urllib 3.20.0 → 3.21.0

package/dist/commonjs/HttpAgent.js

@@ -68,7 +68,7 @@ class HttpAgent extends undici_1.Agent {
             }
             const family = (0, node_net_1.isIP)(hostname);
             if (family === 4 || family === 6) {
-                // if request hostname is ip, custom lookup won't excute
+                // if request hostname is ip, custom lookup won't execute
                 if (!this.#checkAddress(hostname, family)) {
                     throw new IllegalAddressError(hostname, hostname, family);
                 }

package/dist/commonjs/HttpClient.js

@@ -29,6 +29,7 @@ const HttpAgent_js_1 = require("./HttpAgent.js");
 const utils_js_1 = require("./utils.js");
 const symbols_js_1 = __importDefault(require("./symbols.js"));
 const diagnosticsChannel_js_1 = require("./diagnosticsChannel.js");
+const HttpClientError_js_1 = require("./HttpClientError.js");
 const PROTO_RE = /^https?:\/\//i;
 const FormData = undici_1.FormData ?? formdata_node_1.FormData;
 // impl promise pipeline on Node.js 14
@@ -65,15 +66,7 @@ class BlobFromStream {
         return 'Blob';
     }
 }
-class HttpClientRequestTimeoutError extends Error {
-    constructor(timeout, options) {
-        const message = `Request timeout for ${timeout} ms`;
-        super(message, options);
-        this.name = this.constructor.name;
-        Error.captureStackTrace(this, this.constructor);
-    }
-}
-exports.HEADER_USER_AGENT = (0, default_user_agent_1.default)('node-urllib', '3.20.0');
+exports.HEADER_USER_AGENT = (0, default_user_agent_1.default)('node-urllib', '3.21.0');
 function getFileName(stream) {
     const filePath = stream.path;
     if (filePath) {
@@ -580,14 +573,17 @@ class HttpClient extends node_events_1.EventEmitter {
             }
             return clientResponse;
         }
-        catch (e) {
-            debug('Request#%d throw error: %s', requestId, e);
-            let err = e;
+        catch (rawError) {
+            debug('Request#%d throw error: %s', requestId, rawError);
+            let err = rawError;
             if (err.name === 'HeadersTimeoutError') {
-                err = new HttpClientRequestTimeoutError(headersTimeout, { cause: e });
+                err = new HttpClientError_js_1.HttpClientRequestTimeoutError(headersTimeout, { cause: err });
             }
             else if (err.name === 'BodyTimeoutError') {
-                err = new HttpClientRequestTimeoutError(bodyTimeout, { cause: e });
+                err = new HttpClientError_js_1.HttpClientRequestTimeoutError(bodyTimeout, { cause: err });
+            }
+            else if (err.code === 'UND_ERR_CONNECT_TIMEOUT') {
+                err = new HttpClientError_js_1.HttpClientConnectTimeoutError(err.message, err.code, { cause: err });
             }
             else if (err.code === 'UND_ERR_SOCKET' || err.code === 'ECONNRESET') {
                 // auto retry on socket error, https://github.com/node-modules/urllib/issues/454
@@ -610,7 +606,7 @@ class HttpClient extends node_events_1.EventEmitter {
                 res.requestUrls.push(requestUrl.href);
             }
             res.rt = (0, utils_js_1.performanceTime)(requestStartTime);
-            this.#updateSocketInfo(socketInfo, internalOpaque);
+            this.#updateSocketInfo(socketInfo, internalOpaque, rawError);
             channels.response.publish({
                 request: reqMeta,
                 response: res,
@@ -631,21 +627,38 @@ class HttpClient extends node_events_1.EventEmitter {
             throw err;
         }
     }
-    #updateSocketInfo(socketInfo, internalOpaque) {
-        const socket = internalOpaque[symbols_js_1.default.kRequestSocket];
+    #updateSocketInfo(socketInfo, internalOpaque, err) {
+        const socket = internalOpaque[symbols_js_1.default.kRequestSocket] ?? err?.[symbols_js_1.default.kErrorSocket];
         if (socket) {
             socketInfo.id = socket[symbols_js_1.default.kSocketId];
             socketInfo.handledRequests = socket[symbols_js_1.default.kHandledRequests];
             socketInfo.handledResponses = socket[symbols_js_1.default.kHandledResponses];
-            socketInfo.localAddress = socket[symbols_js_1.default.kSocketLocalAddress];
-            socketInfo.localPort = socket[symbols_js_1.default.kSocketLocalPort];
-            socketInfo.remoteAddress = socket.remoteAddress;
-            socketInfo.remotePort = socket.remotePort;
-            socketInfo.remoteFamily = socket.remoteFamily;
+            if (socket[symbols_js_1.default.kSocketLocalAddress]) {
+                socketInfo.localAddress = socket[symbols_js_1.default.kSocketLocalAddress];
+                socketInfo.localPort = socket[symbols_js_1.default.kSocketLocalPort];
+            }
+            if (socket.remoteAddress) {
+                socketInfo.remoteAddress = socket.remoteAddress;
+                socketInfo.remotePort = socket.remotePort;
+                socketInfo.remoteFamily = socket.remoteFamily;
+            }
             socketInfo.bytesRead = socket.bytesRead;
             socketInfo.bytesWritten = socket.bytesWritten;
-            socketInfo.connectedTime = socket[symbols_js_1.default.kSocketConnectedTime];
-            socketInfo.lastRequestEndTime = socket[symbols_js_1.default.kSocketRequestEndTime];
+            if (socket[symbols_js_1.default.kSocketConnectErrorTime]) {
+                socketInfo.connectErrorTime = socket[symbols_js_1.default.kSocketConnectErrorTime];
+                if (Array.isArray(socket.autoSelectFamilyAttemptedAddresses)) {
+                    socketInfo.attemptedRemoteAddresses = socket.autoSelectFamilyAttemptedAddresses;
+                }
+                socketInfo.connectProtocol = socket[symbols_js_1.default.kSocketConnectProtocol];
+                socketInfo.connectHost = socket[symbols_js_1.default.kSocketConnectHost];
+                socketInfo.connectPort = socket[symbols_js_1.default.kSocketConnectPort];
+            }
+            if (socket[symbols_js_1.default.kSocketConnectedTime]) {
+                socketInfo.connectedTime = socket[symbols_js_1.default.kSocketConnectedTime];
+            }
+            if (socket[symbols_js_1.default.kSocketRequestEndTime]) {
+                socketInfo.lastRequestEndTime = socket[symbols_js_1.default.kSocketRequestEndTime];
+            }
             socket[symbols_js_1.default.kSocketRequestEndTime] = new Date();
         }
     }

package/dist/commonjs/HttpClientError.d.ts

@@ -0,0 +1,19 @@
+import type { RawResponseWithMeta, SocketInfo } from './Response.js';
+import type { IncomingHttpHeaders } from './IncomingHttpHeaders.js';
+interface ErrorOptions {
+    cause?: Error;
+}
+export declare class HttpClientRequestError extends Error {
+    status?: number;
+    headers?: IncomingHttpHeaders;
+    socket?: SocketInfo;
+    res?: RawResponseWithMeta;
+}
+export declare class HttpClientRequestTimeoutError extends HttpClientRequestError {
+    constructor(timeout: number, options: ErrorOptions);
+}
+export declare class HttpClientConnectTimeoutError extends HttpClientRequestError {
+    code: string;
+    constructor(message: string, code: string, options: ErrorOptions);
+}
+export {};

package/dist/commonjs/HttpClientError.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HttpClientConnectTimeoutError = exports.HttpClientRequestTimeoutError = exports.HttpClientRequestError = void 0;
+class HttpClientRequestError extends Error {
+    status;
+    headers;
+    socket;
+    res;
+}
+exports.HttpClientRequestError = HttpClientRequestError;
+class HttpClientRequestTimeoutError extends HttpClientRequestError {
+    constructor(timeout, options) {
+        const message = `Request timeout for ${timeout} ms`;
+        super(message, options);
+        this.name = this.constructor.name;
+        Error.captureStackTrace(this, this.constructor);
+    }
+}
+exports.HttpClientRequestTimeoutError = HttpClientRequestTimeoutError;
+class HttpClientConnectTimeoutError extends HttpClientRequestError {
+    code;
+    constructor(message, code, options) {
+        super(message, options);
+        this.name = this.constructor.name;
+        this.code = code;
+        Error.captureStackTrace(this, this.constructor);
+    }
+}
+exports.HttpClientConnectTimeoutError = HttpClientConnectTimeoutError;

package/dist/commonjs/Response.d.ts

@@ -13,7 +13,12 @@ export type SocketInfo = {
     handledRequests: number;
     handledResponses: number;
     connectedTime?: Date;
+    connectErrorTime?: Date;
     lastRequestEndTime?: Date;
+    attemptedRemoteAddresses?: string[];
+    connectProtocol?: string;
+    connectHost?: string;
+    connectPort?: string;
 };
 /**
  * https://eggjs.org/en/core/httpclient.html#timing-boolean

package/dist/commonjs/diagnosticsChannel.js

@@ -7,6 +7,7 @@ exports.initDiagnosticsChannel = void 0;
 const node_diagnostics_channel_1 = __importDefault(require("node:diagnostics_channel"));
 const node_perf_hooks_1 = require("node:perf_hooks");
 const node_util_1 = require("node:util");
+const node_net_1 = require("node:net");
 const symbols_js_1 = __importDefault(require("./symbols.js"));
 const utils_js_1 = require("./utils.js");
 const debug = (0, node_util_1.debuglog)('urllib:DiagnosticsChannel');
@@ -38,8 +39,23 @@ function formatSocket(socket) {
         localPort: socket[symbols_js_1.default.kSocketLocalPort],
         remoteAddress: socket.remoteAddress,
         remotePort: socket.remotePort,
+        attemptedAddresses: socket.autoSelectFamilyAttemptedAddresses,
+        connecting: socket.connecting,
     };
 }
+// make sure error contains socket info
+const kDestroy = Symbol('kDestroy');
+node_net_1.Socket.prototype[kDestroy] = node_net_1.Socket.prototype.destroy;
+node_net_1.Socket.prototype.destroy = function (err) {
+    if (err) {
+        Object.defineProperty(err, symbols_js_1.default.kErrorSocket, {
+            // don't show on console log
+            enumerable: false,
+            value: this,
+        });
+    }
+    return this[kDestroy](err);
+};
 function initDiagnosticsChannel() {
     // makre sure init global DiagnosticsChannel once
     if (initedDiagnosticsChannel)
@@ -69,10 +85,34 @@ function initDiagnosticsChannel() {
         opaque[symbols_js_1.default.kRequestTiming].queuing = (0, utils_js_1.performanceTime)(opaque[symbols_js_1.default.kRequestStartTime]);
     });
     // diagnosticsChannel.channel('undici:client:beforeConnect')
-    // diagnosticsChannel.channel('undici:client:connectError')
+    subscribe('undici:client:connectError', (message, name) => {
+        const { error, connectParams } = message;
+        let { socket } = message;
+        if (!socket && error[symbols_js_1.default.kErrorSocket]) {
+            socket = error[symbols_js_1.default.kErrorSocket];
+        }
+        if (socket) {
+            socket[symbols_js_1.default.kSocketId] = (0, utils_js_1.globalId)('UndiciSocket');
+            socket[symbols_js_1.default.kSocketConnectErrorTime] = new Date();
+            socket[symbols_js_1.default.kHandledRequests] = 0;
+            socket[symbols_js_1.default.kHandledResponses] = 0;
+            // copy local address to symbol, avoid them be reset after request error throw
+            if (socket.localAddress) {
+                socket[symbols_js_1.default.kSocketLocalAddress] = socket.localAddress;
+                socket[symbols_js_1.default.kSocketLocalPort] = socket.localPort;
+            }
+            socket[symbols_js_1.default.kSocketConnectProtocol] = connectParams.protocol;
+            socket[symbols_js_1.default.kSocketConnectHost] = connectParams.host;
+            socket[symbols_js_1.default.kSocketConnectPort] = connectParams.port;
+            debug('[%s] Socket#%d connectError, connectParams: %o, error: %s, (sock: %o)', name, socket[symbols_js_1.default.kSocketId], connectParams, error.message, formatSocket(socket));
+        }
+        else {
+            debug('[%s] connectError, connectParams: %o, error: %o', name, connectParams, error);
+        }
+    });
     // This message is published after a connection is established.
     subscribe('undici:client:connected', (message, name) => {
-        const { socket } = message;
+        const { socket, connectParams } = message;
         socket[symbols_js_1.default.kSocketId] = (0, utils_js_1.globalId)('UndiciSocket');
         socket[symbols_js_1.default.kSocketStartTime] = node_perf_hooks_1.performance.now();
         socket[symbols_js_1.default.kSocketConnectedTime] = new Date();
@@ -81,6 +121,9 @@ function initDiagnosticsChannel() {
         // copy local address to symbol, avoid them be reset after request error throw
         socket[symbols_js_1.default.kSocketLocalAddress] = socket.localAddress;
         socket[symbols_js_1.default.kSocketLocalPort] = socket.localPort;
+        socket[symbols_js_1.default.kSocketConnectProtocol] = connectParams.protocol;
+        socket[symbols_js_1.default.kSocketConnectHost] = connectParams.host;
+        socket[symbols_js_1.default.kSocketConnectPort] = connectParams.port;
         debug('[%s] Socket#%d connected (sock: %o)', name, socket[symbols_js_1.default.kSocketId], formatSocket(socket));
     });
     // This message is published right before the first byte of the request is written to the socket.

package/dist/commonjs/index.d.ts

@@ -6,6 +6,7 @@ export { HttpClient, HttpClient as HttpClient2, HEADER_USER_AGENT as USER_AGENT,
 export { RequestOptions, RequestOptions as RequestOptions2, RequestURL, HttpMethod, FixJSONCtlCharsHandler, FixJSONCtlChars, } from './Request.js';
 export { SocketInfo, Timing, RawResponseWithMeta, HttpClientResponse, } from './Response.js';
 export { IncomingHttpHeaders, } from './IncomingHttpHeaders.js';
+export * from './HttpClientError.js';
 declare const _default: {
     request: typeof request;
     curl: typeof curl;

package/dist/commonjs/index.js

@@ -1,4 +1,18 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -46,6 +60,7 @@ var HttpClient_js_2 = require("./HttpClient.js");
 Object.defineProperty(exports, "HttpClient", { enumerable: true, get: function () { return HttpClient_js_2.HttpClient; } });
 Object.defineProperty(exports, "HttpClient2", { enumerable: true, get: function () { return HttpClient_js_2.HttpClient; } });
 Object.defineProperty(exports, "USER_AGENT", { enumerable: true, get: function () { return HttpClient_js_2.HEADER_USER_AGENT; } });
+__exportStar(require("./HttpClientError.js"), exports);
 exports.default = {
     request,
     curl,

package/dist/commonjs/symbols.d.ts

@@ -2,9 +2,13 @@ declare const _default: {
     kSocketId: symbol;
     kSocketStartTime: symbol;
     kSocketConnectedTime: symbol;
+    kSocketConnectErrorTime: symbol;
     kSocketRequestEndTime: symbol;
     kSocketLocalAddress: symbol;
     kSocketLocalPort: symbol;
+    kSocketConnectHost: symbol;
+    kSocketConnectPort: symbol;
+    kSocketConnectProtocol: symbol;
     kHandledRequests: symbol;
     kHandledResponses: symbol;
     kRequestSocket: symbol;
@@ -13,5 +17,6 @@ declare const _default: {
     kEnableRequestTiming: symbol;
     kRequestTiming: symbol;
     kRequestOriginalOpaque: symbol;
+    kErrorSocket: symbol;
 };
 export default _default;

package/dist/commonjs/symbols.js

@@ -4,9 +4,13 @@ exports.default = {
     kSocketId: Symbol('socket id'),
     kSocketStartTime: Symbol('socket start time'),
     kSocketConnectedTime: Symbol('socket connected time'),
+    kSocketConnectErrorTime: Symbol('socket connectError time'),
     kSocketRequestEndTime: Symbol('socket request end time'),
     kSocketLocalAddress: Symbol('socket local address'),
     kSocketLocalPort: Symbol('socket local port'),
+    kSocketConnectHost: Symbol('socket connect params: host'),
+    kSocketConnectPort: Symbol('socket connect params: port'),
+    kSocketConnectProtocol: Symbol('socket connect params: protocol'),
     kHandledRequests: Symbol('handled requests per socket'),
     kHandledResponses: Symbol('handled responses per socket'),
     kRequestSocket: Symbol('request on the socket'),
@@ -15,4 +19,5 @@ exports.default = {
     kEnableRequestTiming: Symbol('enable request timing or not'),
     kRequestTiming: Symbol('request timing'),
     kRequestOriginalOpaque: Symbol('request original opaque'),
+    kErrorSocket: Symbol('socket of error'),
 };

package/dist/esm/HttpAgent.js

@@ -62,7 +62,7 @@ export class HttpAgent extends Agent {
             }
             const family = isIP(hostname);
             if (family === 4 || family === 6) {
-                // if request hostname is ip, custom lookup won't excute
+                // if request hostname is ip, custom lookup won't execute
                 if (!this.#checkAddress(hostname, family)) {
                     throw new IllegalAddressError(hostname, hostname, family);
                 }

package/dist/esm/HttpClient.js

@@ -23,6 +23,7 @@ import { HttpAgent } from './HttpAgent.js';
 import { parseJSON, sleep, digestAuthHeader, globalId, performanceTime, isReadable } from './utils.js';
 import symbols from './symbols.js';
 import { initDiagnosticsChannel } from './diagnosticsChannel.js';
+import { HttpClientConnectTimeoutError, HttpClientRequestTimeoutError } from './HttpClientError.js';
 const PROTO_RE = /^https?:\/\//i;
 const FormData = FormDataNative ?? FormDataNode;
 // impl promise pipeline on Node.js 14
@@ -59,15 +60,7 @@ class BlobFromStream {
         return 'Blob';
     }
 }
-class HttpClientRequestTimeoutError extends Error {
-    constructor(timeout, options) {
-        const message = `Request timeout for ${timeout} ms`;
-        super(message, options);
-        this.name = this.constructor.name;
-        Error.captureStackTrace(this, this.constructor);
-    }
-}
-export const HEADER_USER_AGENT = createUserAgent('node-urllib', '3.20.0');
+export const HEADER_USER_AGENT = createUserAgent('node-urllib', '3.21.0');
 function getFileName(stream) {
     const filePath = stream.path;
     if (filePath) {
@@ -574,14 +567,17 @@ export class HttpClient extends EventEmitter {
             }
             return clientResponse;
         }
-        catch (e) {
-            debug('Request#%d throw error: %s', requestId, e);
-            let err = e;
+        catch (rawError) {
+            debug('Request#%d throw error: %s', requestId, rawError);
+            let err = rawError;
             if (err.name === 'HeadersTimeoutError') {
-                err = new HttpClientRequestTimeoutError(headersTimeout, { cause: e });
+                err = new HttpClientRequestTimeoutError(headersTimeout, { cause: err });
             }
             else if (err.name === 'BodyTimeoutError') {
-                err = new HttpClientRequestTimeoutError(bodyTimeout, { cause: e });
+                err = new HttpClientRequestTimeoutError(bodyTimeout, { cause: err });
+            }
+            else if (err.code === 'UND_ERR_CONNECT_TIMEOUT') {
+                err = new HttpClientConnectTimeoutError(err.message, err.code, { cause: err });
             }
             else if (err.code === 'UND_ERR_SOCKET' || err.code === 'ECONNRESET') {
                 // auto retry on socket error, https://github.com/node-modules/urllib/issues/454
@@ -604,7 +600,7 @@ export class HttpClient extends EventEmitter {
                 res.requestUrls.push(requestUrl.href);
             }
             res.rt = performanceTime(requestStartTime);
-            this.#updateSocketInfo(socketInfo, internalOpaque);
+            this.#updateSocketInfo(socketInfo, internalOpaque, rawError);
             channels.response.publish({
                 request: reqMeta,
                 response: res,
@@ -625,21 +621,38 @@ export class HttpClient extends EventEmitter {
             throw err;
         }
     }
-    #updateSocketInfo(socketInfo, internalOpaque) {
-        const socket = internalOpaque[symbols.kRequestSocket];
+    #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];
-            socketInfo.localAddress = socket[symbols.kSocketLocalAddress];
-            socketInfo.localPort = socket[symbols.kSocketLocalPort];
-            socketInfo.remoteAddress = socket.remoteAddress;
-            socketInfo.remotePort = socket.remotePort;
-            socketInfo.remoteFamily = socket.remoteFamily;
+            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;
-            socketInfo.connectedTime = socket[symbols.kSocketConnectedTime];
-            socketInfo.lastRequestEndTime = socket[symbols.kSocketRequestEndTime];
+            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/dist/esm/HttpClientError.d.ts

@@ -0,0 +1,19 @@
+import type { RawResponseWithMeta, SocketInfo } from './Response.js';
+import type { IncomingHttpHeaders } from './IncomingHttpHeaders.js';
+interface ErrorOptions {
+    cause?: Error;
+}
+export declare class HttpClientRequestError extends Error {
+    status?: number;
+    headers?: IncomingHttpHeaders;
+    socket?: SocketInfo;
+    res?: RawResponseWithMeta;
+}
+export declare class HttpClientRequestTimeoutError extends HttpClientRequestError {
+    constructor(timeout: number, options: ErrorOptions);
+}
+export declare class HttpClientConnectTimeoutError extends HttpClientRequestError {
+    code: string;
+    constructor(message: string, code: string, options: ErrorOptions);
+}
+export {};

package/dist/esm/HttpClientError.js

@@ -0,0 +1,23 @@
+export class HttpClientRequestError extends Error {
+    status;
+    headers;
+    socket;
+    res;
+}
+export class HttpClientRequestTimeoutError extends HttpClientRequestError {
+    constructor(timeout, options) {
+        const message = `Request timeout for ${timeout} ms`;
+        super(message, options);
+        this.name = this.constructor.name;
+        Error.captureStackTrace(this, this.constructor);
+    }
+}
+export class HttpClientConnectTimeoutError extends HttpClientRequestError {
+    code;
+    constructor(message, code, options) {
+        super(message, options);
+        this.name = this.constructor.name;
+        this.code = code;
+        Error.captureStackTrace(this, this.constructor);
+    }
+}

package/dist/esm/Response.d.ts

@@ -13,7 +13,12 @@ export type SocketInfo = {
     handledRequests: number;
     handledResponses: number;
     connectedTime?: Date;
+    connectErrorTime?: Date;
     lastRequestEndTime?: Date;
+    attemptedRemoteAddresses?: string[];
+    connectProtocol?: string;
+    connectHost?: string;
+    connectPort?: string;
 };
 /**
  * https://eggjs.org/en/core/httpclient.html#timing-boolean

package/dist/esm/diagnosticsChannel.js

@@ -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 symbols from './symbols.js';
 import { globalId, performanceTime } from './utils.js';
 const debug = debuglog('urllib:DiagnosticsChannel');
@@ -32,8 +33,23 @@ function formatSocket(socket) {
         localPort: socket[symbols.kSocketLocalPort],
         remoteAddress: socket.remoteAddress,
         remotePort: socket.remotePort,
+        attemptedAddresses: socket.autoSelectFamilyAttemptedAddresses,
+        connecting: socket.connecting,
     };
 }
+// make sure error contains socket info
+const kDestroy = Symbol('kDestroy');
+Socket.prototype[kDestroy] = Socket.prototype.destroy;
+Socket.prototype.destroy = function (err) {
+    if (err) {
+        Object.defineProperty(err, symbols.kErrorSocket, {
+            // don't show on console log
+            enumerable: false,
+            value: this,
+        });
+    }
+    return this[kDestroy](err);
+};
 export function initDiagnosticsChannel() {
     // makre sure init global DiagnosticsChannel once
     if (initedDiagnosticsChannel)
@@ -63,10 +79,34 @@ export function initDiagnosticsChannel() {
         opaque[symbols.kRequestTiming].queuing = performanceTime(opaque[symbols.kRequestStartTime]);
     });
     // diagnosticsChannel.channel('undici:client:beforeConnect')
-    // diagnosticsChannel.channel('undici:client:connectError')
+    subscribe('undici:client:connectError', (message, name) => {
+        const { error, connectParams } = message;
+        let { socket } = message;
+        if (!socket && error[symbols.kErrorSocket]) {
+            socket = error[symbols.kErrorSocket];
+        }
+        if (socket) {
+            socket[symbols.kSocketId] = globalId('UndiciSocket');
+            socket[symbols.kSocketConnectErrorTime] = new Date();
+            socket[symbols.kHandledRequests] = 0;
+            socket[symbols.kHandledResponses] = 0;
+            // copy local address to symbol, avoid them be reset after request error throw
+            if (socket.localAddress) {
+                socket[symbols.kSocketLocalAddress] = socket.localAddress;
+                socket[symbols.kSocketLocalPort] = socket.localPort;
+            }
+            socket[symbols.kSocketConnectProtocol] = connectParams.protocol;
+            socket[symbols.kSocketConnectHost] = connectParams.host;
+            socket[symbols.kSocketConnectPort] = connectParams.port;
+            debug('[%s] Socket#%d connectError, connectParams: %o, error: %s, (sock: %o)', name, socket[symbols.kSocketId], connectParams, error.message, formatSocket(socket));
+        }
+        else {
+            debug('[%s] connectError, connectParams: %o, error: %o', name, connectParams, error);
+        }
+    });
     // This message is published after a connection is established.
     subscribe('undici:client:connected', (message, name) => {
-        const { socket } = message;
+        const { socket, connectParams } = message;
         socket[symbols.kSocketId] = globalId('UndiciSocket');
         socket[symbols.kSocketStartTime] = performance.now();
         socket[symbols.kSocketConnectedTime] = new Date();
@@ -75,6 +115,9 @@ export function initDiagnosticsChannel() {
         // copy local address to symbol, avoid them be reset after request error throw
         socket[symbols.kSocketLocalAddress] = socket.localAddress;
         socket[symbols.kSocketLocalPort] = socket.localPort;
+        socket[symbols.kSocketConnectProtocol] = connectParams.protocol;
+        socket[symbols.kSocketConnectHost] = connectParams.host;
+        socket[symbols.kSocketConnectPort] = connectParams.port;
         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.

package/dist/esm/index.d.ts

@@ -6,6 +6,7 @@ export { HttpClient, HttpClient as HttpClient2, HEADER_USER_AGENT as USER_AGENT,
 export { RequestOptions, RequestOptions as RequestOptions2, RequestURL, HttpMethod, FixJSONCtlCharsHandler, FixJSONCtlChars, } from './Request.js';
 export { SocketInfo, Timing, RawResponseWithMeta, HttpClientResponse, } from './Response.js';
 export { IncomingHttpHeaders, } from './IncomingHttpHeaders.js';
+export * from './HttpClientError.js';
 declare const _default: {
     request: typeof request;
     curl: typeof curl;

package/dist/esm/index.js

@@ -29,6 +29,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 * from './HttpClientError.js';
 export default {
     request,
     curl,

package/dist/esm/symbols.d.ts

@@ -2,9 +2,13 @@ declare const _default: {
     kSocketId: symbol;
     kSocketStartTime: symbol;
     kSocketConnectedTime: symbol;
+    kSocketConnectErrorTime: symbol;
     kSocketRequestEndTime: symbol;
     kSocketLocalAddress: symbol;
     kSocketLocalPort: symbol;
+    kSocketConnectHost: symbol;
+    kSocketConnectPort: symbol;
+    kSocketConnectProtocol: symbol;
     kHandledRequests: symbol;
     kHandledResponses: symbol;
     kRequestSocket: symbol;
@@ -13,5 +17,6 @@ declare const _default: {
     kEnableRequestTiming: symbol;
     kRequestTiming: symbol;
     kRequestOriginalOpaque: symbol;
+    kErrorSocket: symbol;
 };
 export default _default;

package/dist/esm/symbols.js

@@ -2,9 +2,13 @@ export default {
     kSocketId: Symbol('socket id'),
     kSocketStartTime: Symbol('socket start time'),
     kSocketConnectedTime: Symbol('socket connected time'),
+    kSocketConnectErrorTime: Symbol('socket connectError time'),
     kSocketRequestEndTime: Symbol('socket request end time'),
     kSocketLocalAddress: Symbol('socket local address'),
     kSocketLocalPort: Symbol('socket local port'),
+    kSocketConnectHost: Symbol('socket connect params: host'),
+    kSocketConnectPort: Symbol('socket connect params: port'),
+    kSocketConnectProtocol: Symbol('socket connect params: protocol'),
     kHandledRequests: Symbol('handled requests per socket'),
     kHandledResponses: Symbol('handled responses per socket'),
     kRequestSocket: Symbol('request on the socket'),
@@ -13,4 +17,5 @@ export default {
     kEnableRequestTiming: Symbol('enable request timing or not'),
     kRequestTiming: Symbol('request timing'),
     kRequestOriginalOpaque: Symbol('request original opaque'),
+    kErrorSocket: Symbol('socket of error'),
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "urllib",
-  "version": "3.20.0",
+  "version": "3.21.0",
   "publishConfig": {
     "tag": "latest"
   },
@@ -32,8 +32,9 @@
     "build:esm:test": "cd test/esm && rm -rf node_modules && npm link ../.. && node index.js",
     "build:mts:test": "cd test/mts && rm -rf node_modules && npm link ../.. && tsc",
     "build:test": "npm run build && npm run build:cjs:test && npm run build:esm:test && npm run build:mts:test && npm run test-tsc",
-    "test-tsc": "npm run test-tsc:cjs && npm run test-tsc:esm",
+    "test-tsc": "npm run test-tsc:cjs:es2021 && npm run test-tsc:cjs && npm run test-tsc:esm",
     "test-tsc:cjs": "cd test/fixtures/ts && rm -rf node_modules && npm link ../../.. && npm run build",
+    "test-tsc:cjs:es2021": "cd test/fixtures/ts-cjs-es2021 && rm -rf node_modules && npm link ../../.. && npm run build",
     "test-tsc:esm": "cd test/fixtures/ts-esm && rm -rf node_modules && npm link ../../.. && npm run build",
     "test": "npm run lint && vitest run",
     "test-keepalive": "cross-env TEST_KEEPALIVE_COUNT=50 vitest run --test-timeout 180000 keep-alive-header.test.ts",

package/src/HttpAgent.ts

@@ -77,7 +77,7 @@ export class HttpAgent extends Agent {
       }
       const family = isIP(hostname);
       if (family === 4 || family === 6) {
-        // if request hostname is ip, custom lookup won't excute
+        // if request hostname is ip, custom lookup won't execute
         if (!this.#checkAddress(hostname, family)) {
           throw new IllegalAddressError(hostname, hostname, family);
         }

package/src/HttpClient.ts

@@ -38,6 +38,7 @@ import { RawResponseWithMeta, HttpClientResponse, SocketInfo } from './Response.
 import { parseJSON, sleep, digestAuthHeader, globalId, performanceTime, isReadable } from './utils.js';
 import symbols from './symbols.js';
 import { initDiagnosticsChannel } from './diagnosticsChannel.js';
+import { HttpClientConnectTimeoutError, HttpClientRequestTimeoutError } from './HttpClientError.js';
 
 type Exists<T> = T extends undefined ? never : T;
 type UndiciRequestOption = Exists<Parameters<typeof undiciRequest>[1]>;
@@ -121,15 +122,6 @@ class BlobFromStream {
   }
 }
 
-class HttpClientRequestTimeoutError extends Error {
-  constructor(timeout: number, options: ErrorOptions) {
-    const message = `Request timeout for ${timeout} ms`;
-    super(message, options);
-    this.name = this.constructor.name;
-    Error.captureStackTrace(this, this.constructor);
-  }
-}
-
 export const HEADER_USER_AGENT = createUserAgent('node-urllib', 'VERSION');
 
 function getFileName(stream: Readable) {
@@ -653,13 +645,15 @@ export class HttpClient extends EventEmitter {
       }
 
       return clientResponse;
-    } catch (e: any) {
-      debug('Request#%d throw error: %s', requestId, e);
-      let err = e;
+    } catch (rawError: any) {
+      debug('Request#%d throw error: %s', requestId, rawError);
+      let err = rawError;
       if (err.name === 'HeadersTimeoutError') {
-        err = new HttpClientRequestTimeoutError(headersTimeout, { cause: e });
+        err = new HttpClientRequestTimeoutError(headersTimeout, { cause: err });
       } else if (err.name === 'BodyTimeoutError') {
-        err = new HttpClientRequestTimeoutError(bodyTimeout, { cause: e });
+        err = new HttpClientRequestTimeoutError(bodyTimeout, { cause: err });
+      } else if (err.code === 'UND_ERR_CONNECT_TIMEOUT') {
+        err = new HttpClientConnectTimeoutError(err.message, err.code, { cause: err });
       } 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.socketErrorRetry > 0 && requestContext.socketErrorRetries < args.socketErrorRetry) {
@@ -681,7 +675,7 @@ export class HttpClient extends EventEmitter {
         res.requestUrls.push(requestUrl.href);
       }
       res.rt = performanceTime(requestStartTime);
-      this.#updateSocketInfo(socketInfo, internalOpaque);
+      this.#updateSocketInfo(socketInfo, internalOpaque, rawError);
 
       channels.response.publish({
         request: reqMeta,
@@ -704,21 +698,38 @@ export class HttpClient extends EventEmitter {
     }
   }
 
-  #updateSocketInfo(socketInfo: SocketInfo, internalOpaque: any) {
-    const socket = internalOpaque[symbols.kRequestSocket];
+  #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];
-      socketInfo.localAddress = socket[symbols.kSocketLocalAddress];
-      socketInfo.localPort = socket[symbols.kSocketLocalPort];
-      socketInfo.remoteAddress = socket.remoteAddress;
-      socketInfo.remotePort = socket.remotePort;
-      socketInfo.remoteFamily = socket.remoteFamily;
+      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;
-      socketInfo.connectedTime = socket[symbols.kSocketConnectedTime];
-      socketInfo.lastRequestEndTime = socket[symbols.kSocketRequestEndTime];
+      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/HttpClientError.ts

@@ -0,0 +1,34 @@
+import type { RawResponseWithMeta, SocketInfo } from './Response.js';
+import type { IncomingHttpHeaders } from './IncomingHttpHeaders.js';
+
+// need to support ES2021
+interface ErrorOptions {
+  cause?: Error;
+}
+
+export class HttpClientRequestError extends Error {
+  status?: number;
+  headers?: IncomingHttpHeaders;
+  socket?: SocketInfo;
+  res?: RawResponseWithMeta;
+}
+
+export class HttpClientRequestTimeoutError extends HttpClientRequestError {
+  constructor(timeout: number, options: ErrorOptions) {
+    const message = `Request timeout for ${timeout} ms`;
+    super(message, options);
+    this.name = this.constructor.name;
+    Error.captureStackTrace(this, this.constructor);
+  }
+}
+
+export class HttpClientConnectTimeoutError extends HttpClientRequestError {
+  code: string;
+
+  constructor(message: string, code: string, options: ErrorOptions) {
+    super(message, options);
+    this.name = this.constructor.name;
+    this.code = code;
+    Error.captureStackTrace(this, this.constructor);
+  }
+}

package/src/Response.ts

@@ -13,7 +13,12 @@ export type SocketInfo = {
   handledRequests: number;
   handledResponses: number;
   connectedTime?: Date;
+  connectErrorTime?: Date;
   lastRequestEndTime?: Date;
+  attemptedRemoteAddresses?: string[];
+  connectProtocol?: string;
+  connectHost?: string;
+  connectPort?: string;
 };
 
 /**

package/src/diagnosticsChannel.ts

@@ -35,9 +35,25 @@ function formatSocket(socket: Socket) {
     localPort: socket[symbols.kSocketLocalPort],
     remoteAddress: socket.remoteAddress,
     remotePort: socket.remotePort,
+    attemptedAddresses: socket.autoSelectFamilyAttemptedAddresses,
+    connecting: socket.connecting,
   };
 }
 
+// make sure error contains socket info
+const kDestroy = Symbol('kDestroy');
+Socket.prototype[kDestroy] = Socket.prototype.destroy;
+Socket.prototype.destroy = function(err?: any) {
+  if (err) {
+    Object.defineProperty(err, symbols.kErrorSocket, {
+      // don't show on console log
+      enumerable: false,
+      value: this,
+    });
+  }
+  return this[kDestroy](err);
+};
+
 export function initDiagnosticsChannel() {
   // makre sure init global DiagnosticsChannel once
   if (initedDiagnosticsChannel) return;
@@ -67,10 +83,37 @@ export function initDiagnosticsChannel() {
   });
 
   // diagnosticsChannel.channel('undici:client:beforeConnect')
-  // diagnosticsChannel.channel('undici:client:connectError')
+
+  subscribe('undici:client:connectError', (message, name) => {
+    const { error, connectParams } = message as DiagnosticsChannel.ClientConnectErrorMessage & { error: any };
+    let { socket } = message as DiagnosticsChannel.ClientConnectErrorMessage;
+    if (!socket && error[symbols.kErrorSocket]) {
+      socket = error[symbols.kErrorSocket];
+    }
+    if (socket) {
+      socket[symbols.kSocketId] = globalId('UndiciSocket');
+      socket[symbols.kSocketConnectErrorTime] = new Date();
+      socket[symbols.kHandledRequests] = 0;
+      socket[symbols.kHandledResponses] = 0;
+      // copy local address to symbol, avoid them be reset after request error throw
+      if (socket.localAddress) {
+        socket[symbols.kSocketLocalAddress] = socket.localAddress;
+        socket[symbols.kSocketLocalPort] = socket.localPort;
+      }
+      socket[symbols.kSocketConnectProtocol] = connectParams.protocol;
+      socket[symbols.kSocketConnectHost] = connectParams.host;
+      socket[symbols.kSocketConnectPort] = connectParams.port;
+      debug('[%s] Socket#%d connectError, connectParams: %o, error: %s, (sock: %o)',
+        name, socket[symbols.kSocketId], connectParams, (error as Error).message, formatSocket(socket));
+    } else {
+      debug('[%s] connectError, connectParams: %o, error: %o',
+        name, connectParams, error);
+    }
+  });
+
   // This message is published after a connection is established.
   subscribe('undici:client:connected', (message, name) => {
-    const { socket } = message as DiagnosticsChannel.ClientConnectedMessage;
+    const { socket, connectParams } = message as DiagnosticsChannel.ClientConnectedMessage;
     socket[symbols.kSocketId] = globalId('UndiciSocket');
     socket[symbols.kSocketStartTime] = performance.now();
     socket[symbols.kSocketConnectedTime] = new Date();
@@ -79,6 +122,9 @@ export function initDiagnosticsChannel() {
     // copy local address to symbol, avoid them be reset after request error throw
     socket[symbols.kSocketLocalAddress] = socket.localAddress;
     socket[symbols.kSocketLocalPort] = socket.localPort;
+    socket[symbols.kSocketConnectProtocol] = connectParams.protocol;
+    socket[symbols.kSocketConnectHost] = connectParams.host;
+    socket[symbols.kSocketConnectPort] = connectParams.port;
     debug('[%s] Socket#%d connected (sock: %o)', name, socket[symbols.kSocketId], formatSocket(socket));
   });
 

package/src/index.ts

@@ -53,6 +53,7 @@ export {
 export {
   IncomingHttpHeaders,
 } from './IncomingHttpHeaders.js';
+export * from './HttpClientError.js';
 
 export default {
   request,

package/src/symbols.ts

@@ -2,9 +2,13 @@ export default {
   kSocketId: Symbol('socket id'),
   kSocketStartTime: Symbol('socket start time'),
   kSocketConnectedTime: Symbol('socket connected time'),
+  kSocketConnectErrorTime: Symbol('socket connectError time'),
   kSocketRequestEndTime: Symbol('socket request end time'),
   kSocketLocalAddress: Symbol('socket local address'),
   kSocketLocalPort: Symbol('socket local port'),
+  kSocketConnectHost: Symbol('socket connect params: host'),
+  kSocketConnectPort: Symbol('socket connect params: port'),
+  kSocketConnectProtocol: Symbol('socket connect params: protocol'),
   kHandledRequests: Symbol('handled requests per socket'),
   kHandledResponses: Symbol('handled responses per socket'),
   kRequestSocket: Symbol('request on the socket'),
@@ -13,4 +17,5 @@ export default {
   kEnableRequestTiming: Symbol('enable request timing or not'),
   kRequestTiming: Symbol('request timing'),
   kRequestOriginalOpaque: Symbol('request original opaque'),
+  kErrorSocket: Symbol('socket of error'),
 };