nodejs_chromium 1.0.1 → 1.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodejs_chromium",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/chrome.js

@@ -46,7 +46,7 @@ module.exports = class {
 	}
 
 	async open(url) {
-		return await this.page.goto(url, { waitUntil: 'load' });
+		await this.page.goto(url, { waitUntil: 'load' });
 	}
 
 	/**
@@ -54,15 +54,14 @@ module.exports = class {
 	 *
 	 * @param url
 	 * @param data
-	 * @returns {Promise<*>}
 	 */
 	async post(url, data) {
 		//JSON.stringify(data)
-		return await this.page.goto(url, { method: 'POST', body: data, waitUntil: 'load' });
+		await this.page.goto(url, { method: 'POST', body: data, waitUntil: 'load' });
 	}
 
 	async input(el, value) {
-		return await this.page.type(el, value);
+		await this.page.type(el, value);
 	}
 
 	async click(el) {
@@ -71,9 +70,6 @@ module.exports = class {
 
 	/**
 	 * page.on方法
-	 *
-	 * @param {Object} key
-	 * @param {Object} call
 	 */
 	async on(key, call) {
 		await this.page.on(key, call);
@@ -83,73 +79,34 @@ module.exports = class {
 		await this.browser.disconnect();
 	}
 
-	async wait(ele, timeout = 0, tryCount = 0) {
-		if (ele) {
-			return await this.waitSelector(ele, timeout, tryCount);
-		}
-		return await this.page.waitForNavigation();
-	}
-
-	async waitSelector(ele, timeout = 0, tryCount = 0) {
+	async navigation(timeout = 0, tryCount = 0) {
 		if (timeout < 200) timeout = timeout * 1000;
 		try {
-			await this.page.waitForSelector(ele, { timeout });
+			await this.page.waitForNavigation({ timeout });
 			return true;
 		}
 		catch (e) {
 			if (tryCount > 0) {
-				return await this.waitSelector(ele, timeout, --tryCount)
+				return await this.navigation(ele, timeout, --tryCount)
 			}
 			return false;
 		}
 	}
 
-	async parseResponse(response) {
-		// const response = await this.page.waitForResponse(res => res);
-
-		const value = {};
-		const request = await response.request();
-		const headers = await response.headers();
-		value.method = await request.method();
-		if (value.method === 'OPTIONS') return;
-
-		value.type = await request.resourceType();
-		// value.redirect = await response.redirectURL();
-		if (value.type === 'xhr') value.type = 'AJAX';
-		value.url = await response.url();
-		value.domain = parseUrl(value.url)['host'];
-		value.content = headers['content-type'];
-		value.length = headers['content-length'];
-		value.status = await response.status();
-		value.ok = await response.ok();
-		value.datetime = (new Date(headers['date'])).date('yyyy-mm-dd hh:ii:ss');
-		// value.headers = headers;
-		if (headers['server']) value.server = headers['server'];
-		if (headers['set-cookie']) value.cookies = 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', 'fetch'].has(value.type)) return value;
-		if (value.content) {
-			if (value.content.startsWith('application/vnd')) return value;
-			if (value.content.startsWith('application/xml')) return value;
-			if (value.content.startsWith('text/css')) return value;
-		}
-
-		value.post = await request.postData();
-		if (value.post) value.post = value.post.toString();
-
+	async wait(ele, timeout = 0, tryCount = 0) {
+		if (timeout < 200) timeout = timeout * 1000;
 		try {
-			value.response = await response.buffer();
-			value.response = value.response.toString();
+			await this.page.waitForSelector(ele, { timeout });
+			return true;
 		}
 		catch (e) {
-			value.response = e.parse();
+			if (tryCount > 0) {
+				return await this.wait(ele, timeout, --tryCount)
+			}
+			return false;
 		}
-
-		return value;
 	}
 
-
 	async saveHtml(file) {
 		try {
 			await this.improveUrls(); //修正js/css的域名
@@ -163,6 +120,14 @@ module.exports = class {
 		}
 	}
 
+	async setCookie(cookies) {
+		await this.page.setCookie(...cookies);
+	}
+
+	async getCookie() {
+		return await this.page.cookies();
+	}
+
 	async saveCookies(file) {
 		try {
 			const cookies = await this.page.cookies();
@@ -175,7 +140,7 @@ module.exports = class {
 
 	async watermark(conf) {
 		await this.page.evaluate((conf) => {
-			const wmDiv = document.createElement('div');
+			const wmDiv = document.createElement('div#watermark');
 			wmDiv.style.position = 'fixed';
 			wmDiv.style.top = `50%`;
 			wmDiv.style.left = `50%`;
@@ -188,7 +153,7 @@ module.exports = class {
 			wmDiv.innerText = conf.text;
 			document.body.appendChild(wmDiv);
 		}, conf);
-		await this.page.waitForSelector('div');
+		await this.page.waitForSelector('div#watermark', { timeout: 1000 });
 	}
 
 
@@ -196,7 +161,6 @@ module.exports = class {
 	 * 网页拍照
 	 * @param file
 	 * @param quality
-	 * @returns {Promise<void>}
 	 */
 	async photograph(file, quality = 50) {
 		await this.page.screenshot({
@@ -206,13 +170,11 @@ module.exports = class {
 			quality: quality,
 			omitBackground: true, //显示背景
 		});
-		console.log('photograph=', file);
+		// console.log('photograph=', file);
 	}
 
 	/**
 	 * 补全所有本地js/css
-	 * @returns {Promise<void>}
-	 * @constructor
 	 */
 	async improveUrls() {
 		const url = parseUrl(this.page.url());
@@ -228,4 +190,56 @@ module.exports = class {
 		}, domain);
 	}
 
+
+	async parseResponse(response) {
+		// const response = await this.page.waitForResponse(res => res);
+
+		const value = {};
+		const request = await response.request();
+		const headers = await response.headers();
+		value.method = await request.method();
+		if (value.method === 'OPTIONS') return;
+
+		value.type = await request.resourceType();
+		// value.redirect = await response.redirectURL();
+		if (value.type === 'xhr') value.type = 'AJAX';
+		value.url = await response.url();
+		value.domain = parseUrl(value.url)['host'];
+		value.content = headers['content-type'];
+		value.length = headers['content-length'];
+		value.status = await response.status();
+		value.ok = await response.ok();
+		value.datetime = (new Date(headers['date'])).date('yyyy-mm-dd hh:ii:ss');
+		// value.headers = headers;
+		if (headers['server']) value.server = headers['server'];
+		if (headers['set-cookie']) value.cookies = 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', 'fetch'].has(value.type)) return value;
+		if (value.content) {
+			if (value.content.startsWith('application/vnd')) return value;
+			if (value.content.startsWith('application/xml')) return value;
+			if (value.content.startsWith('text/css')) return value;
+		}
+
+		value.post = await request.postData();
+		if (value.post) value.post = value.post.toString();
+
+		try {
+			value.response = await response.buffer();
+			value.response = value.response.toString();
+		}
+		catch (e) {
+			value.response = e.parse();
+		}
+
+		return value;
+	}
+
+
+
+
+
+
+
 }