swarpc 0.11.0 → 0.13.0

package/dist/client.js

@@ -2,7 +2,8 @@
  * @module
  * @mergeModuleWith <project>
  */
-import { createLogger } from "./log.js";
+import { createLogger, } from "./log.js";
+import { makeNodeId, whoToSendTo } from "./nodes.js";
 import { zProcedures, } from "./types.js";
 import { findTransferables } from "./utils.js";
 /**
@@ -12,38 +13,55 @@ import { findTransferables } from "./utils.js";
  */
 const pendingRequests = new Map();
 // Have we started the client listener?
-let _clientListenerStarted = false;
+let _clientListenerStarted = new Set();
 /**
  *
  * @param procedures procedures the client will be able to call, see {@link ProceduresMap}
  * @param options various options
- * @param options.worker The instantiated worker object. If not provided, the client will use the service worker.
- * Example: `new Worker("./worker.js")`
+ * @param options.worker The worker class, **not instantiated**, or a path to the source code. If not provided, the client will use the service worker. If a string is provided, it'll instantiate a regular `Worker`, not a `SharedWorker`.
+ * Example: `"./worker.js"`
  * See {@link Worker} (used by both dedicated workers and service workers), {@link SharedWorker}, and
  * the different [worker types](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API#worker_types) that exist
  * @param options.hooks Hooks to run on messages received from the server. See {@link Hooks}
  * @param options.loglevel Maximum log level to use, defaults to "debug" (shows everything). "info" will not show debug messages, "warn" will only show warnings and errors, "error" will only show errors.
  * @param options.restartListener If true, will force the listener to restart even if it has already been started. You should probably leave this to false, unless you are testing and want to reset the client state.
  * @param options.localStorage Define a in-memory localStorage with the given key-value pairs. Allows code called on the server to access localStorage (even though SharedWorkers don't have access to the browser's real localStorage)
+ * @param options.nodes the number of workers to use for the server, defaults to {@link navigator.hardwareConcurrency}.
  * @returns a sw&rpc client instance. Each property of the procedures map will be a method, that accepts an input and an optional onProgress callback, see {@link ClientMethod}
  *
  * An example of defining and using a client:
  * {@includeCode ../example/src/routes/+page.svelte}
  */
-export function Client(procedures, { worker, loglevel = "debug", restartListener = false, hooks = {}, localStorage = {}, } = {}) {
+export function Client(procedures, { worker, nodes: nodeCount, loglevel = "debug", restartListener = false, hooks = {}, localStorage = {}, } = {}) {
     const l = createLogger("client", loglevel);
     if (restartListener)
-        _clientListenerStarted = false;
+        _clientListenerStarted.clear();
     // Store procedures on a symbol key, to avoid conflicts with procedure names
     const instance = { [zProcedures]: procedures };
+    nodeCount ??= navigator.hardwareConcurrency || 1;
+    let nodes;
+    if (worker) {
+        nodes = {};
+        for (const _ of Array.from({ length: nodeCount })) {
+            const id = makeNodeId();
+            if (typeof worker === "string") {
+                nodes[id] = new Worker(worker, { name: id });
+            }
+            else {
+                nodes[id] = new worker({ name: id });
+            }
+        }
+        l.info(null, `Started ${nodeCount} node${nodeCount > 1 ? "s" : ""}`, Object.keys(nodes));
+    }
     for (const functionName of Object.keys(procedures)) {
         if (typeof functionName !== "string") {
             throw new Error(`[SWARPC Client] Invalid function name, don't use symbols`);
         }
-        const send = async (requestId, msg, options) => {
+        const send = async (node, nodeId, requestId, msg, options) => {
             const ctx = {
                 logger: l,
-                worker,
+                node,
+                nodeId,
                 hooks,
                 localStorage,
             };
@@ -55,15 +73,20 @@ export function Client(procedures, { worker, loglevel = "debug", restartListener
             }, options);
         };
         // Set the method on the instance
-        const _runProcedure = async (input, onProgress = () => { }, reqid) => {
+        const _runProcedure = async (input, onProgress = () => { }, reqid, nodeId) => {
             // Validate the input against the procedure's input schema
             procedures[functionName].input.assert(input);
             const requestId = reqid ?? makeRequestId();
+            // Choose which node to use
+            nodeId ??= whoToSendTo(nodes, pendingRequests);
+            const node = nodes && nodeId ? nodes[nodeId] : undefined;
+            const l = createLogger("client", loglevel, nodeId ?? "(SW)", requestId);
             return new Promise((resolve, reject) => {
                 // Store promise handlers (as well as progress updates handler)
                 // so the client listener can resolve/reject the promise (and react to progress updates)
                 // when the server sends messages back
                 pendingRequests.set(requestId, {
+                    nodeId,
                     functionName,
                     resolve,
                     onProgress,
@@ -73,25 +96,36 @@ export function Client(procedures, { worker, loglevel = "debug", restartListener
                     ? findTransferables(input)
                     : [];
                 // Post the message to the server
-                l.debug(requestId, `Requesting ${functionName} with`, input);
-                return send(requestId, { input }, { transfer })
+                l.debug(`Requesting ${functionName} with`, input);
+                return send(node, nodeId, requestId, { input }, { transfer })
                     .then(() => { })
                     .catch(reject);
             });
         };
         // @ts-expect-error
         instance[functionName] = _runProcedure;
+        instance[functionName].broadcast = async (input, onProgress, nodesCount) => {
+            let nodesToUse = [undefined];
+            if (nodes)
+                nodesToUse = Object.keys(nodes);
+            if (nodesCount)
+                nodesToUse = nodesToUse.slice(0, nodesCount);
+            const results = await Promise.allSettled(nodesToUse.map(async (id) => _runProcedure(input, onProgress, undefined, id)));
+            return results.map((r, i) => ({ ...r, node: nodesToUse[i] ?? "(SW)" }));
+        };
         instance[functionName].cancelable = (input, onProgress) => {
             const requestId = makeRequestId();
+            const nodeId = whoToSendTo(nodes, pendingRequests);
+            const l = createLogger("client", loglevel, nodeId ?? "(SW)", requestId);
             return {
-                request: _runProcedure(input, onProgress, requestId),
+                request: _runProcedure(input, onProgress, requestId, nodeId),
                 cancel(reason) {
                     if (!pendingRequests.has(requestId)) {
                         l.warn(requestId, `Cannot cancel ${functionName} request, it has already been resolved or rejected`);
                         return;
                     }
                     l.debug(requestId, `Cancelling ${functionName} with`, reason);
-                    postMessageSync(l, worker, {
+                    postMessageSync(l, nodeId ? nodes?.[nodeId] : undefined, {
                         by: "sw&rpc",
                         requestId,
                         functionName,
@@ -110,7 +144,7 @@ export function Client(procedures, { worker, loglevel = "debug", restartListener
  */
 async function postMessage(ctx, message, options) {
     await startClientListener(ctx);
-    const { logger: l, worker } = ctx;
+    const { logger: l, node: worker } = ctx;
     if (!worker && !navigator.serviceWorker.controller)
         l.warn("", "Service Worker is not controlling the page");
     // If no worker is provided, we use the service worker
@@ -134,7 +168,7 @@ async function postMessage(ctx, message, options) {
  */
 export function postMessageSync(l, worker, message, options) {
     if (!worker && !navigator.serviceWorker.controller)
-        l.warn("", "Service Worker is not controlling the page");
+        l.warn("Service Worker is not controlling the page");
     // If no worker is provided, we use the service worker
     const w = worker instanceof SharedWorker
         ? worker.port
@@ -152,9 +186,9 @@ export function postMessageSync(l, worker, message, options) {
  * @returns
  */
 export async function startClientListener(ctx) {
-    if (_clientListenerStarted)
+    if (_clientListenerStarted.has(ctx.nodeId ?? "(SW)"))
         return;
-    const { logger: l, worker } = ctx;
+    const { logger: l, node: worker } = ctx;
     // Get service worker registration if no worker is provided
     if (!worker) {
         const sw = await navigator.serviceWorker.ready;
@@ -177,7 +211,7 @@ export async function startClientListener(ctx) {
         // We don't use a arktype schema here, we trust the server to send valid data
         const payload = eventData;
         // Ignore #initialize request, it's client->server only
-        if ("localStorageData" in payload) {
+        if ("isInitializeRequest" in payload) {
             l.warn(null, "Ignoring unexpected #initialize from server", payload);
             return;
         }
@@ -215,12 +249,14 @@ export async function startClientListener(ctx) {
     else {
         w.addEventListener("message", listener);
     }
-    _clientListenerStarted = true;
+    _clientListenerStarted.add(ctx.nodeId ?? "(SW)");
     // Recursive terminal case is ensured by calling this *after* _clientListenerStarted is set to true: startClientListener() will therefore not be called in postMessage() again.
     await postMessage(ctx, {
         by: "sw&rpc",
         functionName: "#initialize",
+        isInitializeRequest: true,
         localStorageData: ctx.localStorage,
+        nodeId: ctx.nodeId ?? "(SW)",
     });
 }
 /**

package/dist/index.d.ts

@@ -2,6 +2,7 @@
  * @module
  * @mergeModuleWith <project>
  */
+import "./polyfills.js";
 export * from "./client.js";
 export * from "./server.js";
 export type { ProceduresMap, CancelablePromise } from "./types.js";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,cAAc,aAAa,CAAA;AAC3B,cAAc,aAAa,CAAA;AAC3B,YAAY,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,gBAAgB,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,YAAY,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC"}

package/dist/index.js

@@ -2,5 +2,6 @@
  * @module
  * @mergeModuleWith <project>
  */
+import "./polyfills.js";
 export * from "./client.js";
 export * from "./server.js";

package/dist/localstorage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"localstorage.d.ts","sourceRoot":"","sources":["../src/localstorage.ts"],"names":[],"mappings":"AAAA,qBAAa,gBAAgB;IAC3B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;IACzB,SAAS,EAAE,MAAM,EAAE,CAAA;gBAEP,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAKrC,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAKlC,OAAO,CAAC,GAAG,EAAE,MAAM;IAInB,OAAO,CAAC,GAAG,EAAE,MAAM;IAInB,UAAU,CAAC,GAAG,EAAE,MAAM;IAMtB,KAAK;IAKL,GAAG,CAAC,KAAK,EAAE,MAAM;IAIjB,IAAI,MAAM,WAET;IAED,QAAQ,CAAC,OAAO,EAAE,iBAAiB,GAAG,uBAAuB;CAI9D"}
+{"version":3,"file":"localstorage.d.ts","sourceRoot":"","sources":["../src/localstorage.ts"],"names":[],"mappings":"AAAA,qBAAa,gBAAgB;IAC3B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,SAAS,EAAE,MAAM,EAAE,CAAC;gBAER,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAKrC,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAKlC,OAAO,CAAC,GAAG,EAAE,MAAM;IAInB,OAAO,CAAC,GAAG,EAAE,MAAM;IAInB,UAAU,CAAC,GAAG,EAAE,MAAM;IAMtB,KAAK;IAKL,GAAG,CAAC,KAAK,EAAE,MAAM;IAIjB,IAAI,MAAM,WAET;IAED,QAAQ,CAAC,OAAO,EAAE,iBAAiB,GAAG,uBAAuB;CAI9D"}

package/dist/log.d.ts

@@ -5,8 +5,8 @@
 /**
  * @ignore
  */
-export declare function createLogger(side: "server" | "client", level: LogLevel): Logger;
-export declare function createLogger(side: "server" | "client", level: LogLevel, rqid: string): RequestBoundLogger;
+export declare function createLogger(side: "server" | "client", level: LogLevel, nid?: string): Logger;
+export declare function createLogger(side: "server" | "client", level: LogLevel, nid: string, rqid: string): RequestBoundLogger;
 /**
  * @ignore
  */
@@ -23,6 +23,12 @@ export type RequestBoundLogger = {
     error: (message: string, ...args: any[]) => void;
 };
 /** @source */
-export declare const LOG_LEVELS: readonly ["debug", "info", "warn", "error"];
+declare const LOG_LEVELS: readonly ["debug", "info", "warn", "error"];
 export type LogLevel = (typeof LOG_LEVELS)[number];
+/**
+ *
+ * @param scope
+ */
+export declare function injectIntoConsoleGlobal(scope: WorkerGlobalScope | SharedWorkerGlobalScope, nodeId: string): void;
+export {};
 //# sourceMappingURL=log.d.ts.map

package/dist/log.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../src/log.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;GAEG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ,EAAE,KAAK,EAAE,QAAQ,GAAG,MAAM,CAAA;AAChF,wBAAgB,YAAY,CAC1B,IAAI,EAAE,QAAQ,GAAG,QAAQ,EACzB,KAAK,EAAE,QAAQ,EACf,IAAI,EAAE,MAAM,GACX,kBAAkB,CAAA;AAyBrB;;GAEG;AACH,MAAM,MAAM,MAAM,GAAG;IACnB,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IACrE,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IACpE,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IACpE,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;CACtE,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IAChD,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IAC/C,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;IAC/C,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAA;CACjD,CAAA;AAED,cAAc;AACd,eAAO,MAAM,UAAU,6CAA8C,CAAA;AAErE,MAAM,MAAM,QAAQ,GAAG,CAAC,OAAO,UAAU,CAAC,CAAC,MAAM,CAAC,CAAA"}
+{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../src/log.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;GAEG;AACH,wBAAgB,YAAY,CAC1B,IAAI,EAAE,QAAQ,GAAG,QAAQ,EACzB,KAAK,EAAE,QAAQ,EACf,GAAG,CAAC,EAAE,MAAM,GACX,MAAM,CAAC;AACV,wBAAgB,YAAY,CAC1B,IAAI,EAAE,QAAQ,GAAG,QAAQ,EACzB,KAAK,EAAE,QAAQ,EACf,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,GACX,kBAAkB,CAAC;AA2BtB;;GAEG;AACH,MAAM,MAAM,MAAM,GAAG;IACnB,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;IACtE,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;IACrE,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;IACrE,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;CACvE,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;IACjD,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;IAChD,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;IAChD,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;CAClD,CAAC;AAEF,cAAc;AACd,QAAA,MAAM,UAAU,6CAA8C,CAAC;AAE/D,MAAM,MAAM,QAAQ,GAAG,CAAC,OAAO,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC;AA8EnD;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,iBAAiB,GAAG,uBAAuB,EAClD,MAAM,EAAE,MAAM,QAKf"}

package/dist/log.js

@@ -2,54 +2,72 @@
  * @module
  * @mergeModuleWith <project>
  */
-export function createLogger(side, level = "debug", rqid) {
+export function createLogger(side, level = "debug", nid, rqid) {
     const lvls = LOG_LEVELS.slice(LOG_LEVELS.indexOf(level));
-    if (rqid) {
+    if (rqid && nid) {
+        const ids = { rqid, nid };
         return {
-            debug: lvls.includes("debug") ? logger("debug", side, rqid) : () => { },
-            info: lvls.includes("info") ? logger("info", side, rqid) : () => { },
-            warn: lvls.includes("warn") ? logger("warn", side, rqid) : () => { },
-            error: lvls.includes("error") ? logger("error", side, rqid) : () => { },
+            debug: lvls.includes("debug") ? logger("debug", side, ids) : () => { },
+            info: lvls.includes("info") ? logger("info", side, ids) : () => { },
+            warn: lvls.includes("warn") ? logger("warn", side, ids) : () => { },
+            error: lvls.includes("error") ? logger("error", side, ids) : () => { },
         };
     }
     return {
-        debug: lvls.includes("debug") ? logger("debug", side) : () => { },
-        info: lvls.includes("info") ? logger("info", side) : () => { },
-        warn: lvls.includes("warn") ? logger("warn", side) : () => { },
-        error: lvls.includes("error") ? logger("error", side) : () => { },
+        debug: lvls.includes("debug") ? logger("debug", side, nid) : () => { },
+        info: lvls.includes("info") ? logger("info", side, nid) : () => { },
+        warn: lvls.includes("warn") ? logger("warn", side, nid) : () => { },
+        error: lvls.includes("error") ? logger("error", side, nid) : () => { },
     };
 }
 /** @source */
-export const LOG_LEVELS = ["debug", "info", "warn", "error"];
-function logger(severity, side, rqid) {
-    if (rqid === undefined) {
-        return (rqid, message, ...args) => log(severity, side, rqid, message, ...args);
+const LOG_LEVELS = ["debug", "info", "warn", "error"];
+const PATCHABLE_LOG_METHODS = [
+    "debug",
+    "info",
+    "warn",
+    "error",
+    "log",
+];
+function logger(method, side, ids) {
+    if (ids === undefined || typeof ids === "string") {
+        const nid = ids ?? null;
+        return (rqid, ...args) => log(method, side, { nid, rqid }, ...args);
     }
-    return (message, ...args) => log(severity, side, rqid, message, ...args);
+    return (...args) => log(method, side, ids, ...args);
 }
+const originalConsole = PATCHABLE_LOG_METHODS.reduce((result, method) => {
+    result[method] = console[method];
+    return result;
+}, {});
 /**
  * Send log messages to the console, with a helpful prefix.
- * @param severity
+ * @param method
  * @param side
- * @param rqid request ID
- * @param message
+ * @param ids request ID and node ID
  * @param args passed to console methods directly
  */
-function log(severity, side, rqid, message, ...args) {
-    const prefix = "[" +
-        ["SWARPC", side, rqid ? `%c${rqid}%c` : ""].filter(Boolean).join(" ") +
-        "]";
-    const prefixStyles = rqid ? ["color: cyan;", "color: inherit;"] : [];
-    if (severity === "debug") {
-        console.debug(prefix, ...prefixStyles, message, ...args);
-    }
-    else if (severity === "info") {
-        console.info(prefix, ...prefixStyles, message, ...args);
-    }
-    else if (severity === "warn") {
-        console.warn(prefix, ...prefixStyles, message, ...args);
-    }
-    else if (severity === "error") {
-        console.error(prefix, ...prefixStyles, message, ...args);
+function log(method, side, { rqid, nid }, ...args) {
+    const prefix = [
+        `[SWARPC ${side}]`,
+        rqid ? `%c${rqid}%c` : "",
+        nid ? `%c@ ${nid}%c` : "",
+    ]
+        .filter(Boolean)
+        .join(" ");
+    const prefixStyles = [];
+    if (rqid)
+        prefixStyles.push("color: cyan", "color: inherit");
+    if (nid)
+        prefixStyles.push("color: hotpink", "color: inherit");
+    return originalConsole[method](prefix, ...prefixStyles, ...args);
+}
+/**
+ *
+ * @param scope
+ */
+export function injectIntoConsoleGlobal(scope, nodeId) {
+    for (const method of PATCHABLE_LOG_METHODS) {
+        scope.self.console[method] = logger(method, "server", nodeId);
     }
 }

package/dist/nodes.d.ts

@@ -0,0 +1,12 @@
+import { PendingRequest } from "./client.js";
+/**
+ * Returns to which node to send the next request, given the state of the currently pending requests
+ */
+export declare function whoToSendTo(nodes: undefined | Record<string, unknown>, requests: Map<string, PendingRequest>): undefined | string;
+export declare function nodeIdFromScope(scope: WorkerGlobalScope, _scopeType?: "dedicated" | "shared" | "service"): string;
+/**
+ * Generate a random request ID, used to identify nodes in the client
+ * @source
+ */
+export declare function makeNodeId(): string;
+//# sourceMappingURL=nodes.d.ts.map

package/dist/nodes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"nodes.d.ts","sourceRoot":"","sources":["../src/nodes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAG7C;;GAEG;AACH,wBAAgB,WAAW,CACzB,KAAK,EAAE,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC1C,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,GACpC,SAAS,GAAG,MAAM,CA0BpB;AAED,wBAAgB,eAAe,CAC7B,KAAK,EAAE,iBAAiB,EACxB,UAAU,CAAC,EAAE,WAAW,GAAG,QAAQ,GAAG,SAAS,GAC9C,MAAM,CAMR;AAED;;;GAGG;AACH,wBAAgB,UAAU,IAAI,MAAM,CAEnC"}

package/dist/nodes.js

@@ -0,0 +1,36 @@
+import { scopeIsDedicated, scopeIsShared } from "./scopes.js";
+/**
+ * Returns to which node to send the next request, given the state of the currently pending requests
+ */
+export function whoToSendTo(nodes, requests) {
+    if (!nodes)
+        return undefined;
+    let chosen = Object.keys(nodes)[0];
+    const requestsPerNode = Map.groupBy(requests.values(), (req) => req.nodeId);
+    for (const node of Object.keys(nodes)) {
+        if (!requestsPerNode.has(node))
+            requestsPerNode.set(node, []);
+    }
+    for (const [node, reqs] of requestsPerNode.entries()) {
+        if (!node)
+            continue;
+        // Send to the least busy node
+        if (reqs.length < requestsPerNode.get(chosen).length)
+            chosen = node;
+    }
+    console.debug("[SWARPC Load balancer] Choosing", chosen, "load map is", requestsPerNode);
+    return chosen;
+}
+export function nodeIdFromScope(scope, _scopeType) {
+    if (scopeIsDedicated(scope, _scopeType) || scopeIsShared(scope, _scopeType)) {
+        return scope.name;
+    }
+    return "(SW)";
+}
+/**
+ * Generate a random request ID, used to identify nodes in the client
+ * @source
+ */
+export function makeNodeId() {
+    return "N" + Math.random().toString(16).substring(2, 5).toUpperCase();
+}

package/dist/polyfills.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=polyfills.d.ts.map

package/dist/polyfills.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"polyfills.d.ts","sourceRoot":"","sources":["../src/polyfills.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,CAAC"}

package/dist/polyfills.js

@@ -0,0 +1,20 @@
+/**
+ * Groups elements from an iterable into a Map based on a callback function.
+ *
+ * @template K, T
+ * @param {Iterable<T>} iterable - The iterable to group.
+ * @param {function(T, number): K} callbackfn - The callback function to
+ * determine the grouping key.
+ * @returns {Map<K, T[]>} A Map where keys are the grouping keys and values are
+ * arrays of grouped elements.
+ */
+Map.groupBy ??= function groupBy(iterable, callbackfn) {
+    const map = new Map();
+    let i = 0;
+    for (const value of iterable) {
+        const key = callbackfn(value, i++), list = map.get(key);
+        list ? list.push(value) : map.set(key, [value]);
+    }
+    return map;
+};
+export {};

package/dist/scopes.d.ts

@@ -0,0 +1,4 @@
+export declare function scopeIsShared(scope: WorkerGlobalScope, _scopeType?: "dedicated" | "shared" | "service"): scope is SharedWorkerGlobalScope;
+export declare function scopeIsDedicated(scope: WorkerGlobalScope, _scopeType?: "dedicated" | "shared" | "service"): scope is DedicatedWorkerGlobalScope;
+export declare function scopeIsService(scope: WorkerGlobalScope, _scopeType?: "dedicated" | "shared" | "service"): scope is ServiceWorkerGlobalScope;
+//# sourceMappingURL=scopes.d.ts.map

package/dist/scopes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"scopes.d.ts","sourceRoot":"","sources":["../src/scopes.ts"],"names":[],"mappings":"AAaA,wBAAgB,aAAa,CAC3B,KAAK,EAAE,iBAAiB,EACxB,UAAU,CAAC,EAAE,WAAW,GAAG,QAAQ,GAAG,SAAS,GAC9C,KAAK,IAAI,uBAAuB,CAElC;AAED,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,iBAAiB,EACxB,UAAU,CAAC,EAAE,WAAW,GAAG,QAAQ,GAAG,SAAS,GAC9C,KAAK,IAAI,0BAA0B,CAIrC;AAED,wBAAgB,cAAc,CAC5B,KAAK,EAAE,iBAAiB,EACxB,UAAU,CAAC,EAAE,WAAW,GAAG,QAAQ,GAAG,SAAS,GAC9C,KAAK,IAAI,wBAAwB,CAEnC"}

package/dist/scopes.js

@@ -0,0 +1,15 @@
+class MockedWorkerGlobalScope {
+    constructor() { }
+}
+const SharedWorkerGlobalScope = globalThis.SharedWorkerGlobalScope ?? MockedWorkerGlobalScope;
+const DedicatedWorkerGlobalScope = globalThis.DedicatedWorkerGlobalScope ?? MockedWorkerGlobalScope;
+const ServiceWorkerGlobalScope = globalThis.ServiceWorkerGlobalScope ?? MockedWorkerGlobalScope;
+export function scopeIsShared(scope, _scopeType) {
+    return scope instanceof SharedWorkerGlobalScope || _scopeType === "shared";
+}
+export function scopeIsDedicated(scope, _scopeType) {
+    return (scope instanceof DedicatedWorkerGlobalScope || _scopeType === "dedicated");
+}
+export function scopeIsService(scope, _scopeType) {
+    return scope instanceof ServiceWorkerGlobalScope || _scopeType === "service";
+}

package/dist/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAgB,KAAK,QAAQ,EAAE,MAAM,UAAU,CAAA;AACtD,OAAO,EACL,kBAAkB,EAMlB,uBAAuB,EACvB,gBAAgB,EAChB,WAAW,EACX,KAAK,aAAa,EACnB,MAAM,YAAY,CAAA;AAiBnB;;;GAGG;AACH,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,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CACvB,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;AAKD;;;;;;;;;;;GAWG;AACH,wBAAgB,MAAM,CAAC,UAAU,SAAS,aAAa,EACrD,UAAU,EAAE,UAAU,EACtB,EACE,QAAkB,EAClB,KAAK,EACL,UAAU,GACX,GAAE;IACD,KAAK,CAAC,EAAE,iBAAiB,CAAA;IACzB,QAAQ,CAAC,EAAE,QAAQ,CAAA;IACnB,UAAU,CAAC,EAAE,WAAW,GAAG,QAAQ,GAAG,SAAS,CAAA;CAC3C,GACL,YAAY,CAAC,UAAU,CAAC,CA0N1B"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAyC,KAAK,QAAQ,EAAE,MAAM,UAAU,CAAC;AAChF,OAAO,EACL,kBAAkB,EAMlB,uBAAuB,EACvB,gBAAgB,EAChB,WAAW,EACX,KAAK,aAAa,EACnB,MAAM,YAAY,CAAC;AAMpB;;;GAGG;AACH,MAAM,MAAM,YAAY,CAAC,UAAU,SAAS,aAAa,IAAI;IAC3D,CAAC,WAAW,CAAC,EAAE,UAAU,CAAC;IAC1B,CAAC,gBAAgB,CAAC,EAAE,kBAAkB,CAAC,UAAU,CAAC,CAAC;IACnD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB,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;AAKF;;;;;;;;;;;GAWG;AACH,wBAAgB,MAAM,CAAC,UAAU,SAAS,aAAa,EACrD,UAAU,EAAE,UAAU,EACtB,EACE,QAAkB,EAClB,KAAK,EACL,UAAU,GACX,GAAE;IACD,KAAK,CAAC,EAAE,iBAAiB,CAAC;IAC1B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,UAAU,CAAC,EAAE,WAAW,GAAG,QAAQ,GAAG,SAAS,CAAC;CAC5C,GACL,YAAY,CAAC,UAAU,CAAC,CA6M1B"}

package/dist/server.js

@@ -4,16 +4,12 @@
  */
 /// <reference lib="webworker" />
 import { type } from "arktype";
-import { createLogger } from "./log.js";
+import { createLogger, injectIntoConsoleGlobal } from "./log.js";
 import { PayloadHeaderSchema, PayloadInitializeSchema, PayloadSchema, zImplementations, zProcedures, } from "./types.js";
 import { findTransferables } from "./utils.js";
 import { FauxLocalStorage } from "./localstorage.js";
-class MockedWorkerGlobalScope {
-    constructor() { }
-}
-const SharedWorkerGlobalScope = globalThis.SharedWorkerGlobalScope ?? MockedWorkerGlobalScope;
-const DedicatedWorkerGlobalScope = globalThis.DedicatedWorkerGlobalScope ?? MockedWorkerGlobalScope;
-const ServiceWorkerGlobalScope = globalThis.ServiceWorkerGlobalScope ?? MockedWorkerGlobalScope;
+import { scopeIsDedicated, scopeIsShared, scopeIsService } from "./scopes.js";
+import { nodeIdFromScope } from "./nodes.js";
 const abortControllers = new Map();
 const abortedRequests = new Set();
 /**
@@ -29,19 +25,12 @@ const abortedRequests = new Set();
  * {@includeCode ../example/src/service-worker.ts}
  */
 export function Server(procedures, { loglevel = "debug", scope, _scopeType, } = {}) {
-    const l = createLogger("server", loglevel);
     // If scope is not provided, use the global scope
     // This function is meant to be used in a worker, so `self` is a WorkerGlobalScope
     scope ??= self;
-    function scopeIsShared(scope) {
-        return scope instanceof SharedWorkerGlobalScope || _scopeType === "shared";
-    }
-    function scopeIsDedicated(scope) {
-        return (scope instanceof DedicatedWorkerGlobalScope || _scopeType === "dedicated");
-    }
-    function scopeIsService(scope) {
-        return scope instanceof ServiceWorkerGlobalScope || _scopeType === "service";
-    }
+    // Service workers don't have a name, but it's fine anyways cuz we don't have multiple nodes when running with a SW
+    const nodeId = nodeIdFromScope(scope, _scopeType);
+    const l = createLogger("server", loglevel, nodeId);
     // Initialize the instance.
     // Procedures and implementations are stored on properties with symbol keys,
     // to avoid any conflicts with procedure names, and also discourage direct access to them.
@@ -60,7 +49,7 @@ export function Server(procedures, { loglevel = "debug", scope, _scopeType, } =
                 tools.abortSignal?.throwIfAborted();
                 return new Promise((resolve, reject) => {
                     tools.abortSignal?.addEventListener("abort", () => {
-                        let { requestId, reason } = tools.abortSignal?.reason;
+                        let { requestId, reason } = tools.abortSignal.reason;
                         l.debug(requestId, `Aborted ${functionName} request: ${reason}`);
                         reject({ aborted: reason });
                     });
@@ -71,7 +60,7 @@ export function Server(procedures, { loglevel = "debug", scope, _scopeType, } =
     }
     instance.start = async () => {
         const port = await new Promise((resolve) => {
-            if (!scopeIsShared(scope))
+            if (!scopeIsShared(scope, _scopeType))
                 return resolve(undefined);
             l.debug(null, "Awaiting shared worker connection...");
             scope.addEventListener("connect", ({ ports: [port] }) => {
@@ -85,10 +74,10 @@ export function Server(procedures, { loglevel = "debug", scope, _scopeType, } =
             if (port) {
                 port.postMessage(data, { transfer });
             }
-            else if (scopeIsDedicated(scope)) {
+            else if (scopeIsDedicated(scope, _scopeType)) {
                 scope.postMessage(data, { transfer });
             }
-            else if (scopeIsService(scope)) {
+            else if (scopeIsService(scope, _scopeType)) {
                 await scope.clients.matchAll().then((clients) => {
                     clients.forEach((client) => client.postMessage(data, { transfer }));
                 });
@@ -96,9 +85,10 @@ export function Server(procedures, { loglevel = "debug", scope, _scopeType, } =
         };
         const listener = async (event) => {
             if (PayloadInitializeSchema.allows(event.data)) {
-                const { localStorageData } = event.data;
+                const { localStorageData, nodeId } = event.data;
                 l.debug(null, "Setting up faux localStorage", localStorageData);
                 new FauxLocalStorage(localStorageData).register(scope);
+                injectIntoConsoleGlobal(scope, nodeId);
                 return;
             }
             // Decode the payload
@@ -131,7 +121,7 @@ export function Server(procedures, { loglevel = "debug", scope, _scopeType, } =
             }
             // Define payload schema for incoming messages
             const payload = PayloadSchema(type(`"${functionName}"`), schemas.input, schemas.progress, schemas.success).assert(event.data);
-            if ("localStorageData" in payload)
+            if ("isInitializeRequest" in payload)
                 throw "Unreachable: #initialize request payload should've been handled already";
             // Handle abortion requests (pro-choice ftw!!)
             if (payload.abort) {
@@ -150,11 +140,12 @@ export function Server(procedures, { loglevel = "debug", scope, _scopeType, } =
             try {
                 // Call the implementation with the input and a progress callback
                 const result = await implementation(payload.input, async (progress) => {
-                    l.debug(requestId, `Progress for ${functionName}`, progress);
+                    // l.debug(requestId, `Progress for ${functionName}`, progress);
                     await postMsg({ progress });
                 }, {
+                    nodeId,
                     abortSignal: abortControllers.get(requestId)?.signal,
-                    logger: createLogger("server", loglevel, requestId),
+                    logger: createLogger("server", loglevel, nodeId, requestId),
                 });
                 // Send results
                 l.debug(requestId, `Result for ${functionName}`, result);
@@ -177,17 +168,17 @@ export function Server(procedures, { loglevel = "debug", scope, _scopeType, } =
             }
         };
         // Listen for messages from the client
-        if (scopeIsShared(scope)) {
+        if (scopeIsShared(scope, _scopeType)) {
             if (!port)
                 throw new Error("SharedWorker port not initialized");
-            console.log("Listening for shared worker messages on port", port);
+            l.info(null, "Listening for shared worker messages on port", port);
             port.addEventListener("message", listener);
             port.start();
         }
-        else if (scopeIsDedicated(scope)) {
+        else if (scopeIsDedicated(scope, _scopeType)) {
             scope.addEventListener("message", listener);
         }
-        else if (scopeIsService(scope)) {
+        else if (scopeIsService(scope, _scopeType)) {
             scope.addEventListener("message", listener);
         }
         else {