@wiajs/request 3.0.36 → 3.0.39

package/dist/request.cjs

@@ -1,5 +1,5 @@
 /*!
-  * wia request v3.0.36
+  * wia request v3.0.39
   * (c) 2022-2025 Sibyl Yu and contributors
   * Released under the MIT License.
   */
@@ -11,7 +11,6 @@ const assert = require('assert');
 const http = require('http');
 const https = require('https');
 const mime = require('mime-types');
-const stream$1 = require('node:stream');
 const url = require('url');
 const zlib = require('zlib');
 
@@ -498,7 +497,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', '连接被重置，可能是网络问题或服务器关闭了连接');
-let Request = class Request extends stream$1.Duplex {
+let Request = class Request extends stream.Duplex {
     /**
    * Executes the next native request (initial or redirect)
    * @returns http(s) 实例
@@ -526,24 +525,88 @@ let Request = class Request extends stream$1.Duplex {
             // agents 优于 agent
             if (agents) {
                 const scheme = protocol.slice(0, -1);
-                opt.agent = agents[scheme];
+                // [FIX] 仅当 agents 中存在对应协议的 agent 时才覆盖 opt.agent
+                // 防止 agents['https'] 为空时将 opt.agent 覆盖为 undefined，导致回退到 globalAgent
+                if (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;
+                    // 注意：这里修改的是局部变量 protocol，用于选择 httpModule
+                    // protocol 以proxy协议为准
+                    const { proxy } = agents.http;
+                    if (proxy && !agents.http.tunnel) protocol = proxy.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
+            // ============================================================
+            // [FIX] 针对 Bun 的终极修复：构建纯净的 Request Options
+            // ============================================================
+            // 1. 定义标准 Node.js http.request 接受的字段白名单
+            // 避免传入 agents, followRedirects 等杂质干扰 Bun 的解析
+            const nativeFields = [
+                'agent',
+                'auth',
+                'createConnection',
+                'defaultPort',
+                'family',
+                'headers',
+                'hints',
+                'host',
+                'hostname',
+                'insecureHTTPParser',
+                'localAddress',
+                'localPort',
+                'lookup',
+                'maxHeaderSize',
+                'method',
+                'path',
+                'port',
+                'protocol',
+                'rejectUnauthorized',
+                'servername',
+                'setHost',
+                'socketPath',
+                'timeout',
+                'signal'
+            ];
+            // 2. 创建纯净的 options 对象
+            const reqOpt = {};
+            // 3. 显式拷贝字段 (同时也解决了 [Object: null prototype] 问题)
+            for (const field of nativeFields){
+                if (opt[field] !== undefined) reqOpt[field] = opt[field];
+            }
+            // 端口修正逻辑 (保持不变)
+            if (!reqOpt.port) reqOpt.port = protocol === 'https:' ? 443 : 80;
+            else if (reqOpt.port) reqOpt.port = Number(reqOpt.port);
+            // 再次显式确保 agent 存在于新对象中 (防御性编程)
+            // if (opt.agent) reqOpt.agent = opt.agent
+            // ============================================================
+            // [FIX] 针对 Bun 的强制代理修复
+            // ============================================================
+            if (opt.agent) {
+                // 1. 仍然赋值 agent，以便 Node.js 环境正常工作
+                reqOpt.agent = opt.agent;
+                // 2. 【关键】针对 Bun：直接将 Agent 的创建连接方法暴露给 Request
+                // Bun 的 http.request 可能忽略 agent 对象，但通常会尊重 createConnection 选项
+                reqOpt.createConnection = (args, cb)=>{
+                    log$1({
+                        args
+                    }, 'Direct createConnection triggered via options');
+                    // 强制调用你的 Agent 的 createConnection
+                    // 注意：需要确保 this 上下文正确指向 opt.agent
+                    return opt.agent.createConnection(args, cb);
+                };
+            }
             log$1({
-                httpModule,
-                opt
+                reqOpt,
+                protocol,
+                agentType: reqOpt.agent ? 'custom' : 'global'
             }, 'request');
-            const req = httpModule.request(opt, m._onResponse);
+            // Create the native request and set up its event handlers
+            // @ts-ignore
+            const req = httpModule.request(reqOpt, m._onResponse);
             m._currentRequest = req;
             // @ts-ignore
             req.redirectReq = m;
@@ -552,7 +615,8 @@ let Request = class Request extends stream$1.Duplex {
             // set tcp keep alive to prevent drop connection by peer
             req.on('socket', /** @param {*} socket */ (socket)=>{
                 // default interval of sending ack packet is 1 minute
-                socket.setKeepAlive(true, 1000 * 60);
+                // [FIX] 增加 socket 存在性检查，防止极少数情况下的 race condition
+                if (socket) socket.setKeepAlive(true, 1000 * 60);
             });
             // 请求error单独处理
             // 'error' 事件处理，避免错误将冒泡到全局导致程序崩溃
@@ -561,8 +625,9 @@ let Request = class Request extends stream$1.Duplex {
                 ;
                 // @ts-ignore
                 log$1.error({
-                    errcode: err == null ? void 0 : err.code
-                }, 'request');
+                    errcode: err == null ? void 0 : err.code,
+                    msg: err == null ? void 0 : err.message
+                }, 'request error');
                 // @ts-ignore
                 switch(err == null ? void 0 : err.code){
                     case 'ENOTFOUND':
@@ -577,6 +642,10 @@ let Request = class Request extends stream$1.Duplex {
                     case 'ECONNRESET':
                         m.emit('error', new ConnResetError());
                         break;
+                    // [FIX] 捕获证书错误，给予更友好的提示（虽然修复后不应再出现此错误）
+                    case 'DEPTH_ZERO_SELF_SIGNED_CERT':
+                        m.emit('error', utils.createErrorType('ERR_TLS_CERT', `SSL证书错误(自签名): ${err.message}`));
+                        break;
                     default:
                         m.emit('error', utils.createErrorType('ERR_CONNOTHER', `网络错误: ${err.message}`));
                 }
@@ -1052,7 +1121,7 @@ let Request = class Request extends stream$1.Duplex {
         }
         // 响应流，用于读
         // @ts-ignore
-        responseStream = streams.length > 1 ? stream$1.pipeline(streams, utils.noop) : streams[0];
+        responseStream = streams.length > 1 ? stream.pipeline(streams, utils.noop) : streams[0];
         // 将内部 responseStream 可读流 映射到 redirectReq
         // @ts-ignore
         m.responseStream = responseStream;
@@ -1078,7 +1147,7 @@ let Request = class Request extends stream$1.Duplex {
         }
         // 可读流结束，触发 finished，方便上层清理
         // A cleanup function which removes all registered listeners.
-        const offListeners = stream$1.finished(responseStream, ()=>{
+        const offListeners = stream.finished(responseStream, ()=>{
             offListeners() // cleanup
             ;
             this.emit('finished');

package/dist/request.mjs

@@ -1,15 +1,14 @@
 /*!
-  * wia request v3.0.36
+  * wia request v3.0.39
   * (c) 2022-2025 Sibyl Yu and contributors
   * Released under the MIT License.
   */
 import { log as log$2, name } from '@wiajs/log';
-import stream from 'stream';
+import stream, { Duplex } from 'stream';
 import assert from 'assert';
 import http from 'http';
 import https from 'https';
 import mime from 'mime-types';
-import stream$1, { Duplex } from 'node:stream';
 import url from 'url';
 import zlib from 'zlib';
 
@@ -523,24 +522,88 @@ let Request = class Request extends Duplex {
             // agents 优于 agent
             if (agents) {
                 const scheme = protocol.slice(0, -1);
-                opt.agent = agents[scheme];
+                // [FIX] 仅当 agents 中存在对应协议的 agent 时才覆盖 opt.agent
+                // 防止 agents['https'] 为空时将 opt.agent 覆盖为 undefined，导致回退到 globalAgent
+                if (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;
+                    // 注意：这里修改的是局部变量 protocol，用于选择 httpModule
+                    // protocol 以proxy协议为准
+                    const { proxy } = agents.http;
+                    if (proxy && !agents.http.tunnel) protocol = proxy.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
+            // ============================================================
+            // [FIX] 针对 Bun 的终极修复：构建纯净的 Request Options
+            // ============================================================
+            // 1. 定义标准 Node.js http.request 接受的字段白名单
+            // 避免传入 agents, followRedirects 等杂质干扰 Bun 的解析
+            const nativeFields = [
+                'agent',
+                'auth',
+                'createConnection',
+                'defaultPort',
+                'family',
+                'headers',
+                'hints',
+                'host',
+                'hostname',
+                'insecureHTTPParser',
+                'localAddress',
+                'localPort',
+                'lookup',
+                'maxHeaderSize',
+                'method',
+                'path',
+                'port',
+                'protocol',
+                'rejectUnauthorized',
+                'servername',
+                'setHost',
+                'socketPath',
+                'timeout',
+                'signal'
+            ];
+            // 2. 创建纯净的 options 对象
+            const reqOpt = {};
+            // 3. 显式拷贝字段 (同时也解决了 [Object: null prototype] 问题)
+            for (const field of nativeFields){
+                if (opt[field] !== undefined) reqOpt[field] = opt[field];
+            }
+            // 端口修正逻辑 (保持不变)
+            if (!reqOpt.port) reqOpt.port = protocol === 'https:' ? 443 : 80;
+            else if (reqOpt.port) reqOpt.port = Number(reqOpt.port);
+            // 再次显式确保 agent 存在于新对象中 (防御性编程)
+            // if (opt.agent) reqOpt.agent = opt.agent
+            // ============================================================
+            // [FIX] 针对 Bun 的强制代理修复
+            // ============================================================
+            if (opt.agent) {
+                // 1. 仍然赋值 agent，以便 Node.js 环境正常工作
+                reqOpt.agent = opt.agent;
+                // 2. 【关键】针对 Bun：直接将 Agent 的创建连接方法暴露给 Request
+                // Bun 的 http.request 可能忽略 agent 对象，但通常会尊重 createConnection 选项
+                reqOpt.createConnection = (args, cb)=>{
+                    log$1({
+                        args
+                    }, 'Direct createConnection triggered via options');
+                    // 强制调用你的 Agent 的 createConnection
+                    // 注意：需要确保 this 上下文正确指向 opt.agent
+                    return opt.agent.createConnection(args, cb);
+                };
+            }
             log$1({
-                httpModule,
-                opt
+                reqOpt,
+                protocol,
+                agentType: reqOpt.agent ? 'custom' : 'global'
             }, 'request');
-            const req = httpModule.request(opt, m._onResponse);
+            // Create the native request and set up its event handlers
+            // @ts-ignore
+            const req = httpModule.request(reqOpt, m._onResponse);
             m._currentRequest = req;
             // @ts-ignore
             req.redirectReq = m;
@@ -549,7 +612,8 @@ let Request = class Request extends Duplex {
             // set tcp keep alive to prevent drop connection by peer
             req.on('socket', /** @param {*} socket */ (socket)=>{
                 // default interval of sending ack packet is 1 minute
-                socket.setKeepAlive(true, 1000 * 60);
+                // [FIX] 增加 socket 存在性检查，防止极少数情况下的 race condition
+                if (socket) socket.setKeepAlive(true, 1000 * 60);
             });
             // 请求error单独处理
             // 'error' 事件处理，避免错误将冒泡到全局导致程序崩溃
@@ -558,8 +622,9 @@ let Request = class Request extends Duplex {
                 ;
                 // @ts-ignore
                 log$1.error({
-                    errcode: err == null ? void 0 : err.code
-                }, 'request');
+                    errcode: err == null ? void 0 : err.code,
+                    msg: err == null ? void 0 : err.message
+                }, 'request error');
                 // @ts-ignore
                 switch(err == null ? void 0 : err.code){
                     case 'ENOTFOUND':
@@ -574,6 +639,10 @@ let Request = class Request extends Duplex {
                     case 'ECONNRESET':
                         m.emit('error', new ConnResetError());
                         break;
+                    // [FIX] 捕获证书错误，给予更友好的提示（虽然修复后不应再出现此错误）
+                    case 'DEPTH_ZERO_SELF_SIGNED_CERT':
+                        m.emit('error', utils.createErrorType('ERR_TLS_CERT', `SSL证书错误(自签名): ${err.message}`));
+                        break;
                     default:
                         m.emit('error', utils.createErrorType('ERR_CONNOTHER', `网络错误: ${err.message}`));
                 }
@@ -1049,7 +1118,7 @@ let Request = class Request extends Duplex {
         }
         // 响应流，用于读
         // @ts-ignore
-        responseStream = streams.length > 1 ? stream$1.pipeline(streams, utils.noop) : streams[0];
+        responseStream = streams.length > 1 ? stream.pipeline(streams, utils.noop) : streams[0];
         // 将内部 responseStream 可读流 映射到 redirectReq
         // @ts-ignore
         m.responseStream = responseStream;
@@ -1075,7 +1144,7 @@ let Request = class Request extends Duplex {
         }
         // 可读流结束，触发 finished，方便上层清理
         // A cleanup function which removes all registered listeners.
-        const offListeners = stream$1.finished(responseStream, ()=>{
+        const offListeners = stream.finished(responseStream, ()=>{
             offListeners() // cleanup
             ;
             this.emit('finished');

package/lib/request.js

@@ -6,7 +6,7 @@ import assert from 'assert';
 import http from 'http';
 import https from 'https';
 import mime from 'mime-types';
-import stream, { Duplex } from 'node:stream';
+import stream, { Duplex } from 'stream';
 import url from 'url';
 import zlib from 'zlib';
 import ZlibTransform from './ZlibTransform.js';
@@ -163,24 +163,88 @@ let Request = class Request extends Duplex {
             // agents 优于 agent
             if (agents) {
                 const scheme = protocol.slice(0, -1);
-                opt.agent = agents[scheme];
+                // [FIX] 仅当 agents 中存在对应协议的 agent 时才覆盖 opt.agent
+                // 防止 agents['https'] 为空时将 opt.agent 覆盖为 undefined，导致回退到 globalAgent
+                if (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;
+                    // 注意：这里修改的是局部变量 protocol，用于选择 httpModule
+                    // protocol 以proxy协议为准
+                    const { proxy } = agents.http;
+                    if (proxy && !agents.http.tunnel) protocol = proxy.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
+            // ============================================================
+            // [FIX] 针对 Bun 的终极修复：构建纯净的 Request Options
+            // ============================================================
+            // 1. 定义标准 Node.js http.request 接受的字段白名单
+            // 避免传入 agents, followRedirects 等杂质干扰 Bun 的解析
+            const nativeFields = [
+                'agent',
+                'auth',
+                'createConnection',
+                'defaultPort',
+                'family',
+                'headers',
+                'hints',
+                'host',
+                'hostname',
+                'insecureHTTPParser',
+                'localAddress',
+                'localPort',
+                'lookup',
+                'maxHeaderSize',
+                'method',
+                'path',
+                'port',
+                'protocol',
+                'rejectUnauthorized',
+                'servername',
+                'setHost',
+                'socketPath',
+                'timeout',
+                'signal'
+            ];
+            // 2. 创建纯净的 options 对象
+            const reqOpt = {};
+            // 3. 显式拷贝字段 (同时也解决了 [Object: null prototype] 问题)
+            for (const field of nativeFields){
+                if (opt[field] !== undefined) reqOpt[field] = opt[field];
+            }
+            // 端口修正逻辑 (保持不变)
+            if (!reqOpt.port) reqOpt.port = protocol === 'https:' ? 443 : 80;
+            else if (reqOpt.port) reqOpt.port = Number(reqOpt.port);
+            // 再次显式确保 agent 存在于新对象中 (防御性编程)
+            // if (opt.agent) reqOpt.agent = opt.agent
+            // ============================================================
+            // [FIX] 针对 Bun 的强制代理修复
+            // ============================================================
+            if (opt.agent) {
+                // 1. 仍然赋值 agent，以便 Node.js 环境正常工作
+                reqOpt.agent = opt.agent;
+                // 2. 【关键】针对 Bun：直接将 Agent 的创建连接方法暴露给 Request
+                // Bun 的 http.request 可能忽略 agent 对象，但通常会尊重 createConnection 选项
+                reqOpt.createConnection = (args, cb)=>{
+                    log({
+                        args
+                    }, 'Direct createConnection triggered via options');
+                    // 强制调用你的 Agent 的 createConnection
+                    // 注意：需要确保 this 上下文正确指向 opt.agent
+                    return opt.agent.createConnection(args, cb);
+                };
+            }
             log({
-                httpModule,
-                opt
+                reqOpt,
+                protocol,
+                agentType: reqOpt.agent ? 'custom' : 'global'
             }, 'request');
-            const req = httpModule.request(opt, m._onResponse);
+            // Create the native request and set up its event handlers
+            // @ts-ignore
+            const req = httpModule.request(reqOpt, m._onResponse);
             m._currentRequest = req;
             // @ts-ignore
             req.redirectReq = m;
@@ -189,7 +253,8 @@ let Request = class Request extends Duplex {
             // set tcp keep alive to prevent drop connection by peer
             req.on('socket', /** @param {*} socket */ (socket)=>{
                 // default interval of sending ack packet is 1 minute
-                socket.setKeepAlive(true, 1000 * 60);
+                // [FIX] 增加 socket 存在性检查，防止极少数情况下的 race condition
+                if (socket) socket.setKeepAlive(true, 1000 * 60);
             });
             // 请求error单独处理
             // 'error' 事件处理，避免错误将冒泡到全局导致程序崩溃
@@ -198,8 +263,9 @@ let Request = class Request extends Duplex {
                 ;
                 // @ts-ignore
                 log.error({
-                    errcode: err == null ? void 0 : err.code
-                }, 'request');
+                    errcode: err == null ? void 0 : err.code,
+                    msg: err == null ? void 0 : err.message
+                }, 'request error');
                 // @ts-ignore
                 switch(err == null ? void 0 : err.code){
                     case 'ENOTFOUND':
@@ -214,6 +280,10 @@ let Request = class Request extends Duplex {
                     case 'ECONNRESET':
                         m.emit('error', new ConnResetError());
                         break;
+                    // [FIX] 捕获证书错误，给予更友好的提示（虽然修复后不应再出现此错误）
+                    case 'DEPTH_ZERO_SELF_SIGNED_CERT':
+                        m.emit('error', utils.createErrorType('ERR_TLS_CERT', `SSL证书错误(自签名): ${err.message}`));
+                        break;
                     default:
                         m.emit('error', utils.createErrorType('ERR_CONNOTHER', `网络错误: ${err.message}`));
                 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@wiajs/request",
   "description": "Stream HTTP request client.",
   "keywords": ["http", "simple", "util", "utility"],
-  "version": "3.0.36",
+  "version": "3.0.39",
   "type": "module",
   "main": "index.js",
   "types": "types/index.d.ts",
@@ -43,7 +43,7 @@
     "access": "public"
   },
   "engines": {
-    "node": ">= 6"
+    "node": ">= 13.14"
   },
   "dependencies": {
     "@wiajs/log": "^4.3.18",