@wiajs/request 3.0.33 → 3.0.35

package/dist/request.cjs

@@ -1,18 +1,18 @@
 /*!
-  * wia request v3.0.33
-  * (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
@@ -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
@@ -1777,7 +1781,7 @@ function request(uri, opts, callback) {
   try {
     // @ts-ignore
     const {opt, cb} = init(uri, opts, callback);
-    // log.error({uri, options, opts}, 'request')
+    // log({uri, opt, opts}, 'request')
 
     const {data, stream} = opt;
     // data 在本函数完成处理，不传递到 request

package/dist/request.mjs

@@ -1,16 +1,16 @@
 /*!
-  * wia request v3.0.33
-  * (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
@@ -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
@@ -1774,7 +1778,7 @@ function request(uri, opts, callback) {
   try {
     // @ts-ignore
     const {opt, cb} = init(uri, opts, callback);
-    // log.error({uri, options, opts}, 'request')
+    // log({uri, opt, opts}, 'request')
 
     const {data, stream} = opt;
     // data 在本函数完成处理，不传递到 request

package/lib/index.js

@@ -128,7 +128,7 @@ const log = Log({
     try {
         // @ts-ignore
         const { opt, cb } = init(uri, opts, callback);
-        // log.error({uri, options, opts}, 'request')
+        // log({uri, opt, opts}, 'request')
         const { data, stream } = opt;
         // data 在本函数完成处理，不传递到 request
         opt.data = undefined;

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
@@ -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

package/package.json

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