@wiajs/request 3.0.32 → 3.0.35

package/dist/request.cjs

@@ -1,18 +1,18 @@
 /*!
-  * wia request v3.0.32
-  * (c) 2022-2024 Sibyl Yu and contributors
+  * wia request v3.0.35
+  * (c) 2022-2025 Sibyl Yu and contributors
   * Released under the MIT License.
   */
 'use strict';
 
 const stream = require('node:stream');
 const log$2 = require('@wiajs/log');
+const mime = require('mime-types');
+const assert = require('node:assert');
 const http = require('node:http');
 const https = require('node:https');
-const assert = require('node:assert');
 const url = require('node:url');
 const zlib = require('node:zlib');
-const mime = require('mime-types');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 class ZlibTransform extends stream.Transform {
@@ -51,6 +51,100 @@ class ZlibTransform extends stream.Transform {
   }
 }
 
+class Caseless {
+  /**
+   * @param {*} dict
+   */
+  constructor(dict) {
+    this.dict = dict || {};
+  }
+
+  /**
+   *
+   * @param {*} name
+   * @param {*} value
+   * @param {*} clobber
+   * @returns
+   */
+  set(name, value, clobber) {
+    if (typeof name === 'object') {
+      for (const n of name) {
+        this.set(n, name[n], value);
+      }
+    } else {
+      if (typeof clobber === 'undefined') clobber = true;
+      const has = this.has(name);
+
+      if (!clobber && has) this.dict[has] = this.dict[has] + ',' + value;
+      else this.dict[has || name] = value;
+      return has
+    }
+  }
+
+  /**
+   *
+   * @param {string} name
+   * @returns
+   */
+  has(name) {
+    const keys = Object.keys(this.dict);
+    name = name.toLowerCase();
+    for (let i = 0; i < keys.length; i++) {
+      if (keys[i].toLowerCase() === name) return keys[i]
+    }
+    return false
+  }
+
+  /**
+   *
+   * @param {string} name
+   * @returns
+   */
+  get(name) {
+    name = name.toLowerCase();
+    let result;
+    let _key;
+    const headers = this.dict;
+    for (const key of Object.keys(headers)) {
+      _key = key.toLowerCase();
+      if (name === _key) result = headers[key];
+    }
+    return result
+  }
+
+  /**
+   *
+   * @param {string} name
+   * @returns
+   */
+  swap(name) {
+    const has = this.has(name);
+    if (has === name) return
+    if (!has) throw new Error('There is no header than matches "' + name + '"')
+    this.dict[name] = this.dict[has];
+    delete this.dict[has];
+  }
+
+  /**
+   * 
+   * @param {string} name 
+   * @returns 
+   */
+  del(name) {
+    name = String(name).toLowerCase();
+    let deleted = false;
+    let changed = 0;
+    const dict = this.dict;
+    for (const key of Object.keys(this.dict)) {
+      if (name === String(key).toLowerCase()) {
+        deleted = delete dict[key];
+        changed += 1;
+      }
+    }
+    return changed === 0 ? true : deleted
+  }
+}
+
 /**
  * utils for request
  */
@@ -350,100 +444,6 @@ const utils = {
   noBody,
 };
 
-class Caseless {
-  /**
-   * @param {*} dict
-   */
-  constructor(dict) {
-    this.dict = dict || {};
-  }
-
-  /**
-   *
-   * @param {*} name
-   * @param {*} value
-   * @param {*} clobber
-   * @returns
-   */
-  set(name, value, clobber) {
-    if (typeof name === 'object') {
-      for (const n of name) {
-        this.set(n, name[n], value);
-      }
-    } else {
-      if (typeof clobber === 'undefined') clobber = true;
-      const has = this.has(name);
-
-      if (!clobber && has) this.dict[has] = this.dict[has] + ',' + value;
-      else this.dict[has || name] = value;
-      return has
-    }
-  }
-
-  /**
-   *
-   * @param {string} name
-   * @returns
-   */
-  has(name) {
-    const keys = Object.keys(this.dict);
-    name = name.toLowerCase();
-    for (let i = 0; i < keys.length; i++) {
-      if (keys[i].toLowerCase() === name) return keys[i]
-    }
-    return false
-  }
-
-  /**
-   *
-   * @param {string} name
-   * @returns
-   */
-  get(name) {
-    name = name.toLowerCase();
-    let result;
-    let _key;
-    const headers = this.dict;
-    for (const key of Object.keys(headers)) {
-      _key = key.toLowerCase();
-      if (name === _key) result = headers[key];
-    }
-    return result
-  }
-
-  /**
-   *
-   * @param {string} name
-   * @returns
-   */
-  swap(name) {
-    const has = this.has(name);
-    if (has === name) return
-    if (!has) throw new Error('There is no header than matches "' + name + '"')
-    this.dict[name] = this.dict[has];
-    delete this.dict[has];
-  }
-
-  /**
-   * 
-   * @param {string} name 
-   * @returns 
-   */
-  del(name) {
-    name = String(name).toLowerCase();
-    let deleted = false;
-    let changed = 0;
-    const dict = this.dict;
-    for (const key of Object.keys(this.dict)) {
-      if (name === String(key).toLowerCase()) {
-        deleted = delete dict[key];
-        changed += 1;
-      }
-    }
-    return changed === 0 ? true : deleted
-  }
-}
-
 /**
  * fork from follow-redirects
  * https://github.com/follow-redirects/follow-redirects
@@ -636,7 +636,7 @@ class Request extends stream.Duplex {
     super();
     const m = this;
 
-    // log({opts}, 'constructor');
+    // log({opts}, 'new Request')
 
     // Initialize the request
     m.sanitizeOptions(opts);
@@ -776,6 +776,8 @@ class Request extends stream.Duplex {
           protocol =
             agents.http.proxy && !agents.http.tunnel ? agents.http.proxy.protocol : protocol;
         }
+
+        // log({scheme, agents, protocol}, 'request')
       }
 
       const httpModule = httpModules[protocol];
@@ -784,6 +786,8 @@ class Request extends stream.Duplex {
       // log({opt, protocol}, 'request')
       // Create the native request and set up its event handlers
       // @ts-ignore
+
+      log$1({httpModule, opt}, 'request');      
       const req = httpModule.request(opt, m._onResponse);
       m._currentRequest = req;
       // @ts-ignore
@@ -1451,8 +1455,8 @@ class Request extends stream.Duplex {
    * @override -  重写父类方法
    * @template T - 需要模板
    * @param {T & stream.Writable} dest - The writable stream to which data is written.
-   * @param {Object} [opts] - Optional configuration object.
-   * @param {boolean} [opts.end=true] - Whether to end the writable stream when the readable stream ends.
+   * @param {Object} [opt] - Optional configuration object.
+   * @param {boolean} [opt.end=true] - Whether to end the writable stream when the readable stream ends.
    * @returns {T} The destination stream.
    */
   pipe(dest, opts = {}) {
@@ -1645,6 +1649,7 @@ const log = log$2.log({env: `wia:req:${log$2.name((typeof document === 'undefine
  * @prop {string} [url]
  * @prop {'http:' | 'https:'} [protocol]
  * @prop {string} [host]
+ * @prop {string} [hostname]
  * @prop {string} [family]
  * @prop {string} [path]
  * @prop {string} [method]
@@ -1691,7 +1696,7 @@ utils.createErrorType(
  * @param {string | Opts} uri/opts
  * @param {Opts | Cb} [opts] /cb
  * @param {Cb} [cb]
- * @returns {{opts: Opts, cb: Cb}}
+ * @returns {{opt: Opts, cb: Cb}}
  */
 function init(uri, opts, cb) {
   let R;
@@ -1727,26 +1732,28 @@ function init(uri, opts, cb) {
     }
 
     // copy options
-    opts = {
+    /** @type {Opts} */
+    const opt = {
       // @ts-ignore
       ...uri,
       ...opts,
     };
 
-    // @ts-ignore
-    if (!utils.isString(opts.host) && !utils.isString(opts.hostname)) opts.hostname = '::1';
-    // @ts-ignore
-    opts.method = (opts.method ?? 'get').toUpperCase();
+    if (!utils.isString(opt.host) && !utils.isString(opt.hostname)) opt.hostname = '::1';
+    opt.method = (opt.method ?? 'get').toUpperCase();
 
-    // @ts-ignore
     // follow-redirects does not skip comparison, so it should always succeed for axios -1 unlimited
-    opts.maxBodyLength = opts.maxBodyLength ?? Number.POSITIVE_INFINITY;
-    // @ts-ignore
-    opts.maxRedirects = opts.maxRedirects ?? 21;
-    // @ts-ignore
-    if (opts.maxRedirects === 0) opts.followRedirects = false;
+    opt.maxBodyLength = opt.maxBodyLength ?? Number.POSITIVE_INFINITY;
+    opt.maxRedirects = opt.maxRedirects ?? 21;
+    if (opt.maxRedirects === 0) opt.followRedirects = false;
+    opt.headers = opt.headers ?? {
+      Accept: 'application/json, text/plain, */*',
+      'User-Agent':
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36 Edg/107.0.1418.35',
+      'Accept-Encoding': 'gzip, compress, deflate, br',
+    };
 
-    R = {opts, cb};
+    R = {opt, cb};
     // log({R}, 'init')
   } catch (e) {
     log.err(e, 'init');
@@ -1764,24 +1771,24 @@ function init(uri, opts, cb) {
     maxRedirects: _.maxRedirects,
     maxBodyLength: _.maxBodyLength,
  * @param {string | Opts} uri /options
- * @param {Opts | Cb} [options] /callback
+ * @param {Opts | Cb} [opts] /callback
  * @param {Cb} [callback] /null
  * @returns {Request}
  */
-function request(uri, options, callback) {
+function request(uri, opts, callback) {
   let R = null;
 
   try {
     // @ts-ignore
-    const {opts, cb} = init(uri, options, callback);
-    // log.error({uri, options, opts}, 'request')
+    const {opt, cb} = init(uri, opts, callback);
+    // log({uri, opt, opts}, 'request')
 
-    const {data, stream} = opts;
+    const {data, stream} = opt;
     // data 在本函数完成处理，不传递到 request
-    opts.data = undefined;
+    opt.data = undefined;
 
     // @ts-ignore
-    const req = new Request(opts, cb);
+    const req = new Request(opt, cb);
 
     // 非流模式，自动发送请求，流模式通过流写入发送
     if (!stream) {
@@ -1826,7 +1833,7 @@ function request(uri, options, callback) {
 }
 
 /**
- * 执行简单的数据（支持strean）请求
+ * 执行简单的数据（支持stream）请求
  * 非流模式，直接写入数据流，流模式，由管道触发，或手动调用 end() data.pipe 写入数据
  * 复杂数据，请使用 @wiajs/req库（fork from axios），该库封装了当前库，提供了更多功能
  * organize params for patch, post, put, head, del

package/dist/request.mjs

@@ -1,16 +1,16 @@
 /*!
-  * wia request v3.0.32
-  * (c) 2022-2024 Sibyl Yu and contributors
+  * wia request v3.0.35
+  * (c) 2022-2025 Sibyl Yu and contributors
   * Released under the MIT License.
   */
 import stream, { Duplex } from 'node:stream';
 import { log as log$2, name } from '@wiajs/log';
+import mime from 'mime-types';
+import assert from 'node:assert';
 import http from 'node:http';
 import https from 'node:https';
-import assert from 'node:assert';
 import url from 'node:url';
 import zlib from 'node:zlib';
-import mime from 'mime-types';
 
 class ZlibTransform extends stream.Transform {
   /**
@@ -48,6 +48,100 @@ class ZlibTransform extends stream.Transform {
   }
 }
 
+class Caseless {
+  /**
+   * @param {*} dict
+   */
+  constructor(dict) {
+    this.dict = dict || {};
+  }
+
+  /**
+   *
+   * @param {*} name
+   * @param {*} value
+   * @param {*} clobber
+   * @returns
+   */
+  set(name, value, clobber) {
+    if (typeof name === 'object') {
+      for (const n of name) {
+        this.set(n, name[n], value);
+      }
+    } else {
+      if (typeof clobber === 'undefined') clobber = true;
+      const has = this.has(name);
+
+      if (!clobber && has) this.dict[has] = this.dict[has] + ',' + value;
+      else this.dict[has || name] = value;
+      return has
+    }
+  }
+
+  /**
+   *
+   * @param {string} name
+   * @returns
+   */
+  has(name) {
+    const keys = Object.keys(this.dict);
+    name = name.toLowerCase();
+    for (let i = 0; i < keys.length; i++) {
+      if (keys[i].toLowerCase() === name) return keys[i]
+    }
+    return false
+  }
+
+  /**
+   *
+   * @param {string} name
+   * @returns
+   */
+  get(name) {
+    name = name.toLowerCase();
+    let result;
+    let _key;
+    const headers = this.dict;
+    for (const key of Object.keys(headers)) {
+      _key = key.toLowerCase();
+      if (name === _key) result = headers[key];
+    }
+    return result
+  }
+
+  /**
+   *
+   * @param {string} name
+   * @returns
+   */
+  swap(name) {
+    const has = this.has(name);
+    if (has === name) return
+    if (!has) throw new Error('There is no header than matches "' + name + '"')
+    this.dict[name] = this.dict[has];
+    delete this.dict[has];
+  }
+
+  /**
+   * 
+   * @param {string} name 
+   * @returns 
+   */
+  del(name) {
+    name = String(name).toLowerCase();
+    let deleted = false;
+    let changed = 0;
+    const dict = this.dict;
+    for (const key of Object.keys(this.dict)) {
+      if (name === String(key).toLowerCase()) {
+        deleted = delete dict[key];
+        changed += 1;
+      }
+    }
+    return changed === 0 ? true : deleted
+  }
+}
+
 /**
  * utils for request
  */
@@ -347,100 +441,6 @@ const utils = {
   noBody,
 };
 
-class Caseless {
-  /**
-   * @param {*} dict
-   */
-  constructor(dict) {
-    this.dict = dict || {};
-  }
-
-  /**
-   *
-   * @param {*} name
-   * @param {*} value
-   * @param {*} clobber
-   * @returns
-   */
-  set(name, value, clobber) {
-    if (typeof name === 'object') {
-      for (const n of name) {
-        this.set(n, name[n], value);
-      }
-    } else {
-      if (typeof clobber === 'undefined') clobber = true;
-      const has = this.has(name);
-
-      if (!clobber && has) this.dict[has] = this.dict[has] + ',' + value;
-      else this.dict[has || name] = value;
-      return has
-    }
-  }
-
-  /**
-   *
-   * @param {string} name
-   * @returns
-   */
-  has(name) {
-    const keys = Object.keys(this.dict);
-    name = name.toLowerCase();
-    for (let i = 0; i < keys.length; i++) {
-      if (keys[i].toLowerCase() === name) return keys[i]
-    }
-    return false
-  }
-
-  /**
-   *
-   * @param {string} name
-   * @returns
-   */
-  get(name) {
-    name = name.toLowerCase();
-    let result;
-    let _key;
-    const headers = this.dict;
-    for (const key of Object.keys(headers)) {
-      _key = key.toLowerCase();
-      if (name === _key) result = headers[key];
-    }
-    return result
-  }
-
-  /**
-   *
-   * @param {string} name
-   * @returns
-   */
-  swap(name) {
-    const has = this.has(name);
-    if (has === name) return
-    if (!has) throw new Error('There is no header than matches "' + name + '"')
-    this.dict[name] = this.dict[has];
-    delete this.dict[has];
-  }
-
-  /**
-   * 
-   * @param {string} name 
-   * @returns 
-   */
-  del(name) {
-    name = String(name).toLowerCase();
-    let deleted = false;
-    let changed = 0;
-    const dict = this.dict;
-    for (const key of Object.keys(this.dict)) {
-      if (name === String(key).toLowerCase()) {
-        deleted = delete dict[key];
-        changed += 1;
-      }
-    }
-    return changed === 0 ? true : deleted
-  }
-}
-
 /**
  * fork from follow-redirects
  * https://github.com/follow-redirects/follow-redirects
@@ -633,7 +633,7 @@ class Request extends Duplex {
     super();
     const m = this;
 
-    // log({opts}, 'constructor');
+    // log({opts}, 'new Request')
 
     // Initialize the request
     m.sanitizeOptions(opts);
@@ -773,6 +773,8 @@ class Request extends Duplex {
           protocol =
             agents.http.proxy && !agents.http.tunnel ? agents.http.proxy.protocol : protocol;
         }
+
+        // log({scheme, agents, protocol}, 'request')
       }
 
       const httpModule = httpModules[protocol];
@@ -781,6 +783,8 @@ class Request extends Duplex {
       // log({opt, protocol}, 'request')
       // Create the native request and set up its event handlers
       // @ts-ignore
+
+      log$1({httpModule, opt}, 'request');      
       const req = httpModule.request(opt, m._onResponse);
       m._currentRequest = req;
       // @ts-ignore
@@ -1448,8 +1452,8 @@ class Request extends Duplex {
    * @override -  重写父类方法
    * @template T - 需要模板
    * @param {T & stream.Writable} dest - The writable stream to which data is written.
-   * @param {Object} [opts] - Optional configuration object.
-   * @param {boolean} [opts.end=true] - Whether to end the writable stream when the readable stream ends.
+   * @param {Object} [opt] - Optional configuration object.
+   * @param {boolean} [opt.end=true] - Whether to end the writable stream when the readable stream ends.
    * @returns {T} The destination stream.
    */
   pipe(dest, opts = {}) {
@@ -1642,6 +1646,7 @@ const log = log$2({env: `wia:req:${name(import.meta.url)}`}); // __filename
  * @prop {string} [url]
  * @prop {'http:' | 'https:'} [protocol]
  * @prop {string} [host]
+ * @prop {string} [hostname]
  * @prop {string} [family]
  * @prop {string} [path]
  * @prop {string} [method]
@@ -1688,7 +1693,7 @@ utils.createErrorType(
  * @param {string | Opts} uri/opts
  * @param {Opts | Cb} [opts] /cb
  * @param {Cb} [cb]
- * @returns {{opts: Opts, cb: Cb}}
+ * @returns {{opt: Opts, cb: Cb}}
  */
 function init(uri, opts, cb) {
   let R;
@@ -1724,26 +1729,28 @@ function init(uri, opts, cb) {
     }
 
     // copy options
-    opts = {
+    /** @type {Opts} */
+    const opt = {
       // @ts-ignore
       ...uri,
       ...opts,
     };
 
-    // @ts-ignore
-    if (!utils.isString(opts.host) && !utils.isString(opts.hostname)) opts.hostname = '::1';
-    // @ts-ignore
-    opts.method = (opts.method ?? 'get').toUpperCase();
+    if (!utils.isString(opt.host) && !utils.isString(opt.hostname)) opt.hostname = '::1';
+    opt.method = (opt.method ?? 'get').toUpperCase();
 
-    // @ts-ignore
     // follow-redirects does not skip comparison, so it should always succeed for axios -1 unlimited
-    opts.maxBodyLength = opts.maxBodyLength ?? Number.POSITIVE_INFINITY;
-    // @ts-ignore
-    opts.maxRedirects = opts.maxRedirects ?? 21;
-    // @ts-ignore
-    if (opts.maxRedirects === 0) opts.followRedirects = false;
+    opt.maxBodyLength = opt.maxBodyLength ?? Number.POSITIVE_INFINITY;
+    opt.maxRedirects = opt.maxRedirects ?? 21;
+    if (opt.maxRedirects === 0) opt.followRedirects = false;
+    opt.headers = opt.headers ?? {
+      Accept: 'application/json, text/plain, */*',
+      'User-Agent':
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36 Edg/107.0.1418.35',
+      'Accept-Encoding': 'gzip, compress, deflate, br',
+    };
 
-    R = {opts, cb};
+    R = {opt, cb};
     // log({R}, 'init')
   } catch (e) {
     log.err(e, 'init');
@@ -1761,24 +1768,24 @@ function init(uri, opts, cb) {
     maxRedirects: _.maxRedirects,
     maxBodyLength: _.maxBodyLength,
  * @param {string | Opts} uri /options
- * @param {Opts | Cb} [options] /callback
+ * @param {Opts | Cb} [opts] /callback
  * @param {Cb} [callback] /null
  * @returns {Request}
  */
-function request(uri, options, callback) {
+function request(uri, opts, callback) {
   let R = null;
 
   try {
     // @ts-ignore
-    const {opts, cb} = init(uri, options, callback);
-    // log.error({uri, options, opts}, 'request')
+    const {opt, cb} = init(uri, opts, callback);
+    // log({uri, opt, opts}, 'request')
 
-    const {data, stream} = opts;
+    const {data, stream} = opt;
     // data 在本函数完成处理，不传递到 request
-    opts.data = undefined;
+    opt.data = undefined;
 
     // @ts-ignore
-    const req = new Request(opts, cb);
+    const req = new Request(opt, cb);
 
     // 非流模式，自动发送请求，流模式通过流写入发送
     if (!stream) {
@@ -1823,7 +1830,7 @@ function request(uri, options, callback) {
 }
 
 /**
- * 执行简单的数据（支持strean）请求
+ * 执行简单的数据（支持stream）请求
  * 非流模式，直接写入数据流，流模式，由管道触发，或手动调用 end() data.pipe 写入数据
  * 复杂数据，请使用 @wiajs/req库（fork from axios），该库封装了当前库，提供了更多功能
  * organize params for patch, post, put, head, del

package/lib/index.js

@@ -17,6 +17,7 @@ const log = Log({
  * @prop {string} [url]
  * @prop {'http:' | 'https:'} [protocol]
  * @prop {string} [host]
+ * @prop {string} [hostname]
  * @prop {string} [family]
  * @prop {string} [path]
  * @prop {string} [method]
@@ -50,7 +51,7 @@ const log = Log({
  * @param {string | Opts} uri/opts
  * @param {Opts | Cb} [opts] /cb
  * @param {Cb} [cb]
- * @returns {{opts: Opts, cb: Cb}}
+ * @returns {{opt: Opts, cb: Cb}}
  */ function init(uri, opts, cb) {
     let R;
     try {
@@ -84,24 +85,24 @@ const log = Log({
             opts = {};
         }
         // copy options
-        opts = {
+        /** @type {Opts} */ const opt = {
             // @ts-ignore
             ...uri,
             ...opts
         };
-        // @ts-ignore
-        if (!utils.isString(opts.host) && !utils.isString(opts.hostname)) opts.hostname = '::1';
-        // @ts-ignore
-        opts.method = (opts.method ?? 'get').toUpperCase();
-        // @ts-ignore
+        if (!utils.isString(opt.host) && !utils.isString(opt.hostname)) opt.hostname = '::1';
+        opt.method = (opt.method ?? 'get').toUpperCase();
         // follow-redirects does not skip comparison, so it should always succeed for axios -1 unlimited
-        opts.maxBodyLength = opts.maxBodyLength ?? Number.POSITIVE_INFINITY;
-        // @ts-ignore
-        opts.maxRedirects = opts.maxRedirects ?? 21;
-        // @ts-ignore
-        if (opts.maxRedirects === 0) opts.followRedirects = false;
+        opt.maxBodyLength = opt.maxBodyLength ?? Number.POSITIVE_INFINITY;
+        opt.maxRedirects = opt.maxRedirects ?? 21;
+        if (opt.maxRedirects === 0) opt.followRedirects = false;
+        opt.headers = opt.headers ?? {
+            Accept: 'application/json, text/plain, */*',
+            'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36 Edg/107.0.1418.35',
+            'Accept-Encoding': 'gzip, compress, deflate, br'
+        };
         R = {
-            opts,
+            opt,
             cb
         };
     // log({R}, 'init')
@@ -119,20 +120,20 @@ const log = Log({
     maxRedirects: _.maxRedirects,
     maxBodyLength: _.maxBodyLength,
  * @param {string | Opts} uri /options
- * @param {Opts | Cb} [options] /callback
+ * @param {Opts | Cb} [opts] /callback
  * @param {Cb} [callback] /null
  * @returns {Request}
- */ function request(uri, options, callback) {
+ */ function request(uri, opts, callback) {
     let R = null;
     try {
         // @ts-ignore
-        const { opts, cb } = init(uri, options, callback);
-        // log.error({uri, options, opts}, 'request')
-        const { data, stream } = opts;
+        const { opt, cb } = init(uri, opts, callback);
+        // log({uri, opt, opts}, 'request')
+        const { data, stream } = opt;
         // data 在本函数完成处理，不传递到 request
-        opts.data = undefined;
+        opt.data = undefined;
         // @ts-ignore
-        const req = new Request(opts, cb);
+        const req = new Request(opt, cb);
         // 非流模式，自动发送请求，流模式通过流写入发送
         if (!stream) {
             // 发送数据
@@ -168,7 +169,7 @@ const log = Log({
     return R;
 }
 /**
- * 执行简单的数据（支持strean）请求
+ * 执行简单的数据（支持stream）请求
  * 非流模式，直接写入数据流，流模式，由管道触发，或手动调用 end() data.pipe 写入数据
  * 复杂数据，请使用 @wiajs/req库（fork from axios），该库封装了当前库，提供了更多功能
  * organize params for patch, post, put, head, del

package/lib/request.js

@@ -1,18 +1,17 @@
 /**
  * fork from follow-redirects
  * https://github.com/follow-redirects/follow-redirects
- */ import http from 'node:http';
-import https from 'node:https';
+ */ import { log as Log, name } from '@wiajs/log';
+import mime from 'mime-types';
 import assert from 'node:assert';
+import http from 'node:http';
+import https from 'node:https';
+import stream, { Duplex } from 'node:stream';
 import url from 'node:url';
-import stream from 'node:stream';
-import { Duplex } from 'node:stream'; // Writable 流改为读写双工
 import zlib from 'node:zlib';
-import mime from 'mime-types';
-import { log as Log, name } from '@wiajs/log';
 import ZlibTransform from './ZlibTransform.js';
-import utils from './utils.js';
 import Caseless from './caseless.js';
+import utils from './utils.js';
 const log = Log({
     env: `wia:req:${name(import.meta.url)}`
 }) // __filename
@@ -149,7 +148,7 @@ const ConnResetError = utils.createErrorType('ERR_CONNRESET', '连接被重置
         , /** @type {stream.Writable[]} */ this.pipedests = [] // pipe dest
         , /** @type {*} */ this.startTimer = null;
         const m = this;
-        // log({opts}, 'constructor');
+        // log({opts}, 'new Request')
         // Initialize the request
         m.sanitizeOptions(opts);
         m.opt = opts;
@@ -259,12 +258,17 @@ const ConnResetError = utils.createErrorType('ERR_CONNRESET', '连接被重置
                 if (protocol === 'http:' && agents.http) {
                     protocol = agents.http.proxy && !agents.http.tunnel ? agents.http.proxy.protocol : protocol;
                 }
+            // log({scheme, agents, protocol}, 'request')
             }
             const httpModule = httpModules[protocol];
             if (!httpModule) throw TypeError(`Unsupported protocol: ${protocol}`);
             // log({opt, protocol}, 'request')
             // Create the native request and set up its event handlers
             // @ts-ignore
+            log({
+                httpModule,
+                opt
+            }, 'request');
             const req = httpModule.request(opt, m._onResponse);
             m._currentRequest = req;
             // @ts-ignore
@@ -818,8 +822,8 @@ const ConnResetError = utils.createErrorType('ERR_CONNRESET', '连接被重置
    * @override -  重写父类方法
    * @template T - 需要模板
    * @param {T & stream.Writable} dest - The writable stream to which data is written.
-   * @param {Object} [opts] - Optional configuration object.
-   * @param {boolean} [opts.end=true] - Whether to end the writable stream when the readable stream ends.
+   * @param {Object} [opt] - Optional configuration object.
+   * @param {boolean} [opt.end=true] - Whether to end the writable stream when the readable stream ends.
    * @returns {T} The destination stream.
    */ pipe(dest, opts = {}) {
         const m = this;

package/package.json

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

package/types/index.d.ts

@@ -7,6 +7,7 @@ export type Opts = {
     url?: string;
     protocol?: "http:" | "https:";
     host?: string;
+    hostname?: string;
     family?: string;
     path?: string;
     method?: string;
@@ -24,7 +25,7 @@ export type Opts = {
     trackRedirects?: any;
 };
 export type Cb = (res: Response, stream?: stream.Readable) => void;
-declare function request(uri: string | Opts, options?: Opts | Cb, callback?: Cb): Request;
+declare function request(uri: string | Opts, opts?: Opts | Cb, callback?: Cb): Request;
 declare namespace request {
     export let get: (url: string | Opts, opts?: Opts | Cb, cb?: Cb) => void;
     export let head: (url: string | Opts, opts?: Opts | Cb, cb?: Cb) => void;

package/types/request.d.ts

@@ -44,9 +44,7 @@ export default class Request extends stream.Duplex {
     processResponse(response: Response): void;
     _isRedirect: boolean;
     processStream(res: Response): Response | stream.Readable;
-    override pipe<T>(dest: T & stream.Writable, opts?: {
-        end?: boolean;
-    }): T;
+    override pipe<T>(dest: T & stream.Writable, opts?: {}): T;
     unpipe(dest: stream.Writable): this;
     pipeDest(dest: any): void;
     pause(): this;