@whatwg-node/node-fetch 0.7.23-alpha-20250726003115-27dea3e7c5dae7285bf9c837cce54f387e269df2 → 0.7.23-alpha-20250726021227-e4372202f654829422254520007390cd597e7720

package/cjs/Body.js

@@ -27,21 +27,45 @@ class PonyfillBody {
     bodyUsed = false;
     contentType = null;
     contentLength = null;
+    _signal = null;
     constructor(bodyInit, options = {}) {
         this.bodyInit = bodyInit;
         this.options = options;
+        this._signal = options.signal || null;
         const { bodyFactory, contentType, contentLength, bodyType, buffer } = processBodyInit(bodyInit);
         this._bodyFactory = bodyFactory;
         this.contentType = contentType;
         this.contentLength = contentLength;
         this.bodyType = bodyType;
         this._buffer = buffer;
+        if (!buffer) {
+            this._chunks = this._doCollectChunksFromReadableJob();
+        }
     }
     bodyType;
     _bodyFactory = () => null;
     _generatedBody = null;
     _buffer;
     generateBody() {
+        if (!this._buffer && this._chunks) {
+            if ((0, promise_helpers_1.isPromise)(this._chunks)) {
+                return new ReadableStream_js_1.PonyfillReadableStream({
+                    start: async (controller) => {
+                        const chunks = await this._chunks;
+                        if (!chunks?.length) {
+                            this._buffer = node_buffer_1.Buffer.alloc(0);
+                            controller.close();
+                            return;
+                        }
+                        this._buffer = node_buffer_1.Buffer.concat(chunks);
+                        for (const chunk of chunks) {
+                            controller.enqueue(chunk);
+                        }
+                        controller.close();
+                    },
+                });
+            }
+        }
         if (this._generatedBody?.readable?.destroyed && this._buffer) {
             this._generatedBody.readable = node_stream_1.Readable.from(this._buffer);
         }
@@ -215,6 +239,9 @@ class PonyfillBody {
                 limits: formDataLimits,
                 defCharset: 'utf-8',
             });
+            if (this._signal) {
+                (0, node_stream_1.addAbortSignal)(this._signal, bb);
+            }
             let completed = false;
             const complete = (err) => {
                 if (completed)

package/cjs/Request.js

@@ -76,7 +76,6 @@ class PonyfillRequest extends Body_js_1.PonyfillBody {
                 this.agent = requestInit.agent;
             }
         }
-        this._signal = requestInit?.signal || undefined;
     }
     headersSerializer;
     cache;
@@ -92,7 +91,6 @@ class PonyfillRequest extends Body_js_1.PonyfillBody {
     referrer;
     referrerPolicy;
     _url;
-    _signal;
     get signal() {
         this._signal ||= new AbortController().signal;
         return this._signal;

package/cjs/fetchCurl.js

@@ -22,7 +22,7 @@ function fetchCurl(fetchRequest) {
     }
     curlHandle.enable(CurlFeature.StreamResponse);
     let signal;
-    if (fetchRequest._signal === null) {
+    if (fetchRequest._signal == null) {
         signal = undefined;
     }
     else if (fetchRequest._signal) {
@@ -104,8 +104,12 @@ function fetchCurl(fetchRequest) {
         }
     });
     curlHandle.once('stream', function streamListener(stream, status, headersBuf) {
-        const outputStream = stream.pipe(new node_stream_1.PassThrough(), {
-            end: true,
+        const passThrough = new node_stream_1.PassThrough();
+        (0, utils_js_1.pipeThrough)({
+            src: stream,
+            dest: passThrough,
+            signal,
+            onError: deferredPromise.reject,
         });
         const headersFlat = headersBuf
             .toString('utf8')
@@ -118,7 +122,7 @@ function fetchCurl(fetchRequest) {
                     if (!stream.destroyed) {
                         stream.resume();
                     }
-                    outputStream.destroy();
+                    passThrough.destroy();
                     deferredPromise.reject(new Error('redirect is not allowed'));
                 }
                 return true;
@@ -126,14 +130,14 @@ function fetchCurl(fetchRequest) {
             return false;
         });
         const headersInit = headersFlat.map(headerFlat => headerFlat.split(/:\s(.+)/).slice(0, 2));
-        const ponyfillResponse = new Response_js_1.PonyfillResponse(outputStream, {
+        const ponyfillResponse = new Response_js_1.PonyfillResponse(passThrough, {
             status,
             headers: headersInit,
             url: curlHandle.getInfo(Curl.info.REDIRECT_URL)?.toString() || fetchRequest.url,
             redirected: Number(curlHandle.getInfo(Curl.info.REDIRECT_COUNT)) > 0,
         });
         deferredPromise.resolve(ponyfillResponse);
-        streamResolved = outputStream;
+        streamResolved = passThrough;
     });
     setImmediate(() => {
         curlHandle.perform();

package/cjs/fetchNodeHttp.js

@@ -92,10 +92,14 @@ function fetchNodeHttp(fetchRequest) {
                         return;
                     }
                 }
-                outputStream ||= new node_stream_1.PassThrough();
-                nodeResponse.pipe(outputStream, {
-                    end: true,
-                });
+                if (outputStream != null) {
+                    (0, utils_js_1.pipeThrough)({
+                        src: nodeResponse,
+                        dest: outputStream,
+                        signal,
+                        onError: reject,
+                    });
+                }
                 const statusCode = nodeResponse.statusCode || 200;
                 let statusText = nodeResponse.statusMessage || node_http_1.STATUS_CODES[statusCode];
                 if (statusText == null) {

package/cjs/utils.js

@@ -7,6 +7,7 @@ exports.isArrayBufferView = isArrayBufferView;
 exports.isNodeReadable = isNodeReadable;
 exports.isIterable = isIterable;
 exports.shouldRedirect = shouldRedirect;
+exports.pipeThrough = pipeThrough;
 exports.endStream = endStream;
 exports.safeWrite = safeWrite;
 const node_events_1 = require("node:events");
@@ -48,6 +49,42 @@ function isIterable(value) {
 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);
+    });
+    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);
@@ -58,3 +95,10 @@ function safeWrite(chunk, stream) {
         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/Body.js

@@ -1,8 +1,8 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 import { Buffer } from 'node:buffer';
-import { Readable } from 'node:stream';
+import { addAbortSignal, Readable } from 'node:stream';
 import { Busboy } from '@fastify/busboy';
-import { handleMaybePromise } from '@whatwg-node/promise-helpers';
+import { handleMaybePromise, isPromise } from '@whatwg-node/promise-helpers';
 import { hasArrayBufferMethod, hasBufferMethod, hasBytesMethod, PonyfillBlob } from './Blob.js';
 import { PonyfillFile } from './File.js';
 import { getStreamFromFormData, PonyfillFormData } from './FormData.js';
@@ -24,21 +24,45 @@ export class PonyfillBody {
     bodyUsed = false;
     contentType = null;
     contentLength = null;
+    _signal = null;
     constructor(bodyInit, options = {}) {
         this.bodyInit = bodyInit;
         this.options = options;
+        this._signal = options.signal || null;
         const { bodyFactory, contentType, contentLength, bodyType, buffer } = processBodyInit(bodyInit);
         this._bodyFactory = bodyFactory;
         this.contentType = contentType;
         this.contentLength = contentLength;
         this.bodyType = bodyType;
         this._buffer = buffer;
+        if (!buffer) {
+            this._chunks = this._doCollectChunksFromReadableJob();
+        }
     }
     bodyType;
     _bodyFactory = () => null;
     _generatedBody = null;
     _buffer;
     generateBody() {
+        if (!this._buffer && this._chunks) {
+            if (isPromise(this._chunks)) {
+                return new PonyfillReadableStream({
+                    start: async (controller) => {
+                        const chunks = await this._chunks;
+                        if (!chunks?.length) {
+                            this._buffer = Buffer.alloc(0);
+                            controller.close();
+                            return;
+                        }
+                        this._buffer = Buffer.concat(chunks);
+                        for (const chunk of chunks) {
+                            controller.enqueue(chunk);
+                        }
+                        controller.close();
+                    },
+                });
+            }
+        }
         if (this._generatedBody?.readable?.destroyed && this._buffer) {
             this._generatedBody.readable = Readable.from(this._buffer);
         }
@@ -212,6 +236,9 @@ export class PonyfillBody {
                 limits: formDataLimits,
                 defCharset: 'utf-8',
             });
+            if (this._signal) {
+                addAbortSignal(this._signal, bb);
+            }
             let completed = false;
             const complete = (err) => {
                 if (completed)

package/esm/Request.js

@@ -73,7 +73,6 @@ export class PonyfillRequest extends PonyfillBody {
                 this.agent = requestInit.agent;
             }
         }
-        this._signal = requestInit?.signal || undefined;
     }
     headersSerializer;
     cache;
@@ -89,7 +88,6 @@ export class PonyfillRequest extends PonyfillBody {
     referrer;
     referrerPolicy;
     _url;
-    _signal;
     get signal() {
         this._signal ||= new AbortController().signal;
         return this._signal;

package/esm/fetchCurl.js

@@ -2,7 +2,7 @@ import { PassThrough, Readable } from 'node:stream';
 import { rootCertificates } from 'node:tls';
 import { createDeferredPromise } from '@whatwg-node/promise-helpers';
 import { PonyfillResponse } from './Response.js';
-import { defaultHeadersSerializer, isNodeReadable, shouldRedirect } from './utils.js';
+import { defaultHeadersSerializer, isNodeReadable, pipeThrough, shouldRedirect } from './utils.js';
 export function fetchCurl(fetchRequest) {
     const { Curl, CurlFeature, CurlPause, CurlProgressFunc } = globalThis['libcurl'];
     const curlHandle = new Curl();
@@ -19,7 +19,7 @@ export function fetchCurl(fetchRequest) {
     }
     curlHandle.enable(CurlFeature.StreamResponse);
     let signal;
-    if (fetchRequest._signal === null) {
+    if (fetchRequest._signal == null) {
         signal = undefined;
     }
     else if (fetchRequest._signal) {
@@ -101,8 +101,12 @@ export function fetchCurl(fetchRequest) {
         }
     });
     curlHandle.once('stream', function streamListener(stream, status, headersBuf) {
-        const outputStream = stream.pipe(new PassThrough(), {
-            end: true,
+        const passThrough = new PassThrough();
+        pipeThrough({
+            src: stream,
+            dest: passThrough,
+            signal,
+            onError: deferredPromise.reject,
         });
         const headersFlat = headersBuf
             .toString('utf8')
@@ -115,7 +119,7 @@ export function fetchCurl(fetchRequest) {
                     if (!stream.destroyed) {
                         stream.resume();
                     }
-                    outputStream.destroy();
+                    passThrough.destroy();
                     deferredPromise.reject(new Error('redirect is not allowed'));
                 }
                 return true;
@@ -123,14 +127,14 @@ export function fetchCurl(fetchRequest) {
             return false;
         });
         const headersInit = headersFlat.map(headerFlat => headerFlat.split(/:\s(.+)/).slice(0, 2));
-        const ponyfillResponse = new PonyfillResponse(outputStream, {
+        const ponyfillResponse = new PonyfillResponse(passThrough, {
             status,
             headers: headersInit,
             url: curlHandle.getInfo(Curl.info.REDIRECT_URL)?.toString() || fetchRequest.url,
             redirected: Number(curlHandle.getInfo(Curl.info.REDIRECT_COUNT)) > 0,
         });
         deferredPromise.resolve(ponyfillResponse);
-        streamResolved = outputStream;
+        streamResolved = passThrough;
     });
     setImmediate(() => {
         curlHandle.perform();

package/esm/fetchNodeHttp.js

@@ -1,12 +1,12 @@
 import { request as httpRequest, STATUS_CODES } from 'node:http';
 import { request as httpsRequest } from 'node:https';
-import { PassThrough, Readable } from 'node:stream';
+import { Readable } from 'node:stream';
 import { createBrotliDecompress, createGunzip, createInflate, createInflateRaw } from 'node:zlib';
 import { handleMaybePromise } from '@whatwg-node/promise-helpers';
 import { PonyfillRequest } from './Request.js';
 import { PonyfillResponse } from './Response.js';
 import { PonyfillURL } from './URL.js';
-import { endStream, getHeadersObj, isNodeReadable, safeWrite, shouldRedirect } from './utils.js';
+import { endStream, getHeadersObj, isNodeReadable, pipeThrough, safeWrite, shouldRedirect, } from './utils.js';
 function getRequestFnForProtocol(url) {
     if (url.startsWith('http:')) {
         return httpRequest;
@@ -89,10 +89,14 @@ export function fetchNodeHttp(fetchRequest) {
                         return;
                     }
                 }
-                outputStream ||= new PassThrough();
-                nodeResponse.pipe(outputStream, {
-                    end: true,
-                });
+                if (outputStream != null) {
+                    pipeThrough({
+                        src: nodeResponse,
+                        dest: outputStream,
+                        signal,
+                        onError: reject,
+                    });
+                }
                 const statusCode = nodeResponse.statusCode || 200;
                 let statusText = nodeResponse.statusMessage || STATUS_CODES[statusCode];
                 if (statusText == null) {

package/esm/utils.js

@@ -36,6 +36,42 @@ export function isIterable(value) {
 export function shouldRedirect(status) {
     return status === 301 || status === 302 || status === 303 || status === 307 || status === 308;
 }
+export 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);
+    });
+    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 */ });
+}
 export function endStream(stream) {
     // @ts-expect-error Avoid arguments adaptor trampoline https://v8.dev/blog/adaptor-frame
     return stream.end(null, null, null);
@@ -46,3 +82,10 @@ export function safeWrite(chunk, stream) {
         return 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/node-fetch",
-  "version": "0.7.23-alpha-20250726003115-27dea3e7c5dae7285bf9c837cce54f387e269df2",
+  "version": "0.7.23-alpha-20250726021227-e4372202f654829422254520007390cd597e7720",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "dependencies": {

package/typings/Body.d.cts

@@ -24,6 +24,7 @@ export declare class PonyfillBody<TJSON = any> implements Body {
     bodyUsed: boolean;
     contentType: string | null;
     contentLength: number | null;
+    _signal?: AbortSignal | null;
     constructor(bodyInit: BodyPonyfillInit | null, options?: PonyfillBodyOptions);
     private bodyType?;
     private _bodyFactory;

package/typings/Body.d.ts

@@ -24,6 +24,7 @@ export declare class PonyfillBody<TJSON = any> implements Body {
     bodyUsed: boolean;
     contentType: string | null;
     contentLength: number | null;
+    _signal?: AbortSignal | null;
     constructor(bodyInit: BodyPonyfillInit | null, options?: PonyfillBodyOptions);
     private bodyType?;
     private _bodyFactory;

package/typings/Request.d.cts

@@ -26,7 +26,6 @@ export declare class PonyfillRequest<TJSON = any> extends PonyfillBody<TJSON> im
     referrer: string;
     referrerPolicy: ReferrerPolicy;
     _url: string | undefined;
-    _signal: AbortSignal | undefined;
     get signal(): AbortSignal;
     get url(): string;
     _parsedUrl: URL | undefined;

package/typings/Request.d.ts

@@ -26,7 +26,6 @@ export declare class PonyfillRequest<TJSON = any> extends PonyfillBody<TJSON> im
     referrer: string;
     referrerPolicy: ReferrerPolicy;
     _url: string | undefined;
-    _signal: AbortSignal | undefined;
     get signal(): AbortSignal;
     get url(): string;
     _parsedUrl: URL | undefined;

package/typings/utils.d.cts

@@ -6,6 +6,12 @@ export declare function isArrayBufferView(obj: any): obj is ArrayBufferView;
 export declare function isNodeReadable(obj: any): obj is Readable;
 export declare function isIterable(value: any): value is Iterable<unknown>;
 export declare function shouldRedirect(status?: number): boolean;
+export declare function pipeThrough({ src, dest, signal, onError, }: {
+    src: Readable;
+    dest: Writable;
+    signal?: AbortSignal | undefined;
+    onError?: ((e: Error) => void) | undefined;
+}): void;
 export declare function endStream(stream: {
     end: () => void;
 }): void;

package/typings/utils.d.ts

@@ -6,6 +6,12 @@ export declare function isArrayBufferView(obj: any): obj is ArrayBufferView;
 export declare function isNodeReadable(obj: any): obj is Readable;
 export declare function isIterable(value: any): value is Iterable<unknown>;
 export declare function shouldRedirect(status?: number): boolean;
+export declare function pipeThrough({ src, dest, signal, onError, }: {
+    src: Readable;
+    dest: Writable;
+    signal?: AbortSignal | undefined;
+    onError?: ((e: Error) => void) | undefined;
+}): void;
 export declare function endStream(stream: {
     end: () => void;
 }): void;