neo.mjs 3.2.10 → 4.0.0

package/buildScripts/createApp.mjs

@@ -32,6 +32,7 @@ program
     .option('-i, --info',                     'print environment debug info')
     .option('-a, --appName <value>')
     .option('-m, --mainThreadAddons <value>', `Comma separated list of:\n${addonChoices.join(', ')}\nDefaults to DragDrop, Stylesheet`)
+    .option('-s, --useServiceWorker <value>', '"yes", "no"')
     .option('-t, --themes <value>',           ['all', ...themeFolders, 'none'].join(", "))
     .option('-u, --useSharedWorkers <value>', '"yes", "no"')
     .allowUnknownOption()
@@ -105,11 +106,22 @@ if (programOpts.info) {
         });
     }
 
+    if (!programOpts.useServiceWorker) {
+        questions.push({
+            type   : 'list',
+            name   : 'useServiceWorker',
+            message: 'Do you want to use a ServiceWorker for caching assets?',
+            choices: ['yes', 'no'],
+            default: 'no'
+        });
+    }
+
     inquirer.prompt(questions).then(answers => {
         let appName          = programOpts.appName          || answers.appName,
             mainThreadAddons = programOpts.mainThreadAddons || answers.mainThreadAddons,
             themes           = programOpts.themes           || answers.themes,
             useSharedWorkers = programOpts.useSharedWorkers || answers.useSharedWorkers,
+            useServiceWorker = programOpts.useServiceWorker || answers.useServiceWorker,
             lAppName         = appName.toLowerCase(),
             appPath          = 'apps/' + lAppName + '/',
             dir              = 'apps/' + lAppName,
@@ -181,6 +193,10 @@ if (programOpts.info) {
                 neoConfig.useSharedWorkers = true;
             }
 
+            if (useServiceWorker !== 'no') {
+                neoConfig.useServiceWorker = true;
+            }
+
             if (!insideNeo) {
                 neoConfig.workerBasePath = '../../node_modules/neo.mjs/src/worker/';
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "neo.mjs",
-    "version": "3.2.10",
+    "version": "4.0.0",
     "description": "The webworkers driven UI framework",
     "type": "module",
     "repository": {
@@ -34,18 +34,18 @@
     },
     "homepage": "https://neomjs.github.io/pages/",
     "dependencies": {
-        "@fortawesome/fontawesome-free": "^6.1.0",
+        "@fortawesome/fontawesome-free": "^6.1.1",
         "@material/mwc-button": "^0.25.3",
         "@material/mwc-textfield": "^0.25.3",
         "autoprefixer": "^10.4.4",
         "chalk": "^5.0.1",
         "clean-webpack-plugin": "^4.0.0",
         "commander": "^9.1.0",
-        "cssnano": "^5.1.4",
+        "cssnano": "^5.1.5",
         "envinfo": "^7.8.1",
         "fs-extra": "^10.0.1",
         "highlightjs-line-numbers.js": "^2.8.0",
-        "inquirer": "^8.2.1",
+        "inquirer": "^8.2.2",
         "neo-jsdoc": "^1.0.1",
         "neo-jsdoc-x": "^1.0.4",
         "postcss": "^8.4.12",

package/src/main/addon/ServiceWorker.mjs

@@ -1,6 +1,5 @@
-import Base               from '../../core/Base.mjs';
-import RemoteMethodAccess from '../../worker/mixin/RemoteMethodAccess.mjs';
-import WorkerManager      from '../../worker/Manager.mjs';
+import Base          from '../../core/Base.mjs';
+import WorkerManager from '../../worker/Manager.mjs';
 
 /**
  * Creates a ServiceWorker instance, in case Neo.config.useServiceWorker is set to true
@@ -15,15 +14,6 @@ class ServiceWorker extends Base {
          * @protected
          */
         className: 'Neo.main.addon.ServiceWorker',
-        /**
-         * @member {String[]|Neo.core.Base[]|null} mixins=[RemoteMethodAccess]
-         */
-        mixins: [RemoteMethodAccess],
-        /**
-         * @member {ServiceWorkerRegistration|null} registration=null
-         * @protected
-         */
-        registration: null,
         /**
          * @member {Boolean} singleton=true
          * @protected
@@ -45,22 +35,30 @@ class ServiceWorker extends Base {
                 path          = (devMode ? config.basePath : config.workerBasePath) + (devMode ? folder : '') + fileName,
                 serviceWorker = navigator.serviceWorker;
 
+            window.addEventListener('beforeunload', me.onBeforeUnload.bind(me));
+
             serviceWorker.register(path, opts)
                 .then(registration => {
-                    me.registration = registration;
-
                     serviceWorker.ready.then(() => {
                         serviceWorker.onmessage = WorkerManager.onWorkerMessage.bind(WorkerManager);
 
                         WorkerManager.sendMessage('service', {
-                            action     : 'registerNeoConfig',
-                            channelPort: registration.active,
-                            data       : config
+                            action: 'registerNeoConfig',
+                            data  : config
                         });
                     });
                 })
         }
     }
+
+    /**
+     *
+     */
+    onBeforeUnload() {
+        WorkerManager.sendMessage('service', {
+            action: 'unregisterPort'
+        });
+    }
 }
 
 Neo.applyClassConfig(ServiceWorker);

package/src/worker/ServiceBase.mjs

@@ -257,6 +257,19 @@ class ServiceBase extends Base {
         this.onConnect(event.source);
     }
 
+    /**
+     * @param {Object} msg
+     * @param {ExtendableMessageEvent} event
+     */
+    onUnregisterPort(msg, event) {
+        for (let [index, value] of this.channelPorts.entries()) {
+            if (value.clientId === event.source.id) {
+                this.channelPorts.splice(index, 1);
+                break;
+            }
+        }
+    }
+
     /**
      * @param {Object} data
      * @param {String} [data.cacheName=this.cacheName]