neo.mjs 3.1.4 → 3.2.3

package/src/worker/Base.mjs

@@ -71,8 +71,8 @@ class Base extends CoreBase {
             gt.onmessage = me.onMessage.bind(me);
         }
 
-        Neo.workerId      = me.workerId;
         Neo.currentWorker = me;
+        Neo.workerId      = me.workerId;
     }
 
     /**
@@ -204,6 +204,25 @@ class Base extends CoreBase {
         });
     }
 
+    /**
+     * Only relevant for SharedWorkers
+     * @param {Object} msg
+     * @param {String} msg.appName
+     */
+    onRegisterApp(msg) {
+        let me      = this,
+            appName = msg.appName,
+            port;
+
+        for (port of me.ports) {
+            if (!port.appName) {
+                port.appName = appName;
+                me.onConnect({ appName });
+                break;
+            }
+        }
+    }
+
     /**
      * @param {Object} msg
      */
@@ -275,4 +294,4 @@ class Base extends CoreBase {
 
 Neo.applyClassConfig(Base);
 
-export {Base as default};
+export default Base;

package/src/worker/Manager.mjs

@@ -119,7 +119,7 @@ class Manager extends Base {
 
     /**
      * Sends a message to each worker defined inside the this.workers config.
-     * @param {String} msg
+     * @param {Object} msg
      */
     broadcast(msg) {
         Object.keys(this.workers).forEach(name => {
@@ -261,10 +261,9 @@ class Manager extends Base {
      * @param {Object} e
      */
     onWorkerMessage(e) {
-        let me           = this,
-            data         = e.data,
-            delayPromise = false,
-            transfer     = null,
+        let me       = this,
+            data     = e.data,
+            transfer = null,
             promise;
 
         const {action, destination: dest, replyId} = data;
@@ -273,33 +272,26 @@ class Manager extends Base {
 
         me.fire('message:'+action, data);
 
-        if (promise = action === 'reply' && me.promises[replyId]) {
-            if (data.destination === 'main') {
-                data = data.data;
-            }
+        if (action === 'reply') {
+            promise = me.promises[replyId];
 
-            if (data.reject) {
-                promise.reject(data);
-            } else {
+            if (!promise) {
                 if (data.data) {
-                    if (data.data.autoMount) {
-                        me.fire('automount', data);
-                        delayPromise = true;
-                    }
-                    if (data.data.updateVdom) {
-                        me.fire('updateVdom', data);
-                        delayPromise = true;
-                    }
+                    data.data.autoMount  && me.fire('automount',  data);
+                    data.data.updateVdom && me.fire('updateVdom', data);
+
+                    // we want to delay the message until the rendering queue has processed it
+                    // see: https://github.com/neomjs/neo/issues/2864
+                    me.promiseForwardMessage(data).then(msgData => {
+                        me.sendMessage(msgData.destination, msgData);
+                    });
                 }
-
-                if (!delayPromise) {
-                    promise.resolve(data);
-                } else {
-                    me.promises[replyId].data = data;
+            } else {
+                if (data.destination === 'main') {
+                    data = data.data;
                 }
-            }
 
-            if (!delayPromise) {
+                promise[data.reject ? 'reject' : 'resolve'](data);
                 delete me.promises[replyId];
             }
         }
@@ -324,6 +316,11 @@ class Manager extends Base {
         // only needed for SharedWorkers
         else if (dest === 'main' && action === 'registerAppName') {
             me.appNames.push(data.appName);
+
+            me.broadcast({
+                action : 'registerApp',
+                appName: data.appName
+            });
         }
 
         else if (dest === 'main' && action === 'remoteMethod') {
@@ -332,7 +329,18 @@ class Manager extends Base {
     }
 
     /**
-     * @param {String} dest app, data or vdom
+     * @param {Object} data
+     * @param {String} data.replyId
+     * @returns {Promise<any>}
+     */
+    promiseForwardMessage(data) {
+        return new Promise((resolve, reject) => {
+            this.promises[data.replyId] = { data, reject, resolve };
+        });
+    }
+
+    /**
+     * @param {String} dest app, canvas, data or vdom
      * @param {Object} opts configs for Neo.worker.Message
      * @param {Array} [transfer] An optional array of Transferable objects to transfer ownership of.
      * If the ownership of an object is transferred, it becomes unusable (neutered) in the context it was sent from
@@ -346,10 +354,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 };
         });
     }
 
@@ -368,7 +373,7 @@ class Manager extends Base {
     }
 
     /**
-     * @param {String} dest app, data or vdom
+     * @param {String} dest app, canvas, data or vdom
      * @param {Object} opts configs for Neo.worker.Message
      * @param {Array} [transfer] An optional array of Transferable objects to transfer ownership of.
      * If the ownership of an object is transferred, it becomes unusable (neutered) in the context it was sent from

package/src/worker/Message.mjs

@@ -37,4 +37,4 @@ class Message {
 const ns = Neo.ns('Neo.worker', true);
 ns['Message'] = Message;
 
-export {Message as default};
+export default Message;

package/src/worker/VDom.mjs

@@ -28,6 +28,19 @@ class VDom extends Base {
          */
         workerId: 'vdom'
     }}
+
+    /**
+     *
+     */
+    afterConnect() {
+        let me      = this,
+            channel = new MessageChannel(),
+            port    = channel.port2;
+
+        channel.port1.onmessage = me.onMessage.bind(me);
+
+        me.sendMessage('app', {action: 'registerPort', transfer: port}, [port]);
+    }
 }
 
 Neo.applyClassConfig(VDom);

package/src/worker/mixin/RemoteMethodAccess.mjs

@@ -155,4 +155,4 @@ class RemoteMethodAccess extends Base {
 
 Neo.applyClassConfig(RemoteMethodAccess);
 
-export {RemoteMethodAccess as default};
+export default RemoteMethodAccess;

package/test/siesta/tests/CollectionBase.mjs

@@ -160,11 +160,11 @@ StartTest(t => {
             {country: 'Croatia',   firstname: 'Grgur',   githubId: 'grgur',         lastname: 'Grisogono'},
             {country: 'Slovakia',  firstname: 'Jozef',   githubId: 'jsakalos',      lastname: 'Sakalos'},
             {country: 'Argentina', firstname: 'Max',     githubId: 'elmasse',       lastname: 'Fierro'},
+            {country: 'France',    firstname: 'Nigel',   githubId: 'NigeWhite',     lastname: 'White'},
             {country: 'Germany',   firstname: 'Nils',    githubId: 'mrsunshine',    lastname: 'Dehl'},
             {country: 'USA',       firstname: 'Rich',    githubId: 'rwaters',       lastname: 'Waters'},
             {country: 'Germany',   firstname: 'Tobias',  githubId: 'tobiu2',        lastname: 'Uhlig2'},
-            {country: 'Germany',   firstname: 'Tobias',  githubId: 'tobiu',         lastname: 'Uhlig'},
-            {country: 'France',    firstname: 'Nigel',   githubId: 'NigeWhite',     lastname: 'White'}
+            {country: 'Germany',   firstname: 'Tobias',  githubId: 'tobiu',         lastname: 'Uhlig'}
         ], 'collection2.getRange()');
 
         t.notOk(collection2.isFiltered(), 'collection2.isFiltered()');
@@ -186,11 +186,11 @@ StartTest(t => {
             {country: 'Croatia',   firstname: 'Grgur',   githubId: 'grgur',         lastname: 'Grisogono'},
             {country: 'Slovakia',  firstname: 'Jozef',   githubId: 'jsakalos',      lastname: 'Sakalos'},
             {country: 'Argentina', firstname: 'Max',     githubId: 'elmasse',       lastname: 'Fierro'},
+            {country: 'France',    firstname: 'Nigel',   githubId: 'NigeWhite',     lastname: 'White'},
             {country: 'Germany',   firstname: 'Nils',    githubId: 'mrsunshine',    lastname: 'Dehl'},
             {country: 'USA',       firstname: 'Rich',    githubId: 'rwaters',       lastname: 'Waters'},
             {country: 'Germany',   firstname: 'Tobias',  githubId: 'tobiu2',        lastname: 'Uhlig2'},
             {country: 'Germany',   firstname: 'Tobias',  githubId: 'tobiu',         lastname: 'Uhlig'},
-            {country: 'France',    firstname: 'Nigel',   githubId: 'NigeWhite',     lastname: 'White'}
         ], 'collection2.getRange()');
 
         collection2.clearSorters(true);
@@ -251,4 +251,4 @@ StartTest(t => {
         t.isStrict(collection3.getCount(), 5, 'collection3 count is 5');
         t.isStrict(collection3.allItems.getCount(), 9, 'collection3 allItems count is 9');
     });
-});
+});