urllib 3.16.1 → 3.17.0

package/README.md

@@ -200,10 +200,7 @@ Response is normal object, it contains:
 - `aborted`: response was aborted or not
 - `rt`: total request and response time in ms.
 - `timing`: timing object if timing enable.
-- `remoteAddress`: http server ip address
-- `remotePort`: http server ip port
-- `socketHandledRequests`: socket already handled request count
-- `socketHandledResponses`: socket already handled response count
+- `socket`: socket info
 
 ## Run test with debug log
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "urllib",
-  "version": "3.16.1",
+  "version": "3.17.0",
   "publishConfig": {
     "tag": "latest"
   },
@@ -53,6 +53,7 @@
     "build:test": "npm run build && npm run build:cjs:test && npm run build:esm:test && npm run test-tsc",
     "test-tsc": "tsc -p ./test/fixtures/ts/tsconfig.json",
     "test": "npm run lint && vitest run",
+    "test-keepalive": "cross-env TEST_KEEPALIVE_COUNT=50 vitest run --test-timeout 120000 keep-alive-header.test.ts",
     "cov": "vitest run --coverage",
     "ci": "npm run lint && npm run cov && npm run build:test",
     "contributor": "git-contributor",
@@ -78,8 +79,9 @@
     "@types/pump": "^1.1.1",
     "@types/selfsigned": "^2.0.1",
     "@types/tar-stream": "^2.2.2",
-    "@vitest/coverage-c8": "^0.29.7",
+    "@vitest/coverage-v8": "^0.32.0",
     "busboy": "^1.6.0",
+    "cross-env": "^7.0.3",
     "eslint": "^8.25.0",
     "eslint-config-egg": "^12.1.0",
     "git-contributor": "^2.0.0",
@@ -88,7 +90,7 @@
     "selfsigned": "^2.0.1",
     "tar-stream": "^2.2.0",
     "typescript": "^5.0.4",
-    "vitest": "^0.31.1"
+    "vitest": "^0.32.0"
   },
   "engines": {
     "node": ">= 14.19.3"

package/src/HttpClient.ts

@@ -1,3 +1,4 @@
+import diagnosticsChannel from 'node:diagnostics_channel';
 import { EventEmitter } from 'node:events';
 import { LookupFunction } from 'node:net';
 import { STATUS_CODES } from 'node:http';
@@ -29,7 +30,7 @@ import pump from 'pump';
 // Compatible with old style formstream
 import FormStream from 'formstream';
 import { HttpAgent, CheckAddressFunction } from './HttpAgent';
-import { RequestURL, RequestOptions, HttpMethod } from './Request';
+import { RequestURL, RequestOptions, HttpMethod, RequestMeta } from './Request';
 import { RawResponseWithMeta, HttpClientResponse, SocketInfo } from './Response';
 import { parseJSON, sleep, digestAuthHeader, globalId, performanceTime, isReadable } from './utils';
 import symbols from './symbols';
@@ -137,8 +138,25 @@ function defaultIsRetry(response: HttpClientResponse) {
 
 type RequestContext = {
   retries: number;
+  requestStartTime?: number;
 };
 
+const channels = {
+  request: diagnosticsChannel.channel('urllib:request'),
+  response: diagnosticsChannel.channel('urllib:response'),
+};
+
+export type RequestDiagnosticsMessage = {
+  request: RequestMeta;
+};
+
+export type ResponseDiagnosticsMessage = {
+  request: RequestMeta;
+  response: RawResponseWithMeta;
+  error?: Error;
+};
+
+
 export class HttpClient extends EventEmitter {
   #defaultArgs?: RequestOptions;
   #dispatcher?: Dispatcher;
@@ -188,6 +206,7 @@ export class HttpClient extends EventEmitter {
     const headers: IncomingHttpHeaders = {};
     const args = {
       retry: 0,
+      timing: true,
       ...this.#defaultArgs,
       ...options,
       // keep method and headers exists on args for request event handler to easy use
@@ -198,7 +217,10 @@ export class HttpClient extends EventEmitter {
       retries: 0,
       ...requestContext,
     };
-    const requestStartTime = performance.now();
+    if (!requestContext.requestStartTime) {
+      requestContext.requestStartTime = performance.now();
+    }
+    const requestStartTime = requestContext.requestStartTime;
 
     // https://developer.chrome.com/docs/devtools/network/reference/?utm_source=devtools#timing-explanation
     const timing = {
@@ -232,8 +254,8 @@ export class HttpClient extends EventEmitter {
       args,
       ctx: args.ctx,
       retries: requestContext.retries,
-    };
-    const socketInfo = {
+    } as RequestMeta;
+    const socketInfo: SocketInfo = {
       id: 0,
       localAddress: '',
       localPort: 0,
@@ -438,6 +460,9 @@ export class HttpClient extends EventEmitter {
       debug('Request#%d %s %s, headers: %j, headersTimeout: %s, bodyTimeout: %s',
         requestId, requestOptions.method, requestUrl.href, headers, headersTimeout, bodyTimeout);
       requestOptions.headers = headers;
+      channels.request.publish({
+        request: reqMeta,
+      } as RequestDiagnosticsMessage);
       if (this.listenerCount('request') > 0) {
         this.emit('request', reqMeta);
       }
@@ -556,6 +581,10 @@ export class HttpClient extends EventEmitter {
         }
       }
 
+      channels.response.publish({
+        request: reqMeta,
+        response: res,
+      } as ResponseDiagnosticsMessage);
       if (this.listenerCount('response') > 0) {
         this.emit('response', {
           requestId,
@@ -577,11 +606,25 @@ export class HttpClient extends EventEmitter {
         err = new HttpClientRequestTimeoutError(headersTimeout, { cause: e });
       } else if (err.name === 'BodyTimeoutError') {
         err = new HttpClientRequestTimeoutError(bodyTimeout, { cause: e });
+      } else if (err.code === 'UND_ERR_SOCKET' || err.code === 'ECONNRESET') {
+        // auto retry on socket error, https://github.com/node-modules/urllib/issues/454
+        if (args.retry > 0 && requestContext.retries < args.retry) {
+          if (args.retryDelay) {
+            await sleep(args.retryDelay);
+          }
+          requestContext.retries++;
+          return await this.#requestInternal(url, options, requestContext);
+        }
       }
       err.opaque = orginalOpaque;
       err.status = res.status;
       err.headers = res.headers;
       err.res = res;
+      if (err.socket) {
+        // store rawSocket
+        err._rawSocket = err.socket;
+      }
+      err.socket = socketInfo;
       // make sure requestUrls not empty
       if (res.requestUrls.length === 0) {
         res.requestUrls.push(requestUrl.href);
@@ -589,6 +632,11 @@ export class HttpClient extends EventEmitter {
       res.rt = performanceTime(requestStartTime);
       this.#updateSocketInfo(socketInfo, internalOpaque);
 
+      channels.response.publish({
+        request: reqMeta,
+        response: res,
+        error: err,
+      } as ResponseDiagnosticsMessage);
       if (this.listenerCount('response') > 0) {
         this.emit('response', {
           requestId,
@@ -611,13 +659,16 @@ export class HttpClient extends EventEmitter {
       socketInfo.id = socket[symbols.kSocketId];
       socketInfo.handledRequests = socket[symbols.kHandledRequests];
       socketInfo.handledResponses = socket[symbols.kHandledResponses];
-      socketInfo.localAddress = socket.localAddress;
-      socketInfo.localPort = socket.localPort;
+      socketInfo.localAddress = socket[symbols.kSocketLocalAddress];
+      socketInfo.localPort = socket[symbols.kSocketLocalPort];
       socketInfo.remoteAddress = socket.remoteAddress;
       socketInfo.remotePort = socket.remotePort;
       socketInfo.remoteFamily = socket.remoteFamily;
       socketInfo.bytesRead = socket.bytesRead;
       socketInfo.bytesWritten = socket.bytesWritten;
+      socketInfo.connectedTime = socket[symbols.kSocketConnectedTime];
+      socketInfo.lastRequestEndTime = socket[symbols.kSocketRequestEndTime];
+      socket[symbols.kSocketRequestEndTime] = new Date();
     }
   }
 }

package/src/Request.ts

@@ -99,7 +99,7 @@ export type RequestOptions = {
    * */
   gzip?: boolean;
   /**
-   * Enable timing or not, default is false.
+   * Enable timing or not, default is true.
    * */
   timing?: boolean;
   /**
@@ -134,3 +134,11 @@ export type RequestOptions = {
   /** Default: `64 KiB` */
   highWaterMark?: number;
 };
+
+export type RequestMeta = {
+  requestId: number;
+  url: string;
+  args: RequestOptions;
+  ctx?: unknown;
+  retries: number;
+};

package/src/Response.ts

@@ -12,6 +12,8 @@ export type SocketInfo = {
   bytesRead: number;
   handledRequests: number;
   handledResponses: number;
+  connectedTime?: Date;
+  lastRequestEndTime?: Date;
 };
 
 /**

package/src/cjs/HttpClient.d.ts

@@ -4,8 +4,8 @@
 import { EventEmitter } from 'node:events';
 import { LookupFunction } from 'node:net';
 import { CheckAddressFunction } from './HttpAgent';
-import { RequestURL, RequestOptions } from './Request';
-import { HttpClientResponse } from './Response';
+import { RequestURL, RequestOptions, RequestMeta } from './Request';
+import { RawResponseWithMeta, HttpClientResponse } from './Response';
 export type ClientOptions = {
     defaultArgs?: RequestOptions;
     /**
@@ -37,6 +37,14 @@ export type ClientOptions = {
     };
 };
 export declare const HEADER_USER_AGENT: string;
+export type RequestDiagnosticsMessage = {
+    request: RequestMeta;
+};
+export type ResponseDiagnosticsMessage = {
+    request: RequestMeta;
+    response: RawResponseWithMeta;
+    error?: Error;
+};
 export declare class HttpClient extends EventEmitter {
     #private;
     constructor(clientOptions?: ClientOptions);

package/src/cjs/HttpClient.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpClient = exports.HEADER_USER_AGENT = void 0;
+const node_diagnostics_channel_1 = __importDefault(require("node:diagnostics_channel"));
 const node_events_1 = require("node:events");
 const node_http_1 = require("node:http");
 const node_util_1 = require("node:util");
@@ -69,7 +70,7 @@ class HttpClientRequestTimeoutError extends Error {
         Error.captureStackTrace(this, this.constructor);
     }
 }
-exports.HEADER_USER_AGENT = (0, default_user_agent_1.default)('node-urllib', '3.16.1');
+exports.HEADER_USER_AGENT = (0, default_user_agent_1.default)('node-urllib', '3.17.0');
 function getFileName(stream) {
     const filePath = stream.path;
     if (filePath) {
@@ -80,6 +81,10 @@ function getFileName(stream) {
 function defaultIsRetry(response) {
     return response.status >= 500;
 }
+const channels = {
+    request: node_diagnostics_channel_1.default.channel('urllib:request'),
+    response: node_diagnostics_channel_1.default.channel('urllib:response'),
+};
 class HttpClient extends node_events_1.EventEmitter {
     #defaultArgs;
     #dispatcher;
@@ -126,6 +131,7 @@ class HttpClient extends node_events_1.EventEmitter {
         const headers = {};
         const args = {
             retry: 0,
+            timing: true,
             ...this.#defaultArgs,
             ...options,
             // keep method and headers exists on args for request event handler to easy use
@@ -136,7 +142,10 @@ class HttpClient extends node_events_1.EventEmitter {
             retries: 0,
             ...requestContext,
         };
-        const requestStartTime = node_perf_hooks_1.performance.now();
+        if (!requestContext.requestStartTime) {
+            requestContext.requestStartTime = node_perf_hooks_1.performance.now();
+        }
+        const requestStartTime = requestContext.requestStartTime;
         // https://developer.chrome.com/docs/devtools/network/reference/?utm_source=devtools#timing-explanation
         const timing = {
             // socket assigned
@@ -384,6 +393,9 @@ class HttpClient extends node_events_1.EventEmitter {
             }
             debug('Request#%d %s %s, headers: %j, headersTimeout: %s, bodyTimeout: %s', requestId, requestOptions.method, requestUrl.href, headers, headersTimeout, bodyTimeout);
             requestOptions.headers = headers;
+            channels.request.publish({
+                request: reqMeta,
+            });
             if (this.listenerCount('request') > 0) {
                 this.emit('request', reqMeta);
             }
@@ -502,6 +514,10 @@ class HttpClient extends node_events_1.EventEmitter {
                     return await this.#requestInternal(url, options, requestContext);
                 }
             }
+            channels.response.publish({
+                request: reqMeta,
+                response: res,
+            });
             if (this.listenerCount('response') > 0) {
                 this.emit('response', {
                     requestId,
@@ -525,16 +541,36 @@ class HttpClient extends node_events_1.EventEmitter {
             else if (err.name === 'BodyTimeoutError') {
                 err = new HttpClientRequestTimeoutError(bodyTimeout, { cause: e });
             }
+            else if (err.code === 'UND_ERR_SOCKET' || err.code === 'ECONNRESET') {
+                // auto retry on socket error, https://github.com/node-modules/urllib/issues/454
+                if (args.retry > 0 && requestContext.retries < args.retry) {
+                    if (args.retryDelay) {
+                        await (0, utils_1.sleep)(args.retryDelay);
+                    }
+                    requestContext.retries++;
+                    return await this.#requestInternal(url, options, requestContext);
+                }
+            }
             err.opaque = orginalOpaque;
             err.status = res.status;
             err.headers = res.headers;
             err.res = res;
+            if (err.socket) {
+                // store rawSocket
+                err._rawSocket = err.socket;
+            }
+            err.socket = socketInfo;
             // make sure requestUrls not empty
             if (res.requestUrls.length === 0) {
                 res.requestUrls.push(requestUrl.href);
             }
             res.rt = (0, utils_1.performanceTime)(requestStartTime);
             this.#updateSocketInfo(socketInfo, internalOpaque);
+            channels.response.publish({
+                request: reqMeta,
+                response: res,
+                error: err,
+            });
             if (this.listenerCount('response') > 0) {
                 this.emit('response', {
                     requestId,
@@ -556,13 +592,16 @@ class HttpClient extends node_events_1.EventEmitter {
             socketInfo.id = socket[symbols_1.default.kSocketId];
             socketInfo.handledRequests = socket[symbols_1.default.kHandledRequests];
             socketInfo.handledResponses = socket[symbols_1.default.kHandledResponses];
-            socketInfo.localAddress = socket.localAddress;
-            socketInfo.localPort = socket.localPort;
+            socketInfo.localAddress = socket[symbols_1.default.kSocketLocalAddress];
+            socketInfo.localPort = socket[symbols_1.default.kSocketLocalPort];
             socketInfo.remoteAddress = socket.remoteAddress;
             socketInfo.remotePort = socket.remotePort;
             socketInfo.remoteFamily = socket.remoteFamily;
             socketInfo.bytesRead = socket.bytesRead;
             socketInfo.bytesWritten = socket.bytesWritten;
+            socketInfo.connectedTime = socket[symbols_1.default.kSocketConnectedTime];
+            socketInfo.lastRequestEndTime = socket[symbols_1.default.kSocketRequestEndTime];
+            socket[symbols_1.default.kSocketRequestEndTime] = new Date();
         }
     }
 }

package/src/cjs/Request.d.ts

@@ -97,7 +97,7 @@ export type RequestOptions = {
      * */
     gzip?: boolean;
     /**
-     * Enable timing or not, default is false.
+     * Enable timing or not, default is true.
      * */
     timing?: boolean;
     /**
@@ -132,3 +132,10 @@ export type RequestOptions = {
     /** Default: `64 KiB` */
     highWaterMark?: number;
 };
+export type RequestMeta = {
+    requestId: number;
+    url: string;
+    args: RequestOptions;
+    ctx?: unknown;
+    retries: number;
+};

package/src/cjs/Response.d.ts

@@ -13,6 +13,8 @@ export type SocketInfo = {
     bytesRead: number;
     handledRequests: number;
     handledResponses: number;
+    connectedTime?: Date;
+    lastRequestEndTime?: Date;
 };
 /**
  * https://eggjs.org/en/core/httpclient.html#timing-boolean

package/src/cjs/diagnosticsChannel.js

@@ -21,6 +21,25 @@ let initedDiagnosticsChannel = false;
 // server --> client
 // undici:request:headers => { request, response }
 //   -> undici:request:trailers => { request, trailers }
+function subscribe(name, listener) {
+    if (typeof node_diagnostics_channel_1.default.subscribe === 'function') {
+        node_diagnostics_channel_1.default.subscribe(name, listener);
+    }
+    else {
+        // TODO: support Node.js 14, will be removed on the next major version
+        node_diagnostics_channel_1.default.channel(name).subscribe(listener);
+    }
+}
+function formatSocket(socket) {
+    if (!socket)
+        return socket;
+    return {
+        localAddress: socket[symbols_1.default.kSocketLocalAddress],
+        localPort: socket[symbols_1.default.kSocketLocalPort],
+        remoteAddress: socket.remoteAddress,
+        remotePort: socket.remotePort,
+    };
+}
 function initDiagnosticsChannel() {
     // makre sure init global DiagnosticsChannel once
     if (initedDiagnosticsChannel)
@@ -29,7 +48,7 @@ function initDiagnosticsChannel() {
     let kHandler;
     // This message is published when a new outgoing request is created.
     // Note: a request is only loosely completed to a given socket.
-    node_diagnostics_channel_1.default.channel('undici:request:create').subscribe((message, name) => {
+    subscribe('undici:request:create', (message, name) => {
         const { request } = message;
         if (!kHandler) {
             const symbols = Object.getOwnPropertySymbols(request);
@@ -52,16 +71,20 @@ function initDiagnosticsChannel() {
     // diagnosticsChannel.channel('undici:client:beforeConnect')
     // diagnosticsChannel.channel('undici:client:connectError')
     // This message is published after a connection is established.
-    node_diagnostics_channel_1.default.channel('undici:client:connected').subscribe((message, name) => {
+    subscribe('undici:client:connected', (message, name) => {
         const { socket } = message;
         socket[symbols_1.default.kSocketId] = (0, utils_1.globalId)('UndiciSocket');
         socket[symbols_1.default.kSocketStartTime] = node_perf_hooks_1.performance.now();
+        socket[symbols_1.default.kSocketConnectedTime] = new Date();
         socket[symbols_1.default.kHandledRequests] = 0;
         socket[symbols_1.default.kHandledResponses] = 0;
-        debug('[%s] Socket#%d connected', name, socket[symbols_1.default.kSocketId]);
+        // copy local address to symbol, avoid them be reset after request error throw
+        socket[symbols_1.default.kSocketLocalAddress] = socket.localAddress;
+        socket[symbols_1.default.kSocketLocalPort] = socket.localPort;
+        debug('[%s] Socket#%d connected (sock: %o)', name, socket[symbols_1.default.kSocketId], formatSocket(socket));
     });
     // This message is published right before the first byte of the request is written to the socket.
-    node_diagnostics_channel_1.default.channel('undici:client:sendHeaders').subscribe((message, name) => {
+    subscribe('undici:client:sendHeaders', (message, name) => {
         const { request, socket } = message;
         if (!kHandler)
             return;
@@ -71,7 +94,7 @@ function initDiagnosticsChannel() {
         socket[symbols_1.default.kHandledRequests]++;
         // attach socket to opaque
         opaque[symbols_1.default.kRequestSocket] = socket;
-        debug('[%s] Request#%d send headers on Socket#%d (handled %d requests)', name, opaque[symbols_1.default.kRequestId], socket[symbols_1.default.kSocketId], socket[symbols_1.default.kHandledRequests]);
+        debug('[%s] Request#%d send headers on Socket#%d (handled %d requests, sock: %o)', name, opaque[symbols_1.default.kRequestId], socket[symbols_1.default.kSocketId], socket[symbols_1.default.kHandledRequests], formatSocket(socket));
         if (!opaque[symbols_1.default.kEnableRequestTiming])
             return;
         opaque[symbols_1.default.kRequestTiming].requestHeadersSent = (0, utils_1.performanceTime)(opaque[symbols_1.default.kRequestStartTime]);
@@ -82,7 +105,7 @@ function initDiagnosticsChannel() {
                 (0, utils_1.performanceTime)(opaque[symbols_1.default.kRequestStartTime], socket[symbols_1.default.kSocketStartTime]);
         }
     });
-    node_diagnostics_channel_1.default.channel('undici:request:bodySent').subscribe((message, name) => {
+    subscribe('undici:request:bodySent', (message, name) => {
         const { request } = message;
         if (!kHandler)
             return;
@@ -95,7 +118,7 @@ function initDiagnosticsChannel() {
         opaque[symbols_1.default.kRequestTiming].requestSent = (0, utils_1.performanceTime)(opaque[symbols_1.default.kRequestStartTime]);
     });
     // This message is published after the response headers have been received, i.e. the response has been completed.
-    node_diagnostics_channel_1.default.channel('undici:request:headers').subscribe((message, name) => {
+    subscribe('undici:request:headers', (message, name) => {
         const { request, response } = message;
         if (!kHandler)
             return;
@@ -105,13 +128,13 @@ function initDiagnosticsChannel() {
         // get socket from opaque
         const socket = opaque[symbols_1.default.kRequestSocket];
         socket[symbols_1.default.kHandledResponses]++;
-        debug('[%s] Request#%d get %s response headers on Socket#%d (handled %d responses)', name, opaque[symbols_1.default.kRequestId], response.statusCode, socket[symbols_1.default.kSocketId], socket[symbols_1.default.kHandledResponses]);
+        debug('[%s] Request#%d get %s response headers on Socket#%d (handled %d responses, sock: %o)', name, opaque[symbols_1.default.kRequestId], response.statusCode, socket[symbols_1.default.kSocketId], socket[symbols_1.default.kHandledResponses], formatSocket(socket));
         if (!opaque[symbols_1.default.kEnableRequestTiming])
             return;
         opaque[symbols_1.default.kRequestTiming].waiting = (0, utils_1.performanceTime)(opaque[symbols_1.default.kRequestStartTime]);
     });
     // This message is published after the response body and trailers have been received, i.e. the response has been completed.
-    node_diagnostics_channel_1.default.channel('undici:request:trailers').subscribe((message, name) => {
+    subscribe('undici:request:trailers', (message, name) => {
         const { request } = message;
         if (!kHandler)
             return;
@@ -123,6 +146,15 @@ function initDiagnosticsChannel() {
             return;
         opaque[symbols_1.default.kRequestTiming].contentDownload = (0, utils_1.performanceTime)(opaque[symbols_1.default.kRequestStartTime]);
     });
-    // diagnosticsChannel.channel('undici:request:error')
+    // This message is published if the request is going to error, but it has not errored yet.
+    // subscribe('undici:request:error', (message, name) => {
+    //   const { request, error } = message as DiagnosticsChannel.RequestErrorMessage;
+    //   const opaque = request[kHandler]?.opts?.opaque;
+    //   if (!opaque || !opaque[symbols.kRequestId]) return;
+    //   const socket = opaque[symbols.kRequestSocket];
+    //   debug('[%s] Request#%d error on Socket#%d (handled %d responses, sock: %o), error: %o',
+    //     name, opaque[symbols.kRequestId], socket[symbols.kSocketId], socket[symbols.kHandledResponses],
+    //     formatSocket(socket), error);
+    // });
 }
 exports.initDiagnosticsChannel = initDiagnosticsChannel;

package/src/cjs/index.d.ts

@@ -2,7 +2,7 @@ import { RequestOptions, RequestURL } from './Request';
 export declare function request<T = any>(url: RequestURL, options?: RequestOptions): Promise<import("./Response").HttpClientResponse<T>>;
 export declare function curl<T = any>(url: RequestURL, options?: RequestOptions): Promise<import("./Response").HttpClientResponse<T>>;
 export { MockAgent, ProxyAgent, Agent, Dispatcher, setGlobalDispatcher, getGlobalDispatcher, } from 'undici';
-export { HttpClient, HttpClient as HttpClient2, HEADER_USER_AGENT as USER_AGENT } from './HttpClient';
+export { HttpClient, HttpClient as HttpClient2, HEADER_USER_AGENT as USER_AGENT, RequestDiagnosticsMessage, ResponseDiagnosticsMessage, } from './HttpClient';
 export { RequestOptions, RequestOptions as RequestOptions2, RequestURL, HttpMethod, FixJSONCtlCharsHandler, FixJSONCtlChars, } from './Request';
 export { SocketInfo, Timing, RawResponseWithMeta, HttpClientResponse } from './Response';
 declare const _default: {

package/src/cjs/symbols.d.ts

@@ -1,6 +1,10 @@
 declare const _default: {
     kSocketId: symbol;
     kSocketStartTime: symbol;
+    kSocketConnectedTime: symbol;
+    kSocketRequestEndTime: symbol;
+    kSocketLocalAddress: symbol;
+    kSocketLocalPort: symbol;
     kHandledRequests: symbol;
     kHandledResponses: symbol;
     kRequestSocket: symbol;

package/src/cjs/symbols.js

@@ -3,6 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     kSocketId: Symbol('socket id'),
     kSocketStartTime: Symbol('socket start time'),
+    kSocketConnectedTime: Symbol('socket connected time'),
+    kSocketRequestEndTime: Symbol('socket request end time'),
+    kSocketLocalAddress: Symbol('socket local address'),
+    kSocketLocalPort: Symbol('socket local port'),
     kHandledRequests: Symbol('handled requests per socket'),
     kHandledResponses: Symbol('handled responses per socket'),
     kRequestSocket: Symbol('request on the socket'),

package/src/diagnosticsChannel.ts

@@ -1,6 +1,7 @@
 import diagnosticsChannel from 'node:diagnostics_channel';
 import { performance } from 'node:perf_hooks';
 import { debuglog } from 'node:util';
+import { Socket } from 'node:net';
 import { DiagnosticsChannel } from 'undici';
 import symbols from './symbols';
 import { globalId, performanceTime } from './utils';
@@ -17,6 +18,26 @@ let initedDiagnosticsChannel = false;
 // server --> client
 // undici:request:headers => { request, response }
 //   -> undici:request:trailers => { request, trailers }
+
+function subscribe(name: string, listener: (message: unknown, channelName: string | symbol) => void) {
+  if (typeof diagnosticsChannel.subscribe === 'function') {
+    diagnosticsChannel.subscribe(name, listener);
+  } else {
+    // TODO: support Node.js 14, will be removed on the next major version
+    diagnosticsChannel.channel(name).subscribe(listener);
+  }
+}
+
+function formatSocket(socket: Socket) {
+  if (!socket) return socket;
+  return {
+    localAddress: socket[symbols.kSocketLocalAddress],
+    localPort: socket[symbols.kSocketLocalPort],
+    remoteAddress: socket.remoteAddress,
+    remotePort: socket.remotePort,
+  };
+}
+
 export function initDiagnosticsChannel() {
   // makre sure init global DiagnosticsChannel once
   if (initedDiagnosticsChannel) return;
@@ -25,7 +46,7 @@ export function initDiagnosticsChannel() {
   let kHandler: symbol;
   // This message is published when a new outgoing request is created.
   // Note: a request is only loosely completed to a given socket.
-  diagnosticsChannel.channel('undici:request:create').subscribe((message, name) => {
+  subscribe('undici:request:create', (message, name) => {
     const { request } = message as DiagnosticsChannel.RequestCreateMessage;
     if (!kHandler) {
       const symbols = Object.getOwnPropertySymbols(request);
@@ -48,17 +69,21 @@ export function initDiagnosticsChannel() {
   // diagnosticsChannel.channel('undici:client:beforeConnect')
   // diagnosticsChannel.channel('undici:client:connectError')
   // This message is published after a connection is established.
-  diagnosticsChannel.channel('undici:client:connected').subscribe((message, name) => {
+  subscribe('undici:client:connected', (message, name) => {
     const { socket } = message as DiagnosticsChannel.ClientConnectedMessage;
     socket[symbols.kSocketId] = globalId('UndiciSocket');
     socket[symbols.kSocketStartTime] = performance.now();
+    socket[symbols.kSocketConnectedTime] = new Date();
     socket[symbols.kHandledRequests] = 0;
     socket[symbols.kHandledResponses] = 0;
-    debug('[%s] Socket#%d connected', name, socket[symbols.kSocketId]);
+    // copy local address to symbol, avoid them be reset after request error throw
+    socket[symbols.kSocketLocalAddress] = socket.localAddress;
+    socket[symbols.kSocketLocalPort] = socket.localPort;
+    debug('[%s] Socket#%d connected (sock: %o)', name, socket[symbols.kSocketId], formatSocket(socket));
   });
 
   // This message is published right before the first byte of the request is written to the socket.
-  diagnosticsChannel.channel('undici:client:sendHeaders').subscribe((message, name) => {
+  subscribe('undici:client:sendHeaders', (message, name) => {
     const { request, socket } = message as DiagnosticsChannel.ClientSendHeadersMessage;
     if (!kHandler) return;
     const opaque = request[kHandler]?.opts?.opaque;
@@ -67,8 +92,9 @@ export function initDiagnosticsChannel() {
     socket[symbols.kHandledRequests]++;
     // attach socket to opaque
     opaque[symbols.kRequestSocket] = socket;
-    debug('[%s] Request#%d send headers on Socket#%d (handled %d requests)',
-      name, opaque[symbols.kRequestId], socket[symbols.kSocketId], socket[symbols.kHandledRequests]);
+    debug('[%s] Request#%d send headers on Socket#%d (handled %d requests, sock: %o)',
+      name, opaque[symbols.kRequestId], socket[symbols.kSocketId], socket[symbols.kHandledRequests],
+      formatSocket(socket));
 
     if (!opaque[symbols.kEnableRequestTiming]) return;
     opaque[symbols.kRequestTiming].requestHeadersSent = performanceTime(opaque[symbols.kRequestStartTime]);
@@ -80,7 +106,7 @@ export function initDiagnosticsChannel() {
     }
   });
 
-  diagnosticsChannel.channel('undici:request:bodySent').subscribe((message, name) => {
+  subscribe('undici:request:bodySent', (message, name) => {
     const { request } = message as DiagnosticsChannel.RequestBodySentMessage;
     if (!kHandler) return;
     const opaque = request[kHandler]?.opts?.opaque;
@@ -92,7 +118,7 @@ export function initDiagnosticsChannel() {
   });
 
   // This message is published after the response headers have been received, i.e. the response has been completed.
-  diagnosticsChannel.channel('undici:request:headers').subscribe((message, name) => {
+  subscribe('undici:request:headers', (message, name) => {
     const { request, response } = message as DiagnosticsChannel.RequestHeadersMessage;
     if (!kHandler) return;
     const opaque = request[kHandler]?.opts?.opaque;
@@ -101,15 +127,16 @@ export function initDiagnosticsChannel() {
     // get socket from opaque
     const socket = opaque[symbols.kRequestSocket];
     socket[symbols.kHandledResponses]++;
-    debug('[%s] Request#%d get %s response headers on Socket#%d (handled %d responses)',
-      name, opaque[symbols.kRequestId], response.statusCode, socket[symbols.kSocketId], socket[symbols.kHandledResponses]);
+    debug('[%s] Request#%d get %s response headers on Socket#%d (handled %d responses, sock: %o)',
+      name, opaque[symbols.kRequestId], response.statusCode, socket[symbols.kSocketId], socket[symbols.kHandledResponses],
+      formatSocket(socket));
 
     if (!opaque[symbols.kEnableRequestTiming]) return;
     opaque[symbols.kRequestTiming].waiting = performanceTime(opaque[symbols.kRequestStartTime]);
   });
 
   // This message is published after the response body and trailers have been received, i.e. the response has been completed.
-  diagnosticsChannel.channel('undici:request:trailers').subscribe((message, name) => {
+  subscribe('undici:request:trailers', (message, name) => {
     const { request } = message as DiagnosticsChannel.RequestTrailersMessage;
     if (!kHandler) return;
     const opaque = request[kHandler]?.opts?.opaque;
@@ -120,5 +147,15 @@ export function initDiagnosticsChannel() {
     if (!opaque[symbols.kEnableRequestTiming]) return;
     opaque[symbols.kRequestTiming].contentDownload = performanceTime(opaque[symbols.kRequestStartTime]);
   });
-  // diagnosticsChannel.channel('undici:request:error')
+
+  // This message is published if the request is going to error, but it has not errored yet.
+  // subscribe('undici:request:error', (message, name) => {
+  //   const { request, error } = message as DiagnosticsChannel.RequestErrorMessage;
+  //   const opaque = request[kHandler]?.opts?.opaque;
+  //   if (!opaque || !opaque[symbols.kRequestId]) return;
+  //   const socket = opaque[symbols.kRequestSocket];
+  //   debug('[%s] Request#%d error on Socket#%d (handled %d responses, sock: %o), error: %o',
+  //     name, opaque[symbols.kRequestId], socket[symbols.kSocketId], socket[symbols.kHandledResponses],
+  //     formatSocket(socket), error);
+  // });
 }

package/src/esm/HttpClient.d.ts

@@ -4,8 +4,8 @@
 import { EventEmitter } from 'node:events';
 import { LookupFunction } from 'node:net';
 import { CheckAddressFunction } from './HttpAgent';
-import { RequestURL, RequestOptions } from './Request';
-import { HttpClientResponse } from './Response';
+import { RequestURL, RequestOptions, RequestMeta } from './Request';
+import { RawResponseWithMeta, HttpClientResponse } from './Response';
 export type ClientOptions = {
     defaultArgs?: RequestOptions;
     /**
@@ -37,6 +37,14 @@ export type ClientOptions = {
     };
 };
 export declare const HEADER_USER_AGENT: string;
+export type RequestDiagnosticsMessage = {
+    request: RequestMeta;
+};
+export type ResponseDiagnosticsMessage = {
+    request: RequestMeta;
+    response: RawResponseWithMeta;
+    error?: Error;
+};
 export declare class HttpClient extends EventEmitter {
     #private;
     constructor(clientOptions?: ClientOptions);

package/src/esm/HttpClient.js

@@ -1,3 +1,4 @@
+import diagnosticsChannel from 'node:diagnostics_channel';
 import { EventEmitter } from 'node:events';
 import { STATUS_CODES } from 'node:http';
 import { debuglog } from 'node:util';
@@ -63,7 +64,7 @@ class HttpClientRequestTimeoutError extends Error {
         Error.captureStackTrace(this, this.constructor);
     }
 }
-export const HEADER_USER_AGENT = createUserAgent('node-urllib', '3.16.1');
+export const HEADER_USER_AGENT = createUserAgent('node-urllib', '3.17.0');
 function getFileName(stream) {
     const filePath = stream.path;
     if (filePath) {
@@ -74,6 +75,10 @@ function getFileName(stream) {
 function defaultIsRetry(response) {
     return response.status >= 500;
 }
+const channels = {
+    request: diagnosticsChannel.channel('urllib:request'),
+    response: diagnosticsChannel.channel('urllib:response'),
+};
 export class HttpClient extends EventEmitter {
     #defaultArgs;
     #dispatcher;
@@ -120,6 +125,7 @@ export class HttpClient extends EventEmitter {
         const headers = {};
         const args = {
             retry: 0,
+            timing: true,
             ...this.#defaultArgs,
             ...options,
             // keep method and headers exists on args for request event handler to easy use
@@ -130,7 +136,10 @@ export class HttpClient extends EventEmitter {
             retries: 0,
             ...requestContext,
         };
-        const requestStartTime = performance.now();
+        if (!requestContext.requestStartTime) {
+            requestContext.requestStartTime = performance.now();
+        }
+        const requestStartTime = requestContext.requestStartTime;
         // https://developer.chrome.com/docs/devtools/network/reference/?utm_source=devtools#timing-explanation
         const timing = {
             // socket assigned
@@ -378,6 +387,9 @@ export class HttpClient extends EventEmitter {
             }
             debug('Request#%d %s %s, headers: %j, headersTimeout: %s, bodyTimeout: %s', requestId, requestOptions.method, requestUrl.href, headers, headersTimeout, bodyTimeout);
             requestOptions.headers = headers;
+            channels.request.publish({
+                request: reqMeta,
+            });
             if (this.listenerCount('request') > 0) {
                 this.emit('request', reqMeta);
             }
@@ -496,6 +508,10 @@ export class HttpClient extends EventEmitter {
                     return await this.#requestInternal(url, options, requestContext);
                 }
             }
+            channels.response.publish({
+                request: reqMeta,
+                response: res,
+            });
             if (this.listenerCount('response') > 0) {
                 this.emit('response', {
                     requestId,
@@ -519,16 +535,36 @@ export class HttpClient extends EventEmitter {
             else if (err.name === 'BodyTimeoutError') {
                 err = new HttpClientRequestTimeoutError(bodyTimeout, { cause: e });
             }
+            else if (err.code === 'UND_ERR_SOCKET' || err.code === 'ECONNRESET') {
+                // auto retry on socket error, https://github.com/node-modules/urllib/issues/454
+                if (args.retry > 0 && requestContext.retries < args.retry) {
+                    if (args.retryDelay) {
+                        await sleep(args.retryDelay);
+                    }
+                    requestContext.retries++;
+                    return await this.#requestInternal(url, options, requestContext);
+                }
+            }
             err.opaque = orginalOpaque;
             err.status = res.status;
             err.headers = res.headers;
             err.res = res;
+            if (err.socket) {
+                // store rawSocket
+                err._rawSocket = err.socket;
+            }
+            err.socket = socketInfo;
             // make sure requestUrls not empty
             if (res.requestUrls.length === 0) {
                 res.requestUrls.push(requestUrl.href);
             }
             res.rt = performanceTime(requestStartTime);
             this.#updateSocketInfo(socketInfo, internalOpaque);
+            channels.response.publish({
+                request: reqMeta,
+                response: res,
+                error: err,
+            });
             if (this.listenerCount('response') > 0) {
                 this.emit('response', {
                     requestId,
@@ -550,13 +586,16 @@ export class HttpClient extends EventEmitter {
             socketInfo.id = socket[symbols.kSocketId];
             socketInfo.handledRequests = socket[symbols.kHandledRequests];
             socketInfo.handledResponses = socket[symbols.kHandledResponses];
-            socketInfo.localAddress = socket.localAddress;
-            socketInfo.localPort = socket.localPort;
+            socketInfo.localAddress = socket[symbols.kSocketLocalAddress];
+            socketInfo.localPort = socket[symbols.kSocketLocalPort];
             socketInfo.remoteAddress = socket.remoteAddress;
             socketInfo.remotePort = socket.remotePort;
             socketInfo.remoteFamily = socket.remoteFamily;
             socketInfo.bytesRead = socket.bytesRead;
             socketInfo.bytesWritten = socket.bytesWritten;
+            socketInfo.connectedTime = socket[symbols.kSocketConnectedTime];
+            socketInfo.lastRequestEndTime = socket[symbols.kSocketRequestEndTime];
+            socket[symbols.kSocketRequestEndTime] = new Date();
         }
     }
 }

package/src/esm/Request.d.ts

@@ -97,7 +97,7 @@ export type RequestOptions = {
      * */
     gzip?: boolean;
     /**
-     * Enable timing or not, default is false.
+     * Enable timing or not, default is true.
      * */
     timing?: boolean;
     /**
@@ -132,3 +132,10 @@ export type RequestOptions = {
     /** Default: `64 KiB` */
     highWaterMark?: number;
 };
+export type RequestMeta = {
+    requestId: number;
+    url: string;
+    args: RequestOptions;
+    ctx?: unknown;
+    retries: number;
+};

package/src/esm/Response.d.ts

@@ -13,6 +13,8 @@ export type SocketInfo = {
     bytesRead: number;
     handledRequests: number;
     handledResponses: number;
+    connectedTime?: Date;
+    lastRequestEndTime?: Date;
 };
 /**
  * https://eggjs.org/en/core/httpclient.html#timing-boolean

package/src/esm/diagnosticsChannel.js

@@ -15,6 +15,25 @@ let initedDiagnosticsChannel = false;
 // server --> client
 // undici:request:headers => { request, response }
 //   -> undici:request:trailers => { request, trailers }
+function subscribe(name, listener) {
+    if (typeof diagnosticsChannel.subscribe === 'function') {
+        diagnosticsChannel.subscribe(name, listener);
+    }
+    else {
+        // TODO: support Node.js 14, will be removed on the next major version
+        diagnosticsChannel.channel(name).subscribe(listener);
+    }
+}
+function formatSocket(socket) {
+    if (!socket)
+        return socket;
+    return {
+        localAddress: socket[symbols.kSocketLocalAddress],
+        localPort: socket[symbols.kSocketLocalPort],
+        remoteAddress: socket.remoteAddress,
+        remotePort: socket.remotePort,
+    };
+}
 export function initDiagnosticsChannel() {
     // makre sure init global DiagnosticsChannel once
     if (initedDiagnosticsChannel)
@@ -23,7 +42,7 @@ export function initDiagnosticsChannel() {
     let kHandler;
     // This message is published when a new outgoing request is created.
     // Note: a request is only loosely completed to a given socket.
-    diagnosticsChannel.channel('undici:request:create').subscribe((message, name) => {
+    subscribe('undici:request:create', (message, name) => {
         const { request } = message;
         if (!kHandler) {
             const symbols = Object.getOwnPropertySymbols(request);
@@ -46,16 +65,20 @@ export function initDiagnosticsChannel() {
     // diagnosticsChannel.channel('undici:client:beforeConnect')
     // diagnosticsChannel.channel('undici:client:connectError')
     // This message is published after a connection is established.
-    diagnosticsChannel.channel('undici:client:connected').subscribe((message, name) => {
+    subscribe('undici:client:connected', (message, name) => {
         const { socket } = message;
         socket[symbols.kSocketId] = globalId('UndiciSocket');
         socket[symbols.kSocketStartTime] = performance.now();
+        socket[symbols.kSocketConnectedTime] = new Date();
         socket[symbols.kHandledRequests] = 0;
         socket[symbols.kHandledResponses] = 0;
-        debug('[%s] Socket#%d connected', name, socket[symbols.kSocketId]);
+        // copy local address to symbol, avoid them be reset after request error throw
+        socket[symbols.kSocketLocalAddress] = socket.localAddress;
+        socket[symbols.kSocketLocalPort] = socket.localPort;
+        debug('[%s] Socket#%d connected (sock: %o)', name, socket[symbols.kSocketId], formatSocket(socket));
     });
     // This message is published right before the first byte of the request is written to the socket.
-    diagnosticsChannel.channel('undici:client:sendHeaders').subscribe((message, name) => {
+    subscribe('undici:client:sendHeaders', (message, name) => {
         const { request, socket } = message;
         if (!kHandler)
             return;
@@ -65,7 +88,7 @@ export function initDiagnosticsChannel() {
         socket[symbols.kHandledRequests]++;
         // attach socket to opaque
         opaque[symbols.kRequestSocket] = socket;
-        debug('[%s] Request#%d send headers on Socket#%d (handled %d requests)', name, opaque[symbols.kRequestId], socket[symbols.kSocketId], socket[symbols.kHandledRequests]);
+        debug('[%s] Request#%d send headers on Socket#%d (handled %d requests, sock: %o)', name, opaque[symbols.kRequestId], socket[symbols.kSocketId], socket[symbols.kHandledRequests], formatSocket(socket));
         if (!opaque[symbols.kEnableRequestTiming])
             return;
         opaque[symbols.kRequestTiming].requestHeadersSent = performanceTime(opaque[symbols.kRequestStartTime]);
@@ -76,7 +99,7 @@ export function initDiagnosticsChannel() {
                 performanceTime(opaque[symbols.kRequestStartTime], socket[symbols.kSocketStartTime]);
         }
     });
-    diagnosticsChannel.channel('undici:request:bodySent').subscribe((message, name) => {
+    subscribe('undici:request:bodySent', (message, name) => {
         const { request } = message;
         if (!kHandler)
             return;
@@ -89,7 +112,7 @@ export function initDiagnosticsChannel() {
         opaque[symbols.kRequestTiming].requestSent = performanceTime(opaque[symbols.kRequestStartTime]);
     });
     // This message is published after the response headers have been received, i.e. the response has been completed.
-    diagnosticsChannel.channel('undici:request:headers').subscribe((message, name) => {
+    subscribe('undici:request:headers', (message, name) => {
         const { request, response } = message;
         if (!kHandler)
             return;
@@ -99,13 +122,13 @@ export function initDiagnosticsChannel() {
         // get socket from opaque
         const socket = opaque[symbols.kRequestSocket];
         socket[symbols.kHandledResponses]++;
-        debug('[%s] Request#%d get %s response headers on Socket#%d (handled %d responses)', name, opaque[symbols.kRequestId], response.statusCode, socket[symbols.kSocketId], socket[symbols.kHandledResponses]);
+        debug('[%s] Request#%d get %s response headers on Socket#%d (handled %d responses, sock: %o)', name, opaque[symbols.kRequestId], response.statusCode, socket[symbols.kSocketId], socket[symbols.kHandledResponses], formatSocket(socket));
         if (!opaque[symbols.kEnableRequestTiming])
             return;
         opaque[symbols.kRequestTiming].waiting = performanceTime(opaque[symbols.kRequestStartTime]);
     });
     // This message is published after the response body and trailers have been received, i.e. the response has been completed.
-    diagnosticsChannel.channel('undici:request:trailers').subscribe((message, name) => {
+    subscribe('undici:request:trailers', (message, name) => {
         const { request } = message;
         if (!kHandler)
             return;
@@ -117,5 +140,14 @@ export function initDiagnosticsChannel() {
             return;
         opaque[symbols.kRequestTiming].contentDownload = performanceTime(opaque[symbols.kRequestStartTime]);
     });
-    // diagnosticsChannel.channel('undici:request:error')
+    // This message is published if the request is going to error, but it has not errored yet.
+    // subscribe('undici:request:error', (message, name) => {
+    //   const { request, error } = message as DiagnosticsChannel.RequestErrorMessage;
+    //   const opaque = request[kHandler]?.opts?.opaque;
+    //   if (!opaque || !opaque[symbols.kRequestId]) return;
+    //   const socket = opaque[symbols.kRequestSocket];
+    //   debug('[%s] Request#%d error on Socket#%d (handled %d responses, sock: %o), error: %o',
+    //     name, opaque[symbols.kRequestId], socket[symbols.kSocketId], socket[symbols.kHandledResponses],
+    //     formatSocket(socket), error);
+    // });
 }

package/src/esm/index.d.ts

@@ -2,7 +2,7 @@ import { RequestOptions, RequestURL } from './Request';
 export declare function request<T = any>(url: RequestURL, options?: RequestOptions): Promise<import("./Response").HttpClientResponse<T>>;
 export declare function curl<T = any>(url: RequestURL, options?: RequestOptions): Promise<import("./Response").HttpClientResponse<T>>;
 export { MockAgent, ProxyAgent, Agent, Dispatcher, setGlobalDispatcher, getGlobalDispatcher, } from 'undici';
-export { HttpClient, HttpClient as HttpClient2, HEADER_USER_AGENT as USER_AGENT } from './HttpClient';
+export { HttpClient, HttpClient as HttpClient2, HEADER_USER_AGENT as USER_AGENT, RequestDiagnosticsMessage, ResponseDiagnosticsMessage, } from './HttpClient';
 export { RequestOptions, RequestOptions as RequestOptions2, RequestURL, HttpMethod, FixJSONCtlCharsHandler, FixJSONCtlChars, } from './Request';
 export { SocketInfo, Timing, RawResponseWithMeta, HttpClientResponse } from './Response';
 declare const _default: {

package/src/esm/index.js

@@ -28,7 +28,7 @@ export async function curl(url, options) {
 }
 export { MockAgent, ProxyAgent, Agent, Dispatcher, setGlobalDispatcher, getGlobalDispatcher, } from 'undici';
 // HttpClient2 is keep compatible with urlib@2 HttpClient2
-export { HttpClient, HttpClient as HttpClient2, HEADER_USER_AGENT as USER_AGENT } from './HttpClient.js';
+export { HttpClient, HttpClient as HttpClient2, HEADER_USER_AGENT as USER_AGENT, } from './HttpClient.js';
 export default {
     request,
     curl,

package/src/esm/symbols.d.ts

@@ -1,6 +1,10 @@
 declare const _default: {
     kSocketId: symbol;
     kSocketStartTime: symbol;
+    kSocketConnectedTime: symbol;
+    kSocketRequestEndTime: symbol;
+    kSocketLocalAddress: symbol;
+    kSocketLocalPort: symbol;
     kHandledRequests: symbol;
     kHandledResponses: symbol;
     kRequestSocket: symbol;

package/src/esm/symbols.js

@@ -1,6 +1,10 @@
 export default {
     kSocketId: Symbol('socket id'),
     kSocketStartTime: Symbol('socket start time'),
+    kSocketConnectedTime: Symbol('socket connected time'),
+    kSocketRequestEndTime: Symbol('socket request end time'),
+    kSocketLocalAddress: Symbol('socket local address'),
+    kSocketLocalPort: Symbol('socket local port'),
     kHandledRequests: Symbol('handled requests per socket'),
     kHandledResponses: Symbol('handled responses per socket'),
     kRequestSocket: Symbol('request on the socket'),

package/src/index.ts

@@ -36,7 +36,10 @@ export {
   setGlobalDispatcher, getGlobalDispatcher,
 } from 'undici';
 // HttpClient2 is keep compatible with urlib@2 HttpClient2
-export { HttpClient, HttpClient as HttpClient2, HEADER_USER_AGENT as USER_AGENT } from './HttpClient';
+export {
+  HttpClient, HttpClient as HttpClient2, HEADER_USER_AGENT as USER_AGENT,
+  RequestDiagnosticsMessage, ResponseDiagnosticsMessage,
+} from './HttpClient';
 // RequestOptions2 is keep compatible with urlib@2 RequestOptions2
 export {
   RequestOptions, RequestOptions as RequestOptions2, RequestURL, HttpMethod,

package/src/symbols.ts

@@ -1,6 +1,10 @@
 export default {
   kSocketId: Symbol('socket id'),
   kSocketStartTime: Symbol('socket start time'),
+  kSocketConnectedTime: Symbol('socket connected time'),
+  kSocketRequestEndTime: Symbol('socket request end time'),
+  kSocketLocalAddress: Symbol('socket local address'),
+  kSocketLocalPort: Symbol('socket local port'),
   kHandledRequests: Symbol('handled requests per socket'),
   kHandledResponses: Symbol('handled responses per socket'),
   kRequestSocket: Symbol('request on the socket'),