assistsx-js 0.0.2024 → 0.0.2025

package/dist/AssistsXAsync.js

@@ -13,9 +13,10 @@ export class AssistsXAsync {
      * 执行异步调用
      * @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,
@@ -32,7 +33,7 @@ export class AssistsXAsync {
                 // 超时后删除回调函数
                 callbacks.delete(uuid);
                 resolve(new CallResponse(0, null, uuid));
-            }, 1000 * 30);
+            }, timeout * 1000);
         });
         const result = window.assistsxAsync.call(JSON.stringify(params));
         const promiseResult = await promise;
@@ -46,22 +47,26 @@ export class AssistsXAsync {
     /**
      * 设置悬浮窗标志
      * @param flags 标志
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 是否设置成功
      */
-    static async setOverlayFlags(flags) {
+    static async setOverlayFlags(flags, timeout) {
         const response = await this.asyncCall(CallMethod.setOverlayFlags, {
             args: { flags: flags },
+            timeout,
         });
         return response.getDataOrDefault(false);
     }
     /**
      * 设置悬浮窗标志
      * @param flags 标志
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 是否设置成功
      */
-    static async setOverlayFlagList(flags) {
+    static async setOverlayFlagList(flags, timeout) {
         const response = await this.asyncCall(CallMethod.setOverlayFlags, {
             args: { flags: flags },
+            timeout,
         });
         return response.getDataOrDefault(false);
     }
@@ -71,11 +76,13 @@ export class AssistsXAsync {
      * @param filterViewId 视图ID过滤
      * @param filterDes 描述过滤
      * @param filterText 文本过滤
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 节点数组
      */
-    static async getAllNodes({ filterClass, filterViewId, filterDes, filterText, } = {}) {
+    static async getAllNodes({ filterClass, filterViewId, filterDes, filterText, timeout, } = {}) {
         const response = await this.asyncCall(CallMethod.getAllNodes, {
             args: { filterClass, filterViewId, filterDes, filterText },
+            timeout,
         });
         return Node.fromJSONArray(response.getDataOrDefault("[]"));
     }
@@ -83,12 +90,14 @@ export class AssistsXAsync {
      * 设置节点文本
      * @param node 目标节点
      * @param text 要设置的文本
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 是否设置成功
      */
-    static async setNodeText(node, text) {
+    static async setNodeText(node, text, timeout) {
         const response = await this.asyncCall(CallMethod.setNodeText, {
             args: { text },
             node,
+            timeout,
         });
         return response.getDataOrDefault(false);
     }
@@ -96,23 +105,25 @@ export class AssistsXAsync {
      * 对指定节点进行截图
      * @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,
@@ -124,6 +135,7 @@ export class AssistsXAsync {
                 maxHeight,
                 initialCenter,
             },
+            timeout,
         });
         const data = response.getDataOrDefault({});
         return data;
@@ -131,49 +143,61 @@ export class AssistsXAsync {
     /**
      * 点击节点
      * @param node 要点击的节点
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 是否点击成功
      */
-    static async click(node) {
-        const response = await this.asyncCall(CallMethod.click, { node });
+    static async click(node, timeout) {
+        const response = await this.asyncCall(CallMethod.click, { node, timeout });
         return response.getDataOrDefault(false);
     }
     /**
      * 长按节点
      * @param node 要长按的节点
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 是否长按成功
      */
-    static async longClick(node) {
-        const response = await this.asyncCall(CallMethod.longClick, { node });
+    static async longClick(node, timeout) {
+        const response = await this.asyncCall(CallMethod.longClick, {
+            node,
+            timeout,
+        });
         return response.getDataOrDefault(false);
     }
     /**
      * 启动应用
      * @param packageName 应用包名
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 是否启动成功
      */
-    static async launchApp(packageName) {
+    static async launchApp(packageName, timeout) {
         const response = await this.asyncCall(CallMethod.launchApp, {
             args: { packageName },
+            timeout,
         });
         return response.getDataOrDefault(false);
     }
     /**
      * 获取当前应用包名
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 包名
      */
-    static async getPackageName() {
-        const response = await this.asyncCall(CallMethod.getPackageName);
+    static async getPackageName(timeout) {
+        const response = await this.asyncCall(CallMethod.getPackageName, {
+            timeout,
+        });
         return response.getDataOrDefault("");
     }
     /**
      * 显示悬浮提示
      * @param text 提示文本
      * @param delay 显示时长(毫秒)
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 是否显示成功
      */
-    static async overlayToast(text, delay = 2000) {
+    static async overlayToast(text, delay = 2000, timeout) {
         const response = await this.asyncCall(CallMethod.overlayToast, {
             args: { text, delay },
+            timeout,
         });
         return response.getDataOrDefault(false);
     }
@@ -184,12 +208,14 @@ export class AssistsXAsync {
      * @param filterText 文本过滤
      * @param filterDes 描述过滤
      * @param node 父节点范围
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 节点数组
      */
-    static async findById(id, { filterClass, filterText, filterDes, node, } = {}) {
+    static async findById(id, { filterClass, filterText, filterDes, node, timeout, } = {}) {
         const response = await this.asyncCall(CallMethod.findById, {
             args: { id, filterClass, filterText, filterDes },
             node,
+            timeout,
         });
         return Node.fromJSONArray(response.getDataOrDefault("[]"));
     }
@@ -200,12 +226,14 @@ export class AssistsXAsync {
      * @param filterViewId 视图ID过滤
      * @param filterDes 描述过滤
      * @param node 父节点范围
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 节点数组
      */
-    static async findByText(text, { filterClass, filterViewId, filterDes, node, } = {}) {
+    static async findByText(text, { filterClass, filterViewId, filterDes, node, timeout, } = {}) {
         const response = await this.asyncCall(CallMethod.findByText, {
             args: { text, filterClass, filterViewId, filterDes },
             node,
+            timeout,
         });
         return Node.fromJSONArray(response.getDataOrDefault("[]"));
     }
@@ -216,94 +244,115 @@ export class AssistsXAsync {
      * @param filterViewId 视图ID过滤
      * @param filterDes 描述过滤
      * @param node 父节点范围
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 节点数组
      */
-    static async findByTags(className, { filterText, filterViewId, filterDes, node, } = {}) {
+    static async findByTags(className, { filterText, filterViewId, filterDes, node, timeout, } = {}) {
         const response = await this.asyncCall(CallMethod.findByTags, {
             args: { className, filterText, filterViewId, filterDes },
             node,
+            timeout,
         });
         return Node.fromJSONArray(response.getDataOrDefault("[]"));
     }
     /**
      * 查找所有匹配文本的节点
      * @param text 要查找的文本
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 节点数组
      */
-    static async findByTextAllMatch(text) {
+    static async findByTextAllMatch(text, timeout) {
         const response = await this.asyncCall(CallMethod.findByTextAllMatch, {
             args: { text },
+            timeout,
         });
         return Node.fromJSONArray(response.getDataOrDefault("[]"));
     }
     /**
      * 检查是否包含指定文本
      * @param text 要检查的文本
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 是否包含
      */
-    static async containsText(text) {
+    static async containsText(text, timeout) {
         const response = await this.asyncCall(CallMethod.containsText, {
             args: { text },
+            timeout,
         });
         return response.getDataOrDefault(false);
     }
     /**
      * 获取所有文本
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 文本数组
      */
-    static async getAllText() {
-        const response = await this.asyncCall(CallMethod.getAllText);
+    static async getAllText(timeout) {
+        const response = await this.asyncCall(CallMethod.getAllText, { timeout });
         return response.getDataOrDefault("[]");
     }
     /**
      * 查找第一个匹配标签的父节点
      * @param className 类名
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 父节点
      */
-    static async findFirstParentByTags(node, className) {
+    static async findFirstParentByTags(node, className, timeout) {
         const response = await this.asyncCall(CallMethod.findFirstParentByTags, {
             args: { className },
             node,
+            timeout,
         });
         return Node.create(response.getDataOrDefault("{}"));
     }
     /**
      * 获取节点的所有子节点
      * @param node 父节点
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 子节点数组
      */
-    static async getNodes(node) {
-        const response = await this.asyncCall(CallMethod.getNodes, { node });
+    static async getNodes(node, timeout) {
+        const response = await this.asyncCall(CallMethod.getNodes, {
+            node,
+            timeout,
+        });
         return Node.fromJSONArray(response.getDataOrDefault("[]"));
     }
     /**
      * 获取节点的直接子节点
      * @param node 父节点
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 子节点数组
      */
-    static async getChildren(node) {
-        const response = await this.asyncCall(CallMethod.getChildren, { node });
+    static async getChildren(node, timeout) {
+        const response = await this.asyncCall(CallMethod.getChildren, {
+            node,
+            timeout,
+        });
         return Node.fromJSONArray(response.getDataOrDefault([]));
     }
     /**
      * 查找第一个可点击的父节点
      * @param node 起始节点
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 可点击的父节点
      */
-    static async findFirstParentClickable(node) {
+    static async findFirstParentClickable(node, timeout) {
         const response = await this.asyncCall(CallMethod.findFirstParentClickable, {
             node,
+            timeout,
         });
         return Node.create(response.getDataOrDefault("{}"));
     }
     /**
      * 获取节点在屏幕中的边界
      * @param node 目标节点
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 边界对象
      */
-    static async getBoundsInScreen(node) {
+    static async getBoundsInScreen(node, timeout) {
         const response = await this.asyncCall(CallMethod.getBoundsInScreen, {
             node,
+            timeout,
         });
         return Bounds.fromData(response.getDataOrDefault({}));
     }
@@ -312,12 +361,14 @@ export class AssistsXAsync {
      * @param node 目标节点
      * @param compareNode 比较节点
      * @param isFullyByCompareNode 是否完全可见
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 是否可见
      */
-    static async isVisible(node, { compareNode, isFullyByCompareNode, } = {}) {
+    static async isVisible(node, { compareNode, isFullyByCompareNode, timeout, } = {}) {
         const response = await this.asyncCall(CallMethod.isVisible, {
             node,
             args: { compareNode, isFullyByCompareNode },
+            timeout,
         });
         return response.getDataOrDefault(false);
     }
@@ -326,61 +377,71 @@ export class AssistsXAsync {
      * @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);
     }
     /**
      * 返回操作
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 是否成功
      */
-    static async back() {
-        const response = await this.asyncCall(CallMethod.back);
+    static async back(timeout) {
+        const response = await this.asyncCall(CallMethod.back, { timeout });
         return response.getDataOrDefault(false);
     }
     /**
      * 回到主页
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 是否成功
      */
-    static async home() {
-        const response = await this.asyncCall(CallMethod.home);
+    static async home(timeout) {
+        const response = await this.asyncCall(CallMethod.home, { timeout });
         return response.getDataOrDefault(false);
     }
     /**
      * 打开通知栏
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 是否成功
      */
-    static async notifications() {
-        const response = await this.asyncCall(CallMethod.notifications);
+    static async notifications(timeout) {
+        const response = await this.asyncCall(CallMethod.notifications, {
+            timeout,
+        });
         return response.getDataOrDefault(false);
     }
     /**
      * 显示最近应用
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 是否成功
      */
-    static async recentApps() {
-        const response = await this.asyncCall(CallMethod.recentApps);
+    static async recentApps(timeout) {
+        const response = await this.asyncCall(CallMethod.recentApps, { timeout });
         return response.getDataOrDefault(false);
     }
     /**
      * 在节点中粘贴文本
      * @param node 目标节点
      * @param text 要粘贴的文本
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 是否成功
      */
-    static async paste(node, text) {
+    static async paste(node, text, timeout) {
         const response = await this.asyncCall(CallMethod.paste, {
             args: { text },
             node,
+            timeout,
         });
         return response.getDataOrDefault(false);
     }
-    static async focus(node) {
-        const response = await this.asyncCall(CallMethod.focus, { node });
+    static async focus(node, timeout) {
+        const response = await this.asyncCall(CallMethod.focus, { node, timeout });
         return response.getDataOrDefault(false);
     }
     /**
@@ -388,34 +449,40 @@ export class AssistsXAsync {
      * @param node 目标节点
      * @param selectionStart 选择起始位置
      * @param selectionEnd 选择结束位置
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 是否成功
      */
-    static async selectionText(node, selectionStart, selectionEnd) {
+    static async selectionText(node, selectionStart, selectionEnd, timeout) {
         const response = await this.asyncCall(CallMethod.selectionText, {
             args: { selectionStart, selectionEnd },
             node,
+            timeout,
         });
         return response.getDataOrDefault(false);
     }
     /**
      * 向前滚动
      * @param node 可滚动节点
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 是否成功
      */
-    static async scrollForward(node) {
+    static async scrollForward(node, timeout) {
         const response = await this.asyncCall(CallMethod.scrollForward, {
             node,
+            timeout,
         });
         return response.getDataOrDefault(false);
     }
     /**
      * 向后滚动
      * @param node 可滚动节点
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 是否成功
      */
-    static async scrollBackward(node) {
+    static async scrollBackward(node, timeout) {
         const response = await this.asyncCall(CallMethod.scrollBackward, {
             node,
+            timeout,
         });
         return response.getDataOrDefault(false);
     }
@@ -426,12 +493,14 @@ export class AssistsXAsync {
      * @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);
     }
@@ -443,9 +512,10 @@ export class AssistsXAsync {
      * @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: {
@@ -455,6 +525,7 @@ export class AssistsXAsync {
                 clickDuration,
                 clickInterval,
             },
+            timeout,
         });
         return response.getDataOrDefault(false);
     }
@@ -463,15 +534,17 @@ export class AssistsXAsync {
      * @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: {
@@ -481,10 +554,11 @@ export class AssistsXAsync {
                 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,
@@ -494,45 +568,59 @@ export class AssistsXAsync {
                 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({});
     }
-    static async getUniqueDeviceId() {
-        const response = await this.asyncCall(CallMethod.getUniqueDeviceId);
+    static async getUniqueDeviceId(timeout) {
+        const response = await this.asyncCall(CallMethod.getUniqueDeviceId, {
+            timeout,
+        });
         return response.getDataOrDefault("");
     }
-    static async getAndroidID() {
-        const response = await this.asyncCall(CallMethod.getAndroidID);
+    static async getAndroidID(timeout) {
+        const response = await this.asyncCall(CallMethod.getAndroidID, { timeout });
         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({});
     }
     /**
      * 获取屏幕尺寸
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 屏幕尺寸对象
      */
-    static async getScreenSize() {
-        const response = await this.asyncCall(CallMethod.getScreenSize);
+    static async getScreenSize(timeout) {
+        const response = await this.asyncCall(CallMethod.getScreenSize, {
+            timeout,
+        });
         return response.getDataOrDefault("{}");
     }
     /**
      * 获取应用窗口尺寸
+     * @param timeout 超时时间(秒)，默认30秒
      * @returns 应用窗口尺寸对象
      */
-    static async getAppScreenSize() {
-        const response = await this.asyncCall(CallMethod.getAppScreenSize);
+    static async getAppScreenSize(timeout) {
+        const response = await this.asyncCall(CallMethod.getAppScreenSize, {
+            timeout,
+        });
         return response.getDataOrDefault("{}");
     }
 }

package/package.json

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