assistsx-js 0.0.2001 → 0.0.2002

package/dist/AssistsX.d.ts

@@ -182,7 +182,7 @@ export declare class AssistsX {
      * @param className 类名
      * @returns 父节点
      */
-    static findFirstParentByTags(className: string): Node;
+    static findFirstParentByTags(node: Node, className: string): Node;
     /**
      * 获取节点的所有子节点
      * @param node 父节点

package/dist/AssistsX.js

@@ -6,7 +6,7 @@ import { Node } from "./Node";
 import { CallMethod } from "./CallMethod";
 import { CallResponse } from "./CallResponse";
 import { Bounds } from "./Bounds";
-import { generateUUID } from "./Utils";
+import { decodeBase64UTF8, generateUUID } from "./Utils";
 // 回调函数存储对象
 export const callbacks = {};
 // 无障碍事件监听器存储
@@ -14,10 +14,17 @@ export const accessibilityEventListeners = [];
 // 初始化全局回调函数
 if (typeof window !== "undefined" && !window.assistsxCallback) {
     window.assistsxCallback = (data) => {
-        const response = JSON.parse(data);
-        const callback = callbacks[response.callbackId];
-        if (callback) {
-            callback(data);
+        try {
+            console.log(data);
+            const json = decodeBase64UTF8(data);
+            const response = JSON.parse(json);
+            const callback = callbacks[response.callbackId];
+            if (callback) {
+                callback(json);
+            }
+        }
+        catch (e) {
+            console.log(e);
         }
     };
 }
@@ -301,9 +308,10 @@ export class AssistsX {
      * @param className 类名
      * @returns 父节点
      */
-    static findFirstParentByTags(className) {
+    static findFirstParentByTags(node, className) {
         const response = this.call(CallMethod.findFirstParentByTags, {
             args: { className },
+            node,
         });
         return Node.create(response.getDataOrDefault("{}"));
     }

package/dist/AssistsXAsync.d.ts

@@ -152,7 +152,7 @@ export declare class AssistsXAsync {
      * @param className 类名
      * @returns 父节点
      */
-    static findFirstParentByTags(className: string): Promise<Node>;
+    static findFirstParentByTags(node: Node, className: string): Promise<Node>;
     /**
      * 获取节点的所有子节点
      * @param node 父节点

package/dist/AssistsXAsync.js

@@ -258,9 +258,10 @@ export class AssistsXAsync {
      * @param className 类名
      * @returns 父节点
      */
-    static async findFirstParentByTags(className) {
+    static async findFirstParentByTags(node, className) {
         const response = await this.asyncCall(CallMethod.findFirstParentByTags, {
             args: { className },
+            node,
         });
         return Node.create(response.getDataOrDefault("{}"));
     }

package/dist/Node.d.ts

@@ -57,6 +57,12 @@ export declare class Node {
         stepId: string | undefined;
     });
     get async(): NodeAsync;
+    /**
+     * 查找第一个匹配标签的父节点
+     * @param className 类名
+     * @returns 父节点
+     */
+    findFirstParentByTags(className: string): Node;
     /**
      * 对节点执行点击手势
      * @param offsetX X轴偏移

package/dist/Node.js

@@ -21,6 +21,17 @@ export class Node {
     get async() {
         return new NodeAsync(this);
     }
+    /**
+     * 查找第一个匹配标签的父节点
+     * @param className 类名
+     * @returns 父节点
+     */
+    findFirstParentByTags(className) {
+        Step.assert(this.stepId);
+        const node = AssistsX.findFirstParentByTags(this, className);
+        Step.assert(this.stepId);
+        return node;
+    }
     /**
      * 对节点执行点击手势
      * @param offsetX X轴偏移

package/dist/NodeAsync.d.ts

@@ -11,6 +11,12 @@ export declare class NodeAsync {
      * @param node Node实例
      */
     constructor(node: Node);
+    /**
+     * 查找第一个匹配标签的父节点
+     * @param className 类名
+     * @returns 父节点
+     */
+    findFirstParentByTags(className: string): Promise<Node>;
     /**
      * 对节点执行点击手势
      * @param offsetX X轴偏移

package/dist/NodeAsync.js

@@ -9,6 +9,17 @@ export class NodeAsync {
     constructor(node) {
         this.node = node;
     }
+    /**
+     * 查找第一个匹配标签的父节点
+     * @param className 类名
+     * @returns 父节点
+     */
+    async findFirstParentByTags(className) {
+        Step.assert(this.node.stepId);
+        const node = await AssistsXAsync.findFirstParentByTags(this.node, className);
+        Step.assert(this.node.stepId);
+        return node;
+    }
     /**
      * 对节点执行点击手势
      * @param offsetX X轴偏移

package/dist/Step.d.ts

@@ -1,5 +1,7 @@
 import { Node } from "./Node";
 import { StepAsync } from "./StepAsync";
+export type StepResult = Step | undefined;
+export type StepImpl = (step: Step) => Promise<StepResult>;
 export declare class Step {
     static delayMsDefault: number;
     static readonly repeatCountInfinite: number;
@@ -16,12 +18,9 @@ export declare class Step {
      * @param data 步骤数据
      * @param delayMs 步骤延迟时间(毫秒)
      */
-    static run(impl: (step: Step) => Promise<Step | undefined>, { tag, data, backupSteps, delayMs, }?: {
+    static run(impl: StepImpl, { tag, data, delayMs, }?: {
         tag?: string | undefined;
         data?: any | undefined;
-        backupSteps?: {
-            [key: string]: (step: Step) => Promise<Step | undefined>;
-        } | undefined;
         delayMs?: number;
     }): Promise<Step>;
     /**
@@ -70,13 +69,7 @@ export declare class Step {
     /**
      * 步骤实现函数
      */
-    impl: (step: Step) => Promise<Step | undefined>;
-    /**
-     * 备份步骤，可用于在指定的步骤中转向其他步骤
-     */
-    backupSteps: {
-        [key: string]: (step: Step) => Promise<Step | undefined>;
-    } | undefined;
+    impl: StepImpl;
     /**
      * 构造函数
      * @param stepId 步骤ID
@@ -85,14 +78,11 @@ export declare class Step {
      * @param data 步骤数据
      * @param delayMs 步骤延迟时间(毫秒)
      */
-    constructor({ stepId, impl, tag, data, backupSteps, delayMs, repeatCountMax, }: {
+    constructor({ stepId, impl, tag, data, delayMs, repeatCountMax, }: {
         stepId: string;
-        impl: (step: Step) => Promise<Step | undefined>;
+        impl: StepImpl;
         tag?: string | undefined;
         data?: any | undefined;
-        backupSteps?: {
-            [key: string]: (step: Step) => Promise<Step | undefined>;
-        } | undefined;
         delayMs?: number;
         repeatCountMax?: number;
     });
@@ -105,12 +95,9 @@ export declare class Step {
      * @param delayMs 步骤延迟时间(毫秒)
      * @returns 新的步骤实例
      */
-    next(impl: (step: Step) => Promise<Step | undefined>, { tag, data, backupSteps, delayMs, repeatCountMax, }?: {
+    next(impl: StepImpl, { tag, data, delayMs, repeatCountMax, }?: {
         tag?: string | undefined;
         data?: any | undefined;
-        backupSteps?: {
-            [key: string]: (step: Step) => Promise<Step | undefined>;
-        } | undefined;
         delayMs?: number;
         repeatCountMax?: number;
     }): Step;
@@ -122,13 +109,10 @@ export declare class Step {
      * @param delayMs 步骤延迟时间(毫秒)
      * @returns 当前步骤实例
      */
-    repeat({ stepId, tag, data, backupSteps, delayMs, repeatCountMax, }?: {
+    repeat({ stepId, tag, data, delayMs, repeatCountMax, }?: {
         stepId?: string;
         tag?: string | undefined;
         data?: any | undefined;
-        backupSteps?: {
-            [key: string]: (step: Step) => Promise<Step | undefined>;
-        } | undefined;
         delayMs?: number;
         repeatCountMax?: number;
     }): Step;
@@ -239,12 +223,6 @@ export declare class Step {
      * @returns 文本数组
      */
     getAllText(): string[];
-    /**
-     * 查找第一个匹配标签的父节点
-     * @param className 类名
-     * @returns 父节点
-     */
-    findFirstParentByTags(className: string): Node;
     /**
      * 执行点击手势
      * @param x 横坐标

package/dist/Step.js

@@ -15,7 +15,7 @@ export class Step {
      * @param data 步骤数据
      * @param delayMs 步骤延迟时间(毫秒)
      */
-    static async run(impl, { tag, data, backupSteps, delayMs = Step.delayMsDefault, } = {}) {
+    static async run(impl, { tag, data, delayMs = Step.delayMsDefault, } = {}) {
         var _a;
         const stepStore = useStepStore();
         let implnName = impl.name;
@@ -30,7 +30,6 @@ export class Step {
                 impl,
                 tag,
                 data,
-                backupSteps,
                 delayMs,
             });
             while (true) {
@@ -122,7 +121,7 @@ export class Step {
      * @param data 步骤数据
      * @param delayMs 步骤延迟时间(毫秒)
      */
-    constructor({ stepId, impl, tag, data, backupSteps, delayMs = Step.delayMsDefault, repeatCountMax = Step.repeatCountMaxDefault, }) {
+    constructor({ stepId, impl, tag, data, delayMs = Step.delayMsDefault, repeatCountMax = Step.repeatCountMaxDefault, }) {
         /**
          * 步骤ID
          */
@@ -143,7 +142,6 @@ export class Step {
         this.stepId = stepId;
         this.data = data;
         this.impl = impl;
-        this.backupSteps = backupSteps;
         this.delayMs = delayMs;
         this.repeatCountMax = repeatCountMax;
     }
@@ -158,14 +156,13 @@ export class Step {
      * @param delayMs 步骤延迟时间(毫秒)
      * @returns 新的步骤实例
      */
-    next(impl, { tag, data, backupSteps, delayMs = Step.delayMsDefault, repeatCountMax = Step.repeatCountMaxDefault, } = {}) {
+    next(impl, { tag, data, delayMs = Step.delayMsDefault, repeatCountMax = Step.repeatCountMaxDefault, } = {}) {
         Step.assert(this.stepId);
         return new Step({
             stepId: this.stepId,
             impl,
             tag,
             data: data !== null && data !== void 0 ? data : this.data,
-            backupSteps: backupSteps !== null && backupSteps !== void 0 ? backupSteps : this.backupSteps,
             delayMs,
             repeatCountMax,
         });
@@ -178,13 +175,12 @@ export class Step {
      * @param delayMs 步骤延迟时间(毫秒)
      * @returns 当前步骤实例
      */
-    repeat({ stepId = this.stepId, tag = this.tag, data = this.data, backupSteps = this.backupSteps, delayMs = this.delayMs, repeatCountMax = this.repeatCountMax, } = {}) {
+    repeat({ stepId = this.stepId, tag = this.tag, data = this.data, delayMs = this.delayMs, repeatCountMax = this.repeatCountMax, } = {}) {
         Step.assert(this.stepId);
         this.repeatCount++;
         this.stepId = stepId;
         this.tag = tag;
         this.data = data;
-        this.backupSteps = backupSteps;
         this.delayMs = delayMs;
         this.repeatCountMax = repeatCountMax;
         return this;
@@ -370,17 +366,6 @@ export class Step {
         Step.assert(this.stepId);
         return texts;
     }
-    /**
-     * 查找第一个匹配标签的父节点
-     * @param className 类名
-     * @returns 父节点
-     */
-    findFirstParentByTags(className) {
-        Step.assert(this.stepId);
-        const node = AssistsX.findFirstParentByTags(className);
-        Step.assert(this.stepId);
-        return node;
-    }
     /**
      * 执行点击手势
      * @param x 横坐标

package/dist/StepAsync.d.ts

@@ -102,12 +102,6 @@ export declare class StepAsync {
      * @returns 文本数组
      */
     getAllText(): Promise<string[]>;
-    /**
-     * 查找第一个匹配标签的父节点
-     * @param className 类名
-     * @returns 父节点
-     */
-    findFirstParentByTags(className: string): Promise<Node>;
     /**
      * 执行点击手势
      * @param x 横坐标

package/dist/StepAsync.js

@@ -163,17 +163,6 @@ export class StepAsync {
         Step.assert(this.step.stepId);
         return texts;
     }
-    /**
-     * 查找第一个匹配标签的父节点
-     * @param className 类名
-     * @returns 父节点
-     */
-    async findFirstParentByTags(className) {
-        Step.assert(this.step.stepId);
-        const node = await AssistsXAsync.findFirstParentByTags(className);
-        Step.assert(this.step.stepId);
-        return node;
-    }
     /**
      * 执行点击手势
      * @param x 横坐标

package/dist/Utils.d.ts

@@ -1,2 +1,3 @@
 export declare function sleep(ms: number): Promise<void>;
 export declare function generateUUID(): string;
+export declare function decodeBase64UTF8(base64: string): string;

package/dist/Utils.js

@@ -1,12 +1,20 @@
 // 导出工具函数
 export function sleep(ms) {
-    return new Promise(resolve => setTimeout(resolve, ms));
+    return new Promise((resolve) => setTimeout(resolve, ms));
 }
 // 生成UUID
 export function generateUUID() {
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-        const r = Math.random() * 16 | 0;
-        const v = c === 'x' ? r : (r & 0x3 | 0x8);
+    return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (c) {
+        const r = (Math.random() * 16) | 0;
+        const v = c === "x" ? r : (r & 0x3) | 0x8;
         return v.toString(16);
     });
 }
+export function decodeBase64UTF8(base64) {
+    const binary = atob(base64);
+    const bytes = new Uint8Array(binary.length);
+    for (let i = 0; i < binary.length; i++) {
+        bytes[i] = binary.charCodeAt(i);
+    }
+    return new TextDecoder("utf-8").decode(bytes);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "assistsx-js",
-  "version": "0.0.2001",
+  "version": "0.0.2002",
   "description": "assistsx-js自动化开发SDK",
   "main": "dist/index.js",
   "module": "dist/index.js",

package/src/AssistsX.ts

@@ -6,7 +6,7 @@ import { Node } from "./Node";
 import { CallMethod } from "./CallMethod";
 import { CallResponse } from "./CallResponse";
 import { Bounds } from "./Bounds";
-import { generateUUID } from "./Utils";
+import { decodeBase64UTF8, generateUUID } from "./Utils";
 
 /**
  * Web浮动窗口选项接口定义
@@ -30,10 +30,16 @@ export const accessibilityEventListeners: ((event: any) => void)[] = [];
 // 初始化全局回调函数
 if (typeof window !== "undefined" && !window.assistsxCallback) {
   window.assistsxCallback = (data: string) => {
-    const response = JSON.parse(data);
-    const callback = callbacks[response.callbackId];
-    if (callback) {
-      callback(data);
+    try {
+      console.log(data);
+      const json = decodeBase64UTF8(data);
+      const response = JSON.parse(json);
+      const callback = callbacks[response.callbackId];
+      if (callback) {
+        callback(json);
+      }
+    } catch (e) {
+      console.log(e);
     }
   };
 }
@@ -411,9 +417,10 @@ export class AssistsX {
    * @param className 类名
    * @returns 父节点
    */
-  public static findFirstParentByTags(className: string): Node {
+  public static findFirstParentByTags(node: Node, className: string): Node {
     const response = this.call(CallMethod.findFirstParentByTags, {
       args: { className },
+      node,
     });
     return Node.create(response.getDataOrDefault("{}"));
   }

package/src/AssistsXAsync.ts

@@ -347,9 +347,13 @@ export class AssistsXAsync {
    * @param className 类名
    * @returns 父节点
    */
-  public static async findFirstParentByTags(className: string): Promise<Node> {
+  public static async findFirstParentByTags(
+    node: Node,
+    className: string
+  ): Promise<Node> {
     const response = await this.asyncCall(CallMethod.findFirstParentByTags, {
       args: { className },
+      node,
     });
     return Node.create(response.getDataOrDefault("{}"));
   }

package/src/Node.ts

@@ -84,6 +84,18 @@ export class Node {
     return new NodeAsync(this);
   }
 
+  /**
+   * 查找第一个匹配标签的父节点
+   * @param className 类名
+   * @returns 父节点
+   */
+  public findFirstParentByTags(className: string): Node {
+    Step.assert(this.stepId);
+    const node = AssistsX.findFirstParentByTags(this, className);
+    Step.assert(this.stepId);
+    return node;
+  }
+
   /**
    * 对节点执行点击手势
    * @param offsetX X轴偏移

package/src/NodeAsync.ts

@@ -18,7 +18,20 @@ export class NodeAsync {
   constructor(node: Node) {
     this.node = node;
   }
-
+  /**
+   * 查找第一个匹配标签的父节点
+   * @param className 类名
+   * @returns 父节点
+   */
+  public async findFirstParentByTags(className: string): Promise<Node> {
+    Step.assert(this.node.stepId);
+    const node = await AssistsXAsync.findFirstParentByTags(
+      this.node,
+      className
+    );
+    Step.assert(this.node.stepId);
+    return node;
+  }
   /**
    * 对节点执行点击手势
    * @param offsetX X轴偏移

package/src/Step.ts

@@ -10,6 +10,12 @@ import { generateUUID } from "./Utils";
 import { StepError } from "./StepError";
 import { StepAsync } from "./StepAsync";
 
+// 步骤结果类型，可以是Step实例或undefined
+export type StepResult = Step | undefined;
+
+// 步骤实现函数类型
+export type StepImpl = (step: Step) => Promise<StepResult>;
+
 export class Step {
   static delayMsDefault: number = 1000;
   static readonly repeatCountInfinite: number = -1;
@@ -29,18 +35,14 @@ export class Step {
    * @param delayMs 步骤延迟时间(毫秒)
    */
   static async run(
-    impl: (step: Step) => Promise<Step | undefined>,
+    impl: StepImpl,
     {
       tag,
       data,
-      backupSteps,
       delayMs = Step.delayMsDefault,
     }: {
       tag?: string | undefined;
       data?: any | undefined;
-      backupSteps?:
-        | { [key: string]: (step: Step) => Promise<Step | undefined> }
-        | undefined;
       delayMs?: number;
     } = {}
   ): Promise<Step> {
@@ -58,7 +60,6 @@ export class Step {
         impl,
         tag,
         data,
-        backupSteps,
         delayMs,
       });
       while (true) {
@@ -192,14 +193,7 @@ export class Step {
   /**
    * 步骤实现函数
    */
-  impl: (step: Step) => Promise<Step | undefined>;
-
-  /**
-   * 备份步骤，可用于在指定的步骤中转向其他步骤
-   */
-  backupSteps:
-    | { [key: string]: (step: Step) => Promise<Step | undefined> }
-    | undefined;
+  impl: StepImpl;
 
   /**
    * 构造函数
@@ -214,17 +208,13 @@ export class Step {
     impl,
     tag,
     data,
-    backupSteps,
     delayMs = Step.delayMsDefault,
     repeatCountMax = Step.repeatCountMaxDefault,
   }: {
     stepId: string;
-    impl: (step: Step) => Promise<Step | undefined>;
+    impl: StepImpl;
     tag?: string | undefined;
     data?: any | undefined;
-    backupSteps?:
-      | { [key: string]: (step: Step) => Promise<Step | undefined> }
-      | undefined;
     delayMs?: number;
     repeatCountMax?: number;
   }) {
@@ -232,7 +222,6 @@ export class Step {
     this.stepId = stepId;
     this.data = data;
     this.impl = impl;
-    this.backupSteps = backupSteps;
     this.delayMs = delayMs;
     this.repeatCountMax = repeatCountMax;
   }
@@ -249,19 +238,15 @@ export class Step {
    * @returns 新的步骤实例
    */
   next(
-    impl: (step: Step) => Promise<Step | undefined>,
+    impl: StepImpl,
     {
       tag,
       data,
-      backupSteps,
       delayMs = Step.delayMsDefault,
       repeatCountMax = Step.repeatCountMaxDefault,
     }: {
       tag?: string | undefined;
       data?: any | undefined;
-      backupSteps?:
-        | { [key: string]: (step: Step) => Promise<Step | undefined> }
-        | undefined;
       delayMs?: number;
       repeatCountMax?: number;
     } = {}
@@ -272,7 +257,6 @@ export class Step {
       impl,
       tag,
       data: data ?? this.data,
-      backupSteps: backupSteps ?? this.backupSteps,
       delayMs,
       repeatCountMax,
     });
@@ -290,16 +274,12 @@ export class Step {
     stepId = this.stepId,
     tag = this.tag,
     data = this.data,
-    backupSteps = this.backupSteps,
     delayMs = this.delayMs,
     repeatCountMax = this.repeatCountMax,
   }: {
     stepId?: string;
     tag?: string | undefined;
     data?: any | undefined;
-    backupSteps?:
-      | { [key: string]: (step: Step) => Promise<Step | undefined> }
-      | undefined;
     delayMs?: number;
     repeatCountMax?: number;
   } = {}): Step {
@@ -308,7 +288,6 @@ export class Step {
     this.stepId = stepId;
     this.tag = tag;
     this.data = data;
-    this.backupSteps = backupSteps;
     this.delayMs = delayMs;
     this.repeatCountMax = repeatCountMax;
     return this;
@@ -550,18 +529,6 @@ export class Step {
     return texts;
   }
 
-  /**
-   * 查找第一个匹配标签的父节点
-   * @param className 类名
-   * @returns 父节点
-   */
-  public findFirstParentByTags(className: string): Node {
-    Step.assert(this.stepId);
-    const node = AssistsX.findFirstParentByTags(className);
-    Step.assert(this.stepId);
-    return node;
-  }
-
   /**
    * 执行点击手势
    * @param x 横坐标

package/src/StepAsync.ts

@@ -231,18 +231,6 @@ export class StepAsync {
     return texts;
   }
 
-  /**
-   * 查找第一个匹配标签的父节点
-   * @param className 类名
-   * @returns 父节点
-   */
-  public async findFirstParentByTags(className: string): Promise<Node> {
-    Step.assert(this.step.stepId);
-    const node = await AssistsXAsync.findFirstParentByTags(className);
-    Step.assert(this.step.stepId);
-    return node;
-  }
-
   /**
    * 执行点击手势
    * @param x 横坐标

package/src/Utils.ts

@@ -1,13 +1,22 @@
 // 导出工具函数
 export function sleep(ms: number): Promise<void> {
-    return new Promise(resolve => setTimeout(resolve, ms));
+  return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
 // 生成UUID
 export function generateUUID(): string {
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-        const r = Math.random() * 16 | 0;
-        const v = c === 'x' ? r : (r & 0x3 | 0x8);
-        return v.toString(16);
-    });
-}
+  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (c) {
+    const r = (Math.random() * 16) | 0;
+    const v = c === "x" ? r : (r & 0x3) | 0x8;
+    return v.toString(16);
+  });
+}
+
+export function decodeBase64UTF8(base64: string): string {
+  const binary = atob(base64);
+  const bytes = new Uint8Array(binary.length);
+  for (let i = 0; i < binary.length; i++) {
+    bytes[i] = binary.charCodeAt(i);
+  }
+  return new TextDecoder("utf-8").decode(bytes);
+}