osra 0.0.11 → 0.0.12

package/build/call.d.ts

@@ -9,3 +9,9 @@ export declare const call: <T2 extends Resolvers>(target: Target, { key }?: {
  * Make a listener for a call
  */
 export declare const makeCallListener: <T extends (data: any, extra: ApiResolverOptions) => unknown>(func: T) => T;
+/**
+ * Make a listener for a call
+ */
+export declare const makeProxyCallListener: <T extends (data: any, extra: ApiResolverOptions) => unknown>(target: Target, { key }?: {
+    key?: string | undefined;
+}) => T;

package/build/index.d.ts

@@ -3,3 +3,4 @@ export type { ApiMessageData, ApiResolverOptions, Resolvers, StructuredCloneTran
 export * from './register';
 export * from './call';
 export * from './webextension';
+export * from './utils';

package/build/index.js

@@ -1,70 +1,87 @@
-const g = "osra-message", l = ({
-  target: e,
-  resolvers: t,
-  filter: r,
-  map: n,
-  key: a = g
-}) => {
-  const o = (s) => {
-    if (!s.data || typeof s.data != "object" || s.data?.source !== a || r && !r(s))
-      return;
-    const { type: c, data: i, port: d } = s.data, m = t[c];
-    if (!m)
-      throw new Error(`Osra received a message of type "${String(c)}" but no resolver was found for type.`);
-    n ? m(...n(i, { event: s, type: c, port: d })) : m(i, { event: s, type: c, port: d });
-  };
-  return e.addEventListener("message", o), {
-    listener: o,
-    resolvers: t
-  };
-}, b = (e) => !!(globalThis.SharedArrayBuffer && e instanceof globalThis.SharedArrayBuffer), y = (e) => globalThis.ArrayBuffer && e instanceof globalThis.ArrayBuffer || globalThis.MessagePort && e instanceof globalThis.MessagePort || globalThis.ReadableStream && e instanceof globalThis.ReadableStream || globalThis.WritableStream && e instanceof globalThis.WritableStream || globalThis.TransformStream && e instanceof globalThis.TransformStream ? !0 : !!(globalThis.ImageBitmap && e instanceof globalThis.ImageBitmap), h = (e) => {
-  const t = [], r = (n) => b(n) ? void 0 : y(n) ? t.push(n) : Array.isArray(n) ? n.map(r) : n && typeof n == "object" ? Object.values(n).map(r) : void 0;
-  return r(e), t;
-}, p = "__proxyFunctionPort__", M = "__proxyMessageChannelPort__", j = (e) => {
-  const { port1: t, port2: r } = new MessageChannel();
-  return t.addEventListener("message", async (n) => {
+const f = "osra-message", P = (t) => !!(globalThis.SharedArrayBuffer && t instanceof globalThis.SharedArrayBuffer), h = (t) => globalThis.ArrayBuffer && t instanceof globalThis.ArrayBuffer || globalThis.MessagePort && t instanceof globalThis.MessagePort || globalThis.ReadableStream && t instanceof globalThis.ReadableStream || globalThis.WritableStream && t instanceof globalThis.WritableStream || globalThis.TransformStream && t instanceof globalThis.TransformStream ? !0 : !!(globalThis.ImageBitmap && t instanceof globalThis.ImageBitmap), b = (t) => {
+  const e = [], s = (r) => P(r) ? void 0 : h(r) ? e.push(r) : Array.isArray(r) ? r.map(s) : r && typeof r == "object" ? Object.values(r).map(s) : void 0;
+  return s(t), e;
+}, p = "__proxyFunctionPort__", L = "__proxyMessageChannelPort__", A = (t) => {
+  const { port1: e, port2: s } = new MessageChannel();
+  return e.addEventListener("message", async (r) => {
     try {
-      const a = await e(...n.data), o = f(a), s = h(o);
-      t.postMessage({ result: o }, { transfer: s });
+      const a = await t(...r.data), n = m(a), o = b(n);
+      e.postMessage({ result: n }, { transfer: o });
     } catch (a) {
-      t.postMessage({ error: a });
+      e.postMessage({ error: a });
     }
-  }), t.start(), r;
-}, f = (e) => b(e) || y(e) ? e : typeof e == "function" ? { [p]: j(e) } : Array.isArray(e) ? e.map(f) : e && typeof e == "object" ? Object.fromEntries(
-  Object.entries(e).map(([t, r]) => [
-    t,
-    f(r)
+  }), e.start(), s;
+}, m = (t) => P(t) || h(t) ? t : typeof t == "function" ? { [p]: A(t) } : Array.isArray(t) ? t.map(m) : t && typeof t == "object" ? Object.fromEntries(
+  Object.entries(t).map(([e, s]) => [
+    e,
+    m(s)
   ])
-) : e, x = (e) => (...t) => new Promise((r, n) => {
-  const a = f(t), o = h(a), s = (c) => {
-    c.data.error ? n(c.data.error) : r(E(c.data.result)), e.removeEventListener("message", s);
+) : t, _ = (t) => (...e) => new Promise((s, r) => {
+  const a = m(e), n = b(a), o = (c) => {
+    c.data.error ? r(c.data.error) : s(M(c.data.result)), t.removeEventListener("message", o);
   };
-  e.addEventListener("message", s), e.start(), e.postMessage(a, { transfer: o });
-}), E = (e) => b(e) || y(e) ? e : e && typeof e == "object" && e[p] ? x(e[p]) : Array.isArray(e) ? e.map(f) : e && typeof e == "object" ? Object.fromEntries(
-  Object.entries(e).map(([t, r]) => [
-    t,
-    E(r)
+  t.addEventListener("message", o), t.start(), t.postMessage(a, { transfer: n });
+}), M = (t) => P(t) || h(t) ? t : t && typeof t == "object" && t[p] ? _(t[p]) : Array.isArray(t) ? t.map(m) : t && typeof t == "object" ? Object.fromEntries(
+  Object.entries(t).map(([e, s]) => [
+    e,
+    M(s)
   ])
-) : e, A = (e, { key: t = g } = { key: g }) => (r, n) => new Promise((a, o) => {
-  const { port1: s, port2: c } = new MessageChannel();
-  s.addEventListener(
+) : t, C = ({
+  target: t,
+  resolvers: e,
+  filter: s,
+  map: r,
+  key: a = f,
+  proxyTarget: n
+}) => {
+  const o = (c) => {
+    if (!c.data || typeof c.data != "object" || c.data?.source !== a || s && !s(c))
+      return;
+    if (n) {
+      const { type: l, data: O, port: T } = c.data, x = b(O);
+      n.postMessage(
+        {
+          source: a,
+          type: l,
+          data: O,
+          port: T
+        },
+        {
+          targetOrigin: "*",
+          transfer: [T, ...x ?? []]
+        }
+      );
+      return;
+    }
+    const { type: i, data: d, port: g } = c.data, y = e[i];
+    if (!y)
+      throw new Error(`Osra received a message of type "${String(i)}" but no resolver was found for type.`);
+    r ? y(...r(d, { event: c, type: i, port: g })) : y(d, { event: c, type: i, port: g });
+  };
+  return t.addEventListener("message", o), {
+    listener: o,
+    resolvers: e
+  };
+}, R = (t, { key: e = f } = { key: f }) => (s, r) => new Promise((a, n) => {
+  const { port1: o, port2: c } = new MessageChannel();
+  o.addEventListener(
     "message",
-    ({ data: m }) => {
-      if (m.error)
-        o(m.error);
+    ({ data: g }) => {
+      if (g.error)
+        n(g.error);
       else {
-        const L = E(m.result);
-        a(L);
+        const y = M(g.result);
+        a(y);
       }
-      s.close(), c.close();
+      o.close(), c.close();
     },
     { once: !0 }
-  ), s.start();
-  const i = f(n), d = h(i);
-  e.postMessage(
+  ), o.start();
+  const i = m(r), d = b(i);
+  t.postMessage(
     {
-      source: t,
-      type: r,
+      source: e,
+      type: s,
       data: i,
       port: c
     },
@@ -73,109 +90,133 @@ const g = "osra-message", l = ({
       transfer: [c, ...d ?? []]
     }
   );
-}), _ = (e) => async (t, r) => {
-  const { port: n } = r, a = E(t);
+}), D = (t) => async (e, s) => {
+  const { port: r } = s, a = M(e);
   try {
-    const o = await e(a, r), s = f(o), c = h(s);
-    return n.postMessage({ result: s }, { transfer: c }), n.close(), o;
-  } catch (o) {
-    throw n.postMessage({ error: o }), n.close(), o;
+    const n = await t(a, s), o = m(n), c = b(o);
+    return r.postMessage({ result: o }, { transfer: c }), r.close(), n;
+  } catch (n) {
+    throw r.postMessage({ error: n }), r.close(), n;
   }
-}, w = ({ key: e = g }) => {
-  const t = /* @__PURE__ */ new Map(), r = async (a) => t.get(a) ?? new Promise((o, s) => {
+}, $ = (t, { key: e = f } = { key: f }) => (s, r) => {
+  const { type: a, port: n } = r, o = b(s);
+  t.postMessage(
+    {
+      source: e,
+      type: a,
+      data: s,
+      port: n
+    },
+    {
+      targetOrigin: "*",
+      transfer: [n, ...o ?? []]
+    }
+  );
+}, j = ({ key: t = f }) => {
+  const e = /* @__PURE__ */ new Map(), s = async (a) => e.get(a) ?? new Promise((n, o) => {
     let c = !1;
     setTimeout(() => {
-      c || s(new Error(`Osra getPort for "${a}" timed out`));
+      c || o(new Error(`Osra getPort for "${a}" timed out`));
     }, 1e3), chrome.runtime.onConnect.addListener((i) => {
-      i.name === `${e}:${a}` && (t.set(a, i), o(i), c = !0);
+      i.name === `${t}:${a}` && (e.set(a, i), n(i), c = !0);
     });
-  }), n = {
-    addPort: (a, o) => t.set(a, o),
+  }), r = {
+    addPort: (a, n) => e.set(a, n),
     proxyPort: (a) => {
-      const o = self.crypto.randomUUID(), s = chrome.runtime.connect({ name: `${e}:${o}` });
-      return t.set(o, s), s.onDisconnect.addListener(() => {
-        t.delete(o);
-      }), s.onMessage.addListener((c) => {
+      const n = self.crypto.randomUUID(), o = chrome.runtime.connect({ name: `${t}:${n}` });
+      return e.set(n, o), o.onDisconnect.addListener(() => {
+        e.delete(n);
+      }), o.onMessage.addListener((c) => {
         a.postMessage(c);
       }), a.addEventListener("message", async (c) => {
-        s.postMessage(c.data);
+        o.postMessage(c.data);
       }), a.addEventListener("close", () => {
-        s.disconnect();
+        o.disconnect();
       }), {
-        [M]: o
+        [L]: n
       };
     },
-    proxiedPort: async ({ [M]: a }) => {
-      const { port1: o, port2: s } = new MessageChannel(), c = await r(a);
+    proxiedPort: async ({ [L]: a }) => {
+      const { port1: n, port2: o } = new MessageChannel(), c = await s(a);
       c.onMessage.addListener((d) => {
-        o.postMessage(d);
+        n.postMessage(d);
       }), c.onDisconnect.addListener(() => {
-        o.close();
-      }), o.addEventListener("close", () => {
+        n.close();
+      }), n.addEventListener("close", () => {
         c.disconnect();
-      }), o.addEventListener("message", async (d) => {
+      }), n.addEventListener("message", async (d) => {
         c.postMessage(d.data);
-      }), o.start(), s.addEventListener("message", async (d) => {
+      }), n.start(), o.addEventListener("message", async (d) => {
         c.postMessage(d.data);
-      }), s.start();
-      const i = O(n, s);
+      }), o.start();
+      const i = S(r, o);
       return i.uuid = a, i;
     }
   };
-  return n;
-}, P = (e, t) => t instanceof MessagePort ? e.proxyPort(t) : b(t) || y(t) ? t : typeof t == "object" && p in t ? { [p]: e.proxyPort(t[p]) } : Array.isArray(t) ? t.map((r) => P(e, r)) : t && typeof t == "object" ? Object.fromEntries(
-  Object.entries(t).map(([r, n]) => [
-    r,
-    P(e, n)
+  return r;
+}, E = (t, e) => e instanceof MessagePort ? t.proxyPort(e) : P(e) || h(e) ? e : typeof e == "object" && p in e ? { [p]: t.proxyPort(e[p]) } : Array.isArray(e) ? e.map((s) => E(t, s)) : e && typeof e == "object" ? Object.fromEntries(
+  Object.entries(e).map(([s, r]) => [
+    s,
+    E(t, r)
   ])
-) : t, T = async (e, t) => b(t) || y(t) ? t : typeof t == "object" && M in t ? await e.proxiedPort(t) : typeof t == "object" && p in t ? { [p]: await e.proxiedPort(t[p]) } : Array.isArray(t) ? await Promise.all(t.map((r) => T(e, r))) : t && typeof t == "object" ? Object.fromEntries(
+) : e, w = async (t, e) => P(e) || h(e) ? e : typeof e == "object" && L in e ? await t.proxiedPort(e) : typeof e == "object" && p in e ? { [p]: await t.proxiedPort(e[p]) } : Array.isArray(e) ? await Promise.all(e.map((s) => w(t, s))) : e && typeof e == "object" ? Object.fromEntries(
   await Promise.all(
-    Object.entries(t).map(async ([r, n]) => [
-      r,
-      await T(e, n)
+    Object.entries(e).map(async ([s, r]) => [
+      s,
+      await w(t, r)
     ])
   )
-) : t, O = (e, t) => {
-  const r = t.postMessage;
-  return t.postMessage = (n) => {
-    r.apply(t, [P(e, n)]);
-  }, t;
-}, S = ({
-  target: e,
-  key: t = g
+) : e, S = (t, e) => {
+  const s = e.postMessage;
+  return e.postMessage = (r) => {
+    s.apply(e, [E(t, r)]);
+  }, e;
+}, B = ({
+  target: t,
+  key: e = f
 }) => {
-  const r = w({ key: t });
+  const s = j({ key: e });
   return {
-    ...e,
-    postMessage: (n) => {
-      e.runtime.sendMessage(P(r, n));
+    ...t,
+    postMessage: (r) => {
+      t.runtime.sendMessage(E(s, r));
     }
   };
-}, C = ({
-  target: e,
-  key: t = g
+}, F = ({
+  target: t,
+  key: e = f
 }) => {
-  const r = w({ key: t });
+  const s = j({ key: e });
   return {
-    ...e,
-    addEventListener: (n, a, o) => {
-      if (n !== "message")
-        return e.addEventListener(n, a, o);
-      chrome.runtime.onMessage.addListener((s, c, i) => {
-        T(r, s).then((d) => a({ data: d }));
-      }), chrome.runtime.onConnect.addListener((s) => {
-        s.name.startsWith(`${t}:`) && r.addPort(s.name.split(":")[1], s);
+    ...t,
+    addEventListener: (r, a, n) => {
+      if (r !== "message")
+        return t.addEventListener(r, a, n);
+      chrome.runtime.onMessage.addListener((o, c, i) => {
+        w(s, o).then((d) => a({ data: d }));
+      }), chrome.runtime.onConnect.addListener((o) => {
+        o.name.startsWith(`${e}:`) && s.addPort(o.name.split(":")[1], o);
       });
     }
   };
 };
 export {
-  A as call,
-  _ as makeCallListener,
-  l as registerListener,
-  T as replaceProxied,
-  P as replaceProxies,
-  S as wrapExtensionTarget,
-  C as wrapListenerExtensionTarget,
-  O as wrapPort
+  p as PROXY_FUNCTION_PROPERTY,
+  L as PROXY_MESSAGE_CHANNEL_PROPERTY,
+  R as call,
+  b as getTransferableObjects,
+  P as isClonable,
+  h as isTransferable,
+  D as makeCallListener,
+  M as makeObjectProxiedFunctions,
+  _ as makeProxiedFunction,
+  $ as makeProxyCallListener,
+  A as makeProxyFunction,
+  m as proxyObjectFunctions,
+  C as registerListener,
+  w as replaceProxied,
+  E as replaceProxies,
+  B as wrapExtensionTarget,
+  F as wrapListenerExtensionTarget,
+  S as wrapPort
 };

package/build/register.d.ts

@@ -1,5 +1,5 @@
-import type { ApiMessageData, ApiResolverOptions, Resolvers, ValidateResolvers } from './types';
-export declare const registerListener: <T extends Record<PropertyKey, (data: any, extra: ApiResolverOptions) => unknown>>({ target, resolvers, filter, map, key }: {
+import type { ApiMessageData, ApiResolverOptions, Resolvers, Target, ValidateResolvers } from './types';
+export declare const registerListener: <T extends Record<PropertyKey, (data: any, extra: ApiResolverOptions) => unknown>>({ target, resolvers, filter, map, key, proxyTarget }: {
     target: WindowEventHandlers | ServiceWorkerContainer | Worker | SharedWorker;
     resolvers: ValidateResolvers<T>;
     filter?: ((event: MessageEvent<any>) => boolean) | undefined;
@@ -13,6 +13,7 @@ export declare const registerListener: <T extends Record<PropertyKey, (data: any
         port: MessagePort;
     }]) | undefined;
     key?: string | undefined;
+    proxyTarget?: Target | undefined;
 }) => {
     listener: (event: MessageEvent<ApiMessageData<Resolvers>>) => void;
     resolvers: ValidateResolvers<T>;

package/build/types.d.ts

@@ -8,7 +8,7 @@ export type StructuredCloneTransferableObject = {
 };
 export type ProxiedType = (...args: StructuredCloneTransferableType[]) => StructuredCloneTransferableType | Promise<StructuredCloneTransferableType>;
 export type StructuredCloneTransferableType = StructuredCloneType | TransferableObject | Array<StructuredCloneTransferableType> | StructuredCloneTransferableObject | Map<StructuredCloneTransferableType, StructuredCloneTransferableType> | Set<StructuredCloneTransferableType> | ProxiedType;
-export type Target = Window | ServiceWorker | Worker;
+export type Target = Window | ServiceWorker | Worker | MessagePort;
 type NormalizeRecord<T> = T extends Record<any, any> ? {
     [K in keyof T]: NormalizeRecord<T[K]>;
 } : T;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "osra",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "Easy communication between workers",
   "files": [
     "build"