@bettergi/utils 0.0.1 → 0.0.2

package/dist/action.d.ts

@@ -4,7 +4,7 @@
  * @param timeout 超时时间（毫秒），默认 5000 毫秒
  * @param interval 等待间隔（毫秒），默认 200 毫秒
  * @param action 每次等待循环中执行的操作（可选）
- * @returns - true 在超时前条件已满足
+ * @returns - true  在超时前条件已满足
  *          - false 在超时后条件仍未满足
  */
-export declare const waitUntil: (condition: () => boolean, timeout?: number, interval?: number, action?: () => void) => Promise<boolean>;
+export declare const waitUntil: (condition: (context: Record<string, any>) => boolean, timeout?: number, interval?: number, action?: (context: Record<string, any>) => void) => Promise<boolean>;

package/dist/action.js

@@ -4,15 +4,16 @@
  * @param timeout 超时时间（毫秒），默认 5000 毫秒
  * @param interval 等待间隔（毫秒），默认 200 毫秒
  * @param action 每次等待循环中执行的操作（可选）
- * @returns - true 在超时前条件已满足
+ * @returns - true  在超时前条件已满足
  *          - false 在超时后条件仍未满足
  */
 export const waitUntil = async (condition, timeout, interval, action) => {
+    const context = {};
     const deadline = Date.now() + (timeout ?? 5 * 1000);
     while (Date.now() < deadline) {
-        if (condition())
+        if (condition(context))
             return true;
-        action?.();
+        action?.(context);
         await sleep(interval ?? 200);
     }
     return false;

package/dist/ocr.d.ts

@@ -1,4 +1,5 @@
 import { type Region } from "@bettergi/types/csharp/BetterGenshinImpact/GameTask/Model/Area/Region";
+type Direction = "north" | "north-east" | "east" | "south-east" | "south" | "south-west" | "west" | "north-west";
 /**
  * 搜索图片
  * @param path 图片路径
@@ -15,6 +16,13 @@ export declare const findImage: (path: string) => Region | undefined;
  * @returns 如果找到匹配的图片区域，则返回该区域，否则返回 undefined
  */
 export declare const findImageWithinBounds: (path: string, x: number, y: number, w: number, h: number) => Region | undefined;
+/**
+ * 在指定方向上搜索图片
+ * @param path 图片路径
+ * @param direction 搜索方向
+ * @returns 如果找到匹配的图片区域，则返回该区域，否则返回 undefined
+ */
+export declare const findImageInDirection: (path: string, direction: Direction) => Region | undefined;
 /**
  * 搜索文本
  * @param text 待搜索文本
@@ -36,3 +44,13 @@ export declare const findText: (text: string, contains: boolean, ignoreCase: boo
  * @returns 如果找到匹配的文本区域，则返回该区域，否则返回 undefined
  */
 export declare const findTextWithinBounds: (text: string, contains: boolean, ignoreCase: boolean, x: number, y: number, w: number, h: number) => Region | undefined;
+/**
+ * 在指定方向上搜索文本
+ * @param text 待搜索文本
+ * @param contains 是否包含
+ * @param ignoreCase 是否忽略大小写
+ * @param direction 搜索方向
+ * @returns 如果找到匹配的文本区域，则返回该区域，否则返回 undefined
+ */
+export declare const findTextInDirection: (text: string, contains: boolean, ignoreCase: boolean, direction: Direction) => Region | undefined;
+export {};

package/dist/ocr.js

@@ -1,12 +1,18 @@
-const findFirst = (im, ro, predicate) => {
-    const candidates = im.findMulti(ro);
+const findFirst = (ir, ro, predicate) => {
+    const candidates = ir.findMulti(ro);
     for (let i = 0; i < candidates.count; i++) {
-        if (predicate(candidates[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;
+    const w = direction === "north" || direction === "south" ? genshin.width : genshin.width / 2;
+    const h = direction === "west" || direction === "east" ? genshin.height : genshin.height / 2;
+    return { x, y, w, h };
+};
 /**
  * 搜索图片
  * @param path 图片路径
@@ -14,9 +20,9 @@ const findFirst = (im, ro, predicate) => {
  */
 export const findImage = (path) => {
     try {
-        const im = captureGameRegion();
+        const ir = captureGameRegion();
         const ro = RecognitionObject.templateMatch(file.readImageMatSync(path));
-        return findFirst(im, ro, region => region.isExist());
+        return findFirst(ir, ro, region => region.isExist());
     }
     catch (err) {
         err?.message && log.warn(`${err.message}`);
@@ -33,14 +39,24 @@ export const findImage = (path) => {
  */
 export const findImageWithinBounds = (path, x, y, w, h) => {
     try {
-        const im = captureGameRegion();
+        const ir = captureGameRegion();
         const ro = RecognitionObject.templateMatch(file.readImageMatSync(path), x, y, w, h);
-        return findFirst(im, ro, region => region.isExist());
+        return findFirst(ir, ro, region => region.isExist());
     }
     catch (err) {
         err?.message && log.warn(`${err.message}`);
     }
 };
+/**
+ * 在指定方向上搜索图片
+ * @param path 图片路径
+ * @param direction 搜索方向
+ * @returns 如果找到匹配的图片区域，则返回该区域，否则返回 undefined
+ */
+export const findImageInDirection = (path, direction) => {
+    const { x, y, w, h } = directionToBounds(direction);
+    return findImageWithinBounds(path, x, y, w, h);
+};
 /**
  * 搜索文本
  * @param text 待搜索文本
@@ -50,9 +66,9 @@ export const findImageWithinBounds = (path, x, y, w, h) => {
  */
 export const findText = (text, contains, ignoreCase) => {
     const searchText = ignoreCase ? text.toLowerCase() : text;
-    const im = captureGameRegion();
+    const ir = captureGameRegion();
     const ro = RecognitionObject.ocrThis;
-    return findFirst(im, ro, region => {
+    return findFirst(ir, ro, region => {
         const itemText = ignoreCase ? region.text.toLowerCase() : region.text;
         const isMatch = contains ? itemText.includes(searchText) : itemText === searchText;
         return isMatch && region.isExist();
@@ -72,11 +88,23 @@ export const findText = (text, contains, ignoreCase) => {
  */
 export const findTextWithinBounds = (text, contains, ignoreCase, x, y, w, h) => {
     const searchText = ignoreCase ? text.toLowerCase() : text;
-    const im = captureGameRegion();
+    const ir = captureGameRegion();
     const ro = RecognitionObject.ocr(x, y, w, h);
-    return findFirst(im, ro, region => {
+    return findFirst(ir, ro, region => {
         const itemText = ignoreCase ? region.text.toLowerCase() : region.text;
         const isMatch = contains ? itemText.includes(searchText) : itemText === searchText;
         return isMatch && region.isExist();
     });
 };
+/**
+ * 在指定方向上搜索文本
+ * @param text 待搜索文本
+ * @param contains 是否包含
+ * @param ignoreCase 是否忽略大小写
+ * @param direction 搜索方向
+ * @returns 如果找到匹配的文本区域，则返回该区域，否则返回 undefined
+ */
+export const findTextInDirection = (text, contains, ignoreCase, direction) => {
+    const { x, y, w, h } = directionToBounds(direction);
+    return findTextWithinBounds(text, contains, ignoreCase, x, y, w, h);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bettergi/utils",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Utils for BetterGI JavaScript Development",
   "type": "module",
   "author": "Bread Grocery<https://github.com/breadgrocery>",