swarpc 0.12.0 → 0.14.0

package/README.md

@@ -24,7 +24,11 @@ RPC for Service Workers -- move that heavy computation off of your UI thread!
 npm add swarpc arktype
 ```
 
-### Bleeding edge
+ <details>
+<summary>
+Bleeding edge
+
+</summary>
 
 If you want to use the latest commit instead of a published version, you can, either by using the Git URL:
 
@@ -42,6 +46,8 @@ npm add file:vendored/swarpc
 
 This works thanks to the fact that `dist/` is published on the repository (and kept up to date with a CI workflow).
 
+</details>
+
 ## Usage
 
 ### 1. Declare your procedures in a shared file

package/dist/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAEL,kBAAkB,EAClB,KAAK,MAAM,EACX,KAAK,QAAQ,EACd,MAAM,UAAU,CAAC;AAElB,OAAO,EACL,YAAY,EACZ,KAAK,EACL,OAAO,EAEP,iBAAiB,EACjB,WAAW,EACX,KAAK,aAAa,EACnB,MAAM,YAAY,CAAC;AAGpB;;;;GAIG;AACH,MAAM,MAAM,YAAY,CAAC,UAAU,SAAS,aAAa,IAAI;IAC3D,CAAC,WAAW,CAAC,EAAE,UAAU,CAAC;CAC3B,GAAG;KACD,CAAC,IAAI,MAAM,UAAU,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;CACrD,CAAC;AAEF;;GAEG;AACH,KAAK,OAAO,CAAC,UAAU,SAAS,aAAa,IAAI;IAC/C,oCAAoC;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,sBAAsB;IACtB,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAAC;IACxC,gCAAgC;IAChC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,kCAAkC;IAClC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IACzB,0EAA0E;IAC1E,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACnC,CAAC;AAQF,MAAM,MAAM,cAAc,GAAG;IAC3B,sFAAsF;IACtF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,CAAC;IAC7B,UAAU,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,IAAI,CAAC;IACpC,OAAO,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;CAChC,CAAC;AAKF,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;AAEzD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,MAAM,CAAC,UAAU,SAAS,aAAa,EACrD,UAAU,EAAE,UAAU,EACtB,EACE,MAAM,EACN,KAAK,EAAE,SAAS,EAChB,QAAkB,EAClB,eAAuB,EACvB,KAAU,EACV,YAAiB,GAClB,GAAE;IACD,MAAM,CAAC,EAAE,iBAAiB,GAAG,MAAM,CAAC;IACpC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IAC1B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC/B,GACL,YAAY,CAAC,UAAU,CAAC,CAgK1B;AAiCD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,UAAU,SAAS,aAAa,EAC9D,CAAC,EAAE,kBAAkB,EACrB,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,EACzC,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,EAC5B,OAAO,CAAC,EAAE,0BAA0B,GACnC,IAAI,CAiBN;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,UAAU,SAAS,aAAa,EACxE,GAAG,EAAE,OAAO,CAAC,UAAU,CAAC,iBAoFzB;AAED;;;;GAIG;AACH,wBAAgB,aAAa,IAAI,MAAM,CAEtC"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAEL,kBAAkB,EAClB,KAAK,MAAM,EACX,KAAK,QAAQ,EACd,MAAM,UAAU,CAAC;AAElB,OAAO,EACL,YAAY,EACZ,KAAK,EACL,OAAO,EAEP,iBAAiB,EACjB,WAAW,EACX,KAAK,aAAa,EACnB,MAAM,YAAY,CAAC;AAGpB;;;;GAIG;AACH,MAAM,MAAM,YAAY,CAAC,UAAU,SAAS,aAAa,IAAI;IAC3D,CAAC,WAAW,CAAC,EAAE,UAAU,CAAC;CAC3B,GAAG;KACD,CAAC,IAAI,MAAM,UAAU,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;CACrD,CAAC;AAEF;;GAEG;AACH,KAAK,OAAO,CAAC,UAAU,SAAS,aAAa,IAAI;IAC/C,oCAAoC;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,sBAAsB;IACtB,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAAC;IACxC,gCAAgC;IAChC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,kCAAkC;IAClC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IACzB,0EAA0E;IAC1E,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACnC,CAAC;AAQF,MAAM,MAAM,cAAc,GAAG;IAC3B,sFAAsF;IACtF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,CAAC;IAC7B,UAAU,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,IAAI,CAAC;IACpC,OAAO,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;CAChC,CAAC;AAKF,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;AAEzD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,MAAM,CAAC,UAAU,SAAS,aAAa,EACrD,UAAU,EAAE,UAAU,EACtB,EACE,MAAM,EACN,KAAK,EAAE,SAAS,EAChB,QAAkB,EAClB,eAAuB,EACvB,KAAU,EACV,YAAiB,GAClB,GAAE;IACD,MAAM,CAAC,EAAE,iBAAiB,GAAG,MAAM,CAAC;IACpC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IAC1B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC/B,GACL,YAAY,CAAC,UAAU,CAAC,CA2K1B;AAiCD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,UAAU,SAAS,aAAa,EAC9D,CAAC,EAAE,kBAAkB,EACrB,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,EACzC,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,EAC5B,OAAO,CAAC,EAAE,0BAA0B,GACnC,IAAI,CAiBN;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,UAAU,SAAS,aAAa,EACxE,GAAG,EAAE,OAAO,CAAC,UAAU,CAAC,iBAsFzB;AAED;;;;GAIG;AACH,wBAAgB,aAAa,IAAI,MAAM,CAEtC"}

package/dist/client.js

@@ -3,7 +3,7 @@
  * @mergeModuleWith <project>
  */
 import { createLogger, } from "./log.js";
-import { makeNodeId, whoToSendTo } from "./nodes.js";
+import { makeNodeId, nodeIdOrSW, whoToSendTo } from "./nodes.js";
 import { zProcedures, } from "./types.js";
 import { findTransferables } from "./utils.js";
 /**
@@ -80,7 +80,7 @@ export function Client(procedures, { worker, nodes: nodeCount, loglevel = "debug
             // Choose which node to use
             nodeId ??= whoToSendTo(nodes, pendingRequests);
             const node = nodes && nodeId ? nodes[nodeId] : undefined;
-            const l = createLogger("client", loglevel, nodeId ?? "(SW)", requestId);
+            const l = createLogger("client", loglevel, nodeIdOrSW(nodeId), 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)
@@ -104,19 +104,28 @@ export function Client(procedures, { worker, nodes: nodeCount, loglevel = "debug
         };
         // @ts-expect-error
         instance[functionName] = _runProcedure;
-        instance[functionName].broadcast = async (input, onProgress, nodesCount) => {
+        instance[functionName].broadcast = async (input, onProgresses, 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)" }));
+            const progresses = new Map();
+            function onProgress(nodeId) {
+                if (!onProgresses)
+                    return (_) => { };
+                return (progress) => {
+                    progresses.set(nodeIdOrSW(nodeId), progress);
+                    onProgresses(progresses);
+                };
+            }
+            const results = await Promise.allSettled(nodesToUse.map(async (id) => _runProcedure(input, onProgress(id), undefined, id)));
+            return results.map((r, i) => ({ ...r, node: nodeIdOrSW(nodesToUse[i]) }));
         };
         instance[functionName].cancelable = (input, onProgress) => {
             const requestId = makeRequestId();
             const nodeId = whoToSendTo(nodes, pendingRequests);
-            const l = createLogger("client", loglevel, nodeId ?? "(SW)", requestId);
+            const l = createLogger("client", loglevel, nodeIdOrSW(nodeId), requestId);
             return {
                 request: _runProcedure(input, onProgress, requestId, nodeId),
                 cancel(reason) {
@@ -186,7 +195,7 @@ export function postMessageSync(l, worker, message, options) {
  * @returns
  */
 export async function startClientListener(ctx) {
-    if (_clientListenerStarted.has(ctx.nodeId ?? "(SW)"))
+    if (_clientListenerStarted.has(nodeIdOrSW(ctx.nodeId)))
         return;
     const { logger: l, node: worker } = ctx;
     // Get service worker registration if no worker is provided
@@ -211,7 +220,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;
         }
@@ -249,12 +258,14 @@ export async function startClientListener(ctx) {
     else {
         w.addEventListener("message", listener);
     }
-    _clientListenerStarted.add(ctx.nodeId ?? "(SW)");
+    _clientListenerStarted.add(nodeIdOrSW(ctx.nodeId));
     // 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: nodeIdOrSW(ctx.nodeId),
     });
 }
 /**

package/dist/log.d.ts

@@ -25,5 +25,10 @@ export type RequestBoundLogger = {
 /** @source */
 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,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"}
+{"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

@@ -22,22 +22,32 @@ export function createLogger(side, level = "debug", nid, rqid) {
 }
 /** @source */
 const LOG_LEVELS = ["debug", "info", "warn", "error"];
-function logger(severity, side, ids) {
+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, message, ...args) => log(severity, side, { nid, rqid }, message, ...args);
+        return (rqid, ...args) => log(method, side, { nid, rqid }, ...args);
     }
-    return (message, ...args) => log(severity, side, ids, 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 ids request ID and node ID
- * @param message
  * @param args passed to console methods directly
  */
-function log(severity, side, { rqid, nid }, message, ...args) {
+function log(method, side, { rqid, nid }, ...args) {
     const prefix = [
         `[SWARPC ${side}]`,
         rqid ? `%c${rqid}%c` : "",
@@ -50,16 +60,14 @@ function log(severity, side, { rqid, nid }, message, ...args) {
         prefixStyles.push("color: cyan", "color: inherit");
     if (nid)
         prefixStyles.push("color: hotpink", "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);
+    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

@@ -9,4 +9,7 @@ export declare function nodeIdFromScope(scope: WorkerGlobalScope, _scopeType?: "
  * @source
  */
 export declare function makeNodeId(): string;
+export declare const serviceWorkerNodeId: "(SW)";
+export declare function isServiceWorkerNodeId(id: string): id is "(SW)";
+export declare function nodeIdOrSW(id: string | undefined): string | typeof serviceWorkerNodeId;
 //# sourceMappingURL=nodes.d.ts.map

package/dist/nodes.d.ts.map

@@ -1 +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"}
+{"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;AAED,eAAO,MAAM,mBAAmB,EAAG,MAAe,CAAC;AAEnD,wBAAgB,qBAAqB,CAAC,EAAE,EAAE,MAAM,gBAE/C;AAED,wBAAgB,UAAU,CACxB,EAAE,EAAE,MAAM,GAAG,SAAS,GACrB,MAAM,GAAG,OAAO,mBAAmB,CAErC"}

package/dist/nodes.js

@@ -34,3 +34,10 @@ export function nodeIdFromScope(scope, _scopeType) {
 export function makeNodeId() {
     return "N" + Math.random().toString(16).substring(2, 5).toUpperCase();
 }
+export const serviceWorkerNodeId = "(SW)"; // Fixed ID for the service worker, as there's only one
+export function isServiceWorkerNodeId(id) {
+    return id === serviceWorkerNodeId;
+}
+export function nodeIdOrSW(id) {
+    return id ?? serviceWorkerNodeId;
+}

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,CAAC;AACvD,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,CA2M1B"}
+{"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,7 +4,7 @@
  */
 /// <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";
@@ -85,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
@@ -120,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) {
@@ -142,6 +143,7 @@ export function Server(procedures, { loglevel = "debug", scope, _scopeType, } =
                     // l.debug(requestId, `Progress for ${functionName}`, progress);
                     await postMsg({ progress });
                 }, {
+                    nodeId,
                     abortSignal: abortControllers.get(requestId)?.signal,
                     logger: createLogger("server", loglevel, nodeId, requestId),
                 });

package/dist/types.d.ts

@@ -74,6 +74,10 @@ tools: {
      * Logger instance to use for logging messages related to this procedure call, using the same format as SWARPC's built-in logging.
      */
     logger: RequestBoundLogger;
+    /**
+     * ID of the Node the request is being processed on.
+     */
+    nodeId: string;
 }) => Promise<S["inferIn"]>;
 /**
  * Declarations of procedures by name.
@@ -108,7 +112,9 @@ export type Hooks<Procedures extends ProceduresMap> = {
 export declare const PayloadInitializeSchema: import("arktype/internal/methods/object.ts").ObjectType<{
     by: "sw&rpc";
     functionName: "#initialize";
+    isInitializeRequest: true;
     localStorageData: Record<string, unknown>;
+    nodeId: string;
 }, {}>;
 export type PayloadInitialize = typeof PayloadInitializeSchema.infer;
 /**
@@ -187,12 +193,16 @@ export declare const PayloadSchema: import("arktype").Generic<[["Name", string],
         PayloadInitializeSchema: import("arktype/internal/methods/object.ts").ObjectType<{
             by: "sw&rpc";
             functionName: "#initialize";
+            isInitializeRequest: true;
             localStorageData: Record<string, unknown>;
+            nodeId: string;
         }, {}> & {
             readonly " brand": [import("arktype/internal/methods/object.ts").ObjectType<{
                 by: "sw&rpc";
                 functionName: "#initialize";
+                isInitializeRequest: true;
                 localStorageData: Record<string, unknown>;
+                nodeId: string;
             }, {}>, "unparsed"];
         };
     } & {}>;
@@ -220,19 +230,25 @@ export declare const PayloadSchema: import("arktype").Generic<[["Name", string],
         PayloadInitializeSchema: import("arktype/internal/methods/object.ts").ObjectType<{
             by: "sw&rpc";
             functionName: "#initialize";
+            isInitializeRequest: true;
             localStorageData: Record<string, unknown>;
+            nodeId: string;
         }, {}> & {
             readonly " brand": [import("arktype/internal/methods/object.ts").ObjectType<{
                 by: "sw&rpc";
                 functionName: "#initialize";
+                isInitializeRequest: true;
                 localStorageData: Record<string, unknown>;
+                nodeId: string;
             }, {}>, "unparsed"];
         };
     } & {}>;
     PayloadInitializeSchema: {
         by: "sw&rpc";
         functionName: "#initialize";
+        isInitializeRequest: true;
         localStorageData: Record<string, unknown>;
+        nodeId: string;
     };
 }, {
     PayloadCoreSchema: import("arktype/internal/scope.ts").bindGenericToScope<import("@ark/schema").GenericAst<[["I", unknown], ["P", unknown], ["S", unknown]], {
@@ -265,12 +281,16 @@ export declare const PayloadSchema: import("arktype").Generic<[["Name", string],
         PayloadInitializeSchema: import("arktype/internal/methods/object.ts").ObjectType<{
             by: "sw&rpc";
             functionName: "#initialize";
+            isInitializeRequest: true;
             localStorageData: Record<string, unknown>;
+            nodeId: string;
         }, {}> & {
             readonly " brand": [import("arktype/internal/methods/object.ts").ObjectType<{
                 by: "sw&rpc";
                 functionName: "#initialize";
+                isInitializeRequest: true;
                 localStorageData: Record<string, unknown>;
+                nodeId: string;
             }, {}>, "unparsed"];
         };
     } & {}>;
@@ -298,19 +318,25 @@ export declare const PayloadSchema: import("arktype").Generic<[["Name", string],
         PayloadInitializeSchema: import("arktype/internal/methods/object.ts").ObjectType<{
             by: "sw&rpc";
             functionName: "#initialize";
+            isInitializeRequest: true;
             localStorageData: Record<string, unknown>;
+            nodeId: string;
         }, {}> & {
             readonly " brand": [import("arktype/internal/methods/object.ts").ObjectType<{
                 by: "sw&rpc";
                 functionName: "#initialize";
+                isInitializeRequest: true;
                 localStorageData: Record<string, unknown>;
+                nodeId: string;
             }, {}>, "unparsed"];
         };
     } & {}>;
     PayloadInitializeSchema: {
         by: "sw&rpc";
         functionName: "#initialize";
+        isInitializeRequest: true;
         localStorageData: Record<string, unknown>;
+        nodeId: string;
     };
 }>;
 /**
@@ -330,7 +356,9 @@ export type ClientMethod<P extends Procedure<Type, Type, Type>> = ((input: P["in
      * Returns an array of results, one for each node the request was sent to.
      * Each result is a {@link PromiseSettledResult}, with also an additional property, the node ID of the request
      */
-    broadcast: (input: P["input"]["inferIn"], onProgress?: (progress: P["progress"]["inferOut"]) => void, 
+    broadcast: (input: P["input"]["inferIn"], onProgress?: (
+    /** Map of node IDs to their progress updates */
+    progresses: Map<string, P["progress"]["inferOut"]>) => void, 
     /** Number of nodes to send the request to. Leave undefined to send to all nodes */
     nodes?: number) => Promise<Array<PromiseSettledResult<P["success"]["inferOut"]> & {
         node: string;

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/dist/types.js

@@ -6,7 +6,9 @@ import { type } from "arktype";
 export const PayloadInitializeSchema = type({
     by: '"sw&rpc"',
     functionName: '"#initialize"',
+    isInitializeRequest: "true",
     localStorageData: "Record<string, unknown>",
+    nodeId: "string",
 });
 /**
  * @source

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swarpc",
-  "version": "0.12.0",
+  "version": "0.14.0",
   "description": "Full type-safe RPC library for service worker -- move things off of the UI thread with ease!",
   "keywords": [
     "service-workers",
@@ -40,12 +40,14 @@
     "typedoc:withplugins": "npm run typedoc:plugins && npm run typedoc",
     "prepare": "husky"
   },
-  "dependencies": {
+  "peerDependencies": {
     "arktype": "^2.1.22"
   },
   "devDependencies": {
     "@8hobbies/typedoc-plugin-plausible": "^2.2.0",
+    "@playwright/test": "^1.55.0",
     "@vitest/web-worker": "^3.2.4",
+    "date-fns": "^4.1.0",
     "husky": "^9.1.7",
     "kacl": "^1.1.1",
     "knip": "^5.63.1",

package/src/client.ts

@@ -9,7 +9,7 @@ import {
   type Logger,
   type LogLevel,
 } from "./log.js";
-import { makeNodeId, whoToSendTo } from "./nodes.js";
+import { makeNodeId, nodeIdOrSW, whoToSendTo } from "./nodes.js";
 import {
   ClientMethod,
   Hooks,
@@ -186,7 +186,7 @@ export function Client<Procedures extends ProceduresMap>(
       nodeId ??= whoToSendTo(nodes, pendingRequests);
       const node = nodes && nodeId ? nodes[nodeId] : undefined;
 
-      const l = createLogger("client", loglevel, nodeId ?? "(SW)", requestId);
+      const l = createLogger("client", loglevel, nodeIdOrSW(nodeId), requestId);
 
       return new Promise((resolve, reject) => {
         // Store promise handlers (as well as progress updates handler)
@@ -217,26 +217,37 @@ export function Client<Procedures extends ProceduresMap>(
     instance[functionName] = _runProcedure;
     instance[functionName]!.broadcast = async (
       input,
-      onProgress,
+      onProgresses,
       nodesCount,
     ) => {
       let nodesToUse: Array<string | undefined> = [undefined];
       if (nodes) nodesToUse = Object.keys(nodes);
       if (nodesCount) nodesToUse = nodesToUse.slice(0, nodesCount);
 
+      const progresses = new Map<string, unknown>();
+
+      function onProgress(nodeId: string | undefined) {
+        if (!onProgresses) return (_: unknown) => {};
+
+        return (progress: unknown) => {
+          progresses.set(nodeIdOrSW(nodeId), progress);
+          onProgresses(progresses);
+        };
+      }
+
       const results = await Promise.allSettled(
         nodesToUse.map(async (id) =>
-          _runProcedure(input, onProgress, undefined, id),
+          _runProcedure(input, onProgress(id), undefined, id),
         ),
       );
 
-      return results.map((r, i) => ({ ...r, node: nodesToUse[i] ?? "(SW)" }));
+      return results.map((r, i) => ({ ...r, node: nodeIdOrSW(nodesToUse[i]) }));
     };
     instance[functionName]!.cancelable = (input, onProgress) => {
       const requestId = makeRequestId();
       const nodeId = whoToSendTo(nodes, pendingRequests);
 
-      const l = createLogger("client", loglevel, nodeId ?? "(SW)", requestId);
+      const l = createLogger("client", loglevel, nodeIdOrSW(nodeId), requestId);
 
       return {
         request: _runProcedure(input, onProgress, requestId, nodeId),
@@ -336,7 +347,7 @@ export function postMessageSync<Procedures extends ProceduresMap>(
 export async function startClientListener<Procedures extends ProceduresMap>(
   ctx: Context<Procedures>,
 ) {
-  if (_clientListenerStarted.has(ctx.nodeId ?? "(SW)")) return;
+  if (_clientListenerStarted.has(nodeIdOrSW(ctx.nodeId))) return;
 
   const { logger: l, node: worker } = ctx;
 
@@ -367,7 +378,7 @@ export async function startClientListener<Procedures extends ProceduresMap>(
     const payload = eventData as Payload<Procedures>;
 
     // 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;
     }
@@ -410,13 +421,15 @@ export async function startClientListener<Procedures extends ProceduresMap>(
     w.addEventListener("message", listener);
   }
 
-  _clientListenerStarted.add(ctx.nodeId ?? "(SW)");
+  _clientListenerStarted.add(nodeIdOrSW(ctx.nodeId));
 
   // 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: nodeIdOrSW(ctx.nodeId),
   });
 }
 

package/src/log.ts

@@ -65,51 +65,65 @@ const LOG_LEVELS = ["debug", "info", "warn", "error"] as const;
 
 export type LogLevel = (typeof LOG_LEVELS)[number];
 
+const PATCHABLE_LOG_METHODS = [
+  "debug",
+  "info",
+  "warn",
+  "error",
+  "log",
+] as const;
+type LogMethod = (typeof PATCHABLE_LOG_METHODS)[number];
+
 /**
  * Creates partially-applied logging functions given the first 2 or 3 args
- * @param severity
+ * @param method
  * @param side
  * @param ids request ID, {reqid, nodeId}, or null to not bind it
  * @returns
  */
 function logger(
-  severity: LogLevel,
+  method: LogMethod,
   side: "server" | "client",
   ids: { rqid: string; nid: string },
-): (message: string, ...args: any[]) => void;
+): (...args: any[]) => void;
 function logger(
-  severity: LogLevel,
+  method: LogMethod,
   side: "server" | "client",
   nid?: string,
-): (rqid: string | null, message: string, ...args: any[]) => void;
+): (rqid: string | null, ...args: any[]) => void;
 function logger(
-  severity: LogLevel,
+  method: LogMethod,
   side: "server" | "client",
   ids?: string | { rqid: string; nid: string },
 ) {
   if (ids === undefined || typeof ids === "string") {
     const nid = ids ?? null;
-    return (rqid: string | null, message: string, ...args: any[]) =>
-      log(severity, side, { nid, rqid }, message, ...args);
+    return (rqid: string | null, ...args: any[]) =>
+      log(method, side, { nid, rqid }, ...args);
   }
 
-  return (message: string, ...args: any[]) =>
-    log(severity, side, ids, message, ...args);
+  return (...args: any[]) => log(method, side, ids, ...args);
 }
 
+const originalConsole = PATCHABLE_LOG_METHODS.reduce(
+  (result, method) => {
+    result[method] = console[method];
+    return result;
+  },
+  {} as Pick<typeof console, LogMethod>,
+);
+
 /**
  * Send log messages to the console, with a helpful prefix.
- * @param severity
+ * @param method
  * @param side
  * @param ids request ID and node ID
- * @param message
  * @param args passed to console methods directly
  */
 function log(
-  severity: "debug" | "info" | "warn" | "error",
+  method: LogMethod,
   side: "server" | "client",
   { rqid, nid }: { rqid: string | null; nid: string | null },
-  message: string,
   ...args: any[]
 ) {
   const prefix = [
@@ -124,13 +138,18 @@ function log(
   if (rqid) prefixStyles.push("color: cyan", "color: inherit");
   if (nid) prefixStyles.push("color: hotpink", "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);
+  return originalConsole[method](prefix, ...prefixStyles, ...args);
+}
+
+/**
+ *
+ * @param scope
+ */
+export function injectIntoConsoleGlobal(
+  scope: WorkerGlobalScope | SharedWorkerGlobalScope,
+  nodeId: string,
+) {
+  for (const method of PATCHABLE_LOG_METHODS) {
+    scope.self.console[method] = logger(method, "server", nodeId);
   }
 }

package/src/nodes.ts

@@ -53,3 +53,15 @@ export function nodeIdFromScope(
 export function makeNodeId(): string {
   return "N" + Math.random().toString(16).substring(2, 5).toUpperCase();
 }
+
+export const serviceWorkerNodeId = "(SW)" as const; // Fixed ID for the service worker, as there's only one
+
+export function isServiceWorkerNodeId(id: string) {
+  return id === serviceWorkerNodeId;
+}
+
+export function nodeIdOrSW(
+  id: string | undefined,
+): string | typeof serviceWorkerNodeId {
+  return id ?? serviceWorkerNodeId;
+}

package/src/server.ts

@@ -5,7 +5,7 @@
 
 /// <reference lib="webworker" />
 import { type } from "arktype";
-import { createLogger, type LogLevel } from "./log.js";
+import { createLogger, injectIntoConsoleGlobal, type LogLevel } from "./log.js";
 import {
   ImplementationsMap,
   Payload,
@@ -141,9 +141,10 @@ export function Server<Procedures extends ProceduresMap>(
       event: MessageEvent<any> | ExtendableMessageEvent,
     ): Promise<void> => {
       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;
       }
 
@@ -194,7 +195,7 @@ export function Server<Procedures extends ProceduresMap>(
         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!!)
@@ -225,6 +226,7 @@ export function Server<Procedures extends ProceduresMap>(
             await postMsg({ progress });
           },
           {
+            nodeId,
             abortSignal: abortControllers.get(requestId)?.signal,
             logger: createLogger("server", loglevel, nodeId, requestId),
           },

package/src/types.ts

@@ -82,6 +82,10 @@ export type ProcedureImplementation<
      * Logger instance to use for logging messages related to this procedure call, using the same format as SWARPC's built-in logging.
      */
     logger: RequestBoundLogger;
+    /**
+     * ID of the Node the request is being processed on.
+     */
+    nodeId: string;
   },
 ) => Promise<S["inferIn"]>;
 
@@ -134,7 +138,9 @@ export type Hooks<Procedures extends ProceduresMap> = {
 export const PayloadInitializeSchema = type({
   by: '"sw&rpc"',
   functionName: '"#initialize"',
+  isInitializeRequest: "true",
   localStorageData: "Record<string, unknown>",
+  nodeId: "string",
 });
 
 export type PayloadInitialize = typeof PayloadInitializeSchema.infer;
@@ -229,7 +235,10 @@ export type ClientMethod<P extends Procedure<Type, Type, Type>> = ((
    */
   broadcast: (
     input: P["input"]["inferIn"],
-    onProgress?: (progress: P["progress"]["inferOut"]) => void,
+    onProgress?: (
+      /** Map of node IDs to their progress updates */
+      progresses: Map<string, P["progress"]["inferOut"]>,
+    ) => void,
     /** Number of nodes to send the request to. Leave undefined to send to all nodes */
     nodes?: number,
   ) => Promise<