@whatwg-node/node-fetch 0.7.22-alpha-20250526145249-5592a2aa5cd5a8603f5016376c1e6ef0f84f7aab → 0.7.22-alpha-20250527001401-318441d4ecce8b4db24c1d2d9a90cfb84928b021

package/cjs/Body.js

@@ -3,8 +3,8 @@ 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 promises_1 = require("node:stream/promises");
 const busboy_1 = require("@fastify/busboy");
 const promise_helpers_1 = require("@whatwg-node/promise-helpers");
 const Blob_js_1 = require("./Blob.js");
@@ -33,7 +33,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;
@@ -133,6 +133,11 @@ class PonyfillBody {
             this._chunks = [];
             return this._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) {
@@ -204,93 +209,57 @@ class PonyfillBody {
             ...this.options.formDataLimits,
             ...opts?.formDataLimits,
         };
-        return new Promise((resolve, reject) => {
-            const stream = this.body?.readable;
-            if (!stream) {
-                return reject(new Error('No stream available'));
+        const stream = this.body?.readable;
+        if (!stream) {
+            return (0, promise_helpers_1.fakeRejectPromise)(new Error('No stream available'));
+        }
+        const bb = new busboy_1.Busboy({
+            headers: {
+                'content-length': typeof this.contentLength === 'number'
+                    ? this.contentLength.toString()
+                    : this.contentLength || '',
+                'content-type': this.contentType || '',
+            },
+            limits: formDataLimits,
+            defCharset: 'utf-8',
+        });
+        bb.on('field', (name, value, fieldnameTruncated, valueTruncated) => {
+            if (fieldnameTruncated) {
+                throw new Error(`Field name size exceeded: ${formDataLimits?.fieldNameSize} bytes`);
             }
-            // form data file that is currently being processed, it's
-            // important to keep track of it in case the stream ends early
-            let currFile = null;
-            const bb = new busboy_1.Busboy({
-                headers: {
-                    'content-length': typeof this.contentLength === 'number'
-                        ? this.contentLength.toString()
-                        : this.contentLength || '',
-                    'content-type': this.contentType || '',
-                },
-                limits: formDataLimits,
-                defCharset: 'utf-8',
-            });
-            if (this._signal) {
-                (0, node_stream_1.addAbortSignal)(this._signal, bb);
+            if (valueTruncated) {
+                throw new Error(`Field value size exceeded: ${formDataLimits?.fieldSize} bytes`);
             }
-            let completed = false;
-            const complete = (err) => {
-                if (completed)
-                    return;
-                completed = true;
-                stream.unpipe(bb);
-                bb.destroy();
-                if (currFile) {
-                    currFile.destroy();
-                    currFile = null;
-                }
-                if (err) {
-                    reject(err);
-                }
-                else {
-                    // no error occured, this is a successful end/complete/finish
-                    resolve(this._formData);
-                }
-            };
-            // we dont need to listen to the stream close event because bb will close or error when necessary
-            // stream.on('close', complete);
-            // stream can be aborted, for example
-            stream.on('error', complete);
-            bb.on('field', (name, value, fieldnameTruncated, valueTruncated) => {
-                if (fieldnameTruncated) {
-                    return complete(new Error(`Field name size exceeded: ${formDataLimits?.fieldNameSize} bytes`));
-                }
-                if (valueTruncated) {
-                    return complete(new Error(`Field value size exceeded: ${formDataLimits?.fieldSize} bytes`));
-                }
-                this._formData.set(name, value);
-            });
-            bb.on('file', (name, fileStream, filename, _transferEncoding, mimeType) => {
-                currFile = fileStream;
-                const chunks = [];
-                fileStream.on('data', chunk => {
-                    chunks.push(chunk);
-                });
-                fileStream.on('error', complete);
-                fileStream.on('limit', () => {
-                    complete(new Error(`File size limit exceeded: ${formDataLimits?.fileSize} bytes`));
-                });
-                fileStream.on('close', () => {
-                    if (fileStream.truncated) {
-                        complete(new Error(`File size limit exceeded: ${formDataLimits?.fileSize} bytes`));
-                    }
-                    currFile = null;
-                    const file = new File_js_1.PonyfillFile(chunks, filename, { type: mimeType });
-                    this._formData.set(name, file);
-                });
-            });
-            bb.on('fieldsLimit', () => {
-                complete(new Error(`Fields limit exceeded: ${formDataLimits?.fields}`));
+            this._formData.set(name, value);
+        });
+        bb.on('file', (name, fileStream, filename, _transferEncoding, mimeType) => {
+            const chunks = [];
+            fileStream.on('data', chunk => {
+                chunks.push(chunk);
             });
-            bb.on('filesLimit', () => {
-                complete(new Error(`Files limit exceeded: ${formDataLimits?.files}`));
+            fileStream.on('limit', () => {
+                throw new Error(`File size limit exceeded: ${formDataLimits?.fileSize} bytes`);
             });
-            bb.on('partsLimit', () => {
-                complete(new Error(`Parts limit exceeded: ${formDataLimits?.parts}`));
+            fileStream.on('close', () => {
+                if (fileStream.truncated) {
+                    throw new Error(`File size limit exceeded: ${formDataLimits?.fileSize} bytes`);
+                }
+                const file = new File_js_1.PonyfillFile(chunks, filename, { type: mimeType });
+                this._formData.set(name, file);
             });
-            bb.on('end', complete);
-            bb.on('finish', complete);
-            bb.on('close', complete);
-            bb.on('error', complete);
-            stream.pipe(bb);
         });
+        bb.on('fieldsLimit', () => {
+            throw new Error(`Fields limit exceeded: ${formDataLimits?.fields}`);
+        });
+        bb.on('filesLimit', () => {
+            throw new Error(`Files limit exceeded: ${formDataLimits?.files}`);
+        });
+        bb.on('partsLimit', () => {
+            throw new Error(`Parts limit exceeded: ${formDataLimits?.parts}`);
+        });
+        return (0, promises_1.pipeline)(stream, bb, {
+            signal: this._signal || undefined,
+        }).then(() => this._formData);
     }
     buffer() {
         if (this._buffer) {
@@ -379,7 +348,7 @@ class PonyfillBody {
     }
 }
 exports.PonyfillBody = PonyfillBody;
-function processBodyInit(bodyInit, signal) {
+function processBodyInit(bodyInit) {
     if (bodyInit == null) {
         return {
             bodyFactory: () => null,
@@ -462,20 +431,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

@@ -95,14 +95,12 @@ function fetchNodeHttp(fetchRequest) {
                         return;
                     }
                 }
-                if (outputStream != null) {
-                    outputStream = (0, utils_js_1.wrapIncomingMessageWithPassthrough)({
-                        incomingMessage: nodeResponse,
-                        passThrough: outputStream,
-                        signal,
-                        onError: reject,
-                    });
-                }
+                outputStream = (0, utils_js_1.wrapIncomingMessageWithPassthrough)({
+                    incomingMessage: nodeResponse,
+                    passThrough: outputStream,
+                    signal,
+                    onError: reject,
+                });
                 const statusCode = nodeResponse.statusCode || 200;
                 let statusText = nodeResponse.statusMessage || node_http_1.STATUS_CODES[statusCode];
                 if (statusText == null) {

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 { Readable } from 'node:stream';
+import { pipeline } from 'node:stream/promises';
 import { Busboy } from '@fastify/busboy';
-import { createDeferredPromise } from '@whatwg-node/promise-helpers';
+import { createDeferredPromise, fakeRejectPromise, } 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 +30,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;
@@ -130,6 +130,11 @@ export class PonyfillBody {
             this._chunks = [];
             return this._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) {
@@ -201,93 +206,57 @@ export class PonyfillBody {
             ...this.options.formDataLimits,
             ...opts?.formDataLimits,
         };
-        return new Promise((resolve, reject) => {
-            const stream = this.body?.readable;
-            if (!stream) {
-                return reject(new Error('No stream available'));
+        const stream = this.body?.readable;
+        if (!stream) {
+            return fakeRejectPromise(new Error('No stream available'));
+        }
+        const bb = new Busboy({
+            headers: {
+                'content-length': typeof this.contentLength === 'number'
+                    ? this.contentLength.toString()
+                    : this.contentLength || '',
+                'content-type': this.contentType || '',
+            },
+            limits: formDataLimits,
+            defCharset: 'utf-8',
+        });
+        bb.on('field', (name, value, fieldnameTruncated, valueTruncated) => {
+            if (fieldnameTruncated) {
+                throw new Error(`Field name size exceeded: ${formDataLimits?.fieldNameSize} bytes`);
             }
-            // form data file that is currently being processed, it's
-            // important to keep track of it in case the stream ends early
-            let currFile = null;
-            const bb = new Busboy({
-                headers: {
-                    'content-length': typeof this.contentLength === 'number'
-                        ? this.contentLength.toString()
-                        : this.contentLength || '',
-                    'content-type': this.contentType || '',
-                },
-                limits: formDataLimits,
-                defCharset: 'utf-8',
-            });
-            if (this._signal) {
-                addAbortSignal(this._signal, bb);
+            if (valueTruncated) {
+                throw new Error(`Field value size exceeded: ${formDataLimits?.fieldSize} bytes`);
             }
-            let completed = false;
-            const complete = (err) => {
-                if (completed)
-                    return;
-                completed = true;
-                stream.unpipe(bb);
-                bb.destroy();
-                if (currFile) {
-                    currFile.destroy();
-                    currFile = null;
-                }
-                if (err) {
-                    reject(err);
-                }
-                else {
-                    // no error occured, this is a successful end/complete/finish
-                    resolve(this._formData);
-                }
-            };
-            // we dont need to listen to the stream close event because bb will close or error when necessary
-            // stream.on('close', complete);
-            // stream can be aborted, for example
-            stream.on('error', complete);
-            bb.on('field', (name, value, fieldnameTruncated, valueTruncated) => {
-                if (fieldnameTruncated) {
-                    return complete(new Error(`Field name size exceeded: ${formDataLimits?.fieldNameSize} bytes`));
-                }
-                if (valueTruncated) {
-                    return complete(new Error(`Field value size exceeded: ${formDataLimits?.fieldSize} bytes`));
-                }
-                this._formData.set(name, value);
-            });
-            bb.on('file', (name, fileStream, filename, _transferEncoding, mimeType) => {
-                currFile = fileStream;
-                const chunks = [];
-                fileStream.on('data', chunk => {
-                    chunks.push(chunk);
-                });
-                fileStream.on('error', complete);
-                fileStream.on('limit', () => {
-                    complete(new Error(`File size limit exceeded: ${formDataLimits?.fileSize} bytes`));
-                });
-                fileStream.on('close', () => {
-                    if (fileStream.truncated) {
-                        complete(new Error(`File size limit exceeded: ${formDataLimits?.fileSize} bytes`));
-                    }
-                    currFile = null;
-                    const file = new PonyfillFile(chunks, filename, { type: mimeType });
-                    this._formData.set(name, file);
-                });
-            });
-            bb.on('fieldsLimit', () => {
-                complete(new Error(`Fields limit exceeded: ${formDataLimits?.fields}`));
+            this._formData.set(name, value);
+        });
+        bb.on('file', (name, fileStream, filename, _transferEncoding, mimeType) => {
+            const chunks = [];
+            fileStream.on('data', chunk => {
+                chunks.push(chunk);
             });
-            bb.on('filesLimit', () => {
-                complete(new Error(`Files limit exceeded: ${formDataLimits?.files}`));
+            fileStream.on('limit', () => {
+                throw new Error(`File size limit exceeded: ${formDataLimits?.fileSize} bytes`);
             });
-            bb.on('partsLimit', () => {
-                complete(new Error(`Parts limit exceeded: ${formDataLimits?.parts}`));
+            fileStream.on('close', () => {
+                if (fileStream.truncated) {
+                    throw new Error(`File size limit exceeded: ${formDataLimits?.fileSize} bytes`);
+                }
+                const file = new PonyfillFile(chunks, filename, { type: mimeType });
+                this._formData.set(name, file);
             });
-            bb.on('end', complete);
-            bb.on('finish', complete);
-            bb.on('close', complete);
-            bb.on('error', complete);
-            stream.pipe(bb);
         });
+        bb.on('fieldsLimit', () => {
+            throw new Error(`Fields limit exceeded: ${formDataLimits?.fields}`);
+        });
+        bb.on('filesLimit', () => {
+            throw new Error(`Files limit exceeded: ${formDataLimits?.files}`);
+        });
+        bb.on('partsLimit', () => {
+            throw new Error(`Parts limit exceeded: ${formDataLimits?.parts}`);
+        });
+        return pipeline(stream, bb, {
+            signal: this._signal || undefined,
+        }).then(() => this._formData);
     }
     buffer() {
         if (this._buffer) {
@@ -375,7 +344,7 @@ export class PonyfillBody {
         });
     }
 }
-function processBodyInit(bodyInit, signal) {
+function processBodyInit(bodyInit) {
     if (bodyInit == null) {
         return {
             bodyFactory: () => null,
@@ -458,20 +427,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

@@ -92,14 +92,12 @@ export function fetchNodeHttp(fetchRequest) {
                         return;
                     }
                 }
-                if (outputStream != null) {
-                    outputStream = wrapIncomingMessageWithPassthrough({
-                        incomingMessage: nodeResponse,
-                        passThrough: outputStream,
-                        signal,
-                        onError: reject,
-                    });
-                }
+                outputStream = wrapIncomingMessageWithPassthrough({
+                    incomingMessage: nodeResponse,
+                    passThrough: outputStream,
+                    signal,
+                    onError: reject,
+                });
                 const statusCode = nodeResponse.statusCode || 200;
                 let statusText = nodeResponse.statusMessage || STATUS_CODES[statusCode];
                 if (statusText == null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/node-fetch",
-  "version": "0.7.22-alpha-20250526145249-5592a2aa5cd5a8603f5016376c1e6ef0f84f7aab",
+  "version": "0.7.22-alpha-20250527001401-318441d4ecce8b4db24c1d2d9a90cfb84928b021",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "dependencies": {