@yume-chan/android-bin 0.0.17 → 0.0.19

package/src/bug-report.ts

@@ -1,8 +1,15 @@
 // cspell: ignore bugreport
 // cspell: ignore bugreportz
 
-import { AdbCommandBase, AdbSubprocessShellProtocol } from '@yume-chan/adb';
-import { DecodeUtf8Stream, PushReadableStream, ReadableStream, SplitStringStream, WrapReadableStream, WritableStream } from '@yume-chan/stream-extra';
+import { AdbCommandBase, AdbSubprocessShellProtocol } from "@yume-chan/adb";
+import type { ReadableStream } from "@yume-chan/stream-extra";
+import {
+    DecodeUtf8Stream,
+    PushReadableStream,
+    SplitStringStream,
+    WrapReadableStream,
+    WritableStream,
+} from "@yume-chan/stream-extra";
 
 export interface BugReportZVersion {
     major: number;
@@ -34,8 +41,11 @@ export class BugReportZ extends AdbCommandBase {
             return undefined;
         }
 
-        const { stderr, exitCode } = await this.adb.subprocess.spawnAndWait(['bugreportz', '-v']);
-        if (exitCode !== 0 || stderr === '') {
+        const { stderr, exitCode } = await this.adb.subprocess.spawnAndWait([
+            "bugreportz",
+            "-v",
+        ]);
+        if (exitCode !== 0 || stderr === "") {
             return undefined;
         }
 
@@ -68,10 +78,12 @@ export class BugReportZ extends AdbCommandBase {
      * @param onProgress Progress callback. Only specify this if `supportsProgress` is `true`.
      * @returns The path of the bugreport file.
      */
-    public async generate(onProgress?: (progress: string, total: string) => void): Promise<string> {
+    public async generate(
+        onProgress?: (progress: string, total: string) => void
+    ): Promise<string> {
         const process = await this.adb.subprocess.spawn([
-            'bugreportz',
-            ...(onProgress ? ['-p'] : []),
+            "bugreportz",
+            ...(onProgress ? ["-p"] : []),
         ]);
 
         let filename: string | undefined;
@@ -79,40 +91,42 @@ export class BugReportZ extends AdbCommandBase {
 
         await process.stdout
             .pipeThrough(new DecodeUtf8Stream())
-            .pipeThrough(new SplitStringStream('\n'))
-            .pipeTo(new WritableStream<string>({
-                write(line) {
-                    // `BEGIN:` and `PROGRESS:` only appear when `-p` is specified.
-                    let match = line.match(BugReportZ.PROGRESS_REGEX);
-                    if (match) {
-                        onProgress?.(match[1]!, match[2]!);
-                    }
-
-                    match = line.match(BugReportZ.BEGIN_REGEX);
-                    if (match) {
-                        filename = match[1]!;
-                    }
-
-                    match = line.match(BugReportZ.OK_REGEX);
-                    if (match) {
-                        filename = match[1];
-                    }
-
-                    match = line.match(BugReportZ.FAIL_REGEX);
-                    if (match) {
-                        // Don't report error now
-                        // We want to gather all output.
-                        error = match[1];
-                    }
-                }
-            }));
+            .pipeThrough(new SplitStringStream("\n"))
+            .pipeTo(
+                new WritableStream<string>({
+                    write(line) {
+                        // `BEGIN:` and `PROGRESS:` only appear when `-p` is specified.
+                        let match = line.match(BugReportZ.PROGRESS_REGEX);
+                        if (match) {
+                            onProgress?.(match[1]!, match[2]!);
+                        }
+
+                        match = line.match(BugReportZ.BEGIN_REGEX);
+                        if (match) {
+                            filename = match[1]!;
+                        }
+
+                        match = line.match(BugReportZ.OK_REGEX);
+                        if (match) {
+                            filename = match[1];
+                        }
+
+                        match = line.match(BugReportZ.FAIL_REGEX);
+                        if (match) {
+                            // Don't report error now
+                            // We want to gather all output.
+                            error = match[1];
+                        }
+                    },
+                })
+            );
 
         if (error) {
             throw new Error(error);
         }
 
         if (!filename) {
-            throw new Error('bugreportz did not return file name');
+            throw new Error("bugreportz did not return file name");
         }
 
         // Design choice: we don't automatically pull the file to avoid more dependency on `@yume-chan/adb`
@@ -125,22 +139,34 @@ export class BugReportZ extends AdbCommandBase {
 
     public stream(): ReadableStream<Uint8Array> {
         return new PushReadableStream(async (controller) => {
-            const process = await this.adb.subprocess.spawn(['bugreportz', '-s']);
+            const process = await this.adb.subprocess.spawn([
+                "bugreportz",
+                "-s",
+            ]);
             process.stdout
-                .pipeTo(new WritableStream({
-                    async write(chunk) {
-                        await controller.enqueue(chunk);
-                    },
-                }));
+                .pipeTo(
+                    new WritableStream({
+                        async write(chunk) {
+                            await controller.enqueue(chunk);
+                        },
+                    })
+                )
+                .catch((e) => {
+                    void e;
+                });
             process.stderr
                 .pipeThrough(new DecodeUtf8Stream())
-                .pipeTo(new WritableStream({
-                    async write(chunk) {
-                        controller.error(new Error(chunk));
-                    }
-                }));
+                .pipeTo(
+                    new WritableStream({
+                        write(chunk) {
+                            controller.error(new Error(chunk));
+                        },
+                    })
+                )
+                .catch((e) => {
+                    void e;
+                });
             await process.exit;
-            controller.close();
         });
     }
 }
@@ -149,7 +175,7 @@ export class BugReportZ extends AdbCommandBase {
 export class BugReport extends AdbCommandBase {
     public generate(): ReadableStream<Uint8Array> {
         return new WrapReadableStream(async () => {
-            const process = await this.adb.subprocess.spawn(['bugreport']);
+            const process = await this.adb.subprocess.spawn(["bugreport"]);
             return process.stdout;
         });
     }

package/src/cmd.ts

@@ -0,0 +1,67 @@
+import type { Adb, AdbSubprocessProtocolConstructor } from "@yume-chan/adb";
+import {
+    AdbCommandBase,
+    AdbFeature,
+    AdbSubprocessNoneProtocol,
+    AdbSubprocessShellProtocol,
+} from "@yume-chan/adb";
+
+export class Cmd extends AdbCommandBase {
+    private _supportsShellV2: boolean;
+    private _supportsCmd: boolean;
+    private _supportsAbb: boolean;
+    private _supportsAbbExec: boolean;
+
+    public get supportsShellV2() {
+        return this._supportsShellV2;
+    }
+    public get supportsCmd() {
+        return this._supportsCmd;
+    }
+    public get supportsAbb() {
+        return this._supportsAbb;
+    }
+    public get supportsAbbExec() {
+        return this._supportsAbbExec;
+    }
+
+    public 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);
+    }
+
+    public async spawn(
+        shellProtocol: boolean,
+        command: string,
+        ...args: string[]
+    ) {
+        let supportAbb: boolean;
+        let supportCmd: boolean = this.supportsCmd;
+        let service: string;
+        let Protocol: AdbSubprocessProtocolConstructor;
+        if (shellProtocol) {
+            supportAbb = this._supportsAbb;
+            supportCmd &&= this.supportsShellV2;
+            service = "abb";
+            Protocol = AdbSubprocessShellProtocol;
+        } else {
+            supportAbb = this._supportsAbbExec;
+            service = "abb_exec";
+            Protocol = AdbSubprocessNoneProtocol;
+        }
+
+        if (supportAbb) {
+            const socket = await this.adb.createSocket(
+                `${service}:${command}\0${args.join("\0")}\0`
+            );
+            return new Protocol(socket);
+        } else if (supportCmd) {
+            return Protocol.raw(this.adb, `cmd ${command} ${args.join(" ")}`);
+        } else {
+            throw new Error("Not supported");
+        }
+    }
+}

package/src/demo-mode.ts

@@ -4,26 +4,50 @@
 // cspell: ignore systemui
 // cspell: ignore sysui
 
-import { Adb, AdbCommandBase } from '@yume-chan/adb';
+import type { Adb } from "@yume-chan/adb";
+import { AdbCommandBase } from "@yume-chan/adb";
+
 import { Settings } from "./settings.js";
 
 export enum DemoModeSignalStrength {
-    Hidden = 'null',
-    Level0 = '0',
-    Level1 = '1',
-    Level2 = '2',
-    Level3 = '3',
-    Level4 = '4',
+    Hidden = "null",
+    Level0 = "0",
+    Level1 = "1",
+    Level2 = "2",
+    Level3 = "3",
+    Level4 = "4",
 }
 
 // https://cs.android.com/android/platform/superproject/+/master:frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/NetworkControllerImpl.java;l=1362;drc=3b775bf7ad89902f94e03d191b0d8fbdebf2bdbf
-export const DemoModeMobileDataTypes = ['1x', '3g', '4g', '4g+', '5g', '5ge', '5g+',
-    'e', 'g', 'h', 'h+', 'lte', 'lte+', 'dis', 'not', 'null'] as const;
+export const DemoModeMobileDataTypes = [
+    "1x",
+    "3g",
+    "4g",
+    "4g+",
+    "5g",
+    "5ge",
+    "5g+",
+    "e",
+    "g",
+    "h",
+    "h+",
+    "lte",
+    "lte+",
+    "dis",
+    "not",
+    "null",
+] as const;
 
 export type DemoModeMobileDataType = (typeof DemoModeMobileDataTypes)[number];
 
 // https://cs.android.com/android/platform/superproject/+/master:frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java;l=3136
-export const DemoModeStatusBarModes = ['opaque', 'translucent', 'semi-transparent', 'transparent', 'warning'] as const;
+export const DemoModeStatusBarModes = [
+    "opaque",
+    "translucent",
+    "semi-transparent",
+    "transparent",
+    "warning",
+] as const;
 
 export type DemoModeStatusBarMode = (typeof DemoModeStatusBarModes)[number];
 
@@ -35,145 +59,170 @@ export class DemoMode extends AdbCommandBase {
         this.settings = new Settings(adb);
     }
 
-    public static readonly AllowedSettingKey = 'sysui_demo_allowed';
+    public static readonly AllowedSettingKey = "sysui_demo_allowed";
 
     // Demo Mode actually doesn't have a setting indicates its enablement
     // However Developer Mode menu uses this key
     // So we can only try our best to guess if it's enabled
-    public static readonly EnabledSettingKey = 'sysui_tuner_demo_on';
+    public static readonly EnabledSettingKey = "sysui_tuner_demo_on";
 
     public async getAllowed(): Promise<boolean> {
-        const output = await this.settings.get('global', DemoMode.AllowedSettingKey);
-        return output.trim() === '1';
+        const output = await this.settings.get(
+            "global",
+            DemoMode.AllowedSettingKey
+        );
+        return output.trim() === "1";
     }
 
     public async setAllowed(value: boolean): Promise<void> {
         if (value) {
-            await this.settings.put('global', DemoMode.AllowedSettingKey, '1');
+            await this.settings.put("global", DemoMode.AllowedSettingKey, "1");
         } else {
             await this.setEnabled(false);
-            await this.settings.delete('global', DemoMode.AllowedSettingKey);
+            await this.settings.delete("global", DemoMode.AllowedSettingKey);
         }
     }
 
     public async getEnabled(): Promise<boolean> {
-        const result = await this.settings.get('global', DemoMode.EnabledSettingKey);
-        return result.trim() === '1';
+        const result = await this.settings.get(
+            "global",
+            DemoMode.EnabledSettingKey
+        );
+        return result.trim() === "1";
     }
 
     public async setEnabled(value: boolean): Promise<void> {
         if (value) {
-            await this.settings.put('global', DemoMode.EnabledSettingKey, '1');
+            await this.settings.put("global", DemoMode.EnabledSettingKey, "1");
         } else {
-            await this.settings.delete('global', DemoMode.EnabledSettingKey);
-            await this.broadcast('exit');
+            await this.settings.delete("global", DemoMode.EnabledSettingKey);
+            await this.broadcast("exit");
         }
     }
 
-    public async broadcast(command: string, extra?: Record<string, string>): Promise<void> {
+    public async broadcast(
+        command: string,
+        extra?: Record<string, string>
+    ): Promise<void> {
         await this.adb.subprocess.spawnAndWaitLegacy([
-            'am',
-            'broadcast',
-            '-a',
-            'com.android.systemui.demo',
-            '-e',
-            'command',
+            "am",
+            "broadcast",
+            "-a",
+            "com.android.systemui.demo",
+            "-e",
+            "command",
             command,
-            ...(extra ? Object.entries(extra).flatMap(([key, value]) => ['-e', key, value]) : []),
+            ...(extra
+                ? Object.entries(extra).flatMap(([key, value]) => [
+                      "-e",
+                      key,
+                      value,
+                  ])
+                : []),
         ]);
     }
 
     public async setBatteryLevel(level: number): Promise<void> {
-        await this.broadcast('battery', { level: level.toString() });
+        await this.broadcast("battery", { level: level.toString() });
     }
 
     public async setBatteryCharging(value: boolean): Promise<void> {
-        await this.broadcast('battery', { plugged: value.toString() });
+        await this.broadcast("battery", { plugged: value.toString() });
     }
 
     public async setPowerSaveMode(value: boolean): Promise<void> {
-        await this.broadcast('battery', { powersave: value.toString() });
+        await this.broadcast("battery", { powersave: value.toString() });
     }
 
     public async setAirplaneMode(show: boolean): Promise<void> {
-        await this.broadcast('network', { airplane: show ? 'show' : 'hide' });
+        await this.broadcast("network", { airplane: show ? "show" : "hide" });
     }
 
-    public async setWifiSignalStrength(value: DemoModeSignalStrength): Promise<void> {
-        await this.broadcast('network', { wifi: 'show', level: value });
+    public async setWifiSignalStrength(
+        value: DemoModeSignalStrength
+    ): Promise<void> {
+        await this.broadcast("network", { wifi: "show", level: value });
     }
 
-    public async setMobileDataType(value: DemoModeMobileDataType): Promise<void> {
+    public async setMobileDataType(
+        value: DemoModeMobileDataType
+    ): Promise<void> {
         for (let i = 0; i < 2; i += 1) {
-            await this.broadcast('network', {
-                mobile: 'show',
-                sims: '1',
-                nosim: 'hide',
-                slot: '0',
+            await this.broadcast("network", {
+                mobile: "show",
+                sims: "1",
+                nosim: "hide",
+                slot: "0",
                 datatype: value,
-                fully: 'true',
-                roam: 'false',
-                level: '4',
-                inflate: 'false',
-                activity: 'in',
-                carriernetworkchange: 'hide',
+                fully: "true",
+                roam: "false",
+                level: "4",
+                inflate: "false",
+                activity: "in",
+                carriernetworkchange: "hide",
             });
         }
     }
 
-    public async setMobileSignalStrength(value: DemoModeSignalStrength): Promise<void> {
-        await this.broadcast('network', { mobile: 'show', level: value });
+    public async setMobileSignalStrength(
+        value: DemoModeSignalStrength
+    ): Promise<void> {
+        await this.broadcast("network", { mobile: "show", level: value });
     }
 
     public async setNoSimCardIcon(show: boolean): Promise<void> {
-        await this.broadcast('network', { nosim: show ? 'show' : 'hide' });
+        await this.broadcast("network", { nosim: show ? "show" : "hide" });
     }
 
     public async setStatusBarMode(mode: DemoModeStatusBarMode): Promise<void> {
-        await this.broadcast('bars', { mode });
+        await this.broadcast("bars", { mode });
     }
 
     public async setVibrateModeEnabled(value: boolean): Promise<void> {
         // https://cs.android.com/android/platform/superproject/+/master:frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/phone/DemoStatusIcons.java;l=103
-        await this.broadcast('status', { volume: value ? 'vibrate' : 'hide' });
+        await this.broadcast("status", { volume: value ? "vibrate" : "hide" });
     }
 
     public async setBluetoothConnected(value: boolean): Promise<void> {
         // https://cs.android.com/android/platform/superproject/+/master:frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/phone/DemoStatusIcons.java;l=114
-        await this.broadcast('status', { bluetooth: value ? 'connected' : 'hide' });
+        await this.broadcast("status", {
+            bluetooth: value ? "connected" : "hide",
+        });
     }
 
     public async setLocatingIcon(show: boolean): Promise<void> {
-        await this.broadcast('status', { location: show ? 'show' : 'hide' });
+        await this.broadcast("status", { location: show ? "show" : "hide" });
     }
 
     public async setAlarmIcon(show: boolean): Promise<void> {
-        await this.broadcast('status', { alarm: show ? 'show' : 'hide' });
+        await this.broadcast("status", { alarm: show ? "show" : "hide" });
     }
 
     public async setSyncingIcon(show: boolean): Promise<void> {
-        await this.broadcast('status', { sync: show ? 'show' : 'hide' });
+        await this.broadcast("status", { sync: show ? "show" : "hide" });
     }
 
     public async setMuteIcon(show: boolean): Promise<void> {
-        await this.broadcast('status', { mute: show ? 'show' : 'hide' });
+        await this.broadcast("status", { mute: show ? "show" : "hide" });
     }
 
     public async setSpeakerPhoneIcon(show: boolean): Promise<void> {
-        await this.broadcast('status', { speakerphone: show ? 'show' : 'hide' });
+        await this.broadcast("status", {
+            speakerphone: show ? "show" : "hide",
+        });
     }
 
     public async setNotificationsVisibility(show: boolean): Promise<void> {
         // https://cs.android.com/android/platform/superproject/+/master:frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java;l=3131
-        await this.broadcast('notifications', { visible: show.toString() });
+        await this.broadcast("notifications", { visible: show.toString() });
     }
 
     public async setTime(hour: number, minute: number): Promise<void> {
-        await this.broadcast('clock', {
+        await this.broadcast("clock", {
             // cspell: disable-next-line
             hhmm:
-                hour.toString().padStart(2, '0') +
-                minute.toString().padStart(2, '0'),
+                hour.toString().padStart(2, "0") +
+                minute.toString().padStart(2, "0"),
         });
     }
 }

package/src/index.ts

@@ -1,6 +1,8 @@
 // cspell: ignore logcat
 
-export * from './bug-report.js';
-export * from './demo-mode.js';
-export * from './logcat.js';
-export * from './settings.js';
+export * from "./bug-report.js";
+export * from "./cmd.js";
+export * from "./demo-mode.js";
+export * from "./logcat.js";
+export * from "./pm.js";
+export * from "./settings.js";