bug: Service Worker: Ensure Unmanaged Apps Handle Recovery Messages (#8695)

Author: tobiu

src/main/addon/ServiceWorker.mjs

@@ -50,8 +50,6 @@ class ServiceWorker extends Base {
 
             await serviceWorker.ready;
 
-            serviceWorker.onmessage = WorkerManager.onWorkerMessage.bind(WorkerManager);
-
             if (!WorkerManager.getWorker('service')) {
                 /*
                  * navigator.serviceWorker.controller can be null in case we load a page for the first time
@@ -61,16 +59,6 @@ class ServiceWorker extends Base {
                 WorkerManager.serviceWorker = registration.active
             }
 
-            let swVersion = await WorkerManager.promiseMessage('service', {
-                action: 'getVersion'
-            });
-
-            if (swVersion?.version && swVersion.version !== config.version) {
-                console.error(`Version Mismatch! Client: ${config.version}, SW: ${swVersion.version}. Reloading.`);
-                location.reload(true);
-                return
-            }
-
             WorkerManager.sendMessage('service', {
                 action: 'registerNeoConfig',
                 data  : config

src/worker/Manager.mjs

@@ -147,6 +147,11 @@ class Manager extends Base {
 
         !Neo.insideWorker && me.createWorkers();
 
+        if (navigator.serviceWorker) {
+            navigator.serviceWorker.onmessage = me.onWorkerMessage.bind(me);
+            me.checkServiceWorkerVersion()
+        }
+
         Neo.setGlobalConfig = me.setGlobalConfig.bind(me);
         Neo.workerId        = 'main';
 
@@ -177,6 +182,22 @@ class Manager extends Base {
         })
     }
 
+    /**
+     * @returns {Promise<void>}
+     */
+    async checkServiceWorkerVersion() {
+        if (navigator.serviceWorker?.controller) {
+            let swVersion = await this.promiseMessage('service', {
+                action: 'getVersion'
+            });
+
+            if (swVersion?.version && swVersion.version !== Neo.config.version) {
+                console.error(`Version Mismatch! Client: ${Neo.config.version}, SW: ${swVersion.version}. Reloading.`);
+                location.reload(true)
+            }
+        }
+    }
+
     /**
      * Creates a web worker using the passed options as well as adding error & message event listeners.
      * @param {Object} opts