@wiajs/request 3.0.33 → 3.0.36

package/lib/ZlibTransform.js

@@ -1,19 +1,19 @@
-import stream from 'node:stream';
+import stream from 'stream';
 let ZlibTransform = class ZlibTransform extends stream.Transform {
     /**
-   * 
-   * @param {*} chunk 
-   * @param {*} encoding 
-   * @param {*} callback 
+   *
+   * @param {*} chunk
+   * @param {*} encoding
+   * @param {*} callback
    */ __transform(chunk, encoding, callback) {
         this.push(chunk);
         callback();
     }
     /**
-   * 
-   * @param {*} chunk 
-   * @param {*} encoding 
-   * @param {*} callback 
+   *
+   * @param {*} chunk
+   * @param {*} encoding
+   * @param {*} callback
    */ _transform(chunk, encoding, callback) {
         if (chunk.length !== 0) {
             this._transform = this.__transform;

package/lib/caseless.js

@@ -1,9 +1,4 @@
-export default class Caseless {
-    /**
-   * @param {*} dict
-   */ constructor(dict){
-        this.dict = dict || {};
-    }
+let Caseless = class Caseless {
     /**
    *
    * @param {*} name
@@ -62,9 +57,9 @@ export default class Caseless {
         delete this.dict[has];
     }
     /**
-   * 
-   * @param {string} name 
-   * @returns 
+   *
+   * @param {string} name
+   * @returns
    */ del(name) {
         name = String(name).toLowerCase();
         let deleted = false;
@@ -78,7 +73,13 @@ export default class Caseless {
         }
         return changed === 0 ? true : deleted;
     }
-}
+    /**
+   * @param {*} dict
+   */ constructor(dict){
+        this.dict = dict || {};
+    }
+};
+export { Caseless as default };
 /**
  *
  * @param {*} resp
@@ -87,32 +88,32 @@ export default class Caseless {
  */ export function httpify(resp, headers) {
     const c = new Caseless(headers);
     /**
-   * 
-   * @param {string} key 
-   * @param {*} value 
-   * @param {*} clobber 
-   * @returns 
+   *
+   * @param {string} key
+   * @param {*} value
+   * @param {*} clobber
+   * @returns
    */ resp.setHeader = (key, value, clobber)=>{
         if (typeof value === 'undefined') return;
         return c.set(key, value, clobber);
     };
     /**
-   * 
-   * @param {string} key 
+   *
+   * @param {string} key
    * @returns {boolean|string}
    */ resp.hasHeader = (key)=>{
         return c.has(key);
     };
     /**
-   * 
-   * @param {string} key 
+   *
+   * @param {string} key
    * @returns {*}
    */ resp.getHeader = (key)=>{
         return c.get(key);
     };
     /**
-   * 
-   * @param {string} key 
+   *
+   * @param {string} key
    * @returns {boolean}
    */ resp.removeHeader = (key)=>{
         return c.del(key);

package/lib/index.js

@@ -3,8 +3,8 @@
  * used by axios
  * 修改以支持http、https 代理服务器
  * 代理模式下，http or https 请求，取决于 proxy 代理服务器，而不是目的服务器。
- */ import stream from 'node:stream';
-import { log as Log, name } from '@wiajs/log';
+ */ import { log as Log, name } from '@wiajs/log';
+import stream from 'stream';
 import Request from './request.js';
 import utils from './utils.js';
 const log = Log({
@@ -91,12 +91,16 @@ const log = Log({
             ...opts
         };
         if (!utils.isString(opt.host) && !utils.isString(opt.hostname)) opt.hostname = '::1';
-        opt.method = (opt.method ?? 'get').toUpperCase();
+        var _opt_method;
+        opt.method = ((_opt_method = opt.method) != null ? _opt_method : 'get').toUpperCase();
+        var _opt_maxBodyLength;
         // follow-redirects does not skip comparison, so it should always succeed for axios -1 unlimited
-        opt.maxBodyLength = opt.maxBodyLength ?? Number.POSITIVE_INFINITY;
-        opt.maxRedirects = opt.maxRedirects ?? 21;
+        opt.maxBodyLength = (_opt_maxBodyLength = opt.maxBodyLength) != null ? _opt_maxBodyLength : Number.POSITIVE_INFINITY;
+        var _opt_maxRedirects;
+        opt.maxRedirects = (_opt_maxRedirects = opt.maxRedirects) != null ? _opt_maxRedirects : 21;
         if (opt.maxRedirects === 0) opt.followRedirects = false;
-        opt.headers = opt.headers ?? {
+        var _opt_headers;
+        opt.headers = (_opt_headers = opt.headers) != null ? _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'
@@ -128,7 +132,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 assert from 'node:assert';
-import url from 'node:url';
-import stream from 'node:stream';
-import { Duplex } from 'node:stream'; // Writable 流改为读写双工
-import zlib from 'node:zlib';
+ */ import { log as Log, name } from '@wiajs/log';
+import assert from 'assert';
+import http from 'http';
+import https from 'https';
 import mime from 'mime-types';
-import { log as Log, name } from '@wiajs/log';
+import stream, { Duplex } from 'node:stream';
+import url from 'url';
+import zlib from 'zlib';
 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
@@ -136,96 +135,7 @@ const HostNotfoundError = utils.createErrorType('ERR_HOSTNOTFOUND', 'DNS 解析
 const ConnRefusedError = utils.createErrorType('ERR_CONNREFUSED', '连接被拒绝，目标服务器可能不可用');
 const ConnTimedoutError = utils.createErrorType('ERR_CONNTIMEDOUT', '请求超时，请检查网络连接或服务器负载');
 const ConnResetError = utils.createErrorType('ERR_CONNRESET', '连接被重置，可能是网络问题或服务器关闭了连接');
-/**
- * An HTTP(S) request that can be redirected
- * wrap http.ClientRequest
- */ export default class Request extends Duplex {
-    /**
-   * responseCallback 原消息处理回调
-   * @param {Opts} opts
-   * @param {*} resCallback
-   */ constructor(opts, resCallback){
-        super(), /** @type {NodeJS.Timeout} */ this._timeout = null, /** @type {*} */ this.socket = null, /** @type {http.ClientRequest} */ this._currentRequest = null, /** @type {Response} */ 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({opts}, 'new Request')
-        // Initialize the request
-        m.sanitizeOptions(opts);
-        m.opt = opts;
-        m.headers = opts.headers;
-        // log({opts}, 'constructor')
-        m._ended = false;
-        m._ending = false;
-        m._redirectCount = 0;
-        /** @type {any[]} */ m._redirects = [];
-        m._requestBodyLength = 0;
-        /** @type {any[]} */ m._requestBodyBuffers = [];
-        // save the callback if passed
-        m.resCallback = resCallback;
-        /**
-     * React to responses of native requests
-     * 接管 response 事件，非重定向，触发 response 事件
-     * @param {Response} res
-     */ m._onResponse = (res)=>{
-            try {
-                m.processResponse(res);
-            } catch (cause) {
-                m.emit('error', cause instanceof RedirectionError ? cause : new RedirectionError({
-                    cause: cause
-                }));
-            }
-        };
-        // Proxy all other public ClientRequest methods 'getHeader'
-        for (const method of writeMethods){
-            // @ts-ignore
-            m[method] = (a, b)=>{
-                // log(method, {a, b})
-                // @ts-ignore
-                m._currentRequest?.[method](a, b);
-            };
-        }
-        // Proxy all public ClientRequest properties
-        // 'aborted', 'connection' 弃用
-        for (const property of writeProps){
-            Object.defineProperty(m, property, {
-                get () {
-                    // @ts-ignore
-                    const val = m._currentRequest?.[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 &&
-                if (m._currentRequest) {
-                    m.emit('error', new Error('You cannot pipe to this stream after the outbound request has started.'));
-                }
-                m.pipesrc = src;
-                if (utils.isReadStream(src)) {
-                    // @ts-ignore
-                    if (!m.hasHeader('content-type')) m.setHeader('content-type', mime.lookup(src.path));
-                } else {
-                    // 拷贝请求头
-                    if (src.headers) {
-                        for (const k of Object.keys(src.headers)){
-                            if (!m.hasHeader(k)) {
-                                m.setHeader(k, src.headers[k]);
-                            }
-                        }
-                    }
-                    // @ts-ignore
-                    if (src.opt.method && !m.opt.method) m.opt.method = src.opt.method;
-                }
-            });
-        }
-    // Perform the first request
-    // m.request(); // 创建时不连接，写入数据时连接，否则 pipe 时无法写入header
-    }
+let Request = class Request extends Duplex {
     /**
    * Executes the next native request (initial or redirect)
    * @returns http(s) 实例
@@ -259,12 +169,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
@@ -283,10 +198,10 @@ const ConnResetError = utils.createErrorType('ERR_CONNRESET', '连接被重置
                 ;
                 // @ts-ignore
                 log.error({
-                    errcode: err?.code
+                    errcode: err == null ? void 0 : err.code
                 }, 'request');
                 // @ts-ignore
-                switch(err?.code){
+                switch(err == null ? void 0 : err.code){
                     case 'ENOTFOUND':
                         m.emit('error', new HostNotfoundError());
                         break;
@@ -486,21 +401,24 @@ const ConnResetError = utils.createErrorType('ERR_CONNRESET', '连接被重置
    * @param {string} name
    * @param {string} value
    */ setHeader(name, value) {
+        var _this__currentRequest;
         this.opt.headers[name] = value;
-        this._currentRequest?.setHeader(name, value);
+        (_this__currentRequest = this._currentRequest) == null ? void 0 : _this__currentRequest.setHeader(name, value);
     }
     /**
    * Clears a header value on the current native request
    * @param {string} name
    */ removeHeader(name) {
+        var _this__currentRequest;
         delete this.opt.headers[name];
-        this._currentRequest?.removeHeader(name);
+        (_this__currentRequest = this._currentRequest) == null ? void 0 : _this__currentRequest.removeHeader(name);
     }
     /**
    * 标头是否已发送
    * @returns
    */ get headersSent() {
-        return this._currentRequest?.headersSent;
+        var _this__currentRequest;
+        return (_this__currentRequest = this._currentRequest) == null ? void 0 : _this__currentRequest.headersSent;
     }
     /**
    * Global timeout for all underlying requests
@@ -633,7 +551,7 @@ const ConnResetError = utils.createErrorType('ERR_CONNRESET', '连接被重置
             // NOTE: responseStartTime is deprecated in favor of .timings
             response.responseStartTime = m.responseStartTime;
             // 触发原回调函数
-            m.resCallback?.(response, responseStream);
+            m.resCallback == null ? void 0 : m.resCallback.call(m, response, responseStream);
             // 类似 ClientRequest，触发 response 事件
             m.emit('response', response, responseStream);
             // Clean up
@@ -884,7 +802,7 @@ const ConnResetError = utils.createErrorType('ERR_CONNRESET', '连接被重置
         const m = this;
         const { response } = m;
         // Called after the response is received
-        if (response?.headers && dest.headers && !dest.headersSent) {
+        if ((response == null ? void 0 : response.headers) && dest.headers && !dest.headersSent) {
             const caseless = new Caseless(response.headers);
             if (caseless.has('content-type')) {
                 const ctname = /** @type {string} */ caseless.has('content-type');
@@ -903,7 +821,7 @@ const ConnResetError = utils.createErrorType('ERR_CONNRESET', '连接被重置
                 }
             }
         }
-        if (response?.headers && dest.setHeader && !dest.headersSent) {
+        if ((response == null ? void 0 : response.headers) && dest.setHeader && !dest.headersSent) {
             for (const k of Object.keys(response.headers))dest.setHeader(k, response.headers[k]);
             dest.statusCode = response.statusCode;
         }
@@ -929,7 +847,99 @@ const ConnResetError = utils.createErrorType('ERR_CONNRESET', '连接被重置
     isPaused() {
         return this._paused;
     }
-}
+    /**
+   * responseCallback 原消息处理回调
+   * @param {Opts} opts
+   * @param {*} resCallback
+   */ constructor(opts, resCallback){
+        super(), /** @type {NodeJS.Timeout} */ this._timeout = null, /** @type {*} */ this.socket = null, /** @type {http.ClientRequest} */ this._currentRequest = null, /** @type {Response} */ 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({opts}, 'new Request')
+        // Initialize the request
+        m.sanitizeOptions(opts);
+        m.opt = opts;
+        m.headers = opts.headers;
+        // log({opts}, 'constructor')
+        m._ended = false;
+        m._ending = false;
+        m._redirectCount = 0;
+        /** @type {any[]} */ m._redirects = [];
+        m._requestBodyLength = 0;
+        /** @type {any[]} */ m._requestBodyBuffers = [];
+        // save the callback if passed
+        m.resCallback = resCallback;
+        /**
+     * React to responses of native requests
+     * 接管 response 事件，非重定向，触发 response 事件
+     * @param {Response} res
+     */ m._onResponse = (res)=>{
+            try {
+                m.processResponse(res);
+            } catch (cause) {
+                m.emit('error', cause instanceof RedirectionError ? cause : new RedirectionError({
+                    cause: cause
+                }));
+            }
+        };
+        // Proxy all other public ClientRequest methods 'getHeader'
+        for (const method of writeMethods){
+            // @ts-ignore
+            m[method] = (a, b)=>{
+                var // log(method, {a, b})
+                // @ts-ignore
+                _m__currentRequest;
+                (_m__currentRequest = m._currentRequest) == null ? void 0 : _m__currentRequest[method](a, b);
+            };
+        }
+        // Proxy all public ClientRequest properties
+        // 'aborted', 'connection' 弃用
+        for (const property of writeProps){
+            Object.defineProperty(m, property, {
+                get () {
+                    var _m__currentRequest;
+                    // @ts-ignore
+                    const val = (_m__currentRequest = m._currentRequest) == null ? void 0 : _m__currentRequest[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 &&
+                if (m._currentRequest) {
+                    m.emit('error', new Error('You cannot pipe to this stream after the outbound request has started.'));
+                }
+                m.pipesrc = src;
+                if (utils.isReadStream(src)) {
+                    // @ts-ignore
+                    if (!m.hasHeader('content-type')) m.setHeader('content-type', mime.lookup(src.path));
+                } else {
+                    // 拷贝请求头
+                    if (src.headers) {
+                        for (const k of Object.keys(src.headers)){
+                            if (!m.hasHeader(k)) {
+                                m.setHeader(k, src.headers[k]);
+                            }
+                        }
+                    }
+                    // @ts-ignore
+                    if (src.opt.method && !m.opt.method) m.opt.method = src.opt.method;
+                }
+            });
+        }
+    // Perform the first request
+    // m.request(); // 创建时不连接，写入数据时连接，否则 pipe 时无法写入header
+    }
+};
+/**
+ * An HTTP(S) request that can be redirected
+ * wrap http.ClientRequest
+ */ export { Request as default };
 /**
  * 释放请求，触发error事件
  *  'error' event, and emit a 'close' event.

package/lib/utils.js

@@ -1,7 +1,7 @@
 /**
  * utils for request
- */ import url from 'node:url';
-import assert from 'node:assert';
+ */ import assert from 'assert';
+import url from 'url';
 const { URL } = url;
 // Whether to use the native URL object or the legacy url module
 let useNativeURL = false;

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.36",
   "type": "module",
   "main": "index.js",
   "types": "types/index.d.ts",
@@ -26,7 +26,6 @@
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production gulp build -f gulpfile.js",
-    "lib": "swc --config-file ./.swcrc ./src -d lib -w --strip-leading-paths",
     "test": "npm run lint && npm run test-ci && npm run test-browser",
     "test-ci": "taper tests/test-*.js",
     "test-cov": "nyc --reporter=lcov tape tests/test-*.js",
@@ -37,7 +36,7 @@
   "contributors": ["Mikeal Rogers <mikeal.rogers@gmail.com>"],
   "repository": {
     "type": "git",
-    "url": "https://github.com/request/request.git"
+    "url": "https://github.com/@wiajs/request.git"
   },
   "license": "MIT",
   "publishConfig": {