assistsx-js 0.0.2023 → 0.0.2025

package/dist/AssistsX.d.ts

@@ -78,12 +78,14 @@ export declare class AssistsX {
      * 执行异步调用
      * @param method 方法名
      * @param args 参数对象
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns Promise<调用响应>
      */
-    static asyncCall(method: string, { args, node, nodes }?: {
+    static asyncCall(method: string, { args, node, nodes, timeout, }?: {
         args?: any;
         node?: Node;
         nodes?: Node[];
+        timeout?: number;
     }): Promise<CallResponse>;
     /**
      * 设置悬浮窗标志
@@ -122,11 +124,14 @@ export declare class AssistsX {
      * 对指定节点进行截图
      * @param nodes 要截图的节点数组
      * @param overlayHiddenScreenshotDelayMillis 截图延迟时间(毫秒)
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 截图路径数组
      */
-    static takeScreenshotNodes(nodes: Node[], overlayHiddenScreenshotDelayMillis?: number): Promise<string[]>;
-    static scanQR(): Promise<string>;
-    static loadWebViewOverlay(url: string, options?: WebFloatingWindowOptions): Promise<any>;
+    static takeScreenshotNodes(nodes: Node[], overlayHiddenScreenshotDelayMillis?: number, timeout?: number): Promise<string[]>;
+    static scanQR(timeout?: number): Promise<string>;
+    static loadWebViewOverlay(url: string, options?: WebFloatingWindowOptions & {
+        timeout?: number;
+    }): Promise<any>;
     /**
      * 点击节点
      * @param node 要点击的节点
@@ -265,9 +270,10 @@ export declare class AssistsX {
      * @param x 横坐标
      * @param y 纵坐标
      * @param duration 持续时间
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 是否成功
      */
-    static clickByGesture(x: number, y: number, duration: number): Promise<boolean>;
+    static clickByGesture(x: number, y: number, duration: number, timeout?: number): Promise<boolean>;
     /**
      * 返回操作
      * @returns 是否成功
@@ -323,13 +329,15 @@ export declare class AssistsX {
      * @param offsetY Y轴偏移
      * @param switchWindowIntervalDelay 窗口切换延迟
      * @param clickDuration 点击持续时间
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 是否成功
      */
-    static clickNodeByGesture(node: Node, { offsetX, offsetY, switchWindowIntervalDelay, clickDuration, }?: {
+    static clickNodeByGesture(node: Node, { offsetX, offsetY, switchWindowIntervalDelay, clickDuration, timeout, }?: {
         offsetX?: number;
         offsetY?: number;
         switchWindowIntervalDelay?: number;
         clickDuration?: number;
+        timeout?: number;
     }): Promise<boolean>;
     /**
      * 对节点执行双击手势
@@ -339,20 +347,23 @@ export declare class AssistsX {
      * @param switchWindowIntervalDelay 窗口切换延迟
      * @param clickDuration 点击持续时间
      * @param clickInterval 点击间隔
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 是否成功
      */
-    static doubleClickNodeByGesture(node: Node, { offsetX, offsetY, switchWindowIntervalDelay, clickDuration, clickInterval, }?: {
+    static doubleClickNodeByGesture(node: Node, { offsetX, offsetY, switchWindowIntervalDelay, clickDuration, clickInterval, timeout, }?: {
         offsetX?: number;
         offsetY?: number;
         switchWindowIntervalDelay?: number;
         clickDuration?: number;
         clickInterval?: number;
+        timeout?: number;
     }): Promise<boolean>;
     /**
      * 执行线型手势
      * @param startPoint
      * @param endPoint
      * @param param2
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns
      */
     static performLinearGesture(startPoint: {
@@ -361,30 +372,33 @@ export declare class AssistsX {
     }, endPoint: {
         x: number;
         y: number;
-    }, { duration }?: {
+    }, { duration, timeout }?: {
         duration?: number;
+        timeout?: number;
     }): Promise<boolean>;
-    static longPressNodeByGestureAutoPaste(node: Node, text: string, { matchedPackageName, matchedText, timeoutMillis, longPressDuration, }?: {
+    static longPressNodeByGestureAutoPaste(node: Node, text: string, { matchedPackageName, matchedText, timeoutMillis, longPressDuration, timeout, }?: {
         matchedPackageName?: string;
         matchedText?: string;
         timeoutMillis?: number;
         longPressDuration?: number;
+        timeout?: number;
     }): Promise<boolean>;
     static longPressGestureAutoPaste(point: {
         x: number;
         y: number;
-    }, text: string, { matchedPackageName, matchedText, timeoutMillis, longPressDuration, }?: {
+    }, text: string, { matchedPackageName, matchedText, timeoutMillis, longPressDuration, timeout, }?: {
         matchedPackageName?: string;
         matchedText?: string;
         timeoutMillis?: number;
         longPressDuration?: number;
+        timeout?: number;
     }): Promise<boolean>;
-    static getAppInfo(packageName: string): Promise<any>;
+    static getAppInfo(packageName: string, timeout?: number): Promise<any>;
     static getUniqueDeviceId(): any;
     static getAndroidID(): any;
-    static getMacAddress(): Promise<any>;
-    static getDeviceInfo(): Promise<any>;
-    static getNetworkInfo(): Promise<any>;
+    static getMacAddress(timeout?: number): Promise<any>;
+    static getDeviceInfo(timeout?: number): Promise<any>;
+    static getNetworkType(timeout?: number): Promise<any>;
     static setAccessibilityEventFilters(value: AccessibilityEventFilter[]): Promise<any>;
     static addAccessibilityEventFilter(value: AccessibilityEventFilter): Promise<any>;
     /**

package/dist/AssistsX.js

@@ -79,9 +79,10 @@ export class AssistsX {
      * 执行异步调用
      * @param method 方法名
      * @param args 参数对象
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns Promise<调用响应>
      */
-    static async asyncCall(method, { args, node, nodes } = {}) {
+    static async asyncCall(method, { args, node, nodes, timeout = 30, } = {}) {
         const uuid = generateUUID();
         const params = {
             method,
@@ -98,7 +99,7 @@ export class AssistsX {
                 // 超时后删除回调函数
                 callbacks.delete(uuid);
                 resolve(new CallResponse(0, null, uuid));
-            }, 1000 * 30);
+            }, timeout * 1000);
         });
         const result = window.assistsx.call(JSON.stringify(params));
         const promiseResult = await promise;
@@ -162,23 +163,25 @@ export class AssistsX {
      * 对指定节点进行截图
      * @param nodes 要截图的节点数组
      * @param overlayHiddenScreenshotDelayMillis 截图延迟时间(毫秒)
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 截图路径数组
      */
-    static async takeScreenshotNodes(nodes, overlayHiddenScreenshotDelayMillis = 250) {
+    static async takeScreenshotNodes(nodes, overlayHiddenScreenshotDelayMillis = 250, timeout) {
         const response = await this.asyncCall(CallMethod.takeScreenshot, {
             nodes,
             args: { overlayHiddenScreenshotDelayMillis },
+            timeout,
         });
         const data = response.getDataOrDefault("");
         return data.images;
     }
-    static async scanQR() {
-        const response = await this.asyncCall(CallMethod.scanQR);
+    static async scanQR(timeout) {
+        const response = await this.asyncCall(CallMethod.scanQR, { timeout });
         const data = response.getDataOrDefault({ value: "" });
         return data.value;
     }
     static async loadWebViewOverlay(url, options = {}) {
-        const { initialWidth, initialHeight, minWidth, minHeight, maxWidth, maxHeight, initialCenter, } = options;
+        const { initialWidth, initialHeight, minWidth, minHeight, maxWidth, maxHeight, initialCenter, timeout, } = options;
         const response = await this.asyncCall(CallMethod.loadWebViewOverlay, {
             args: {
                 url,
@@ -190,6 +193,7 @@ export class AssistsX {
                 maxHeight,
                 initialCenter,
             },
+            timeout,
         });
         const data = response.getDataOrDefault({});
         return data;
@@ -384,11 +388,13 @@ export class AssistsX {
      * @param x 横坐标
      * @param y 纵坐标
      * @param duration 持续时间
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 是否成功
      */
-    static async clickByGesture(x, y, duration) {
+    static async clickByGesture(x, y, duration, timeout) {
         const response = await this.asyncCall(CallMethod.clickByGesture, {
             args: { x, y, duration },
+            timeout,
         });
         return response.getDataOrDefault(false);
     }
@@ -477,12 +483,14 @@ export class AssistsX {
      * @param offsetY Y轴偏移
      * @param switchWindowIntervalDelay 窗口切换延迟
      * @param clickDuration 点击持续时间
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 是否成功
      */
-    static async clickNodeByGesture(node, { offsetX, offsetY, switchWindowIntervalDelay, clickDuration, } = {}) {
+    static async clickNodeByGesture(node, { offsetX, offsetY, switchWindowIntervalDelay, clickDuration, timeout, } = {}) {
         const response = await this.asyncCall(CallMethod.clickNodeByGesture, {
             node,
             args: { offsetX, offsetY, switchWindowIntervalDelay, clickDuration },
+            timeout,
         });
         return response.getDataOrDefault(false);
     }
@@ -494,9 +502,10 @@ export class AssistsX {
      * @param switchWindowIntervalDelay 窗口切换延迟
      * @param clickDuration 点击持续时间
      * @param clickInterval 点击间隔
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 是否成功
      */
-    static async doubleClickNodeByGesture(node, { offsetX, offsetY, switchWindowIntervalDelay, clickDuration, clickInterval, } = {}) {
+    static async doubleClickNodeByGesture(node, { offsetX, offsetY, switchWindowIntervalDelay, clickDuration, clickInterval, timeout, } = {}) {
         const response = await this.asyncCall(CallMethod.doubleClickNodeByGesture, {
             node,
             args: {
@@ -506,6 +515,7 @@ export class AssistsX {
                 clickDuration,
                 clickInterval,
             },
+            timeout,
         });
         return response.getDataOrDefault(false);
     }
@@ -514,15 +524,17 @@ export class AssistsX {
      * @param startPoint
      * @param endPoint
      * @param param2
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns
      */
-    static async performLinearGesture(startPoint, endPoint, { duration } = {}) {
+    static async performLinearGesture(startPoint, endPoint, { duration, timeout } = {}) {
         const response = await this.asyncCall(CallMethod.performLinearGesture, {
             args: { startPoint, endPoint, duration },
+            timeout,
         });
         return response.getDataOrDefault(false);
     }
-    static async longPressNodeByGestureAutoPaste(node, text, { matchedPackageName, matchedText, timeoutMillis, longPressDuration, } = { matchedText: "粘贴", timeoutMillis: 1500, longPressDuration: 600 }) {
+    static async longPressNodeByGestureAutoPaste(node, text, { matchedPackageName, matchedText, timeoutMillis, longPressDuration, timeout, } = { matchedText: "粘贴", timeoutMillis: 1500, longPressDuration: 600 }) {
         const response = await this.asyncCall(CallMethod.longPressGestureAutoPaste, {
             node,
             args: {
@@ -532,10 +544,11 @@ export class AssistsX {
                 timeoutMillis,
                 longPressDuration,
             },
+            timeout,
         });
         return response.getDataOrDefault(false);
     }
-    static async longPressGestureAutoPaste(point, text, { matchedPackageName, matchedText, timeoutMillis, longPressDuration, } = { matchedText: "粘贴", timeoutMillis: 1500, longPressDuration: 600 }) {
+    static async longPressGestureAutoPaste(point, text, { matchedPackageName, matchedText, timeoutMillis, longPressDuration, timeout, } = { matchedText: "粘贴", timeoutMillis: 1500, longPressDuration: 600 }) {
         const response = await this.asyncCall(CallMethod.longPressGestureAutoPaste, {
             args: {
                 point,
@@ -545,12 +558,14 @@ export class AssistsX {
                 timeoutMillis,
                 longPressDuration,
             },
+            timeout,
         });
         return response.getDataOrDefault(false);
     }
-    static async getAppInfo(packageName) {
+    static async getAppInfo(packageName, timeout) {
         const response = await this.asyncCall(CallMethod.getAppInfo, {
             args: { packageName },
+            timeout,
         });
         return response.getDataOrDefault({});
     }
@@ -562,16 +577,22 @@ export class AssistsX {
         const response = this.call(CallMethod.getAndroidID);
         return response.getDataOrDefault("");
     }
-    static async getMacAddress() {
-        const response = await this.asyncCall(CallMethod.getMacAddress);
+    static async getMacAddress(timeout) {
+        const response = await this.asyncCall(CallMethod.getMacAddress, {
+            timeout,
+        });
         return response.getDataOrDefault({});
     }
-    static async getDeviceInfo() {
-        const response = await this.asyncCall(CallMethod.getDeviceInfo);
+    static async getDeviceInfo(timeout) {
+        const response = await this.asyncCall(CallMethod.getDeviceInfo, {
+            timeout,
+        });
         return response.getDataOrDefault({});
     }
-    static async getNetworkInfo() {
-        const response = await this.asyncCall(CallMethod.getNetworkInfo);
+    static async getNetworkType(timeout) {
+        const response = await this.asyncCall(CallMethod.getNetworkType, {
+            timeout,
+        });
         return response.getDataOrDefault({});
     }
     static async setAccessibilityEventFilters(value) {