@bettergi/utils 0.0.10 → 0.1.0

package/README.md

@@ -21,8 +21,6 @@ pnpm install @bettergi/utils
 > 常见游戏内操作封装，省去手动实现的繁琐。
 
 ```ts
-import { openMenu, openMenuPage, openPaimonMenu, setTime } from "@bettergi/utils";
-
 // 打开派蒙菜单
 await openPaimonMenu();
 
@@ -32,7 +30,10 @@ await openMenu("邮件");
 // 打开菜单页面
 await openMenuPage("问卷");
 
-// 调整游戏时间
+// 调整游戏到指定时间
+await setTimeTo(12, 35);
+
+// 调整游戏时间段
 await setTime("evening");
 ```
 
@@ -41,16 +42,6 @@ await setTime("evening");
 > 对 RecognitionObject 代码的封装，对于简单的找图、找字操作，不再需要编写复杂的代码。
 
 ```ts
-import {
-  findImage,
-  findImageInDirection,
-  findImageWithinBounds,
-  findText,
-  findTextInDirection,
-  findTextWithinBounds
-} from "@bettergi/utils";
-
-// 在整个画面内搜索图片，找不到返回 undefined
 const i1 = findImage("assets/关闭.png");
 
 // 在指定方向上搜索图片，找不到返回 undefined
@@ -60,13 +51,13 @@ const i2 = findImageInDirection("assets/关闭.png", "north-east");
 const i3 = findImageWithinBounds("assets/关闭.png", 960, 0, 960, 1080);
 
 // 在整个画面内搜索文本（不包含、忽略大小写），找不到返回 undefined
-const t1 = findText("购买", false, true);
+const t1 = findText("购买");
 
 // 在指定方向上搜索文本（包含、忽略大小写），找不到返回 undefined
-const t2 = findTextInDirection("师傅", true, true, "east");
+const t2 = findTextInDirection("师傅", "east", { contains: true, ignoreCase: true });
 
 // 在指定区域内搜索文本（不包含、忽略大小写），找不到返回 undefined
-const t3 = findTextWithinBounds("确认", false, true, 960, 540, 960, 540);
+const t3 = findTextWithinBounds("确认", 960, 540, 960, 540);
 ```
 
 ### 行为流程
@@ -74,16 +65,28 @@ const t3 = findTextWithinBounds("确认", false, true, 960, 540, 960, 540);
 > 对脚本开发过程中常见工作流的抽象，例如：等待 XXX 完成/出现/消失。
 
 ```ts
-import { findImageInDirection, waitUntil } from "@bettergi/utils";
-
 // 等待直到找不到[关闭按钮] 或 5秒后超时，每隔1秒检查一次，期间按 Esc 键
-const done = await waitUntil(
+const done = await waitForAction(
   () => findImageInDirection("assets/关闭.png", "north-east") === undefined,
-  5000,
-  1000,
-  () => keyPress("ESCAPE")
+  () => keyPress("ESCAPE"),
+  { maxAttempts: 5, retryInterval: 1000 }
 );
 if (!done) throw new Error("关闭页面超时");
+
+// 断言 "世界等级" 区域即将出现 或 5秒后超时抛出异常，每隔1秒检查一次，期间按 Esc 键
+await assertRegionAppearing(
+  () => findTextInDirection("世界等级", "north-west"),
+  "打开派蒙菜单超时",
+  () => keyPress("ESCAPE"),
+  { maxAttempts: 5, retryInterval: 1000 }
+);
+
+// 断言 "购买" 区域不存在 或 5秒后超时抛出异常，每隔1秒检查一次，期间如果存在 "购买" 按钮则点击
+const findButton = () => findTextWithinBounds("购买", 500, 740, 900, 110);
+await assertRegionDisappearing(findButton, "点击购买按钮超时", () => findButton()?.click(), {
+  maxAttempts: 5,
+  retryInterval: 1000
+});
 ```
 
 ### 鼠标操作
@@ -91,15 +94,11 @@ if (!done) throw new Error("关闭页面超时");
 > 对常见鼠标操作的封装，如鼠标滚动、拖拽等。
 
 ```ts
-import {
-  mouseScrollDown,
-  mouseScrollDownLines,
-  mouseScrollUp,
-  mouseScrollUpLines,
-  mouseSlide,
-  mouseSlideX,
-  mouseSlideY
-} from "@bettergi/utils";
+// 鼠标从 (745, 610) 平滑自然地移动 (1920, 1080)
+await naturalMouseMove(0, 0, 1920, 1080);
+
+// 鼠标从 (745, 610) 拖拽到 (1280, 610)
+await mouseDrag(745, 610, 1280, 610);
 
 // 鼠标滚轮向上滚动 175 像素
 await mouseScrollUp(175);
@@ -112,15 +111,6 @@ await mouseScrollUpLines(99);
 
 // 鼠标滚轮向下滚动 1 行，行高 115（自定义：商店物品行高）
 await mouseScrollDownLines(1, 115);
-
-// 鼠标从 (745, 610) 拖拽到 (1280, 610)
-await mouseSlide(745, 610, 1280, 610);
-
-// 鼠标从 (745, 610) 向右拖拽 435 像素
-await mouseSlideX(745, 610, 435);
-
-// 鼠标从 (1290, 140) 向下拖拽 175 像素
-await mouseSlideY(1290, 140, 175);
 ```
 
 ### 数据存储
@@ -154,8 +144,8 @@ import { getForBody, postForBody } from "@bettergi/utils";
 
 // 发送 GET 请求获取响应体内容
 // 提示：需要在 `manifest.json` 文件中配置 `http_allowed_urls`，并在 调度器 -> 修改通用配置 中启用
-const body1 = await getForBody("https://example.com/", null, { "User-Agent": "BetterGI" });
-const body2 = await postForBody("https://example.com/", null, { "User-Agent": "BetterGI" });
+const body1 = await getForBody("https://example.com/", undefined, { "User-Agent": "BetterGI" });
+const body2 = await postForBody("https://example.com/", undefined, { "User-Agent": "BetterGI" });
 log.info(`GET 请求响应体内容${body1}`);
 log.info(`POST 请求响应体内容${body2}`);
 ```

package/dist/asserts.d.ts

@@ -0,0 +1,57 @@
+import { type Action, type RetryOptions } from "./workflow";
+/**
+ * 断言某个区域当前存在，否则抛出异常
+ * @param regionProvider 返回区域的函数
+ * @param message 错误信息
+ */
+export declare const assertRegionPresent: (regionProvider: () => Region | null | undefined, message: string) => Promise<void>;
+/**
+ * 断言某个区域当前不存在，否则抛出异常
+ * @param regionProvider 返回区域的函数
+ * @param message 错误信息
+ */
+export declare const assertRegionAbsent: (regionProvider: () => Region | null | undefined, message: string) => Promise<void>;
+/**
+ * 断言整个画面上某个元素当前存在，否则抛出异常
+ * @param recognitionObject 识别对象
+ * @param message 错误信息
+ */
+export declare const assertElementPresent: (recognitionObject: RecognitionObject, message: string) => Promise<void>;
+/**
+ * 断言整个画面上某个元素当前不存在，否则抛出异常
+ * @param recognitionObject 识别对象
+ * @param message 错误信息
+ */
+export declare const assertElementAbsent: (recognitionObject: RecognitionObject, message: string) => Promise<void>;
+/**
+ * 断言某个区域即将出现，否则抛出异常
+ * @param regionProvider 返回区域的函数
+ * @param message 错误信息
+ * @param retryAction 每次重试时执行的操作（可选）
+ * @param options 配置选项
+ */
+export declare const assertRegionAppearing: (regionProvider: () => Region | null | undefined, message: string, retryAction?: Action, options?: RetryOptions) => Promise<void>;
+/**
+ * 断言某个区域即将消失，否则抛出异常
+ * @param regionProvider 返回区域的函数
+ * @param message 错误信息
+ * @param retryAction 每次重试时执行的操作（可选）
+ * @param options 配置选项
+ */
+export declare const assertRegionDisappearing: (regionProvider: () => Region | null | undefined, message: string, retryAction?: Action, options?: RetryOptions) => Promise<void>;
+/**
+ * 断言整个画面上某个元素即将出现，否则抛出异常
+ * @param recognitionObject 识别对象
+ * @param message 错误信息
+ * @param retryAction 每次重试时执行的操作（可选）
+ * @param options 配置选项
+ */
+export declare const assertElementAppearing: (recognitionObject: RecognitionObject, message: string, retryAction?: Action, options?: RetryOptions) => Promise<void>;
+/**
+ * 断言整个画面上某个元素即将消失，否则抛出异常
+ * @param recognitionObject 识别对象
+ * @param message 错误信息
+ * @param retryAction 每次重试时执行的操作（可选）
+ * @param options 配置选项
+ */
+export declare const assertElementDisappearing: (recognitionObject: RecognitionObject, message: string, retryAction?: Action, options?: RetryOptions) => Promise<void>;

package/dist/asserts.js

@@ -0,0 +1,91 @@
+import { waitForElementAppear, waitForElementDisappear, waitForRegionAppear, waitForRegionDisappear } from "./workflow";
+/**
+ * 断言某个区域当前存在，否则抛出异常
+ * @param regionProvider 返回区域的函数
+ * @param message 错误信息
+ */
+export const assertRegionPresent = async (regionProvider, message) => {
+    const region = regionProvider();
+    if (region == null || !region.isExist()) {
+        throw new Error(message);
+    }
+};
+/**
+ * 断言某个区域当前不存在，否则抛出异常
+ * @param regionProvider 返回区域的函数
+ * @param message 错误信息
+ */
+export const assertRegionAbsent = async (regionProvider, message) => {
+    const region = regionProvider();
+    if (region != null && region.isExist()) {
+        throw new Error(message);
+    }
+};
+/**
+ * 断言整个画面上某个元素当前存在，否则抛出异常
+ * @param recognitionObject 识别对象
+ * @param message 错误信息
+ */
+export const assertElementPresent = async (recognitionObject, message) => {
+    return assertRegionPresent(() => captureGameRegion().find(recognitionObject), message);
+};
+/**
+ * 断言整个画面上某个元素当前不存在，否则抛出异常
+ * @param recognitionObject 识别对象
+ * @param message 错误信息
+ */
+export const assertElementAbsent = async (recognitionObject, message) => {
+    return assertRegionAbsent(() => captureGameRegion().find(recognitionObject), message);
+};
+/**
+ * 断言某个区域即将出现，否则抛出异常
+ * @param regionProvider 返回区域的函数
+ * @param message 错误信息
+ * @param retryAction 每次重试时执行的操作（可选）
+ * @param options 配置选项
+ */
+export const assertRegionAppearing = async (regionProvider, message, retryAction, options) => {
+    const isAppeared = await waitForRegionAppear(regionProvider, retryAction, options);
+    if (!isAppeared) {
+        throw new Error(message);
+    }
+};
+/**
+ * 断言某个区域即将消失，否则抛出异常
+ * @param regionProvider 返回区域的函数
+ * @param message 错误信息
+ * @param retryAction 每次重试时执行的操作（可选）
+ * @param options 配置选项
+ */
+export const assertRegionDisappearing = async (regionProvider, message, retryAction, options) => {
+    const isDisappeared = await waitForRegionDisappear(regionProvider, retryAction, options);
+    if (!isDisappeared) {
+        throw new Error(message);
+    }
+};
+/**
+ * 断言整个画面上某个元素即将出现，否则抛出异常
+ * @param recognitionObject 识别对象
+ * @param message 错误信息
+ * @param retryAction 每次重试时执行的操作（可选）
+ * @param options 配置选项
+ */
+export const assertElementAppearing = async (recognitionObject, message, retryAction, options) => {
+    const isAppeared = await waitForElementAppear(recognitionObject, retryAction, options);
+    if (!isAppeared) {
+        throw new Error(message);
+    }
+};
+/**
+ * 断言整个画面上某个元素即将消失，否则抛出异常
+ * @param recognitionObject 识别对象
+ * @param message 错误信息
+ * @param retryAction 每次重试时执行的操作（可选）
+ * @param options 配置选项
+ */
+export const assertElementDisappearing = async (recognitionObject, message, retryAction, options) => {
+    const isDisappeared = await waitForElementDisappear(recognitionObject, retryAction, options);
+    if (!isDisappeared) {
+        throw new Error(message);
+    }
+};

package/dist/flow.d.ts

@@ -8,3 +8,23 @@
  *          - false 在超时后条件仍未满足
  */
 export declare const waitUntil: (condition: (context: Record<string, any>) => boolean, timeout?: number, interval?: number, action?: (context: Record<string, any>) => Promise<void> | void) => Promise<boolean>;
+/**
+ * 断言区域存在
+ * @param 获取区域的函数
+ * @param message 错误信息
+ * @param timeout 超时时间（毫秒），默认 3000 毫秒
+ * @param interval 等待间隔（毫秒），默认 300 毫秒
+ * @param action 每次等待循环中执行的操作（可选）
+ * @throws 如果区域在超时时间内未找到则抛出错误
+ */
+export declare const assertExists: (regionProvider: () => Region | undefined, message?: string, timeout?: number, interval?: number, action?: (context: Record<string, any>) => Promise<void> | void) => Promise<void>;
+/**
+ * 断言区域不存在
+ * @param 获取区域的函数
+ * @param message 错误信息
+ * @param timeout 超时时间（毫秒），默认 3000 毫秒
+ * @param interval 等待间隔（毫秒），默认 300 毫秒
+ * @param action 每次等待循环中执行的操作（可选）
+ * @throws 如果区域在超时时间内仍然存在则抛出错误
+ */
+export declare const assertNotExists: (regionProvider: () => Region | undefined, message?: string, timeout?: number, interval?: number, action?: (context: Record<string, any>) => Promise<void> | void) => Promise<void>;

package/dist/flow.js

@@ -1,3 +1,7 @@
+/** 默认超时时间（毫秒） */
+const defaultTimeout = 3 * 1000;
+/** 默认等待间隔（毫秒） */
+const defaultInterval = 300;
 /**
  * 等待直到条件满足或超时
  * @param condition 等待的条件判断函数，返回 true 表示条件满足
@@ -7,7 +11,7 @@
  * @returns - true  在超时前条件已满足
  *          - false 在超时后条件仍未满足
  */
-export const waitUntil = async (condition, timeout = 3000, interval = 300, action) => {
+export const waitUntil = async (condition, timeout = defaultTimeout, interval = defaultInterval, action) => {
     const context = {};
     const deadline = Date.now() + timeout;
     while (Date.now() < deadline) {
@@ -18,3 +22,31 @@ export const waitUntil = async (condition, timeout = 3000, interval = 300, actio
     }
     return false;
 };
+/**
+ * 断言区域存在
+ * @param 获取区域的函数
+ * @param message 错误信息
+ * @param timeout 超时时间（毫秒），默认 3000 毫秒
+ * @param interval 等待间隔（毫秒），默认 300 毫秒
+ * @param action 每次等待循环中执行的操作（可选）
+ * @throws 如果区域在超时时间内未找到则抛出错误
+ */
+export const assertExists = async (regionProvider, message = "断言区域存在失败", timeout = defaultTimeout, interval = defaultInterval, action) => {
+    const ok = await waitUntil(() => regionProvider() !== undefined, timeout, interval, action);
+    if (!ok)
+        throw new Error(message);
+};
+/**
+ * 断言区域不存在
+ * @param 获取区域的函数
+ * @param message 错误信息
+ * @param timeout 超时时间（毫秒），默认 3000 毫秒
+ * @param interval 等待间隔（毫秒），默认 300 毫秒
+ * @param action 每次等待循环中执行的操作（可选）
+ * @throws 如果区域在超时时间内仍然存在则抛出错误
+ */
+export const assertNotExists = async (regionProvider, message = "断言区域不存在失败", timeout = defaultTimeout, interval = defaultInterval, action) => {
+    const ok = await waitUntil(() => regionProvider() === undefined, timeout, interval, action);
+    if (!ok)
+        throw new Error(message);
+};

package/dist/game.d.ts

@@ -1,3 +1,13 @@
+import { ListView } from "./ocr";
+/**
+ * 临时设置游戏分辨率和DPI缩放比例，执行指定动作后恢复
+ * 适用于使用了鼠标移动的操作，保证在不同的分辨率和DPI下都能正确地复现鼠标操作
+ * @param w 游戏宽度
+ * @param y 游戏高度
+ * @param dpi 系统屏幕的DPI缩放比例
+ * @param action 执行动作
+ */
+export declare const withGameMetrics: <T>(w: number, y: number, dpi: number, action: () => Promise<T> | T) => Promise<T>;
 /**
  * 打开派蒙菜单
  */
@@ -5,34 +15,37 @@ export declare const openPaimonMenu: () => Promise<void>;
 /**
  * 打开游戏菜单（左侧按钮）
  * @param name 菜单名称
- * @param reverse 是否反向搜索（可选）
- * @param config 搜索参数（可选）
+ * @param stepBackwards 是否反向步进（可选）
+ * @param options 搜索参数（可选）
  */
-export declare const openMenu: (name: "\u62CD\u7167" | "\u516C\u544A" | "\u90AE\u4EF6" | "\u65F6\u95F4" | "\u8BBE\u7F6E" | (string & {}), reverse?: boolean, config?: {
-    x?: number;
-    step?: number;
-    timeout?: number;
+export declare const openMenu: (name: "\u62CD\u7167" | "\u516C\u544A" | "\u90AE\u4EF6" | "\u65F6\u95F4" | "\u8BBE\u7F6E" | (string & {}), stepBackwards?: boolean, options?: {
+    navWidth?: number;
+    steps?: number;
 }) => Promise<void>;
 /**
  * 打开游戏菜单页面（菜单按钮列表）
  * @param name 菜单页面名称
- * @param config 菜单页面视图参数
- */
-export declare const openMenuPage: (name: string, config?: {
-    x?: number;
-    y?: number;
-    w?: number;
-    h?: number;
-    lineHeight?: number;
-}) => Promise<void>;
-/**
- * 调整游戏时间
- * @param period 时间段
- * @param config 时钟参数
+ * @param listView 菜单页面视图参数
  */
-export declare const setTime: (period: "night" | "morning" | "noon" | "evening", config?: {
+export declare const openMenuPage: (name: string, listView?: ListView) => Promise<void>;
+type ClockOptions = {
     centerX?: number;
     centerY?: number;
+    offsetHours?: number;
     radius?: number;
-    offset?: number;
-}) => Promise<void>;
+    smooth?: number;
+};
+/**
+ * 调整游戏时间到指定时分
+ * @param hour 小时
+ * @param minute 分钟
+ * @param options 时钟参数
+ */
+export declare const setTimeTo: (hour: number, minute: number, options?: ClockOptions) => Promise<void>;
+/**
+ * 调整游戏时间到指定时间段
+ * @param period 时间段
+ * @param options 时钟参数
+ */
+export declare const setTime: (period: "night" | "morning" | "noon" | "evening", options?: ClockOptions) => Promise<void>;
+export {};

package/dist/game.js

@@ -1,6 +1,24 @@
-import { waitUntil } from "./flow";
-import { mouseSlide } from "./mouse";
+import { assertRegionAppearing, assertRegionDisappearing } from "./asserts";
+import { mouseMoveAlongWaypoints } from "./mouse";
 import { findTextInDirection, findTextWithinBounds, findTextWithinListView } from "./ocr";
+/**
+ * 临时设置游戏分辨率和DPI缩放比例，执行指定动作后恢复
+ * 适用于使用了鼠标移动的操作，保证在不同的分辨率和DPI下都能正确地复现鼠标操作
+ * @param w 游戏宽度
+ * @param y 游戏高度
+ * @param dpi 系统屏幕的DPI缩放比例
+ * @param action 执行动作
+ */
+export const withGameMetrics = async (w, y, dpi, action) => {
+    const { width, height, screenDpiScale } = genshin;
+    try {
+        setGameMetrics(w, y, dpi);
+        return await action();
+    }
+    finally {
+        setGameMetrics(width, height, screenDpiScale);
+    }
+};
 /**
  * 打开派蒙菜单
  */
@@ -8,40 +26,37 @@ export const openPaimonMenu = async () => {
     // 1.返回主界面
     await genshin.returnMainUi();
     // 2.打开派蒙菜单
-    const findWorldLevel = () => findTextInDirection("世界等级", false, true, "north-west");
-    const ok = await waitUntil(() => findWorldLevel() !== undefined, 5000, 1000, () => keyPress("ESCAPE"));
-    if (!ok)
-        throw new Error("打开派蒙菜单超时");
+    await assertRegionAppearing(() => findTextWithinBounds("世界等级", 300, 230, 440, 100), "打开派蒙菜单超时", () => keyPress("ESCAPE"));
 };
 /**
  * 打开游戏菜单（左侧按钮）
  * @param name 菜单名称
- * @param reverse 是否反向搜索（可选）
- * @param config 搜索参数（可选）
+ * @param stepBackwards 是否反向步进（可选）
+ * @param options 搜索参数（可选）
  */
-export const openMenu = async (name, reverse = false, config = {}) => {
+export const openMenu = async (name, stepBackwards = false, options = {}) => {
     // 1.打开派蒙菜单
     await openPaimonMenu();
-    // 2.搜索菜单按钮
-    const { x = 50, step = 30, timeout = 3000 } = config;
-    const findTooltip = () => findTextWithinBounds(name, false, true, 0, 0, x + 150, genshin.height);
-    let result = undefined;
-    const steps = Math.ceil(genshin.height / step);
-    for (let i = 0; i < steps; i++) {
-        const o = i * step;
-        const y = reverse ? genshin.height - o : o;
-        moveMouseTo(x, y);
-        await sleep(30);
-        if ((result = findTooltip()) !== undefined)
-            break;
-    }
+    // 2.步进搜索菜单按钮
+    const { navWidth = 95, steps: step = 30 } = options;
+    const findTooltip = () => findTextWithinBounds(name, navWidth, 0, 20 + name.length * 20, genshin.height);
+    const tooltip = await withGameMetrics(1920, 1080, 1.5, async () => {
+        let result = undefined;
+        const steps = Math.ceil(genshin.height / step);
+        for (let i = 0; i < steps; i++) {
+            const o = i * step;
+            const y = stepBackwards ? genshin.height - o : o;
+            moveMouseTo(Math.round(navWidth / 2), y);
+            await sleep(30); // 等待提示文字出现
+            if ((result = findTooltip()) !== undefined)
+                return result;
+        }
+    });
     // 3.点击菜单按钮
-    if (result != undefined) {
-        const ok = await waitUntil(() => findTooltip() === undefined, timeout, 1000, () => {
-            click(x, result.y);
+    if (tooltip != undefined) {
+        await assertRegionDisappearing(findTooltip, `打开菜单 ${name} 超时`, () => {
+            click(Math.round(navWidth / 2), tooltip.y);
         });
-        if (!ok)
-            throw new Error(`打开菜单 ${name} 超时`);
     }
     else {
         throw new Error(`打开菜单 ${name} 失败`);
@@ -50,54 +65,67 @@ export const openMenu = async (name, reverse = false, config = {}) => {
 /**
  * 打开游戏菜单页面（菜单按钮列表）
  * @param name 菜单页面名称
- * @param config 菜单页面视图参数
+ * @param listView 菜单页面视图参数
  */
-export const openMenuPage = async (name, config = {}) => {
+export const openMenuPage = async (name, listView) => {
     // 1.打开派蒙菜单
     await openPaimonMenu();
-    // 2.搜索菜单页面
-    const { x = 100, y = 330, w = 670, h = 730, lineHeight = 142 } = config;
-    const pageButton = await findTextWithinListView(name, false, true, {
-        x,
-        y,
-        w,
-        h,
-        maxListItems: 5,
-        lineHeight
+    // 2.搜索菜单页面按钮
+    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 });
     });
-    if (!pageButton)
+    if (!button)
         throw new Error(`搜索菜单页面 ${name} 失败`);
-    // 3.点击菜单页面
-    pageButton.click();
+    // 3.点击打开菜单页面
+    await assertRegionDisappearing(() => findTextWithinBounds(name, button.x, button.y, button.width, button.height), `打开菜单页面 ${name} 超时`, () => {
+        button.click();
+    });
 };
 /**
- * 调整游戏时间
- * @param period 时间段
- * @param config 时钟参数
+ * 调整游戏时间到指定时分
+ * @param hour 小时
+ * @param minute 分钟
+ * @param options 时钟参数
  */
-export const setTime = async (period, config = {}) => {
+export const setTimeTo = async (hour, minute, options) => {
     // 1.打开时间页面
     await openMenu("时间", true);
-    // 2.拨动指针
-    const { centerX = 1440, centerY = 502, radius = 400, offset = 5 } = config;
-    const index = ["night", "morning", "noon", "evening"].indexOf(period);
-    const periodsDirections = [
-        () => mouseSlide(centerX, centerY, centerX - offset, centerY + radius),
-        () => mouseSlide(centerX, centerY, centerX - radius, centerY - offset),
-        () => mouseSlide(centerX, centerY, centerX + offset, centerY - radius),
-        () => mouseSlide(centerX, centerY, centerX + radius, centerY + offset)
-    ];
-    const jobs = Array.from({ length: 4 }, (_, i) => periodsDirections[(index + i + 1) % periodsDirections.length]);
-    for (const job of jobs)
-        await job();
-    // 3.点击确认按钮，等待调整结束
-    const findTooShort = () => findTextInDirection("时间少于", true, true, "south-east");
-    const findConfirmButton = () => findTextInDirection("确认", false, true, "south-east");
-    const ok = await waitUntil(() => findTooShort() !== undefined, 20 * 1000, 1000, () => {
-        findConfirmButton()?.click();
+    // 2.计算调整时钟的路径点
+    const { centerX = 1440, centerY = 502, offsetHours = 6, radius = 154, smooth = 3 } = options || {};
+    const radian = ((((hour + offsetHours) * 60 + minute) % 1440) / 1440) * Math.PI * 2;
+    const waypoints = [{ x: centerX, y: centerY }].concat(Array.from({ length: Math.max(smooth, 3) })
+        // 计算弧度
+        .map((_, i) => radian + (1 + i / (Math.max(smooth, 3) - 1)) * Math.PI)
+        // 计算相对圆点坐标
+        .map(rad => ({ x: radius * Math.cos(rad), y: radius * Math.sin(rad) }))
+        // 计算绝对坐标
+        .map(p => ({ x: Math.round(p.x + centerX), y: Math.round(p.y + centerY) })));
+    // 3.拨动指针
+    await withGameMetrics(1920, 1080, 1.5, async () => {
+        await mouseMoveAlongWaypoints(waypoints, { shouldDrag: true });
+        // 3.点击确认按钮，等待调整结束
+        await assertRegionAppearing(() => findTextInDirection("时间少于", "south-east", { contains: true }), "调整时间超时", () => {
+            findTextInDirection("确认", "south-east")?.click();
+        }, { maxAttempts: 20, retryInterval: 1000 });
     });
-    if (!ok)
-        throw new Error("调整时间超时");
     // 4.返回主界面
     await genshin.returnMainUi();
 };
+/**
+ * 调整游戏时间到指定时间段
+ * @param period 时间段
+ * @param options 时钟参数
+ */
+export const setTime = async (period, options) => {
+    switch (period) {
+        case "night":
+            return setTimeTo(0, 0, options);
+        case "morning":
+            return setTimeTo(6, 0, options);
+        case "noon":
+            return setTimeTo(12, 0, options);
+        case "evening":
+            return setTimeTo(18, 0, options);
+    }
+};

package/dist/http.js

@@ -6,8 +6,8 @@
  * @param headers 请求头
  * @returns 响应体内容
  */
-export const requestForBody = async (method, url, body = "null", headers) => {
-    const resp = await http.request(method, url, body, headers ? JSON.stringify(headers) : "null");
+export const requestForBody = async (method, url, body, headers) => {
+    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;
     }

package/dist/index.d.ts

@@ -1,4 +1,5 @@
-export * from "./flow";
+export * from "./asserts";
+export * from "./workflow";
 export * from "./game";
 export * from "./http";
 export * from "./mouse";

package/dist/index.js

@@ -1,4 +1,5 @@
-export * from "./flow";
+export * from "./asserts";
+export * from "./workflow";
 export * from "./game";
 export * from "./http";
 export * from "./mouse";