@wiajs/request 3.0.20 → 3.0.23

package/dist/request.cjs

@@ -1,5 +1,5 @@
 /*!
-  * wia request v3.0.19
+  * wia request v3.0.23
   * (c) 2022-2024 Sibyl Yu and contributors
   * Released under the MIT License.
   */
@@ -92,10 +92,10 @@ const preservedUrlFields = [
  * @property {string} message - The error message.
  * @property {Error | undefined} cause - The optional error cause.
  */
-function createErrorType(code, message, baseClass) {  
+function createErrorType(code, message, baseClass) {
   /**
    * Create constructor
-   * @param {*} properties 
+   * @param {*} properties
    */
   function CustomError(properties) {
     // istanbul ignore else
@@ -120,7 +120,7 @@ function createErrorType(code, message, baseClass) {
       enumerable: false,
     },
   });
-  
+
   // @ts-ignore
   return CustomError
 }
@@ -221,9 +221,9 @@ function isURL(value) {
 }
 
 /**
- * 
- * @param {*} rs 
- * @returns 
+ *
+ * @param {*} rs
+ * @returns
  */
 function isReadStream(rs) {
   return rs.readable && rs.path && rs.mode
@@ -319,6 +319,15 @@ function noBody(method, code) {
   )
 }
 
+/**
+ * Determine if a value is a Stream
+ *
+ * @param {*} val The value to test
+ *
+ * @returns {boolean} True if value is a Stream, otherwise false
+ */
+const isStream = val => isObject(val) && isFunction(val.pipe);
+
 const utils = {
   createErrorType,
   InvalidUrlError,
@@ -332,6 +341,7 @@ const utils = {
   isObject,
   isURL,
   isReadStream,
+  isStream,
   noop,
   parseUrl,
   spreadUrlObject,
@@ -439,7 +449,7 @@ class Caseless {
  * https://github.com/follow-redirects/follow-redirects
  */
 
-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 log$1 = log$2.log({env: `wia:req:${log$2.name((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('request.cjs', document.baseURI).href)))}`}); // __filename
 
 /**
  * @typedef {object} Opts
@@ -509,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', // 弃用
@@ -533,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 上触发
   };
 
@@ -544,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); // 向上触发事件
   };
 
@@ -664,14 +674,14 @@ class Request extends stream.Duplex {
         get() {
           // @ts-ignore
           const val = m._currentRequest?.[property];
-          log$1('get property', {property});
+          // log('get property', {property})
           return val
         },
       });
     }
 
+    // 流模式
     if (opts.stream) {
-      // 流模式
       // 被 pipe 作为目标时触发，拷贝 src headers
       m.on(
         'pipe',
@@ -707,7 +717,7 @@ class Request extends stream.Duplex {
     }
 
     // Perform the first request
-    // m.request(); // 写入数据时执行，否则 pipe 时无法写入header
+    // m.request(); // 创建时不连接，写入数据时连接，否则 pipe 时无法写入header
   }
 
   /**
@@ -739,6 +749,7 @@ class Request extends stream.Duplex {
       // 代理以目的网址协议为准
       // If specified, use the agent corresponding to the protocol
       // (HTTP and HTTPS use different types of agents)
+      // agents 优于 agent
       if (agents) {
         const scheme = protocol.slice(0, -1);
         opt.agent = agents[scheme];
@@ -842,13 +853,13 @@ class Request extends stream.Duplex {
    * 如 request 不存在，则创建连接，pipe 时可写入 header
    * @override -  重写父类方法
    * @param {*} chunk - The data chunk to write.
-   * @param {BufferEncoding | ((error: Error | null) => void)} [encodingOrCallback] - Encoding for string data, or the callback if no encoding is provided.
+   * @param {BufferEncoding | ((error: Error | null) => void)} [encoding] - Encoding for string data, or the callback if no encoding is provided.
    * @param {(error: Error | null) => void} [cb] - Callback to signal the end of the write operation.
    * @returns {boolean} True if the write was successful, false otherwise.
    */
-  write(chunk, encodingOrCallback, cb) {
+  write(chunk, encoding, cb) {
     const m = this;
-    log$1({data: chunk, encoding: encodingOrCallback, callback: cb}, 'write');
+    // log({data: chunk, encoding, cb}, 'write')
 
     // Writing is not allowed if end has been called
     if (m._ending) throw new WriteAfterEndError()
@@ -860,10 +871,10 @@ class Request extends stream.Duplex {
     if (!utils.isString(chunk) && !utils.isBuffer(chunk))
       throw new TypeError('data should be a string, Buffer or Uint8Array')
 
-    if (utils.isFunction(encodingOrCallback)) {
+    if (utils.isFunction(encoding)) {
       // @ts-ignore
-      cb = encodingOrCallback;
-      encodingOrCallback = null;
+      cb = encoding;
+      encoding = null;
     }
 
     // Ignore empty buffers, since writing them doesn't invoke the callback
@@ -876,9 +887,9 @@ class Request extends stream.Duplex {
     // Only write when we don't exceed the maximum body length
     if (m._requestBodyLength + chunk.length <= m.opt.maxBodyLength) {
       m._requestBodyLength += chunk.length;
-      m._requestBodyBuffers.push({data: chunk, encoding: encodingOrCallback});
+      m._requestBodyBuffers.push({data: chunk, encoding});
       // @ts-ignore
-      m._currentRequest.write(chunk, encodingOrCallback, cb);
+      m._currentRequest.write(chunk, encoding, cb);
     }
     // Error when we exceed the maximum body length
     else {
@@ -909,7 +920,7 @@ class Request extends stream.Duplex {
       encoding = null;
     }
 
-    // ! 数据写入时连接，pipe 时可设置 header
+    // ! 创建实例时不连接，数据写入时发起连接，连接后无法设置 header，因此 pipe 时可设置 header
     if (!m._currentRequest) m.request();
 
     // Write data if needed and end
@@ -1109,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) {
       // 非重定向，返回给原始回调处理
@@ -1245,11 +1256,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;
@@ -1521,12 +1532,18 @@ function isSubdomain(subdomain, domain) {
 
 /**
  * from 'https://github.com/follow-redirects/follow-redirects'
+ * used by axios
  * 修改以支持http、https 代理服务器
  * 代理模式下，http or https 请求，取决于 proxy 代理服务器，而不是目的服务器。
  */
 
 
-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
+const log = log$2.log({env: `wia:req:${log$2.name((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('request.cjs', document.baseURI).href)))}`}); // __filename
+
+const WritebBeenAbortedError = utils.createErrorType(
+  'ERR_STREAM_WRITE_BEEN_ABORTED',
+  'Request stream has been aborted'
+)
 
 // Preventive platform detection
 // istanbul ignore
@@ -1589,6 +1606,7 @@ function init(uri, options, callback) {
 /**
  * Executes a request, following redirects
  * 替换原 http(s).request，参数类似
+ * 需外部调用 end() data.pipe 或stream管道写入数据
  * 注意变参 (options[, callback]) or (url[, options][, callback])
     maxRedirects: _.maxRedirects,
     maxBodyLength: _.maxBodyLength,
@@ -1612,7 +1630,8 @@ function request(uri, options, callback) {
 }
 
 /**
- * 执行简单的非stream数据请求
+ * 执行简单的数据（支持strean）请求
+ * 非流模式，直接写入数据流，流模式，由管道触发，或手动调用 end() data.pipe 写入数据
  * 复杂数据，请使用 @wiajs/req库（fork from axios），该库封装了当前库，提供了更多功能
  * organize params for patch, post, put, head, del
  * @param {string} verb
@@ -1626,7 +1645,35 @@ function fn(verb) {
     const {opts, cb} = init(uri, options, callback);
     opts.method = method;
     const req = new Request(opts, cb);
-    req.end();
+    const {data, stream} = opts;
+    if (!stream) {
+      // 发送数据
+      if (utils.isStream(data)) {
+        // Send the request
+        let ended = false;
+        let errored = false;
+
+        data.on('end', () => {
+          ended = true;
+        });
+
+        data.once(
+          'error',
+          /** @param {*} err */ err => {
+            errored = true;
+            req.destroy(err);
+          }
+        );
+
+        data.on('close', () => {
+          if (!ended && !errored) {
+            throw new WritebBeenAbortedError()
+          }
+        });
+
+        data.pipe(req); // 写入数据流
+      } else req.end(data);
+    }
     return req
   }
 }
@@ -1639,6 +1686,6 @@ request.post = fn('post');
 request.put = fn('put');
 request.patch = fn('patch');
 request.del = fn('delete');
-request['delete'] = fn('delete');
+request.delete = fn('delete');
 
 module.exports = request;

package/dist/request.mjs

@@ -1,5 +1,5 @@
 /*!
-  * wia request v3.0.19
+  * wia request v3.0.23
   * (c) 2022-2024 Sibyl Yu and contributors
   * Released under the MIT License.
   */
@@ -89,10 +89,10 @@ const preservedUrlFields = [
  * @property {string} message - The error message.
  * @property {Error | undefined} cause - The optional error cause.
  */
-function createErrorType(code, message, baseClass) {  
+function createErrorType(code, message, baseClass) {
   /**
    * Create constructor
-   * @param {*} properties 
+   * @param {*} properties
    */
   function CustomError(properties) {
     // istanbul ignore else
@@ -117,7 +117,7 @@ function createErrorType(code, message, baseClass) {
       enumerable: false,
     },
   });
-  
+
   // @ts-ignore
   return CustomError
 }
@@ -218,9 +218,9 @@ function isURL(value) {
 }
 
 /**
- * 
- * @param {*} rs 
- * @returns 
+ *
+ * @param {*} rs
+ * @returns
  */
 function isReadStream(rs) {
   return rs.readable && rs.path && rs.mode
@@ -316,6 +316,15 @@ function noBody(method, code) {
   )
 }
 
+/**
+ * Determine if a value is a Stream
+ *
+ * @param {*} val The value to test
+ *
+ * @returns {boolean} True if value is a Stream, otherwise false
+ */
+const isStream = val => isObject(val) && isFunction(val.pipe);
+
 const utils = {
   createErrorType,
   InvalidUrlError,
@@ -329,6 +338,7 @@ const utils = {
   isObject,
   isURL,
   isReadStream,
+  isStream,
   noop,
   parseUrl,
   spreadUrlObject,
@@ -506,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', // 弃用
@@ -530,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 上触发
   };
 
@@ -541,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); // 向上触发事件
   };
 
@@ -661,14 +671,14 @@ class Request extends Duplex {
         get() {
           // @ts-ignore
           const val = m._currentRequest?.[property];
-          log$1('get property', {property});
+          // log('get property', {property})
           return val
         },
       });
     }
 
+    // 流模式
     if (opts.stream) {
-      // 流模式
       // 被 pipe 作为目标时触发，拷贝 src headers
       m.on(
         'pipe',
@@ -704,7 +714,7 @@ class Request extends Duplex {
     }
 
     // Perform the first request
-    // m.request(); // 写入数据时执行，否则 pipe 时无法写入header
+    // m.request(); // 创建时不连接，写入数据时连接，否则 pipe 时无法写入header
   }
 
   /**
@@ -736,6 +746,7 @@ class Request extends Duplex {
       // 代理以目的网址协议为准
       // If specified, use the agent corresponding to the protocol
       // (HTTP and HTTPS use different types of agents)
+      // agents 优于 agent
       if (agents) {
         const scheme = protocol.slice(0, -1);
         opt.agent = agents[scheme];
@@ -839,13 +850,13 @@ class Request extends Duplex {
    * 如 request 不存在，则创建连接，pipe 时可写入 header
    * @override -  重写父类方法
    * @param {*} chunk - The data chunk to write.
-   * @param {BufferEncoding | ((error: Error | null) => void)} [encodingOrCallback] - Encoding for string data, or the callback if no encoding is provided.
+   * @param {BufferEncoding | ((error: Error | null) => void)} [encoding] - Encoding for string data, or the callback if no encoding is provided.
    * @param {(error: Error | null) => void} [cb] - Callback to signal the end of the write operation.
    * @returns {boolean} True if the write was successful, false otherwise.
    */
-  write(chunk, encodingOrCallback, cb) {
+  write(chunk, encoding, cb) {
     const m = this;
-    log$1({data: chunk, encoding: encodingOrCallback, callback: cb}, 'write');
+    // log({data: chunk, encoding, cb}, 'write')
 
     // Writing is not allowed if end has been called
     if (m._ending) throw new WriteAfterEndError()
@@ -857,10 +868,10 @@ class Request extends Duplex {
     if (!utils.isString(chunk) && !utils.isBuffer(chunk))
       throw new TypeError('data should be a string, Buffer or Uint8Array')
 
-    if (utils.isFunction(encodingOrCallback)) {
+    if (utils.isFunction(encoding)) {
       // @ts-ignore
-      cb = encodingOrCallback;
-      encodingOrCallback = null;
+      cb = encoding;
+      encoding = null;
     }
 
     // Ignore empty buffers, since writing them doesn't invoke the callback
@@ -873,9 +884,9 @@ class Request extends Duplex {
     // Only write when we don't exceed the maximum body length
     if (m._requestBodyLength + chunk.length <= m.opt.maxBodyLength) {
       m._requestBodyLength += chunk.length;
-      m._requestBodyBuffers.push({data: chunk, encoding: encodingOrCallback});
+      m._requestBodyBuffers.push({data: chunk, encoding});
       // @ts-ignore
-      m._currentRequest.write(chunk, encodingOrCallback, cb);
+      m._currentRequest.write(chunk, encoding, cb);
     }
     // Error when we exceed the maximum body length
     else {
@@ -906,7 +917,7 @@ class Request extends Duplex {
       encoding = null;
     }
 
-    // ! 数据写入时连接，pipe 时可设置 header
+    // ! 创建实例时不连接，数据写入时发起连接，连接后无法设置 header，因此 pipe 时可设置 header
     if (!m._currentRequest) m.request();
 
     // Write data if needed and end
@@ -1106,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) {
       // 非重定向，返回给原始回调处理
@@ -1242,11 +1253,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;
@@ -1518,12 +1529,18 @@ function isSubdomain(subdomain, domain) {
 
 /**
  * from 'https://github.com/follow-redirects/follow-redirects'
+ * used by axios
  * 修改以支持http、https 代理服务器
  * 代理模式下，http or https 请求，取决于 proxy 代理服务器，而不是目的服务器。
  */
 
 
-const log = log$2({env: `wia:req:${name(import.meta.url)}`}) // __filename
+const log = log$2({env: `wia:req:${name(import.meta.url)}`}); // __filename
+
+const WritebBeenAbortedError = utils.createErrorType(
+  'ERR_STREAM_WRITE_BEEN_ABORTED',
+  'Request stream has been aborted'
+)
 
 // Preventive platform detection
 // istanbul ignore
@@ -1586,6 +1603,7 @@ function init(uri, options, callback) {
 /**
  * Executes a request, following redirects
  * 替换原 http(s).request，参数类似
+ * 需外部调用 end() data.pipe 或stream管道写入数据
  * 注意变参 (options[, callback]) or (url[, options][, callback])
     maxRedirects: _.maxRedirects,
     maxBodyLength: _.maxBodyLength,
@@ -1609,7 +1627,8 @@ function request(uri, options, callback) {
 }
 
 /**
- * 执行简单的非stream数据请求
+ * 执行简单的数据（支持strean）请求
+ * 非流模式，直接写入数据流，流模式，由管道触发，或手动调用 end() data.pipe 写入数据
  * 复杂数据，请使用 @wiajs/req库（fork from axios），该库封装了当前库，提供了更多功能
  * organize params for patch, post, put, head, del
  * @param {string} verb
@@ -1623,7 +1642,35 @@ function fn(verb) {
     const {opts, cb} = init(uri, options, callback);
     opts.method = method;
     const req = new Request(opts, cb);
-    req.end();
+    const {data, stream} = opts;
+    if (!stream) {
+      // 发送数据
+      if (utils.isStream(data)) {
+        // Send the request
+        let ended = false;
+        let errored = false;
+
+        data.on('end', () => {
+          ended = true;
+        });
+
+        data.once(
+          'error',
+          /** @param {*} err */ err => {
+            errored = true;
+            req.destroy(err);
+          }
+        );
+
+        data.on('close', () => {
+          if (!ended && !errored) {
+            throw new WritebBeenAbortedError()
+          }
+        });
+
+        data.pipe(req); // 写入数据流
+      } else req.end(data);
+    }
     return req
   }
 }
@@ -1636,6 +1683,6 @@ request.post = fn('post');
 request.put = fn('put');
 request.patch = fn('patch');
 request.del = fn('delete');
-request['delete'] = fn('delete');
+request.delete = fn('delete');
 
 export { request as default };

package/lib/index.js

@@ -1,5 +1,6 @@
 /**
  * from 'https://github.com/follow-redirects/follow-redirects'
+ * used by axios
  * 修改以支持http、https 代理服务器
  * 代理模式下，http or https 请求，取决于 proxy 代理服务器，而不是目的服务器。
  */ import { log as Log, name } from '@wiajs/log';
@@ -9,6 +10,7 @@ const log = Log({
     env: `wia:req:${name(import.meta.url)}`
 }) // __filename
 ;
+const WritebBeenAbortedError = utils.createErrorType('ERR_STREAM_WRITE_BEEN_ABORTED', 'Request stream has been aborted');
 (function detectUnsupportedEnvironment() {
     const looksLikeNode = typeof process !== 'undefined';
     const looksLikeBrowser = typeof window !== 'undefined' && typeof document !== 'undefined';
@@ -61,6 +63,7 @@ const log = Log({
 /**
  * Executes a request, following redirects
  * 替换原 http(s).request，参数类似
+ * 需外部调用 end() data.pipe 或stream管道写入数据
  * 注意变参 (options[, callback]) or (url[, options][, callback])
     maxRedirects: _.maxRedirects,
     maxBodyLength: _.maxBodyLength,
@@ -80,7 +83,8 @@ const log = Log({
     return R;
 }
 /**
- * 执行简单的非stream数据请求
+ * 执行简单的数据（支持strean）请求
+ * 非流模式，直接写入数据流，流模式，由管道触发，或手动调用 end() data.pipe 写入数据
  * 复杂数据，请使用 @wiajs/req库（fork from axios），该库封装了当前库，提供了更多功能
  * organize params for patch, post, put, head, del
  * @param {string} verb
@@ -92,7 +96,29 @@ const log = Log({
         const { opts, cb } = init(uri, options, callback);
         opts.method = method;
         const req = new Request(opts, cb);
-        req.end();
+        const { data, stream } = opts;
+        if (!stream) {
+            // 发送数据
+            if (utils.isStream(data)) {
+                // Send the request
+                let ended = false;
+                let errored = false;
+                data.on('end', ()=>{
+                    ended = true;
+                });
+                data.once('error', /** @param {*} err */ (err)=>{
+                    errored = true;
+                    req.destroy(err);
+                });
+                data.on('close', ()=>{
+                    if (!ended && !errored) {
+                        throw new WritebBeenAbortedError();
+                    }
+                });
+                data.pipe(req) // 写入数据流
+                ;
+            } else req.end(data);
+        }
         return req;
     };
 }
@@ -104,5 +130,5 @@ request.post = fn('post');
 request.put = fn('put');
 request.patch = fn('patch');
 request.del = fn('delete');
-request['delete'] = fn('delete');
+request.delete = fn('delete');
 export default request;

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) // 向上触发事件
     ;
 };
@@ -193,15 +189,13 @@ 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;
                 }
             });
         }
+        // 流模式
         if (opts.stream) {
-            // 流模式
             // 被 pipe 作为目标时触发，拷贝 src headers
             m.on('pipe', /** @param {stream.Readable & {headers?: Object.<string, string>}} src */ (src)=>{
                 // m.ntick &&
@@ -227,7 +221,7 @@ const WriteAfterEndError = utils.createErrorType('ERR_STREAM_WRITE_AFTER_END', '
             });
         }
     // Perform the first request
-    // m.request(); // 写入数据时执行，否则 pipe 时无法写入header
+    // m.request(); // 创建时不连接，写入数据时连接，否则 pipe 时无法写入header
     }
     /**
    * Executes the next native request (initial or redirect)
@@ -253,6 +247,7 @@ const WriteAfterEndError = utils.createErrorType('ERR_STREAM_WRITE_AFTER_END', '
             // 代理以目的网址协议为准
             // If specified, use the agent corresponding to the protocol
             // (HTTP and HTTPS use different types of agents)
+            // agents 优于 agent
             if (agents) {
                 const scheme = protocol.slice(0, -1);
                 opt.agent = agents[scheme];
@@ -336,26 +331,22 @@ const WriteAfterEndError = utils.createErrorType('ERR_STREAM_WRITE_AFTER_END', '
    * 如 request 不存在，则创建连接，pipe 时可写入 header
    * @override -  重写父类方法
    * @param {*} chunk - The data chunk to write.
-   * @param {BufferEncoding | ((error: Error | null) => void)} [encodingOrCallback] - Encoding for string data, or the callback if no encoding is provided.
+   * @param {BufferEncoding | ((error: Error | null) => void)} [encoding] - Encoding for string data, or the callback if no encoding is provided.
    * @param {(error: Error | null) => void} [cb] - Callback to signal the end of the write operation.
    * @returns {boolean} True if the write was successful, false otherwise.
-   */ write(chunk, encodingOrCallback, cb) {
+   */ write(chunk, encoding, cb) {
         const m = this;
-        log({
-            data: chunk,
-            encoding: encodingOrCallback,
-            callback: 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
         if (!m._currentRequest) m.request();
         // Validate input and shift parameters if necessary
         if (!utils.isString(chunk) && !utils.isBuffer(chunk)) throw new TypeError('data should be a string, Buffer or Uint8Array');
-        if (utils.isFunction(encodingOrCallback)) {
+        if (utils.isFunction(encoding)) {
             // @ts-ignore
-            cb = encodingOrCallback;
-            encodingOrCallback = null;
+            cb = encoding;
+            encoding = null;
         }
         // Ignore empty buffers, since writing them doesn't invoke the callback
         // https://github.com/nodejs/node/issues/22066
@@ -368,10 +359,10 @@ const WriteAfterEndError = utils.createErrorType('ERR_STREAM_WRITE_AFTER_END', '
             m._requestBodyLength += chunk.length;
             m._requestBodyBuffers.push({
                 data: chunk,
-                encoding: encodingOrCallback
+                encoding
             });
             // @ts-ignore
-            m._currentRequest.write(chunk, encodingOrCallback, cb);
+            m._currentRequest.write(chunk, encoding, cb);
         } else {
             m.emit('error', new MaxBodyLengthExceededError());
             m.abort();
@@ -396,7 +387,7 @@ const WriteAfterEndError = utils.createErrorType('ERR_STREAM_WRITE_AFTER_END', '
             cb = encoding;
             encoding = null;
         }
-        // ! 数据写入时连接，pipe 时可设置 header
+        // ! 创建实例时不连接，数据写入时发起连接，连接后无法设置 header，因此 pipe 时可设置 header
         if (!m._currentRequest) m.request();
         // Write data if needed and end
         if (!chunk) {
@@ -559,10 +550,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;
@@ -673,11 +661,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/lib/utils.js

@@ -38,7 +38,7 @@ const preservedUrlFields = [
  */ function createErrorType(code, message, baseClass) {
     /**
    * Create constructor
-   * @param {*} properties 
+   * @param {*} properties
    */ function CustomError(properties) {
         // istanbul ignore else
         if (isFunction(Error.captureStackTrace)) {
@@ -132,9 +132,9 @@ const noop = ()=>{};
     return URL && value instanceof URL;
 }
 /**
- * 
- * @param {*} rs 
- * @returns 
+ *
+ * @param {*} rs
+ * @returns
  */ function isReadStream(rs) {
     return rs.readable && rs.path && rs.mode;
 }
@@ -217,6 +217,13 @@ const noop = ()=>{};
     code === 204 || // Not Modified
     code === 304;
 }
+/**
+ * Determine if a value is a Stream
+ *
+ * @param {*} val The value to test
+ *
+ * @returns {boolean} True if value is a Stream, otherwise false
+ */ const isStream = (val)=>isObject(val) && isFunction(val.pipe);
 export default {
     createErrorType,
     InvalidUrlError,
@@ -230,6 +237,7 @@ export default {
     isObject,
     isURL,
     isReadStream,
+    isStream,
     noop,
     parseUrl,
     spreadUrlObject,

package/package.json

@@ -2,12 +2,15 @@
   "name": "@wiajs/request",
   "description": "Stream HTTP request client.",
   "keywords": ["http", "simple", "util", "utility"],
-  "version": "3.0.20",
+  "version": "3.0.23",
   "type": "module",
   "main": "index.js",
   "types": "types/index.d.ts",
   "exports": {
     ".": {
+      "types": {
+        "default": "./types/index.d.ts"
+      },      
       "node": {
         "import": "./index.js",
         "require": "./dist/request.cjs",