@whatwg-node/node-fetch 0.7.15-alpha-20250324173008-e214682794a80d23e60fa5a3ee070fdb4871da83 → 0.7.15-alpha-20250324185339-daa21e16c396158104a59781d00308c832a5948a

package/cjs/Body.js

@@ -29,9 +29,11 @@ class PonyfillBody {
     bodyUsed = false;
     contentType = null;
     contentLength = null;
+    signal = null;
     constructor(bodyInit, options = {}) {
         this.bodyInit = bodyInit;
         this.options = options;
+        this.signal = options.signal || null;
         const { bodyFactory, contentType, contentLength, bodyType, buffer } = processBodyInit(bodyInit, options?.signal);
         this._bodyFactory = bodyFactory;
         this.contentType = contentType;
@@ -52,6 +54,9 @@ class PonyfillBody {
         }
         const body = this._bodyFactory();
         this._generatedBody = body;
+        if (body?.readable && this.signal) {
+            (0, node_stream_1.addAbortSignal)(this.signal, body.readable);
+        }
         return body;
     }
     handleContentLengthHeader(forceSet = false) {
@@ -132,16 +137,9 @@ class PonyfillBody {
             this._chunks = [];
             return (0, utils_js_1.fakePromise)(this._chunks);
         }
-        const chunks = [];
-        _body.readable.on('data', chunk => {
-            chunks.push(chunk);
-        });
-        return new Promise((resolve, reject) => {
-            _body.readable.once('end', () => {
-                this._chunks = chunks;
-                resolve(this._chunks);
-            });
-            _body.readable.once('error', reject);
+        return _body.readable.toArray({ signal: this.signal }).then(chunks => {
+            this._chunks = chunks;
+            return this._chunks;
         });
     }
     _collectChunksFromReadable() {

package/cjs/Request.js

@@ -41,7 +41,7 @@ class PonyfillRequest extends Body_js_1.PonyfillBody {
             bodyInit = options.body || null;
             requestInit = options;
         }
-        super(bodyInit, options);
+        super(bodyInit, requestInit);
         this._url = _url;
         this._parsedUrl = _parsedUrl;
         this.cache = requestInit?.cache || 'default';

package/esm/Body.js

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 import { Buffer } from 'node:buffer';
 import { IncomingMessage } from 'node:http';
-import { PassThrough, Readable } from 'node:stream';
+import { addAbortSignal, PassThrough, Readable } from 'node:stream';
 import busboy from 'busboy';
 import { handleMaybePromise } from '@whatwg-node/promise-helpers';
 import { hasArrayBufferMethod, hasBufferMethod, hasBytesMethod, PonyfillBlob } from './Blob.js';
@@ -25,9 +25,11 @@ export class PonyfillBody {
     bodyUsed = false;
     contentType = null;
     contentLength = null;
+    signal = null;
     constructor(bodyInit, options = {}) {
         this.bodyInit = bodyInit;
         this.options = options;
+        this.signal = options.signal || null;
         const { bodyFactory, contentType, contentLength, bodyType, buffer } = processBodyInit(bodyInit, options?.signal);
         this._bodyFactory = bodyFactory;
         this.contentType = contentType;
@@ -48,6 +50,9 @@ export class PonyfillBody {
         }
         const body = this._bodyFactory();
         this._generatedBody = body;
+        if (body?.readable && this.signal) {
+            addAbortSignal(this.signal, body.readable);
+        }
         return body;
     }
     handleContentLengthHeader(forceSet = false) {
@@ -128,16 +133,9 @@ export class PonyfillBody {
             this._chunks = [];
             return fakePromise(this._chunks);
         }
-        const chunks = [];
-        _body.readable.on('data', chunk => {
-            chunks.push(chunk);
-        });
-        return new Promise((resolve, reject) => {
-            _body.readable.once('end', () => {
-                this._chunks = chunks;
-                resolve(this._chunks);
-            });
-            _body.readable.once('error', reject);
+        return _body.readable.toArray({ signal: this.signal }).then(chunks => {
+            this._chunks = chunks;
+            return this._chunks;
         });
     }
     _collectChunksFromReadable() {

package/esm/Request.js

@@ -38,7 +38,7 @@ export class PonyfillRequest extends PonyfillBody {
             bodyInit = options.body || null;
             requestInit = options;
         }
-        super(bodyInit, options);
+        super(bodyInit, requestInit);
         this._url = _url;
         this._parsedUrl = _parsedUrl;
         this.cache = requestInit?.cache || 'default';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/node-fetch",
-  "version": "0.7.15-alpha-20250324173008-e214682794a80d23e60fa5a3ee070fdb4871da83",
+  "version": "0.7.15-alpha-20250324185339-daa21e16c396158104a59781d00308c832a5948a",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "dependencies": {

package/typings/Body.d.cts

@@ -24,6 +24,7 @@ export declare class PonyfillBody<TJSON = any> implements Body {
     bodyUsed: boolean;
     contentType: string | null;
     contentLength: number | null;
+    signal?: AbortSignal | null;
     constructor(bodyInit: BodyPonyfillInit | null, options?: PonyfillBodyOptions);
     private bodyType?;
     private _bodyFactory;

package/typings/Body.d.ts

@@ -24,6 +24,7 @@ export declare class PonyfillBody<TJSON = any> implements Body {
     bodyUsed: boolean;
     contentType: string | null;
     contentLength: number | null;
+    signal?: AbortSignal | null;
     constructor(bodyInit: BodyPonyfillInit | null, options?: PonyfillBodyOptions);
     private bodyType?;
     private _bodyFactory;