@whatwg-node/node-fetch 0.7.22-alpha-20250527020114-bf7a9c1c4bf32e1ca6edd3faf2d7a81370ded65c → 0.7.22-alpha-20250710160716-6df7209d12299dba404ac539d834654be5d43990

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);
+        const { bodyFactory, contentType, contentLength, bodyType, buffer } = processBodyInit(bodyInit, options?.signal);
         this._bodyFactory = bodyFactory;
         this.contentType = contentType;
         this.contentLength = contentLength;
@@ -109,14 +109,14 @@ class PonyfillBody {
     _doCollectChunksFromReadableJob() {
         if (this.bodyType === BodyInitType.AsyncIterable) {
             if (Array.fromAsync) {
-                return Array.fromAsync(this.bodyInit).then(chunks => {
+                return (0, promise_helpers_1.handleMaybePromise)(() => Array.fromAsync(this.bodyInit), chunks => {
                     this._chunks = chunks;
                     return this._chunks;
                 });
             }
             const iterator = this.bodyInit[Symbol.asyncIterator]();
             const chunks = [];
-            const collectValue = () => iterator.next().then(({ value, done }) => {
+            const collectValue = () => (0, promise_helpers_1.handleMaybePromise)(() => iterator.next(), ({ value, done }) => {
                 if (value) {
                     chunks.push(value);
                 }
@@ -131,30 +131,23 @@ class PonyfillBody {
         const _body = this.generateBody();
         if (!_body) {
             this._chunks = [];
-            return this._chunks;
-        }
-        if (_body.readable.destroyed) {
-            // If the stream is already destroyed, we can resolve immediately
-            this._chunks = [];
-            return this._chunks;
+            return (0, utils_js_1.fakePromise)(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 new Promise((resolve, reject) => {
+            _body.readable.on('data', chunk => {
+                chunks.push(chunk);
+            });
+            _body.readable.once('error', reject);
+            _body.readable.once('end', () => {
+                resolve((this._chunks = chunks));
+            });
         });
-        return deferred.promise;
     }
     _collectChunksFromReadable() {
+        if (this._chunks) {
+            return (0, utils_js_1.fakePromise)(this._chunks);
+        }
         this._chunks ||= this._doCollectChunksFromReadableJob();
         return this._chunks;
     }
@@ -181,15 +174,13 @@ class PonyfillBody {
             });
             return (0, utils_js_1.fakePromise)(this._blob);
         }
-        return (0, utils_js_1.fakePromise)()
-            .then(() => this._collectChunksFromReadable())
-            .then(chunks => {
+        return (0, utils_js_1.fakePromise)((0, promise_helpers_1.handleMaybePromise)(() => this._collectChunksFromReadable(), chunks => {
             this._blob = new Blob_js_1.PonyfillBlob(chunks, {
                 type: this.contentType || '',
                 size: this.contentLength,
             });
             return this._blob;
-        });
+        }));
     }
     _formData = null;
     formData(opts) {
@@ -209,57 +200,93 @@ class PonyfillBody {
             ...this.options.formDataLimits,
             ...opts?.formDataLimits,
         };
-        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) {
-                bb.destroy(new Error(`Field name size exceeded: ${formDataLimits?.fieldNameSize} bytes`));
+        return new Promise((resolve, reject) => {
+            const stream = this.body?.readable;
+            if (!stream) {
+                return reject(new Error('No stream available'));
             }
-            if (valueTruncated) {
-                bb.destroy(new Error(`Field value size exceeded: ${formDataLimits?.fieldSize} 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);
             }
-            this._formData.set(name, value);
-        });
-        bb.on('file', (name, fileStream, filename, _transferEncoding, mimeType) => {
-            const chunks = [];
-            fileStream.on('data', chunk => {
-                chunks.push(chunk);
+            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);
             });
-            fileStream.on('limit', () => {
-                bb.destroy(new Error(`File size limit exceeded: ${formDataLimits?.fileSize} bytes`));
+            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);
+                });
             });
-            fileStream.on('close', () => {
-                if (fileStream.truncated) {
-                    bb.destroy(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('fieldsLimit', () => {
+                complete(new Error(`Fields limit exceeded: ${formDataLimits?.fields}`));
             });
+            bb.on('filesLimit', () => {
+                complete(new Error(`Files limit exceeded: ${formDataLimits?.files}`));
+            });
+            bb.on('partsLimit', () => {
+                complete(new Error(`Parts limit exceeded: ${formDataLimits?.parts}`));
+            });
+            bb.on('end', complete);
+            bb.on('finish', complete);
+            bb.on('close', complete);
+            bb.on('error', complete);
+            stream.pipe(bb);
         });
-        bb.on('fieldsLimit', () => {
-            bb.destroy(new Error(`Fields limit exceeded: ${formDataLimits?.fields}`));
-        });
-        bb.on('filesLimit', () => {
-            bb.destroy(new Error(`Files limit exceeded: ${formDataLimits?.files}`));
-        });
-        bb.on('partsLimit', () => {
-            bb.destroy(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) {
@@ -296,16 +323,14 @@ class PonyfillBody {
                 });
             }
         }
-        return (0, utils_js_1.fakePromise)()
-            .then(() => this._collectChunksFromReadable())
-            .then(chunks => {
+        return (0, utils_js_1.fakePromise)((0, promise_helpers_1.handleMaybePromise)(() => this._collectChunksFromReadable(), 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();
@@ -348,7 +373,7 @@ class PonyfillBody {
     }
 }
 exports.PonyfillBody = PonyfillBody;
-function processBodyInit(bodyInit) {
+function processBodyInit(bodyInit, signal) {
     if (bodyInit == null) {
         return {
             bodyFactory: () => null,
@@ -357,10 +382,11 @@ function processBodyInit(bodyInit) {
         };
     }
     if (typeof bodyInit === 'string') {
+        const contentLength = node_buffer_1.Buffer.byteLength(bodyInit);
         return {
             bodyType: BodyInitType.String,
-            contentType: null,
-            contentLength: null,
+            contentType: 'text/plain;charset=UTF-8',
+            contentLength,
             bodyFactory() {
                 const readable = node_stream_1.Readable.from(node_buffer_1.Buffer.from(bodyInit, 'utf-8'));
                 return new ReadableStream_js_1.PonyfillReadableStream(readable);
@@ -430,6 +456,20 @@ function processBodyInit(bodyInit) {
             },
         };
     }
+    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/Response.js

@@ -4,6 +4,7 @@ exports.PonyfillResponse = void 0;
 const node_http_1 = require("node:http");
 const Body_js_1 = require("./Body.js");
 const Headers_js_1 = require("./Headers.js");
+const JSON_CONTENT_TYPE = 'application/json; charset=utf-8';
 class PonyfillResponse extends Body_js_1.PonyfillBody {
     headers;
     constructor(body, init) {
@@ -49,6 +50,57 @@ class PonyfillResponse extends Body_js_1.PonyfillBody {
     }
     static json(data, init) {
         const bodyInit = JSON.stringify(data);
+        if (!init) {
+            init = {
+                headers: {
+                    'content-type': JSON_CONTENT_TYPE,
+                    'content-length': Buffer.byteLength(bodyInit).toString(),
+                },
+            };
+        }
+        else if (!init.headers) {
+            init.headers = {
+                'content-type': JSON_CONTENT_TYPE,
+                'content-length': Buffer.byteLength(bodyInit).toString(),
+            };
+        }
+        else if ((0, Headers_js_1.isHeadersLike)(init.headers)) {
+            if (!init.headers.has('content-type')) {
+                init.headers.set('content-type', JSON_CONTENT_TYPE);
+            }
+            if (!init.headers.has('content-length')) {
+                init.headers.set('content-length', Buffer.byteLength(bodyInit).toString());
+            }
+        }
+        else if (Array.isArray(init.headers)) {
+            let contentTypeExists = false;
+            let contentLengthExists = false;
+            for (const [key] of init.headers) {
+                if (contentLengthExists && contentTypeExists) {
+                    break;
+                }
+                if (!contentTypeExists && key.toLowerCase() === 'content-type') {
+                    contentTypeExists = true;
+                }
+                else if (!contentLengthExists && key.toLowerCase() === 'content-length') {
+                    contentLengthExists = true;
+                }
+            }
+            if (!contentTypeExists) {
+                init.headers.push(['content-type', JSON_CONTENT_TYPE]);
+            }
+            if (!contentLengthExists) {
+                init.headers.push(['content-length', Buffer.byteLength(bodyInit).toString()]);
+            }
+        }
+        else if (typeof init.headers === 'object') {
+            if (init.headers?.['content-type'] == null) {
+                init.headers['content-type'] = JSON_CONTENT_TYPE;
+            }
+            if (init.headers?.['content-length'] == null) {
+                init.headers['content-length'] = Buffer.byteLength(bodyInit).toString();
+            }
+        }
         return new PonyfillResponse(bodyInit, init);
     }
     [Symbol.toStringTag] = 'Response';

package/cjs/fetchNodeHttp.js

@@ -95,12 +95,14 @@ function fetchNodeHttp(fetchRequest) {
                         return;
                     }
                 }
-                outputStream = (0, utils_js_1.wrapIncomingMessageWithPassthrough)({
-                    incomingMessage: nodeResponse,
-                    passThrough: outputStream,
-                    signal,
-                    onError: reject,
-                });
+                if (outputStream != null) {
+                    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 { Readable } from 'node:stream';
-import { pipeline } from 'node:stream/promises';
+import { IncomingMessage } from 'node:http';
+import { addAbortSignal, Readable } from 'node:stream';
 import { Busboy } from '@fastify/busboy';
-import { createDeferredPromise, fakeRejectPromise, } from '@whatwg-node/promise-helpers';
+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";
@@ -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);
+        const { bodyFactory, contentType, contentLength, bodyType, buffer } = processBodyInit(bodyInit, options?.signal);
         this._bodyFactory = bodyFactory;
         this.contentType = contentType;
         this.contentLength = contentLength;
@@ -106,14 +106,14 @@ export class PonyfillBody {
     _doCollectChunksFromReadableJob() {
         if (this.bodyType === BodyInitType.AsyncIterable) {
             if (Array.fromAsync) {
-                return Array.fromAsync(this.bodyInit).then(chunks => {
+                return handleMaybePromise(() => Array.fromAsync(this.bodyInit), chunks => {
                     this._chunks = chunks;
                     return this._chunks;
                 });
             }
             const iterator = this.bodyInit[Symbol.asyncIterator]();
             const chunks = [];
-            const collectValue = () => iterator.next().then(({ value, done }) => {
+            const collectValue = () => handleMaybePromise(() => iterator.next(), ({ value, done }) => {
                 if (value) {
                     chunks.push(value);
                 }
@@ -128,30 +128,23 @@ export class PonyfillBody {
         const _body = this.generateBody();
         if (!_body) {
             this._chunks = [];
-            return this._chunks;
-        }
-        if (_body.readable.destroyed) {
-            // If the stream is already destroyed, we can resolve immediately
-            this._chunks = [];
-            return this._chunks;
+            return fakePromise(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 new Promise((resolve, reject) => {
+            _body.readable.on('data', chunk => {
+                chunks.push(chunk);
+            });
+            _body.readable.once('error', reject);
+            _body.readable.once('end', () => {
+                resolve((this._chunks = chunks));
+            });
         });
-        return deferred.promise;
     }
     _collectChunksFromReadable() {
+        if (this._chunks) {
+            return fakePromise(this._chunks);
+        }
         this._chunks ||= this._doCollectChunksFromReadableJob();
         return this._chunks;
     }
@@ -178,15 +171,13 @@ export class PonyfillBody {
             });
             return fakePromise(this._blob);
         }
-        return fakePromise()
-            .then(() => this._collectChunksFromReadable())
-            .then(chunks => {
+        return fakePromise(handleMaybePromise(() => this._collectChunksFromReadable(), chunks => {
             this._blob = new PonyfillBlob(chunks, {
                 type: this.contentType || '',
                 size: this.contentLength,
             });
             return this._blob;
-        });
+        }));
     }
     _formData = null;
     formData(opts) {
@@ -206,57 +197,93 @@ export class PonyfillBody {
             ...this.options.formDataLimits,
             ...opts?.formDataLimits,
         };
-        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) {
-                bb.destroy(new Error(`Field name size exceeded: ${formDataLimits?.fieldNameSize} bytes`));
+        return new Promise((resolve, reject) => {
+            const stream = this.body?.readable;
+            if (!stream) {
+                return reject(new Error('No stream available'));
             }
-            if (valueTruncated) {
-                bb.destroy(new Error(`Field value size exceeded: ${formDataLimits?.fieldSize} 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);
             }
-            this._formData.set(name, value);
-        });
-        bb.on('file', (name, fileStream, filename, _transferEncoding, mimeType) => {
-            const chunks = [];
-            fileStream.on('data', chunk => {
-                chunks.push(chunk);
+            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);
             });
-            fileStream.on('limit', () => {
-                bb.destroy(new Error(`File size limit exceeded: ${formDataLimits?.fileSize} bytes`));
+            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);
+                });
             });
-            fileStream.on('close', () => {
-                if (fileStream.truncated) {
-                    bb.destroy(new Error(`File size limit exceeded: ${formDataLimits?.fileSize} bytes`));
-                }
-                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', () => {
+                complete(new Error(`Files limit exceeded: ${formDataLimits?.files}`));
+            });
+            bb.on('partsLimit', () => {
+                complete(new Error(`Parts limit exceeded: ${formDataLimits?.parts}`));
+            });
+            bb.on('end', complete);
+            bb.on('finish', complete);
+            bb.on('close', complete);
+            bb.on('error', complete);
+            stream.pipe(bb);
         });
-        bb.on('fieldsLimit', () => {
-            bb.destroy(new Error(`Fields limit exceeded: ${formDataLimits?.fields}`));
-        });
-        bb.on('filesLimit', () => {
-            bb.destroy(new Error(`Files limit exceeded: ${formDataLimits?.files}`));
-        });
-        bb.on('partsLimit', () => {
-            bb.destroy(new Error(`Parts limit exceeded: ${formDataLimits?.parts}`));
-        });
-        return pipeline(stream, bb, {
-            signal: this._signal || undefined,
-        }).then(() => this._formData);
     }
     buffer() {
         if (this._buffer) {
@@ -293,16 +320,14 @@ export class PonyfillBody {
                 });
             }
         }
-        return fakePromise()
-            .then(() => this._collectChunksFromReadable())
-            .then(chunks => {
+        return fakePromise(handleMaybePromise(() => this._collectChunksFromReadable(), chunks => {
             if (chunks.length === 1) {
                 this._buffer = chunks[0];
                 return this._buffer;
             }
             this._buffer = Buffer.concat(chunks);
             return this._buffer;
-        });
+        }));
     }
     bytes() {
         return this.buffer();
@@ -344,7 +369,7 @@ export class PonyfillBody {
         });
     }
 }
-function processBodyInit(bodyInit) {
+function processBodyInit(bodyInit, signal) {
     if (bodyInit == null) {
         return {
             bodyFactory: () => null,
@@ -353,10 +378,11 @@ function processBodyInit(bodyInit) {
         };
     }
     if (typeof bodyInit === 'string') {
+        const contentLength = Buffer.byteLength(bodyInit);
         return {
             bodyType: BodyInitType.String,
-            contentType: null,
-            contentLength: null,
+            contentType: 'text/plain;charset=UTF-8',
+            contentLength,
             bodyFactory() {
                 const readable = Readable.from(Buffer.from(bodyInit, 'utf-8'));
                 return new PonyfillReadableStream(readable);
@@ -426,6 +452,20 @@ function processBodyInit(bodyInit) {
             },
         };
     }
+    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/Response.js

@@ -1,6 +1,7 @@
 import { STATUS_CODES } from 'node:http';
 import { PonyfillBody } from './Body.js';
 import { isHeadersLike, PonyfillHeaders } from './Headers.js';
+const JSON_CONTENT_TYPE = 'application/json; charset=utf-8';
 export class PonyfillResponse extends PonyfillBody {
     headers;
     constructor(body, init) {
@@ -46,6 +47,57 @@ export class PonyfillResponse extends PonyfillBody {
     }
     static json(data, init) {
         const bodyInit = JSON.stringify(data);
+        if (!init) {
+            init = {
+                headers: {
+                    'content-type': JSON_CONTENT_TYPE,
+                    'content-length': Buffer.byteLength(bodyInit).toString(),
+                },
+            };
+        }
+        else if (!init.headers) {
+            init.headers = {
+                'content-type': JSON_CONTENT_TYPE,
+                'content-length': Buffer.byteLength(bodyInit).toString(),
+            };
+        }
+        else if (isHeadersLike(init.headers)) {
+            if (!init.headers.has('content-type')) {
+                init.headers.set('content-type', JSON_CONTENT_TYPE);
+            }
+            if (!init.headers.has('content-length')) {
+                init.headers.set('content-length', Buffer.byteLength(bodyInit).toString());
+            }
+        }
+        else if (Array.isArray(init.headers)) {
+            let contentTypeExists = false;
+            let contentLengthExists = false;
+            for (const [key] of init.headers) {
+                if (contentLengthExists && contentTypeExists) {
+                    break;
+                }
+                if (!contentTypeExists && key.toLowerCase() === 'content-type') {
+                    contentTypeExists = true;
+                }
+                else if (!contentLengthExists && key.toLowerCase() === 'content-length') {
+                    contentLengthExists = true;
+                }
+            }
+            if (!contentTypeExists) {
+                init.headers.push(['content-type', JSON_CONTENT_TYPE]);
+            }
+            if (!contentLengthExists) {
+                init.headers.push(['content-length', Buffer.byteLength(bodyInit).toString()]);
+            }
+        }
+        else if (typeof init.headers === 'object') {
+            if (init.headers?.['content-type'] == null) {
+                init.headers['content-type'] = JSON_CONTENT_TYPE;
+            }
+            if (init.headers?.['content-length'] == null) {
+                init.headers['content-length'] = Buffer.byteLength(bodyInit).toString();
+            }
+        }
         return new PonyfillResponse(bodyInit, init);
     }
     [Symbol.toStringTag] = 'Response';

package/esm/fetchNodeHttp.js

@@ -92,12 +92,14 @@ export function fetchNodeHttp(fetchRequest) {
                         return;
                     }
                 }
-                outputStream = wrapIncomingMessageWithPassthrough({
-                    incomingMessage: nodeResponse,
-                    passThrough: outputStream,
-                    signal,
-                    onError: reject,
-                });
+                if (outputStream != null) {
+                    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-20250527020114-bf7a9c1c4bf32e1ca6edd3faf2d7a81370ded65c",
+  "version": "0.7.22-alpha-20250710160716-6df7209d12299dba404ac539d834654be5d43990",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "dependencies": {

package/typings/ReadableStream.d.cts

@@ -10,9 +10,9 @@ export declare class PonyfillReadableStream<T> implements ReadableStream<T> {
     getReader(): ReadableStreamDefaultReader<T>;
     [Symbol.asyncIterator](): {
         [Symbol.asyncIterator](): /*elided*/ any;
-        next: () => Promise<IteratorResult<any, any>>;
-        return: () => Promise<IteratorResult<any, any>>;
-        throw: (err: Error) => Promise<IteratorResult<any, any>>;
+        next: () => Promise<IteratorResult<any, undefined>>;
+        return: () => Promise<IteratorResult<any, undefined>>;
+        throw: (err: Error) => Promise<IteratorResult<any, undefined>>;
     };
     tee(): [ReadableStream<T>, ReadableStream<T>];
     private pipeToWriter;

package/typings/ReadableStream.d.ts

@@ -10,9 +10,9 @@ export declare class PonyfillReadableStream<T> implements ReadableStream<T> {
     getReader(): ReadableStreamDefaultReader<T>;
     [Symbol.asyncIterator](): {
         [Symbol.asyncIterator](): /*elided*/ any;
-        next: () => Promise<IteratorResult<any, any>>;
-        return: () => Promise<IteratorResult<any, any>>;
-        throw: (err: Error) => Promise<IteratorResult<any, any>>;
+        next: () => Promise<IteratorResult<any, undefined>>;
+        return: () => Promise<IteratorResult<any, undefined>>;
+        throw: (err: Error) => Promise<IteratorResult<any, undefined>>;
     };
     tee(): [ReadableStream<T>, ReadableStream<T>];
     private pipeToWriter;