nodejs_chromium 1.1.10 → 1.1.13

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "nodejs_chromium",
-	"version": "1.1.10",
+	"version": "1.1.13",
 	"description": "for pupeteer chromium",
 	"main": "index.js",
 	"scripts": {

package/src/chrome.js

@@ -1,6 +1,6 @@
 const fs = require("fs");
 const Cookies = require("./cookies");
-const { parse: parseUrl } = require("url");
+const { URL } = require('url');
 
 
 /**
@@ -53,7 +53,7 @@ module.exports = class {
 			await page.evaluateOnNewDocument(() => {
 				const newProto = navigator.__proto__;
 				delete newProto.webdriver; //删除 navigator.webdriver字段
-				navigator.__proto__ = newProto; //在每次新文档加载时，删除 navigator.webdriver 字段，这有助于防止某些网站检测到自动化行为。
+				navigator.__proto__ = newProto; //删除 navigator.webdriver 字段，有助于防止某些网站检测到自动化行为
 			});
 			return new module.exports(this.browser, page, this.options, false); //new 自身
 		}
@@ -152,7 +152,7 @@ module.exports = class {
 	/**
 	 * 关闭
 	 */
-	async close(act = 0) {
+	async close(act = 1) {
 		try {
 			if (act & 1) await this.page.close();
 			if (act & 2) await this.browser.close();
@@ -214,7 +214,6 @@ module.exports = class {
 			else {
 				await this.page.goto(url, { timeout, referer, waitUntil });
 			}
-			await this.page.goto(url, { timeout, referer, waitUntil });
 			return this;
 		}
 		catch (e) {
@@ -578,7 +577,7 @@ module.exports = class {
 	 * 补全所有本地js/css，一般用于保存html之前
 	 */
 	async improveUrls() {
-		const url = parseUrl(this.page.url());
+		const url = new URL(this.page.url());
 		const domain = url.protocol + '//' + url.host;
 		await this.page.evaluate((domain) => {
 			try {
@@ -596,6 +595,17 @@ module.exports = class {
 		}, domain);
 	}
 
+	skipTypes = ['image', 'font', 'other', 'script', 'stylesheet', 'document', 'ping'];
+	setSkipType(items) {
+		this.skipTypes.length = 0;
+		this.skipTypes = [...items];
+		return this;
+	}
+
+	delSkipType(...item) {
+		this.skipTypes = this.skipTypes.del(...item);
+		return this;
+	}
 
 	async parseResponse(response) {
 		// const response = await this.page.waitForResponse(res => res);
@@ -612,7 +622,7 @@ module.exports = class {
 		if (value.type === 'xhr') value.type = 'AJAX';
 		value.url = await response.url();
 		value.headers = { request: request.headers(), response: headers };
-		value.domain = parseUrl(value.url)['host'];
+		value.domain = (new URL(value.url))['host'];
 		value.content = headers['content-type'];
 		value.length = headers['content-length'];
 		value.status = await response.status();
@@ -623,7 +633,11 @@ module.exports = class {
 		if (headers['set-cookie']) value.cookies = await this.cookies.parse(headers['set-cookie']);
 		value.remote = await response.remoteAddress(); //目标服务器
 		if (value.status === 301 || value.status === 302) return value;
-		if (['image', 'font', 'other', 'script', 'stylesheet', 'document', 'ping'].has(value.type)) return value;
+
+		// if (['image', 'font', 'other', 'script', 'stylesheet', 'document', 'ping'].has(value.type)) return value;
+		// if (['image', 'font', 'other', 'script', 'stylesheet', 'ping'].includes(value.type)) return value;
+		if (this.skipTypes.includes(value.type)) return value;
+
 		if (value.content) {
 			if (value.content.startsWith('application/vnd')) return value;
 			if (value.content.startsWith('application/xml')) return value;
@@ -647,9 +661,8 @@ module.exports = class {
 	}
 
 	host(url) {
-		// const domain = url.protocol + '//' + url.host;
-		const urls = parseUrl(url);
-		return '.' + urls.host.split('.').slice(-2).join('.');
+		const myUrl = new URL(url);
+		return '.' + myUrl.host.split('.').slice(-2).join('.');
 	}
 
 
@@ -670,7 +683,7 @@ module.exports = class {
 
 			if (abort.length > 0 && abort.some(t => t === rType)) return request.abort();
 
-			if (optHead !== {}) Object.assign(headers, optHead);
+			if (JSON.stringify(optHead) !== '{}') Object.assign(headers, optHead);
 
 			headers['Access-Control-Allow-Origin'] = '*'; // 设置允许跨源访问的域名，可以根据需求修改
 			headers['Access-Control-Allow-Methods'] = '*'; //'GET, POST, PUT, OPTIONS';
@@ -680,8 +693,7 @@ module.exports = class {
 
 		this.page.on('response', async res => {
 			if (!this.responseCall) return;
-			let json = await this.parseResponse(res);
-			await this.responseCall(json);
+			await this.responseCall(await this.parseResponse(res));
 		});
 
 	}