assistsx-js 0.0.2040 → 0.0.2042

package/dist/Step.d.ts

@@ -101,6 +101,7 @@ export declare class Step {
      * 步骤标签
      */
     tag: string | undefined;
+    isEnd: boolean;
     /**
      * 步骤数据
      */
@@ -112,7 +113,7 @@ export declare class Step {
     /**
      * 步骤实现函数
      */
-    impl: StepImpl;
+    impl: StepImpl | undefined;
     /**
      * 构造函数
      * @param stepId 步骤ID
@@ -121,13 +122,14 @@ export declare class Step {
      * @param data 步骤数据
      * @param delayMs 步骤延迟时间(毫秒)
      */
-    constructor({ stepId, impl, tag, data, delayMs, repeatCountMax, }: {
+    constructor({ stepId, impl, tag, data, delayMs, repeatCountMax, isEnd, }: {
         stepId: string;
-        impl: StepImpl;
+        impl: StepImpl | undefined;
         tag?: string | undefined;
         data?: any | undefined;
         delayMs?: number;
         repeatCountMax?: number;
+        isEnd?: boolean;
     });
     get async(): StepAsync;
     /**
@@ -144,6 +146,12 @@ export declare class Step {
         delayMs?: number;
         repeatCountMax?: number;
     }): Step;
+    end({ tag, data, delayMs, repeatCountMax, }?: {
+        tag?: string | undefined;
+        data?: any | undefined;
+        delayMs?: number;
+        repeatCountMax?: number;
+    }): Step;
     /**
      * 重复当前步骤
      * @param stepId 步骤ID

package/dist/Step.js

@@ -16,7 +16,7 @@ export class Step {
      * @param delayMs 步骤延迟时间(毫秒)
      */
     static async run(impl, { tag, data, delayMs = Step.delayMsDefault, } = {}) {
-        var _a;
+        var _a, _b, _c, _d, _e, _f;
         const stepStore = useStepStore();
         let implnName = impl.name;
         let currentStep;
@@ -41,7 +41,7 @@ export class Step {
                     Step.assert(currentStep.stepId);
                 }
                 //执行步骤
-                implnName = currentStep.impl.name;
+                implnName = (_b = (_a = currentStep.impl) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : "undefined";
                 if (Step.showLog) {
                     console.log(`执行步骤${implnName}，重复次数${currentStep.repeatCount}`);
                 }
@@ -78,15 +78,15 @@ export class Step {
                         Step.assert(stepToExecute.stepId);
                     }
                     // 打印拦截步骤的执行信息
-                    const interceptedImplName = stepToExecute.impl.name;
+                    const interceptedImplName = (_c = stepToExecute.impl) === null || _c === void 0 ? void 0 : _c.name;
                     if (Step.showLog) {
                         console.log(`执行拦截步骤${interceptedImplName}，重复次数${stepToExecute.repeatCount}`);
                     }
                     // 执行拦截后的步骤
-                    nextStep = await stepToExecute.impl(stepToExecute);
+                    nextStep = await ((_d = stepToExecute.impl) === null || _d === void 0 ? void 0 : _d.call(stepToExecute, stepToExecute));
                 }
                 else {
-                    nextStep = await currentStep.impl(currentStep);
+                    nextStep = await ((_e = currentStep.impl) === null || _e === void 0 ? void 0 : _e.call(currentStep, currentStep));
                 }
                 if (currentStep.repeatCountMax > Step.repeatCountInfinite &&
                     currentStep.repeatCount > currentStep.repeatCountMax) {
@@ -98,6 +98,12 @@ export class Step {
                 Step.assert(currentStep.stepId);
                 if (nextStep) {
                     currentStep = nextStep;
+                    if (currentStep.isEnd) {
+                        if (Step.showLog) {
+                            console.log(`步骤${implnName}结束`);
+                        }
+                        break;
+                    }
                 }
                 else {
                     break;
@@ -111,7 +117,7 @@ export class Step {
                 impl: implnName,
                 tag: tag,
                 data: data,
-                error: (_a = e === null || e === void 0 ? void 0 : e.message) !== null && _a !== void 0 ? _a : String(e),
+                error: (_f = e === null || e === void 0 ? void 0 : e.message) !== null && _f !== void 0 ? _f : String(e),
             });
             stepStore.setError(errorMsg);
             throw new StepError(errorMsg, implnName, tag, data, e, currentStep || undefined);
@@ -132,6 +138,9 @@ export class Step {
      */
     static assert(stepId) {
         if (stepId && Step.stepId != stepId) {
+            if (Step.stepId === "STEP_STOP") {
+                throw new Error("主动中断步骤");
+            }
             throw new Error("StepId mismatch");
         }
     }
@@ -151,7 +160,7 @@ export class Step {
      * 停止当前步骤执行
      */
     static stop() {
-        this._stepId = undefined;
+        this._stepId = "STEP_STOP";
     }
     /**
      * 添加步骤拦截器
@@ -236,7 +245,7 @@ export class Step {
      * @param data 步骤数据
      * @param delayMs 步骤延迟时间(毫秒)
      */
-    constructor({ stepId, impl, tag, data, delayMs = Step.delayMsDefault, repeatCountMax = Step.repeatCountMaxDefault, }) {
+    constructor({ stepId, impl, tag, data, delayMs = Step.delayMsDefault, repeatCountMax = Step.repeatCountMaxDefault, isEnd = false, }) {
         /**
          * 步骤ID
          */
@@ -249,6 +258,7 @@ export class Step {
          * 步骤重复执行最大次数,默认不限制
          */
         this.repeatCountMax = Step.repeatCountMaxDefault;
+        this.isEnd = false;
         /**
          * 步骤延迟时间(毫秒)
          */
@@ -259,6 +269,7 @@ export class Step {
         this.impl = impl;
         this.delayMs = delayMs;
         this.repeatCountMax = repeatCountMax;
+        this.isEnd = isEnd;
     }
     get async() {
         return new StepAsync(this);
@@ -282,6 +293,18 @@ export class Step {
             repeatCountMax,
         });
     }
+    end({ tag, data, delayMs = Step.delayMsDefault, repeatCountMax = Step.repeatCountMaxDefault, } = {}) {
+        Step.assert(this.stepId);
+        return new Step({
+            stepId: this.stepId,
+            impl: undefined,
+            tag,
+            data: data !== null && data !== void 0 ? data : this.data,
+            delayMs,
+            repeatCountMax,
+            isEnd: true,
+        });
+    }
     /**
      * 重复当前步骤
      * @param stepId 步骤ID

package/package.json

@@ -1,43 +1,43 @@
 {
-  "name": "assistsx-js",
-  "version": "0.0.2040",
-  "description": "assistsx-js自动化开发SDK",
-  "main": "dist/index.js",
-  "module": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "files": [
-    "dist",
-    "src"
-  ],
-  "exports": {
-    ".": {
-      "import": "./dist/index.js",
-      "require": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+    "name": "assistsx-js",
+    "version": "0.0.2042",
+    "description": "assistsx-js自动化开发SDK",
+    "main": "dist/index.js",
+    "module": "dist/index.js",
+    "types": "dist/index.d.ts",
+    "files": [
+        "dist",
+        "src"
+    ],
+    "exports": {
+        ".": {
+            "import": "./dist/index.js",
+            "require": "./dist/index.js",
+            "types": "./dist/index.d.ts"
+        }
+    },
+    "publishConfig": {
+        "access": "public"
+    },
+    "scripts": {
+        "build": "tsc",
+        "prepublish": "npm run build",
+        "test": "echo \"Error: no test specified\" && exit 1"
+    },
+    "keywords": [
+        "assistsx",
+        "assists",
+        "android assistsx",
+        "assistsx webview",
+        "AccessibilityService",
+        "dev"
+    ],
+    "author": "Ven",
+    "license": "MIT",
+    "devDependencies": {
+        "typescript": "^5.3.3"
+    },
+    "dependencies": {
+        "pinia": "^3.0.3"
     }
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "scripts": {
-    "build": "tsc",
-    "prepublish": "npm run build",
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "keywords": [
-    "assistsx",
-    "assists",
-    "android assistsx",
-    "assistsx webview",
-    "AccessibilityService",
-    "dev"
-  ],
-  "author": "Ven",
-  "license": "MIT",
-  "devDependencies": {
-    "typescript": "^5.3.3"
-  },
-  "dependencies": {
-    "pinia": "^3.0.3"
-  }
-}
+}