@gjsify/webrtc 0.3.13 → 0.3.14

package/lib/esm/tee-multiplexer.js

@@ -1,62 +1,60 @@
 import { Gst } from "./gst-init.js";
-class TeeMultiplexer {
-  _tee;
-  // Gst.Element
-  _pipeline;
-  // Gst.Pipeline
-  _branchCount = 0;
-  /**
-   * Create a tee in the given pipeline and link it to the source's output.
-   * The source must already be in the pipeline.
-   */
-  constructor(pipeline, source) {
-    this._pipeline = pipeline;
-    this._tee = Gst.ElementFactory.make("tee", null);
-    this._tee.allow_not_linked = true;
-    pipeline.add(this._tee);
-    this._tee.sync_state_with_parent();
-    source.link(this._tee);
-  }
-  /** Request a new src pad from the tee for a consumer branch. */
-  requestSrcPad() {
-    const padName = "src_%u";
-    const srcPad = this._tee.request_pad_simple ? this._tee.request_pad_simple(padName) : this._tee.get_request_pad(padName);
-    if (srcPad) this._branchCount++;
-    return srcPad;
-  }
-  /**
-   * Release a branch's src pad from the tee.
-   * Adds a DROP probe before unlinking to prevent errors.
-   */
-  releaseSrcPad(srcPad) {
-    if (!srcPad) return;
-    try {
-      srcPad.add_probe(
-        Gst.PadProbeType.BLOCK_DOWNSTREAM,
-        () => Gst.PadProbeReturn.DROP
-      );
-    } catch {
-    }
-    try {
-      const peer = srcPad.get_peer();
-      if (peer) srcPad.unlink(peer);
-    } catch {
-    }
-    try {
-      this._tee.release_request_pad(srcPad);
-    } catch {
-    }
-    this._branchCount--;
-  }
-  /** Number of active branches. */
-  get branchCount() {
-    return this._branchCount;
-  }
-  /** The tee element (for pipeline queries). */
-  get element() {
-    return this._tee;
-  }
-}
-export {
-  TeeMultiplexer
+
+//#region src/tee-multiplexer.ts
+/**
+* Manages a GStreamer `tee` element that fans out one source to multiple
+* consumer branches. Each branch gets its own src pad from the tee.
+*/
+var TeeMultiplexer = class {
+	_tee;
+	_pipeline;
+	_branchCount = 0;
+	/**
+	* Create a tee in the given pipeline and link it to the source's output.
+	* The source must already be in the pipeline.
+	*/
+	constructor(pipeline, source) {
+		this._pipeline = pipeline;
+		this._tee = Gst.ElementFactory.make("tee", null);
+		this._tee.allow_not_linked = true;
+		pipeline.add(this._tee);
+		this._tee.sync_state_with_parent();
+		source.link(this._tee);
+	}
+	/** Request a new src pad from the tee for a consumer branch. */
+	requestSrcPad() {
+		const padName = "src_%u";
+		const srcPad = this._tee.request_pad_simple ? this._tee.request_pad_simple(padName) : this._tee.get_request_pad(padName);
+		if (srcPad) this._branchCount++;
+		return srcPad;
+	}
+	/**
+	* Release a branch's src pad from the tee.
+	* Adds a DROP probe before unlinking to prevent errors.
+	*/
+	releaseSrcPad(srcPad) {
+		if (!srcPad) return;
+		try {
+			srcPad.add_probe(Gst.PadProbeType.BLOCK_DOWNSTREAM, () => Gst.PadProbeReturn.DROP);
+		} catch {}
+		try {
+			const peer = srcPad.get_peer();
+			if (peer) srcPad.unlink(peer);
+		} catch {}
+		try {
+			this._tee.release_request_pad(srcPad);
+		} catch {}
+		this._branchCount--;
+	}
+	/** Number of active branches. */
+	get branchCount() {
+		return this._branchCount;
+	}
+	/** The tee element (for pipeline queries). */
+	get element() {
+		return this._tee;
+	}
 };
+
+//#endregion
+export { TeeMultiplexer };

package/lib/esm/wpt-helpers.js

@@ -1,122 +1,138 @@
-import {
-  RTCPeerConnection
-} from "./index.js";
+import { RTCPeerConnection } from "./rtc-peer-connection.js";
+import "./index.js";
+
+//#region src/wpt-helpers.ts
+/** Mirror WPT's `createPeerConnectionWithCleanup` — returns a fresh pc. */
 function createPeerConnection() {
-  return new RTCPeerConnection();
+	return new RTCPeerConnection();
 }
+/**
+* Mirror WPT's `exchangeOfferAnswer(pc1, pc2)` + `exchangeIceCandidates`.
+* Runs the full handshake to completion.
+*/
 async function exchangeOfferAnswer(pc1, pc2) {
-  pc1.onicecandidate = (ev) => {
-    if (ev.candidate) pc2.addIceCandidate(ev.candidate.toJSON()).catch(() => {
-    });
-  };
-  pc2.onicecandidate = (ev) => {
-    if (ev.candidate) pc1.addIceCandidate(ev.candidate.toJSON()).catch(() => {
-    });
-  };
-  const offer = await pc1.createOffer();
-  await pc1.setLocalDescription(offer);
-  await pc2.setRemoteDescription(offer);
-  const answer = await pc2.createAnswer();
-  await pc2.setLocalDescription(answer);
-  await pc1.setRemoteDescription(answer);
+	pc1.onicecandidate = (ev) => {
+		if (ev.candidate) pc2.addIceCandidate(ev.candidate.toJSON()).catch(() => {});
+	};
+	pc2.onicecandidate = (ev) => {
+		if (ev.candidate) pc1.addIceCandidate(ev.candidate.toJSON()).catch(() => {});
+	};
+	const offer = await pc1.createOffer();
+	await pc1.setLocalDescription(offer);
+	await pc2.setRemoteDescription(offer);
+	const answer = await pc2.createAnswer();
+	await pc2.setLocalDescription(answer);
+	await pc1.setRemoteDescription(answer);
 }
+/**
+* Port of WPT `createDataChannelPair(t, options, pc1, pc2)` — returns
+* `[dc1, dc2]` both in `'open'` state, handshake complete. If `options.negotiated`
+* both sides pre-create the channel with matching id; otherwise pc1 creates
+* and pc2 receives via `ondatachannel`.
+*/
 async function createDataChannelPair(options = {}, pc1 = createPeerConnection(), pc2 = createPeerConnection(), label = "wpt") {
-  let pair;
-  let bothOpen;
-  if (options.negotiated) {
-    const dc1 = pc1.createDataChannel(label, options);
-    const dc2 = pc2.createDataChannel(label, options);
-    pair = [dc1, dc2];
-    bothOpen = Promise.all(pair.map((dc) => new Promise((res, rej) => {
-      if (dc.readyState === "open") return res();
-      dc.onopen = () => res();
-      dc.onerror = (ev) => rej(ev?.error ?? new Error("onerror"));
-    })));
-  } else {
-    const dc1 = pc1.createDataChannel(label, options);
-    bothOpen = Promise.all([
-      new Promise((res, rej) => {
-        if (dc1.readyState === "open") return res();
-        dc1.onopen = () => res();
-        dc1.onerror = (ev) => rej(ev?.error ?? new Error("onerror"));
-      }),
-      new Promise((res, rej) => {
-        pc2.ondatachannel = (ev) => {
-          const dc2 = ev.channel;
-          if (dc2.readyState === "open") return res(dc2);
-          dc2.onopen = () => res(dc2);
-          dc2.onerror = (e) => rej(e?.error ?? new Error("onerror"));
-        };
-      }).then((dc2) => {
-        pair[1] = dc2;
-      })
-    ]);
-    pair = [dc1, void 0];
-  }
-  await exchangeOfferAnswer(pc1, pc2);
-  await bothOpen;
-  return [pair[0], pair[1], pc1, pc2];
+	let pair;
+	let bothOpen;
+	if (options.negotiated) {
+		const dc1 = pc1.createDataChannel(label, options);
+		const dc2 = pc2.createDataChannel(label, options);
+		pair = [dc1, dc2];
+		bothOpen = Promise.all(pair.map((dc) => new Promise((res, rej) => {
+			if (dc.readyState === "open") return res();
+			dc.onopen = () => res();
+			dc.onerror = (ev) => rej(ev?.error ?? new Error("onerror"));
+		})));
+	} else {
+		const dc1 = pc1.createDataChannel(label, options);
+		bothOpen = Promise.all([new Promise((res, rej) => {
+			if (dc1.readyState === "open") return res();
+			dc1.onopen = () => res();
+			dc1.onerror = (ev) => rej(ev?.error ?? new Error("onerror"));
+		}), new Promise((res, rej) => {
+			pc2.ondatachannel = (ev) => {
+				const dc2 = ev.channel;
+				if (dc2.readyState === "open") return res(dc2);
+				dc2.onopen = () => res(dc2);
+				dc2.onerror = (e) => rej(e?.error ?? new Error("onerror"));
+			};
+		}).then((dc2) => {
+			pair[1] = dc2;
+		})]);
+		pair = [dc1, undefined];
+	}
+	await exchangeOfferAnswer(pc1, pc2);
+	await bothOpen;
+	return [
+		pair[0],
+		pair[1],
+		pc1,
+		pc2
+	];
 }
+/** Port of WPT `awaitMessage(channel)` — resolves with the next incoming data. */
 function awaitMessage(channel) {
-  return new Promise((resolve, reject) => {
-    const messageHandler = (ev) => {
-      channel.removeEventListener("message", messageHandler);
-      channel.removeEventListener("error", errorHandler);
-      resolve(ev.data);
-    };
-    const errorHandler = (ev) => {
-      channel.removeEventListener("message", messageHandler);
-      channel.removeEventListener("error", errorHandler);
-      reject(ev?.error ?? new Error("channel error"));
-    };
-    channel.addEventListener("message", messageHandler);
-    channel.addEventListener("error", errorHandler);
-  });
-}
-class EventWatcher {
-  _events = [];
-  _waiters = [];
-  constructor(target, eventTypes) {
-    for (const type of eventTypes) {
-      target.addEventListener(type, () => {
-        this._events.push(type);
-        this._tryResolve();
-      });
-    }
-  }
-  wait_for(expected) {
-    const types = Array.isArray(expected) ? expected : [expected];
-    return new Promise((resolve, reject) => {
-      this._waiters.push({ types, resolve, reject });
-      this._tryResolve();
-    });
-  }
-  _tryResolve() {
-    while (this._waiters.length > 0 && this._events.length >= this._waiters[0].types.length) {
-      const waiter = this._waiters.shift();
-      const got = this._events.splice(0, waiter.types.length);
-      const matches = waiter.types.every((t, i) => got[i] === t);
-      if (matches) {
-        waiter.resolve();
-      } else {
-        waiter.reject(new Error(`EventWatcher: expected ${JSON.stringify(waiter.types)}, got ${JSON.stringify(got)}`));
-      }
-    }
-  }
+	return new Promise((resolve, reject) => {
+		const messageHandler = (ev) => {
+			channel.removeEventListener("message", messageHandler);
+			channel.removeEventListener("error", errorHandler);
+			resolve(ev.data);
+		};
+		const errorHandler = (ev) => {
+			channel.removeEventListener("message", messageHandler);
+			channel.removeEventListener("error", errorHandler);
+			reject(ev?.error ?? new Error("channel error"));
+		};
+		channel.addEventListener("message", messageHandler);
+		channel.addEventListener("error", errorHandler);
+	});
 }
+/**
+* Mirror WPT's `EventWatcher(t, target, events)` — accumulates events in
+* order and returns `wait_for(types)` that matches the expected sequence.
+*/
+var EventWatcher = class {
+	_events = [];
+	_waiters = [];
+	constructor(target, eventTypes) {
+		for (const type of eventTypes) {
+			target.addEventListener(type, () => {
+				this._events.push(type);
+				this._tryResolve();
+			});
+		}
+	}
+	wait_for(expected) {
+		const types = Array.isArray(expected) ? expected : [expected];
+		return new Promise((resolve, reject) => {
+			this._waiters.push({
+				types,
+				resolve,
+				reject
+			});
+			this._tryResolve();
+		});
+	}
+	_tryResolve() {
+		while (this._waiters.length > 0 && this._events.length >= this._waiters[0].types.length) {
+			const waiter = this._waiters.shift();
+			const got = this._events.splice(0, waiter.types.length);
+			const matches = waiter.types.every((t, i) => got[i] === t);
+			if (matches) {
+				waiter.resolve();
+			} else {
+				waiter.reject(new Error(`EventWatcher: expected ${JSON.stringify(waiter.types)}, got ${JSON.stringify(got)}`));
+			}
+		}
+	}
+};
+/** Close an array of RTCPeerConnection instances, ignoring errors. */
 function closePeerConnections(...pcs) {
-  for (const pc of pcs) {
-    try {
-      pc?.close();
-    } catch {
-    }
-  }
+	for (const pc of pcs) {
+		try {
+			pc?.close();
+		} catch {}
+	}
 }
-export {
-  EventWatcher,
-  awaitMessage,
-  closePeerConnections,
-  createDataChannelPair,
-  createPeerConnection,
-  exchangeOfferAnswer
-};
+
+//#endregion
+export { EventWatcher, awaitMessage, closePeerConnections, createDataChannelPair, createPeerConnection, exchangeOfferAnswer };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gjsify/webrtc",
-  "version": "0.3.13",
+  "version": "0.3.14",
   "description": "W3C WebRTC API for GJS using GStreamer webrtcbin as the peer-connection backend",
   "type": "module",
   "module": "lib/esm/index.js",
@@ -55,20 +55,20 @@
     "peer-connection"
   ],
   "dependencies": {
-    "@gjsify/buffer": "^0.3.13",
-    "@gjsify/dom-events": "^0.3.13",
-    "@gjsify/dom-exception": "^0.3.13",
-    "@gjsify/webrtc-native": "^0.3.13"
+    "@gjsify/buffer": "^0.3.14",
+    "@gjsify/dom-events": "^0.3.14",
+    "@gjsify/dom-exception": "^0.3.14",
+    "@gjsify/webrtc-native": "^0.3.14"
   },
   "devDependencies": {
-    "@girs/gjs": "^4.0.0-rc.9",
-    "@girs/glib-2.0": "^2.88.0-4.0.0-rc.9",
-    "@girs/gobject-2.0": "^2.88.0-4.0.0-rc.9",
-    "@girs/gst-1.0": "^1.28.1-4.0.0-rc.9",
-    "@girs/gstsdp-1.0": "^1.0.0-4.0.0-rc.9",
-    "@girs/gstwebrtc-1.0": "^1.0.0-4.0.0-rc.9",
-    "@gjsify/cli": "^0.3.13",
-    "@gjsify/unit": "^0.3.13",
+    "@girs/gjs": "4.0.0-rc.9",
+    "@girs/glib-2.0": "2.88.0-4.0.0-rc.9",
+    "@girs/gobject-2.0": "2.88.0-4.0.0-rc.9",
+    "@girs/gst-1.0": "1.28.1-4.0.0-rc.9",
+    "@girs/gstsdp-1.0": "1.0.0-4.0.0-rc.9",
+    "@girs/gstwebrtc-1.0": "1.0.0-4.0.0-rc.9",
+    "@gjsify/cli": "^0.3.14",
+    "@gjsify/unit": "^0.3.14",
     "@types/node": "^25.6.0",
     "typescript": "^6.0.3"
   }