feat(app): 将OCR识别模块整合打包，修复OCR路径存在空格执行失败的BUG

.vscode/settings.json

@@ -1,17 +1,18 @@
 {
 	"cSpell.words": [
-		"jsdom",
 		"axios",
 		"historychange",
 		"isclose",
 		"isstop",
+		"jsdom",
 		"nomove",
 		"ondefault",
 		"ondone",
 		"onhistorychange",
 		"onprevent",
 		"onrender",
 		"onrun",
+		"sider",
 		"Tesseract",
 		"traineddata",
 		"webrtc",
@@ -35,5 +36,8 @@
 	/** 鼠标滚动速度 */
 	"editor.mouseWheelScrollSensitivity": 2,
 	/** 不生成 @return 的 jsdoc */
-	"typescript.suggest.jsdoc.generateReturns": false
+	"typescript.suggest.jsdoc.generateReturns": false,
+	"[typescript]": {
+		"editor.defaultFormatter": "esbenp.prettier-vscode"
+	}
 }

packages/app/electron.builder.json

@@ -13,8 +13,8 @@
 	},
 	"extraFiles": [
 		{
-			"from": "./bin",
-			"to": "./bin"
+			"from": "./bin/ocr.zip",
+			"to": "./bin/ocr.zip"
 		}
 	],
 

packages/app/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ocsjs/app",
-	"version": "2.0.4",
+	"version": "2.0.5",
 	"description": "app package of ocs",
 	"main": "./lib/index.js",
 	"types": "./lib/types.d.ts",

packages/app/src/tasks/init.store.ts

@@ -5,12 +5,16 @@ import { existsSync, mkdirSync } from 'fs';
 import { appStore, store } from '../store';
 import { valid, coerce, clean, gt, SemVer } from 'semver';
 import defaultsDeep from 'lodash/defaultsDeep';
+import { Logger } from '../logger';
+
+const logger = Logger('store-init');
 
 /**
  * 初始化配置
  */
 export async function initStore() {
 	const version = store.store.version;
+	logger.log('version', version);
 
 	// 是否需要初始化
 	if (typeof version === 'string') {
@@ -23,13 +27,17 @@ export async function initStore() {
 			store.store = defaultsDeep(store.store, appStore);
 		}
 	} else {
-		const render = store.store.render || {};
+		const render = store.store.render ? JSON.parse(JSON.stringify(store.store.render)) : {};
+		appStore.render = render;
 		// 初始化设置
 		store.store = appStore;
-		// 恢复 render 数据
-		store.store.render = render;
+
+		logger.log('store', store.store);
 	}
 
+	// 强制更新 exe-path
+	store.store.paths['exe-path'] = app.getPath('exe');
+
 	if (!existsSync(store.store.paths.userDataDirsFolder)) {
 		mkdirSync(store.store.paths.userDataDirsFolder, { recursive: true });
 	}

packages/app/src/tasks/ocr.unzip.ts

@@ -2,17 +2,22 @@ import { Logger } from '../logger';
 import { getProjectPath, unzip } from '../utils';
 import path from 'path';
 import fs from 'fs';
+import { app } from 'electron';
+import { store } from '../store';
 
 const logger = Logger('ocr-unzip');
 
+export let ocr_path = '';
+
 export async function ocrUnzip() {
 	logger.log('ocr-unzip', Date.now());
+	const parentFolder = app.isPackaged ? path.join(app.getPath('exe'), '../') : getProjectPath();
 	try {
-		const ocr = path.join(getProjectPath(), './bin/ocr.zip');
-		const dest = path.join(getProjectPath(), './bin/ocr');
-		if (!fs.existsSync(dest)) {
-			await unzip(ocr, path.join(getProjectPath(), './bin/ocr'));
-			logger.log('ocr-unzip-finish', Date.now());
+		const ocr = path.join(parentFolder, './bin/ocr.zip');
+		ocr_path = path.join(store.store.paths.downloadFolder, './ocr');
+		if (!fs.existsSync(ocr_path)) {
+			await unzip(ocr, ocr_path);
+			logger.log('ocr-unzip-finish', Date.now(), ocr_path);
 		}
 	} catch (err) {
 		logger.log('ocr-unzip-error', err);

packages/app/src/utils/index.ts

@@ -63,10 +63,15 @@ export function zip(input: string, output: string) {
  */
 
 export function unzip(input: string, output: string) {
-	return new Promise<void>((resolve) => {
+	return new Promise<void>((resolve, reject) => {
 		const zip = new AdmZip(input);
-		zip.extractAllTo(output, true);
-		resolve();
+		zip.extractAllToAsync(output, true, (err) => {
+			if (err) {
+				reject(err);
+			} else {
+				resolve();
+			}
+		});
 	});
 }
 

packages/app/src/utils/ocr.ts

@@ -2,8 +2,10 @@ import { writeFile, mkdirSync, existsSync, rmSync, writeFileSync } from 'fs';
 import path from 'path';
 import { randomUUID } from 'crypto';
 import child_process from 'child_process';
-import { getProjectPath } from '.';
+import { ocr_path } from '../tasks/ocr.unzip';
+import { Logger } from '../logger';
 
+const logger = Logger('ocr');
 
 /**
  * 使用 ddddocr 进行验证码识别
@@ -12,13 +14,16 @@ import { getProjectPath } from '.';
 export function ocr(base64: string) {
 	return new Promise<string>((resolve, reject) => {
 		const uuid = randomUUID();
-		const img_cache = path.join(getProjectPath(), './bin/ocr/img_cache');
+		const img_cache = path.join(ocr_path, './img_cache');
 		if (!existsSync(img_cache)) {
 			mkdirSync(img_cache, { recursive: true });
 		}
 		const img = path.join(img_cache, uuid + '.png');
 		writeFile(img, base64, 'base64', () => {
-			const cmd = [path.join(getProjectPath(), './bin/ocr/ocr.exe'), '--ocr', img].join(' ');
+			// 要使用 "" 去包裹路径，防止出现空格
+			const cmd = [`"${path.join(ocr_path, './ocr.exe')}"`, '--ocr', `"${img}"`].join(' ');
+			logger.log('cmd', cmd);
+
 			child_process.exec(cmd, (err, stdout, stderr) => {
 				if (err || stderr) {
 					reject(err || stderr);
@@ -48,7 +53,7 @@ export function det(det_target_base64: string, det_bg_base64: string) {
 		target_y: number;
 		target: [number, number, number, number];
 	}>((resolve, reject) => {
-		const img_cache = path.join(getProjectPath(), './bin/ocr/img_cache');
+		const img_cache = path.join(ocr_path, './img_cache');
 		if (!existsSync(img_cache)) {
 			mkdirSync(img_cache, { recursive: true });
 		}
@@ -57,7 +62,9 @@ export function det(det_target_base64: string, det_bg_base64: string) {
 		writeFileSync(img1, det_target_base64, 'base64');
 		writeFileSync(img2, det_bg_base64, 'base64');
 
-		const cmd = [path.join(getProjectPath(), './bin/ocr/ocr.exe'), '--det-target', img1, '--det-bg', img2].join(' ');
+		const cmd = [`"${path.join(ocr_path, './ocr.exe')}"`, '--det-target', `"${img1}"`, '--det-bg', `"${img2}"`].join(
+			' '
+		);
 
 		child_process.exec(cmd, (err, stdout, stderr) => {
 			if (err || stderr) {
@@ -78,5 +85,5 @@ export function det(det_target_base64: string, det_bg_base64: string) {
 
 /** 判断是否能够进行验证码识别 */
 export function canOCR() {
-	return existsSync(path.join(getProjectPath(), './bin/ocr/ocr.exe'));
+	return existsSync(path.join(ocr_path, './ocr.exe'));
 }