nodejs_chromium 1.1.13 → 1.1.15

package/package.json

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

package/src/chrome.js

@@ -305,15 +305,18 @@ module.exports = class {
 	 */
 	async elements(tag1, tag2, call) {
 		try {
+
 			const div = await this.page.$(tag1);
 			if (!div) {
 				throw new Error(`${tag1} not exists`);
 			}
+			let index = 0;
 			for (const elm of (await div.$$(tag2))) {
 				const html = await elm.evaluate(node => node.outerHTML);
 				const text = await elm.evaluate(node => node.innerHTML);
-				call(elm, { html, text });
+				call(elm, { html, text, index: index++ });
 			}
+
 		}
 		catch (e) {
 			console.log('[chrome.elements.Error]', e.message)
@@ -321,6 +324,40 @@ module.exports = class {
 	}
 
 
+	/**
+	 * 遍历tag1里的tag2，并由call判断，只有call返回true时才resolve
+	 *
+	 * @param {Object} tag1
+	 * @param {Object} tag2
+	 * @param {Object} call
+	 */
+	async search(tag1, tag2, call) {
+		return await new Promise(async (resolve) => {
+			try {
+
+				const div = await this.page.$(tag1);
+				if (!div) {
+					throw new Error(`${tag1} not exists`);
+				}
+				let index = 0;
+				for (const ele of (await div.$$(tag2))) {
+					index++;
+					const html = await ele.evaluate(node => node.outerHTML);
+					const text = await ele.evaluate(node => node.innerHTML);
+					let val = call(ele, { html, text, index });
+					if (val === true) return resolve({ success: true, ele, html, text, index });
+				}
+				resolve({ success: false });
+
+			}
+			catch (e) {
+				console.log('[chrome.elements.Error]', e.message)
+			}
+		});
+
+	}
+
+
 	/**
 	 * 支持css普通选择器方式和伪类方式
 	 * div.body
@@ -444,8 +481,8 @@ module.exports = class {
 	async click(el, option = {}) {
 		try {
 			let { delay = 100, count = 1, x = 6, y = 3 } = option;
-			await this.page.click(el, { delay, count, offset: { x, y } });
-			return this;
+			return await this.page.click(el, { delay, count, offset: { x, y } });
+			// return this;
 		}
 		catch (e) {
 			console.log('[chrome.click.Error]', e.message);
@@ -596,6 +633,7 @@ module.exports = class {
 	}
 
 	skipTypes = ['image', 'font', 'other', 'script', 'stylesheet', 'document', 'ping'];
+
 	setSkipType(items) {
 		this.skipTypes.length = 0;
 		this.skipTypes = [...items];