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

package/esm/settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"settings.js","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"settings.js","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AAKrC,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC7B,iBAAiB,EAAE,oBAAoB;IACvC,cAAc,EAAE,iBAAiB;IACjC,eAAe,EAAE,kBAAkB;CAC7B,CAAC;AAcX,oGAAoG;AACpG,MAAM,OAAO,QAAQ;IACjB,MAAM,CAAC,WAAW,GAAG,UAAU,CAAC;IAChC,MAAM,CAAC,WAAW,GAAG,UAAU,CAAC;IAEvB,IAAI,CAA0B;IAEvC,YAAY,GAAQ;QAChB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,kBAAkB,CAAC,GAAG,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC;IAClE,CAAC;IAED,IAAI,CACA,IAAY,EACZ,SAA4B,EAC5B,OAAoC,EACpC,GAAG,IAAc;QAEjB,MAAM,OAAO,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAEvC,IAAI,OAAO,EAAE,IAAI,KAAK,SAAS,EAAE,CAAC;YAC9B,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QACpD,CAAC;QAED,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAE9B,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACrB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACtB,CAAC;QAED,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,GAAG,CACL,SAA4B,EAC5B,GAAW,EACX,OAAyB;QAEzB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;QAC/D,iBAAiB;QACjB,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,MAAM,CACR,SAA4B,EAC5B,GAAW,EACX,OAAyB;QAEzB,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,GAAG,CACL,SAA4B,EAC5B,GAAW,EACX,KAAa,EACb,OAA4B;QAE5B,MAAM,IAAI,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC1B,IAAI,OAAO,EAAE,GAAG,EAAE,CAAC;YACf,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC3B,CAAC;QACD,IAAI,OAAO,EAAE,WAAW,EAAE,CAAC;YACvB,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACzB,CAAC;QACD,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IACxD,CAAC;IAaD,KAAK,CAAC,KAAK,CACP,SAA4B,EAC5B,iBAAyB,EACzB,YAAuC,EACvC,OAAyB;QAEzB,MAAM,IAAI,GAAG,CAAC,iBAAiB,CAAC,CAAC;QACjC,IACI,iBAAiB,KAAK,iBAAiB,CAAC,iBAAiB;YACzD,iBAAiB,KAAK,iBAAiB,CAAC,cAAc;YACtD,iBAAiB,KAAK,iBAAiB,CAAC,eAAe,EACzD,CAAC;YACC,OAAO,GAAG,YAA+B,CAAC;QAC9C,CAAC;aAAM,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE,CAAC;YAC1C,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC5B,CAAC;QACD,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IAC1D,CAAC"}

package/esm/utils.d.ts

@@ -1,4 +1,7 @@
-export declare function buildArguments<T>(commands: readonly string[], options: Partial<T> | undefined, map: Partial<Record<keyof T, string>>): string[];
+export declare function buildCommand<T>(commands: readonly string[], options: Partial<T> | undefined, map: Partial<Record<keyof T, string>>): string[];
 export type SingleUser = number | "current";
 export type SingleUserOrAll = SingleUser | "all";
+export type Optional<T extends object> = {
+    [K in keyof T]?: T[K] | undefined;
+};
 //# sourceMappingURL=utils.d.ts.map

package/esm/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,wBAAgB,cAAc,CAAC,CAAC,EAC5B,QAAQ,EAAE,SAAS,MAAM,EAAE,EAC3B,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,SAAS,EAC/B,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,GACtC,MAAM,EAAE,CAqBV;AAED,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,SAAS,CAAC;AAC5C,MAAM,MAAM,eAAe,GAAG,UAAU,GAAG,KAAK,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,wBAAgB,YAAY,CAAC,CAAC,EAC1B,QAAQ,EAAE,SAAS,MAAM,EAAE,EAC3B,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,SAAS,EAC/B,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,GACtC,MAAM,EAAE,CAoCV;AAED,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,SAAS,CAAC;AAC5C,MAAM,MAAM,eAAe,GAAG,UAAU,GAAG,KAAK,CAAC;AAEjD,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS,MAAM,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS;CAAE,CAAC"}

package/esm/utils.js

@@ -1,20 +1,31 @@
-export function buildArguments(commands, options, map) {
+export function buildCommand(commands, options, map) {
     const args = commands.slice();
     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;
+            if (value === undefined || value === null) {
+                continue;
+            }
+            const option = map[key];
+            // Empty string means positional argument,
+            // they must be added at the end,
+            // so let the caller handle it.
+            if (option === undefined || option === "") {
+                continue;
+            }
+            switch (typeof value) {
+                case "boolean":
+                    if (value) {
+                        args.push(option);
                     }
-                }
+                    break;
+                case "number":
+                    args.push(option, value.toString());
+                    break;
+                case "string":
+                    args.push(option, value);
+                    break;
+                default:
+                    throw new Error(`Unsupported type for option ${key}: ${typeof value}`);
             }
         }
     }

package/esm/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,cAAc,CAC1B,QAA2B,EAC3B,OAA+B,EAC/B,GAAqC;IAErC,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,EAAE,CAAC;IAC9B,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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,YAAY,CACxB,QAA2B,EAC3B,OAA+B,EAC/B,GAAqC;IAErC,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,EAAE,CAAC;IAC9B,IAAI,OAAO,EAAE,CAAC;QACV,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YACjD,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACxC,SAAS;YACb,CAAC;YAED,MAAM,MAAM,GAAG,GAAG,CAAC,GAAc,CAAC,CAAC;YACnC,0CAA0C;YAC1C,iCAAiC;YACjC,+BAA+B;YAC/B,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,EAAE,EAAE,CAAC;gBACxC,SAAS;YACb,CAAC;YAED,QAAQ,OAAO,KAAK,EAAE,CAAC;gBACnB,KAAK,SAAS;oBACV,IAAI,KAAK,EAAE,CAAC;wBACR,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;oBACtB,CAAC;oBACD,MAAM;gBACV,KAAK,QAAQ;oBACT,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;oBACpC,MAAM;gBACV,KAAK,QAAQ;oBACT,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;oBACzB,MAAM;gBACV;oBACI,MAAM,IAAI,KAAK,CACX,+BAA+B,GAAG,KAAK,OAAO,KAAK,EAAE,CACxD,CAAC;YACV,CAAC;QACL,CAAC;IACL,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yume-chan/android-bin",
-  "version": "2.1.0",
+  "version": "3.0.0-beta.0",
   "description": "Wrappers for Android built-in executables.",
   "keywords": [
     "adb",
@@ -26,20 +26,20 @@
   "types": "esm/index.d.ts",
   "sideEffects": false,
   "dependencies": {
-    "@yume-chan/stream-extra": "^2.1.0",
-    "@yume-chan/struct": "^2.0.1",
-    "@yume-chan/adb": "^2.1.0"
+    "@yume-chan/adb": "3.0.0-beta.0",
+    "@yume-chan/stream-extra": "3.0.0-beta.0",
+    "@yume-chan/struct": "3.0.0-beta.0"
   },
   "devDependencies": {
-    "@types/node": "^24.0.1",
-    "prettier": "^3.5.3",
-    "typescript": "^5.8.3",
-    "@yume-chan/test-runner": "^1.0.0",
+    "@types/node": "^26.0.0",
+    "prettier": "^3.8.4",
+    "typescript": "^6.0.3",
     "@yume-chan/eslint-config": "^1.0.0",
+    "@yume-chan/test-runner": "^1.0.0",
     "@yume-chan/tsconfig": "^1.0.0"
   },
   "scripts": {
-    "build": "tsc -b tsconfig.build.json",
+    "build": "tsc -p tsconfig.build.json",
     "lint": "run-eslint && prettier src/**/*.ts --write --tab-width 4",
     "test": "run-test"
   }

package/src/am.ts

@@ -1,21 +1,15 @@
-import type { Adb } from "@yume-chan/adb";
-import { AdbServiceBase } from "@yume-chan/adb";
-
-import { CmdNoneProtocolService } 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;
-}
+import type { Adb, AdbNoneProtocolProcess } from "@yume-chan/adb";
+import { escapeArg } from "@yume-chan/adb";
+import { SplitStringStream, TextDecoderStream } from "@yume-chan/stream-extra";
+
+import { Cmd } from "./cmd/index.js";
+import type { Intent } from "./intent.js";
+import { serializeIntent } from "./intent.js";
+import type { SingleUser, SingleUserOrAll } from "./utils.js";
+import { buildCommand } from "./utils.js";
 
 const START_ACTIVITY_OPTIONS_MAP: Partial<
-    Record<keyof ActivityManagerStartActivityOptions, string>
+    Record<keyof ActivityManager.StartActivityOptions, string>
 > = {
     displayId: "--display",
     windowingMode: "--windowingMode",
@@ -23,42 +17,108 @@ const START_ACTIVITY_OPTIONS_MAP: Partial<
     user: "--user",
 };
 
-export class ActivityManager extends AdbServiceBase {
-    static ServiceName = "activity";
-    static CommandName = "am";
+export class ActivityManager {
+    static readonly ServiceName = "activity";
+    static readonly CommandName = "am";
 
-    #cmd: CmdNoneProtocolService;
+    readonly #adb: Adb;
 
-    constructor(adb: Adb) {
-        super(adb);
-        this.#cmd = new CmdNoneProtocolService(
-            adb,
-            ActivityManager.CommandName,
-        );
+    #apiLevel: number | undefined;
+    #cmd: Cmd.NoneProtocolService;
+
+    constructor(adb: Adb, apiLevel?: number) {
+        this.#adb = adb;
+        this.#apiLevel = apiLevel;
+        this.#cmd = Cmd.createNoneProtocol(adb, ActivityManager.CommandName);
     }
 
     async startActivity(
-        options: ActivityManagerStartActivityOptions,
+        options: ActivityManager.StartActivityOptions,
     ): Promise<void> {
-        let args = buildArguments(
-            [ActivityManager.ServiceName, "start-activity", "-W"],
+        // Android 8 added "start-activity" alias to "start"
+        // but we want to use the most compatible one.
+        const command = buildCommand(
+            [ActivityManager.ServiceName, "start", "-W"],
             options,
             START_ACTIVITY_OPTIONS_MAP,
         );
 
-        args = args.concat(options.intent.build());
+        for (const arg of serializeIntent(options.intent)) {
+            command.push(arg);
+        }
 
-        const output = await this.#cmd
-            .spawnWaitText(args)
-            .then((output) => output.trim());
+        // Android 7 supports `cmd activity` but not `cmd activity start` command
+        let process: AdbNoneProtocolProcess;
+        if (this.#apiLevel !== undefined && this.#apiLevel <= 25) {
+            command[0] = ActivityManager.CommandName;
+            process = await this.#adb.subprocess.noneProtocol.spawn(
+                command.map(escapeArg),
+            );
+        } else {
+            process = await this.#cmd.spawn(command);
+        }
 
-        for (const line of output) {
+        const lines = process.output
+            .pipeThrough(new TextDecoderStream())
+            .pipeThrough(new SplitStringStream("\n", { trim: true }));
+
+        for await (const line of lines) {
             if (line.startsWith("Error:")) {
+                // Exit from the `for await` loop will cancel `lines`,
+                // and subsequently, `process`, which is fine, as the work is already done
                 throw new Error(line.substring("Error:".length).trim());
             }
+
             if (line === "Complete") {
+                // Same as above
                 return;
             }
         }
+
+        // Ensure the subprocess exits before returning
+        await process.exited;
+    }
+
+    async broadcast(
+        intent: Intent,
+        options?: { user?: SingleUserOrAll; receiverPermission?: string },
+    ) {
+        const command = [ActivityManager.ServiceName, "broadcast"];
+
+        if (options) {
+            if (options.user !== undefined) {
+                command.push("--user", options.user.toString());
+            }
+            if (options.receiverPermission) {
+                command.push(
+                    "--receiver-permission",
+                    options.receiverPermission,
+                );
+            }
+        }
+
+        for (const arg of serializeIntent(intent)) {
+            command.push(arg);
+        }
+
+        // Android 7 supports `cmd activity` but not `cmd activity broadcast` command
+        if (this.#apiLevel !== undefined && this.#apiLevel <= 25) {
+            command[0] = ActivityManager.CommandName;
+            await this.#adb.subprocess.noneProtocol
+                .spawn(command.map(escapeArg))
+                .wait();
+        } else {
+            await this.#cmd.spawn(command).wait();
+        }
+    }
+}
+
+export namespace ActivityManager {
+    export interface StartActivityOptions {
+        displayId?: number;
+        windowingMode?: number;
+        forceStop?: boolean;
+        user?: SingleUser;
+        intent: Intent;
     }
 }

package/src/bu.ts

@@ -1,28 +1,18 @@
-import { AdbServiceBase } from "@yume-chan/adb";
+import type { Adb } from "@yume-chan/adb";
 import type { MaybeConsumable, ReadableStream } from "@yume-chan/stream-extra";
 
-export interface AdbBackupOptions {
-    user: number;
-    saveSharedStorage?: boolean;
-    saveWidgets?: boolean;
-    packages: readonly string[] | "user" | "all";
-    savePackageApk: boolean;
-    savePackageObb: boolean;
-    savePackageKeyValue: boolean;
-    compress: boolean;
-}
+export class AdbBackup {
+    readonly #adb: Adb;
 
-export interface AdbRestoreOptions {
-    user: number;
-    file: ReadableStream<MaybeConsumable<Uint8Array>>;
-}
+    constructor(adb: Adb) {
+        this.#adb = adb;
+    }
 
-export class AdbBackup extends AdbServiceBase {
     /**
      * User must confirm backup on device within 60 seconds.
      */
     async backup(
-        options: AdbBackupOptions,
+        options: AdbBackup.BackupOptions,
     ): Promise<ReadableStream<Uint8Array>> {
         const args = ["bu", "backup"];
 
@@ -54,7 +44,7 @@ export class AdbBackup extends AdbServiceBase {
             args.push(...options.packages);
         }
 
-        const process = await this.adb.subprocess.noneProtocol.spawn(args);
+        const process = await this.#adb.subprocess.noneProtocol.spawn(args);
         return process.output;
     }
 
@@ -62,11 +52,32 @@ export class AdbBackup extends AdbServiceBase {
      * User must enter the password (if any) and
      * confirm restore on device within 60 seconds.
      */
-    restore(options: AdbRestoreOptions): Promise<string> {
+    restore(options: AdbBackup.RestoreOptions): Promise<string> {
         const args = ["bu", "restore"];
         if (options.user !== undefined) {
             args.push("--user", options.user.toString());
         }
-        return this.adb.subprocess.noneProtocol.spawnWaitText(args);
+        return this.#adb.subprocess.noneProtocol
+            .spawn(args)
+            .wait({ stdin: options.file })
+            .toString();
+    }
+}
+
+export namespace AdbBackup {
+    export interface BackupOptions {
+        user?: number | undefined;
+        saveSharedStorage?: boolean | undefined;
+        saveWidgets?: boolean | undefined;
+        packages: readonly string[] | "user" | "all";
+        savePackageApk: boolean;
+        savePackageObb: boolean;
+        savePackageKeyValue: boolean;
+        compress: boolean;
+    }
+
+    export interface RestoreOptions {
+        user?: number | undefined;
+        file: ReadableStream<MaybeConsumable<Uint8Array>>;
     }
 }

package/src/bug-report.ts

@@ -1,8 +1,7 @@
 // cspell: ignore bugreport
 // cspell: ignore bugreportz
 
-import type { Adb, AdbSync } from "@yume-chan/adb";
-import { AdbServiceBase } from "@yume-chan/adb";
+import type { Adb } from "@yume-chan/adb";
 import type { AbortSignal, ReadableStream } from "@yume-chan/stream-extra";
 import {
     AbortController,
@@ -13,25 +12,7 @@ import {
     WritableStream,
 } from "@yume-chan/stream-extra";
 
-export interface BugReportCapabilities {
-    supportsBugReport: boolean;
-    bugReportZVersion?: string | undefined;
-    supportsBugReportZ: boolean;
-    supportsBugReportZProgress: boolean;
-    supportsBugReportZStream: boolean;
-}
-
-export interface BugReportZOptions {
-    signal?: AbortSignal;
-    /**
-     * A callback that will be called when progress is updated.
-     *
-     * Specify `onProgress` when `supportsBugReportZProgress` is `false` will throw an error.
-     */
-    onProgress?: ((completed: string, total: string) => void) | undefined;
-}
-
-export class BugReport extends AdbServiceBase {
+export class BugReport {
     static VERSION_REGEX: RegExp = /(\d+)\.(\d+)/;
 
     static BEGIN_REGEX: RegExp = /BEGIN:(.*)/;
@@ -57,10 +38,10 @@ export class BugReport extends AdbServiceBase {
             });
         }
 
-        const result = await adb.subprocess.shellProtocol.spawnWaitText([
-            "bugreportz",
-            "-v",
-        ]);
+        const result = await adb.subprocess.shellProtocol
+            .spawn(["bugreportz", "-v"])
+            .wait()
+            .toString();
         if (result.exitCode !== 0 || result.stderr === "") {
             return new BugReport(adb, {
                 supportsBugReport: true,
@@ -95,6 +76,8 @@ export class BugReport extends AdbServiceBase {
         });
     }
 
+    readonly #adb: Adb;
+
     #supportsBugReport: boolean;
     /**
      * Gets whether the device supports flat (text file, non-zipped) bugreport.
@@ -145,8 +128,8 @@ export class BugReport extends AdbServiceBase {
         return this.#supportsBugReportZStream;
     }
 
-    constructor(adb: Adb, capabilities: BugReportCapabilities) {
-        super(adb);
+    constructor(adb: Adb, capabilities: BugReport.Capabilities) {
+        this.#adb = adb;
 
         this.#supportsBugReport = capabilities.supportsBugReport;
         this.#bugReportZVersion = capabilities.bugReportZVersion;
@@ -171,7 +154,7 @@ export class BugReport extends AdbServiceBase {
         return new WrapReadableStream(async () => {
             // https://cs.android.com/android/platform/superproject/+/master:frameworks/native/cmds/bugreport/bugreport.cpp;drc=9b73bf07d73dbab5b792632e1e233edbad77f5fd;bpv=0;bpt=0
             const process =
-                await this.adb.subprocess.noneProtocol.spawn("bugreport");
+                await this.#adb.subprocess.noneProtocol.spawn("bugreport");
             return process.output;
         });
     }
@@ -184,7 +167,7 @@ export class BugReport extends AdbServiceBase {
      *
      * @returns The path to the generated bugreport file on device filesystem.
      */
-    async bugReportZ(options?: BugReportZOptions): Promise<string> {
+    async bugReportZ(options?: BugReport.BugReportZOptions): Promise<string> {
         if (options?.signal?.aborted) {
             throw options?.signal.reason as Error;
         }
@@ -202,7 +185,7 @@ export class BugReport extends AdbServiceBase {
         }
 
         // `subprocess.shellProtocol` must be defined when `this.#supportsBugReportZ` is `true`
-        const process = await this.adb.subprocess.shellProtocol!.spawn(args);
+        const process = await this.#adb.subprocess.shellProtocol!.spawn(args);
 
         options?.signal?.addEventListener("abort", () => {
             void process.kill();
@@ -211,10 +194,10 @@ export class BugReport extends AdbServiceBase {
         let filename: string | undefined;
         let error: string | undefined;
 
-        for await (const line of process.stdout
+        const lines = process.stdout
             .pipeThrough(new TextDecoderStream())
-            // Each chunk should contain one or several full lines
-            .pipeThrough(new SplitStringStream("\n"))) {
+            .pipeThrough(new SplitStringStream("\n", { trim: true }));
+        for await (const line of lines) {
             // `BEGIN:` and `PROGRESS:` only appear when `-p` is specified.
             let match = line.match(BugReport.PROGRESS_REGEX);
             if (match) {
@@ -258,10 +241,10 @@ export class BugReport extends AdbServiceBase {
      */
     bugReportZStream(): ReadableStream<Uint8Array> {
         return new PushReadableStream(async (controller) => {
-            const process = await this.adb.subprocess.shellProtocol!.spawn([
-                "bugreportz",
-                "-s",
-            ]);
+            const process = await this.#adb.subprocess.shellProtocol!.spawn(
+                ["bugreportz", "-s"],
+                controller.abortSignal,
+            );
             process.stdout
                 .pipeTo(
                     new WritableStream({
@@ -310,13 +293,11 @@ export class BugReport extends AdbServiceBase {
 
         if (this.#supportsBugReportZ) {
             let path: string | undefined;
-            let sync: AdbSync | undefined;
             const controller = new AbortController();
             const cleanup = async () => {
                 controller.abort();
-                await sync?.dispose();
                 if (path) {
-                    await this.adb.rm(path);
+                    await this.#adb.rm(path);
                 }
             };
 
@@ -330,8 +311,7 @@ export class BugReport extends AdbServiceBase {
                                 ? onProgress
                                 : undefined,
                         });
-                        sync = await this.adb.sync();
-                        return sync.read(path);
+                        return this.#adb.sync.read(path);
                     },
                     cancel: cleanup,
                     close: cleanup,
@@ -342,3 +322,23 @@ export class BugReport extends AdbServiceBase {
         return { type: "bugreport", stream: this.bugReport() };
     }
 }
+
+export namespace BugReport {
+    export interface Capabilities {
+        supportsBugReport: boolean;
+        bugReportZVersion?: string | undefined;
+        supportsBugReportZ: boolean;
+        supportsBugReportZProgress: boolean;
+        supportsBugReportZStream: boolean;
+    }
+
+    export interface BugReportZOptions {
+        signal?: AbortSignal;
+        /**
+         * A callback that will be called when progress is updated.
+         *
+         * Specify `onProgress` when `supportsBugReportZProgress` is `false` will throw an error.
+         */
+        onProgress?: ((completed: string, total: string) => void) | undefined;
+    }
+}

package/src/cmd/index.ts

@@ -0,0 +1 @@
+export * from "./service.js";

package/src/cmd/none.ts

@@ -0,0 +1,62 @@
+import type { Adb } from "@yume-chan/adb";
+import {
+    AdbFeature,
+    AdbNoneProtocolProcessImpl,
+    adbNoneProtocolSpawner,
+    escapeArg,
+} from "@yume-chan/adb";
+
+import { Cmd } from "./service.js";
+import { checkCommand, resolveFallback, serializeAbbService } from "./utils.js";
+
+export function createNoneProtocol(
+    adb: Adb,
+    fallback: NonNullable<Cmd.Fallback>,
+): Cmd.NoneProtocolService;
+export function createNoneProtocol(
+    adb: Adb,
+    fallback?: Cmd.Fallback,
+): Cmd.NoneProtocolService | undefined;
+export function createNoneProtocol(
+    adb: Adb,
+    fallback?: Cmd.Fallback,
+): Cmd.NoneProtocolService | undefined {
+    if (adb.canUseFeature(AdbFeature.AbbExec)) {
+        return {
+            mode: Cmd.Mode.Abb,
+            spawn: adbNoneProtocolSpawner(async (command, signal) => {
+                const service = serializeAbbService("abb_exec", command);
+                const socket = await adb.createSocket(service);
+                return new AdbNoneProtocolProcessImpl(socket, signal);
+            }),
+        };
+    }
+
+    if (adb.canUseFeature(AdbFeature.Cmd)) {
+        return {
+            mode: Cmd.Mode.Cmd,
+            spawn: adbNoneProtocolSpawner(async (command, signal) => {
+                checkCommand(command);
+
+                const newCommand = command.map(escapeArg);
+                newCommand.unshift("cmd");
+                return adb.subprocess.noneProtocol.spawn(newCommand, signal);
+            }),
+        };
+    }
+
+    if (fallback) {
+        return {
+            mode: Cmd.Mode.Fallback,
+            spawn: adbNoneProtocolSpawner(async (command, signal) => {
+                checkCommand(command);
+
+                const newCommand = command.map(escapeArg);
+                newCommand[0] = resolveFallback(fallback, command[0]!);
+                return adb.subprocess.noneProtocol.spawn(newCommand, signal);
+            }),
+        };
+    }
+
+    return undefined;
+}

package/src/cmd/service.ts

@@ -0,0 +1,54 @@
+import type {
+    Adb,
+    AdbNoneProtocolSpawner,
+    AdbShellProtocolSpawner,
+} from "@yume-chan/adb";
+
+import { createNoneProtocol } from "./none.js";
+import { createShellProtocol } from "./shell.js";
+
+export class Cmd {
+    static readonly Mode = {
+        Abb: 0,
+        Cmd: 1,
+        Fallback: 2,
+    } as const;
+
+    static readonly createNoneProtocol = createNoneProtocol;
+    static readonly createShellProtocol = createShellProtocol;
+
+    #noneProtocol: Cmd.NoneProtocolService | undefined;
+    get noneProtocol() {
+        return this.#noneProtocol;
+    }
+
+    #shellProtocol: Cmd.ShellProtocolService | undefined;
+    get shellProtocol() {
+        return this.#shellProtocol;
+    }
+
+    constructor(adb: Adb, fallback?: Cmd.Fallback) {
+        this.#noneProtocol = createNoneProtocol(adb, fallback);
+        this.#shellProtocol = createShellProtocol(adb, fallback);
+    }
+}
+
+export namespace Cmd {
+    export type Fallback =
+        | string
+        | Record<string, string>
+        | ((service: string) => string)
+        | undefined;
+
+    export type Mode = (typeof Cmd.Mode)[keyof typeof Cmd.Mode];
+
+    export interface NoneProtocolService {
+        mode: Mode;
+        spawn: AdbNoneProtocolSpawner;
+    }
+
+    export interface ShellProtocolService {
+        mode: Mode;
+        spawn: AdbShellProtocolSpawner;
+    }
+}