@whatwg-node/node-fetch 0.7.19 → 0.7.20-alpha-20250512180730-0c5bd3cc4fb4349409e46f6c13c6774715600d41

package/cjs/ReadableStream.js

@@ -2,7 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PonyfillReadableStream = void 0;
 const node_buffer_1 = require("node:buffer");
+const node_events_1 = require("node:events");
 const node_stream_1 = require("node:stream");
+const promises_1 = require("node:stream/promises");
 const promise_helpers_1 = require("@whatwg-node/promise-helpers");
 const utils_js_1 = require("./utils.js");
 function createController(desiredSize, readable) {
@@ -125,12 +127,14 @@ class PonyfillReadableStream {
     }
     cancel(reason) {
         this.readable.destroy(reason);
-        return new Promise(resolve => this.readable.once('end', resolve));
+        // @ts-expect-error - we know it is void
+        return (0, node_events_1.once)(this.readable, 'close');
     }
     locked = false;
     getReader(_options) {
         const iterator = this.readable[Symbol.asyncIterator]();
         this.locked = true;
+        const thisReadable = this.readable;
         return {
             read() {
                 return iterator.next();
@@ -159,10 +163,12 @@ class PonyfillReadableStream {
                 this.locked = false;
                 return (0, utils_js_1.fakePromise)();
             },
-            closed: new Promise((resolve, reject) => {
-                this.readable.once('end', resolve);
-                this.readable.once('error', reject);
-            }),
+            get closed() {
+                return Promise.race([
+                    (0, node_events_1.once)(thisReadable, 'end'),
+                    (0, node_events_1.once)(thisReadable, 'error').then(err => Promise.reject(err)),
+                ]);
+            },
         };
     }
     [Symbol.asyncIterator]() {
@@ -202,10 +208,8 @@ class PonyfillReadableStream {
     }
     pipeTo(destination) {
         if (isPonyfillWritableStream(destination)) {
-            return new Promise((resolve, reject) => {
-                this.readable.pipe(destination.writable);
-                destination.writable.once('finish', resolve);
-                destination.writable.once('error', reject);
+            return (0, promises_1.pipeline)(this.readable, destination.writable, {
+                end: true,
             });
         }
         else {

package/cjs/TextEncoderDecoderStream.js

@@ -7,9 +7,7 @@ class PonyfillTextDecoderStream extends TransformStream_js_1.PonyfillTransformSt
     textDecoder;
     constructor(encoding, options) {
         super({
-            transform: (chunk, controller) => {
-                controller.enqueue(this.textDecoder.decode(chunk, { stream: true }));
-            },
+            transform: (chunk, controller) => controller.enqueue(this.textDecoder.decode(chunk, { stream: true })),
         });
         this.textDecoder = new TextEncoderDecoder_js_1.PonyfillTextDecoder(encoding, options);
     }
@@ -28,9 +26,7 @@ class PonyfillTextEncoderStream extends TransformStream_js_1.PonyfillTransformSt
     textEncoder;
     constructor(encoding) {
         super({
-            transform: (chunk, controller) => {
-                controller.enqueue(this.textEncoder.encode(chunk));
-            },
+            transform: (chunk, controller) => controller.enqueue(this.textEncoder.encode(chunk)),
         });
         this.textEncoder = new TextEncoderDecoder_js_1.PonyfillTextEncoder(encoding);
     }

package/cjs/WritableStream.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PonyfillWritableStream = void 0;
+const node_events_1 = require("node:events");
 const node_stream_1 = require("node:stream");
 const promise_helpers_1 = require("@whatwg-node/promise-helpers");
 const utils_js_1 = require("./utils.js");
@@ -62,19 +63,15 @@ class PonyfillWritableStream {
     getWriter() {
         const writable = this.writable;
         return {
-            closed: new Promise(resolve => {
-                writable.once('close', () => {
-                    resolve(undefined);
-                });
-            }),
+            get closed() {
+                return (0, node_events_1.once)(writable, 'close');
+            },
             get desiredSize() {
                 return writable.writableLength;
             },
-            ready: new Promise(resolve => {
-                writable.once('drain', () => {
-                    resolve(undefined);
-                });
-            }),
+            get ready() {
+                return (0, node_events_1.once)(writable, 'drain');
+            },
             releaseLock() {
                 // no-op
             },
@@ -95,10 +92,8 @@ class PonyfillWritableStream {
                 return (0, utils_js_1.fakePromise)().then(() => (0, utils_js_1.endStream)(writable));
             },
             abort(reason) {
-                return new Promise(resolve => {
-                    writable.destroy(reason);
-                    writable.once('close', resolve);
-                });
+                writable.destroy(reason);
+                return (0, node_events_1.once)(writable, 'close');
             },
         };
     }
@@ -112,10 +107,8 @@ class PonyfillWritableStream {
         return (0, utils_js_1.fakePromise)().then(() => (0, utils_js_1.endStream)(this.writable));
     }
     abort(reason) {
-        return new Promise(resolve => {
-            this.writable.destroy(reason);
-            this.writable.once('close', resolve);
-        });
+        this.writable.destroy(reason);
+        return (0, node_events_1.once)(this.writable, 'close');
     }
     locked = false;
 }

package/cjs/fetchNodeHttp.js

@@ -108,7 +108,7 @@ function fetchNodeHttp(fetchRequest) {
                 resolve(ponyfillResponse);
             });
             if (fetchRequest['_buffer'] != null) {
-                (0, promise_helpers_1.handleMaybePromise)(() => (0, utils_js_1.safeWrite)(fetchRequest['_buffer'], nodeRequest), () => (0, utils_js_1.endStream)(nodeRequest), reject);
+                (0, promise_helpers_1.handleMaybePromise)(() => (0, utils_js_1.safeWrite)(fetchRequest['_buffer'], nodeRequest, fetchRequest.signal), () => (0, utils_js_1.endStream)(nodeRequest), reject);
             }
             else {
                 const nodeReadable = (fetchRequest.body != null

package/cjs/utils.js

@@ -10,6 +10,7 @@ exports.shouldRedirect = shouldRedirect;
 exports.wrapIncomingMessageWithPassthrough = wrapIncomingMessageWithPassthrough;
 exports.endStream = endStream;
 exports.safeWrite = safeWrite;
+const node_events_1 = require("node:events");
 const node_stream_1 = require("node:stream");
 const promises_1 = require("node:stream/promises");
 function isHeadersInstance(obj) {
@@ -64,9 +65,11 @@ function endStream(stream) {
     // @ts-expect-error Avoid arguments adaptor trampoline https://v8.dev/blog/adaptor-frame
     return stream.end(null, null, null);
 }
-function safeWrite(chunk, stream) {
+function safeWrite(chunk, stream, signal) {
     const result = stream.write(chunk);
     if (!result) {
-        return new Promise(resolve => stream.once('drain', resolve));
+        return (0, node_events_1.once)(stream, 'drain', {
+            signal,
+        });
     }
 }

package/esm/ReadableStream.js

@@ -1,5 +1,7 @@
 import { Buffer } from 'node:buffer';
+import { once } from 'node:events';
 import { Readable } from 'node:stream';
+import { pipeline } from 'node:stream/promises';
 import { handleMaybePromise } from '@whatwg-node/promise-helpers';
 import { fakePromise } from './utils.js';
 function createController(desiredSize, readable) {
@@ -122,12 +124,14 @@ export class PonyfillReadableStream {
     }
     cancel(reason) {
         this.readable.destroy(reason);
-        return new Promise(resolve => this.readable.once('end', resolve));
+        // @ts-expect-error - we know it is void
+        return once(this.readable, 'close');
     }
     locked = false;
     getReader(_options) {
         const iterator = this.readable[Symbol.asyncIterator]();
         this.locked = true;
+        const thisReadable = this.readable;
         return {
             read() {
                 return iterator.next();
@@ -156,10 +160,12 @@ export class PonyfillReadableStream {
                 this.locked = false;
                 return fakePromise();
             },
-            closed: new Promise((resolve, reject) => {
-                this.readable.once('end', resolve);
-                this.readable.once('error', reject);
-            }),
+            get closed() {
+                return Promise.race([
+                    once(thisReadable, 'end'),
+                    once(thisReadable, 'error').then(err => Promise.reject(err)),
+                ]);
+            },
         };
     }
     [Symbol.asyncIterator]() {
@@ -199,10 +205,8 @@ export class PonyfillReadableStream {
     }
     pipeTo(destination) {
         if (isPonyfillWritableStream(destination)) {
-            return new Promise((resolve, reject) => {
-                this.readable.pipe(destination.writable);
-                destination.writable.once('finish', resolve);
-                destination.writable.once('error', reject);
+            return pipeline(this.readable, destination.writable, {
+                end: true,
             });
         }
         else {

package/esm/TextEncoderDecoderStream.js

@@ -4,9 +4,7 @@ export class PonyfillTextDecoderStream extends PonyfillTransformStream {
     textDecoder;
     constructor(encoding, options) {
         super({
-            transform: (chunk, controller) => {
-                controller.enqueue(this.textDecoder.decode(chunk, { stream: true }));
-            },
+            transform: (chunk, controller) => controller.enqueue(this.textDecoder.decode(chunk, { stream: true })),
         });
         this.textDecoder = new PonyfillTextDecoder(encoding, options);
     }
@@ -24,9 +22,7 @@ export class PonyfillTextEncoderStream extends PonyfillTransformStream {
     textEncoder;
     constructor(encoding) {
         super({
-            transform: (chunk, controller) => {
-                controller.enqueue(this.textEncoder.encode(chunk));
-            },
+            transform: (chunk, controller) => controller.enqueue(this.textEncoder.encode(chunk)),
         });
         this.textEncoder = new PonyfillTextEncoder(encoding);
     }

package/esm/WritableStream.js

@@ -1,3 +1,4 @@
+import { once } from 'node:events';
 import { Writable } from 'node:stream';
 import { fakeRejectPromise } from '@whatwg-node/promise-helpers';
 import { endStream, fakePromise, safeWrite } from './utils.js';
@@ -59,19 +60,15 @@ export class PonyfillWritableStream {
     getWriter() {
         const writable = this.writable;
         return {
-            closed: new Promise(resolve => {
-                writable.once('close', () => {
-                    resolve(undefined);
-                });
-            }),
+            get closed() {
+                return once(writable, 'close');
+            },
             get desiredSize() {
                 return writable.writableLength;
             },
-            ready: new Promise(resolve => {
-                writable.once('drain', () => {
-                    resolve(undefined);
-                });
-            }),
+            get ready() {
+                return once(writable, 'drain');
+            },
             releaseLock() {
                 // no-op
             },
@@ -92,10 +89,8 @@ export class PonyfillWritableStream {
                 return fakePromise().then(() => endStream(writable));
             },
             abort(reason) {
-                return new Promise(resolve => {
-                    writable.destroy(reason);
-                    writable.once('close', resolve);
-                });
+                writable.destroy(reason);
+                return once(writable, 'close');
             },
         };
     }
@@ -109,10 +104,8 @@ export class PonyfillWritableStream {
         return fakePromise().then(() => endStream(this.writable));
     }
     abort(reason) {
-        return new Promise(resolve => {
-            this.writable.destroy(reason);
-            this.writable.once('close', resolve);
-        });
+        this.writable.destroy(reason);
+        return once(this.writable, 'close');
     }
     locked = false;
 }

package/esm/fetchNodeHttp.js

@@ -105,7 +105,7 @@ export function fetchNodeHttp(fetchRequest) {
                 resolve(ponyfillResponse);
             });
             if (fetchRequest['_buffer'] != null) {
-                handleMaybePromise(() => safeWrite(fetchRequest['_buffer'], nodeRequest), () => endStream(nodeRequest), reject);
+                handleMaybePromise(() => safeWrite(fetchRequest['_buffer'], nodeRequest, fetchRequest.signal), () => endStream(nodeRequest), reject);
             }
             else {
                 const nodeReadable = (fetchRequest.body != null

package/esm/utils.js

@@ -1,3 +1,4 @@
+import { once } from 'node:events';
 import { PassThrough } from 'node:stream';
 import { pipeline } from 'node:stream/promises';
 function isHeadersInstance(obj) {
@@ -51,9 +52,11 @@ export function endStream(stream) {
     // @ts-expect-error Avoid arguments adaptor trampoline https://v8.dev/blog/adaptor-frame
     return stream.end(null, null, null);
 }
-export function safeWrite(chunk, stream) {
+export function safeWrite(chunk, stream, signal) {
     const result = stream.write(chunk);
     if (!result) {
-        return new Promise(resolve => stream.once('drain', resolve));
+        return once(stream, 'drain', {
+            signal,
+        });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/node-fetch",
-  "version": "0.7.19",
+  "version": "0.7.20-alpha-20250512180730-0c5bd3cc4fb4349409e46f6c13c6774715600d41",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "dependencies": {

package/typings/utils.d.cts

@@ -1,5 +1,5 @@
 import { IncomingMessage } from 'node:http';
-import { PassThrough, Readable } from 'node:stream';
+import { PassThrough, Readable, Writable } from 'node:stream';
 export declare function getHeadersObj(headers: Headers): Record<string, string>;
 export declare function defaultHeadersSerializer(headers: Headers, onContentLength?: (value: string) => void): string[];
 export { fakePromise } from '@whatwg-node/promise-helpers';
@@ -16,7 +16,4 @@ export declare function wrapIncomingMessageWithPassthrough({ incomingMessage, si
 export declare function endStream(stream: {
     end: () => void;
 }): void;
-export declare function safeWrite(chunk: any, stream: {
-    write: (chunk: any) => boolean;
-    once: (event: string, listener: () => void) => void;
-}): Promise<void> | undefined;
+export declare function safeWrite(chunk: any, stream: Writable, signal?: AbortSignal | undefined): Promise<any> | undefined;

package/typings/utils.d.ts

@@ -1,5 +1,5 @@
 import { IncomingMessage } from 'node:http';
-import { PassThrough, Readable } from 'node:stream';
+import { PassThrough, Readable, Writable } from 'node:stream';
 export declare function getHeadersObj(headers: Headers): Record<string, string>;
 export declare function defaultHeadersSerializer(headers: Headers, onContentLength?: (value: string) => void): string[];
 export { fakePromise } from '@whatwg-node/promise-helpers';
@@ -16,7 +16,4 @@ export declare function wrapIncomingMessageWithPassthrough({ incomingMessage, si
 export declare function endStream(stream: {
     end: () => void;
 }): void;
-export declare function safeWrite(chunk: any, stream: {
-    write: (chunk: any) => boolean;
-    once: (event: string, listener: () => void) => void;
-}): Promise<void> | undefined;
+export declare function safeWrite(chunk: any, stream: Writable, signal?: AbortSignal | undefined): Promise<any> | undefined;