@yume-chan/android-bin 0.0.20 → 0.0.22

package/esm/bug-report.js

@@ -1,60 +1,159 @@
 // cspell: ignore bugreport
 // cspell: ignore bugreportz
 import { AdbCommandBase, AdbSubprocessShellProtocol } from "@yume-chan/adb";
-import { DecodeUtf8Stream, PushReadableStream, SplitStringStream, WrapReadableStream, WritableStream, } from "@yume-chan/stream-extra";
-class BugReportZ extends AdbCommandBase {
+import { AbortController, DecodeUtf8Stream, PushReadableStream, SplitStringStream, WrapReadableStream, WritableStream, } from "@yume-chan/stream-extra";
+export class BugReport extends AdbCommandBase {
     static VERSION_REGEX = /(\d+)\.(\d+)/;
     static BEGIN_REGEX = /BEGIN:(.*)/;
     static PROGRESS_REGEX = /PROGRESS:(.*)\/(.*)/;
     static OK_REGEX = /OK:(.*)/;
     static FAIL_REGEX = /FAIL:(.*)/;
     /**
-     * Retrieve the version of bugreportz.
-     *
-     * @returns a `BugReportVersion` object, or `undefined` if `bugreportz` is not available.
+     * Queries the device's bugreport capabilities.
      */
-    async version() {
+    static async queryCapabilities(adb) {
         // bugreportz requires shell protocol
-        if (!AdbSubprocessShellProtocol.isSupported(this.adb)) {
-            return undefined;
+        if (!AdbSubprocessShellProtocol.isSupported(adb)) {
+            return new BugReport(adb, {
+                supportsBugReport: true,
+                bugReportZVersion: undefined,
+                supportsBugReportZ: false,
+                supportsBugReportZProgress: false,
+                supportsBugReportZStream: false,
+            });
         }
-        const { stderr, exitCode } = await this.adb.subprocess.spawnAndWait([
+        const { stderr, exitCode } = await adb.subprocess.spawnAndWait([
             "bugreportz",
             "-v",
         ]);
         if (exitCode !== 0 || stderr === "") {
-            return undefined;
+            return new BugReport(adb, {
+                supportsBugReport: true,
+                bugReportZVersion: undefined,
+                supportsBugReportZ: false,
+                supportsBugReportZProgress: false,
+                supportsBugReportZStream: false,
+            });
         }
-        const match = stderr.match(BugReportZ.VERSION_REGEX);
+        const match = stderr.match(BugReport.VERSION_REGEX);
         if (!match) {
-            return undefined;
+            return new BugReport(adb, {
+                supportsBugReport: true,
+                bugReportZVersion: undefined,
+                supportsBugReportZ: false,
+                supportsBugReportZProgress: false,
+                supportsBugReportZStream: false,
+            });
         }
-        const major = parseInt(match[1], 10);
-        const minor = parseInt(match[2], 10);
-        return {
-            major,
-            minor,
-            supportProgress: this.supportProgress(major, minor),
-            supportStream: this.supportStream(major, minor),
-        };
+        const [major, minor] = match[0]
+            .split(".")
+            .map((x) => parseInt(x, 10));
+        return new BugReport(adb, {
+            // Before BugReportZ version 1.2 (Android 12), BugReport was deprecated but still works.
+            supportsBugReport: major === 1 && minor <= 1,
+            bugReportZVersion: match[0],
+            supportsBugReportZ: true,
+            supportsBugReportZProgress: major > 1 || minor >= 1,
+            supportsBugReportZStream: major > 1 || minor >= 2,
+        });
+    }
+    #supportsBugReport;
+    /**
+     * Gets whether the device supports flat (text file, non-zipped) bugreport.
+     *
+     * Should be `true` for Android version <= 11.
+     */
+    get supportsBugReport() {
+        return this.#supportsBugReport;
+    }
+    #bugReportZVersion;
+    /**
+     * Gets the version of BugReportZ.
+     *
+     * Will be `undefined` if BugReportZ is not supported.
+     */
+    get bugReportZVersion() {
+        return this.#bugReportZVersion;
+    }
+    #supportsBugReportZ;
+    /**
+     * Gets whether the device supports zipped bugreport.
+     *
+     * Should be `true` for Android version >= 7.
+     */
+    get supportsBugReportZ() {
+        return this.#supportsBugReportZ;
     }
-    supportProgress(major, minor) {
-        return major > 1 || minor >= 1;
+    #supportsBugReportZProgress;
+    /**
+     * Gets whether the device supports progress report for zipped bugreport.
+     *
+     * Should be `true` for Android version >= 8.
+     */
+    get supportsBugReportZProgress() {
+        return this.#supportsBugReportZProgress;
     }
+    #supportsBugReportZStream;
     /**
-     * Create a zipped bugreport file.
+     * Gets whether the device supports streaming zipped bugreport.
      *
-     * Compare to `stream`, this method will write the output to a file on device.
+     * Should be `true` for Android version >= 12.
+     */
+    get supportsBugReportZStream() {
+        return this.#supportsBugReportZStream;
+    }
+    constructor(adb, capabilities) {
+        super(adb);
+        this.#supportsBugReport = capabilities.supportsBugReport;
+        this.#bugReportZVersion = capabilities.bugReportZVersion;
+        this.#supportsBugReportZ = capabilities.supportsBugReportZ;
+        this.#supportsBugReportZProgress =
+            capabilities.supportsBugReportZProgress;
+        this.#supportsBugReportZStream = capabilities.supportsBugReportZStream;
+    }
+    /**
+     * Creates a legacy, non-zipped bugreport file, or throws an error if `supportsBugReport` is `false`.
+     *
+     * @returns A flat (text file, non-zipped) bugreport.
+     */
+    bugReport() {
+        if (!this.#supportsBugReport) {
+            throw new Error("Flat (text file, non-zipped) bugreport is not supported.");
+        }
+        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.spawn(["bugreport"]);
+            return process.stdout;
+        });
+    }
+    /**
+     * Creates a zipped bugreport file, or throws an error if `supportsBugReportZ` is `false`.
+     *
+     * Compare to `bugReportZStream`, this method will write the output to a file on device.
      * You can pull it later using sync protocol.
      *
-     * @param onProgress Progress callback. Only specify this if `supportsProgress` is `true`.
-     * @returns The path of the bugreport file.
+     * @returns The path to the generated bugreport file on device filesystem.
      */
-    async generate(onProgress) {
-        const process = await this.adb.subprocess.spawn([
-            "bugreportz",
-            ...(onProgress ? ["-p"] : []),
-        ]);
+    async bugReportZ(options) {
+        if (options?.signal?.aborted) {
+            throw options?.signal.reason ?? new Error("Aborted");
+        }
+        if (!this.#supportsBugReportZ) {
+            throw new Error("bugreportz is not supported");
+        }
+        const args = ["bugreportz"];
+        if (options?.onProgress) {
+            if (!this.#supportsBugReportZProgress) {
+                throw new Error("bugreportz progress is not supported");
+            }
+            args.push("-p");
+        }
+        const process = await this.adb.subprocess.spawn(args, {
+            protocols: [AdbSubprocessShellProtocol],
+        });
+        options?.signal?.addEventListener("abort", () => {
+            void process.kill();
+        });
         let filename;
         let error;
         await process.stdout
@@ -63,19 +162,19 @@ class BugReportZ extends AdbCommandBase {
             .pipeTo(new WritableStream({
             write(line) {
                 // `BEGIN:` and `PROGRESS:` only appear when `-p` is specified.
-                let match = line.match(BugReportZ.PROGRESS_REGEX);
+                let match = line.match(BugReport.PROGRESS_REGEX);
                 if (match) {
-                    onProgress?.(match[1], match[2]);
+                    options?.onProgress?.(match[1], match[2]);
                 }
-                match = line.match(BugReportZ.BEGIN_REGEX);
+                match = line.match(BugReport.BEGIN_REGEX);
                 if (match) {
                     filename = match[1];
                 }
-                match = line.match(BugReportZ.OK_REGEX);
+                match = line.match(BugReport.OK_REGEX);
                 if (match) {
                     filename = match[1];
                 }
-                match = line.match(BugReportZ.FAIL_REGEX);
+                match = line.match(BugReport.FAIL_REGEX);
                 if (match) {
                     // Don't report error now
                     // We want to gather all output.
@@ -92,15 +191,14 @@ class BugReportZ extends AdbCommandBase {
         // Design choice: we don't automatically pull the file to avoid more dependency on `@yume-chan/adb`
         return filename;
     }
-    supportStream(major, minor) {
-        return major > 1 || minor >= 2;
-    }
-    stream() {
+    /**
+     * Creates a zipped bugreport file, or throws an error if `supportsBugReportZStream` is `false`.
+     *
+     * @returns The content of the generated bugreport file.
+     */
+    bugReportZStream() {
         return new PushReadableStream(async (controller) => {
-            const process = await this.adb.subprocess.spawn([
-                "bugreportz",
-                "-s",
-            ]);
+            const process = await this.adb.subprocess.spawn(["bugreportz", "-s"], { protocols: [AdbSubprocessShellProtocol] });
             process.stdout
                 .pipeTo(new WritableStream({
                 async write(chunk) {
@@ -123,15 +221,51 @@ class BugReportZ extends AdbCommandBase {
             await process.exit;
         });
     }
-}
-export { BugReportZ };
-// https://cs.android.com/android/platform/superproject/+/master:frameworks/native/cmds/bugreport/bugreport.cpp;drc=9b73bf07d73dbab5b792632e1e233edbad77f5fd;bpv=0;bpt=0
-export class BugReport extends AdbCommandBase {
-    generate() {
-        return new WrapReadableStream(async () => {
-            const process = await this.adb.subprocess.spawn(["bugreport"]);
-            return process.stdout;
-        });
+    /**
+     * Automatically choose the best bugreport method.
+     *
+     * * If `supportsBugReportZStream` is `true`, this method will return a stream of zipped bugreport.
+     * * If `supportsBugReportZ` is `true`, this method will return a stream of zipped bugreport, and will delete the file on device after the stream is closed.
+     * * If `supportsBugReport` is `true`, this method will return a stream of flat bugreport.
+     *
+     * @param onProgress
+     * If `supportsBugReportZStream` is `false` and `supportsBugReportZProgress` is `true`,
+     * this callback will be called when progress is updated.
+     */
+    automatic(onProgress) {
+        if (this.#supportsBugReportZStream) {
+            return { type: "bugreportz", stream: this.bugReportZStream() };
+        }
+        if (this.#supportsBugReportZ) {
+            let path;
+            let sync;
+            const controller = new AbortController();
+            const cleanup = async () => {
+                controller.abort();
+                await sync?.dispose();
+                if (path) {
+                    await this.adb.rm(path);
+                }
+            };
+            return {
+                type: "bugreportz",
+                stream: new WrapReadableStream({
+                    start: async () => {
+                        path = await this.bugReportZ({
+                            signal: controller.signal,
+                            onProgress: this.#supportsBugReportZProgress
+                                ? onProgress
+                                : undefined,
+                        });
+                        sync = await this.adb.sync();
+                        return sync.read(path);
+                    },
+                    cancel: cleanup,
+                    close: cleanup,
+                }),
+            };
+        }
+        return { type: "bugreport", stream: this.bugReport() };
     }
 }
 //# sourceMappingURL=bug-report.js.map

package/esm/bug-report.js.map

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

package/esm/cmd.d.ts

@@ -1,15 +1,13 @@
-import type { Adb } from "@yume-chan/adb";
+import type { Adb, AdbSubprocessProtocol, AdbSubprocessWaitResult } from "@yume-chan/adb";
 import { AdbCommandBase } from "@yume-chan/adb";
 export declare class Cmd extends AdbCommandBase {
-    private _supportsShellV2;
-    private _supportsCmd;
-    private _supportsAbb;
-    private _supportsAbbExec;
+    #private;
     get supportsShellV2(): boolean;
     get supportsCmd(): boolean;
     get supportsAbb(): boolean;
     get supportsAbbExec(): boolean;
     constructor(adb: Adb);
-    spawn(shellProtocol: boolean, command: string, ...args: string[]): Promise<import("@yume-chan/adb").AdbSubprocessProtocol>;
+    spawn(shellProtocol: boolean, command: string, ...args: string[]): Promise<AdbSubprocessProtocol>;
+    spawnAndWait(command: string, ...args: string[]): Promise<AdbSubprocessWaitResult>;
 }
 //# sourceMappingURL=cmd.d.ts.map

package/esm/cmd.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cmd.d.ts","sourceRoot":"","sources":["../src/cmd.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAoC,MAAM,gBAAgB,CAAC;AAC5E,OAAO,EACH,cAAc,EAIjB,MAAM,gBAAgB,CAAC;AAExB,qBAAa,GAAI,SAAQ,cAAc;IACnC,OAAO,CAAC,gBAAgB,CAAU;IAClC,OAAO,CAAC,YAAY,CAAU;IAC9B,OAAO,CAAC,YAAY,CAAU;IAC9B,OAAO,CAAC,gBAAgB,CAAU;IAElC,IAAW,eAAe,YAEzB;IACD,IAAW,WAAW,YAErB;IACD,IAAW,WAAW,YAErB;IACD,IAAW,eAAe,YAEzB;gBAEkB,GAAG,EAAE,GAAG;IAQd,KAAK,CACd,aAAa,EAAE,OAAO,EACtB,OAAO,EAAE,MAAM,EACf,GAAG,IAAI,EAAE,MAAM,EAAE;CA4BxB"}
+{"version":3,"file":"cmd.d.ts","sourceRoot":"","sources":["../src/cmd.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,GAAG,EACH,qBAAqB,EAErB,uBAAuB,EAC1B,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACH,cAAc,EAIjB,MAAM,gBAAgB,CAAC;AAGxB,qBAAa,GAAI,SAAQ,cAAc;;IAEnC,IAAI,eAAe,YAElB;IAGD,IAAI,WAAW,YAEd;IAGD,IAAI,WAAW,YAEd;IAGD,IAAI,eAAe,YAElB;gBAEW,GAAG,EAAE,GAAG;IAQd,KAAK,CACP,aAAa,EAAE,OAAO,EACtB,OAAO,EAAE,MAAM,EACf,GAAG,IAAI,EAAE,MAAM,EAAE,GAClB,OAAO,CAAC,qBAAqB,CAAC;IA+B3B,YAAY,CACd,OAAO,EAAE,MAAM,EACf,GAAG,IAAI,EAAE,MAAM,EAAE,GAClB,OAAO,CAAC,uBAAuB,CAAC;CAmBtC"}

package/esm/cmd.js

@@ -1,54 +1,69 @@
 import { AdbCommandBase, AdbFeature, AdbSubprocessNoneProtocol, AdbSubprocessShellProtocol, } from "@yume-chan/adb";
+import { ConcatStringStream, DecodeUtf8Stream } from "@yume-chan/stream-extra";
 export class Cmd extends AdbCommandBase {
-    _supportsShellV2;
-    _supportsCmd;
-    _supportsAbb;
-    _supportsAbbExec;
+    #supportsShellV2;
     get supportsShellV2() {
-        return this._supportsShellV2;
+        return this.#supportsShellV2;
     }
+    #supportsCmd;
     get supportsCmd() {
-        return this._supportsCmd;
+        return this.#supportsCmd;
     }
+    #supportsAbb;
     get supportsAbb() {
-        return this._supportsAbb;
+        return this.#supportsAbb;
     }
+    #supportsAbbExec;
     get supportsAbbExec() {
-        return this._supportsAbbExec;
+        return this.#supportsAbbExec;
     }
     constructor(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.supportsFeature(AdbFeature.ShellV2);
+        this.#supportsCmd = adb.supportsFeature(AdbFeature.Cmd);
+        this.#supportsAbb = adb.supportsFeature(AdbFeature.Abb);
+        this.#supportsAbbExec = adb.supportsFeature(AdbFeature.AbbExec);
     }
     async spawn(shellProtocol, command, ...args) {
         let supportsAbb;
-        let supportsCmd = this.supportsCmd;
+        let supportsCmd = this.#supportsCmd;
         let service;
         let Protocol;
         if (shellProtocol) {
-            supportsAbb = this._supportsAbb;
+            supportsAbb = this.#supportsAbb;
             supportsCmd &&= this.supportsShellV2;
             service = "abb";
             Protocol = AdbSubprocessShellProtocol;
         }
         else {
-            supportsAbb = this._supportsAbbExec;
+            supportsAbb = this.#supportsAbbExec;
             service = "abb_exec";
             Protocol = AdbSubprocessNoneProtocol;
         }
         if (supportsAbb) {
-            const socket = await this.adb.createSocket(`${service}:${command}\0${args.join("\0")}\0`);
-            return new Protocol(socket);
+            return new Protocol(await this.adb.createSocket(`${service}:${command}\0${args.join("\0")}\0`));
         }
-        else if (supportsCmd) {
+        if (supportsCmd) {
             return Protocol.raw(this.adb, `cmd ${command} ${args.join(" ")}`);
         }
-        else {
-            throw new Error("Not supported");
-        }
+        throw new Error("Not supported");
+    }
+    async spawnAndWait(command, ...args) {
+        const process = await this.spawn(true, command, ...args);
+        const [stdout, stderr, exitCode] = await Promise.all([
+            process.stdout
+                .pipeThrough(new DecodeUtf8Stream())
+                .pipeThrough(new ConcatStringStream()),
+            process.stderr
+                .pipeThrough(new DecodeUtf8Stream())
+                .pipeThrough(new ConcatStringStream()),
+            process.exit,
+        ]);
+        return {
+            stdout,
+            stderr,
+            exitCode,
+        };
     }
 }
 //# sourceMappingURL=cmd.js.map

package/esm/cmd.js.map

@@ -1 +1 @@
-{"version":3,"file":"cmd.js","sourceRoot":"","sources":["../src/cmd.ts"],"names":[],"mappings":"AACA,OAAO,EACH,cAAc,EACd,UAAU,EACV,yBAAyB,EACzB,0BAA0B,GAC7B,MAAM,gBAAgB,CAAC;AAExB,MAAM,OAAO,GAAI,SAAQ,cAAc;IAC3B,gBAAgB,CAAU;IAC1B,YAAY,CAAU;IACtB,YAAY,CAAU;IACtB,gBAAgB,CAAU;IAElC,IAAW,eAAe;QACtB,OAAO,IAAI,CAAC,gBAAgB,CAAC;IACjC,CAAC;IACD,IAAW,WAAW;QAClB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IACD,IAAW,WAAW;QAClB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IACD,IAAW,eAAe;QACtB,OAAO,IAAI,CAAC,gBAAgB,CAAC;IACjC,CAAC;IAED,YAAmB,GAAQ;QACvB,KAAK,CAAC,GAAG,CAAC,CAAC;QACX,IAAI,CAAC,gBAAgB,GAAG,GAAG,CAAC,eAAe,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAChE,IAAI,CAAC,YAAY,GAAG,GAAG,CAAC,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACxD,IAAI,CAAC,YAAY,GAAG,GAAG,CAAC,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACxD,IAAI,CAAC,gBAAgB,GAAG,GAAG,CAAC,eAAe,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IACpE,CAAC;IAEM,KAAK,CAAC,KAAK,CACd,aAAsB,EACtB,OAAe,EACf,GAAG,IAAc;QAEjB,IAAI,WAAoB,CAAC;QACzB,IAAI,WAAW,GAAY,IAAI,CAAC,WAAW,CAAC;QAC5C,IAAI,OAAe,CAAC;QACpB,IAAI,QAA0C,CAAC;QAC/C,IAAI,aAAa,EAAE;YACf,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC;YAChC,WAAW,KAAK,IAAI,CAAC,eAAe,CAAC;YACrC,OAAO,GAAG,KAAK,CAAC;YAChB,QAAQ,GAAG,0BAA0B,CAAC;SACzC;aAAM;YACH,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC;YACpC,OAAO,GAAG,UAAU,CAAC;YACrB,QAAQ,GAAG,yBAAyB,CAAC;SACxC;QAED,IAAI,WAAW,EAAE;YACb,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,CACtC,GAAG,OAAO,IAAI,OAAO,KAAK,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAChD,CAAC;YACF,OAAO,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC;SAC/B;aAAM,IAAI,WAAW,EAAE;YACpB,OAAO,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;SACrE;aAAM;YACH,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;SACpC;IACL,CAAC;CACJ"}
+{"version":3,"file":"cmd.js","sourceRoot":"","sources":["../src/cmd.ts"],"names":[],"mappings":"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"}

package/esm/demo-mode.d.ts

@@ -13,10 +13,10 @@ 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 AdbCommandBase {
-    private settings;
+    #private;
     constructor(adb: Adb);
-    static readonly AllowedSettingKey = "sysui_demo_allowed";
-    static readonly EnabledSettingKey = "sysui_tuner_demo_on";
+    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>;

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;IACxC,OAAO,CAAC,QAAQ,CAAW;gBAEf,GAAG,EAAE,GAAG;IAKpB,gBAAuB,iBAAiB,wBAAwB;IAKhE,gBAAuB,iBAAiB,yBAAyB;IAEpD,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC;IAQ9B,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IASzC,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC;IAQ9B,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IASzC,SAAS,CAClB,OAAO,EAAE,MAAM,EACf,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC/B,OAAO,CAAC,IAAI,CAAC;IAmBH,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,CAC9B,KAAK,EAAE,sBAAsB,GAC9B,OAAO,CAAC,IAAI,CAAC;IAIH,iBAAiB,CAC1B,KAAK,EAAE,sBAAsB,GAC9B,OAAO,CAAC,IAAI,CAAC;IAkBH,uBAAuB,CAChC,KAAK,EAAE,sBAAsB,GAC9B,OAAO,CAAC,IAAI,CAAC;IAIH,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;CAQpE"}
+{"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"}

package/esm/demo-mode.js

@@ -13,7 +13,7 @@ export var DemoModeSignalStrength;
     DemoModeSignalStrength["Level2"] = "2";
     DemoModeSignalStrength["Level3"] = "3";
     DemoModeSignalStrength["Level4"] = "4";
-})(DemoModeSignalStrength = DemoModeSignalStrength || (DemoModeSignalStrength = {}));
+})(DemoModeSignalStrength || (DemoModeSignalStrength = {}));
 // 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",
@@ -41,40 +41,40 @@ export const DemoModeStatusBarModes = [
     "transparent",
     "warning",
 ];
-class DemoMode extends AdbCommandBase {
-    settings;
+export class DemoMode extends AdbCommandBase {
+    #settings;
     constructor(adb) {
         super(adb);
-        this.settings = new Settings(adb);
+        this.#settings = new Settings(adb);
     }
-    static AllowedSettingKey = "sysui_demo_allowed";
+    static ALLOWED_SETTING_KEY = "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
-    static EnabledSettingKey = "sysui_tuner_demo_on";
+    static ENABLED_SETTING_KEY = "sysui_tuner_demo_on";
     async getAllowed() {
-        const output = await this.settings.get("global", DemoMode.AllowedSettingKey);
-        return output.trim() === "1";
+        const output = await this.#settings.get("global", DemoMode.ALLOWED_SETTING_KEY);
+        return output === "1";
     }
     async setAllowed(value) {
         if (value) {
-            await this.settings.put("global", DemoMode.AllowedSettingKey, "1");
+            await this.#settings.put("global", DemoMode.ALLOWED_SETTING_KEY, "1");
         }
         else {
             await this.setEnabled(false);
-            await this.settings.delete("global", DemoMode.AllowedSettingKey);
+            await this.#settings.delete("global", DemoMode.ALLOWED_SETTING_KEY);
         }
     }
     async getEnabled() {
-        const result = await this.settings.get("global", DemoMode.EnabledSettingKey);
-        return result.trim() === "1";
+        const result = await this.#settings.get("global", DemoMode.ENABLED_SETTING_KEY);
+        return result === "1";
     }
     async setEnabled(value) {
         if (value) {
-            await this.settings.put("global", DemoMode.EnabledSettingKey, "1");
+            await this.#settings.put("global", DemoMode.ENABLED_SETTING_KEY, "1");
         }
         else {
-            await this.settings.delete("global", DemoMode.EnabledSettingKey);
+            await this.#settings.delete("global", DemoMode.ENABLED_SETTING_KEY);
             await this.broadcast("exit");
         }
     }
@@ -176,5 +176,4 @@ class DemoMode extends AdbCommandBase {
         });
     }
 }
-export { DemoMode };
 //# sourceMappingURL=demo-mode.js.map

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,43 @@
 import { AdbCommandBase } from "@yume-chan/adb";
 export declare class DumpSys extends AdbCommandBase {
+    diskStats(): Promise<{
+        dataFree: number | undefined;
+        dataTotal: number | undefined;
+        cacheFree: number | undefined;
+        cacheTotal: number | undefined;
+        systemFree: number | undefined;
+        systemTotal: number | undefined;
+    }>;
+    battery(): Promise<{
+        acPowered: boolean;
+        usbPowered: boolean;
+        wirelessPowered: boolean;
+        level: number | undefined;
+        scale: number | undefined;
+        voltage: number | undefined;
+        current: number | undefined;
+        status: DumpSys.Battery.Status | undefined;
+        health: DumpSys.Battery.Health | undefined;
+    }>;
+}
+export declare namespace DumpSys {
+    namespace Battery {
+        enum Status {
+            Unknown = 1,
+            Charging = 2,
+            Discharging = 3,
+            NotCharging = 4,
+            Full = 5
+        }
+        enum Health {
+            Unknown = 1,
+            Good = 2,
+            Overheat = 3,
+            Dead = 4,
+            OverVoltage = 5,
+            UnspecifiedFailure = 6,
+            Cold = 7
+        }
+    }
 }
 //# sourceMappingURL=dumpsys.d.ts.map