urllib 4.3.1 → 4.4.0

package/dist/esm/utils.js

@@ -1,6 +1,7 @@
 import { randomBytes, createHash } from 'node:crypto';
 import { Readable } from 'node:stream';
 import { performance } from 'node:perf_hooks';
+import symbols from './symbols.js';
 const JSONCtlCharsMap = {
     '"': '\\"', // \u0022
     '\\': '\\\\', // \u005c
@@ -139,4 +140,54 @@ export function isReadable(stream) {
         && typeof stream._read === 'function'
         && typeof stream._readableState === 'object';
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxVQUFVLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDdEQsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUN2QyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFHOUMsTUFBTSxlQUFlLEdBQTJCO0lBQzlDLEdBQUcsRUFBRSxLQUFLLEVBQUUsU0FBUztJQUNyQixJQUFJLEVBQUUsTUFBTSxFQUFFLFNBQVM7SUFDdkIsSUFBSSxFQUFFLEtBQUssRUFBRSxTQUFTO0lBQ3RCLElBQUksRUFBRSxLQUFLLEVBQUUsU0FBUztJQUN0QixJQUFJLEVBQUUsS0FBSyxFQUFFLFNBQVM7SUFDdEIsSUFBSSxFQUFFLEtBQUssRUFBRSxTQUFTO0lBQ3RCLElBQUksRUFBRSxLQUFLLEVBQUUsU0FBUztDQUN2QixDQUFDO0FBQ0YsbUNBQW1DO0FBQ25DLE1BQU0sY0FBYyxHQUFHLHdCQUF3QixDQUFDO0FBRWhELFNBQVMsY0FBYyxDQUFDLENBQVM7SUFDL0IsT0FBTyxlQUFlLENBQUMsQ0FBQyxDQUFDLElBQUksS0FBSyxHQUFHLENBQUMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsR0FBRyxPQUFPLENBQUMsQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQzdGLENBQUM7QUFFRCxTQUFTLG1CQUFtQixDQUFDLEtBQWE7SUFDeEMsT0FBTyxLQUFLLENBQUMsT0FBTyxDQUFDLGNBQWMsRUFBRSxjQUFjLENBQUMsQ0FBQztBQUN2RCxDQUFDO0FBRUQsTUFBTSxVQUFVLFNBQVMsQ0FBQyxJQUFZLEVBQUUsZUFBaUM7SUFDdkUsSUFBSSxPQUFPLGVBQWUsS0FBSyxVQUFVLEVBQUUsQ0FBQztRQUMx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
+export function updateSocketInfo(socketInfo, internalOpaque, err) {
+    const socket = internalOpaque[symbols.kRequestSocket] ?? err?.[symbols.kErrorSocket];
+    if (socket) {
+        socketInfo.id = socket[symbols.kSocketId];
+        socketInfo.handledRequests = socket[symbols.kHandledRequests];
+        socketInfo.handledResponses = socket[symbols.kHandledResponses];
+        if (socket[symbols.kSocketLocalAddress]) {
+            socketInfo.localAddress = socket[symbols.kSocketLocalAddress];
+            socketInfo.localPort = socket[symbols.kSocketLocalPort];
+        }
+        if (socket.remoteAddress) {
+            socketInfo.remoteAddress = socket.remoteAddress;
+            socketInfo.remotePort = socket.remotePort;
+            socketInfo.remoteFamily = socket.remoteFamily;
+        }
+        socketInfo.bytesRead = socket.bytesRead;
+        socketInfo.bytesWritten = socket.bytesWritten;
+        if (socket[symbols.kSocketConnectErrorTime]) {
+            socketInfo.connectErrorTime = socket[symbols.kSocketConnectErrorTime];
+            if (Array.isArray(socket.autoSelectFamilyAttemptedAddresses)) {
+                socketInfo.attemptedRemoteAddresses = socket.autoSelectFamilyAttemptedAddresses;
+            }
+            socketInfo.connectProtocol = socket[symbols.kSocketConnectProtocol];
+            socketInfo.connectHost = socket[symbols.kSocketConnectHost];
+            socketInfo.connectPort = socket[symbols.kSocketConnectPort];
+        }
+        if (socket[symbols.kSocketConnectedTime]) {
+            socketInfo.connectedTime = socket[symbols.kSocketConnectedTime];
+        }
+        if (socket[symbols.kSocketRequestEndTime]) {
+            socketInfo.lastRequestEndTime = socket[symbols.kSocketRequestEndTime];
+        }
+        socket[symbols.kSocketRequestEndTime] = new Date();
+    }
+}
+export function convertHeader(headers) {
+    const res = {};
+    for (const [key, value] of headers.entries()) {
+        if (res[key]) {
+            if (!Array.isArray(res[key])) {
+                res[key] = [res[key]];
+            }
+            res[key].push(value);
+        }
+        else {
+            res[key] = value;
+        }
+    }
+    return res;
+}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"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"}

package/dist/package.json

@@ -1,4 +1,4 @@
 {
   "name": "urllib",
-  "version": "4.3.1"
+  "version": "4.4.0"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "urllib",
-  "version": "4.3.1",
+  "version": "4.4.0",
   "publishConfig": {
     "tag": "latest"
   },

package/src/FetchOpaqueInterceptor.ts

@@ -0,0 +1,41 @@
+// const { AsyncLocalStorage } = require('node:async_hooks');
+import { AsyncLocalStorage } from 'node:async_hooks';
+import symbols from './symbols.js';
+import { Dispatcher } from 'undici';
+
+// const RedirectHandler = require('../handler/redirect-handler')
+
+export interface FetchOpaque {
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  [symbols.kRequestId]: number;
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  [symbols.kRequestStartTime]: number;
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  [symbols.kEnableRequestTiming]: number;
+}
+
+// const internalOpaque = {
+//   [symbols.kRequestId]: requestId,
+//   [symbols.kRequestStartTime]: requestStartTime,
+//   [symbols.kEnableRequestTiming]: !!(init.timing ?? true),
+//   [symbols.kRequestTiming]: timing,
+//   // [symbols.kRequestOriginalOpaque]: originalOpaque,
+// };
+
+export interface OpaqueInterceptorOptions {
+  opaqueLocalStorage: AsyncLocalStorage<FetchOpaque>;
+}
+
+export function fetchOpaqueInterceptor(opts: OpaqueInterceptorOptions) {
+  const opaqueLocalStorage = opts?.opaqueLocalStorage;
+  return (dispatch: Dispatcher['dispatch']): Dispatcher['dispatch'] => {
+    return function redirectInterceptor(opts: Dispatcher.DispatchOptions, handler: Dispatcher.DispatchHandlers) {
+      const opaque = opaqueLocalStorage?.getStore();
+      (handler as any).opaque = opaque;
+      return dispatch(opts, handler);
+    };
+  };
+}

package/src/HttpAgent.ts

@@ -8,12 +8,12 @@ import {
 
 export type CheckAddressFunction = (ip: string, family: number | string, hostname: string) => boolean;
 
-export type HttpAgentOptions = {
+export interface HttpAgentOptions extends Agent.Options {
   lookup?: LookupFunction;
   checkAddress?: CheckAddressFunction;
   connect?: buildConnector.BuildOptions,
   allowH2?: boolean;
-};
+}
 
 class IllegalAddressError extends Error {
   hostname: string;
@@ -36,9 +36,10 @@ export class HttpAgent extends Agent {
 
   constructor(options: HttpAgentOptions) {
     /* eslint node/prefer-promises/dns: off*/
-    const _lookup = options.lookup ?? dns.lookup;
-    const lookup: LookupFunction = (hostname, dnsOptions, callback) => {
-      _lookup(hostname, dnsOptions, (err, ...args: any[]) => {
+    const { lookup = dns.lookup, ...baseOpts } = options;
+
+    const lookupFunction: LookupFunction = (hostname, dnsOptions, callback) => {
+      lookup(hostname, dnsOptions, (err, ...args: any[]) => {
         // address will be array on Node.js >= 20
         const address = args[0];
         const family = args[1];
@@ -63,7 +64,8 @@ export class HttpAgent extends Agent {
       });
     };
     super({
-      connect: { ...options.connect, lookup, allowH2: options.allowH2 },
+      ...baseOpts,
+      connect: { ...options.connect, lookup: lookupFunction, allowH2: options.allowH2 },
     });
     this.#checkAddress = options.checkAddress;
   }

package/src/HttpClient.ts

@@ -37,7 +37,7 @@ import { HttpAgent, CheckAddressFunction } from './HttpAgent.js';
 import type { IncomingHttpHeaders } from './IncomingHttpHeaders.js';
 import { RequestURL, RequestOptions, HttpMethod, RequestMeta } from './Request.js';
 import { RawResponseWithMeta, HttpClientResponse, SocketInfo } from './Response.js';
-import { parseJSON, digestAuthHeader, globalId, performanceTime, isReadable } from './utils.js';
+import { parseJSON, digestAuthHeader, globalId, performanceTime, isReadable, updateSocketInfo } from './utils.js';
 import symbols from './symbols.js';
 import { initDiagnosticsChannel } from './diagnosticsChannel.js';
 import { HttpClientConnectTimeoutError, HttpClientRequestTimeoutError } from './HttpClientError.js';
@@ -47,7 +47,28 @@ type UndiciRequestOption = Exists<Parameters<typeof undiciRequest>[1]>;
 type PropertyShouldBe<T, K extends keyof T, V> = Omit<T, K> & { [P in K]: V };
 type IUndiciRequestOption = PropertyShouldBe<UndiciRequestOption, 'headers', IncomingHttpHeaders>;
 
-const PROTO_RE = /^https?:\/\//i;
+export const PROTO_RE = /^https?:\/\//i;
+
+export interface UnidiciTimingInfo {
+  startTime: number;
+  redirectStartTime: number;
+  redirectEndTime: number;
+  postRedirectStartTime: number;
+  finalServiceWorkerStartTime: number;
+  finalNetworkResponseStartTime: number;
+  finalNetworkRequestStartTime: number;
+  endTime: number;
+  encodedBodySize: number;
+  decodedBodySize: number;
+  finalConnectionTimingInfo: {
+    domainLookupStartTime: number;
+    domainLookupEndTime: number;
+    connectionStartTime: number;
+    connectionEndTime: number;
+    secureConnectionStartTime: number;
+    // ALPNNegotiatedProtocol: undefined
+  };
+}
 
 function noop() {
   // noop
@@ -137,9 +158,11 @@ export type RequestContext = {
   requestStartTime?: number;
 };
 
-const channels = {
+export const channels = {
   request: diagnosticsChannel.channel('urllib:request'),
   response: diagnosticsChannel.channel('urllib:response'),
+  fetchRequest: diagnosticsChannel.channel('urllib:fetch:request'),
+  fetchResponse: diagnosticsChannel.channel('urllib:fetch:response'),
 };
 
 export type RequestDiagnosticsMessage = {
@@ -631,7 +654,7 @@ export class HttpClient extends EventEmitter {
       }
       res.rt = performanceTime(requestStartTime);
       // get real socket info from internalOpaque
-      this.#updateSocketInfo(socketInfo, internalOpaque);
+      updateSocketInfo(socketInfo, internalOpaque);
 
       const clientResponse: HttpClientResponse = {
         opaque: originalOpaque,
@@ -707,7 +730,7 @@ export class HttpClient extends EventEmitter {
         res.requestUrls.push(requestUrl.href);
       }
       res.rt = performanceTime(requestStartTime);
-      this.#updateSocketInfo(socketInfo, internalOpaque, rawError);
+      updateSocketInfo(socketInfo, internalOpaque, rawError);
 
       channels.response.publish({
         request: reqMeta,
@@ -729,40 +752,4 @@ export class HttpClient extends EventEmitter {
       throw err;
     }
   }
-
-  #updateSocketInfo(socketInfo: SocketInfo, internalOpaque: any, err?: any) {
-    const socket = internalOpaque[symbols.kRequestSocket] ?? err?.[symbols.kErrorSocket];
-    if (socket) {
-      socketInfo.id = socket[symbols.kSocketId];
-      socketInfo.handledRequests = socket[symbols.kHandledRequests];
-      socketInfo.handledResponses = socket[symbols.kHandledResponses];
-      if (socket[symbols.kSocketLocalAddress]) {
-        socketInfo.localAddress = socket[symbols.kSocketLocalAddress];
-        socketInfo.localPort = socket[symbols.kSocketLocalPort];
-      }
-      if (socket.remoteAddress) {
-        socketInfo.remoteAddress = socket.remoteAddress;
-        socketInfo.remotePort = socket.remotePort;
-        socketInfo.remoteFamily = socket.remoteFamily;
-      }
-      socketInfo.bytesRead = socket.bytesRead;
-      socketInfo.bytesWritten = socket.bytesWritten;
-      if (socket[symbols.kSocketConnectErrorTime]) {
-        socketInfo.connectErrorTime = socket[symbols.kSocketConnectErrorTime];
-        if (Array.isArray(socket.autoSelectFamilyAttemptedAddresses)) {
-          socketInfo.attemptedRemoteAddresses = socket.autoSelectFamilyAttemptedAddresses;
-        }
-        socketInfo.connectProtocol = socket[symbols.kSocketConnectProtocol];
-        socketInfo.connectHost = socket[symbols.kSocketConnectHost];
-        socketInfo.connectPort = socket[symbols.kSocketConnectPort];
-      }
-      if (socket[symbols.kSocketConnectedTime]) {
-        socketInfo.connectedTime = socket[symbols.kSocketConnectedTime];
-      }
-      if (socket[symbols.kSocketRequestEndTime]) {
-        socketInfo.lastRequestEndTime = socket[symbols.kSocketRequestEndTime];
-      }
-      socket[symbols.kSocketRequestEndTime] = new Date();
-    }
-  }
 }

package/src/Request.ts

@@ -3,6 +3,7 @@ import type { EventEmitter } from 'node:events';
 import type { Dispatcher } from 'undici';
 import type { IncomingHttpHeaders } from './IncomingHttpHeaders.js';
 import type { HttpClientResponse } from './Response.js';
+import { Request } from 'undici';
 
 export type HttpMethod = Dispatcher.HttpMethod;
 
@@ -161,3 +162,8 @@ export type RequestMeta = {
   ctx?: unknown;
   retries: number;
 };
+
+export type FetchMeta = {
+  requestId: number;
+  request: Request,
+};

package/src/fetch.ts

@@ -0,0 +1,264 @@
+import { AsyncLocalStorage } from 'node:async_hooks';
+import {
+  fetch as UndiciFetch,
+  RequestInfo,
+  RequestInit,
+  Request,
+  Response,
+  Agent,
+  getGlobalDispatcher,
+  Pool,
+  Dispatcher,
+} from 'undici';
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
+import undiciSymbols from 'undici/lib/core/symbols.js';
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
+import undiciFetchSymbols from 'undici/lib/web/fetch/symbols.js';
+import {
+  channels,
+  ClientOptions,
+  PoolStat,
+  RequestDiagnosticsMessage,
+  ResponseDiagnosticsMessage,
+  UnidiciTimingInfo,
+} from './HttpClient.js';
+import {
+  HttpAgent,
+  HttpAgentOptions,
+} from './HttpAgent.js';
+import { initDiagnosticsChannel } from './diagnosticsChannel.js';
+import { convertHeader, globalId, performanceTime, updateSocketInfo } from './utils.js';
+import symbols from './symbols.js';
+import {
+  FetchMeta,
+  HttpMethod,
+  RequestMeta,
+} from './Request.js';
+import { FetchOpaque, fetchOpaqueInterceptor } from './FetchOpaqueInterceptor.js';
+import { RawResponseWithMeta, SocketInfo } from './Response.js';
+import { IncomingHttpHeaders } from './IncomingHttpHeaders.js';
+
+export interface UrllibRequestInit extends RequestInit {
+  // default is true
+  timing?: boolean;
+}
+
+export type FetchDiagnosticsMessage = {
+  fetch: FetchMeta;
+};
+
+export type FetchResponseDiagnosticsMessage = {
+  fetch: FetchMeta;
+  timingInfo?: UnidiciTimingInfo;
+  response?: Response;
+  error?: Error;
+};
+
+export class FetchFactory {
+  static #dispatcher: Agent;
+  static #opaqueLocalStorage = new AsyncLocalStorage<FetchOpaque>();
+
+  static getDispatcher() {
+    return FetchFactory.#dispatcher ?? getGlobalDispatcher();
+  }
+
+  static setDispatcher(dispatcher: Agent) {
+    FetchFactory.#dispatcher = dispatcher;
+  }
+
+  static setClientOptions(clientOptions: ClientOptions) {
+    let dispatcherOption: Agent.Options = {
+      interceptors: {
+        Agent: [
+          fetchOpaqueInterceptor({
+            opaqueLocalStorage: FetchFactory.#opaqueLocalStorage,
+          }),
+        ],
+        Client: [],
+      },
+    };
+    let dispatcherClazz: new (options: Agent.Options) => Agent = Agent;
+    if (clientOptions?.lookup || clientOptions?.checkAddress) {
+      dispatcherOption = {
+        ...dispatcherOption,
+        lookup: clientOptions.lookup,
+        checkAddress: clientOptions.checkAddress,
+        connect: clientOptions.connect,
+        allowH2: clientOptions.allowH2,
+      } as HttpAgentOptions;
+      dispatcherClazz = HttpAgent as unknown as new (options: Agent.Options) => Agent;
+    } else if (clientOptions?.connect) {
+      dispatcherOption = {
+        ...dispatcherOption,
+        connect: clientOptions.connect,
+        allowH2: clientOptions.allowH2,
+      } as HttpAgentOptions;
+      dispatcherClazz = Agent;
+    } else if (clientOptions?.allowH2) {
+      // Support HTTP2
+      dispatcherOption = {
+        ...dispatcherOption,
+        allowH2: clientOptions.allowH2,
+      } as HttpAgentOptions;
+      dispatcherClazz = Agent;
+    }
+    FetchFactory.#dispatcher = new dispatcherClazz(dispatcherOption);
+    initDiagnosticsChannel();
+  }
+
+  static getDispatcherPoolStats() {
+    const agent = FetchFactory.getDispatcher();
+    // origin => Pool Instance
+    const clients: Map<string, WeakRef<Pool>> | undefined = Reflect.get(agent, undiciSymbols.kClients);
+    const poolStatsMap: Record<string, PoolStat> = {};
+    if (!clients) {
+      return poolStatsMap;
+    }
+    for (const [ key, ref ] of clients) {
+      const pool = typeof ref.deref === 'function' ? ref.deref() : ref as unknown as Pool;
+      const stats = pool?.stats;
+      if (!stats) continue;
+      poolStatsMap[key] = {
+        connected: stats.connected,
+        free: stats.free,
+        pending: stats.pending,
+        queued: stats.queued,
+        running: stats.running,
+        size: stats.size,
+      } satisfies PoolStat;
+    }
+    return poolStatsMap;
+  }
+
+  static async fetch(input: RequestInfo, init?: UrllibRequestInit): Promise<Response> {
+    const requestStartTime = performance.now();
+    init = init ?? {};
+    init.dispatcher = init.dispatcher ?? FetchFactory.#dispatcher;
+    const request = new Request(input, init);
+    const requestId = globalId('HttpClientRequest');
+    // https://developer.chrome.com/docs/devtools/network/reference/?utm_source=devtools#timing-explanation
+    const timing = {
+      // socket assigned
+      queuing: 0,
+      // dns lookup time
+      // dnslookup: 0,
+      // socket connected
+      connected: 0,
+      // request headers sent
+      requestHeadersSent: 0,
+      // request sent, including headers and body
+      requestSent: 0,
+      // Time to first byte (TTFB), the response headers have been received
+      waiting: 0,
+      // the response body and trailers have been received
+      contentDownload: 0,
+    };
+
+    // using opaque to diagnostics channel, binding request and socket
+    const internalOpaque = {
+      [symbols.kRequestId]: requestId,
+      [symbols.kRequestStartTime]: requestStartTime,
+      [symbols.kEnableRequestTiming]: !!(init.timing ?? true),
+      [symbols.kRequestTiming]: timing,
+      // [symbols.kRequestOriginalOpaque]: originalOpaque,
+    };
+    const reqMeta: RequestMeta = {
+      requestId,
+      url: request.url,
+      args: {
+        method: request.method as HttpMethod,
+        type: request.method as HttpMethod,
+        data: request.body,
+        headers: convertHeader(request.headers),
+      },
+      retries: 0,
+    };
+    const fetchMeta: FetchMeta = {
+      requestId,
+      request,
+    };
+    const socketInfo: SocketInfo = {
+      id: 0,
+      localAddress: '',
+      localPort: 0,
+      remoteAddress: '',
+      remotePort: 0,
+      remoteFamily: '',
+      bytesWritten: 0,
+      bytesRead: 0,
+      handledRequests: 0,
+      handledResponses: 0,
+    };
+    channels.request.publish({
+      request: reqMeta,
+    } as RequestDiagnosticsMessage);
+    channels.fetchRequest.publish({
+      fetch: fetchMeta,
+    } as FetchDiagnosticsMessage);
+
+    let res: Response;
+    // keep urllib createCallbackResponse style
+    const resHeaders: IncomingHttpHeaders = {};
+    const urllibResponse = {
+      status: -1,
+      statusCode: -1,
+      statusText: '',
+      statusMessage: '',
+      headers: resHeaders,
+      size: 0,
+      aborted: false,
+      rt: 0,
+      keepAliveSocket: true,
+      requestUrls: [
+        request.url,
+      ],
+      timing,
+      socket: socketInfo,
+      retries: 0,
+      socketErrorRetries: 0,
+    } as any as RawResponseWithMeta;
+    try {
+      await FetchFactory.#opaqueLocalStorage.run(internalOpaque, async () => {
+        res = await UndiciFetch(input, init);
+      });
+    } catch (e: any) {
+      channels.response.publish({
+        fetch: fetchMeta,
+        error: e,
+      } as FetchResponseDiagnosticsMessage);
+      channels.fetchResponse.publish({
+        request: reqMeta,
+        response: urllibResponse,
+        error: e,
+      } as ResponseDiagnosticsMessage);
+      throw e;
+    }
+
+    // get unidici internal response
+    const state = Reflect.get(res!, undiciFetchSymbols.kState) as Dispatcher.ResponseData;
+    updateSocketInfo(socketInfo, internalOpaque /* , rawError */);
+
+    urllibResponse.headers = convertHeader(res!.headers);
+    urllibResponse.status = urllibResponse.statusCode = res!.status;
+    urllibResponse!.statusMessage = res!.statusText;
+    if (urllibResponse.headers['content-length']) {
+      urllibResponse.size = parseInt(urllibResponse.headers['content-length']);
+    }
+    urllibResponse.rt = performanceTime(requestStartTime);
+
+    channels.fetchResponse.publish({
+      fetch: fetchMeta,
+      timingInfo: (state as any).timingInfo,
+      response: res!,
+    } as FetchResponseDiagnosticsMessage);
+    channels.response.publish({
+      request: reqMeta,
+      response: urllibResponse,
+    } as ResponseDiagnosticsMessage);
+    return res!;
+  }
+}
+
+export const fetch = FetchFactory.fetch;

package/src/index.ts

@@ -39,6 +39,8 @@ export async function curl<T = any>(url: RequestURL, options?: RequestOptions) {
 export {
   MockAgent, ProxyAgent, Agent, Dispatcher,
   setGlobalDispatcher, getGlobalDispatcher,
+  Request, RequestInfo, RequestInit,
+  Response,
 } from 'undici';
 // HttpClient2 is keep compatible with urllib@2 HttpClient2
 export {
@@ -60,6 +62,7 @@ export {
   IncomingHttpHeaders,
 } from './IncomingHttpHeaders.js';
 export * from './HttpClientError.js';
+export { FetchFactory, fetch } from './fetch.js';
 
 export default {
   request,

package/src/utils.ts

@@ -2,6 +2,9 @@ import { randomBytes, createHash } from 'node:crypto';
 import { Readable } from 'node:stream';
 import { performance } from 'node:perf_hooks';
 import type { FixJSONCtlChars } from './Request.js';
+import { SocketInfo } from './Response.js';
+import symbols from './symbols.js';
+import { IncomingHttpHeaders } from './IncomingHttpHeaders.js';
 
 const JSONCtlCharsMap: Record<string, string> = {
   '"': '\\"', // \u0022
@@ -151,3 +154,54 @@ export function isReadable(stream: any) {
     && typeof stream._read === 'function'
     && typeof stream._readableState === 'object';
 }
+
+export function updateSocketInfo(socketInfo: SocketInfo, internalOpaque: any, err?: any) {
+  const socket = internalOpaque[symbols.kRequestSocket] ?? err?.[symbols.kErrorSocket];
+  if (socket) {
+    socketInfo.id = socket[symbols.kSocketId];
+    socketInfo.handledRequests = socket[symbols.kHandledRequests];
+    socketInfo.handledResponses = socket[symbols.kHandledResponses];
+    if (socket[symbols.kSocketLocalAddress]) {
+      socketInfo.localAddress = socket[symbols.kSocketLocalAddress];
+      socketInfo.localPort = socket[symbols.kSocketLocalPort];
+    }
+    if (socket.remoteAddress) {
+      socketInfo.remoteAddress = socket.remoteAddress;
+      socketInfo.remotePort = socket.remotePort;
+      socketInfo.remoteFamily = socket.remoteFamily;
+    }
+    socketInfo.bytesRead = socket.bytesRead;
+    socketInfo.bytesWritten = socket.bytesWritten;
+    if (socket[symbols.kSocketConnectErrorTime]) {
+      socketInfo.connectErrorTime = socket[symbols.kSocketConnectErrorTime];
+      if (Array.isArray(socket.autoSelectFamilyAttemptedAddresses)) {
+        socketInfo.attemptedRemoteAddresses = socket.autoSelectFamilyAttemptedAddresses;
+      }
+      socketInfo.connectProtocol = socket[symbols.kSocketConnectProtocol];
+      socketInfo.connectHost = socket[symbols.kSocketConnectHost];
+      socketInfo.connectPort = socket[symbols.kSocketConnectPort];
+    }
+    if (socket[symbols.kSocketConnectedTime]) {
+      socketInfo.connectedTime = socket[symbols.kSocketConnectedTime];
+    }
+    if (socket[symbols.kSocketRequestEndTime]) {
+      socketInfo.lastRequestEndTime = socket[symbols.kSocketRequestEndTime];
+    }
+    socket[symbols.kSocketRequestEndTime] = new Date();
+  }
+}
+
+export function convertHeader(headers: Headers): IncomingHttpHeaders {
+  const res: IncomingHttpHeaders = {};
+  for (const [ key, value ] of headers.entries()) {
+    if (res[key]) {
+      if (!Array.isArray(res[key])) {
+        res[key] = [ res[key] ];
+      }
+      res[key].push(value);
+    } else {
+      res[key] = value;
+    }
+  }
+  return res;
+}