主要 替换opencv.js->@techstark/opencv-js

package.json

@@ -19,6 +19,7 @@
     "license": "GPL-3.0",
     "dependencies": {
         "@erase2d/fabric": "^1.1.6",
+        "@techstark/opencv-js": "4.10.0-release.1",
         "chroma-js": "^3.1.1",
         "diff-match-patch": "^1.0.5",
         "dkh-ui": "^0.12.4",
@@ -35,7 +36,6 @@
         "mp4-muxer": "^5.1.3",
         "node-screenshots": "^0.2.1",
         "onnxruntime-node": "^1.18.0",
-        "opencv.js": "^1.2.1",
         "qr-scanner-wechat": "^0.1.3",
         "remarkable": "^2.0.1",
         "sortablejs": "^1.15.2",
@@ -73,6 +73,8 @@
         "node-screenshots-win32-x64-msvc": "0.1.9"
     },
     "pnpm": {
-        "neverBuiltDependencies": ["canvas"]
+        "neverBuiltDependencies": [
+            "canvas"
+        ]
     }
 }

src/renderer/clip/clip_window.ts

@@ -337,8 +337,7 @@ function edge() {
     for (let i = 0; i < contours.size(); i++) {
         const cnt = contours.get(i);
         const r = cv.boundingRect(cnt);
-        r.type = "image";
-        edgeRect.push(r);
+        edgeRect.push({ ...r, type: "image" });
     }
 
     src.delete();
@@ -408,7 +407,8 @@ function setDefaultAction(act: setting["框选后默认操作"]) {
     if (!act) return;
     autoDo = act;
     if (autoDo !== "no") {
-        toolBarEl.els[autoDo].el.style.backgroundColor = "var(--bar-focus-color)";
+        toolBarEl.els[autoDo].el.style.backgroundColor =
+            "var(--bar-focus-color)";
     }
 }
 
@@ -525,14 +525,14 @@ function long_s() {
     s = null;
 }
 
-function startLong() {
+async function startLong() {
     initLong(finalRect);
     const r = [...finalRect];
     r[0] += screenPosition[nowScreenId].x;
     r[1] += screenPosition[nowScreenId].y;
     long_s();
     ipcRenderer.send("clip_main_b", "long_s", r);
-    if (!cv) cv = require("opencv.js");
+    if (!cv) cv = require("@techstark/opencv-js");
     if (store.get("广截屏.模式") === "自动") {
         uIOhook = require("uiohook-napi").uIOhook;
         uIOhook.start();
@@ -2752,7 +2752,7 @@ async function fabricCopy() {
 
 if (store.get("框选.自动框选.图像识别")) {
     // biome-ignore lint: 为了部分引入
-    var cv = require("opencv.js");
+    var cv = require("@techstark/opencv-js");
 }
 
 const 字体 = store.get("字体");