@ekhein/lamda-node-sdk 2.2.3 → 10.8.1

package/README.md

@@ -1,11 +1,27 @@
-<!-- 生成 grpc ts 代码 -->
+# @ekhein/lamda-node-sdk
+
+`lamda` Node.js gRPC SDK，当前 RPC 定义已同步到 FIRERPA `v10.8`。
+
+## 从上游重新生成
+
+```bash
+pnpm install
 
-```
 protoc \
   --plugin=protoc-gen-ts_proto=./node_modules/.bin/protoc-gen-ts_proto \
-  --ts_proto_out=./dist \
+  --ts_proto_out=./src/rpc \
   --ts_proto_opt=outputServices=nice-grpc,outputServices=generic-definitions,useExactTypes=false \
-  --proto_path=./proto/google \
   --proto_path=./proto/rpc \
+  --proto_path=./proto \
   ./proto/rpc/services.proto
-```
+
+pnpm build
+```
+
+## v10.8 同步说明
+
+- 新增 APK/XAPK 安装会话接口：`installSessionCreate`、`installSessionWrite`、`installSessionCommit`、`installSessionQuery`、`installSessionAbandon`。
+- 新增虚拟显示与多显示器接口，以及针对指定 display 的 UI 自动化参数。
+- 更新 Watcher 协议类型：`WatcherControlRequest`、`WatcherInfo`、`WatcherInfoList`。
+- 新增 `pointLongClick`、`playAudio`、Shadowsocks/HTTPS 代理配置和 `ServerInfoResponse.privileged`。
+- 上游已删除若干旧 RPC；`ApplicationActivityRequest.extras` 已改为 `ActivityExtras`。升级时请按 TypeScript 编译错误调整调用。

package/dist/main.d.ts

@@ -16,14 +16,14 @@ export declare class Device {
     readonly Settings: SettingsClient;
     private channel;
     private client;
-    constructor();
+    constructor(ipaddr: string, port?: number);
     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>;
+    keyboard(keys: string, selector: 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>;
-    activity(data: string): Promise<import("./rpc/types").Boolean>;
+    openURLScheme(data: string): Promise<import("./rpc/types").Boolean>;
     kill(name: string): Promise<import("./rpc/types").Boolean>;
-    open(name: string): Promise<import("./rpc/types").Boolean>;
+    start(name: string): Promise<import("./rpc/types").Boolean>;
     restart(name: string): Promise<void>;
     call(args: {
         package: string;

package/dist/main.js

@@ -20,16 +20,16 @@ const services_1 = require("./rpc/services");
 class Device {
     channel;
     client;
-    constructor() {
-        const address = new URL(process.env.LAMDA_URL, "http://127.0.0.1:65000");
+    constructor(ipaddr, port = 65000) {
+        const address = Array(ipaddr, port).join(":");
         const credentials = nice_grpc_1.ChannelCredentials.createInsecure();
         this.client = (0, nice_grpc_1.createClientFactory)()
             .use((0, remoteException_Interceptor_1.RemoteExceptionInterceptor)());
-        this.channel = (0, nice_grpc_1.createChannel)(address.host, credentials, {
+        this.channel = (0, nice_grpc_1.createChannel)(address, credentials, {
             ["grpc.max_send_message_length"]: 64 * 1024 * 1024,
             ["grpc.max_receive_message_length"]: 128 * 1024 * 1024,
             ["grpc.keepalive_time_ms"]: 60 * 1000,
-            ["grpc.keepalive_timeout_ms"]: 15 * 1000,
+            ["grpc.keepalive_timeout_ms"]: 20 * 1000,
             ["grpc.keepalive_permit_without_calls"]: 1,
             ["grpc.max_pings_without_data"]: 0,
             ["grpc.enable_http_proxy"]: 0,
@@ -51,13 +51,13 @@ class Device {
         return this.UiAutomator
             .selectorClick({ selector, corner });
     }
-    async clickEx(keys, keyboard) {
+    async keyboard(keys, selector) {
         for (let i = 0; i < keys.length; i++) {
             await this.sleep(100, 200);
-            await this.click(keyboard[keys[i]]);
+            await this.click(selector[keys[i]]);
         }
     }
-    async waitFor(selector, timeout = 15e3) {
+    async waitFor(selector, timeout = 15000) {
         return this.UiAutomator
             .selectorWaitForExists({ selector, timeout })
             .then(async (exists) => {
@@ -70,7 +70,7 @@ class Device {
         const ms = Math.random() * (max - min) + min;
         return new Promise(resolve => setTimeout(resolve, ms));
     }
-    async activity(data) {
+    async openURLScheme(data) {
         return this.Application
             .startActivity({
             data,
@@ -82,14 +82,14 @@ class Device {
         return this.Application
             .stopApplication({ name });
     }
-    async open(name) {
+    async start(name) {
         return this.Application
             .startApplication({ name });
     }
     async restart(name) {
         await this.kill(name);
         await this.sleep(200);
-        await this.open(name);
+        await this.start(name);
     }
     async call(args) {
         const callinfo = JSON.stringify(args.callinfo);

package/dist/rpc/application.d.ts

@@ -22,43 +22,52 @@ export declare enum ScriptRuntime {
 }
 export declare function scriptRuntimeFromJSON(object: any): ScriptRuntime;
 export declare function scriptRuntimeToJSON(object: ScriptRuntime): string;
+export declare enum ActivityExtrasNullValue {
+    ACTIVITY_EXTRAS_NULL_VALUE = 0,
+    UNRECOGNIZED = -1
+}
+export declare function activityExtrasNullValueFromJSON(object: any): ActivityExtrasNullValue;
+export declare function activityExtrasNullValueToJSON(object: ActivityExtrasNullValue): string;
+export interface ActivityExtrasValue {
+    nullValue?: ActivityExtrasNullValue | undefined;
+    doubleValue?: number | undefined;
+    stringValue?: string | undefined;
+    boolValue?: boolean | undefined;
+    int64Value?: number | undefined;
+}
+export interface ActivityExtras {
+    fields: {
+        [key: string]: ActivityExtrasValue;
+    };
+}
+export interface ActivityExtras_FieldsEntry {
+    key: string;
+    value: ActivityExtrasValue | undefined;
+}
 export interface ApplicationRequest {
     name: string;
     permission: string;
     mode: GrantType;
     path: string;
     user: number;
+    display: number;
 }
 export interface ApplicationActivityRequest {
     package: string;
     action: string;
     category: string;
     component: string;
-    extras: {
-        [key: string]: any;
-    } | undefined;
-    categories: string[];
+    extras: ActivityExtras | undefined;
     flags: number;
     debug: boolean;
     data: string;
     user: number;
+    display: number;
 }
 export interface ApplicationActivityInfo {
-    package: string;
     action: string;
-    category: string;
     component: string;
-    extras: {
-        [key: string]: any;
-    } | undefined;
     categories: string[];
-    flags: number;
-    debug: boolean;
-    data: string;
-    user: number;
-}
-export interface ApplicationActivityInfoList {
-    activities: ApplicationActivityInfo[];
 }
 export interface ApplicationPermissions {
     permissions: string[];
@@ -77,18 +86,29 @@ export interface ApplicationInfo {
     versionName: string;
     activity: string;
     user: number;
+    label: string;
 }
 export interface ApplicationProcess {
     packages: string[];
     processName: string;
     uid: number;
     pid: number;
+    label: string;
 }
 export interface ApplicationProcesses {
     processes: ApplicationProcess[];
 }
-export interface ApplicationPkgNames {
-    names: string[];
+export interface InstalledApplicationInfo {
+    packageName: string;
+    label: string;
+    uid: number;
+    user: number;
+    enabled: boolean;
+    system: boolean;
+    versionName: string;
+}
+export interface InstalledApplications {
+    applications: InstalledApplicationInfo[];
 }
 export interface HookRequest {
     package: string;
@@ -99,6 +119,7 @@ export interface HookRequest {
     standup: number;
     spawn: boolean;
     user: number;
+    process: string;
 }
 export interface HookRpcRequest {
     package: string;
@@ -109,18 +130,80 @@ export interface HookRpcResponse {
     package: string;
     callresult: string;
 }
+export interface InstallSessionCreateRequest {
+    user: number;
+    installerPackageName: string;
+    sizeBytes: number;
+    package: string;
+    dontKillApp: boolean;
+    replaceExisting: boolean;
+    allowTest: boolean;
+    requestDowngrade: boolean;
+    grantRuntimePermissions: boolean;
+}
+export interface InstallSessionWriteRequest {
+    session: number;
+    path: string;
+    name: string;
+    delete: boolean;
+}
+export interface InstallSessionAbandonRequest {
+    session: number;
+}
+export interface InstallSessionQueryRequest {
+    session: number;
+}
+export interface InstallSessionCommitRequest {
+    session: number;
+    wait: boolean;
+    timeout: number;
+}
+export interface InstallSessionCreateResponse {
+    user: number;
+    session: number;
+}
+export interface InstallSessionWriteResponse {
+    session: number;
+    name: string;
+    writtenBytes: number;
+    totalBytes: number;
+}
+export interface InstallSessionStatusResponse {
+    user: number;
+    session: number;
+    package: string;
+    status: number;
+    legacyStatus: number;
+    statusMessage: string;
+    finished: boolean;
+    committed: boolean;
+    abandoned: boolean;
+    progress: number;
+    success: boolean;
+}
+export declare const ActivityExtrasValue: MessageFns<ActivityExtrasValue>;
+export declare const ActivityExtras: MessageFns<ActivityExtras>;
+export declare const ActivityExtras_FieldsEntry: MessageFns<ActivityExtras_FieldsEntry>;
 export declare const ApplicationRequest: MessageFns<ApplicationRequest>;
 export declare const ApplicationActivityRequest: MessageFns<ApplicationActivityRequest>;
 export declare const ApplicationActivityInfo: MessageFns<ApplicationActivityInfo>;
-export declare const ApplicationActivityInfoList: MessageFns<ApplicationActivityInfoList>;
 export declare const ApplicationPermissions: MessageFns<ApplicationPermissions>;
 export declare const ApplicationInfo: MessageFns<ApplicationInfo>;
 export declare const ApplicationProcess: MessageFns<ApplicationProcess>;
 export declare const ApplicationProcesses: MessageFns<ApplicationProcesses>;
-export declare const ApplicationPkgNames: MessageFns<ApplicationPkgNames>;
+export declare const InstalledApplicationInfo: MessageFns<InstalledApplicationInfo>;
+export declare const InstalledApplications: MessageFns<InstalledApplications>;
 export declare const HookRequest: MessageFns<HookRequest>;
 export declare const HookRpcRequest: MessageFns<HookRpcRequest>;
 export declare const HookRpcResponse: MessageFns<HookRpcResponse>;
+export declare const InstallSessionCreateRequest: MessageFns<InstallSessionCreateRequest>;
+export declare const InstallSessionWriteRequest: MessageFns<InstallSessionWriteRequest>;
+export declare const InstallSessionAbandonRequest: MessageFns<InstallSessionAbandonRequest>;
+export declare const InstallSessionQueryRequest: MessageFns<InstallSessionQueryRequest>;
+export declare const InstallSessionCommitRequest: MessageFns<InstallSessionCommitRequest>;
+export declare const InstallSessionCreateResponse: MessageFns<InstallSessionCreateResponse>;
+export declare const InstallSessionWriteResponse: MessageFns<InstallSessionWriteResponse>;
+export declare const InstallSessionStatusResponse: MessageFns<InstallSessionStatusResponse>;
 type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
 export type DeepPartial<T> = T extends Builtin ? T : T extends globalThis.Array<infer U> ? globalThis.Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {} ? {
     [K in keyof T]?: DeepPartial<T[K]>;