@yume-chan/android-bin 1.1.0 → 2.0.0

package/src/pm.ts

@@ -4,7 +4,7 @@
 // cspell:ignore versioncode
 
 import type { Adb } from "@yume-chan/adb";
-import { AdbCommandBase, escapeArg } from "@yume-chan/adb";
+import { AdbServiceBase } from "@yume-chan/adb";
 import type { MaybeConsumable, ReadableStream } from "@yume-chan/stream-extra";
 import {
     ConcatStringStream,
@@ -12,7 +12,7 @@ import {
     TextDecoderStream,
 } from "@yume-chan/stream-extra";
 
-import { Cmd } from "./cmd.js";
+import { CmdNoneProtocolService } from "./cmd.js";
 import type { IntentBuilder } from "./intent.js";
 import type { SingleUserOrAll } from "./utils.js";
 import { buildArguments } from "./utils.js";
@@ -260,7 +260,7 @@ function buildInstallArguments(
     options: Partial<PackageManagerInstallOptions> | undefined,
 ): string[] {
     const args = buildArguments(
-        ["pm", command],
+        [PackageManager.ServiceName, command],
         options,
         PACKAGE_MANAGER_INSTALL_OPTIONS_MAP,
     );
@@ -281,12 +281,15 @@ function buildInstallArguments(
     return args;
 }
 
-export class PackageManager extends AdbCommandBase {
-    #cmd: Cmd;
+export class PackageManager extends AdbServiceBase {
+    static ServiceName = "package";
+    static CommandName = "pm";
+
+    #cmd: CmdNoneProtocolService;
 
     constructor(adb: Adb) {
         super(adb);
-        this.#cmd = new Cmd(adb);
+        this.#cmd = new CmdNoneProtocolService(adb, PackageManager.CommandName);
     }
 
     /**
@@ -299,20 +302,39 @@ export class PackageManager extends AdbCommandBase {
         options?: Partial<PackageManagerInstallOptions>,
     ): Promise<string> {
         const args = buildInstallArguments("install", options);
+        args[0] = PackageManager.CommandName;
         // WIP: old version of pm doesn't support multiple apks
         args.push(...apks);
-        return await this.adb.subprocess.spawnAndWaitLegacy(args);
+
+        // Starting from Android 7, `pm` becomes a wrapper to `cmd package`.
+        // The benefit of `cmd package` is it starts faster than the old `pm`,
+        // because it connects to the already running `system` process,
+        // instead of initializing all system components from scratch.
+        //
+        // But launching `cmd package` directly causes it to not be able to
+        // read files in `/data/local/tmp` (and many other places) due to SELinux policies,
+        // so installing files must still use `pm`.
+        // (the starting executable file decides which SELinux policies to apply)
+        const output = await this.adb.subprocess.noneProtocol
+            .spawnWaitText(args)
+            .then((output) => output.trim());
+
+        if (output !== "Success") {
+            throw new Error(output);
+        }
+
+        return output;
     }
 
     async pushAndInstallStream(
         stream: ReadableStream<MaybeConsumable<Uint8Array>>,
         options?: Partial<PackageManagerInstallOptions>,
-    ): Promise<void> {
-        const sync = await this.adb.sync();
-
+    ): Promise<string> {
         const fileName = Math.random().toString().substring(2);
         const filePath = `/data/local/tmp/${fileName}.apk`;
 
+        const sync = await this.adb.sync();
+
         try {
             await sync.write({
                 filename: filePath,
@@ -322,26 +344,8 @@ export class PackageManager extends AdbCommandBase {
             await sync.dispose();
         }
 
-        // Starting from Android 7, `pm` becomes a wrapper to `cmd package`.
-        // The benefit of `cmd package` is it starts faster than the old `pm`,
-        // because it connects to the already running `system` process,
-        // instead of initializing all system components from scratch.
-        //
-        // But launching `cmd package` directly causes it to not be able to
-        // read files in `/data/local/tmp` (and many other places) due to SELinux policies,
-        // so installing files must still use `pm`.
-        // (the starting executable file decides which SELinux policies to apply)
-        const args = buildInstallArguments("install", options);
-        args.push(filePath);
-
         try {
-            const output = await this.adb.subprocess
-                .spawnAndWaitLegacy(args.map(escapeArg))
-                .then((output) => output.trim());
-
-            if (output !== "Success") {
-                throw new Error(output);
-            }
+            return await this.install([filePath], options);
         } finally {
             await this.adb.rm(filePath);
         }
@@ -356,20 +360,17 @@ export class PackageManager extends AdbCommandBase {
         // It's hard to detect whether `pm` supports streaming install (unless actually trying),
         // so check for whether `cmd` is supported,
         // and assume `pm` streaming install support status is same as that.
-        if (!this.#cmd.supportsCmd) {
+        if (!this.#cmd.isSupported) {
             // Fall back to push file then install
             await this.pushAndInstallStream(stream, options);
             return;
         }
 
         const args = buildInstallArguments("install", options);
-        // Remove `pm` from args, `Cmd#spawn` will prepend `cmd <command>` so the final args
-        // will be `cmd package install <args>`
-        args.shift();
         args.push("-S", size.toString());
-        const process = await this.#cmd.spawn(false, "package", ...args);
+        const process = await this.#cmd.spawn(args);
 
-        const output = process.stdout
+        const output = process.output
             .pipeThrough(new TextDecoderStream())
             .pipeThrough(new ConcatStringStream())
             .then((output) => output.trim());
@@ -437,20 +438,11 @@ export class PackageManager extends AdbCommandBase {
         };
     }
 
-    async #cmdOrSubprocess(args: string[]) {
-        if (this.#cmd.supportsCmd) {
-            args.shift();
-            return await this.#cmd.spawn(false, "package", ...args);
-        }
-
-        return this.adb.subprocess.spawn(args);
-    }
-
     async *listPackages(
         options?: Partial<PackageManagerListPackagesOptions>,
     ): AsyncGenerator<PackageManagerListPackagesResult, void, void> {
         const args = buildArguments(
-            ["pm", "list", "packages"],
+            ["package", "list", "packages"],
             options,
             PACKAGE_MANAGER_LIST_PACKAGES_OPTIONS_MAP,
         );
@@ -458,12 +450,9 @@ export class PackageManager extends AdbCommandBase {
             args.push(options.filter);
         }
 
-        const process = await this.#cmdOrSubprocess(args);
-        const reader = process.stdout
+        const process = await this.#cmd.spawn(args);
+        const reader = process.output
             .pipeThrough(new TextDecoderStream())
-            // FIXME: `SplitStringStream` will throw away some data
-            // if it doesn't end with a separator. So each chunk of data
-            // must contain several complete lines.
             .pipeThrough(new SplitStringStream("\n"))
             .getReader();
         while (true) {
@@ -475,12 +464,27 @@ export class PackageManager extends AdbCommandBase {
         }
     }
 
+    async getPackageSources(packageName: string): Promise<string[]> {
+        const args = [PackageManager.ServiceName, "-p", packageName];
+        const process = await this.#cmd.spawn(args);
+        const result: string[] = [];
+        for await (const line of process.output
+            .pipeThrough(new TextDecoderStream())
+            .pipeThrough(new SplitStringStream("\n"))) {
+            if (line.startsWith("package:")) {
+                result.push(line.substring("package:".length));
+            }
+        }
+
+        return result;
+    }
+
     async uninstall(
         packageName: string,
         options?: Partial<PackageManagerUninstallOptions>,
     ): Promise<void> {
         const args = buildArguments(
-            ["pm", "uninstall"],
+            [PackageManager.ServiceName, "uninstall"],
             options,
             PACKAGE_MANAGER_UNINSTALL_OPTIONS_MAP,
         );
@@ -489,10 +493,8 @@ export class PackageManager extends AdbCommandBase {
             args.push(...options.splitNames);
         }
 
-        const process = await this.#cmdOrSubprocess(args);
-        const output = await process.stdout
-            .pipeThrough(new TextDecoderStream())
-            .pipeThrough(new ConcatStringStream())
+        const output = await this.#cmd
+            .spawnWaitText(args)
             .then((output) => output.trim());
         if (output !== "Success") {
             throw new Error(output);
@@ -503,17 +505,15 @@ export class PackageManager extends AdbCommandBase {
         options: PackageManagerResolveActivityOptions,
     ): Promise<string | undefined> {
         let args = buildArguments(
-            ["pm", "resolve-activity", "--components"],
+            [PackageManager.ServiceName, "resolve-activity", "--components"],
             options,
             PACKAGE_MANAGER_RESOLVE_ACTIVITY_OPTIONS_MAP,
         );
 
         args = args.concat(options.intent.build());
 
-        const process = await this.#cmdOrSubprocess(args);
-        const output = await process.stdout
-            .pipeThrough(new TextDecoderStream())
-            .pipeThrough(new ConcatStringStream())
+        const output = await this.#cmd
+            .spawnWaitText(args)
             .then((output) => output.trim());
 
         if (output === "No activity found") {
@@ -538,10 +538,8 @@ export class PackageManager extends AdbCommandBase {
     ): Promise<number> {
         const args = buildInstallArguments("install-create", options);
 
-        const process = await this.#cmdOrSubprocess(args);
-        const output = await process.stdout
-            .pipeThrough(new TextDecoderStream())
-            .pipeThrough(new ConcatStringStream())
+        const output = await this.#cmd
+            .spawnWaitText(args)
             .then((output) => output.trim());
 
         const sessionIdString = output.match(/.*\[(\d+)\].*/);
@@ -552,6 +550,17 @@ export class PackageManager extends AdbCommandBase {
         return Number.parseInt(sessionIdString[1]!, 10);
     }
 
+    async checkResult(stream: ReadableStream<Uint8Array>) {
+        const output = await stream
+            .pipeThrough(new TextDecoderStream())
+            .pipeThrough(new ConcatStringStream())
+            .then((output) => output.trim());
+
+        if (!output.startsWith("Success")) {
+            throw new Error(output);
+        }
+    }
+
     async sessionAddSplit(
         sessionId: number,
         splitName: string,
@@ -565,12 +574,8 @@ export class PackageManager extends AdbCommandBase {
             path,
         ];
 
-        const output = await this.adb.subprocess
-            .spawnAndWaitLegacy(args)
-            .then((output) => output.trim());
-        if (!output.startsWith("Success")) {
-            throw new Error(output);
-        }
+        const process = await this.adb.subprocess.noneProtocol.spawn(args);
+        await this.checkResult(process.output);
     }
 
     async sessionAddSplitStream(
@@ -580,7 +585,7 @@ export class PackageManager extends AdbCommandBase {
         stream: ReadableStream<MaybeConsumable<Uint8Array>>,
     ): Promise<void> {
         const args: string[] = [
-            "pm",
+            PackageManager.ServiceName,
             "install-write",
             "-S",
             size.toString(),
@@ -589,40 +594,31 @@ export class PackageManager extends AdbCommandBase {
             "-",
         ];
 
-        const process = await this.#cmdOrSubprocess(args);
-        const output = process.stdout
-            .pipeThrough(new TextDecoderStream())
-            .pipeThrough(new ConcatStringStream())
-            .then((output) => output.trim());
-
+        const process = await this.#cmd.spawn(args);
         await Promise.all([
             stream.pipeTo(process.stdin),
-            output.then((output) => {
-                if (!output.startsWith("Success")) {
-                    throw new Error(output);
-                }
-            }),
+            this.checkResult(process.output),
         ]);
     }
 
     async sessionCommit(sessionId: number): Promise<void> {
-        const args: string[] = ["pm", "install-commit", sessionId.toString()];
-        const output = await this.adb.subprocess
-            .spawnAndWaitLegacy(args)
-            .then((output) => output.trim());
-        if (output !== "Success") {
-            throw new Error(output);
-        }
+        const args: string[] = [
+            PackageManager.ServiceName,
+            "install-commit",
+            sessionId.toString(),
+        ];
+        const process = await this.#cmd.spawn(args);
+        await this.checkResult(process.output);
     }
 
     async sessionAbandon(sessionId: number): Promise<void> {
-        const args: string[] = ["pm", "install-abandon", sessionId.toString()];
-        const output = await this.adb.subprocess
-            .spawnAndWaitLegacy(args)
-            .then((output) => output.trim());
-        if (output !== "Success") {
-            throw new Error(output);
-        }
+        const args: string[] = [
+            PackageManager.ServiceName,
+            "install-abandon",
+            sessionId.toString(),
+        ];
+        const process = await this.#cmd.spawn(args);
+        await this.checkResult(process.output);
     }
 }
 

package/src/settings.ts

@@ -1,16 +1,19 @@
-import type { Adb, AdbSubprocessWaitResult } from "@yume-chan/adb";
-import { AdbCommandBase } from "@yume-chan/adb";
+import type { Adb } from "@yume-chan/adb";
+import { AdbServiceBase } from "@yume-chan/adb";
 
-import { Cmd } from "./cmd.js";
+import { CmdNoneProtocolService } from "./cmd.js";
 import type { SingleUser } from "./utils.js";
 
 export type SettingsNamespace = "system" | "secure" | "global";
 
-export enum SettingsResetMode {
-    UntrustedDefaults = "untrusted_defaults",
-    UntrustedClear = "untrusted_clear",
-    TrustedDefaults = "trusted_defaults",
-}
+export const SettingsResetMode = {
+    UntrustedDefaults: "untrusted_defaults",
+    UntrustedClear: "untrusted_clear",
+    TrustedDefaults: "trusted_defaults",
+} as const;
+
+export type SettingsResetMode =
+    (typeof SettingsResetMode)[keyof typeof SettingsResetMode];
 
 export interface SettingsOptions {
     user?: SingleUser;
@@ -22,21 +25,24 @@ export interface SettingsPutOptions extends SettingsOptions {
 }
 
 // frameworks/base/packages/SettingsProvider/src/com/android/providers/settings/SettingsService.java
-export class Settings extends AdbCommandBase {
-    #cmd: Cmd;
+export class Settings extends AdbServiceBase {
+    static ServiceName = "settings";
+    static CommandName = "settings";
+
+    #cmd: CmdNoneProtocolService;
 
     constructor(adb: Adb) {
         super(adb);
-        this.#cmd = new Cmd(adb);
+        this.#cmd = new CmdNoneProtocolService(adb, Settings.CommandName);
     }
 
-    async base(
+    base(
         verb: string,
         namespace: SettingsNamespace,
         options: SettingsOptions | undefined,
         ...args: string[]
     ): Promise<string> {
-        let command = ["settings"];
+        let command = [Settings.ServiceName];
 
         if (options?.user !== undefined) {
             command.push("--user", options.user.toString());
@@ -45,21 +51,7 @@ export class Settings extends AdbCommandBase {
         command.push(verb, namespace);
         command = command.concat(args);
 
-        let output: AdbSubprocessWaitResult;
-        if (this.#cmd.supportsCmd) {
-            output = await this.#cmd.spawnAndWait(
-                command[0]!,
-                ...command.slice(1),
-            );
-        } else {
-            output = await this.adb.subprocess.spawnAndWait(command);
-        }
-
-        if (output.stderr) {
-            throw new Error(output.stderr);
-        }
-
-        return output.stdout;
+        return this.#cmd.spawnWaitText(command);
     }
 
     async get(