@ricsam/isolate-fetch 0.1.11 → 0.1.13

package/dist/cjs/stream-state.cjs.map

@@ -2,9 +2,9 @@
   "version": 3,
   "sources": ["../../src/stream-state.ts"],
   "sourcesContent": [
-    "import ivm from \"isolated-vm\";\n\n// ============================================================================\n// Types\n// ============================================================================\n\nexport interface StreamState {\n  /** Buffered chunks waiting to be read */\n  queue: Uint8Array[];\n\n  /** Total bytes in queue (for backpressure) */\n  queueSize: number;\n\n  /** Stream has been closed (no more data) */\n  closed: boolean;\n\n  /** Stream encountered an error */\n  errored: boolean;\n\n  /** The error value if errored */\n  errorValue: unknown;\n\n  /** A pull is waiting for data */\n  pullWaiting: boolean;\n\n  /** Resolve function for waiting pull */\n  pullResolve: ((chunk: Uint8Array | null) => void) | null;\n\n  /** Reject function for waiting pull */\n  pullReject: ((error: unknown) => void) | null;\n}\n\nexport interface StreamStateRegistry {\n  /** Create a new stream and return its ID */\n  create(): number;\n\n  /** Get stream state by ID */\n  get(streamId: number): StreamState | undefined;\n\n  /** Push a chunk to the stream's queue */\n  push(streamId: number, chunk: Uint8Array): boolean;\n\n  /** Pull a chunk from the stream (returns Promise that resolves when data available) */\n  pull(\n    streamId: number\n  ): Promise<{ value: Uint8Array; done: false } | { done: true }>;\n\n  /** Close the stream (no more data) */\n  close(streamId: number): void;\n\n  /** Error the stream */\n  error(streamId: number, errorValue: unknown): void;\n\n  /** Check if stream queue is above high-water mark */\n  isQueueFull(streamId: number): boolean;\n\n  /** Delete stream state (cleanup) */\n  delete(streamId: number): void;\n\n  /** Clear all streams (context cleanup) */\n  clear(): void;\n}\n\n// ============================================================================\n// Constants\n// ============================================================================\n\n/** Maximum bytes to buffer before backpressure kicks in */\nexport const HIGH_WATER_MARK = 64 * 1024; // 64KB\n\n/** Maximum number of chunks in queue */\nexport const MAX_QUEUE_CHUNKS = 16;\n\n// ============================================================================\n// Implementation\n// ============================================================================\n\nexport function createStreamStateRegistry(): StreamStateRegistry {\n  const streams = new Map<number, StreamState>();\n  let nextStreamId = 1;\n\n  return {\n    create(): number {\n      const streamId = nextStreamId++;\n      streams.set(streamId, {\n        queue: [],\n        queueSize: 0,\n        closed: false,\n        errored: false,\n        errorValue: undefined,\n        pullWaiting: false,\n        pullResolve: null,\n        pullReject: null,\n      });\n      return streamId;\n    },\n\n    get(streamId: number): StreamState | undefined {\n      return streams.get(streamId);\n    },\n\n    push(streamId: number, chunk: Uint8Array): boolean {\n      const state = streams.get(streamId);\n      if (!state) return false;\n      if (state.closed || state.errored) return false;\n\n      // If a pull is waiting, deliver directly\n      if (state.pullWaiting && state.pullResolve) {\n        state.pullWaiting = false;\n        const resolve = state.pullResolve;\n        state.pullResolve = null;\n        state.pullReject = null;\n        resolve(chunk);\n        return true;\n      }\n\n      // Otherwise queue the chunk\n      state.queue.push(chunk);\n      state.queueSize += chunk.length;\n      return true;\n    },\n\n    async pull(\n      streamId: number\n    ): Promise<{ value: Uint8Array; done: false } | { done: true }> {\n      const state = streams.get(streamId);\n      if (!state) {\n        return { done: true };\n      }\n\n      // If queue has data, return it first (even if stream is errored)\n      if (state.queue.length > 0) {\n        const chunk = state.queue.shift()!;\n        state.queueSize -= chunk.length;\n        return { value: chunk, done: false };\n      }\n\n      // If errored (and queue is empty), throw\n      if (state.errored) {\n        throw state.errorValue;\n      }\n\n      // If closed and queue empty, we're done\n      if (state.closed) {\n        return { done: true };\n      }\n\n      // Wait for data\n      return new Promise((resolve, reject) => {\n        state.pullWaiting = true;\n        state.pullResolve = (chunk) => {\n          if (chunk === null) {\n            resolve({ done: true });\n          } else {\n            resolve({ value: chunk, done: false });\n          }\n        };\n        state.pullReject = reject;\n      });\n    },\n\n    close(streamId: number): void {\n      const state = streams.get(streamId);\n      if (!state) return;\n\n      state.closed = true;\n\n      // If a pull is waiting, resolve with done\n      if (state.pullWaiting && state.pullResolve) {\n        state.pullWaiting = false;\n        const resolve = state.pullResolve;\n        state.pullResolve = null;\n        state.pullReject = null;\n        resolve(null);\n      }\n    },\n\n    error(streamId: number, errorValue: unknown): void {\n      const state = streams.get(streamId);\n      if (!state) return;\n\n      state.errored = true;\n      state.errorValue = errorValue;\n\n      // If a pull is waiting, reject it\n      if (state.pullWaiting && state.pullReject) {\n        state.pullWaiting = false;\n        const reject = state.pullReject;\n        state.pullResolve = null;\n        state.pullReject = null;\n        reject(errorValue);\n      }\n    },\n\n    isQueueFull(streamId: number): boolean {\n      const state = streams.get(streamId);\n      if (!state) return true;\n      return (\n        state.queueSize >= HIGH_WATER_MARK ||\n        state.queue.length >= MAX_QUEUE_CHUNKS\n      );\n    },\n\n    delete(streamId: number): void {\n      const state = streams.get(streamId);\n      if (state && state.pullWaiting && state.pullReject) {\n        state.pullReject(new Error(\"Stream deleted\"));\n      }\n      streams.delete(streamId);\n    },\n\n    clear(): void {\n      for (const [streamId] of streams) {\n        this.delete(streamId);\n      }\n    },\n  };\n}\n\n// ============================================================================\n// Context-Scoped Registry\n// ============================================================================\n\nconst contextRegistries = new WeakMap<ivm.Context, StreamStateRegistry>();\n\nexport function getStreamRegistryForContext(\n  context: ivm.Context\n): StreamStateRegistry {\n  let registry = contextRegistries.get(context);\n  if (!registry) {\n    registry = createStreamStateRegistry();\n    contextRegistries.set(context, registry);\n  }\n  return registry;\n}\n\nexport function clearStreamRegistryForContext(context: ivm.Context): void {\n  const registry = contextRegistries.get(context);\n  if (registry) {\n    registry.clear();\n    contextRegistries.delete(context);\n  }\n}\n\n// ============================================================================\n// Native Stream Reader\n// ============================================================================\n\n/**\n * Start reading from a native ReadableStream and push to host queue.\n * Respects backpressure by pausing when queue is full.\n *\n * @param nativeStream The native ReadableStream to read from\n * @param streamId The stream ID in the registry\n * @param registry The stream state registry\n * @returns Async cleanup function to cancel the reader\n */\nexport function startNativeStreamReader(\n  nativeStream: ReadableStream<Uint8Array>,\n  streamId: number,\n  registry: StreamStateRegistry\n): () => Promise<void> {\n  let cancelled = false;\n  let reader: ReadableStreamDefaultReader<Uint8Array> | null = null;\n  let readLoopPromise: Promise<void> | null = null;\n\n  const CHUNK_SIZE = 64 * 1024; // 64KB max chunk size\n\n  async function readLoop() {\n    try {\n      reader = nativeStream.getReader();\n\n      while (!cancelled) {\n        // Respect backpressure - wait if queue is full\n        while (registry.isQueueFull(streamId) && !cancelled) {\n          await new Promise((resolve) => setTimeout(resolve, 1));\n        }\n        if (cancelled) break;\n\n        const { done, value } = await reader.read();\n\n        if (done) {\n          registry.close(streamId);\n          break;\n        }\n\n        if (value) {\n          // Split large chunks to maintain granularity\n          if (value.length > CHUNK_SIZE) {\n            for (let offset = 0; offset < value.length; offset += CHUNK_SIZE) {\n              const chunk = value.slice(\n                offset,\n                Math.min(offset + CHUNK_SIZE, value.length)\n              );\n              registry.push(streamId, chunk);\n            }\n          } else {\n            registry.push(streamId, value);\n          }\n        }\n      }\n    } catch (error) {\n      registry.error(streamId, error);\n    } finally {\n      if (reader) {\n        try {\n          reader.releaseLock();\n        } catch {\n          // Ignore release errors\n        }\n      }\n    }\n  }\n\n  // Start the read loop and save the promise\n  readLoopPromise = readLoop();\n\n  // Return async cleanup function\n  return async () => {\n    cancelled = true;\n    if (reader) {\n      try {\n        await reader.cancel();\n      } catch {\n        // Ignore cancel errors\n      }\n    }\n    // Wait for read loop to finish\n    if (readLoopPromise) {\n      try {\n        await readLoopPromise;\n      } catch {\n        // Ignore read loop errors during cleanup\n      }\n    }\n  };\n}\n"
+    "import ivm from \"isolated-vm\";\n\n// ============================================================================\n// Types\n// ============================================================================\n\nexport interface StreamState {\n  /** Buffered chunks waiting to be read */\n  queue: Uint8Array[];\n\n  /** Total bytes in queue (for backpressure) */\n  queueSize: number;\n\n  /** Stream has been closed (no more data) */\n  closed: boolean;\n\n  /** Stream encountered an error */\n  errored: boolean;\n\n  /** The error value if errored */\n  errorValue: unknown;\n\n  /** A pull is waiting for data */\n  pullWaiting: boolean;\n\n  /** Resolve function for waiting pull */\n  pullResolve: ((chunk: Uint8Array | null) => void) | null;\n\n  /** Reject function for waiting pull */\n  pullReject: ((error: unknown) => void) | null;\n}\n\nexport interface StreamStateRegistry {\n  /** Create a new stream and return its ID */\n  create(): number;\n\n  /** Get stream state by ID */\n  get(streamId: number): StreamState | undefined;\n\n  /** Push a chunk to the stream's queue */\n  push(streamId: number, chunk: Uint8Array): boolean;\n\n  /** Pull a chunk from the stream (returns Promise that resolves when data available) */\n  pull(\n    streamId: number\n  ): Promise<{ value: Uint8Array; done: false } | { done: true }>;\n\n  /** Close the stream (no more data) */\n  close(streamId: number): void;\n\n  /** Error the stream */\n  error(streamId: number, errorValue: unknown): void;\n\n  /** Check if stream queue is above high-water mark */\n  isQueueFull(streamId: number): boolean;\n\n  /** Delete stream state (cleanup) */\n  delete(streamId: number): void;\n\n  /** Clear all streams (context cleanup) */\n  clear(): void;\n\n  /** Cancel a stream and call its cleanup function */\n  cancel(streamId: number): void;\n\n  /** Register a cleanup function for a stream */\n  setCleanup(streamId: number, cleanup: () => Promise<void>): void;\n}\n\n// ============================================================================\n// Constants\n// ============================================================================\n\n/** Maximum bytes to buffer before backpressure kicks in */\nexport const HIGH_WATER_MARK = 64 * 1024; // 64KB\n\n/** Maximum number of chunks in queue */\nexport const MAX_QUEUE_CHUNKS = 16;\n\n// ============================================================================\n// Implementation\n// ============================================================================\n\nexport function createStreamStateRegistry(): StreamStateRegistry {\n  const streams = new Map<number, StreamState>();\n  const cleanups = new Map<number, () => Promise<void>>();\n  let nextStreamId = 1;\n\n  return {\n    create(): number {\n      const streamId = nextStreamId++;\n      streams.set(streamId, {\n        queue: [],\n        queueSize: 0,\n        closed: false,\n        errored: false,\n        errorValue: undefined,\n        pullWaiting: false,\n        pullResolve: null,\n        pullReject: null,\n      });\n      return streamId;\n    },\n\n    get(streamId: number): StreamState | undefined {\n      return streams.get(streamId);\n    },\n\n    push(streamId: number, chunk: Uint8Array): boolean {\n      const state = streams.get(streamId);\n      if (!state) return false;\n      if (state.closed || state.errored) return false;\n\n      // If a pull is waiting, deliver directly\n      if (state.pullWaiting && state.pullResolve) {\n        state.pullWaiting = false;\n        const resolve = state.pullResolve;\n        state.pullResolve = null;\n        state.pullReject = null;\n        resolve(chunk);\n        return true;\n      }\n\n      // Otherwise queue the chunk\n      state.queue.push(chunk);\n      state.queueSize += chunk.length;\n      return true;\n    },\n\n    async pull(\n      streamId: number\n    ): Promise<{ value: Uint8Array; done: false } | { done: true }> {\n      const state = streams.get(streamId);\n      if (!state) {\n        return { done: true };\n      }\n\n      // If queue has data, return it first (even if stream is errored)\n      if (state.queue.length > 0) {\n        const chunk = state.queue.shift()!;\n        state.queueSize -= chunk.length;\n        return { value: chunk, done: false };\n      }\n\n      // If errored (and queue is empty), throw\n      if (state.errored) {\n        throw state.errorValue;\n      }\n\n      // If closed and queue empty, we're done\n      if (state.closed) {\n        return { done: true };\n      }\n\n      // Wait for data\n      return new Promise((resolve, reject) => {\n        state.pullWaiting = true;\n        state.pullResolve = (chunk) => {\n          if (chunk === null) {\n            resolve({ done: true });\n          } else {\n            resolve({ value: chunk, done: false });\n          }\n        };\n        state.pullReject = reject;\n      });\n    },\n\n    close(streamId: number): void {\n      const state = streams.get(streamId);\n      if (!state) return;\n\n      state.closed = true;\n\n      // If a pull is waiting, resolve with done\n      if (state.pullWaiting && state.pullResolve) {\n        state.pullWaiting = false;\n        const resolve = state.pullResolve;\n        state.pullResolve = null;\n        state.pullReject = null;\n        resolve(null);\n      }\n    },\n\n    error(streamId: number, errorValue: unknown): void {\n      const state = streams.get(streamId);\n      if (!state) return;\n\n      state.errored = true;\n      state.errorValue = errorValue;\n\n      // If a pull is waiting, reject it\n      if (state.pullWaiting && state.pullReject) {\n        state.pullWaiting = false;\n        const reject = state.pullReject;\n        state.pullResolve = null;\n        state.pullReject = null;\n        reject(errorValue);\n      }\n    },\n\n    isQueueFull(streamId: number): boolean {\n      const state = streams.get(streamId);\n      if (!state) return true;\n      return (\n        state.queueSize >= HIGH_WATER_MARK ||\n        state.queue.length >= MAX_QUEUE_CHUNKS\n      );\n    },\n\n    delete(streamId: number): void {\n      const state = streams.get(streamId);\n      if (state && state.pullWaiting && state.pullReject) {\n        state.pullReject(new Error(\"Stream deleted\"));\n      }\n      streams.delete(streamId);\n      cleanups.delete(streamId);\n    },\n\n    clear(): void {\n      for (const [streamId] of streams) {\n        this.delete(streamId);\n      }\n    },\n\n    cancel(streamId: number): void {\n      this.close(streamId);\n      const cleanup = cleanups.get(streamId);\n      if (cleanup) {\n        cleanup().catch(() => {});\n        cleanups.delete(streamId);\n      }\n    },\n\n    setCleanup(streamId: number, cleanup: () => Promise<void>): void {\n      cleanups.set(streamId, cleanup);\n    },\n  };\n}\n\n// ============================================================================\n// Context-Scoped Registry\n// ============================================================================\n\nconst contextRegistries = new WeakMap<ivm.Context, StreamStateRegistry>();\n\nexport function getStreamRegistryForContext(\n  context: ivm.Context\n): StreamStateRegistry {\n  let registry = contextRegistries.get(context);\n  if (!registry) {\n    registry = createStreamStateRegistry();\n    contextRegistries.set(context, registry);\n  }\n  return registry;\n}\n\nexport function clearStreamRegistryForContext(context: ivm.Context): void {\n  const registry = contextRegistries.get(context);\n  if (registry) {\n    registry.clear();\n    contextRegistries.delete(context);\n  }\n}\n\n// ============================================================================\n// Native Stream Reader\n// ============================================================================\n\n/**\n * Start reading from a native ReadableStream and push to host queue.\n * Respects backpressure by pausing when queue is full.\n *\n * @param nativeStream The native ReadableStream to read from\n * @param streamId The stream ID in the registry\n * @param registry The stream state registry\n * @returns Async cleanup function to cancel the reader\n */\nexport function startNativeStreamReader(\n  nativeStream: ReadableStream<Uint8Array>,\n  streamId: number,\n  registry: StreamStateRegistry\n): () => Promise<void> {\n  let cancelled = false;\n  let reader: ReadableStreamDefaultReader<Uint8Array> | null = null;\n  let readLoopPromise: Promise<void> | null = null;\n\n  const CHUNK_SIZE = 64 * 1024; // 64KB max chunk size\n\n  async function readLoop() {\n    try {\n      reader = nativeStream.getReader();\n\n      while (!cancelled) {\n        // Respect backpressure - wait if queue is full\n        while (registry.isQueueFull(streamId) && !cancelled) {\n          await new Promise((resolve) => setTimeout(resolve, 1));\n        }\n        if (cancelled) break;\n\n        const { done, value } = await reader.read();\n\n        if (done) {\n          registry.close(streamId);\n          break;\n        }\n\n        if (value) {\n          // Split large chunks to maintain granularity\n          if (value.length > CHUNK_SIZE) {\n            for (let offset = 0; offset < value.length; offset += CHUNK_SIZE) {\n              const chunk = value.slice(\n                offset,\n                Math.min(offset + CHUNK_SIZE, value.length)\n              );\n              registry.push(streamId, chunk);\n            }\n          } else {\n            registry.push(streamId, value);\n          }\n        }\n      }\n    } catch (error) {\n      registry.error(streamId, error);\n    } finally {\n      if (reader) {\n        try {\n          reader.releaseLock();\n        } catch {\n          // Ignore release errors\n        }\n      }\n    }\n  }\n\n  // Start the read loop and save the promise\n  readLoopPromise = readLoop();\n\n  // Return async cleanup function\n  return async () => {\n    cancelled = true;\n    if (reader) {\n      try {\n        await reader.cancel();\n      } catch {\n        // Ignore cancel errors\n      }\n    }\n    // Wait for read loop to finish\n    if (readLoopPromise) {\n      try {\n        await readLoopPromise;\n      } catch {\n        // Ignore read loop errors during cleanup\n      }\n    }\n  };\n}\n"
   ],
-  "mappings": "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",
-  "debugId": "3BBE010F050C1BB964756E2164756E21",
+  "mappings": "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",
+  "debugId": "56A6539DC27E874264756E2164756E21",
   "names": []
 }

package/dist/mjs/index.mjs

@@ -366,6 +366,9 @@ function setupStreamCallbacks(context, streamRegistry) {
   global.setSync("__Stream_isQueueFull", new ivm.Callback((streamId) => {
     return streamRegistry.isQueueFull(streamId);
   }));
+  global.setSync("__Stream_cancel", new ivm.Callback((streamId) => {
+    streamRegistry.cancel(streamId);
+  }));
   const pullRef = new ivm.Reference(async (streamId) => {
     const result = await streamRegistry.pull(streamId);
     if (result.done) {
@@ -416,7 +419,7 @@ var hostBackedStreamCode = `
         async pull(controller) {
           if (closed) return;
 
-          const resultJson = __Stream_pull_ref.applySyncPromise(undefined, [streamId]);
+          const resultJson = await __Stream_pull_ref.apply(undefined, [streamId], { result: { promise: true, copy: true } });
           const result = JSON.parse(resultJson);
 
           if (result.done) {
@@ -428,7 +431,7 @@ var hostBackedStreamCode = `
         },
         cancel(reason) {
           closed = true;
-          __Stream_error(streamId, String(reason || "cancelled"));
+          __Stream_cancel(streamId);
         }
       });
 
@@ -455,7 +458,7 @@ var hostBackedStreamCode = `
   globalThis.HostBackedReadableStream = HostBackedReadableStream;
 })();
 `;
-function setupResponse(context, stateMap) {
+function setupResponse(context, stateMap, streamRegistry) {
   const global = context.global;
   global.setSync("__Response_construct", new ivm.Callback((bodyBytes, status, statusText, headers) => {
     const instanceId = nextInstanceId++;
@@ -535,6 +538,10 @@ function setupResponse(context, stateMap) {
     const state = stateMap.get(instanceId);
     return state?.type ?? "default";
   }));
+  global.setSync("__Response_get_nullBody", new ivm.Callback((instanceId) => {
+    const state = stateMap.get(instanceId);
+    return state?.nullBody ?? false;
+  }));
   global.setSync("__Response_setType", new ivm.Callback((instanceId, type) => {
     const state = stateMap.get(instanceId);
     if (state) {
@@ -568,6 +575,38 @@ function setupResponse(context, stateMap) {
     if (!state) {
       throw new Error("[TypeError]Cannot clone invalid Response");
     }
+    if (state.streamId !== null) {
+      const streamId1 = streamRegistry.create();
+      const streamId2 = streamRegistry.create();
+      const origStreamId = state.streamId;
+      (async () => {
+        try {
+          while (true) {
+            const result = await streamRegistry.pull(origStreamId);
+            if (result.done) {
+              streamRegistry.close(streamId1);
+              streamRegistry.close(streamId2);
+              break;
+            }
+            streamRegistry.push(streamId1, new Uint8Array(result.value));
+            streamRegistry.push(streamId2, new Uint8Array(result.value));
+          }
+        } catch (err) {
+          streamRegistry.error(streamId1, err);
+          streamRegistry.error(streamId2, err);
+        }
+      })();
+      state.streamId = streamId1;
+      const newId2 = nextInstanceId++;
+      const newState2 = {
+        ...state,
+        streamId: streamId2,
+        body: state.body ? new Uint8Array(state.body) : null,
+        bodyUsed: false
+      };
+      stateMap.set(newId2, newState2);
+      return newId2;
+    }
     const newId = nextInstanceId++;
     const newState = {
       ...state,
@@ -794,6 +833,11 @@ function setupResponse(context, stateMap) {
     }
 
     get body() {
+      // Null-body responses (204, 304, HEAD) must return null
+      if (__Response_get_nullBody(this.#instanceId)) {
+        return null;
+      }
+
       // Return cached body if available (WHATWG spec requires same object on repeated access)
       if (this.#cachedBody !== null) {
         return this.#cachedBody;
@@ -825,6 +869,26 @@ function setupResponse(context, stateMap) {
       } catch (err) {
         throw __decodeError(err);
       }
+      if (__Response_get_nullBody(this.#instanceId)) {
+        return "";
+      }
+      if (this.#streamId !== null) {
+        const reader = this.body.getReader();
+        const chunks = [];
+        while (true) {
+          const { done, value } = await reader.read();
+          if (done) break;
+          if (value) chunks.push(value);
+        }
+        const totalLength = chunks.reduce((acc, c) => acc + c.length, 0);
+        const result = new Uint8Array(totalLength);
+        let offset = 0;
+        for (const chunk of chunks) {
+          result.set(chunk, offset);
+          offset += chunk.length;
+        }
+        return new TextDecoder().decode(result);
+      }
       return __Response_text(this.#instanceId);
     }
 
@@ -1075,30 +1139,10 @@ function setupRequest(context, stateMap) {
       return Array.from(new TextEncoder().encode(body.toString()));
     }
     if (body instanceof FormData) {
-      // Check if FormData has any File/Blob entries
-      let hasFiles = false;
-      for (const [, value] of body.entries()) {
-        if (value instanceof File || value instanceof Blob) {
-          hasFiles = true;
-          break;
-        }
-      }
-
-      if (hasFiles) {
-        // Serialize as multipart/form-data
-        const { body: bytes, contentType } = __serializeFormData(body);
-        globalThis.__pendingFormDataContentType = contentType;
-        return Array.from(bytes);
-      }
-
-      // URL-encoded for string-only FormData
-      const parts = [];
-      body.forEach((value, key) => {
-        if (typeof value === 'string') {
-          parts.push(encodeURIComponent(key) + '=' + encodeURIComponent(value));
-        }
-      });
-      return Array.from(new TextEncoder().encode(parts.join('&')));
+      // Always serialize as multipart/form-data per spec
+      const { body: bytes, contentType } = __serializeFormData(body);
+      globalThis.__pendingFormDataContentType = contentType;
+      return Array.from(bytes);
     }
     // Try to convert to string
     return Array.from(new TextEncoder().encode(String(body)));
@@ -1196,7 +1240,7 @@ function setupRequest(context, stateMap) {
       if (globalThis.__pendingFormDataContentType) {
         headers.set('content-type', globalThis.__pendingFormDataContentType);
         delete globalThis.__pendingFormDataContentType;
-      } else if (body instanceof FormData && !headers.has('content-type')) {
+      } else if (body instanceof URLSearchParams && !headers.has('content-type')) {
         headers.set('content-type', 'application/x-www-form-urlencoded');
       }
 
@@ -1386,32 +1430,56 @@ function setupRequest(context, stateMap) {
 var FETCH_STREAM_THRESHOLD = 64 * 1024;
 function setupFetchFunction(context, stateMap, streamRegistry, options) {
   const global = context.global;
-  const fetchRef = new ivm.Reference(async (url, method, headersJson, bodyJson, signalAborted) => {
+  const fetchAbortControllers = new Map;
+  global.setSync("__fetch_abort", new ivm.Callback((fetchId) => {
+    const controller = fetchAbortControllers.get(fetchId);
+    if (controller) {
+      setImmediate(() => controller.abort());
+    }
+  }));
+  const fetchRef = new ivm.Reference(async (url, method, headersJson, bodyJson, signalAborted, fetchId) => {
     if (signalAborted) {
       throw new Error("[AbortError]The operation was aborted.");
     }
+    const hostController = new AbortController;
+    fetchAbortControllers.set(fetchId, hostController);
     const headers = JSON.parse(headersJson);
     const bodyBytes = bodyJson ? JSON.parse(bodyJson) : null;
     const body = bodyBytes ? new Uint8Array(bodyBytes) : null;
     const nativeRequest = new Request(url, {
       method,
       headers,
-      body
+      body,
+      signal: hostController.signal
     });
     const onFetch = options?.onFetch ?? fetch;
-    const nativeResponse = await onFetch(nativeRequest);
-    const contentLength = nativeResponse.headers.get("content-length");
-    const knownSize = contentLength ? parseInt(contentLength, 10) : null;
-    const isCallbackStream = nativeResponse.__isCallbackStream;
-    const isNetworkResponse = nativeResponse.url && (nativeResponse.url.startsWith("http://") || nativeResponse.url.startsWith("https://"));
-    const shouldStream = nativeResponse.body && (isCallbackStream || isNetworkResponse && (knownSize === null || knownSize > FETCH_STREAM_THRESHOLD));
-    if (shouldStream && nativeResponse.body) {
-      if (isCallbackStream) {
-        const streamId2 = streamRegistry.create();
-        const passthruMap = getPassthruBodiesForContext(context);
-        passthruMap.set(streamId2, nativeResponse.body);
-        const instanceId3 = nextInstanceId++;
-        const state3 = {
+    try {
+      let cleanupAbort;
+      const abortPromise = new Promise((_, reject) => {
+        if (hostController.signal.aborted) {
+          reject(Object.assign(new Error("The operation was aborted."), { name: "AbortError" }));
+          return;
+        }
+        const onAbort = () => {
+          reject(Object.assign(new Error("The operation was aborted."), { name: "AbortError" }));
+        };
+        hostController.signal.addEventListener("abort", onAbort, { once: true });
+        cleanupAbort = () => hostController.signal.removeEventListener("abort", onAbort);
+      });
+      abortPromise.catch(() => {});
+      const nativeResponse = await Promise.race([onFetch(nativeRequest), abortPromise]);
+      cleanupAbort?.();
+      const status = nativeResponse.status;
+      const isNullBody = status === 204 || status === 304 || method.toUpperCase() === "HEAD";
+      const isCallbackStream = nativeResponse.__isCallbackStream;
+      const isNetworkResponse = nativeResponse.url && (nativeResponse.url.startsWith("http://") || nativeResponse.url.startsWith("https://"));
+      const shouldStream = !isNullBody && nativeResponse.body && (isCallbackStream || isNetworkResponse);
+      if (shouldStream && nativeResponse.body) {
+        const streamId = streamRegistry.create();
+        const streamCleanupFn = startNativeStreamReader(nativeResponse.body, streamId, streamRegistry);
+        streamRegistry.setCleanup(streamId, streamCleanupFn);
+        const instanceId2 = nextInstanceId++;
+        const state2 = {
           status: nativeResponse.status,
           statusText: nativeResponse.statusText,
           headers: Array.from(nativeResponse.headers.entries()),
@@ -1420,65 +1488,37 @@ function setupFetchFunction(context, stateMap, streamRegistry, options) {
           type: "default",
           url: nativeResponse.url,
           redirected: nativeResponse.redirected,
-          streamId: streamId2
+          streamId,
+          nullBody: isNullBody
         };
-        stateMap.set(instanceId3, state3);
-        return instanceId3;
+        stateMap.set(instanceId2, state2);
+        return instanceId2;
       }
-      const streamId = streamRegistry.create();
-      const instanceId2 = nextInstanceId++;
-      const state2 = {
+      const responseBody = await nativeResponse.arrayBuffer();
+      const responseBodyArray = Array.from(new Uint8Array(responseBody));
+      const instanceId = nextInstanceId++;
+      const state = {
         status: nativeResponse.status,
         statusText: nativeResponse.statusText,
         headers: Array.from(nativeResponse.headers.entries()),
-        body: new Uint8Array(0),
+        body: new Uint8Array(responseBodyArray),
         bodyUsed: false,
         type: "default",
         url: nativeResponse.url,
         redirected: nativeResponse.redirected,
-        streamId
+        streamId: null,
+        nullBody: isNullBody
       };
-      stateMap.set(instanceId2, state2);
-      const reader = nativeResponse.body.getReader();
-      (async () => {
-        try {
-          while (true) {
-            const { done, value } = await reader.read();
-            if (done) {
-              streamRegistry.close(streamId);
-              break;
-            }
-            if (value) {
-              while (streamRegistry.isQueueFull(streamId)) {
-                await new Promise((r) => setTimeout(r, 1));
-              }
-              streamRegistry.push(streamId, value);
-            }
-          }
-        } catch (err) {
-          streamRegistry.error(streamId, err);
-        } finally {
-          reader.releaseLock();
-        }
-      })();
-      return instanceId2;
+      stateMap.set(instanceId, state);
+      return instanceId;
+    } catch (err) {
+      if (err instanceof Error && err.name === "AbortError") {
+        throw new Error("[AbortError]The operation was aborted.");
+      }
+      throw err;
+    } finally {
+      fetchAbortControllers.delete(fetchId);
     }
-    const responseBody = await nativeResponse.arrayBuffer();
-    const responseBodyArray = Array.from(new Uint8Array(responseBody));
-    const instanceId = nextInstanceId++;
-    const state = {
-      status: nativeResponse.status,
-      statusText: nativeResponse.statusText,
-      headers: Array.from(nativeResponse.headers.entries()),
-      body: new Uint8Array(responseBodyArray),
-      bodyUsed: false,
-      type: "default",
-      url: nativeResponse.url,
-      redirected: nativeResponse.redirected,
-      streamId: null
-    };
-    stateMap.set(instanceId, state);
-    return instanceId;
   });
   global.setSync("__fetch_ref", fetchRef);
   const fetchCode = `
@@ -1496,7 +1536,28 @@ function setupFetchFunction(context, stateMap, streamRegistry, options) {
     return err;
   }
 
-  globalThis.fetch = function(input, init = {}) {
+  let __nextFetchId = 1;
+
+  globalThis.fetch = async function(input, init = {}) {
+    // Handle Blob and ReadableStream bodies before creating Request
+    if (init.body instanceof Blob && !(init.body instanceof File)) {
+      const buf = await init.body.arrayBuffer();
+      init = Object.assign({}, init, { body: new Uint8Array(buf) });
+    } else if (init.body instanceof ReadableStream) {
+      const reader = init.body.getReader();
+      const chunks = [];
+      while (true) {
+        const { done, value } = await reader.read();
+        if (done) break;
+        chunks.push(value);
+      }
+      const total = chunks.reduce((s, c) => s + c.length, 0);
+      const buf = new Uint8Array(total);
+      let off = 0;
+      for (const c of chunks) { buf.set(c, off); off += c.length; }
+      init = Object.assign({}, init, { body: buf });
+    }
+
     // Create Request from input
     const request = input instanceof Request ? input : new Request(input, init);
 
@@ -1504,20 +1565,34 @@ function setupFetchFunction(context, stateMap, streamRegistry, options) {
     const signal = init.signal ?? request.signal;
     const signalAborted = signal?.aborted ?? false;
 
+    // Assign a fetch ID for abort tracking
+    const fetchId = __nextFetchId++;
+
+    // Register abort listener if signal exists
+    if (signal && !signalAborted) {
+      signal.addEventListener('abort', () => { __fetch_abort(fetchId); });
+    }
+
     // Serialize headers and body to JSON for transfer
     const headersJson = JSON.stringify(Array.from(request.headers.entries()));
     const bodyBytes = request._getBodyBytes();
     const bodyJson = bodyBytes ? JSON.stringify(bodyBytes) : null;
 
+    // Short-circuit: if signal is already aborted, throw without calling host
+    if (signalAborted) {
+      throw new DOMException('The operation was aborted.', 'AbortError');
+    }
+
     // Call host - returns just the response instance ID
     try {
-      const instanceId = __fetch_ref.applySyncPromise(undefined, [
+      const instanceId = await __fetch_ref.apply(undefined, [
         request.url,
         request.method,
         headersJson,
         bodyJson,
-        signalAborted
-      ]);
+        signalAborted,
+        fetchId
+      ], { result: { promise: true, copy: true } });
 
       // Construct Response from the instance ID
       return Response._fromInstanceId(instanceId);
@@ -1634,7 +1709,7 @@ async function setupFetch(context, options) {
   context.evalSync(multipartCode);
   setupStreamCallbacks(context, streamRegistry);
   context.evalSync(hostBackedStreamCode);
-  setupResponse(context, stateMap);
+  setupResponse(context, stateMap, streamRegistry);
   setupRequest(context, stateMap);
   setupFetchFunction(context, stateMap, streamRegistry, options);
   const serveState = {
@@ -1757,8 +1832,7 @@ async function setupFetch(context, options) {
             },
             cancel() {
               streamDone = true;
-              streamRegistry.error(responseStreamId, new Error("Stream cancelled"));
-              streamRegistry.delete(responseStreamId);
+              streamRegistry.cancel(responseStreamId);
             }
           });
           const responseHeaders2 = new Headers(responseState.headers);
@@ -1911,4 +1985,4 @@ export {
   clearAllInstanceState
 };
 
-//# debugId=5C3C175E215A892A64756E2164756E21
+//# debugId=D6C7C0BA2C0C13D164756E2164756E21