neo.mjs 6.17.1 → 6.18.0

package/src/worker/Base.mjs

@@ -66,13 +66,13 @@ class Base extends CoreBase {
         });
 
         if (me.isSharedWorker) {
-            gt.onconnect = me.onConnected.bind(me);
+            gt.onconnect = me.onConnected.bind(me)
         } else {
-            gt.onmessage = me.onMessage.bind(me);
+            gt.onmessage = me.onMessage.bind(me)
         }
 
         Neo.currentWorker = me;
-        Neo.workerId      = me.workerId;
+        Neo.workerId      = me.workerId
     }
 
     /**
@@ -93,16 +93,16 @@ class Base extends CoreBase {
 
             Object.entries(opts).forEach(([key, value]) => {
                 if (value !== port[key]) {
-                    hasMatch = false;
+                    hasMatch = false
                 }
             });
 
             if (hasMatch) {
-                returnPort = port;
+                returnPort = port
             }
         });
 
-        return returnPort;
+        return returnPort
     }
 
     /**
@@ -171,14 +171,13 @@ class Base extends CoreBase {
      * @param {Object} e
      */
     onMessage(e) {
-        let me      = this,
-            data    = e.data,
-            action  = data.action,
-            replyId = data.replyId,
+        let me                = this,
+            {data}            = e,
+            {action, replyId} = data,
             promise;
 
         if (!action) {
-            throw new Error('Message action is missing: ' + data.id);
+            throw new Error('Message action is missing: ' + data.id)
         }
 
         if (action !== 'reply') {
@@ -207,8 +206,8 @@ class Base extends CoreBase {
      * @param {String} msg.appName
      */
     onRegisterApp(msg) {
-        let me      = this,
-            appName = msg.appName,
+        let me        = this,
+            {appName} = msg,
             port;
 
         for (port of me.ports) {
@@ -255,7 +254,7 @@ class Base extends CoreBase {
             let message = me.sendMessage(dest, opts, transfer),
                 msgId   = message.id;
 
-            me.promises[msgId] = { reject, resolve }
+            me.promises[msgId] = {reject, resolve}
         })
     }
 
@@ -275,7 +274,7 @@ class Base extends CoreBase {
             message, port, portObject;
 
         if (me.channelPorts[dest]) {
-            port = me.channelPorts[dest];
+            port = me.channelPorts[dest]
         } else if (!me.isSharedWorker) {
             port = globalThis
         } else {

package/src/worker/Canvas.mjs

@@ -80,6 +80,4 @@ class Canvas extends Base {
     }
 }
 
-let instance = Neo.setupClass(Canvas);
-
-export default instance;
+export default Neo.setupClass(Canvas);

package/src/worker/Data.mjs

@@ -55,7 +55,7 @@ class Data extends Base {
 
         me.sendMessage('app', {action: 'registerPort', transfer: port2}, [port2]);
 
-        me.channelPorts.app = port1;
+        me.channelPorts.app = port1
     }
 
     /**
@@ -91,8 +91,6 @@ class Data extends Base {
      * @param {Object} msg
      */
     async onRpc(msg) {
-        console.log('onRpc', msg);
-
         let me = this,
             response;
 
@@ -100,15 +98,13 @@ class Data extends Base {
             // todo: we could store calls which arrive too early and pass them to the manager once it is ready
             console.warn('manager.RemotesApi not loaded yet', msg);
 
-            me.reject(msg);
+            me.reject(msg)
         } else {
             response = await Neo.manager.rpc.Message.onMessage(msg);
 
-            me.resolve(msg, response);
+            me.resolve(msg, response)
         }
     }
 }
 
-let instance = Neo.setupClass(Data);
-
-export default instance;
+export default Neo.setupClass(Data);

package/src/worker/Manager.mjs

@@ -157,13 +157,13 @@ class Manager extends Base {
      * @returns {SharedWorker|Worker}
      */
     createWorker(opts) {
-        let me       = this,
-            fileName = opts.fileName,
-            filePath = (opts.basePath || me.basePath) + fileName,
-            name     = `neomjs-${fileName.substring(0, fileName.indexOf('.')).toLowerCase()}-worker`,
-            isShared = me.sharedWorkersEnabled && NeoConfig.useSharedWorkers,
-            cls      = isShared ? SharedWorker : Worker,
-            worker   = devMode  // todo: switch to the new syntax to create a worker from a JS module once browsers are ready
+        let me         = this,
+            {fileName} = opts,
+            filePath   = (opts.basePath || me.basePath) + fileName,
+            name       = `neomjs-${fileName.substring(0, fileName.indexOf('.')).toLowerCase()}-worker`,
+            isShared   = me.sharedWorkersEnabled && NeoConfig.useSharedWorkers,
+            cls        = isShared ? SharedWorker : Worker,
+            worker     = devMode  // todo: switch to the new syntax to create a worker from a JS module once browsers are ready
                 ? new cls(filePath, {name: name, type: 'module'})
                 : new cls(filePath, {name: name});
 
@@ -179,10 +179,10 @@ class Manager extends Base {
      * Calls createWorker for each worker inside the this.workers config.
      */
     createWorkers() {
-        let me       = this,
-            config   = Neo.clone(NeoConfig, true),
-            hash     = location.hash,
-            windowId = me.windowId,
+        let me                   = this,
+            config               = Neo.clone(NeoConfig, true),
+            {hash, href, search} = location,
+            {windowId}           = me,
             key, value;
 
         // remove configs which are not relevant for the workers scope
@@ -193,14 +193,11 @@ class Manager extends Base {
             config.hash = {
                 hash      : DomEvents.parseHash(hash.substring(1)),
                 hashString: hash.substring(1),
-                windowId  : me.windowId
+                windowId
             }
         }
 
-        config.url = {
-            href  : location.href,
-            search: location.search
-        };
+        config.url = {href, search};
 
         for ([key, value] of Object.entries(me.workers)) {
             if (key === 'canvas' && !config.useCanvasWorker ||
@@ -278,7 +275,7 @@ class Manager extends Base {
 
         if (me.constructedThreads === me.activeWorkers) {
             NeoConfig.appPath && setTimeout(() => { // better safe than sorry => all remotes need to be registered
-                me.loadApplication(NeoConfig.appPath);
+                me.loadApplication(NeoConfig.appPath)
             }, NeoConfig.loadApplicationDelay)
         }
     }
@@ -298,7 +295,7 @@ class Manager extends Base {
      */
     onWorkerMessage(e) {
         let me       = this,
-            data     = e.data,
+            {data}   = e,
             transfer = null,
             promise;
 
@@ -328,7 +325,7 @@ class Manager extends Base {
                 }
 
                 promise[data.reject ? 'reject' : 'resolve'](data);
-                delete me.promises[replyId];
+                delete me.promises[replyId]
             }
         }
 
@@ -338,7 +335,7 @@ class Manager extends Base {
             }
 
             me.promiseMessage(dest, data, transfer).then(response => {
-                me.sendMessage(response.destination, response);
+                me.sendMessage(response.destination, response)
             }).catch(err => {
                 me.sendMessage(data.origin, {
                     action : 'reply',
@@ -351,12 +348,11 @@ class Manager extends Base {
 
         // only needed for SharedWorkers
         else if (dest === 'main' && action === 'registerAppName') {
-            me.appNames.push(data.appName);
+            let {appName} = data;
 
-            me.broadcast({
-                action : 'registerApp',
-                appName: data.appName
-            })
+            me.appNames.push(appName);
+
+            me.broadcast({action: 'registerApp', appName})
         }
 
         else if (dest === 'main' && action === 'remoteMethod') {
@@ -371,7 +367,7 @@ class Manager extends Base {
      */
     promiseForwardMessage(data) {
         return new Promise((resolve, reject) => {
-            this.promises[data.replyId] = { data, reject, resolve }
+            this.promises[data.replyId] = {data, reject, resolve}
         })
     }
 
@@ -390,7 +386,7 @@ class Manager extends Base {
             let message = me.sendMessage(dest, opts, transfer),
                 msgId   = message.id;
 
-            me.promises[msgId] = { reject, resolve }
+            me.promises[msgId] = {reject, resolve}
         })
     }
 
@@ -399,11 +395,12 @@ class Manager extends Base {
      */
     resolveDomOperationPromise(replyId) {
         if (replyId) {
-            let promise = this.promises[replyId];
+            let {promises} = this,
+                promise    = promises[replyId];
 
             if (promise) {
                 promise.resolve(promise.data);
-                delete this.promises[replyId]
+                delete promises[replyId]
             }
         }
     }
@@ -443,6 +440,4 @@ class Manager extends Base {
     }
 }
 
-let instance = Neo.setupClass(Manager);
-
-export default instance;
+export default Neo.setupClass(Manager);

package/src/worker/Message.mjs

@@ -30,7 +30,7 @@ class Message {
         config.id          = config.id          || IdGenerator.getId(Neo.workerId);
         config.origin      = config.origin      || Neo.workerId;
 
-        Object.assign(this, config);
+        Object.assign(this, config)
     }
 }
 

package/src/worker/ServiceBase.mjs

@@ -91,7 +91,7 @@ class ServiceBase extends Base {
         });
 
         Neo.currentWorker = me;
-        Neo.workerId      = me.workerId;
+        Neo.workerId      = me.workerId
     }
 
     /**
@@ -128,7 +128,7 @@ class ServiceBase extends Base {
             clientId   : client.id,
             destination: 'app',
             port       : port1
-        });
+        })
     }
 
     /**
@@ -140,11 +140,11 @@ class ServiceBase extends Base {
     getPort(destination, clientId=this.lastClient?.id) {
         for (let port of this.channelPorts) {
             if (clientId === port.clientId && destination === port.destination) {
-                return port.port;
+                return port.port
             }
         }
 
-        return null;
+        return null
     }
 
     /**
@@ -156,7 +156,7 @@ class ServiceBase extends Base {
 
         if (lastClientId && !me.remotes.includes(lastClientId)) {
             me.remotes.push(lastClientId);
-            super.initRemote();
+            super.initRemote()
         }
     }
 
@@ -164,7 +164,7 @@ class ServiceBase extends Base {
      * @param {ExtendableMessageEvent} event
      */
     onActivate(event) {
-        console.log('onActivate', event);
+        console.log('onActivate', event)
     }
 
     /**
@@ -174,21 +174,21 @@ class ServiceBase extends Base {
         console.log('onConnect', source);
 
         this.createMessageChannel(source);
-        this.initRemote();
+        this.initRemote()
     }
 
     /**
      * @param {ExtendableMessageEvent} event
      */
     onFetch(event) {
-        let hasMatch = false,
-            request  = event.request,
+        let hasMatch   = false,
+            {request}  = event,
             key;
 
         for (key of this.cachePaths) {
             if (request.url.includes(key)) {
                 hasMatch = true;
-                break;
+                break
             }
         }
 
@@ -199,7 +199,7 @@ class ServiceBase extends Base {
                 .then(response       => cache.put(request, response.clone())
                 .then(()             => response)
             )))
-        );
+        )
     }
 
     /**
@@ -207,7 +207,7 @@ class ServiceBase extends Base {
      */
     onInstall(event) {
         console.log('onInstall', event);
-        globalThis.skipWaiting();
+        globalThis.skipWaiting()
     }
 
     /**
@@ -216,25 +216,24 @@ class ServiceBase extends Base {
      * @param {ExtendableMessageEvent|MessageEvent} event
      */
     onMessage(event) {
-        let me      = this,
-            data    = event.data,
-            action  = data.action,
-            replyId = data.replyId,
+        let me                = this,
+            {data}            = event,
+            {action, replyId} = data,
             promise;
 
         if (event.source) { // ExtendableMessageEvent
-            me.lastClient = event.source;
+            me.lastClient = event.source
         }
 
         if (!action) {
-            throw new Error('Message action is missing: ' + data.id);
+            throw new Error('Message action is missing: ' + data.id)
         }
 
         if (action !== 'reply') {
             me['on' + Neo.capitalize(action)](data, event);
         } else if (promise = action === 'reply' && me.promises[replyId]) {
             promise[data.reject ? 'reject' : 'resolve'](data.data);
-            delete me.promises[replyId];
+            delete me.promises[replyId]
         }
     }
 
@@ -243,7 +242,7 @@ class ServiceBase extends Base {
      * @param {ExtendableMessageEvent} event
      */
     onPing(msg, event) {
-        this.resolve(msg, {originMsg: msg});
+        this.resolve(msg, {originMsg: msg})
     }
 
     /**
@@ -260,7 +259,7 @@ class ServiceBase extends Base {
             await me.clearCaches()
         }
 
-        me.onConnect(event.source);
+        me.onConnect(event.source)
     }
 
     /**
@@ -271,7 +270,7 @@ class ServiceBase extends Base {
         for (let [index, value] of this.channelPorts.entries()) {
             if (value.clientId === event.source.id) {
                 this.channelPorts.splice(index, 1);
-                break;
+                break
             }
         }
     }
@@ -285,12 +284,12 @@ class ServiceBase extends Base {
     async preloadAssets(data) {
         let cacheName = data.cacheName || this.cacheName,
             cache     = await caches.open(cacheName),
-            files     = data.files,
+            {files}   = data,
             items     = [],
             asset, hasMatch, item;
 
         if (!Array.isArray(files)) {
-            files = [files];
+            files = [files]
         }
 
         for (item of files) {
@@ -298,17 +297,17 @@ class ServiceBase extends Base {
 
             if (!data.forceReload) {
                 asset    = await cache.match(item);
-                hasMatch = !!asset;
+                hasMatch = !!asset
             }
 
-            !hasMatch && items.push(item);
+            !hasMatch && items.push(item)
         }
 
         if (items.length > 0) {
-            await cache.addAll(items);
+            await cache.addAll(items)
         }
 
-        return {success: true};
+        return {success: true}
     }
 
     /**
@@ -326,8 +325,8 @@ class ServiceBase extends Base {
             let message = me.sendMessage(dest, opts, transfer),
                 msgId   = message.id;
 
-            me.promises[msgId] = {reject, resolve};
-        });
+            me.promises[msgId] = {reject, resolve}
+        })
     }
 
     /**
@@ -344,28 +343,25 @@ class ServiceBase extends Base {
      */
     async removeAssets(data) {
         if (!Neo.isObject(data)) {
-            data = {
-                assets: data
-            };
+            data = {assets: data}
         }
 
-        let assets    = data.assets,
-            cacheName = data.cacheName || this.cacheName,
-            options   = data.options || {},
-            cache     = await caches.open(cacheName),
-            promises  = [];
+        let {assets, options={}} = data,
+            cacheName              = data.cacheName || this.cacheName,
+            cache                  = await caches.open(cacheName),
+            promises               = [];
 
         if (!Array.isArray(assets)) {
-            assets = [assets];
+            assets = [assets]
         }
 
         assets.forEach(asset => {
-            promises.push(cache.delete(asset, options));
+            promises.push(cache.delete(asset, options))
         });
 
         await Promise.all(promises);
 
-        return {success: true};
+        return {success: true}
     }
 
     /**
@@ -384,7 +380,7 @@ class ServiceBase extends Base {
             port    = this.getPort(dest) || this.lastClient;
 
         port.postMessage(message, transfer);
-        return message;
+        return message
     }
 }
 

package/src/worker/Task.mjs

@@ -62,6 +62,4 @@ class Task extends Base {
     }
 }
 
-let instance = Neo.setupClass(Task);
-
-export default instance;
+export default Neo.setupClass(Task);

package/src/worker/VDom.mjs

@@ -39,10 +39,8 @@ class VDom extends Base {
 
         channel.port1.onmessage = me.onMessage.bind(me);
 
-        me.sendMessage('app', {action: 'registerPort', transfer: port2}, [port2]);
+        me.sendMessage('app', {action: 'registerPort', transfer: port2}, [port2])
     }
 }
 
-let instance = Neo.setupClass(VDom);
-
-export default instance;
+export default Neo.setupClass(VDom);

package/src/worker/mixin/RemoteMethodAccess.mjs

@@ -35,8 +35,8 @@ class RemoteMethodAccess extends Base {
      * @returns {function(*=, *=): Promise<any>}
      */
     generateRemote(remote, method) {
-        let me     = this,
-            origin = remote.origin;
+        let me       = this,
+            {origin} = remote;
 
         return function(data, buffer) {
             let opts = {
@@ -58,10 +58,9 @@ class RemoteMethodAccess extends Base {
      */
     onRegisterRemote(remote) {
         if (remote.destination === Neo.workerId) {
-            let me        = this,
-                className = remote.className,
-                methods   = remote.methods,
-                pkg       = Neo.ns(className, true);
+            let me                   = this,
+                {className, methods} = remote,
+                pkg                  = Neo.ns(className, true);
 
             methods.forEach(method => {
                 if (remote.origin !== 'main' && pkg[method]) {