mm_https 1.6.7 → 1.6.9

package/index.js

@@ -5,7 +5,7 @@
  */
 const http = require('http');
 const https = require('https');
-const HttpProxyAgent = require('https-proxy-agent');
+const { ProxyAgent } = require('proxy-agent');
 const fs = require("fs");
 const {
 	createGunzip,
@@ -42,6 +42,16 @@ class Http {
 		 */
 		this._boundary = "";
 
+		/**
+		 * 代理agent缓存，复用连接
+		 */
+		var proxy_url = this._config.proxy;
+		this._agent = proxy_url ? new ProxyAgent({
+			getProxyForUrl: function () {
+				return proxy_url;
+			}
+		}) : null;
+
 		/**
 		 * headers协议头
 		 */
@@ -199,7 +209,7 @@ Http.prototype.httpOptions = function (options) {
 		type,
 		method: method || "GET",
 		headers: http_headers,
-		agent: cfg.proxy ? new HttpProxyAgent(cfg.proxy) : null,
+		agent: this._agent,
 		rejectUnauthorized: cfg.rejectUnauthorized,
 		timeout: options.timeout || cfg.timeout || 0,
 		stream_callback: stream_callback,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mm_https",
-	"version": "1.6.7",
+	"version": "1.6.9",
 	"description": "超级美眉HTTP请求模块 - 支持自动Cookie管理、代理设置、文件下载等功能",
 	"main": "index.js",
 	"scripts": {
@@ -30,11 +30,11 @@
 	},
 	"homepage": "https://gitee.com/qiuwenwu91/mm_https#readme",
 	"engines": {
-		"node": ">=12.0.0"
+		"node": ">=20.0.0"
 	},
 	"dependencies": {
-		"https-proxy-agent": "^9.1.0",
 		"iconv-lite": "^0.7.3",
-		"mm_expand": "^2.5.0"
+		"mm_expand": "^2.5.1",
+		"proxy-agent": "^8.0.2"
 	}
-}
+}

package/test.js

@@ -91,6 +91,34 @@ function startServer() {
 	return server;
 }
 
+/**
+ * 启动本地HTTP代理服务器（仅支持绝对URL转发，用于测试http代理）
+ * @returns {http.Server} 代理服务器实例
+ */
+function startProxyServer() {
+	var proxy = http.createServer(function (req, res) {
+		proxy.forwarded = (proxy.forwarded || 0) + 1;
+		var url = new URL(req.url);
+		var options = {
+			hostname: url.hostname,
+			port: url.port || 80,
+			path: url.pathname + url.search,
+			method: req.method,
+			headers: Object.assign({}, req.headers, { host: url.host })
+		};
+		var p_req = http.request(options, function (p_res) {
+			res.writeHead(p_res.statusCode, p_res.headers);
+			p_res.pipe(res);
+		});
+		p_req.on('error', function () {
+			res.writeHead(502, { 'Content-Type': 'text/plain' });
+			res.end('proxy error');
+		});
+		req.pipe(p_req);
+	});
+	return proxy;
+}
+
 /**
  * 主测试流程
  */
@@ -99,6 +127,9 @@ async function main() {
 	var server = startServer();
 	await new Promise(function (resolve) { server.listen(0, resolve); });
 	server_port = server.address().port;
+	var proxy = startProxyServer();
+	await new Promise(function (resolve) { proxy.listen(0, resolve); });
+	var proxy_port = proxy.address().port;
 	var client = new Http({ proxy: null });
 	var base = 'http://127.0.0.1:' + server_port;
 	var tmp_dir = path.join(__dirname, 'tmp_test');
@@ -198,11 +229,20 @@ async function main() {
 		var reader2 = new Readable({ read: function () { this.push(def); this.push(null); } });
 		out = await client.undata(reader2, null, 'utf8');
 		assert('undata deflate解压', out === 'hello inflate');
+
+		// 12. 代理
+		console.log('\n[PROXY]');
+		var proxy_client = new Http({ proxy: 'http://127.0.0.1:' + proxy_port });
+		res = await proxy_client.get(base + '/get?page=1');
+		assert('代理GET返回200', res.status === 200);
+		assert('代理GET内容正确', res.body.indexOf('ok') !== -1);
+		assert('请求确实经过代理', proxy.forwarded > 0);
 	} catch (e) {
 		console.error('测试异常:', e);
 		fail_count++;
 	} finally {
 		server.close();
+		proxy.close();
 		fs.rmSync(tmp_dir, { recursive: true, force: true });
 		console.log('\n== 测试结果: 通过 ' + pass_count + ', 失败 ' + fail_count + ' ==');
 		if (fail_count > 0) {