@bettergi/utils 0.1.15 → 0.1.17

package/dist/ocr.js

@@ -1,13 +1,5 @@
 import { mouseScrollDownLines } from "./mouse";
 import { waitForAction } from "./workflow";
-const findFirst = (ir, ro, predicate) => {
-    const candidates = ir.findMulti(ro);
-    for (let i = 0; i < candidates.count; i++) {
-        if (predicate(candidates[i]))
-            return candidates[i];
-    }
-    return undefined;
-};
 const directionToBounds = (direction) => {
     const x = direction.includes("east") ? genshin.width / 2 : 0;
     const y = direction.includes("south") ? genshin.height / 2 : 0;
@@ -32,8 +24,11 @@ export const findImage = (image, config = {}) => {
     try {
         const mat = typeof image === "string" ? file.readImageMatSync(image) : image;
         const ro = RecognitionObject.templateMatch(mat);
-        Object.assign(ro, config);
-        return findFirst(ir, ro, region => region.isExist());
+        if (Object.keys(config).length > 0) {
+            Object.assign(ro, config) && ro.initTemplate();
+        }
+        const region = ir.find(ro);
+        return region.isExist() ? region : undefined;
     }
     catch (err) {
         log.warn(`${err.message || err}`);
@@ -57,8 +52,11 @@ export const findImageWithinBounds = (image, x, y, w, h, config = {}) => {
     try {
         const mat = typeof image === "string" ? file.readImageMatSync(image) : image;
         const ro = RecognitionObject.templateMatch(mat, x, y, w, h);
-        Object.assign(ro, config);
-        return findFirst(ir, ro, region => region.isExist());
+        if (Object.keys(config).length > 0) {
+            Object.assign(ro, config) && ro.initTemplate();
+        }
+        const region = ir.find(ro);
+        return region.isExist() ? region : undefined;
     }
     catch (err) {
         log.warn(`${err.message || err}`);
@@ -91,6 +89,14 @@ export const findImageInDirection = (image, direction, config = {}) => {
     const { x, y, w, h } = directionToBounds(direction);
     return findImageWithinBounds(image, x, y, w, h, config);
 };
+const findFirst = (ir, ro, predicate) => {
+    const candidates = ir.findMulti(ro);
+    for (let i = 0; i < candidates.count; i++) {
+        if (predicate(candidates[i]))
+            return candidates[i];
+    }
+    return undefined;
+};
 /**
  * 在整个画面内搜索文本
  * @param text 待搜索文本
@@ -104,7 +110,9 @@ export const findText = (text, options, config = {}) => {
     const ir = captureGameRegion();
     try {
         const ro = RecognitionObject.ocrThis;
-        Object.assign(ro, config);
+        if (Object.keys(config).length > 0) {
+            Object.assign(ro, config) && ro.initTemplate();
+        }
         return findFirst(ir, ro, region => {
             const itemText = ignoreCase ? region.text.toLowerCase() : region.text;
             const isMatch = contains ? itemText.includes(searchText) : itemText === searchText;
@@ -135,7 +143,9 @@ export const findTextWithinBounds = (text, x, y, w, h, options, config = {}) =>
     const ir = captureGameRegion();
     try {
         const ro = RecognitionObject.ocr(x, y, w, h);
-        Object.assign(ro, config);
+        if (Object.keys(config).length > 0) {
+            Object.assign(ro, config) && ro.initTemplate();
+        }
         return findFirst(ir, ro, region => {
             const itemText = ignoreCase ? region.text.toLowerCase() : region.text;
             const isMatch = contains ? itemText.includes(searchText) : itemText === searchText;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bettergi/utils",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "description": "开发 BetterGI 脚本常用工具集",
   "type": "module",
   "author": "Bread Grocery<https://github.com/breadgrocery>",
@@ -33,7 +33,7 @@
     "build": "rimraf dist && tsc"
   },
   "devDependencies": {
-    "@bettergi/types": "^0.1.3",
+    "@bettergi/types": "workspace:latest",
     "rimraf": "^6.1.0",
     "typescript": "^5.9.3"
   }