mm_https 1.4.6 → 1.4.7

package/index.js

@@ -3,75 +3,36 @@
  * @author <a href="http://qww.elins.cn">邱文武</a>
  * @version 1.2
  */
+const http = require('http');
+const https = require('https');
+const HttpProxyAgent = require('https-proxy-agent');
 const fs = require("fs");
 const Cookie = require('./cookie');
 const {
-	gunzip,
-	inflate
+	unzipSync
 } = require('zlib');
-const http = require('http');
-const https = require('https');
 const iconv = require('iconv-lite');
+const {
+	hostname
+} = require('os');
+const {
+	header
+} = require('request/lib/hawk');
+const {
+	HttpsProxyAgent
+} = require('https-proxy-agent');
 
-/**
- * @description 获取参数项
- * @param {String} url 网址
- * @return {Object} http参数对象
- */
-function getInfo(url) {
-	var host = url.between("//", "/", true);
-	var path = "/" + url.replace("//").right("/");
-	var index = host.indexOf(':');
-	var port;
-
-	if (index !== -1) {
-		port = host.substr(index + 1);
-		host = host.substr(0, index);
-	} else {
-		if (url.indexOf('https') !== -1) {
-			port = 443;
-		} else {
-			port = 80;
-		}
-	}
-	return {
-		host: host,
-		port: port,
-		path: path
-	}
-}
-
-/**
- * http类函数
- */
 class Http {
-	/**
-	 * 构造函数
-	 * @constructor
-	 * @param {Object} config 配置参数
-	 */
 	constructor(config) {
-		/**
-		 * 存储上次请求
-		 */
-		this.referer = "";
-		/**
-		 * 设置cookie存储
-		 */
-		this.cookie = new Cookie();
-
-		/**
-		 * 获取的编码方式
-		 */
-		this.encoding = 'utf-8';
-
 		this.config = Object.assign({
 			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': '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-encoding': 'gzip, deflate, br',
+				'accept-encoding': 'deflate',
 				'accept-language': 'zh-CN,zh;q=0.9',
-				'cache-control': 'max-age=0',
-				'sec-ch-ua': '"Google Chrome";v="95", "Chromium";v="95", ";Not A Brand";v="99"',
+				'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',
@@ -79,258 +40,95 @@ class Http {
 				'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/95.0.4638.54 Safari/537.36'
+				'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
-		}, config)
+			rejectUnauthorized: false,
+			cookie: "",
+			proxy: null
+			// proxy: "http://127.0.0.1:10809"
+		}, config);
+
+		/**
+		 * cookie缓存
+		 */
+		this.cookies = {
+
+		}
 	}
 }
 
-/**
- * @description 删除cookie
- * @param {String} name 名称
- * @param {String} path 路径
- * @param {String} domain 域名
- */
-Http.prototype.delCookie = function(name, path, domain) {
-	if (domain) {
-		this.list.del({
-			name: name,
-			path: path,
-			domain: domain
-		});
-	} else if (path) {
-		this.list.del({
-			name: name,
-			path: path
-		});
-	} else {
-		this.list.del({
-			name: name
-		});
+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]);
 	}
-};
+}
 
-/**
- * @description 初始化选项
- * @param {String} method 请求方式
- * @param {String} url 请求地址
- * @param {Object} cookie 缓存
- * @return {Object} 配置参数
- */
-Http.prototype.option = function(method, url, cookie) {
-	var {
-		host,
-		port,
-		path
-	} = getInfo(url);
-	var op = Object.assign({}, this.config, {
-		url: url,
-		hostname: host,
-		path: path,
-		port: port,
-		method: method
-	});
-	if (cookie) {
-		op.cookie = cookie;
-	} else if (this.cookie) {
-		op.cookie = this.cookie.str();
-	}
-	if (this.referer) {
-		op.Referer = this.referer;
+Http.prototype.get_cookie = function() {
+	var dist = this.cookies;
+	var str = "";
+	for(var k in dist)
+	{
+		str += "; " + k + "=" + dist[k];
 	}
-	return op;
-};
-
-/**
- * http请求
- * @param {Object} options 请求配置
- * @param {Object} param 请求参数
- * @return {Promise|Object} 请求的结果
- */
-Http.prototype.req = function(options, param) {
-	return new Promise((resolve, reject) => {
-		var hp;
-		var url = options.url;
-		if (url && url.indexOf('https') !== -1) {
-			hp = https;
-		} else {
-			hp = http;
-		}
-		var req = hp.request(options, function(res) {
-			var code = res.statusCode;
-			if (code === 200) {
-				var chunks = [];
-				var encoding = res.headers['content-encoding'];
-				// 非gzip/deflate要转成utf-8格式
-				if (encoding === 'undefined') {
-					res.setEncoding(this.encoding);
-				}
-				res.on('data', function(chunk) {
-					chunks.push(chunk);
-				});
-				res.on('end', function() {
-					var buffer = Buffer.concat(chunks);
-					if (encoding === 'gzip') {
-						gunzip(buffer, function(err, decoded) {
-							if (err) {
-								reject(err);
-							} else {
-								var body = decoded.toString();
-								var mh = body.match(/charset=(gb2312|GBK)"/i);
-								if (mh) {
-									body = iconv.decode(decoded, 'GBK');
-								}
-								resolve({
-									headers: res.headers,
-									binary: decoded,
-									body: body
-								});
-							}
-						});
-					} else if (encoding === 'deflate') {
-						inflate(buffer, function(err, decoded) {
-							if (err) {
-								reject(err);
-							} else {
-								var body = decoded.toString();
-								var mh = body.match(/charset=(gb2312|GBK)"/i);
-								if (mh) {
-									body = iconv.decode(decoded, 'GBK');
-								}
-								resolve({
-									headers: res.headers,
-									binary: decoded,
-									body: body
-								});
-							}
-						});
-					} else {
-						var body = buffer.toString();
-						var mh = body.match(/charset=(gb2312|GBK)"/i);
-						if (mh) {
-							body = iconv.decode(buffer, 'GBK');
-						}
-						resolve({
-							headers: res.headers,
-							binary: buffer,
-							body: body
-						});
-					}
-				});
-			} else {
-				resolve({
-					status: code,
-					message: res.statusMessage,
-					headers: res.headers
-				});
-			}
-		});
-		if (param) {
-			req.write(param);
-		}
-		req.on("error", function(err) {
-			resolve({
-				status: 0,
-				message: err.message
-			});
-		});
-		req.end();
-	});
-};
+	return str;
+}
 
-/**
- * @description 执行http请求
- * @param {Object} options 配置参数
- * @param {Object} param 传递参数
- * @return {Object} 执行结果
- */
-Http.prototype.run = async function(options, param) {
-	var res = await this.req(options, param);
-	if (res) {
-		if (res.status === 302) {
-			var url = res.headers.location;
-			var op = this.option(options.method, url);
-			res = await this.req(op, param);
-			if (res.status === 302) {
-				var url = res.headers.location;
-				op = this.option(options.method, url);
-				res = await this.req(op, param);
-			}
-		}
-		var hd = res.headers;
-		if (hd) {
-			var lt = hd['set-cookie'];
-			if (lt) {
-				var len = lt.length;
-				for (var i = 0; i < len; i++) {
-					this.cookie.str(lt[i]);
-				}
-			}
-			this.referer = options.url;
-		}
+Http.prototype.options = function(options) {
+	return {
+		url: "",
+		method: "GET",
+		body: {},
+		proxy: "http://127.0.0.1:10809",
+		headers: Object.assign({}, this.config.headers)
 	}
-	return res;
-};
+}
 
-/**
- * @description 执行http请求 —— 快速
- * @param {Object} options 配置参数
- * @param {Object} param 传递参数
- * @return {Object} 执行结果
- */
-Http.prototype.run_fast = async function(options, param) {
-	var res = await this.req(options, param);
-	if (res) {
-		if (res.status === 302) {
-			var url = res.headers.location;
-			var op = this.option(options.method, url);
-			res = await this.req(op, param);
-			if (res.status === 302) {
-				var url = res.headers.location;
-				op = this.option(options.method, url);
-				res = await this.req(op, param);
-			}
-		}
+Http.prototype.http_options = function(options) {
+	var cg = this.config;
+	var {
+		url,
+		body,
+		headers,
+		method,
+		cookie
+	} = 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;
+	if(cookie){
+		this.set_cookie(cookie);
 	}
-	return res;
-};
-
-/**
- * @description GET请求
- * @param {String} url 请求地址
- * @param {Object} headers 请求头
- * @param {Object} cookie 服务缓存
- * @return {Object} 请求的结果
- */
-Http.prototype.get = async function(url, headers, cookie) {
-	var op = this.option('GET', url, cookie);
-	$.push(op.headers, headers, true);
-	return await this.run(op);
-};
-
-/**
- * @description GET请求 —— 快速
- * @param {String} url 请求地址
- * @return {Object} 请求的结果
- */
-Http.prototype.get_fast = async function(url) {
-	var op = this.option('GET', url, {});
-	return await this.run_fast(op);
-};
+	return {
+		url,
+		protocol,
+		hostname,
+		body,
+		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()
+	}
+}
 
-/**
- * @description POST请求
- * @param {String} url 请求地址
- * @param {Object} param 正文参数
- * @param {Object} headers 请求头
- * @param {String} type 请求类型
- * @param {String} cookie Cookie缓存
- * @return {Object} 请求的结果
- */
-Http.prototype.post = async function(url, param, headers, type, cookie) {
+Http.prototype.post_option = function(op) {
+	var param = op.body;
 	var body = "";
 	var tp = typeof(param);
+	var type = op.type;
 	if (tp === "object") {
 		if (!type) {
 			type = 'application/json; charset=UTF-8';
@@ -364,30 +162,150 @@ Http.prototype.post = async function(url, param, headers, type, cookie) {
 			}
 		}
 	}
-	var op = this.option('POST', url, cookie);
 	op.body = body;
 	op.headers['Content-Type'] = type;
 	op.headers['Content-Length'] = Buffer.byteLength(body);
-	$.push(op.headers, headers, true);
-	return await this.run(op, body);
+}
+
+/**
+ * http请求
+ * @param {Object} options 配置
+ * @return {Object} 返回执行结果
+ */
+Http.prototype.req = async function(options) {
+	var op = this.http_options(options);
+	if (op.method.toLocaleUpperCase() === "POST") {
+		this.post_option(op);
+	}
+	var res = await this.request(op);
+	if (res.statusCode == 302) {
+		var url = headers.location;
+		var lt = headers['set-cookie'];
+		if (lt) {
+			var len = lt.length;
+			for (var i = 0; i < len; i++) {
+				_this.set_cookie(lt[i]);
+			}
+			options.url = url;
+			op = this.http_options(options);
+			op.referer = options.url;
+			res = await this.request(op);
+		}
+	} else {
+		return res;
+	}
+}
+
+/**
+ * 请求
+ * @param {Object} options 配置
+ */
+Http.prototype.request = function(options) {
+	var hp = options.protocol === "https" ? https : http;
+	delete options.protocol;
+	var _this = this;
+	return new Promise(function(resolve, reject) {
+		var body = '';
+		var req = hp.request(options, (res) => {
+			if (res.statusCode == 200) {
+				var { headers } = res;
+				var buffer = '';
+				var encoding = headers['content-encoding'];
+				if (encoding) {
+					res.setEncoding('utf-8');
+				} else {
+					res.setEncoding("binary");
+				}
+				res.on('data', function(d) {
+					buffer += d;
+				}).on('end', function(d) {
+					switch (encoding) {
+						case 'br':
+						case 'gzip':
+						case 'deflate':
+							body = unzipSync(buffer);
+							break;
+						default:
+							body = buffer;
+							break;
+					}
+					var mh = body.match(/charset=(gb2312|GBK)"/i);
+					if (mh) {
+						body = iconv.decode(buffer, 'GBK');
+					}
+					var lt = headers['set-cookie'];
+					if (lt) {
+						var len = lt.length;
+						for (var i = 0; i < len; i++) {
+							_this.set_cookie(lt[i]);
+						}
+					}
+					resolve({
+						status: 200,
+						headers,
+						binary: buffer,
+						body: body
+					});
+				});
+			} else {
+				resolve({
+					status: {
+						code: res.statusCode,
+						message: res.statusMessage
+					}
+				});
+				reject(res);
+			}
+		});
+
+		req.on("error", function(err) {
+			resolve({
+				status: 0,
+				message: err.message
+			});
+			reject(err);
+		});
+		if (options.method.toLocaleUpperCase() == "POST") {
+			req.write(options.body);
+		}
+		req.end();
+	});
+}
+
+/**
+ * @description GET请求
+ * @param {String} url 请求地址
+ * @param {Object} headers 请求头
+ * @param {Object} cookie 服务缓存
+ * @return {Object} 响应的结果
+ */
+Http.prototype.get = async function(url, headers, cookie) {
+	return await this.req({
+		method: "GET",
+		url,
+		headers,
+		cookie
+	});
 };
 
+
 /**
- * @description POST请求 —— 快速
+ * @description POST提交
  * @param {String} url 请求地址
- * @param {String} body 正文参数
- * @param {String} type 请求类型
- * @return {Object} 请求的结果
+ * @param {Object} body 提交参
+ * @param {Object} headers 请求头
+ * @param {Number} type 传参方式 json, form, text
+ * @param {Object} cookie 服务缓存
+ * @return {Object} 响应的结果
  */
-Http.prototype.post_fast = async function(url, body, type) {
-	var op = this.option('POST', url, {});
-	op.body = body;
-	if (!type) {
-		type = "application/json; charset=UTF-8";
-	}
-	op.headers['Content-Type'] = type;
-	op.headers['Content-Length'] = Buffer.byteLength(body);
-	return await this.run_fast(op, body);
+Http.prototype.post = async function(url, body, headers, type, cookie) {
+	return await this.req({
+		method: "POST",
+		url,
+		body,
+		headers,
+		cookie
+	});
 };
 
 /**
@@ -414,8 +332,9 @@ Http.prototype.download = async function(url, filename, auto, headers, cookie) {
 				}
 			} else {
 				var content_type = res.headers["content-type"];
-				var type = content_type.replace("image/", "").replace("application/x-", "").replace("text/", "").replace("audio/",
-					"").replace("audio/", "").replace("jpeg", "jpg");
+				var type = content_type.replace("image/", "").replace("application/x-", "").replace("text/", "")
+					.replace("audio/",
+						"").replace("audio/", "").replace("jpeg", "jpg");
 				file = filename + "." + type;
 			}
 		} else {
@@ -437,8 +356,7 @@ Http.prototype.download = async function(url, filename, auto, headers, cookie) {
  * 清除缓存
  */
 Http.prototype.clear = function() {
-	this.cookie.list.clear();
-	this.headers = [];
+	this.cookies = {};
 };
 
 if (global.$) {

package/package.json

@@ -1,10 +1,11 @@
-{
+{
     "name": "mm_https",
-    "version": "1.4.6",
+    "version": "1.4.7",
     "description": "这是超级美眉http请求帮助类模块，可自动补充cookie，实现模拟登录，通讯",
     "main": "index.js",
     "scripts": {
-        "test": "node test.js"
+        "test": "node test.js",
+        "dev": "nodemon test.js"
     },
     "repository": {
         "type": "git",
@@ -30,8 +31,8 @@
     },
     "homepage": "https://github.com/qiuwenwu/mm_https#readme",
     "dependencies": {
+        "https-proxy-agent": "^5.0.1",
         "iconv-lite": "^0.5.0",
         "mm_expand": "^1.4.7"
-    },
-    "devDependencies": {}
+    }
 }

package/test.js

@@ -20,10 +20,11 @@ var fs = require("fs");
 // 		query: token
 // 	};
 // 	var res = await hp.post('https://openai.weixin.qq.com/openapi/message/' + TOKEN, pm);
-// 	console.log(res.body)
+// 	console.log(res.message, res.body)
 // }
 // test3();
 
+
 // async function test2(content, from_user) {.
 // 图灵机器人
 //	const apikey = "xxx";
@@ -53,25 +54,45 @@ var fs = require("fs");
 // }
 // test2("真的", "we21lkjq3l");
 
-// 测试
+
+// // 测试
 // async function test() {
-// 	var hp = new Http();
-// 	// var res = await hp.get("http://www.baidu.com");
-// 	// console.log('百度:' + JSON.stringify(res));
-// 	res = await hp.post("http://api.bitcentre.com.cn/login", {
+// 	var hp = new Http({
+// 		proxy: "http://127.0.0.1:10809"
+// 	});
+// 	res = await hp.post("https://accounts.binance.com/bapi/accounts/v2/public/authcenter/login", {
 // 		'phone': "15817188815",
 // 		'password': "asd123"
 // 	}, null, 'form');
-// 	console.log('登录:' + JSON.stringify(res));
-// 	console.log('cookie:', hp.cookie);
-// 	var token = hp.cookie.get('x-auth-token').value;
-// 	console.log('访问牌:' + token);
-// 	res = await hp.get("http://api.bitcentre.com.cn/paper/id?id=1", {
-// 		"x-auth-token": token
-// 	});
-// 	console.log('结果:' + JSON.stringify(res));
+// 	var token = hp.cookies['x-auth-token'];
+// 	// 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);
 // }
 
+// 测试
+async function test() {
+	var hp = new Http();
+	// var res = await hp.get("http://www.baidu.com");
+	// console.log('百度:' + JSON.stringify(res));
+	res = await hp.post("http://127.0.0.1:8000/login", {
+		'phone': "15817188815",
+		'password': "asd123"
+	}, null, 'text');
+	console.log('登录:' + JSON.stringify(res));
+	var token = hp.cookies['x-auth-token'];
+	console.log('访问牌:' + token);
+	res = await hp.get("http://127.0.0.1:8000/paper/id?id=1", {
+		"x-auth-token": token || ""
+	});
+	console.log('结果:' + JSON.stringify(res));
+	console.log('结果:', hp.cookies);
+}
+
 // async function test () {
 // 	var hp = new Http();
 // 	var res = await hp.get_fast('http://www.hao123.com');
@@ -101,22 +122,69 @@ var fs = require("fs");
 // test();
 
 
-async function download(){
-	var hp = new Http();
-	// var url = "http://www.haoduoma.com/d/file/p/2021-06-18/76df67e451ca9dec9991588ad7fda6e6.jpg";
-	var url = "https://www.copipi.com/p/224/224/becce1fc21d723614b598f5377d5d676.jpg";
-	"./二维码/中文".addDir();
-	var filename = "./二维码/你好.jpg".fullname();
-	var file = await hp.download(url, filename);
-	console.log(file);
-}
-download();
-
-// async function test(){
+// async function download(){
 // 	var hp = new Http();
-// 	var url = "https://weibo.com/p/1003061669879400";
-// 	var res = await hp.get(url);
-// 	console.log(res);
+// 	// var url = "http://www.haoduoma.com/d/file/p/2021-06-18/76df67e451ca9dec9991588ad7fda6e6.jpg";
+// 	var url = "https://www.copipi.com/p/224/224/becce1fc21d723614b598f5377d5d676.jpg";
+// 	"./二维码/中文".addDir();
+// 	var filename = "./二维码/你好.jpg".fullname();
+// 	var file = await hp.download(url, filename);
+// 	console.log(file);
+// }
+// download();
+
+// async function test() {
+// 	var http = new Http();
+// 	console.log("开始请求");
+// 	var options = http.new_options({
+// 		url: "http://www.hao123.com:8000/test?dd=123"
+// 	});
+// 	console.log(1, options);
+
+// 	options = http.new_options({
+// 		url: "www.hao123.com:8000/test?dd=123"
+// 	});
+// 	console.log(2, options);
+
+// 	options = http.new_options({
+// 		url: "www.hao123.com/test?dd=123"
+// 	});
+// 	console.log(3, options);
+
+// 	var options = http.new_options({
+// 		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"
+// 	});
+// 	console.log(6, options);
+// }
+
+// async function test() {
+// 	var http = new Http();
+// 	var res = await http.get("https://www.hao123.com");
+// 	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"
+// 	// });
+// 	// var res = await http.get("https://www.binance.com/bapi/nft/v1/friendly/nft/nft-asset/asset-detail?nftInfoId=31849573");
+// 	// console.log("结果", res.body);
 // }
 
- // test();
+test();