@webqit/port-plus 0.1.19 → 0.1.21

package/package.json

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

package/src/MessageEventPlus.js

@@ -3,8 +3,20 @@ import { MessagePortPlus, applyMutations, _options } from './MessagePortPlus.js'
 
 export class MessageEventPlus extends MessageEvent {
 
-    #originalTarget;
-    get originalTarget() { return this.#originalTarget; }
+    static setCurrentTarget(event, currentTarget) {
+        event.#currentTarget = currentTarget;
+        if (!event.#target) {
+            event.#target = currentTarget;
+        }
+    }
+
+    // ----------
+
+    #currentTarget;
+    get currentTarget() { return this.#currentTarget; }
+
+    #target;
+    get target() { return this.#target; }
 
     #eventID;
     get eventID() { return this.#eventID; }
@@ -28,7 +40,7 @@ export class MessageEventPlus extends MessageEvent {
     get ports() { return this.#ports; }
 
     constructor(data, {
-        originalTarget = null,
+        target = null,
         type = 'message',
         eventID,
         live = false,
@@ -42,7 +54,7 @@ export class MessageEventPlus extends MessageEvent {
         }
         super(type);
         this.#data = data;
-        this.#originalTarget = originalTarget;
+        this.#target = target;
         this.#eventID = eventID;
         this.#live = live;
         this.#bubbles = bubbles;
@@ -56,7 +68,7 @@ export class MessageEventPlus extends MessageEvent {
             if (typeof eventID !== 'string') {
                 throw new TypeError('eventID must be a non-empty string');
             }
-            applyMutations.call(originalTarget, this.#data, this.#eventID, { honourDoneMutationFlags: this.#honourDoneMutationFlags });
+            applyMutations.call(target, this.#data, this.#eventID, { honourDoneMutationFlags: this.#honourDoneMutationFlags });
         }
     }
 

package/src/MessagePortPlus.js

@@ -1,8 +1,8 @@
 import { _wq as $wq } from '@webqit/util/js/index.js';
 import { _isObject, _isTypeObject } from '@webqit/util/js/index.js';
 import { MessageEventPlus } from './MessageEventPlus.js';
-import { Observer } from '@webqit/observer';
 import { WebSocketPort } from './WebSocketPort.js';
+import { Observer } from '@webqit/observer';
 
 export const _wq = (target, ...args) => $wq(target, 'port+', ...args);
 export const _meta = (target, ...args) => $wq(target, 'port+', 'meta', ...args);
@@ -211,7 +211,7 @@ export function MessagePortPlusMixin(superClass) {
                 }
 
                 const eventPlus = new MessageEventPlus(message, {
-                    originalTarget: port,
+                    target: port,
                     ...wqOptions,
                     ports: e.ports,
                 });
@@ -322,13 +322,19 @@ export function MessagePortPlusMixin(superClass) {
         }
 
         dispatchEvent(event) {
+            if (event instanceof MessageEventPlus) {
+                MessageEventPlus.setCurrentTarget(event, this);
+            }
+
             const returnValue = this._dispatchEvent
                 ? this._dispatchEvent(event)
                 : super.dispatchEvent(event);
+
             if (event instanceof MessageEventPlus) {
                 // Bubble semantics
                 propagateEvent.call(this, event);
             }
+
             return returnValue;
         }
 
@@ -681,13 +687,11 @@ export function propagateEvent(event) {
     if (event.propagationStopped) return;
     const portMeta = _meta(this);
 
-    if (portMeta.get('parentNode') instanceof EventTarget && (
+    if (portMeta.get('parentPort') instanceof EventTarget && (
         event.bubbles
-        || portMeta.get('parentNode')?.findPort?.((port) => port === this) && event instanceof MessageEventPlus)
+        || portMeta.get('parentPort')?.findPort?.((port) => port === this) && event instanceof MessageEventPlus)
     ) {
-        portMeta.get('parentNode').dispatchEvent(event);
-        // "parentNode" is typically a StarPort feature
-        // in case "this" is a RelayPort
+        portMeta.get('parentPort').dispatchEvent(event);
     }
 
     const downstreamRegistry = getDownstreamRegistry.call(this);

package/src/StarPort.js

@@ -7,6 +7,9 @@ import {
 
 export class StarPort extends MessagePortPlus {
 
+    #tags = new Map;
+    get tags() { return this.#tags; }
+
     #ports = new Set;
     #startCalled = false;
     #closeCalled = false;
@@ -20,6 +23,34 @@ export class StarPort extends MessagePortPlus {
         if (handshake === 0) this.start();
     }
 
+    #autoCloseX;
+    get autoCloseXPromise() { return this.#autoCloseX?.p; }
+
+    #autoCloseXPromises = new Set;
+    extendAutoClose(promise) {
+        const readyStateInternals = getReadyStateInternals.call(this);
+
+        if (readyStateInternals.close.state) {
+            throw new Error('Port lifecycle already complete.');
+        }
+
+        promise = Promise.resolve(promise);
+        this.#autoCloseXPromises.add(promise);
+        if (!this.#autoCloseX) {
+            let r;
+            const p = new Promise(res => (r = res));
+            this.#autoCloseX = { p, r };
+        }
+
+        return promise.finally(() => {
+            this.#autoCloseXPromises.delete(promise);
+            if (!this.#autoCloseXPromises.size) {
+                this.#autoCloseX.r();
+                this.#autoCloseX = null;
+            }
+        });
+    }
+
     addPort(portPlus, { enableBubbling = true } = {}) {
         if (!(portPlus instanceof MessagePortPlus)) {
             throw new TypeError('Port must be a WQMessagePort instance.');
@@ -38,10 +69,10 @@ export class StarPort extends MessagePortPlus {
         const portPlusMeta = _meta(portPlus);
 
         if (enableBubbling) {
-            if (portPlusMeta.get('parentNode')) {
+            if (portPlusMeta.get('parentPort')) {
                 throw new TypeError('Incoming port already has a parent node.');
             }
-            portPlusMeta.set('parentNode', this); // @ORDER: 2
+            portPlusMeta.set('parentPort', this); // @ORDER: 2
         }
 
         if (this.options.handshake) {
@@ -62,15 +93,21 @@ export class StarPort extends MessagePortPlus {
             this.#ports.delete(portPlus);
 
             if (enableBubbling
-                && portPlusMeta.get('parentNode') === this) {
-                portPlusMeta.set('parentNode', null);
+                && portPlusMeta.get('parentPort') === this) {
+                portPlusMeta.set('parentPort', null);
             }
 
-            if (this.#ports.size === 0
-                && _options(this).autoClose) {
-                readyStateInternals.close.state = true;
-                readyStateInternals.close.resolve(this);
-            }
+            const resolveClose = () => {
+                if (this.#ports.size === 0
+                    && _options(this).autoClose) {
+                    readyStateInternals.close.state = true;
+                    readyStateInternals.close.resolve(this);
+                }
+            };
+
+            if (this.#autoCloseX) {
+                this.#autoCloseX.p.finally(resolveClose);
+            } else resolveClose();
         };
 
         return cleanup;
@@ -113,6 +150,7 @@ export class StarPort extends MessagePortPlus {
         for (const portPlus of this.#ports) {
             portPlus.close(...args);
         }
+        this.#autoCloseX?.r();
 
         if (!this.options.handshake || !this.#ports.size) {
             const readyStateInternals = getReadyStateInternals.call(this);