@ricsam/quickjs-fetch 0.2.9 → 0.2.11

package/dist/cjs/setup.cjs

@@ -80,6 +80,18 @@ function setupFetch(context, options = {}) {
       result.value.dispose();
       return { instanceId, globalKey };
     },
+    getStreamByKey: (globalKey) => {
+      const result = context.evalCode(`globalThis["${globalKey}"]`);
+      if (result.error) {
+        result.error.dispose();
+        return null;
+      }
+      if (context.typeof(result.value) === "undefined") {
+        result.value.dispose();
+        return null;
+      }
+      return result.value;
+    },
     pumpEventLoop: () => {
       context.runtime.executePendingJobs();
     }
@@ -100,36 +112,6 @@ function setupFetch(context, options = {}) {
   const RequestClass = import_request.createRequestClass(context, stateMap, streamHelpers);
   context.setProp(context.global, "Request", RequestClass);
   RequestClass.dispose();
-  const bodyGetterWrapperResult = context.evalCode(`
-    (function() {
-      const originalBodyDescriptor = Object.getOwnPropertyDescriptor(Request.prototype, 'body');
-      if (originalBodyDescriptor && originalBodyDescriptor.get) {
-        const originalGetter = originalBodyDescriptor.get;
-        Object.defineProperty(Request.prototype, 'body', {
-          get: function() {
-            const result = originalGetter.call(this);
-            // Check if result is an upload stream marker
-            if (typeof result === 'string' && result.startsWith('__UPLOAD_STREAM_KEY__:')) {
-              const globalKey = result.slice('__UPLOAD_STREAM_KEY__:'.length);
-              const stream = globalThis[globalKey];
-              // Don't delete the global - keep it around for subsequent calls
-              // The wrapper will cache this in _cachedBodyStream for future calls
-              return stream || null;
-            }
-            return result;
-          },
-          configurable: true,
-          enumerable: true
-        });
-      }
-    })();
-  `);
-  if (bodyGetterWrapperResult.error) {
-    console.error("Failed to wrap body getter:", context.dump(bodyGetterWrapperResult.error));
-    bodyGetterWrapperResult.error.dispose();
-  } else {
-    bodyGetterWrapperResult.value.dispose();
-  }
   const ResponseClass = import_response.createResponseClass(context, stateMap, streamFactory);
   context.setProp(context.global, "Response", ResponseClass);
   ResponseClass.dispose();
@@ -153,9 +135,53 @@ function setupFetch(context, options = {}) {
   const ServerWebSocketClass = import_serve.createServerWebSocketClass(context, stateMap, dispatchWsCommand);
   context.setProp(context.global, "__ServerWebSocket__", ServerWebSocketClass);
   ServerWebSocketClass.dispose();
+  const dataGetterResult = context.evalCode(`
+    Object.defineProperty(__ServerWebSocket__.prototype, 'data', {
+      get: function() {
+        return __upgradeRegistry__.get(this.__connectionId__);
+      },
+      enumerable: true,
+      configurable: true
+    });
+  `);
+  if (dataGetterResult.error) {
+    dataGetterResult.error.dispose();
+  } else {
+    dataGetterResult.value.dispose();
+  }
   const ServerClass = import_serve.createServerClass(context, stateMap, serveState);
   context.setProp(context.global, "__Server__", ServerClass);
   ServerClass.dispose();
+  const registryResult = context.evalCode(`
+    globalThis.__upgradeRegistry__ = new Map();
+    globalThis.__upgradeIdCounter__ = 0;
+  `);
+  if (registryResult.error) {
+    registryResult.error.dispose();
+  } else {
+    registryResult.value.dispose();
+  }
+  const setPendingUpgradeFn = context.newFunction("__setPendingUpgrade__", (connIdHandle) => {
+    const connectionId = context.getString(connIdHandle);
+    serveState.pendingUpgrade = { requested: true, connectionId };
+    return context.undefined;
+  });
+  context.setProp(context.global, "__setPendingUpgrade__", setPendingUpgradeFn);
+  setPendingUpgradeFn.dispose();
+  const upgradeMethodResult = context.evalCode(`
+    __Server__.prototype.upgrade = function(request, options) {
+      const data = options && typeof options === 'object' ? options.data : undefined;
+      const connectionId = String(++globalThis.__upgradeIdCounter__);
+      globalThis.__upgradeRegistry__.set(connectionId, data);
+      __setPendingUpgrade__(connectionId);
+      return true;
+    };
+  `);
+  if (upgradeMethodResult.error) {
+    upgradeMethodResult.error.dispose();
+  } else {
+    upgradeMethodResult.value.dispose();
+  }
   const fetchFn = import_fetch.createFetchFunction(context, options.onFetch);
   context.setProp(context.global, "fetch", fetchFn);
   fetchFn.dispose();
@@ -172,4 +198,4 @@ function setupFetch(context, options = {}) {
 }
 })
 
-//# debugId=2A8118ACB811092764756E2164756E21
+//# debugId=2354E39DCBC5283664756E2164756E21

package/dist/cjs/setup.cjs.map

@@ -2,9 +2,9 @@
   "version": 3,
   "sources": ["../../src/setup.ts"],
   "sourcesContent": [
-    "import type { QuickJSContext, QuickJSHandle } from \"quickjs-emscripten\";\nimport { setupCore, createStateMap, createReadableStream } from \"@ricsam/quickjs-core\";\nimport type { SetupFetchOptions, FetchHandle, ServeState } from \"./types.cjs\";\nimport { createHeadersClass } from \"./globals/headers.cjs\";\nimport { createRequestClass, addRequestFormDataMethod } from \"./globals/request.cjs\";\nimport { createResponseClass, addResponseStaticMethods } from \"./globals/response.cjs\";\nimport { setupAbortControllerAndSignal } from \"./globals/abort-controller.cjs\";\nimport { createFormDataClass, addFormDataFileMethods } from \"./globals/form-data.cjs\";\nimport { createFetchFunction } from \"./globals/fetch.cjs\";\nimport {\n  createServeFunction,\n  createServerClass,\n  createServerWebSocketClass,\n} from \"./globals/serve.cjs\";\nimport { createFetchHandle } from \"./handle.cjs\";\n\n/**\n * Setup Fetch API in a QuickJS context\n *\n * Injects the following globals:\n * - fetch\n * - Request\n * - Response\n * - Headers\n * - AbortController\n * - AbortSignal\n * - serve\n * - FormData\n *\n * Also sets up Core APIs (Streams, Blob, File) if not already present.\n *\n * **Private globals (internal use):**\n * - `__Server__` - Server class for serve() handler, instantiated via evalCode\n * - `__ServerWebSocket__` - WebSocket class for connection handling\n * - `__scheduleTimeout__` - Host function to schedule AbortSignal.timeout()\n * - `__checkTimeout__` - Host function to check if timeout elapsed\n *\n * These private globals follow the `__Name__` convention and are required for\n * JavaScript code in QuickJS to create class instances via evalCode.\n * See PATTERNS.md section 5 for details.\n *\n * @example\n * const handle = setupFetch(context, {\n *   onFetch: async (request) => {\n *     // Proxy to real fetch\n *     return fetch(request);\n *   }\n * });\n *\n * context.evalCode(`\n *   serve({\n *     fetch(request, server) {\n *       return new Response(\"Hello!\");\n *     }\n *   });\n * `);\n *\n * const response = await handle.dispatchRequest(\n *   new Request(\"http://localhost/\")\n * );\n */\nexport function setupFetch(\n  context: QuickJSContext,\n  options: SetupFetchOptions = {}\n): FetchHandle {\n  // Setup core if not already done\n  const coreHandle =\n    options.coreHandle ??\n    setupCore(context, {\n      stateMap: options.stateMap,\n    });\n\n  const stateMap = options.stateMap ?? coreHandle.stateMap;\n\n  // Create serve state\n  const serveState: ServeState = {\n    fetchHandler: null,\n    websocketHandlers: {},\n    pendingUpgrade: null,\n    activeConnections: new Map(),\n  };\n\n  // WebSocket command dispatcher\n  const wsCommandCallbacks = new Set<\n    (cmd: import(\"./types.cjs\").WebSocketCommand) => void\n  >();\n  const dispatchWsCommand = (cmd: import(\"./types.cjs\").WebSocketCommand) => {\n    for (const cb of wsCommandCallbacks) {\n      cb(cmd);\n    }\n  };\n\n  // Create stream factory for Request/Response body\n  const streamFactory = (source: UnderlyingSource) =>\n    createReadableStream(context, stateMap, source);\n\n  // Create stream helpers for upload streaming\n  const streamHelpers = {\n    createStream: streamFactory,\n    createEmptyStream: (): { instanceId: number; globalKey: string } => {\n      // Create a pure QuickJS ReadableStream with no source (no host callbacks)\n      // Store it on a unique global key so it can be retrieved from JS without\n      // returning a handle through the callback (which causes lifetime issues)\n      const globalKey = `__uploadStream_${Date.now()}_${Math.random().toString(36).slice(2)}__`;\n      const result = context.evalCode(`\n        (function() {\n          const stream = new ReadableStream();\n          globalThis[\"${globalKey}\"] = stream;\n          return stream.__instanceId__;\n        })()\n      `);\n      if (result.error) {\n        const error = context.dump(result.error);\n        result.error.dispose();\n        throw new Error(`Failed to create empty ReadableStream: ${JSON.stringify(error)}`);\n      }\n      const instanceId = context.getNumber(result.value);\n      result.value.dispose();\n\n      return { instanceId, globalKey };\n    },\n    pumpEventLoop: () => {\n      context.runtime.executePendingJobs();\n    },\n  };\n\n  // Create Headers class\n  const HeadersClass = createHeadersClass(context, stateMap);\n  context.setProp(context.global, \"Headers\", HeadersClass);\n  HeadersClass.dispose();\n\n  // Add Symbol.iterator support for Headers (for...of, Array.from, spread)\n  const iteratorResult = context.evalCode(`\n    Headers.prototype[Symbol.iterator] = function() {\n      return this.entries()[Symbol.iterator]();\n    };\n  `);\n  if (iteratorResult.error) {\n    iteratorResult.error.dispose();\n  } else {\n    iteratorResult.value.dispose();\n  }\n\n  // Create Request class\n  const RequestClass = createRequestClass(context, stateMap, streamHelpers);\n  context.setProp(context.global, \"Request\", RequestClass);\n  RequestClass.dispose();\n\n  // Wrap the body getter to resolve upload stream markers\n  // This works around the issue of returning QuickJSHandle from __hostCall__\n  const bodyGetterWrapperResult = context.evalCode(`\n    (function() {\n      const originalBodyDescriptor = Object.getOwnPropertyDescriptor(Request.prototype, 'body');\n      if (originalBodyDescriptor && originalBodyDescriptor.get) {\n        const originalGetter = originalBodyDescriptor.get;\n        Object.defineProperty(Request.prototype, 'body', {\n          get: function() {\n            const result = originalGetter.call(this);\n            // Check if result is an upload stream marker\n            if (typeof result === 'string' && result.startsWith('__UPLOAD_STREAM_KEY__:')) {\n              const globalKey = result.slice('__UPLOAD_STREAM_KEY__:'.length);\n              const stream = globalThis[globalKey];\n              // Don't delete the global - keep it around for subsequent calls\n              // The wrapper will cache this in _cachedBodyStream for future calls\n              return stream || null;\n            }\n            return result;\n          },\n          configurable: true,\n          enumerable: true\n        });\n      }\n    })();\n  `);\n  if (bodyGetterWrapperResult.error) {\n    console.error(\"Failed to wrap body getter:\", context.dump(bodyGetterWrapperResult.error));\n    bodyGetterWrapperResult.error.dispose();\n  } else {\n    bodyGetterWrapperResult.value.dispose();\n  }\n\n  // Create Response class\n  const ResponseClass = createResponseClass(context, stateMap, streamFactory);\n  context.setProp(context.global, \"Response\", ResponseClass);\n  ResponseClass.dispose();\n\n  // Add Response static methods (must be after Response and Headers are on global)\n  addResponseStaticMethods(context);\n\n  // Create AbortSignal and AbortController classes (pure QuickJS implementation)\n  setupAbortControllerAndSignal(context);\n\n  // Create FormData class\n  const FormDataClass = createFormDataClass(context, stateMap);\n  context.setProp(context.global, \"FormData\", FormDataClass);\n  FormDataClass.dispose();\n\n  // Add Symbol.iterator support for FormData (for...of, Array.from, spread)\n  const formDataIteratorResult = context.evalCode(`\n    FormData.prototype[Symbol.iterator] = function() {\n      return this.entries()[Symbol.iterator]();\n    };\n  `);\n  if (formDataIteratorResult.error) {\n    formDataIteratorResult.error.dispose();\n  } else {\n    formDataIteratorResult.value.dispose();\n  }\n\n  // Add Request.formData() method that returns a proper FormData instance\n  // Must be after both Request and FormData are on global\n  addRequestFormDataMethod(context);\n\n  // Add FormData.get()/getAll() overrides to reconstruct File instances\n  // Must be after both FormData and File are on global\n  addFormDataFileMethods(context);\n\n  // Create ServerWebSocket class (internal, for WebSocket handling)\n  const ServerWebSocketClass = createServerWebSocketClass(\n    context,\n    stateMap,\n    dispatchWsCommand\n  );\n  // Set on global with internal name so we can use evalCode to instantiate\n  context.setProp(context.global, \"__ServerWebSocket__\", ServerWebSocketClass);\n  ServerWebSocketClass.dispose();\n  // Note: ServerWebSocketClass handle is now owned by global\n\n  // Create Server class (internal, passed to fetch handler)\n  const ServerClass = createServerClass(context, stateMap, serveState);\n  // Set on global with internal name so we can use evalCode to instantiate\n  context.setProp(context.global, \"__Server__\", ServerClass);\n  ServerClass.dispose();\n  // Note: ServerClass handle is now owned by global\n\n  // Create fetch function\n  const fetchFn = createFetchFunction(context, options.onFetch);\n  context.setProp(context.global, \"fetch\", fetchFn);\n  fetchFn.dispose();\n\n  // Create serve function\n  const serveFn = createServeFunction(context, stateMap, serveState);\n  context.setProp(context.global, \"serve\", serveFn);\n  serveFn.dispose();\n\n  // Create and return the handle\n  const fetchHandle = createFetchHandle(\n    context,\n    stateMap,\n    serveState\n  );\n\n  // Wire up WebSocket command callbacks\n  const originalOnWebSocketCommand = fetchHandle.onWebSocketCommand;\n  fetchHandle.onWebSocketCommand = (callback) => {\n    wsCommandCallbacks.add(callback);\n    return () => wsCommandCallbacks.delete(callback);\n  };\n\n  return fetchHandle;\n}\n"
+    "import type { QuickJSContext, QuickJSHandle } from \"quickjs-emscripten\";\nimport { setupCore, createStateMap, createReadableStream } from \"@ricsam/quickjs-core\";\nimport type { SetupFetchOptions, FetchHandle, ServeState } from \"./types.cjs\";\nimport { createHeadersClass } from \"./globals/headers.cjs\";\nimport { createRequestClass, addRequestFormDataMethod } from \"./globals/request.cjs\";\nimport { createResponseClass, addResponseStaticMethods } from \"./globals/response.cjs\";\nimport { setupAbortControllerAndSignal } from \"./globals/abort-controller.cjs\";\nimport { createFormDataClass, addFormDataFileMethods } from \"./globals/form-data.cjs\";\nimport { createFetchFunction } from \"./globals/fetch.cjs\";\nimport {\n  createServeFunction,\n  createServerClass,\n  createServerWebSocketClass,\n} from \"./globals/serve.cjs\";\nimport { createFetchHandle } from \"./handle.cjs\";\n\n/**\n * Setup Fetch API in a QuickJS context\n *\n * Injects the following globals:\n * - fetch\n * - Request\n * - Response\n * - Headers\n * - AbortController\n * - AbortSignal\n * - serve\n * - FormData\n *\n * Also sets up Core APIs (Streams, Blob, File) if not already present.\n *\n * **Private globals (internal use):**\n * - `__Server__` - Server class for serve() handler, instantiated via evalCode\n * - `__ServerWebSocket__` - WebSocket class for connection handling\n * - `__scheduleTimeout__` - Host function to schedule AbortSignal.timeout()\n * - `__checkTimeout__` - Host function to check if timeout elapsed\n *\n * These private globals follow the `__Name__` convention and are required for\n * JavaScript code in QuickJS to create class instances via evalCode.\n * See PATTERNS.md section 5 for details.\n *\n * @example\n * const handle = setupFetch(context, {\n *   onFetch: async (request) => {\n *     // Proxy to real fetch\n *     return fetch(request);\n *   }\n * });\n *\n * context.evalCode(`\n *   serve({\n *     fetch(request, server) {\n *       return new Response(\"Hello!\");\n *     }\n *   });\n * `);\n *\n * const response = await handle.dispatchRequest(\n *   new Request(\"http://localhost/\")\n * );\n */\nexport function setupFetch(\n  context: QuickJSContext,\n  options: SetupFetchOptions = {}\n): FetchHandle {\n  // Setup core if not already done\n  const coreHandle =\n    options.coreHandle ??\n    setupCore(context, {\n      stateMap: options.stateMap,\n    });\n\n  const stateMap = options.stateMap ?? coreHandle.stateMap;\n\n  // Create serve state\n  const serveState: ServeState = {\n    fetchHandler: null,\n    websocketHandlers: {},\n    pendingUpgrade: null,\n    activeConnections: new Map(),\n  };\n\n  // WebSocket command dispatcher\n  const wsCommandCallbacks = new Set<\n    (cmd: import(\"./types.cjs\").WebSocketCommand) => void\n  >();\n  const dispatchWsCommand = (cmd: import(\"./types.cjs\").WebSocketCommand) => {\n    for (const cb of wsCommandCallbacks) {\n      cb(cmd);\n    }\n  };\n\n  // Create stream factory for Request/Response body\n  const streamFactory = (source: UnderlyingSource) =>\n    createReadableStream(context, stateMap, source);\n\n  // Create stream helpers for upload streaming\n  const streamHelpers = {\n    createStream: streamFactory,\n    /**\n     * Create an empty ReadableStream for upload streaming.\n     *\n     * IMPORTANT: We store the stream on a global variable and return the key.\n     * This is necessary because __hostCall__ manages and disposes returned handles\n     * in its scope. If we cached the handle and returned it multiple times,\n     * subsequent calls would return a dead handle.\n     *\n     * The getter must call getStreamByKey() each time to get a fresh handle.\n     */\n    createEmptyStream: (): { instanceId: number; globalKey: string } => {\n      const globalKey = `__uploadStream_${Date.now()}_${Math.random().toString(36).slice(2)}__`;\n      const result = context.evalCode(`\n        (function() {\n          const stream = new ReadableStream();\n          globalThis[\"${globalKey}\"] = stream;\n          return stream.__instanceId__;\n        })()\n      `);\n      if (result.error) {\n        const error = context.dump(result.error);\n        result.error.dispose();\n        throw new Error(`Failed to create empty ReadableStream: ${JSON.stringify(error)}`);\n      }\n      const instanceId = context.getNumber(result.value);\n      result.value.dispose();\n\n      return { instanceId, globalKey };\n    },\n    /**\n     * Get a fresh handle to the stream stored at globalKey.\n     * This must be called each time the body getter is accessed to avoid\n     * returning disposed handles.\n     */\n    getStreamByKey: (globalKey: string): import(\"quickjs-emscripten\").QuickJSHandle | null => {\n      const result = context.evalCode(`globalThis[\"${globalKey}\"]`);\n      if (result.error) {\n        result.error.dispose();\n        return null;\n      }\n      if (context.typeof(result.value) === \"undefined\") {\n        result.value.dispose();\n        return null;\n      }\n      return result.value;\n    },\n    pumpEventLoop: () => {\n      context.runtime.executePendingJobs();\n    },\n  };\n\n  // Create Headers class\n  const HeadersClass = createHeadersClass(context, stateMap);\n  context.setProp(context.global, \"Headers\", HeadersClass);\n  HeadersClass.dispose();\n\n  // Add Symbol.iterator support for Headers (for...of, Array.from, spread)\n  const iteratorResult = context.evalCode(`\n    Headers.prototype[Symbol.iterator] = function() {\n      return this.entries()[Symbol.iterator]();\n    };\n  `);\n  if (iteratorResult.error) {\n    iteratorResult.error.dispose();\n  } else {\n    iteratorResult.value.dispose();\n  }\n\n  // Create Request class\n  const RequestClass = createRequestClass(context, stateMap, streamHelpers);\n  context.setProp(context.global, \"Request\", RequestClass);\n  RequestClass.dispose();\n\n  // Note: No body getter wrapper needed - handles are returned directly\n  // through __hostCall__ because quickjs-emscripten properly duplicates\n  // handles via QTS_DupValuePointer before returning to QuickJS.\n\n  // Create Response class\n  const ResponseClass = createResponseClass(context, stateMap, streamFactory);\n  context.setProp(context.global, \"Response\", ResponseClass);\n  ResponseClass.dispose();\n\n  // Add Response static methods (must be after Response and Headers are on global)\n  addResponseStaticMethods(context);\n\n  // Create AbortSignal and AbortController classes (pure QuickJS implementation)\n  setupAbortControllerAndSignal(context);\n\n  // Create FormData class\n  const FormDataClass = createFormDataClass(context, stateMap);\n  context.setProp(context.global, \"FormData\", FormDataClass);\n  FormDataClass.dispose();\n\n  // Add Symbol.iterator support for FormData (for...of, Array.from, spread)\n  const formDataIteratorResult = context.evalCode(`\n    FormData.prototype[Symbol.iterator] = function() {\n      return this.entries()[Symbol.iterator]();\n    };\n  `);\n  if (formDataIteratorResult.error) {\n    formDataIteratorResult.error.dispose();\n  } else {\n    formDataIteratorResult.value.dispose();\n  }\n\n  // Add Request.formData() method that returns a proper FormData instance\n  // Must be after both Request and FormData are on global\n  addRequestFormDataMethod(context);\n\n  // Add FormData.get()/getAll() overrides to reconstruct File instances\n  // Must be after both FormData and File are on global\n  addFormDataFileMethods(context);\n\n  // Create ServerWebSocket class (internal, for WebSocket handling)\n  const ServerWebSocketClass = createServerWebSocketClass(\n    context,\n    stateMap,\n    dispatchWsCommand\n  );\n  // Set on global with internal name so we can use evalCode to instantiate\n  context.setProp(context.global, \"__ServerWebSocket__\", ServerWebSocketClass);\n  ServerWebSocketClass.dispose();\n  // Note: ServerWebSocketClass handle is now owned by global\n\n  // Add pure-JS data getter to ServerWebSocket prototype\n  // This getter reads from __upgradeRegistry__ using __connectionId__,\n  // keeping complex data (like Zod schemas) entirely within QuickJS\n  // to avoid marshalling depth limit issues\n  const dataGetterResult = context.evalCode(`\n    Object.defineProperty(__ServerWebSocket__.prototype, 'data', {\n      get: function() {\n        return __upgradeRegistry__.get(this.__connectionId__);\n      },\n      enumerable: true,\n      configurable: true\n    });\n  `);\n  if (dataGetterResult.error) {\n    dataGetterResult.error.dispose();\n  } else {\n    dataGetterResult.value.dispose();\n  }\n\n  // Create Server class (internal, passed to fetch handler)\n  const ServerClass = createServerClass(context, stateMap, serveState);\n  // Set on global with internal name so we can use evalCode to instantiate\n  context.setProp(context.global, \"__Server__\", ServerClass);\n  ServerClass.dispose();\n  // Note: ServerClass handle is now owned by global\n\n  // Setup upgrade registry and helper function for WebSocket upgrades\n  // The registry keeps data within QuickJS to avoid marshalling complex objects\n  const registryResult = context.evalCode(`\n    globalThis.__upgradeRegistry__ = new Map();\n    globalThis.__upgradeIdCounter__ = 0;\n  `);\n  if (registryResult.error) {\n    registryResult.error.dispose();\n  } else {\n    registryResult.value.dispose();\n  }\n\n  // Host function to set pendingUpgrade - only receives connectionId string\n  const setPendingUpgradeFn = context.newFunction(\n    \"__setPendingUpgrade__\",\n    (connIdHandle) => {\n      const connectionId = context.getString(connIdHandle);\n      serveState.pendingUpgrade = { requested: true, connectionId };\n      return context.undefined;\n    }\n  );\n  context.setProp(context.global, \"__setPendingUpgrade__\", setPendingUpgradeFn);\n  setPendingUpgradeFn.dispose();\n\n  // Add upgrade method to Server prototype as pure JavaScript\n  // This keeps the data within QuickJS and only passes connectionId to host\n  const upgradeMethodResult = context.evalCode(`\n    __Server__.prototype.upgrade = function(request, options) {\n      const data = options && typeof options === 'object' ? options.data : undefined;\n      const connectionId = String(++globalThis.__upgradeIdCounter__);\n      globalThis.__upgradeRegistry__.set(connectionId, data);\n      __setPendingUpgrade__(connectionId);\n      return true;\n    };\n  `);\n  if (upgradeMethodResult.error) {\n    upgradeMethodResult.error.dispose();\n  } else {\n    upgradeMethodResult.value.dispose();\n  }\n\n  // Create fetch function\n  const fetchFn = createFetchFunction(context, options.onFetch);\n  context.setProp(context.global, \"fetch\", fetchFn);\n  fetchFn.dispose();\n\n  // Create serve function\n  const serveFn = createServeFunction(context, stateMap, serveState);\n  context.setProp(context.global, \"serve\", serveFn);\n  serveFn.dispose();\n\n  // Create and return the handle\n  const fetchHandle = createFetchHandle(\n    context,\n    stateMap,\n    serveState\n  );\n\n  // Wire up WebSocket command callbacks\n  const originalOnWebSocketCommand = fetchHandle.onWebSocketCommand;\n  fetchHandle.onWebSocketCommand = (callback) => {\n    wsCommandCallbacks.add(callback);\n    return () => wsCommandCallbacks.delete(callback);\n  };\n\n  return fetchHandle;\n}\n"
   ],
-  "mappings": "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",
-  "debugId": "2A8118ACB811092764756E2164756E21",
+  "mappings": "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",
+  "debugId": "2354E39DCBC5283664756E2164756E21",
   "names": []
 }

package/dist/mjs/globals/request.mjs

@@ -134,19 +134,22 @@ function createRequestClass(context, stateMap, streamHelpers) {
           if (!createStream) {
             return this.body;
           }
+          if (this._uploadStreamGlobalKey) {
+            return streamHelpers?.getStreamByKey(this._uploadStreamGlobalKey) || null;
+          }
           if (this._cachedBodyStream !== undefined) {
             return this._cachedBodyStream;
           }
           if (this.nativeBodyStream) {
-            if (!streamHelpers?.createEmptyStream) {
+            if (!streamHelpers?.createEmptyStream || !streamHelpers?.getStreamByKey) {
               return null;
             }
             const { instanceId: streamInstanceId, globalKey } = streamHelpers.createEmptyStream();
             const cleanup = startNativeStreamReader(this.nativeBodyStream, streamInstanceId, streamHelpers.pumpEventLoop);
             this._uploadStreamCleanup = cleanup;
-            this._cachedBodyStream = `__UPLOAD_STREAM_KEY__:${globalKey}`;
+            this._uploadStreamGlobalKey = globalKey;
             this.nativeBodyStream = undefined;
-            return this._cachedBodyStream;
+            return streamHelpers.getStreamByKey(globalKey);
           }
           if (!this.body) {
             this._cachedBodyStream = null;
@@ -402,4 +405,4 @@ export {
   addRequestFormDataMethod
 };
 
-//# debugId=3969E7C807E073F664756E2164756E21
+//# debugId=1AB30F476B52ACC364756E2164756E21

package/dist/mjs/globals/request.mjs.map

@@ -2,9 +2,9 @@
   "version": 3,
   "sources": ["../../../src/globals/request.ts"],
   "sourcesContent": [
-    "import type { QuickJSContext, QuickJSHandle } from \"quickjs-emscripten\";\nimport type { StateMap } from \"@ricsam/quickjs-core\";\nimport { defineClass, getInstanceStateById } from \"@ricsam/quickjs-core\";\nimport type { RequestState, HeadersState, AbortSignalState, FormDataState } from \"../types.mjs\";\nimport { createHeadersStateFromNative, createHeadersLike } from \"./headers.mjs\";\nimport { parseMultipartFormData, parseUrlEncodedFormData } from \"./form-data.mjs\";\nimport { startNativeStreamReader } from \"../upload-stream-queue.mjs\";\n\n/**\n * Type for the stream factory function\n */\ntype StreamFactory = (source: UnderlyingSource) => QuickJSHandle;\n\n/**\n * Stream helpers passed to the body getter for upload streaming\n */\ninterface StreamHelpers {\n  createStream: StreamFactory;\n  /** Creates an empty ReadableStream, stores on global, returns instanceId and globalKey */\n  createEmptyStream: () => { instanceId: number; globalKey: string };\n  pumpEventLoop: () => void;\n}\n\n/**\n * Helper to consume a native ReadableStream into a Uint8Array.\n * Used by text(), json(), arrayBuffer(), blob() methods.\n */\nasync function consumeNativeStream(\n  stream: ReadableStream<Uint8Array>\n): Promise<Uint8Array> {\n  const chunks: Uint8Array[] = [];\n  const reader = stream.getReader();\n\n  while (true) {\n    const { done, value } = await reader.read();\n    if (done) break;\n    chunks.push(value);\n  }\n\n  // Concatenate chunks into single Uint8Array\n  const totalLength = chunks.reduce((sum, chunk) => sum + chunk.length, 0);\n  const result = new Uint8Array(totalLength);\n  let offset = 0;\n  for (const chunk of chunks) {\n    result.set(chunk, offset);\n    offset += chunk.length;\n  }\n\n  return result;\n}\n\n/**\n * Create the Request class for QuickJS\n */\nexport function createRequestClass(\n  context: QuickJSContext,\n  stateMap: StateMap,\n  streamHelpers?: StreamHelpers\n): QuickJSHandle {\n  const createStream = streamHelpers?.createStream;\n  return defineClass<RequestState>(context, stateMap, {\n    name: \"Request\",\n    construct: (args) => {\n      const input = args[0];\n      const init = args[1] as {\n        method?: string;\n        headers?: object;\n        body?: unknown;\n        cache?: string;\n        credentials?: string;\n        integrity?: string;\n        keepalive?: boolean;\n        mode?: string;\n        redirect?: string;\n        referrer?: string;\n        referrerPolicy?: string;\n        signal?: AbortSignalState;\n      } | undefined;\n\n      let url = \"\";\n      let method = \"GET\";\n      let headersState: HeadersState = { headers: new Map() };\n      let body: Uint8Array | null = null;\n      let signal: AbortSignalState | null = null;\n\n      // Handle input\n      if (typeof input === \"string\") {\n        url = input;\n      } else if (input && typeof input === \"object\") {\n        // Could be URL or Request-like\n        if (\"url\" in input) {\n          url = String((input as { url: string }).url);\n        }\n        if (\"method\" in input) {\n          method = String((input as { method: string }).method);\n        }\n        if (\"headersState\" in input) {\n          const inputHeaders = (input as RequestState).headersState;\n          headersState = {\n            headers: new Map(inputHeaders.headers),\n          };\n        }\n        if (\"body\" in input && (input as RequestState).body) {\n          body = (input as RequestState).body;\n        }\n        if (\"signal\" in input) {\n          signal = (input as RequestState).signal;\n        }\n      }\n\n      // Apply init options\n      if (init) {\n        if (init.method) {\n          method = init.method.toUpperCase();\n        }\n        if (init.headers) {\n          if (init.headers && typeof init.headers === \"object\") {\n            if (\"headers\" in init.headers && init.headers.headers instanceof Map) {\n              headersState = {\n                headers: new Map((init.headers as HeadersState).headers),\n              };\n            } else if (\n              \"__isDefineClassInstance__\" in init.headers &&\n              (init.headers as { __isDefineClassInstance__?: boolean }).__isDefineClassInstance__ === true &&\n              \"__instanceId__\" in init.headers\n            ) {\n              // Unmarshalled Headers instance from defineClass\n              const instanceId = (init.headers as { __instanceId__: number }).__instanceId__;\n              const state = getInstanceStateById<HeadersState>(instanceId);\n              if (state && state.headers instanceof Map) {\n                headersState = {\n                  headers: new Map(state.headers),\n                };\n              }\n            } else {\n              headersState = { headers: new Map() };\n              for (const [key, value] of Object.entries(init.headers)) {\n                headersState.headers.set(key.toLowerCase(), [String(value)]);\n              }\n            }\n          }\n        }\n        if (init.body !== undefined && init.body !== null) {\n          if (typeof init.body === \"string\") {\n            body = new TextEncoder().encode(init.body);\n          } else if (init.body instanceof ArrayBuffer) {\n            body = new Uint8Array(init.body);\n          } else if (init.body instanceof Uint8Array) {\n            body = init.body;\n          }\n        }\n        if (init.signal) {\n          signal = init.signal;\n        }\n      }\n\n      return {\n        method,\n        url,\n        headersState,\n        body,\n        bodyUsed: false,\n        cache: init?.cache || \"default\",\n        credentials: init?.credentials || \"same-origin\",\n        destination: \"\",\n        integrity: init?.integrity || \"\",\n        keepalive: init?.keepalive || false,\n        mode: init?.mode || \"cors\",\n        redirect: init?.redirect || \"follow\",\n        referrer: init?.referrer || \"about:client\",\n        referrerPolicy: init?.referrerPolicy || \"\",\n        signal,\n      };\n    },\n    properties: {\n      method: {\n        get(this: RequestState) {\n          return this.method;\n        },\n      },\n      url: {\n        get(this: RequestState) {\n          return this.url;\n        },\n      },\n      headers: {\n        get(this: RequestState) {\n          return createHeadersLike(this.headersState);\n        },\n      },\n      body: {\n        get(this: RequestState & { _cachedBodyStream?: object | string | null; _uploadStreamCleanup?: () => void }) {\n          if (!createStream) {\n            // Fallback: return raw body if no stream factory\n            return this.body;\n          }\n\n          // Return cached stream if already created\n          if (this._cachedBodyStream !== undefined) {\n            return this._cachedBodyStream;\n          }\n\n          // Streaming native body - create a QuickJS ReadableStream that bridges to the native stream\n          // Uses the \"Inverted Direct State Access\" pattern: host pushes to QuickJS stream's queue\n          if (this.nativeBodyStream) {\n            if (!streamHelpers?.createEmptyStream) {\n              // No helpers available - fall back to null (legacy behavior)\n              return null;\n            }\n\n            // Create a QuickJS ReadableStream with no source callbacks via evalCode\n            // The stream is stored on a global key - we return a marker string that\n            // the JavaScript wrapper will use to retrieve the actual stream.\n            // This avoids returning a QuickJSHandle through __hostCall__ which causes lifetime issues.\n            const { instanceId: streamInstanceId, globalKey } = streamHelpers.createEmptyStream();\n\n            // Start background reader that pushes to the QuickJS stream\n            // The onChunkPushed callback pumps the event loop to process pending reads\n            const cleanup = startNativeStreamReader(\n              this.nativeBodyStream,\n              streamInstanceId,\n              streamHelpers.pumpEventLoop\n            );\n\n            // Store cleanup function for potential cancellation\n            this._uploadStreamCleanup = cleanup;\n            // Cache the global key so subsequent calls return the same stream\n            this._cachedBodyStream = `__UPLOAD_STREAM_KEY__:${globalKey}`;\n\n            // Clear nativeBodyStream to prevent double-consumption\n            // This ensures text()/json()/arrayBuffer() don't try to read from it\n            this.nativeBodyStream = undefined;\n\n            return this._cachedBodyStream;\n          }\n\n          // Fallback: buffered body (backwards compatibility)\n          if (!this.body) {\n            this._cachedBodyStream = null;\n            return null;\n          }\n          const bodyData = this.body;\n          let offset = 0;\n          const chunkSize = 65536; // 64KB chunks\n          const stream = createStream({\n            pull(controller) {\n              if (offset >= bodyData.length) {\n                controller.close();\n                return;\n              }\n              const chunk = bodyData.slice(offset, Math.min(offset + chunkSize, bodyData.length));\n              offset += chunk.length;\n              controller.enqueue(chunk);\n            },\n          });\n          this._cachedBodyStream = stream;\n          return stream;\n        },\n      },\n      bodyUsed: {\n        get(this: RequestState) {\n          return this.bodyUsed;\n        },\n      },\n      cache: {\n        get(this: RequestState) {\n          return this.cache;\n        },\n      },\n      credentials: {\n        get(this: RequestState) {\n          return this.credentials;\n        },\n      },\n      destination: {\n        get(this: RequestState) {\n          return this.destination;\n        },\n      },\n      integrity: {\n        get(this: RequestState) {\n          return this.integrity;\n        },\n      },\n      keepalive: {\n        get(this: RequestState) {\n          return this.keepalive;\n        },\n      },\n      mode: {\n        get(this: RequestState) {\n          return this.mode;\n        },\n      },\n      redirect: {\n        get(this: RequestState) {\n          return this.redirect;\n        },\n      },\n      referrer: {\n        get(this: RequestState) {\n          return this.referrer;\n        },\n      },\n      referrerPolicy: {\n        get(this: RequestState) {\n          return this.referrerPolicy;\n        },\n      },\n      signal: {\n        get(this: RequestState) {\n          return this.signal;\n        },\n      },\n    },\n    methods: {\n      async arrayBuffer(this: RequestState): Promise<ArrayBuffer> {\n        if (this.bodyUsed) {\n          throw new TypeError(\"Body has already been consumed\");\n        }\n        this.bodyUsed = true;\n\n        // Consume native stream if present\n        if (this.nativeBodyStream) {\n          const buffer = await consumeNativeStream(this.nativeBodyStream);\n          return buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength) as ArrayBuffer;\n        }\n\n        // Fallback: buffered body\n        if (!this.body) {\n          return new ArrayBuffer(0);\n        }\n        return this.body.buffer.slice(\n          this.body.byteOffset,\n          this.body.byteOffset + this.body.byteLength\n        ) as ArrayBuffer;\n      },\n      async blob(this: RequestState): Promise<object> {\n        if (this.bodyUsed) {\n          throw new TypeError(\"Body has already been consumed\");\n        }\n        this.bodyUsed = true;\n        const contentType = this.headersState.headers.get(\"content-type\")?.[0] || \"\";\n\n        // Consume native stream if present\n        if (this.nativeBodyStream) {\n          const buffer = await consumeNativeStream(this.nativeBodyStream);\n          return {\n            parts: [buffer],\n            type: contentType,\n            size: buffer.length,\n          };\n        }\n\n        // Fallback: buffered body\n        return {\n          parts: this.body ? [this.body] : [],\n          type: contentType,\n          size: this.body?.length || 0,\n        };\n      },\n      clone(this: RequestState): RequestState {\n        if (this.bodyUsed) {\n          throw new TypeError(\"Body has already been consumed\");\n        }\n        // Note: Cannot clone streaming body - would need to tee the stream\n        if (this.nativeBodyStream) {\n          throw new TypeError(\"Cannot clone Request with streaming body\");\n        }\n        return {\n          ...this,\n          headersState: {\n            headers: new Map(this.headersState.headers),\n          },\n          body: this.body ? new Uint8Array(this.body) : null,\n          bodyUsed: false,\n        };\n      },\n      async json(this: RequestState): Promise<unknown> {\n        if (this.bodyUsed) {\n          throw new TypeError(\"Body has already been consumed\");\n        }\n        this.bodyUsed = true;\n\n        // Consume native stream if present\n        if (this.nativeBodyStream) {\n          const buffer = await consumeNativeStream(this.nativeBodyStream);\n          const text = new TextDecoder().decode(buffer);\n          return JSON.parse(text);\n        }\n\n        // Fallback: buffered body\n        if (!this.body) {\n          return JSON.parse(\"\");\n        }\n        const text = new TextDecoder().decode(this.body);\n        return JSON.parse(text);\n      },\n      async text(this: RequestState): Promise<string> {\n        if (this.bodyUsed) {\n          throw new TypeError(\"Body has already been consumed\");\n        }\n        this.bodyUsed = true;\n\n        // Consume native stream if present\n        if (this.nativeBodyStream) {\n          const buffer = await consumeNativeStream(this.nativeBodyStream);\n          return new TextDecoder().decode(buffer);\n        }\n\n        // Fallback: buffered body\n        if (!this.body) {\n          return \"\";\n        }\n        return new TextDecoder().decode(this.body);\n      },\n      /**\n       * Private method that returns raw FormData entries.\n       * Used by the formData() method added via evalCode (see addRequestFormDataMethod).\n       *\n       * Note: File data is converted to plain number arrays to avoid memory issues\n       * when marshalling Uint8Array between host and QuickJS contexts.\n       */\n      async __getFormDataEntries__(this: RequestState): Promise<{\n        entries: Array<{\n          name: string;\n          value: string | { __formDataFile__: true; data: number[]; filename: string; type: string };\n        }>;\n      }> {\n        if (this.bodyUsed) {\n          throw new TypeError(\"Body has already been consumed\");\n        }\n        this.bodyUsed = true;\n\n        // Get body data from native stream or buffered body\n        let bodyData: Uint8Array | null = null;\n        if (this.nativeBodyStream) {\n          bodyData = await consumeNativeStream(this.nativeBodyStream);\n        } else {\n          bodyData = this.body;\n        }\n\n        if (!bodyData) {\n          return { entries: [] };\n        }\n\n        const contentType = this.headersState.headers.get(\"content-type\")?.[0] || \"\";\n\n        let formDataState: FormDataState;\n        if (contentType.includes(\"multipart/form-data\")) {\n          formDataState = parseMultipartFormData(bodyData, contentType);\n        } else if (contentType.includes(\"application/x-www-form-urlencoded\")) {\n          formDataState = parseUrlEncodedFormData(bodyData);\n        } else {\n          throw new TypeError(\"Could not parse content as FormData\");\n        }\n\n        // Convert Uint8Array data to plain number arrays for safe marshalling\n        // Include marker so FormData.get() can reconstruct File instances\n        type SerializedFileValue = { __formDataFile__: true; data: number[]; filename: string; type: string };\n        type SerializedEntry = { name: string; value: string | SerializedFileValue };\n        return {\n          entries: formDataState.entries.map((entry): SerializedEntry => {\n            if (typeof entry.value === \"string\") {\n              return { name: entry.name, value: entry.value };\n            }\n            // Convert Uint8Array to number array and include marker\n            return {\n              name: entry.name,\n              value: {\n                __formDataFile__: true,\n                data: Array.from(entry.value.data),\n                filename: entry.value.filename,\n                type: entry.value.type,\n              },\n            };\n          }),\n        };\n      },\n    },\n  });\n}\n\n/**\n * Add the formData() method to Request.prototype via evalCode.\n *\n * This must be called AFTER both Request and FormData classes are on global.\n * The method creates a proper FormData instance with all entries.\n *\n * @see PATTERNS.md section 2 (Class Methods That Return Instances)\n */\nexport function addRequestFormDataMethod(context: QuickJSContext): void {\n  const result = context.evalCode(`\n    Request.prototype.formData = async function() {\n      // Get raw entries from private method\n      // Note: File data comes as plain number arrays (converted in host side)\n      const rawData = await this.__getFormDataEntries__();\n\n      // Create a proper FormData instance\n      const formData = new FormData();\n\n      // Populate with entries\n      // FormData.append handles both string values and file-like objects\n      // with number arrays (converted to Uint8Array on the host side)\n      for (const entry of rawData.entries) {\n        formData.append(entry.name, entry.value);\n      }\n\n      return formData;\n    };\n  `);\n\n  if (result.error) {\n    result.error.dispose();\n  } else {\n    result.value.dispose();\n  }\n}\n\n/**\n * Create a RequestState from a native Request object.\n *\n * This is now synchronous - we preserve the native ReadableStream instead of\n * buffering it. The stream is consumed lazily when QuickJS code accesses\n * request.body or calls request.text()/json()/arrayBuffer().\n *\n * This enables streaming large uploads (1GB+) without buffering.\n */\nexport function createRequestStateFromNative(\n  request: Request\n): RequestState {\n  return {\n    method: request.method,\n    url: request.url,\n    headersState: createHeadersStateFromNative(request.headers),\n    body: null, // Not buffered upfront - use nativeBodyStream instead\n    bodyUsed: false,\n    cache: request.cache,\n    credentials: request.credentials,\n    destination: request.destination,\n    integrity: request.integrity,\n    keepalive: request.keepalive,\n    mode: request.mode,\n    redirect: request.redirect,\n    referrer: request.referrer,\n    referrerPolicy: request.referrerPolicy,\n    signal: null, // Signal handling is complex, simplified here\n    nativeBodyStream: request.body ?? undefined,\n  };\n}\n"
+    "import type { QuickJSContext, QuickJSHandle } from \"quickjs-emscripten\";\nimport type { StateMap } from \"@ricsam/quickjs-core\";\nimport { defineClass, getInstanceStateById } from \"@ricsam/quickjs-core\";\nimport type { RequestState, HeadersState, AbortSignalState, FormDataState } from \"../types.mjs\";\nimport { createHeadersStateFromNative, createHeadersLike } from \"./headers.mjs\";\nimport { parseMultipartFormData, parseUrlEncodedFormData } from \"./form-data.mjs\";\nimport { startNativeStreamReader } from \"../upload-stream-queue.mjs\";\n\n/**\n * Type for the stream factory function\n */\ntype StreamFactory = (source: UnderlyingSource) => QuickJSHandle;\n\n/**\n * Stream helpers passed to the body getter for upload streaming\n */\ninterface StreamHelpers {\n  createStream: StreamFactory;\n  /** Creates an empty ReadableStream, stores on global, returns instanceId and globalKey */\n  createEmptyStream: () => { instanceId: number; globalKey: string };\n  /** Gets a fresh handle to the stream stored at globalKey */\n  getStreamByKey: (globalKey: string) => QuickJSHandle | null;\n  pumpEventLoop: () => void;\n}\n\n/**\n * Helper to consume a native ReadableStream into a Uint8Array.\n * Used by text(), json(), arrayBuffer(), blob() methods.\n */\nasync function consumeNativeStream(\n  stream: ReadableStream<Uint8Array>\n): Promise<Uint8Array> {\n  const chunks: Uint8Array[] = [];\n  const reader = stream.getReader();\n\n  while (true) {\n    const { done, value } = await reader.read();\n    if (done) break;\n    chunks.push(value);\n  }\n\n  // Concatenate chunks into single Uint8Array\n  const totalLength = chunks.reduce((sum, chunk) => sum + chunk.length, 0);\n  const result = new Uint8Array(totalLength);\n  let offset = 0;\n  for (const chunk of chunks) {\n    result.set(chunk, offset);\n    offset += chunk.length;\n  }\n\n  return result;\n}\n\n/**\n * Create the Request class for QuickJS\n */\nexport function createRequestClass(\n  context: QuickJSContext,\n  stateMap: StateMap,\n  streamHelpers?: StreamHelpers\n): QuickJSHandle {\n  const createStream = streamHelpers?.createStream;\n  return defineClass<RequestState>(context, stateMap, {\n    name: \"Request\",\n    construct: (args) => {\n      const input = args[0];\n      const init = args[1] as {\n        method?: string;\n        headers?: object;\n        body?: unknown;\n        cache?: string;\n        credentials?: string;\n        integrity?: string;\n        keepalive?: boolean;\n        mode?: string;\n        redirect?: string;\n        referrer?: string;\n        referrerPolicy?: string;\n        signal?: AbortSignalState;\n      } | undefined;\n\n      let url = \"\";\n      let method = \"GET\";\n      let headersState: HeadersState = { headers: new Map() };\n      let body: Uint8Array | null = null;\n      let signal: AbortSignalState | null = null;\n\n      // Handle input\n      if (typeof input === \"string\") {\n        url = input;\n      } else if (input && typeof input === \"object\") {\n        // Could be URL or Request-like\n        if (\"url\" in input) {\n          url = String((input as { url: string }).url);\n        }\n        if (\"method\" in input) {\n          method = String((input as { method: string }).method);\n        }\n        if (\"headersState\" in input) {\n          const inputHeaders = (input as RequestState).headersState;\n          headersState = {\n            headers: new Map(inputHeaders.headers),\n          };\n        }\n        if (\"body\" in input && (input as RequestState).body) {\n          body = (input as RequestState).body;\n        }\n        if (\"signal\" in input) {\n          signal = (input as RequestState).signal;\n        }\n      }\n\n      // Apply init options\n      if (init) {\n        if (init.method) {\n          method = init.method.toUpperCase();\n        }\n        if (init.headers) {\n          if (init.headers && typeof init.headers === \"object\") {\n            if (\"headers\" in init.headers && init.headers.headers instanceof Map) {\n              headersState = {\n                headers: new Map((init.headers as HeadersState).headers),\n              };\n            } else if (\n              \"__isDefineClassInstance__\" in init.headers &&\n              (init.headers as { __isDefineClassInstance__?: boolean }).__isDefineClassInstance__ === true &&\n              \"__instanceId__\" in init.headers\n            ) {\n              // Unmarshalled Headers instance from defineClass\n              const instanceId = (init.headers as { __instanceId__: number }).__instanceId__;\n              const state = getInstanceStateById<HeadersState>(instanceId);\n              if (state && state.headers instanceof Map) {\n                headersState = {\n                  headers: new Map(state.headers),\n                };\n              }\n            } else {\n              headersState = { headers: new Map() };\n              for (const [key, value] of Object.entries(init.headers)) {\n                headersState.headers.set(key.toLowerCase(), [String(value)]);\n              }\n            }\n          }\n        }\n        if (init.body !== undefined && init.body !== null) {\n          if (typeof init.body === \"string\") {\n            body = new TextEncoder().encode(init.body);\n          } else if (init.body instanceof ArrayBuffer) {\n            body = new Uint8Array(init.body);\n          } else if (init.body instanceof Uint8Array) {\n            body = init.body;\n          }\n        }\n        if (init.signal) {\n          signal = init.signal;\n        }\n      }\n\n      return {\n        method,\n        url,\n        headersState,\n        body,\n        bodyUsed: false,\n        cache: init?.cache || \"default\",\n        credentials: init?.credentials || \"same-origin\",\n        destination: \"\",\n        integrity: init?.integrity || \"\",\n        keepalive: init?.keepalive || false,\n        mode: init?.mode || \"cors\",\n        redirect: init?.redirect || \"follow\",\n        referrer: init?.referrer || \"about:client\",\n        referrerPolicy: init?.referrerPolicy || \"\",\n        signal,\n      };\n    },\n    properties: {\n      method: {\n        get(this: RequestState) {\n          return this.method;\n        },\n      },\n      url: {\n        get(this: RequestState) {\n          return this.url;\n        },\n      },\n      headers: {\n        get(this: RequestState) {\n          return createHeadersLike(this.headersState);\n        },\n      },\n      body: {\n        get(this: RequestState & { _uploadStreamGlobalKey?: string; _uploadStreamCleanup?: () => void; _cachedBodyStream?: object | null }) {\n          if (!createStream) {\n            // Fallback: return raw body if no stream factory\n            return this.body;\n          }\n\n          // If we have an upload stream, get a fresh handle each time\n          // (Can't cache handles because __hostCall__ disposes them after each call)\n          if (this._uploadStreamGlobalKey) {\n            return streamHelpers?.getStreamByKey(this._uploadStreamGlobalKey) || null;\n          }\n\n          // Return cached buffered body stream if already created\n          if (this._cachedBodyStream !== undefined) {\n            return this._cachedBodyStream;\n          }\n\n          // Streaming native body - create a QuickJS ReadableStream that bridges to the native stream\n          // Uses the \"Inverted Direct State Access\" pattern: host pushes to QuickJS stream's queue\n          if (this.nativeBodyStream) {\n            if (!streamHelpers?.createEmptyStream || !streamHelpers?.getStreamByKey) {\n              // No helpers available - fall back to null (legacy behavior)\n              return null;\n            }\n\n            // Create a QuickJS ReadableStream with no source callbacks.\n            // The stream is stored on a global because __hostCall__ disposes returned\n            // handles after each call. We cache the globalKey and get a fresh handle\n            // on each access via getStreamByKey().\n            const { instanceId: streamInstanceId, globalKey } = streamHelpers.createEmptyStream();\n\n            // Start background reader that pushes to the QuickJS stream\n            // The onChunkPushed callback pumps the event loop to process pending reads\n            const cleanup = startNativeStreamReader(\n              this.nativeBodyStream,\n              streamInstanceId,\n              streamHelpers.pumpEventLoop\n            );\n\n            // Store cleanup function for potential cancellation\n            this._uploadStreamCleanup = cleanup;\n            // Cache the global key so subsequent calls can get the same stream\n            this._uploadStreamGlobalKey = globalKey;\n\n            // Clear nativeBodyStream to prevent double-consumption\n            // This ensures text()/json()/arrayBuffer() don't try to read from it\n            this.nativeBodyStream = undefined;\n\n            // Get fresh handle to return\n            return streamHelpers.getStreamByKey(globalKey);\n          }\n\n          // Fallback: buffered body (backwards compatibility)\n          if (!this.body) {\n            this._cachedBodyStream = null;\n            return null;\n          }\n          const bodyData = this.body;\n          let offset = 0;\n          const chunkSize = 65536; // 64KB chunks\n          const stream = createStream({\n            pull(controller) {\n              if (offset >= bodyData.length) {\n                controller.close();\n                return;\n              }\n              const chunk = bodyData.slice(offset, Math.min(offset + chunkSize, bodyData.length));\n              offset += chunk.length;\n              controller.enqueue(chunk);\n            },\n          });\n          this._cachedBodyStream = stream;\n          return stream;\n        },\n      },\n      bodyUsed: {\n        get(this: RequestState) {\n          return this.bodyUsed;\n        },\n      },\n      cache: {\n        get(this: RequestState) {\n          return this.cache;\n        },\n      },\n      credentials: {\n        get(this: RequestState) {\n          return this.credentials;\n        },\n      },\n      destination: {\n        get(this: RequestState) {\n          return this.destination;\n        },\n      },\n      integrity: {\n        get(this: RequestState) {\n          return this.integrity;\n        },\n      },\n      keepalive: {\n        get(this: RequestState) {\n          return this.keepalive;\n        },\n      },\n      mode: {\n        get(this: RequestState) {\n          return this.mode;\n        },\n      },\n      redirect: {\n        get(this: RequestState) {\n          return this.redirect;\n        },\n      },\n      referrer: {\n        get(this: RequestState) {\n          return this.referrer;\n        },\n      },\n      referrerPolicy: {\n        get(this: RequestState) {\n          return this.referrerPolicy;\n        },\n      },\n      signal: {\n        get(this: RequestState) {\n          return this.signal;\n        },\n      },\n    },\n    methods: {\n      async arrayBuffer(this: RequestState): Promise<ArrayBuffer> {\n        if (this.bodyUsed) {\n          throw new TypeError(\"Body has already been consumed\");\n        }\n        this.bodyUsed = true;\n\n        // Consume native stream if present\n        if (this.nativeBodyStream) {\n          const buffer = await consumeNativeStream(this.nativeBodyStream);\n          return buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength) as ArrayBuffer;\n        }\n\n        // Fallback: buffered body\n        if (!this.body) {\n          return new ArrayBuffer(0);\n        }\n        return this.body.buffer.slice(\n          this.body.byteOffset,\n          this.body.byteOffset + this.body.byteLength\n        ) as ArrayBuffer;\n      },\n      async blob(this: RequestState): Promise<object> {\n        if (this.bodyUsed) {\n          throw new TypeError(\"Body has already been consumed\");\n        }\n        this.bodyUsed = true;\n        const contentType = this.headersState.headers.get(\"content-type\")?.[0] || \"\";\n\n        // Consume native stream if present\n        if (this.nativeBodyStream) {\n          const buffer = await consumeNativeStream(this.nativeBodyStream);\n          return {\n            parts: [buffer],\n            type: contentType,\n            size: buffer.length,\n          };\n        }\n\n        // Fallback: buffered body\n        return {\n          parts: this.body ? [this.body] : [],\n          type: contentType,\n          size: this.body?.length || 0,\n        };\n      },\n      clone(this: RequestState): RequestState {\n        if (this.bodyUsed) {\n          throw new TypeError(\"Body has already been consumed\");\n        }\n        // Note: Cannot clone streaming body - would need to tee the stream\n        if (this.nativeBodyStream) {\n          throw new TypeError(\"Cannot clone Request with streaming body\");\n        }\n        return {\n          ...this,\n          headersState: {\n            headers: new Map(this.headersState.headers),\n          },\n          body: this.body ? new Uint8Array(this.body) : null,\n          bodyUsed: false,\n        };\n      },\n      async json(this: RequestState): Promise<unknown> {\n        if (this.bodyUsed) {\n          throw new TypeError(\"Body has already been consumed\");\n        }\n        this.bodyUsed = true;\n\n        // Consume native stream if present\n        if (this.nativeBodyStream) {\n          const buffer = await consumeNativeStream(this.nativeBodyStream);\n          const text = new TextDecoder().decode(buffer);\n          return JSON.parse(text);\n        }\n\n        // Fallback: buffered body\n        if (!this.body) {\n          return JSON.parse(\"\");\n        }\n        const text = new TextDecoder().decode(this.body);\n        return JSON.parse(text);\n      },\n      async text(this: RequestState): Promise<string> {\n        if (this.bodyUsed) {\n          throw new TypeError(\"Body has already been consumed\");\n        }\n        this.bodyUsed = true;\n\n        // Consume native stream if present\n        if (this.nativeBodyStream) {\n          const buffer = await consumeNativeStream(this.nativeBodyStream);\n          return new TextDecoder().decode(buffer);\n        }\n\n        // Fallback: buffered body\n        if (!this.body) {\n          return \"\";\n        }\n        return new TextDecoder().decode(this.body);\n      },\n      /**\n       * Private method that returns raw FormData entries.\n       * Used by the formData() method added via evalCode (see addRequestFormDataMethod).\n       *\n       * Note: File data is converted to plain number arrays to avoid memory issues\n       * when marshalling Uint8Array between host and QuickJS contexts.\n       */\n      async __getFormDataEntries__(this: RequestState): Promise<{\n        entries: Array<{\n          name: string;\n          value: string | { __formDataFile__: true; data: number[]; filename: string; type: string };\n        }>;\n      }> {\n        if (this.bodyUsed) {\n          throw new TypeError(\"Body has already been consumed\");\n        }\n        this.bodyUsed = true;\n\n        // Get body data from native stream or buffered body\n        let bodyData: Uint8Array | null = null;\n        if (this.nativeBodyStream) {\n          bodyData = await consumeNativeStream(this.nativeBodyStream);\n        } else {\n          bodyData = this.body;\n        }\n\n        if (!bodyData) {\n          return { entries: [] };\n        }\n\n        const contentType = this.headersState.headers.get(\"content-type\")?.[0] || \"\";\n\n        let formDataState: FormDataState;\n        if (contentType.includes(\"multipart/form-data\")) {\n          formDataState = parseMultipartFormData(bodyData, contentType);\n        } else if (contentType.includes(\"application/x-www-form-urlencoded\")) {\n          formDataState = parseUrlEncodedFormData(bodyData);\n        } else {\n          throw new TypeError(\"Could not parse content as FormData\");\n        }\n\n        // Convert Uint8Array data to plain number arrays for safe marshalling\n        // Include marker so FormData.get() can reconstruct File instances\n        type SerializedFileValue = { __formDataFile__: true; data: number[]; filename: string; type: string };\n        type SerializedEntry = { name: string; value: string | SerializedFileValue };\n        return {\n          entries: formDataState.entries.map((entry): SerializedEntry => {\n            if (typeof entry.value === \"string\") {\n              return { name: entry.name, value: entry.value };\n            }\n            // Convert Uint8Array to number array and include marker\n            return {\n              name: entry.name,\n              value: {\n                __formDataFile__: true,\n                data: Array.from(entry.value.data),\n                filename: entry.value.filename,\n                type: entry.value.type,\n              },\n            };\n          }),\n        };\n      },\n    },\n  });\n}\n\n/**\n * Add the formData() method to Request.prototype via evalCode.\n *\n * This must be called AFTER both Request and FormData classes are on global.\n * The method creates a proper FormData instance with all entries.\n *\n * @see PATTERNS.md section 2 (Class Methods That Return Instances)\n */\nexport function addRequestFormDataMethod(context: QuickJSContext): void {\n  const result = context.evalCode(`\n    Request.prototype.formData = async function() {\n      // Get raw entries from private method\n      // Note: File data comes as plain number arrays (converted in host side)\n      const rawData = await this.__getFormDataEntries__();\n\n      // Create a proper FormData instance\n      const formData = new FormData();\n\n      // Populate with entries\n      // FormData.append handles both string values and file-like objects\n      // with number arrays (converted to Uint8Array on the host side)\n      for (const entry of rawData.entries) {\n        formData.append(entry.name, entry.value);\n      }\n\n      return formData;\n    };\n  `);\n\n  if (result.error) {\n    result.error.dispose();\n  } else {\n    result.value.dispose();\n  }\n}\n\n/**\n * Create a RequestState from a native Request object.\n *\n * This is now synchronous - we preserve the native ReadableStream instead of\n * buffering it. The stream is consumed lazily when QuickJS code accesses\n * request.body or calls request.text()/json()/arrayBuffer().\n *\n * This enables streaming large uploads (1GB+) without buffering.\n */\nexport function createRequestStateFromNative(\n  request: Request\n): RequestState {\n  return {\n    method: request.method,\n    url: request.url,\n    headersState: createHeadersStateFromNative(request.headers),\n    body: null, // Not buffered upfront - use nativeBodyStream instead\n    bodyUsed: false,\n    cache: request.cache,\n    credentials: request.credentials,\n    destination: request.destination,\n    integrity: request.integrity,\n    keepalive: request.keepalive,\n    mode: request.mode,\n    redirect: request.redirect,\n    referrer: request.referrer,\n    referrerPolicy: request.referrerPolicy,\n    signal: null, // Signal handling is complex, simplified here\n    nativeBodyStream: request.body ?? undefined,\n  };\n}\n"
   ],
-  "mappings": "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",
-  "debugId": "3969E7C807E073F664756E2164756E21",
+  "mappings": "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",
+  "debugId": "1AB30F476B52ACC364756E2164756E21",
   "names": []
 }

package/dist/mjs/globals/serve.mjs

@@ -6,20 +6,13 @@ function createServerWebSocketClass(context, stateMap, onWebSocketCommand) {
     name: "ServerWebSocket",
     construct: (args) => {
       const connectionId = String(args[0]);
-      const data = args[1];
       return {
-        data,
         readyState: 1,
         connectionId,
         wsHandle: null
       };
     },
     properties: {
-      data: {
-        get() {
-          return this.data;
-        }
-      },
       readyState: {
         get() {
           return this.readyState;
@@ -62,22 +55,13 @@ function createServerWebSocketClass(context, stateMap, onWebSocketCommand) {
     }
   });
 }
-function createServerClass(context, stateMap, serveState) {
+function createServerClass(context, stateMap, _serveState) {
   return defineClass(context, stateMap, {
     name: "Server",
     construct: () => {
-      return { serveState };
+      return {};
     },
-    methods: {
-      upgrade(_request, options) {
-        const data = options && typeof options === "object" && "data" in options ? options.data : undefined;
-        this.serveState.pendingUpgrade = {
-          requested: true,
-          data
-        };
-        return true;
-      }
-    }
+    methods: {}
   });
 }
 function createServeFunction(context, stateMap, serveState) {
@@ -148,4 +132,4 @@ export {
   createServeFunction
 };
 
-//# debugId=273172F2CE17BE7964756E2164756E21
+//# debugId=168A2F1F5C5FC26C64756E2164756E21

package/dist/mjs/globals/serve.mjs.map

@@ -2,9 +2,9 @@
   "version": 3,
   "sources": ["../../../src/globals/serve.ts"],
   "sourcesContent": [
-    "import type { QuickJSContext, QuickJSHandle } from \"quickjs-emscripten\";\nimport type { StateMap } from \"@ricsam/quickjs-core\";\nimport { defineClass } from \"@ricsam/quickjs-core\";\nimport type { ServeState, ServerWebSocketState, WebSocketCommand } from \"../types.mjs\";\n\ninterface ServerState {\n  serveState: ServeState;\n}\n\n/**\n * Create the ServerWebSocket class for QuickJS\n */\nexport function createServerWebSocketClass(\n  context: QuickJSContext,\n  stateMap: StateMap,\n  onWebSocketCommand: (cmd: WebSocketCommand) => void\n): QuickJSHandle {\n  return defineClass<ServerWebSocketState>(context, stateMap, {\n    name: \"ServerWebSocket\",\n    construct: (args) => {\n      const connectionId = String(args[0]);\n      const data = args[1];\n\n      return {\n        data,\n        readyState: 1, // OPEN\n        connectionId,\n        wsHandle: null,\n      };\n    },\n    properties: {\n      data: {\n        get(this: ServerWebSocketState) {\n          return this.data;\n        },\n      },\n      readyState: {\n        get(this: ServerWebSocketState) {\n          return this.readyState;\n        },\n      },\n    },\n    methods: {\n      send(this: ServerWebSocketState, message: unknown) {\n        if (this.readyState !== 1) {\n          throw new Error(\"WebSocket is not open\");\n        }\n\n        let data: string | ArrayBuffer;\n        if (typeof message === \"string\") {\n          data = message;\n        } else if (message instanceof ArrayBuffer) {\n          data = message;\n        } else if (message instanceof Uint8Array) {\n          data = message.buffer.slice(\n            message.byteOffset,\n            message.byteOffset + message.byteLength\n          ) as ArrayBuffer;\n        } else {\n          data = String(message);\n        }\n\n        onWebSocketCommand({\n          type: \"message\",\n          connectionId: this.connectionId,\n          data,\n        });\n      },\n      close(this: ServerWebSocketState, code?: unknown, reason?: unknown) {\n        if (this.readyState === 3) {\n          return; // Already closed\n        }\n\n        this.readyState = 2; // CLOSING\n\n        onWebSocketCommand({\n          type: \"close\",\n          connectionId: this.connectionId,\n          code: typeof code === \"number\" ? code : undefined,\n          reason: typeof reason === \"string\" ? reason : undefined,\n        });\n      },\n    },\n  });\n}\n\n/**\n * Create the Server class for QuickJS\n */\nexport function createServerClass(\n  context: QuickJSContext,\n  stateMap: StateMap,\n  serveState: ServeState\n): QuickJSHandle {\n  return defineClass<ServerState>(context, stateMap, {\n    name: \"Server\",\n    construct: () => {\n      return { serveState };\n    },\n    methods: {\n      upgrade(\n        this: ServerState,\n        _request: unknown,\n        options?: unknown\n      ): boolean {\n        const data =\n          options && typeof options === \"object\" && \"data\" in options\n            ? (options as { data: unknown }).data\n            : undefined;\n\n        this.serveState.pendingUpgrade = {\n          requested: true,\n          data,\n        };\n\n        return true;\n      },\n    },\n  });\n}\n\n/**\n * Create the serve function for QuickJS\n * Uses context.newFunction instead of defineFunction to properly manage handle lifetimes\n */\nexport function createServeFunction(\n  context: QuickJSContext,\n  stateMap: StateMap,\n  serveState: ServeState\n): QuickJSHandle {\n  return context.newFunction(\"serve\", (optionsHandle) => {\n    if (context.typeof(optionsHandle) !== \"object\") {\n      throw context.newError(\"serve requires an options object\");\n    }\n\n    // Dispose previous handlers if any\n    if (serveState.fetchHandler) {\n      serveState.fetchHandler.dispose();\n      serveState.fetchHandler = null;\n    }\n\n    // Get and store fetch handler - don't dispose, keep alive for later calls\n    const fetchHandle = context.getProp(optionsHandle, \"fetch\");\n    if (context.typeof(fetchHandle) === \"function\") {\n      serveState.fetchHandler = fetchHandle;\n    } else {\n      fetchHandle.dispose();\n    }\n\n    // Get and store websocket handlers\n    const websocketHandle = context.getProp(optionsHandle, \"websocket\");\n    if (context.typeof(websocketHandle) === \"object\") {\n      // Dispose previous handlers\n      if (serveState.websocketHandlers.open) {\n        serveState.websocketHandlers.open.dispose();\n        serveState.websocketHandlers.open = undefined;\n      }\n      if (serveState.websocketHandlers.message) {\n        serveState.websocketHandlers.message.dispose();\n        serveState.websocketHandlers.message = undefined;\n      }\n      if (serveState.websocketHandlers.close) {\n        serveState.websocketHandlers.close.dispose();\n        serveState.websocketHandlers.close = undefined;\n      }\n      if (serveState.websocketHandlers.error) {\n        serveState.websocketHandlers.error.dispose();\n        serveState.websocketHandlers.error = undefined;\n      }\n\n      const openHandle = context.getProp(websocketHandle, \"open\");\n      if (context.typeof(openHandle) === \"function\") {\n        serveState.websocketHandlers.open = openHandle;\n      } else {\n        openHandle.dispose();\n      }\n\n      const messageHandle = context.getProp(websocketHandle, \"message\");\n      if (context.typeof(messageHandle) === \"function\") {\n        serveState.websocketHandlers.message = messageHandle;\n      } else {\n        messageHandle.dispose();\n      }\n\n      const closeHandle = context.getProp(websocketHandle, \"close\");\n      if (context.typeof(closeHandle) === \"function\") {\n        serveState.websocketHandlers.close = closeHandle;\n      } else {\n        closeHandle.dispose();\n      }\n\n      const errorHandle = context.getProp(websocketHandle, \"error\");\n      if (context.typeof(errorHandle) === \"function\") {\n        serveState.websocketHandlers.error = errorHandle;\n      } else {\n        errorHandle.dispose();\n      }\n    }\n    websocketHandle.dispose();\n\n    return context.undefined;\n  });\n}\n"
+    "import type { QuickJSContext, QuickJSHandle } from \"quickjs-emscripten\";\nimport type { StateMap } from \"@ricsam/quickjs-core\";\nimport { defineClass } from \"@ricsam/quickjs-core\";\nimport type { ServeState, ServerWebSocketState, WebSocketCommand } from \"../types.mjs\";\n\n// Server state is empty - upgrade method is pure JavaScript and stores data in a global registry\ntype ServerState = Record<string, never>;\n\n/**\n * Create the ServerWebSocket class for QuickJS\n */\nexport function createServerWebSocketClass(\n  context: QuickJSContext,\n  stateMap: StateMap,\n  onWebSocketCommand: (cmd: WebSocketCommand) => void\n): QuickJSHandle {\n  return defineClass<ServerWebSocketState>(context, stateMap, {\n    name: \"ServerWebSocket\",\n    construct: (args) => {\n      const connectionId = String(args[0]);\n      // Note: 'data' is accessed via a pure-JS getter that reads from __upgradeRegistry__\n      // This avoids unmarshalling complex objects (like Zod schemas) that would exceed depth limit\n      return {\n        readyState: 1, // OPEN\n        connectionId,\n        wsHandle: null,\n      };\n    },\n    properties: {\n      // Note: 'data' is NOT defined here - it's a pure-JS getter added in setup.ts\n      // that reads from __upgradeRegistry__ to avoid marshalling complex objects\n      readyState: {\n        get(this: ServerWebSocketState) {\n          return this.readyState;\n        },\n      },\n    },\n    methods: {\n      send(this: ServerWebSocketState, message: unknown) {\n        if (this.readyState !== 1) {\n          throw new Error(\"WebSocket is not open\");\n        }\n\n        let data: string | ArrayBuffer;\n        if (typeof message === \"string\") {\n          data = message;\n        } else if (message instanceof ArrayBuffer) {\n          data = message;\n        } else if (message instanceof Uint8Array) {\n          data = message.buffer.slice(\n            message.byteOffset,\n            message.byteOffset + message.byteLength\n          ) as ArrayBuffer;\n        } else {\n          data = String(message);\n        }\n\n        onWebSocketCommand({\n          type: \"message\",\n          connectionId: this.connectionId,\n          data,\n        });\n      },\n      close(this: ServerWebSocketState, code?: unknown, reason?: unknown) {\n        if (this.readyState === 3) {\n          return; // Already closed\n        }\n\n        this.readyState = 2; // CLOSING\n\n        onWebSocketCommand({\n          type: \"close\",\n          connectionId: this.connectionId,\n          code: typeof code === \"number\" ? code : undefined,\n          reason: typeof reason === \"string\" ? reason : undefined,\n        });\n      },\n    },\n  });\n}\n\n/**\n * Create the Server class for QuickJS\n */\nexport function createServerClass(\n  context: QuickJSContext,\n  stateMap: StateMap,\n  _serveState: ServeState\n): QuickJSHandle {\n  // Note: The upgrade method is added as pure JavaScript in setup.ts\n  // to avoid marshalling data across the QuickJS/host boundary.\n  // This keeps complex objects (like Zod schemas) within QuickJS.\n  return defineClass<ServerState>(context, stateMap, {\n    name: \"Server\",\n    construct: () => {\n      return {};\n    },\n    methods: {},\n  });\n}\n\n/**\n * Create the serve function for QuickJS\n * Uses context.newFunction instead of defineFunction to properly manage handle lifetimes\n */\nexport function createServeFunction(\n  context: QuickJSContext,\n  stateMap: StateMap,\n  serveState: ServeState\n): QuickJSHandle {\n  return context.newFunction(\"serve\", (optionsHandle) => {\n    if (context.typeof(optionsHandle) !== \"object\") {\n      throw context.newError(\"serve requires an options object\");\n    }\n\n    // Dispose previous handlers if any\n    if (serveState.fetchHandler) {\n      serveState.fetchHandler.dispose();\n      serveState.fetchHandler = null;\n    }\n\n    // Get and store fetch handler - don't dispose, keep alive for later calls\n    const fetchHandle = context.getProp(optionsHandle, \"fetch\");\n    if (context.typeof(fetchHandle) === \"function\") {\n      serveState.fetchHandler = fetchHandle;\n    } else {\n      fetchHandle.dispose();\n    }\n\n    // Get and store websocket handlers\n    const websocketHandle = context.getProp(optionsHandle, \"websocket\");\n    if (context.typeof(websocketHandle) === \"object\") {\n      // Dispose previous handlers\n      if (serveState.websocketHandlers.open) {\n        serveState.websocketHandlers.open.dispose();\n        serveState.websocketHandlers.open = undefined;\n      }\n      if (serveState.websocketHandlers.message) {\n        serveState.websocketHandlers.message.dispose();\n        serveState.websocketHandlers.message = undefined;\n      }\n      if (serveState.websocketHandlers.close) {\n        serveState.websocketHandlers.close.dispose();\n        serveState.websocketHandlers.close = undefined;\n      }\n      if (serveState.websocketHandlers.error) {\n        serveState.websocketHandlers.error.dispose();\n        serveState.websocketHandlers.error = undefined;\n      }\n\n      const openHandle = context.getProp(websocketHandle, \"open\");\n      if (context.typeof(openHandle) === \"function\") {\n        serveState.websocketHandlers.open = openHandle;\n      } else {\n        openHandle.dispose();\n      }\n\n      const messageHandle = context.getProp(websocketHandle, \"message\");\n      if (context.typeof(messageHandle) === \"function\") {\n        serveState.websocketHandlers.message = messageHandle;\n      } else {\n        messageHandle.dispose();\n      }\n\n      const closeHandle = context.getProp(websocketHandle, \"close\");\n      if (context.typeof(closeHandle) === \"function\") {\n        serveState.websocketHandlers.close = closeHandle;\n      } else {\n        closeHandle.dispose();\n      }\n\n      const errorHandle = context.getProp(websocketHandle, \"error\");\n      if (context.typeof(errorHandle) === \"function\") {\n        serveState.websocketHandlers.error = errorHandle;\n      } else {\n        errorHandle.dispose();\n      }\n    }\n    websocketHandle.dispose();\n\n    return context.undefined;\n  });\n}\n"
   ],
-  "mappings": "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",
-  "debugId": "273172F2CE17BE7964756E2164756E21",
+  "mappings": "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",
+  "debugId": "168A2F1F5C5FC26C64756E2164756E21",
   "names": []
 }

package/dist/mjs/handle.mjs

@@ -75,6 +75,17 @@ function createFetchHandle(context, stateMap, serveState) {
       if (!serveState.fetchHandler) {
         throw new Error("No serve() handler registered");
       }
+      if (serveState.pendingUpgrade?.connectionId) {
+        const connId = serveState.pendingUpgrade.connectionId;
+        if (!serveState.activeConnections.has(connId)) {
+          const deleteResult = context.evalCode(`__upgradeRegistry__.delete("${connId}")`);
+          if (deleteResult.error) {
+            deleteResult.error.dispose();
+          } else {
+            deleteResult.value.dispose();
+          }
+        }
+      }
       serveState.pendingUpgrade = null;
       const requestState = createRequestStateFromNative(request);
       const requestHandle = createRequestInstance(context, stateMap, requestState);
@@ -143,26 +154,24 @@ function createFetchHandle(context, stateMap, serveState) {
     getUpgradeRequest() {
       return serveState.pendingUpgrade;
     },
-    dispatchWebSocketOpen(connectionId, data) {
+    dispatchWebSocketOpen(connectionId) {
       if (!serveState.websocketHandlers.open) {
         return;
       }
       const connectionIdHandle = context.newString(connectionId);
-      const dataHandle = marshal(context, data);
       context.setProp(context.global, "__wsConnectionId__", connectionIdHandle);
-      context.setProp(context.global, "__wsData__", dataHandle);
       connectionIdHandle.dispose();
-      dataHandle.dispose();
-      const wsResult = context.evalCode(`new __ServerWebSocket__(__wsConnectionId__, __wsData__)`);
+      const wsResult = context.evalCode(`new __ServerWebSocket__(__wsConnectionId__)`);
       context.setProp(context.global, "__wsConnectionId__", context.undefined);
-      context.setProp(context.global, "__wsData__", context.undefined);
       if (wsResult.error) {
         wsResult.error.dispose();
         return;
       }
       const wsHandle = wsResult.value;
+      const connIdForGetter = context.newString(connectionId);
+      context.setProp(wsHandle, "__connectionId__", connIdForGetter);
+      connIdForGetter.dispose();
       serveState.activeConnections.set(connectionId, {
-        data,
         readyState: 1,
         connectionId,
         wsHandle
@@ -194,14 +203,24 @@ function createFetchHandle(context, stateMap, serveState) {
       context.runtime.executePendingJobs();
     },
     dispatchWebSocketClose(connectionId, code, reason) {
+      const cleanupRegistry = () => {
+        const deleteResult = context.evalCode(`__upgradeRegistry__.delete("${connectionId}")`);
+        if (deleteResult.error) {
+          deleteResult.error.dispose();
+        } else {
+          deleteResult.value.dispose();
+        }
+      };
       const connection = serveState.activeConnections.get(connectionId);
       if (!connection || !connection.wsHandle) {
         serveState.activeConnections.delete(connectionId);
+        cleanupRegistry();
         return;
       }
       if (!serveState.websocketHandlers.close) {
         connection.wsHandle.dispose();
         serveState.activeConnections.delete(connectionId);
+        cleanupRegistry();
         return;
       }
       connection.readyState = 3;
@@ -217,6 +236,7 @@ function createFetchHandle(context, stateMap, serveState) {
       }
       connection.wsHandle.dispose();
       serveState.activeConnections.delete(connectionId);
+      cleanupRegistry();
       context.runtime.executePendingJobs();
     },
     dispatchWebSocketError(connectionId, error) {
@@ -247,7 +267,16 @@ function createFetchHandle(context, stateMap, serveState) {
     hasServeHandler() {
       return serveState.fetchHandler !== null;
     },
+    hasActiveConnections() {
+      return serveState.activeConnections.size > 0;
+    },
     dispose() {
+      const clearResult = context.evalCode(`__upgradeRegistry__.clear()`);
+      if (clearResult.error) {
+        clearResult.error.dispose();
+      } else {
+        clearResult.value.dispose();
+      }
       if (serveState.websocketHandlers.open) {
         serveState.websocketHandlers.open.dispose();
         serveState.websocketHandlers.open = undefined;
@@ -281,4 +310,4 @@ export {
   createFetchHandle
 };
 
-//# debugId=802249127874F14F64756E2164756E21
+//# debugId=023C0E73AA057C8764756E2164756E21