@yume-chan/adb 2.6.0 → 3.0.0-beta.0

package/esm/{commands → service}/power.d.ts

@@ -1,5 +1,7 @@
-import { AdbServiceBase } from "./base.js";
-export declare class AdbPower extends AdbServiceBase {
+import type { Adb } from "../adb.js";
+export declare class AdbPowerService {
+    #private;
+    constructor(adb: Adb);
     reboot(mode?: string): Promise<string>;
     bootloader(): Promise<string>;
     fastboot(): Promise<string>;

package/esm/service/power.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"power.d.ts","sourceRoot":"","sources":["../../src/service/power.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAErC,qBAAa,eAAe;;gBAGZ,GAAG,EAAE,GAAG;IAIpB,MAAM,CAAC,IAAI,SAAK;IAIhB,UAAU;IAIV,QAAQ;IAIR,QAAQ;IAIR,QAAQ;IAIR;;;;OAIG;IACH,eAAe;IAIf,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC;IAO3B,WAAW,CAAC,SAAS,UAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IAU/C;;;;OAIG;IACH,WAAW;CAGd"}

package/esm/{commands → service}/power.js

@@ -2,10 +2,13 @@
 // cspell: ignore fastboot
 // cspell: ignore keyevent
 // cspell: ignore longpress
-import { AdbServiceBase } from "./base.js";
-export class AdbPower extends AdbServiceBase {
+export class AdbPowerService {
+    #adb;
+    constructor(adb) {
+        this.#adb = adb;
+    }
     reboot(mode = "") {
-        return this.adb.createSocketAndWait(`reboot:${mode}`);
+        return this.#adb.createSocketAndWait(`reboot:${mode}`);
     }
     bootloader() {
         return this.reboot("bootloader");
@@ -28,7 +31,10 @@ export class AdbPower extends AdbServiceBase {
         return this.reboot("edl");
     }
     powerOff() {
-        return this.adb.subprocess.noneProtocol.spawnWaitText(["reboot", "-p"]);
+        return this.#adb.subprocess.noneProtocol
+            .spawn(["reboot", "-p"])
+            .wait()
+            .toString();
     }
     powerButton(longPress = false) {
         const args = ["input", "keyevent"];
@@ -36,7 +42,7 @@ export class AdbPower extends AdbServiceBase {
             args.push("--longpress");
         }
         args.push("POWER");
-        return this.adb.subprocess.noneProtocol.spawnWaitText(args);
+        return this.#adb.subprocess.noneProtocol.spawn(args).wait().toString();
     }
     /**
      * Reboot to Samsung Odin download mode.

package/esm/service/power.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"power.js","sourceRoot":"","sources":["../../src/service/power.ts"],"names":[],"mappings":"AAAA,4BAA4B;AAC5B,0BAA0B;AAC1B,0BAA0B;AAC1B,2BAA2B;AAI3B,MAAM,OAAO,eAAe;IACf,IAAI,CAAM;IAEnB,YAAY,GAAQ;QAChB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;IACpB,CAAC;IAED,MAAM,CAAC,IAAI,GAAG,EAAE;QACZ,OAAO,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC;IAC3D,CAAC;IAED,UAAU;QACN,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IACrC,CAAC;IAED,QAAQ;QACJ,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACnC,CAAC;IAED,QAAQ;QACJ,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACnC,CAAC;IAED,QAAQ;QACJ,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACnC,CAAC;IAED;;;;OAIG;IACH,eAAe;QACX,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IAED,QAAQ;QACJ,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY;aACnC,KAAK,CAAC,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;aACvB,IAAI,EAAE;aACN,QAAQ,EAAE,CAAC;IACpB,CAAC;IAED,WAAW,CAAC,SAAS,GAAG,KAAK;QACzB,MAAM,IAAI,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QACnC,IAAI,SAAS,EAAE,CAAC;YACZ,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC7B,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEnB,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC;IAC3E,CAAC;IAED;;;;OAIG;IACH,WAAW;QACP,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACnC,CAAC;CACJ"}

package/esm/service/reverse/error.d.ts

@@ -0,0 +1,14 @@
+declare const AdbReverseErrorBrand: unique symbol;
+export declare class AdbReverseError extends Error {
+    [AdbReverseErrorBrand]: boolean;
+    static [Symbol.hasInstance](value: unknown): boolean;
+    constructor(message: string);
+}
+declare const AdbReverseNotSupportedErrorBrand: unique symbol;
+export declare class AdbReverseNotSupportedError extends AdbReverseError {
+    [AdbReverseNotSupportedErrorBrand]: boolean;
+    static [Symbol.hasInstance](value: unknown): boolean;
+    constructor();
+}
+export {};
+//# sourceMappingURL=error.d.ts.map

package/esm/service/reverse/error.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../../../src/service/reverse/error.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,oBAAoB,eAAsC,CAAC;AAEjE,qBAAa,eAAgB,SAAQ,KAAK;IACtC,CAAC,oBAAoB,CAAC,UAAQ;WAEd,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,KAAK,EAAE,OAAO;gBAMvC,OAAO,EAAE,MAAM;CAG9B;AAED,QAAA,MAAM,gCAAgC,eAErC,CAAC;AAEF,qBAAa,2BAA4B,SAAQ,eAAe;IAC5D,CAAC,gCAAgC,CAAC,UAAQ;WAE1B,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,KAAK,EAAE,OAAO;;CAWtD"}

package/esm/service/reverse/error.js

@@ -0,0 +1,21 @@
+const AdbReverseErrorBrand = Symbol.for("AdbReverseError.brand");
+export class AdbReverseError extends Error {
+    [AdbReverseErrorBrand] = true;
+    static [Symbol.hasInstance](value) {
+        return !!value?.[AdbReverseErrorBrand];
+    }
+    constructor(message) {
+        super(message);
+    }
+}
+const AdbReverseNotSupportedErrorBrand = Symbol.for("AdbReverseNotSupportedError.brand");
+export class AdbReverseNotSupportedError extends AdbReverseError {
+    [AdbReverseNotSupportedErrorBrand] = true;
+    static [Symbol.hasInstance](value) {
+        return !!value?.[AdbReverseNotSupportedErrorBrand];
+    }
+    constructor() {
+        super("ADB reverse tunnel is not supported on this device when connected wirelessly.");
+    }
+}
+//# sourceMappingURL=error.js.map

package/esm/service/reverse/error.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../src/service/reverse/error.ts"],"names":[],"mappings":"AAAA,MAAM,oBAAoB,GAAG,MAAM,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;AAEjE,MAAM,OAAO,eAAgB,SAAQ,KAAK;IACtC,CAAC,oBAAoB,CAAC,GAAG,IAAI,CAAC;IAE9B,MAAM,CAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,KAAc;QAC/C,OAAO,CAAC,CAAE,KAAiD,EAAE,CACzD,oBAAoB,CACvB,CAAC;IACN,CAAC;IAED,YAAY,OAAe;QACvB,KAAK,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;CACJ;AAED,MAAM,gCAAgC,GAAG,MAAM,CAAC,GAAG,CAC/C,mCAAmC,CACtC,CAAC;AAEF,MAAM,OAAO,2BAA4B,SAAQ,eAAe;IAC5D,CAAC,gCAAgC,CAAC,GAAG,IAAI,CAAC;IAE1C,MAAM,CAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,KAAc;QAC/C,OAAO,CAAC,CAAE,KAAiD,EAAE,CACzD,gCAAgC,CACnC,CAAC;IACN,CAAC;IAED;QACI,KAAK,CACD,+EAA+E,CAClF,CAAC;IACN,CAAC;CACJ"}

package/esm/service/reverse/index.d.ts

@@ -0,0 +1,3 @@
+export * from "./error.js";
+export * from "./service.js";
+//# sourceMappingURL=index.d.ts.map

package/esm/service/reverse/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/reverse/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC"}

package/esm/service/reverse/index.js

@@ -0,0 +1,4 @@
+export * from "./error.js";
+export * from "./service.js";
+// `response.ts` is internal
+//# sourceMappingURL=index.js.map

package/esm/service/reverse/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/service/reverse/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,4BAA4B"}

package/esm/service/reverse/response.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=response.d.ts.map

package/esm/service/reverse/response.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"response.d.ts","sourceRoot":"","sources":["../../../src/service/reverse/response.ts"],"names":[],"mappings":""}

package/esm/service/reverse/response.js

@@ -0,0 +1,30 @@
+import { extend, string, struct } from "@yume-chan/struct";
+import { AdbReverseError, AdbReverseNotSupportedError } from "./error.js";
+/** @internal exported for tests */
+export const AdbReverseStringResponse = struct({
+    length: string(4),
+    content: string({
+        field: "length",
+        convert(value) {
+            return Number.parseInt(value, 16);
+        },
+        back(value) {
+            return value.toString(16).padStart(4, "0");
+        },
+    }),
+}, { littleEndian: true });
+/** @internal exported for tests */
+export const AdbReverseErrorResponse = extend(AdbReverseStringResponse, {}, {
+    postDeserialize(value) {
+        // https://issuetracker.google.com/issues/37066218
+        // ADB on Android <9 can't create reverse tunnels when connected wirelessly (ADB over Wi-Fi),
+        // and returns this confusing "more than one device/emulator" error.
+        if (value.content === "more than one device/emulator") {
+            throw new AdbReverseNotSupportedError();
+        }
+        else {
+            throw new AdbReverseError(value.content);
+        }
+    },
+});
+//# sourceMappingURL=response.js.map

package/esm/service/reverse/response.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"response.js","sourceRoot":"","sources":["../../../src/service/reverse/response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3D,OAAO,EAAE,eAAe,EAAE,2BAA2B,EAAE,MAAM,YAAY,CAAC;AAE1E,mCAAmC;AACnC,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAC1C;IACI,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,QAAQ;QACf,OAAO,CAAC,KAAa;YACjB,OAAO,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACtC,CAAC;QACD,IAAI,CAAC,KAAK;YACN,OAAO,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QAC/C,CAAC;KACJ,CAAC;CACL,EACD,EAAE,YAAY,EAAE,IAAI,EAAE,CACzB,CAAC;AAEF,mCAAmC;AACnC,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CACzC,wBAAwB,EACxB,EAAE,EACF;IACI,eAAe,CAAC,KAAK;QACjB,kDAAkD;QAClD,6FAA6F;QAC7F,oEAAoE;QACpE,IAAI,KAAK,CAAC,OAAO,KAAK,+BAA+B,EAAE,CAAC;YACpD,MAAM,IAAI,2BAA2B,EAAE,CAAC;QAC5C,CAAC;aAAM,CAAC;YACJ,MAAM,IAAI,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC7C,CAAC;IACL,CAAC;CACJ,CACJ,CAAC"}

package/esm/service/reverse/service.d.ts

@@ -0,0 +1,59 @@
+import { BufferedReadableStream } from "@yume-chan/stream-extra";
+import type { Adb } from "../../adb.js";
+export declare class AdbReverseService {
+    #private;
+    static readonly StringResponse: import("@yume-chan/struct").Struct<{
+        length: import("@yume-chan/struct").Field<string, never, never, string> & {
+            as: <T>(infer: T) => import("@yume-chan/struct").Field<T, never, never>;
+        };
+        content: import("@yume-chan/struct").Field<string, "length", Record<"length", string>, string> & {
+            as: <T>(infer: T) => import("@yume-chan/struct").Field<T, "length", Record<"length", string>, T>;
+        };
+    }, undefined, import("@yume-chan/struct").FieldsValue<{
+        length: import("@yume-chan/struct").Field<string, never, never, string> & {
+            as: <T>(infer: T) => import("@yume-chan/struct").Field<T, never, never>;
+        };
+        content: import("@yume-chan/struct").Field<string, "length", Record<"length", string>, string> & {
+            as: <T>(infer: T) => import("@yume-chan/struct").Field<T, "length", Record<"length", string>, T>;
+        };
+    }>>;
+    static readonly ErrorResponse: import("@yume-chan/struct").Struct<{
+        length: import("@yume-chan/struct").Field<string, never, never, string> & {
+            as: <T>(infer: T) => import("@yume-chan/struct").Field<T, never, never>;
+        };
+        content: import("@yume-chan/struct").Field<string, "length", Record<"length", string>, string> & {
+            as: <T>(infer: T) => import("@yume-chan/struct").Field<T, "length", Record<"length", string>, T>;
+        };
+    }, undefined, never>;
+    constructor(adb: Adb);
+    protected createBufferedStream(service: string): Promise<BufferedReadableStream>;
+    protected sendRequest(service: string): Promise<BufferedReadableStream>;
+    /**
+     * Get a list of all reverse port forwarding on the device.
+     */
+    list(): Promise<AdbReverseService.Listener[]>;
+    /**
+     * Add a reverse port forwarding for a program that already listens on a port.
+     */
+    addExternal(deviceAddress: string, localAddress: string): Promise<string>;
+    /**
+     * Add a reverse port forwarding.
+     */
+    add(deviceAddress: string, handler: Adb.IncomingSocketHandler, localAddress?: string): Promise<string>;
+    /**
+     * Remove a reverse port forwarding.
+     */
+    remove(deviceAddress: string): Promise<void>;
+    /**
+     * Remove all reverse port forwarding, including the ones added by other programs.
+     */
+    removeAll(): Promise<void>;
+}
+export declare namespace AdbReverseService {
+    interface Listener {
+        deviceSerial: string;
+        localName: string;
+        remoteName: string;
+    }
+}
+//# sourceMappingURL=service.d.ts.map

package/esm/service/reverse/service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/service/reverse/service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAGjE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAuBxC,qBAAa,iBAAiB;;IAC1B,MAAM,CAAC,QAAQ,CAAC,cAAc;;;;;;;;;;;;;;QAA4B;IAE1D,MAAM,CAAC,QAAQ,CAAC,aAAa;;;;;;;yBAA2B;gBAI5C,GAAG,EAAE,GAAG;cAMJ,oBAAoB,CAAC,OAAO,EAAE,MAAM;cAKpC,WAAW,CAAC,OAAO,EAAE,MAAM;IAW3C;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC;IAiBnD;;OAEG;IACG,WAAW,CAAC,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IA8B7D;;OAEG;IACG,GAAG,CACL,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,GAAG,CAAC,qBAAqB,EAClC,YAAY,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC;IAgBlB;;OAEG;IACG,MAAM,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYlD;;OAEG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAQnC;AAED,yBAAiB,iBAAiB,CAAC;IAC/B,UAAiB,QAAQ;QACrB,YAAY,EAAE,MAAM,CAAC;QACrB,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,EAAE,MAAM,CAAC;KACtB;CACJ"}

package/esm/{commands/reverse.js → service/reverse/service.js}

@@ -1,43 +1,8 @@
 // cspell: ignore killforward
 import { BufferedReadableStream } from "@yume-chan/stream-extra";
-import { encodeUtf8, ExactReadableEndedError, extend, string, struct, } from "@yume-chan/struct";
-import { hexToNumber, sequenceEqual } from "../utils/index.js";
-import { AdbServiceBase } from "./base.js";
-const AdbReverseStringResponse = struct({
-    length: string(4),
-    content: string({
-        field: "length",
-        convert(value) {
-            return Number.parseInt(value, 16);
-        },
-        back(value) {
-            return value.toString(16).padStart(4, "0");
-        },
-    }),
-}, { littleEndian: true });
-export class AdbReverseError extends Error {
-    constructor(message) {
-        super(message);
-    }
-}
-export class AdbReverseNotSupportedError extends AdbReverseError {
-    constructor() {
-        super("ADB reverse tunnel is not supported on this device when connected wirelessly.");
-    }
-}
-export const AdbReverseErrorResponse = extend(AdbReverseStringResponse, {}, {
-    postDeserialize(value) {
-        // https://issuetracker.google.com/issues/37066218
-        // ADB on Android <9 can't create reverse tunnels when connected wirelessly (ADB over Wi-Fi),
-        // and returns this confusing "more than one device/emulator" error.
-        if (value.content === "more than one device/emulator") {
-            throw new AdbReverseNotSupportedError();
-        }
-        else {
-            throw new AdbReverseError(value.content);
-        }
-    },
-});
+import { encodeUtf8, ExactReadableEndedError } from "@yume-chan/struct";
+import { hexToNumber, sequenceEqual } from "../../utils/index.js";
+import { AdbReverseErrorResponse, AdbReverseStringResponse, } from "./response.js";
 // Like `hexToNumber`, it's much faster than first converting `buffer` to a string
 function decimalToNumber(buffer) {
     let value = 0;
@@ -51,10 +16,16 @@ function decimalToNumber(buffer) {
     return value;
 }
 const OKAY = encodeUtf8("OKAY");
-export class AdbReverseService extends AdbServiceBase {
+export class AdbReverseService {
+    static StringResponse = AdbReverseStringResponse;
+    static ErrorResponse = AdbReverseErrorResponse;
+    #adb;
+    constructor(adb) {
+        this.#adb = adb;
+    }
     #deviceAddressToLocalAddress = new Map();
     async createBufferedStream(service) {
-        const socket = await this.adb.createSocket(service);
+        const socket = await this.#adb.createSocket(service);
         return new BufferedReadableStream(socket.readable);
     }
     async sendRequest(service) {
@@ -112,14 +83,14 @@ export class AdbReverseService extends AdbServiceBase {
      * Add a reverse port forwarding.
      */
     async add(deviceAddress, handler, localAddress) {
-        localAddress = await this.adb.transport.addReverseTunnel(handler, localAddress);
+        localAddress = await this.#adb.transport.addReverseTunnel(handler, localAddress);
         try {
             deviceAddress = await this.addExternal(deviceAddress, localAddress);
             this.#deviceAddressToLocalAddress.set(deviceAddress, localAddress);
             return deviceAddress;
         }
         catch (e) {
-            await this.adb.transport.removeReverseTunnel(localAddress);
+            await this.#adb.transport.removeReverseTunnel(localAddress);
             throw e;
         }
     }
@@ -129,7 +100,7 @@ export class AdbReverseService extends AdbServiceBase {
     async remove(deviceAddress) {
         const localAddress = this.#deviceAddressToLocalAddress.get(deviceAddress);
         if (localAddress) {
-            await this.adb.transport.removeReverseTunnel(localAddress);
+            await this.#adb.transport.removeReverseTunnel(localAddress);
         }
         await this.sendRequest(`reverse:killforward:${deviceAddress}`);
         // No need to close the stream, device will close it
@@ -138,10 +109,10 @@ export class AdbReverseService extends AdbServiceBase {
      * Remove all reverse port forwarding, including the ones added by other programs.
      */
     async removeAll() {
-        await this.adb.transport.clearReverseTunnels();
+        await this.#adb.transport.clearReverseTunnels();
         this.#deviceAddressToLocalAddress.clear();
         await this.sendRequest(`reverse:killforward-all`);
         // No need to close the stream, device will close it
     }
 }
-//# sourceMappingURL=reverse.js.map
+//# sourceMappingURL=service.js.map

package/esm/service/reverse/service.js.map

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

package/esm/{commands → service}/subprocess/index.d.ts

@@ -1,5 +1,6 @@
 export * from "./none/index.js";
 export * from "./service.js";
 export * from "./shell/index.js";
+export * from "./types.js";
 export * from "./utils.js";
 //# sourceMappingURL=index.d.ts.map

package/esm/service/subprocess/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/subprocess/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC"}

package/esm/{commands → service}/subprocess/index.js

@@ -1,5 +1,6 @@
 export * from "./none/index.js";
 export * from "./service.js";
 export * from "./shell/index.js";
+export * from "./types.js";
 export * from "./utils.js";
 //# sourceMappingURL=index.js.map

package/esm/service/subprocess/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/service/subprocess/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC"}

package/esm/service/subprocess/none/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/service/subprocess/none/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC"}

package/esm/service/subprocess/none/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/service/subprocess/none/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC"}

package/esm/{commands → service}/subprocess/none/process.d.ts

@@ -1,13 +1,13 @@
 import type { MaybePromiseLike } from "@yume-chan/async";
 import type { AbortSignal, MaybeConsumable, ReadableStream, WritableStream } from "@yume-chan/stream-extra";
-import type { AdbSocket } from "../../../adb.js";
+import type { Adb } from "../../../adb.js";
 import type { AdbNoneProtocolProcess } from "./spawner.js";
 export declare class AdbNoneProtocolProcessImpl implements AdbNoneProtocolProcess {
     #private;
     get stdin(): WritableStream<MaybeConsumable<Uint8Array>>;
     get output(): ReadableStream<Uint8Array>;
     get exited(): Promise<undefined>;
-    constructor(socket: AdbSocket, signal?: AbortSignal);
+    constructor(socket: Adb.Socket, signal?: AbortSignal);
     kill(): MaybePromiseLike<void>;
 }
 //# sourceMappingURL=process.d.ts.map

package/esm/service/subprocess/none/process.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"process.d.ts","sourceRoot":"","sources":["../../../../src/service/subprocess/none/process.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,KAAK,EACR,WAAW,EACX,eAAe,EACf,cAAc,EACd,cAAc,EACjB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAE3C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAE3D,qBAAa,0BAA2B,YAAW,sBAAsB;;IAGrE,IAAI,KAAK,IAAI,cAAc,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAEvD;IAED,IAAI,MAAM,IAAI,cAAc,CAAC,UAAU,CAAC,CAEvC;IAGD,IAAI,MAAM,IAAI,OAAO,CAAC,SAAS,CAAC,CAE/B;gBAEW,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW;IAuBpD,IAAI,IAAI,gBAAgB,CAAC,IAAI,CAAC;CAGjC"}

package/esm/service/subprocess/none/process.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"process.js","sourceRoot":"","sources":["../../../../src/service/subprocess/none/process.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAYnD,MAAM,OAAO,0BAA0B;IAC1B,OAAO,CAAa;IAE7B,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;IACjC,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;IACjC,CAAC;IAEQ,OAAO,CAAqB;IACrC,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAED,YAAY,MAAkB,EAAE,MAAoB;QAChD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QAEtB,IAAI,MAAM,EAAE,CAAC;YACT,sCAAsC;YACtC,sCAAsC;YACtC,0DAA0D;YAE1D,MAAM,MAAM,GAAG,IAAI,eAAe,EAAa,CAAC;YAChD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CACpB,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAC/B,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAC1B,CAAC;YACF,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE;gBAClC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAC7B,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;YACzB,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAClC,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;QACvC,CAAC;IACL,CAAC;IAED,IAAI;QACA,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IAChC,CAAC;CACJ"}

package/esm/{commands → service}/subprocess/none/pty.d.ts

@@ -1,14 +1,14 @@
 import type { MaybePromiseLike } from "@yume-chan/async";
 import type { ReadableStream, WritableStream } from "@yume-chan/stream-extra";
 import { MaybeConsumable } from "@yume-chan/stream-extra";
-import type { AdbSocket } from "../../../adb.js";
-import type { AdbPtyProcess } from "../pty.js";
-export declare class AdbNoneProtocolPtyProcess implements AdbPtyProcess<undefined> {
+import type { Adb } from "../../../adb.js";
+import type { AdbPty } from "../pty.js";
+export declare class AdbNoneProtocolPty implements AdbPty<undefined> {
     #private;
     get input(): WritableStream<MaybeConsumable<Uint8Array>>;
     get output(): ReadableStream<Uint8Array>;
     get exited(): Promise<undefined>;
-    constructor(socket: AdbSocket);
+    constructor(socket: Adb.Socket);
     sigint(): Promise<void>;
     kill(): MaybePromiseLike<void>;
 }

package/esm/service/subprocess/none/pty.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pty.d.ts","sourceRoot":"","sources":["../../../../src/service/subprocess/none/pty.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,KAAK,EACR,cAAc,EACd,cAAc,EAEjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAExC,qBAAa,kBAAmB,YAAW,MAAM,CAAC,SAAS,CAAC;;IAKxD,IAAI,KAAK,IAAI,cAAc,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAEvD;IAED,IAAI,MAAM,IAAI,cAAc,CAAC,UAAU,CAAC,CAEvC;IAED,IAAI,MAAM,IAAI,OAAO,CAAC,SAAS,CAAC,CAE/B;gBAEW,MAAM,EAAE,GAAG,CAAC,MAAM;IAS9B,MAAM;IAIN,IAAI,IAAI,gBAAgB,CAAC,IAAI,CAAC;CAGjC"}

package/esm/{commands → service}/subprocess/none/pty.js

@@ -1,5 +1,5 @@
 import { MaybeConsumable } from "@yume-chan/stream-extra";
-export class AdbNoneProtocolPtyProcess {
+export class AdbNoneProtocolPty {
     #socket;
     #writer;
     #input;

package/esm/service/subprocess/none/pty.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pty.js","sourceRoot":"","sources":["../../../../src/service/subprocess/none/pty.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAK1D,MAAM,OAAO,kBAAkB;IAClB,OAAO,CAAa;IACpB,OAAO,CAA2D;IAElE,MAAM,CAA6C;IAC5D,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;IACjC,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;IAC/B,CAAC;IAED,YAAY,MAAkB;QAC1B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QAEtB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;QACjD,IAAI,CAAC,MAAM,GAAG,IAAI,eAAe,CAAC,cAAc,CAAa;YACzD,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC;SAC9C,CAAC,CAAC;IACP,CAAC;IAED,MAAM;QACF,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACtD,CAAC;IAED,IAAI;QACA,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IAChC,CAAC;CACJ"}

package/esm/service/subprocess/none/service.d.ts

@@ -0,0 +1,10 @@
+import type { Adb } from "../../../adb.js";
+import { AdbNoneProtocolPty } from "./pty.js";
+export declare class AdbNoneProtocolSubprocessService {
+    #private;
+    get adb(): Adb;
+    constructor(adb: Adb);
+    spawn: import("./spawner.js").AdbNoneProtocolSpawner;
+    pty(command?: string | readonly string[]): Promise<AdbNoneProtocolPty>;
+}
+//# sourceMappingURL=service.d.ts.map

package/esm/service/subprocess/none/service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../../src/service/subprocess/none/service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAG3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAG9C,qBAAa,gCAAgC;;IAEzC,IAAI,GAAG,IAAI,GAAG,CAEb;gBAEW,GAAG,EAAE,GAAG;IAIpB,KAAK,gDAwBF;IAEG,GAAG,CACL,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,GACrC,OAAO,CAAC,kBAAkB,CAAC;CAYjC"}

package/esm/service/subprocess/none/service.js

@@ -0,0 +1,44 @@
+import { AdbNoneProtocolProcessImpl } from "./process.js";
+import { AdbNoneProtocolPty } from "./pty.js";
+import { adbNoneProtocolSpawner } from "./spawner.js";
+export class AdbNoneProtocolSubprocessService {
+    #adb;
+    get adb() {
+        return this.#adb;
+    }
+    constructor(adb) {
+        this.#adb = adb;
+    }
+    spawn = adbNoneProtocolSpawner(async (command, signal) => {
+        if (!command.length) {
+            throw new Error("Command cannot be empty");
+        }
+        // Android 7 added `shell,raw:${command}` service which also triggers raw mode,
+        // but we want to keep backward compatibility.
+        let service = "exec:";
+        // Similar to SSH, we don't escape the `command`,
+        // because the command will be invoked by `sh -c`,
+        // it can contain environment variables (`KEY=value command`),
+        // and shell expansions (`echo "$KEY"` vs `echo '$KEY'`),
+        // which we can't know how to properly escape.
+        service += command.join(" ");
+        const socket = await this.#adb.createSocket(service);
+        if (signal?.aborted) {
+            await socket.close();
+            throw signal.reason;
+        }
+        return new AdbNoneProtocolProcessImpl(socket, signal);
+    });
+    async pty(command) {
+        let service = "shell:";
+        if (typeof command === "string") {
+            service += command;
+        }
+        else if (Array.isArray(command)) {
+            // Don't escape `command`. See `spawn` above for details
+            service += command.join(" ");
+        }
+        return new AdbNoneProtocolPty(await this.#adb.createSocket(service));
+    }
+}
+//# sourceMappingURL=service.js.map

package/esm/service/subprocess/none/service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../src/service/subprocess/none/service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAEtD,MAAM,OAAO,gCAAgC;IAChC,IAAI,CAAM;IACnB,IAAI,GAAG;QACH,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IAED,YAAY,GAAQ;QAChB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;IACpB,CAAC;IAED,KAAK,GAAG,sBAAsB,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QACrD,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAC/C,CAAC;QAED,+EAA+E;QAC/E,8CAA8C;QAC9C,IAAI,OAAO,GAAG,OAAO,CAAC;QAEtB,iDAAiD;QACjD,kDAAkD;QAClD,8DAA8D;QAC9D,yDAAyD;QACzD,8CAA8C;QAC9C,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE7B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAErD,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;YAClB,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;YACrB,MAAM,MAAM,CAAC,MAAM,CAAC;QACxB,CAAC;QAED,OAAO,IAAI,0BAA0B,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,GAAG,CACL,OAAoC;QAEpC,IAAI,OAAO,GAAG,QAAQ,CAAC;QAEvB,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,IAAI,OAAO,CAAC;QACvB,CAAC;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAChC,wDAAwD;YACxD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjC,CAAC;QAED,OAAO,IAAI,kBAAkB,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;IACzE,CAAC;CACJ"}

package/esm/service/subprocess/none/spawner.d.ts

@@ -0,0 +1,15 @@
+import type { MaybePromiseLike } from "@yume-chan/async";
+import type { AbortSignal, MaybeConsumable, ReadableStream, WritableStream } from "@yume-chan/stream-extra";
+import type { AdbSubprocessSpawner } from "../types.js";
+export interface AdbNoneProtocolProcess {
+    get stdin(): WritableStream<MaybeConsumable<Uint8Array>>;
+    /**
+     * Mix of stdout and stderr
+     */
+    get output(): ReadableStream<Uint8Array>;
+    get exited(): Promise<void>;
+    kill(): MaybePromiseLike<void>;
+}
+export type AdbNoneProtocolSpawner = (command: string | readonly string[], signal?: AbortSignal) => Promise<AdbNoneProtocolProcess> & AdbSubprocessSpawner.Wait<Uint8Array, string>;
+export declare function adbNoneProtocolSpawner(spawn: (command: readonly string[], signal: AbortSignal | undefined) => Promise<AdbNoneProtocolProcess>): AdbNoneProtocolSpawner;
+//# sourceMappingURL=spawner.d.ts.map

package/esm/service/subprocess/none/spawner.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"spawner.d.ts","sourceRoot":"","sources":["../../../../src/service/subprocess/none/spawner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,KAAK,EACR,WAAW,EACX,eAAe,EACf,cAAc,EACd,cAAc,EACjB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAQxD,MAAM,WAAW,sBAAsB;IACnC,IAAI,KAAK,IAAI,cAAc,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;IAEzD;;OAEG;IACH,IAAI,MAAM,IAAI,cAAc,CAAC,UAAU,CAAC,CAAC;IAEzC,IAAI,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5B,IAAI,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC;CAClC;AAED,MAAM,MAAM,sBAAsB,GAAG,CACjC,OAAO,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,EACnC,MAAM,CAAC,EAAE,WAAW,KACnB,OAAO,CAAC,sBAAsB,CAAC,GAChC,oBAAoB,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;AAElD,wBAAgB,sBAAsB,CAClC,KAAK,EAAE,CACH,OAAO,EAAE,SAAS,MAAM,EAAE,EAC1B,MAAM,EAAE,WAAW,GAAG,SAAS,KAC9B,OAAO,CAAC,sBAAsB,CAAC,GACrC,sBAAsB,CAuCxB"}

package/esm/service/subprocess/none/spawner.js

@@ -0,0 +1,31 @@
+import { concatUint8Arrays } from "@yume-chan/stream-extra";
+import { createLazyPromise, decodeUtf8Chunked, splitCommand, ToArrayStream, } from "../utils.js";
+export function adbNoneProtocolSpawner(spawn) {
+    return (command, signal) => {
+        signal?.throwIfAborted();
+        if (typeof command === "string") {
+            command = splitCommand(command);
+        }
+        const processPromise = spawn(command, signal);
+        processPromise.wait = (options) => {
+            const waitPromise = processPromise.then(async (process) => {
+                const [, output] = await Promise.all([
+                    options?.stdin?.pipeTo(process.stdin),
+                    process.output.pipeThrough(new ToArrayStream()),
+                ]);
+                return output;
+            });
+            return createLazyPromise(async () => {
+                const chunks = await waitPromise;
+                return concatUint8Arrays(chunks);
+            }, {
+                async toString() {
+                    const chunks = await waitPromise;
+                    return decodeUtf8Chunked(chunks);
+                },
+            });
+        };
+        return processPromise;
+    };
+}
+//# sourceMappingURL=spawner.js.map

package/esm/service/subprocess/none/spawner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"spawner.js","sourceRoot":"","sources":["../../../../src/service/subprocess/none/spawner.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAG5D,OAAO,EACH,iBAAiB,EACjB,iBAAiB,EACjB,YAAY,EACZ,aAAa,GAChB,MAAM,aAAa,CAAC;AAqBrB,MAAM,UAAU,sBAAsB,CAClC,KAGoC;IAEpC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACvB,MAAM,EAAE,cAAc,EAAE,CAAC;QAEzB,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QACpC,CAAC;QAED,MAAM,cAAc,GAAG,KAAK,CACxB,OAAO,EACP,MAAM,CAEuC,CAAC;QAElD,cAAc,CAAC,IAAI,GAAG,CAAC,OAAO,EAAE,EAAE;YAC9B,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBACtD,MAAM,CAAC,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;oBACjC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;oBACrC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,aAAa,EAAE,CAAC;iBAClD,CAAC,CAAC;gBACH,OAAO,MAAM,CAAC;YAClB,CAAC,CAAC,CAAC;YAEH,OAAO,iBAAiB,CACpB,KAAK,IAAI,EAAE;gBACP,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC;gBACjC,OAAO,iBAAiB,CAAC,MAAM,CAAC,CAAC;YACrC,CAAC,EACD;gBACI,KAAK,CAAC,QAAQ;oBACV,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC;oBACjC,OAAO,iBAAiB,CAAC,MAAM,CAAC,CAAC;gBACrC,CAAC;aACJ,CACJ,CAAC;QACN,CAAC,CAAC;QAEF,OAAO,cAAc,CAAC;IAC1B,CAAC,CAAC;AACN,CAAC"}

package/esm/{commands → service}/subprocess/pty.d.ts

@@ -1,6 +1,6 @@
 import type { MaybePromiseLike } from "@yume-chan/async";
 import type { MaybeConsumable, ReadableStream, WritableStream } from "@yume-chan/stream-extra";
-export interface AdbPtyProcess<TExitCode> {
+export interface AdbPty<TExitCode> {
     get input(): WritableStream<MaybeConsumable<Uint8Array>>;
     get output(): ReadableStream<Uint8Array>;
     get exited(): Promise<TExitCode>;

package/esm/service/subprocess/pty.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pty.d.ts","sourceRoot":"","sources":["../../../src/service/subprocess/pty.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,KAAK,EACR,eAAe,EACf,cAAc,EACd,cAAc,EACjB,MAAM,yBAAyB,CAAC;AAEjC,MAAM,WAAW,MAAM,CAAC,SAAS;IAC7B,IAAI,KAAK,IAAI,cAAc,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;IACzD,IAAI,MAAM,IAAI,cAAc,CAAC,UAAU,CAAC,CAAC;IACzC,IAAI,MAAM,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC;IAEjC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACxB,IAAI,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC;CAClC"}

package/esm/{commands → service}/subprocess/pty.js.map

@@ -1 +1 @@
-{"version":3,"file":"pty.js","sourceRoot":"","sources":["../../../src/commands/subprocess/pty.ts"],"names":[],"mappings":""}
+{"version":3,"file":"pty.js","sourceRoot":"","sources":["../../../src/service/subprocess/pty.ts"],"names":[],"mappings":""}

package/esm/service/subprocess/service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/service/subprocess/service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAGxC,OAAO,EAAE,gCAAgC,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,iCAAiC,EAAE,MAAM,kBAAkB,CAAC;AAErE,qBAAa,oBAAoB;;IAE7B,IAAI,GAAG,QAEN;IAGD,IAAI,YAAY,IAAI,gCAAgC,CAEnD;IAGD,IAAI,aAAa,IAAI,iCAAiC,GAAG,SAAS,CAEjE;gBAEW,GAAG,EAAE,GAAG;CASvB"}

package/esm/{commands → service}/subprocess/service.js

@@ -17,7 +17,7 @@ export class AdbSubprocessService {
     constructor(adb) {
         this.#adb = adb;
         this.#noneProtocol = new AdbNoneProtocolSubprocessService(adb);
-        if (adb.canUseFeature(AdbFeature.ShellV2)) {
+        if (adb.canUseFeature(AdbFeature.Shell2)) {
             this.#shellProtocol = new AdbShellProtocolSubprocessService(adb);
         }
     }

package/esm/service/subprocess/service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../src/service/subprocess/service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,OAAO,EAAE,gCAAgC,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,iCAAiC,EAAE,MAAM,kBAAkB,CAAC;AAErE,MAAM,OAAO,oBAAoB;IACpB,IAAI,CAAM;IACnB,IAAI,GAAG;QACH,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IAEQ,aAAa,CAAmC;IACzD,IAAI,YAAY;QACZ,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IAEQ,cAAc,CAAqC;IAC5D,IAAI,aAAa;QACb,OAAO,IAAI,CAAC,cAAc,CAAC;IAC/B,CAAC;IAED,YAAY,GAAQ;QAChB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;QAEhB,IAAI,CAAC,aAAa,GAAG,IAAI,gCAAgC,CAAC,GAAG,CAAC,CAAC;QAE/D,IAAI,GAAG,CAAC,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YACvC,IAAI,CAAC,cAAc,GAAG,IAAI,iCAAiC,CAAC,GAAG,CAAC,CAAC;QACrE,CAAC;IACL,CAAC;CACJ"}

package/esm/service/subprocess/shell/index.d.ts

@@ -0,0 +1,5 @@
+export * from "./process.js";
+export * from "./pty.js";
+export * from "./service.js";
+export * from "./spawner.js";
+//# sourceMappingURL=index.d.ts.map

package/esm/{commands/subprocess/none → service/subprocess/shell}/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/subprocess/none/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/service/subprocess/shell/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC"}