osra 0.3.1 → 0.3.3

package/build/index.js

@@ -27,20 +27,23 @@ var e = Object.defineProperty, t = (t, n) => {
 	let t = a[e];
 	if (!t) throw Error("Unknown typed array type");
 	return t;
-}, l = (e) => o.some((t) => e instanceof t), u = (e) => e instanceof WebSocket, d = (e) => !!globalThis.ServiceWorkerContainer && e instanceof ServiceWorkerContainer, f = (e) => !!globalThis.Worker && e instanceof Worker, p = (e) => !!globalThis.DedicatedWorkerGlobalScope && e instanceof DedicatedWorkerGlobalScope, m = (e) => !!globalThis.SharedWorker && e instanceof SharedWorker, h = (e) => e instanceof MessagePort, ee = (e) => !!e && typeof e == "object" && "__OSRA_KEY__" in e && !!e.__OSRA_KEY__, g = (e, t) => {
+}, l = (e) => o.some((t) => e instanceof t), u = (e) => e instanceof WebSocket, d = (e) => !!globalThis.ServiceWorkerContainer && e instanceof ServiceWorkerContainer, f = (e) => !!globalThis.Worker && e instanceof Worker, p = (e) => !!globalThis.DedicatedWorkerGlobalScope && e instanceof DedicatedWorkerGlobalScope, m = (e) => !!globalThis.SharedWorker && e instanceof SharedWorker, h = (e) => e instanceof MessagePort, g = (e) => !!e && typeof e == "object" && "__OSRA_KEY__" in e && !!e.__OSRA_KEY__, _ = (e, t) => {
 	for (let n of t) if (n && e instanceof n) return !0;
 	return !1;
-}, _ = (e) => g(e, [globalThis.SharedArrayBuffer]), v = (e) => g(e, [
+}, v = (e) => _(e, [globalThis.SharedArrayBuffer]), y = (e) => _(e, [
 	globalThis.ArrayBuffer,
 	globalThis.MessagePort,
 	globalThis.ReadableStream,
 	globalThis.WritableStream,
 	globalThis.TransformStream,
 	globalThis.ImageBitmap
-]), y = (e) => {
-	let t = se();
+]), b = (e) => {
+	let t = A();
 	return t ? e === t : !1;
-}, b = (e, t = !1) => !e || typeof e != "object" || C(e) || !("name" in e) || !("disconnect" in e) || !("postMessage" in e) ? !1 : t ? "sender" in e && "onMessage" in e && "onDisconnect" in e : !0, te = (e) => !!e && typeof e == "object" && !C(e) && "addListener" in e && "hasListener" in e && "removeListener" in e, x = (e) => te(e), S = (e) => te(e), C = (e) => {
+}, x = (e, t = !1) => !e || typeof e != "object" || w(e) || !("name" in e) || !("disconnect" in e) || !("postMessage" in e) ? !1 : t ? "sender" in e && "onMessage" in e && "onDisconnect" in e : !0, ee = (e) => !!e && typeof e == "object" && !w(e) && "addListener" in e && "hasListener" in e && "removeListener" in e, S = (e) => {
+	let t = A();
+	return t ? e === t.onConnect || e === t.onConnectExternal : !1;
+}, C = (e) => ee(e), w = (e) => {
 	if (!e || typeof e != "object") return !1;
 	try {
 		return "window" in e && e.window === e;
@@ -51,23 +54,23 @@ var e = Object.defineProperty, t = (t, n) => {
 			return !1;
 		}
 	}
-}, w = (e) => u(e) || b(e) || y(e), T = (e) => u(e) || b(e) || x(e) || S(e) || y(e), E = (e) => !!e && typeof e == "object" && "isJson" in e && e.isJson === !0 || w(e) || T(e), D = (e) => C(e) || w(e) || d(e) || f(e) || p(e) || m(e) || h(e) || ie(e);
+}, T = (e) => u(e) || x(e) || b(e), te = (e) => u(e) || x(e) || S(e) || C(e) || b(e), E = (e) => !!e && typeof e == "object" && "isJson" in e && e.isJson === !0 || T(e) || te(e), D = (e) => w(e) || T(e) || d(e) || f(e) || p(e) || m(e) || h(e) || ie(e);
 function ne(e) {
 	if (!D(e)) throw Error("Transport is not emitable");
 }
-var O = (e) => C(e) || T(e) || d(e) || f(e) || p(e) || m(e) || h(e) || k(e);
+var O = (e) => w(e) || te(e) || d(e) || f(e) || p(e) || m(e) || h(e) || ae(e);
 function re(e) {
 	if (!O(e)) throw Error("Transport is not receiveable");
 }
-var ie = (e) => !e || typeof e != "object" || C(e) || !("emit" in e) ? !1 : D(e.emit) || typeof e.emit == "function", k = (e) => !e || typeof e != "object" || C(e) || !("receive" in e) ? !1 : O(e.receive) || typeof e.receive == "function", A = (e) => ie(e) || k(e), ae = (e) => D(e) || O(e) || A(e) || E(e), oe = () => globalThis.browser ?? globalThis.chrome, se = () => oe()?.runtime, j = (e, t) => ee(e) && e.__OSRA_KEY__ === t, M = (e, t) => e?.addEventListener("abort", t, { once: !0 }), ce = ({ listener: e, transport: t, remoteName: r, key: i = n, unregisterSignal: a }) => {
-	let o = A(t) ? t.receive : t;
+var ie = (e) => !e || typeof e != "object" || w(e) || !("emit" in e) ? !1 : D(e.emit) || typeof e.emit == "function", ae = (e) => !e || typeof e != "object" || w(e) || !("receive" in e) ? !1 : O(e.receive) || typeof e.receive == "function", k = (e) => ie(e) || ae(e), oe = (e) => D(e) || O(e) || k(e) || E(e), se = () => globalThis.browser ?? globalThis.chrome, A = () => se()?.runtime, j = (e, t) => g(e) && e.__OSRA_KEY__ === t, M = (e, t) => e?.addEventListener("abort", t, { once: !0 }), ce = ({ listener: e, transport: t, remoteName: r, key: i = n, unregisterSignal: a }) => {
+	let o = k(t) ? t.receive : t;
 	if (typeof o == "function") {
 		o((t, n) => {
 			j(t, i) && (r && t.name !== r || e(t, n));
 		});
 		return;
 	}
-	if (y(o) || b(o) || x(o) || S(o)) {
+	if (b(o) || x(o) || S(o) || C(o)) {
 		let t = (t, n) => {
 			let o = (t, a) => {
 				j(t, i) && (r && t.name !== r || e(t, {
@@ -77,11 +80,11 @@ var ie = (e) => !e || typeof e != "object" || C(e) || !("emit" in e) ? !1 : D(e.
 			};
 			t.addListener(o), M(a, () => t.removeListener(o));
 		};
-		if (y(o)) t(o.onMessage);
-		else if (x(o)) {
+		if (b(o)) t(o.onMessage);
+		else if (S(o)) {
 			let e = (e) => t(e.onMessage, e);
 			o.addListener(e), M(a, () => o.removeListener(e));
-		} else S(o) ? t(o) : t(o.onMessage);
+		} else C(o) ? t(o) : t(o.onMessage);
 		return;
 	}
 	let s = (t) => {
@@ -92,56 +95,56 @@ var ie = (e) => !e || typeof e != "object" || C(e) || !("emit" in e) ? !1 : D(e.
 	};
 	o.addEventListener("message", s), M(a, () => o.removeEventListener("message", s));
 }, le = (e, t, n = "*", r = []) => {
-	let i = A(e) ? e.emit : e;
-	typeof i == "function" ? i(t, r) : C(i) ? i.postMessage(t, n, r) : b(i) ? i.postMessage(t) : y(i) ? i.sendMessage(t) : u(i) ? i.send(JSON.stringify(t)) : m(i) ? i.port.postMessage(t, r) : i.postMessage(t, r);
-}, N = { [i]: "revivable" }, P = (e) => !!e && typeof e == "object" && "__OSRA_BOX__" in e && e.__OSRA_BOX__ === "revivable", F = (e) => e instanceof Error ? e.stack ?? String(e) : String(e), ue = (e, t) => E(t.transport) ? { base64Buffer: new Uint8Array(e).toBase64() } : { arrayBuffer: e }, de = (e) => "arrayBuffer" in e ? e.arrayBuffer : Uint8Array.fromBase64(e.base64Buffer).buffer, fe = /* @__PURE__ */ t({
-	box: () => he,
-	isType: () => me,
-	revive: () => ge,
-	type: () => pe
-}), pe = "arrayBuffer", me = (e) => e instanceof ArrayBuffer, he = (e, t) => ({
+	let i = k(e) ? e.emit : e;
+	typeof i == "function" ? i(t, r) : w(i) ? i.postMessage(t, n, r) : x(i) ? i.postMessage(t) : b(i) ? i.sendMessage(t) : u(i) ? i.send(JSON.stringify(t)) : m(i) ? i.port.postMessage(t, r) : i.postMessage(t, r);
+}, N = { [i]: "revivable" }, P = (e) => !!e && typeof e == "object" && "__OSRA_BOX__" in e && e.__OSRA_BOX__ === "revivable", F = (e) => e instanceof Error ? e.stack ?? String(e) : String(e), I = (e, t) => E(t.transport) ? { base64Buffer: new Uint8Array(e).toBase64() } : { arrayBuffer: e }, L = (e) => "arrayBuffer" in e ? e.arrayBuffer : Uint8Array.fromBase64(e.base64Buffer).buffer, ue = /* @__PURE__ */ t({
+	box: () => pe,
+	isType: () => fe,
+	revive: () => me,
+	type: () => de
+}), de = "arrayBuffer", fe = (e) => e instanceof ArrayBuffer, pe = (e, t) => ({
 	...N,
-	type: pe,
-	...ue(e, t)
-}), ge = (e, t) => de(e), _e = /* @__PURE__ */ t({
-	box: () => be,
-	isType: () => ye,
-	revive: () => xe,
-	type: () => ve
-}), ve = "date", ye = (e) => e instanceof Date, be = (e, t) => ({
+	type: de,
+	...I(e, t)
+}), me = (e, t) => L(e), he = /* @__PURE__ */ t({
+	box: () => ve,
+	isType: () => _e,
+	revive: () => ye,
+	type: () => ge
+}), ge = "date", _e = (e) => e instanceof Date, ve = (e, t) => ({
 	...N,
-	type: ve,
+	type: ge,
 	ISOString: e.toISOString()
-}), xe = (e, t) => new Date(e.ISOString), Se = /* @__PURE__ */ t({
-	box: () => Te,
-	isType: () => we,
-	revive: () => I,
-	type: () => Ce
-}), Ce = "headers", we = (e) => e instanceof Headers, Te = (e, t) => ({
+}), ye = (e, t) => new Date(e.ISOString), be = /* @__PURE__ */ t({
+	box: () => R,
+	isType: () => Se,
+	revive: () => z,
+	type: () => xe
+}), xe = "headers", Se = (e) => e instanceof Headers, R = (e, t) => ({
 	...N,
-	type: Ce,
+	type: xe,
 	entries: [...e.entries()]
-}), I = (e, t) => new Headers(e.entries), Ee = /* @__PURE__ */ t({
-	box: () => ke,
-	isType: () => Oe,
-	revive: () => Ae,
-	type: () => De
-}), De = "error", Oe = (e) => e instanceof Error, ke = (e, t) => ({
+}), z = (e, t) => new Headers(e.entries), Ce = /* @__PURE__ */ t({
+	box: () => Ee,
+	isType: () => Te,
+	revive: () => De,
+	type: () => we
+}), we = "error", Te = (e) => e instanceof Error, Ee = (e, t) => ({
 	...N,
-	type: De,
+	type: we,
 	message: e.message,
 	stack: e.stack || e.toString()
-}), Ae = (e, t) => Error(e.message, { cause: e.stack }), je = /* @__PURE__ */ t({
-	box: () => Pe,
-	isType: () => Ne,
-	revive: () => Fe,
-	type: () => Me
-}), Me = "typedArray", Ne = l, Pe = (e, t) => ({
+}), De = (e, t) => Error(e.message, { cause: e.stack }), Oe = /* @__PURE__ */ t({
+	box: () => je,
+	isType: () => Ae,
+	revive: () => Me,
+	type: () => ke
+}), ke = "typedArray", Ae = l, je = (e, t) => ({
 	...N,
-	type: Me,
+	type: ke,
 	typedArrayType: s(e),
-	...ue(e.buffer, t)
-}), Fe = (e, t) => new (c(e.typedArrayType))(de(e)), L = class extends EventTarget {
+	...I(e.buffer, t)
+}), Me = (e, t) => new (c(e.typedArrayType))(L(e)), B = class extends EventTarget {
 	addEventListener(e, t, n) {
 		super.addEventListener(e, t, n);
 	}
@@ -181,40 +184,40 @@ var ie = (e) => !e || typeof e != "object" || C(e) || !("emit" in e) ? !1 : D(e.
 	close() {
 		this._closed || (this._closed = !0, this._queue.length = 0, this._onClose?.());
 	}
-}, R = class {
+}, V = class {
 	port1;
 	port2;
 	constructor() {
-		let e = new L(), t = new L();
+		let e = new B(), t = new B();
 		e._peer = t, t._peer = e, this.port1 = e, this.port2 = t;
 	}
-}, Ie = /* @__PURE__ */ t({
-	box: () => V,
-	createRevivableChannel: () => U,
-	init: () => ze,
-	isType: () => Be,
-	revive: () => H,
-	type: () => B
-}), z = new FinalizationRegistry((e) => {
+}, Ne = /* @__PURE__ */ t({
+	box: () => W,
+	createRevivableChannel: () => K,
+	init: () => Ie,
+	isType: () => Le,
+	revive: () => G,
+	type: () => U
+}), H = new FinalizationRegistry((e) => {
 	e.sendMessage({
 		type: "message-port-close",
 		remoteUuid: e.remoteUuid,
 		portId: e.portId
 	}), e.cleanup();
-}), B = "messagePort", Le = /* @__PURE__ */ new WeakMap(), Re = (e) => {
-	let t = Le.get(e);
+}), U = "messagePort", Pe = /* @__PURE__ */ new WeakMap(), Fe = (e) => {
+	let t = Pe.get(e);
 	if (!t) throw Error("osra message-port: connection state missing; did init() run?");
 	return t;
-}, ze = (e) => {
+}, Ie = (e) => {
 	let t = { portHandlers: /* @__PURE__ */ new Map() };
-	Le.set(e, t), e.eventTarget.addEventListener("message", ({ detail: e }) => {
+	Pe.set(e, t), e.eventTarget.addEventListener("message", ({ detail: e }) => {
 		e.type !== "message" && e.type !== "message-port-close" || t.portHandlers.get(e.portId)?.(e);
 	});
-}, Be = (e) => e instanceof MessagePort || e instanceof L, V = (e, t, n) => {
-	let r = e instanceof L;
+}, Le = (e) => e instanceof MessagePort || e instanceof B, W = (e, t, n) => {
+	let r = e instanceof B;
 	if (r || E(t.transport)) {
-		let { portHandlers: n } = Re(t), i = e, a = globalThis.crypto.randomUUID(), o = !1, s = () => {
-			o || (o = !0, n.delete(a), z.unregister(i), i.removeEventListener("message", l));
+		let { portHandlers: n } = Fe(t), i = e, a = globalThis.crypto.randomUUID(), o = !1, s = () => {
+			o || (o = !0, n.delete(a), H.unregister(i), i.removeEventListener("message", l));
 		}, c = (e) => {
 			if (e.type === "message-port-close") {
 				s(), i.close();
@@ -231,12 +234,12 @@ var ie = (e) => !e || typeof e != "object" || C(e) || !("emit" in e) ? !1 : D(e.
 				portId: a
 			});
 		}
-		return z.register(i, {
+		return H.register(i, {
 			sendMessage: t.sendMessage,
 			remoteUuid: t.remoteUuid,
 			portId: a,
 			cleanup: s
-		}, i), i.addEventListener("message", l), i.start(), i instanceof L && (i._onClose = () => {
+		}, i), i.addEventListener("message", l), i.start(), i instanceof B && (i._onClose = () => {
 			o || (t.sendMessage({
 				type: "message-port-close",
 				remoteUuid: t.remoteUuid,
@@ -244,18 +247,18 @@ var ie = (e) => !e || typeof e != "object" || C(e) || !("emit" in e) ? !1 : D(e.
 			}), s());
 		}), n.set(a, c), {
 			...N,
-			type: B,
+			type: U,
 			portId: a,
 			synthetic: r
 		};
 	}
 	return {
 		...N,
-		type: B,
+		type: U,
 		port: e,
 		...n?.autoBox ? { autoBox: !0 } : {}
 	};
-}, H = (e, t) => "port" in e ? e.autoBox ? Ve(e.port, t) : e.port : He(e.portId, t, e.synthetic), Ve = (e, t) => {
+}, G = (e, t) => "port" in e ? e.autoBox ? Re(e.port, t) : e.port : ze(e.portId, t, e.synthetic), Re = (e, t) => {
 	let n = new EventTarget(), r = ({ data: e }) => {
 		n.dispatchEvent(new MessageEvent("message", { data: Z(e, t) }));
 	};
@@ -265,25 +268,25 @@ var ie = (e) => !e || typeof e != "object" || C(e) || !("emit" in e) ? !1 : D(e.
 	}, n.start = () => e.start(), n.close = () => {
 		e.removeEventListener("message", r), e.close();
 	}, n;
-}, U = (e) => {
+}, K = (e) => {
 	if (E(e.transport)) {
-		let { port1: t, port2: n } = new R();
+		let { port1: t, port2: n } = new V();
 		return {
 			localPort: t,
-			boxedRemote: V(n, e)
+			boxedRemote: W(n, e)
 		};
 	}
 	let { port1: t, port2: n } = new MessageChannel();
 	return {
-		localPort: Ve(t, e),
-		boxedRemote: V(n, e, { autoBox: !0 })
+		localPort: Re(t, e),
+		boxedRemote: W(n, e, { autoBox: !0 })
 	};
-}, He = (e, t, n) => {
-	let { portHandlers: r } = Re(t), { port1: i, port2: a } = n ? new R() : new MessageChannel(), o = new WeakRef(i), s = !1, c = () => {
+}, ze = (e, t, n) => {
+	let { portHandlers: r } = Fe(t), { port1: i, port2: a } = n ? new V() : new MessageChannel(), o = new WeakRef(i), s = !1, c = () => {
 		if (s) return;
 		s = !0, r.delete(e), a.removeEventListener("message", u), a.close();
 		let t = o.deref();
-		t && z.unregister(t);
+		t && H.unregister(t);
 	}, l = (e) => {
 		if (e.type === "message-port-close") {
 			c(), o.deref()?.close();
@@ -303,26 +306,26 @@ var ie = (e) => !e || typeof e != "object" || C(e) || !("emit" in e) ? !1 : D(e.
 			portId: e
 		});
 	};
-	return z.register(i, {
+	return H.register(i, {
 		sendMessage: t.sendMessage,
 		remoteUuid: t.remoteUuid,
 		portId: e,
 		cleanup: c
-	}, i), i instanceof L && (i._onClose = () => {
+	}, i), i instanceof B && (i._onClose = () => {
 		s || (t.sendMessage({
 			type: "message-port-close",
 			remoteUuid: t.remoteUuid,
 			portId: e
 		}), c());
 	}), a.addEventListener("message", u), a.start(), r.set(e, l), i;
-}, Ue = /* @__PURE__ */ t({
-	box: () => Je,
-	isType: () => qe,
-	revive: () => Ye,
-	type: () => We
-}), We = "promise", Ge = (e) => e instanceof Promise, Ke = /* @__PURE__ */ new Set(), qe = (e) => e instanceof Promise, Je = (e, t) => {
-	if (!Ge(e)) throw TypeError("Expected Promise");
-	let n = e, { localPort: r, boxedRemote: i } = U(t), a = (e) => {
+}, Be = /* @__PURE__ */ t({
+	box: () => Ge,
+	isType: () => We,
+	revive: () => Ke,
+	type: () => Ve
+}), Ve = "promise", He = (e) => e instanceof Promise, Ue = /* @__PURE__ */ new Set(), We = (e) => e instanceof Promise, Ge = (e, t) => {
+	if (!He(e)) throw TypeError("Expected Promise");
+	let n = e, { localPort: r, boxedRemote: i } = K(t), a = (e) => {
 		r.postMessage(e), r.close();
 	};
 	return n.then((e) => a({
@@ -333,22 +336,22 @@ var ie = (e) => !e || typeof e != "object" || C(e) || !("emit" in e) ? !1 : D(e.
 		error: F(e)
 	})), {
 		...N,
-		type: We,
+		type: Ve,
 		port: i
 	};
-}, Ye = (e, t) => {
-	let n = H(e.port, t);
-	return Ke.add(n), new Promise((e, t) => {
+}, Ke = (e, t) => {
+	let n = G(e.port, t);
+	return Ue.add(n), new Promise((e, t) => {
 		n.addEventListener("message", ({ data: r }) => {
-			r.type === "resolve" ? e(r.data) : t(r.error), n.close(), Ke.delete(n);
+			r.type === "resolve" ? e(r.data) : t(r.error), n.close(), Ue.delete(n);
 		}, { once: !0 }), n.start();
 	});
-}, Xe = /* @__PURE__ */ t({
-	box: () => et,
-	isType: () => $e,
-	revive: () => tt,
-	type: () => Ze
-}), Ze = "function", Qe = new FinalizationRegistry((e) => {
+}, qe = /* @__PURE__ */ t({
+	box: () => Ze,
+	isType: () => Xe,
+	revive: () => Qe,
+	type: () => Je
+}), Je = "function", Ye = new FinalizationRegistry((e) => {
 	try {
 		e.port.postMessage({ __osra_close__: !0 });
 	} catch {}
@@ -359,14 +362,14 @@ var ie = (e) => !e || typeof e != "object" || C(e) || !("emit" in e) ? !1 : D(e.
 		try {
 			n(/* @__PURE__ */ Error("osra function was garbage collected before result arrived"));
 		} catch {}
-		W.delete(t);
+		q.delete(t);
 		try {
 			t.close();
 		} catch {}
 	}
 	e.inFlight.clear();
-}), W = /* @__PURE__ */ new Set(), $e = (e) => typeof e == "function", et = (e, t) => {
-	let { localPort: n, boxedRemote: r } = U(t), i = () => {
+}), q = /* @__PURE__ */ new Set(), Xe = (e) => typeof e == "function", Ze = (e, t) => {
+	let { localPort: n, boxedRemote: r } = K(t), i = () => {
 		n.close();
 	};
 	return n.addEventListener("message", ({ data: t }) => {
@@ -401,50 +404,50 @@ var ie = (e) => !e || typeof e != "object" || C(e) || !("emit" in e) ? !1 : D(e.
 		});
 	}), n.start(), {
 		...N,
-		type: Ze,
+		type: Je,
 		port: r
 	};
-}, tt = (e, t) => {
-	let n = H(e.port, t), r = /* @__PURE__ */ new Set(), i = (...e) => new Promise((i, a) => {
-		let { localPort: o, boxedRemote: s } = U(t);
-		W.add(o);
+}, Qe = (e, t) => {
+	let n = G(e.port, t), r = /* @__PURE__ */ new Set(), i = (...e) => new Promise((i, a) => {
+		let { localPort: o, boxedRemote: s } = K(t);
+		q.add(o);
 		let c = {
 			returnLocal: o,
 			reject: a
 		};
 		r.add(c), o.addEventListener("message", ({ data: e }) => {
-			"__osra_ok__" in e ? i(e.value) : a(e.error), o.close(), W.delete(o), r.delete(c);
+			"__osra_ok__" in e ? i(e.value) : a(e.error), o.close(), q.delete(o), r.delete(c);
 		}, { once: !0 }), o.start();
 		try {
 			n.postMessage([s, e]);
 		} catch (e) {
-			W.delete(o), r.delete(c);
+			q.delete(o), r.delete(c);
 			try {
 				o.close();
 			} catch {}
 			a(e);
 		}
 	});
-	return Qe.register(i, {
+	return Ye.register(i, {
 		port: n,
 		inFlight: r
 	}, i), i;
-}, nt = /* @__PURE__ */ t({
-	box: () => G,
-	isType: () => it,
-	revive: () => K,
-	type: () => rt
-}), rt = "readableStream", it = (e) => e instanceof ReadableStream, G = (e, t) => {
-	let { localPort: n, boxedRemote: r } = U(t), i = e.getReader();
+}, $e = /* @__PURE__ */ t({
+	box: () => nt,
+	isType: () => tt,
+	revive: () => rt,
+	type: () => et
+}), et = "readableStream", tt = (e) => e instanceof ReadableStream, nt = (e, t) => {
+	let { localPort: n, boxedRemote: r } = K(t), i = e.getReader();
 	return n.addEventListener("message", ({ data: e }) => {
 		"type" in e && e.type === "pull" ? n.postMessage(i.read()) : (i.cancel(), n.close());
 	}), n.start(), {
 		...N,
-		type: rt,
+		type: et,
 		port: r
 	};
-}, K = (e, t) => {
-	let n = H(e.port, t);
+}, rt = (e, t) => {
+	let n = G(e.port, t);
 	return n.start(), new ReadableStream({
 		pull: (e) => new Promise((t, r) => {
 			n.addEventListener("message", ({ data: n }) => {
@@ -457,13 +460,13 @@ var ie = (e) => !e || typeof e != "object" || C(e) || !("emit" in e) ? !1 : D(e.
 			n.postMessage({ type: "cancel" }), queueMicrotask(() => n.close());
 		}
 	});
-}, at = /* @__PURE__ */ t({
-	box: () => ct,
-	isType: () => st,
-	revive: () => lt,
-	type: () => ot
-}), ot = "abortSignal", st = (e) => e instanceof AbortSignal, ct = (e, t) => {
-	let { localPort: n, boxedRemote: r } = U(t);
+}, it = /* @__PURE__ */ t({
+	box: () => st,
+	isType: () => ot,
+	revive: () => ct,
+	type: () => at
+}), at = "abortSignal", ot = (e) => e instanceof AbortSignal, st = (e, t) => {
+	let { localPort: n, boxedRemote: r } = K(t);
 	return e.aborted ? n.close() : e.addEventListener("abort", () => {
 		n.postMessage({
 			type: "abort",
@@ -471,51 +474,51 @@ var ie = (e) => !e || typeof e != "object" || C(e) || !("emit" in e) ? !1 : D(e.
 		}), n.close();
 	}, { once: !0 }), {
 		...N,
-		type: ot,
+		type: at,
 		aborted: e.aborted,
 		reason: e.aborted ? X(e.reason, t) : void 0,
 		port: r
 	};
-}, lt = (e, t) => {
+}, ct = (e, t) => {
 	let n = new AbortController();
 	if (e.aborted) return n.abort(Z(e.reason, t)), n.signal;
-	let r = H(e.port, t);
+	let r = G(e.port, t);
 	return r.start(), r.addEventListener("message", ({ data: e }) => {
 		e.type === "abort" && (n.abort(Z(e.reason, t)), r.close());
 	}), n.signal;
-}, ut = /* @__PURE__ */ t({
-	box: () => pt,
-	isType: () => ft,
-	revive: () => mt,
-	type: () => dt
-}), dt = "response", ft = (e) => e instanceof Response, pt = (e, t) => ({
+}, lt = /* @__PURE__ */ t({
+	box: () => ft,
+	isType: () => dt,
+	revive: () => pt,
+	type: () => ut
+}), ut = "response", dt = (e) => e instanceof Response, ft = (e, t) => ({
 	...N,
-	type: dt,
+	type: ut,
 	status: e.status,
 	statusText: e.statusText,
-	headers: Te(e.headers, t),
-	body: e.body ? G(e.body, t) : null,
+	headers: R(e.headers, t),
+	body: e.body ? nt(e.body, t) : null,
 	url: e.url,
 	redirected: e.redirected
-}), mt = (e, t) => {
-	let n = I(e.headers, t), r = e.body ? K(e.body, t) : null;
+}), pt = (e, t) => {
+	let n = z(e.headers, t), r = e.body ? rt(e.body, t) : null;
 	return new Response(r, {
 		status: e.status,
 		statusText: e.statusText,
 		headers: n
 	});
-}, ht = /* @__PURE__ */ t({
-	box: () => vt,
-	isType: () => _t,
-	revive: () => yt,
-	type: () => gt
-}), gt = "request", _t = (e) => e instanceof Request, vt = (e, t) => ({
+}, mt = /* @__PURE__ */ t({
+	box: () => _t,
+	isType: () => gt,
+	revive: () => vt,
+	type: () => ht
+}), ht = "request", gt = (e) => e instanceof Request, _t = (e, t) => ({
 	...N,
-	type: gt,
+	type: ht,
 	method: e.method,
 	url: e.url,
-	headers: Te(e.headers, t),
-	body: e.body ? G(e.body, t) : null,
+	headers: R(e.headers, t),
+	body: e.body ? nt(e.body, t) : null,
 	credentials: e.credentials,
 	cache: e.cache,
 	redirect: e.redirect,
@@ -523,8 +526,8 @@ var ie = (e) => !e || typeof e != "object" || C(e) || !("emit" in e) ? !1 : D(e.
 	referrerPolicy: e.referrerPolicy,
 	integrity: e.integrity,
 	keepalive: e.keepalive
-}), yt = (e, t) => {
-	let n = I(e.headers, t), r = e.body ? K(e.body, t) : null;
+}), vt = (e, t) => {
+	let n = z(e.headers, t), r = e.body ? rt(e.body, t) : null;
 	return new Request(e.url, {
 		method: e.method,
 		headers: n,
@@ -538,27 +541,29 @@ var ie = (e) => !e || typeof e != "object" || C(e) || !("emit" in e) ? !1 : D(e.
 		keepalive: e.keepalive,
 		duplex: "half"
 	});
-}, bt = /* @__PURE__ */ t({
+}, yt = /* @__PURE__ */ t({
 	box: () => kt,
 	identity: () => wt,
 	isType: () => Ot,
 	revive: () => At,
-	type: () => q
-}), q = "identity", J = Symbol.for("osra.identity"), Y = (e) => e !== null && (typeof e == "object" || typeof e == "function"), xt = (e) => Y(e) && J in e && e[J] === !0, St = /* @__PURE__ */ new WeakMap(), Ct = (e) => {
+	type: () => J
+}), J = "identity", bt = Symbol.for("osra.identity"), Y = (e) => e !== null && (typeof e == "object" || typeof e == "function"), xt = (e) => Y(e) && bt in e && e[bt] === !0, St = /* @__PURE__ */ new WeakMap(), Ct = (e) => {
 	if (xt(e)) return e;
 	let t = St.get(e);
 	if (t) return t;
 	let n = {
-		[J]: !0,
+		[bt]: !0,
 		value: e
 	};
 	return St.set(e, n), n;
 }, wt = (e) => Y(e) ? Ct(e) : e, Tt = /* @__PURE__ */ new WeakMap(), Et = (e) => {
 	let t = Tt.get(e);
 	if (t) return t;
-	let n = {
-		sendIds: /* @__PURE__ */ new WeakMap(),
+	let n = /* @__PURE__ */ new WeakMap(), r = /* @__PURE__ */ new Map(), i = /* @__PURE__ */ new Map(), a = /* @__PURE__ */ new WeakMap(), o = {
+		sendIds: n,
+		idToSent: r,
 		sendRegistry: new FinalizationRegistry((t) => {
+			r.delete(t);
 			try {
 				e.sendMessage({
 					type: "identity-dispose",
@@ -567,13 +572,17 @@ var ie = (e) => !e || typeof e != "object" || C(e) || !("emit" in e) ? !1 : D(e.
 				});
 			} catch {}
 		}),
-		receiveCache: /* @__PURE__ */ new Map(),
+		receiveCache: i,
+		revivedToId: a,
 		listenerInstalled: !1
 	};
-	return Tt.set(e, n), Dt(e, n), n;
+	return Tt.set(e, o), Dt(e, o), o;
 }, Dt = (e, t) => {
 	t.listenerInstalled || (t.listenerInstalled = !0, e.eventTarget.addEventListener("message", ({ detail: e }) => {
-		e?.type === "identity-dispose" && t.receiveCache.delete(e.id);
+		if (e?.type === "identity-dispose") {
+			let n = t.receiveCache.get(e.id);
+			t.receiveCache.delete(e.id), n !== void 0 && Y(n) && t.revivedToId.delete(n);
+		}
 	}));
 }, Ot = (e) => xt(e), kt = (e, t) => {
 	let n = Et(t), r = e.value, i = Y(r) ? r : void 0;
@@ -581,30 +590,38 @@ var ie = (e) => !e || typeof e != "object" || C(e) || !("emit" in e) ? !1 : D(e.
 		let e = n.sendIds.get(i);
 		if (e !== void 0) return {
 			...N,
-			type: q,
+			type: J,
 			id: e
 		};
+		let t = n.revivedToId.get(i);
+		if (t !== void 0) return {
+			...N,
+			type: J,
+			id: t
+		};
 	}
 	let a = globalThis.crypto.randomUUID(), o = X(r, t);
-	return i !== void 0 && (n.sendIds.set(i, a), n.sendRegistry.register(i, a)), {
+	return i !== void 0 && (n.sendIds.set(i, a), n.idToSent.set(a, new WeakRef(i)), n.sendRegistry.register(i, a)), {
 		...N,
-		type: q,
+		type: J,
 		id: a,
 		inner: o
 	};
 }, At = (e, t) => {
 	let n = Et(t), r = n.receiveCache.get(e.id);
 	if (r !== void 0) return r;
+	let i = n.idToSent.get(e.id)?.deref();
+	if (i !== void 0) return i;
 	if (!("inner" in e) || e.inner === void 0) throw Error(`osra identity: received id=${e.id} with no inner payload and no cached value`);
-	let i = Z(e.inner, t);
-	return n.receiveCache.set(e.id, i), i;
+	let a = Z(e.inner, t);
+	return n.receiveCache.set(e.id, a), Y(a) && n.revivedToId.set(a, e.id), a;
 }, jt = /* @__PURE__ */ t({
 	box: () => zt,
 	isType: () => Rt,
 	revive: () => Bt,
 	transfer: () => Lt,
 	type: () => Mt
-}), Mt = "transfer", Nt = Symbol.for("osra.transfer"), Pt = (e) => typeof e == "object" && !!e, Ft = (e) => Pt(e) && Nt in e && e[Nt] === !0, It = (e) => Pt(e) ? ArrayBuffer.isView(e) ? !0 : g(e, [
+}), Mt = "transfer", Nt = Symbol.for("osra.transfer"), Pt = (e) => typeof e == "object" && !!e, Ft = (e) => Pt(e) && Nt in e && e[Nt] === !0, It = (e) => Pt(e) ? ArrayBuffer.isView(e) ? !0 : _(e, [
 	globalThis.ArrayBuffer,
 	globalThis.MessagePort,
 	globalThis.ReadableStream,
@@ -660,7 +677,7 @@ var ie = (e) => !e || typeof e != "object" || C(e) || !("emit" in e) ? !1 : D(e.
 		e.port.postMessage({ kind: "close" });
 	} catch {}
 }), rn = (e) => e instanceof EventTarget, an = (e, t) => {
-	let { localPort: n, boxedRemote: r } = U(t), i = /* @__PURE__ */ new Map(), a = () => {
+	let { localPort: n, boxedRemote: r } = K(t), i = /* @__PURE__ */ new Map(), a = () => {
 		for (let [t, n] of i) e.removeEventListener(t, n);
 		i.clear(), n.removeEventListener("message", o), n.close();
 	}, o = ({ data: t }) => {
@@ -741,25 +758,25 @@ var ie = (e) => !e || typeof e != "object" || C(e) || !("emit" in e) ? !1 : D(e.
 		}));
 	} });
 }, dn = (e, t) => {
-	let n = H(e.port, t);
+	let n = G(e.port, t);
 	n.start();
 	let r = new EventTarget(), i = /* @__PURE__ */ new Map();
 	return ln(n, new WeakRef(r)), un(r, n, i), nn.register(r, { port: n }, r), r;
 }, fn = [
 	jt,
-	bt,
-	fe,
-	_e,
-	Se,
-	Ee,
-	je,
-	Ue,
-	Xe,
-	Ie,
-	nt,
-	at,
-	ut,
-	ht,
+	yt,
+	ue,
+	he,
+	be,
+	Ce,
+	Oe,
+	Be,
+	qe,
+	Ne,
+	$e,
+	it,
+	lt,
+	mt,
 	Vt,
 	Gt,
 	Yt,
@@ -862,7 +879,7 @@ var ie = (e) => !e || typeof e != "object" || C(e) || !("emit" in e) ? !1 : D(e.
 		}
 		e.sendMessage({ type: "announce" });
 	}
-}, Sn = () => new EventTarget(), Cn = (e) => g(e, [
+}, Sn = () => new EventTarget(), Cn = (e) => _(e, [
 	globalThis.MessagePort,
 	globalThis.ReadableStream,
 	globalThis.WritableStream,
@@ -870,7 +887,7 @@ var ie = (e) => !e || typeof e != "object" || C(e) || !("emit" in e) ? !1 : D(e.
 	globalThis.OffscreenCanvas
 ]), wn = (e) => P(e) && e.type === "transfer", $ = (e) => {
 	let t = [], n = /* @__PURE__ */ new WeakSet(), r = (e, i) => {
-		if (!(!e || typeof e != "object") && !n.has(e) && (n.add(e), !_(e))) {
+		if (!(!e || typeof e != "object") && !n.has(e) && (n.add(e), !v(e))) {
 			if (wn(e)) {
 				r(e.inner, i || !e.degraded);
 				return;
@@ -879,7 +896,7 @@ var ie = (e) => !e || typeof e != "object" || C(e) || !("emit" in e) ? !1 : D(e.
 				t.push(e);
 				return;
 			}
-			if (v(e)) {
+			if (y(e)) {
 				i && t.push(e);
 				return;
 			}
@@ -895,45 +912,45 @@ var ie = (e) => !e || typeof e != "object" || C(e) || !("emit" in e) ? !1 : D(e.
 	return r(e, !1), t;
 }, Tn = (e) => ({
 	isJson: "isJson" in e && e.isJson !== void 0 ? e.isJson : E(e),
-	...A(e) ? e : {
+	...k(e) ? e : {
 		emit: e,
 		receive: e
 	}
 }), En = (e) => [...fn.filter((t) => !(e ?? []).some((e) => e.type === t.type)), ...e ?? []], Dn = [yn], On = (e, { transport: t, name: i, remoteName: a, key: o = r, origin: s = "*", unregisterSignal: c, revivableModules: l, uuid: u, remoteUuid: d }) => {
-	let f = Tn(t), p = En(l), m = /* @__PURE__ */ new Map(), { promise: h, resolve: ee } = Promise.withResolvers(), g = u ?? globalThis.crypto.randomUUID(), _ = (e) => {
+	let f = Tn(t), p = En(l), m = /* @__PURE__ */ new Map(), { promise: h, resolve: g } = Promise.withResolvers(), _ = u ?? globalThis.crypto.randomUUID(), v = (e) => {
 		if (c?.aborted || !D(f)) return;
 		let t = {
 			[n]: o,
 			name: i,
-			uuid: g,
+			uuid: _,
 			...e
 		};
 		le(f, t, s, $(t));
-	}, v = Sn(), y = {
+	}, y = Sn(), b = {
 		transport: f,
 		value: e,
 		revivableModules: p,
 		connectionContexts: m,
-		getUuid: () => g,
+		getUuid: () => _,
 		presetRemoteUuid: d,
-		sendMessage: _,
-		protocolEventTarget: v,
-		resolveRemoteValue: ee,
+		sendMessage: v,
+		protocolEventTarget: y,
+		resolveRemoteValue: g,
 		createConnectionEventTarget: Sn
 	};
 	O(f) && ce({
 		listener: (e, t) => {
-			e.uuid !== g && v.dispatchEvent(new CustomEvent("message", { detail: e }));
+			e.uuid !== _ && y.dispatchEvent(new CustomEvent("message", { detail: e }));
 		},
 		transport: f,
 		remoteName: a,
 		key: o,
 		unregisterSignal: c
 	});
-	for (let e of Dn) e.init(y);
+	for (let e of Dn) e.init(b);
 	return h;
 }, kn = async (e, t) => On(e, t);
 //#endregion
-export { N as BoxBase, R as EventChannel, L as EventPort, i as OSRA_BOX, r as OSRA_DEFAULT_KEY, n as OSRA_KEY, ne as assertEmitTransport, re as assertReceiveTransport, _n as box, ue as boxBuffer, j as checkOsraMessageKey, Dn as connections, Sn as createTypedEventTarget, fn as defaultRevivableModules, kn as expose, $ as getTransferableObjects, oe as getWebExtensionGlobal, se as getWebExtensionRuntime, wt as identity, xn as init, g as instanceOfAny, _ as isClonable, ie as isCustomEmitTransport, k as isCustomReceiveTransport, A as isCustomTransport, p as isDedicatedWorker, w as isEmitJsonOnlyTransport, D as isEmitTransport, E as isJsonOnlyTransport, ee as isOsraMessage, T as isReceiveJsonOnlyTransport, O as isReceiveTransport, P as isRevivableBox, d as isServiceWorkerContainer, m as isSharedWorker, v as isTransferable, ae as isTransport, l as isTypedArray, x as isWebExtensionOnConnect, S as isWebExtensionOnMessage, b as isWebExtensionPort, y as isWebExtensionRuntime, u as isWebSocket, C as isWindow, f as isWorker, En as mergeRevivableModules, Tn as normalizeTransport, X as recursiveBox, Z as recursiveRevive, ce as registerOsraMessageListener, vn as revive, de as reviveBuffer, le as sendOsraMessage, F as serializeError, Q as startBidirectionalConnection, On as startConnections, Lt as transfer, bn as type, s as typedArrayToType, c as typedArrayTypeToTypedArrayConstructor };
+export { N as BoxBase, V as EventChannel, B as EventPort, i as OSRA_BOX, r as OSRA_DEFAULT_KEY, n as OSRA_KEY, ne as assertEmitTransport, re as assertReceiveTransport, _n as box, I as boxBuffer, j as checkOsraMessageKey, Dn as connections, Sn as createTypedEventTarget, fn as defaultRevivableModules, kn as expose, $ as getTransferableObjects, se as getWebExtensionGlobal, A as getWebExtensionRuntime, wt as identity, xn as init, _ as instanceOfAny, v as isClonable, ie as isCustomEmitTransport, ae as isCustomReceiveTransport, k as isCustomTransport, p as isDedicatedWorker, T as isEmitJsonOnlyTransport, D as isEmitTransport, E as isJsonOnlyTransport, g as isOsraMessage, te as isReceiveJsonOnlyTransport, O as isReceiveTransport, P as isRevivableBox, d as isServiceWorkerContainer, m as isSharedWorker, y as isTransferable, oe as isTransport, l as isTypedArray, S as isWebExtensionOnConnect, C as isWebExtensionOnMessage, x as isWebExtensionPort, b as isWebExtensionRuntime, u as isWebSocket, w as isWindow, f as isWorker, En as mergeRevivableModules, Tn as normalizeTransport, X as recursiveBox, Z as recursiveRevive, ce as registerOsraMessageListener, vn as revive, L as reviveBuffer, le as sendOsraMessage, F as serializeError, Q as startBidirectionalConnection, On as startConnections, Lt as transfer, bn as type, s as typedArrayToType, c as typedArrayTypeToTypedArrayConstructor };
 
 //# sourceMappingURL=index.js.map