@ricsam/isolate-fetch 0.1.16 → 0.1.17

package/dist/cjs/index.cjs

@@ -1063,6 +1063,7 @@ function setupRequest(context, stateMap) {
       body,
       bodyUsed: false,
       streamId: null,
+      signalAborted: false,
       mode,
       credentials,
       cache,
@@ -1159,6 +1160,10 @@ function setupRequest(context, stateMap) {
     const state = stateMap.get(instanceId);
     return state?.streamId ?? null;
   }));
+  global.setSync("__Request_get_signalAborted", new import_isolated_vm.default.Callback((instanceId) => {
+    const state = stateMap.get(instanceId);
+    return state?.signalAborted ?? false;
+  }));
   const requestCode = `
 (function() {
   function __decodeError(err) {
@@ -1222,6 +1227,8 @@ function setupRequest(context, stateMap) {
     return result;
   }
 
+  const __requestSignalControllers = new Map();
+
   class Request {
     #instanceId;
     #headers;
@@ -1232,9 +1239,15 @@ function setupRequest(context, stateMap) {
     constructor(input, init = {}) {
       // Handle internal construction from instance ID
       if (typeof input === 'number' && init === null) {
+        const controller = new AbortController();
+        if (__Request_get_signalAborted(input)) {
+          controller.abort();
+        }
+        __requestSignalControllers.set(input, controller);
+
         this.#instanceId = input;
         this.#headers = new Headers(__Request_get_headers(input));
-        this.#signal = null;
+        this.#signal = controller.signal;
         this.#streamId = __Request_getStreamId(input);
         return;
       }
@@ -1243,7 +1256,7 @@ function setupRequest(context, stateMap) {
       let method = 'GET';
       let headers;
       let body = null;
-      let signal = null;
+      let signal = new AbortController().signal;
       let mode = 'cors';
       let credentials = 'same-origin';
       let cache = 'default';
@@ -1280,6 +1293,11 @@ function setupRequest(context, stateMap) {
       if (init.referrer !== undefined) referrer = init.referrer;
       if (init.integrity !== undefined) integrity = init.integrity;
 
+      // Ensure signal is always a valid AbortSignal
+      if (signal == null) {
+        signal = new AbortController().signal;
+      }
+
       // Validate: body with GET/HEAD
       if (body !== null && (method === 'GET' || method === 'HEAD')) {
         throw new TypeError('Request with GET/HEAD method cannot have body');
@@ -1473,10 +1491,18 @@ function setupRequest(context, stateMap) {
     }
   }
 
+  globalThis.__Request_abortSignalByInstanceId = function(instanceId) {
+    const controller = __requestSignalControllers.get(instanceId);
+    if (controller && !controller.signal.aborted) {
+      controller.abort();
+    }
+  };
+
   globalThis.Request = Request;
 })();
 `;
   context.evalSync(requestCode);
+  return context.evalSync("globalThis.__Request_abortSignalByInstanceId", { reference: true });
 }
 var FETCH_STREAM_THRESHOLD = 64 * 1024;
 function setupFetchFunction(context, stateMap, streamRegistry, options) {
@@ -2134,7 +2160,7 @@ async function setupFetch(context, options) {
   setupStreamCallbacks(context, streamRegistry);
   context.evalSync(hostBackedStreamCode);
   setupResponse(context, stateMap, streamRegistry);
-  setupRequest(context, stateMap);
+  const requestAbortSignalRef = setupRequest(context, stateMap);
   setupFetchFunction(context, stateMap, streamRegistry, options);
   const serveState = {
     pendingUpgrade: null,
@@ -2187,8 +2213,11 @@ async function setupFetch(context, options) {
       context.evalSync(`globalThis.__upgradeRegistry__.clear()`);
       serveState.activeConnections.clear();
       serveState.pendingUpgrade = null;
+      try {
+        requestAbortSignalRef.release();
+      } catch {}
     },
-    async dispatchRequest(request, _dispatchOptions) {
+    async dispatchRequest(request, dispatchOptions) {
       if (serveState.pendingUpgrade) {
         const oldConnectionId = serveState.pendingUpgrade.connectionId;
         context.evalSync(`globalThis.__upgradeRegistry__.delete("${oldConnectionId}")`);
@@ -2198,8 +2227,12 @@ async function setupFetch(context, options) {
       if (!hasHandler) {
         throw new Error("No serve() handler registered");
       }
+      const forwardedSignal = dispatchOptions?.signal ?? request.signal;
+      const forwardedSignalInitiallyAborted = forwardedSignal?.aborted ?? false;
       let requestStreamId = null;
+      let requestInstanceId = null;
       let streamCleanup = null;
+      let onForwardedSignalAbort;
       const canHaveBody = !["GET", "HEAD"].includes(request.method.toUpperCase());
       if (canHaveBody && request.body) {
         requestStreamId = streamRegistry.create();
@@ -2207,7 +2240,7 @@ async function setupFetch(context, options) {
       }
       try {
         const headersArray = Array.from(request.headers.entries());
-        const requestInstanceId = nextInstanceId++;
+        requestInstanceId = nextInstanceId++;
         const requestState = {
           url: request.url,
           method: request.method,
@@ -2215,6 +2248,7 @@ async function setupFetch(context, options) {
           body: null,
           bodyUsed: false,
           streamId: requestStreamId,
+          signalAborted: forwardedSignalInitiallyAborted,
           mode: request.mode,
           credentials: request.credentials,
           cache: request.cache,
@@ -2223,6 +2257,26 @@ async function setupFetch(context, options) {
           integrity: request.integrity
         };
         stateMap.set(requestInstanceId, requestState);
+        if (forwardedSignal && !forwardedSignalInitiallyAborted) {
+          onForwardedSignalAbort = () => {
+            if (requestInstanceId == null)
+              return;
+            const currentState = stateMap.get(requestInstanceId);
+            if (!currentState || currentState.signalAborted) {
+              return;
+            }
+            currentState.signalAborted = true;
+            try {
+              requestAbortSignalRef.applyIgnored(undefined, [requestInstanceId], {
+                arguments: { copy: true }
+              });
+            } catch {}
+          };
+          forwardedSignal.addEventListener("abort", onForwardedSignalAbort, { once: true });
+          if (forwardedSignal.aborted) {
+            onForwardedSignalAbort();
+          }
+        }
         const responseInstanceId = await context.eval(`
           (async function() {
             const request = Request._fromInstanceId(${requestInstanceId});
@@ -2317,6 +2371,9 @@ async function setupFetch(context, options) {
         response._originalStatus = responseState.status;
         return response;
       } finally {
+        if (forwardedSignal && onForwardedSignalAbort) {
+          forwardedSignal.removeEventListener("abort", onForwardedSignalAbort);
+        }
         if (requestStreamId !== null) {
           const startTime = Date.now();
           let streamState = streamRegistry.get(requestStreamId);
@@ -2499,4 +2556,4 @@ async function setupFetch(context, options) {
   };
 }
 
-//# debugId=A475F6C880EAF54E64756E2164756E21
+//# debugId=930DF43743B8401164756E2164756E21