@whatwg-node/node-fetch 0.7.6-alpha-20250109001305-3002f5a56f2e1931522968b3d6eb544aa91559b6 → 0.7.6-alpha-20250109232708-2991d90eb21112e812c9058f8263208dd56c7280

package/cjs/fetchCurl.js

@@ -63,17 +63,18 @@ function fetchCurl(fetchRequest) {
     curlHandle.enable(CurlFeature.NoHeaderParsing);
     const deferredPromise = (0, utils_js_1.createDeferredPromise)();
     let streamResolved;
-    if (fetchRequest['_signal']) {
-        fetchRequest['_signal'].onabort = () => {
-            if (curlHandle.isOpen) {
-                try {
-                    curlHandle.pause(CurlPause.Recv);
-                }
-                catch (e) {
-                    deferredPromise.reject(e);
-                }
+    function onAbort() {
+        if (curlHandle.isOpen) {
+            try {
+                curlHandle.pause(CurlPause.Recv);
+            }
+            catch (e) {
+                deferredPromise.reject(e);
             }
-        };
+        }
+    }
+    if (fetchRequest['_signal']) {
+        fetchRequest['_signal'].addEventListener('abort', onAbort, { once: true });
     }
     curlHandle.once('end', function endListener() {
         try {
@@ -82,6 +83,9 @@ function fetchCurl(fetchRequest) {
         catch (e) {
             deferredPromise.reject(e);
         }
+        if (fetchRequest['_signal']) {
+            fetchRequest['_signal'].removeEventListener('abort', onAbort);
+        }
     });
     curlHandle.once('error', function errorListener(error) {
         if (streamResolved && !streamResolved.closed && !streamResolved.destroyed) {

package/esm/fetchCurl.js

@@ -60,17 +60,18 @@ export function fetchCurl(fetchRequest) {
     curlHandle.enable(CurlFeature.NoHeaderParsing);
     const deferredPromise = createDeferredPromise();
     let streamResolved;
-    if (fetchRequest['_signal']) {
-        fetchRequest['_signal'].onabort = () => {
-            if (curlHandle.isOpen) {
-                try {
-                    curlHandle.pause(CurlPause.Recv);
-                }
-                catch (e) {
-                    deferredPromise.reject(e);
-                }
+    function onAbort() {
+        if (curlHandle.isOpen) {
+            try {
+                curlHandle.pause(CurlPause.Recv);
+            }
+            catch (e) {
+                deferredPromise.reject(e);
             }
-        };
+        }
+    }
+    if (fetchRequest['_signal']) {
+        fetchRequest['_signal'].addEventListener('abort', onAbort, { once: true });
     }
     curlHandle.once('end', function endListener() {
         try {
@@ -79,6 +80,9 @@ export function fetchCurl(fetchRequest) {
         catch (e) {
             deferredPromise.reject(e);
         }
+        if (fetchRequest['_signal']) {
+            fetchRequest['_signal'].removeEventListener('abort', onAbort);
+        }
     });
     curlHandle.once('error', function errorListener(error) {
         if (streamResolved && !streamResolved.closed && !streamResolved.destroyed) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/node-fetch",
-  "version": "0.7.6-alpha-20250109001305-3002f5a56f2e1931522968b3d6eb544aa91559b6",
+  "version": "0.7.6-alpha-20250109232708-2991d90eb21112e812c9058f8263208dd56c7280",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "dependencies": {