@yume-chan/android-bin 0.0.21 → 0.0.23

package/esm/utils.js

@@ -0,0 +1,23 @@
+export function buildArguments(commands, options, map) {
+    const args = commands;
+    if (options) {
+        for (const [key, value] of Object.entries(options)) {
+            if (value) {
+                const option = map[key];
+                if (option) {
+                    args.push(option);
+                    switch (typeof value) {
+                        case "number":
+                            args.push(value.toString());
+                            break;
+                        case "string":
+                            args.push(value);
+                            break;
+                    }
+                }
+            }
+        }
+    }
+    return args;
+}
+//# sourceMappingURL=utils.js.map

package/esm/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,cAAc,CAC1B,QAAkB,EAClB,OAA+B,EAC/B,GAAqC;IAErC,MAAM,IAAI,GAAG,QAAQ,CAAC;IACtB,IAAI,OAAO,EAAE,CAAC;QACV,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YACjD,IAAI,KAAK,EAAE,CAAC;gBACR,MAAM,MAAM,GAAG,GAAG,CAAC,GAAc,CAAC,CAAC;gBACnC,IAAI,MAAM,EAAE,CAAC;oBACT,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;oBAClB,QAAQ,OAAO,KAAK,EAAE,CAAC;wBACnB,KAAK,QAAQ;4BACT,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;4BAC5B,MAAM;wBACV,KAAK,QAAQ;4BACT,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;4BACjB,MAAM;oBACd,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC;IACL,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yume-chan/android-bin",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "description": "Wrappers for Android built-in executables.",
   "keywords": [
     "adb",
@@ -25,26 +25,26 @@
   "main": "esm/index.js",
   "types": "esm/index.d.ts",
   "dependencies": {
-    "@yume-chan/adb": "^0.0.21",
-    "@yume-chan/stream-extra": "^0.0.21",
-    "@yume-chan/struct": "^0.0.21",
-    "tslib": "^2.6.0"
+    "@yume-chan/adb": "^0.0.23",
+    "@yume-chan/stream-extra": "^0.0.23",
+    "@yume-chan/struct": "^0.0.23",
+    "tslib": "^2.6.2"
   },
   "devDependencies": {
-    "@jest/globals": "^29.6.1",
+    "@jest/globals": "^30.0.0-alpha.3",
     "@yume-chan/eslint-config": "^1.0.0",
     "@yume-chan/tsconfig": "^1.0.0",
     "cross-env": "^7.0.3",
-    "eslint": "^8.44.0",
-    "jest": "^29.5.0",
-    "prettier": "^3.0.0",
-    "ts-jest": "^29.1.1",
-    "typescript": "^5.1.6"
+    "eslint": "^8.57.0",
+    "jest": "^30.0.0-alpha.3",
+    "prettier": "^3.2.5",
+    "ts-jest": "^29.1.2",
+    "typescript": "^5.4.2"
   },
   "scripts": {
     "build": "tsc -b tsconfig.build.json",
     "build:watch": "tsc -b tsconfig.build.json",
-    "test": "cross-env NODE_OPTIONS=--experimental-vm-modules jest --coverage",
+    "test": "cross-env NODE_OPTIONS=\"--experimental-vm-modules --no-warnings\" TS_JEST_DISABLE_VER_CHECKER=true jest --coverage",
     "lint": "eslint src/**/*.ts --fix && prettier src/**/*.ts --write --tab-width 4"
   }
 }

package/src/am.ts

@@ -0,0 +1,69 @@
+import type { Adb } from "@yume-chan/adb";
+import { AdbCommandBase } from "@yume-chan/adb";
+import { ConcatStringStream, DecodeUtf8Stream } from "@yume-chan/stream-extra";
+
+import { Cmd } from "./cmd.js";
+import type { IntentBuilder } from "./intent.js";
+import type { SingleUser } from "./utils.js";
+import { buildArguments } from "./utils.js";
+
+export interface ActivityManagerStartActivityOptions {
+    displayId?: number;
+    windowingMode?: number;
+    forceStop?: boolean;
+    user?: SingleUser;
+    intent: IntentBuilder;
+}
+
+const START_ACTIVITY_OPTIONS_MAP: Partial<
+    Record<keyof ActivityManagerStartActivityOptions, string>
+> = {
+    displayId: "--display",
+    windowingMode: "--windowingMode",
+    forceStop: "-S",
+    user: "--user",
+};
+
+export class ActivityManager extends AdbCommandBase {
+    #cmd: Cmd;
+
+    constructor(adb: Adb) {
+        super(adb);
+        this.#cmd = new Cmd(adb);
+    }
+
+    async #cmdOrSubprocess(args: string[]) {
+        if (this.#cmd.supportsCmd) {
+            args.shift();
+            return await this.#cmd.spawn(false, "activity", ...args);
+        }
+
+        return this.adb.subprocess.spawn(args);
+    }
+
+    async startActivity(options: ActivityManagerStartActivityOptions) {
+        let args = buildArguments(
+            ["am", "start-activity", "-W"],
+            options,
+            START_ACTIVITY_OPTIONS_MAP,
+        );
+
+        args = args.concat(options.intent.build());
+
+        const process = await this.#cmdOrSubprocess(args);
+
+        const output = await process.stdout
+            .pipeThrough(new DecodeUtf8Stream())
+            .pipeThrough(new ConcatStringStream())
+            .then((output) => output.trim());
+
+        for (const line of output) {
+            if (line.startsWith("Error:")) {
+                throw new Error(line.substring("Error:".length).trim());
+            }
+            if (line === "Complete") {
+                return;
+            }
+        }
+    }
+}

package/src/cmd.ts

@@ -35,10 +35,10 @@ export class Cmd extends AdbCommandBase {
 
     constructor(adb: Adb) {
         super(adb);
-        this.#supportsShellV2 = adb.supportsFeature(AdbFeature.ShellV2);
-        this.#supportsCmd = adb.supportsFeature(AdbFeature.Cmd);
-        this.#supportsAbb = adb.supportsFeature(AdbFeature.Abb);
-        this.#supportsAbbExec = adb.supportsFeature(AdbFeature.AbbExec);
+        this.#supportsShellV2 = adb.canUseFeature(AdbFeature.ShellV2);
+        this.#supportsCmd = adb.canUseFeature(AdbFeature.Cmd);
+        this.#supportsAbb = adb.canUseFeature(AdbFeature.Abb);
+        this.#supportsAbbExec = adb.canUseFeature(AdbFeature.AbbExec);
     }
 
     async spawn(

package/src/dumpsys.ts

@@ -47,7 +47,9 @@ export class DumpSys extends AdbCommandBase {
         let scale: number | undefined;
         let voltage: number | undefined;
         let current: number | undefined;
-        for (const line of output) {
+        let status: DumpSys.Battery.Status | undefined;
+        let health: DumpSys.Battery.Health | undefined;
+        for (const line of output.split("\n")) {
             const parts = line.split(":");
             if (parts.length !== 2) {
                 continue;
@@ -75,6 +77,18 @@ export class DumpSys extends AdbCommandBase {
                 case "current now":
                     current = Number.parseInt(parts[1]!.trim(), 10);
                     break;
+                case "status":
+                    status = Number.parseInt(
+                        parts[1]!.trim(),
+                        10,
+                    ) as DumpSys.Battery.Status;
+                    break;
+                case "health":
+                    health = Number.parseInt(
+                        parts[1]!.trim(),
+                        10,
+                    ) as DumpSys.Battery.Health;
+                    break;
             }
         }
 
@@ -86,6 +100,30 @@ export class DumpSys extends AdbCommandBase {
             scale,
             voltage,
             current,
+            status,
+            health,
         };
     }
 }
+
+export namespace DumpSys {
+    export namespace Battery {
+        export enum Status {
+            Unknown = 1,
+            Charging,
+            Discharging,
+            NotCharging,
+            Full,
+        }
+
+        export enum Health {
+            Unknown = 1,
+            Good,
+            Overheat,
+            Dead,
+            OverVoltage,
+            UnspecifiedFailure,
+            Cold,
+        }
+    }
+}

package/src/index.ts

@@ -1,11 +1,14 @@
 // cspell: ignore logcat
 
+export * from "./am.js";
 export * from "./bu.js";
 export * from "./bug-report.js";
 export * from "./cmd.js";
 export * from "./demo-mode.js";
 export * from "./dumpsys.js";
+export * from "./intent.js";
 export * from "./logcat.js";
 export * from "./overlay-display.js";
 export * from "./pm.js";
 export * from "./settings.js";
+export * from "./string-format.js";

package/src/intent.ts

@@ -0,0 +1,63 @@
+export class IntentBuilder {
+    #action: string | undefined;
+    #categories: string[] = [];
+    #packageName: string | undefined;
+    #component: string | undefined;
+    #data: string | undefined;
+    #type: string | undefined;
+
+    setAction(action: string): this {
+        this.#action = action;
+        return this;
+    }
+
+    addCategory(category: string): this {
+        this.#categories.push(category);
+        return this;
+    }
+
+    setPackage(packageName: string): this {
+        this.#packageName = packageName;
+        return this;
+    }
+
+    setComponent(component: string): this {
+        this.#component = component;
+        return this;
+    }
+
+    setData(data: string): this {
+        this.#data = data;
+        return this;
+    }
+
+    build(): string[] {
+        const result: string[] = [];
+
+        if (this.#action) {
+            result.push("-a", this.#action);
+        }
+
+        for (const category of this.#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);
+        }
+
+        return result;
+    }
+}

package/src/logcat.ts

@@ -384,7 +384,7 @@ export interface LogSize {
 
 export class Logcat extends AdbCommandBase {
     static logIdToName(id: LogId): string {
-        return LogId[id]!;
+        return LogId[id];
     }
 
     static logNameToId(name: string): LogId {
@@ -471,11 +471,12 @@ export class Logcat extends AdbCommandBase {
     }
 
     async clear(ids?: LogId[]) {
-        await this.adb.subprocess.spawnAndWait([
-            "logcat",
-            "-c",
-            ...(ids ? ["-b", Logcat.joinLogId(ids)] : []),
-        ]);
+        const args = ["logcat", "-c"];
+        if (ids && ids.length > 0) {
+            args.push("-b", Logcat.joinLogId(ids));
+        }
+
+        await this.adb.subprocess.spawnAndWait(args);
     }
 
     binary(options?: LogcatOptions): ReadableStream<AndroidLogEntry> {