nodejs_chromium 1.1.7 → 1.1.10

package/index.js

@@ -4,12 +4,10 @@ const chrome = require("./src/chrome.js");
 const { exec } = require("child_process");
 global.__UA__ = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36';
 const mob_ua = 'Mozilla/5.0 (Linux; Android 13;Build/TKQ1.220905.001) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/116.0.0.0 Mobile Safari/537.36';
-let browser;
+const fs = require("fs");
 
 
 async function NormalClose(path) {
-
-	const fs = require("fs");
 	/**
 	 * 禁止显示【要恢复页面吗？chromium 未正确关闭。】
 	 * PATH为chrome.userDataDir
@@ -94,21 +92,21 @@ async function newBrowser(params) {
 			]
 		}
 
-		if (proxy) option.defaultArgs.push(`--proxy-server=${proxy}`);
+		if (proxy) option.args.push(`--proxy-server=${proxy}`);
 		if (incognito) option.args.push('--incognito', '--disable-infobars'); //使用无痕模式启动
 		if (!cache) option.args.push('--disable-cache'); //禁缓存
 		if (path) option.executablePath = path; //指定chrome安装路径
 
-		browser = await puppeteer.launch(option);
-		
+		const browser = await puppeteer.launch(option);
+
 		await NormalClose(option.userDataDir); //禁止显示【要恢复页面吗？chromium 未正确关闭。】
-		
+
 		return browser;
 	}
 	catch (e) {
 		let mt = e.message.match(/\(ver\. (\d+\.\d+\.\d+\.\d+)\)/);
 		if (mt) {
-			return { error: `chrome(${mt})未安装`, install: 1 };
+			return { error: `chrome(${mt[0]})未安装，请执行【npx puppeteer browsers install】以安装相应版本的chrome`, install: 1 };
 		}
 		else {
 			console.log('checkInstall', e.message);
@@ -130,7 +128,10 @@ async function newChrome(params) {
 				headers = {},
 		} = params;
 
-		await newBrowser(params);
+		const browser = await newBrowser(params);
+		if (browser.error) {
+			console.log({ browser })
+		}
 
 		// const version = await browser.version();
 		const page = (await browser.pages())[0];

package/package.json

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

package/src/chrome.js

@@ -311,7 +311,9 @@ module.exports = class {
 				throw new Error(`${tag1} not exists`);
 			}
 			for (const elm of (await div.$$(tag2))) {
-				call(elm, (await elm.evaluate(node => node.innerHTML)));
+				const html = await elm.evaluate(node => node.outerHTML);
+				const text = await elm.evaluate(node => node.innerHTML);
+				call(elm, { html, text });
 			}
 		}
 		catch (e) {