@ekhein/lamda-node-sdk 2.1.3 → 2.1.5

package/dist/exceptions/timeout.exception.d.ts

@@ -1,4 +1,4 @@
-import { DeepPartial, SelectorWaitRequest } from "../rpc/uiautomator";
+import { Selector } from "../rpc/uiautomator";
 export declare class TimeoutException extends Error {
-    constructor(args: DeepPartial<SelectorWaitRequest>);
+    constructor(selector: Partial<Selector>, timeout: number);
 }

package/dist/exceptions/timeout.exception.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TimeoutException = void 0;
 const util_1 = require("util");
 class TimeoutException extends Error {
-    constructor(args) {
-        super((0, util_1.format)("%s %sms selector [%s]", TimeoutException.name, args.timeout, args.selector));
+    constructor(selector, timeout) {
+        super((0, util_1.format)("%s %sms selector [%s]", TimeoutException.name, timeout, selector));
     }
 }
 exports.TimeoutException = TimeoutException;

package/dist/main.d.ts

@@ -1,3 +1,4 @@
+import { Corner, Selector } from './rpc/uiautomator';
 import { UtilClient, UiAutomatorClient, ApplicationClient, DebugClient, FileClient, LockClient, ProxyClient, SelinuxPolicyClient, ShellClient, StatusClient, StorageClient, WifiClient, SettingsClient } from './rpc/services';
 export declare class Device {
     readonly Util: UtilClient;
@@ -16,10 +17,10 @@ export declare class Device {
     private channel;
     private client;
     constructor(host?: string, prot?: number);
-    click(...args: Parameters<typeof this.UiAutomator["selectorClick"]>): Promise<import("./rpc/types").Boolean>;
-    waitFor(...args: Parameters<typeof this.UiAutomator["selectorWaitForExists"]>): Promise<void>;
+    click(selector: Partial<Selector>, corner?: Corner): Promise<import("./rpc/types").Boolean>;
+    clickEx(keys: string, keyboard: Record<"0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9", Partial<Selector>>): Promise<void>;
+    waitFor(selector: Partial<Selector>, timeout?: number): Promise<true>;
     sleep(min?: number, max?: number): Promise<unknown>;
-    passwd(pwd: string, keyboard: Record<"0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9", Parameters<typeof this.UiAutomator["selectorClick"]>[0]>): Promise<void>;
     activity(data: string): Promise<import("./rpc/types").Boolean>;
     kill(name: string): Promise<import("./rpc/types").Boolean>;
     open(name: string): Promise<import("./rpc/types").Boolean>;

package/dist/main.js

@@ -47,36 +47,35 @@ class Device {
             })
         });
     }
-    async click(...args) {
+    async click(selector, corner) {
         return this.UiAutomator
-            .selectorClick(...args);
+            .selectorClick({ selector, corner });
     }
-    async waitFor(...args) {
-        args[0] = Object.assign({ timeout: 30e3 }, args[0]);
+    async clickEx(keys, keyboard) {
+        for (let i = 0; i < keys.length; i++) {
+            await this.sleep(100, 200);
+            await this.click(keyboard[keys[i]]);
+        }
+    }
+    async waitFor(selector, timeout = 15e3) {
         return this.UiAutomator
-            .selectorWaitForExists(...args)
+            .selectorWaitForExists({ selector, timeout })
             .then(async (exists) => {
-            if (!exists.value) {
-                throw new timeout_exception_1.TimeoutException(args[0]);
-            }
+            if (exists.value === false)
+                throw new timeout_exception_1.TimeoutException(selector, timeout);
+            return exists.value;
         });
     }
     async sleep(min = 500, max = min) {
         const ms = Math.random() * (max - min) + min;
         return new Promise(resolve => setTimeout(resolve, ms));
     }
-    async passwd(pwd, keyboard) {
-        for (let i = 0; i < pwd.length; i++) {
-            await this.sleep(100, 200);
-            await this.click(keyboard[pwd[i]]);
-        }
-    }
     async activity(data) {
         return this.Application
             .startActivity({
             data,
             action: android_intent_1.ACTION_VIEW,
-            flags: (activity_flag_1.FLAG_ACTIVITY_NEW_TASK | activity_flag_1.FLAG_ACTIVITY_CLEAR_TOP | activity_flag_1.FLAG_ACTIVITY_CLEAR_TASK)
+            flags: activity_flag_1.FLAG_ACTIVITY_NEW_TASK | activity_flag_1.FLAG_ACTIVITY_CLEAR_TOP | activity_flag_1.FLAG_ACTIVITY_CLEAR_TASK
         });
     }
     async kill(name) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ekhein/lamda-node-sdk",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "author": "ekhein",
   "license": "MIT",
   "main": "./dist/main.js",