@whatwg-node/node-fetch 0.8.0-alpha-20241212154840-0a0effe808a6614e0a3afd853126a38641485756 → 0.8.0-alpha-20250917012053-36c9ccdc3e94ee8d0961f17398a9053fa55df37b

package/esm/ReadableStream.js

@@ -1,4 +1,8 @@
-import { Readable } from 'stream';
+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) {
     let chunks = [];
@@ -62,20 +66,31 @@ export class PonyfillReadableStream {
         else {
             let started = false;
             let ongoing = false;
-            const readImpl = async (desiredSize) => {
+            const handleStart = (desiredSize) => {
                 if (!started) {
                     const controller = createController(desiredSize, this.readable);
                     started = true;
-                    await underlyingSource?.start?.(controller);
-                    controller._flush();
-                    if (controller._closed) {
+                    return handleMaybePromise(() => underlyingSource?.start?.(controller), () => {
+                        controller._flush();
+                        if (controller._closed) {
+                            return false;
+                        }
+                        return true;
+                    });
+                }
+                return true;
+            };
+            const readImpl = (desiredSize) => {
+                return handleMaybePromise(() => handleStart(desiredSize), shouldContinue => {
+                    if (!shouldContinue) {
                         return;
                     }
-                }
-                const controller = createController(desiredSize, this.readable);
-                await underlyingSource?.pull?.(controller);
-                controller._flush();
-                ongoing = false;
+                    const controller = createController(desiredSize, this.readable);
+                    return handleMaybePromise(() => underlyingSource?.pull?.(controller), () => {
+                        controller._flush();
+                        ongoing = false;
+                    });
+                });
             };
             this.readable = new Readable({
                 read(desiredSize) {
@@ -109,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();
@@ -141,16 +158,36 @@ export class PonyfillReadableStream {
                     }
                 }
                 this.locked = false;
-                return fakePromise(undefined);
+                return fakePromise();
+            },
+            get closed() {
+                return Promise.race([
+                    once(thisReadable, 'end'),
+                    once(thisReadable, 'error').then(err => Promise.reject(err)),
+                ]);
             },
-            closed: new Promise((resolve, reject) => {
-                this.readable.once('end', resolve);
-                this.readable.once('error', reject);
-            }),
         };
     }
     [Symbol.asyncIterator]() {
-        return this.readable[Symbol.asyncIterator]();
+        const iterator = this.readable[Symbol.asyncIterator]();
+        return {
+            [Symbol.asyncIterator]() {
+                return this;
+            },
+            next: () => iterator.next(),
+            return: () => {
+                if (!this.readable.destroyed) {
+                    this.readable.destroy();
+                }
+                return iterator.return?.() || fakePromise({ done: true, value: undefined });
+            },
+            throw: (err) => {
+                if (!this.readable.destroyed) {
+                    this.readable.destroy(err);
+                }
+                return iterator.throw?.(err) || fakePromise({ done: true, value: undefined });
+            },
+        };
     }
     tee() {
         throw new Error('Not implemented');
@@ -168,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 {
@@ -196,6 +231,7 @@ export class PonyfillReadableStream {
     static from(iterable) {
         return new PonyfillReadableStream(Readable.from(iterable));
     }
+    [Symbol.toStringTag] = 'ReadableStream';
 }
 function isPonyfillReadableStream(obj) {
     return obj?.readable != null;

package/esm/Request.js

@@ -1,6 +1,5 @@
-import { Agent as HTTPAgent } from 'http';
-import { Agent as HTTPSAgent } from 'https';
-import { PonyfillAbortController } from './AbortController.js';
+import { Agent as HTTPAgent } from 'node:http';
+import { Agent as HTTPSAgent } from 'node:https';
 import { PonyfillBody } from './Body.js';
 import { isHeadersLike, PonyfillHeaders } from './Headers.js';
 import { PonyfillURL } from './URL.js';
@@ -39,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';
@@ -55,7 +54,6 @@ export class PonyfillRequest extends PonyfillBody {
         this.redirect = requestInit?.redirect || 'follow';
         this.referrer = requestInit?.referrer || 'about:client';
         this.referrerPolicy = requestInit?.referrerPolicy || 'no-referrer';
-        this._signal = requestInit?.signal;
         this.headersSerializer = requestInit?.headersSerializer;
         this.duplex = requestInit?.duplex || 'half';
         this.destination = 'document';
@@ -90,6 +88,10 @@ export class PonyfillRequest extends PonyfillBody {
     referrer;
     referrerPolicy;
     _url;
+    get signal() {
+        this._signal ||= new AbortController().signal;
+        return this._signal;
+    }
     get url() {
         if (this._url == null) {
             if (this._parsedUrl) {
@@ -115,15 +117,6 @@ export class PonyfillRequest extends PonyfillBody {
     }
     duplex;
     agent;
-    _signal;
-    get signal() {
-        // Create a new signal only if needed
-        // Because the creation of signal is expensive
-        if (!this._signal) {
-            this._signal = new PonyfillAbortController().signal;
-        }
-        return this._signal;
-    }
     clone() {
         return this;
     }

package/esm/Response.js

@@ -1,4 +1,4 @@
-import { STATUS_CODES } from 'http';
+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';
@@ -45,14 +45,60 @@ export class PonyfillResponse extends PonyfillBody {
             status,
         });
     }
-    static json(data, init = {}) {
-        init.headers =
-            init?.headers && isHeadersLike(init.headers)
-                ? init.headers
-                : new PonyfillHeaders(init?.headers);
-        if (!init.headers.has('content-type')) {
-            init.headers.set('content-type', JSON_CONTENT_TYPE);
+    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(JSON.stringify(data), init);
+        return new PonyfillResponse(bodyInit, init);
     }
+    [Symbol.toStringTag] = 'Response';
 }

package/esm/TextEncoderDecoder.js

@@ -1,3 +1,4 @@
+import { Buffer } from 'node:buffer';
 import { isArrayBufferView } from './utils.js';
 export class PonyfillTextEncoder {
     encoding;

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/TransformStream.js

@@ -1,5 +1,6 @@
 import { Transform } from 'node:stream';
 import { PonyfillReadableStream } from './ReadableStream.js';
+import { endStream } from './utils.js';
 import { PonyfillWritableStream } from './WritableStream.js';
 export class PonyfillTransformStream {
     transform;
@@ -18,7 +19,7 @@ export class PonyfillTransformStream {
                     transform.destroy(reason);
                 },
                 terminate() {
-                    transform.end();
+                    endStream(transform);
                 },
                 get desiredSize() {
                     return transform.writableLength;

package/esm/URL.js

@@ -1,79 +1,24 @@
-import { resolveObjectURL } from 'buffer';
-import { randomUUID } from 'crypto';
-import FastQuerystring from 'fast-querystring';
-import FastUrl from '@kamilkisiela/fast-url-parser';
-import { PonyfillURLSearchParams } from './URLSearchParams.js';
-FastUrl.queryString = FastQuerystring;
-const IPV6_REGEX = /^(?:(?:(?:[0-9A-Fa-f]{1,4}:){6}(?:[0-9A-Fa-f]{1,4}:[0-9A-Fa-f]{1,4}|(?:(?:0?0?[0-9]|0?[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}(?:0?0?[0-9]|0?[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))|::(?:[0-9A-Fa-f]{1,4}:){5}(?:[0-9A-Fa-f]{1,4}:[0-9A-Fa-f]{1,4}|(?:(?:0?0?[0-9]|0?[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}(?:0?0?[0-9]|0?[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))|(?:[0-9A-Fa-f]{1,4})?::(?:[0-9A-Fa-f]{1,4}:){4}(?:[0-9A-Fa-f]{1,4}:[0-9A-Fa-f]{1,4}|(?:(?:0?0?[0-9]|0?[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}(?:0?0?[0-9]|0?[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))|(?:(?:[0-9A-Fa-f]{1,4}:){0,1}[0-9A-Fa-f]{1,4})?::(?:[0-9A-Fa-f]{1,4}:){3}(?:[0-9A-Fa-f]{1,4}:[0-9A-Fa-f]{1,4}|(?:(?:0?0?[0-9]|0?[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}(?:0?0?[0-9]|0?[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))|(?:(?:[0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})?::(?:[0-9A-Fa-f]{1,4}:){2}(?:[0-9A-Fa-f]{1,4}:[0-9A-Fa-f]{1,4}|(?:(?:0?0?[0-9]|0?[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}(?:0?0?[0-9]|0?[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))|(?:(?:[0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})?::[0-9A-Fa-f]{1,4}:(?:[0-9A-Fa-f]{1,4}:[0-9A-Fa-f]{1,4}|(?:(?:0?0?[0-9]|0?[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}(?:0?0?[0-9]|0?[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))|(?:(?:[0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})?::(?:[0-9A-Fa-f]{1,4}:[0-9A-Fa-f]{1,4}|(?:(?:0?0?[0-9]|0?[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}(?:0?0?[0-9]|0?[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))|(?:(?:[0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})?::[0-9A-Fa-f]{1,4}|(?:(?:[0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})?::)(?:\/(?:0?0?[0-9]|0?[1-9][0-9]|1[01][0-9]|12[0-8]))?)$/;
-export class PonyfillURL extends FastUrl {
-    constructor(url, base) {
-        super();
-        if (url.startsWith('data:')) {
-            this.protocol = 'data:';
-            this.pathname = url.slice('data:'.length);
-            return;
-        }
-        this.parse(url, false);
-        // `fast-url-parser` cannot handle ipv6 hosts correctly
-        if ((url.startsWith('http://[') || url.startsWith('https://[')) &&
-            IPV6_REGEX.test(this.hostname)) {
-            this.hostname = `[${this.hostname}]`;
-        }
-        if (base) {
-            const baseParsed = typeof base === 'string' ? new PonyfillURL(base) : base;
-            this.protocol ||= baseParsed.protocol;
-            this.host ||= baseParsed.host;
-            this.pathname ||= baseParsed.pathname;
-            this.port ||= baseParsed.port;
-        }
-    }
-    get origin() {
-        return `${this.protocol}//${this.host}${this.port ? `:${this.port}` : ''}`;
-    }
-    _searchParams;
-    get searchParams() {
-        if (!this._searchParams) {
-            this._searchParams = new PonyfillURLSearchParams(this.query);
-        }
-        return this._searchParams;
-    }
-    get username() {
-        return this.auth?.split(':')[0] || '';
-    }
-    set username(value) {
-        this.auth = `${value}:${this.password}`;
-    }
-    get password() {
-        return this.auth?.split(':')[1] || '';
-    }
-    set password(value) {
-        this.auth = `${this.username}:${value}`;
-    }
-    toString() {
-        if (this._searchParams) {
-            this.search = this._searchParams.toString();
-        }
-        return this.format();
-    }
-    toJSON() {
-        return this.toString();
-    }
+import NodeBuffer from 'node:buffer';
+import { randomUUID } from 'node:crypto';
+const NativeURL = globalThis.URL;
+class URL extends NativeURL {
+    // This part is only needed to handle `PonyfillBlob` objects
     static blobRegistry = new Map();
     static createObjectURL(blob) {
         const blobUrl = `blob:whatwgnode:${randomUUID()}`;
         this.blobRegistry.set(blobUrl, blob);
         return blobUrl;
     }
-    static resolveObjectURL(url) {
+    static revokeObjectURL(url) {
         if (!this.blobRegistry.has(url)) {
-            URL.revokeObjectURL(url);
+            NativeURL.revokeObjectURL(url);
         }
         else {
             this.blobRegistry.delete(url);
         }
     }
     static getBlobFromURL(url) {
-        return (this.blobRegistry.get(url) || resolveObjectURL(url));
+        return (this.blobRegistry.get(url) || NodeBuffer?.resolveObjectURL?.(url));
     }
-    [Symbol.toStringTag] = 'URL';
 }
+export { URL as PonyfillURL };

package/esm/URLSearchParams.js

@@ -1,115 +1 @@
-import FastQuerystring from 'fast-querystring';
-import { PonyfillIteratorObject } from './IteratorObject.js';
-function isURLSearchParams(value) {
-    return value?.entries != null;
-}
-export class PonyfillURLSearchParams {
-    params;
-    constructor(init) {
-        if (init) {
-            if (typeof init === 'string') {
-                this.params = FastQuerystring.parse(init);
-            }
-            else if (Array.isArray(init)) {
-                this.params = {};
-                for (const [key, value] of init) {
-                    this.params[key] = value;
-                }
-            }
-            else if (isURLSearchParams(init)) {
-                this.params = {};
-                for (const [key, value] of init.entries()) {
-                    this.params[key] = value;
-                }
-            }
-            else {
-                this.params = init;
-            }
-        }
-        else {
-            this.params = {};
-        }
-    }
-    append(name, value) {
-        const existingValue = this.params[name];
-        const finalValue = existingValue ? `${existingValue},${value}` : value;
-        this.params[name] = finalValue;
-    }
-    delete(name) {
-        delete this.params[name];
-    }
-    get(name) {
-        const value = this.params[name];
-        if (Array.isArray(value)) {
-            return value[0] || null;
-        }
-        return value || null;
-    }
-    getAll(name) {
-        const value = this.params[name];
-        if (!Array.isArray(value)) {
-            return value ? [value] : [];
-        }
-        return value;
-    }
-    has(name) {
-        return name in this.params;
-    }
-    set(name, value) {
-        this.params[name] = value;
-    }
-    sort() {
-        const sortedKeys = Object.keys(this.params).sort();
-        const sortedParams = {};
-        for (const key of sortedKeys) {
-            sortedParams[key] = this.params[key];
-        }
-        this.params = sortedParams;
-    }
-    toString() {
-        return FastQuerystring.stringify(this.params);
-    }
-    *_keys() {
-        for (const key in this.params) {
-            yield key;
-        }
-    }
-    keys() {
-        return new PonyfillIteratorObject(this._keys(), 'URLSearchParamsIterator');
-    }
-    *_entries() {
-        for (const key of this.keys()) {
-            const value = this.params[key];
-            if (Array.isArray(value)) {
-                for (const item of value) {
-                    yield [key, item];
-                }
-            }
-            else {
-                yield [key, value];
-            }
-        }
-    }
-    entries() {
-        return new PonyfillIteratorObject(this._entries(), 'URLSearchParamsIterator');
-    }
-    *_values() {
-        for (const [, value] of this) {
-            yield value;
-        }
-    }
-    values() {
-        return new PonyfillIteratorObject(this._values(), 'URLSearchParamsIterator');
-    }
-    [Symbol.iterator]() {
-        return this.entries();
-    }
-    forEach(callback) {
-        for (const [key, value] of this) {
-            callback(value, key, this);
-        }
-    }
-    get size() {
-        return Object.keys(this.params).length;
-    }
-}
+export const PonyfillURLSearchParams = globalThis.URLSearchParams;