@whatwg-node/node-fetch 0.8.0-alpha-20241212154840-0a0effe808a6614e0a3afd853126a38641485756 → 0.8.0-alpha-20250917012053-36c9ccdc3e94ee8d0961f17398a9053fa55df37b

package/cjs/TransformStream.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PonyfillTransformStream = void 0;
 const node_stream_1 = require("node:stream");
 const ReadableStream_js_1 = require("./ReadableStream.js");
+const utils_js_1 = require("./utils.js");
 const WritableStream_js_1 = require("./WritableStream.js");
 class PonyfillTransformStream {
     transform;
@@ -21,7 +22,7 @@ class PonyfillTransformStream {
                     transform.destroy(reason);
                 },
                 terminate() {
-                    transform.end();
+                    (0, utils_js_1.endStream)(transform);
                 },
                 get desiredSize() {
                     return transform.writableLength;

package/cjs/URL.js

@@ -2,83 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PonyfillURL = void 0;
 const tslib_1 = require("tslib");
-const buffer_1 = require("buffer");
-const crypto_1 = require("crypto");
-const fast_querystring_1 = tslib_1.__importDefault(require("fast-querystring"));
-const fast_url_parser_1 = tslib_1.__importDefault(require("@kamilkisiela/fast-url-parser"));
-const URLSearchParams_js_1 = require("./URLSearchParams.js");
-fast_url_parser_1.default.queryString = fast_querystring_1.default;
-const IPV6_REGEX = /^(?:(?:(?:[0-9A-Fa-f]{1,4}:){6}(?:[0-9A-Fa-f]{1,4}:[0-9A-Fa-f]{1,4}|(?:(?:0?0?[0-9]|0?[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}(?:0?0?[0-9]|0?[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))|::(?:[0-9A-Fa-f]{1,4}:){5}(?:[0-9A-Fa-f]{1,4}:[0-9A-Fa-f]{1,4}|(?:(?:0?0?[0-9]|0?[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}(?:0?0?[0-9]|0?[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))|(?:[0-9A-Fa-f]{1,4})?::(?:[0-9A-Fa-f]{1,4}:){4}(?:[0-9A-Fa-f]{1,4}:[0-9A-Fa-f]{1,4}|(?:(?:0?0?[0-9]|0?[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}(?:0?0?[0-9]|0?[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))|(?:(?:[0-9A-Fa-f]{1,4}:){0,1}[0-9A-Fa-f]{1,4})?::(?:[0-9A-Fa-f]{1,4}:){3}(?:[0-9A-Fa-f]{1,4}:[0-9A-Fa-f]{1,4}|(?:(?:0?0?[0-9]|0?[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}(?:0?0?[0-9]|0?[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))|(?:(?:[0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})?::(?:[0-9A-Fa-f]{1,4}:){2}(?:[0-9A-Fa-f]{1,4}:[0-9A-Fa-f]{1,4}|(?:(?:0?0?[0-9]|0?[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}(?:0?0?[0-9]|0?[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))|(?:(?:[0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})?::[0-9A-Fa-f]{1,4}:(?:[0-9A-Fa-f]{1,4}:[0-9A-Fa-f]{1,4}|(?:(?:0?0?[0-9]|0?[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}(?:0?0?[0-9]|0?[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))|(?:(?:[0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})?::(?:[0-9A-Fa-f]{1,4}:[0-9A-Fa-f]{1,4}|(?:(?:0?0?[0-9]|0?[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}(?:0?0?[0-9]|0?[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))|(?:(?:[0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})?::[0-9A-Fa-f]{1,4}|(?:(?:[0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})?::)(?:\/(?:0?0?[0-9]|0?[1-9][0-9]|1[01][0-9]|12[0-8]))?)$/;
-class PonyfillURL extends fast_url_parser_1.default {
-    constructor(url, base) {
-        super();
-        if (url.startsWith('data:')) {
-            this.protocol = 'data:';
-            this.pathname = url.slice('data:'.length);
-            return;
-        }
-        this.parse(url, false);
-        // `fast-url-parser` cannot handle ipv6 hosts correctly
-        if ((url.startsWith('http://[') || url.startsWith('https://[')) &&
-            IPV6_REGEX.test(this.hostname)) {
-            this.hostname = `[${this.hostname}]`;
-        }
-        if (base) {
-            const baseParsed = typeof base === 'string' ? new PonyfillURL(base) : base;
-            this.protocol ||= baseParsed.protocol;
-            this.host ||= baseParsed.host;
-            this.pathname ||= baseParsed.pathname;
-            this.port ||= baseParsed.port;
-        }
-    }
-    get origin() {
-        return `${this.protocol}//${this.host}${this.port ? `:${this.port}` : ''}`;
-    }
-    _searchParams;
-    get searchParams() {
-        if (!this._searchParams) {
-            this._searchParams = new URLSearchParams_js_1.PonyfillURLSearchParams(this.query);
-        }
-        return this._searchParams;
-    }
-    get username() {
-        return this.auth?.split(':')[0] || '';
-    }
-    set username(value) {
-        this.auth = `${value}:${this.password}`;
-    }
-    get password() {
-        return this.auth?.split(':')[1] || '';
-    }
-    set password(value) {
-        this.auth = `${this.username}:${value}`;
-    }
-    toString() {
-        if (this._searchParams) {
-            this.search = this._searchParams.toString();
-        }
-        return this.format();
-    }
-    toJSON() {
-        return this.toString();
-    }
+const node_buffer_1 = tslib_1.__importDefault(require("node:buffer"));
+const node_crypto_1 = require("node:crypto");
+const NativeURL = globalThis.URL;
+class URL extends NativeURL {
+    // This part is only needed to handle `PonyfillBlob` objects
     static blobRegistry = new Map();
     static createObjectURL(blob) {
-        const blobUrl = `blob:whatwgnode:${(0, crypto_1.randomUUID)()}`;
+        const blobUrl = `blob:whatwgnode:${(0, node_crypto_1.randomUUID)()}`;
         this.blobRegistry.set(blobUrl, blob);
         return blobUrl;
     }
-    static resolveObjectURL(url) {
+    static revokeObjectURL(url) {
         if (!this.blobRegistry.has(url)) {
-            URL.revokeObjectURL(url);
+            NativeURL.revokeObjectURL(url);
         }
         else {
             this.blobRegistry.delete(url);
         }
     }
     static getBlobFromURL(url) {
-        return (this.blobRegistry.get(url) || (0, buffer_1.resolveObjectURL)(url));
+        return (this.blobRegistry.get(url) || node_buffer_1.default?.resolveObjectURL?.(url));
     }
-    [Symbol.toStringTag] = 'URL';
 }
-exports.PonyfillURL = PonyfillURL;
+exports.PonyfillURL = URL;

package/cjs/URLSearchParams.js

@@ -1,120 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PonyfillURLSearchParams = void 0;
-const tslib_1 = require("tslib");
-const fast_querystring_1 = tslib_1.__importDefault(require("fast-querystring"));
-const IteratorObject_js_1 = require("./IteratorObject.js");
-function isURLSearchParams(value) {
-    return value?.entries != null;
-}
-class PonyfillURLSearchParams {
-    params;
-    constructor(init) {
-        if (init) {
-            if (typeof init === 'string') {
-                this.params = fast_querystring_1.default.parse(init);
-            }
-            else if (Array.isArray(init)) {
-                this.params = {};
-                for (const [key, value] of init) {
-                    this.params[key] = value;
-                }
-            }
-            else if (isURLSearchParams(init)) {
-                this.params = {};
-                for (const [key, value] of init.entries()) {
-                    this.params[key] = value;
-                }
-            }
-            else {
-                this.params = init;
-            }
-        }
-        else {
-            this.params = {};
-        }
-    }
-    append(name, value) {
-        const existingValue = this.params[name];
-        const finalValue = existingValue ? `${existingValue},${value}` : value;
-        this.params[name] = finalValue;
-    }
-    delete(name) {
-        delete this.params[name];
-    }
-    get(name) {
-        const value = this.params[name];
-        if (Array.isArray(value)) {
-            return value[0] || null;
-        }
-        return value || null;
-    }
-    getAll(name) {
-        const value = this.params[name];
-        if (!Array.isArray(value)) {
-            return value ? [value] : [];
-        }
-        return value;
-    }
-    has(name) {
-        return name in this.params;
-    }
-    set(name, value) {
-        this.params[name] = value;
-    }
-    sort() {
-        const sortedKeys = Object.keys(this.params).sort();
-        const sortedParams = {};
-        for (const key of sortedKeys) {
-            sortedParams[key] = this.params[key];
-        }
-        this.params = sortedParams;
-    }
-    toString() {
-        return fast_querystring_1.default.stringify(this.params);
-    }
-    *_keys() {
-        for (const key in this.params) {
-            yield key;
-        }
-    }
-    keys() {
-        return new IteratorObject_js_1.PonyfillIteratorObject(this._keys(), 'URLSearchParamsIterator');
-    }
-    *_entries() {
-        for (const key of this.keys()) {
-            const value = this.params[key];
-            if (Array.isArray(value)) {
-                for (const item of value) {
-                    yield [key, item];
-                }
-            }
-            else {
-                yield [key, value];
-            }
-        }
-    }
-    entries() {
-        return new IteratorObject_js_1.PonyfillIteratorObject(this._entries(), 'URLSearchParamsIterator');
-    }
-    *_values() {
-        for (const [, value] of this) {
-            yield value;
-        }
-    }
-    values() {
-        return new IteratorObject_js_1.PonyfillIteratorObject(this._values(), 'URLSearchParamsIterator');
-    }
-    [Symbol.iterator]() {
-        return this.entries();
-    }
-    forEach(callback) {
-        for (const [key, value] of this) {
-            callback(value, key, this);
-        }
-    }
-    get size() {
-        return Object.keys(this.params).length;
-    }
-}
-exports.PonyfillURLSearchParams = PonyfillURLSearchParams;
+exports.PonyfillURLSearchParams = globalThis.URLSearchParams;

package/cjs/WritableStream.js

@@ -1,16 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PonyfillWritableStream = void 0;
-const stream_1 = require("stream");
+const node_events_1 = require("node:events");
+const node_stream_1 = require("node:stream");
+const promise_helpers_1 = require("@whatwg-node/promise-helpers");
 const utils_js_1 = require("./utils.js");
 class PonyfillWritableStream {
     writable;
     constructor(underlyingSink) {
-        if (underlyingSink instanceof stream_1.Writable) {
+        if (underlyingSink instanceof node_stream_1.Writable) {
             this.writable = underlyingSink;
         }
         else if (underlyingSink) {
-            const writable = new stream_1.Writable({
+            const writable = new node_stream_1.Writable({
                 write(chunk, _encoding, callback) {
                     try {
                         const result = underlyingSink.write?.(chunk, controller);
@@ -44,147 +46,69 @@ class PonyfillWritableStream {
                 },
             });
             this.writable = writable;
-            let onabort;
-            let reason;
+            const abortCtrl = new AbortController();
             const controller = {
-                signal: {
-                    any(signals) {
-                        return AbortSignal.any([...signals]);
-                    },
-                    get reason() {
-                        return reason;
-                    },
-                    get aborted() {
-                        return writable.destroyed;
-                    },
-                    addEventListener: (_event, eventListener) => {
-                        writable.once('error', eventListener);
-                        writable.once('close', eventListener);
-                    },
-                    removeEventListener: (_event, eventListener) => {
-                        writable.off('error', eventListener);
-                        writable.off('close', eventListener);
-                    },
-                    dispatchEvent: (_event) => {
-                        return false;
-                    },
-                    get onabort() {
-                        return onabort;
-                    },
-                    set onabort(value) {
-                        if (onabort) {
-                            this.removeEventListener('abort', onabort);
-                        }
-                        onabort = value;
-                        if (onabort) {
-                            this.addEventListener('abort', onabort);
-                        }
-                    },
-                    throwIfAborted() {
-                        if (writable.destroyed) {
-                            throw reason;
-                        }
-                    },
-                },
-                error: e => {
-                    this.writable.destroy(e);
+                signal: abortCtrl.signal,
+                error(e) {
+                    writable.destroy(e);
                 },
             };
-            this.writable.once('error', err => {
-                reason = err;
-            });
+            writable.once('error', err => abortCtrl.abort(err));
+            writable.once('close', () => abortCtrl.abort());
         }
         else {
-            this.writable = new stream_1.Writable();
+            this.writable = new node_stream_1.Writable();
         }
     }
     getWriter() {
         const writable = this.writable;
         return {
-            closed: new Promise(resolve => {
-                writable.once('close', () => {
-                    resolve(undefined);
-                });
-            }),
+            get closed() {
+                return (0, node_events_1.once)(writable, 'close');
+            },
             get desiredSize() {
                 return writable.writableLength;
             },
-            ready: new Promise(resolve => {
-                writable.once('drain', () => {
-                    resolve(undefined);
-                });
-            }),
+            get ready() {
+                return (0, node_events_1.once)(writable, 'drain');
+            },
             releaseLock() {
                 // no-op
             },
             write(chunk) {
+                const promise = (0, utils_js_1.fakePromise)();
                 if (chunk == null) {
-                    return (0, utils_js_1.fakePromise)(undefined);
+                    return promise;
                 }
-                return new Promise((resolve, reject) => {
-                    writable.write(chunk, (err) => {
-                        if (err) {
-                            reject(err);
-                        }
-                        else {
-                            resolve();
-                        }
-                    });
-                });
+                return promise.then(() => (0, utils_js_1.safeWrite)(chunk, writable));
             },
             close() {
                 if (!writable.errored && writable.closed) {
-                    return (0, utils_js_1.fakePromise)(undefined);
+                    return (0, utils_js_1.fakePromise)();
                 }
-                return new Promise((resolve, reject) => {
-                    if (writable.errored) {
-                        reject(writable.errored);
-                    }
-                    else {
-                        writable.end((err) => {
-                            if (err) {
-                                reject(err);
-                            }
-                            else {
-                                resolve();
-                            }
-                        });
-                    }
-                });
+                if (writable.errored) {
+                    return (0, promise_helpers_1.fakeRejectPromise)(writable.errored);
+                }
+                return (0, utils_js_1.fakePromise)().then(() => (0, utils_js_1.endStream)(writable));
             },
             abort(reason) {
-                return new Promise(resolve => {
-                    writable.destroy(reason);
-                    writable.once('close', resolve);
-                });
+                writable.destroy(reason);
+                return (0, node_events_1.once)(writable, 'close');
             },
         };
     }
     close() {
         if (!this.writable.errored && this.writable.closed) {
-            return (0, utils_js_1.fakePromise)(undefined);
+            return (0, utils_js_1.fakePromise)();
         }
-        return new Promise((resolve, reject) => {
-            if (this.writable.errored) {
-                reject(this.writable.errored);
-            }
-            else {
-                this.writable.end((err) => {
-                    if (err) {
-                        reject(err);
-                    }
-                    else {
-                        resolve();
-                    }
-                });
-            }
-        });
+        if (this.writable.errored) {
+            return (0, promise_helpers_1.fakeRejectPromise)(this.writable.errored);
+        }
+        return (0, utils_js_1.fakePromise)().then(() => (0, utils_js_1.endStream)(this.writable));
     }
     abort(reason) {
-        return new Promise(resolve => {
-            this.writable.destroy(reason);
-            this.writable.once('close', resolve);
-        });
+        this.writable.destroy(reason);
+        return (0, node_events_1.once)(this.writable, 'close');
     }
     locked = false;
 }

package/cjs/fetch.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchPonyfill = fetchPonyfill;
-const fs_1 = require("fs");
-const url_1 = require("url");
+const node_buffer_1 = require("node:buffer");
+const node_fs_1 = require("node:fs");
+const node_url_1 = require("node:url");
 const fetchCurl_js_1 = require("./fetchCurl.js");
 const fetchNodeHttp_js_1 = require("./fetchNodeHttp.js");
 const Request_js_1 = require("./Request.js");
@@ -10,16 +11,44 @@ const Response_js_1 = require("./Response.js");
 const URL_js_1 = require("./URL.js");
 const utils_js_1 = require("./utils.js");
 const BASE64_SUFFIX = ';base64';
-function getResponseForFile(url) {
-    const path = (0, url_1.fileURLToPath)(url);
-    const readable = (0, fs_1.createReadStream)(path);
-    return new Response_js_1.PonyfillResponse(readable);
+async function getResponseForFile(url) {
+    const path = (0, node_url_1.fileURLToPath)(url);
+    try {
+        await node_fs_1.promises.access(path, node_fs_1.promises.constants.R_OK);
+        const stats = await node_fs_1.promises.stat(path, {
+            bigint: true,
+        });
+        const readable = (0, node_fs_1.createReadStream)(path);
+        return new Response_js_1.PonyfillResponse(readable, {
+            status: 200,
+            statusText: 'OK',
+            headers: {
+                'content-type': 'application/octet-stream',
+                'last-modified': stats.mtime.toUTCString(),
+            },
+        });
+    }
+    catch (err) {
+        if (err.code === 'ENOENT') {
+            return new Response_js_1.PonyfillResponse(null, {
+                status: 404,
+                statusText: 'Not Found',
+            });
+        }
+        else if (err.code === 'EACCES') {
+            return new Response_js_1.PonyfillResponse(null, {
+                status: 403,
+                statusText: 'Forbidden',
+            });
+        }
+        throw err;
+    }
 }
 function getResponseForDataUri(url) {
     const [mimeType = 'text/plain', ...datas] = url.substring(5).split(',');
     const data = decodeURIComponent(datas.join(','));
     if (mimeType.endsWith(BASE64_SUFFIX)) {
-        const buffer = Buffer.from(data, 'base64url');
+        const buffer = node_buffer_1.Buffer.from(data, 'base64url');
         const realMimeType = mimeType.slice(0, -BASE64_SUFFIX.length);
         return new Response_js_1.PonyfillResponse(buffer, {
             status: 200,
@@ -65,7 +94,7 @@ function fetchPonyfill(info, init) {
     }
     if (fetchRequest.url.startsWith('file:')) {
         const response = getResponseForFile(fetchRequest.url);
-        return (0, utils_js_1.fakePromise)(response);
+        return response;
     }
     if (fetchRequest.url.startsWith('blob:')) {
         const response = getResponseForBlob(fetchRequest.url);

package/cjs/fetchCurl.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchCurl = fetchCurl;
-const stream_1 = require("stream");
-const tls_1 = require("tls");
+const node_stream_1 = require("node:stream");
+const node_tls_1 = require("node:tls");
+const promise_helpers_1 = require("@whatwg-node/promise-helpers");
 const Response_js_1 = require("./Response.js");
 const utils_js_1 = require("./utils.js");
 function fetchCurl(fetchRequest) {
@@ -17,15 +18,18 @@ function fetchCurl(fetchRequest) {
         curlHandle.setOpt('CAINFO', process.env.NODE_EXTRA_CA_CERTS);
     }
     else {
-        curlHandle.setOpt('CAINFO_BLOB', tls_1.rootCertificates.join('\n'));
+        curlHandle.setOpt('CAINFO_BLOB', node_tls_1.rootCertificates.join('\n'));
     }
     curlHandle.enable(CurlFeature.StreamResponse);
+    let signal;
+    if (fetchRequest._signal === null) {
+        signal = undefined;
+    }
+    else if (fetchRequest._signal) {
+        signal = fetchRequest._signal;
+    }
     curlHandle.setStreamProgressCallback(function () {
-        return fetchRequest['_signal']?.aborted
-            ? process.env.DEBUG
-                ? CurlProgressFunc.Continue
-                : 1
-            : 0;
+        return signal?.aborted ? (process.env.DEBUG ? CurlProgressFunc.Continue : 1) : 0;
     });
     if (fetchRequest['bodyType'] === 'String') {
         curlHandle.setOpt('POSTFIELDS', fetchRequest['bodyInit']);
@@ -34,7 +38,7 @@ function fetchCurl(fetchRequest) {
         const nodeReadable = (fetchRequest.body != null
             ? (0, utils_js_1.isNodeReadable)(fetchRequest.body)
                 ? fetchRequest.body
-                : stream_1.Readable.from(fetchRequest.body)
+                : node_stream_1.Readable.from(fetchRequest.body)
             : null);
         if (nodeReadable) {
             curlHandle.setOpt('UPLOAD', true);
@@ -60,20 +64,19 @@ function fetchCurl(fetchRequest) {
     }
     curlHandle.setOpt('HTTPHEADER', curlHeaders);
     curlHandle.enable(CurlFeature.NoHeaderParsing);
-    const deferredPromise = (0, utils_js_1.createDeferredPromise)();
+    const deferredPromise = (0, promise_helpers_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);
             }
-        };
+        }
     }
+    signal?.addEventListener('abort', onAbort, { once: true });
     curlHandle.once('end', function endListener() {
         try {
             curlHandle.close();
@@ -81,6 +84,7 @@ function fetchCurl(fetchRequest) {
         catch (e) {
             deferredPromise.reject(e);
         }
+        signal?.removeEventListener('abort', onAbort);
     });
     curlHandle.once('error', function errorListener(error) {
         if (streamResolved && !streamResolved.closed && !streamResolved.destroyed) {
@@ -100,42 +104,17 @@ function fetchCurl(fetchRequest) {
         }
     });
     curlHandle.once('stream', function streamListener(stream, status, headersBuf) {
-        const outputStream = new stream_1.PassThrough();
-        stream_1.promises
-            .pipeline(stream, outputStream, {
+        const outputStream = stream.pipe(new node_stream_1.PassThrough(), {
             end: true,
-            signal: fetchRequest['_signal'] ?? undefined,
-        })
-            .then(() => {
-            if (!stream.destroyed) {
-                stream.resume();
-            }
-        })
-            .catch(deferredPromise.reject);
-        if (fetchRequest['_signal']) {
-            outputStream.once('error', () => {
-                if (!fetchRequest['_signal']?.aborted) {
-                    fetchRequest['_signal']?.sendAbort?.();
-                }
-            });
-            outputStream.once('close', () => {
-                if (!fetchRequest['_signal']?.aborted) {
-                    fetchRequest['_signal']?.sendAbort?.();
-                }
-            });
-            outputStream.once('destroy', () => {
-                if (!fetchRequest['_signal']?.aborted) {
-                    fetchRequest['_signal']?.sendAbort?.();
-                }
-            });
-        }
+        });
         const headersFlat = headersBuf
             .toString('utf8')
             .split(/\r?\n|\r/g)
             .filter(headerFilter => {
             if (headerFilter && !headerFilter.startsWith('HTTP/')) {
                 if (fetchRequest.redirect === 'error' &&
-                    (headerFilter.includes('location') || headerFilter.includes('Location'))) {
+                    headerFilter.toLowerCase().includes('location') &&
+                    (0, utils_js_1.shouldRedirect)(status)) {
                     if (!stream.destroyed) {
                         stream.resume();
                     }
@@ -156,18 +135,8 @@ function fetchCurl(fetchRequest) {
         deferredPromise.resolve(ponyfillResponse);
         streamResolved = outputStream;
     });
-    let count = 0;
-    try {
-        count = Curl.getCount();
-    }
-    catch { }
-    if (count > 0) {
-        setImmediate(() => {
-            curlHandle.perform();
-        });
-    }
-    else {
+    setImmediate(() => {
         curlHandle.perform();
-    }
+    });
     return deferredPromise.promise;
 }