mm_https 1.7.0 → 1.7.2

package/example/index.js

@@ -0,0 +1,59 @@
+/**
+ * mm_https 模块最小可运行示例
+ * @description 演示 Http 客户端的 GET/POST 请求，
+ *              请求本地测试服务器，不访问外部网络
+ */
+const http = require('http');
+const { Http } = require('../index.js');
+
+/**
+ * 启动本地测试服务器
+ * @returns {http.Server} 服务器实例
+ */
+function startServer() {
+  const server = http.createServer(function (req, res) {
+    if (req.url.startsWith('/get')) {
+      res.writeHead(200, { 'Content-Type': 'application/json' });
+      res.end(JSON.stringify({ ok: true, path: req.url }));
+    } else if (req.url.startsWith('/post')) {
+      const body = [];
+      req.on('data', (c) => body.push(c));
+      req.on('end', function () {
+        res.writeHead(200, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ body: Buffer.concat(body).toString() }));
+      });
+    } else {
+      res.writeHead(404);
+      res.end('not found');
+    }
+  });
+  return server;
+}
+
+/**
+ * 主演示流程
+ */
+async function main() {
+  const server = startServer();
+  await new Promise((resolve) => server.listen(0, resolve));
+  const baseUrl = 'http://127.0.0.1:' + server.address().port;
+
+  try {
+    const client = new Http({ proxy: null });
+
+    // GET 请求
+    const getRes = await client.get(baseUrl + '/get?page=1');
+    console.log('GET 状态:', getRes.status, '| 响应:', getRes.body);
+
+    // POST JSON 请求
+    const postRes = await client.post(baseUrl + '/post', { a: 1, b: 'x' }, null, 'json');
+    console.log('POST 状态:', postRes.status, '| 响应:', postRes.body);
+  } finally {
+    server.close();
+  }
+}
+
+main().catch((err) => {
+  console.error('示例运行失败:', err);
+  process.exit(1);
+});

package/index.js

@@ -1,576 +1,17 @@
-/**
- * @fileOverview HTTP请求模块
- * @author <a href="http://qww.elins.cn">邱文武</a>
- * @version 1.2
- */
-const http = require('http');
-const https = require('https');
-const { ProxyAgent } = require('proxy-agent');
-const fs = require("fs");
-const {
-	createGunzip,
-	createInflate,
-	unzipSync
-} = require('zlib');
-const iconv = require('iconv-lite');
-require('mm_expand');
+const { Http } = require('./lib/http');
+const Admin = require('mm_corejs').Admin;
 
-/**
- * HTTP客户端类
- * @class
- */
-class Http {
-	/**
-	 * 创建HTTP客户端实例
-	 * @param {Object} config - 配置选项
-	 */
-	constructor(config) {
-		this._config = Object.assign({
-			headers: "",
-			rejectUnauthorized: false,
-			cookie: "",
-			proxy: null
-		}, config);
+const admin = new Admin();
+admin.setClass(Http);
 
-		/**
-		 * cookies缓存
-		 */
-		this._cookies = {};
-
-		/**
-		 * multipart表单边界值
-		 */
-		this._boundary = "";
-
-		/**
-		 * 代理agent缓存，复用连接
-		 */
-		var proxy_url = this._config.proxy;
-		this._agent = proxy_url ? new ProxyAgent({
-			getProxyForUrl: function () {
-				return proxy_url;
-			}
-		}) : null;
-
-		/**
-		 * headers协议头
-		 */
-		this._headers = {
-			'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9',
-			'Accept-Encoding': 'gzip, deflate',
-			'Accept-Language': 'zh-CN,zh;q=0.9',
-			'Cache-Control': 'no-cache',
-			'Connection': 'keep-alive',
-			'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36'
-		};
-
-		if (this._config.cookie) {
-			this.setCookie(this._config.cookie);
-		}
-
-		if (this._config.headers) {
-			var headers = this.changeHeaders(config.headers);
-			Object.assign(this._headers, headers);
-		}
-
-		this._logger = $.log || console;
-	}
-}
-
-/**
- * 日志记录
- * @param {string} level - 日志级别
- * @param {string} message - 日志消息
- * @param {...*} args - 日志参数
- */
-Http.prototype.log = function (level, message, ...args) {
-	this._logger[level](`[${this.constructor.name}] ${message}`, ...args);
-}
-
-/**
- * 设置Cookie
- * @param {Object|String} cookies - Cookie字符串
- */
-Http.prototype.setCookie = function (cookies) {
-	if (typeof (cookies) == "string") {
-		var arr = cookies.split('; ');
-		if (arr.length > 0) {
-			var kv_arr = arr[0].split("=");
-			this._cookies[kv_arr[0]] = encodeURIComponent(kv_arr[1]);
-		}
-	}
-	else if (typeof (cookies) == "object") {
-		Object.assign(this._cookies, cookies);
-	}
-}
-
-/**
- * 获取Cookie字符串
- * @returns {string} Cookie字符串
- */
-Http.prototype.getCookie = function () {
-	var cookies = this._cookies;
-	var str = "";
-	for (var key in cookies) {
-		str += "; " + key + "=" + cookies[key];
-	}
-	var cookie_str = str.replace("; ", "");
-	return cookie_str;
-}
-
-/**
- * 转换协议头
- * @param {Object|string} headers - 协议头
- * @returns {Object} 转换后的协议头对象
- */
-Http.prototype.changeHeaders = function (headers) {
-	if (headers) {
-		if (typeof (headers) == "string") {
-			if (headers.indexOf("{") === 0) {
-				return headers.toJson();
-			} else {
-				var header_dict = {};
-				var lines = headers.split('\n');
-				for (var i = 0; i < lines.length; i++) {
-					var line = lines[i].trim();
-					if (line) {
-						header_dict[line.left(":").trim()] = line.right(":").trim();
-					}
-				}
-				return header_dict;
-			}
-		} else {
-			return headers;
-		}
-	}
-	return {};
-}
-
-/**
- * 获取默认选项
- * @returns {Object} 默认选项对象
- */
-Http.prototype.options = function () {
-	return {
-		href: "",
-		method: "GET",
-		body: {},
-		proxy: "http://127.0.0.1:10809",
-		headers: Object.assign({}, this._headers)
-	}
-}
-
-/**
- * 生成HTTP选项
- * @param {Object} options - 选项参数
- * @returns {Object} HTTP选项对象
- */
-Http.prototype.httpOptions = function (options) {
-	var cfg = this._config;
-	var {
-		href,
-		body,
-		headers,
-		method,
-		cookie,
-		type,
-		stream_callback
-	} = options;
-	var url_obj = new URL(href);
-	var query = {};
-	url_obj.searchParams.forEach(function (value, key) {
-		query[key] = value;
-	});
-	var port = url_obj.port ? parseInt(url_obj.port, 10) : (url_obj.protocol === "https:" ? 443 : 80);
-	url_obj = {
-		href: url_obj.href,
-		protocol: url_obj.protocol,
-		host: url_obj.host,
-		hostname: url_obj.hostname,
-		port: port,
-		pathname: url_obj.pathname,
-		search: url_obj.search,
-		path: url_obj.pathname + url_obj.search,
-		query: query,
-		hash: url_obj.hash
-	};
-	if (cookie) {
-		this.setCookie(cookie);
-	}
-	var protocol = href.left(":/") || 'http';
-	var http_headers = headers ? Object.assign({}, this._headers, headers) : Object.assign({}, this._headers);
-	var cookie_str = this.getCookie();
-	if (cookie_str) {
-		http_headers['Cookie'] = cookie_str;
-	}
-	return Object.assign({}, {
-		host_protocol: protocol,
-		body,
-		type,
-		method: method || "GET",
-		headers: http_headers,
-		agent: this._agent,
-		rejectUnauthorized: cfg.rejectUnauthorized,
-		timeout: options.timeout || cfg.timeout || 0,
-		stream_callback: stream_callback,
-		cookie: cookie_str
-	}, url_obj);
-}
-
-/**
- * 处理POST选项
- * @param {Object} op - 选项对象
- */
-Http.prototype.postOption = function (op) {
-	var param = op.body;
-	var body_str = "";
-	var param_type = typeof (param);
-	var content_type = op.type;
-	if (param_type === "object") {
-		if (!content_type) {
-			content_type = 'application/json; charset=UTF-8';
-		}
-		if (content_type.indexOf('multipart') !== -1 || content_type.indexOf('form-data') !== -1) {
-			body_str = this.multipartBody(param);
-			content_type = "multipart/form-data; boundary=" + this._boundary;
-		} else if (content_type.indexOf('json') !== -1) {
-			body_str = JSON.stringify(param);
-			content_type = "application/json; charset=UTF-8";
-		} else if (content_type.indexOf('html') !== -1) {
-			body_str = $.toXml(param);
-			content_type = "text/html; charset=UTF-8";
-		} else if (content_type.indexOf('form') !== -1) {
-			body_str = $.toUrl(param);
-			content_type = "application/x-www-form-urlencoded";
-		} else {
-			body_str = $.toXml(param);
-			content_type = "text/plain; charset=UTF-8";
-		}
-	} else {
-		body_str = param.trim();
-		if (!content_type) {
-			if (body_str.startsWith('{') && body_str.endsWith('}')) {
-				content_type = "application/json; charset=UTF-8";
-			} else if (body_str.startsWith('[') && body_str.endsWith(']')) {
-				content_type = "application/json; charset=UTF-8";
-			} else if (body_str.indexOf("<html>") !== -1) {
-				content_type = "text/html";
-			} else {
-				content_type = "text/plain; charset=UTF-8";
-			}
-		}
-	}
-	op.body = body_str;
-	if (!op.headers['Content-Type']) {
-		op.headers['Content-Type'] = content_type;
-	}
-	op.headers['Content-Length'] = Buffer.byteLength(body_str);
-}
-
-/**
- * 生成multipart/form-data请求体
- * @param {Object} param - 表单参数，文件字段值为 {value, filename, content_type}
- * @returns {Buffer} multipart请求体
- */
-Http.prototype.multipartBody = function (param) {
-	var boundary = "----mm_https_" + Date.now().toString(16);
-	this._boundary = boundary;
-	var chunks = [];
-	for (var key in param) {
-		var value = param[key];
-		var value_type = typeof (value);
-		if (value_type === "object" && value !== null) {
-			var filename = value.filename || key;
-			var file_type = value.content_type || "application/octet-stream";
-			var content = value.value;
-			if (!Buffer.isBuffer(content)) {
-				content = Buffer.from(String(content));
-			}
-			chunks.push(Buffer.from('--' + boundary + '\r\nContent-Disposition: form-data; name="' + key + '"; filename="' + filename + '"\r\nContent-Type: ' + file_type + '\r\n\r\n'));
-			chunks.push(content);
-			chunks.push(Buffer.from('\r\n'));
-		} else {
-			chunks.push(Buffer.from('--' + boundary + '\r\nContent-Disposition: form-data; name="' + key + '"\r\n\r\n' + value + '\r\n'));
-		}
-	}
-	chunks.push(Buffer.from('--' + boundary + '--\r\n'));
-	return Buffer.concat(chunks);
-}
-
-/**
- * HTTP请求
- * @param {Object} options - 配置选项
- * @returns {Promise<Object>} 执行结果
- */
-Http.prototype.req = async function (options) {
-	var op = this.httpOptions(options);
-	if (op.method.toLocaleUpperCase() === "POST") {
-		this.postOption(op);
-	}
-	var res = await this.request(op);
-	var redirects = [301, 302, 303, 307, 308];
-	var count = 0;
-	while (redirects.indexOf(res.status.code) !== -1) {
-		if (++count > 5) {
-			throw new Error("重定向次数超过上限(5次)");
-		}
-		var location = res.headers.location;
-		if (!location) {
-			break;
-		}
-		var redirect_url = new URL(location, op.href).href;
-		options.href = redirect_url;
-		op = this.httpOptions(options);
-		op.referer = redirect_url;
-		res = await this.request(op);
-	}
-	return res;
-}
-
-/**
- * 解压数据流
- * @param {Stream} stream - 输入数据流
- * @param {string} encoding - 压缩方式，gzip使用gunzip，其他使用inflate
- * @param {string} charset - 字符编码，指定时返回字符串
- * @returns {Promise<Buffer|string>} 解压后的数据
- */
-Http.prototype.undata = function (stream, encoding, charset) {
-	var buf_arr = [];
-	return new Promise(function (resolve, reject) {
-		var zpipe = encoding ? createGunzip() : createInflate();
-		zpipe.on('data', function (d) {
-			buf_arr.push(d);
-		}).on('end', function () {
-			var buffer = Buffer.concat(buf_arr);
-			resolve(charset ? buffer.toString(charset) : buffer);
-		}).on('error', function (err) {
-			reject(err);
-		});
-		stream.on('error', function (err) {
-			reject(err);
-		});
-		stream.pipe(zpipe);
-	});
-}
-
-/**
- * 发送请求
- * @param {Object} options - 配置选项
- * @returns {Promise<Object>} 请求结果
- */
-Http.prototype.request = function (options) {
-	var protocol = options.host_protocol === "https" ? https : http;
-	var self = this;
-	return new Promise(function (resolve, reject) {
-		var body = '';
-		var req = protocol.request(options, (res) => {
-			var {
-				headers
-			} = res;
-			var status_code = res.statusCode;
-			var cookie_list = headers['set-cookie'];
-			if (cookie_list) {
-				var len = cookie_list.length;
-				for (var i = 0; i < len; i++) {
-					self.setCookie(cookie_list[i]);
-				}
-			}
-
-			// 流式下载：仅对成功响应生效
-			if (status_code >= 200 && status_code < 300 && options.stream_callback) {
-				var stream = options.stream_callback(headers);
-				if (stream) {
-					res.on('error', function (err) {
-						reject(err);
-					});
-					res.pipe(stream);
-					stream.on('finish', function () {
-						resolve({
-							status: status_code,
-							headers
-					});
-					});
-					stream.on('error', function (err) {
-						reject(err);
-					});
-					return;
-				}
-			}
-
-			var chunks = [];
-			var encoding = headers['content-encoding'];
-
-			res.on('data', function (chunk) {
-				chunks.push(chunk);
-			}).on('end', function () {
-				var buffer = Buffer.concat(chunks);
-				switch (encoding) {
-					case 'br':
-					case 'gzip':
-					case 'deflate':
-						buffer = unzipSync(buffer);
-						body = buffer.toString();
-						break;
-					default:
-						body = buffer.toString();
-						break;
-				}
-				var charset_match = body.match(/charset=gb2312"/i);
-				if (charset_match) {
-					body = iconv.decode(buffer, 'gb2312');
-				} else {
-					charset_match = body.match(/charset=GBK"/i);
-					if (charset_match) {
-						body = iconv.decode(buffer, 'GBK');
-					}
-				}
-				if (status_code >= 200 && status_code < 300) {
-					resolve({
-						status: status_code,
-						headers,
-						buffer,
-						body
-					});
-				} else {
-					resolve({
-						headers,
-						status: {
-							code: status_code,
-							message: res.statusMessage
-						},
-						buffer,
-						body
-					});
-				}
-			});
-		});
-
-		req.on("error", function (err) {
-			self.log("debug", "错误", err);
-			resolve({
-				status: 0,
-				message: err.message
-			});
-		});
-		if (options.timeout) {
-			req.setTimeout(options.timeout, function () {
-				req.destroy(new Error("请求超时"));
-			});
-		}
-		if (options.method.toLocaleUpperCase() == "POST") {
-			req.write(options.body);
-		}
-		req.end();
-	});
-}
-
-/**
- * GET请求
- * @param {string} url - 请求地址
- * @param {Object} headers - 请求头
- * @param {string} cookie - Cookie字符串
- * @returns {Promise<Object>} 响应结果
- */
-Http.prototype.get = async function (url, headers, cookie) {
-	return await this.req({
-		method: "GET",
-		href: url,
-		headers,
-		cookie
-	});
-};
-
-/**
- * POST请求
- * @param {string} url - 请求地址
- * @param {Object} body - 提交参数
- * @param {Object} headers - 请求头
- * @param {string} type - 传参方式 json, form, text
- * @param {string} cookie - Cookie字符串
- * @returns {Promise<Object>} 响应结果
- */
-Http.prototype.post = async function (url, body, headers, type, cookie) {
-	return await this.req({
-		method: "POST",
-		href: url,
-		body,
-		type,
-		headers,
-		cookie
-	});
-};
-
-/**
- * 上传文件
- * @param {string} url - 请求地址
- * @param {Object} body - 表单参数，文件字段值为 {value: Buffer|string, filename, content_type}
- * @param {Object} headers - 请求头
- * @param {string} cookie - Cookie字符串
- * @returns {Promise<Object>} 响应结果
- */
-Http.prototype.upload = async function (url, body, headers, cookie) {
-	return await this.req({
-		method: "POST",
-		href: url,
-		body,
-		type: "form-data",
-		headers,
-		cookie
-	});
-};
-
-/**
- * 下载文件
- * @param {string} url - 下载地址
- * @param {string} filename - 文件名
- * @param {string} auto - 自动类型
- * @param {Object} headers - 协议头
- * @param {string} cookie - Cookie字符串
- * @returns {Promise<string>} 成功返回保存路径，失败返回null
- */
-Http.prototype.download = async function (url, filename, auto, headers, cookie) {
-	var self = this;
-	var file_path = null;
-	await this.request(this.httpOptions({
-		method: "GET",
-		href: url,
-		headers,
-		cookie,
-		stream_callback: function (res_headers) {
-			var ext = "";
-			if (auto) {
-				var parts = url.split('/');
-				var full_name = parts[parts.length - 1];
-				if (full_name.indexOf('.') !== -1) {
-					ext = full_name.right('.');
-				}
-				if (!ext) {
-					var content_type = res_headers["content-type"] || "";
-					ext = content_type.replace("image/", "").replace("application/x-", "").replace("text/", "")
-						.replace("audio/", "").replace("jpeg", "jpg").split(";")[0].trim();
-				}
-			}
-			file_path = ext ? filename + "." + ext : filename;
-			if (!file_path) {
-				self.log("debug", '保存文件名(filename)不能为空!');
-				return null;
-			}
-			return fs.createWriteStream(file_path);
-		}
-	}));
-	return file_path;
-};
-
-/**
- * 清除缓存
- */
-Http.prototype.clear = function () {
-	this._cookies = {};
-};
-
-/**
- * 导出构造函数
- */
 module.exports = {
-	Http
-};
+  Http,
+  admin,
+  httpAdmin(scope, config) {
+    if (!scope) {
+      scope = 'os';
+    }
+    admin.set(scope, config);
+    return admin;
+  }
+}

package/{cookie.js → lib/cookie.js}

@@ -1,4 +1,5 @@
-require('mm_expand');
+require('mm_helper');
+const { push } = require('mm_helper');
 
 /**
  * @class Cookie类
@@ -108,7 +109,7 @@ Cookie.prototype.str = function(str) {
 		var domain = cookie.domain;
 		var obj = this.get(name, path, domain);
 		if (obj) {
-			$.push(obj, cookie, true);
+			push(obj, cookie, true);
 		} else {
 			this.list.push(cookie);
 		}

package/lib/http.js

@@ -0,0 +1,577 @@
+/**
+ * @fileOverview HTTP请求模块
+ * @author <a href="http://qww.elins.cn">邱文武</a>
+ * @version 1.2
+ */
+const http = require('http');
+const https = require('https');
+const { ProxyAgent } = require('proxy-agent');
+const fs = require("fs");
+const {
+	createGunzip,
+	createInflate,
+	unzipSync
+} = require('zlib');
+const iconv = require('iconv-lite');
+require('mm_helper');
+const { toXml, toUrl } = require('mm_helper');
+
+/**
+ * HTTP客户端类
+ * @class
+ */
+class Http {
+	/**
+	 * 创建HTTP客户端实例
+	 * @param {Object} config - 配置选项
+	 */
+	constructor(config) {
+		this._config = Object.assign({
+			headers: "",
+			rejectUnauthorized: false,
+			cookie: "",
+			proxy: null
+		}, config);
+
+		/**
+		 * cookies缓存
+		 */
+		this._cookies = {};
+
+		/**
+		 * multipart表单边界值
+		 */
+		this._boundary = "";
+
+		/**
+		 * 代理agent缓存，复用连接
+		 */
+		var proxy_url = this._config.proxy;
+		this._agent = proxy_url ? new ProxyAgent({
+			getProxyForUrl: function () {
+				return proxy_url;
+			}
+		}) : null;
+
+		/**
+		 * headers协议头
+		 */
+		this._headers = {
+			'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9',
+			'Accept-Encoding': 'gzip, deflate',
+			'Accept-Language': 'zh-CN,zh;q=0.9',
+			'Cache-Control': 'no-cache',
+			'Connection': 'keep-alive',
+			'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36'
+		};
+
+		if (this._config.cookie) {
+			this.setCookie(this._config.cookie);
+		}
+
+		if (this._config.headers) {
+			var headers = this.changeHeaders(config.headers);
+			Object.assign(this._headers, headers);
+		}
+
+		this._logger = console;
+	}
+}
+
+/**
+ * 日志记录
+ * @param {string} level - 日志级别
+ * @param {string} message - 日志消息
+ * @param {...*} args - 日志参数
+ */
+Http.prototype.log = function (level, message, ...args) {
+	this._logger[level](`[${this.constructor.name}] ${message}`, ...args);
+}
+
+/**
+ * 设置Cookie
+ * @param {Object|String} cookies - Cookie字符串
+ */
+Http.prototype.setCookie = function (cookies) {
+	if (typeof (cookies) == "string") {
+		var arr = cookies.split('; ');
+		if (arr.length > 0) {
+			var kv_arr = arr[0].split("=");
+			this._cookies[kv_arr[0]] = encodeURIComponent(kv_arr[1]);
+		}
+	}
+	else if (typeof (cookies) == "object") {
+		Object.assign(this._cookies, cookies);
+	}
+}
+
+/**
+ * 获取Cookie字符串
+ * @returns {string} Cookie字符串
+ */
+Http.prototype.getCookie = function () {
+	var cookies = this._cookies;
+	var str = "";
+	for (var key in cookies) {
+		str += "; " + key + "=" + cookies[key];
+	}
+	var cookie_str = str.replace("; ", "");
+	return cookie_str;
+}
+
+/**
+ * 转换协议头
+ * @param {Object|string} headers - 协议头
+ * @returns {Object} 转换后的协议头对象
+ */
+Http.prototype.changeHeaders = function (headers) {
+	if (headers) {
+		if (typeof (headers) == "string") {
+			if (headers.indexOf("{") === 0) {
+				return headers.toJson();
+			} else {
+				var header_dict = {};
+				var lines = headers.split('\n');
+				for (var i = 0; i < lines.length; i++) {
+					var line = lines[i].trim();
+					if (line) {
+						header_dict[line.left(":").trim()] = line.right(":").trim();
+					}
+				}
+				return header_dict;
+			}
+		} else {
+			return headers;
+		}
+	}
+	return {};
+}
+
+/**
+ * 获取默认选项
+ * @returns {Object} 默认选项对象
+ */
+Http.prototype.options = function () {
+	return {
+		href: "",
+		method: "GET",
+		body: {},
+		proxy: "http://127.0.0.1:10809",
+		headers: Object.assign({}, this._headers)
+	}
+}
+
+/**
+ * 生成HTTP选项
+ * @param {Object} options - 选项参数
+ * @returns {Object} HTTP选项对象
+ */
+Http.prototype.httpOptions = function (options) {
+	var cfg = this._config;
+	var {
+		href,
+		body,
+		headers,
+		method,
+		cookie,
+		type,
+		stream_callback
+	} = options;
+	var url_obj = new URL(href);
+	var query = {};
+	url_obj.searchParams.forEach(function (value, key) {
+		query[key] = value;
+	});
+	var port = url_obj.port ? parseInt(url_obj.port, 10) : (url_obj.protocol === "https:" ? 443 : 80);
+	url_obj = {
+		href: url_obj.href,
+		protocol: url_obj.protocol,
+		host: url_obj.host,
+		hostname: url_obj.hostname,
+		port: port,
+		pathname: url_obj.pathname,
+		search: url_obj.search,
+		path: url_obj.pathname + url_obj.search,
+		query: query,
+		hash: url_obj.hash
+	};
+	if (cookie) {
+		this.setCookie(cookie);
+	}
+	var protocol = href.left(":/") || 'http';
+	var http_headers = headers ? Object.assign({}, this._headers, headers) : Object.assign({}, this._headers);
+	var cookie_str = this.getCookie();
+	if (cookie_str) {
+		http_headers['Cookie'] = cookie_str;
+	}
+	return Object.assign({}, {
+		host_protocol: protocol,
+		body,
+		type,
+		method: method || "GET",
+		headers: http_headers,
+		agent: this._agent,
+		rejectUnauthorized: cfg.rejectUnauthorized,
+		timeout: options.timeout || cfg.timeout || 0,
+		stream_callback: stream_callback,
+		cookie: cookie_str
+	}, url_obj);
+}
+
+/**
+ * 处理POST选项
+ * @param {Object} op - 选项对象
+ */
+Http.prototype.postOption = function (op) {
+	var param = op.body;
+	var body_str = "";
+	var param_type = typeof (param);
+	var content_type = op.type;
+	if (param_type === "object") {
+		if (!content_type) {
+			content_type = 'application/json; charset=UTF-8';
+		}
+		if (content_type.indexOf('multipart') !== -1 || content_type.indexOf('form-data') !== -1) {
+			body_str = this.multipartBody(param);
+			content_type = "multipart/form-data; boundary=" + this._boundary;
+		} else if (content_type.indexOf('json') !== -1) {
+			body_str = JSON.stringify(param);
+			content_type = "application/json; charset=UTF-8";
+		} else if (content_type.indexOf('html') !== -1) {
+			body_str = toXml(param);
+			content_type = "text/html; charset=UTF-8";
+		} else if (content_type.indexOf('form') !== -1) {
+			body_str = toUrl(param);
+			content_type = "application/x-www-form-urlencoded";
+		} else {
+			body_str = toXml(param);
+			content_type = "text/plain; charset=UTF-8";
+		}
+	} else {
+		body_str = param.trim();
+		if (!content_type) {
+			if (body_str.startsWith('{') && body_str.endsWith('}')) {
+				content_type = "application/json; charset=UTF-8";
+			} else if (body_str.startsWith('[') && body_str.endsWith(']')) {
+				content_type = "application/json; charset=UTF-8";
+			} else if (body_str.indexOf("<html>") !== -1) {
+				content_type = "text/html";
+			} else {
+				content_type = "text/plain; charset=UTF-8";
+			}
+		}
+	}
+	op.body = body_str;
+	if (!op.headers['Content-Type']) {
+		op.headers['Content-Type'] = content_type;
+	}
+	op.headers['Content-Length'] = Buffer.byteLength(body_str);
+}
+
+/**
+ * 生成multipart/form-data请求体
+ * @param {Object} param - 表单参数，文件字段值为 {value, filename, content_type}
+ * @returns {Buffer} multipart请求体
+ */
+Http.prototype.multipartBody = function (param) {
+	var boundary = "----mm_https_" + Date.now().toString(16);
+	this._boundary = boundary;
+	var chunks = [];
+	for (var key in param) {
+		var value = param[key];
+		var value_type = typeof (value);
+		if (value_type === "object" && value !== null) {
+			var filename = value.filename || key;
+			var file_type = value.content_type || "application/octet-stream";
+			var content = value.value;
+			if (!Buffer.isBuffer(content)) {
+				content = Buffer.from(String(content));
+			}
+			chunks.push(Buffer.from('--' + boundary + '\r\nContent-Disposition: form-data; name="' + key + '"; filename="' + filename + '"\r\nContent-Type: ' + file_type + '\r\n\r\n'));
+			chunks.push(content);
+			chunks.push(Buffer.from('\r\n'));
+		} else {
+			chunks.push(Buffer.from('--' + boundary + '\r\nContent-Disposition: form-data; name="' + key + '"\r\n\r\n' + value + '\r\n'));
+		}
+	}
+	chunks.push(Buffer.from('--' + boundary + '--\r\n'));
+	return Buffer.concat(chunks);
+}
+
+/**
+ * HTTP请求
+ * @param {Object} options - 配置选项
+ * @returns {Promise<Object>} 执行结果
+ */
+Http.prototype.req = async function (options) {
+	var op = this.httpOptions(options);
+	if (op.method.toLocaleUpperCase() === "POST") {
+		this.postOption(op);
+	}
+	var res = await this.request(op);
+	var redirects = [301, 302, 303, 307, 308];
+	var count = 0;
+	while (redirects.indexOf(res.status.code) !== -1) {
+		if (++count > 5) {
+			throw new Error("重定向次数超过上限(5次)");
+		}
+		var location = res.headers.location;
+		if (!location) {
+			break;
+		}
+		var redirect_url = new URL(location, op.href).href;
+		options.href = redirect_url;
+		op = this.httpOptions(options);
+		op.referer = redirect_url;
+		res = await this.request(op);
+	}
+	return res;
+}
+
+/**
+ * 解压数据流
+ * @param {Stream} stream - 输入数据流
+ * @param {string} encoding - 压缩方式，gzip使用gunzip，其他使用inflate
+ * @param {string} charset - 字符编码，指定时返回字符串
+ * @returns {Promise<Buffer|string>} 解压后的数据
+ */
+Http.prototype.undata = function (stream, encoding, charset) {
+	var buf_arr = [];
+	return new Promise(function (resolve, reject) {
+		var zpipe = encoding ? createGunzip() : createInflate();
+		zpipe.on('data', function (d) {
+			buf_arr.push(d);
+		}).on('end', function () {
+			var buffer = Buffer.concat(buf_arr);
+			resolve(charset ? buffer.toString(charset) : buffer);
+		}).on('error', function (err) {
+			reject(err);
+		});
+		stream.on('error', function (err) {
+			reject(err);
+		});
+		stream.pipe(zpipe);
+	});
+}
+
+/**
+ * 发送请求
+ * @param {Object} options - 配置选项
+ * @returns {Promise<Object>} 请求结果
+ */
+Http.prototype.request = function (options) {
+	var protocol = options.host_protocol === "https" ? https : http;
+	var self = this;
+	return new Promise(function (resolve, reject) {
+		var body = '';
+		var req = protocol.request(options, (res) => {
+			var {
+				headers
+			} = res;
+			var status_code = res.statusCode;
+			var cookie_list = headers['set-cookie'];
+			if (cookie_list) {
+				var len = cookie_list.length;
+				for (var i = 0; i < len; i++) {
+					self.setCookie(cookie_list[i]);
+				}
+			}
+
+			// 流式下载：仅对成功响应生效
+			if (status_code >= 200 && status_code < 300 && options.stream_callback) {
+				var stream = options.stream_callback(headers);
+				if (stream) {
+					res.on('error', function (err) {
+						reject(err);
+					});
+					res.pipe(stream);
+					stream.on('finish', function () {
+						resolve({
+							status: status_code,
+							headers
+					});
+					});
+					stream.on('error', function (err) {
+						reject(err);
+					});
+					return;
+				}
+			}
+
+			var chunks = [];
+			var encoding = headers['content-encoding'];
+
+			res.on('data', function (chunk) {
+				chunks.push(chunk);
+			}).on('end', function () {
+				var buffer = Buffer.concat(chunks);
+				switch (encoding) {
+					case 'br':
+					case 'gzip':
+					case 'deflate':
+						buffer = unzipSync(buffer);
+						body = buffer.toString();
+						break;
+					default:
+						body = buffer.toString();
+						break;
+				}
+				var charset_match = body.match(/charset=gb2312"/i);
+				if (charset_match) {
+					body = iconv.decode(buffer, 'gb2312');
+				} else {
+					charset_match = body.match(/charset=GBK"/i);
+					if (charset_match) {
+						body = iconv.decode(buffer, 'GBK');
+					}
+				}
+				if (status_code >= 200 && status_code < 300) {
+					resolve({
+						status: status_code,
+						headers,
+						buffer,
+						body
+					});
+				} else {
+					resolve({
+						headers,
+						status: {
+							code: status_code,
+							message: res.statusMessage
+						},
+						buffer,
+						body
+					});
+				}
+			});
+		});
+
+		req.on("error", function (err) {
+			self.log("debug", "错误", err);
+			resolve({
+				status: 0,
+				message: err.message
+			});
+		});
+		if (options.timeout) {
+			req.setTimeout(options.timeout, function () {
+				req.destroy(new Error("请求超时"));
+			});
+		}
+		if (options.method.toLocaleUpperCase() == "POST") {
+			req.write(options.body);
+		}
+		req.end();
+	});
+}
+
+/**
+ * GET请求
+ * @param {string} url - 请求地址
+ * @param {Object} headers - 请求头
+ * @param {string} cookie - Cookie字符串
+ * @returns {Promise<Object>} 响应结果
+ */
+Http.prototype.get = async function (url, headers, cookie) {
+	return await this.req({
+		method: "GET",
+		href: url,
+		headers,
+		cookie
+	});
+};
+
+/**
+ * POST请求
+ * @param {string} url - 请求地址
+ * @param {Object} body - 提交参数
+ * @param {Object} headers - 请求头
+ * @param {string} type - 传参方式 json, form, text
+ * @param {string} cookie - Cookie字符串
+ * @returns {Promise<Object>} 响应结果
+ */
+Http.prototype.post = async function (url, body, headers, type, cookie) {
+	return await this.req({
+		method: "POST",
+		href: url,
+		body,
+		type,
+		headers,
+		cookie
+	});
+};
+
+/**
+ * 上传文件
+ * @param {string} url - 请求地址
+ * @param {Object} body - 表单参数，文件字段值为 {value: Buffer|string, filename, content_type}
+ * @param {Object} headers - 请求头
+ * @param {string} cookie - Cookie字符串
+ * @returns {Promise<Object>} 响应结果
+ */
+Http.prototype.upload = async function (url, body, headers, cookie) {
+	return await this.req({
+		method: "POST",
+		href: url,
+		body,
+		type: "form-data",
+		headers,
+		cookie
+	});
+};
+
+/**
+ * 下载文件
+ * @param {string} url - 下载地址
+ * @param {string} filename - 文件名
+ * @param {string} auto - 自动类型
+ * @param {Object} headers - 协议头
+ * @param {string} cookie - Cookie字符串
+ * @returns {Promise<string>} 成功返回保存路径，失败返回null
+ */
+Http.prototype.download = async function (url, filename, auto, headers, cookie) {
+	var self = this;
+	var file_path = null;
+	await this.request(this.httpOptions({
+		method: "GET",
+		href: url,
+		headers,
+		cookie,
+		stream_callback: function (res_headers) {
+			var ext = "";
+			if (auto) {
+				var parts = url.split('/');
+				var full_name = parts[parts.length - 1];
+				if (full_name.indexOf('.') !== -1) {
+					ext = full_name.right('.');
+				}
+				if (!ext) {
+					var content_type = res_headers["content-type"] || "";
+					ext = content_type.replace("image/", "").replace("application/x-", "").replace("text/", "")
+						.replace("audio/", "").replace("jpeg", "jpg").split(";")[0].trim();
+				}
+			}
+			file_path = ext ? filename + "." + ext : filename;
+			if (!file_path) {
+				self.log("debug", '保存文件名(filename)不能为空!');
+				return null;
+			}
+			return fs.createWriteStream(file_path);
+		}
+	}));
+	return file_path;
+};
+
+/**
+ * 清除缓存
+ */
+Http.prototype.clear = function () {
+	this._cookies = {};
+};
+
+/**
+ * 导出构造函数
+ */
+module.exports = {
+	Http
+};

package/package.json

@@ -1,40 +1,46 @@
-{
-	"name": "mm_https",
-	"version": "1.7.0",
-	"description": "超级美眉HTTP请求模块 - 支持自动Cookie管理、代理设置、文件下载等功能",
-	"main": "index.js",
-	"scripts": {
-		"test": "node test.js",
-		"dev": "nodemon test.js"
-	},
-	"repository": {
-		"type": "git",
-		"url": "git+https://gitee.com/qiuwenwu91/mm_https.git"
-	},
-	"keywords": [
-		"http",
-		"https",
-		"request",
-		"async",
-		"promise",
-		"cookie",
-		"proxy",
-		"download",
-		"nodejs",
-		"http-client"
-	],
-	"author": "邱文武",
-	"license": "ISC",
-	"bugs": {
-		"url": "https://gitee.com/qiuwenwu91/mm_https/issues"
-	},
-	"homepage": "https://gitee.com/qiuwenwu91/mm_https#readme",
-	"engines": {
-		"node": ">=20.0.0"
-	},
-	"dependencies": {
-		"iconv-lite": "^0.7.3",
-		"mm_expand": "^2.5.3",
-		"proxy-agent": "^8.0.2"
-	}
-}
+{
+    "name": "mm_https",
+    "version": "1.7.2",
+    "description": "超级美眉HTTP请求模块 - 支持自动Cookie管理、代理设置、文件下载等功能",
+    "main": "index.js",
+    "scripts": {
+        "test": "node test.js",
+        "dev": "nodemon test.js"
+    },
+    "repository": {
+        "type": "git",
+        "url": "git+https://gitee.com/qiuwenwu91/mm_https.git"
+    },
+    "keywords": [
+        "mm_mod",
+        "mm_infra",
+        "mm_http_client",
+        "http",
+        "https",
+        "request",
+        "async",
+        "promise",
+        "cookie",
+        "proxy",
+        "download",
+        "nodejs",
+        "http-client"
+    ],
+    "layer": "adapter",
+    "group": "http_client",
+    "author": "邱文武",
+    "license": "ISC",
+    "bugs": {
+        "url": "https://gitee.com/qiuwenwu91/mm_https/issues"
+    },
+    "homepage": "https://gitee.com/qiuwenwu91/mm_https#readme",
+    "engines": {
+        "node": ">=20.0.0"
+    },
+    "dependencies": {
+        "iconv-lite": "^0.7.3",
+        "mm_corejs": "^1.1.6",
+        "mm_helper": "^1.0.0",
+        "proxy-agent": "^8.0.2"
+    }
+}