@ricsam/isolate 0.1.5 → 0.1.7

package/dist/cjs/internal/fetch/index.cjs

@@ -1911,11 +1911,16 @@ function setupClientWebSocket(context, clientWsCommandCallbacks) {
     }
   };
 
-  const __wrapAsyncContextCallback = (callback) => (
-    typeof callback === 'function' && globalThis.AsyncContext?.Snapshot?.wrap
-      ? globalThis.AsyncContext.Snapshot.wrap(callback)
+  const __wrapAsyncContextCallback = (callback, options = {}) => (
+    typeof callback === 'function' && globalThis.__isolateAsyncContextInternals?.wrapCallback
+      ? globalThis.__isolateAsyncContextInternals.wrapCallback(callback, options)
       : callback
   );
+  const __releaseAsyncContextCallback = (callback) => (
+    typeof callback === 'function' && globalThis.__isolateAsyncContextInternals?.releaseCallback
+      ? globalThis.__isolateAsyncContextInternals.releaseCallback(callback)
+      : false
+  );
 
   // Helper to dispatch events
   function dispatchEvent(ws, event) {
@@ -2052,13 +2057,20 @@ function setupClientWebSocket(context, clientWsCommandCallbacks) {
     get CLOSED() { return WebSocket.CLOSED; }
 
     _setHandler(type, handler) {
+      const previous = this._handlers.get(type);
+      if (previous?.wrapped) {
+        __releaseAsyncContextCallback(previous.wrapped);
+      }
       if (typeof handler !== 'function') {
         this._handlers.set(type, null);
         return;
       }
       this._handlers.set(type, {
         original: handler,
-        wrapped: __wrapAsyncContextCallback(handler),
+        wrapped: __wrapAsyncContextCallback(handler, {
+          resource: this,
+          type: 'isolate.websocket',
+        }),
       });
     }
 
@@ -2138,7 +2150,10 @@ function setupClientWebSocket(context, clientWsCommandCallbacks) {
       if (!listeners.some((entry) => entry.original === listener)) {
         listeners.push({
           original: listener,
-          wrapped: __wrapAsyncContextCallback(listener),
+          wrapped: __wrapAsyncContextCallback(listener, {
+            resource: this,
+            type: 'isolate.websocket',
+          }),
         });
       }
     }
@@ -2148,6 +2163,7 @@ function setupClientWebSocket(context, clientWsCommandCallbacks) {
       if (!listeners) return;
       const index = listeners.findIndex((entry) => entry.original === listener || entry.wrapped === listener);
       if (index !== -1) {
+        __releaseAsyncContextCallback(listeners[index].wrapped);
         listeners.splice(index, 1);
       }
     }
@@ -2206,6 +2222,18 @@ function setupClientWebSocket(context, clientWsCommandCallbacks) {
       this.#readyState = WebSocket.CLOSED;
       const event = new _CloseEvent('close', { code, reason, wasClean });
       dispatchEvent(this, event);
+      for (const handler of this._handlers.values()) {
+        if (handler?.wrapped) {
+          __releaseAsyncContextCallback(handler.wrapped);
+        }
+      }
+      for (const listeners of this._listeners.values()) {
+        for (const listener of listeners) {
+          __releaseAsyncContextCallback(listener.wrapped);
+        }
+      }
+      this._handlers.clear();
+      this._listeners.clear();
       __clientWebSockets.delete(this.#socketId);
     }
   }
@@ -2241,9 +2269,9 @@ function setupServe(context) {
   context.evalSync(`
 (function() {
   globalThis.__serveOptions__ = null;
-  const __wrapAsyncContextCallback = (callback) => (
-    typeof callback === 'function' && globalThis.AsyncContext?.Snapshot?.wrap
-      ? globalThis.AsyncContext.Snapshot.wrap(callback)
+  const __wrapAsyncContextCallback = (callback, options = {}) => (
+    typeof callback === 'function' && globalThis.__isolateAsyncContextInternals?.wrapCallback
+      ? globalThis.__isolateAsyncContextInternals.wrapCallback(callback, options)
       : callback
   );
 
@@ -2254,14 +2282,19 @@ function setupServe(context) {
 
     const wrapped = { ...options };
     if (typeof options.fetch === 'function') {
-      wrapped.fetch = __wrapAsyncContextCallback(options.fetch);
+      wrapped.fetch = __wrapAsyncContextCallback(options.fetch, {
+        type: 'isolate.serve',
+      });
     }
 
     if (options.websocket && typeof options.websocket === 'object') {
       wrapped.websocket = { ...options.websocket };
       for (const name of ['open', 'message', 'close', 'error']) {
         if (typeof options.websocket[name] === 'function') {
-          wrapped.websocket[name] = __wrapAsyncContextCallback(options.websocket[name]);
+          wrapped.websocket[name] = __wrapAsyncContextCallback(
+            options.websocket[name],
+            { type: 'isolate.serve.websocket' },
+          );
         }
       }
     }
@@ -2309,10 +2342,15 @@ async function setupFetch(context, options) {
 (function() {
   const __eventListeners = new Map();
   const __wrapAsyncContextCallback = (callback) => (
-    typeof callback === 'function' && globalThis.AsyncContext?.Snapshot?.wrap
-      ? globalThis.AsyncContext.Snapshot.wrap(callback)
+    typeof callback === 'function' && globalThis.__isolateAsyncContextInternals?.wrapCallback
+      ? globalThis.__isolateAsyncContextInternals.wrapCallback(callback, { type: 'isolate.event' })
       : callback
   );
+  const __releaseAsyncContextCallback = (callback) => (
+    typeof callback === 'function' && globalThis.__isolateAsyncContextInternals?.releaseCallback
+      ? globalThis.__isolateAsyncContextInternals.releaseCallback(callback)
+      : false
+  );
 
   globalThis.__on = function(event, callback) {
     let listeners = __eventListeners.get(event);
@@ -2324,6 +2362,7 @@ async function setupFetch(context, options) {
     listeners.add(wrapped);
     return function() {
       listeners.delete(wrapped);
+      __releaseAsyncContextCallback(wrapped);
       if (listeners.size === 0) {
         __eventListeners.delete(event);
       }
@@ -2699,4 +2738,4 @@ async function setupFetch(context, options) {
   };
 }
 
-//# debugId=8ADCBFBB67CCF95F64756E2164756E21
+//# debugId=9AF8B200C8CF0CEC64756E2164756E21