@wiajs/request 3.0.22 → 3.0.25

package/dist/request.cjs

@@ -1,5 +1,5 @@
 /*!
-  * wia request v3.0.22
+  * wia request v3.0.25
   * (c) 2022-2024 Sibyl Yu and contributors
   * Released under the MIT License.
   */
@@ -519,7 +519,7 @@ const writeProps = [
 const writeMethods = ['cork', 'flushHeaders', 'setNoDelay', 'setSocketKeepAlive'];
 
 // Create handlers that pass events from native requests
-// 在 clientRequest 事件转发
+// 在 clientRequest 事件转发写事件
 const writeEvents = [
   // 'abort', // 弃用
   // 'aborted', // 弃用
@@ -543,7 +543,7 @@ const writeEventEmit = Object.create(null);
 for (const ev of writeEvents)
   writeEventEmit[ev] = /** @param  {...any} args */ function (...args) {
     const m = this; // 事件回调，this === clientRequest 实例
-    log$1('req event', {ev});
+    // log('req event', {ev})
     m.redirectReq.emit(ev, ...args); // req 事情映射到 redirectReq 上触发
   };
 
@@ -554,7 +554,7 @@ const readEventEmit = Object.create(null);
 for (const ev of readEvents)
   readEventEmit[ev] = /** @param  {...any} args */ function (...args) {
     const m = this; // 事件回调，this === clientRequest 实例
-    log$1('res event', {ev});
+    // log('res event', {ev})
     m.redirectReq.emit(ev, ...args); // 向上触发事件
   };
 
@@ -661,7 +661,7 @@ class Request extends stream.Duplex {
     for (const method of writeMethods) {
       // @ts-ignore
       m[method] = (a, b) => {
-        log$1(method, {a, b});
+        // log(method, {a, b})
         // @ts-ignore
         m._currentRequest?.[method](a, b);
       };
@@ -674,7 +674,7 @@ class Request extends stream.Duplex {
         get() {
           // @ts-ignore
           const val = m._currentRequest?.[property];
-          log$1('get property', {property});
+          // log('get property', {property})
           return val
         },
       });
@@ -765,7 +765,7 @@ class Request extends stream.Duplex {
       const httpModule = httpModules[protocol];
       if (!httpModule) throw TypeError(`Unsupported protocol: ${protocol}`)
 
-      log$1({opt, protocol}, 'request');
+      // log({opt, protocol}, 'request')
       // Create the native request and set up its event handlers
       // @ts-ignore
       const req = httpModule.request(opt, m._onResponse);
@@ -859,7 +859,7 @@ class Request extends stream.Duplex {
    */
   write(chunk, encoding, cb) {
     const m = this;
-    log$1({data: chunk, encoding, cb}, 'write');
+    // log({data: chunk, encoding, cb}, 'write')
 
     // Writing is not allowed if end has been called
     if (m._ending) throw new WriteAfterEndError()
@@ -1120,7 +1120,7 @@ class Request extends stream.Duplex {
     // If the response is not a redirect; return it as-is
     const {location} = response.headers;
 
-    log$1({statusCode, headers: response.headers}, 'processResponse');
+    // log({statusCode, headers: response.headers}, 'processResponse')
 
     if (!location || opt.followRedirects === false || statusCode < 300 || statusCode >= 400) {
       // 非重定向，返回给原始回调处理
@@ -1208,7 +1208,9 @@ class Request extends stream.Duplex {
 
     // Create the redirected request
     const redirectUrl = utils.resolveUrl(location, currentUrl);
+
     log$1({redirectUrl}, 'redirecting to');
+
     m._isRedirect = true;
     // 覆盖原 url 解析部分，包括 protocol、hostname、port等
     utils.spreadUrlObject(redirectUrl, m.opt);
@@ -1256,11 +1258,11 @@ class Request extends stream.Duplex {
     // 'transfer-encoding': 'chunked'时，无content-length，axios v1.2 不能自动解压
     const responseLength = +res.headers['content-length'];
 
-    log$1('processStream', {
-      statusCode: res.statusCode,
-      responseLength,
-      headers: res.headers,
-    });
+    // log('processStream', {
+    //   statusCode: res.statusCode,
+    //   responseLength,
+    //   headers: res.headers,
+    // })
 
     if (opt.transformStream) {
       opt.transformStream.responseLength = responseLength;

package/dist/request.mjs

@@ -1,5 +1,5 @@
 /*!
-  * wia request v3.0.22
+  * wia request v3.0.25
   * (c) 2022-2024 Sibyl Yu and contributors
   * Released under the MIT License.
   */
@@ -516,7 +516,7 @@ const writeProps = [
 const writeMethods = ['cork', 'flushHeaders', 'setNoDelay', 'setSocketKeepAlive'];
 
 // Create handlers that pass events from native requests
-// 在 clientRequest 事件转发
+// 在 clientRequest 事件转发写事件
 const writeEvents = [
   // 'abort', // 弃用
   // 'aborted', // 弃用
@@ -540,7 +540,7 @@ const writeEventEmit = Object.create(null);
 for (const ev of writeEvents)
   writeEventEmit[ev] = /** @param  {...any} args */ function (...args) {
     const m = this; // 事件回调，this === clientRequest 实例
-    log$1('req event', {ev});
+    // log('req event', {ev})
     m.redirectReq.emit(ev, ...args); // req 事情映射到 redirectReq 上触发
   };
 
@@ -551,7 +551,7 @@ const readEventEmit = Object.create(null);
 for (const ev of readEvents)
   readEventEmit[ev] = /** @param  {...any} args */ function (...args) {
     const m = this; // 事件回调，this === clientRequest 实例
-    log$1('res event', {ev});
+    // log('res event', {ev})
     m.redirectReq.emit(ev, ...args); // 向上触发事件
   };
 
@@ -658,7 +658,7 @@ class Request extends Duplex {
     for (const method of writeMethods) {
       // @ts-ignore
       m[method] = (a, b) => {
-        log$1(method, {a, b});
+        // log(method, {a, b})
         // @ts-ignore
         m._currentRequest?.[method](a, b);
       };
@@ -671,7 +671,7 @@ class Request extends Duplex {
         get() {
           // @ts-ignore
           const val = m._currentRequest?.[property];
-          log$1('get property', {property});
+          // log('get property', {property})
           return val
         },
       });
@@ -762,7 +762,7 @@ class Request extends Duplex {
       const httpModule = httpModules[protocol];
       if (!httpModule) throw TypeError(`Unsupported protocol: ${protocol}`)
 
-      log$1({opt, protocol}, 'request');
+      // log({opt, protocol}, 'request')
       // Create the native request and set up its event handlers
       // @ts-ignore
       const req = httpModule.request(opt, m._onResponse);
@@ -856,7 +856,7 @@ class Request extends Duplex {
    */
   write(chunk, encoding, cb) {
     const m = this;
-    log$1({data: chunk, encoding, cb}, 'write');
+    // log({data: chunk, encoding, cb}, 'write')
 
     // Writing is not allowed if end has been called
     if (m._ending) throw new WriteAfterEndError()
@@ -1117,7 +1117,7 @@ class Request extends Duplex {
     // If the response is not a redirect; return it as-is
     const {location} = response.headers;
 
-    log$1({statusCode, headers: response.headers}, 'processResponse');
+    // log({statusCode, headers: response.headers}, 'processResponse')
 
     if (!location || opt.followRedirects === false || statusCode < 300 || statusCode >= 400) {
       // 非重定向，返回给原始回调处理
@@ -1205,7 +1205,9 @@ class Request extends Duplex {
 
     // Create the redirected request
     const redirectUrl = utils.resolveUrl(location, currentUrl);
+
     log$1({redirectUrl}, 'redirecting to');
+
     m._isRedirect = true;
     // 覆盖原 url 解析部分，包括 protocol、hostname、port等
     utils.spreadUrlObject(redirectUrl, m.opt);
@@ -1253,11 +1255,11 @@ class Request extends Duplex {
     // 'transfer-encoding': 'chunked'时，无content-length，axios v1.2 不能自动解压
     const responseLength = +res.headers['content-length'];
 
-    log$1('processStream', {
-      statusCode: res.statusCode,
-      responseLength,
-      headers: res.headers,
-    });
+    // log('processStream', {
+    //   statusCode: res.statusCode,
+    //   responseLength,
+    //   headers: res.headers,
+    // })
 
     if (opt.transformStream) {
       opt.transformStream.responseLength = responseLength;

package/lib/request.js

@@ -81,7 +81,7 @@ const writeMethods = [
     'setSocketKeepAlive'
 ];
 // Create handlers that pass events from native requests
-// 在 clientRequest 事件转发
+// 在 clientRequest 事件转发写事件
 const writeEvents = [
     // 'abort', // 弃用
     // 'aborted', // 弃用
@@ -103,9 +103,7 @@ const writeEventEmit = Object.create(null);
 for (const ev of writeEvents)writeEventEmit[ev] = /** @param  {...any} args */ function(...args) {
     const m = this // 事件回调，this === clientRequest 实例
     ;
-    log('req event', {
-        ev
-    });
+    // log('req event', {ev})
     m.redirectReq.emit(ev, ...args) // req 事情映射到 redirectReq 上触发
     ;
 };
@@ -123,9 +121,7 @@ const readEventEmit = Object.create(null);
 for (const ev of readEvents)readEventEmit[ev] = /** @param  {...any} args */ function(...args) {
     const m = this // 事件回调，this === clientRequest 实例
     ;
-    log('res event', {
-        ev
-    });
+    // log('res event', {ev})
     m.redirectReq.emit(ev, ...args) // 向上触发事件
     ;
 };
@@ -178,10 +174,7 @@ const WriteAfterEndError = utils.createErrorType('ERR_STREAM_WRITE_AFTER_END', '
         for (const method of writeMethods){
             // @ts-ignore
             m[method] = (a, b)=>{
-                log(method, {
-                    a,
-                    b
-                });
+                // log(method, {a, b})
                 // @ts-ignore
                 m._currentRequest?.[method](a, b);
             };
@@ -193,9 +186,7 @@ const WriteAfterEndError = utils.createErrorType('ERR_STREAM_WRITE_AFTER_END', '
                 get () {
                     // @ts-ignore
                     const val = m._currentRequest?.[property];
-                    log('get property', {
-                        property
-                    });
+                    // log('get property', {property})
                     return val;
                 }
             });
@@ -265,10 +256,7 @@ const WriteAfterEndError = utils.createErrorType('ERR_STREAM_WRITE_AFTER_END', '
             }
             const httpModule = httpModules[protocol];
             if (!httpModule) throw TypeError(`Unsupported protocol: ${protocol}`);
-            log({
-                opt,
-                protocol
-            }, 'request');
+            // log({opt, protocol}, 'request')
             // Create the native request and set up its event handlers
             // @ts-ignore
             const req = httpModule.request(opt, m._onResponse);
@@ -342,11 +330,7 @@ const WriteAfterEndError = utils.createErrorType('ERR_STREAM_WRITE_AFTER_END', '
    * @returns {boolean} True if the write was successful, false otherwise.
    */ write(chunk, encoding, cb) {
         const m = this;
-        log({
-            data: chunk,
-            encoding,
-            cb
-        }, 'write');
+        // log({data: chunk, encoding, cb}, 'write')
         // Writing is not allowed if end has been called
         if (m._ending) throw new WriteAfterEndError();
         // ! 数据写入时连接，pipe 时可设置 header
@@ -560,10 +544,7 @@ const WriteAfterEndError = utils.createErrorType('ERR_STREAM_WRITE_AFTER_END', '
         // even if the specific status code is not understood.
         // If the response is not a redirect; return it as-is
         const { location } = response.headers;
-        log({
-            statusCode,
-            headers: response.headers
-        }, 'processResponse');
+        // log({statusCode, headers: response.headers}, 'processResponse')
         if (!location || opt.followRedirects === false || statusCode < 300 || statusCode >= 400) {
             // 非重定向，返回给原始回调处理
             response.responseUrl = m._currentUrl;
@@ -674,11 +655,11 @@ const WriteAfterEndError = utils.createErrorType('ERR_STREAM_WRITE_AFTER_END', '
         ];
         // 'transfer-encoding': 'chunked'时，无content-length，axios v1.2 不能自动解压
         const responseLength = +res.headers['content-length'];
-        log('processStream', {
-            statusCode: res.statusCode,
-            responseLength,
-            headers: res.headers
-        });
+        // log('processStream', {
+        //   statusCode: res.statusCode,
+        //   responseLength,
+        //   headers: res.headers,
+        // })
         if (opt.transformStream) {
             opt.transformStream.responseLength = responseLength;
             streams.push(opt.transformStream);

package/package.json

@@ -2,7 +2,7 @@
   "name": "@wiajs/request",
   "description": "Stream HTTP request client.",
   "keywords": ["http", "simple", "util", "utility"],
-  "version": "3.0.22",
+  "version": "3.0.25",
   "type": "module",
   "main": "index.js",
   "types": "types/index.d.ts",