urllib 3.17.2 → 3.18.1-beta.0

package/{src/cjs → dist/commonjs}/HttpAgent.d.ts

@@ -1,8 +1,6 @@
 /// <reference types="node" />
 import { LookupFunction } from 'node:net';
-import { Agent } from 'undici';
-import type Dispatcher from 'undici/types/dispatcher';
-import type buildConnector from 'undici/types/connector';
+import { Agent, Dispatcher, buildConnector } from 'undici';
 export type CheckAddressFunction = (ip: string, family: number | string) => boolean;
 export type HttpAgentOptions = {
     lookup?: LookupFunction;

package/{src/esm → dist/commonjs}/HttpClient.d.ts

@@ -3,9 +3,9 @@
 /// <reference types="node" />
 import { EventEmitter } from 'node:events';
 import { LookupFunction } from 'node:net';
-import { CheckAddressFunction } from './HttpAgent';
-import { RequestURL, RequestOptions, RequestMeta } from './Request';
-import { RawResponseWithMeta, HttpClientResponse } from './Response';
+import { CheckAddressFunction } from './HttpAgent.js';
+import { RequestURL, RequestOptions, RequestMeta } from './Request.js';
+import { RawResponseWithMeta, HttpClientResponse } from './Response.js';
 export type ClientOptions = {
     defaultArgs?: RequestOptions;
     /**
@@ -31,7 +31,7 @@ export type ClientOptions = {
         */
         rejectUnauthorized?: boolean;
         /**
-         * sockePath string | null (optional) - Default: null - An IPC endpoint, either Unix domain socket or Windows named pipe
+         * socketPath string | null (optional) - Default: null - An IPC endpoint, either Unix domain socket or Windows named pipe
          */
         socketPath?: string | null;
     };

package/{src/cjs → dist/commonjs}/HttpClient.js

@@ -21,13 +21,14 @@ const formdata_node_1 = require("formdata-node");
 const form_data_encoder_1 = require("form-data-encoder");
 const default_user_agent_1 = __importDefault(require("default-user-agent"));
 const mime_types_1 = __importDefault(require("mime-types"));
+const qs_1 = __importDefault(require("qs"));
 const pump_1 = __importDefault(require("pump"));
 // Compatible with old style formstream
 const formstream_1 = __importDefault(require("formstream"));
-const HttpAgent_1 = require("./HttpAgent");
-const utils_1 = require("./utils");
-const symbols_1 = __importDefault(require("./symbols"));
-const diagnosticsChannel_1 = require("./diagnosticsChannel");
+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 PROTO_RE = /^https?:\/\//i;
 const FormData = undici_1.FormData ?? formdata_node_1.FormData;
 // impl promise pipeline on Node.js 14
@@ -72,7 +73,7 @@ class HttpClientRequestTimeoutError extends Error {
         Error.captureStackTrace(this, this.constructor);
     }
 }
-exports.HEADER_USER_AGENT = (0, default_user_agent_1.default)('node-urllib', '3.17.2');
+exports.HEADER_USER_AGENT = (0, default_user_agent_1.default)('node-urllib', '3.18.1-beta.0');
 function getFileName(stream) {
     const filePath = stream.path;
     if (filePath) {
@@ -94,13 +95,13 @@ class HttpClient extends node_events_1.EventEmitter {
         super();
         this.#defaultArgs = clientOptions?.defaultArgs;
         if (clientOptions?.lookup || clientOptions?.checkAddress || clientOptions?.connect) {
-            this.#dispatcher = new HttpAgent_1.HttpAgent({
+            this.#dispatcher = new HttpAgent_js_1.HttpAgent({
                 lookup: clientOptions.lookup,
                 checkAddress: clientOptions.checkAddress,
                 connect: clientOptions.connect,
             });
         }
-        (0, diagnosticsChannel_1.initDiagnosticsChannel)();
+        (0, diagnosticsChannel_js_1.initDiagnosticsChannel)();
     }
     async request(url, options) {
         return await this.#requestInternal(url, options);
@@ -110,7 +111,7 @@ class HttpClient extends node_events_1.EventEmitter {
         return await this.request(url, options);
     }
     async #requestInternal(url, options, requestContext) {
-        const requestId = (0, utils_1.globalId)('HttpClientRequest');
+        const requestId = (0, utils_js_1.globalId)('HttpClientRequest');
         let requestUrl;
         if (typeof url === 'string') {
             if (!PROTO_RE.test(url)) {
@@ -167,14 +168,14 @@ class HttpClient extends node_events_1.EventEmitter {
             // the response body and trailers have been received
             contentDownload: 0,
         };
-        const orginalOpaque = args.opaque;
+        const originalOpaque = args.opaque;
         // using opaque to diagnostics channel, binding request and socket
         const internalOpaque = {
-            [symbols_1.default.kRequestId]: requestId,
-            [symbols_1.default.kRequestStartTime]: requestStartTime,
-            [symbols_1.default.kEnableRequestTiming]: !!args.timing,
-            [symbols_1.default.kRequestTiming]: timing,
-            [symbols_1.default.kRequestOrginalOpaque]: orginalOpaque,
+            [symbols_js_1.default.kRequestId]: requestId,
+            [symbols_js_1.default.kRequestStartTime]: requestStartTime,
+            [symbols_js_1.default.kEnableRequestTiming]: !!args.timing,
+            [symbols_js_1.default.kRequestTiming]: timing,
+            [symbols_js_1.default.kRequestOriginalOpaque]: originalOpaque,
         };
         const reqMeta = {
             requestId,
@@ -290,7 +291,7 @@ class HttpClient extends node_events_1.EventEmitter {
             if (args.stream && !args.content) {
                 // convert old style stream to new stream
                 // https://nodejs.org/dist/latest-v18.x/docs/api/stream.html#readablewrapstream
-                if ((0, utils_1.isReadable)(args.stream) && !(args.stream instanceof node_stream_1.Readable)) {
+                if ((0, utils_js_1.isReadable)(args.stream) && !(args.stream instanceof node_stream_1.Readable)) {
                     debug('Request#%d convert old style stream to Readable', requestId);
                     args.stream = new node_stream_1.Readable().wrap(args.stream);
                     isStreamingRequest = true;
@@ -314,7 +315,7 @@ class HttpClient extends node_events_1.EventEmitter {
                         uploadFiles.push([field, file]);
                     }
                 }
-                else if (args.files instanceof node_stream_1.Readable || (0, utils_1.isReadable)(args.files)) {
+                else if (args.files instanceof node_stream_1.Readable || (0, utils_js_1.isReadable)(args.files)) {
                     uploadFiles.push(['file', args.files]);
                 }
                 else if (typeof args.files === 'string' || Buffer.isBuffer(args.files)) {
@@ -343,7 +344,7 @@ class HttpClient extends node_events_1.EventEmitter {
                     else if (Buffer.isBuffer(file)) {
                         formData.append(field, new node_buffer_1.Blob([file]), `bufferfile${index}`);
                     }
-                    else if (file instanceof node_stream_1.Readable || (0, utils_1.isReadable)(file)) {
+                    else if (file instanceof node_stream_1.Readable || (0, utils_js_1.isReadable)(file)) {
                         const fileName = getFileName(file) || `streamfile${index}`;
                         formData.append(field, new BlobFromStream(file, mime_types_1.default.lookup(fileName) || ''), fileName);
                         isStreamingRequest = true;
@@ -372,27 +373,35 @@ class HttpClient extends node_events_1.EventEmitter {
                     else if (typeof args.content === 'string' && !headers['content-type']) {
                         headers['content-type'] = 'text/plain;charset=UTF-8';
                     }
-                    isStreamingRequest = (0, utils_1.isReadable)(args.content);
+                    isStreamingRequest = (0, utils_js_1.isReadable)(args.content);
                 }
             }
             else if (args.data) {
                 const isStringOrBufferOrReadable = typeof args.data === 'string'
                     || Buffer.isBuffer(args.data)
-                    || (0, utils_1.isReadable)(args.data);
+                    || (0, utils_js_1.isReadable)(args.data);
                 if (isGETOrHEAD) {
                     if (!isStringOrBufferOrReadable) {
-                        for (const field in args.data) {
-                            const fieldValue = args.data[field];
-                            if (fieldValue === undefined)
-                                continue;
-                            requestUrl.searchParams.append(field, fieldValue);
+                        if (args.nestedQuerystring) {
+                            const querystring = qs_1.default.stringify(args.data);
+                            // reset the requestUrl
+                            const href = requestUrl.href;
+                            requestUrl = new URL(href + (href.includes('?') ? '&' : '?') + querystring);
+                        }
+                        else {
+                            for (const field in args.data) {
+                                const fieldValue = args.data[field];
+                                if (fieldValue === undefined)
+                                    continue;
+                                requestUrl.searchParams.append(field, fieldValue);
+                            }
                         }
                     }
                 }
                 else {
                     if (isStringOrBufferOrReadable) {
                         requestOptions.body = args.data;
-                        isStreamingRequest = (0, utils_1.isReadable)(args.data);
+                        isStreamingRequest = (0, utils_js_1.isReadable)(args.data);
                     }
                     else {
                         if (args.contentType === 'json'
@@ -405,7 +414,12 @@ class HttpClient extends node_events_1.EventEmitter {
                         }
                         else {
                             headers['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
-                            requestOptions.body = new URLSearchParams(args.data).toString();
+                            if (args.nestedQuerystring) {
+                                requestOptions.body = qs_1.default.stringify(args.data);
+                            }
+                            else {
+                                requestOptions.body = new URLSearchParams(args.data).toString();
+                            }
                         }
                     }
                 }
@@ -432,7 +446,7 @@ class HttpClient extends node_events_1.EventEmitter {
                     : authenticateHeaders;
                 if (authenticate && authenticate.startsWith('Digest ')) {
                     debug('Request#%d %s: got digest auth header WWW-Authenticate: %s', requestId, requestUrl.href, authenticate);
-                    requestOptions.headers.authorization = (0, utils_1.digestAuthHeader)(requestOptions.method, `${requestUrl.pathname}${requestUrl.search}`, authenticate, args.digestAuth);
+                    requestOptions.headers.authorization = (0, utils_js_1.digestAuthHeader)(requestOptions.method, `${requestUrl.pathname}${requestUrl.search}`, authenticate, args.digestAuth);
                     debug('Request#%d %s: auth with digest header: %s', requestId, url, requestOptions.headers.authorization);
                     if (Array.isArray(response.headers['set-cookie'])) {
                         // FIXME: merge exists cookie header
@@ -507,15 +521,15 @@ class HttpClient extends node_events_1.EventEmitter {
                         data = null;
                     }
                     else {
-                        data = (0, utils_1.parseJSON)(data.toString(), args.fixJSONCtlChars);
+                        data = (0, utils_js_1.parseJSON)(data.toString(), args.fixJSONCtlChars);
                     }
                 }
             }
-            res.rt = (0, utils_1.performanceTime)(requestStartTime);
+            res.rt = (0, utils_js_1.performanceTime)(requestStartTime);
             // get real socket info from internalOpaque
             this.#updateSocketInfo(socketInfo, internalOpaque);
             const clientResponse = {
-                opaque: orginalOpaque,
+                opaque: originalOpaque,
                 data,
                 status: res.status,
                 statusCode: res.status,
@@ -530,7 +544,7 @@ class HttpClient extends node_events_1.EventEmitter {
                 const isRetry = args.isRetry ?? defaultIsRetry;
                 if (isRetry(clientResponse)) {
                     if (args.retryDelay) {
-                        await (0, utils_1.sleep)(args.retryDelay);
+                        await (0, utils_js_1.sleep)(args.retryDelay);
                     }
                     requestContext.retries++;
                     return await this.#requestInternal(url, options, requestContext);
@@ -570,7 +584,7 @@ class HttpClient extends node_events_1.EventEmitter {
                     return await this.#requestInternal(url, options, requestContext);
                 }
             }
-            err.opaque = orginalOpaque;
+            err.opaque = originalOpaque;
             err.status = res.status;
             err.headers = res.headers;
             err.res = res;
@@ -583,7 +597,7 @@ class HttpClient extends node_events_1.EventEmitter {
             if (res.requestUrls.length === 0) {
                 res.requestUrls.push(requestUrl.href);
             }
-            res.rt = (0, utils_1.performanceTime)(requestStartTime);
+            res.rt = (0, utils_js_1.performanceTime)(requestStartTime);
             this.#updateSocketInfo(socketInfo, internalOpaque);
             channels.response.publish({
                 request: reqMeta,
@@ -606,21 +620,21 @@ class HttpClient extends node_events_1.EventEmitter {
         }
     }
     #updateSocketInfo(socketInfo, internalOpaque) {
-        const socket = internalOpaque[symbols_1.default.kRequestSocket];
+        const socket = internalOpaque[symbols_js_1.default.kRequestSocket];
         if (socket) {
-            socketInfo.id = socket[symbols_1.default.kSocketId];
-            socketInfo.handledRequests = socket[symbols_1.default.kHandledRequests];
-            socketInfo.handledResponses = socket[symbols_1.default.kHandledResponses];
-            socketInfo.localAddress = socket[symbols_1.default.kSocketLocalAddress];
-            socketInfo.localPort = socket[symbols_1.default.kSocketLocalPort];
+            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;
             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();
+            socketInfo.connectedTime = socket[symbols_js_1.default.kSocketConnectedTime];
+            socketInfo.lastRequestEndTime = socket[symbols_js_1.default.kSocketRequestEndTime];
+            socket[symbols_js_1.default.kSocketRequestEndTime] = new Date();
         }
     }
 }

package/{src/cjs → dist/commonjs}/Request.d.ts

@@ -4,8 +4,8 @@
 /// <reference types="node" />
 import { Readable, Writable } from 'node:stream';
 import type { IncomingHttpHeaders } from 'node:http';
-import type Dispatcher from 'undici/types/dispatcher';
-import type { HttpClientResponse } from './Response';
+import type { Dispatcher } from 'undici';
+import type { HttpClientResponse } from './Response.js';
 export type HttpMethod = Dispatcher.HttpMethod;
 export type RequestURL = string | URL;
 export type FixJSONCtlCharsHandler = (data: string) => string;
@@ -44,6 +44,11 @@ export type RequestOptions = {
      * Default is 'buffer'.
      */
     dataType?: 'text' | 'html' | 'json' | 'buffer' | 'stream';
+    /**
+     * urllib default use URLSearchParams to stringify form data which don't support nested object,
+     * will use qs instead of URLSearchParams to support nested object by set this option to true.
+     */
+    nestedQuerystring?: boolean;
     /**
      * @deprecated
      * Only for d.ts keep compatible with urllib@2, don't use it anymore.

package/{src/cjs → dist/commonjs}/diagnosticsChannel.js

@@ -7,8 +7,8 @@ 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 symbols_1 = __importDefault(require("./symbols"));
-const utils_1 = require("./utils");
+const symbols_js_1 = __importDefault(require("./symbols.js"));
+const utils_js_1 = require("./utils.js");
 const debug = (0, node_util_1.debuglog)('urllib:DiagnosticsChannel');
 let initedDiagnosticsChannel = false;
 // https://undici.nodejs.org/#/docs/api/DiagnosticsChannel
@@ -34,8 +34,8 @@ function formatSocket(socket) {
     if (!socket)
         return socket;
     return {
-        localAddress: socket[symbols_1.default.kSocketLocalAddress],
-        localPort: socket[symbols_1.default.kSocketLocalPort],
+        localAddress: socket[symbols_js_1.default.kSocketLocalAddress],
+        localPort: socket[symbols_js_1.default.kSocketLocalPort],
         remoteAddress: socket.remoteAddress,
         remotePort: socket.remotePort,
     };
@@ -61,27 +61,27 @@ function initDiagnosticsChannel() {
         }
         const opaque = request[kHandler]?.opts?.opaque;
         // ignore non HttpClient Request
-        if (!opaque || !opaque[symbols_1.default.kRequestId])
+        if (!opaque || !opaque[symbols_js_1.default.kRequestId])
             return;
-        debug('[%s] Request#%d %s %s, path: %s, headers: %o', name, opaque[symbols_1.default.kRequestId], request.method, request.origin, request.path, request.headers);
-        if (!opaque[symbols_1.default.kEnableRequestTiming])
+        debug('[%s] Request#%d %s %s, path: %s, headers: %o', name, opaque[symbols_js_1.default.kRequestId], request.method, request.origin, request.path, request.headers);
+        if (!opaque[symbols_js_1.default.kEnableRequestTiming])
             return;
-        opaque[symbols_1.default.kRequestTiming].queuing = (0, utils_1.performanceTime)(opaque[symbols_1.default.kRequestStartTime]);
+        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')
     // This message is published after a connection is established.
     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;
+        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();
+        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
-        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));
+        socket[symbols_js_1.default.kSocketLocalAddress] = socket.localAddress;
+        socket[symbols_js_1.default.kSocketLocalPort] = socket.localPort;
+        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.
     subscribe('undici:client:sendHeaders', (message, name) => {
@@ -89,20 +89,20 @@ function initDiagnosticsChannel() {
         if (!kHandler)
             return;
         const opaque = request[kHandler]?.opts?.opaque;
-        if (!opaque || !opaque[symbols_1.default.kRequestId])
+        if (!opaque || !opaque[symbols_js_1.default.kRequestId])
             return;
-        socket[symbols_1.default.kHandledRequests]++;
+        socket[symbols_js_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, 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])
+        opaque[symbols_js_1.default.kRequestSocket] = socket;
+        debug('[%s] Request#%d send headers on Socket#%d (handled %d requests, sock: %o)', name, opaque[symbols_js_1.default.kRequestId], socket[symbols_js_1.default.kSocketId], socket[symbols_js_1.default.kHandledRequests], formatSocket(socket));
+        if (!opaque[symbols_js_1.default.kEnableRequestTiming])
             return;
-        opaque[symbols_1.default.kRequestTiming].requestHeadersSent = (0, utils_1.performanceTime)(opaque[symbols_1.default.kRequestStartTime]);
+        opaque[symbols_js_1.default.kRequestTiming].requestHeadersSent = (0, utils_js_1.performanceTime)(opaque[symbols_js_1.default.kRequestStartTime]);
         // first socket need to caculate the connected time
-        if (socket[symbols_1.default.kHandledRequests] === 1) {
+        if (socket[symbols_js_1.default.kHandledRequests] === 1) {
             // kSocketStartTime - kRequestStartTime = connected time
-            opaque[symbols_1.default.kRequestTiming].connected =
-                (0, utils_1.performanceTime)(opaque[symbols_1.default.kRequestStartTime], socket[symbols_1.default.kSocketStartTime]);
+            opaque[symbols_js_1.default.kRequestTiming].connected =
+                (0, utils_js_1.performanceTime)(opaque[symbols_js_1.default.kRequestStartTime], socket[symbols_js_1.default.kSocketStartTime]);
         }
     });
     subscribe('undici:request:bodySent', (message, name) => {
@@ -110,12 +110,12 @@ function initDiagnosticsChannel() {
         if (!kHandler)
             return;
         const opaque = request[kHandler]?.opts?.opaque;
-        if (!opaque || !opaque[symbols_1.default.kRequestId])
+        if (!opaque || !opaque[symbols_js_1.default.kRequestId])
             return;
-        debug('[%s] Request#%d send body', name, opaque[symbols_1.default.kRequestId]);
-        if (!opaque[symbols_1.default.kEnableRequestTiming])
+        debug('[%s] Request#%d send body', name, opaque[symbols_js_1.default.kRequestId]);
+        if (!opaque[symbols_js_1.default.kEnableRequestTiming])
             return;
-        opaque[symbols_1.default.kRequestTiming].requestSent = (0, utils_1.performanceTime)(opaque[symbols_1.default.kRequestStartTime]);
+        opaque[symbols_js_1.default.kRequestTiming].requestSent = (0, utils_js_1.performanceTime)(opaque[symbols_js_1.default.kRequestStartTime]);
     });
     // This message is published after the response headers have been received, i.e. the response has been completed.
     subscribe('undici:request:headers', (message, name) => {
@@ -123,15 +123,15 @@ function initDiagnosticsChannel() {
         if (!kHandler)
             return;
         const opaque = request[kHandler]?.opts?.opaque;
-        if (!opaque || !opaque[symbols_1.default.kRequestId])
+        if (!opaque || !opaque[symbols_js_1.default.kRequestId])
             return;
         // 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, 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])
+        const socket = opaque[symbols_js_1.default.kRequestSocket];
+        socket[symbols_js_1.default.kHandledResponses]++;
+        debug('[%s] Request#%d get %s response headers on Socket#%d (handled %d responses, sock: %o)', name, opaque[symbols_js_1.default.kRequestId], response.statusCode, socket[symbols_js_1.default.kSocketId], socket[symbols_js_1.default.kHandledResponses], formatSocket(socket));
+        if (!opaque[symbols_js_1.default.kEnableRequestTiming])
             return;
-        opaque[symbols_1.default.kRequestTiming].waiting = (0, utils_1.performanceTime)(opaque[symbols_1.default.kRequestStartTime]);
+        opaque[symbols_js_1.default.kRequestTiming].waiting = (0, utils_js_1.performanceTime)(opaque[symbols_js_1.default.kRequestStartTime]);
     });
     // This message is published after the response body and trailers have been received, i.e. the response has been completed.
     subscribe('undici:request:trailers', (message, name) => {
@@ -139,12 +139,12 @@ function initDiagnosticsChannel() {
         if (!kHandler)
             return;
         const opaque = request[kHandler]?.opts?.opaque;
-        if (!opaque || !opaque[symbols_1.default.kRequestId])
+        if (!opaque || !opaque[symbols_js_1.default.kRequestId])
             return;
-        debug('[%s] Request#%d get response body and trailers', name, opaque[symbols_1.default.kRequestId]);
-        if (!opaque[symbols_1.default.kEnableRequestTiming])
+        debug('[%s] Request#%d get response body and trailers', name, opaque[symbols_js_1.default.kRequestId]);
+        if (!opaque[symbols_js_1.default.kEnableRequestTiming])
             return;
-        opaque[symbols_1.default.kRequestTiming].contentDownload = (0, utils_1.performanceTime)(opaque[symbols_1.default.kRequestStartTime]);
+        opaque[symbols_js_1.default.kRequestTiming].contentDownload = (0, utils_js_1.performanceTime)(opaque[symbols_js_1.default.kRequestStartTime]);
     });
     // This message is published if the request is going to error, but it has not errored yet.
     // subscribe('undici:request:error', (message, name) => {

package/{src/esm → dist/commonjs}/index.d.ts

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

package/{src/cjs → dist/commonjs}/index.js

@@ -5,14 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.USER_AGENT = exports.HttpClient2 = exports.HttpClient = exports.getGlobalDispatcher = exports.setGlobalDispatcher = exports.Dispatcher = exports.Agent = exports.ProxyAgent = exports.MockAgent = exports.curl = exports.request = void 0;
 const ylru_1 = __importDefault(require("ylru"));
-const HttpClient_1 = require("./HttpClient");
+const HttpClient_js_1 = require("./HttpClient.js");
 let httpclient;
 const domainSocketHttpclients = new ylru_1.default(50);
 async function request(url, options) {
     if (options?.socketPath) {
         let domainSocketHttpclient = domainSocketHttpclients.get(options.socketPath);
         if (!domainSocketHttpclient) {
-            domainSocketHttpclient = new HttpClient_1.HttpClient({
+            domainSocketHttpclient = new HttpClient_js_1.HttpClient({
                 connect: { socketPath: options.socketPath },
             });
             domainSocketHttpclients.set(options.socketPath, domainSocketHttpclient);
@@ -20,7 +20,7 @@ async function request(url, options) {
         return await domainSocketHttpclient.request(url, options);
     }
     if (!httpclient) {
-        httpclient = new HttpClient_1.HttpClient({});
+        httpclient = new HttpClient_js_1.HttpClient({});
     }
     return await httpclient.request(url, options);
 }
@@ -42,12 +42,12 @@ Object.defineProperty(exports, "Dispatcher", { enumerable: true, get: function (
 Object.defineProperty(exports, "setGlobalDispatcher", { enumerable: true, get: function () { return undici_1.setGlobalDispatcher; } });
 Object.defineProperty(exports, "getGlobalDispatcher", { enumerable: true, get: function () { return undici_1.getGlobalDispatcher; } });
 // HttpClient2 is keep compatible with urlib@2 HttpClient2
-var HttpClient_2 = require("./HttpClient");
-Object.defineProperty(exports, "HttpClient", { enumerable: true, get: function () { return HttpClient_2.HttpClient; } });
-Object.defineProperty(exports, "HttpClient2", { enumerable: true, get: function () { return HttpClient_2.HttpClient; } });
-Object.defineProperty(exports, "USER_AGENT", { enumerable: true, get: function () { return HttpClient_2.HEADER_USER_AGENT; } });
+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; } });
 exports.default = {
     request,
     curl,
-    USER_AGENT: HttpClient_1.HEADER_USER_AGENT,
+    USER_AGENT: HttpClient_js_1.HEADER_USER_AGENT,
 };

package/dist/commonjs/package.json

@@ -0,0 +1 @@
+{"type":"commonjs"}

package/{src/cjs → dist/commonjs}/symbols.d.ts

@@ -12,6 +12,6 @@ declare const _default: {
     kRequestStartTime: symbol;
     kEnableRequestTiming: symbol;
     kRequestTiming: symbol;
-    kRequestOrginalOpaque: symbol;
+    kRequestOriginalOpaque: symbol;
 };
 export default _default;

package/{src/cjs → dist/commonjs}/symbols.js

@@ -14,5 +14,5 @@ exports.default = {
     kRequestStartTime: Symbol('request start time'),
     kEnableRequestTiming: Symbol('enable request timing or not'),
     kRequestTiming: Symbol('request timing'),
-    kRequestOrginalOpaque: Symbol('request orginal opaque'),
+    kRequestOriginalOpaque: Symbol('request original opaque'),
 };

package/{src/cjs → dist/commonjs}/utils.d.ts

@@ -1,4 +1,4 @@
-import { FixJSONCtlChars } from './Request';
+import type { FixJSONCtlChars } from './Request.js';
 export declare function parseJSON(data: string, fixJSONCtlChars?: FixJSONCtlChars): string;
 export declare function sleep(ms: number): Promise<void>;
 export declare function digestAuthHeader(method: string, uri: string, wwwAuthenticate: string, userpass: string): string;

package/{src → dist}/esm/HttpAgent.d.ts

@@ -1,8 +1,6 @@
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
 import { LookupFunction } from 'node:net';
-import { Agent } from 'undici';
-import type Dispatcher from 'undici/types/dispatcher';
-import type buildConnector from 'undici/types/connector';
+import { Agent, Dispatcher, buildConnector } from 'undici';
 export type CheckAddressFunction = (ip: string, family: number | string) => boolean;
 export type HttpAgentOptions = {
     lookup?: LookupFunction;

package/{src/cjs → dist/esm}/HttpClient.d.ts

@@ -1,11 +1,11 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
 import { EventEmitter } from 'node:events';
 import { LookupFunction } from 'node:net';
-import { CheckAddressFunction } from './HttpAgent';
-import { RequestURL, RequestOptions, RequestMeta } from './Request';
-import { RawResponseWithMeta, HttpClientResponse } from './Response';
+import { CheckAddressFunction } from './HttpAgent.js';
+import { RequestURL, RequestOptions, RequestMeta } from './Request.js';
+import { RawResponseWithMeta, HttpClientResponse } from './Response.js';
 export type ClientOptions = {
     defaultArgs?: RequestOptions;
     /**
@@ -31,7 +31,7 @@ export type ClientOptions = {
         */
         rejectUnauthorized?: boolean;
         /**
-         * sockePath string | null (optional) - Default: null - An IPC endpoint, either Unix domain socket or Windows named pipe
+         * socketPath string | null (optional) - Default: null - An IPC endpoint, either Unix domain socket or Windows named pipe
          */
         socketPath?: string | null;
     };

package/{src → dist}/esm/HttpClient.js

@@ -15,6 +15,7 @@ import { FormData as FormDataNode } from 'formdata-node';
 import { FormDataEncoder } from 'form-data-encoder';
 import createUserAgent from 'default-user-agent';
 import mime from 'mime-types';
+import qs from 'qs';
 import pump from 'pump';
 // Compatible with old style formstream
 import FormStream from 'formstream';
@@ -66,7 +67,7 @@ class HttpClientRequestTimeoutError extends Error {
         Error.captureStackTrace(this, this.constructor);
     }
 }
-export const HEADER_USER_AGENT = createUserAgent('node-urllib', '3.17.2');
+export const HEADER_USER_AGENT = createUserAgent('node-urllib', '3.18.1-beta.0');
 function getFileName(stream) {
     const filePath = stream.path;
     if (filePath) {
@@ -161,14 +162,14 @@ export class HttpClient extends EventEmitter {
             // the response body and trailers have been received
             contentDownload: 0,
         };
-        const orginalOpaque = args.opaque;
+        const originalOpaque = args.opaque;
         // using opaque to diagnostics channel, binding request and socket
         const internalOpaque = {
             [symbols.kRequestId]: requestId,
             [symbols.kRequestStartTime]: requestStartTime,
             [symbols.kEnableRequestTiming]: !!args.timing,
             [symbols.kRequestTiming]: timing,
-            [symbols.kRequestOrginalOpaque]: orginalOpaque,
+            [symbols.kRequestOriginalOpaque]: originalOpaque,
         };
         const reqMeta = {
             requestId,
@@ -375,11 +376,19 @@ export class HttpClient extends EventEmitter {
                     || isReadable(args.data);
                 if (isGETOrHEAD) {
                     if (!isStringOrBufferOrReadable) {
-                        for (const field in args.data) {
-                            const fieldValue = args.data[field];
-                            if (fieldValue === undefined)
-                                continue;
-                            requestUrl.searchParams.append(field, fieldValue);
+                        if (args.nestedQuerystring) {
+                            const querystring = qs.stringify(args.data);
+                            // reset the requestUrl
+                            const href = requestUrl.href;
+                            requestUrl = new URL(href + (href.includes('?') ? '&' : '?') + querystring);
+                        }
+                        else {
+                            for (const field in args.data) {
+                                const fieldValue = args.data[field];
+                                if (fieldValue === undefined)
+                                    continue;
+                                requestUrl.searchParams.append(field, fieldValue);
+                            }
                         }
                     }
                 }
@@ -399,7 +408,12 @@ export class HttpClient extends EventEmitter {
                         }
                         else {
                             headers['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
-                            requestOptions.body = new URLSearchParams(args.data).toString();
+                            if (args.nestedQuerystring) {
+                                requestOptions.body = qs.stringify(args.data);
+                            }
+                            else {
+                                requestOptions.body = new URLSearchParams(args.data).toString();
+                            }
                         }
                     }
                 }
@@ -509,7 +523,7 @@ export class HttpClient extends EventEmitter {
             // get real socket info from internalOpaque
             this.#updateSocketInfo(socketInfo, internalOpaque);
             const clientResponse = {
-                opaque: orginalOpaque,
+                opaque: originalOpaque,
                 data,
                 status: res.status,
                 statusCode: res.status,
@@ -564,7 +578,7 @@ export class HttpClient extends EventEmitter {
                     return await this.#requestInternal(url, options, requestContext);
                 }
             }
-            err.opaque = orginalOpaque;
+            err.opaque = originalOpaque;
             err.status = res.status;
             err.headers = res.headers;
             err.res = res;

package/{src → dist}/esm/Request.d.ts

@@ -1,11 +1,11 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
 import { Readable, Writable } from 'node:stream';
 import type { IncomingHttpHeaders } from 'node:http';
-import type Dispatcher from 'undici/types/dispatcher';
-import type { HttpClientResponse } from './Response';
+import type { Dispatcher } from 'undici';
+import type { HttpClientResponse } from './Response.js';
 export type HttpMethod = Dispatcher.HttpMethod;
 export type RequestURL = string | URL;
 export type FixJSONCtlCharsHandler = (data: string) => string;
@@ -44,6 +44,11 @@ export type RequestOptions = {
      * Default is 'buffer'.
      */
     dataType?: 'text' | 'html' | 'json' | 'buffer' | 'stream';
+    /**
+     * urllib default use URLSearchParams to stringify form data which don't support nested object,
+     * will use qs instead of URLSearchParams to support nested object by set this option to true.
+     */
+    nestedQuerystring?: boolean;
     /**
      * @deprecated
      * Only for d.ts keep compatible with urllib@2, don't use it anymore.

package/{src → dist}/esm/Response.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="node" />
-/// <reference types="node" />
+/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
 import { Readable } from 'node:stream';
 import { IncomingHttpHeaders } from 'node:http';
 export type SocketInfo = {

package/{src/cjs → dist/esm}/index.d.ts

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

package/dist/esm/package.json

@@ -0,0 +1 @@
+{"type":"module"}

package/{src → dist}/esm/symbols.d.ts

@@ -12,6 +12,6 @@ declare const _default: {
     kRequestStartTime: symbol;
     kEnableRequestTiming: symbol;
     kRequestTiming: symbol;
-    kRequestOrginalOpaque: symbol;
+    kRequestOriginalOpaque: symbol;
 };
 export default _default;

package/{src → dist}/esm/symbols.js

@@ -12,5 +12,5 @@ export default {
     kRequestStartTime: Symbol('request start time'),
     kEnableRequestTiming: Symbol('enable request timing or not'),
     kRequestTiming: Symbol('request timing'),
-    kRequestOrginalOpaque: Symbol('request orginal opaque'),
+    kRequestOriginalOpaque: Symbol('request original opaque'),
 };

package/{src → dist}/esm/utils.d.ts

@@ -1,4 +1,4 @@
-import { FixJSONCtlChars } from './Request';
+import type { FixJSONCtlChars } from './Request.js';
 export declare function parseJSON(data: string, fixJSONCtlChars?: FixJSONCtlChars): string;
 export declare function sleep(ms: number): Promise<void>;
 export declare function digestAuthHeader(method: string, uri: string, wwwAuthenticate: string, userpass: string): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "urllib",
-  "version": "3.17.2",
+  "version": "3.18.1-beta.0",
   "publishConfig": {
     "tag": "latest"
   },
@@ -19,21 +19,28 @@
   "author": "fengmk2 <fengmk2@gmail.com> (https://github.com/fengmk2)",
   "homepage": "https://github.com/node-modules/urllib",
   "type": "module",
+  "tshy": {
+    "exports": {
+      ".": "./src/index.ts",
+      "./package.json": "./package.json"
+    }
+  },
   "exports": {
     ".": {
       "import": {
-        "types": "./src/esm/index.d.ts",
-        "default": "./src/esm/index.js"
+        "types": "./dist/esm/index.d.ts",
+        "default": "./dist/esm/index.js"
       },
       "require": {
-        "types": "./src/cjs/index.d.ts",
-        "default": "./src/cjs/index.js"
+        "types": "./dist/commonjs/index.d.ts",
+        "default": "./dist/commonjs/index.js"
       }
-    }
+    },
+    "./package.json": "./package.json"
   },
-  "types": "./src/esm/index.d.ts",
-  "main": "./src/cjs/index.js",
+  "typings": "./dist/commonjs/index.d.ts",
   "files": [
+    "dist",
     "src"
   ],
   "repository": {
@@ -43,21 +50,22 @@
   "scripts": {
     "lint": "eslint src test --ext .ts --cache",
     "prebuild": "npm run clean",
-    "build": "tsc --version && npm run build:cjs && npm run build:esm && npm run build:version",
+    "build": "tsc --version && tshy && npm run build:version",
     "postbuild": "rm -rf src/*.tsbuildinfo",
-    "build:cjs": "tsc -p ./tsconfig.build.cjs.json",
-    "build:esm": "tsc -p ./tsconfig.build.esm.json && node ./scripts/esm_import_fix.js",
     "build:version": "node ./scripts/replace_urllib_version.js",
     "build:cjs:test": "cd test/cjs && rm -rf node_modules && npm link ../.. && node index.js",
     "build:esm:test": "cd test/esm && rm -rf node_modules && npm link ../.. && node index.js",
-    "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",
+    "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:cjs": "cd test/fixtures/ts && 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",
     "cov": "vitest run --coverage",
     "ci": "npm run lint && npm run cov && npm run build:test",
     "contributor": "git-contributor",
-    "clean": "rm -rf src/*.tsbuildinfo src/cjs/*.ts src/cjs/*.js src/esm/*.ts src/esm/*.js",
+    "clean": "rm -rf dist",
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
@@ -68,15 +76,19 @@
     "formstream": "^1.1.1",
     "mime-types": "^2.1.35",
     "pump": "^3.0.0",
+    "qs": "^6.11.2",
     "undici": "^5.22.1",
     "ylru": "^1.3.2"
   },
   "devDependencies": {
+    "@tsconfig/node18": "^18.2.1",
+    "@tsconfig/strictest": "^2.0.2",
     "@types/busboy": "^1.5.0",
     "@types/default-user-agent": "^1.0.0",
     "@types/mime-types": "^2.1.1",
     "@types/node": "^20.2.1",
     "@types/pump": "^1.1.1",
+    "@types/qs": "^6.9.7",
     "@types/selfsigned": "^2.0.1",
     "@types/tar-stream": "^2.2.2",
     "@vitest/coverage-v8": "^0.32.0",
@@ -89,6 +101,7 @@
     "proxy": "^1.0.2",
     "selfsigned": "^2.0.1",
     "tar-stream": "^2.2.0",
+    "tshy": "^1.0.0-3",
     "typescript": "^5.0.4",
     "vitest": "^0.32.0"
   },

package/src/HttpAgent.ts

@@ -2,9 +2,9 @@ import dns from 'node:dns';
 import { LookupFunction, isIP } from 'node:net';
 import {
   Agent,
+  Dispatcher,
+  buildConnector,
 } from 'undici';
-import type Dispatcher from 'undici/types/dispatcher';
-import type buildConnector from 'undici/types/connector';
 
 export type CheckAddressFunction = (ip: string, family: number | string) => boolean;
 

package/src/HttpClient.ts

@@ -26,15 +26,16 @@ import { FormData as FormDataNode } from 'formdata-node';
 import { FormDataEncoder } from 'form-data-encoder';
 import createUserAgent from 'default-user-agent';
 import mime from 'mime-types';
+import qs from 'qs';
 import pump from 'pump';
 // Compatible with old style formstream
 import FormStream from 'formstream';
-import { HttpAgent, CheckAddressFunction } from './HttpAgent';
-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';
-import { initDiagnosticsChannel } from './diagnosticsChannel';
+import { HttpAgent, CheckAddressFunction } from './HttpAgent.js';
+import { RequestURL, RequestOptions, HttpMethod, RequestMeta } from './Request.js';
+import { RawResponseWithMeta, HttpClientResponse, SocketInfo } from './Response.js';
+import { parseJSON, sleep, digestAuthHeader, globalId, performanceTime, isReadable } from './utils.js';
+import symbols from './symbols.js';
+import { initDiagnosticsChannel } from './diagnosticsChannel.js';
 
 type Exists<T> = T extends undefined ? never : T;
 type UndiciRequestOption = Exists<Parameters<typeof undiciRequest>[1]>;
@@ -87,7 +88,7 @@ export type ClientOptions = {
     rejectUnauthorized?: boolean;
 
     /**
-     * sockePath string | null (optional) - Default: null - An IPC endpoint, either Unix domain socket or Windows named pipe
+     * socketPath string | null (optional) - Default: null - An IPC endpoint, either Unix domain socket or Windows named pipe
      */
     socketPath?: string | null;
   },
@@ -244,14 +245,14 @@ export class HttpClient extends EventEmitter {
       // the response body and trailers have been received
       contentDownload: 0,
     };
-    const orginalOpaque = args.opaque;
+    const originalOpaque = args.opaque;
     // using opaque to diagnostics channel, binding request and socket
     const internalOpaque = {
       [symbols.kRequestId]: requestId,
       [symbols.kRequestStartTime]: requestStartTime,
       [symbols.kEnableRequestTiming]: !!args.timing,
       [symbols.kRequestTiming]: timing,
-      [symbols.kRequestOrginalOpaque]: orginalOpaque,
+      [symbols.kRequestOriginalOpaque]: originalOpaque,
     };
     const reqMeta = {
       requestId,
@@ -452,10 +453,17 @@ export class HttpClient extends EventEmitter {
           || isReadable(args.data);
         if (isGETOrHEAD) {
           if (!isStringOrBufferOrReadable) {
-            for (const field in args.data) {
-              const fieldValue = args.data[field];
-              if (fieldValue === undefined) continue;
-              requestUrl.searchParams.append(field, fieldValue);
+            if (args.nestedQuerystring) {
+              const querystring = qs.stringify(args.data);
+              // reset the requestUrl
+              const href = requestUrl.href;
+              requestUrl = new URL(href + (href.includes('?') ? '&' : '?') + querystring);
+            } else {
+              for (const field in args.data) {
+                const fieldValue = args.data[field];
+                if (fieldValue === undefined) continue;
+                requestUrl.searchParams.append(field, fieldValue);
+              }
             }
           }
         } else {
@@ -472,7 +480,11 @@ export class HttpClient extends EventEmitter {
               }
             } else {
               headers['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
-              requestOptions.body = new URLSearchParams(args.data).toString();
+              if (args.nestedQuerystring) {
+                requestOptions.body = qs.stringify(args.data);
+              } else {
+                requestOptions.body = new URLSearchParams(args.data).toString();
+              }
             }
           }
         }
@@ -582,7 +594,7 @@ export class HttpClient extends EventEmitter {
       this.#updateSocketInfo(socketInfo, internalOpaque);
 
       const clientResponse: HttpClientResponse = {
-        opaque: orginalOpaque,
+        opaque: originalOpaque,
         data,
         status: res.status,
         statusCode: res.status,
@@ -637,7 +649,7 @@ export class HttpClient extends EventEmitter {
           return await this.#requestInternal(url, options, requestContext);
         }
       }
-      err.opaque = orginalOpaque;
+      err.opaque = originalOpaque;
       err.status = res.status;
       err.headers = res.headers;
       err.res = res;

package/src/Request.ts

@@ -1,9 +1,9 @@
 import { Readable, Writable } from 'node:stream';
 import type { IncomingHttpHeaders } from 'node:http';
-import type Dispatcher from 'undici/types/dispatcher';
+import type { Dispatcher } from 'undici';
 import type {
   HttpClientResponse,
-} from './Response';
+} from './Response.js';
 
 export type HttpMethod = Dispatcher.HttpMethod;
 
@@ -46,6 +46,11 @@ export type RequestOptions = {
    * Default is 'buffer'.
    */
   dataType?: 'text' | 'html' | 'json' | 'buffer' | 'stream';
+  /**
+   * urllib default use URLSearchParams to stringify form data which don't support nested object,
+   * will use qs instead of URLSearchParams to support nested object by set this option to true.
+   */
+  nestedQuerystring?: boolean;
   /**
    * @deprecated
    * Only for d.ts keep compatible with urllib@2, don't use it anymore.

package/src/diagnosticsChannel.ts

@@ -3,8 +3,8 @@ 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';
+import symbols from './symbols.js';
+import { globalId, performanceTime } from './utils.js';
 
 const debug = debuglog('urllib:DiagnosticsChannel');
 let initedDiagnosticsChannel = false;

package/src/index.ts

@@ -1,6 +1,6 @@
 import LRU from 'ylru';
-import { HttpClient, HEADER_USER_AGENT } from './HttpClient';
-import { RequestOptions, RequestURL } from './Request';
+import { HttpClient, HEADER_USER_AGENT } from './HttpClient.js';
+import { RequestOptions, RequestURL } from './Request.js';
 
 let httpclient: HttpClient;
 const domainSocketHttpclients = new LRU(50);
@@ -39,14 +39,14 @@ export {
 export {
   HttpClient, HttpClient as HttpClient2, HEADER_USER_AGENT as USER_AGENT,
   RequestDiagnosticsMessage, ResponseDiagnosticsMessage,
-} from './HttpClient';
+} from './HttpClient.js';
 // RequestOptions2 is keep compatible with urlib@2 RequestOptions2
 export {
   RequestOptions, RequestOptions as RequestOptions2, RequestURL, HttpMethod,
   FixJSONCtlCharsHandler, FixJSONCtlChars,
-} from './Request';
+} from './Request.js';
 
-export { SocketInfo, Timing, RawResponseWithMeta, HttpClientResponse } from './Response';
+export { SocketInfo, Timing, RawResponseWithMeta, HttpClientResponse } from './Response.js';
 
 export default {
   request,

package/src/symbols.ts

@@ -12,5 +12,5 @@ export default {
   kRequestStartTime: Symbol('request start time'),
   kEnableRequestTiming: Symbol('enable request timing or not'),
   kRequestTiming: Symbol('request timing'),
-  kRequestOrginalOpaque: Symbol('request orginal opaque'),
+  kRequestOriginalOpaque: Symbol('request original opaque'),
 };

package/src/utils.ts

@@ -1,7 +1,7 @@
 import { randomBytes, createHash } from 'node:crypto';
 import { Readable } from 'node:stream';
 import { performance } from 'node:perf_hooks';
-import { FixJSONCtlChars } from './Request';
+import type { FixJSONCtlChars } from './Request.js';
 
 const JSONCtlCharsMap = {
   '"': '\\"', // \u0022

package/src/cjs/package.json

@@ -1,3 +0,0 @@
-{
-  "type": "commonjs"
-}

package/src/esm/package.json

@@ -1,3 +0,0 @@
-{
-  "type": "module"
-}