fix(all): 优化浏览器启动以及各种加载逻辑

.vscode/settings.json

@@ -1,5 +1,24 @@
 {
-    "cSpell.words": [
-        "userscript"
-    ]
-}
+	"cSpell.words": ["ICVE", "userscript", "userscripts"],
+	"eslint.validate": ["javascript", "javascriptreact", "vue"],
+	"editor.formatOnSave": true,
+	"editor.codeActionsOnSave": {
+		"source.fixAll.eslint": true
+	},
+	"editor.defaultFormatter": "esbenp.prettier-vscode",
+	/** 样式自动生成 */
+	"less.compile": {
+		"compress": false,
+		"sourceMap": false,
+		"out": "../css/"
+	},
+	/** 鼠标中键代码缩进 */
+	"editor.mouseWheelZoom": true,
+	/** 鼠标滚动速度 */
+	"editor.mouseWheelScrollSensitivity": 2,
+	/** 不生成 @return 的 jsdoc */
+	"typescript.suggest.jsdoc.generateReturns": false,
+	"[typescript]": {
+		"editor.defaultFormatter": "esbenp.prettier-vscode"
+	}
+}

packages/app/src/scripts/automation/wk/cx.ts

@@ -109,10 +109,11 @@ function login(
 		const tryLogin = async () => {
 			tryCount--;
 			const area = await page.$('#numVerCode');
-			if (area !== null) {
+			const codeInput = await page.$('#vercode');
+			if (area && codeInput) {
 				/** 破解验证码 */
 				if (opts?.ocrApiUrl && opts?.ocrApiImageKey && area) {
-					await breakVerifyCode(page, area, {
+					await breakVerifyCode(page, area, codeInput, {
 						ocrApiUrl: opts.ocrApiUrl,
 						ocrApiImageKey: opts.ocrApiImageKey
 					});

packages/app/src/scripts/index.ts

@@ -1,5 +1,15 @@
 import { CXPhoneLoginScript, CXUnitLoginScript } from './automation/wk/cx';
 import { ZHSPhoneLoginScript, ZHSUnitLoginScript } from './automation/wk/zhs';
-import { NewPageScript } from './automation';
+import { ICVELoginScript } from './automation/wk/icve';
+import { ZJYLoginScript } from './automation/wk/zjy';
+import { NewPageScript } from './automation/common';
 
-export const scripts = [CXPhoneLoginScript, CXUnitLoginScript, ZHSPhoneLoginScript, ZHSUnitLoginScript, NewPageScript];
+export const scripts = [
+	CXPhoneLoginScript,
+	CXUnitLoginScript,
+	ZHSPhoneLoginScript,
+	ZHSUnitLoginScript,
+	ZJYLoginScript,
+	ICVELoginScript,
+	NewPageScript
+];

packages/app/src/scripts/utils/index.ts

@@ -10,6 +10,7 @@ export function slowType(page: Page, selector: string, text: string) {
 export async function breakVerifyCode(
 	page: Page,
 	imageElement: ElementHandle<any>,
+	inputElement: ElementHandle<any>,
 	options: { ocrApiUrl: string; ocrApiImageKey: string }
 ) {
 	const box = await imageElement.boundingBox();
@@ -24,7 +25,7 @@ export async function breakVerifyCode(
 		if (canOCR) {
 			/** 破解验证码 */
 			if (code) {
-				await page.fill('#vercode', code);
+				await inputElement.fill(code);
 			} else if (error) {
 				throw new Error(error);
 			}