@statewalker/webrun-streams-webrtc 0.4.0 → 0.4.1

package/dist/index.js

@@ -333,7 +333,8 @@ const claimed = /* @__PURE__ */ new WeakSet();
 * ```
 *
 * Messages that arrive before a port's first listener are held for it and delivered after that
-* tick, to every listener added by then.
+* tick, to every listener added by then. Messages posted before a port's channel opens are queued
+* and sent, in order, when it opens.
 */
 async function webrtcPortMux(options) {
 	const { pc, codec, onPort } = options;
@@ -376,9 +377,26 @@ async function webrtcPortMux(options) {
 			if (held) held.push(data);
 			else deliver(data);
 		};
+		let queued = dc.readyState === "connecting" ? [] : void 0;
+		const send = (bytes) => {
+			try {
+				dc.send(bytes);
+			} catch (err) {
+				end(err instanceof Error ? err : new Error(String(err)));
+			}
+		};
+		const onOpen = () => {
+			const pending = queued;
+			queued = void 0;
+			for (const bytes of pending ?? []) {
+				if (closeSignal.aborted) return;
+				send(bytes);
+			}
+		};
 		const onClose = () => end(/* @__PURE__ */ new Error("webrun-streams-webrtc: the data channel closed"));
 		const onError = (ev) => end(/* @__PURE__ */ new Error(`webrun-streams-webrtc: the data channel failed: ${ev.error?.message ?? "unknown"}`));
 		dc.addEventListener("message", onMessage);
+		dc.addEventListener("open", onOpen);
 		dc.addEventListener("close", onClose);
 		dc.addEventListener("error", onError);
 		if (dc.readyState === "closing" || dc.readyState === "closed") onClose();
@@ -386,6 +404,8 @@ async function webrtcPortMux(options) {
 		const cleanUp = () => {
 			live.delete(port);
 			dc.removeEventListener("message", onMessage);
+			dc.removeEventListener("open", onOpen);
+			queued = void 0;
 			listeners.clear();
 			held = void 0;
 			if (dc.readyState !== "closed") dc.close();
@@ -408,18 +428,16 @@ async function webrtcPortMux(options) {
 				});
 			},
 			postMessage(message) {
-				if (closeSignal.aborted || dc.readyState !== "open") return;
+				if (closeSignal.aborted) return;
+				if (!queued && dc.readyState !== "open") return;
 				const bytes = codec.encode(message);
 				if (bytes.byteLength > maxFrameBytes) {
 					const err = /* @__PURE__ */ new RangeError(`webrun-streams-webrtc: a ${bytes.byteLength}-byte message exceeds maxFrameBytes (${maxFrameBytes})`);
 					end(err);
 					throw err;
 				}
-				try {
-					dc.send(bytes);
-				} catch (err) {
-					end(err instanceof Error ? err : new Error(String(err)));
-				}
+				if (queued) queued.push(bytes);
+				else send(bytes);
 			},
 			addEventListener(_type, listener) {
 				listeners.add(listener);

package/dist/port-mux.d.ts

@@ -67,7 +67,8 @@ export interface WebRtcPortMux {
  * ```
  *
  * Messages that arrive before a port's first listener are held for it and delivered after that
- * tick, to every listener added by then.
+ * tick, to every listener added by then. Messages posted before a port's channel opens are queued
+ * and sent, in order, when it opens.
  */
 export declare function webrtcPortMux(options: WebRtcPortMuxOptions): Promise<WebRtcPortMux>;
 export {};

package/dist/port-mux.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"port-mux.d.ts","sourceRoot":"","sources":["../src/port-mux.ts"],"names":[],"mappings":"AAAA,yFAAyF;AACzF,eAAO,MAAM,iBAAiB,iBAAiB,CAAC;AAEhD;;;GAGG;AACH,eAAO,MAAM,4BAA4B,QAAY,CAAC;AAEtD,sHAAsH;AACtH,eAAO,MAAM,6BAA6B,QAAqC,CAAC;AAEhF,kFAAkF;AAClF,eAAO,MAAM,oBAAoB,QAAa,CAAC;AAE/C;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB,MAAM,CAAC,KAAK,EAAE,OAAO,GAAG,UAAU,CAAC;IACnC,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC;CACpC;AAED,KAAK,QAAQ,GAAG,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAE9D,4FAA4F;AAC5F,MAAM,WAAW,eAAe;IAC9B,gBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC5D,mBAAmB,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC/D,+EAA+E;IAC/E,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IACpC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,gGAAgG;IAChG,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;CACnC;AAED,MAAM,WAAW,oBAAoB;IACnC,wFAAwF;IACxF,EAAE,EAAE,iBAAiB,CAAC;IACtB,kDAAkD;IAClD,KAAK,EAAE,UAAU,CAAC;IAClB;;;;OAIG;IACH,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,eAAe,KAAK,OAAO,GAAG,SAAS,CAAC;IACxD,mFAAmF;IACnF,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oDAAoD;IACpD,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,+EAA+E;AAC/E,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;IACvF,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;CACjC;AAMD;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,aAAa,CAAC,CA6MzF"}
+{"version":3,"file":"port-mux.d.ts","sourceRoot":"","sources":["../src/port-mux.ts"],"names":[],"mappings":"AAAA,yFAAyF;AACzF,eAAO,MAAM,iBAAiB,iBAAiB,CAAC;AAEhD;;;GAGG;AACH,eAAO,MAAM,4BAA4B,QAAY,CAAC;AAEtD,sHAAsH;AACtH,eAAO,MAAM,6BAA6B,QAAqC,CAAC;AAEhF,kFAAkF;AAClF,eAAO,MAAM,oBAAoB,QAAa,CAAC;AAE/C;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB,MAAM,CAAC,KAAK,EAAE,OAAO,GAAG,UAAU,CAAC;IACnC,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC;CACpC;AAED,KAAK,QAAQ,GAAG,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAE9D,4FAA4F;AAC5F,MAAM,WAAW,eAAe;IAC9B,gBAAgB,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC5D,mBAAmB,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC/D,+EAA+E;IAC/E,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IACpC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,gGAAgG;IAChG,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;CACnC;AAED,MAAM,WAAW,oBAAoB;IACnC,wFAAwF;IACxF,EAAE,EAAE,iBAAiB,CAAC;IACtB,kDAAkD;IAClD,KAAK,EAAE,UAAU,CAAC;IAClB;;;;OAIG;IACH,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,eAAe,KAAK,OAAO,GAAG,SAAS,CAAC;IACxD,mFAAmF;IACnF,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oDAAoD;IACpD,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,+EAA+E;AAC/E,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;IACvF,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;CACjC;AAMD;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,aAAa,CAAC,CAkOzF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@statewalker/webrun-streams-webrtc",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "private": false,
   "type": "module",
   "description": "WebRTC DataChannel-backed Connect/Serve adapter (native multi-stream) in the webrun-streams-* family",
@@ -43,8 +43,8 @@
     "typescript": "^7.0.2",
     "vitest": "^5.0.5",
     "@statewalker/webrun-msgpack": "^0.11.0",
-    "@statewalker/webrun-rpc": "^0.12.0",
-    "@statewalker/webrun-streams-conformance": "^0.5.0"
+    "@statewalker/webrun-streams-conformance": "^0.5.0",
+    "@statewalker/webrun-rpc": "^0.12.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/src/port-mux.ts

@@ -78,7 +78,8 @@ const claimed = new WeakSet<RTCDataChannel>();
  * ```
  *
  * Messages that arrive before a port's first listener are held for it and delivered after that
- * tick, to every listener added by then.
+ * tick, to every listener added by then. Messages posted before a port's channel opens are queued
+ * and sent, in order, when it opens.
  */
 export async function webrtcPortMux(options: WebRtcPortMuxOptions): Promise<WebRtcPortMux> {
   const { pc, codec, onPort } = options;
@@ -132,6 +133,26 @@ export async function webrtcPortMux(options: WebRtcPortMuxOptions): Promise<WebR
       if (held) held.push(data);
       else deliver(data);
     };
+    // Posts made while the channel is still connecting, sent in order when it opens, as a
+    // MessagePort queues them (statewalker/statewalker-root#57). `undefined` once the channel has
+    // opened, or when it was open already.
+    let queued: Uint8Array[] | undefined = dc.readyState === "connecting" ? [] : undefined;
+    const send = (bytes: Uint8Array) => {
+      try {
+        dc.send(bytes as Uint8Array<ArrayBuffer>);
+      } catch (err) {
+        // a send queue full, or a channel closing meanwhile: the port is broken
+        end(err instanceof Error ? err : new Error(String(err)));
+      }
+    };
+    const onOpen = () => {
+      const pending = queued;
+      queued = undefined;
+      for (const bytes of pending ?? []) {
+        if (closeSignal.aborted) return;
+        send(bytes);
+      }
+    };
     const onClose = () => end(new Error("webrun-streams-webrtc: the data channel closed"));
     const onError = (ev: Event) =>
       end(
@@ -140,6 +161,7 @@ export async function webrtcPortMux(options: WebRtcPortMuxOptions): Promise<WebR
         ),
       );
     dc.addEventListener("message", onMessage);
+    dc.addEventListener("open", onOpen);
     dc.addEventListener("close", onClose);
     dc.addEventListener("error", onError);
     if (dc.readyState === "closing" || dc.readyState === "closed") onClose();
@@ -147,6 +169,8 @@ export async function webrtcPortMux(options: WebRtcPortMuxOptions): Promise<WebR
     const cleanUp = () => {
       live.delete(port);
       dc.removeEventListener("message", onMessage);
+      dc.removeEventListener("open", onOpen);
+      queued = undefined;
       listeners.clear();
       held = undefined;
       if (dc.readyState !== "closed") dc.close();
@@ -170,7 +194,9 @@ export async function webrtcPortMux(options: WebRtcPortMuxOptions): Promise<WebR
         });
       },
       postMessage(message) {
-        if (closeSignal.aborted || dc.readyState !== "open") return; // `closeSignal` says so
+        if (closeSignal.aborted) return; // `closeSignal` says so
+        // a channel closing or closed: its close event aborts `closeSignal`
+        if (!queued && dc.readyState !== "open") return;
         const bytes = codec.encode(message);
         if (bytes.byteLength > maxFrameBytes) {
           const err = new RangeError(
@@ -179,12 +205,8 @@ export async function webrtcPortMux(options: WebRtcPortMuxOptions): Promise<WebR
           end(err);
           throw err;
         }
-        try {
-          dc.send(bytes as Uint8Array<ArrayBuffer>);
-        } catch (err) {
-          // a send queue full, or a channel closing meanwhile: the port is broken
-          end(err instanceof Error ? err : new Error(String(err)));
-        }
+        if (queued) queued.push(bytes);
+        else send(bytes);
       },
       addEventListener(_type, listener) {
         listeners.add(listener);