nodejs_chromium 1.0.2 → 1.0.4

package/package.json

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

package/src/chrome.js

@@ -45,8 +45,9 @@ module.exports = class {
 		this.responseCall = call;
 	}
 
-	async setCookie(cookies) {
-		await this.page.setCookie(...cookies);
+	async waiting(time) {
+		if (time < 100) time = time * 1000;
+		return await new Promise(res => setTimeout(res, time));
 	}
 
 	async open(url) {
@@ -74,9 +75,6 @@ module.exports = class {
 
 	/**
 	 * page.on方法
-	 *
-	 * @param {Object} key
-	 * @param {Object} call
 	 */
 	async on(key, call) {
 		await this.page.on(key, call);
@@ -86,14 +84,21 @@ module.exports = class {
 		await this.browser.disconnect();
 	}
 
-	async wait(ele, timeout = 0, tryCount = 0) {
-		if (ele) {
-			return await this.waitSelector(ele, timeout, tryCount);
+	async navigation(timeout = 0, tryCount = 0) {
+		if (timeout < 200) timeout = timeout * 1000;
+		try {
+			await this.page.waitForNavigation({ timeout });
+			return true;
+		}
+		catch (e) {
+			if (tryCount > 0) {
+				return await this.navigation(ele, timeout, --tryCount)
+			}
+			return false;
 		}
-		await this.page.waitForNavigation();
 	}
 
-	async waitSelector(ele, timeout = 0, tryCount = 0) {
+	async wait(ele, timeout = 0, tryCount = 0) {
 		if (timeout < 200) timeout = timeout * 1000;
 		try {
 			await this.page.waitForSelector(ele, { timeout });
@@ -101,7 +106,7 @@ module.exports = class {
 		}
 		catch (e) {
 			if (tryCount > 0) {
-				return await this.waitSelector(ele, timeout, --tryCount)
+				return await this.wait(ele, timeout, --tryCount)
 			}
 			return false;
 		}
@@ -120,6 +125,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();
@@ -153,7 +166,6 @@ module.exports = class {
 	 * 网页拍照
 	 * @param file
 	 * @param quality
-	 * @returns {Promise<void>}
 	 */
 	async photograph(file, quality = 50) {
 		await this.page.screenshot({
@@ -168,8 +180,6 @@ module.exports = class {
 
 	/**
 	 * 补全所有本地js/css
-	 * @returns {Promise<void>}
-	 * @constructor
 	 */
 	async improveUrls() {
 		const url = parseUrl(this.page.url());