mm_https 1.4.9 → 1.5.1

package/index.js

@@ -5,6 +5,7 @@
  */
 const http = require('http');
 const https = require('https');
+const Url = require('url');
 const HttpProxyAgent = require('https-proxy-agent');
 const fs = require("fs");
 const Cookie = require('./cookie');
@@ -23,21 +24,22 @@ class Http {
 	constructor(config) {
 		this.config = Object.assign({
 			headers: {
-				'accept': 'text/html,application/json,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': '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, br',
-				'accept-encoding': 'deflate',
-				'accept-language': 'zh-CN,zh;q=0.9',
-				'cache-control': 'no-cache',
-				'pragma': 'no-cache',
-				'sec-ch-ua': '" Not A;Brand";v="99", "Chromium";v="98", "Google Chrome";v="98"',
-				'sec-ch-ua-mobile': '?0',
-				'sec-ch-ua-platform': '"Windows"',
-				'sec-fetch-dest': 'document',
-				'sec-fetch-mode': 'navigate',
-				'sec-fetch-site': 'none',
-				'sec-fetch-user': '?1',
-				'upgrade-insecure-requests': '1',
-				'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'
+				'Accept-Encoding': 'gzip, deflate',
+				'Accept-Language': 'zh-CN,zh;q=0.9',
+				'Cache-Control': 'no-cache',
+				'Connection': 'keep-alive',
+				'Pragma': 'no-cache',
+				// 'sec-ch-ua': '" Not A;Brand";v="99", "Chromium";v="98", "Google Chrome";v="98"',
+				// 'sec-ch-ua-mobile': '?0',
+				// 'sec-ch-ua-platform': '"Windows"',
+				// 'sec-fetch-dest': 'document',
+				// 'sec-fetch-mode': 'navigate',
+				// 'sec-fetch-site': 'none',
+				// 'sec-fetch-user': '?1',
+				'Upgrade-Insecure-Requests': '1',
+				'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'
 			},
 			rejectUnauthorized: false,
 			cookie: "",
@@ -58,10 +60,12 @@ Http.prototype.set_cookie = function(cookieStr) {
 	var arr = cookieStr.split('; ');
 	var name;
 	if (arr.length > 1) {
-		var kv = arr[0];
-		var arr_kv = kv.split("=");
-		name = arr_kv[0];
-		this.cookies[name] = encodeURIComponent(arr_kv[1]);
+		for (var i = 0; i < arr.length; i++) {
+			var kv = arr[i];
+			var arr_kv = kv.split("=");
+			name = arr_kv[0];
+			this.cookies[name] = encodeURIComponent(arr_kv[1]);
+		}
 	}
 }
 
@@ -71,12 +75,13 @@ Http.prototype.get_cookie = function() {
 	for (var k in dist) {
 		str += "; " + k + "=" + dist[k];
 	}
-	return str;
+	var cookie = str.replace("; ", "");
+	return cookie
 }
 
 Http.prototype.options = function(options) {
 	return {
-		url: "",
+		href: "",
 		method: "GET",
 		body: {},
 		proxy: "http://127.0.0.1:10809",
@@ -87,41 +92,67 @@ Http.prototype.options = function(options) {
 Http.prototype.http_options = function(options) {
 	var cg = this.config;
 	var {
-		url,
+		href,
 		body,
 		headers,
 		method,
 		cookie,
 		type
 	} = options;
-	var protocol = url.left(":/") || 'http';
-	// 移除协议头 取端口号
-	var u = url.replace(protocol + "://", "");
-	var port = u.between(":", "/") || u.right(":") || (protocol === 'http' ? 80 : 443);
-	// 移除端口号，取主机地址
-	u = u.replace(":" + port, "");
-	var hostname = u.left("/", true).left("?", true);
-	// 移除主机地址，取路由路径
-	u = u.replace(hostname, "");
-	var path = u;
+	var u = Url.parse(href, true);
 	if (cookie) {
 		this.set_cookie(cookie);
 	}
-	return {
-		url,
-		protocol,
-		hostname,
+	return Object.assign({}, {
 		body,
 		type,
-		port: Number(port),
-		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()
-	}
+	}, 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 = "";
@@ -184,9 +215,9 @@ Http.prototype.req = async function(options) {
 			for (var i = 0; i < len; i++) {
 				_this.set_cookie(lt[i]);
 			}
-			options.url = url;
+			options.href = url;
 			op = this.http_options(options);
-			op.referer = options.url;
+			op.referer = options.href;
 			res = await this.request(op);
 		}
 	} else {
@@ -194,6 +225,38 @@ Http.prototype.req = async function(options) {
 	}
 }
 
+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);
+		});
+	response.pipe(zpipe);
+	response
+		.on('error', function(err) {
+			if (errored) return;
+			errored = true;
+			cb(err, response, null);
+		});
+}
+
 /**
  * 请求
  * @param {Object} options 配置
@@ -209,29 +272,25 @@ Http.prototype.request = function(options) {
 				var {
 					headers
 				} = res;
-				var buffer = '';
+				var chunks = [];
 				var encoding = headers['content-encoding'];
-				if (encoding) {
-					res.setEncoding('utf-8');
-				} else {
-					res.setEncoding("binary");
-				}
 				res.on('data', function(d) {
-					buffer += d;
+					chunks.push(d);
 				}).on('end', function(d) {
+					var buffer = Buffer.concat(chunks);
 					switch (encoding) {
 						case 'br':
 						case 'gzip':
 						case 'deflate':
-							body = unzipSync(buffer);
+							body = unzipSync(buffer).toString();
 							break;
 						default:
-							body = buffer;
+							body = buffer.toString();
 							break;
 					}
 					var mh = body.match(/charset=(gb2312|GBK)"/i);
 					if (mh) {
-						body = iconv.decode(buffer, 'GBK');
+						body = iconv.decode(body, 'GBK');
 					}
 					var lt = headers['set-cookie'];
 					if (lt) {
@@ -243,7 +302,8 @@ Http.prototype.request = function(options) {
 					resolve({
 						status: 200,
 						headers,
-						body: body
+						buffer,
+						body
 					});
 				});
 			} else {
@@ -281,7 +341,7 @@ Http.prototype.request = function(options) {
 Http.prototype.get = async function(url, headers, cookie) {
 	return await this.req({
 		method: "GET",
-		url,
+		href: url,
 		headers,
 		cookie
 	});
@@ -300,7 +360,7 @@ Http.prototype.get = async function(url, headers, cookie) {
 Http.prototype.post = async function(url, body, headers, type, cookie) {
 	return await this.req({
 		method: "POST",
-		url,
+		href: url,
 		body,
 		type,
 		headers,
@@ -340,7 +400,7 @@ Http.prototype.download = async function(url, filename, auto, headers, cookie) {
 			file = filename;
 		}
 		if (file) {
-			var length = await fs.writeFileSync(file, res.body, "binary");
+			var length = await fs.writeFileSync(file, res.buffer, "binary");
 			if (length == 0) {
 				file = null;
 			}

package/nodemon.json

@@ -0,0 +1,19 @@
+{
+	"restartable": "rs",
+	"ignore": [
+		".git",
+		".svn",
+		"node_modules/**/node_modules",
+		"static"
+	],
+	"verbose": true,
+	"execMap": {
+		"": "node",
+		"js": "node --harmony"
+	},
+	"env": {
+		"NODE_ENV": "development"
+	},
+	"ext": "js ts json",
+	"legacy-watch": false
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mm_https",
-    "version": "1.4.9",
+    "version": "1.5.1",
     "description": "这是超级美眉http请求帮助类模块，可自动补充cookie，实现模拟登录，通讯",
     "main": "index.js",
     "scripts": {

package/test.js

@@ -1,4 +1,5 @@
 // const nJwt = require('njwt');
+var http = require('http');
 var Http = require('./index.js');
 var fs = require("fs");
 
@@ -68,7 +69,7 @@ var fs = require("fs");
 // 	// res = await hp.get("http://api.bitcentre.com.cn/paper/id?id=1", {
 // 	// 	"x-auth-token": token
 // 	// });
-	
+
 // 	// res = await hp.get("https://www.google.com");
 // 	console.log('结果:', res);
 // 	console.log('结果:', hp.cookies);
@@ -93,17 +94,30 @@ var fs = require("fs");
 // 	// console.log('结果:', hp.cookies);
 // }
 
-async function test () {
+// async function test() {
+// 	var hp = new Http();
+// 	hp.config.headers.Accept = "application/javascript; charset=UTF-8";
+// 	var url =
+// 		"http://69.push2.eastmoney.com/api/qt/clist/get?cb=jQuery1124007023275733383882_1586573202818&pn=1&pz=100000&po=1&np=1&ut=bd1d9ddb04089700cf9c27f6f7426281&fltt=2&invt=2&fid=f3&fs=m:0+t:6,m:0+t:13,m:0+t:80,m:1+t:2,m:1+t:23&fields=f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f12,f13,f14,f15,f16,f17,f18,f20,f21,f23,f24,f25,f22,f11,f62,f128,f136,f115,f152";
+// 	var res = await hp.get(url);
+// 	console.log(res);
+// }
+
+
+async function test() {
 	var hp = new Http();
-	var res = await hp.get('http://www.hao123.com');
-	console.log(res.body);
+	hp.config.headers.Accept = "application/javascript; charset=UTF-8";
+	var url ="http://localhost:8001/api/wallet/count";
+	var res = await hp.get(url);
+	console.log(res);
 }
 
 // async function test() {
+// 	console.log("测试")
 // 	var hp = new Http();
-// 	var res = await hp.get('http://localhost:8080/dev/img/logo_gray.png');
+// 	var res = await hp.get('https://www.baidu.com/img/flexible/logo/pc/result.png');
 // 	console.log(res);
-// 	fs.writeFile("./logonew.png", res.body, "binary", function(err) {
+// 	fs.writeFile("./logonew.png", res.buffer, "binary", function(err) {
 // 		if (err) {
 // 			console.log("下载失败");
 // 		}
@@ -155,17 +169,17 @@ async function test () {
 // 		url: "http://www.hao123.com/test?dd=123"
 // 	});
 // 	console.log(4, options);
-	
+
 // 	var options = http.new_options({
 // 		url: "http://www.hao123.com"
 // 	});
 // 	console.log(5, options);
-	
+
 // 	options = http.new_options({
 // 		url: "https://www.hao123.com:8000"
 // 	});
 // 	console.log(6, options);
-	
+
 // 	options = http.new_options({
 // 		url: "https://www.hao123.com?dd=123"
 // 	});
@@ -178,7 +192,7 @@ async function test () {
 // 	console.log("结果", res.body);
 // 	var res = await http.download('http://www.51sjk.com/Upload/Articles/1/0/8/8799_20200415005654483_0.jpg', "./demo.jpg");
 // 	// console.log(res);
-	
+
 // 	// console.log("代理请求");
 // 	// var http = new Http({
 // 	// 	proxy: "http://127.0.0.1:10809"