mm_https 1.5.0 → 1.5.2

package/index.js

@@ -38,8 +38,8 @@ class Http {
 				// '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'
+				// '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: "",
@@ -207,13 +207,14 @@ Http.prototype.req = async function(options) {
 		this.post_option(op);
 	}
 	var res = await this.request(op);
-	if (res.statusCode == 302) {
-		var url = headers.location;
-		var lt = headers['set-cookie'];
+	console.log(op);
+	if (res.status.code == 302) {
+		var url = res.headers.location;
+		var lt = res.headers['set-cookie'];
 		if (lt) {
 			var len = lt.length;
 			for (var i = 0; i < len; i++) {
-				_this.set_cookie(lt[i]);
+				this.set_cookie(lt[i]);
 			}
 			options.href = url;
 			op = this.http_options(options);
@@ -268,17 +269,12 @@ Http.prototype.request = function(options) {
 	return new Promise(function(resolve, reject) {
 		var body = '';
 		var req = hp.request(options, (res) => {
+			var {
+				headers
+			} = res;
 			if (res.statusCode == 200) {
-				var {
-					headers
-				} = res;
 				var chunks = [];
 				var encoding = headers['content-encoding'];
-				if (encoding) {
-					// res.setEncoding('utf-8');
-				} else {
-					res.setEncoding("binary");
-				}
 				res.on('data', function(d) {
 					chunks.push(d);
 				}).on('end', function(d) {
@@ -307,11 +303,13 @@ Http.prototype.request = function(options) {
 					resolve({
 						status: 200,
 						headers,
-						body: body
+						buffer,
+						body
 					});
 				});
 			} else {
 				resolve({
+					headers,
 					status: {
 						code: res.statusCode,
 						message: res.statusMessage
@@ -404,7 +402,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.5.0",
+    "version": "1.5.2",
     "description": "这是超级美眉http请求帮助类模块，可自动补充cookie，实现模拟登录，通讯",
     "main": "index.js",
     "scripts": {

package/test.js

@@ -1,8 +1,14 @@
 // const nJwt = require('njwt');
-var http = require('http');
 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/");
+	var res = await http.get("https://www.hao123.com/");
+	console.log("html", res);
+}
+
 // async function test3() {
 // 	// 将「微信对话开放平台」得到的信息填入
 // 	var APPID = "xxx";
@@ -25,7 +31,6 @@ var fs = require("fs");
 // }
 // test3();
 
-
 // async function test2(content, from_user) {.
 // 图灵机器人
 //	const apikey = "xxx";
@@ -94,19 +99,30 @@ var fs = require("fs");
 // 	// console.log('结果:', hp.cookies);
 // }
 
-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);
-}
+// 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();
+// 	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("下载失败");
 // 		}