@whatwg-node/node-fetch 0.7.17 → 0.7.18-alpha-20250414141945-85ba4bb116008ce30707b20368f44d791a52afaa

package/cjs/Body.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PonyfillBody = void 0;
-const tslib_1 = require("tslib");
 /* 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 = tslib_1.__importDefault(require("busboy"));
+const busboy_1 = require("@fastify/busboy");
 const promise_helpers_1 = require("@whatwg-node/promise-helpers");
 const Blob_js_1 = require("./Blob.js");
 const File_js_1 = require("./File.js");
@@ -189,56 +188,85 @@ class PonyfillBody {
             ...opts?.formDataLimits,
         };
         return new Promise((resolve, reject) => {
-            const bb = (0, busboy_1.default)({
+            const stream = this.body?.readable;
+            if (!stream) {
+                return reject(new Error('No stream available'));
+            }
+            let lastError;
+            // 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,
-                defParamCharset: 'utf-8',
+                defCharset: 'utf-8',
             });
-            bb.on('field', (name, value, { nameTruncated, valueTruncated }) => {
-                if (nameTruncated) {
-                    reject(new Error(`Field name size exceeded: ${formDataLimits?.fieldNameSize} bytes`));
+            const complete = (err) => {
+                stream.unpipe(bb);
+                bb.destroy();
+                if (currFile) {
+                    currFile.destroy();
+                    currFile = null;
+                }
+                if (err || lastError) {
+                    reject(err || lastError);
+                }
+                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) {
-                    reject(new Error(`Field value size exceeded: ${formDataLimits?.fieldSize} bytes`));
+                    return complete(new Error(`Field value size exceeded: ${formDataLimits?.fieldSize} bytes`));
                 }
                 this._formData.set(name, value);
             });
-            bb.on('fieldsLimit', () => {
-                reject(new Error(`Fields limit exceeded: ${formDataLimits?.fields}`));
-            });
-            bb.on('file', (name, fileStream, { filename, mimeType }) => {
+            bb.on('file', (name, fileStream, filename, _transferEncoding, mimeType) => {
+                currFile = fileStream;
                 const chunks = [];
-                fileStream.on('limit', () => {
-                    reject(new Error(`File size limit exceeded: ${formDataLimits?.fileSize} bytes`));
-                });
                 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) {
-                        reject(new Error(`File size limit exceeded: ${formDataLimits?.fileSize} bytes`));
+                        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}`));
+            });
             bb.on('filesLimit', () => {
-                reject(new Error(`Files limit exceeded: ${formDataLimits?.files}`));
+                complete(new Error(`Files limit exceeded: ${formDataLimits?.files}`));
             });
             bb.on('partsLimit', () => {
-                reject(new Error(`Parts limit exceeded: ${formDataLimits?.parts}`));
-            });
-            bb.on('close', () => {
-                resolve(this._formData);
-            });
-            bb.on('error', (err = 'An error occurred while parsing the form data') => {
-                const errMessage = err.message || err.toString();
-                // @ts-ignore - `cause` is in `TypeError`in node
-                reject(new TypeError(errMessage, err.cause));
+                complete(new Error(`Parts limit exceeded: ${formDataLimits?.parts}`));
             });
-            _body?.readable.pipe(bb);
+            bb.on('end', complete);
+            bb.on('finish', complete);
+            bb.on('close', complete);
+            bb.on('error', complete);
+            stream.pipe(bb);
         });
     }
     buffer() {

package/esm/Body.js

@@ -2,7 +2,7 @@
 import { Buffer } from 'node:buffer';
 import { IncomingMessage } from 'node:http';
 import { Readable } from 'node:stream';
-import busboy from 'busboy';
+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';
@@ -185,56 +185,85 @@ export class PonyfillBody {
             ...opts?.formDataLimits,
         };
         return new Promise((resolve, reject) => {
-            const bb = busboy({
+            const stream = this.body?.readable;
+            if (!stream) {
+                return reject(new Error('No stream available'));
+            }
+            let lastError;
+            // 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,
-                defParamCharset: 'utf-8',
+                defCharset: 'utf-8',
             });
-            bb.on('field', (name, value, { nameTruncated, valueTruncated }) => {
-                if (nameTruncated) {
-                    reject(new Error(`Field name size exceeded: ${formDataLimits?.fieldNameSize} bytes`));
+            const complete = (err) => {
+                stream.unpipe(bb);
+                bb.destroy();
+                if (currFile) {
+                    currFile.destroy();
+                    currFile = null;
+                }
+                if (err || lastError) {
+                    reject(err || lastError);
+                }
+                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) {
-                    reject(new Error(`Field value size exceeded: ${formDataLimits?.fieldSize} bytes`));
+                    return complete(new Error(`Field value size exceeded: ${formDataLimits?.fieldSize} bytes`));
                 }
                 this._formData.set(name, value);
             });
-            bb.on('fieldsLimit', () => {
-                reject(new Error(`Fields limit exceeded: ${formDataLimits?.fields}`));
-            });
-            bb.on('file', (name, fileStream, { filename, mimeType }) => {
+            bb.on('file', (name, fileStream, filename, _transferEncoding, mimeType) => {
+                currFile = fileStream;
                 const chunks = [];
-                fileStream.on('limit', () => {
-                    reject(new Error(`File size limit exceeded: ${formDataLimits?.fileSize} bytes`));
-                });
                 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) {
-                        reject(new Error(`File size limit exceeded: ${formDataLimits?.fileSize} bytes`));
+                        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}`));
+            });
             bb.on('filesLimit', () => {
-                reject(new Error(`Files limit exceeded: ${formDataLimits?.files}`));
+                complete(new Error(`Files limit exceeded: ${formDataLimits?.files}`));
             });
             bb.on('partsLimit', () => {
-                reject(new Error(`Parts limit exceeded: ${formDataLimits?.parts}`));
-            });
-            bb.on('close', () => {
-                resolve(this._formData);
-            });
-            bb.on('error', (err = 'An error occurred while parsing the form data') => {
-                const errMessage = err.message || err.toString();
-                // @ts-ignore - `cause` is in `TypeError`in node
-                reject(new TypeError(errMessage, err.cause));
+                complete(new Error(`Parts limit exceeded: ${formDataLimits?.parts}`));
             });
-            _body?.readable.pipe(bb);
+            bb.on('end', complete);
+            bb.on('finish', complete);
+            bb.on('close', complete);
+            bb.on('error', complete);
+            stream.pipe(bb);
         });
     }
     buffer() {

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@whatwg-node/node-fetch",
-  "version": "0.7.17",
+  "version": "0.7.18-alpha-20250414141945-85ba4bb116008ce30707b20368f44d791a52afaa",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "dependencies": {
+    "@fastify/busboy": "^3.1.1",
     "@whatwg-node/disposablestack": "^0.0.6",
-    "@whatwg-node/promise-helpers": "^1.2.5",
-    "busboy": "^1.6.0",
+    "@whatwg-node/promise-helpers": "1.3.1-alpha-20250414141945-85ba4bb116008ce30707b20368f44d791a52afaa",
     "tslib": "^2.6.3"
   },
   "repository": {