@whatwg-node/node-fetch 0.7.22-alpha-20250526145249-5592a2aa5cd5a8603f5016376c1e6ef0f84f7aab → 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;
@@ -133,6 +132,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) {
@@ -379,7 +383,7 @@ class PonyfillBody {
     }
 }
 exports.PonyfillBody = PonyfillBody;
-function processBodyInit(bodyInit, signal) {
+function processBodyInit(bodyInit) {
     if (bodyInit == null) {
         return {
             bodyFactory: () => null,
@@ -462,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/esm/Body.js

@@ -1,6 +1,5 @@
 /* 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 { createDeferredPromise } from '@whatwg-node/promise-helpers';
@@ -8,7 +7,7 @@ import { hasArrayBufferMethod, hasBufferMethod, hasBytesMethod, PonyfillBlob } f
 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;
@@ -130,6 +129,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) {
@@ -375,7 +379,7 @@ export class PonyfillBody {
         });
     }
 }
-function processBodyInit(bodyInit, signal) {
+function processBodyInit(bodyInit) {
     if (bodyInit == null) {
         return {
             bodyFactory: () => null,
@@ -458,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/package.json

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