@whatwg-node/node-fetch 0.7.21 → 0.7.22-alpha-20250526163200-dc90c3024c7fa99ad5eb4e46eeee8988f7e003df

package/cjs/Body.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PonyfillBody = void 0;
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 const node_buffer_1 = require("node:buffer");
-const node_http_1 = require("node:http");
 const node_stream_1 = require("node:stream");
 const busboy_1 = require("@fastify/busboy");
 const promise_helpers_1 = require("@whatwg-node/promise-helpers");
@@ -33,7 +32,7 @@ class PonyfillBody {
         this.bodyInit = bodyInit;
         this.options = options;
         this._signal = options.signal || null;
-        const { bodyFactory, contentType, contentLength, bodyType, buffer } = processBodyInit(bodyInit, options?.signal);
+        const { bodyFactory, contentType, contentLength, bodyType, buffer } = processBodyInit(bodyInit);
         this._bodyFactory = bodyFactory;
         this.contentType = contentType;
         this.contentLength = contentLength;
@@ -109,14 +108,14 @@ class PonyfillBody {
     _doCollectChunksFromReadableJob() {
         if (this.bodyType === BodyInitType.AsyncIterable) {
             if (Array.fromAsync) {
-                return (0, promise_helpers_1.handleMaybePromise)(() => Array.fromAsync(this.bodyInit), chunks => {
+                return Array.fromAsync(this.bodyInit).then(chunks => {
                     this._chunks = chunks;
                     return this._chunks;
                 });
             }
             const iterator = this.bodyInit[Symbol.asyncIterator]();
             const chunks = [];
-            const collectValue = () => (0, promise_helpers_1.handleMaybePromise)(() => iterator.next(), ({ value, done }) => {
+            const collectValue = () => iterator.next().then(({ value, done }) => {
                 if (value) {
                     chunks.push(value);
                 }
@@ -131,17 +130,30 @@ class PonyfillBody {
         const _body = this.generateBody();
         if (!_body) {
             this._chunks = [];
-            return (0, utils_js_1.fakePromise)(this._chunks);
+            return this._chunks;
         }
-        return _body.readable.toArray().then(chunks => {
-            this._chunks = chunks;
+        if (_body.readable.destroyed) {
+            // If the stream is already destroyed, we can resolve immediately
+            this._chunks = [];
             return this._chunks;
+        }
+        const chunks = [];
+        const deferred = (0, promise_helpers_1.createDeferredPromise)();
+        _body.readable.on('data', function nextChunk(chunk) {
+            chunks.push(chunk);
+        });
+        // eslint-disable-next-line @typescript-eslint/no-this-alias
+        const _this = this;
+        _body.readable.once('end', function endOfStream() {
+            _this._chunks = chunks;
+            deferred.resolve(chunks);
+        });
+        _body.readable.once('error', function errorOnStream(err) {
+            deferred.reject(err);
         });
+        return deferred.promise;
     }
     _collectChunksFromReadable() {
-        if (this._chunks) {
-            return (0, utils_js_1.fakePromise)(this._chunks);
-        }
         this._chunks ||= this._doCollectChunksFromReadableJob();
         return this._chunks;
     }
@@ -168,13 +180,15 @@ class PonyfillBody {
             });
             return (0, utils_js_1.fakePromise)(this._blob);
         }
-        return (0, utils_js_1.fakePromise)((0, promise_helpers_1.handleMaybePromise)(() => this._collectChunksFromReadable(), chunks => {
+        return (0, utils_js_1.fakePromise)()
+            .then(() => this._collectChunksFromReadable())
+            .then(chunks => {
             this._blob = new Blob_js_1.PonyfillBlob(chunks, {
                 type: this.contentType || '',
                 size: this.contentLength,
             });
             return this._blob;
-        }));
+        });
     }
     _formData = null;
     formData(opts) {
@@ -317,14 +331,16 @@ class PonyfillBody {
                 });
             }
         }
-        return (0, utils_js_1.fakePromise)((0, promise_helpers_1.handleMaybePromise)(() => this._collectChunksFromReadable(), chunks => {
+        return (0, utils_js_1.fakePromise)()
+            .then(() => this._collectChunksFromReadable())
+            .then(chunks => {
             if (chunks.length === 1) {
                 this._buffer = chunks[0];
                 return this._buffer;
             }
             this._buffer = node_buffer_1.Buffer.concat(chunks);
             return this._buffer;
-        }));
+        });
     }
     bytes() {
         return this.buffer();
@@ -367,7 +383,7 @@ class PonyfillBody {
     }
 }
 exports.PonyfillBody = PonyfillBody;
-function processBodyInit(bodyInit, signal) {
+function processBodyInit(bodyInit) {
     if (bodyInit == null) {
         return {
             bodyFactory: () => null,
@@ -450,20 +466,6 @@ function processBodyInit(bodyInit, signal) {
             },
         };
     }
-    if (bodyInit instanceof node_http_1.IncomingMessage) {
-        const passThrough = (0, utils_js_1.wrapIncomingMessageWithPassthrough)({
-            incomingMessage: bodyInit,
-            signal,
-        });
-        return {
-            bodyType: BodyInitType.Readable,
-            contentType: null,
-            contentLength: null,
-            bodyFactory() {
-                return new ReadableStream_js_1.PonyfillReadableStream(passThrough);
-            },
-        };
-    }
     if (bodyInit instanceof node_stream_1.Readable) {
         return {
             bodyType: BodyInitType.Readable,

package/cjs/fetchNodeHttp.js

@@ -118,7 +118,7 @@ function fetchNodeHttp(fetchRequest) {
                 resolve(ponyfillResponse);
             });
             if (fetchRequest['_buffer'] != null) {
-                (0, promise_helpers_1.handleMaybePromise)(() => (0, utils_js_1.safeWrite)(fetchRequest['_buffer'], nodeRequest, signal), () => (0, utils_js_1.endStream)(nodeRequest), reject);
+                (0, promise_helpers_1.handleMaybePromise)(() => (0, utils_js_1.safeWrite)(fetchRequest['_buffer'], nodeRequest), () => (0, utils_js_1.endStream)(nodeRequest), reject);
             }
             else {
                 const nodeReadable = (fetchRequest.body != null

package/cjs/utils.js

@@ -70,11 +70,9 @@ 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, signal) {
+function safeWrite(chunk, stream) {
     const result = stream.write(chunk);
     if (!result) {
-        return (0, node_events_1.once)(stream, 'drain', {
-            signal,
-        });
+        return (0, node_events_1.once)(stream, 'drain');
     }
 }

package/esm/Body.js

@@ -1,14 +1,13 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 import { Buffer } from 'node:buffer';
-import { IncomingMessage } from 'node:http';
 import { addAbortSignal, Readable } from 'node:stream';
 import { Busboy } from '@fastify/busboy';
-import { handleMaybePromise } from '@whatwg-node/promise-helpers';
+import { createDeferredPromise } 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 } from './utils.js';
 var BodyInitType;
 (function (BodyInitType) {
     BodyInitType["ReadableStream"] = "ReadableStream";
@@ -30,7 +29,7 @@ export class PonyfillBody {
         this.bodyInit = bodyInit;
         this.options = options;
         this._signal = options.signal || null;
-        const { bodyFactory, contentType, contentLength, bodyType, buffer } = processBodyInit(bodyInit, options?.signal);
+        const { bodyFactory, contentType, contentLength, bodyType, buffer } = processBodyInit(bodyInit);
         this._bodyFactory = bodyFactory;
         this.contentType = contentType;
         this.contentLength = contentLength;
@@ -106,14 +105,14 @@ export class PonyfillBody {
     _doCollectChunksFromReadableJob() {
         if (this.bodyType === BodyInitType.AsyncIterable) {
             if (Array.fromAsync) {
-                return handleMaybePromise(() => Array.fromAsync(this.bodyInit), chunks => {
+                return Array.fromAsync(this.bodyInit).then(chunks => {
                     this._chunks = chunks;
                     return this._chunks;
                 });
             }
             const iterator = this.bodyInit[Symbol.asyncIterator]();
             const chunks = [];
-            const collectValue = () => handleMaybePromise(() => iterator.next(), ({ value, done }) => {
+            const collectValue = () => iterator.next().then(({ value, done }) => {
                 if (value) {
                     chunks.push(value);
                 }
@@ -128,17 +127,30 @@ export class PonyfillBody {
         const _body = this.generateBody();
         if (!_body) {
             this._chunks = [];
-            return fakePromise(this._chunks);
+            return this._chunks;
         }
-        return _body.readable.toArray().then(chunks => {
-            this._chunks = chunks;
+        if (_body.readable.destroyed) {
+            // If the stream is already destroyed, we can resolve immediately
+            this._chunks = [];
             return this._chunks;
+        }
+        const chunks = [];
+        const deferred = createDeferredPromise();
+        _body.readable.on('data', function nextChunk(chunk) {
+            chunks.push(chunk);
+        });
+        // eslint-disable-next-line @typescript-eslint/no-this-alias
+        const _this = this;
+        _body.readable.once('end', function endOfStream() {
+            _this._chunks = chunks;
+            deferred.resolve(chunks);
+        });
+        _body.readable.once('error', function errorOnStream(err) {
+            deferred.reject(err);
         });
+        return deferred.promise;
     }
     _collectChunksFromReadable() {
-        if (this._chunks) {
-            return fakePromise(this._chunks);
-        }
         this._chunks ||= this._doCollectChunksFromReadableJob();
         return this._chunks;
     }
@@ -165,13 +177,15 @@ export class PonyfillBody {
             });
             return fakePromise(this._blob);
         }
-        return fakePromise(handleMaybePromise(() => this._collectChunksFromReadable(), chunks => {
+        return fakePromise()
+            .then(() => this._collectChunksFromReadable())
+            .then(chunks => {
             this._blob = new PonyfillBlob(chunks, {
                 type: this.contentType || '',
                 size: this.contentLength,
             });
             return this._blob;
-        }));
+        });
     }
     _formData = null;
     formData(opts) {
@@ -314,14 +328,16 @@ export class PonyfillBody {
                 });
             }
         }
-        return fakePromise(handleMaybePromise(() => this._collectChunksFromReadable(), chunks => {
+        return fakePromise()
+            .then(() => this._collectChunksFromReadable())
+            .then(chunks => {
             if (chunks.length === 1) {
                 this._buffer = chunks[0];
                 return this._buffer;
             }
             this._buffer = Buffer.concat(chunks);
             return this._buffer;
-        }));
+        });
     }
     bytes() {
         return this.buffer();
@@ -363,7 +379,7 @@ export class PonyfillBody {
         });
     }
 }
-function processBodyInit(bodyInit, signal) {
+function processBodyInit(bodyInit) {
     if (bodyInit == null) {
         return {
             bodyFactory: () => null,
@@ -446,20 +462,6 @@ function processBodyInit(bodyInit, signal) {
             },
         };
     }
-    if (bodyInit instanceof IncomingMessage) {
-        const passThrough = wrapIncomingMessageWithPassthrough({
-            incomingMessage: bodyInit,
-            signal,
-        });
-        return {
-            bodyType: BodyInitType.Readable,
-            contentType: null,
-            contentLength: null,
-            bodyFactory() {
-                return new PonyfillReadableStream(passThrough);
-            },
-        };
-    }
     if (bodyInit instanceof Readable) {
         return {
             bodyType: BodyInitType.Readable,

package/esm/fetchNodeHttp.js

@@ -115,7 +115,7 @@ export function fetchNodeHttp(fetchRequest) {
                 resolve(ponyfillResponse);
             });
             if (fetchRequest['_buffer'] != null) {
-                handleMaybePromise(() => safeWrite(fetchRequest['_buffer'], nodeRequest, signal), () => endStream(nodeRequest), reject);
+                handleMaybePromise(() => safeWrite(fetchRequest['_buffer'], nodeRequest), () => endStream(nodeRequest), reject);
             }
             else {
                 const nodeReadable = (fetchRequest.body != null

package/esm/utils.js

@@ -57,11 +57,9 @@ export function endStream(stream) {
     // @ts-expect-error Avoid arguments adaptor trampoline https://v8.dev/blog/adaptor-frame
     return stream.end(null, null, null);
 }
-export function safeWrite(chunk, stream, signal) {
+export function safeWrite(chunk, stream) {
     const result = stream.write(chunk);
     if (!result) {
-        return once(stream, 'drain', {
-            signal,
-        });
+        return once(stream, 'drain');
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/node-fetch",
-  "version": "0.7.21",
+  "version": "0.7.22-alpha-20250526163200-dc90c3024c7fa99ad5eb4e46eeee8988f7e003df",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "dependencies": {

package/typings/utils.d.cts

@@ -16,4 +16,4 @@ export declare function wrapIncomingMessageWithPassthrough({ incomingMessage, si
 export declare function endStream(stream: {
     end: () => void;
 }): void;
-export declare function safeWrite(chunk: any, stream: Writable, signal?: AbortSignal | undefined): Promise<any> | undefined;
+export declare function safeWrite(chunk: any, stream: Writable): Promise<any[]> | undefined;

package/typings/utils.d.ts

@@ -16,4 +16,4 @@ export declare function wrapIncomingMessageWithPassthrough({ incomingMessage, si
 export declare function endStream(stream: {
     end: () => void;
 }): void;
-export declare function safeWrite(chunk: any, stream: Writable, signal?: AbortSignal | undefined): Promise<any> | undefined;
+export declare function safeWrite(chunk: any, stream: Writable): Promise<any[]> | undefined;