@ricsam/isolate-fetch 0.1.19 → 0.1.21

package/dist/cjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/isolate-fetch",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "type": "commonjs"
 }

package/dist/mjs/index.mjs

@@ -7,6 +7,7 @@ import {
 } from "./stream-state.mjs";
 var instanceStateMap = new WeakMap;
 var passthruBodies = new WeakMap;
+var trackedGlobalHandles = new WeakMap;
 var nextInstanceId = 1;
 function getInstanceStateMapForContext(context) {
   let map = instanceStateMap.get(context);
@@ -24,6 +25,37 @@ function getPassthruBodiesForContext(context) {
   }
   return map;
 }
+function getTrackedGlobalHandlesForContext(context) {
+  let handles = trackedGlobalHandles.get(context);
+  if (!handles) {
+    handles = new Set;
+    trackedGlobalHandles.set(context, handles);
+  }
+  return handles;
+}
+function setTrackedGlobal(context, name, value) {
+  if (value instanceof ivm.Callback || value instanceof ivm.Reference) {
+    getTrackedGlobalHandlesForContext(context).add(value);
+  }
+  context.global.setSync(name, value);
+}
+function releaseIfSupported(handle) {
+  const maybeHandle = handle;
+  if (typeof maybeHandle.release === "function") {
+    maybeHandle.release();
+  }
+}
+function releaseTrackedGlobalHandles(context) {
+  const handles = trackedGlobalHandles.get(context);
+  if (!handles)
+    return;
+  for (const handle of handles) {
+    try {
+      releaseIfSupported(handle);
+    } catch {}
+  }
+  handles.clear();
+}
 var headersCode = `
 (function() {
   class Headers {
@@ -356,24 +388,23 @@ var multipartCode = `
 })();
 `;
 function setupStreamCallbacks(context, streamRegistry) {
-  const global = context.global;
-  global.setSync("__Stream_create", new ivm.Callback(() => {
+  setTrackedGlobal(context, "__Stream_create", new ivm.Callback(() => {
     return streamRegistry.create();
   }));
-  global.setSync("__Stream_push", new ivm.Callback((streamId, chunkArray) => {
+  setTrackedGlobal(context, "__Stream_push", new ivm.Callback((streamId, chunkArray) => {
     const chunk = new Uint8Array(chunkArray);
     return streamRegistry.push(streamId, chunk);
   }));
-  global.setSync("__Stream_close", new ivm.Callback((streamId) => {
+  setTrackedGlobal(context, "__Stream_close", new ivm.Callback((streamId) => {
     streamRegistry.close(streamId);
   }));
-  global.setSync("__Stream_error", new ivm.Callback((streamId, message) => {
+  setTrackedGlobal(context, "__Stream_error", new ivm.Callback((streamId, message) => {
     streamRegistry.error(streamId, new Error(message));
   }));
-  global.setSync("__Stream_isQueueFull", new ivm.Callback((streamId) => {
+  setTrackedGlobal(context, "__Stream_isQueueFull", new ivm.Callback((streamId) => {
     return streamRegistry.isQueueFull(streamId);
   }));
-  global.setSync("__Stream_cancel", new ivm.Callback((streamId) => {
+  setTrackedGlobal(context, "__Stream_cancel", new ivm.Callback((streamId) => {
     streamRegistry.cancel(streamId);
   }));
   const pullRef = new ivm.Reference(async (streamId) => {
@@ -383,7 +414,7 @@ function setupStreamCallbacks(context, streamRegistry) {
     }
     return JSON.stringify({ done: false, value: Array.from(result.value) });
   });
-  global.setSync("__Stream_pull_ref", pullRef);
+  setTrackedGlobal(context, "__Stream_pull_ref", pullRef);
 }
 var hostBackedStreamCode = `
 (function() {
@@ -466,8 +497,7 @@ var hostBackedStreamCode = `
 })();
 `;
 function setupResponse(context, stateMap, streamRegistry) {
-  const global = context.global;
-  global.setSync("__Response_construct", new ivm.Callback((bodyBytes, status, statusText, headers) => {
+  setTrackedGlobal(context, "__Response_construct", new ivm.Callback((bodyBytes, status, statusText, headers) => {
     const instanceId = nextInstanceId++;
     const body = bodyBytes ? new Uint8Array(bodyBytes) : null;
     const state = {
@@ -484,7 +514,7 @@ function setupResponse(context, stateMap, streamRegistry) {
     stateMap.set(instanceId, state);
     return instanceId;
   }));
-  global.setSync("__Response_constructStreaming", new ivm.Callback((streamId, status, statusText, headers) => {
+  setTrackedGlobal(context, "__Response_constructStreaming", new ivm.Callback((streamId, status, statusText, headers) => {
     const instanceId = nextInstanceId++;
     const state = {
       status,
@@ -500,7 +530,7 @@ function setupResponse(context, stateMap, streamRegistry) {
     stateMap.set(instanceId, state);
     return instanceId;
   }));
-  global.setSync("__Response_constructFromFetch", new ivm.Callback((bodyBytes, status, statusText, headers, url, redirected) => {
+  setTrackedGlobal(context, "__Response_constructFromFetch", new ivm.Callback((bodyBytes, status, statusText, headers, url, redirected) => {
     const instanceId = nextInstanceId++;
     const body = bodyBytes ? new Uint8Array(bodyBytes) : null;
     const state = {
@@ -517,45 +547,45 @@ function setupResponse(context, stateMap, streamRegistry) {
     stateMap.set(instanceId, state);
     return instanceId;
   }));
-  global.setSync("__Response_get_status", new ivm.Callback((instanceId) => {
+  setTrackedGlobal(context, "__Response_get_status", new ivm.Callback((instanceId) => {
     const state = stateMap.get(instanceId);
     return state?.status ?? 200;
   }));
-  global.setSync("__Response_get_statusText", new ivm.Callback((instanceId) => {
+  setTrackedGlobal(context, "__Response_get_statusText", new ivm.Callback((instanceId) => {
     const state = stateMap.get(instanceId);
     return state?.statusText ?? "";
   }));
-  global.setSync("__Response_get_headers", new ivm.Callback((instanceId) => {
+  setTrackedGlobal(context, "__Response_get_headers", new ivm.Callback((instanceId) => {
     const state = stateMap.get(instanceId);
     return state?.headers ?? [];
   }));
-  global.setSync("__Response_get_bodyUsed", new ivm.Callback((instanceId) => {
+  setTrackedGlobal(context, "__Response_get_bodyUsed", new ivm.Callback((instanceId) => {
     const state = stateMap.get(instanceId);
     return state?.bodyUsed ?? false;
   }));
-  global.setSync("__Response_get_url", new ivm.Callback((instanceId) => {
+  setTrackedGlobal(context, "__Response_get_url", new ivm.Callback((instanceId) => {
     const state = stateMap.get(instanceId);
     return state?.url ?? "";
   }));
-  global.setSync("__Response_get_redirected", new ivm.Callback((instanceId) => {
+  setTrackedGlobal(context, "__Response_get_redirected", new ivm.Callback((instanceId) => {
     const state = stateMap.get(instanceId);
     return state?.redirected ?? false;
   }));
-  global.setSync("__Response_get_type", new ivm.Callback((instanceId) => {
+  setTrackedGlobal(context, "__Response_get_type", new ivm.Callback((instanceId) => {
     const state = stateMap.get(instanceId);
     return state?.type ?? "default";
   }));
-  global.setSync("__Response_get_nullBody", new ivm.Callback((instanceId) => {
+  setTrackedGlobal(context, "__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) => {
+  setTrackedGlobal(context, "__Response_setType", new ivm.Callback((instanceId, type) => {
     const state = stateMap.get(instanceId);
     if (state) {
       state.type = type;
     }
   }));
-  global.setSync("__Response_markBodyUsed", new ivm.Callback((instanceId) => {
+  setTrackedGlobal(context, "__Response_markBodyUsed", new ivm.Callback((instanceId) => {
     const state = stateMap.get(instanceId);
     if (state) {
       if (state.bodyUsed) {
@@ -564,20 +594,20 @@ function setupResponse(context, stateMap, streamRegistry) {
       state.bodyUsed = true;
     }
   }));
-  global.setSync("__Response_text", new ivm.Callback((instanceId) => {
+  setTrackedGlobal(context, "__Response_text", new ivm.Callback((instanceId) => {
     const state = stateMap.get(instanceId);
     if (!state || !state.body)
       return "";
     return new TextDecoder().decode(state.body);
   }));
-  global.setSync("__Response_arrayBuffer", new ivm.Callback((instanceId) => {
+  setTrackedGlobal(context, "__Response_arrayBuffer", new ivm.Callback((instanceId) => {
     const state = stateMap.get(instanceId);
     if (!state || !state.body) {
       return new ivm.ExternalCopy(new ArrayBuffer(0)).copyInto();
     }
     return new ivm.ExternalCopy(state.body.buffer.slice(state.body.byteOffset, state.body.byteOffset + state.body.byteLength)).copyInto();
   }));
-  global.setSync("__Response_clone", new ivm.Callback((instanceId) => {
+  setTrackedGlobal(context, "__Response_clone", new ivm.Callback((instanceId) => {
     const state = stateMap.get(instanceId);
     if (!state) {
       throw new Error("[TypeError]Cannot clone invalid Response");
@@ -623,7 +653,7 @@ function setupResponse(context, stateMap, streamRegistry) {
     stateMap.set(newId, newState);
     return newId;
   }));
-  global.setSync("__Response_getStreamId", new ivm.Callback((instanceId) => {
+  setTrackedGlobal(context, "__Response_getStreamId", new ivm.Callback((instanceId) => {
     const state = stateMap.get(instanceId);
     return state?.streamId ?? null;
   }));
@@ -1008,8 +1038,7 @@ function setupResponse(context, stateMap, streamRegistry) {
   context.evalSync(responseCode);
 }
 function setupRequest(context, stateMap) {
-  const global = context.global;
-  global.setSync("__Request_construct", new ivm.Callback((url, method, headers, bodyBytes, mode, credentials, cache, redirect, referrer, integrity) => {
+  setTrackedGlobal(context, "__Request_construct", new ivm.Callback((url, method, headers, bodyBytes, mode, credentials, cache, redirect, referrer, integrity) => {
     const instanceId = nextInstanceId++;
     const body = bodyBytes ? new Uint8Array(bodyBytes) : null;
     const state = {
@@ -1030,47 +1059,47 @@ function setupRequest(context, stateMap) {
     stateMap.set(instanceId, state);
     return instanceId;
   }));
-  global.setSync("__Request_get_method", new ivm.Callback((instanceId) => {
+  setTrackedGlobal(context, "__Request_get_method", new ivm.Callback((instanceId) => {
     const state = stateMap.get(instanceId);
     return state?.method ?? "GET";
   }));
-  global.setSync("__Request_get_url", new ivm.Callback((instanceId) => {
+  setTrackedGlobal(context, "__Request_get_url", new ivm.Callback((instanceId) => {
     const state = stateMap.get(instanceId);
     return state?.url ?? "";
   }));
-  global.setSync("__Request_get_headers", new ivm.Callback((instanceId) => {
+  setTrackedGlobal(context, "__Request_get_headers", new ivm.Callback((instanceId) => {
     const state = stateMap.get(instanceId);
     return state?.headers ?? [];
   }));
-  global.setSync("__Request_get_bodyUsed", new ivm.Callback((instanceId) => {
+  setTrackedGlobal(context, "__Request_get_bodyUsed", new ivm.Callback((instanceId) => {
     const state = stateMap.get(instanceId);
     return state?.bodyUsed ?? false;
   }));
-  global.setSync("__Request_get_mode", new ivm.Callback((instanceId) => {
+  setTrackedGlobal(context, "__Request_get_mode", new ivm.Callback((instanceId) => {
     const state = stateMap.get(instanceId);
     return state?.mode ?? "cors";
   }));
-  global.setSync("__Request_get_credentials", new ivm.Callback((instanceId) => {
+  setTrackedGlobal(context, "__Request_get_credentials", new ivm.Callback((instanceId) => {
     const state = stateMap.get(instanceId);
     return state?.credentials ?? "same-origin";
   }));
-  global.setSync("__Request_get_cache", new ivm.Callback((instanceId) => {
+  setTrackedGlobal(context, "__Request_get_cache", new ivm.Callback((instanceId) => {
     const state = stateMap.get(instanceId);
     return state?.cache ?? "default";
   }));
-  global.setSync("__Request_get_redirect", new ivm.Callback((instanceId) => {
+  setTrackedGlobal(context, "__Request_get_redirect", new ivm.Callback((instanceId) => {
     const state = stateMap.get(instanceId);
     return state?.redirect ?? "follow";
   }));
-  global.setSync("__Request_get_referrer", new ivm.Callback((instanceId) => {
+  setTrackedGlobal(context, "__Request_get_referrer", new ivm.Callback((instanceId) => {
     const state = stateMap.get(instanceId);
     return state?.referrer ?? "about:client";
   }));
-  global.setSync("__Request_get_integrity", new ivm.Callback((instanceId) => {
+  setTrackedGlobal(context, "__Request_get_integrity", new ivm.Callback((instanceId) => {
     const state = stateMap.get(instanceId);
     return state?.integrity ?? "";
   }));
-  global.setSync("__Request_markBodyUsed", new ivm.Callback((instanceId) => {
+  setTrackedGlobal(context, "__Request_markBodyUsed", new ivm.Callback((instanceId) => {
     const state = stateMap.get(instanceId);
     if (state) {
       if (state.bodyUsed) {
@@ -1079,26 +1108,26 @@ function setupRequest(context, stateMap) {
       state.bodyUsed = true;
     }
   }));
-  global.setSync("__Request_text", new ivm.Callback((instanceId) => {
+  setTrackedGlobal(context, "__Request_text", new ivm.Callback((instanceId) => {
     const state = stateMap.get(instanceId);
     if (!state || !state.body)
       return "";
     return new TextDecoder().decode(state.body);
   }));
-  global.setSync("__Request_arrayBuffer", new ivm.Callback((instanceId) => {
+  setTrackedGlobal(context, "__Request_arrayBuffer", new ivm.Callback((instanceId) => {
     const state = stateMap.get(instanceId);
     if (!state || !state.body) {
       return new ivm.ExternalCopy(new ArrayBuffer(0)).copyInto();
     }
     return new ivm.ExternalCopy(state.body.buffer.slice(state.body.byteOffset, state.body.byteOffset + state.body.byteLength)).copyInto();
   }));
-  global.setSync("__Request_getBodyBytes", new ivm.Callback((instanceId) => {
+  setTrackedGlobal(context, "__Request_getBodyBytes", new ivm.Callback((instanceId) => {
     const state = stateMap.get(instanceId);
     if (!state || !state.body)
       return null;
     return Array.from(state.body);
   }));
-  global.setSync("__Request_clone", new ivm.Callback((instanceId) => {
+  setTrackedGlobal(context, "__Request_clone", new ivm.Callback((instanceId) => {
     const state = stateMap.get(instanceId);
     if (!state) {
       throw new Error("[TypeError]Cannot clone invalid Request");
@@ -1112,11 +1141,11 @@ function setupRequest(context, stateMap) {
     stateMap.set(newId, newState);
     return newId;
   }));
-  global.setSync("__Request_getStreamId", new ivm.Callback((instanceId) => {
+  setTrackedGlobal(context, "__Request_getStreamId", new ivm.Callback((instanceId) => {
     const state = stateMap.get(instanceId);
     return state?.streamId ?? null;
   }));
-  global.setSync("__Request_get_signalAborted", new ivm.Callback((instanceId) => {
+  setTrackedGlobal(context, "__Request_get_signalAborted", new ivm.Callback((instanceId) => {
     const state = stateMap.get(instanceId);
     return state?.signalAborted ?? false;
   }));
@@ -1462,9 +1491,8 @@ function setupRequest(context, stateMap) {
 }
 var FETCH_STREAM_THRESHOLD = 64 * 1024;
 function setupFetchFunction(context, stateMap, streamRegistry, options) {
-  const global = context.global;
   const fetchAbortControllers = new Map;
-  global.setSync("__fetch_abort", new ivm.Callback((fetchId) => {
+  setTrackedGlobal(context, "__fetch_abort", new ivm.Callback((fetchId) => {
     const controller = fetchAbortControllers.get(fetchId);
     if (controller) {
       setImmediate(() => controller.abort());
@@ -1559,7 +1587,7 @@ function setupFetchFunction(context, stateMap, streamRegistry, options) {
       fetchAbortControllers.delete(fetchId);
     }
   });
-  global.setSync("__fetch_ref", fetchRef);
+  setTrackedGlobal(context, "__fetch_ref", fetchRef);
   const fetchCode = `
 (function() {
   function __decodeError(err) {
@@ -1644,12 +1672,11 @@ function setupFetchFunction(context, stateMap, streamRegistry, options) {
   context.evalSync(fetchCode);
 }
 function setupServer(context, serveState) {
-  const global = context.global;
   context.evalSync(`
     globalThis.__upgradeRegistry__ = new Map();
     globalThis.__upgradeIdCounter__ = 0;
   `);
-  global.setSync("__setPendingUpgrade__", new ivm.Callback((connectionId) => {
+  setTrackedGlobal(context, "__setPendingUpgrade__", new ivm.Callback((connectionId) => {
     serveState.pendingUpgrade = { requested: true, connectionId };
   }));
   context.evalSync(`
@@ -1668,13 +1695,12 @@ function setupServer(context, serveState) {
   `);
 }
 function setupServerWebSocket(context, wsCommandCallbacks) {
-  const global = context.global;
-  global.setSync("__ServerWebSocket_send", new ivm.Callback((connectionId, data) => {
+  setTrackedGlobal(context, "__ServerWebSocket_send", new ivm.Callback((connectionId, data) => {
     const cmd = { type: "message", connectionId, data };
     for (const cb of wsCommandCallbacks)
       cb(cmd);
   }));
-  global.setSync("__ServerWebSocket_close", new ivm.Callback((connectionId, code, reason) => {
+  setTrackedGlobal(context, "__ServerWebSocket_close", new ivm.Callback((connectionId, code, reason) => {
     const cmd = { type: "close", connectionId, code, reason };
     for (const cb of wsCommandCallbacks)
       cb(cmd);
@@ -1727,8 +1753,7 @@ function setupServerWebSocket(context, wsCommandCallbacks) {
   `);
 }
 function setupClientWebSocket(context, clientWsCommandCallbacks) {
-  const global = context.global;
-  global.setSync("__WebSocket_connect", new ivm.Callback((socketId, url, protocols) => {
+  setTrackedGlobal(context, "__WebSocket_connect", new ivm.Callback((socketId, url, protocols) => {
     const cmd = {
       type: "connect",
       socketId,
@@ -1738,12 +1763,12 @@ function setupClientWebSocket(context, clientWsCommandCallbacks) {
     for (const cb of clientWsCommandCallbacks)
       cb(cmd);
   }));
-  global.setSync("__WebSocket_send", new ivm.Callback((socketId, data) => {
+  setTrackedGlobal(context, "__WebSocket_send", new ivm.Callback((socketId, data) => {
     const cmd = { type: "send", socketId, data };
     for (const cb of clientWsCommandCallbacks)
       cb(cmd);
   }));
-  global.setSync("__WebSocket_close", new ivm.Callback((socketId, code, reason) => {
+  setTrackedGlobal(context, "__WebSocket_close", new ivm.Callback((socketId, code, reason) => {
     const cmd = { type: "close", socketId, code, reason };
     for (const cb of clientWsCommandCallbacks)
       cb(cmd);
@@ -2129,7 +2154,7 @@ async function setupFetch(context, options) {
   setupServe(context);
   setupClientWebSocket(context, clientWsCommandCallbacks);
   const eventCallbacks = new Set;
-  context.global.setSync("__emit", new ivm.Callback((eventName, payloadJson) => {
+  setTrackedGlobal(context, "__emit", new ivm.Callback((eventName, payloadJson) => {
     const payload = JSON.parse(payloadJson);
     for (const cb of eventCallbacks)
       cb(eventName, payload);
@@ -2169,6 +2194,7 @@ async function setupFetch(context, options) {
       context.evalSync(`globalThis.__upgradeRegistry__.clear()`);
       serveState.activeConnections.clear();
       serveState.pendingUpgrade = null;
+      releaseTrackedGlobalHandles(context);
       try {
         requestAbortSignalRef.release();
       } catch {}
@@ -2258,7 +2284,8 @@ async function setupFetch(context, options) {
             passthruMap.delete(responseState.streamId);
             const responseHeaders2 = new Headers(responseState.headers);
             const status2 = responseState.status === 101 ? 200 : responseState.status;
-            const response2 = new Response(passthruBody, {
+            const hasNullBodyStatus2 = responseState.status === 101 || responseState.status === 103 || responseState.status === 204 || responseState.status === 205 || responseState.status === 304;
+            const response2 = new Response(hasNullBodyStatus2 ? null : passthruBody, {
               status: status2,
               statusText: responseState.statusText,
               headers: responseHeaders2
@@ -2308,7 +2335,12 @@ async function setupFetch(context, options) {
           });
           const responseHeaders2 = new Headers(responseState.headers);
           const status2 = responseState.status === 101 ? 200 : responseState.status;
-          const response2 = new Response(pumpedStream, {
+          const hasNullBodyStatus2 = responseState.status === 101 || responseState.status === 103 || responseState.status === 204 || responseState.status === 205 || responseState.status === 304;
+          if (hasNullBodyStatus2) {
+            streamRegistry.cancel(responseStreamId);
+            streamRegistry.delete(responseStreamId);
+          }
+          const response2 = new Response(hasNullBodyStatus2 ? null : pumpedStream, {
             status: status2,
             statusText: responseState.statusText,
             headers: responseHeaders2
@@ -2317,7 +2349,8 @@ async function setupFetch(context, options) {
           return response2;
         }
         const responseHeaders = new Headers(responseState.headers);
-        const responseBody = responseState.body;
+        const hasNullBodyStatus = responseState.status === 101 || responseState.status === 103 || responseState.status === 204 || responseState.status === 205 || responseState.status === 304;
+        const responseBody = hasNullBodyStatus ? null : responseState.body;
         const status = responseState.status === 101 ? 200 : responseState.status;
         const response = new Response(responseBody, {
           status,
@@ -2516,4 +2549,4 @@ export {
   clearAllInstanceState
 };
 
-//# debugId=83B79F4E8D9D4D3864756E2164756E21
+//# debugId=76C34F62F495C17164756E2164756E21