urllib 3.22.2 → 3.22.4

package/README.md

@@ -68,7 +68,7 @@ console.log('status: %s, body size: %d, headers: %j', res.status, data.length, r
   - **keepAliveTimeout** `number | null` - Default is `4000`, 4 seconds - The timeout after which a socket without active requests will time out. Monitors time between activity on a connected socket. This value may be overridden by *keep-alive* hints from the server. See [MDN: HTTP - Headers - Keep-Alive directives](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Keep-Alive#directives) for more details.
   - ***auth*** String - `username:password` used in HTTP Basic Authorization.
   - ***digestAuth*** String - `username:password` used in HTTP [Digest Authorization](https://en.wikipedia.org/wiki/Digest_access_authentication).
-  - ***followRedirect*** Boolean - follow HTTP 3xx responses as redirects. defaults to false.
+  - ***followRedirect*** Boolean - follow HTTP 3xx responses as redirects. defaults to true.
   - ***maxRedirects*** Number - The maximum number of redirects to follow, defaults to 10.
   - ***formatRedirectUrl*** Function - Format the redirect url by your self. Default is `url.resolve(from, to)`.
   - ***beforeRequest*** Function - Before request hook, you can change every thing here.

package/dist/commonjs/HttpClient.js

@@ -16,6 +16,7 @@ const node_path_1 = require("node:path");
 const node_fs_1 = require("node:fs");
 const node_url_1 = require("node:url");
 const node_perf_hooks_1 = require("node:perf_hooks");
+const node_querystring_1 = __importDefault(require("node:querystring"));
 const undici_1 = require("undici");
 const symbols_js_1 = __importDefault(require("undici/lib/core/symbols.js"));
 const formdata_node_1 = require("formdata-node");
@@ -67,7 +68,7 @@ class BlobFromStream {
         return 'Blob';
     }
 }
-exports.HEADER_USER_AGENT = (0, default_user_agent_1.default)('node-urllib', '3.22.2');
+exports.HEADER_USER_AGENT = (0, default_user_agent_1.default)('node-urllib', '3.22.4');
 function getFileName(stream) {
     const filePath = stream.path;
     if (filePath) {
@@ -159,7 +160,7 @@ class HttpClient extends node_events_1.EventEmitter {
                 requestUrl = new URL(url.toString());
             }
         }
-        const method = (options?.method ?? 'GET').toUpperCase();
+        const method = (options?.type || options?.method || 'GET').toUpperCase();
         const originalHeaders = options?.headers;
         const headers = {};
         const args = {
@@ -412,20 +413,16 @@ class HttpClient extends node_events_1.EventEmitter {
                     || (0, utils_js_1.isReadable)(args.data);
                 if (isGETOrHEAD) {
                     if (!isStringOrBufferOrReadable) {
+                        let query;
                         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);
+                            query = qs_1.default.stringify(args.data);
                         }
                         else {
-                            for (const field in args.data) {
-                                const fieldValue = args.data[field];
-                                if (fieldValue === undefined)
-                                    continue;
-                                requestUrl.searchParams.append(field, fieldValue);
-                            }
+                            query = node_querystring_1.default.stringify(args.data);
                         }
+                        // reset the requestUrl
+                        const href = requestUrl.href;
+                        requestUrl = new URL(href + (href.includes('?') ? '&' : '?') + query);
                     }
                 }
                 else {

package/dist/commonjs/Request.d.ts

@@ -12,6 +12,8 @@ export type FixJSONCtlChars = boolean | FixJSONCtlCharsHandler;
 export type RequestOptions = {
     /** Request method, defaults to GET. Could be GET, POST, DELETE or PUT. Alias 'type'. */
     method?: HttpMethod | Lowercase<HttpMethod>;
+    /** Alias for 'method'. */
+    type?: HttpMethod | Lowercase<HttpMethod>;
     /** Data to be sent. Will be stringify automatically. */
     data?: any;
     /** Manually set the content of payload. If set, data will be ignored. */

package/dist/esm/HttpClient.js

@@ -10,6 +10,7 @@ import { basename } from 'node:path';
 import { createReadStream } from 'node:fs';
 import { format as urlFormat } from 'node:url';
 import { performance } from 'node:perf_hooks';
+import querystring from 'node:querystring';
 import { FormData as FormDataNative, request as undiciRequest, Agent, getGlobalDispatcher, } from 'undici';
 import undiciSymbols from 'undici/lib/core/symbols.js';
 import { FormData as FormDataNode } from 'formdata-node';
@@ -61,7 +62,7 @@ class BlobFromStream {
         return 'Blob';
     }
 }
-export const HEADER_USER_AGENT = createUserAgent('node-urllib', '3.22.2');
+export const HEADER_USER_AGENT = createUserAgent('node-urllib', '3.22.4');
 function getFileName(stream) {
     const filePath = stream.path;
     if (filePath) {
@@ -153,7 +154,7 @@ export class HttpClient extends EventEmitter {
                 requestUrl = new URL(url.toString());
             }
         }
-        const method = (options?.method ?? 'GET').toUpperCase();
+        const method = (options?.type || options?.method || 'GET').toUpperCase();
         const originalHeaders = options?.headers;
         const headers = {};
         const args = {
@@ -406,20 +407,16 @@ export class HttpClient extends EventEmitter {
                     || isReadable(args.data);
                 if (isGETOrHEAD) {
                     if (!isStringOrBufferOrReadable) {
+                        let query;
                         if (args.nestedQuerystring) {
-                            const querystring = qs.stringify(args.data);
-                            // reset the requestUrl
-                            const href = requestUrl.href;
-                            requestUrl = new URL(href + (href.includes('?') ? '&' : '?') + querystring);
+                            query = qs.stringify(args.data);
                         }
                         else {
-                            for (const field in args.data) {
-                                const fieldValue = args.data[field];
-                                if (fieldValue === undefined)
-                                    continue;
-                                requestUrl.searchParams.append(field, fieldValue);
-                            }
+                            query = querystring.stringify(args.data);
                         }
+                        // reset the requestUrl
+                        const href = requestUrl.href;
+                        requestUrl = new URL(href + (href.includes('?') ? '&' : '?') + query);
                     }
                 }
                 else {

package/dist/esm/Request.d.ts

@@ -12,6 +12,8 @@ export type FixJSONCtlChars = boolean | FixJSONCtlCharsHandler;
 export type RequestOptions = {
     /** Request method, defaults to GET. Could be GET, POST, DELETE or PUT. Alias 'type'. */
     method?: HttpMethod | Lowercase<HttpMethod>;
+    /** Alias for 'method'. */
+    type?: HttpMethod | Lowercase<HttpMethod>;
     /** Data to be sent. Will be stringify automatically. */
     data?: any;
     /** Manually set the content of payload. If set, data will be ignored. */

package/package.json

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

package/src/HttpClient.ts

@@ -16,6 +16,7 @@ import { basename } from 'node:path';
 import { createReadStream } from 'node:fs';
 import { format as urlFormat } from 'node:url';
 import { performance } from 'node:perf_hooks';
+import querystring from 'node:querystring';
 import {
   FormData as FormDataNative,
   request as undiciRequest,
@@ -255,7 +256,7 @@ export class HttpClient extends EventEmitter {
       }
     }
 
-    const method = (options?.method ?? 'GET').toUpperCase() as HttpMethod;
+    const method = (options?.type || options?.method || 'GET').toUpperCase() as HttpMethod;
     const originalHeaders = options?.headers;
     const headers: IncomingHttpHeaders = {};
     const args = {
@@ -503,18 +504,15 @@ export class HttpClient extends EventEmitter {
           || isReadable(args.data);
         if (isGETOrHEAD) {
           if (!isStringOrBufferOrReadable) {
+            let query;
             if (args.nestedQuerystring) {
-              const querystring = qs.stringify(args.data);
-              // reset the requestUrl
-              const href = requestUrl.href;
-              requestUrl = new URL(href + (href.includes('?') ? '&' : '?') + querystring);
+              query = qs.stringify(args.data);
             } else {
-              for (const field in args.data) {
-                const fieldValue = args.data[field];
-                if (fieldValue === undefined) continue;
-                requestUrl.searchParams.append(field, fieldValue);
-              }
+              query = querystring.stringify(args.data);
             }
+            // reset the requestUrl
+            const href = requestUrl.href;
+            requestUrl = new URL(href + (href.includes('?') ? '&' : '?') + query);
           }
         } else {
           if (isStringOrBufferOrReadable) {

package/src/Request.ts

@@ -13,6 +13,8 @@ export type FixJSONCtlChars = boolean | FixJSONCtlCharsHandler;
 export type RequestOptions = {
   /** Request method, defaults to GET. Could be GET, POST, DELETE or PUT. Alias 'type'. */
   method?: HttpMethod | Lowercase<HttpMethod>;
+  /** Alias for 'method'. */
+  type?: HttpMethod | Lowercase<HttpMethod>;
   /** Data to be sent. Will be stringify automatically. */
   data?: any;
   /** Manually set the content of payload. If set, data will be ignored. */