mm_https 1.5.5 → 1.5.7

package/index.js

@@ -23,24 +23,7 @@ const {
 class Http {
 	constructor(config) {
 		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, br',
-				'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'
-			},
+			headers: "",
 			rejectUnauthorized: false,
 			cookie: "",
 			proxy: null
@@ -48,10 +31,29 @@ class Http {
 		}, config);
 
 		/**
-		 * cookie缓存
+		 * cookies 缓存
 		 */
-		this.cookies = {
+		this.cookies = {};
 
+		/**
+		 * 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/98.0.4758.102 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);
 		}
 	}
 }
@@ -79,13 +81,40 @@ Http.prototype.get_cookie = function() {
 	return cookie
 }
 
+/**
+ * 转换协议头
+ * @param {Object|String} headers 协议头
+ */
+Http.prototype.change_headers = function(headers) {
+	if (headers) {
+		if (typeof(headers) == "string") {
+			if (headers.indexOf("{") === 0) {
+				return headers.toJson();
+			} else {
+				var dict = {};
+				var lines = headers.split('\n');
+				for (var i = 0; i < lines.length; i++) {
+					var line = lines[i].trim();
+					if (line) {
+						dict[line.left(":").trim()] = line.right(":").trim();
+					}
+				}
+				return dict;
+			}
+		} else {
+			return headers;
+		}
+	}
+	return {}
+}
+
 Http.prototype.options = function(options) {
 	return {
 		href: "",
 		method: "GET",
 		body: {},
 		proxy: "http://127.0.0.1:10809",
-		headers: Object.assign({}, this.config.headers)
+		headers: Object.assign({}, this.headers)
 	}
 }
 
@@ -109,7 +138,7 @@ Http.prototype.http_options = function(options) {
 		body,
 		type,
 		method: method || "GET",
-		headers: headers ? Object.assign({}, cg.headers, headers) : Object.assign({}, cg.headers),
+		headers: headers ? Object.assign({}, this.headers, headers) : Object.assign({}, this.headers),
 		agent: cg.proxy ? new HttpProxyAgent(cg.proxy) : null,
 		cookie: this.get_cookie()
 	}, u);
@@ -272,9 +301,11 @@ Http.prototype.request = function(options) {
 			var {
 				headers
 			} = res;
+
 			if (res.statusCode == 200) {
 				var chunks = [];
 				var encoding = headers['content-encoding'];
+
 				res.on('data', function(d) {
 					chunks.push(d);
 				}).on('end', function(de) {
@@ -283,7 +314,8 @@ Http.prototype.request = function(options) {
 						case 'br':
 						case 'gzip':
 						case 'deflate':
-							body = unzipSync(buffer).toString();
+							buffer = unzipSync(buffer);
+							body = buffer.toString();
 							break;
 						default:
 							body = buffer.toString();
@@ -320,6 +352,7 @@ Http.prototype.request = function(options) {
 		});
 
 		req.on("error", function(err) {
+			console.log("错误", err);
 			resolve({
 				status: 0,
 				message: err.message
@@ -427,4 +460,4 @@ if (global.$) {
 /**
  * @description 导入构造函数
  */
-module.exports = Http;
+module.exports = Http;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mm_https",
-    "version": "1.5.5",
+    "version": "1.5.7",
     "description": "这是超级美眉http请求帮助类模块，可自动补充cookie，实现模拟登录，通讯",
     "main": "index.js",
     "scripts": {
@@ -32,7 +32,7 @@
     "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"
+        "iconv-lite": "^0.5.2",
+        "mm_expand": "^1.5.6"
     }
 }

package/test.js

@@ -2,11 +2,11 @@
 var Http = require('./index.js');
 var fs = require("fs");
 
-async function test(){
-	var http = new Http();
-	var res = await http.get("https://www.baidu.com/");
-	console.log("html", res);
-}
+// async function test(){
+// 	var http = new Http();
+// 	var res = await http.get("https://www.baidu.com/");
+// 	console.log("html", res);
+// }
 
 // async function test3() {
 // 	// 将「微信对话开放平台」得到的信息填入
@@ -140,16 +140,22 @@ async function test(){
 // 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 download(){
+	var hp = new Http({
+		headers: `
+		Referer: https://www.aieliantong.com/admin/index
+		X-Auth-Token: xxx
+		`,
+		cookie: "Hm_lvt_c73f94a74e41202e67d251e6e3f591cb=1697871513; Hm_lpvt_c73f94a74e41202e67d251e6e3f591cb=1698886851; mm:uuid=3QSuThREzVFdRW6/YrT0o0WpriBhXhMdnLmhtJOXwBg="
+	});
+	console.log(hp.headers, hp.cookies);
+	var url = "https://www.copipi.com/p/224/224/becce1fc21d723614b598f5377d5d676.jpg";
+	"./二维码/中文".addDir();
+	var filename = "./二维码/qrcode.jpg".fullname();
+	var file = await hp.download(url, filename);
+	console.log(file);
+}
+download();
 
 // async function test() {
 // 	var http = new Http();
@@ -205,4 +211,4 @@ async function test(){
 // 	// console.log("结果", res.body);
 // }
 
-test();
+// test();