@webqit/port-plus 0.1.8 → 0.1.10

package/package.json

@@ -14,7 +14,7 @@
   ],
   "homepage": "https://port-plus.netlify.app/",
   "icon": "https://webqit.io/icon.svg",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "license": "MIT",
   "repository": {
     "type": "git",

package/src/MessagePortPlus.js

@@ -54,7 +54,7 @@ export function MessagePortPlusMixin(superClass) {
 
             const proto = this.prototype;
 
-            for (const prop of portPlusMethods) {
+            for (const prop of portPlusMethods.concat('_autoStart')) {
                 const original = port[prop];
                 const plus = proto[prop];
 
@@ -283,12 +283,7 @@ export function MessagePortPlusMixin(superClass) {
 
         set onmessage(v) {
             // Auto-start?
-            const portPlusMeta = _meta(this);
-            const options = _options(this);
-            if (!portPlusMeta.get('internal_call')
-                && options.autoStart) {
-                this.start();
-            }
+            this._autoStart();
 
             if (typeof super.onmessage !== 'undefined') {
                 super.onmessage = v;
@@ -311,12 +306,7 @@ export function MessagePortPlusMixin(superClass) {
 
         addEventListener(...args) {
             // Auto-start?
-            const portPlusMeta = _meta(this);
-            const options = _options(this);
-            if (!portPlusMeta.get('internal_call')
-                && options.autoStart) {
-                this.start();
-            }
+            this._autoStart();
 
             // Add to registry 
             const garbageCollection = getGarbageCollection.call(this);
@@ -345,17 +335,12 @@ export function MessagePortPlusMixin(superClass) {
 
         postMessage(message, transferOrOptions = {}) {
             // Auto-start?
-            const portPlusMeta = _meta(this);
-            const options = _options(this);
-            if (!portPlusMeta.get('internal_call')
-                && options.autoStart) {
-                this.start();
-            }
+            this._autoStart();
 
             // Update readyState
             const readyStateInternals = getReadyStateInternals.call(this);
             readyStateInternals.messaging.state = true;
-            readyStateInternals.messaging.resolve();
+            readyStateInternals.messaging.resolve(this);
 
             // Format payload if not yet in the ['.wq'] format
             let _relayedFrom;
@@ -377,6 +362,7 @@ export function MessagePortPlusMixin(superClass) {
             };
 
             // If client-server mode, wait for open ready state
+            const options = _options(this);
             if (options.postAwaitsOpen) readyStateInternals.open.promise.then(post);
             else post();
         }
@@ -519,6 +505,15 @@ export function MessagePortPlusMixin(superClass) {
             return readyStateInternals[query].promise;
         }
 
+        _autoStart() {
+            const portPlusMeta = _meta(this);
+            const options = _options(this);
+            if (!portPlusMeta.get('internal_call')
+                && options.autoStart) {
+                this.start();
+            }
+        }
+
         start() {
             const readyStateInternals = getReadyStateInternals.call(this);
             if (readyStateInternals.open.state) return;
@@ -528,7 +523,7 @@ export function MessagePortPlusMixin(superClass) {
             const readyStateOpen = () => {
                 if (readyStateInternals.open.state) return;
                 readyStateInternals.open.state = true;
-                readyStateInternals.open.resolve();
+                readyStateInternals.open.resolve(this);
 
                 const openEvent = new MessageEventPlus(null, { type: 'open' });
                 this._dispatchEvent
@@ -607,7 +602,7 @@ export function MessagePortPlusMixin(superClass) {
                 ? this._close(...args)
                 : super.close(...args);
 
-            readyStateInternals.close.resolve();
+            readyStateInternals.close.resolve(this);
 
             const openEvent = new MessageEventPlus(null, { type: 'close' });
             this._dispatchEvent
@@ -744,7 +739,7 @@ export function getReadyStateInternals() {
     const portPlusMeta = _meta(this);
     if (!portPlusMeta.has('readystate_registry')) {
         const $ref = (o) => {
-            o.promise = new Promise((res, rej) => (o.resolve = () => res(this), o.reject = rej));
+            o.promise = new Promise((res, rej) => (o.resolve = res, o.reject = rej));
             return o;
         };
         portPlusMeta.set('readystate_registry', {

package/src/RelayPort.js

@@ -6,8 +6,8 @@ export class RelayPort extends StarPort {
     #channelSpec;
     get channelSpec() { return this.#channelSpec; }
 
-    constructor(channel = null) {
-        super();
+    constructor(channel = null, options = {}) {
+        super(options);
         if (typeof channel === 'string') {
             channel = { from: channel, to: channel };
         } else if (_isObject(channel)) {
@@ -20,14 +20,14 @@ export class RelayPort extends StarPort {
         this.#channelSpec = channel;
     }
 
-    addPort(portPlus, { resolveMessage = null } = {}) {
+    addPort(portPlus, { resolveMessage = null, ...options } = {}) {
         const $resolveMessage = (data, ...args) => {
             if (resolveMessage) return resolveMessage(data, ...args);
             return data;
         };
 
         // Add port and forward its messages back to this relay instance
-        const unadd = super.addPort(portPlus, { enableBubbling: false });
+        const unadd = super.addPort(portPlus, options);
         const unforward = portPlus.relay({ channel: this.#channelSpec, to: this, bidirectional: false/* IMPORTANT */, resolveMessage: $resolveMessage });
 
         const messageType_ping = this.#channelSpec.from

package/src/StarPort.js

@@ -1,4 +1,9 @@
-import { MessagePortPlus, _meta, _options } from './MessagePortPlus.js';
+import {
+    MessagePortPlus,
+    _meta,
+    _options,
+    getReadyStateInternals,
+} from './MessagePortPlus.js';
 
 export class StarPort extends MessagePortPlus {
 
@@ -8,8 +13,8 @@ export class StarPort extends MessagePortPlus {
 
     [Symbol.iterator]() { return this.#ports[Symbol.iterator](); }
 
-    constructor({ autoClose = true } = {}) {
-        super({ autoStart: false, postAwaitsOpen: true, autoClose });
+    constructor({ autoStart = true, postAwaitsOpen = false, autoClose = true } = {}) {
+        super({ autoStart, postAwaitsOpen, autoClose });
     }
 
     addPort(portPlus, { enableBubbling = true } = {}) {
@@ -17,6 +22,13 @@ export class StarPort extends MessagePortPlus {
             throw new TypeError('Port must be a WQMessagePort instance.');
         }
 
+        const readyStateInternals = getReadyStateInternals.call(this);
+
+        if (readyStateInternals.close.state) {
+            const starPortName = this.constructor.name;
+            throw new Error(`Cannot add port to ${starPortName}. ${starPortName} is closed.`);
+        }
+
         if (this.#ports.has(portPlus)) return;
         this.#ports.add(portPlus); // @ORDER: 1
 
@@ -34,7 +46,7 @@ export class StarPort extends MessagePortPlus {
 
         const cleanup = () => {
             if (!this.#ports.has(portPlus)) return;
-            
+
             this.#ports.delete(portPlus);
 
             if (enableBubbling
@@ -66,9 +78,27 @@ export class StarPort extends MessagePortPlus {
         }
     }
 
+    _autoStart() {} // Must be present to do nothing
+
+    start() {
+        const readyStateInternals = getReadyStateInternals.call(this);
+
+        if (readyStateInternals.open.state) return;
+        readyStateInternals.open.state = true;
+
+        readyStateInternals.open.resolve(this);
+    }
+
     close(...args) {
+        const readyStateInternals = getReadyStateInternals.call(this);
+
+        if (readyStateInternals.close.state) return;
+        readyStateInternals.close.state = true;
+
         for (const portPlus of this.#ports) {
             portPlus.close?.(...args);
         }
+
+        readyStateInternals.close.resolve(this);
     }
 }

package/test/basic.test.js

@@ -53,3 +53,6 @@ p.port2.close();
 
 await new Promise((r) => setTimeout(r, 3000));
 m.port2.close();
+
+const e = new BroadcastChannelPlus('test');
+console.log('________________', e.readyState)