@ricsam/isolate-client 0.1.17 → 0.1.19

package/dist/cjs/connection.cjs

@@ -4,38 +4,59 @@ var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+function __accessProp(key) {
+  return this[key];
+}
+var __toESMCache_node;
+var __toESMCache_esm;
 var __toESM = (mod, isNodeMode, target) => {
+  var canCache = mod != null && typeof mod === "object";
+  if (canCache) {
+    var cache = isNodeMode ? __toESMCache_node ??= new WeakMap : __toESMCache_esm ??= new WeakMap;
+    var cached = cache.get(mod);
+    if (cached)
+      return cached;
+  }
   target = mod != null ? __create(__getProtoOf(mod)) : {};
   const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
   for (let key of __getOwnPropNames(mod))
     if (!__hasOwnProp.call(to, key))
       __defProp(to, key, {
-        get: () => mod[key],
+        get: __accessProp.bind(mod, key),
         enumerable: true
       });
+  if (canCache)
+    cache.set(mod, to);
   return to;
 };
-var __moduleCache = /* @__PURE__ */ new WeakMap;
 var __toCommonJS = (from) => {
-  var entry = __moduleCache.get(from), desc;
+  var entry = (__moduleCache ??= new WeakMap).get(from), desc;
   if (entry)
     return entry;
   entry = __defProp({}, "__esModule", { value: true });
-  if (from && typeof from === "object" || typeof from === "function")
-    __getOwnPropNames(from).map((key) => !__hasOwnProp.call(entry, key) && __defProp(entry, key, {
-      get: () => from[key],
-      enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-    }));
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (var key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(entry, key))
+        __defProp(entry, key, {
+          get: __accessProp.bind(from, key),
+          enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+        });
+  }
   __moduleCache.set(from, entry);
   return entry;
 };
+var __moduleCache;
+var __returnValue = (v) => v;
+function __exportSetter(name, newValue) {
+  this[name] = __returnValue.bind(null, newValue);
+}
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, {
       get: all[name],
       enumerable: true,
       configurable: true,
-      set: (newValue) => all[name] = () => newValue
+      set: __exportSetter.bind(all, name)
     });
 };
 
@@ -660,6 +681,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 +709,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 +741,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 +1074,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 +1454,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 +1712,4 @@ function handleClientWsClose(isolateId, payload, state) {
   }
 }
 
-//# debugId=BB5A27475A32C8E264756E2164756E21
+//# debugId=C08D5EB489DD9C9D64756E2164756E21