@wiajs/request 3.0.5 → 3.0.7

package/dist/request.cjs

@@ -1,5 +1,5 @@
 /*!
-  * wia request v3.0.0
+  * wia request v3.0.7
   * (c) 2022-2024 Sibyl Yu and contributors
   * Released under the MIT License.
   */
@@ -14,6 +14,7 @@ const stream = require('node:stream');
 const zlib = require('node:zlib');
 const mime = require('mime-types');
 
+var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 class ZlibTransform extends stream.Transform {
   __transform(chunk, encoding, callback) {
     this.push(chunk);
@@ -42,12 +43,12 @@ class ZlibTransform extends stream.Transform {
  * utils for request
  */
 
-const {URL} = url;
+const {URL: URL$1} = url;
 
 // Whether to use the native URL object or the legacy url module
 let useNativeURL = false;
 try {
-  assert(new URL(''));
+  assert(new URL$1(''));
 } catch (error) {
   useNativeURL = error.code === 'ERR_INVALID_URL';
 }
@@ -193,7 +194,7 @@ const noop = () => {};
  * @returns
  */
 function isURL(value) {
-  return URL && value instanceof URL
+  return URL$1 && value instanceof URL$1
 }
 
 function isReadStream(rs) {
@@ -235,7 +236,7 @@ function parseUrl(input) {
   let parsed;
   // istanbul ignore else
   if (useNativeURL) {
-    parsed = new URL(input);
+    parsed = new URL$1(input);
   } else {
     // Ensure the URL is valid and absolute
     parsed = validateUrl(url.parse(input));
@@ -269,7 +270,7 @@ function validateUrl(input) {
  */
 function resolveUrl(relative, base) {
   // istanbul ignore next
-  return useNativeURL ? new URL(relative, base) : parseUrl(url.resolve(base, relative))
+  return useNativeURL ? new URL$1(relative, base) : parseUrl(url.resolve(base, relative))
 }
 
 /**
@@ -405,7 +406,7 @@ class Caseless {
  * https://github.com/follow-redirects/follow-redirects
  */
 
-const log$1 = log$2.log({env: `wia:req:${log$2.name(__filename)}`});
+const log$1 = log$2.log({env: `wia:req:${log$2.name((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('request.cjs', document.baseURI).href)))}`}); // __filename
 
 const httpModules = {'http:': http, 'https:': https};
 
@@ -444,7 +445,7 @@ const writeEventEmit = Object.create(null);
 for (const ev of writeEvents)
   writeEventEmit[ev] = function (...args) {
     const m = this; // 事件回调，this === clientRequest 实例
-    log$1.debug('req event', {ev});
+    log$1('req event', {ev});
     m.redirectReq.emit(ev, ...args); // req 事情映射到 redirectReq 上触发
   };
 
@@ -455,7 +456,7 @@ const readEventEmit = Object.create(null);
 for (const ev of readEvents)
   readEventEmit[ev] = function (...args) {
     const m = this; // 事件回调，this === clientRequest 实例
-    log$1.debug('res event', {ev});
+    log$1('res event', {ev});
     m.redirectReq.emit(ev, ...args); // 向上触发事件
   };
 
@@ -499,22 +500,25 @@ class Request extends stream.Duplex {
   pipesrc = null // 被 pipe 时的 src stream
   /** @type {stream.Writable[]} */
   pipedests = [] // pipe dest
+  /** @type {*} */
+  startTimer = null
 
   /**
    * responseCallback 原消息处理回调
-   * @param {*} options
+   * @param {*} opts
    * @param {*} resCallback
    */
-  constructor(options, resCallback) {
+  constructor(opts, resCallback) {
     super();
     const m = this;
 
     // log({options}, 'constructor');
 
     // Initialize the request
-    m._sanitizeOptions(options);
-    m._options = options;
-    m.headers = options.headers;
+    m.sanitizeOptions(opts);
+    m.opt = opts;
+    m.headers = opts.headers;
+    // log({opts}, 'constructor')
     m._ended = false;
     m._ending = false;
     m._redirectCount = 0;
@@ -528,35 +532,16 @@ class Request extends stream.Duplex {
     m.resCallback = resCallback;
     // React to responses of native requests
     // 接管 response 事件，非重定向，触发 response 事件
-    m._onResponse = response => {
+    m._onResponse = res => {
       try {
-        m.processResponse(response);
+        m.processResponse(res);
       } catch (cause) {
         m.emit('error', cause instanceof RedirectionError ? cause : new RedirectionError({cause: cause}));
       }
     };
 
-    // 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 (options.stream)
+    if (opts.stream) {
       // 被 pipe 作为目标时触发，拷贝 src headers
       m.on(
         'pipe',
@@ -581,12 +566,11 @@ class Request extends stream.Duplex {
               }
             }
 
-            // if (src.method && !self.explicitMethod) {
-            //   m.method = src.method
-            // }
+            if (src.opt.method && !m.opt.method) m.opt.method = src.opt.method;
           }
         }
       );
+    }
 
     // Perform the first request
     // m.request(); // 写入数据时执行，否则 pipe时无法写入header
@@ -598,10 +582,11 @@ class Request extends stream.Duplex {
    */
   request() {
     let R = null;
+    const m = this;
+    const {opt} = m;
 
     try {
-      const m = this;
-      // read stream
+      // reset read stream
       m.response = null;
       m.responseStarted = false;
       m.responseStream = null;
@@ -614,35 +599,53 @@ class Request extends stream.Duplex {
       // m.httpModule = httpModules[protocol];
 
       // Load the native protocol
-      let {protocol} = m._options;
-      const {agents} = m._options;
+      let {protocol} = opt;
+      const {agents} = opt;
 
       // 代理以目的网址协议为准
       // If specified, use the agent corresponding to the protocol
       // (HTTP and HTTPS use different types of agents)
       if (agents) {
         const scheme = protocol.slice(0, -1);
-        m._options.agent = agents[scheme];
-      }
+        opt.agent = agents[scheme];
 
-      // http 非隧道代理模式，模块以代理主机为准，其他以目的网址为准
-      // 代理内部会根据代理协议选择 http(s) 发起请求创建连接
-      if (protocol === 'http:' && agents.http) {
-        protocol = agents.http.proxy && !agents.http.tunnel ? agents.http.proxy.protocol : protocol;
+        // http 非隧道代理模式，模块以代理主机为准，其他以目的网址为准
+        // 代理内部会根据代理协议选择 http(s) 发起请求创建连接
+        if (protocol === 'http:' && agents.http) {
+          protocol = agents.http.proxy && !agents.http.tunnel ? agents.http.proxy.protocol : protocol;
+        }
       }
 
       const httpModule = httpModules[protocol];
       if (!httpModule) throw TypeError(`Unsupported protocol: ${protocol}`)
 
-      log$1.debug('request', {options: m._options, protocol});
-
-      debugger
-
+      log$1({opt, protocol}, 'request');
       // Create the native request and set up its event handlers
-      const req = httpModule.request(m._options, m._onResponse);
+      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]);
 
@@ -650,7 +653,7 @@ class Request extends stream.Duplex {
       // a client MUST send only the absolute path […] as the request-target.
       // When making a request to a proxy, […]
       // a client MUST send the target URI in absolute-form […].
-      m._currentUrl = /^\//.test(m._options.path) ? url.format(m._options) : m._options.path;
+      m._currentUrl = /^\//.test(opt.path) ? url.format(opt) : opt.path;
 
       // End a redirected request
       // (The first request must be ended explicitly with RedirectableRequest#end)
@@ -745,7 +748,7 @@ class Request extends stream.Duplex {
     }
 
     // Only write when we don't exceed the maximum body length
-    if (m._requestBodyLength + chunk.length <= m._options.maxBodyLength) {
+    if (m._requestBodyLength + chunk.length <= m.opt.maxBodyLength) {
       m._requestBodyLength += chunk.length;
       m._requestBodyBuffers.push({data: chunk, encoding});
       m._currentRequest.write(chunk, encoding, cb);
@@ -801,7 +804,7 @@ class Request extends stream.Duplex {
    * @returns
    */
   hasHeader(name) {
-    return this._options.headers.includes(name)
+    return this.opt.headers.includes(name)
   }
 
   /**
@@ -810,7 +813,7 @@ class Request extends stream.Duplex {
    * @returns {string}
    */
   getHeader(name) {
-    return this._options.headers[name]
+    return this.opt.headers[name]
   }
 
   /**
@@ -818,7 +821,7 @@ class Request extends stream.Duplex {
    * @param {string} name
    */
   setHeader(name, value) {
-    this._options.headers[name] = value;
+    this.opt.headers[name] = value;
     this._currentRequest?.setHeader(name, value);
   }
 
@@ -827,7 +830,7 @@ class Request extends stream.Duplex {
    * @param {string} name
    */
   removeHeader(name) {
-    delete this._options.headers[name];
+    delete this.opt.headers[name];
     this._currentRequest?.removeHeader(name);
   }
 
@@ -839,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
@@ -849,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) {
@@ -860,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);
     }
 
@@ -903,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);
@@ -914,7 +914,7 @@ class Request extends stream.Duplex {
     return m
   }
 
-  _sanitizeOptions(options) {
+  sanitizeOptions(options) {
     // Ensure headers are always present
     if (!options.headers) options.headers = {};
 
@@ -951,7 +951,7 @@ class Request extends stream.Duplex {
 
     // Store the redirected response
     const {statusCode} = response;
-    if (m._options.trackRedirects) {
+    if (m.opt.trackRedirects) {
       m._redirects.push({
         url: m._currentUrl,
         headers: response.headers,
@@ -971,7 +971,7 @@ class Request extends stream.Duplex {
 
     log$1('processResponse', {statusCode, headers: response.headers});
 
-    if (!location || m._options.followRedirects === false || statusCode < 300 || statusCode >= 400) {
+    if (!location || m.opt.followRedirects === false || statusCode < 300 || statusCode >= 400) {
       // 非重定向，返回给原始回调处理
       response.responseUrl = m._currentUrl;
       response.redirects = m._redirects;
@@ -1010,16 +1010,16 @@ class Request extends stream.Duplex {
 
     // RFC7231§6.4: A client SHOULD detect and intervene
     // in cyclical redirections (i.e., "infinite" redirection loops).
-    if (++m._redirectCount > m._options.maxRedirects) throw new TooManyRedirectsError()
+    if (++m._redirectCount > m.opt.maxRedirects) throw new TooManyRedirectsError()
 
     // Store the request headers if applicable
     let requestHeaders;
-    const {beforeRedirect} = m._options;
+    const {beforeRedirect} = m.opt;
     if (beforeRedirect) {
       requestHeaders = {
         // The Host header was set by nativeProtocol.request
         Host: response.req.getHeader('host'),
-        ...m._options.headers,
+        ...m.opt.headers,
       };
     }
 
@@ -1027,23 +1027,23 @@ class Request extends stream.Duplex {
     // care for methods not known to be safe, […]
     // RFC7231§6.4.2–3: For historical reasons, a user agent MAY change
     // the request method from POST to GET for the subsequent request.
-    const {method} = m._options;
+    const {method} = m.opt;
     if (
-      ((statusCode === 301 || statusCode === 302) && m._options.method === 'POST') ||
+      ((statusCode === 301 || statusCode === 302) && m.opt.method === 'POST') ||
       // RFC7231§6.4.4: The 303 (See Other) status code indicates that
       // the server is redirecting the user agent to a different resource […]
       // A user agent can perform a retrieval request targeting that URI
       // (a GET or HEAD request if using HTTP) […]
-      (statusCode === 303 && !/^(?:GET|HEAD)$/.test(m._options.method))
+      (statusCode === 303 && !/^(?:GET|HEAD)$/.test(m.opt.method))
     ) {
-      m._options.method = 'GET';
+      m.opt.method = 'GET';
       // Drop a possible entity and headers related to it
       m._requestBodyBuffers = [];
-      removeMatchingHeaders(/^content-/i, m._options.headers);
+      removeMatchingHeaders(/^content-/i, m.opt.headers);
     }
 
     // Drop the Host header, as the redirect might lead to a different host
-    const currentHostHeader = removeMatchingHeaders(/^host$/i, m._options.headers);
+    const currentHostHeader = removeMatchingHeaders(/^host$/i, m.opt.headers);
 
     // If the redirect is relative, carry over the host of the last request
     const currentUrlParts = utils.parseUrl(m._currentUrl);
@@ -1057,7 +1057,7 @@ class Request extends stream.Duplex {
     log$1({redirectUrl}, 'redirecting to');
     m._isRedirect = true;
     // 覆盖原 url 解析部分，包括 protocol、hostname、port等
-    utils.spreadUrlObject(redirectUrl, m._options);
+    utils.spreadUrlObject(redirectUrl, m.opt);
 
     // Drop confidential headers when redirecting to a less secure protocol
     // or to a different domain that is not a superdomain
@@ -1065,7 +1065,7 @@ class Request extends stream.Duplex {
       (redirectUrl.protocol !== currentUrlParts.protocol && redirectUrl.protocol !== 'https:') ||
       (redirectUrl.host !== currentHost && !isSubdomain(redirectUrl.host, currentHost))
     ) {
-      removeMatchingHeaders(/^(?:(?:proxy-)?authorization|cookie)$/i, this._options.headers);
+      removeMatchingHeaders(/^(?:(?:proxy-)?authorization|cookie)$/i, this.opt.headers);
     }
 
     // Evaluate the beforeRedirect callback
@@ -1080,8 +1080,8 @@ class Request extends stream.Duplex {
         headers: requestHeaders,
       };
 
-      beforeRedirect(m._options, responseDetails, requestDetails);
-      m._sanitizeOptions(m._options);
+      beforeRedirect(m.opt, responseDetails, requestDetails);
+      m.sanitizeOptions(m.opt);
     }
 
     // Perform the redirected request
@@ -1095,7 +1095,7 @@ class Request extends stream.Duplex {
    */
   processStream(res) {
     const m = this;
-    const {_options: opts} = m;
+    const {opt: opts} = m;
 
     const streams = [res];
 
@@ -1260,7 +1260,7 @@ class Request extends stream.Duplex {
    */
   pipeDest(dest) {
     const m = this;
-    const {response, _options} = m;
+    const {response} = m;
 
     // Called after the response is received
     if (response?.headers && dest.headers && !dest.headersSent) {
@@ -1291,9 +1291,9 @@ class Request extends stream.Duplex {
       dest.statusCode = response.statusCode;
     }
 
-    // if (m.pipefilter) {
-    //   m.pipefilter(response, dest)
-    // }
+    if (m.pipefilter) {
+      m.pipefilter(response, dest);
+    }
   }
 
   /**
@@ -1362,16 +1362,16 @@ function isSubdomain(subdomain, domain) {
  */
 
 
-const log = log$2.log({env: `wia:req:${log$2.name(__filename)}`})
+const log = log$2.log({env: `wia:req:${log$2.name((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('request.cjs', document.baseURI).href)))}`}) // __filename
 
 // Preventive platform detection
-// istanbul ignore next
+// istanbul ignore
 ;(function detectUnsupportedEnvironment() {
   const looksLikeNode = typeof process !== 'undefined';
   const looksLikeBrowser = typeof window !== 'undefined' && typeof document !== 'undefined';
   const looksLikeV8 = utils.isFunction(Error.captureStackTrace);
   if (!looksLikeNode && (looksLikeBrowser || !looksLikeV8)) {
-    log.warn('The follow-redirects package should be excluded from browser builds.');
+    console.warn('The follow-redirects package should be excluded from browser builds.');
   }
 })();
 
@@ -1389,6 +1389,7 @@ const log = log$2.log({env: `wia:req:${log$2.name(__filename)}`})
  * @returns
  */
 function init(uri, options, callback) {
+  let R;
   try {
     // Parse parameters, ensuring that input is an object
     if (utils.isURL(uri)) uri = utils.spreadUrlObject(uri);
@@ -1413,6 +1414,7 @@ function init(uri, options, callback) {
     if (!utils.isString(options.host) && !utils.isString(options.hostname)) options.hostname = '::1';
 
     R = {opts: options, cb: callback};
+    // log({R}, 'init')
   } catch (e) {
     log.err(e, 'init');
   }
@@ -1435,8 +1437,9 @@ function request(uri, options, callback) {
   let R = null;
 
   try {
+    log({uri, options}, 'request');
+
     const {opts, cb} = init(uri, options, callback);
-    // log.debug('request', {options})
     R = new Request(opts, cb);
   } catch (e) {
     log.err(e, 'request');
@@ -1454,6 +1457,8 @@ function request(uri, options, callback) {
  */
 function fn(verb) {
   const method = verb.toUpperCase();
+
+  // @ts-ignore
   return (uri, options, callback) => {
     const {opts, cb} = init(uri, options, callback);
     opts.method = method;

package/dist/request.mjs

@@ -1,5 +1,5 @@
 /*!
-  * wia request v3.0.0
+  * wia request v3.0.7
   * (c) 2022-2024 Sibyl Yu and contributors
   * Released under the MIT License.
   */
@@ -403,7 +403,7 @@ class Caseless {
  * https://github.com/follow-redirects/follow-redirects
  */
 
-const log$1 = log$2({env: `wia:req:${name(__filename)}`});
+const log$1 = log$2({env: `wia:req:${name(import.meta.url)}`}); // __filename
 
 const httpModules = {'http:': http, 'https:': https};
 
@@ -442,7 +442,7 @@ const writeEventEmit = Object.create(null);
 for (const ev of writeEvents)
   writeEventEmit[ev] = function (...args) {
     const m = this; // 事件回调，this === clientRequest 实例
-    log$1.debug('req event', {ev});
+    log$1('req event', {ev});
     m.redirectReq.emit(ev, ...args); // req 事情映射到 redirectReq 上触发
   };
 
@@ -453,7 +453,7 @@ const readEventEmit = Object.create(null);
 for (const ev of readEvents)
   readEventEmit[ev] = function (...args) {
     const m = this; // 事件回调，this === clientRequest 实例
-    log$1.debug('res event', {ev});
+    log$1('res event', {ev});
     m.redirectReq.emit(ev, ...args); // 向上触发事件
   };
 
@@ -497,22 +497,25 @@ class Request extends Duplex {
   pipesrc = null // 被 pipe 时的 src stream
   /** @type {stream.Writable[]} */
   pipedests = [] // pipe dest
+  /** @type {*} */
+  startTimer = null
 
   /**
    * responseCallback 原消息处理回调
-   * @param {*} options
+   * @param {*} opts
    * @param {*} resCallback
    */
-  constructor(options, resCallback) {
+  constructor(opts, resCallback) {
     super();
     const m = this;
 
     // log({options}, 'constructor');
 
     // Initialize the request
-    m._sanitizeOptions(options);
-    m._options = options;
-    m.headers = options.headers;
+    m.sanitizeOptions(opts);
+    m.opt = opts;
+    m.headers = opts.headers;
+    // log({opts}, 'constructor')
     m._ended = false;
     m._ending = false;
     m._redirectCount = 0;
@@ -526,35 +529,16 @@ class Request extends Duplex {
     m.resCallback = resCallback;
     // React to responses of native requests
     // 接管 response 事件，非重定向，触发 response 事件
-    m._onResponse = response => {
+    m._onResponse = res => {
       try {
-        m.processResponse(response);
+        m.processResponse(res);
       } catch (cause) {
         m.emit('error', cause instanceof RedirectionError ? cause : new RedirectionError({cause: cause}));
       }
     };
 
-    // 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 (options.stream)
+    if (opts.stream) {
       // 被 pipe 作为目标时触发，拷贝 src headers
       m.on(
         'pipe',
@@ -579,12 +563,11 @@ class Request extends Duplex {
               }
             }
 
-            // if (src.method && !self.explicitMethod) {
-            //   m.method = src.method
-            // }
+            if (src.opt.method && !m.opt.method) m.opt.method = src.opt.method;
           }
         }
       );
+    }
 
     // Perform the first request
     // m.request(); // 写入数据时执行，否则 pipe时无法写入header
@@ -596,10 +579,11 @@ class Request extends Duplex {
    */
   request() {
     let R = null;
+    const m = this;
+    const {opt} = m;
 
     try {
-      const m = this;
-      // read stream
+      // reset read stream
       m.response = null;
       m.responseStarted = false;
       m.responseStream = null;
@@ -612,35 +596,53 @@ class Request extends Duplex {
       // m.httpModule = httpModules[protocol];
 
       // Load the native protocol
-      let {protocol} = m._options;
-      const {agents} = m._options;
+      let {protocol} = opt;
+      const {agents} = opt;
 
       // 代理以目的网址协议为准
       // If specified, use the agent corresponding to the protocol
       // (HTTP and HTTPS use different types of agents)
       if (agents) {
         const scheme = protocol.slice(0, -1);
-        m._options.agent = agents[scheme];
-      }
+        opt.agent = agents[scheme];
 
-      // http 非隧道代理模式，模块以代理主机为准，其他以目的网址为准
-      // 代理内部会根据代理协议选择 http(s) 发起请求创建连接
-      if (protocol === 'http:' && agents.http) {
-        protocol = agents.http.proxy && !agents.http.tunnel ? agents.http.proxy.protocol : protocol;
+        // http 非隧道代理模式，模块以代理主机为准，其他以目的网址为准
+        // 代理内部会根据代理协议选择 http(s) 发起请求创建连接
+        if (protocol === 'http:' && agents.http) {
+          protocol = agents.http.proxy && !agents.http.tunnel ? agents.http.proxy.protocol : protocol;
+        }
       }
 
       const httpModule = httpModules[protocol];
       if (!httpModule) throw TypeError(`Unsupported protocol: ${protocol}`)
 
-      log$1.debug('request', {options: m._options, protocol});
-
-      debugger
-
+      log$1({opt, protocol}, 'request');
       // Create the native request and set up its event handlers
-      const req = httpModule.request(m._options, m._onResponse);
+      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]);
 
@@ -648,7 +650,7 @@ class Request extends Duplex {
       // a client MUST send only the absolute path […] as the request-target.
       // When making a request to a proxy, […]
       // a client MUST send the target URI in absolute-form […].
-      m._currentUrl = /^\//.test(m._options.path) ? url.format(m._options) : m._options.path;
+      m._currentUrl = /^\//.test(opt.path) ? url.format(opt) : opt.path;
 
       // End a redirected request
       // (The first request must be ended explicitly with RedirectableRequest#end)
@@ -743,7 +745,7 @@ class Request extends Duplex {
     }
 
     // Only write when we don't exceed the maximum body length
-    if (m._requestBodyLength + chunk.length <= m._options.maxBodyLength) {
+    if (m._requestBodyLength + chunk.length <= m.opt.maxBodyLength) {
       m._requestBodyLength += chunk.length;
       m._requestBodyBuffers.push({data: chunk, encoding});
       m._currentRequest.write(chunk, encoding, cb);
@@ -799,7 +801,7 @@ class Request extends Duplex {
    * @returns
    */
   hasHeader(name) {
-    return this._options.headers.includes(name)
+    return this.opt.headers.includes(name)
   }
 
   /**
@@ -808,7 +810,7 @@ class Request extends Duplex {
    * @returns {string}
    */
   getHeader(name) {
-    return this._options.headers[name]
+    return this.opt.headers[name]
   }
 
   /**
@@ -816,7 +818,7 @@ class Request extends Duplex {
    * @param {string} name
    */
   setHeader(name, value) {
-    this._options.headers[name] = value;
+    this.opt.headers[name] = value;
     this._currentRequest?.setHeader(name, value);
   }
 
@@ -825,7 +827,7 @@ class Request extends Duplex {
    * @param {string} name
    */
   removeHeader(name) {
-    delete this._options.headers[name];
+    delete this.opt.headers[name];
     this._currentRequest?.removeHeader(name);
   }
 
@@ -837,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
@@ -847,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) {
@@ -858,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);
     }
 
@@ -901,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);
@@ -912,7 +911,7 @@ class Request extends Duplex {
     return m
   }
 
-  _sanitizeOptions(options) {
+  sanitizeOptions(options) {
     // Ensure headers are always present
     if (!options.headers) options.headers = {};
 
@@ -949,7 +948,7 @@ class Request extends Duplex {
 
     // Store the redirected response
     const {statusCode} = response;
-    if (m._options.trackRedirects) {
+    if (m.opt.trackRedirects) {
       m._redirects.push({
         url: m._currentUrl,
         headers: response.headers,
@@ -969,7 +968,7 @@ class Request extends Duplex {
 
     log$1('processResponse', {statusCode, headers: response.headers});
 
-    if (!location || m._options.followRedirects === false || statusCode < 300 || statusCode >= 400) {
+    if (!location || m.opt.followRedirects === false || statusCode < 300 || statusCode >= 400) {
       // 非重定向，返回给原始回调处理
       response.responseUrl = m._currentUrl;
       response.redirects = m._redirects;
@@ -1008,16 +1007,16 @@ class Request extends Duplex {
 
     // RFC7231§6.4: A client SHOULD detect and intervene
     // in cyclical redirections (i.e., "infinite" redirection loops).
-    if (++m._redirectCount > m._options.maxRedirects) throw new TooManyRedirectsError()
+    if (++m._redirectCount > m.opt.maxRedirects) throw new TooManyRedirectsError()
 
     // Store the request headers if applicable
     let requestHeaders;
-    const {beforeRedirect} = m._options;
+    const {beforeRedirect} = m.opt;
     if (beforeRedirect) {
       requestHeaders = {
         // The Host header was set by nativeProtocol.request
         Host: response.req.getHeader('host'),
-        ...m._options.headers,
+        ...m.opt.headers,
       };
     }
 
@@ -1025,23 +1024,23 @@ class Request extends Duplex {
     // care for methods not known to be safe, […]
     // RFC7231§6.4.2–3: For historical reasons, a user agent MAY change
     // the request method from POST to GET for the subsequent request.
-    const {method} = m._options;
+    const {method} = m.opt;
     if (
-      ((statusCode === 301 || statusCode === 302) && m._options.method === 'POST') ||
+      ((statusCode === 301 || statusCode === 302) && m.opt.method === 'POST') ||
       // RFC7231§6.4.4: The 303 (See Other) status code indicates that
       // the server is redirecting the user agent to a different resource […]
       // A user agent can perform a retrieval request targeting that URI
       // (a GET or HEAD request if using HTTP) […]
-      (statusCode === 303 && !/^(?:GET|HEAD)$/.test(m._options.method))
+      (statusCode === 303 && !/^(?:GET|HEAD)$/.test(m.opt.method))
     ) {
-      m._options.method = 'GET';
+      m.opt.method = 'GET';
       // Drop a possible entity and headers related to it
       m._requestBodyBuffers = [];
-      removeMatchingHeaders(/^content-/i, m._options.headers);
+      removeMatchingHeaders(/^content-/i, m.opt.headers);
     }
 
     // Drop the Host header, as the redirect might lead to a different host
-    const currentHostHeader = removeMatchingHeaders(/^host$/i, m._options.headers);
+    const currentHostHeader = removeMatchingHeaders(/^host$/i, m.opt.headers);
 
     // If the redirect is relative, carry over the host of the last request
     const currentUrlParts = utils.parseUrl(m._currentUrl);
@@ -1055,7 +1054,7 @@ class Request extends Duplex {
     log$1({redirectUrl}, 'redirecting to');
     m._isRedirect = true;
     // 覆盖原 url 解析部分，包括 protocol、hostname、port等
-    utils.spreadUrlObject(redirectUrl, m._options);
+    utils.spreadUrlObject(redirectUrl, m.opt);
 
     // Drop confidential headers when redirecting to a less secure protocol
     // or to a different domain that is not a superdomain
@@ -1063,7 +1062,7 @@ class Request extends Duplex {
       (redirectUrl.protocol !== currentUrlParts.protocol && redirectUrl.protocol !== 'https:') ||
       (redirectUrl.host !== currentHost && !isSubdomain(redirectUrl.host, currentHost))
     ) {
-      removeMatchingHeaders(/^(?:(?:proxy-)?authorization|cookie)$/i, this._options.headers);
+      removeMatchingHeaders(/^(?:(?:proxy-)?authorization|cookie)$/i, this.opt.headers);
     }
 
     // Evaluate the beforeRedirect callback
@@ -1078,8 +1077,8 @@ class Request extends Duplex {
         headers: requestHeaders,
       };
 
-      beforeRedirect(m._options, responseDetails, requestDetails);
-      m._sanitizeOptions(m._options);
+      beforeRedirect(m.opt, responseDetails, requestDetails);
+      m.sanitizeOptions(m.opt);
     }
 
     // Perform the redirected request
@@ -1093,7 +1092,7 @@ class Request extends Duplex {
    */
   processStream(res) {
     const m = this;
-    const {_options: opts} = m;
+    const {opt: opts} = m;
 
     const streams = [res];
 
@@ -1258,7 +1257,7 @@ class Request extends Duplex {
    */
   pipeDest(dest) {
     const m = this;
-    const {response, _options} = m;
+    const {response} = m;
 
     // Called after the response is received
     if (response?.headers && dest.headers && !dest.headersSent) {
@@ -1289,9 +1288,9 @@ class Request extends Duplex {
       dest.statusCode = response.statusCode;
     }
 
-    // if (m.pipefilter) {
-    //   m.pipefilter(response, dest)
-    // }
+    if (m.pipefilter) {
+      m.pipefilter(response, dest);
+    }
   }
 
   /**
@@ -1360,16 +1359,16 @@ function isSubdomain(subdomain, domain) {
  */
 
 
-const log = log$2({env: `wia:req:${name(__filename)}`})
+const log = log$2({env: `wia:req:${name(import.meta.url)}`}) // __filename
 
 // Preventive platform detection
-// istanbul ignore next
+// istanbul ignore
 ;(function detectUnsupportedEnvironment() {
   const looksLikeNode = typeof process !== 'undefined';
   const looksLikeBrowser = typeof window !== 'undefined' && typeof document !== 'undefined';
   const looksLikeV8 = utils.isFunction(Error.captureStackTrace);
   if (!looksLikeNode && (looksLikeBrowser || !looksLikeV8)) {
-    log.warn('The follow-redirects package should be excluded from browser builds.');
+    console.warn('The follow-redirects package should be excluded from browser builds.');
   }
 })();
 
@@ -1387,6 +1386,7 @@ const log = log$2({env: `wia:req:${name(__filename)}`})
  * @returns
  */
 function init(uri, options, callback) {
+  let R;
   try {
     // Parse parameters, ensuring that input is an object
     if (utils.isURL(uri)) uri = utils.spreadUrlObject(uri);
@@ -1411,6 +1411,7 @@ function init(uri, options, callback) {
     if (!utils.isString(options.host) && !utils.isString(options.hostname)) options.hostname = '::1';
 
     R = {opts: options, cb: callback};
+    // log({R}, 'init')
   } catch (e) {
     log.err(e, 'init');
   }
@@ -1433,8 +1434,9 @@ function request(uri, options, callback) {
   let R = null;
 
   try {
+    log({uri, options}, 'request');
+
     const {opts, cb} = init(uri, options, callback);
-    // log.debug('request', {options})
     R = new Request(opts, cb);
   } catch (e) {
     log.err(e, 'request');
@@ -1452,6 +1454,8 @@ function request(uri, options, callback) {
  */
 function fn(verb) {
   const method = verb.toUpperCase();
+
+  // @ts-ignore
   return (uri, options, callback) => {
     const {opts, cb} = init(uri, options, callback);
     opts.method = method;

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.5",
+  "version": "3.0.7",
   "type": "module",
   "main": "index.js",
   "exports": {