@bettergi/utils 0.1.20 → 0.1.22

package/README.md

@@ -126,22 +126,32 @@ await assertRegionDisappearing(findButton, "点击购买按钮超时", () => fin
 > 对常见鼠标操作的封装，如鼠标的平滑移动、鼠标滚轮滚动、鼠标拖拽等。
 
 ```ts
-// 鼠标从 (745, 610) 平滑自然地移动 (1920, 1080)
-await naturalMouseMove(745, 610, 1920, 1080);
+// 鼠标沿路径点移动并拖拽
+await mouseMoveAlongWaypoints(
+  [
+    { x: 100, y: 100 },
+    { x: 200, y: 200 },
+    { x: 300, y: 300 }
+  ],
+  { shouldDrag: true }
+);
 
 // 鼠标从 (745, 610) 拖拽到 (1280, 610)
 await mouseDrag(745, 610, 1280, 610);
 
+// 鼠标从 (745, 610) 平滑自然地移动 (1920, 1080)
+await naturalMouseMove(745, 610, 1920, 1080);
+
 // 鼠标滚轮向上滚动 175 像素
 await mouseScrollUp(175);
 
 // 鼠标滚轮向下滚动 175 像素
 await mouseScrollDown(175);
 
-// 鼠标滚轮向上滚动 99 行，行高 175（默认: 背包物品行高）
+// 鼠标滚轮向上滚动 99 行（默认: 175为背包物品行高）
 await mouseScrollUpLines(99);
 
-// 鼠标滚轮向下滚动 1 行，行高 115（自定义: 商店物品行高）
+// 鼠标滚轮向下滚动 1 行（自定义: 115为商店物品行高）
 await mouseScrollDownLines(1, 115);
 ```
 
@@ -201,12 +211,14 @@ tracker.complete(`任务完成`);
 
 ```ts
 // 发送 GET 请求获取响应体内容
-const body1 = await getForBody("https://example.com/", undefined, { "User-Agent": "BetterGI" });
-log.info(`GET 请求响应体内容${body1}`);
+const body1 = await getForBody("https://jsonplaceholder.typicode.com/todos/1");
 
 // 发送 POST 请求获取响应体内容
-const body2 = await postForBody("https://example.com/", undefined, { "User-Agent": "BetterGI" });
-log.info(`POST 请求响应体内容${body2}`);
+const body2 = await postForBody("https://jsonplaceholder.typicode.com/posts", {
+  title: "foo",
+  body: "bar",
+  userId: 1
+});
 ```
 
 ### 文件操作

package/dist/game.js

@@ -71,14 +71,14 @@ export const openMenuPage = async (name, listView) => {
     // 1.打开派蒙菜单
     await openPaimonMenu();
     // 2.搜索菜单页面按钮
+    const { x = 95, y = 330, w = 670, h = 730, lineHeight = 142 } = listView || {};
     const button = await withGameMetrics(1920, 1080, 1.5, async () => {
-        const { x = 95, y = 330, w = 670, h = 730, lineHeight = 142 } = listView || {};
-        return await findTextWithinListView(name, { x, y, w, h, lineHeight, scrollLines: 2 });
+        return await findTextWithinListView(name, { x, y, w, h, lineHeight, scrollLines: 5 });
     });
     if (!button)
         throw new Error(`搜索菜单页面 ${name} 失败`);
     // 3.点击打开菜单页面
-    await assertRegionDisappearing(() => findTextWithinBounds(name, button.x, button.y, button.width, button.height), `打开菜单页面 ${name} 超时`, () => {
+    await assertRegionDisappearing(() => findTextWithinBounds(name, x, y, w, h), `打开菜单页面 ${name} 超时`, () => {
         button.click();
     });
 };

package/dist/http.d.ts

@@ -2,24 +2,24 @@
  * 发送 HTTP 请求，获取响应体内容
  * @param method 请求方法
  * @param url 请求 URL
- * @param body 请求体
+ * @param body 请求体（UTF-8 编码）
  * @param headers 请求头
  * @returns 响应体内容
  */
-export declare const requestForBody: (method: Parameters<typeof http.request>[0], url: string, body?: string, headers?: Record<string, any>) => Promise<string>;
+export declare const requestForBody: (method: Parameters<typeof http.request>[0], url: string, body?: string | object, headers?: Record<string, any>) => Promise<string>;
 /**
  * 发送 HTTP GET 请求，获取响应体内容
  * @param url 请求 URL
- * @param body 请求体
+ * @param body 请求体（UTF-8 编码）
  * @param headers 请求头
  * @returns 响应体内容
  */
-export declare const getForBody: (url: string, body?: string, headers?: Record<string, any>) => Promise<string>;
+export declare const getForBody: (url: string, body?: string | object, headers?: Record<string, any>) => Promise<string>;
 /**
  * 发送 HTTP POST 请求，获取响应体内容
  * @param url 请求 URL
- * @param body 请求体
+ * @param body 请求体（UTF-8 编码）
  * @param headers 请求头
  * @returns 响应体内容
  */
-export declare const postForBody: (url: string, body?: string, headers?: Record<string, any>) => Promise<string>;
+export declare const postForBody: (url: string, body?: string | object, headers?: Record<string, any>) => Promise<string>;

package/dist/http.js

@@ -2,33 +2,37 @@
  * 发送 HTTP 请求，获取响应体内容
  * @param method 请求方法
  * @param url 请求 URL
- * @param body 请求体
+ * @param body 请求体（UTF-8 编码）
  * @param headers 请求头
  * @returns 响应体内容
  */
 export const requestForBody = async (method, url, body, headers) => {
-    const resp = await http.request(method, url, body ?? "null", headers ? JSON.stringify(headers) : "null");
+    if (body && typeof body === "object") {
+        body = JSON.stringify(body);
+        headers = { ...headers, "Content-Type": "application/json" };
+    }
+    const resp = await http.request(method, url, body ?? null, headers ? JSON.stringify(headers) : null);
     if (resp.status_code >= 200 && resp.status_code < 400) {
         return resp.body;
     }
     else {
-        throw new Error(`HTTP request failed with status ${resp.status_code}`);
+        throw new Error(`HTTP request failed with status ${resp.status_code}: ${resp.body}`);
     }
 };
 /**
  * 发送 HTTP GET 请求，获取响应体内容
  * @param url 请求 URL
- * @param body 请求体
+ * @param body 请求体（UTF-8 编码）
  * @param headers 请求头
  * @returns 响应体内容
  */
-export const getForBody = async (url, body, headers) => {
+export const getForBody = (url, body, headers) => {
     return requestForBody("GET", url, body, headers);
 };
 /**
  * 发送 HTTP POST 请求，获取响应体内容
  * @param url 请求 URL
- * @param body 请求体
+ * @param body 请求体（UTF-8 编码）
  * @param headers 请求头
  * @returns 响应体内容
  */

package/dist/ocr.d.ts

@@ -112,10 +112,11 @@ export type ListView = {
  * @param condition 查找条件
  * @param listView 列表视图参数
  * @param retryOptions 重试选项
- * @param sampling 区域采样函数，通过采样区域画面变化判断列表是否触底（默认：取上半部分）
+ * @param sampling 区域采样函数，通过采样区域画面变化判断列表是否触底（默认：底半区）
+ * @param threshold 采样区域匹配阈值（默认：0.9）
  * @returns 如果找到匹配的区域，则返回该区域，否则返回 undefined
  */
-export declare const findWithinListView: (condition: (listViewRegion: ImageRegion) => Region | undefined, listView: ListView, retryOptions?: RetryOptions, sampling?: (listViewRegion: ImageRegion) => ImageRegion) => Promise<Region | undefined>;
+export declare const findWithinListView: (condition: (listViewRegion: ImageRegion) => Region | undefined, listView: ListView, retryOptions?: RetryOptions, sampling?: (listViewRegion: ImageRegion) => ImageRegion, threshold?: number) => Promise<Region | undefined>;
 /**
  * 在列表视图中滚动搜索文本
  * @param text 待搜索文本
@@ -123,15 +124,19 @@ export declare const findWithinListView: (condition: (listViewRegion: ImageRegio
  * @param matchOptions 搜索选项
  * @param retryOptions 重试选项
  * @param config 识别对象配置
+ * @param sampling 区域采样函数，通过采样区域画面变化判断列表是否触底（默认：底半区）
+ * @param threshold 采样区域匹配阈值（默认：0.9）
  * @returns 如果找到匹配的文本区域，则返回该区域，否则返回 undefined
  */
-export declare const findTextWithinListView: (text: string, listView: ListView, matchOptions?: TextMatchOptions, retryOptions?: RetryOptions, config?: ROConfig, sampling?: (listViewRegion: ImageRegion) => ImageRegion) => Promise<Region | undefined>;
+export declare const findTextWithinListView: (text: string, listView: ListView, matchOptions?: TextMatchOptions, retryOptions?: RetryOptions, config?: ROConfig, sampling?: (listViewRegion: ImageRegion) => ImageRegion, threshold?: number) => Promise<Region | undefined>;
 /**
  * 在列表视图中查找图像
  * @param image 图片路径 或 图片Mat
  * @param listView 列表视图参数
- * @param config 识别对象配置
  * @param retryOptions 重试选项
+ * @param config 识别对象配置
+ * @param sampling 区域采样函数，通过采样区域画面变化判断列表是否触底（默认：底半区）
+ * @param threshold 采样区域匹配阈值（默认：0.9）
  * @returns 如果找到匹配的区域，则返回该区域，否则返回 undefined
  */
-export declare const findImageWithinListView: (image: string | ImageMat, listView: ListView, config?: ROConfig, retryOptions?: RetryOptions, sampling?: (listViewRegion: ImageRegion) => ImageRegion) => Promise<Region | undefined>;
+export declare const findImageWithinListView: (image: string | ImageMat, listView: ListView, retryOptions?: RetryOptions, config?: ROConfig, sampling?: (listViewRegion: ImageRegion) => ImageRegion, threshold?: number) => Promise<Region | undefined>;

package/dist/ocr.js

@@ -202,28 +202,39 @@ export const findTextInDirection = (text, direction, options, config = {}) => {
  * @param condition 查找条件
  * @param listView 列表视图参数
  * @param retryOptions 重试选项
- * @param sampling 区域采样函数，通过采样区域画面变化判断列表是否触底（默认：取上半部分）
+ * @param sampling 区域采样函数，通过采样区域画面变化判断列表是否触底（默认：底半区）
+ * @param threshold 采样区域匹配阈值（默认：0.9）
  * @returns 如果找到匹配的区域，则返回该区域，否则返回 undefined
  */
-export const findWithinListView = async (condition, listView, retryOptions, sampling) => {
+export const findWithinListView = async (condition, listView, retryOptions, sampling, threshold = 0.9) => {
     const { x, y, w, h, lineHeight, scrollLines = 1, paddingX = 10, paddingY = 10 } = listView;
-    const { maxAttempts = 99, retryInterval = 1000 } = retryOptions || {};
-    sampling = sampling || (r => r.deriveCrop(0, 0, r.width, Math.floor(r.height / 2)));
+    const { maxAttempts = 99, retryInterval = 1200 } = retryOptions || {};
+    sampling ??= r => r.deriveCrop(1, r.height * 0.5, r.width - 1, r.height * 0.5);
     const captureListViewRegion = () => captureGameRegion().deriveCrop(x, y, w, h);
-    let _lvr;
-    const isReachedBottom = () => {
-        const region = sampling(captureListViewRegion());
-        if (region?.isExist()) {
-            if (_lvr?.find(RecognitionObject.templateMatch(region.srcMat))) {
+    const isReachedBottom = (() => {
+        let lastCaptured;
+        return () => {
+            const newRegion = captureListViewRegion();
+            if (!newRegion?.isExist())
                 return true;
+            try {
+                if (!lastCaptured)
+                    return false;
+                const oldRegion = sampling(lastCaptured);
+                if (!oldRegion?.isExist())
+                    return true;
+                // 根据采样区域画面是否变化，判断列表是否触底
+                const ro = RecognitionObject.templateMatch(oldRegion.srcMat);
+                ro.threshold = threshold;
+                ro.use3Channels = true;
+                ro.initTemplate();
+                return newRegion.find(ro)?.isExist();
             }
-            else {
-                _lvr = region;
-                return false;
+            finally {
+                lastCaptured = newRegion;
             }
-        }
-        return true; // 异常情况: 无法获取列表视图截图
-    };
+        };
+    })();
     const isFoundOrReachedBottom = await waitForAction(() => condition(captureListViewRegion())?.isExist() || isReachedBottom(), async () => {
         moveMouseTo(x + w - paddingX, y + paddingY); // 移动到滚动条附近
         await sleep(50);
@@ -238,9 +249,11 @@ export const findWithinListView = async (condition, listView, retryOptions, samp
  * @param matchOptions 搜索选项
  * @param retryOptions 重试选项
  * @param config 识别对象配置
+ * @param sampling 区域采样函数，通过采样区域画面变化判断列表是否触底（默认：底半区）
+ * @param threshold 采样区域匹配阈值（默认：0.9）
  * @returns 如果找到匹配的文本区域，则返回该区域，否则返回 undefined
  */
-export const findTextWithinListView = async (text, listView, matchOptions, retryOptions, config = {}, sampling) => {
+export const findTextWithinListView = async (text, listView, matchOptions, retryOptions, config = {}, sampling, threshold = 0.9) => {
     const ro = RecognitionObject.ocrThis;
     if (Object.keys(config).length > 0) {
         Object.assign(ro, config) && ro.initTemplate();
@@ -249,17 +262,19 @@ export const findTextWithinListView = async (text, listView, matchOptions, retry
         return findFirstRegion(lvr, ro, region => {
             return region.isExist() && textMatch(region.text, text, matchOptions);
         });
-    }, listView, retryOptions, sampling);
+    }, listView, retryOptions, sampling, threshold);
 };
 /**
  * 在列表视图中查找图像
  * @param image 图片路径 或 图片Mat
  * @param listView 列表视图参数
- * @param config 识别对象配置
  * @param retryOptions 重试选项
+ * @param config 识别对象配置
+ * @param sampling 区域采样函数，通过采样区域画面变化判断列表是否触底（默认：底半区）
+ * @param threshold 采样区域匹配阈值（默认：0.9）
  * @returns 如果找到匹配的区域，则返回该区域，否则返回 undefined
  */
-export const findImageWithinListView = async (image, listView, config = {}, retryOptions, sampling) => {
+export const findImageWithinListView = async (image, listView, retryOptions, config = {}, sampling, threshold = 0.9) => {
     const mat = typeof image === "string" ? file.readImageMatSync(image) : image;
     const ro = RecognitionObject.templateMatch(mat);
     if (Object.keys(config).length > 0) {
@@ -268,5 +283,5 @@ export const findImageWithinListView = async (image, listView, config = {}, retr
     return findWithinListView(ir => {
         const region = ir.find(ro);
         return region.isExist() ? region : undefined;
-    }, listView, retryOptions, sampling);
+    }, listView, retryOptions, sampling, threshold);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bettergi/utils",
-  "version": "0.1.20",
+  "version": "0.1.22",
   "description": "开发 BetterGI 脚本常用工具集",
   "type": "module",
   "author": "Bread Grocery<https://github.com/breadgrocery>",