mm_https 1.4.7 → 1.4.9

package/index.js

@@ -15,9 +15,6 @@ const iconv = require('iconv-lite');
 const {
 	hostname
 } = require('os');
-const {
-	header
-} = require('request/lib/hawk');
 const {
 	HttpsProxyAgent
 } = require('https-proxy-agent');
@@ -71,8 +68,7 @@ Http.prototype.set_cookie = function(cookieStr) {
 Http.prototype.get_cookie = function() {
 	var dist = this.cookies;
 	var str = "";
-	for(var k in dist)
-	{
+	for (var k in dist) {
 		str += "; " + k + "=" + dist[k];
 	}
 	return str;
@@ -95,7 +91,8 @@ Http.prototype.http_options = function(options) {
 		body,
 		headers,
 		method,
-		cookie
+		cookie,
+		type
 	} = options;
 	var protocol = url.left(":/") || 'http';
 	// 移除协议头 取端口号
@@ -107,7 +104,7 @@ Http.prototype.http_options = function(options) {
 	// 移除主机地址，取路由路径
 	u = u.replace(hostname, "");
 	var path = u;
-	if(cookie){
+	if (cookie) {
 		this.set_cookie(cookie);
 	}
 	return {
@@ -115,6 +112,7 @@ Http.prototype.http_options = function(options) {
 		protocol,
 		hostname,
 		body,
+		type,
 		port: Number(port),
 		path: path.indexOf("/") === 0 ? path : "/" + path,
 		method: method || "GET",
@@ -208,7 +206,9 @@ Http.prototype.request = function(options) {
 		var body = '';
 		var req = hp.request(options, (res) => {
 			if (res.statusCode == 200) {
-				var { headers } = res;
+				var {
+					headers
+				} = res;
 				var buffer = '';
 				var encoding = headers['content-encoding'];
 				if (encoding) {
@@ -243,7 +243,6 @@ Http.prototype.request = function(options) {
 					resolve({
 						status: 200,
 						headers,
-						binary: buffer,
 						body: body
 					});
 				});
@@ -303,6 +302,7 @@ Http.prototype.post = async function(url, body, headers, type, cookie) {
 		method: "POST",
 		url,
 		body,
+		type,
 		headers,
 		cookie
 	});
@@ -318,10 +318,9 @@ Http.prototype.post = async function(url, body, headers, type, cookie) {
  * @return {String} 成功返回保存路径，失败返回null
  */
 Http.prototype.download = async function(url, filename, auto, headers, cookie) {
-	this.encoding = "binary";
 	var res = await this.get(url, headers, cookie);
 	var file = null;
-	if (res.binary) {
+	if (res.body) {
 		if (auto) {
 			var arr = url.split('/');
 			var fullname = arr[arr.length - 1];
@@ -341,7 +340,7 @@ Http.prototype.download = async function(url, filename, auto, headers, cookie) {
 			file = filename;
 		}
 		if (file) {
-			var length = await fs.writeFileSync(file, res.binary, "binary");
+			var length = await fs.writeFileSync(file, res.body, "binary");
 			if (length == 0) {
 				file = null;
 			}

package/package.json

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

package/test.js

@@ -75,35 +75,35 @@ var fs = require("fs");
 // }
 
 // 测试
-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 () {
+// async function test() {
 // 	var hp = new Http();
-// 	var res = await hp.get_fast('http://www.hao123.com');
-// 	console.log(res.body);
+// 	// 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, 'json');
+// 	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('http://www.hao123.com');
+	console.log(res.body);
+}
+
 // async function test() {
 // 	var hp = new Http();
-// 	hp.encoding = "binary";
 // 	var res = await hp.get('http://localhost:8080/dev/img/logo_gray.png');
-// 	fs.writeFile("./logonew.png", res.binary, "binary", function(err) {
+// 	console.log(res);
+// 	fs.writeFile("./logonew.png", res.body, "binary", function(err) {
 // 		if (err) {
 // 			console.log("下载失败");
 // 		}