@wiajs/req 1.7.22 → 1.7.25

package/dist/node/req.cjs

@@ -1,5 +1,5 @@
 /*!
-  * @wia/req v1.7.22
+  * @wia/req v1.7.25
   * (c) 2024 Sibyl Yu, Matt Zabriskie and contributors
   * Released under the MIT License.
   */
@@ -2917,8 +2917,14 @@ class HttpAdapter {
 
     if (config.httpAgent) options.agents = {http: config.httpAgent};
     if (config.httpsAgent) options.agents.https = config.httpAgent;
-    // ! 配置了 agent,使用Agent，否则使用缺省 agent
-    if (config.agent) options.agents = new agent.Agent(config.agent);
+
+    // ! 配置了 agent,使用Agent，否则使用缺省 agent，agents 优于agent
+    if (config.agents) options.agents = config.agents;
+    else if (config.agent) options.agents = new agent.Agent(config.agent);
+
+    const isHttpsRequest = isHttps.test(options.protocol);
+    // agents 优先于 agent，在 request中根据协议从 agents 中获取
+    options.agent = isHttpsRequest ? config.httpsAgent : config.httpAgent;
 
     // cacheable-lookup integration hotfix
     if (!utils$1.isUndefined(lookup)) options.lookup = lookup;
@@ -2933,11 +2939,6 @@ class HttpAdapter {
 
     // 执行请求的具体对象
     _.transport = config.transport;
-
-    const isHttpsRequest = isHttps.test(options.protocol);
-    // agents 优先于 agent，在 request中根据协议从 agents 中获取
-    options.agent = isHttpsRequest ? config.httpsAgent : config.httpAgent;
-
     if (config.maxBodyLength > -1) options.maxBodyLength = config.maxBodyLength;
     // follow-redirects does not skip comparison, so it should always succeed for axios -1 unlimited
     else options.maxBodyLength = Number.POSITIVE_INFINITY;
@@ -2947,13 +2948,17 @@ class HttpAdapter {
     // 自动跳转
     // else {
     // 支持跳转或stream，需使用 http、https 封装类
-    if (config.maxRedirects) options.maxRedirects = config.maxRedirects;
+
+    options.maxRedirects = config.maxRedirects ?? 21;
+    options.followRedirects = config.followRedirects ?? true; // 默认自动跳转
+    if (config.maxRedirects === 0) options.followRedirects = false;
     if (config.beforeRedirect) options.beforeRedirects.config = config.beforeRedirect;
 
     if (config.insecureHTTPParser) options.insecureHTTPParser = config.insecureHTTPParser;
 
+    // _.data = data
+    options.data = data; // 传给 request 处理
     _.options = options;
-    _.data = data;
 
     // log({config}, 'init')
     return options
@@ -2975,7 +2980,7 @@ class HttpAdapter {
     try {
       await _.init();
 
-      const {transport, protocol, config, options, data, abort, emitter, maxDownloadRate} = _;
+      const {transport, protocol, config, options, abort, emitter, maxDownloadRate} = _;
       const {responseType, responseEncoding, onDownloadProgress} = config;
 
       if (protocol === 'data:') {
@@ -3060,15 +3065,15 @@ class HttpAdapter {
             }
           );
 
+          // socket 连接成功事件，移到 request
           // set tcp keep alive to prevent drop connection by peer
-          req.on(
-            'socket',
-            /** @param {*} socket */ socket => {
-              // log('onsocket')
-              // default interval of sending ack packet is 1 minute
-              socket.setKeepAlive(true, 1000 * 60);
-            }
-          );
+          // req.on(
+          //   'socket',
+          //   /** @param {*} socket */ socket => {
+          //     // default interval of sending ack packet is 1 minute
+          //     socket.setKeepAlive(true, 1000 * 60)
+          //   }
+          // )
 
           // Handle request timeout
           if (config.timeout) {
@@ -3237,7 +3242,7 @@ class HttpAdapter {
               }
             );
 
-            // 非stream模式需发送数据，由request处理
+            // 非stream模式需发送数据，改由request处理
             // if (utils.isStream(data)) {
             //   // Send the request
             //   let ended = false

package/dist/req.js

@@ -1,5 +1,5 @@
 /*!
-  * @wia/req v1.7.22
+  * @wia/req v1.7.25
   * (c) 2024 Sibyl Yu, Matt Zabriskie and contributors
   * Released under the MIT License.
   */

package/dist/req.min.js

@@ -1,5 +1,5 @@
 /*!
-  * @wia/req v1.7.22
+  * @wia/req v1.7.25
   * (c) 2024 Sibyl Yu, Matt Zabriskie and contributors
   * Released under the MIT License.
   */

package/dist/web/req.cjs

@@ -1,5 +1,5 @@
 /*!
-  * @wia/req v1.7.22
+  * @wia/req v1.7.25
   * (c) 2024 Sibyl Yu, Matt Zabriskie and contributors
   * Released under the MIT License.
   */

package/dist/web/req.mjs

@@ -1,5 +1,5 @@
 /*!
-  * @wia/req v1.7.22
+  * @wia/req v1.7.25
   * (c) 2024 Sibyl Yu, Matt Zabriskie and contributors
   * Released under the MIT License.
   */

package/index.d.cts

@@ -497,6 +497,7 @@ declare namespace axios {
     validateStatus?: ((status: number) => boolean) | null
     maxBodyLength?: number
     maxRedirects?: number
+    followRedirects?: boolean
     maxRate?: number | [MaxUploadRate, MaxDownloadRate]
     beforeRedirect?: (
       options: Record<string, any>,

package/index.d.ts

@@ -391,6 +391,7 @@ export interface AxiosRequestConfig<D = any> {
   validateStatus?: ((status: number) => boolean) | null
   maxBodyLength?: number
   maxRedirects?: number
+  followRedirects?: boolean
   maxRate?: number | [MaxUploadRate, MaxDownloadRate]
   beforeRedirect?: (
     options: Record<string, any>,

package/lib/adapters/http.js

@@ -272,8 +272,12 @@ const isHttpAdapterSupported = typeof process !== 'undefined' && utils.kindOf(pr
             http: config.httpAgent
         };
         if (config.httpsAgent) options.agents.https = config.httpAgent;
-        // ! 配置了 agent,使用Agent，否则使用缺省 agent
-        if (config.agent) options.agents = new Agent(config.agent);
+        // ! 配置了 agent,使用Agent，否则使用缺省 agent，agents 优于agent
+        if (config.agents) options.agents = config.agents;
+        else if (config.agent) options.agents = new Agent(config.agent);
+        const isHttpsRequest = isHttps.test(options.protocol);
+        // agents 优先于 agent，在 request中根据协议从 agents 中获取
+        options.agent = isHttpsRequest ? config.httpsAgent : config.httpAgent;
         // cacheable-lookup integration hotfix
         if (!utils.isUndefined(lookup)) options.lookup = lookup;
         if (config.socketPath) options.socketPath = config.socketPath;
@@ -283,9 +287,6 @@ const isHttpAdapterSupported = typeof process !== 'undefined' && utils.kindOf(pr
         }
         // 执行请求的具体对象
         _.transport = config.transport;
-        const isHttpsRequest = isHttps.test(options.protocol);
-        // agents 优先于 agent，在 request中根据协议从 agents 中获取
-        options.agent = isHttpsRequest ? config.httpsAgent : config.httpAgent;
         if (config.maxBodyLength > -1) options.maxBodyLength = config.maxBodyLength;
         else options.maxBodyLength = Number.POSITIVE_INFINITY;
         // maxRedirects 缺省 21，不跳转，直接使用系统http or https，不支持 stream
@@ -293,11 +294,16 @@ const isHttpAdapterSupported = typeof process !== 'undefined' && utils.kindOf(pr
         // 自动跳转
         // else {
         // 支持跳转或stream，需使用 http、https 封装类
-        if (config.maxRedirects) options.maxRedirects = config.maxRedirects;
+        options.maxRedirects = config.maxRedirects ?? 21;
+        options.followRedirects = config.followRedirects ?? true // 默认自动跳转
+        ;
+        if (config.maxRedirects === 0) options.followRedirects = false;
         if (config.beforeRedirect) options.beforeRedirects.config = config.beforeRedirect;
         if (config.insecureHTTPParser) options.insecureHTTPParser = config.insecureHTTPParser;
+        // _.data = data
+        options.data = data // 传给 request 处理
+        ;
         _.options = options;
-        _.data = data;
         // log({config}, 'init')
         return options;
     }
@@ -313,7 +319,7 @@ const isHttpAdapterSupported = typeof process !== 'undefined' && utils.kindOf(pr
         const _ = this;
         try {
             await _.init();
-            const { transport, protocol, config, options, data, abort, emitter, maxDownloadRate } = _;
+            const { transport, protocol, config, options, abort, emitter, maxDownloadRate } = _;
             const { responseType, responseEncoding, onDownloadProgress } = config;
             if (protocol === 'data:') {
                 /** @type {*} */ let convertedData;
@@ -371,12 +377,15 @@ const isHttpAdapterSupported = typeof process !== 'undefined' && utils.kindOf(pr
                         // if (req.aborted && err.code !== AxiosError.ERR_FR_TOO_MANY_REDIRECTS) return;
                         reject(AxiosError.from(err, null, config, req));
                     });
+                    // socket 连接成功事件，移到 request
                     // set tcp keep alive to prevent drop connection by peer
-                    req.on('socket', /** @param {*} socket */ (socket)=>{
-                        // log('onsocket')
-                        // default interval of sending ack packet is 1 minute
-                        socket.setKeepAlive(true, 1000 * 60);
-                    });
+                    // req.on(
+                    //   'socket',
+                    //   /** @param {*} socket */ socket => {
+                    //     // default interval of sending ack packet is 1 minute
+                    //     socket.setKeepAlive(true, 1000 * 60)
+                    //   }
+                    // )
                     // Handle request timeout
                     if (config.timeout) {
                         // This is forcing a int timeout to avoid problems if the `req` interface doesn't handle other types.
@@ -482,7 +491,7 @@ const isHttpAdapterSupported = typeof process !== 'undefined' && utils.kindOf(pr
                                 }
                             });
                         });
-                    // 非stream模式需发送数据，由request处理
+                    // 非stream模式需发送数据，改由request处理
                     // if (utils.isStream(data)) {
                     //   // Send the request
                     //   let ended = false

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wiajs/req",
-	"version": "1.7.22",
+	"version": "1.7.25",
 	"description": "Promise And Stream based AXIOS client for the browser and node.js",
 	"type": "module",
 	"types": "index.d.ts",
@@ -143,7 +143,7 @@
 	},
 	"dependencies": {
 		"@wiajs/log": "^4.3.19",
-		"@wiajs/request": "^3.0.29",
+		"@wiajs/request": "^3.0.31",
 		"@wiajs/agent": "^1.0.21",
 		"form-data": "^4.0.0",
 		"proxy-from-env": "^1.1.0"