@ricsam/isolate-client 0.1.17 → 0.1.18

package/dist/cjs/connection.cjs

@@ -660,6 +660,8 @@ async function createRuntime(state, options = {}, namespaceId) {
       if (signal?.aborted) {
         throw new DOMException("The operation was aborted", "AbortError");
       }
+      const requestSignal = req.signal;
+      const requestSignalInitiallyAborted = requestSignal?.aborted ?? false;
       const reqId = state.nextRequestId++;
       const serialized = await serializeRequestWithStreaming(state, req);
       const { bodyStream, ...serializableRequest } = serialized;
@@ -686,6 +688,23 @@ async function createRuntime(state, options = {}, namespaceId) {
         };
         signal.addEventListener("abort", onAbort, { once: true });
       }
+      let onRequestAbort;
+      if (requestSignal && !requestSignalInitiallyAborted) {
+        onRequestAbort = () => {
+          const abortMessage = {
+            type: import_isolate_protocol.MessageType.DISPATCH_REQUEST_ABORT,
+            isolateId,
+            targetRequestId: reqId
+          };
+          if (state.connected) {
+            sendMessage(state.socket, abortMessage);
+          }
+        };
+        requestSignal.addEventListener("abort", onRequestAbort, { once: true });
+        if (requestSignal.aborted) {
+          onRequestAbort();
+        }
+      }
       try {
         if (serialized.bodyStreamId !== undefined && bodyStream) {
           const streamId = serialized.bodyStreamId;
@@ -701,6 +720,9 @@ async function createRuntime(state, options = {}, namespaceId) {
         if (signal && onAbort) {
           signal.removeEventListener("abort", onAbort);
         }
+        if (requestSignal && onRequestAbort) {
+          requestSignal.removeEventListener("abort", onRequestAbort);
+        }
       }
     },
     async getUpgradeRequest() {
@@ -1031,12 +1053,16 @@ function registerFetchCallback(state, callback) {
   state.callbacksNeedingRequestId.add(callbackId);
   state.callbacks.set(callbackId, async (serialized, requestId) => {
     const data = serialized;
+    const signalController = new AbortController;
+    if (data.signalAborted) {
+      signalController.abort();
+    }
     const init = {
       method: data.method,
       headers: data.headers,
       rawBody: data.body ?? null,
       body: data.body ?? null,
-      signal: new AbortController().signal
+      signal: signalController.signal
     };
     const response = await callback(data.url, init);
     const contentLength = response.headers.get("content-length");
@@ -1407,7 +1433,8 @@ async function serializeRequestWithStreaming(state, request) {
     method: request.method,
     url: request.url,
     headers,
-    body
+    body,
+    signalAborted: request.signal?.aborted ?? false
   };
   if (bodyStreamId !== undefined) {
     result.bodyStreamId = bodyStreamId;
@@ -1664,4 +1691,4 @@ function handleClientWsClose(isolateId, payload, state) {
   }
 }
 
-//# debugId=BB5A27475A32C8E264756E2164756E21
+//# debugId=E397D9CA05CE94DB64756E2164756E21