@yume-chan/android-bin 2.0.1 → 3.0.0-beta.0

package/esm/cmd/service.js

@@ -0,0 +1,24 @@
+import { createNoneProtocol } from "./none.js";
+import { createShellProtocol } from "./shell.js";
+export class Cmd {
+    static Mode = {
+        Abb: 0,
+        Cmd: 1,
+        Fallback: 2,
+    };
+    static createNoneProtocol = createNoneProtocol;
+    static createShellProtocol = createShellProtocol;
+    #noneProtocol;
+    get noneProtocol() {
+        return this.#noneProtocol;
+    }
+    #shellProtocol;
+    get shellProtocol() {
+        return this.#shellProtocol;
+    }
+    constructor(adb, fallback) {
+        this.#noneProtocol = createNoneProtocol(adb, fallback);
+        this.#shellProtocol = createShellProtocol(adb, fallback);
+    }
+}
+//# sourceMappingURL=service.js.map

package/esm/cmd/service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/cmd/service.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEjD,MAAM,OAAO,GAAG;IACZ,MAAM,CAAU,IAAI,GAAG;QACnB,GAAG,EAAE,CAAC;QACN,GAAG,EAAE,CAAC;QACN,QAAQ,EAAE,CAAC;KACL,CAAC;IAEX,MAAM,CAAU,kBAAkB,GAAG,kBAAkB,CAAC;IACxD,MAAM,CAAU,mBAAmB,GAAG,mBAAmB,CAAC;IAE1D,aAAa,CAAsC;IACnD,IAAI,YAAY;QACZ,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IAED,cAAc,CAAuC;IACrD,IAAI,aAAa;QACb,OAAO,IAAI,CAAC,cAAc,CAAC;IAC/B,CAAC;IAED,YAAY,GAAQ,EAAE,QAAuB;QACzC,IAAI,CAAC,aAAa,GAAG,kBAAkB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACvD,IAAI,CAAC,cAAc,GAAG,mBAAmB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IAC7D,CAAC"}

package/esm/cmd/shell.d.ts

@@ -0,0 +1,5 @@
+import type { Adb } from "@yume-chan/adb";
+import { Cmd } from "./service.js";
+export declare function createShellProtocol(adb: Adb, fallback: NonNullable<Cmd.Fallback>): Cmd.ShellProtocolService;
+export declare function createShellProtocol(adb: Adb, fallback?: Cmd.Fallback): Cmd.ShellProtocolService | undefined;
+//# sourceMappingURL=shell.d.ts.map

package/esm/cmd/shell.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shell.d.ts","sourceRoot":"","sources":["../../src/cmd/shell.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAQ1C,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAGnC,wBAAgB,mBAAmB,CAC/B,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,GACpC,GAAG,CAAC,oBAAoB,CAAC;AAC5B,wBAAgB,mBAAmB,CAC/B,GAAG,EAAE,GAAG,EACR,QAAQ,CAAC,EAAE,GAAG,CAAC,QAAQ,GACxB,GAAG,CAAC,oBAAoB,GAAG,SAAS,CAAC"}

package/esm/cmd/shell.js

@@ -0,0 +1,43 @@
+import { AdbFeature, AdbShellProtocolProcessImpl, adbShellProtocolSpawner, escapeArg, } from "@yume-chan/adb";
+import { Cmd } from "./service.js";
+import { checkCommand, resolveFallback, serializeAbbService } from "./utils.js";
+export function createShellProtocol(adb, fallback) {
+    if (adb.canUseFeature(AdbFeature.Abb)) {
+        return {
+            mode: Cmd.Mode.Abb,
+            spawn: adbShellProtocolSpawner(async (command, signal) => {
+                const service = serializeAbbService("abb", command);
+                const socket = await adb.createSocket(service);
+                return new AdbShellProtocolProcessImpl(socket, signal);
+            }),
+        };
+    }
+    const shellProtocolService = adb.subprocess.shellProtocol;
+    if (!shellProtocolService) {
+        return undefined;
+    }
+    if (adb.canUseFeature(AdbFeature.Cmd)) {
+        return {
+            mode: Cmd.Mode.Cmd,
+            spawn: adbShellProtocolSpawner(async (command, signal) => {
+                checkCommand(command);
+                const newCommand = command.map(escapeArg);
+                newCommand.unshift("cmd");
+                return shellProtocolService.spawn(newCommand, signal);
+            }),
+        };
+    }
+    if (fallback) {
+        return {
+            mode: Cmd.Mode.Fallback,
+            spawn: adbShellProtocolSpawner(async (command, signal) => {
+                checkCommand(command);
+                const newCommand = command.map(escapeArg);
+                newCommand[0] = resolveFallback(fallback, command[0]);
+                return shellProtocolService.spawn(newCommand, signal);
+            }),
+        };
+    }
+    return undefined;
+}
+//# sourceMappingURL=shell.js.map

package/esm/cmd/shell.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/cmd/shell.ts"],"names":[],"mappings":"AACA,OAAO,EACH,UAAU,EACV,2BAA2B,EAC3B,uBAAuB,EACvB,SAAS,GACZ,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAUhF,MAAM,UAAU,mBAAmB,CAC/B,GAAQ,EACR,QAAuB;IAEvB,IAAI,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACpC,OAAO;YACH,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,GAAG;YAClB,KAAK,EAAE,uBAAuB,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;gBACrD,MAAM,OAAO,GAAG,mBAAmB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;gBACpD,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAC/C,OAAO,IAAI,2BAA2B,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAC3D,CAAC,CAAC;SACL,CAAC;IACN,CAAC;IAED,MAAM,oBAAoB,GAAG,GAAG,CAAC,UAAU,CAAC,aAAa,CAAC;IAC1D,IAAI,CAAC,oBAAoB,EAAE,CAAC;QACxB,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,IAAI,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACpC,OAAO;YACH,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,GAAG;YAClB,KAAK,EAAE,uBAAuB,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;gBACrD,YAAY,CAAC,OAAO,CAAC,CAAC;gBAEtB,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;gBAC1C,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBAC1B,OAAO,oBAAoB,CAAC,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YAC1D,CAAC,CAAC;SACL,CAAC;IACN,CAAC;IAED,IAAI,QAAQ,EAAE,CAAC;QACX,OAAO;YACH,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,QAAQ;YACvB,KAAK,EAAE,uBAAuB,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;gBACrD,YAAY,CAAC,OAAO,CAAC,CAAC;gBAEtB,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;gBAC1C,UAAU,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAE,CAAC,CAAC;gBACvD,OAAO,oBAAoB,CAAC,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YAC1D,CAAC,CAAC;SACL,CAAC;IACN,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC"}

package/esm/cmd/utils.d.ts

@@ -0,0 +1,5 @@
+import type { Cmd } from "./service.js";
+export declare function resolveFallback(fallback: Cmd.Fallback, command: string): string;
+export declare function checkCommand(command: readonly string[]): void;
+export declare function serializeAbbService(prefix: string, command: readonly string[]): string;
+//# sourceMappingURL=utils.d.ts.map

package/esm/cmd/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/cmd/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAExC,wBAAgB,eAAe,CAC3B,QAAQ,EAAE,GAAG,CAAC,QAAQ,EACtB,OAAO,EAAE,MAAM,GAChB,MAAM,CAYR;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,QAItD;AAED,wBAAgB,mBAAmB,CAC/B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,SAAS,MAAM,EAAE,GAC3B,MAAM,CAMR"}

package/esm/cmd/utils.js

@@ -0,0 +1,24 @@
+export function resolveFallback(fallback, command) {
+    if (typeof fallback === "function") {
+        fallback = fallback(command);
+    }
+    else if (typeof fallback === "object" && fallback !== null) {
+        fallback = fallback[command];
+    }
+    if (!fallback) {
+        throw new Error(`No fallback configured for command "${command}"`);
+    }
+    return fallback;
+}
+export function checkCommand(command) {
+    if (!command.length) {
+        throw new TypeError("Command is empty");
+    }
+}
+export function serializeAbbService(prefix, command) {
+    checkCommand(command);
+    // `abb` mode uses `\0` as the separator, allowing space in arguments.
+    // The last `\0` is required for older versions of `adb`.
+    return `${prefix}:${command.join("\0")}\0`;
+}
+//# sourceMappingURL=utils.js.map

package/esm/cmd/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/cmd/utils.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,eAAe,CAC3B,QAAsB,EACtB,OAAe;IAEf,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE,CAAC;QACjC,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;SAAM,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;QAC3D,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAED,IAAI,CAAC,QAAQ,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,uCAAuC,OAAO,GAAG,CAAC,CAAC;IACvE,CAAC;IAED,OAAO,QAAQ,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,OAA0B;IACnD,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;QAClB,MAAM,IAAI,SAAS,CAAC,kBAAkB,CAAC,CAAC;IAC5C,CAAC;AACL,CAAC;AAED,MAAM,UAAU,mBAAmB,CAC/B,MAAc,EACd,OAA0B;IAE1B,YAAY,CAAC,OAAO,CAAC,CAAC;IAEtB,sEAAsE;IACtE,yDAAyD;IACzD,OAAO,GAAG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;AAC/C,CAAC"}

package/esm/demo-mode.d.ts

@@ -1,5 +1,4 @@
 import type { Adb } from "@yume-chan/adb";
-import { AdbServiceBase } from "@yume-chan/adb";
 export declare enum DemoModeSignalStrength {
     Hidden = "null",
     Level0 = "0",
@@ -12,16 +11,16 @@ export declare const DemoModeMobileDataTypes: readonly ["1x", "3g", "4g", "4g+",
 export type DemoModeMobileDataType = (typeof DemoModeMobileDataTypes)[number];
 export declare const DemoModeStatusBarModes: readonly ["opaque", "translucent", "semi-transparent", "transparent", "warning"];
 export type DemoModeStatusBarMode = (typeof DemoModeStatusBarModes)[number];
-export declare class DemoMode extends AdbServiceBase {
+export declare class DemoMode {
     #private;
-    constructor(adb: Adb);
+    constructor(adb: Adb, apiLevel?: number);
     static readonly ALLOWED_SETTING_KEY = "sysui_demo_allowed";
     static readonly ENABLED_SETTING_KEY = "sysui_tuner_demo_on";
     getAllowed(): Promise<boolean>;
     setAllowed(value: boolean): Promise<void>;
     getEnabled(): Promise<boolean>;
     setEnabled(value: boolean): Promise<void>;
-    broadcast(command: string, extra?: Record<string, string>): Promise<void>;
+    broadcast(command: string, extras?: Record<string, string>): Promise<void>;
     setBatteryLevel(level: number): Promise<void>;
     setBatteryCharging(value: boolean): Promise<void>;
     setPowerSaveMode(value: boolean): Promise<void>;

package/esm/demo-mode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"demo-mode.d.ts","sourceRoot":"","sources":["../src/demo-mode.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIhD,oBAAY,sBAAsB;IAC9B,MAAM,SAAS;IACf,MAAM,MAAM;IACZ,MAAM,MAAM;IACZ,MAAM,MAAM;IACZ,MAAM,MAAM;IACZ,MAAM,MAAM;CACf;AAGD,eAAO,MAAM,uBAAuB,kHAiB1B,CAAC;AAEX,MAAM,MAAM,sBAAsB,GAAG,CAAC,OAAO,uBAAuB,CAAC,CAAC,MAAM,CAAC,CAAC;AAG9E,eAAO,MAAM,sBAAsB,kFAMzB,CAAC;AAEX,MAAM,MAAM,qBAAqB,GAAG,CAAC,OAAO,sBAAsB,CAAC,CAAC,MAAM,CAAC,CAAC;AAE5E,qBAAa,QAAS,SAAQ,cAAc;;gBAG5B,GAAG,EAAE,GAAG;IAKpB,MAAM,CAAC,QAAQ,CAAC,mBAAmB,wBAAwB;IAK3D,MAAM,CAAC,QAAQ,CAAC,mBAAmB,yBAAyB;IAEtD,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC;IAQ9B,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAazC,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC;IAQ9B,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAazC,SAAS,CACX,OAAO,EAAE,MAAM,EACf,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC/B,OAAO,CAAC,IAAI,CAAC;IAmBV,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7C,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAIjD,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/C,eAAe,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7C,qBAAqB,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IAInE,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB/D,uBAAuB,CACzB,KAAK,EAAE,sBAAsB,GAC9B,OAAO,CAAC,IAAI,CAAC;IAIV,gBAAgB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAI9C,gBAAgB,CAAC,IAAI,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5D,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAKpD,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAOpD,eAAe,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7C,YAAY,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1C,cAAc,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5C,WAAW,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAIzC,mBAAmB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAMjD,0BAA0B,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxD,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAQ7D"}
+{"version":3,"file":"demo-mode.d.ts","sourceRoot":"","sources":["../src/demo-mode.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAK1C,oBAAY,sBAAsB;IAC9B,MAAM,SAAS;IACf,MAAM,MAAM;IACZ,MAAM,MAAM;IACZ,MAAM,MAAM;IACZ,MAAM,MAAM;IACZ,MAAM,MAAM;CACf;AAGD,eAAO,MAAM,uBAAuB,kHAiB1B,CAAC;AAEX,MAAM,MAAM,sBAAsB,GAAG,CAAC,OAAO,uBAAuB,CAAC,CAAC,MAAM,CAAC,CAAC;AAG9E,eAAO,MAAM,sBAAsB,kFAMzB,CAAC;AAEX,MAAM,MAAM,qBAAqB,GAAG,CAAC,OAAO,sBAAsB,CAAC,CAAC,MAAM,CAAC,CAAC;AAE5E,qBAAa,QAAQ;;gBAIL,GAAG,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,MAAM;IAKvC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,wBAAwB;IAK3D,MAAM,CAAC,QAAQ,CAAC,mBAAmB,yBAAyB;IAEtD,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC;IAQ9B,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAazC,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC;IAQ9B,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAa/C,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAUpE,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7C,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAIjD,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/C,eAAe,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7C,qBAAqB,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IAInE,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB/D,uBAAuB,CACzB,KAAK,EAAE,sBAAsB,GAC9B,OAAO,CAAC,IAAI,CAAC;IAIV,gBAAgB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAI9C,gBAAgB,CAAC,IAAI,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5D,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAKpD,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAOpD,eAAe,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7C,YAAY,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1C,cAAc,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5C,WAAW,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAIzC,mBAAmB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAMjD,0BAA0B,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxD,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAQ7D"}

package/esm/demo-mode.js

@@ -3,7 +3,7 @@
 // cspell: ignore nosim
 // cspell: ignore systemui
 // cspell: ignore sysui
-import { AdbServiceBase } from "@yume-chan/adb";
+import { ActivityManager } from "./am.js";
 import { Settings } from "./settings.js";
 export var DemoModeSignalStrength;
 (function (DemoModeSignalStrength) {
@@ -41,10 +41,11 @@ export const DemoModeStatusBarModes = [
     "transparent",
     "warning",
 ];
-export class DemoMode extends AdbServiceBase {
+export class DemoMode {
+    #am;
     #settings;
-    constructor(adb) {
-        super(adb);
+    constructor(adb, apiLevel) {
+        this.#am = new ActivityManager(adb, apiLevel);
         this.#settings = new Settings(adb);
     }
     static ALLOWED_SETTING_KEY = "sysui_demo_allowed";
@@ -78,23 +79,14 @@ export class DemoMode extends AdbServiceBase {
             await this.broadcast("exit");
         }
     }
-    async broadcast(command, extra) {
-        await this.adb.subprocess.noneProtocol.spawnWaitText([
-            "am",
-            "broadcast",
-            "-a",
-            "com.android.systemui.demo",
-            "-e",
-            "command",
-            command,
-            ...(extra
-                ? Object.entries(extra).flatMap(([key, value]) => [
-                    "-e",
-                    key,
-                    value,
-                ])
-                : []),
-        ]);
+    broadcast(command, extras) {
+        return this.#am.broadcast({
+            action: "com.android.systemui.demo",
+            extras: {
+                command,
+                ...extras,
+            },
+        });
     }
     async setBatteryLevel(level) {
         await this.broadcast("battery", { level: level.toString() });

package/esm/demo-mode.js.map

@@ -1 +1 @@
-{"version":3,"file":"demo-mode.js","sourceRoot":"","sources":["../src/demo-mode.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"demo-mode.js","sourceRoot":"","sources":["../src/demo-mode.ts"],"names":[],"mappings":"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"}

package/esm/dumpsys.d.ts

@@ -1,4 +1,4 @@
-import { AdbServiceBase } from "@yume-chan/adb";
+import type { Adb } from "@yume-chan/adb";
 declare const Status: {
     readonly Unknown: 1;
     readonly Charging: 2;
@@ -15,7 +15,8 @@ declare const Health: {
     readonly UnspecifiedFailure: 6;
     readonly Cold: 7;
 };
-export declare class DumpSys extends AdbServiceBase {
+export declare class DumpSys {
+    #private;
     static readonly Battery: {
         Status: {
             readonly Unknown: 1;
@@ -34,6 +35,7 @@ export declare class DumpSys extends AdbServiceBase {
             readonly Cold: 7;
         };
     };
+    constructor(adb: Adb);
     diskStats(): Promise<{
         dataFree: number | undefined;
         dataTotal: number | undefined;

package/esm/dumpsys.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dumpsys.d.ts","sourceRoot":"","sources":["../src/dumpsys.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAiChD,QAAA,MAAM,MAAM;;;;;;CAMF,CAAC;AAEX,QAAA,MAAM,MAAM;;;;;;;;CAQF,CAAC;AAOX,qBAAa,OAAQ,SAAQ,cAAc;IACvC,MAAM,CAAC,QAAQ,CAAC,OAAO;;;;;;;;;;;;;;;;;MAAW;IAE5B,SAAS;;;;;;;;IAiCT,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC;CA4CjD;AAED,yBAAiB,OAAO,CAAC;IACrB,UAAiB,OAAO,CAAC;QACrB,KAAY,MAAM,GAAG,CAAC,OAAO,MAAM,CAAC,CAAC,MAAM,OAAO,MAAM,CAAC,CAAC;QAC1D,KAAY,MAAM,GAAG,CAAC,OAAO,MAAM,CAAC,CAAC,MAAM,OAAO,MAAM,CAAC,CAAC;QAE1D,UAAiB,IAAI;YACjB,SAAS,EAAE,OAAO,CAAC;YACnB,UAAU,EAAE,OAAO,CAAC;YACpB,eAAe,EAAE,OAAO,CAAC;YACzB,WAAW,EAAE,OAAO,CAAC;YACrB,kBAAkB,CAAC,EAAE,MAAM,CAAC;YAC5B,kBAAkB,CAAC,EAAE,MAAM,CAAC;YAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;YACvB,MAAM,EAAE,MAAM,CAAC;YACf,MAAM,EAAE,MAAM,CAAC;YACf,OAAO,CAAC,EAAE,OAAO,CAAC;YAClB,KAAK,CAAC,EAAE,MAAM,CAAC;YACf,KAAK,CAAC,EAAE,MAAM,CAAC;YACf,OAAO,CAAC,EAAE,MAAM,CAAC;YACjB,WAAW,CAAC,EAAE,MAAM,CAAC;YACrB,UAAU,CAAC,EAAE,MAAM,CAAC;YACpB,OAAO,CAAC,EAAE,MAAM,CAAC;SACpB;KACJ;CACJ"}
+{"version":3,"file":"dumpsys.d.ts","sourceRoot":"","sources":["../src/dumpsys.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAiC1C,QAAA,MAAM,MAAM;;;;;;CAMF,CAAC;AAEX,QAAA,MAAM,MAAM;;;;;;;;CAQF,CAAC;AAOX,qBAAa,OAAO;;IAChB,MAAM,CAAC,QAAQ,CAAC,OAAO;;;;;;;;;;;;;;;;;MAAW;gBAItB,GAAG,EAAE,GAAG;IAId,SAAS;;;;;;;;IAiCT,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC;CA4CjD;AAED,yBAAiB,OAAO,CAAC;IACrB,UAAiB,OAAO,CAAC;QACrB,KAAY,MAAM,GAAG,CAAC,OAAO,MAAM,CAAC,CAAC,MAAM,OAAO,MAAM,CAAC,CAAC;QAC1D,KAAY,MAAM,GAAG,CAAC,OAAO,MAAM,CAAC,CAAC,MAAM,OAAO,MAAM,CAAC,CAAC;QAE1D,UAAiB,IAAI;YACjB,SAAS,EAAE,OAAO,CAAC;YACnB,UAAU,EAAE,OAAO,CAAC;YACpB,eAAe,EAAE,OAAO,CAAC;YACzB,WAAW,EAAE,OAAO,CAAC;YACrB,kBAAkB,CAAC,EAAE,MAAM,CAAC;YAC5B,kBAAkB,CAAC,EAAE,MAAM,CAAC;YAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;YACvB,MAAM,EAAE,MAAM,CAAC;YACf,MAAM,EAAE,MAAM,CAAC;YACf,OAAO,CAAC,EAAE,OAAO,CAAC;YAClB,KAAK,CAAC,EAAE,MAAM,CAAC;YACf,KAAK,CAAC,EAAE,MAAM,CAAC;YACf,OAAO,CAAC,EAAE,MAAM,CAAC;YACjB,WAAW,CAAC,EAAE,MAAM,CAAC;YACrB,UAAU,CAAC,EAAE,MAAM,CAAC;YACpB,OAAO,CAAC,EAAE,MAAM,CAAC;SACpB;KACJ;CACJ"}

package/esm/dumpsys.js

@@ -1,4 +1,3 @@
-import { AdbServiceBase } from "@yume-chan/adb";
 const BatteryDumpFields = {
     "AC powered": { type: "boolean", field: "acPowered" },
     "USB powered": { type: "boolean", field: "usbPowered" },
@@ -43,13 +42,17 @@ const Battery = {
     Status,
     Health,
 };
-export class DumpSys extends AdbServiceBase {
+export class DumpSys {
     static Battery = Battery;
+    #adb;
+    constructor(adb) {
+        this.#adb = adb;
+    }
     async diskStats() {
-        const result = await this.adb.subprocess.noneProtocol.spawnWaitText([
-            "dumpsys",
-            "diskstats",
-        ]);
+        const result = await this.#adb.subprocess.noneProtocol
+            .spawn(["dumpsys", "diskstats"])
+            .wait()
+            .toString();
         function getSize(name) {
             const match = result.match(new RegExp(`${name}-Free: (\\d+)K / (\\d+)K`));
             if (!match) {
@@ -73,10 +76,10 @@ export class DumpSys extends AdbServiceBase {
         };
     }
     async battery() {
-        const result = await this.adb.subprocess.noneProtocol.spawnWaitText([
-            "dumpsys",
-            "battery",
-        ]);
+        const result = await this.#adb.subprocess.noneProtocol
+            .spawn(["dumpsys", "battery"])
+            .wait()
+            .toString();
         const info = {
             acPowered: false,
             usbPowered: false,

package/esm/dumpsys.js.map

@@ -1 +1 @@
-{"version":3,"file":"dumpsys.js","sourceRoot":"","sources":["../src/dumpsys.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"dumpsys.js","sourceRoot":"","sources":["../src/dumpsys.ts"],"names":[],"mappings":"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"}

package/esm/index.d.ts

@@ -1,7 +1,7 @@
 export * from "./am.js";
 export * from "./bu.js";
 export * from "./bug-report.js";
-export * from "./cmd.js";
+export * from "./cmd/index.js";
 export * from "./demo-mode.js";
 export * from "./dumpsys.js";
 export * from "./intent.js";

package/esm/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,iBAAiB,CAAC;AAChC,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,cAAc,SAAS,CAAC;AACxB,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,cAAc,SAAS,CAAC;AACxB,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC"}

package/esm/index.js

@@ -2,7 +2,7 @@
 export * from "./am.js";
 export * from "./bu.js";
 export * from "./bug-report.js";
-export * from "./cmd.js";
+export * from "./cmd/index.js";
 export * from "./demo-mode.js";
 export * from "./dumpsys.js";
 export * from "./intent.js";

package/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,wBAAwB;AAExB,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,iBAAiB,CAAC;AAChC,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,cAAc,SAAS,CAAC;AACxB,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,wBAAwB;AAExB,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,cAAc,SAAS,CAAC;AACxB,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC"}

package/esm/intent.d.ts

@@ -1,11 +1,39 @@
-export declare class IntentBuilder {
-    #private;
-    setAction(action: string): this;
-    addCategory(category: string): this;
-    setPackage(packageName: string): this;
-    setComponent(component: string): this;
-    setData(data: string): this;
-    addStringExtra(key: string, value: string): this;
-    build(): string[];
+export interface ComponentName {
+    packageName: string;
+    className: string;
 }
+export interface Intent {
+    action?: string | undefined;
+    data?: string | undefined;
+    type?: string | undefined;
+    identifier?: string | undefined;
+    categories?: string[] | undefined;
+    extras?: Record<string, string | null | number | bigint | Intent.Extra.String | ComponentName | Intent.Extra.NumberArray | Intent.Extra.StringArray | Intent.Extra.Number | boolean> | undefined;
+    flags?: number | undefined;
+    package?: string | undefined;
+    component?: ComponentName | undefined;
+}
+export declare namespace Intent {
+    namespace Extra {
+        interface Number {
+            type: "long" | "float" | "double";
+            value: number;
+        }
+        interface String {
+            type: "uri";
+            value: string;
+        }
+        interface NumberArray {
+            type: "array" | "arrayList";
+            itemType: "int" | Number["type"];
+            value: number[];
+        }
+        interface StringArray {
+            type: "array" | "arrayList";
+            itemType: "string";
+            value: string[];
+        }
+    }
+}
+export declare function serializeIntent(intent: Intent): string[];
 //# sourceMappingURL=intent.d.ts.map

package/esm/intent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"intent.d.ts","sourceRoot":"","sources":["../src/intent.ts"],"names":[],"mappings":"AAAA,qBAAa,aAAa;;IAStB,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAK/B,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAKnC,UAAU,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAKrC,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAKrC,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAK3B,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAKhD,KAAK,IAAI,MAAM,EAAE;CAiCpB"}
+{"version":3,"file":"intent.d.ts","sourceRoot":"","sources":["../src/intent.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,aAAa;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,MAAM;IACnB,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,UAAU,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAClC,MAAM,CAAC,EACD,MAAM,CACF,MAAM,EACJ,MAAM,GACN,IAAI,GACJ,MAAM,GACN,MAAM,GACN,MAAM,CAAC,KAAK,CAAC,MAAM,GACnB,aAAa,GACb,MAAM,CAAC,KAAK,CAAC,WAAW,GACxB,MAAM,CAAC,KAAK,CAAC,WAAW,GACxB,MAAM,CAAC,KAAK,CAAC,MAAM,GACnB,OAAO,CACZ,GACD,SAAS,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,SAAS,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;CACzC;AAED,yBAAiB,MAAM,CAAC;IACpB,UAAiB,KAAK,CAAC;QACnB,UAAiB,MAAM;YACnB,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAC;YAClC,KAAK,EAAE,MAAM,CAAC;SACjB;QAED,UAAiB,MAAM;YACnB,IAAI,EAAE,KAAK,CAAC;YACZ,KAAK,EAAE,MAAM,CAAC;SACjB;QAED,UAAiB,WAAW;YACxB,IAAI,EAAE,OAAO,GAAG,WAAW,CAAC;YAC5B,QAAQ,EAAE,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;YACjC,KAAK,EAAE,MAAM,EAAE,CAAC;SACnB;QAED,UAAiB,WAAW;YACxB,IAAI,EAAE,OAAO,GAAG,WAAW,CAAC;YAC5B,QAAQ,EAAE,QAAQ,CAAC;YACnB,KAAK,EAAE,MAAM,EAAE,CAAC;SACnB;KACJ;CACJ;AAqDD,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,YAgG7C"}

package/esm/intent.js

@@ -1,59 +1,122 @@
-export class IntentBuilder {
-    #action;
-    #categories = [];
-    #packageName;
-    #component;
-    #data;
-    #type;
-    #stringExtras = new Map();
-    setAction(action) {
-        this.#action = action;
-        return this;
-    }
-    addCategory(category) {
-        this.#categories.push(category);
-        return this;
-    }
-    setPackage(packageName) {
-        this.#packageName = packageName;
-        return this;
-    }
-    setComponent(component) {
-        this.#component = component;
-        return this;
-    }
-    setData(data) {
-        this.#data = data;
-        return this;
-    }
-    addStringExtra(key, value) {
-        this.#stringExtras.set(key, value);
-        return this;
-    }
-    build() {
-        const result = [];
-        if (this.#action) {
-            result.push("-a", this.#action);
-        }
-        for (const category of this.#categories) {
+// cspell: ignore eial
+// cspell: ignore elal
+// cspell: ignore efal
+// cspell: ignore esal
+// cspell: ignore edal
+function getNumberType(type) {
+    switch (type) {
+        case "int":
+            return "--ei";
+        case "long":
+            return "--el";
+        case "float":
+            return "--ef";
+        case "double":
+            return "--ed";
+        default:
+            throw new Error(`Unknown number type: ${type}`);
+    }
+}
+function serializeExtraArray(array) {
+    let type;
+    let value;
+    if (array.itemType === "string") {
+        type = "--es";
+        value = array.value
+            .map((item) => item.replaceAll(",", "\\,"))
+            .join(",");
+    }
+    else {
+        type = getNumberType(array.itemType);
+        value = array.value.join(",");
+    }
+    if (array.type === "array") {
+        type += "a";
+    }
+    else {
+        type += "al";
+    }
+    return [type, value];
+}
+function serializeString(result, key, value) {
+    // Treat empty string as not set
+    if (value) {
+        result.push(key, value);
+    }
+}
+export function serializeIntent(intent) {
+    const result = [];
+    serializeString(result, "-a", intent.action);
+    serializeString(result, "-d", intent.data);
+    serializeString(result, "-t", intent.type);
+    serializeString(result, "-i", intent.identifier);
+    if (intent.categories) {
+        for (const category of intent.categories) {
             result.push("-c", category);
         }
-        if (this.#packageName) {
-            result.push("-p", this.#packageName);
-        }
-        if (this.#component) {
-            result.push("-n", this.#component);
-        }
-        if (this.#data) {
-            result.push("-d", this.#data);
-        }
-        if (this.#type) {
-            result.push("-t", this.#type);
-        }
-        for (const [key, value] of this.#stringExtras) {
-            result.push("--es", key, value);
+    }
+    if (intent.extras) {
+        for (const [key, value] of Object.entries(intent.extras)) {
+            switch (typeof value) {
+                case "string":
+                    result.push("--es", key, value);
+                    break;
+                case "object":
+                    if (value === null) {
+                        result.push("--esn", key);
+                        break;
+                    }
+                    // `ComponentName`
+                    if ("packageName" in value) {
+                        result.push("--ecn", key, value.packageName + "/" + value.className);
+                        break;
+                    }
+                    switch (value.type) {
+                        case "uri":
+                            result.push("--eu", key, value.value);
+                            break;
+                        case "array":
+                        case "arrayList":
+                            {
+                                const [type, valueString] = serializeExtraArray(value);
+                                result.push(type, key, valueString);
+                            }
+                            break;
+                        default:
+                            result.push(getNumberType(value.type), key, value.value.toString());
+                            break;
+                    }
+                    break;
+                case "number":
+                    if (value % 1 !== 0) {
+                        throw new Error(`Extra \`${key}\` is not an integer, must use \`Intent.Extra.Number\` type instead`);
+                    }
+                    // Infer type from value
+                    if (value < -2147483648 || value > 2147483647) {
+                        result.push("--el", key, value.toString());
+                    }
+                    else {
+                        result.push("--ei", key, value.toString());
+                    }
+                    break;
+                case "bigint":
+                    result.push("--el", key, value.toString());
+                    break;
+                case "boolean":
+                    result.push("--ez", key, value ? "true" : "false");
+                    break;
+            }
         }
-        return result;
     }
+    if (intent.component) {
+        result.push("-n", intent.component.packageName + "/" + intent.component.className);
+    }
+    serializeString(result, "-p", intent.package);
+    // `0` is the default value for `flags` when deserializing
+    // so it can be omitted if it's either `undefined` or `0`
+    if (intent.flags) {
+        result.push("-f", intent.flags.toString());
+    }
+    return result;
 }
 //# sourceMappingURL=intent.js.map