mm_https 1.6.0 → 1.6.2

package/index.js

@@ -44,13 +44,13 @@ class Http {
 			'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/98.0.4758.102 Safari/537.36'
+			'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.set_cookie(this.config.cookie);
 		}
-		
+
 		if (this.config.headers) {
 			var headers = this.change_headers(config.headers);
 			Object.assign(this.headers, headers);
@@ -144,46 +144,6 @@ Http.prototype.http_options = function(options) {
 	}, u);
 }
 
-// Http.prototype.http_options = function(options) {
-// 	var cg = this.config;
-// 	var {
-// 		href,
-// 		body,
-// 		headers,
-// 		method,
-// 		cookie,
-// 		type
-// 	} = options;
-// 	var protocol = href.left(":/") || 'http';
-// 	// 移除协议头 取端口号
-// 	var u = href.replace(protocol + "://", "");
-// 	var port = u.between(":", "/") || u.left("/", true).right(":") || (protocol === 'http' ? 80 : 443);
-
-// 	// 移除端口号，取主机地址
-// 	u = u.replace(":" + port, "");
-// 	var hostname = u.left("/", true).left("?", true);
-// 	// 移除主机地址，取路由路径
-// 	u = u.replace(hostname, "");
-// 	var path = u.left("?", true);
-// 	if (cookie) {
-// 		this.set_cookie(cookie);
-// 	}
-// 	return {
-// 		href,
-// 		protocol,
-// 		hostname,
-// 		body,
-// 		type,
-// 		port: Number(port),
-// 		search: "?" + u.right("?"),
-// 		path: path.indexOf("/") === 0 ? path : "/" + path,
-// 		method: method || "GET",
-// 		headers: headers ? Object.assign({}, cg.headers, headers) : Object.assign({}, cg.headers),
-// 		agent: cg.proxy ? new HttpProxyAgent(cg.proxy) : null,
-// 		cookie: this.get_cookie()
-// 	}
-// }
-
 Http.prototype.post_option = function(op) {
 	var param = op.body;
 	var body = "";
@@ -197,7 +157,7 @@ Http.prototype.post_option = function(op) {
 		} else if (type.indexOf('html') !== -1) {
 			type = "text/html; charset=UTF-8";
 		} else if (type.indexOf('form') !== -1) {
-			type = "application/x-www-form-urlencoded; charset=UTF-8";
+			type = "application/x-www-form-urlencoded";
 		} else {
 			type = "text/plain; charset=UTF-8";
 		}
@@ -223,7 +183,9 @@ Http.prototype.post_option = function(op) {
 		}
 	}
 	op.body = body;
-	op.headers['Content-Type'] = type;
+	if (!op.headers['Content-Type']) {
+		op.headers['Content-Type'] = type;
+	}
 	op.headers['Content-Length'] = Buffer.byteLength(body);
 }
 
@@ -238,7 +200,7 @@ Http.prototype.req = async function(options) {
 		this.post_option(op);
 	}
 	var res = await this.request(op);
-	if (res.status.code == 302) {
+	if (res.status.code == 302 || res.status.code == 307) {
 		var url = res.headers.location;
 		var lt = res.headers['set-cookie'];
 		if (lt) {
@@ -246,14 +208,13 @@ Http.prototype.req = async function(options) {
 			for (var i = 0; i < len; i++) {
 				this.set_cookie(lt[i]);
 			}
-			options.href = url;
-			op = this.http_options(options);
-			op.referer = options.href;
-			res = await this.request(op);
 		}
-	} else {
-		return res;
+		options.href = url;
+		op = this.http_options(options);
+		op.referer = options.href;
+		res = await this.request(op);
 	}
+	return res;
 }
 
 Http.prototype.undata = function(encoding) {
@@ -324,8 +285,7 @@ Http.prototype.request = function(options) {
 					var mh = body.match(/charset=gb2312"/i);
 					if (mh) {
 						body = iconv.decode(buffer, 'gb2312');
-					}
-					else {
+					} else {
 						mh = body.match(/charset=GBK"/i);
 						if (mh) {
 							body = iconv.decode(buffer, 'GBK');

package/package.json

@@ -1,38 +1,38 @@
 {
-    "name": "mm_https",
-    "version": "1.6.0",
-    "description": "这是超级美眉http请求帮助类模块，可自动补充cookie，实现模拟登录，通讯",
-    "main": "index.js",
-    "scripts": {
-        "test": "node test.js",
-        "dev": "nodemon test.js"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/qiuwenwu/mm_https.git"
-    },
-    "keywords": [
-        "myhttp",
-        "async",
-        "await",
-        "promise",
-        "add",
-        "del",
-        "set",
-        "get",
-        "query",
-        "run",
-        "exec"
-    ],
-    "author": "邱文武",
-    "license": "ISC",
-    "bugs": {
-        "url": "https://github.com/qiuwenwu/mm_https/issues"
-    },
-    "homepage": "https://github.com/qiuwenwu/mm_https#readme",
-    "dependencies": {
-        "https-proxy-agent": "^7.0.5",
-        "iconv-lite": "^0.6.3",
-        "mm_expand": "^1.6.9"
-    }
-}
+	"name": "mm_https",
+	"version": "1.6.2",
+	"description": "这是超级美眉http请求帮助类模块，可自动补充cookie，实现模拟登录，通讯",
+	"main": "index.js",
+	"scripts": {
+		"test": "node test.js",
+		"dev": "nodemon test.js"
+	},
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/qiuwenwu/mm_https.git"
+	},
+	"keywords": [
+		"myhttp",
+		"async",
+		"await",
+		"promise",
+		"add",
+		"del",
+		"set",
+		"get",
+		"query",
+		"run",
+		"exec"
+	],
+	"author": "邱文武",
+	"license": "ISC",
+	"bugs": {
+		"url": "https://github.com/qiuwenwu/mm_https/issues"
+	},
+	"homepage": "https://github.com/qiuwenwu/mm_https#readme",
+	"dependencies": {
+		"https-proxy-agent": "^7.0.6",
+		"iconv-lite": "^0.6.3",
+		"mm_expand": "^1.7.7"
+	}
+}