swarpc 0.2.4 → 0.3.0

package/dist/swarpc.d.ts

@@ -1,4 +1,4 @@
-import type { ProceduresMap, SwarpcClient, SwarpcServer } from "./types.js";
+import { type ProceduresMap, type SwarpcClient, type SwarpcServer } from "./types.js";
 export type { ProceduresMap, SwarpcClient, SwarpcServer } from "./types.js";
 export declare function Server<Procedures extends ProceduresMap>(procedures: Procedures, { worker }?: {
     worker?: Worker;

package/dist/swarpc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"swarpc.d.ts","sourceRoot":"","sources":["../src/swarpc.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE3E,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE3E,wBAAgB,MAAM,CAAC,UAAU,SAAS,aAAa,EACrD,UAAU,EAAE,UAAU,EACtB,EAAE,MAAM,EAAE,GAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAO,GACnC,YAAY,CAAC,UAAU,CAAC,CAyE1B;AA2DD,wBAAgB,MAAM,CAAC,UAAU,SAAS,aAAa,EACrD,UAAU,EAAE,UAAU,EACtB,EAAE,MAAM,EAAE,GAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAO,GACnC,YAAY,CAAC,UAAU,CAAC,CAiC1B"}
+{"version":3,"file":"swarpc.d.ts","sourceRoot":"","sources":["../src/swarpc.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,YAAY,EAClB,MAAM,YAAY,CAAA;AAEnB,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAE3E,wBAAgB,MAAM,CAAC,UAAU,SAAS,aAAa,EACrD,UAAU,EAAE,UAAU,EACtB,EAAE,MAAM,EAAE,GAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAO,GACnC,YAAY,CAAC,UAAU,CAAC,CAyE1B;AA4DD,wBAAgB,MAAM,CAAC,UAAU,SAAS,aAAa,EACrD,UAAU,EAAE,UAAU,EACtB,EAAE,MAAM,EAAE,GAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAO,GACnC,YAAY,CAAC,UAAU,CAAC,CAmC1B"}

package/dist/swarpc.js

@@ -1,16 +1,17 @@
 import { type } from "arktype";
+import { zImplementations, zProcedures, } from "./types.js";
 export function Server(procedures, { worker } = {}) {
     const instance = {
-        procedures,
-        implementations: {},
-        start: () => { },
+        [zProcedures]: procedures,
+        [zImplementations]: {},
+        start: (self) => { },
     };
     for (const functionName in procedures) {
         instance[functionName] = ((implementation) => {
-            if (!instance.procedures[functionName]) {
+            if (!instance[zProcedures][functionName]) {
                 throw new Error(`No procedure found for function name: ${functionName}`);
             }
-            instance.implementations[functionName] = implementation;
+            instance[zImplementations][functionName] = implementation;
         });
     }
     const PayloadSchema = type.or(...Object.entries(procedures).map(([functionName, { input }]) => ({
@@ -38,7 +39,7 @@ export function Server(procedures, { worker } = {}) {
                     message: "message" in error ? error.message : String(error),
                 },
             });
-            const implementation = instance.implementations[functionName];
+            const implementation = instance[zImplementations][functionName];
             if (!implementation) {
                 await postError("No implementation found");
                 return;
@@ -74,6 +75,7 @@ async function startClientListener(worker) {
         }
     }
     const w = worker ?? navigator.serviceWorker;
+    console.log("[SWARPC Client] Starting client listener on", w);
     w.addEventListener("message", (event) => {
         const { functionName, requestId, ...data } = event.data || {};
         if (!requestId) {
@@ -98,7 +100,7 @@ async function startClientListener(worker) {
     _clientListenerStarted = true;
 }
 export function Client(procedures, { worker } = {}) {
-    const instance = { procedures };
+    const instance = { [zProcedures]: procedures };
     for (const functionName of Object.keys(procedures)) {
         instance[functionName] = (async (input, onProgress = () => { }) => {
             procedures[functionName].input.assert(input);

package/dist/types.d.ts

@@ -6,17 +6,20 @@ export type Procedure<I extends Type, P extends Type, S extends Type> = {
 };
 export type ProcedureImplementation<I extends Type, P extends Type, S extends Type> = (input: I["inferOut"], onProgress: (progress: P["inferOut"]) => void) => Promise<S["inferOut"]>;
 export type ProceduresMap = Record<string, Procedure<Type, Type, Type>>;
+export type ImplementationsMap<Procedures extends ProceduresMap> = {
+    [F in keyof Procedures]: ProcedureImplementation<Procedures[F]["input"], Procedures[F]["progress"], Procedures[F]["success"]>;
+};
 export type ClientMethod<P extends Procedure<Type, Type, Type>> = (input: P["input"]["inferIn"], onProgress?: (progress: P["progress"]["inferOut"]) => void) => Promise<P["success"]["inferOut"]>;
+export declare const zImplementations: unique symbol;
+export declare const zProcedures: unique symbol;
 export type SwarpcClient<Procedures extends ProceduresMap> = {
-    procedures: Procedures;
+    [zProcedures]: Procedures;
 } & {
     [F in keyof Procedures]: ClientMethod<Procedures[F]>;
 };
 export type SwarpcServer<Procedures extends ProceduresMap> = {
-    procedures: Procedures;
-    implementations: {
-        [F in keyof Procedures]: ProcedureImplementation<Procedures[F]["input"], Procedures[F]["progress"], Procedures[F]["success"]>;
-    };
+    [zProcedures]: Procedures;
+    [zImplementations]: ImplementationsMap<Procedures>;
     start(self: Window): void;
 } & {
     [F in keyof Procedures]: (impl: ProcedureImplementation<Procedures[F]["input"], Procedures[F]["progress"], Procedures[F]["success"]>) => void;

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAEpC,MAAM,MAAM,SAAS,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,SAAS,IAAI,EAAE,CAAC,SAAS,IAAI,IAAI;IACtE,KAAK,EAAE,CAAC,CAAC;IACT,QAAQ,EAAE,CAAC,CAAC;IACZ,OAAO,EAAE,CAAC,CAAC;CACZ,CAAC;AAEF,MAAM,MAAM,uBAAuB,CACjC,CAAC,SAAS,IAAI,EACd,CAAC,SAAS,IAAI,EACd,CAAC,SAAS,IAAI,IACZ,CACF,KAAK,EAAE,CAAC,CAAC,UAAU,CAAC,EACpB,UAAU,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,UAAU,CAAC,KAAK,IAAI,KAC1C,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;AAE5B,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;AAExE,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAChE,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,EAC5B,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,KAAK,IAAI,KACvD,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;AAEvC,MAAM,MAAM,YAAY,CAAC,UAAU,SAAS,aAAa,IAAI;IAC3D,UAAU,EAAE,UAAU,CAAC;CACxB,GAAG;KACD,CAAC,IAAI,MAAM,UAAU,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;CACrD,CAAC;AAEF,MAAM,MAAM,YAAY,CAAC,UAAU,SAAS,aAAa,IAAI;IAC3D,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,EAAE;SACd,CAAC,IAAI,MAAM,UAAU,GAAG,uBAAuB,CAC9C,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,EACtB,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,EACzB,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CACzB;KACF,CAAC;IACF,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B,GAAG;KACD,CAAC,IAAI,MAAM,UAAU,GAAG,CACvB,IAAI,EAAE,uBAAuB,CAC3B,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,EACtB,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,EACzB,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CACzB,KACE,IAAI;CACV,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAEnC,MAAM,MAAM,SAAS,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,SAAS,IAAI,EAAE,CAAC,SAAS,IAAI,IAAI;IACtE,KAAK,EAAE,CAAC,CAAA;IACR,QAAQ,EAAE,CAAC,CAAA;IACX,OAAO,EAAE,CAAC,CAAA;CACX,CAAA;AAED,MAAM,MAAM,uBAAuB,CACjC,CAAC,SAAS,IAAI,EACd,CAAC,SAAS,IAAI,EACd,CAAC,SAAS,IAAI,IACZ,CACF,KAAK,EAAE,CAAC,CAAC,UAAU,CAAC,EACpB,UAAU,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,UAAU,CAAC,KAAK,IAAI,KAC1C,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAA;AAE3B,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAA;AAEvE,MAAM,MAAM,kBAAkB,CAAC,UAAU,SAAS,aAAa,IAAI;KAChE,CAAC,IAAI,MAAM,UAAU,GAAG,uBAAuB,CAC9C,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,EACtB,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,EACzB,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CACzB;CACF,CAAA;AAED,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAChE,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,EAC5B,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,KAAK,IAAI,KACvD,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,CAAC,CAAA;AAEtC,eAAO,MAAM,gBAAgB,eAAmC,CAAA;AAChE,eAAO,MAAM,WAAW,eAA8B,CAAA;AAEtD,MAAM,MAAM,YAAY,CAAC,UAAU,SAAS,aAAa,IAAI;IAC3D,CAAC,WAAW,CAAC,EAAE,UAAU,CAAA;CAC1B,GAAG;KACD,CAAC,IAAI,MAAM,UAAU,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;CACrD,CAAA;AAED,MAAM,MAAM,YAAY,CAAC,UAAU,SAAS,aAAa,IAAI;IAC3D,CAAC,WAAW,CAAC,EAAE,UAAU,CAAA;IACzB,CAAC,gBAAgB,CAAC,EAAE,kBAAkB,CAAC,UAAU,CAAC,CAAA;IAClD,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAC1B,GAAG;KACD,CAAC,IAAI,MAAM,UAAU,GAAG,CACvB,IAAI,EAAE,uBAAuB,CAC3B,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,EACtB,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,EACzB,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CACzB,KACE,IAAI;CACV,CAAA"}

package/dist/types.js

@@ -1 +1,2 @@
-export {};
+export const zImplementations = Symbol("SWARPC implementations");
+export const zProcedures = Symbol("SWARPC procedures");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swarpc",
-  "version": "0.2.4",
+  "version": "0.3.0",
   "description": "Full type-safe RPC library for service worker -- move things off of the UI thread with ease!",
   "keywords": [
     "service-workers",

package/src/swarpc.ts

@@ -1,5 +1,12 @@
 import { type } from "arktype"
-import type { ProceduresMap, SwarpcClient, SwarpcServer } from "./types.js"
+import {
+  ImplementationsMap,
+  zImplementations,
+  zProcedures,
+  type ProceduresMap,
+  type SwarpcClient,
+  type SwarpcServer,
+} from "./types.js"
 
 export type { ProceduresMap, SwarpcClient, SwarpcServer } from "./types.js"
 
@@ -8,17 +15,17 @@ export function Server<Procedures extends ProceduresMap>(
   { worker }: { worker?: Worker } = {}
 ): SwarpcServer<Procedures> {
   const instance = {
-    procedures,
-    implementations: {} as SwarpcServer<Procedures>["implementations"],
-    start: () => {},
+    [zProcedures]: procedures,
+    [zImplementations]: {} as ImplementationsMap<Procedures>,
+    start: (self: Window) => {},
   } as SwarpcServer<Procedures>
 
   for (const functionName in procedures) {
     instance[functionName] = ((implementation) => {
-      if (!instance.procedures[functionName]) {
+      if (!instance[zProcedures][functionName]) {
         throw new Error(`No procedure found for function name: ${functionName}`)
       }
-      instance.implementations[functionName] = implementation as any
+      instance[zImplementations][functionName] = implementation as any
     }) as SwarpcServer<Procedures>[typeof functionName]
   }
 
@@ -60,7 +67,7 @@ export function Server<Procedures extends ProceduresMap>(
           },
         })
 
-      const implementation = instance.implementations[functionName]
+      const implementation = instance[zImplementations][functionName]
       if (!implementation) {
         await postError("No implementation found")
         return
@@ -109,6 +116,7 @@ async function startClientListener(worker?: Worker) {
   }
 
   const w = worker ?? navigator.serviceWorker
+  console.log("[SWARPC Client] Starting client listener on", w)
   w.addEventListener("message", (event) => {
     const { functionName, requestId, ...data } =
       (event as MessageEvent).data || {}
@@ -142,7 +150,9 @@ export function Client<Procedures extends ProceduresMap>(
   procedures: Procedures,
   { worker }: { worker?: Worker } = {}
 ): SwarpcClient<Procedures> {
-  const instance = { procedures } as Partial<SwarpcClient<Procedures>>
+  const instance = { [zProcedures]: procedures } as Partial<
+    SwarpcClient<Procedures>
+  >
 
   for (const functionName of Object.keys(procedures) as Array<
     keyof Procedures

package/src/types.ts

@@ -1,10 +1,10 @@
-import type { Type } from "arktype";
+import type { Type } from "arktype"
 
 export type Procedure<I extends Type, P extends Type, S extends Type> = {
-  input: I;
-  progress: P;
-  success: S;
-};
+  input: I
+  progress: P
+  success: S
+}
 
 export type ProcedureImplementation<
   I extends Type,
@@ -13,31 +13,36 @@ export type ProcedureImplementation<
 > = (
   input: I["inferOut"],
   onProgress: (progress: P["inferOut"]) => void
-) => Promise<S["inferOut"]>;
+) => Promise<S["inferOut"]>
 
-export type ProceduresMap = Record<string, Procedure<Type, Type, Type>>;
+export type ProceduresMap = Record<string, Procedure<Type, Type, Type>>
+
+export type ImplementationsMap<Procedures extends ProceduresMap> = {
+  [F in keyof Procedures]: ProcedureImplementation<
+    Procedures[F]["input"],
+    Procedures[F]["progress"],
+    Procedures[F]["success"]
+  >
+}
 
 export type ClientMethod<P extends Procedure<Type, Type, Type>> = (
   input: P["input"]["inferIn"],
   onProgress?: (progress: P["progress"]["inferOut"]) => void
-) => Promise<P["success"]["inferOut"]>;
+) => Promise<P["success"]["inferOut"]>
+
+export const zImplementations = Symbol("SWARPC implementations")
+export const zProcedures = Symbol("SWARPC procedures")
 
 export type SwarpcClient<Procedures extends ProceduresMap> = {
-  procedures: Procedures;
+  [zProcedures]: Procedures
 } & {
-  [F in keyof Procedures]: ClientMethod<Procedures[F]>;
-};
+  [F in keyof Procedures]: ClientMethod<Procedures[F]>
+}
 
 export type SwarpcServer<Procedures extends ProceduresMap> = {
-  procedures: Procedures;
-  implementations: {
-    [F in keyof Procedures]: ProcedureImplementation<
-      Procedures[F]["input"],
-      Procedures[F]["progress"],
-      Procedures[F]["success"]
-    >;
-  };
-  start(self: Window): void;
+  [zProcedures]: Procedures
+  [zImplementations]: ImplementationsMap<Procedures>
+  start(self: Window): void
 } & {
   [F in keyof Procedures]: (
     impl: ProcedureImplementation<
@@ -45,5 +50,5 @@ export type SwarpcServer<Procedures extends ProceduresMap> = {
       Procedures[F]["progress"],
       Procedures[F]["success"]
     >
-  ) => void;
-};
+  ) => void
+}