@whatwg-node/node-fetch 0.8.0-alpha-20241212160430-140b66f028923f44368e67598b6b66f47f690454 → 0.8.0-alpha-20250917053118-2dc604e028627df01a83e41a3dd6dd3f89ca0b40

package/cjs/fetchNodeHttp.js

@@ -1,20 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchNodeHttp = fetchNodeHttp;
-const http_1 = require("http");
-const https_1 = require("https");
-const stream_1 = require("stream");
-const zlib_1 = require("zlib");
+const node_http_1 = require("node:http");
+const node_https_1 = require("node:https");
+const node_stream_1 = require("node:stream");
+const node_zlib_1 = require("node:zlib");
+const promise_helpers_1 = require("@whatwg-node/promise-helpers");
 const Request_js_1 = require("./Request.js");
 const Response_js_1 = require("./Response.js");
 const URL_js_1 = require("./URL.js");
 const utils_js_1 = require("./utils.js");
 function getRequestFnForProtocol(url) {
     if (url.startsWith('http:')) {
-        return http_1.request;
+        return node_http_1.request;
     }
     else if (url.startsWith('https:')) {
-        return https_1.request;
+        return node_https_1.request;
     }
     throw new Error(`Unsupported protocol: ${url.split(':')[0] || url}`);
 }
@@ -22,30 +23,24 @@ function fetchNodeHttp(fetchRequest) {
     return new Promise((resolve, reject) => {
         try {
             const requestFn = getRequestFnForProtocol(fetchRequest.parsedUrl?.protocol || fetchRequest.url);
-            const nodeReadable = (fetchRequest.body != null
-                ? (0, utils_js_1.isNodeReadable)(fetchRequest.body)
-                    ? fetchRequest.body
-                    : stream_1.Readable.from(fetchRequest.body)
-                : null);
             const headersSerializer = fetchRequest.headersSerializer || utils_js_1.getHeadersObj;
             const nodeHeaders = headersSerializer(fetchRequest.headers);
-            if (nodeHeaders['accept-encoding'] == null) {
-                nodeHeaders['accept-encoding'] = 'gzip, deflate, br';
+            nodeHeaders['accept-encoding'] ||= 'gzip, deflate, br';
+            nodeHeaders['user-agent'] ||= 'node';
+            let signal;
+            if (fetchRequest._signal == null) {
+                signal = undefined;
+            }
+            else if (fetchRequest._signal) {
+                signal = fetchRequest._signal;
             }
             let nodeRequest;
-            // Skip using parsed URL if it's an IPv6 address (starting with brackets)
-            if (fetchRequest.parsedUrl && !fetchRequest.parsedUrl.hostname?.startsWith('[')) {
-                nodeRequest = requestFn({
-                    auth: fetchRequest.parsedUrl.username
-                        ? `${fetchRequest.parsedUrl.username}:${fetchRequest.parsedUrl.password}`
-                        : undefined,
-                    hostname: fetchRequest.parsedUrl.hostname,
+            // If it is our ponyfilled Request, it should have `parsedUrl` which is a `URL` object
+            if (fetchRequest.parsedUrl) {
+                nodeRequest = requestFn(fetchRequest.parsedUrl, {
                     method: fetchRequest.method,
-                    path: fetchRequest.parsedUrl.pathname + (fetchRequest.parsedUrl.search || ''),
-                    port: fetchRequest.parsedUrl.port,
-                    protocol: fetchRequest.parsedUrl.protocol,
                     headers: nodeHeaders,
-                    signal: fetchRequest['_signal'] ?? undefined,
+                    signal,
                     agent: fetchRequest.agent,
                 });
             }
@@ -53,33 +48,32 @@ function fetchNodeHttp(fetchRequest) {
                 nodeRequest = requestFn(fetchRequest.url, {
                     method: fetchRequest.method,
                     headers: nodeHeaders,
-                    signal: fetchRequest['_signal'] ?? undefined,
+                    signal,
                     agent: fetchRequest.agent,
                 });
             }
+            nodeRequest.once('error', reject);
             nodeRequest.once('response', nodeResponse => {
                 let outputStream;
                 const contentEncoding = nodeResponse.headers['content-encoding'];
                 switch (contentEncoding) {
                     case 'x-gzip':
                     case 'gzip':
-                        outputStream = (0, zlib_1.createGunzip)();
+                        outputStream = (0, node_zlib_1.createGunzip)();
                         break;
                     case 'x-deflate':
                     case 'deflate':
-                        outputStream = (0, zlib_1.createInflate)();
+                        outputStream = (0, node_zlib_1.createInflate)();
                         break;
                     case 'x-deflate-raw':
                     case 'deflate-raw':
-                        outputStream = (0, zlib_1.createInflateRaw)();
+                        outputStream = (0, node_zlib_1.createInflateRaw)();
                         break;
                     case 'br':
-                        outputStream = (0, zlib_1.createBrotliDecompress)();
+                        outputStream = (0, node_zlib_1.createBrotliDecompress)();
                         break;
-                    default:
-                        outputStream = new stream_1.PassThrough();
                 }
-                if (nodeResponse.headers.location) {
+                if (nodeResponse.headers.location && (0, utils_js_1.shouldRedirect)(nodeResponse.statusCode)) {
                     if (fetchRequest.redirect === 'error') {
                         const redirectError = new Error('Redirects are not allowed');
                         reject(redirectError);
@@ -97,48 +91,50 @@ function fetchNodeHttp(fetchRequest) {
                         return;
                     }
                 }
-                stream_1.promises
-                    .pipeline(nodeResponse, outputStream, {
-                    signal: fetchRequest['_signal'] ?? undefined,
-                    end: true,
-                })
-                    .then(() => {
-                    if (!nodeResponse.destroyed) {
-                        nodeResponse.resume();
-                    }
-                })
-                    .catch(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 ||= new node_stream_1.PassThrough();
+                (0, utils_js_1.pipeThrough)({
+                    src: nodeResponse,
+                    dest: outputStream,
+                    signal,
+                    onError: e => {
+                        if (!nodeResponse.destroyed) {
+                            nodeResponse.destroy(e);
                         }
-                    });
-                    outputStream.once('destroy', () => {
-                        if (!fetchRequest['_signal']?.aborted) {
-                            fetchRequest['_signal']?.sendAbort?.();
+                        if (!outputStream.destroyed) {
+                            outputStream.destroy(e);
                         }
-                    });
+                        reject(e);
+                    },
+                });
+                const statusCode = nodeResponse.statusCode || 200;
+                let statusText = nodeResponse.statusMessage || node_http_1.STATUS_CODES[statusCode];
+                if (statusText == null) {
+                    statusText = '';
                 }
-                const ponyfillResponse = new Response_js_1.PonyfillResponse(outputStream, {
-                    status: nodeResponse.statusCode,
-                    statusText: nodeResponse.statusMessage,
+                const ponyfillResponse = new Response_js_1.PonyfillResponse(outputStream || nodeResponse, {
+                    status: statusCode,
+                    statusText,
                     headers: nodeResponse.headers,
                     url: fetchRequest.url,
+                    signal,
                 });
                 resolve(ponyfillResponse);
             });
-            nodeRequest.once('error', reject);
-            if (nodeReadable) {
-                nodeReadable.pipe(nodeRequest);
+            if (fetchRequest['_buffer'] != null) {
+                (0, promise_helpers_1.handleMaybePromise)(() => (0, utils_js_1.safeWrite)(fetchRequest['_buffer'], nodeRequest), () => (0, utils_js_1.endStream)(nodeRequest), reject);
             }
             else {
-                nodeRequest.end();
+                const nodeReadable = (fetchRequest.body != null
+                    ? (0, utils_js_1.isNodeReadable)(fetchRequest.body)
+                        ? fetchRequest.body
+                        : node_stream_1.Readable.from(fetchRequest.body)
+                    : null);
+                if (nodeReadable) {
+                    nodeReadable.pipe(nodeRequest);
+                }
+                else {
+                    (0, utils_js_1.endStream)(nodeRequest);
+                }
             }
         }
         catch (e) {

package/cjs/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AbortError = exports.AbortSignal = exports.AbortController = exports.TextEncoderStream = exports.TextDecoderStream = exports.IteratorObject = exports.DecompressionStream = exports.CompressionStream = exports.TransformStream = exports.WritableStream = exports.URLSearchParams = exports.URL = exports.btoa = exports.TextDecoder = exports.TextEncoder = exports.Blob = exports.FormData = exports.File = exports.ReadableStream = exports.Response = exports.Request = exports.Body = exports.Headers = exports.fetch = void 0;
+exports.TextEncoderStream = exports.TextDecoderStream = exports.IteratorObject = exports.DecompressionStream = exports.CompressionStream = exports.TransformStream = exports.WritableStream = exports.URLSearchParams = exports.URL = exports.btoa = exports.TextDecoder = exports.TextEncoder = exports.Blob = exports.FormData = exports.File = exports.ReadableStream = exports.Response = exports.Request = exports.Body = exports.Headers = exports.fetch = void 0;
 var fetch_js_1 = require("./fetch.js");
 Object.defineProperty(exports, "fetch", { enumerable: true, get: function () { return fetch_js_1.fetchPonyfill; } });
 var Headers_js_1 = require("./Headers.js");
@@ -40,9 +40,3 @@ Object.defineProperty(exports, "IteratorObject", { enumerable: true, get: functi
 var TextEncoderDecoderStream_js_1 = require("./TextEncoderDecoderStream.js");
 Object.defineProperty(exports, "TextDecoderStream", { enumerable: true, get: function () { return TextEncoderDecoderStream_js_1.PonyfillTextDecoderStream; } });
 Object.defineProperty(exports, "TextEncoderStream", { enumerable: true, get: function () { return TextEncoderDecoderStream_js_1.PonyfillTextEncoderStream; } });
-var AbortController_js_1 = require("./AbortController.js");
-Object.defineProperty(exports, "AbortController", { enumerable: true, get: function () { return AbortController_js_1.PonyfillAbortController; } });
-var AbortSignal_js_1 = require("./AbortSignal.js");
-Object.defineProperty(exports, "AbortSignal", { enumerable: true, get: function () { return AbortSignal_js_1.PonyfillAbortSignal; } });
-var AbortError_js_1 = require("./AbortError.js");
-Object.defineProperty(exports, "AbortError", { enumerable: true, get: function () { return AbortError_js_1.PonyfillAbortError; } });

package/cjs/utils.js

@@ -1,12 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.fakePromise = void 0;
 exports.getHeadersObj = getHeadersObj;
 exports.defaultHeadersSerializer = defaultHeadersSerializer;
-exports.fakePromise = fakePromise;
 exports.isArrayBufferView = isArrayBufferView;
 exports.isNodeReadable = isNodeReadable;
-exports.createDeferredPromise = createDeferredPromise;
 exports.isIterable = isIterable;
+exports.shouldRedirect = shouldRedirect;
+exports.pipeThrough = pipeThrough;
+exports.endStream = endStream;
+exports.safeWrite = safeWrite;
+const node_events_1 = require("node:events");
 function isHeadersInstance(obj) {
     return obj?.forEach != null;
 }
@@ -14,6 +18,11 @@ function getHeadersObj(headers) {
     if (headers == null || !isHeadersInstance(headers)) {
         return headers;
     }
+    // @ts-expect-error - `headersInit` is not a public property
+    if (headers.headersInit && !headers._map && !isHeadersInstance(headers.headersInit)) {
+        // @ts-expect-error - `headersInit` is not a public property
+        return headers.headersInit;
+    }
     return Object.fromEntries(headers.entries());
 }
 function defaultHeadersSerializer(headers, onContentLength) {
@@ -26,65 +35,77 @@ function defaultHeadersSerializer(headers, onContentLength) {
     });
     return headerArray;
 }
-function isPromise(val) {
-    return val?.then != null;
-}
-function fakePromise(value) {
-    if (isPromise(value)) {
-        return value;
-    }
-    // Write a fake promise to avoid the promise constructor
-    // being called with `new Promise` in the browser.
-    return {
-        then(resolve) {
-            if (resolve) {
-                const callbackResult = resolve(value);
-                if (isPromise(callbackResult)) {
-                    return callbackResult;
-                }
-                return fakePromise(callbackResult);
-            }
-            return this;
-        },
-        catch() {
-            return this;
-        },
-        finally(cb) {
-            if (cb) {
-                const callbackResult = cb();
-                if (isPromise(callbackResult)) {
-                    return callbackResult.then(() => value);
-                }
-                return fakePromise(value);
-            }
-            return this;
-        },
-        [Symbol.toStringTag]: 'Promise',
-    };
-}
+var promise_helpers_1 = require("@whatwg-node/promise-helpers");
+Object.defineProperty(exports, "fakePromise", { enumerable: true, get: function () { return promise_helpers_1.fakePromise; } });
 function isArrayBufferView(obj) {
     return obj != null && obj.buffer != null && obj.byteLength != null && obj.byteOffset != null;
 }
 function isNodeReadable(obj) {
     return obj != null && obj.pipe != null;
 }
-function createDeferredPromise() {
-    let resolveFn;
-    let rejectFn;
-    const promise = new Promise(function deferredPromiseExecutor(resolve, reject) {
-        resolveFn = resolve;
-        rejectFn = reject;
-    });
-    return {
-        promise,
-        get resolve() {
-            return resolveFn;
-        },
-        get reject() {
-            return rejectFn;
-        },
-    };
-}
 function isIterable(value) {
     return value?.[Symbol.iterator] != null;
 }
+function shouldRedirect(status) {
+    return status === 301 || status === 302 || status === 303 || status === 307 || status === 308;
+}
+function pipeThrough({ src, dest, signal, onError, }) {
+    if (onError) {
+        // listen for errors on the destination stream if necessary. if the readable
+        // stream (src) emits an error, the writable destination (dest) will be
+        // destroyed with that error (see below)
+        dest.once('error', onError);
+    }
+    src.once('error', (e) => {
+        // if the readable stream (src) emits an error during pipe, the writable
+        // destination (dest) is not closed automatically. that needs to be
+        // done manually. the readable stream is closed when error is emitted,
+        // so only the writable destination needs to be destroyed
+        dest.destroy(e);
+    });
+    dest.once('close', () => {
+        // if the writable destination (dest) is closed, the readable stream (src)
+        // is not closed automatically. that needs to be done manually
+        if (!src.destroyed) {
+            src.destroy();
+        }
+    });
+    if (signal) {
+        // this is faster than `import('node:signal').addAbortSignal(signal, src)`
+        const srcRef = new WeakRef(src);
+        const signalRef = new WeakRef(signal);
+        function cleanup() {
+            signalRef.deref()?.removeEventListener('abort', onAbort);
+            srcRef.deref()?.removeListener('end', cleanup);
+            srcRef.deref()?.removeListener('error', cleanup);
+            srcRef.deref()?.removeListener('close', cleanup);
+        }
+        function onAbort() {
+            srcRef.deref()?.destroy(new AbortError());
+            cleanup();
+        }
+        signal.addEventListener('abort', onAbort, { once: true });
+        // this is faster than `import('node:signal').finished(src, cleanup)`
+        src.once('end', cleanup);
+        src.once('error', cleanup);
+        src.once('close', cleanup);
+    }
+    src.pipe(dest, { end: true /* already default */ });
+}
+function endStream(stream) {
+    // @ts-expect-error Avoid arguments adaptor trampoline https://v8.dev/blog/adaptor-frame
+    return stream.end(null, null, null);
+}
+function safeWrite(chunk, stream) {
+    const result = stream.write(chunk);
+    if (!result) {
+        return (0, node_events_1.once)(stream, 'drain');
+    }
+}
+// https://github.com/nodejs/node/blob/f692878dec6354c0a82241f224906981861bc840/lib/internal/errors.js#L961-L973
+class AbortError extends Error {
+    constructor(message = 'The operation was aborted', options = undefined) {
+        super(message, options);
+        this.name = 'AbortError';
+    }
+}

package/esm/AbortError.js

@@ -1,6 +1,13 @@
-export class PonyfillAbortError extends DOMException {
-    constructor() {
-        super('The operation was aborted', 'AbortError');
+export class PonyfillAbortError extends Error {
+    constructor(reason) {
+        let message = 'The operation was aborted';
+        if (reason) {
+            message += ` reason: ${reason}`;
+        }
+        super(message, {
+            cause: reason,
+        });
+        this.name = 'AbortError';
     }
     get reason() {
         return this.cause;

package/esm/Blob.js

@@ -1,4 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
+/* eslint-disable @typescript-eslint/ban-ts-comment */
+import { Buffer } from 'node:buffer';
 import { PonyfillReadableStream } from './ReadableStream.js';
 import { fakePromise, isArrayBufferView } from './utils.js';
 function getBlobPartAsBuffer(blobPart) {
@@ -114,7 +116,7 @@ export class PonyfillBlob {
     }
     arrayBuffer() {
         if (this._buffer) {
-            // @ts-expect-error - `Buffer` and `ArrayBuffer` are compatible
+            // @ts-ignore - Mismatch between Buffer and ArrayBuffer
             return fakePromise(this._buffer);
         }
         if (this.blobParts.length === 1) {
@@ -125,7 +127,7 @@ export class PonyfillBlob {
                 return this.blobParts[0].arrayBuffer();
             }
         }
-        // @ts-expect-error - `Buffer` and `ArrayBuffer` are compatible
+        // @ts-ignore - Mismatch between Buffer and ArrayBuffer
         return this.buffer();
     }
     bytes() {
@@ -135,11 +137,11 @@ export class PonyfillBlob {
         if (this.blobParts.length === 1) {
             if (Buffer.isBuffer(this.blobParts[0])) {
                 this._buffer = this.blobParts[0];
-                return fakePromise(this.blobParts[0]);
+                return fakePromise(this._buffer);
             }
             if (this.blobParts[0] instanceof Uint8Array) {
                 this._buffer = Buffer.from(this.blobParts[0]);
-                return fakePromise(this.blobParts[0]);
+                return fakePromise(this._buffer);
             }
             if (hasBytesMethod(this.blobParts[0])) {
                 return this.blobParts[0].bytes();