mm_https 1.6.5 → 1.6.7

package/eslint.config.js

@@ -0,0 +1,68 @@
+const jsdoc = require('eslint-plugin-jsdoc');
+
+module.exports = [
+  {
+    files: ['index.js','lib/**/*.js'],
+    languageOptions: {
+      ecmaVersion: 2020,
+      sourceType: 'script'
+    },
+    plugins: {
+      jsdoc: jsdoc
+    },
+    rules: {
+      // JSDoc相关规则 - 设置为error级别强制要求
+      'jsdoc/require-jsdoc': ['error', {
+        require: {
+          FunctionDeclaration: true,
+          MethodDefinition: true,
+          ClassDeclaration: true,
+          ArrowFunctionExpression: true
+        }
+      }],
+      'jsdoc/check-param-names': 'off',
+      'jsdoc/check-tag-names': 'off',
+      'jsdoc/check-types': 'off',
+      'jsdoc/require-param': 'off',
+      'jsdoc/require-param-description': 'off',
+      'jsdoc/require-returns': 'off',
+      'jsdoc/require-returns-description': 'off',
+      
+      // 基础语法规则
+      'no-unused-vars': ['error', { args: 'none', vars: 'all' }],
+      'no-console': 'warn',
+      
+      // 代码风格规则
+      'indent': ['error', 2],
+      'quotes': ['error', 'single'],
+      'semi': ['error', 'always'],
+      'comma-dangle': ['error', 'never'],
+      'no-trailing-spaces': 'error',
+      'eol-last': 'error',
+      'max-len': ['error', { code: 100 }],
+      'max-lines-per-function': ['error', { max: 40 }],
+      'complexity': ['error', 12],
+      'max-depth': ['error', 4],
+      'max-params': ['error', 4],
+      
+      // 命名规则
+      'id-length': ['error', {
+        min: 1,
+        max: 20,
+        properties: 'always'
+      }]
+    }
+  },
+  {
+    files: ['test/**/*.js'],
+    languageOptions: {
+      ecmaVersion: 2020,
+      sourceType: 'script'
+    },
+    rules: {
+      // 测试文件中允许使用console
+      'no-console': 'off',
+      'no-unused-vars': 'off'
+    }
+  }
+];

package/index.js

@@ -5,10 +5,11 @@
  */
 const http = require('http');
 const https = require('https');
-const Url = require('url');
 const HttpProxyAgent = require('https-proxy-agent');
 const fs = require("fs");
 const {
+	createGunzip,
+	createInflate,
 	unzipSync
 } = require('zlib');
 const iconv = require('iconv-lite');
@@ -36,6 +37,11 @@ class Http {
 		 */
 		this._cookies = {};
 
+		/**
+		 * multipart表单边界值
+		 */
+		this._boundary = "";
+
 		/**
 		 * headers协议头
 		 */
@@ -56,9 +62,21 @@ class Http {
 			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字符串
@@ -66,14 +84,9 @@ class Http {
 Http.prototype.setCookie = function (cookies) {
 	if (typeof (cookies) == "string") {
 		var arr = cookies.split('; ');
-		var name;
 		if (arr.length > 0) {
-			for (var i = 0; i < arr.length; i++) {
-				var kv = arr[i];
-				var kvArr = kv.split("=");
-				name = kvArr[0];
-				this._cookies[name] = encodeURIComponent(kvArr[1]);
-			}
+			var kv_arr = arr[0].split("=");
+			this._cookies[kv_arr[0]] = encodeURIComponent(kv_arr[1]);
 		}
 	}
 	else if (typeof (cookies) == "object") {
@@ -91,8 +104,8 @@ Http.prototype.getCookie = function () {
 	for (var key in cookies) {
 		str += "; " + key + "=" + cookies[key];
 	}
-	var cookieStr = str.replace("; ", "");
-	return cookieStr;
+	var cookie_str = str.replace("; ", "");
+	return cookie_str;
 }
 
 /**
@@ -106,15 +119,15 @@ Http.prototype.changeHeaders = function (headers) {
 			if (headers.indexOf("{") === 0) {
 				return headers.toJson();
 			} else {
-				var headerDict = {};
+				var header_dict = {};
 				var lines = headers.split('\n');
 				for (var i = 0; i < lines.length; i++) {
 					var line = lines[i].trim();
 					if (line) {
-						headerDict[line.left(":").trim()] = line.right(":").trim();
+						header_dict[line.left(":").trim()] = line.right(":").trim();
 					}
 				}
-				return headerDict;
+				return header_dict;
 			}
 		} else {
 			return headers;
@@ -150,22 +163,48 @@ Http.prototype.httpOptions = function (options) {
 		headers,
 		method,
 		cookie,
-		type
+		type,
+		stream_callback
 	} = options;
-	var urlObj = Url.parse(href, true);
+	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({}, {
-		hostProtocol: protocol,
+		host_protocol: protocol,
 		body,
 		type,
 		method: method || "GET",
-		headers: headers ? Object.assign({}, this._headers, headers) : Object.assign({}, this._headers),
+		headers: http_headers,
 		agent: cfg.proxy ? new HttpProxyAgent(cfg.proxy) : null,
-		cookie: this.getCookie()
-	}, urlObj);
+		rejectUnauthorized: cfg.rejectUnauthorized,
+		timeout: options.timeout || cfg.timeout || 0,
+		stream_callback: stream_callback,
+		cookie: cookie_str
+	}, url_obj);
 }
 
 /**
@@ -174,47 +213,78 @@ Http.prototype.httpOptions = function (options) {
  */
 Http.prototype.postOption = function (op) {
 	var param = op.body;
-	var bodyStr = "";
-	var paramType = typeof (param);
-	var contentType = op.type;
-	if (paramType === "object") {
-		if (!contentType) {
-			contentType = 'application/json; charset=UTF-8';
-		} else if (contentType.indexOf('json') !== -1) {
-			contentType = "application/json; charset=UTF-8";
-		} else if (contentType.indexOf('html') !== -1) {
-			contentType = "text/html; charset=UTF-8";
-		} else if (contentType.indexOf('form') !== -1) {
-			contentType = "application/x-www-form-urlencoded";
-		} else {
-			contentType = "text/plain; charset=UTF-8";
+	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 (contentType.indexOf('/json') !== -1) {
-			bodyStr = JSON.stringify(param);
-		} else if (contentType.indexOf('form') !== -1) {
-			bodyStr = $.toUrl(param);
+		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 {
-			bodyStr = $.toXml(param);
+			body_str = $.toXml(param);
+			content_type = "text/plain; charset=UTF-8";
 		}
 	} else {
-		bodyStr = param.trim();
-		if (!contentType) {
-			if (bodyStr.startsWith('{') && bodyStr.endsWith('}')) {
-				contentType = "application/json; charset=UTF-8";
-			} else if (bodyStr.startsWith('[') && bodyStr.endsWith(']')) {
-				contentType = "application/json; charset=UTF-8";
-			} else if (bodyStr.indexOf("<html>") !== -1) {
-				contentType = "text/html";
+		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 {
-				contentType = "text/plain; charset=UTF-8";
+				content_type = "text/plain; charset=UTF-8";
 			}
 		}
 	}
-	op.body = bodyStr;
+	op.body = body_str;
 	if (!op.headers['Content-Type']) {
-		op.headers['Content-Type'] = contentType;
+		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'));
+		}
 	}
-	op.headers['Content-Length'] = Buffer.byteLength(bodyStr);
+	chunks.push(Buffer.from('--' + boundary + '--\r\n'));
+	return Buffer.concat(chunks);
 }
 
 /**
@@ -228,57 +298,49 @@ Http.prototype.req = async function (options) {
 		this.postOption(op);
 	}
 	var res = await this.request(op);
-	if (res.status.code == 302 || res.status.code == 307) {
-		var redirectUrl = res.headers.location;
-		var cookieList = res.headers['set-cookie'];
-		if (cookieList) {
-			var len = cookieList.length;
-			for (var i = 0; i < len; i++) {
-				this.setCookie(cookieList[i]);
-			}
+	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;
 		}
-		options.href = redirectUrl;
+		var redirect_url = new URL(location, op.href).href;
+		options.href = redirect_url;
 		op = this.httpOptions(options);
-		op.referer = options.href;
+		op.referer = redirect_url;
 		res = await this.request(op);
 	}
 	return res;
 }
 
 /**
- * 解压数据
- * @param {string} encoding - 编码方式
+ * 解压数据流
+ * @param {Stream} stream - 输入数据流
+ * @param {string} encoding - 压缩方式，gzip使用gunzip，其他使用inflate
+ * @param {string} charset - 字符编码，指定时返回字符串
+ * @returns {Promise<Buffer|string>} 解压后的数据
  */
-Http.prototype.undata = function (encoding) {
-	var bufarr = [];
-	var errored = false;
-	var zpipe;
-	if (encoding) {
-		zpipe = zlib.createGunzip();
-	} else {
-		zpipe = zlib.createInflate();
-	}
-	zpipe.on('data', function (d) {
-		bufarr.push(d);
-	})
-		.on('end', function () {
-			if (errored) return;
-			errored = true;
-			cb(null, response, enc ? Buffer.concat(bufarr).toString(
-				enc) : Buffer.concat(bufarr));
-		})
-		.on('error', function (err) {
-			if (errored) return;
-			errored = true;
-			cb(err, response, null);
+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);
 		});
-	response.pipe(zpipe);
-	response
-		.on('error', function (err) {
-			if (errored) return;
-			errored = true;
-			cb(err, response, null);
+		stream.on('error', function (err) {
+			reject(err);
 		});
+		stream.pipe(zpipe);
+	});
 }
 
 /**
@@ -287,7 +349,7 @@ Http.prototype.undata = function (encoding) {
  * @returns {Promise<Object>} 请求结果
  */
 Http.prototype.request = function (options) {
-	var protocol = options.hostProtocol === "https" ? https : http;
+	var protocol = options.host_protocol === "https" ? https : http;
 	var self = this;
 	return new Promise(function (resolve, reject) {
 		var body = '';
@@ -295,69 +357,96 @@ Http.prototype.request = function (options) {
 			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 (res.statusCode == 200) {
-				var chunks = [];
-				var encoding = headers['content-encoding'];
+			// 流式下载：仅对成功响应生效
+			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;
+				}
+			}
 
-				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 charsetMatch = body.match(/charset=gb2312"/i);
-					if (charsetMatch) {
-						body = iconv.decode(buffer, 'gb2312');
-					} else {
-						charsetMatch = body.match(/charset=GBK"/i);
-						if (charsetMatch) {
-							body = iconv.decode(buffer, 'GBK');
-						}
-					}
-					var cookieList = headers['set-cookie'];
-					if (cookieList) {
-						var len = cookieList.length;
-						for (var i = 0; i < len; i++) {
-							self.setCookie(cookieList[i]);
-						}
+			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: 200,
+						status: status_code,
 						headers,
 						buffer,
 						body
 					});
-				});
-			} else {
-				resolve({
-					headers,
-					status: {
-						code: res.statusCode,
-						message: res.statusMessage
-					}
-				});
-				reject(res);
-			}
+				} else {
+					resolve({
+						headers,
+						status: {
+							code: status_code,
+							message: res.statusMessage
+						},
+						buffer,
+						body
+					});
+				}
+			});
 		});
 
 		req.on("error", function (err) {
-			$.log.debug("错误", err);
+			self.log("debug", "错误", err);
 			resolve({
 				status: 0,
 				message: err.message
 			});
-			reject(err);
 		});
+		if (options.timeout) {
+			req.setTimeout(options.timeout, function () {
+				req.destroy(new Error("请求超时"));
+			});
+		}
 		if (options.method.toLocaleUpperCase() == "POST") {
 			req.write(options.body);
 		}
@@ -401,6 +490,25 @@ Http.prototype.post = async function (url, body, headers, type, 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 - 下载地址
@@ -411,36 +519,36 @@ Http.prototype.post = async function (url, body, headers, type, cookie) {
  * @returns {Promise<string>} 成功返回保存路径，失败返回null
  */
 Http.prototype.download = async function (url, filename, auto, headers, cookie) {
-	var res = await this.get(url, headers, cookie);
-	var filePath = null;
-	if (res.body) {
-		if (auto) {
-			var parts = url.split('/');
-			var fullName = parts[parts.length - 1];
-			if (fullName.indexOf('.') !== -1) {
-				var ext = fullName.right('.');
-				if (ext) {
-					filePath = filename + "." + ext;
+	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();
 				}
-			} else {
-				var contentType = res.headers["content-type"];
-				var ext = contentType.replace("image/", "").replace("application/x-", "").replace("text/", "")
-					.replace("audio/", "").replace("jpeg", "jpg");
-				filePath = filename + "." + ext;
 			}
-		} else {
-			filePath = filename;
-		}
-		if (filePath) {
-			var bytesWritten = await fs.writeFileSync(filePath, res.buffer, "binary");
-			if (bytesWritten == 0) {
-				filePath = null;
+			file_path = ext ? filename + "." + ext : filename;
+			if (!file_path) {
+				self.log("debug", '保存文件名(filename)不能为空!');
+				return null;
 			}
-		} else {
-			$.log.debug('保存文件名(filename)不能为!');
+			return fs.createWriteStream(file_path);
 		}
-	}
-	return filePath;
+	}));
+	return file_path;
 };
 
 /**
@@ -450,10 +558,6 @@ Http.prototype.clear = function () {
 	this._cookies = {};
 };
 
-if (global.$ && !$.Http) {
-	$.Http = Http;
-}
-
 /**
  * 导出构造函数
  */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mm_https",
-	"version": "1.6.5",
+	"version": "1.6.7",
 	"description": "超级美眉HTTP请求模块 - 支持自动Cookie管理、代理设置、文件下载等功能",
 	"main": "index.js",
 	"scripts": {
@@ -33,8 +33,8 @@
 		"node": ">=12.0.0"
 	},
 	"dependencies": {
-		"https-proxy-agent": "^7.0.6",
-		"iconv-lite": "^0.7.0",
-		"mm_expand": "^1.9.7"
+		"https-proxy-agent": "^9.1.0",
+		"iconv-lite": "^0.7.3",
+		"mm_expand": "^2.5.0"
 	}
 }

package/test.js

@@ -1,168 +1,214 @@
-/**
- * mm_https模块测试文件
- * 用于npm发布前的功能验证
- */
-
-const {
-	Http
-} = require('./index.js');
-
-/**
- * 基础HTTP请求测试
- */
-async function testBasicRequests() {
-	console.log('=== 基础HTTP请求测试 ===');
-	
-	const http = new Http();
-	
-	try {
-		// 测试GET请求
-		console.log('1. 测试GET请求...');
-		const getRes = await http.get('https://httpbin.org/get');
-		console.log('GET请求状态码:', getRes.status);
-		console.log('GET请求成功');
-		
-		// 测试POST请求
-		console.log('2. 测试POST请求...');
-		const postData = { test: 'data', value: 123 };
-		const postRes = await http.post('https://httpbin.org/post', postData);
-		console.log('POST请求状态码:', postRes.status);
-		console.log('POST请求成功');
-		
-		// 测试Cookie管理
-		console.log('3. 测试Cookie管理...');
-		http.setCookie('session=test_session; user=test_user');
-		const cookieStr = http.getCookie();
-		console.log('当前Cookie:', cookieStr);
-		
-		console.log('✅ 基础功能测试通过');
-		return true;
-	} catch (err) {
-		console.error('❌ 基础功能测试失败:', err.message);
-		return false;
-	}
-}
-
-/**
- * 高级功能测试
- */
-async function testAdvancedFeatures() {
-	console.log('\n=== 高级功能测试 ===');
-	
-	const http = new Http({
-		headers: {
-			'User-Agent': 'Test-Agent/1.0'
-		},
-		cookie: 'initial=test_cookie'
-	});
-	
-	try {
-		// 测试自定义请求头
-		console.log('1. 测试自定义请求头...');
-		const headersRes = await http.get('https://httpbin.org/headers');
-		console.log('自定义请求头测试成功');
-		
-		// 测试URL参数解析
-		console.log('2. 测试URL参数解析...');
-		const options = http.options();
-		console.log('默认选项配置成功:', typeof options);
-		
-		// 测试HTTP选项配置
-		console.log('3. 测试HTTP选项配置...');
-		const httpOptions = http.httpOptions({
-			method: 'GET',
-			href: 'https://httpbin.org/get'
-		});
-		console.log('HTTP选项配置成功');
-		
-		console.log('✅ 高级功能测试通过');
-		return true;
-	} catch (err) {
-		console.error('❌ 高级功能测试失败:', err.message);
-		return false;
-	}
-}
-
-/**
- * 错误处理测试
- */
-async function testErrorHandling() {
-	console.log('\n=== 错误处理测试 ===');
-	
-	const http = new Http();
-	
-	try {
-		// 测试不存在的域名
-		console.log('1. 测试不存在的域名...');
-		try {
-			// 设置较短的超时时间，避免长时间等待
-			const timeoutHttp = new Http();
-			// 使用不存在的域名进行测试
-			const res = await timeoutHttp.get('http://nonexistent-domain-12345.test');
-			console.log('GET响应状态码:', res.status, '响应消息:', res.message, '响应内容:', res.body);
-			console.log('⚠️  不存在的域名测试 - 请求可能被重定向或超时');
-		} catch (err) {
-			console.log('不存在的域名处理正确:', err.message);
-		}
-		
-		// 测试网络错误处理
-		console.log('2. 测试网络错误处理...');
-		try {
-			// 尝试访问一个无效的端口
-			await http.get('http://localhost:99999');
-			console.log('⚠️  无效端口测试 - 请求可能被系统拒绝');
-		} catch (err) {
-			console.log('无效端口处理正确:', err.message);
-		}
-		
-		console.log('✅ 错误处理测试通过');
-		return true;
-	} catch (err) {
-		console.error('❌ 错误处理测试失败:', err.message);
-		return false;
-	}
-}
-
-/**
- * 主测试函数
- */
-async function runTests() {
-	console.log('开始mm_https模块测试...\n');
-	
-	const results = [];
-	
-	// 运行所有测试
-	results.push(await testBasicRequests());
-	results.push(await testAdvancedFeatures());
-	results.push(await testErrorHandling());
-	
-	// 统计结果
-	const passed = results.filter(r => r).length;
-	const total = results.length;
-	
-	console.log('\n=== 测试结果汇总 ===');
-	console.log(`通过: ${passed}/${total}`);
-	
-	if (passed === total) {
-		console.log('🎉 所有测试通过！模块功能正常。');
-		process.exit(0);
-	} else {
-		console.log('⚠️  部分测试失败，请检查模块功能。');
-		process.exit(1);
-	}
-}
-
-// 如果直接运行此文件，则执行测试
-if (require.main === module) {
-	runTests().catch(err => {
-		console.error('测试执行失败:', err);
-		process.exit(1);
-	});
-}
-
-module.exports = {
-	testBasicRequests,
-	testAdvancedFeatures,
-	testErrorHandling,
-	runTests
-};
+/**
+ * mm_https 模块功能测试
+ * @author 邱文武
+ * @description 启动本地服务器，测试 GET/POST/upload/download/重定向/超时/cookie/undata 等功能
+ */
+const http = require('http');
+const fs = require('fs');
+const path = require('path');
+const { Readable } = require('stream');
+const zlib = require('zlib');
+const { Http } = require('./index.js');
+
+let server_port;
+let pass_count = 0;
+let fail_count = 0;
+
+/**
+ * 断言测试结果
+ * @param {string} name - 测试名称
+ * @param {boolean} cond - 断言条件
+ * @param {string} detail - 失败详情
+ */
+function assert(name, cond, detail) {
+	if (cond) {
+		pass_count++;
+		console.log('  [通过] ' + name);
+	} else {
+		fail_count++;
+		console.log('  [失败] ' + name + (detail ? ' => ' + detail : ''));
+	}
+}
+
+/**
+ * 启动本地测试服务器
+ * @returns {http.Server} 服务器实例
+ */
+function startServer() {
+	var server = http.createServer(function (req, res) {
+		var url = req.url;
+		if (url.startsWith('/get')) {
+			res.writeHead(200, { 'Content-Type': 'application/json' });
+			res.end(JSON.stringify({ ok: true, path: url }));
+		} else if (url.startsWith('/post')) {
+			var body = [];
+			req.on('data', function (c) { body.push(c); });
+			req.on('end', function () {
+				res.writeHead(200, { 'Content-Type': 'application/json' });
+				res.end(JSON.stringify({ type: req.headers['content-type'], body: Buffer.concat(body).toString() }));
+			});
+		} else if (url.startsWith('/upload')) {
+			var body = [];
+			req.on('data', function (c) { body.push(c); });
+			req.on('end', function () {
+				res.writeHead(200, { 'Content-Type': 'application/json' });
+				res.end(JSON.stringify({ type: req.headers['content-type'], length: req.headers['content-length'] }));
+			});
+		} else if (url.startsWith('/download-image')) {
+			res.writeHead(200, { 'Content-Type': 'image/png' });
+			res.end(Buffer.from([137, 80, 78, 71]));
+		} else if (url.startsWith('/download')) {
+			res.writeHead(200, { 'Content-Type': 'application/octet-stream' });
+			res.end(Buffer.from([1, 2, 3, 4, 5]));
+		} else if (url.startsWith('/redirect-relative')) {
+			res.writeHead(302, { 'Location': '/get' });
+			res.end();
+		} else if (url.startsWith('/redirect-absolute')) {
+			res.writeHead(301, { 'Location': 'http://127.0.0.1:' + server_port + '/get' });
+			res.end();
+		} else if (url.startsWith('/redirect-loop')) {
+			res.writeHead(302, { 'Location': '/redirect-loop' });
+			res.end();
+		} else if (url.startsWith('/redirect-empty')) {
+			res.writeHead(302, {});
+			res.end();
+		} else if (url.startsWith('/slow')) {
+			setTimeout(function () {
+				res.writeHead(200, { 'Content-Type': 'text/plain' });
+				res.end('slow response');
+			}, 3000);
+		} else if (url.startsWith('/cookie')) {
+			res.writeHead(200, { 'Content-Type': 'application/json', 'Set-Cookie': 'test=abc; Path=/' });
+			res.end('{}');
+		} else if (url.startsWith('/check-cookie')) {
+			res.writeHead(200, { 'Content-Type': 'application/json' });
+			res.end(JSON.stringify({ cookie: req.headers['cookie'] || '' }));
+		} else {
+			res.writeHead(404, { 'Content-Type': 'text/plain' });
+			res.end('not found');
+		}
+	});
+	return server;
+}
+
+/**
+ * 主测试流程
+ */
+async function main() {
+	console.log('== mm_https 模块功能测试 ==');
+	var server = startServer();
+	await new Promise(function (resolve) { server.listen(0, resolve); });
+	server_port = server.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');
+	fs.mkdirSync(tmp_dir, { recursive: true });
+	try {
+		// 1. GET
+		console.log('\n[GET]');
+		var res = await client.get(base + '/get?page=1&size=10');
+		assert('GET 返回200', res.status === 200);
+		assert('GET 保留查询参数', res.body.indexOf('page=1') !== -1);
+
+		// 2. POST json
+		console.log('\n[POST json]');
+		res = await client.post(base + '/post', { a: 1, b: 'x' }, null, 'json');
+		var data = JSON.parse(res.body);
+		assert('POST json 类型正确', data.type.indexOf('application/json') === 0);
+		assert('POST json 内容正确', data.body === '{"a":1,"b":"x"}');
+
+		// 3. POST form
+		console.log('\n[POST form]');
+		res = await client.post(base + '/post', { a: 1, b: 'x' }, null, 'form');
+		data = JSON.parse(res.body);
+		assert('POST form 类型正确', data.type.indexOf('application/x-www-form-urlencoded') === 0);
+		assert('POST form 内容正确', data.body.indexOf('a=1') !== -1 && data.body.indexOf('b=x') !== -1);
+
+		// 4. POST text
+		console.log('\n[POST text]');
+		res = await client.post(base + '/post', 'plain text body', null, 'text');
+		data = JSON.parse(res.body);
+		assert('POST text 内容正确', data.body === 'plain text body');
+
+		// 5. upload
+		console.log('\n[UPLOAD]');
+		res = await client.upload(base + '/upload', {
+			name: '测试文件',
+			file: { value: Buffer.from([1, 2, 3]), filename: 'a.bin', contentType: 'application/octet-stream' }
+		});
+		data = JSON.parse(res.body);
+		assert('UPLOAD 类型为multipart', data.type.indexOf('multipart/form-data; boundary=') === 0);
+		assert('UPLOAD 携带Content-Length', parseInt(data.length, 10) > 0);
+
+		// 6. download
+		console.log('\n[DOWNLOAD]');
+		var file_path = await client.download(base + '/download', path.join(tmp_dir, 'dl'));
+		assert('DOWNLOAD 返回文件路径', !!file_path);
+		var buf = fs.readFileSync(file_path);
+		assert('DOWNLOAD 文件内容正确', buf.length === 5 && buf[0] === 1 && buf[4] === 5);
+		file_path = await client.download(base + '/download-image', path.join(tmp_dir, 'img'), true);
+		assert('DOWNLOAD auto扩展名', file_path === path.join(tmp_dir, 'img') + '.png');
+
+		// 7. 重定向
+		console.log('\n[REDIRECT]');
+		res = await client.get(base + '/redirect-relative');
+		assert('302 相对路径重定向', res.status === 200 && res.body.indexOf('ok') !== -1);
+		res = await client.get(base + '/redirect-absolute');
+		assert('301 绝对路径重定向', res.status === 200);
+		res = await client.get(base + '/redirect-empty');
+		assert('302 无Location不崩溃', res.status.code === 302);
+		var loop_error = null;
+		try {
+			await client.get(base + '/redirect-loop');
+		} catch (e) {
+			loop_error = e;
+		}
+		assert('重定向循环受限', loop_error && loop_error.message.indexOf('重定向次数超过上限') !== -1);
+
+		// 8. 非2xx状态码
+		console.log('\n[状态码]');
+		res = await client.get(base + '/status-404');
+		assert('404 返回状态对象', res.status && res.status.code === 404);
+		assert('404 携带响应体', res.body.indexOf('not found') !== -1);
+
+		// 9. cookie
+		console.log('\n[COOKIE]');
+		var cookie_client = new Http({ proxy: null });
+		await cookie_client.get(base + '/cookie');
+		res = await cookie_client.get(base + '/check-cookie');
+		data = JSON.parse(res.body);
+		assert('Cookie 自动保持', data.cookie.indexOf('test=abc') !== -1);
+
+		// 10. 超时
+		console.log('\n[TIMEOUT]');
+		var slow_client = new Http({ proxy: null, timeout: 500 });
+		var start = Date.now();
+		res = await slow_client.get(base + '/slow');
+		var elapsed = Date.now() - start;
+		assert('超时返回错误对象', res.status === 0 && res.message.indexOf('超时') !== -1);
+		assert('超时耗时合理(<2秒)', elapsed < 2000);
+
+		// 11. undata 解压
+		console.log('\n[UNDATA]');
+		var gz = zlib.gzipSync(Buffer.from('hello undata'));
+		var reader = new Readable({ read: function () { this.push(gz); this.push(null); } });
+		var out = await client.undata(reader, 'gzip', 'utf8');
+		assert('undata gzip解压', out === 'hello undata');
+		var def = zlib.deflateSync(Buffer.from('hello inflate'));
+		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');
+	} catch (e) {
+		console.error('测试异常:', e);
+		fail_count++;
+	} finally {
+		server.close();
+		fs.rmSync(tmp_dir, { recursive: true, force: true });
+		console.log('\n== 测试结果: 通过 ' + pass_count + ', 失败 ' + fail_count + ' ==');
+		if (fail_count > 0) {
+			process.exitCode = 1;
+		}
+	}
+}
+
+main();

package/npm-publish-checklist.md

@@ -1,99 +0,0 @@
-# mm_https模块 npm发布检查清单
-
-## ✅ 已完成的项目
-
-### 1. 代码重构和规范
-- [x] 类名和方法名使用小驼峰命名法
-- [x] 私有成员使用下划线前缀
-- [x] 变量名使用小写蛇形命名法
-- [x] 完整的JSDoc注释
-- [x] 符合ES6类和原型方法范式
-
-### 2. 测试文件优化
-- [x] 创建适合npm发布的测试文件
-- [x] 包含基础功能测试
-- [x] 包含高级功能测试
-- [x] 包含错误处理测试
-- [x] 所有测试通过
-
-### 3. 配置文件优化
-- [x] 更新package.json描述和关键词
-- [x] 添加Node.js版本要求
-- [x] 优化依赖管理
-
-### 4. 功能验证
-- [x] 语法检查通过
-- [x] 依赖关系正常
-- [x] 模块功能完整
-
-## 📋 npm发布前检查
-
-### 版本管理
-- [ ] 确认当前版本号：1.6.4
-- [ ] 是否需要更新版本号
-- [ ] 更新CHANGELOG.md（如有）
-
-### 文档检查
-- [ ] README.md内容完整且准确
-- [ ] 示例代码正确
-- [ ] 安装说明清晰
-
-### 发布准备
-- [ ] 登录npm账号：`npm login`
-- [ ] 检查包名可用性：`npm search mm_https`
-- [ ] 执行发布命令：`npm publish`
-
-## 🚀 发布命令
-
-```bash
-# 登录npm（如果未登录）
-npm login
-
-# 检查包名是否可用
-npm search mm_https
-
-# 发布到npm
-npm publish
-
-# 或者发布为公开包（如果需要）
-npm publish --access public
-```
-
-## 📦 安装使用
-
-发布后，用户可以通过以下方式安装：
-
-```bash
-npm install mm_https
-```
-
-使用示例：
-```javascript
-const { Http } = require('mm_https');
-
-async function example() {
-    const http = new Http();
-    const res = await http.get('https://httpbin.org/get');
-    console.log(res.body);
-}
-```
-
-## 🔧 开发命令
-
-```bash
-# 运行测试
-npm test
-
-# 开发模式
-npm run dev
-
-# 安装依赖
-npm install
-```
-
-## 📞 支持信息
-
-- 作者：邱文武
-- 许可证：ISC
-- 问题反馈：https://gitee.com/qiuwenwu91/mm_https/issues
-- 主页：https://gitee.com/qiuwenwu91/mm_https#readme