@whatwg-node/node-fetch 0.7.22-alpha-20250710160716-6df7209d12299dba404ac539d834654be5d43990 → 0.7.23-alpha-20250725190806-5df0ede70a22656416fd7a0f626f8d5ba8238197

package/cjs/Body.js

@@ -457,8 +457,10 @@ function processBodyInit(bodyInit, signal) {
         };
     }
     if (bodyInit instanceof node_http_1.IncomingMessage) {
-        const passThrough = (0, utils_js_1.wrapIncomingMessageWithPassthrough)({
-            incomingMessage: bodyInit,
+        const passThrough = new node_stream_1.PassThrough();
+        (0, utils_js_1.pipeThrough)({
+            src: bodyInit,
+            dest: passThrough,
             signal,
         });
         return {

package/cjs/fetchCurl.js

@@ -107,8 +107,10 @@ function fetchCurl(fetchRequest) {
         }
     });
     curlHandle.once('stream', function streamListener(stream, status, headersBuf) {
-        const outputStream = (0, utils_js_1.wrapIncomingMessageWithPassthrough)({
-            incomingMessage: stream,
+        const passThrough = new node_stream_1.PassThrough();
+        (0, utils_js_1.pipeThrough)({
+            src: stream,
+            dest: passThrough,
             signal,
             onError: deferredPromise.reject,
         });
@@ -123,7 +125,7 @@ function fetchCurl(fetchRequest) {
                     if (!stream.destroyed) {
                         stream.resume();
                     }
-                    outputStream.destroy();
+                    passThrough.destroy();
                     deferredPromise.reject(new Error('redirect is not allowed'));
                 }
                 return true;
@@ -131,14 +133,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

@@ -96,9 +96,9 @@ function fetchNodeHttp(fetchRequest) {
                     }
                 }
                 if (outputStream != null) {
-                    outputStream = (0, utils_js_1.wrapIncomingMessageWithPassthrough)({
-                        incomingMessage: nodeResponse,
-                        passThrough: outputStream,
+                    (0, utils_js_1.pipeThrough)({
+                        src: nodeResponse,
+                        dest: outputStream,
                         signal,
                         onError: reject,
                     });

package/cjs/utils.js

@@ -7,12 +7,10 @@ exports.isArrayBufferView = isArrayBufferView;
 exports.isNodeReadable = isNodeReadable;
 exports.isIterable = isIterable;
 exports.shouldRedirect = shouldRedirect;
-exports.wrapIncomingMessageWithPassthrough = wrapIncomingMessageWithPassthrough;
+exports.pipeThrough = pipeThrough;
 exports.endStream = endStream;
 exports.safeWrite = safeWrite;
 const node_events_1 = require("node:events");
-const node_stream_1 = require("node:stream");
-const promises_1 = require("node:stream/promises");
 function isHeadersInstance(obj) {
     return obj?.forEach != null;
 }
@@ -51,20 +49,39 @@ function isIterable(value) {
 function shouldRedirect(status) {
     return status === 301 || status === 302 || status === 303 || status === 307 || status === 308;
 }
-function wrapIncomingMessageWithPassthrough({ incomingMessage, signal, passThrough = new node_stream_1.PassThrough(), onError = (e) => {
-    passThrough.destroy(e);
-}, }) {
-    (0, promises_1.pipeline)(incomingMessage, passThrough, {
-        signal,
-        end: true,
-    })
-        .then(() => {
-        if (!incomingMessage.destroyed) {
-            incomingMessage.resume();
+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) {
+        function handleAbort() {
+            try {
+                signal.throwIfAborted();
+            }
+            catch (abortError) {
+                // destroying the src stream will destroy the dest stream as well
+                src.destroy(abortError);
+            }
         }
-    })
-        .catch(onError);
-    return passThrough;
+        if (signal.aborted) {
+            // if the signal is already aborted, we can just destroy the
+            // src stream and not start pipe at all
+            handleAbort();
+            return;
+        }
+        signal.addEventListener('abort', handleAbort, { once: true });
+    }
+    src.pipe(dest, { end: true /* already default */ });
 }
 function endStream(stream) {
     // @ts-expect-error Avoid arguments adaptor trampoline https://v8.dev/blog/adaptor-frame

package/esm/Body.js

@@ -1,14 +1,14 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 import { Buffer } from 'node:buffer';
 import { IncomingMessage } from 'node:http';
-import { addAbortSignal, Readable } from 'node:stream';
+import { addAbortSignal, PassThrough, Readable } from 'node:stream';
 import { Busboy } from '@fastify/busboy';
 import { handleMaybePromise } from '@whatwg-node/promise-helpers';
 import { hasArrayBufferMethod, hasBufferMethod, hasBytesMethod, PonyfillBlob } from './Blob.js';
 import { PonyfillFile } from './File.js';
 import { getStreamFromFormData, PonyfillFormData } from './FormData.js';
 import { PonyfillReadableStream } from './ReadableStream.js';
-import { fakePromise, isArrayBufferView, wrapIncomingMessageWithPassthrough } from './utils.js';
+import { fakePromise, isArrayBufferView, pipeThrough } from './utils.js';
 var BodyInitType;
 (function (BodyInitType) {
     BodyInitType["ReadableStream"] = "ReadableStream";
@@ -453,8 +453,10 @@ function processBodyInit(bodyInit, signal) {
         };
     }
     if (bodyInit instanceof IncomingMessage) {
-        const passThrough = wrapIncomingMessageWithPassthrough({
-            incomingMessage: bodyInit,
+        const passThrough = new PassThrough();
+        pipeThrough({
+            src: bodyInit,
+            dest: passThrough,
             signal,
         });
         return {

package/esm/fetchCurl.js

@@ -1,8 +1,8 @@
-import { Readable } from 'node:stream';
+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, wrapIncomingMessageWithPassthrough, } 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();
@@ -104,8 +104,10 @@ export function fetchCurl(fetchRequest) {
         }
     });
     curlHandle.once('stream', function streamListener(stream, status, headersBuf) {
-        const outputStream = wrapIncomingMessageWithPassthrough({
-            incomingMessage: stream,
+        const passThrough = new PassThrough();
+        pipeThrough({
+            src: stream,
+            dest: passThrough,
             signal,
             onError: deferredPromise.reject,
         });
@@ -120,7 +122,7 @@ export function fetchCurl(fetchRequest) {
                     if (!stream.destroyed) {
                         stream.resume();
                     }
-                    outputStream.destroy();
+                    passThrough.destroy();
                     deferredPromise.reject(new Error('redirect is not allowed'));
                 }
                 return true;
@@ -128,14 +130,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

@@ -6,7 +6,7 @@ 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, wrapIncomingMessageWithPassthrough, } from './utils.js';
+import { endStream, getHeadersObj, isNodeReadable, pipeThrough, safeWrite, shouldRedirect, } from './utils.js';
 function getRequestFnForProtocol(url) {
     if (url.startsWith('http:')) {
         return httpRequest;
@@ -93,9 +93,9 @@ export function fetchNodeHttp(fetchRequest) {
                     }
                 }
                 if (outputStream != null) {
-                    outputStream = wrapIncomingMessageWithPassthrough({
-                        incomingMessage: nodeResponse,
-                        passThrough: outputStream,
+                    pipeThrough({
+                        src: nodeResponse,
+                        dest: outputStream,
                         signal,
                         onError: reject,
                     });

package/esm/utils.js

@@ -1,6 +1,4 @@
 import { once } from 'node:events';
-import { PassThrough } from 'node:stream';
-import { pipeline } from 'node:stream/promises';
 function isHeadersInstance(obj) {
     return obj?.forEach != null;
 }
@@ -38,20 +36,39 @@ export function isIterable(value) {
 export function shouldRedirect(status) {
     return status === 301 || status === 302 || status === 303 || status === 307 || status === 308;
 }
-export function wrapIncomingMessageWithPassthrough({ incomingMessage, signal, passThrough = new PassThrough(), onError = (e) => {
-    passThrough.destroy(e);
-}, }) {
-    pipeline(incomingMessage, passThrough, {
-        signal,
-        end: true,
-    })
-        .then(() => {
-        if (!incomingMessage.destroyed) {
-            incomingMessage.resume();
+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) {
+        function handleAbort() {
+            try {
+                signal.throwIfAborted();
+            }
+            catch (abortError) {
+                // destroying the src stream will destroy the dest stream as well
+                src.destroy(abortError);
+            }
         }
-    })
-        .catch(onError);
-    return passThrough;
+        if (signal.aborted) {
+            // if the signal is already aborted, we can just destroy the
+            // src stream and not start pipe at all
+            handleAbort();
+            return;
+        }
+        signal.addEventListener('abort', handleAbort, { once: true });
+    }
+    src.pipe(dest, { end: true /* already default */ });
 }
 export function endStream(stream) {
     // @ts-expect-error Avoid arguments adaptor trampoline https://v8.dev/blog/adaptor-frame

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/node-fetch",
-  "version": "0.7.22-alpha-20250710160716-6df7209d12299dba404ac539d834654be5d43990",
+  "version": "0.7.23-alpha-20250725190806-5df0ede70a22656416fd7a0f626f8d5ba8238197",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "dependencies": {

package/typings/utils.d.cts

@@ -1,5 +1,4 @@
-import { IncomingMessage } from 'node:http';
-import { PassThrough, Readable, Writable } from 'node:stream';
+import { Readable, Writable } from 'node:stream';
 export declare function getHeadersObj(headers: Headers): Record<string, string>;
 export declare function defaultHeadersSerializer(headers: Headers, onContentLength?: (value: string) => void): string[];
 export { fakePromise } from '@whatwg-node/promise-helpers';
@@ -7,12 +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 wrapIncomingMessageWithPassthrough({ incomingMessage, signal, passThrough, onError, }: {
-    incomingMessage: IncomingMessage;
-    passThrough?: PassThrough | undefined;
+export declare function pipeThrough({ src, dest, signal, onError, }: {
+    src: Readable;
+    dest: Writable;
     signal?: AbortSignal | undefined;
-    onError?: (e: Error) => void;
-}): PassThrough;
+    onError?: ((e: Error) => void) | undefined;
+}): void;
 export declare function endStream(stream: {
     end: () => void;
 }): void;

package/typings/utils.d.ts

@@ -1,5 +1,4 @@
-import { IncomingMessage } from 'node:http';
-import { PassThrough, Readable, Writable } from 'node:stream';
+import { Readable, Writable } from 'node:stream';
 export declare function getHeadersObj(headers: Headers): Record<string, string>;
 export declare function defaultHeadersSerializer(headers: Headers, onContentLength?: (value: string) => void): string[];
 export { fakePromise } from '@whatwg-node/promise-helpers';
@@ -7,12 +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 wrapIncomingMessageWithPassthrough({ incomingMessage, signal, passThrough, onError, }: {
-    incomingMessage: IncomingMessage;
-    passThrough?: PassThrough | undefined;
+export declare function pipeThrough({ src, dest, signal, onError, }: {
+    src: Readable;
+    dest: Writable;
     signal?: AbortSignal | undefined;
-    onError?: (e: Error) => void;
-}): PassThrough;
+    onError?: ((e: Error) => void) | undefined;
+}): void;
 export declare function endStream(stream: {
     end: () => void;
 }): void;