@whatwg-node/node-fetch 0.7.3 → 0.7.4-alpha-20241125125556-f6d4dd923d74499ecd7ef790e4704bf3bffd1892

package/cjs/IteratorObject.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PonyfillIteratorObject = void 0;
 const node_util_1 = require("node:util");
+const disposablestack_1 = require("@whatwg-node/disposablestack");
 const utils_js_1 = require("./utils.js");
 class PonyfillIteratorObject {
     iterableIterator;
@@ -110,10 +111,8 @@ class PonyfillIteratorObject {
     toArray() {
         return Array.from(this.iterableIterator);
     }
-    [Symbol.dispose]() {
-        if (typeof this.iterableIterator.return === 'function') {
-            this.iterableIterator.return();
-        }
+    [disposablestack_1.DisposableSymbols.dispose]() {
+        this.iterableIterator.return?.();
     }
     next(...[value]) {
         return this.iterableIterator.next(value);

package/cjs/ReadableStream.js

@@ -65,27 +65,28 @@ class PonyfillReadableStream {
         else {
             let started = false;
             let ongoing = false;
+            const readImpl = async (desiredSize) => {
+                if (!started) {
+                    const controller = createController(desiredSize, this.readable);
+                    started = true;
+                    await underlyingSource?.start?.(controller);
+                    controller._flush();
+                    if (controller._closed) {
+                        return;
+                    }
+                }
+                const controller = createController(desiredSize, this.readable);
+                await underlyingSource?.pull?.(controller);
+                controller._flush();
+                ongoing = false;
+            };
             this.readable = new stream_1.Readable({
                 read(desiredSize) {
                     if (ongoing) {
                         return;
                     }
                     ongoing = true;
-                    return Promise.resolve().then(async () => {
-                        if (!started) {
-                            const controller = createController(desiredSize, this);
-                            started = true;
-                            await underlyingSource?.start?.(controller);
-                            controller._flush();
-                            if (controller._closed) {
-                                return;
-                            }
-                        }
-                        const controller = createController(desiredSize, this);
-                        await underlyingSource?.pull?.(controller);
-                        controller._flush();
-                        ongoing = false;
-                    });
+                    return readImpl(desiredSize);
                 },
                 destroy(err, callback) {
                     if (underlyingSource?.cancel) {
@@ -157,6 +158,17 @@ class PonyfillReadableStream {
     tee() {
         throw new Error('Not implemented');
     }
+    async pipeToWriter(writer) {
+        try {
+            for await (const chunk of this) {
+                await writer.write(chunk);
+            }
+            await writer.close();
+        }
+        catch (err) {
+            await writer.abort(err);
+        }
+    }
     pipeTo(destination) {
         if (isPonyfillWritableStream(destination)) {
             return new Promise((resolve, reject) => {
@@ -167,17 +179,7 @@ class PonyfillReadableStream {
         }
         else {
             const writer = destination.getWriter();
-            return Promise.resolve().then(async () => {
-                try {
-                    for await (const chunk of this) {
-                        await writer.write(chunk);
-                    }
-                    await writer.close();
-                }
-                catch (err) {
-                    await writer.abort(err);
-                }
-            });
+            return this.pipeToWriter(writer);
         }
     }
     pipeThrough({ writable, readable, }) {

package/cjs/Request.js

@@ -5,6 +5,7 @@ const http_1 = require("http");
 const https_1 = require("https");
 const Body_js_1 = require("./Body.js");
 const Headers_js_1 = require("./Headers.js");
+const URL_js_1 = require("./URL.js");
 function isRequest(input) {
     return input[Symbol.toStringTag] === 'Request';
 }
@@ -13,17 +14,26 @@ function isURL(obj) {
 }
 class PonyfillRequest extends Body_js_1.PonyfillBody {
     constructor(input, options) {
-        let url;
+        let _url;
+        let _parsedUrl;
         let bodyInit = null;
         let requestInit;
         if (typeof input === 'string') {
-            url = input;
+            _url = input;
         }
         else if (isURL(input)) {
-            url = input.toString();
+            _parsedUrl = input;
         }
         else if (isRequest(input)) {
-            url = input.url;
+            if (input._parsedUrl) {
+                _parsedUrl = input._parsedUrl;
+            }
+            else if (input._url) {
+                _url = input._url;
+            }
+            else {
+                _url = input.url;
+            }
             bodyInit = input.body;
             requestInit = input;
         }
@@ -32,6 +42,8 @@ class PonyfillRequest extends Body_js_1.PonyfillBody {
             requestInit = options;
         }
         super(bodyInit, options);
+        this._url = _url;
+        this._parsedUrl = _parsedUrl;
         this.cache = requestInit?.cache || 'default';
         this.credentials = requestInit?.credentials || 'same-origin';
         this.headers =
@@ -48,20 +60,20 @@ class PonyfillRequest extends Body_js_1.PonyfillBody {
         this._signal = requestInit?.signal;
         this.headersSerializer = requestInit?.headersSerializer;
         this.duplex = requestInit?.duplex || 'half';
-        this.url = url || '';
         this.destination = 'document';
         this.priority = 'auto';
         if (this.method !== 'GET' && this.method !== 'HEAD') {
             this.handleContentLengthHeader(true);
         }
         if (requestInit?.agent != null) {
+            const protocol = _parsedUrl?.protocol || _url || this.url;
             if (requestInit.agent === false) {
                 this.agent = false;
             }
-            else if (this.url.startsWith('http:/') && requestInit.agent instanceof http_1.Agent) {
+            else if (protocol.startsWith('http:') && requestInit.agent instanceof http_1.Agent) {
                 this.agent = requestInit.agent;
             }
-            else if (this.url.startsWith('https:/') && requestInit.agent instanceof https_1.Agent) {
+            else if (protocol.startsWith('https:') && requestInit.agent instanceof https_1.Agent) {
                 this.agent = requestInit.agent;
             }
         }
@@ -79,7 +91,30 @@ class PonyfillRequest extends Body_js_1.PonyfillBody {
     redirect;
     referrer;
     referrerPolicy;
-    url;
+    _url;
+    get url() {
+        if (this._url == null) {
+            if (this._parsedUrl) {
+                this._url = this._parsedUrl.toString();
+            }
+            else {
+                throw new TypeError('Invalid URL');
+            }
+        }
+        return this._url;
+    }
+    _parsedUrl;
+    get parsedUrl() {
+        if (this._parsedUrl == null) {
+            if (this._url != null) {
+                this._parsedUrl = new URL_js_1.PonyfillURL(this._url);
+            }
+            else {
+                throw new TypeError('Invalid URL');
+            }
+        }
+        return this._parsedUrl;
+    }
     duplex;
     agent;
     _signal;

package/cjs/URL.js

@@ -69,5 +69,6 @@ class PonyfillURL extends fast_url_parser_1.default {
     static getBlobFromURL(url) {
         return (this.blobRegistry.get(url) || (0, buffer_1.resolveObjectURL)(url));
     }
+    [Symbol.toStringTag] = 'URL';
 }
 exports.PonyfillURL = PonyfillURL;

package/cjs/fetchNodeHttp.js

@@ -21,7 +21,7 @@ function getRequestFnForProtocol(url) {
 function fetchNodeHttp(fetchRequest) {
     return new Promise((resolve, reject) => {
         try {
-            const requestFn = getRequestFnForProtocol(fetchRequest.url);
+            const requestFn = getRequestFnForProtocol(fetchRequest.parsedUrl?.protocol || fetchRequest.url);
             const nodeReadable = (fetchRequest.body != null
                 ? (0, utils_js_1.isNodeReadable)(fetchRequest.body)
                     ? fetchRequest.body
@@ -32,12 +32,28 @@ function fetchNodeHttp(fetchRequest) {
             if (nodeHeaders['accept-encoding'] == null) {
                 nodeHeaders['accept-encoding'] = 'gzip, deflate, br';
             }
-            const nodeRequest = requestFn(fetchRequest.url, {
-                method: fetchRequest.method,
-                headers: nodeHeaders,
-                signal: fetchRequest['_signal'] ?? undefined,
-                agent: fetchRequest.agent,
-            });
+            let nodeRequest;
+            if (fetchRequest.parsedUrl) {
+                nodeRequest = requestFn({
+                    host: fetchRequest.parsedUrl.host,
+                    hostname: fetchRequest.parsedUrl.hostname,
+                    method: fetchRequest.method,
+                    path: fetchRequest.parsedUrl.pathname + (fetchRequest.parsedUrl.search || ''),
+                    port: fetchRequest.parsedUrl.port,
+                    protocol: fetchRequest.parsedUrl.protocol,
+                    headers: nodeHeaders,
+                    signal: fetchRequest['_signal'] ?? undefined,
+                    agent: fetchRequest.agent,
+                });
+            }
+            else {
+                nodeRequest = requestFn(fetchRequest.url, {
+                    method: fetchRequest.method,
+                    headers: nodeHeaders,
+                    signal: fetchRequest['_signal'] ?? undefined,
+                    agent: fetchRequest.agent,
+                });
+            }
             nodeRequest.once('response', nodeResponse => {
                 let outputStream;
                 const contentEncoding = nodeResponse.headers['content-encoding'];

package/cjs/utils.js

@@ -14,11 +14,7 @@ function getHeadersObj(headers) {
     if (headers == null || !isHeadersInstance(headers)) {
         return headers;
     }
-    const obj = {};
-    headers.forEach((value, key) => {
-        obj[key] = value;
-    });
-    return obj;
+    return Object.fromEntries(headers.entries());
 }
 function defaultHeadersSerializer(headers, onContentLength) {
     const headerArray = [];

package/esm/IteratorObject.js

@@ -1,4 +1,5 @@
 import { inspect } from 'node:util';
+import { DisposableSymbols } from '@whatwg-node/disposablestack';
 import { isIterable } from './utils.js';
 export class PonyfillIteratorObject {
     iterableIterator;
@@ -107,10 +108,8 @@ export class PonyfillIteratorObject {
     toArray() {
         return Array.from(this.iterableIterator);
     }
-    [Symbol.dispose]() {
-        if (typeof this.iterableIterator.return === 'function') {
-            this.iterableIterator.return();
-        }
+    [DisposableSymbols.dispose]() {
+        this.iterableIterator.return?.();
     }
     next(...[value]) {
         return this.iterableIterator.next(value);

package/esm/ReadableStream.js

@@ -62,27 +62,28 @@ export class PonyfillReadableStream {
         else {
             let started = false;
             let ongoing = false;
+            const readImpl = async (desiredSize) => {
+                if (!started) {
+                    const controller = createController(desiredSize, this.readable);
+                    started = true;
+                    await underlyingSource?.start?.(controller);
+                    controller._flush();
+                    if (controller._closed) {
+                        return;
+                    }
+                }
+                const controller = createController(desiredSize, this.readable);
+                await underlyingSource?.pull?.(controller);
+                controller._flush();
+                ongoing = false;
+            };
             this.readable = new Readable({
                 read(desiredSize) {
                     if (ongoing) {
                         return;
                     }
                     ongoing = true;
-                    return Promise.resolve().then(async () => {
-                        if (!started) {
-                            const controller = createController(desiredSize, this);
-                            started = true;
-                            await underlyingSource?.start?.(controller);
-                            controller._flush();
-                            if (controller._closed) {
-                                return;
-                            }
-                        }
-                        const controller = createController(desiredSize, this);
-                        await underlyingSource?.pull?.(controller);
-                        controller._flush();
-                        ongoing = false;
-                    });
+                    return readImpl(desiredSize);
                 },
                 destroy(err, callback) {
                     if (underlyingSource?.cancel) {
@@ -154,6 +155,17 @@ export class PonyfillReadableStream {
     tee() {
         throw new Error('Not implemented');
     }
+    async pipeToWriter(writer) {
+        try {
+            for await (const chunk of this) {
+                await writer.write(chunk);
+            }
+            await writer.close();
+        }
+        catch (err) {
+            await writer.abort(err);
+        }
+    }
     pipeTo(destination) {
         if (isPonyfillWritableStream(destination)) {
             return new Promise((resolve, reject) => {
@@ -164,17 +176,7 @@ export class PonyfillReadableStream {
         }
         else {
             const writer = destination.getWriter();
-            return Promise.resolve().then(async () => {
-                try {
-                    for await (const chunk of this) {
-                        await writer.write(chunk);
-                    }
-                    await writer.close();
-                }
-                catch (err) {
-                    await writer.abort(err);
-                }
-            });
+            return this.pipeToWriter(writer);
         }
     }
     pipeThrough({ writable, readable, }) {

package/esm/Request.js

@@ -2,6 +2,7 @@ import { Agent as HTTPAgent } from 'http';
 import { Agent as HTTPSAgent } from 'https';
 import { PonyfillBody } from './Body.js';
 import { isHeadersLike, PonyfillHeaders } from './Headers.js';
+import { PonyfillURL } from './URL.js';
 function isRequest(input) {
     return input[Symbol.toStringTag] === 'Request';
 }
@@ -10,17 +11,26 @@ function isURL(obj) {
 }
 export class PonyfillRequest extends PonyfillBody {
     constructor(input, options) {
-        let url;
+        let _url;
+        let _parsedUrl;
         let bodyInit = null;
         let requestInit;
         if (typeof input === 'string') {
-            url = input;
+            _url = input;
         }
         else if (isURL(input)) {
-            url = input.toString();
+            _parsedUrl = input;
         }
         else if (isRequest(input)) {
-            url = input.url;
+            if (input._parsedUrl) {
+                _parsedUrl = input._parsedUrl;
+            }
+            else if (input._url) {
+                _url = input._url;
+            }
+            else {
+                _url = input.url;
+            }
             bodyInit = input.body;
             requestInit = input;
         }
@@ -29,6 +39,8 @@ export class PonyfillRequest extends PonyfillBody {
             requestInit = options;
         }
         super(bodyInit, options);
+        this._url = _url;
+        this._parsedUrl = _parsedUrl;
         this.cache = requestInit?.cache || 'default';
         this.credentials = requestInit?.credentials || 'same-origin';
         this.headers =
@@ -45,20 +57,20 @@ export class PonyfillRequest extends PonyfillBody {
         this._signal = requestInit?.signal;
         this.headersSerializer = requestInit?.headersSerializer;
         this.duplex = requestInit?.duplex || 'half';
-        this.url = url || '';
         this.destination = 'document';
         this.priority = 'auto';
         if (this.method !== 'GET' && this.method !== 'HEAD') {
             this.handleContentLengthHeader(true);
         }
         if (requestInit?.agent != null) {
+            const protocol = _parsedUrl?.protocol || _url || this.url;
             if (requestInit.agent === false) {
                 this.agent = false;
             }
-            else if (this.url.startsWith('http:/') && requestInit.agent instanceof HTTPAgent) {
+            else if (protocol.startsWith('http:') && requestInit.agent instanceof HTTPAgent) {
                 this.agent = requestInit.agent;
             }
-            else if (this.url.startsWith('https:/') && requestInit.agent instanceof HTTPSAgent) {
+            else if (protocol.startsWith('https:') && requestInit.agent instanceof HTTPSAgent) {
                 this.agent = requestInit.agent;
             }
         }
@@ -76,7 +88,30 @@ export class PonyfillRequest extends PonyfillBody {
     redirect;
     referrer;
     referrerPolicy;
-    url;
+    _url;
+    get url() {
+        if (this._url == null) {
+            if (this._parsedUrl) {
+                this._url = this._parsedUrl.toString();
+            }
+            else {
+                throw new TypeError('Invalid URL');
+            }
+        }
+        return this._url;
+    }
+    _parsedUrl;
+    get parsedUrl() {
+        if (this._parsedUrl == null) {
+            if (this._url != null) {
+                this._parsedUrl = new PonyfillURL(this._url);
+            }
+            else {
+                throw new TypeError('Invalid URL');
+            }
+        }
+        return this._parsedUrl;
+    }
     duplex;
     agent;
     _signal;

package/esm/URL.js

@@ -65,4 +65,5 @@ export class PonyfillURL extends FastUrl {
     static getBlobFromURL(url) {
         return (this.blobRegistry.get(url) || resolveObjectURL(url));
     }
+    [Symbol.toStringTag] = 'URL';
 }

package/esm/fetchNodeHttp.js

@@ -18,7 +18,7 @@ function getRequestFnForProtocol(url) {
 export function fetchNodeHttp(fetchRequest) {
     return new Promise((resolve, reject) => {
         try {
-            const requestFn = getRequestFnForProtocol(fetchRequest.url);
+            const requestFn = getRequestFnForProtocol(fetchRequest.parsedUrl?.protocol || fetchRequest.url);
             const nodeReadable = (fetchRequest.body != null
                 ? isNodeReadable(fetchRequest.body)
                     ? fetchRequest.body
@@ -29,12 +29,28 @@ export function fetchNodeHttp(fetchRequest) {
             if (nodeHeaders['accept-encoding'] == null) {
                 nodeHeaders['accept-encoding'] = 'gzip, deflate, br';
             }
-            const nodeRequest = requestFn(fetchRequest.url, {
-                method: fetchRequest.method,
-                headers: nodeHeaders,
-                signal: fetchRequest['_signal'] ?? undefined,
-                agent: fetchRequest.agent,
-            });
+            let nodeRequest;
+            if (fetchRequest.parsedUrl) {
+                nodeRequest = requestFn({
+                    host: fetchRequest.parsedUrl.host,
+                    hostname: fetchRequest.parsedUrl.hostname,
+                    method: fetchRequest.method,
+                    path: fetchRequest.parsedUrl.pathname + (fetchRequest.parsedUrl.search || ''),
+                    port: fetchRequest.parsedUrl.port,
+                    protocol: fetchRequest.parsedUrl.protocol,
+                    headers: nodeHeaders,
+                    signal: fetchRequest['_signal'] ?? undefined,
+                    agent: fetchRequest.agent,
+                });
+            }
+            else {
+                nodeRequest = requestFn(fetchRequest.url, {
+                    method: fetchRequest.method,
+                    headers: nodeHeaders,
+                    signal: fetchRequest['_signal'] ?? undefined,
+                    agent: fetchRequest.agent,
+                });
+            }
             nodeRequest.once('response', nodeResponse => {
                 let outputStream;
                 const contentEncoding = nodeResponse.headers['content-encoding'];

package/esm/utils.js

@@ -5,11 +5,7 @@ export function getHeadersObj(headers) {
     if (headers == null || !isHeadersInstance(headers)) {
         return headers;
     }
-    const obj = {};
-    headers.forEach((value, key) => {
-        obj[key] = value;
-    });
-    return obj;
+    return Object.fromEntries(headers.entries());
 }
 export function defaultHeadersSerializer(headers, onContentLength) {
     const headerArray = [];

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@whatwg-node/node-fetch",
-  "version": "0.7.3",
+  "version": "0.7.4-alpha-20241125125556-f6d4dd923d74499ecd7ef790e4704bf3bffd1892",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "dependencies": {
     "@kamilkisiela/fast-url-parser": "^1.1.4",
+    "@whatwg-node/disposablestack": "^0.0.5",
     "busboy": "^1.6.0",
     "fast-querystring": "^1.1.1",
     "tslib": "^2.6.3"

package/typings/IteratorObject.d.cts

@@ -1,3 +1,4 @@
+import { DisposableSymbols } from '@whatwg-node/disposablestack';
 export declare class PonyfillIteratorObject<T> implements IteratorObject<T, undefined, unknown> {
     private iterableIterator;
     [Symbol.toStringTag]: string;
@@ -13,7 +14,7 @@ export declare class PonyfillIteratorObject<T> implements IteratorObject<T, unde
     every(predicate: (value: T, index: number) => unknown): boolean;
     find(predicate: (value: T, index: number) => unknown): T | undefined;
     toArray(): T[];
-    [Symbol.dispose](): void;
+    [DisposableSymbols.dispose](): void;
     next(...[value]: [] | [unknown]): IteratorResult<T, undefined>;
     [Symbol.iterator](): URLSearchParamsIterator<T>;
 }

package/typings/IteratorObject.d.ts

@@ -1,3 +1,4 @@
+import { DisposableSymbols } from '@whatwg-node/disposablestack';
 export declare class PonyfillIteratorObject<T> implements IteratorObject<T, undefined, unknown> {
     private iterableIterator;
     [Symbol.toStringTag]: string;
@@ -13,7 +14,7 @@ export declare class PonyfillIteratorObject<T> implements IteratorObject<T, unde
     every(predicate: (value: T, index: number) => unknown): boolean;
     find(predicate: (value: T, index: number) => unknown): T | undefined;
     toArray(): T[];
-    [Symbol.dispose](): void;
+    [DisposableSymbols.dispose](): void;
     next(...[value]: [] | [unknown]): IteratorResult<T, undefined>;
     [Symbol.iterator](): URLSearchParamsIterator<T>;
 }

package/typings/ReadableStream.d.cts

@@ -10,6 +10,7 @@ export declare class PonyfillReadableStream<T> implements ReadableStream<T> {
     getReader(): ReadableStreamDefaultReader<T>;
     [Symbol.asyncIterator](): NodeJS.AsyncIterator<any, any, any>;
     tee(): [ReadableStream<T>, ReadableStream<T>];
+    private pipeToWriter;
     pipeTo(destination: WritableStream<T>): Promise<void>;
     pipeThrough<T2>({ writable, readable, }: {
         writable: WritableStream<T>;

package/typings/ReadableStream.d.ts

@@ -10,6 +10,7 @@ export declare class PonyfillReadableStream<T> implements ReadableStream<T> {
     getReader(): ReadableStreamDefaultReader<T>;
     [Symbol.asyncIterator](): NodeJS.AsyncIterator<any, any, any>;
     tee(): [ReadableStream<T>, ReadableStream<T>];
+    private pipeToWriter;
     pipeTo(destination: WritableStream<T>): Promise<void>;
     pipeThrough<T2>({ writable, readable, }: {
         writable: WritableStream<T>;

package/typings/Request.d.cts

@@ -25,7 +25,10 @@ export declare class PonyfillRequest<TJSON = any> extends PonyfillBody<TJSON> im
     redirect: RequestRedirect;
     referrer: string;
     referrerPolicy: ReferrerPolicy;
-    url: string;
+    _url: string | undefined;
+    get url(): string;
+    _parsedUrl: URL | undefined;
+    get parsedUrl(): URL;
     duplex: 'half' | 'full';
     agent: HTTPAgent | HTTPSAgent | false | undefined;
     private _signal;

package/typings/Request.d.ts

@@ -25,7 +25,10 @@ export declare class PonyfillRequest<TJSON = any> extends PonyfillBody<TJSON> im
     redirect: RequestRedirect;
     referrer: string;
     referrerPolicy: ReferrerPolicy;
-    url: string;
+    _url: string | undefined;
+    get url(): string;
+    _parsedUrl: URL | undefined;
+    get parsedUrl(): URL;
     duplex: 'half' | 'full';
     agent: HTTPAgent | HTTPSAgent | false | undefined;
     private _signal;

package/typings/URL.d.cts

@@ -16,4 +16,5 @@ export declare class PonyfillURL extends FastUrl implements URL {
     static createObjectURL(blob: Blob): string;
     static resolveObjectURL(url: string): void;
     static getBlobFromURL(url: string): Blob | PonyfillBlob | undefined;
+    [Symbol.toStringTag]: string;
 }

package/typings/URL.d.ts

@@ -16,4 +16,5 @@ export declare class PonyfillURL extends FastUrl implements URL {
     static createObjectURL(blob: Blob): string;
     static resolveObjectURL(url: string): void;
     static getBlobFromURL(url: string): Blob | PonyfillBlob | undefined;
+    [Symbol.toStringTag]: string;
 }