fix: 优化 OCR 数据加载问题

ocsjs · Apr 27, 2022 · ed958a9 · ed958a9
1 parent 6bb3a29
commit ed958a9
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 27 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -16,6 +16,7 @@
     "@types/node-fetch": "^2.6.1",
     "axios": "^0.25.0",
     "chalk": "4.1.0",
+    "dom-to-image": "^2.6.0",
     "html2canvas": "^1.4.1",
     "lodash": "^4.17.21",
     "node-fetch": "^2.6.7",
@@ -44,6 +45,7 @@
   },
   "homepage": "https://github.com/enncy/online-course-script#readme",
   "devDependencies": {
+    "@types/dom-to-image": "^2.6.4",
     "@types/string-similarity": "^4.0.0",
     "@types/tampermonkey": "^4.0.5",
     "@vitejs/plugin-vue": "^1.6.1",

diff --git a/packages/core/src/components/cx/ExamSettingPanel.tsx b/packages/core/src/components/cx/ExamSettingPanel.tsx
@@ -29,7 +29,7 @@ export const ExamSettingPanel = defineComponent({
             <input
               type="number"
               value={settings.period}
-              min="0"
+              min="3"
               step="1"
               onChange={(e: any) => {
                 settings.period = e.target.valueAsNumber;

diff --git a/packages/core/src/components/cx/StudySettingPanel.tsx b/packages/core/src/components/cx/StudySettingPanel.tsx
@@ -101,7 +101,7 @@ export const StudySettingPanel = defineComponent({
             <input
               type="number"
               value={store.setting.cx.work.period}
-              min="0"
+              min="3"
               step="1"
               onChange={(e: any) => {
                 store.setting.cx.work.period = e.target.valueAsNumber;

diff --git a/packages/core/src/components/cx/WorkSettingPanel.tsx b/packages/core/src/components/cx/WorkSettingPanel.tsx
@@ -21,7 +21,7 @@ export const WorkSettingPanel = defineComponent({
             <input
               type="number"
               value={settings.period}
-              min="0"
+              min="3"
               step="1"
               onChange={(e: any) => {
                 settings.period = e.target.valueAsNumber;

diff --git a/packages/core/src/components/zhs/WorkSettingPanel.tsx b/packages/core/src/components/zhs/WorkSettingPanel.tsx
@@ -29,7 +29,7 @@ export const WorkSettingPanel = defineComponent({
               type="number"
               onChange={(e: any) => (settings.period = e.target.valueAsNumber)}
               value={settings.period}
-              min="0"
+              min="3"
               step="1"
             ></input>
           </div>

diff --git a/packages/core/src/core/ocr.ts b/packages/core/src/core/ocr.ts
@@ -1,4 +1,5 @@
-import html2canvas from 'html2canvas';
+import domtoimage from 'dom-to-image';
+
 import Tesseract, { createWorker } from 'tesseract.js';
 
 /**
@@ -7,8 +8,6 @@ import Tesseract, { createWorker } from 'tesseract.js';
  * @see https://github.com/naptha/tesseract.js
  */
 export class OCR {
-  /** 初始化语言 */
-    lang: string;
     worker: Tesseract.Worker;
     /**
      * 默认加载语言
@@ -31,9 +30,8 @@ export class OCR {
       letterSpacing: '8px'
     }
 
-    constructor(lang?: string) {
-      this.lang = lang || OCR.DEFAULT_LANG;
-      this.worker = createWorker();
+    constructor(options: Partial<Tesseract.WorkerOptions> = {}) {
+      this.worker = createWorker(options);
     }
 
     /**
@@ -43,8 +41,8 @@ export class OCR {
     async load(lang?: string) {
       await this.worker.load();
       // 加载语言
-      await this.worker.loadLanguage(lang || this.lang || OCR.DEFAULT_LANG);
-      await this.worker.initialize(lang || this.lang || OCR.DEFAULT_LANG);
+      await this.worker.loadLanguage(lang || OCR.DEFAULT_LANG);
+      await this.worker.initialize(lang || OCR.DEFAULT_LANG);
     }
 
     /**
@@ -78,9 +76,9 @@ export class OCR {
      */
     async recognize(el: HTMLElement): Promise<string> {
       // 图片转base64
-      const canvas = await html2canvas(el);
+      const base64 = await domtoimage.toPng(el);
       // 识别
-      const { data: { text } } = await this.worker.recognize(canvas.toDataURL());
+      const { data: { text } } = await this.worker.recognize(base64);
       return text.replace(/ /g, '');
     }
 

diff --git a/packages/core/src/main.ts b/packages/core/src/main.ts
@@ -1,18 +1,17 @@
-import { store } from './script/index';
 import { CommonScript } from './script/common';
-import { ZHSScript } from './script/zhs';
 import { CXScript } from './script/cx';
+import { store } from './script/index';
+import { ZHSScript } from './script/zhs';
 import { start } from './start';
 
 export * from './core/index';
-
-/** 默认脚本列表 */
-export const definedScripts = [CommonScript, ZHSScript, CXScript];
-
-// @ts-ignore vite.define
-const VERSION = process.env._VERSION_;
-
 /**
  * ocsjs
  */
-export { store, start, VERSION };
+export { store, start };
+
+// @ts-ignore vite.define
+export const VERSION = process.env._VERSION_;
+
+/** 默认脚本列表 */
+export const definedScripts = [CommonScript, CXScript, ZHSScript];
diff --git a/packages/core/src/script/cx/index.ts b/packages/core/src/script/cx/index.ts
@@ -184,14 +184,18 @@ export const CXScript = defineScript({
         /** 文字识别 */
         const fonts = CXAnalyses.getSecretFont();
         if (fonts.length) {
-          logger('debug', '文字识别启动');
-          const ocr = new OCR();
-          await ocr.load();
+          const ocr = new OCR({
+            langPath: 'https://cdn.ocs.enncy.cn/resources/tessdata'
 
+          });
+          logger('debug', '加载文字识别功能, 如果是初始化请耐心等待...');
+          await ocr.load();
+          logger('info', '文字识别功能加载成功');
           for (const font of fonts) {
             const text = await ocr.recognize(OCR.suit(font));
             font.innerHTML = text;
           }
+          logger('info', '文字识别完成');
         }
       }
     }