assistsx-js 0.0.2048 → 0.0.2050

package/src/CallMethod.ts

@@ -1,70 +1,72 @@
 // CallMethod 常量对象
 export const CallMethod = {
-  takeScreenshot: "takeScreenshot",
-  overlayToast: "overlayToast",
-  setNodeText: "setNodeText",
-  findByTags: "findByTags",
-  findById: "findById",
-  findByText: "findByText",
-  findByTextAllMatch: "findByTextAllMatch",
-  containsText: "containsText",
-  getAllText: "getAllText",
-  findFirstParentByTags: "findFirstParentByTags",
-  getAllNodes: "getAllNodes",
-  getNodes: "getNodes",
-  findFirstParentClickable: "findFirstParentClickable",
-  getChildren: "getChildren",
-  getBoundsInScreen: "getBoundsInScreen",
-  isVisible: "isVisible",
-  click: "click",
-  longClick: "longClick",
-  back: "back",
-  home: "home",
-  notifications: "notifications",
-  recentApps: "recentApps",
-  paste: "paste",
-  focus: "focus",
-  selectionText: "selectionText",
-  scrollForward: "scrollForward",
-  launchApp: "launchApp",
-  getPackageName: "getPackageName",
-  getScreenSize: "getScreenSize",
-  getAppScreenSize: "getAppScreenSize",
-  scrollBackward: "scrollBackward",
-  setOverlayFlags: "setOverlayFlags",
-  scanQR: "scanQR",
-  loadWebViewOverlay: "loadWebViewOverlay",
-  recognizeTextInScreenshot: "recognizeTextInScreenshot",
+    takeScreenshot: "takeScreenshot",
+    overlayToast: "overlayToast",
+    setNodeText: "setNodeText",
+    findByTags: "findByTags",
+    findById: "findById",
+    findByText: "findByText",
+    findByTextAllMatch: "findByTextAllMatch",
+    containsText: "containsText",
+    getAllText: "getAllText",
+    findFirstParentByTags: "findFirstParentByTags",
+    getAllNodes: "getAllNodes",
+    getNodes: "getNodes",
+    findFirstParentClickable: "findFirstParentClickable",
+    getChildren: "getChildren",
+    getBoundsInScreen: "getBoundsInScreen",
+    isVisible: "isVisible",
+    click: "click",
+    longClick: "longClick",
+    back: "back",
+    home: "home",
+    notifications: "notifications",
+    recentApps: "recentApps",
+    paste: "paste",
+    focus: "focus",
+    selectionText: "selectionText",
+    scrollForward: "scrollForward",
+    launchApp: "launchApp",
+    getPackageName: "getPackageName",
+    getScreenSize: "getScreenSize",
+    getAppScreenSize: "getAppScreenSize",
+    scrollBackward: "scrollBackward",
+    setOverlayFlags: "setOverlayFlags",
+    scanQR: "scanQR",
+    loadWebViewOverlay: "loadWebViewOverlay",
+    recognizeTextInScreenshot: "recognizeTextInScreenshot",
 
-  clickByGesture: "clickByGesture",
-  clickNodeByGesture: "clickNodeByGesture",
-  doubleClickNodeByGesture: "doubleClickNodeByGesture",
-  performLinearGesture: "performLinearGesture",
-  longPressGestureAutoPaste: "longPressGestureAutoPaste",
+    clickByGesture: "clickByGesture",
+    clickNodeByGesture: "clickNodeByGesture",
+    doubleClickNodeByGesture: "doubleClickNodeByGesture",
+    performLinearGesture: "performLinearGesture",
+    longPressGestureAutoPaste: "longPressGestureAutoPaste",
 
-  getAppInfo: "getAppInfo",
-  getMacAddress: "getMacAddress",
-  getAndroidID: "getAndroidID",
-  getUniqueDeviceId: "getUniqueDeviceId",
+    getAppInfo: "getAppInfo",
+    getMacAddress: "getMacAddress",
+    getAndroidID: "getAndroidID",
+    getUniqueDeviceId: "getUniqueDeviceId",
 
-  addAccessibilityEventFilter: "addAccessibilityEventFilter",
-  setAccessibilityEventFilters: "setAccessibilityEventFilters",
+    addAccessibilityEventFilter: "addAccessibilityEventFilter",
+    setAccessibilityEventFilters: "setAccessibilityEventFilters",
 
-  httpRequest: "httpRequest",
-  getDeviceInfo: "getDeviceInfo",
-  getNetworkType: "getNetworkType",
-  isAppInstalled: "isAppInstalled",
-  getClipboardLatestText: "getClipboardLatestText",
-  openUrlInBrowser: "openUrlInBrowser",
-  keepScreenOn: "keepScreenOn",
-  clearKeepScreenOn: "clearKeepScreenOn",
-  download: "download",
-  audioPlayFromFile: "audioPlayFromFile",
-  audioStop: "audioStop",
+    httpRequest: "httpRequest",
+    getDeviceInfo: "getDeviceInfo",
+    getNetworkType: "getNetworkType",
+    isAppInstalled: "isAppInstalled",
+    getClipboardLatestText: "getClipboardLatestText",
+    openUrlInBrowser: "openUrlInBrowser",
+    keepScreenOn: "keepScreenOn",
+    clearKeepScreenOn: "clearKeepScreenOn",
+    download: "download",
+    audioPlayFromFile: "audioPlayFromFile",
+    audioStop: "audioStop",
+    audioPlayRingtone: "audioPlayRingtone",
+    audioStopRingtone: "audioStopRingtone",
 
-  // 通讯录相关方法
-  addContact: "addContact",
-  getAllContacts: "getAllContacts",
+    // 通讯录相关方法
+    addContact: "addContact",
+    getAllContacts: "getAllContacts",
 } as const;
 
 // 导出类型定义

package/src/Step.ts

@@ -7,7 +7,7 @@ import { Node } from "./Node";
 import { CallMethod } from "./CallMethod";
 import { useStepStore } from "./StepStateStore";
 import { generateUUID } from "./Utils";
-import { StepError } from "./StepError";
+import { StepError, StepStopError } from "./StepError";
 import { StepAsync } from "./StepAsync";
 
 // 步骤结果类型，可以是Step实例或undefined
@@ -35,6 +35,11 @@ export class Step {
      */
     private static _interceptors: StepInterceptor[] = [];
 
+    /**
+     * 步骤异常变量，默认为空
+     */
+    public static exception: StepError | undefined = undefined;
+
     /**
      * 运行步骤实现
      * @param impl 步骤实现函数
@@ -56,6 +61,7 @@ export class Step {
             delayMs?: number;
         } = {}
     ): Promise<Step | undefined> {
+        this.exception = undefined;
         const stepStore = useStepStore();
         let implnName = impl.name;
         let currentStep: Step | undefined;
@@ -180,14 +186,7 @@ export class Step {
                 error: e?.message ?? String(e),
             });
             stepStore.setError(errorMsg);
-            throw new StepError(
-                errorMsg,
-                implnName,
-                tag,
-                data,
-                e,
-                currentStep || undefined
-            );
+            throw e
         }
         //步骤执行结束
         stepStore.completeStep();
@@ -206,11 +205,12 @@ export class Step {
      * @param stepId 要验证的步骤ID
      */
     static assert(stepId: string | undefined) {
+        // 检查异常变量，如果不为空则直接抛出
+        if (Step.exception) {
+            throw Step.exception;
+        }
         if (stepId && Step.stepId != stepId) {
-            if (Step.stepId === "STEP_STOP") {
-                throw new Error("主动中断步骤");
-            }
-            throw new Error("StepId mismatch");
+            throw new StepError("StepId mismatch", { stepId, currentStepId: Step.stepId });
         }
     }
 
@@ -229,9 +229,15 @@ export class Step {
 
     /**
      * 停止当前步骤执行
+     * @param exception 可选的异常对象，如果传入则使用该异常，否则使用默认的StepStopError
      */
-    static stop(): void {
+    static stop(exception?: StepError): void {
         this._stepId = "STEP_STOP";
+        if (exception) {
+            this.exception = exception;
+        } else {
+            this.exception = new StepStopError("主动中断步骤", { stepId: this._stepId });
+        }
     }
 
     /**

package/src/StepError.ts

@@ -1,47 +1,59 @@
 /**
  * 步骤执行错误类
  * 用于携带步骤执行过程中的错误信息和当前步骤对象
+ * 支持传入可选数据：message，data任何类型的数据
  */
 export class StepError extends Error {
-  /**
-   * 步骤实现函数名
-   */
-  readonly impl: string;
+    /**
+     * 步骤实现函数名
+     */
+    readonly impl?: string;
 
-  /**
-   * 步骤标签
-   */
-  readonly tag: string | undefined;
+    /**
+     * 步骤标签
+     */
+    readonly tag?: string | undefined;
 
-  /**
-   * 步骤数据
-   */
-  readonly data: any | undefined;
+    /**
+     * 步骤数据，可以是任何类型
+     */
+    readonly data?: any;
 
-  /**
-   * 原始错误
-   */
-  readonly originalError: any;
+    /**
+     * 原始错误
+     */
+    readonly originalError?: any;
 
-  /**
-   * 当前步骤对象
-   */
-  readonly currentStep: any | undefined;
+    /**
+     * 当前步骤对象
+     */
+    readonly currentStep?: any;
 
-  constructor(
-    message: string,
-    impl: string,
-    tag: string | undefined,
-    data: any | undefined,
-    originalError: any,
-    currentStep: any | undefined
-  ) {
-    super(message);
-    this.name = "StepError";
-    this.impl = impl;
-    this.tag = tag;
-    this.data = data;
-    this.originalError = originalError;
-    this.currentStep = currentStep;
-  }
+    constructor(
+        message?: string,
+        data?: any,
+        impl?: string,
+        tag?: string | undefined,
+        originalError?: any,
+        currentStep?: any | undefined
+    ) {
+        super(message);
+        this.name = "StepError";
+        this.data = data;
+        this.impl = impl;
+        this.tag = tag;
+        this.originalError = originalError;
+        this.currentStep = currentStep;
+    }
+}
+
+/**
+ * 主动停止异常类
+ * 用于表示步骤被主动停止执行
+ */
+export class StepStopError extends StepError {
+    constructor(message?: string, data?: any) {
+        super(message || "主动中断步骤", data);
+        this.name = "StepStopError";
+    }
 }