@ricsam/isolate-daemon 0.1.16 → 0.1.17

package/dist/cjs/connection.cjs

@@ -69,7 +69,9 @@ function handleConnection(socket, state) {
     nextStreamId: 1,
     activeStreams: new Map,
     streamReceivers: new Map,
-    callbackStreamReceivers: new Map
+    callbackStreamReceivers: new Map,
+    dispatchAbortControllers: new Map,
+    earlyAbortedDispatches: new Set
   };
   state.connections.set(socket, connection);
   const parser = import_isolate_protocol.createFrameParser();
@@ -86,6 +88,11 @@ function handleConnection(socket, state) {
     }
   });
   socket.on("close", () => {
+    for (const [, controller] of connection.dispatchAbortControllers) {
+      controller.abort();
+    }
+    connection.dispatchAbortControllers.clear();
+    connection.earlyAbortedDispatches.clear();
     for (const isolateId of connection.isolates) {
       const instance = state.isolates.get(isolateId);
       if (instance) {
@@ -147,6 +154,9 @@ async function handleMessage(message, connection, state) {
     case import_isolate_protocol.MessageType.DISPATCH_REQUEST:
       await handleDispatchRequest(message, connection, state);
       break;
+    case import_isolate_protocol.MessageType.DISPATCH_REQUEST_ABORT:
+      handleDispatchRequestAbort(message, connection);
+      break;
     case import_isolate_protocol.MessageType.CALLBACK_RESPONSE:
       handleCallbackResponse(message, connection);
       break;
@@ -756,7 +766,8 @@ async function handleCreateRuntime(message, connection, state) {
           url,
           method: init.method,
           headers: init.headers,
-          body: init.rawBody
+          body: init.rawBody,
+          signalAborted: init.signal.aborted
         };
         const result = await invokeCallbackWithReconnect(callbackContext, () => callbackContext.fetch, [serialized], "Fetch", invokeClientCallback);
         if (result && typeof result === "object" && result.__streamingResponse) {
@@ -996,6 +1007,12 @@ async function handleDispatchRequest(message, connection, state) {
     return;
   }
   instance.lastActivity = Date.now();
+  const dispatchAbortController = new AbortController;
+  connection.dispatchAbortControllers.set(message.requestId, dispatchAbortController);
+  if (connection.earlyAbortedDispatches.has(message.requestId) || message.request.signalAborted) {
+    dispatchAbortController.abort();
+    connection.earlyAbortedDispatches.delete(message.requestId);
+  }
   try {
     let requestBody = null;
     if (message.request.bodyStreamId !== undefined) {
@@ -1006,9 +1023,12 @@ async function handleDispatchRequest(message, connection, state) {
     const request = new Request(message.request.url, {
       method: message.request.method,
       headers: message.request.headers,
-      body: requestBody
+      body: requestBody,
+      signal: dispatchAbortController.signal
+    });
+    const response = await instance.runtime.fetch.dispatchRequest(request, {
+      signal: dispatchAbortController.signal
     });
-    const response = await instance.runtime.fetch.dispatchRequest(request);
     if (response.body) {
       await sendStreamedResponse(connection, message.requestId, response);
     } else {
@@ -1028,7 +1048,18 @@ async function handleDispatchRequest(message, connection, state) {
   } catch (err) {
     const error = err;
     sendError(connection.socket, message.requestId, import_isolate_protocol.ErrorCode.SCRIPT_ERROR, error.message, { name: error.name, stack: error.stack });
+  } finally {
+    connection.dispatchAbortControllers.delete(message.requestId);
+    connection.earlyAbortedDispatches.delete(message.requestId);
+  }
+}
+function handleDispatchRequestAbort(message, connection) {
+  const controller = connection.dispatchAbortControllers.get(message.targetRequestId);
+  if (controller) {
+    controller.abort();
+    return;
   }
+  connection.earlyAbortedDispatches.add(message.targetRequestId);
 }
 function receiveStreamedBody(connection, streamId) {
   return new Promise((resolve, reject) => {
@@ -1661,4 +1692,4 @@ async function handleClearCollectedData(message, connection, state) {
   }
 }
 
-//# debugId=D9712A3ECDBAF18B64756E2164756E21
+//# debugId=B1D2B1F7510AB4C564756E2164756E21