zero-com 1.13.4 → 1.14.1

package/lib/common.js

@@ -229,9 +229,15 @@ const hasHandleCall = (sourceFile) => {
 };
 exports.hasHandleCall = hasHandleCall;
 const generateRegistryRequires = (registry) => {
-    return Array.from(registry.keys())
+    const requires = Array.from(registry.keys())
         .map(fp => `require(${JSON.stringify(fp)});`)
         .join('\n');
+    // Initialize ZERO_COM_CONTEXT_STORAGE inline so it lives inside the bundle
+    // and gets mangled together with all references. Without this, the runtime
+    // module may be externalized (loaded via Node.js require) and set the
+    // un-mangled name while the bundle references the mangled name.
+    const initContextStorage = `if (!globalThis.${exports.ZERO_COM_CONTEXT_STORAGE}) { globalThis.${exports.ZERO_COM_CONTEXT_STORAGE} = new (require('async_hooks').AsyncLocalStorage)(); }`;
+    return initContextStorage + '\n' + requires;
 };
 exports.generateRegistryRequires = generateRegistryRequires;
 const collectHandleCallReplacements = (sourceFile) => {

package/lib/runtime.d.ts

@@ -1,8 +1,10 @@
+import { asyncLocalStorage as storage } from './async-local-storage';
 declare global {
     var ZERO_COM_SERVER_REGISTRY: {
         [funcId: string]: (...args: any[]) => any;
     };
     var ZERO_COM_CLIENT_CALL: (funcId: string, args: any[]) => any;
+    var ZERO_COM_CONTEXT_STORAGE: typeof storage;
 }
 export declare function context<T = unknown>(): T;
 export declare function func<F extends (...args: any[]) => any>(fn: F): F;

package/lib/runtime.js

@@ -4,6 +4,13 @@ exports.call = exports.runWithContext = exports.handle = void 0;
 exports.context = context;
 exports.func = func;
 const async_local_storage_1 = require("./async-local-storage");
+// Initialize context storage on globalThis — the single source of truth.
+// All functions (context, handle, runWithContext, ZERO_COM_CLIENT_CALL) use this
+// global instance so that context propagates correctly even when the module is
+// loaded multiple times (e.g. webpack-bundled AND externalized).
+if (!globalThis.ZERO_COM_CONTEXT_STORAGE && async_local_storage_1.asyncLocalStorage) {
+    globalThis.ZERO_COM_CONTEXT_STORAGE = async_local_storage_1.asyncLocalStorage;
+}
 // Default server-side implementation: call directly from registry
 // This enables server functions to call other server functions without transport.
 // If a request context exists (set by handle()), it is propagated automatically.
@@ -13,25 +20,27 @@ const async_local_storage_1 = require("./async-local-storage");
 if (typeof globalThis.ZERO_COM_CLIENT_CALL === 'undefined') {
     globalThis.ZERO_COM_CLIENT_CALL = (funcId, args) => {
         var _a;
-        if (!async_local_storage_1.asyncLocalStorage) {
+        const als = globalThis.ZERO_COM_CONTEXT_STORAGE;
+        if (!als) {
             throw new Error('Server function called on client without transport configured. Call call() first.');
         }
         const fn = (_a = globalThis.ZERO_COM_SERVER_REGISTRY) === null || _a === void 0 ? void 0 : _a[funcId];
         if (!fn)
             throw new Error(`Function not found: ${funcId}`);
-        const ctx = async_local_storage_1.asyncLocalStorage.getStore();
+        const ctx = als.getStore();
         if (ctx !== undefined) {
-            return async_local_storage_1.asyncLocalStorage.run(ctx, () => fn(...args));
+            return als.run(ctx, () => fn(...args));
         }
         return fn(...args);
     };
 }
 // Get the current context - call this inside server functions
 function context() {
-    if (!async_local_storage_1.asyncLocalStorage) {
+    const als = globalThis.ZERO_COM_CONTEXT_STORAGE;
+    if (!als) {
         throw new Error('context() is only available on the server');
     }
-    const ctx = async_local_storage_1.asyncLocalStorage.getStore();
+    const ctx = als.getStore();
     if (ctx === undefined) {
         throw new Error('context() called outside of a server function');
     }
@@ -50,18 +59,20 @@ const handle = (funcId, ctx, args) => {
     if (!fn) {
         throw new Error(`Function not found in registry: ${funcId}`);
     }
-    if (!async_local_storage_1.asyncLocalStorage) {
+    const als = globalThis.ZERO_COM_CONTEXT_STORAGE;
+    if (!als) {
         throw new Error('handle() is only available on the server');
     }
-    return async_local_storage_1.asyncLocalStorage.run(ctx, () => fn(...args));
+    return als.run(ctx, () => fn(...args));
 };
 exports.handle = handle;
 // Run a callback within a context, making context() available inside it.
 // Use this in server-only code that does not go through handle() (e.g. auth callbacks).
 const runWithContext = (ctx, fn) => {
-    if (!async_local_storage_1.asyncLocalStorage)
+    const als = globalThis.ZERO_COM_CONTEXT_STORAGE;
+    if (!als)
         throw new Error('runWithContext() is only available on the server');
-    return async_local_storage_1.asyncLocalStorage.run(ctx, fn);
+    return als.run(ctx, fn);
 };
 exports.runWithContext = runWithContext;
 // Client calls this to set up transport (overrides default server-side behavior)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zero-com",
-  "version": "1.13.4",
+  "version": "1.14.1",
   "main": "index.js",
   "browser": {
     "./lib/async-local-storage.js": "./lib/async-local-storage.browser.js"