@whatwg-node/node-fetch 0.7.17-alpha-20250325145529-58232171d1f56e9f26b72ecd5acfffe6680802dc → 0.7.17-alpha-20250325150348-7623243e301deb614f405fb2c602a77956d868a8

package/cjs/Body.js

@@ -6,7 +6,6 @@ const tslib_1 = require("tslib");
 const node_buffer_1 = require("node:buffer");
 const node_http_1 = require("node:http");
 const node_stream_1 = require("node:stream");
-const promises_1 = require("node:stream/promises");
 const busboy_1 = tslib_1.__importDefault(require("busboy"));
 const promise_helpers_1 = require("@whatwg-node/promise-helpers");
 const Blob_js_1 = require("./Blob.js");
@@ -402,12 +401,9 @@ function processBodyInit(bodyInit, signal) {
         };
     }
     if (bodyInit instanceof node_http_1.IncomingMessage) {
-        const passThrough = new node_stream_1.PassThrough();
-        (0, promises_1.pipeline)(bodyInit, passThrough, {
+        const passThrough = (0, utils_js_1.wrapIncomingMessageWithPassthrough)({
+            incomingMessage: bodyInit,
             signal,
-            end: true,
-        }).catch(e => {
-            passThrough.destroy(e);
         });
         return {
             bodyType: BodyInitType.Readable,

package/cjs/fetchCurl.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchCurl = fetchCurl;
 const node_stream_1 = require("node:stream");
-const promises_1 = require("node:stream/promises");
 const node_tls_1 = require("node:tls");
 const promise_helpers_1 = require("@whatwg-node/promise-helpers");
 const Response_js_1 = require("./Response.js");
@@ -102,17 +101,11 @@ function fetchCurl(fetchRequest) {
         }
     });
     curlHandle.once('stream', function streamListener(stream, status, headersBuf) {
-        const outputStream = new node_stream_1.PassThrough();
-        (0, promises_1.pipeline)(stream, outputStream, {
-            end: true,
+        const outputStream = (0, utils_js_1.wrapIncomingMessageWithPassthrough)({
+            incomingMessage: stream,
             signal: fetchRequest.signal,
-        })
-            .then(() => {
-            if (!stream.destroyed) {
-                stream.resume();
-            }
-        })
-            .catch(deferredPromise.reject);
+            onError: deferredPromise.reject,
+        });
         const headersFlat = headersBuf
             .toString('utf8')
             .split(/\r?\n|\r/g)

package/cjs/fetchNodeHttp.js

@@ -4,7 +4,6 @@ exports.fetchNodeHttp = fetchNodeHttp;
 const node_http_1 = require("node:http");
 const node_https_1 = require("node:https");
 const node_stream_1 = require("node:stream");
-const promises_1 = require("node:stream/promises");
 const node_zlib_1 = require("node:zlib");
 const Request_js_1 = require("./Request.js");
 const Response_js_1 = require("./Response.js");
@@ -85,16 +84,12 @@ function fetchNodeHttp(fetchRequest) {
                     }
                 }
                 if (outputStream != null) {
-                    (0, promises_1.pipeline)(nodeResponse, outputStream, {
+                    outputStream = (0, utils_js_1.wrapIncomingMessageWithPassthrough)({
+                        incomingMessage: nodeResponse,
+                        passThrough: outputStream,
                         signal: fetchRequest.signal,
-                        end: true,
-                    })
-                        .then(() => {
-                        if (!nodeResponse.destroyed) {
-                            nodeResponse.resume();
-                        }
-                    })
-                        .catch(reject);
+                        onError: reject,
+                    });
                 }
                 const statusCode = nodeResponse.statusCode || 200;
                 let statusText = nodeResponse.statusMessage || node_http_1.STATUS_CODES[statusCode];

package/cjs/utils.js

@@ -7,6 +7,9 @@ exports.isArrayBufferView = isArrayBufferView;
 exports.isNodeReadable = isNodeReadable;
 exports.isIterable = isIterable;
 exports.shouldRedirect = shouldRedirect;
+exports.wrapIncomingMessageWithPassthrough = wrapIncomingMessageWithPassthrough;
+const node_stream_1 = require("node:stream");
+const promises_1 = require("node:stream/promises");
 function isHeadersInstance(obj) {
     return obj?.forEach != null;
 }
@@ -40,3 +43,18 @@ 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();
+        }
+    })
+        .catch(onError);
+    return passThrough;
+}

package/esm/Body.js

@@ -1,15 +1,14 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 import { Buffer } from 'node:buffer';
 import { IncomingMessage } from 'node:http';
-import { PassThrough, Readable } from 'node:stream';
-import { pipeline } from 'node:stream/promises';
+import { Readable } from 'node:stream';
 import busboy from '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 } from './utils.js';
+import { fakePromise, isArrayBufferView, wrapIncomingMessageWithPassthrough } from './utils.js';
 var BodyInitType;
 (function (BodyInitType) {
     BodyInitType["ReadableStream"] = "ReadableStream";
@@ -397,12 +396,9 @@ function processBodyInit(bodyInit, signal) {
         };
     }
     if (bodyInit instanceof IncomingMessage) {
-        const passThrough = new PassThrough();
-        pipeline(bodyInit, passThrough, {
+        const passThrough = wrapIncomingMessageWithPassthrough({
+            incomingMessage: bodyInit,
             signal,
-            end: true,
-        }).catch(e => {
-            passThrough.destroy(e);
         });
         return {
             bodyType: BodyInitType.Readable,

package/esm/fetchCurl.js

@@ -1,9 +1,8 @@
-import { PassThrough, Readable } from 'node:stream';
-import { pipeline } from 'node:stream/promises';
+import { 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, shouldRedirect, wrapIncomingMessageWithPassthrough, } from './utils.js';
 export function fetchCurl(fetchRequest) {
     const { Curl, CurlFeature, CurlPause, CurlProgressFunc } = globalThis['libcurl'];
     const curlHandle = new Curl();
@@ -99,17 +98,11 @@ export function fetchCurl(fetchRequest) {
         }
     });
     curlHandle.once('stream', function streamListener(stream, status, headersBuf) {
-        const outputStream = new PassThrough();
-        pipeline(stream, outputStream, {
-            end: true,
+        const outputStream = wrapIncomingMessageWithPassthrough({
+            incomingMessage: stream,
             signal: fetchRequest.signal,
-        })
-            .then(() => {
-            if (!stream.destroyed) {
-                stream.resume();
-            }
-        })
-            .catch(deferredPromise.reject);
+            onError: deferredPromise.reject,
+        });
         const headersFlat = headersBuf
             .toString('utf8')
             .split(/\r?\n|\r/g)

package/esm/fetchNodeHttp.js

@@ -1,12 +1,11 @@
 import { request as httpRequest, STATUS_CODES } from 'node:http';
 import { request as httpsRequest } from 'node:https';
 import { Readable } from 'node:stream';
-import { pipeline } from 'node:stream/promises';
 import { createBrotliDecompress, createGunzip, createInflate, createInflateRaw } from 'node:zlib';
 import { PonyfillRequest } from './Request.js';
 import { PonyfillResponse } from './Response.js';
 import { PonyfillURL } from './URL.js';
-import { getHeadersObj, isNodeReadable, shouldRedirect } from './utils.js';
+import { getHeadersObj, isNodeReadable, shouldRedirect, wrapIncomingMessageWithPassthrough, } from './utils.js';
 function getRequestFnForProtocol(url) {
     if (url.startsWith('http:')) {
         return httpRequest;
@@ -82,16 +81,12 @@ export function fetchNodeHttp(fetchRequest) {
                     }
                 }
                 if (outputStream != null) {
-                    pipeline(nodeResponse, outputStream, {
+                    outputStream = wrapIncomingMessageWithPassthrough({
+                        incomingMessage: nodeResponse,
+                        passThrough: outputStream,
                         signal: fetchRequest.signal,
-                        end: true,
-                    })
-                        .then(() => {
-                        if (!nodeResponse.destroyed) {
-                            nodeResponse.resume();
-                        }
-                    })
-                        .catch(reject);
+                        onError: reject,
+                    });
                 }
                 const statusCode = nodeResponse.statusCode || 200;
                 let statusText = nodeResponse.statusMessage || STATUS_CODES[statusCode];

package/esm/utils.js

@@ -1,3 +1,5 @@
+import { PassThrough } from 'node:stream';
+import { pipeline } from 'node:stream/promises';
 function isHeadersInstance(obj) {
     return obj?.forEach != null;
 }
@@ -30,3 +32,18 @@ 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();
+        }
+    })
+        .catch(onError);
+    return passThrough;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/node-fetch",
-  "version": "0.7.17-alpha-20250325145529-58232171d1f56e9f26b72ecd5acfffe6680802dc",
+  "version": "0.7.17-alpha-20250325150348-7623243e301deb614f405fb2c602a77956d868a8",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "dependencies": {

package/typings/utils.d.cts

@@ -1,4 +1,5 @@
-import { Readable } from 'node:stream';
+import { IncomingMessage } from 'node:http';
+import { PassThrough, Readable } 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';
@@ -6,3 +7,9 @@ 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;
+    signal?: AbortSignal | undefined;
+    onError?: (e: Error) => void;
+}): PassThrough;

package/typings/utils.d.ts

@@ -1,4 +1,5 @@
-import { Readable } from 'node:stream';
+import { IncomingMessage } from 'node:http';
+import { PassThrough, Readable } 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';
@@ -6,3 +7,9 @@ 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;
+    signal?: AbortSignal | undefined;
+    onError?: (e: Error) => void;
+}): PassThrough;