@wiajs/request 3.0.6 → 3.0.7

package/dist/request.cjs

@@ -1,5 +1,5 @@
 /*!
-  * wia request v3.0.5
+  * wia request v3.0.7
   * (c) 2022-2024 Sibyl Yu and contributors
   * Released under the MIT License.
   */
@@ -500,6 +500,8 @@ class Request extends stream.Duplex {
   pipesrc = null // 被 pipe 时的 src stream
   /** @type {stream.Writable[]} */
   pipedests = [] // pipe dest
+  /** @type {*} */
+  startTimer = null
 
   /**
    * responseCallback 原消息处理回调
@@ -538,25 +540,6 @@ class Request extends stream.Duplex {
       }
     };
 
-    // Proxy all other public ClientRequest methods
-    for (const method of ['flushHeaders', 'setNoDelay', 'setSocketKeepAlive']) {
-      m[method] = (a, b) => {
-        log$1.debug(method, {a, b});
-        m._currentRequest[method](a, b);
-      };
-    }
-
-    // Proxy all public ClientRequest properties
-    for (const property of ['aborted', 'connection', 'socket']) {
-      Object.defineProperty(m, property, {
-        get() {
-          const val = m._currentRequest[property];
-          log$1.debug('get property', {property});
-          return val
-        },
-      });
-    }
-
     // 流模式
     if (opts.stream) {
       // 被 pipe 作为目标时触发，拷贝 src headers
@@ -640,8 +623,29 @@ class Request extends stream.Duplex {
       // Create the native request and set up its event handlers
       const req = httpModule.request(opt, m._onResponse);
       m._currentRequest = req;
-
       req.redirectReq = m;
+
+      // Proxy all other public ClientRequest methods
+      for (const method of ['flushHeaders', 'setNoDelay', 'setSocketKeepAlive']) {
+        m[method] = (a, b) => {
+          log$1.debug(method, {a, b});
+          m._currentRequest[method](a, b);
+        };
+      }
+
+      // Proxy all public ClientRequest properties
+      for (const property of ['aborted', 'connection', 'socket']) {
+        Object.defineProperty(m, property, {
+          get() {
+            const val = m._currentRequest[property];
+            log$1.debug('get property', {property});
+            return val
+          },
+        });
+      }
+
+      m._currentRequest.once('socket', m.startTimer);
+
       // 接收req事件，转发 到 redirectReq 发射
       for (const ev of writeEvents) req.on(ev, writeEventEmit[ev]);
 
@@ -838,9 +842,8 @@ class Request extends stream.Duplex {
     return this._currentRequest?.headersSent
   }
 
-  // Global timeout for all underlying requests
   /**
-   *
+   * Global timeout for all underlying requests
    * @param {*} msecs
    * @param {*} callback
    * @returns
@@ -848,9 +851,8 @@ class Request extends stream.Duplex {
   setTimeout(msecs, callback) {
     const m = this;
 
-    // Destroys the socket on timeout
     /**
-     *
+     * Destroys the socket on timeout
      * @param {*} socket
      */
     function destroyOnTimeout(socket) {
@@ -859,19 +861,18 @@ class Request extends stream.Duplex {
       socket.addListener('timeout', socket.destroy);
     }
 
-    // Sets up a timer to trigger a timeout event
     /**
-     *
+     * Sets up a timer to trigger a timeout event
      * @param {*} socket
      */
     function startTimer(socket) {
-      if (m._timeout) {
-        clearTimeout(m._timeout);
-      }
+      if (m._timeout) clearTimeout(m._timeout);
+
       m._timeout = setTimeout(() => {
         m.emit('timeout');
         clearTimer();
       }, msecs);
+
       destroyOnTimeout(socket);
     }
 
@@ -902,7 +903,7 @@ class Request extends stream.Duplex {
 
     // Start the timer if or when the socket is opened
     if (m.socket) startTimer(m.socket);
-    else m._currentRequest.once('socket', startTimer);
+    else m.startTimer = startTimer; // 未连接，先登记
 
     // Clean up on events
     m.on('socket', destroyOnTimeout);
@@ -1436,6 +1437,8 @@ function request(uri, options, callback) {
   let R = null;
 
   try {
+    log({uri, options}, 'request');
+
     const {opts, cb} = init(uri, options, callback);
     R = new Request(opts, cb);
   } catch (e) {

package/dist/request.mjs

@@ -1,5 +1,5 @@
 /*!
-  * wia request v3.0.5
+  * wia request v3.0.7
   * (c) 2022-2024 Sibyl Yu and contributors
   * Released under the MIT License.
   */
@@ -497,6 +497,8 @@ class Request extends Duplex {
   pipesrc = null // 被 pipe 时的 src stream
   /** @type {stream.Writable[]} */
   pipedests = [] // pipe dest
+  /** @type {*} */
+  startTimer = null
 
   /**
    * responseCallback 原消息处理回调
@@ -535,25 +537,6 @@ class Request extends Duplex {
       }
     };
 
-    // Proxy all other public ClientRequest methods
-    for (const method of ['flushHeaders', 'setNoDelay', 'setSocketKeepAlive']) {
-      m[method] = (a, b) => {
-        log$1.debug(method, {a, b});
-        m._currentRequest[method](a, b);
-      };
-    }
-
-    // Proxy all public ClientRequest properties
-    for (const property of ['aborted', 'connection', 'socket']) {
-      Object.defineProperty(m, property, {
-        get() {
-          const val = m._currentRequest[property];
-          log$1.debug('get property', {property});
-          return val
-        },
-      });
-    }
-
     // 流模式
     if (opts.stream) {
       // 被 pipe 作为目标时触发，拷贝 src headers
@@ -637,8 +620,29 @@ class Request extends Duplex {
       // Create the native request and set up its event handlers
       const req = httpModule.request(opt, m._onResponse);
       m._currentRequest = req;
-
       req.redirectReq = m;
+
+      // Proxy all other public ClientRequest methods
+      for (const method of ['flushHeaders', 'setNoDelay', 'setSocketKeepAlive']) {
+        m[method] = (a, b) => {
+          log$1.debug(method, {a, b});
+          m._currentRequest[method](a, b);
+        };
+      }
+
+      // Proxy all public ClientRequest properties
+      for (const property of ['aborted', 'connection', 'socket']) {
+        Object.defineProperty(m, property, {
+          get() {
+            const val = m._currentRequest[property];
+            log$1.debug('get property', {property});
+            return val
+          },
+        });
+      }
+
+      m._currentRequest.once('socket', m.startTimer);
+
       // 接收req事件，转发 到 redirectReq 发射
       for (const ev of writeEvents) req.on(ev, writeEventEmit[ev]);
 
@@ -835,9 +839,8 @@ class Request extends Duplex {
     return this._currentRequest?.headersSent
   }
 
-  // Global timeout for all underlying requests
   /**
-   *
+   * Global timeout for all underlying requests
    * @param {*} msecs
    * @param {*} callback
    * @returns
@@ -845,9 +848,8 @@ class Request extends Duplex {
   setTimeout(msecs, callback) {
     const m = this;
 
-    // Destroys the socket on timeout
     /**
-     *
+     * Destroys the socket on timeout
      * @param {*} socket
      */
     function destroyOnTimeout(socket) {
@@ -856,19 +858,18 @@ class Request extends Duplex {
       socket.addListener('timeout', socket.destroy);
     }
 
-    // Sets up a timer to trigger a timeout event
     /**
-     *
+     * Sets up a timer to trigger a timeout event
      * @param {*} socket
      */
     function startTimer(socket) {
-      if (m._timeout) {
-        clearTimeout(m._timeout);
-      }
+      if (m._timeout) clearTimeout(m._timeout);
+
       m._timeout = setTimeout(() => {
         m.emit('timeout');
         clearTimer();
       }, msecs);
+
       destroyOnTimeout(socket);
     }
 
@@ -899,7 +900,7 @@ class Request extends Duplex {
 
     // Start the timer if or when the socket is opened
     if (m.socket) startTimer(m.socket);
-    else m._currentRequest.once('socket', startTimer);
+    else m.startTimer = startTimer; // 未连接，先登记
 
     // Clean up on events
     m.on('socket', destroyOnTimeout);
@@ -1433,6 +1434,8 @@ function request(uri, options, callback) {
   let R = null;
 
   try {
+    log({uri, options}, 'request');
+
     const {opts, cb} = init(uri, options, callback);
     R = new Request(opts, cb);
   } catch (e) {

package/lib/index.js

@@ -71,6 +71,10 @@ const log = Log({
  */ function request(uri, options, callback) {
     let R = null;
     try {
+        log({
+            uri,
+            options
+        }, 'request');
         const { opts, cb } = init(uri, options, callback);
         R = new Request(opts, cb);
     } catch (e) {

package/lib/request.js

@@ -94,7 +94,7 @@ const WriteAfterEndError = utils.createErrorType('ERR_STREAM_WRITE_AFTER_END', '
    */ constructor(opts, resCallback){
         super(), this._timeout = 0, /** @type {*} */ this.socket = null, /** @type {http.ClientRequest} */ this._currentRequest = null, /** @type {stream.Readable} */ this.response = null, /** @type {stream.Readable} */ this.responseStream = null, this.timing = false, this.responseStarted = false, this.responseStartTime = 0, this._destdata = false, this._paused = false, this._respended = false, /** @type {stream.Readable} */ this.pipesrc = null // 被 pipe 时的 src stream
         , /** @type {stream.Writable[]} */ this.pipedests = [] // pipe dest
-        ;
+        , /** @type {*} */ this.startTimer = null;
         const m = this;
         // log({options}, 'constructor');
         // Initialize the request
@@ -121,36 +121,6 @@ const WriteAfterEndError = utils.createErrorType('ERR_STREAM_WRITE_AFTER_END', '
                 }));
             }
         };
-        // Proxy all other public ClientRequest methods
-        for (const method of [
-            'flushHeaders',
-            'setNoDelay',
-            'setSocketKeepAlive'
-        ]){
-            m[method] = (a, b)=>{
-                log.debug(method, {
-                    a,
-                    b
-                });
-                m._currentRequest[method](a, b);
-            };
-        }
-        // Proxy all public ClientRequest properties
-        for (const property of [
-            'aborted',
-            'connection',
-            'socket'
-        ]){
-            Object.defineProperty(m, property, {
-                get () {
-                    const val = m._currentRequest[property];
-                    log.debug('get property', {
-                        property
-                    });
-                    return val;
-                }
-            });
-        }
         // 流模式
         if (opts.stream) {
             // 被 pipe 作为目标时触发，拷贝 src headers
@@ -222,6 +192,37 @@ const WriteAfterEndError = utils.createErrorType('ERR_STREAM_WRITE_AFTER_END', '
             const req = httpModule.request(opt, m._onResponse);
             m._currentRequest = req;
             req.redirectReq = m;
+            // Proxy all other public ClientRequest methods
+            for (const method of [
+                'flushHeaders',
+                'setNoDelay',
+                'setSocketKeepAlive'
+            ]){
+                m[method] = (a, b)=>{
+                    log.debug(method, {
+                        a,
+                        b
+                    });
+                    m._currentRequest[method](a, b);
+                };
+            }
+            // Proxy all public ClientRequest properties
+            for (const property of [
+                'aborted',
+                'connection',
+                'socket'
+            ]){
+                Object.defineProperty(m, property, {
+                    get () {
+                        const val = m._currentRequest[property];
+                        log.debug('get property', {
+                            property
+                        });
+                        return val;
+                    }
+                });
+            }
+            m._currentRequest.once('socket', m.startTimer);
             // 接收req事件，转发 到 redirectReq 发射
             for (const ev of writeEvents)req.on(ev, writeEventEmit[ev]);
             // RFC7230§5.3.1: When making a request directly to an origin server, […]
@@ -382,31 +383,26 @@ const WriteAfterEndError = utils.createErrorType('ERR_STREAM_WRITE_AFTER_END', '
    */ get headersSent() {
         return this._currentRequest?.headersSent;
     }
-    // Global timeout for all underlying requests
     /**
-   *
+   * Global timeout for all underlying requests
    * @param {*} msecs
    * @param {*} callback
    * @returns
    */ setTimeout(msecs, callback) {
         const m = this;
-        // Destroys the socket on timeout
         /**
-     *
+     * Destroys the socket on timeout
      * @param {*} socket
      */ function destroyOnTimeout(socket) {
             socket.setTimeout(msecs);
             socket.removeListener('timeout', socket.destroy);
             socket.addListener('timeout', socket.destroy);
         }
-        // Sets up a timer to trigger a timeout event
         /**
-     *
+     * Sets up a timer to trigger a timeout event
      * @param {*} socket
      */ function startTimer(socket) {
-            if (m._timeout) {
-                clearTimeout(m._timeout);
-            }
+            if (m._timeout) clearTimeout(m._timeout);
             m._timeout = setTimeout(()=>{
                 m.emit('timeout');
                 clearTimer();
@@ -436,7 +432,8 @@ const WriteAfterEndError = utils.createErrorType('ERR_STREAM_WRITE_AFTER_END', '
         if (callback) m.on('timeout', callback);
         // Start the timer if or when the socket is opened
         if (m.socket) startTimer(m.socket);
-        else m._currentRequest.once('socket', startTimer);
+        else m.startTimer = startTimer // 未连接，先登记
+        ;
         // Clean up on events
         m.on('socket', destroyOnTimeout);
         m.on('abort', clearTimer);

package/package.json

@@ -2,7 +2,7 @@
   "name": "@wiajs/request",
   "description": "Stream HTTP request client.",
   "keywords": ["http", "simple", "util", "utility"],
-  "version": "3.0.6",
+  "version": "3.0.7",
   "type": "module",
   "main": "index.js",
   "exports": {