From 29ad7fcf73c1e87e3197d4751e55baf496e677da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Syn=C3=A1=C4=8Dek?=
 <ondrejsynacek@fastmail.com>
Date: Sun, 20 Dec 2020 15:00:00 +0100
Subject: [PATCH] fix: extract service worker setup to Svelte app
 initialization

---
 lib/frontend/components/Status.svelte |  7 +++-
 lib/frontend/index.js                 |  3 ++
 lib/frontend/stores/index.js          |  2 +
 lib/frontend/stores/swStatusStore.js  |  3 ++
 lib/frontend/sw-boot.js               | 40 ++++++++++++++++++
 lib/static/index.js                   | 58 ---------------------------
 6 files changed, 54 insertions(+), 59 deletions(-)
 create mode 100644 lib/frontend/stores/swStatusStore.js
 create mode 100644 lib/frontend/sw-boot.js

diff --git a/lib/frontend/components/Status.svelte b/lib/frontend/components/Status.svelte
index bd46652..e2c3e43 100644
--- a/lib/frontend/components/Status.svelte
+++ b/lib/frontend/components/Status.svelte
@@ -14,7 +14,7 @@
 </style>
 
 <script>
-  import { parseStatusStore, requestStore } from '../stores'
+  import { parseStatusStore, requestStore, swStatusStore } from '../stores'
 
   $: error = ($requestStore && $requestStore.error) ? $requestStore.error : null
   $: pendingRequest = Boolean($requestStore && !$requestStore.error)
@@ -36,4 +36,9 @@
       {$parseStatusStore}
     </div>
   {/if}
+  {#if $swStatusStore}
+    <div class='status-item'>
+      {$swStatusStore}
+    </div>
+  {/if}
 </div>
diff --git a/lib/frontend/index.js b/lib/frontend/index.js
index e532f8a..7420698 100644
--- a/lib/frontend/index.js
+++ b/lib/frontend/index.js
@@ -2,11 +2,14 @@ import App from './components/App.svelte'
 
 import * as stores from './stores'
 import * as services from './services'
+import serviceWorkerBoot from './sw-boot'
 
 const boot = () => {
 
   services.storageListener.register()
 
+  serviceWorkerBoot()
+
   new App({
     target: document.querySelector('#root'),
   })
diff --git a/lib/frontend/stores/index.js b/lib/frontend/stores/index.js
index 15a439e..5a72cca 100644
--- a/lib/frontend/stores/index.js
+++ b/lib/frontend/stores/index.js
@@ -2,10 +2,12 @@ import configStore from './configStore'
 import eventStore from './eventStore'
 import parseStatusStore from './parseStatusStore'
 import requestStore from './requestStore'
+import swStatusStore from './swStatusStore'
 
 export {
   configStore,
   eventStore,
   parseStatusStore,
   requestStore,
+  swStatusStore,
 }
diff --git a/lib/frontend/stores/swStatusStore.js b/lib/frontend/stores/swStatusStore.js
new file mode 100644
index 0000000..8a3735d
--- /dev/null
+++ b/lib/frontend/stores/swStatusStore.js
@@ -0,0 +1,3 @@
+import { writable } from 'svelte/store'
+
+export default writable(null)
diff --git a/lib/frontend/sw-boot.js b/lib/frontend/sw-boot.js
new file mode 100644
index 0000000..8ad68d2
--- /dev/null
+++ b/lib/frontend/sw-boot.js
@@ -0,0 +1,40 @@
+import { swStatusStore } from './stores'
+
+export default () => {
+  if (!window.navigator || !window.navigator.serviceWorker) {
+    return
+  }
+
+  const { serviceWorker } = window.navigator
+
+  serviceWorker.register('sw.js', {
+    scope: './',
+  }).then((registration) => {
+    swStatusStore.set(`Service worker registered with scope ${registration.scope}`)
+    setTimeout(() => {
+      swStatusStore.set(null)
+    }, 4500)
+
+    registration.addEventListener('updatefound', () => {
+      console.info('Service worker will be updated...')
+      const newWorker = registration.installing
+
+      newWorker.addEventListener('statechange', () => {
+        if (newWorker.state === 'installed') {
+          newWorker.postMessage({ action: 'skipWaiting' })
+        }
+      })
+    })
+  }).catch((err) => {
+    swStatusStore.set(`Service worker error: ${err.toString()}`)
+  })
+
+  let refreshing
+  serviceWorker.addEventListener('controllerchange', () => {
+    if (refreshing) {
+      return
+    }
+    window.location.reload()
+    refreshing = true
+  })
+}
diff --git a/lib/static/index.js b/lib/static/index.js
index d353a84..061c61c 100644
--- a/lib/static/index.js
+++ b/lib/static/index.js
@@ -13,12 +13,6 @@ import { requestStore } from '../frontend/stores'
 import { Request } from '../frontend/records'
 
 (() => {
-  let request = null
-
-  requestStore.subscribe((updatedRequest) => {
-    request = updatedRequest
-  })
-
   document.addEventListener('DOMContentLoaded', boot)
 
   const configureLogger = (logger) => {
@@ -34,57 +28,5 @@ import { Request } from '../frontend/records'
     logger.setRemoteLogging(shouldTrack)
   }
 
-  const clearStatuses = () => {
-    document.querySelectorAll('.status-item').forEach((item) => {
-      item.classList.remove('show')
-    })
-  }
-
-  const setServiceWorkerStatus = (status) => {
-    clearStatuses()
-    const sw = document.querySelector('#service-worker')
-    sw.innerText = status
-    status ? sw.classList.add('show') : sw.classList.remove('show')
-  }
-
-  const form = document.querySelector('form')
-  const submitButton = document.querySelector("#submit")
-  const input = document.querySelector("#url")
-  const link = document.querySelector("#current-download")
-
-  if (window.navigator && window.navigator.serviceWorker) {
-    const serviceWorker = window.navigator.serviceWorker
-    serviceWorker.register('sw.js', {
-      scope: './',
-    }).then((registration) => {
-      setServiceWorkerStatus(`Service worker registered with scope ${registration.scope}`)
-      setTimeout(() => {
-        setServiceWorkerStatus('')
-      }, 4500)
-
-      registration.addEventListener('updatefound', () => {
-        console.info('Service worker will be updated...')
-        const newWorker = registration.installing
-
-        newWorker.addEventListener('statechange', () => {
-          if (newWorker.state === 'installed') {
-            newWorker.postMessage({ action: 'skipWaiting' })
-          }
-        })
-      })
-    }).catch((err) => {
-      setServiceWorkerStatus(`Service worker error: ${err.toString()}`)
-    })
-
-    let refreshing
-    serviceWorker.addEventListener('controllerchange', () => {
-      if (refreshing) {
-        return
-      }
-      window.location.reload()
-      refreshing = true
-    })
-  }
-
   configureLogger(logger)
 })()