@whatwg-node/node-fetch 0.7.15-alpha-20250322121446-0a8732f1758546d618a797e18a1da953697eb27c → 0.7.15-alpha-20250322150325-5bf305acd3e2ca23ba360e88d5e6b33587051b71

package/cjs/Body.js

@@ -4,6 +4,7 @@ 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 promise_helpers_1 = require("@whatwg-node/promise-helpers");
@@ -31,7 +32,7 @@ class PonyfillBody {
     constructor(bodyInit, options = {}) {
         this.bodyInit = bodyInit;
         this.options = options;
-        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;
@@ -130,7 +131,7 @@ class PonyfillBody {
         }
         const _body = this.generateBody();
         this._chunks = [];
-        if (!_body || _body.readable?.destroyed) {
+        if (!_body) {
             return (0, utils_js_1.fakePromise)(this._chunks);
         }
         _body.readable.on('data', chunk => {
@@ -310,7 +311,7 @@ class PonyfillBody {
     }
 }
 exports.PonyfillBody = PonyfillBody;
-function processBodyInit(bodyInit) {
+function processBodyInit(bodyInit, signal) {
     if (bodyInit == null) {
         return {
             bodyFactory: () => null,
@@ -333,13 +334,14 @@ function processBodyInit(bodyInit) {
         };
     }
     if (node_buffer_1.Buffer.isBuffer(bodyInit)) {
+        const buffer = bodyInit;
         return {
             bodyType: BodyInitType.Buffer,
             contentType: null,
             contentLength: bodyInit.length,
             buffer: bodyInit,
             bodyFactory() {
-                const readable = node_stream_1.Readable.from(bodyInit);
+                const readable = node_stream_1.Readable.from(buffer);
                 const body = new ReadableStream_js_1.PonyfillReadableStream(readable);
                 return body;
             },
@@ -360,20 +362,22 @@ function processBodyInit(bodyInit) {
         };
     }
     if (bodyInit instanceof ReadableStream_js_1.PonyfillReadableStream && bodyInit.readable != null) {
+        const readableStream = bodyInit;
         return {
             bodyType: BodyInitType.ReadableStream,
-            bodyFactory: () => bodyInit,
+            bodyFactory: () => readableStream,
             contentType: null,
             contentLength: null,
         };
     }
     if (isBlob(bodyInit)) {
+        const blob = bodyInit;
         return {
             bodyType: BodyInitType.Blob,
             contentType: bodyInit.type,
             contentLength: bodyInit.size,
             bodyFactory() {
-                return bodyInit.stream();
+                return blob.stream();
             },
         };
     }
@@ -392,6 +396,21 @@ function processBodyInit(bodyInit) {
             },
         };
     }
+    if (bodyInit instanceof node_http_1.IncomingMessage) {
+        const passthrough = (bodyInit = bodyInit.pipe(new node_stream_1.PassThrough(), {
+            end: true,
+            // @ts-expect-error - `signal` is not in the type definition
+            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,7 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 import { Buffer } from 'node:buffer';
-import { Readable } from 'node:stream';
+import { IncomingMessage } from 'node:http';
+import { PassThrough, Readable } from 'node:stream';
 import busboy from 'busboy';
 import { handleMaybePromise } from '@whatwg-node/promise-helpers';
 import { hasArrayBufferMethod, hasBufferMethod, hasBytesMethod, PonyfillBlob } from './Blob.js';
@@ -27,7 +28,7 @@ export class PonyfillBody {
     constructor(bodyInit, options = {}) {
         this.bodyInit = bodyInit;
         this.options = options;
-        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;
@@ -126,7 +127,7 @@ export class PonyfillBody {
         }
         const _body = this.generateBody();
         this._chunks = [];
-        if (!_body || _body.readable?.destroyed) {
+        if (!_body) {
             return fakePromise(this._chunks);
         }
         _body.readable.on('data', chunk => {
@@ -305,7 +306,7 @@ export class PonyfillBody {
         });
     }
 }
-function processBodyInit(bodyInit) {
+function processBodyInit(bodyInit, signal) {
     if (bodyInit == null) {
         return {
             bodyFactory: () => null,
@@ -328,13 +329,14 @@ function processBodyInit(bodyInit) {
         };
     }
     if (Buffer.isBuffer(bodyInit)) {
+        const buffer = bodyInit;
         return {
             bodyType: BodyInitType.Buffer,
             contentType: null,
             contentLength: bodyInit.length,
             buffer: bodyInit,
             bodyFactory() {
-                const readable = Readable.from(bodyInit);
+                const readable = Readable.from(buffer);
                 const body = new PonyfillReadableStream(readable);
                 return body;
             },
@@ -355,20 +357,22 @@ function processBodyInit(bodyInit) {
         };
     }
     if (bodyInit instanceof PonyfillReadableStream && bodyInit.readable != null) {
+        const readableStream = bodyInit;
         return {
             bodyType: BodyInitType.ReadableStream,
-            bodyFactory: () => bodyInit,
+            bodyFactory: () => readableStream,
             contentType: null,
             contentLength: null,
         };
     }
     if (isBlob(bodyInit)) {
+        const blob = bodyInit;
         return {
             bodyType: BodyInitType.Blob,
             contentType: bodyInit.type,
             contentLength: bodyInit.size,
             bodyFactory() {
-                return bodyInit.stream();
+                return blob.stream();
             },
         };
     }
@@ -387,6 +391,21 @@ function processBodyInit(bodyInit) {
             },
         };
     }
+    if (bodyInit instanceof IncomingMessage) {
+        const passthrough = (bodyInit = bodyInit.pipe(new PassThrough(), {
+            end: true,
+            // @ts-expect-error - `signal` is not in the type definition
+            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.15-alpha-20250322121446-0a8732f1758546d618a797e18a1da953697eb27c",
+  "version": "0.7.15-alpha-20250322150325-5bf305acd3e2ca23ba360e88d5e6b33587051b71",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "dependencies": {

package/typings/Body.d.cts

@@ -16,6 +16,7 @@ export interface FormDataLimits {
 }
 export interface PonyfillBodyOptions {
     formDataLimits?: FormDataLimits;
+    signal?: AbortSignal;
 }
 export declare class PonyfillBody<TJSON = any> implements Body {
     private bodyInit;

package/typings/Body.d.ts

@@ -16,6 +16,7 @@ export interface FormDataLimits {
 }
 export interface PonyfillBodyOptions {
     formDataLimits?: FormDataLimits;
+    signal?: AbortSignal;
 }
 export declare class PonyfillBody<TJSON = any> implements Body {
     private bodyInit;