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

package/src/settings.ts

@@ -1,7 +1,6 @@
 import type { Adb } from "@yume-chan/adb";
-import { AdbServiceBase } from "@yume-chan/adb";
 
-import { CmdNoneProtocolService } from "./cmd.js";
+import { Cmd } from "./cmd/index.js";
 import type { SingleUser } from "./utils.js";
 
 export type SettingsNamespace = "system" | "secure" | "global";
@@ -25,15 +24,14 @@ export interface SettingsPutOptions extends SettingsOptions {
 }
 
 // frameworks/base/packages/SettingsProvider/src/com/android/providers/settings/SettingsService.java
-export class Settings extends AdbServiceBase {
+export class Settings {
     static ServiceName = "settings";
     static CommandName = "settings";
 
-    #cmd: CmdNoneProtocolService;
+    readonly #cmd: Cmd.NoneProtocolService;
 
     constructor(adb: Adb) {
-        super(adb);
-        this.#cmd = new CmdNoneProtocolService(adb, Settings.CommandName);
+        this.#cmd = Cmd.createNoneProtocol(adb, Settings.CommandName);
     }
 
     base(
@@ -42,16 +40,19 @@ export class Settings extends AdbServiceBase {
         options: SettingsOptions | undefined,
         ...args: string[]
     ): Promise<string> {
-        let command = [Settings.ServiceName];
+        const command = [Settings.ServiceName];
 
         if (options?.user !== undefined) {
             command.push("--user", options.user.toString());
         }
 
         command.push(verb, namespace);
-        command = command.concat(args);
 
-        return this.#cmd.spawnWaitText(command);
+        for (const arg of args) {
+            command.push(arg);
+        }
+
+        return this.#cmd.spawn(command).wait().toString();
     }
 
     async get(
@@ -61,7 +62,7 @@ export class Settings extends AdbServiceBase {
     ): Promise<string> {
         const output = await this.base("get", namespace, options, key);
         // Remove last \n
-        return output.substring(0, output.length - 1);
+        return output.endsWith("\n") ? output.slice(0, -1) : output;
     }
 
     async delete(

package/src/utils.ts

@@ -1,4 +1,4 @@
-export function buildArguments<T>(
+export function buildCommand<T>(
     commands: readonly string[],
     options: Partial<T> | undefined,
     map: Partial<Record<keyof T, string>>,
@@ -6,19 +6,34 @@ export function buildArguments<T>(
     const args = commands.slice();
     if (options) {
         for (const [key, value] of Object.entries(options)) {
-            if (value) {
-                const option = map[key as keyof T];
-                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 as keyof T];
+            // 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}`,
+                    );
             }
         }
     }
@@ -27,3 +42,5 @@ export function buildArguments<T>(
 
 export type SingleUser = number | "current";
 export type SingleUserOrAll = SingleUser | "all";
+
+export type Optional<T extends object> = { [K in keyof T]?: T[K] | undefined };

package/tsconfig.build.json

@@ -1,14 +1,3 @@
 {
     "extends": "./node_modules/@yume-chan/tsconfig/tsconfig.base.json",
-    "references": [
-        {
-            "path": "../adb/tsconfig.build.json"
-        },
-        {
-            "path": "../stream-extra/tsconfig.build.json"
-        },
-        {
-            "path": "../struct/tsconfig.build.json"
-        }
-    ]
 }

package/CHANGELOG.md

@@ -1,181 +0,0 @@
-# Change Log - @yume-chan/android-bin
-
-## 2.1.0
-
-### Patch Changes
-
-- Updated dependencies [40a60ca]
-- Updated dependencies [a835eb8]
-- Updated dependencies [dbcfd34]
-    - @yume-chan/stream-extra@2.1.0
-    - @yume-chan/adb@2.1.0
-
-## 2.0.1
-
-### Patch Changes
-
-- Updated dependencies [0bcb9b8]
-    - @yume-chan/struct@2.0.1
-    - @yume-chan/adb@2.0.1
-    - @yume-chan/stream-extra@2.0.1
-
-## 2.0.0
-
-### Major Changes
-
-- Redesign subprocess API
-
-### Minor Changes
-
-- 0f29501: Add `PackageManager.prototype.getPackages` method to get apk paths
-
-### Patch Changes
-
-- Updated dependencies
-- Updated dependencies [05c01ad]
-- Updated dependencies [b79df96]
-    - @yume-chan/adb@2.0.0
-    - @yume-chan/struct@2.0.0
-    - @yume-chan/stream-extra@2.0.0
-
-## 1.1.0
-
-### Patch Changes
-
-- Updated dependencies [ab98953]
-    - @yume-chan/adb@1.1.0
-
-## 1.0.1
-
-### Patch Changes
-
-- 53688d3: Use PNPM workspace and Changesets to manage the monorepo.
-
-    Because Changesets doesn't support alpha versions (`0.x.x`), this version is `1.0.0`. Future versions will follow SemVer rules, for example, breaking API changes will introduce a new major version.
-
-- Updated dependencies [53688d3]
-- Updated dependencies [db8466f]
-- Updated dependencies [db8466f]
-- Updated dependencies [ea5002b]
-- Updated dependencies [db8466f]
-    - @yume-chan/stream-extra@1.0.1
-    - @yume-chan/struct@1.0.1
-    - @yume-chan/adb@1.0.1
-
-This log was last generated on Tue, 18 Jun 2024 02:49:43 GMT and should not be manually modified.
-
-## 0.0.24
-
-Tue, 18 Jun 2024 02:49:43 GMT
-
-### Updates
-
-- Allow streams to accept both `Uint8Array` and `Consumable<Uint8Array>` as inputs
-- Add all supported fields to `DumpSys.Battery.Info`
-
-## 0.0.23
-
-Thu, 21 Mar 2024 03:15:10 GMT
-
-### Updates
-
-- Add support for pm install session
-
-## 0.0.22
-
-Wed, 13 Dec 2023 05:57:27 GMT
-
-### Updates
-
-- Add wrapper for `pm uninstall`
-- Change `PackageManager#listPackages` to return an async generator
-- Add wrapper for `am start`
-- Add wrapper for `pm resolve-activity`
-- Add `status` and `health` fields to `DumpSys#battery`
-
-## 0.0.21
-
-Fri, 25 Aug 2023 14:05:18 GMT
-
-### Updates
-
-- Add wrapper for `bu`
-- Remove the last `\n` from `Settings#get`
-- Add wrappers for `dumpsys diskstats` and `dumpsys battery`
-- Add wrapper for `pm list packages`
-- Rewrite `Settings` to use `Cmd` if available
-- Add support to stop `bugreport`
-- Merge `bugreport` and `bugreportz` wrappers, providing an `automatic` method to choose the best available bugreport method
-
-## 0.0.20
-
-Mon, 05 Jun 2023 02:51:41 GMT
-
-_Version update only_
-
-## 0.0.19
-
-Sun, 09 Apr 2023 05:55:33 GMT
-
-### Updates
-
-- Add wrapper for `cmd`, with support for Android Binder Bridge (abb)
-- Add `OverlayDisplay` wrapper for managing overlay displays
-
-## 0.0.18
-
-Wed, 25 Jan 2023 21:33:49 GMT
-
-_Version update only_
-
-## 0.0.17
-
-Tue, 18 Oct 2022 09:32:30 GMT
-
-### Updates
-
-- Update to use new stream util package
-
-## 0.0.16
-
-Sat, 28 May 2022 03:56:37 GMT
-
-### Updates
-
-- Upgrade TypeScript to 4.7.2 to enable Node.js ESM
-- Improve performance of `Logcat#binary()` by up to 150%
-
-## 0.0.15
-
-Mon, 02 May 2022 04:18:01 GMT
-
-_Version update only_
-
-## 0.0.14
-
-Sat, 30 Apr 2022 14:05:48 GMT
-
-_Version update only_
-
-## 0.0.13
-
-Thu, 28 Apr 2022 01:23:53 GMT
-
-### Updates
-
-- Add support for bugreport/bugreportz
-- Add basic support for logcat
-
-## 0.0.12
-
-Sun, 03 Apr 2022 11:18:47 GMT
-
-_Version update only_
-
-## 0.0.11
-
-Sun, 03 Apr 2022 10:54:15 GMT
-
-### Updates
-
-- Improve compatibility with Node.js 12 ESM format

package/esm/cmd.d.ts

@@ -1,23 +0,0 @@
-import type { Adb } from "@yume-chan/adb";
-import { AdbNoneProtocolSpawner, AdbServiceBase, AdbShellProtocolSpawner } from "@yume-chan/adb";
-export declare class CmdNoneProtocolService extends AdbNoneProtocolSpawner {
-    #private;
-    get supportsAbbExec(): boolean;
-    get supportsCmd(): boolean;
-    get isSupported(): boolean;
-    constructor(adb: Adb, fallback?: string | Record<string, string> | ((service: string) => string));
-}
-export declare class CmdShellProtocolService extends AdbShellProtocolSpawner {
-    #private;
-    get supportsCmd(): boolean;
-    get supportsAbb(): boolean;
-    get isSupported(): boolean;
-    constructor(adb: Adb, fallback?: string | Record<string, string> | ((service: string) => string));
-}
-export declare class Cmd extends AdbServiceBase {
-    #private;
-    get noneProtocol(): CmdNoneProtocolService | undefined;
-    get shellProtocol(): CmdShellProtocolService | undefined;
-    constructor(adb: Adb, fallback?: string | Record<string, string> | ((service: string) => string));
-}
-//# sourceMappingURL=cmd.d.ts.map

package/esm/cmd.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cmd.d.ts","sourceRoot":"","sources":["../src/cmd.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAA2B,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAGH,sBAAsB,EACtB,cAAc,EAEd,uBAAuB,EAC1B,MAAM,gBAAgB,CAAC;AAExB,qBAAa,sBAAuB,SAAQ,sBAAsB;;IAE9D,IAAI,eAAe,IAAI,OAAO,CAE7B;IAGD,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,IAAI,WAAW,YAEd;gBAGG,GAAG,EAAE,GAAG,EACR,QAAQ,CAAC,EACH,MAAM,GACN,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACtB,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC;CAiC1C;AAED,qBAAa,uBAAwB,SAAQ,uBAAuB;;IAIhE,IAAI,WAAW,IAAI,OAAO,CAEzB;IAGD,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,IAAI,WAAW,YAKd;gBAGG,GAAG,EAAE,GAAG,EACR,QAAQ,CAAC,EACH,MAAM,GACN,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACtB,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC;CAsC1C;AAED,qBAAa,GAAI,SAAQ,cAAc;;IAEnC,IAAI,YAAY,uCAEf;IAGD,IAAI,aAAa,wCAEhB;gBAGG,GAAG,EAAE,GAAG,EACR,QAAQ,CAAC,EACH,MAAM,GACN,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACtB,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,CAAC;CAmB1C"}

package/esm/cmd.js

@@ -1,104 +0,0 @@
-import { AdbFeature, AdbNoneProtocolProcessImpl, AdbNoneProtocolSpawner, AdbServiceBase, AdbShellProtocolProcessImpl, AdbShellProtocolSpawner, } from "@yume-chan/adb";
-export class CmdNoneProtocolService extends AdbNoneProtocolSpawner {
-    #supportsAbbExec;
-    get supportsAbbExec() {
-        return this.#supportsAbbExec;
-    }
-    #supportsCmd;
-    get supportsCmd() {
-        return this.#supportsCmd;
-    }
-    get isSupported() {
-        return this.#supportsAbbExec || this.#supportsCmd;
-    }
-    constructor(adb, fallback) {
-        super(async (command) => {
-            if (this.#supportsAbbExec) {
-                return new AdbNoneProtocolProcessImpl(await adb.createSocket(`abb_exec:${command.join("\0")}\0`));
-            }
-            if (this.#supportsCmd) {
-                return adb.subprocess.noneProtocol.spawn(`cmd ${command.join(" ")}`);
-            }
-            if (typeof fallback === "function") {
-                fallback = fallback(command[0]);
-            }
-            else if (typeof fallback === "object") {
-                fallback = fallback[command[0]];
-            }
-            if (!fallback) {
-                throw new Error("Unsupported");
-            }
-            const fallbackCommand = command.slice();
-            fallbackCommand[0] = fallback;
-            return adb.subprocess.noneProtocol.spawn(fallbackCommand);
-        });
-        this.#supportsCmd = adb.canUseFeature(AdbFeature.Cmd);
-        this.#supportsAbbExec = adb.canUseFeature(AdbFeature.AbbExec);
-    }
-}
-export class CmdShellProtocolService extends AdbShellProtocolSpawner {
-    #adb;
-    #supportsCmd;
-    get supportsCmd() {
-        return this.#supportsCmd;
-    }
-    #supportsAbb;
-    get supportsAbb() {
-        return this.#supportsAbb;
-    }
-    get isSupported() {
-        return (this.#supportsAbb ||
-            (this.#supportsCmd && !!this.#adb.subprocess.shellProtocol));
-    }
-    constructor(adb, fallback) {
-        super(async (command) => {
-            if (this.#supportsAbb) {
-                return new AdbShellProtocolProcessImpl(await this.#adb.createSocket(`abb:${command.join("\0")}\0`));
-            }
-            if (!adb.subprocess.shellProtocol) {
-                throw new Error("Unsupported");
-            }
-            if (this.#supportsCmd) {
-                return adb.subprocess.shellProtocol.spawn(`cmd ${command.join(" ")}`);
-            }
-            if (typeof fallback === "function") {
-                fallback = fallback(command[0]);
-            }
-            else if (typeof fallback === "object") {
-                fallback = fallback[command[0]];
-            }
-            if (!fallback) {
-                throw new Error("Unsupported");
-            }
-            const fallbackCommand = command.slice();
-            fallbackCommand[0] = fallback;
-            return adb.subprocess.shellProtocol.spawn(fallbackCommand);
-        });
-        this.#adb = adb;
-        this.#supportsCmd = adb.canUseFeature(AdbFeature.Cmd);
-        this.#supportsAbb = adb.canUseFeature(AdbFeature.Abb);
-    }
-}
-export class Cmd extends AdbServiceBase {
-    #noneProtocol;
-    get noneProtocol() {
-        return this.#noneProtocol;
-    }
-    #shellProtocol;
-    get shellProtocol() {
-        return this.#shellProtocol;
-    }
-    constructor(adb, fallback) {
-        super(adb);
-        if (adb.canUseFeature(AdbFeature.AbbExec) ||
-            adb.canUseFeature(AdbFeature.Cmd)) {
-            this.#noneProtocol = new CmdNoneProtocolService(adb, fallback);
-        }
-        if (adb.canUseFeature(AdbFeature.Abb) ||
-            (adb.canUseFeature(AdbFeature.Cmd) &&
-                adb.canUseFeature(AdbFeature.ShellV2))) {
-            this.#shellProtocol = new CmdShellProtocolService(adb, fallback);
-        }
-    }
-}
-//# sourceMappingURL=cmd.js.map

package/esm/cmd.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"cmd.js","sourceRoot":"","sources":["../src/cmd.ts"],"names":[],"mappings":"AACA,OAAO,EACH,UAAU,EACV,0BAA0B,EAC1B,sBAAsB,EACtB,cAAc,EACd,2BAA2B,EAC3B,uBAAuB,GAC1B,MAAM,gBAAgB,CAAC;AAExB,MAAM,OAAO,sBAAuB,SAAQ,sBAAsB;IAC9D,gBAAgB,CAAU;IAC1B,IAAI,eAAe;QACf,OAAO,IAAI,CAAC,gBAAgB,CAAC;IACjC,CAAC;IAED,YAAY,CAAU;IACtB,IAAI,WAAW;QACX,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAED,IAAI,WAAW;QACX,OAAO,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,YAAY,CAAC;IACtD,CAAC;IAED,YACI,GAAQ,EACR,QAGmC;QAEnC,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;YACpB,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACxB,OAAO,IAAI,0BAA0B,CACjC,MAAM,GAAG,CAAC,YAAY,CAAC,YAAY,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAC7D,CAAC;YACN,CAAC;YAED,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;gBACpB,OAAO,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,KAAK,CACpC,OAAO,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAC7B,CAAC;YACN,CAAC;YAED,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE,CAAC;gBACjC,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAE,CAAC,CAAC;YACrC,CAAC;iBAAM,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;gBACtC,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAE,CAAC,CAAC;YACrC,CAAC;YAED,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACZ,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;YACnC,CAAC;YAED,MAAM,eAAe,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;YACxC,eAAe,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC;YAC9B,OAAO,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY,GAAG,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACtD,IAAI,CAAC,gBAAgB,GAAG,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAClE,CAAC;CACJ;AAED,MAAM,OAAO,uBAAwB,SAAQ,uBAAuB;IAChE,IAAI,CAAM;IAEV,YAAY,CAAU;IACtB,IAAI,WAAW;QACX,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAED,YAAY,CAAU;IACtB,IAAI,WAAW;QACX,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAED,IAAI,WAAW;QACX,OAAO,CACH,IAAI,CAAC,YAAY;YACjB,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,CAC9D,CAAC;IACN,CAAC;IAED,YACI,GAAQ,EACR,QAGmC;QAEnC,KAAK,CAAC,KAAK,EAAE,OAAO,EAAoC,EAAE;YACtD,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;gBACpB,OAAO,IAAI,2BAA2B,CAClC,MAAM,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAC9D,CAAC;YACN,CAAC;YAED,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC;gBAChC,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;YACnC,CAAC;YAED,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;gBACpB,OAAO,GAAG,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,CACrC,OAAO,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAC7B,CAAC;YACN,CAAC;YAED,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE,CAAC;gBACjC,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAE,CAAC,CAAC;YACrC,CAAC;iBAAM,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;gBACtC,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAE,CAAC,CAAC;YACrC,CAAC;YAED,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACZ,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;YACnC,CAAC;YAED,MAAM,eAAe,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;YACxC,eAAe,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC;YAC9B,OAAO,GAAG,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;QAChB,IAAI,CAAC,YAAY,GAAG,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACtD,IAAI,CAAC,YAAY,GAAG,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAC1D,CAAC;CACJ;AAED,MAAM,OAAO,GAAI,SAAQ,cAAc;IACnC,aAAa,CAAqC;IAClD,IAAI,YAAY;QACZ,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IAED,cAAc,CAAsC;IACpD,IAAI,aAAa;QACb,OAAO,IAAI,CAAC,cAAc,CAAC;IAC/B,CAAC;IAED,YACI,GAAQ,EACR,QAGmC;QAEnC,KAAK,CAAC,GAAG,CAAC,CAAC;QAEX,IACI,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC;YACrC,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC,GAAG,CAAC,EACnC,CAAC;YACC,IAAI,CAAC,aAAa,GAAG,IAAI,sBAAsB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACnE,CAAC;QAED,IACI,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC,GAAG,CAAC;YACjC,CAAC,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC,GAAG,CAAC;gBAC9B,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,EAC5C,CAAC;YACC,IAAI,CAAC,cAAc,GAAG,IAAI,uBAAuB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACrE,CAAC;IACL,CAAC;CACJ"}

package/src/cmd.ts

@@ -1,166 +0,0 @@
-import type { Adb, AdbShellProtocolProcess } from "@yume-chan/adb";
-import {
-    AdbFeature,
-    AdbNoneProtocolProcessImpl,
-    AdbNoneProtocolSpawner,
-    AdbServiceBase,
-    AdbShellProtocolProcessImpl,
-    AdbShellProtocolSpawner,
-} from "@yume-chan/adb";
-
-export class CmdNoneProtocolService extends AdbNoneProtocolSpawner {
-    #supportsAbbExec: boolean;
-    get supportsAbbExec(): boolean {
-        return this.#supportsAbbExec;
-    }
-
-    #supportsCmd: boolean;
-    get supportsCmd(): boolean {
-        return this.#supportsCmd;
-    }
-
-    get isSupported() {
-        return this.#supportsAbbExec || this.#supportsCmd;
-    }
-
-    constructor(
-        adb: Adb,
-        fallback?:
-            | string
-            | Record<string, string>
-            | ((service: string) => string),
-    ) {
-        super(async (command) => {
-            if (this.#supportsAbbExec) {
-                return new AdbNoneProtocolProcessImpl(
-                    await adb.createSocket(`abb_exec:${command.join("\0")}\0`),
-                );
-            }
-
-            if (this.#supportsCmd) {
-                return adb.subprocess.noneProtocol.spawn(
-                    `cmd ${command.join(" ")}`,
-                );
-            }
-
-            if (typeof fallback === "function") {
-                fallback = fallback(command[0]!);
-            } else if (typeof fallback === "object") {
-                fallback = fallback[command[0]!];
-            }
-
-            if (!fallback) {
-                throw new Error("Unsupported");
-            }
-
-            const fallbackCommand = command.slice();
-            fallbackCommand[0] = fallback;
-            return adb.subprocess.noneProtocol.spawn(fallbackCommand);
-        });
-
-        this.#supportsCmd = adb.canUseFeature(AdbFeature.Cmd);
-        this.#supportsAbbExec = adb.canUseFeature(AdbFeature.AbbExec);
-    }
-}
-
-export class CmdShellProtocolService extends AdbShellProtocolSpawner {
-    #adb: Adb;
-
-    #supportsCmd: boolean;
-    get supportsCmd(): boolean {
-        return this.#supportsCmd;
-    }
-
-    #supportsAbb: boolean;
-    get supportsAbb(): boolean {
-        return this.#supportsAbb;
-    }
-
-    get isSupported() {
-        return (
-            this.#supportsAbb ||
-            (this.#supportsCmd && !!this.#adb.subprocess.shellProtocol)
-        );
-    }
-
-    constructor(
-        adb: Adb,
-        fallback?:
-            | string
-            | Record<string, string>
-            | ((service: string) => string),
-    ) {
-        super(async (command): Promise<AdbShellProtocolProcess> => {
-            if (this.#supportsAbb) {
-                return new AdbShellProtocolProcessImpl(
-                    await this.#adb.createSocket(`abb:${command.join("\0")}\0`),
-                );
-            }
-
-            if (!adb.subprocess.shellProtocol) {
-                throw new Error("Unsupported");
-            }
-
-            if (this.#supportsCmd) {
-                return adb.subprocess.shellProtocol.spawn(
-                    `cmd ${command.join(" ")}`,
-                );
-            }
-
-            if (typeof fallback === "function") {
-                fallback = fallback(command[0]!);
-            } else if (typeof fallback === "object") {
-                fallback = fallback[command[0]!];
-            }
-
-            if (!fallback) {
-                throw new Error("Unsupported");
-            }
-
-            const fallbackCommand = command.slice();
-            fallbackCommand[0] = fallback;
-            return adb.subprocess.shellProtocol.spawn(fallbackCommand);
-        });
-
-        this.#adb = adb;
-        this.#supportsCmd = adb.canUseFeature(AdbFeature.Cmd);
-        this.#supportsAbb = adb.canUseFeature(AdbFeature.Abb);
-    }
-}
-
-export class Cmd extends AdbServiceBase {
-    #noneProtocol: CmdNoneProtocolService | undefined;
-    get noneProtocol() {
-        return this.#noneProtocol;
-    }
-
-    #shellProtocol: CmdShellProtocolService | undefined;
-    get shellProtocol() {
-        return this.#shellProtocol;
-    }
-
-    constructor(
-        adb: Adb,
-        fallback?:
-            | string
-            | Record<string, string>
-            | ((service: string) => string),
-    ) {
-        super(adb);
-
-        if (
-            adb.canUseFeature(AdbFeature.AbbExec) ||
-            adb.canUseFeature(AdbFeature.Cmd)
-        ) {
-            this.#noneProtocol = new CmdNoneProtocolService(adb, fallback);
-        }
-
-        if (
-            adb.canUseFeature(AdbFeature.Abb) ||
-            (adb.canUseFeature(AdbFeature.Cmd) &&
-                adb.canUseFeature(AdbFeature.ShellV2))
-        ) {
-            this.#shellProtocol = new CmdShellProtocolService(adb, fallback);
-        }
-    }
-}