@whatwg-node/node-fetch 0.7.15-alpha-20250323023432-5c31277f5c8544821b18ae941f15b1014132c37f → 0.7.15-alpha-20250324114328-290d8363ab5adbcacb8cd300791dcd5694b9669d

package/cjs/Body.js

@@ -6,6 +6,7 @@ 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");
@@ -105,10 +106,7 @@ class PonyfillBody {
         return null;
     }
     _chunks = null;
-    _collectChunksFromReadable() {
-        if (this._chunks) {
-            return (0, utils_js_1.fakePromise)(this._chunks);
-        }
+    _doCollectChunksFromReadableJob() {
         if (this.bodyType === BodyInitType.AsyncIterable) {
             if (Array.fromAsync) {
                 return (0, promise_helpers_1.handleMaybePromise)(() => Array.fromAsync(this.bodyInit), chunks => {
@@ -117,31 +115,43 @@ class PonyfillBody {
                 });
             }
             const iterator = this.bodyInit[Symbol.asyncIterator]();
+            const chunks = [];
             const collectValue = () => (0, promise_helpers_1.handleMaybePromise)(() => iterator.next(), ({ value, done }) => {
-                this._chunks ||= [];
                 if (value) {
-                    this._chunks.push(value);
+                    chunks.push(value);
                 }
                 if (!done) {
                     return collectValue();
                 }
+                this._chunks = chunks;
                 return this._chunks;
             });
             return collectValue();
         }
         const _body = this.generateBody();
-        this._chunks = [];
         if (!_body) {
+            this._chunks = [];
             return (0, utils_js_1.fakePromise)(this._chunks);
         }
+        const chunks = [];
         _body.readable.on('data', chunk => {
-            this._chunks.push(chunk);
+            chunks.push(chunk);
         });
         return new Promise((resolve, reject) => {
-            _body.readable.once('end', () => resolve(this._chunks));
+            _body.readable.once('end', () => {
+                this._chunks = chunks;
+                resolve(this._chunks);
+            });
             _body.readable.once('error', reject);
         });
     }
+    _collectChunksFromReadable() {
+        if (this._chunks) {
+            return (0, utils_js_1.fakePromise)(this._chunks);
+        }
+        this._chunks ||= this._doCollectChunksFromReadableJob();
+        return this._chunks;
+    }
     _blob = null;
     blob() {
         if (this._blob) {
@@ -397,11 +407,24 @@ function processBodyInit(bodyInit, signal) {
         };
     }
     if (bodyInit instanceof node_http_1.IncomingMessage) {
-        const passthrough = (bodyInit = bodyInit.pipe(new node_stream_1.PassThrough(), {
-            end: true,
-            // @ts-expect-error - `signal` is not in the type definition
+        const originalStream = bodyInit;
+        const passthrough = (bodyInit = bodyInit.pipe(new node_stream_1.PassThrough({
             signal,
+        }), {
+            end: true,
         }));
+        (0, promises_1.pipeline)(originalStream, passthrough, {
+            end: true,
+            signal,
+        })
+            .then(() => {
+            if (!originalStream.destroyed) {
+                originalStream.resume();
+            }
+        })
+            .catch(e => {
+            passthrough.destroy(e);
+        });
         return {
             bodyType: BodyInitType.Readable,
             contentType: null,

package/cjs/fetchCurl.js

@@ -102,7 +102,9 @@ function fetchCurl(fetchRequest) {
         }
     });
     curlHandle.once('stream', function streamListener(stream, status, headersBuf) {
-        const outputStream = new node_stream_1.PassThrough();
+        const outputStream = new node_stream_1.PassThrough({
+            signal: fetchRequest.signal,
+        });
         (0, promises_1.pipeline)(stream, outputStream, {
             end: true,
             signal: fetchRequest.signal,

package/esm/Body.js

@@ -2,6 +2,7 @@
 import { Buffer } from 'node:buffer';
 import { IncomingMessage } from 'node:http';
 import { PassThrough, Readable } from 'node:stream';
+import { pipeline } from 'node:stream/promises';
 import busboy from 'busboy';
 import { handleMaybePromise } from '@whatwg-node/promise-helpers';
 import { hasArrayBufferMethod, hasBufferMethod, hasBytesMethod, PonyfillBlob } from './Blob.js';
@@ -101,10 +102,7 @@ export class PonyfillBody {
         return null;
     }
     _chunks = null;
-    _collectChunksFromReadable() {
-        if (this._chunks) {
-            return fakePromise(this._chunks);
-        }
+    _doCollectChunksFromReadableJob() {
         if (this.bodyType === BodyInitType.AsyncIterable) {
             if (Array.fromAsync) {
                 return handleMaybePromise(() => Array.fromAsync(this.bodyInit), chunks => {
@@ -113,31 +111,43 @@ export class PonyfillBody {
                 });
             }
             const iterator = this.bodyInit[Symbol.asyncIterator]();
+            const chunks = [];
             const collectValue = () => handleMaybePromise(() => iterator.next(), ({ value, done }) => {
-                this._chunks ||= [];
                 if (value) {
-                    this._chunks.push(value);
+                    chunks.push(value);
                 }
                 if (!done) {
                     return collectValue();
                 }
+                this._chunks = chunks;
                 return this._chunks;
             });
             return collectValue();
         }
         const _body = this.generateBody();
-        this._chunks = [];
         if (!_body) {
+            this._chunks = [];
             return fakePromise(this._chunks);
         }
+        const chunks = [];
         _body.readable.on('data', chunk => {
-            this._chunks.push(chunk);
+            chunks.push(chunk);
         });
         return new Promise((resolve, reject) => {
-            _body.readable.once('end', () => resolve(this._chunks));
+            _body.readable.once('end', () => {
+                this._chunks = chunks;
+                resolve(this._chunks);
+            });
             _body.readable.once('error', reject);
         });
     }
+    _collectChunksFromReadable() {
+        if (this._chunks) {
+            return fakePromise(this._chunks);
+        }
+        this._chunks ||= this._doCollectChunksFromReadableJob();
+        return this._chunks;
+    }
     _blob = null;
     blob() {
         if (this._blob) {
@@ -392,11 +402,24 @@ function processBodyInit(bodyInit, signal) {
         };
     }
     if (bodyInit instanceof IncomingMessage) {
-        const passthrough = (bodyInit = bodyInit.pipe(new PassThrough(), {
-            end: true,
-            // @ts-expect-error - `signal` is not in the type definition
+        const originalStream = bodyInit;
+        const passthrough = (bodyInit = bodyInit.pipe(new PassThrough({
             signal,
+        }), {
+            end: true,
         }));
+        pipeline(originalStream, passthrough, {
+            end: true,
+            signal,
+        })
+            .then(() => {
+            if (!originalStream.destroyed) {
+                originalStream.resume();
+            }
+        })
+            .catch(e => {
+            passthrough.destroy(e);
+        });
         return {
             bodyType: BodyInitType.Readable,
             contentType: null,

package/esm/fetchCurl.js

@@ -99,7 +99,9 @@ export function fetchCurl(fetchRequest) {
         }
     });
     curlHandle.once('stream', function streamListener(stream, status, headersBuf) {
-        const outputStream = new PassThrough();
+        const outputStream = new PassThrough({
+            signal: fetchRequest.signal,
+        });
         pipeline(stream, outputStream, {
             end: true,
             signal: fetchRequest.signal,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/node-fetch",
-  "version": "0.7.15-alpha-20250323023432-5c31277f5c8544821b18ae941f15b1014132c37f",
+  "version": "0.7.15-alpha-20250324114328-290d8363ab5adbcacb8cd300791dcd5694b9669d",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "dependencies": {

package/typings/Body.d.cts

@@ -34,7 +34,8 @@ export declare class PonyfillBody<TJSON = any> implements Body {
         headers: Headers;
     }, forceSet?: boolean): void;
     get body(): PonyfillReadableStream<Uint8Array> | null;
-    _chunks: Uint8Array[] | null;
+    _chunks: MaybePromise<Uint8Array[]> | null;
+    _doCollectChunksFromReadableJob(): MaybePromise<Uint8Array<ArrayBufferLike>[]>;
     _collectChunksFromReadable(): MaybePromise<Uint8Array<ArrayBufferLike>[]>;
     _blob: PonyfillBlob | null;
     blob(): Promise<PonyfillBlob>;

package/typings/Body.d.ts

@@ -34,7 +34,8 @@ export declare class PonyfillBody<TJSON = any> implements Body {
         headers: Headers;
     }, forceSet?: boolean): void;
     get body(): PonyfillReadableStream<Uint8Array> | null;
-    _chunks: Uint8Array[] | null;
+    _chunks: MaybePromise<Uint8Array[]> | null;
+    _doCollectChunksFromReadableJob(): MaybePromise<Uint8Array<ArrayBufferLike>[]>;
     _collectChunksFromReadable(): MaybePromise<Uint8Array<ArrayBufferLike>[]>;
     _blob: PonyfillBlob | null;
     blob(): Promise<PonyfillBlob>;