@whatwg-node/node-fetch 0.7.8-alpha-20250122230954-3105b2fac861fe650311d5dc0f4a88470234b0b5 → 0.7.8-alpha-20250124215951-ab82e441881dc42c7b236e47e5cbd62a5e2a359d

package/esm/fetchCurl.js

@@ -3,157 +3,155 @@ import { pipeline } from 'node:stream/promises';
 import { rootCertificates } from 'node:tls';
 import { PonyfillResponse } from './Response.js';
 import { createDeferredPromise, defaultHeadersSerializer, isNodeReadable } from './utils.js';
-export function createFetchCurl(nodeLibcurl) {
-    return function fetchCurl(fetchRequest) {
-        const { Curl, CurlFeature, CurlPause, CurlProgressFunc } = nodeLibcurl;
-        const curlHandle = new Curl();
-        curlHandle.enable(CurlFeature.NoDataParsing);
-        curlHandle.setOpt('URL', fetchRequest.url);
-        if (process.env.NODE_TLS_REJECT_UNAUTHORIZED === '0') {
-            curlHandle.setOpt('SSL_VERIFYPEER', false);
+export function fetchCurl(fetchRequest) {
+    const { Curl, CurlFeature, CurlPause, CurlProgressFunc } = globalThis['libcurl'];
+    const curlHandle = new Curl();
+    curlHandle.enable(CurlFeature.NoDataParsing);
+    curlHandle.setOpt('URL', fetchRequest.url);
+    if (process.env.NODE_TLS_REJECT_UNAUTHORIZED === '0') {
+        curlHandle.setOpt('SSL_VERIFYPEER', false);
+    }
+    if (process.env.NODE_EXTRA_CA_CERTS) {
+        curlHandle.setOpt('CAINFO', process.env.NODE_EXTRA_CA_CERTS);
+    }
+    else {
+        curlHandle.setOpt('CAINFO_BLOB', rootCertificates.join('\n'));
+    }
+    curlHandle.enable(CurlFeature.StreamResponse);
+    curlHandle.setStreamProgressCallback(function () {
+        return fetchRequest['_signal']?.aborted
+            ? process.env.DEBUG
+                ? CurlProgressFunc.Continue
+                : 1
+            : 0;
+    });
+    if (fetchRequest['bodyType'] === 'String') {
+        curlHandle.setOpt('POSTFIELDS', fetchRequest['bodyInit']);
+    }
+    else {
+        const nodeReadable = (fetchRequest.body != null
+            ? isNodeReadable(fetchRequest.body)
+                ? fetchRequest.body
+                : Readable.from(fetchRequest.body)
+            : null);
+        if (nodeReadable) {
+            curlHandle.setOpt('UPLOAD', true);
+            curlHandle.setUploadStream(nodeReadable);
         }
-        if (process.env.NODE_EXTRA_CA_CERTS) {
-            curlHandle.setOpt('CAINFO', process.env.NODE_EXTRA_CA_CERTS);
-        }
-        else {
-            curlHandle.setOpt('CAINFO_BLOB', rootCertificates.join('\n'));
+    }
+    if (process.env.DEBUG) {
+        curlHandle.setOpt('VERBOSE', true);
+    }
+    curlHandle.setOpt('TRANSFER_ENCODING', false);
+    curlHandle.setOpt('HTTP_TRANSFER_DECODING', true);
+    curlHandle.setOpt('FOLLOWLOCATION', fetchRequest.redirect === 'follow');
+    curlHandle.setOpt('MAXREDIRS', 20);
+    curlHandle.setOpt('ACCEPT_ENCODING', '');
+    curlHandle.setOpt('CUSTOMREQUEST', fetchRequest.method);
+    const headersSerializer = fetchRequest.headersSerializer || defaultHeadersSerializer;
+    let size;
+    const curlHeaders = headersSerializer(fetchRequest.headers, value => {
+        size = Number(value);
+    });
+    if (size != null) {
+        curlHandle.setOpt('INFILESIZE', size);
+    }
+    curlHandle.setOpt('HTTPHEADER', curlHeaders);
+    curlHandle.enable(CurlFeature.NoHeaderParsing);
+    const deferredPromise = createDeferredPromise();
+    let streamResolved;
+    function onAbort() {
+        if (curlHandle.isOpen) {
+            try {
+                curlHandle.pause(CurlPause.Recv);
+            }
+            catch (e) {
+                deferredPromise.reject(e);
+            }
         }
-        curlHandle.enable(CurlFeature.StreamResponse);
-        curlHandle.setStreamProgressCallback(function () {
-            return fetchRequest['_signal']?.aborted
-                ? process.env.DEBUG
-                    ? CurlProgressFunc.Continue
-                    : 1
-                : 0;
-        });
-        if (fetchRequest['bodyType'] === 'String') {
-            curlHandle.setOpt('POSTFIELDS', fetchRequest['bodyInit']);
+    }
+    if (fetchRequest['_signal']) {
+        fetchRequest['_signal'].addEventListener('abort', onAbort, { once: true });
+    }
+    curlHandle.once('end', function endListener() {
+        try {
+            curlHandle.close();
         }
-        else {
-            const nodeReadable = (fetchRequest.body != null
-                ? isNodeReadable(fetchRequest.body)
-                    ? fetchRequest.body
-                    : Readable.from(fetchRequest.body)
-                : null);
-            if (nodeReadable) {
-                curlHandle.setOpt('UPLOAD', true);
-                curlHandle.setUploadStream(nodeReadable);
-            }
+        catch (e) {
+            deferredPromise.reject(e);
         }
-        if (process.env.DEBUG) {
-            curlHandle.setOpt('VERBOSE', true);
+        if (fetchRequest['_signal']) {
+            fetchRequest['_signal'].removeEventListener('abort', onAbort);
         }
-        curlHandle.setOpt('TRANSFER_ENCODING', false);
-        curlHandle.setOpt('HTTP_TRANSFER_DECODING', true);
-        curlHandle.setOpt('FOLLOWLOCATION', fetchRequest.redirect === 'follow');
-        curlHandle.setOpt('MAXREDIRS', 20);
-        curlHandle.setOpt('ACCEPT_ENCODING', '');
-        curlHandle.setOpt('CUSTOMREQUEST', fetchRequest.method);
-        const headersSerializer = fetchRequest.headersSerializer || defaultHeadersSerializer;
-        let size;
-        const curlHeaders = headersSerializer(fetchRequest.headers, value => {
-            size = Number(value);
-        });
-        if (size != null) {
-            curlHandle.setOpt('INFILESIZE', size);
+    });
+    curlHandle.once('error', function errorListener(error) {
+        if (streamResolved && !streamResolved.closed && !streamResolved.destroyed) {
+            streamResolved.destroy(error);
         }
-        curlHandle.setOpt('HTTPHEADER', curlHeaders);
-        curlHandle.enable(CurlFeature.NoHeaderParsing);
-        const deferredPromise = createDeferredPromise();
-        let streamResolved;
-        function onAbort() {
-            if (curlHandle.isOpen) {
-                try {
-                    curlHandle.pause(CurlPause.Recv);
-                }
-                catch (e) {
-                    deferredPromise.reject(e);
-                }
+        else {
+            if (error.message === 'Operation was aborted by an application callback') {
+                error.message = 'The operation was aborted.';
             }
+            deferredPromise.reject(error);
         }
-        if (fetchRequest['_signal']) {
-            fetchRequest['_signal'].addEventListener('abort', onAbort, { once: true });
+        try {
+            curlHandle.close();
         }
-        curlHandle.once('end', function endListener() {
-            try {
-                curlHandle.close();
-            }
-            catch (e) {
-                deferredPromise.reject(e);
-            }
-            if (fetchRequest['_signal']) {
-                fetchRequest['_signal'].removeEventListener('abort', onAbort);
-            }
-        });
-        curlHandle.once('error', function errorListener(error) {
-            if (streamResolved && !streamResolved.closed && !streamResolved.destroyed) {
-                streamResolved.destroy(error);
+        catch (e) {
+            deferredPromise.reject(e);
+        }
+    });
+    curlHandle.once('stream', function streamListener(stream, status, headersBuf) {
+        const outputStream = new PassThrough();
+        pipeline(stream, outputStream, {
+            end: true,
+            signal: fetchRequest['_signal'] ?? undefined,
+        })
+            .then(() => {
+            if (!stream.destroyed) {
+                stream.resume();
             }
-            else {
-                if (error.message === 'Operation was aborted by an application callback') {
-                    error.message = 'The operation was aborted.';
+        })
+            .catch(deferredPromise.reject);
+        const headersFlat = headersBuf
+            .toString('utf8')
+            .split(/\r?\n|\r/g)
+            .filter(headerFilter => {
+            if (headerFilter && !headerFilter.startsWith('HTTP/')) {
+                if (fetchRequest.redirect === 'error' &&
+                    (headerFilter.includes('location') || headerFilter.includes('Location'))) {
+                    if (!stream.destroyed) {
+                        stream.resume();
+                    }
+                    outputStream.destroy();
+                    deferredPromise.reject(new Error('redirect is not allowed'));
                 }
-                deferredPromise.reject(error);
-            }
-            try {
-                curlHandle.close();
-            }
-            catch (e) {
-                deferredPromise.reject(e);
+                return true;
             }
+            return false;
         });
-        curlHandle.once('stream', function streamListener(stream, status, headersBuf) {
-            const outputStream = new PassThrough();
-            pipeline(stream, outputStream, {
-                end: true,
-                signal: fetchRequest['_signal'] ?? undefined,
-            })
-                .then(() => {
-                if (!stream.destroyed) {
-                    stream.resume();
-                }
-            })
-                .catch(deferredPromise.reject);
-            const headersFlat = headersBuf
-                .toString('utf8')
-                .split(/\r?\n|\r/g)
-                .filter(headerFilter => {
-                if (headerFilter && !headerFilter.startsWith('HTTP/')) {
-                    if (fetchRequest.redirect === 'error' &&
-                        (headerFilter.includes('location') || headerFilter.includes('Location'))) {
-                        if (!stream.destroyed) {
-                            stream.resume();
-                        }
-                        outputStream.destroy();
-                        deferredPromise.reject(new Error('redirect is not allowed'));
-                    }
-                    return true;
-                }
-                return false;
-            });
-            const headersInit = headersFlat.map(headerFlat => headerFlat.split(/:\s(.+)/).slice(0, 2));
-            const ponyfillResponse = new PonyfillResponse(outputStream, {
-                status,
-                headers: headersInit,
-                url: curlHandle.getInfo(Curl.info.REDIRECT_URL)?.toString() || fetchRequest.url,
-                redirected: Number(curlHandle.getInfo(Curl.info.REDIRECT_COUNT)) > 0,
-            });
-            deferredPromise.resolve(ponyfillResponse);
-            streamResolved = outputStream;
+        const headersInit = headersFlat.map(headerFlat => headerFlat.split(/:\s(.+)/).slice(0, 2));
+        const ponyfillResponse = new PonyfillResponse(outputStream, {
+            status,
+            headers: headersInit,
+            url: curlHandle.getInfo(Curl.info.REDIRECT_URL)?.toString() || fetchRequest.url,
+            redirected: Number(curlHandle.getInfo(Curl.info.REDIRECT_COUNT)) > 0,
         });
-        let count = 0;
-        try {
-            count = Curl.getCount();
-        }
-        catch { }
-        if (count > 0) {
-            setImmediate(() => {
-                curlHandle.perform();
-            });
-        }
-        else {
+        deferredPromise.resolve(ponyfillResponse);
+        streamResolved = outputStream;
+    });
+    let count = 0;
+    try {
+        count = Curl.getCount();
+    }
+    catch { }
+    if (count > 0) {
+        setImmediate(() => {
             curlHandle.perform();
-        }
-        return deferredPromise.promise;
-    };
+        });
+    }
+    else {
+        curlHandle.perform();
+    }
+    return deferredPromise.promise;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/node-fetch",
-  "version": "0.7.8-alpha-20250122230954-3105b2fac861fe650311d5dc0f4a88470234b0b5",
+  "version": "0.7.8-alpha-20250124215951-ab82e441881dc42c7b236e47e5cbd62a5e2a359d",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "dependencies": {

package/typings/Request.d.cts

@@ -31,7 +31,6 @@ export declare class PonyfillRequest<TJSON = any> extends PonyfillBody<TJSON> im
     get parsedUrl(): URL;
     duplex: 'half' | 'full';
     agent: HTTPAgent | HTTPSAgent | false | undefined;
-    dispatcher: import('undici').Dispatcher | undefined;
     private _signal;
     get signal(): AbortSignal;
     clone(): PonyfillRequest<TJSON>;

package/typings/Request.d.ts

@@ -31,7 +31,6 @@ export declare class PonyfillRequest<TJSON = any> extends PonyfillBody<TJSON> im
     get parsedUrl(): URL;
     duplex: 'half' | 'full';
     agent: HTTPAgent | HTTPSAgent | false | undefined;
-    dispatcher: import('undici').Dispatcher | undefined;
     private _signal;
     get signal(): AbortSignal;
     clone(): PonyfillRequest<TJSON>;

package/typings/fetch.d.cts

@@ -1,5 +1,3 @@
-import { fetchNodeHttp } from './fetchNodeHttp.cjs';
 import { PonyfillRequest, RequestPonyfillInit } from './Request.cjs';
 import { PonyfillResponse } from './Response.cjs';
-export declare function createFetchPonyfill(fetchFn: typeof fetchNodeHttp): <TResponseJSON = any, TRequestJSON = any>(info: string | PonyfillRequest<TRequestJSON> | URL, init?: RequestPonyfillInit) => Promise<PonyfillResponse<TResponseJSON>>;
 export declare function fetchPonyfill<TResponseJSON = any, TRequestJSON = any>(info: string | PonyfillRequest<TRequestJSON> | URL, init?: RequestPonyfillInit): Promise<PonyfillResponse<TResponseJSON>>;

package/typings/fetch.d.ts

@@ -1,5 +1,3 @@
-import { fetchNodeHttp } from './fetchNodeHttp.js';
 import { PonyfillRequest, RequestPonyfillInit } from './Request.js';
 import { PonyfillResponse } from './Response.js';
-export declare function createFetchPonyfill(fetchFn: typeof fetchNodeHttp): <TResponseJSON = any, TRequestJSON = any>(info: string | PonyfillRequest<TRequestJSON> | URL, init?: RequestPonyfillInit) => Promise<PonyfillResponse<TResponseJSON>>;
 export declare function fetchPonyfill<TResponseJSON = any, TRequestJSON = any>(info: string | PonyfillRequest<TRequestJSON> | URL, init?: RequestPonyfillInit): Promise<PonyfillResponse<TResponseJSON>>;

package/typings/fetchCurl.d.cts

@@ -1,3 +1,3 @@
 import { PonyfillRequest } from './Request.cjs';
 import { PonyfillResponse } from './Response.cjs';
-export declare function createFetchCurl(nodeLibcurl: typeof import('node-libcurl')): <TResponseJSON = any, TRequestJSON = any>(fetchRequest: PonyfillRequest<TRequestJSON>) => Promise<PonyfillResponse<TResponseJSON>>;
+export declare function fetchCurl<TResponseJSON = any, TRequestJSON = any>(fetchRequest: PonyfillRequest<TRequestJSON>): Promise<PonyfillResponse<TResponseJSON>>;

package/typings/fetchCurl.d.ts

@@ -1,3 +1,3 @@
 import { PonyfillRequest } from './Request.js';
 import { PonyfillResponse } from './Response.js';
-export declare function createFetchCurl(nodeLibcurl: typeof import('node-libcurl')): <TResponseJSON = any, TRequestJSON = any>(fetchRequest: PonyfillRequest<TRequestJSON>) => Promise<PonyfillResponse<TResponseJSON>>;
+export declare function fetchCurl<TResponseJSON = any, TRequestJSON = any>(fetchRequest: PonyfillRequest<TRequestJSON>): Promise<PonyfillResponse<TResponseJSON>>;

package/typings/utils.d.cts

@@ -6,7 +6,7 @@ export declare function isArrayBufferView(obj: any): obj is ArrayBufferView;
 export declare function isNodeReadable(obj: any): obj is Readable;
 export interface DeferredPromise<T = void> {
     promise: Promise<T>;
-    resolve: (value: T | PromiseLike<T>) => void;
+    resolve: (value: T) => void;
     reject: (reason: any) => void;
 }
 export declare function createDeferredPromise<T = void>(): DeferredPromise<T>;

package/typings/utils.d.ts

@@ -6,7 +6,7 @@ export declare function isArrayBufferView(obj: any): obj is ArrayBufferView;
 export declare function isNodeReadable(obj: any): obj is Readable;
 export interface DeferredPromise<T = void> {
     promise: Promise<T>;
-    resolve: (value: T | PromiseLike<T>) => void;
+    resolve: (value: T) => void;
     reject: (reason: any) => void;
 }
 export declare function createDeferredPromise<T = void>(): DeferredPromise<T>;

package/cjs/fetchUndici.js

@@ -1,190 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createFetchUndici = createFetchUndici;
-const node_stream_1 = require("node:stream");
-const types_1 = require("node:util/types");
-const node_zlib_1 = require("node:zlib");
-const fetchNodeHttp_js_1 = require("./fetchNodeHttp.js");
-const Request_js_1 = require("./Request.js");
-const Response_js_1 = require("./Response.js");
-const URL_js_1 = require("./URL.js");
-const utils_js_1 = require("./utils.js");
-function createFetchUndici(getGlobalDispatcher) {
-    return function fetchUndici(fetchRequest) {
-        const dispatcher = fetchRequest.dispatcher || getGlobalDispatcher();
-        if (!dispatcher) {
-            if (process.env.DEBUG) {
-                console.debug('[@whatwg-node/node-fetch] - native undici dispatcher not available, falling back to node:http');
-            }
-            return (0, fetchNodeHttp_js_1.fetchNodeHttp)(fetchRequest);
-        }
-        const deferred = (0, utils_js_1.createDeferredPromise)();
-        let abortListener;
-        let passthrough;
-        let response;
-        let body = null;
-        const bodyInit = fetchRequest['bodyInit'];
-        if (bodyInit != null) {
-            if (typeof bodyInit === 'string' ||
-                Buffer.isBuffer(bodyInit) ||
-                (0, types_1.isUint8Array)(bodyInit) ||
-                bodyInit instanceof node_stream_1.Readable) {
-                body = bodyInit;
-            }
-            else if (fetchRequest.body != null) {
-                if ((0, utils_js_1.isNodeReadable)(fetchRequest.body?.readable)) {
-                    body = fetchRequest.body.readable;
-                }
-                else {
-                    body = node_stream_1.Readable.from(fetchRequest.body);
-                }
-            }
-        }
-        function setPassthrough(contentEncoding) {
-            switch (contentEncoding) {
-                case 'x-gzip':
-                case 'gzip':
-                    passthrough = (0, node_zlib_1.createGunzip)();
-                    break;
-                case 'x-deflate':
-                case 'deflate':
-                    passthrough = (0, node_zlib_1.createInflate)();
-                    break;
-                case 'x-deflate-raw':
-                case 'deflate-raw':
-                    passthrough = (0, node_zlib_1.createInflateRaw)();
-                    break;
-                case 'br':
-                    passthrough = (0, node_zlib_1.createBrotliDecompress)();
-                    break;
-                default:
-                    passthrough = new node_stream_1.PassThrough();
-            }
-            return passthrough;
-        }
-        function onAbort(e) {
-            fetchRequest['_signal']?.removeEventListener('abort', abortListener);
-            passthrough?.destroy(e);
-            deferred.reject(e);
-        }
-        const headersSerializer = fetchRequest.headersSerializer || utils_js_1.getHeadersObj;
-        const nodeHeaders = headersSerializer(fetchRequest.headers);
-        if (nodeHeaders['accept-encoding'] == null) {
-            nodeHeaders['accept-encoding'] = 'gzip, deflate, br';
-        }
-        const dispatcherReturn = dispatcher.dispatch({
-            origin: fetchRequest.parsedUrl.origin,
-            path: fetchRequest.parsedUrl.pathname,
-            query: Object.fromEntries(fetchRequest.parsedUrl.searchParams),
-            method: fetchRequest.method,
-            headers: nodeHeaders,
-            body,
-        }, {
-            onRequestStart(controller) {
-                abortListener = function abortListener() {
-                    onAbort(fetchRequest['_signal']?.reason);
-                    controller.abort(fetchRequest['_signal']?.reason);
-                };
-                fetchRequest['_signal']?.addEventListener('abort', abortListener, { once: true });
-            },
-            onRequestUpgrade(_controller, statusCode, headers, socket) {
-                response = new Response_js_1.PonyfillResponse(socket, {
-                    status: statusCode,
-                    headers: headers,
-                    url: fetchRequest.url,
-                });
-                deferred.resolve(response);
-                fetchRequest['_signal']?.removeEventListener('abort', abortListener);
-            },
-            onResponseStart(controller, statusCode, headers, statusMessage) {
-                if (headers.location) {
-                    if (fetchRequest.redirect === 'error') {
-                        const redirectError = new Error('Redirects are not allowed');
-                        deferred.reject(redirectError);
-                        controller.resume();
-                        return;
-                    }
-                    if (fetchRequest.redirect === 'follow') {
-                        const redirectedUrl = new URL_js_1.PonyfillURL(headers.location, fetchRequest.parsedUrl || fetchRequest.url);
-                        const redirectResponse$ = fetchUndici(new Request_js_1.PonyfillRequest(redirectedUrl, fetchRequest));
-                        deferred.resolve(redirectResponse$.then(redirectResponse => {
-                            redirectResponse.redirected = true;
-                            return redirectResponse;
-                        }));
-                        controller.resume();
-                        return;
-                    }
-                }
-                passthrough = setPassthrough(headers['content-encoding']);
-                deferred.resolve(new Response_js_1.PonyfillResponse(passthrough, {
-                    status: statusCode,
-                    statusText: statusMessage,
-                    headers: headers,
-                    url: fetchRequest.url,
-                }));
-            },
-            onResponseData(controller, chunk) {
-                passthrough.write(chunk);
-                if (controller.reason) {
-                    onAbort(controller.reason);
-                }
-            },
-            onResponseEnd(controller, _trailers) {
-                if (controller.reason) {
-                    onAbort(controller.reason);
-                }
-                else {
-                    passthrough.end();
-                    fetchRequest['_signal']?.removeEventListener('abort', abortListener);
-                }
-            },
-            onResponseError(controller, error) {
-                onAbort(error || controller.reason);
-            },
-            // Old Undici support
-            onConnect(abort) {
-                abortListener = function abortListener() {
-                    abort(fetchRequest['_signal']?.reason);
-                    onAbort(fetchRequest['_signal']?.reason);
-                };
-                fetchRequest['_signal']?.addEventListener('abort', abortListener, { once: true });
-            },
-            onError(error) {
-                onAbort(error);
-            },
-            // TODO: onUpgrade
-            onHeaders(statusCode, headersBuf, _resume, statusText) {
-                const headers = headersBuf.map(headerBuf => {
-                    const header = headerBuf
-                        .toString('utf-8')
-                        .split(/:\s(.+)/)
-                        .slice(0, 2);
-                    if (header[0] === 'content-encoding') {
-                        const contentEncoding = header[1];
-                        setPassthrough(contentEncoding);
-                    }
-                    return header;
-                });
-                passthrough ||= new node_stream_1.PassThrough();
-                deferred.resolve(new Response_js_1.PonyfillResponse(passthrough, {
-                    status: statusCode,
-                    statusText,
-                    headers,
-                    url: fetchRequest.url,
-                }));
-                return true;
-            },
-            onData(chunk) {
-                return passthrough.write(chunk);
-            },
-            onComplete() {
-                passthrough.end();
-                fetchRequest['_signal']?.removeEventListener('abort', abortListener);
-            },
-        });
-        if (!dispatcherReturn) {
-            console.warn('Undici dispatcher returned false');
-        }
-        return deferred.promise;
-    };
-}