@yume-chan/adb 2.6.2 → 3.0.0-beta.1

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,CA2CxB"}

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

@@ -0,0 +1,36 @@
+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) => {
+                try {
+                    const [, output] = await Promise.all([
+                        options?.stdin?.pipeTo(process.stdin),
+                        process.output.pipeThrough(new ToArrayStream()),
+                    ]);
+                    return output;
+                }
+                finally {
+                    await process.kill();
+                }
+            });
+            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,IAAI,CAAC;oBACD,MAAM,CAAC,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;wBACjC,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;wBACrC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,aAAa,EAAE,CAAC;qBAClD,CAAC,CAAC;oBACH,OAAO,MAAM,CAAC;gBAClB,CAAC;wBAAS,CAAC;oBACP,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;gBACzB,CAAC;YACL,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"}

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

@@ -0,0 +1,6 @@
+export * from "./process.js";
+export * from "./pty.js";
+export * from "./service.js";
+export * from "./spawner.js";
+// `shared.ts` is internal
+//# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","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.js","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;AAC7B,0BAA0B"}

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

@@ -1,7 +1,7 @@
 import type { MaybePromiseLike } from "@yume-chan/async";
 import type { AbortSignal, ReadableStream } from "@yume-chan/stream-extra";
 import { MaybeConsumable, WritableStream } from "@yume-chan/stream-extra";
-import type { AdbSocket } from "../../../adb.js";
+import type { Adb } from "../../../adb.js";
 import type { AdbShellProtocolProcess } from "./spawner.js";
 export declare class AdbShellProtocolProcessImpl implements AdbShellProtocolProcess {
     #private;
@@ -9,7 +9,7 @@ export declare class AdbShellProtocolProcessImpl implements AdbShellProtocolProc
     get stdout(): ReadableStream<Uint8Array<ArrayBufferLike>>;
     get stderr(): ReadableStream<Uint8Array<ArrayBufferLike>>;
     get exited(): Promise<number>;
-    constructor(socket: AdbSocket, signal?: AbortSignal);
+    constructor(socket: Adb.Socket, signal?: AbortSignal);
     kill(): MaybePromiseLike<void>;
 }
 //# sourceMappingURL=process.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"process.d.ts","sourceRoot":"","sources":["../../../../src/service/subprocess/shell/process.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,KAAK,EACR,WAAW,EAEX,cAAc,EAEjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACH,eAAe,EAGf,cAAc,EACjB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAG3C,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAE5D,qBAAa,2BAA4B,YAAW,uBAAuB;;IAKvE,IAAI,KAAK,iEAER;IAGD,IAAI,MAAM,gDAET;IAGD,IAAI,MAAM,gDAET;IAGD,IAAI,MAAM,oBAET;gBAEW,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW;IAmFpD,IAAI,IAAI,gBAAgB,CAAC,IAAI,CAAC;CAGjC"}

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

@@ -65,23 +65,19 @@ export class AdbShellProtocolProcessImpl {
             // If `exited` has already settled, this will be a no-op
             exited.reject(e);
         });
-        if (signal) {
-            // `signal` won't affect `this.stdout` and `this.stderr`
-            // So remaining data can still be read
-            // (call `controller.error` will discard all pending data)
-            signal.addEventListener("abort", () => {
-                exited.reject(signal.reason);
-                this.#socket.close();
-            });
-        }
+        // `signal` won't affect `this.stdout` and `this.stderr`
+        // So remaining data can still be read
+        // (call `controller.error` will discard all pending data)
+        signal?.addEventListener("abort", () => {
+            exited.reject(signal.reason);
+            this.#socket.close();
+        });
         this.#writer = this.#socket.writable.getWriter();
         this.#stdin = new MaybeConsumable.WritableStream({
-            write: async (chunk) => {
-                await this.#writer.write(AdbShellProtocolPacket.serialize({
-                    id: AdbShellProtocolId.Stdin,
-                    data: chunk,
-                }));
-            },
+            write: (chunk) => this.#writer.write(AdbShellProtocolPacket.serialize({
+                id: AdbShellProtocolId.Stdin,
+                data: chunk,
+            })),
             close: () => 
             // Only shell protocol + raw mode supports closing stdin
             this.#writer.write(AdbShellProtocolPacket.serialize({

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

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

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"pty.d.ts","sourceRoot":"","sources":["../../../../src/service/subprocess/shell/pty.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAER,cAAc,EAEjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACH,eAAe,EAGf,cAAc,EACjB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAIxC,qBAAa,mBAAoB,YAAW,MAAM,CAAC,MAAM,CAAC;;IAKtD,IAAI,KAAK,iEAER;IAGD,IAAI,MAAM,gDAET;IAGD,IAAI,MAAM,oBAET;gBAEW,MAAM,EAAE,GAAG,CAAC,MAAM;IAuDxB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAYvC,MAAM;IAKN,IAAI;CAGP"}

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

@@ -2,16 +2,16 @@ import { PromiseResolver } from "@yume-chan/async";
 import { MaybeConsumable, PushReadableStream, StructDeserializeStream, WritableStream, } from "@yume-chan/stream-extra";
 import { encodeUtf8 } from "@yume-chan/struct";
 import { AdbShellProtocolId, AdbShellProtocolPacket } from "./shared.js";
-export class AdbShellProtocolPtyProcess {
+export class AdbShellProtocolPty {
     #socket;
     #writer;
     #input;
     get input() {
         return this.#input;
     }
-    #stdout;
+    #output;
     get output() {
-        return this.#stdout;
+        return this.#output;
     }
     #exited = new PromiseResolver();
     get exited() {
@@ -19,9 +19,9 @@ export class AdbShellProtocolPtyProcess {
     }
     constructor(socket) {
         this.#socket = socket;
-        let stdoutController;
-        this.#stdout = new PushReadableStream((controller) => {
-            stdoutController = controller;
+        let outputController;
+        this.#output = new PushReadableStream((controller) => {
+            outputController = controller;
         });
         socket.readable
             .pipeThrough(new StructDeserializeStream(AdbShellProtocolPacket))
@@ -32,17 +32,18 @@ export class AdbShellProtocolPtyProcess {
                         this.#exited.resolve(chunk.data[0]);
                         break;
                     case AdbShellProtocolId.Stdout:
-                        await stdoutController.enqueue(chunk.data);
+                        await outputController.enqueue(chunk.data);
                         break;
+                    // PTY mode doesn't have stderr
                 }
             },
         }))
             .then(() => {
-            stdoutController.close();
+            outputController.close();
             // If `#exit` has already resolved, this will be a no-op
             this.#exited.reject(new Error("Socket ended without exit message"));
         }, (e) => {
-            stdoutController.error(e);
+            outputController.error(e);
             // If `#exit` has already resolved, this will be a no-op
             this.#exited.reject(e);
         });
@@ -67,6 +68,7 @@ export class AdbShellProtocolPtyProcess {
         }));
     }
     sigint() {
+        // Write `^C`
         return this.#writeStdin(new Uint8Array([0x03]));
     }
     kill() {

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

@@ -0,0 +1 @@
+{"version":3,"file":"pty.js","sourceRoot":"","sources":["../../../../src/service/subprocess/shell/pty.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAMnD,OAAO,EACH,eAAe,EACf,kBAAkB,EAClB,uBAAuB,EACvB,cAAc,GACjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAK/C,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAEzE,MAAM,OAAO,mBAAmB;IACnB,OAAO,CAAa;IACpB,OAAO,CAA2D;IAElE,MAAM,CAA8C;IAC7D,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAEQ,OAAO,CAA6B;IAC7C,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAEQ,OAAO,GAAG,IAAI,eAAe,EAAU,CAAC;IACjD,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;IAChC,CAAC;IAED,YAAY,MAAkB;QAC1B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QAEtB,IAAI,gBAA2D,CAAC;QAChE,IAAI,CAAC,OAAO,GAAG,IAAI,kBAAkB,CAAa,CAAC,UAAU,EAAE,EAAE;YAC7D,gBAAgB,GAAG,UAAU,CAAC;QAClC,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,QAAQ;aACV,WAAW,CAAC,IAAI,uBAAuB,CAAC,sBAAsB,CAAC,CAAC;aAChE,MAAM,CACH,IAAI,cAAc,CAAyB;YACvC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;gBACnB,QAAQ,KAAK,CAAC,EAAE,EAAE,CAAC;oBACf,KAAK,kBAAkB,CAAC,IAAI;wBACxB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,CAAC;wBACrC,MAAM;oBACV,KAAK,kBAAkB,CAAC,MAAM;wBAC1B,MAAM,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;wBAC3C,MAAM;oBACV,+BAA+B;gBACnC,CAAC;YACL,CAAC;SACJ,CAAC,CACL;aACA,IAAI,CACD,GAAG,EAAE;YACD,gBAAgB,CAAC,KAAK,EAAE,CAAC;YACzB,wDAAwD;YACxD,IAAI,CAAC,OAAO,CAAC,MAAM,CACf,IAAI,KAAK,CAAC,mCAAmC,CAAC,CACjD,CAAC;QACN,CAAC,EACD,CAAC,CAAC,EAAE,EAAE;YACF,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC1B,wDAAwD;YACxD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC3B,CAAC,CACJ,CAAC;QAEN,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,WAAW,CAAC,KAAK,CAAC;SAC5C,CAAC,CAAC;IACP,CAAC;IAED,WAAW,CAAC,KAAiB;QACzB,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CACrB,sBAAsB,CAAC,SAAS,CAAC;YAC7B,EAAE,EAAE,kBAAkB,CAAC,KAAK;YAC5B,IAAI,EAAE,KAAK;SACd,CAAC,CACL,CAAC;IACN,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAY,EAAE,IAAY;QACnC,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CACpB,sBAAsB,CAAC,SAAS,CAAC;YAC7B,EAAE,EAAE,kBAAkB,CAAC,gBAAgB;YACvC,oEAAoE;YACpE,8DAA8D;YAC9D,8EAA8E;YAC9E,IAAI,EAAE,UAAU,CAAC,GAAG,IAAI,IAAI,IAAI,QAAQ,CAAC;SAC5C,CAAC,CACL,CAAC;IACN,CAAC;IAED,MAAM;QACF,aAAa;QACb,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpD,CAAC;IAED,IAAI;QACA,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IAChC,CAAC;CACJ"}

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

@@ -0,0 +1,34 @@
+import type { Adb } from "../../../adb.js";
+import { AdbShellProtocolPty } from "./pty.js";
+import { AdbShellProtocolId, AdbShellProtocolPacket } from "./shared.js";
+export declare class AdbShellProtocolSubprocessService {
+    #private;
+    static readonly PacketId: {
+        readonly Stdin: 0;
+        readonly Stdout: 1;
+        readonly Stderr: 2;
+        readonly Exit: 3;
+        readonly CloseStdin: 4;
+        readonly WindowSizeChange: 5;
+    };
+    static readonly Packet: import("@yume-chan/struct").Struct<{
+        id: import("@yume-chan/struct").Field<AdbShellProtocolId, never, never, number>;
+        data: import("@yume-chan/struct").Field<Uint8Array<ArrayBufferLike>, string, never, Uint8Array<ArrayBufferLike>>;
+    }, undefined, import("@yume-chan/struct").FieldsValue<{
+        id: import("@yume-chan/struct").Field<AdbShellProtocolId, never, never, number>;
+        data: import("@yume-chan/struct").Field<Uint8Array<ArrayBufferLike>, string, never, Uint8Array<ArrayBufferLike>>;
+    }>>;
+    get adb(): Adb;
+    get isSupported(): boolean;
+    constructor(adb: Adb);
+    spawn: import("./spawner.js").AdbShellProtocolSpawner;
+    pty(options?: {
+        command?: string | readonly string[] | undefined;
+        terminalType?: string;
+    }): Promise<AdbShellProtocolPty>;
+}
+export declare namespace AdbShellProtocolSubprocessService {
+    type PacketId = AdbShellProtocolId;
+    type Packet = AdbShellProtocolPacket;
+}
+//# sourceMappingURL=service.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../../src/service/subprocess/shell/service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAI3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAGzE,qBAAa,iCAAiC;;IAC1C,MAAM,CAAC,QAAQ,CAAC,QAAQ;;;;;;;MAAsB;IAE9C,MAAM,CAAC,QAAQ,CAAC,MAAM;;;;;;QAA0B;IAGhD,IAAI,GAAG,QAEN;IAED,IAAI,WAAW,YAEd;gBAEW,GAAG,EAAE,GAAG;IAIpB,KAAK,iDAeF;IAEG,GAAG,CAAC,OAAO,CAAC,EAAE;QAChB,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;QACjD,YAAY,CAAC,EAAE,MAAM,CAAC;KACzB,GAAG,OAAO,CAAC,mBAAmB,CAAC;CAsBnC;AAED,yBAAiB,iCAAiC,CAAC;IAC/C,KAAY,QAAQ,GAAG,kBAAkB,CAAC;IAE1C,KAAY,MAAM,GAAG,sBAAsB,CAAC;CAC/C"}

package/esm/service/subprocess/shell/service.js

@@ -0,0 +1,52 @@
+import { AdbFeature } from "../../../features.js";
+import { AdbShellProtocolProcessImpl } from "./process.js";
+import { AdbShellProtocolPty } from "./pty.js";
+import { AdbShellProtocolId, AdbShellProtocolPacket } from "./shared.js";
+import { adbShellProtocolSpawner } from "./spawner.js";
+export class AdbShellProtocolSubprocessService {
+    static PacketId = AdbShellProtocolId;
+    static Packet = AdbShellProtocolPacket;
+    #adb;
+    get adb() {
+        return this.#adb;
+    }
+    get isSupported() {
+        return this.#adb.canUseFeature(AdbFeature.Shell2);
+    }
+    constructor(adb) {
+        this.#adb = adb;
+    }
+    spawn = adbShellProtocolSpawner(async (command, signal) => {
+        if (!command.length) {
+            throw new Error("Command cannot be empty");
+        }
+        // Don't escape `command`. See `AdbNoneProtocolSubprocessService.prototype.spawn` for details.
+        const service = "shell,v2,raw:" + command.join(" ");
+        const socket = await this.#adb.createSocket(service);
+        if (signal?.aborted) {
+            await socket.close();
+            throw signal.reason;
+        }
+        return new AdbShellProtocolProcessImpl(socket, signal);
+    });
+    async pty(options) {
+        const { command, terminalType } = options ?? {};
+        let service = "shell,v2,pty";
+        if (terminalType) {
+            if (terminalType.includes(",") || terminalType.includes(":")) {
+                throw new Error("terminalType must not contain ',' or ':'");
+            }
+            service += `,TERM=` + terminalType;
+        }
+        service += ":";
+        if (typeof command === "string") {
+            service += command;
+        }
+        else if (Array.isArray(command)) {
+            // Don't escape `command`. See `AdbNoneProtocolSubprocessService.prototype.spawn` for details.
+            service += command.join(" ");
+        }
+        return new AdbShellProtocolPty(await this.#adb.createSocket(service));
+    }
+}
+//# sourceMappingURL=service.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../src/service/subprocess/shell/service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,2BAA2B,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AACzE,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAEvD,MAAM,OAAO,iCAAiC;IAC1C,MAAM,CAAU,QAAQ,GAAG,kBAAkB,CAAC;IAE9C,MAAM,CAAU,MAAM,GAAG,sBAAsB,CAAC;IAEvC,IAAI,CAAM;IACnB,IAAI,GAAG;QACH,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IAED,IAAI,WAAW;QACX,OAAO,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IACtD,CAAC;IAED,YAAY,GAAQ;QAChB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;IACpB,CAAC;IAED,KAAK,GAAG,uBAAuB,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QACtD,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAC/C,CAAC;QAED,8FAA8F;QAC9F,MAAM,OAAO,GAAG,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACpD,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,2BAA2B,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,GAAG,CAAC,OAGT;QACG,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;QAEhD,IAAI,OAAO,GAAG,cAAc,CAAC;QAE7B,IAAI,YAAY,EAAE,CAAC;YACf,IAAI,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC3D,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;YAChE,CAAC;YACD,OAAO,IAAI,QAAQ,GAAG,YAAY,CAAC;QACvC,CAAC;QACD,OAAO,IAAI,GAAG,CAAC;QAEf,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,8FAA8F;YAC9F,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjC,CAAC;QAED,OAAO,IAAI,mBAAmB,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;IAC1E,CAAC"}

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

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

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

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

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

@@ -1,4 +1,5 @@
 import { buffer, struct, u32, u8 } from "@yume-chan/struct";
+/** @internal */
 export const AdbShellProtocolId = {
     Stdin: 0,
     Stdout: 1,
@@ -8,6 +9,7 @@ export const AdbShellProtocolId = {
     WindowSizeChange: 5,
 };
 // This packet format is used in both directions.
+/** @internal */
 export const AdbShellProtocolPacket = struct({
     id: u8(),
     data: buffer(u32),

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

@@ -0,0 +1 @@
+{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../src/service/subprocess/shell/shared.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,mBAAmB,CAAC;AAE5D,gBAAgB;AAChB,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAC9B,KAAK,EAAE,CAAC;IACR,MAAM,EAAE,CAAC;IACT,MAAM,EAAE,CAAC;IACT,IAAI,EAAE,CAAC;IACP,UAAU,EAAE,CAAC;IACb,gBAAgB,EAAE,CAAC;CACb,CAAC;AAMX,iDAAiD;AACjD,gBAAgB;AAChB,MAAM,CAAC,MAAM,sBAAsB,GAAG,MAAM,CACxC;IACI,EAAE,EAAE,EAAE,EAAsB;IAC5B,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC;CACpB,EACD,EAAE,YAAY,EAAE,IAAI,EAAE,CACzB,CAAC"}

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

@@ -1,5 +1,6 @@
 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 AdbShellProtocolProcess {
     get stdin(): WritableStream<MaybeConsumable<Uint8Array>>;
     get stdout(): ReadableStream<Uint8Array>;
@@ -7,13 +8,7 @@ export interface AdbShellProtocolProcess {
     get exited(): Promise<number>;
     kill(): MaybePromiseLike<void>;
 }
-export declare class AdbShellProtocolSpawner {
-    #private;
-    constructor(spawn: (command: readonly string[], signal: AbortSignal | undefined) => Promise<AdbShellProtocolProcess>);
-    spawn(command: string | readonly string[], signal?: AbortSignal): Promise<AdbShellProtocolProcess>;
-    spawnWait(command: string | readonly string[]): Promise<AdbShellProtocolSpawner.WaitResult<Uint8Array>>;
-    spawnWaitText(command: string | readonly string[]): Promise<AdbShellProtocolSpawner.WaitResult<string>>;
-}
+export type AdbShellProtocolSpawner = (command: string | readonly string[], signal?: AbortSignal) => Promise<AdbShellProtocolProcess> & AdbSubprocessSpawner.Wait<AdbShellProtocolSpawner.WaitResult<Uint8Array>, AdbShellProtocolSpawner.WaitResult<string>>;
 export declare namespace AdbShellProtocolSpawner {
     interface WaitResult<T> {
         stdout: T;
@@ -21,4 +16,5 @@ export declare namespace AdbShellProtocolSpawner {
         exitCode: number;
     }
 }
+export declare function adbShellProtocolSpawner(spawn: (command: readonly string[], signal: AbortSignal | undefined) => Promise<AdbShellProtocolProcess>): AdbShellProtocolSpawner;
 //# sourceMappingURL=spawner.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"spawner.d.ts","sourceRoot":"","sources":["../../../../src/service/subprocess/shell/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,uBAAuB;IACpC,IAAI,KAAK,IAAI,cAAc,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;IAEzD,IAAI,MAAM,IAAI,cAAc,CAAC,UAAU,CAAC,CAAC;IACzC,IAAI,MAAM,IAAI,cAAc,CAAC,UAAU,CAAC,CAAC;IAEzC,IAAI,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAE9B,IAAI,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC;CAClC;AAED,MAAM,MAAM,uBAAuB,GAAG,CAClC,OAAO,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,EACnC,MAAM,CAAC,EAAE,WAAW,KACnB,OAAO,CAAC,uBAAuB,CAAC,GACjC,oBAAoB,CAAC,IAAI,CACrB,uBAAuB,CAAC,UAAU,CAAC,UAAU,CAAC,EAC9C,uBAAuB,CAAC,UAAU,CAAC,MAAM,CAAC,CAC7C,CAAC;AAEN,yBAAiB,uBAAuB,CAAC;IACrC,UAAiB,UAAU,CAAC,CAAC;QACzB,MAAM,EAAE,CAAC,CAAC;QACV,MAAM,EAAE,CAAC,CAAC;QACV,QAAQ,EAAE,MAAM,CAAC;KACpB;CACJ;AAED,wBAAgB,uBAAuB,CACnC,KAAK,EAAE,CACH,OAAO,EAAE,SAAS,MAAM,EAAE,EAC1B,MAAM,EAAE,WAAW,GAAG,SAAS,KAC9B,OAAO,CAAC,uBAAuB,CAAC,GACtC,uBAAuB,CA8DzB"}

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

@@ -0,0 +1,50 @@
+import { concatUint8Arrays } from "@yume-chan/stream-extra";
+import { createLazyPromise, decodeUtf8Chunked, splitCommand, ToArrayStream, } from "../utils.js";
+export function adbShellProtocolSpawner(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) => {
+                try {
+                    const [, stdout, stderr, exitCode] = await Promise.all([
+                        options?.stdin?.pipeTo(process.stdin),
+                        process.stdout.pipeThrough(new ToArrayStream()),
+                        process.stderr.pipeThrough(new ToArrayStream()),
+                        process.exited,
+                    ]);
+                    return {
+                        stdout,
+                        stderr,
+                        exitCode,
+                    };
+                }
+                finally {
+                    await process.kill();
+                }
+            });
+            return createLazyPromise(async () => {
+                const { stdout, stderr, exitCode } = await waitPromise;
+                return {
+                    stdout: concatUint8Arrays(stdout),
+                    stderr: concatUint8Arrays(stderr),
+                    exitCode,
+                };
+            }, {
+                async toString() {
+                    const { stdout, stderr, exitCode } = await waitPromise;
+                    return {
+                        stdout: decodeUtf8Chunked(stdout),
+                        stderr: decodeUtf8Chunked(stderr),
+                        exitCode,
+                    };
+                },
+            });
+        };
+        return processPromise;
+    };
+}
+//# sourceMappingURL=spawner.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"spawner.js","sourceRoot":"","sources":["../../../../src/service/subprocess/shell/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;AA8BrB,MAAM,UAAU,uBAAuB,CACnC,KAGqC;IAErC,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,CAKL,CAAC;QAEN,cAAc,CAAC,IAAI,GAAG,CAAC,OAAO,EAAE,EAAE;YAC9B,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBACtD,IAAI,CAAC;oBACD,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;wBACnD,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;wBACrC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,aAAa,EAAE,CAAC;wBAC/C,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,aAAa,EAAE,CAAC;wBAC/C,OAAO,CAAC,MAAM;qBACjB,CAAC,CAAC;oBACH,OAAO;wBACH,MAAM;wBACN,MAAM;wBACN,QAAQ;qBACgD,CAAC;gBACjE,CAAC;wBAAS,CAAC;oBACP,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;gBACzB,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,OAAO,iBAAiB,CACpB,KAAK,IAAI,EAAE;gBACP,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,WAAW,CAAC;gBAEvD,OAAO;oBACH,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC;oBACjC,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC;oBACjC,QAAQ;iBACX,CAAC;YACN,CAAC,EACD;gBACI,KAAK,CAAC,QAAQ;oBACV,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,WAAW,CAAC;oBAEvD,OAAO;wBACH,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC;wBACjC,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC;wBACjC,QAAQ;qBACX,CAAC;gBACN,CAAC;aACJ,CACJ,CAAC;QACN,CAAC,CAAC;QAEF,OAAO,cAAc,CAAC;IAC1B,CAAC,CAAC;AACN,CAAC"}

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

@@ -0,0 +1,14 @@
+import type { MaybeConsumable, ReadableStream } from "@yume-chan/stream-extra";
+import type { LazyPromise } from "./utils.js";
+export declare namespace AdbSubprocessSpawner {
+    interface WaitToString<T> {
+        toString(): Promise<T>;
+    }
+    interface WaitOptions {
+        stdin?: ReadableStream<MaybeConsumable<Uint8Array>> | undefined;
+    }
+    interface Wait<TBuffer, TString> {
+        wait(options?: WaitOptions): LazyPromise<TBuffer, WaitToString<TString>>;
+    }
+}
+//# sourceMappingURL=types.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/service/subprocess/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE/E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,yBAAiB,oBAAoB,CAAC;IAClC,UAAiB,YAAY,CAAC,CAAC;QAC3B,QAAQ,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;KAC1B;IAED,UAAiB,WAAW;QACxB,KAAK,CAAC,EAAE,cAAc,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,GAAG,SAAS,CAAC;KACnE;IAED,UAAiB,IAAI,CAAC,OAAO,EAAE,OAAO;QAClC,IAAI,CACA,OAAO,CAAC,EAAE,WAAW,GACtB,WAAW,CAAC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;KAClD;CACJ"}

package/esm/service/subprocess/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

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

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

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

@@ -0,0 +1,39 @@
+import { AccumulateStream } from "@yume-chan/stream-extra";
+export declare function escapeArg(s: string): string;
+/**
+ * Split the command.
+ *
+ * Quotes and escaped characters are supported, and will be returned as-is.
+ * @param input The input command
+ * @returns An array of string containing the arguments
+ */
+export declare function splitCommand(input: string): string[];
+export type LazyPromise<T, U> = Omit<Promise<T>, typeof Symbol.toStringTag> & U;
+/**
+ * Creates a `Promise`-like object that lazily computes the result
+ * only when it's being used as a `Promise`.
+ *
+ * For example, if an API returns a value `p` of type `Promise<T> & { asU(): Promise<U> }`,
+ * and the user calls `p.asU()` instead of using it as a `Promise` (`p.then()`, `await p`, etc.),
+ * is unnecessary to compute the result `T` (unless `asU` also depends on it).
+ *
+ * By using `createLazyPromise(computeT, { asU: computeU })`,
+ * `computeT` will only run when `p` is used as a `Promise`.
+ *
+ * Note that the result object can't be returned from an async function,
+ * as async functions always creates a new `Promise` with the return value,
+ * which runs `initializer` immediately, and discards any extra `methods` attached.
+ * @param initializer
+ * The initializer function when the result object is being used as a `Promise`.
+ *
+ * The result value will be cached.
+ * @param methods Any extra methods to add to the result object
+ * @returns
+ * A `Promise`-like object that runs `initializer` when used as a `Promise`, and contains `methods`.
+ */
+export declare function createLazyPromise<T, U extends Record<PropertyKey, () => unknown>>(initializer: () => Promise<T>, methods: U): LazyPromise<T, U>;
+export declare class ToArrayStream<T> extends AccumulateStream<T, T[]> {
+    constructor();
+}
+export declare function decodeUtf8Chunked(chunks: Uint8Array[]): string;
+//# sourceMappingURL=utils.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/service/subprocess/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAG3D,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,UAoBlC;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAyCpD;AAID,MAAM,MAAM,WAAW,CAAC,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;AAEhF;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,iBAAiB,CAC7B,CAAC,EACD,CAAC,SAAS,MAAM,CAAC,WAAW,EAAE,MAAM,OAAO,CAAC,EAC9C,WAAW,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,GAAG,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAoC9D;AAED,qBAAa,aAAa,CAAC,CAAC,CAAE,SAAQ,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;;CAW7D;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,CAU9D"}