@yume-chan/adb 1.1.0 → 2.0.1

package/esm/server/observer.js

@@ -1,7 +1,10 @@
-import { EventEmitter } from "@yume-chan/event";
+import { EventEmitter, StickyEventEmitter } from "@yume-chan/event";
 import { Ref } from "../utils/index.js";
 import { AdbServerClient } from "./client.js";
-function unorderedRemove(array, index) {
+export function unorderedRemove(array, index) {
+    if (index < 0 || index >= array.length) {
+        return;
+    }
     array[index] = array[array.length - 1];
     array.length -= 1;
 }
@@ -14,36 +17,41 @@ export class AdbServerDeviceObserverOwner {
         this.#client = client;
     }
     async #receive(stream) {
+        const response = await stream.readString();
+        const next = AdbServerClient.parseDeviceList(response);
+        const removed = this.current.slice();
+        const added = [];
+        for (const nextDevice of next) {
+            const index = removed.findIndex((device) => device.transportId === nextDevice.transportId);
+            if (index === -1) {
+                added.push(nextDevice);
+                continue;
+            }
+            unorderedRemove(removed, index);
+        }
+        this.current = next;
+        if (added.length) {
+            for (const observer of this.#observers) {
+                observer.onDeviceAdd.fire(added);
+            }
+        }
+        if (removed.length) {
+            for (const observer of this.#observers) {
+                observer.onDeviceRemove.fire(removed);
+            }
+        }
+        for (const observer of this.#observers) {
+            observer.onListChange.fire(this.current);
+        }
+    }
+    async #receiveLoop(stream) {
         try {
             while (true) {
-                const response = await stream.readString();
-                const next = AdbServerClient.parseDeviceList(response);
-                const added = [];
-                for (const nextDevice of next) {
-                    const index = this.current.findIndex((device) => device.transportId === nextDevice.transportId);
-                    if (index === -1) {
-                        added.push(nextDevice);
-                        continue;
-                    }
-                    unorderedRemove(this.current, index);
-                }
-                if (added.length) {
-                    for (const observer of this.#observers) {
-                        observer.onDeviceAdd.fire(added);
-                    }
-                }
-                if (this.current.length) {
-                    for (const observer of this.#observers) {
-                        observer.onDeviceRemove.fire(this.current);
-                    }
-                }
-                this.current = next;
-                for (const observer of this.#observers) {
-                    observer.onListChange.fire(this.current);
-                }
+                await this.#receive(stream);
             }
         }
         catch (e) {
+            this.#stream = undefined;
             for (const observer of this.#observers) {
                 observer.onError.fire(e);
             }
@@ -53,7 +61,10 @@ export class AdbServerDeviceObserverOwner {
         const stream = await this.#client.createConnection("host:track-devices-l", 
         // Each individual observer will ref depending on their options
         { unref: true });
-        void this.#receive(stream);
+        // Set `current` and `onListChange` value before returning
+        await this.#receive(stream);
+        // Then start receive loop
+        void this.#receiveLoop(stream);
         return stream;
     }
     async #handleObserverStop(stream) {
@@ -63,41 +74,52 @@ export class AdbServerDeviceObserverOwner {
         }
     }
     async createObserver(options) {
-        if (options?.signal?.aborted) {
-            throw options.signal.reason;
-        }
-        this.#stream ??= this.#connect();
-        const stream = await this.#stream;
-        if (options?.signal?.aborted) {
-            await this.#handleObserverStop(stream);
-            throw options.signal.reason;
-        }
+        options?.signal?.throwIfAborted();
         const onDeviceAdd = new EventEmitter();
         const onDeviceRemove = new EventEmitter();
-        const onListChange = new EventEmitter();
-        const onError = new EventEmitter();
+        const onListChange = new StickyEventEmitter();
+        const onError = new StickyEventEmitter();
         const observer = { onDeviceAdd, onDeviceRemove, onListChange, onError };
+        // Register `observer` before `#connect`.
+        // So `#handleObserverStop` knows if there is any observer.
         this.#observers.push(observer);
+        let stream;
+        if (!this.#stream) {
+            this.#stream = this.#connect();
+            try {
+                stream = await this.#stream;
+            }
+            catch (e) {
+                this.#stream = undefined;
+                throw e;
+            }
+        }
+        else {
+            stream = await this.#stream;
+            onListChange.fire(this.current);
+        }
         const ref = new Ref(options);
         const stop = async () => {
-            const index = self.#observers.indexOf(observer);
-            if (index === -1) {
-                return;
-            }
-            unorderedRemove(this.#observers, index);
+            unorderedRemove(this.#observers, this.#observers.indexOf(observer));
             await this.#handleObserverStop(stream);
             ref.unref();
         };
-        options?.signal?.addEventListener("abort", () => void stop());
+        if (options?.signal) {
+            if (options.signal.aborted) {
+                await stop();
+                throw options.signal.reason;
+            }
+            options.signal.addEventListener("abort", () => void stop());
+        }
         // eslint-disable-next-line @typescript-eslint/no-this-alias
-        const self = this;
+        const _this = this;
         return {
             onDeviceAdd: onDeviceAdd.event,
             onDeviceRemove: onDeviceRemove.event,
             onListChange: onListChange.event,
             onError: onError.event,
             get current() {
-                return self.current;
+                return _this.current;
             },
             stop,
         };

package/esm/server/observer.js.map

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

package/esm/server/stream.d.ts

@@ -11,7 +11,7 @@ export declare class AdbServerStream {
     release(): {
         readable: import("@yume-chan/stream-extra").ReadableStream<Uint8Array<ArrayBufferLike>>;
         writable: import("@yume-chan/stream-extra/esm/types.js").WritableStream<import("@yume-chan/stream-extra").MaybeConsumable<Uint8Array<ArrayBufferLike>>>;
-        closed: Promise<void>;
+        closed: Promise<undefined>;
         close: () => MaybePromiseLike<void>;
     };
     dispose(): Promise<void>;

package/esm/server/transport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../src/server/transport.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACR,wBAAwB,EACxB,SAAS,EACT,YAAY,EACf,MAAM,WAAW,CAAC;AACnB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,eAAO,MAAM,2BAA2B,EAmBnC,UAAU,EAAE,CAAC;AAElB,qBAAa,kBAAmB,YAAW,YAAY;;IAGnD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAE7B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAmB;IAElD,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;IAM3B,IAAI,YAAY,kBAEf;IAED,IAAI,cAAc,iBAIjB;gBAIG,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,OAAO,CAAC,IAAI,CAAC;IAUzB,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IAS5C,gBAAgB,CAClB,OAAO,EAAE,wBAAwB,EACjC,OAAO,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC;IAIZ,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAInD,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAIpC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAO/B"}
+{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../src/server/transport.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACR,wBAAwB,EACxB,SAAS,EACT,YAAY,EACf,MAAM,WAAW,CAAC;AACnB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,eAAO,MAAM,2BAA2B,cAoBhB,CAAC;AAEzB,qBAAa,kBAAmB,YAAW,YAAY;;IAGnD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAE7B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAmB;IAElD,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;IAM3B,IAAI,YAAY,kBAEf;IAED,IAAI,cAAc,iBAIjB;gBAIG,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,OAAO,CAAC,IAAI,CAAC;IAUzB,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IAS5C,gBAAgB,CAClB,OAAO,EAAE,wBAAwB,EACjC,OAAO,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC;IAIZ,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAInD,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAIpC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAO/B"}

package/esm/server/transport.js

@@ -1,6 +1,6 @@
 import { PromiseResolver } from "@yume-chan/async";
 import { AdbFeature } from "../features.js";
-export const ADB_SERVER_DEFAULT_FEATURES = [
+export const ADB_SERVER_DEFAULT_FEATURES = /* #__PURE__ */ (() => [
     AdbFeature.ShellV2,
     AdbFeature.Cmd,
     AdbFeature.StatV2,
@@ -19,7 +19,7 @@ export const ADB_SERVER_DEFAULT_FEATURES = [
     "sendrecv_v2_lz4",
     "sendrecv_v2_zstd",
     "sendrecv_v2_dry_run_send",
-];
+])();
 export class AdbServerTransport {
     #client;
     serial;

package/esm/server/transport.js.map

@@ -1 +1 @@
-{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../src/server/transport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAQnD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAI5C,MAAM,CAAC,MAAM,2BAA2B,GAAG;IACvC,UAAU,CAAC,OAAO;IAClB,UAAU,CAAC,GAAG;IACd,UAAU,CAAC,MAAM;IACjB,UAAU,CAAC,MAAM;IACjB,UAAU,CAAC,cAAc;IACzB,MAAM;IACN,UAAU,CAAC,GAAG;IACd,yFAAyF;IACzF,gCAAgC;IAChC,8BAA8B;IAC9B,UAAU,CAAC,OAAO;IAClB,eAAe;IACf,WAAW;IACX,UAAU,CAAC,aAAa;IACxB,oBAAoB;IACpB,iBAAiB;IACjB,kBAAkB;IAClB,0BAA0B;CACb,CAAC;AAElB,MAAM,OAAO,kBAAkB;IAC3B,OAAO,CAAkB;IAEhB,MAAM,CAAS;IAEf,WAAW,CAAS;IAEpB,cAAc,GAAW,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;IAEzC,MAAM,CAAY;IAE3B,QAAQ,GAAgB,EAAE,CAAC;IAE3B,OAAO,GAAG,IAAI,eAAe,EAAQ,CAAC;IACtC,aAAa,CAAgB;IAC7B,IAAI,YAAY;QACZ,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IAED,IAAI,cAAc;QACd,kEAAkE;QAClE,8CAA8C;QAC9C,OAAO,2BAA2B,CAAC;IACvC,CAAC;IAED,yDAAyD;IACzD,YACI,MAAuB,EACvB,MAAc,EACd,MAAiB,EACjB,WAAmB,EACnB,YAA2B;QAE3B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAE/B,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAe;QACzB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,sBAAsB,CACpD,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,EACjC,OAAO,CACV,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3B,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,OAAiC,EACjC,OAAgB;QAEhB,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,OAAe;QACrC,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,mBAAmB;QACrB,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,mBAAmB,EAAE,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,KAAK;QACP,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACjC,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;QACzB,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;QACzB,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;CACJ"}
+{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../src/server/transport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAQnD,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAI5C,MAAM,CAAC,MAAM,2BAA2B,GAAG,eAAe,CAAC,CAAC,GAAG,EAAE,CAC7D;IACI,UAAU,CAAC,OAAO;IAClB,UAAU,CAAC,GAAG;IACd,UAAU,CAAC,MAAM;IACjB,UAAU,CAAC,MAAM;IACjB,UAAU,CAAC,cAAc;IACzB,MAAM;IACN,UAAU,CAAC,GAAG;IACd,yFAAyF;IACzF,gCAAgC;IAChC,8BAA8B;IAC9B,UAAU,CAAC,OAAO;IAClB,eAAe;IACf,WAAW;IACX,UAAU,CAAC,aAAa;IACxB,oBAAoB;IACpB,iBAAiB;IACjB,kBAAkB;IAClB,0BAA0B;CACb,CAAC,EAAE,CAAC;AAEzB,MAAM,OAAO,kBAAkB;IAC3B,OAAO,CAAkB;IAEhB,MAAM,CAAS;IAEf,WAAW,CAAS;IAEpB,cAAc,GAAW,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;IAEzC,MAAM,CAAY;IAE3B,QAAQ,GAAgB,EAAE,CAAC;IAE3B,OAAO,GAAG,IAAI,eAAe,EAAQ,CAAC;IACtC,aAAa,CAAgB;IAC7B,IAAI,YAAY;QACZ,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IAED,IAAI,cAAc;QACd,kEAAkE;QAClE,8CAA8C;QAC9C,OAAO,2BAA2B,CAAC;IACvC,CAAC;IAED,yDAAyD;IACzD,YACI,MAAuB,EACvB,MAAc,EACd,MAAiB,EACjB,WAAmB,EACnB,YAA2B;QAE3B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAE/B,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAe;QACzB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,sBAAsB,CACpD,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,EACjC,OAAO,CACV,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3B,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,OAAiC,EACjC,OAAgB;QAEhB,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,OAAe;QACrC,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,mBAAmB;QACrB,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,mBAAmB,EAAE,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,KAAK;QACP,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACjC,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;QACzB,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;QACzB,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;CACJ"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yume-chan/adb",
-  "version": "1.1.0",
+  "version": "2.0.1",
   "description": "TypeScript implementation of Android Debug Bridge (ADB) protocol.",
   "keywords": [
     "adb",
@@ -27,18 +27,18 @@
   "sideEffects": false,
   "dependencies": {
     "@yume-chan/async": "^4.0.2",
-    "@yume-chan/event": "^1.0.0",
-    "@yume-chan/no-data-view": "^1.0.0",
-    "@yume-chan/stream-extra": "^1.0.0",
-    "@yume-chan/struct": "^1.0.0"
+    "@yume-chan/event": "^2.0.0",
+    "@yume-chan/no-data-view": "^2.0.0",
+    "@yume-chan/stream-extra": "^2.0.1",
+    "@yume-chan/struct": "^2.0.1"
   },
   "devDependencies": {
-    "@types/node": "^22.10.2",
-    "prettier": "^3.4.2",
-    "typescript": "^5.7.2",
+    "@types/node": "^22.13.10",
+    "prettier": "^3.5.3",
+    "typescript": "^5.8.2",
     "@yume-chan/eslint-config": "^1.0.0",
-    "@yume-chan/tsconfig": "^1.0.0",
-    "@yume-chan/test-runner": "^1.0.0"
+    "@yume-chan/test-runner": "^1.0.0",
+    "@yume-chan/tsconfig": "^1.0.0"
   },
   "scripts": {
     "build": "tsc -b tsconfig.build.json",

package/src/adb.ts

@@ -9,10 +9,10 @@ import type { AdbBanner } from "./banner.js";
 import type { AdbFrameBuffer } from "./commands/index.js";
 import {
     AdbPower,
-    AdbReverseCommand,
-    AdbSubprocess,
+    AdbReverseService,
+    AdbSubprocessService,
     AdbSync,
-    AdbTcpIpCommand,
+    AdbTcpIpService,
     escapeArg,
     framebuffer,
 } from "./commands/index.js";
@@ -30,7 +30,7 @@ export interface AdbSocket
         Closeable {
     get service(): string;
 
-    get closed(): Promise<void>;
+    get closed(): Promise<undefined>;
 }
 
 export type AdbIncomingSocketHandler = (
@@ -61,44 +61,47 @@ export interface AdbTransport extends Closeable {
 }
 
 export class Adb implements Closeable {
-    readonly transport: AdbTransport;
+    readonly #transport: AdbTransport;
+    get transport(): AdbTransport {
+        return this.#transport;
+    }
 
     get serial() {
-        return this.transport.serial;
+        return this.#transport.serial;
     }
 
     get maxPayloadSize() {
-        return this.transport.maxPayloadSize;
+        return this.#transport.maxPayloadSize;
     }
 
     get banner() {
-        return this.transport.banner;
+        return this.#transport.banner;
     }
 
     get disconnected() {
-        return this.transport.disconnected;
+        return this.#transport.disconnected;
     }
 
     public get clientFeatures() {
-        return this.transport.clientFeatures;
+        return this.#transport.clientFeatures;
     }
 
     public get deviceFeatures() {
         return this.banner.features;
     }
 
-    readonly subprocess: AdbSubprocess;
+    readonly subprocess: AdbSubprocessService;
     readonly power: AdbPower;
-    readonly reverse: AdbReverseCommand;
-    readonly tcpip: AdbTcpIpCommand;
+    readonly reverse: AdbReverseService;
+    readonly tcpip: AdbTcpIpService;
 
     constructor(transport: AdbTransport) {
-        this.transport = transport;
+        this.#transport = transport;
 
-        this.subprocess = new AdbSubprocess(this);
+        this.subprocess = new AdbSubprocessService(this);
         this.power = new AdbPower(this);
-        this.reverse = new AdbReverseCommand(this);
-        this.tcpip = new AdbTcpIpCommand(this);
+        this.reverse = new AdbReverseService(this);
+        this.tcpip = new AdbTcpIpService(this);
     }
 
     canUseFeature(feature: AdbFeature): boolean {
@@ -112,7 +115,7 @@ export class Adb implements Closeable {
      * Creates a new ADB Socket to the specified service or socket address.
      */
     async createSocket(service: string): Promise<AdbSocket> {
-        return this.transport.connect(service);
+        return this.#transport.connect(service);
     }
 
     async createSocketAndWait(service: string): Promise<string> {
@@ -122,15 +125,13 @@ export class Adb implements Closeable {
             .pipeThrough(new ConcatStringStream());
     }
 
-    async getProp(key: string): Promise<string> {
-        const stdout = await this.subprocess.spawnAndWaitLegacy([
-            "getprop",
-            key,
-        ]);
-        return stdout.trim();
+    getProp(key: string): Promise<string> {
+        return this.subprocess.noneProtocol
+            .spawnWaitText(["getprop", key])
+            .then((output) => output.trim());
     }
 
-    async rm(
+    rm(
         filenames: string | string[],
         options?: { recursive?: boolean; force?: boolean },
     ): Promise<string> {
@@ -150,8 +151,8 @@ export class Adb implements Closeable {
         }
         // https://android.googlesource.com/platform/packages/modules/adb/+/1a0fb8846d4e6b671c8aa7f137a8c21d7b248716/client/adb_install.cpp#984
         args.push("</dev/null");
-        const stdout = await this.subprocess.spawnAndWaitLegacy(args);
-        return stdout;
+
+        return this.subprocess.noneProtocol.spawnWaitText(args);
     }
 
     async sync(): Promise<AdbSync> {
@@ -164,6 +165,6 @@ export class Adb implements Closeable {
     }
 
     async close(): Promise<void> {
-        await this.transport.close();
+        await this.#transport.close();
     }
 }

package/src/banner.ts

@@ -51,22 +51,22 @@ export class AdbBanner {
         return new AdbBanner(product, model, device, features);
     }
 
-    #product: string | undefined;
+    readonly #product: string | undefined;
     get product() {
         return this.#product;
     }
 
-    #model: string | undefined;
+    readonly #model: string | undefined;
     get model() {
         return this.#model;
     }
 
-    #device: string | undefined;
+    readonly #device: string | undefined;
     get device() {
         return this.#device;
     }
 
-    #features: AdbFeature[] = [];
+    readonly #features: AdbFeature[] = [];
     get features() {
         return this.#features;
     }

package/src/commands/base.ts

@@ -2,11 +2,14 @@ import { AutoDisposable } from "@yume-chan/event";
 
 import type { Adb } from "../adb.js";
 
-export class AdbCommandBase extends AutoDisposable {
-    protected adb: Adb;
+export class AdbServiceBase extends AutoDisposable {
+    readonly #adb: Adb;
+    get adb() {
+        return this.#adb;
+    }
 
     constructor(adb: Adb) {
         super();
-        this.adb = adb;
+        this.#adb = adb;
     }
 }

package/src/commands/power.ts

@@ -3,9 +3,9 @@
 // cspell: ignore keyevent
 // cspell: ignore longpress
 
-import { AdbCommandBase } from "./base.js";
+import { AdbServiceBase } from "./base.js";
 
-export class AdbPower extends AdbCommandBase {
+export class AdbPower extends AdbServiceBase {
     reboot(mode = "") {
         return this.adb.createSocketAndWait(`reboot:${mode}`);
     }
@@ -35,18 +35,18 @@ export class AdbPower extends AdbCommandBase {
         return this.reboot("edl");
     }
 
-    powerOff() {
-        return this.adb.subprocess.spawnAndWaitLegacy(["reboot", "-p"]);
+    powerOff(): Promise<string> {
+        return this.adb.subprocess.noneProtocol.spawnWaitText(["reboot", "-p"]);
     }
 
-    powerButton(longPress = false) {
+    powerButton(longPress = false): Promise<string> {
         const args = ["input", "keyevent"];
         if (longPress) {
             args.push("--longpress");
         }
         args.push("POWER");
 
-        return this.adb.subprocess.spawnAndWaitLegacy(args);
+        return this.adb.subprocess.noneProtocol.spawnWaitText(args);
     }
 
     /**

package/src/commands/reverse.ts

@@ -4,13 +4,16 @@ import { BufferedReadableStream } from "@yume-chan/stream-extra";
 import {
     encodeUtf8,
     ExactReadableEndedError,
+    extend,
     string,
     struct,
 } from "@yume-chan/struct";
 
-import type { Adb, AdbIncomingSocketHandler } from "../adb.js";
+import type { AdbIncomingSocketHandler } from "../adb.js";
 import { hexToNumber, sequenceEqual } from "../utils/index.js";
 
+import { AdbServiceBase } from "./base.js";
+
 export interface AdbForwardListener {
     deviceSerial: string;
 
@@ -49,11 +52,11 @@ export class AdbReverseNotSupportedError extends AdbReverseError {
     }
 }
 
-const AdbReverseErrorResponse = struct(
-    /* #__PURE__ */ (() => AdbReverseStringResponse.fields)(),
+const AdbReverseErrorResponse = extend(
+    AdbReverseStringResponse,
+    {},
     {
-        littleEndian: true,
-        postDeserialize: (value) => {
+        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.
@@ -81,15 +84,9 @@ function decimalToNumber(buffer: Uint8Array) {
 
 const OKAY = encodeUtf8("OKAY");
 
-export class AdbReverseCommand {
-    protected adb: Adb;
-
+export class AdbReverseService extends AdbServiceBase {
     readonly #deviceAddressToLocalAddress = new Map<string, string>();
 
-    constructor(adb: Adb) {
-        this.adb = adb;
-    }
-
     protected async createBufferedStream(service: string) {
         const socket = await this.adb.createSocket(service);
         return new BufferedReadableStream(socket.readable);

package/src/commands/subprocess/index.ts

@@ -1,3 +1,4 @@
-export * from "./command.js";
-export * from "./protocols/index.js";
+export * from "./none/index.js";
+export * from "./service.js";
+export * from "./shell/index.js";
 export * from "./utils.js";

package/src/commands/subprocess/none/index.ts

@@ -0,0 +1,4 @@
+export * from "./process.js";
+export * from "./pty.js";
+export * from "./service.js";
+export * from "./spawner.js";

package/src/commands/subprocess/none/process.ts

@@ -0,0 +1,56 @@
+import type { MaybePromiseLike } from "@yume-chan/async";
+import { PromiseResolver } from "@yume-chan/async";
+import type {
+    AbortSignal,
+    MaybeConsumable,
+    ReadableStream,
+    WritableStream,
+} from "@yume-chan/stream-extra";
+
+import type { AdbSocket } from "../../../adb.js";
+
+import type { AdbNoneProtocolProcess } from "./spawner.js";
+
+export class AdbNoneProtocolProcessImpl implements AdbNoneProtocolProcess {
+    readonly #socket: AdbSocket;
+
+    get stdin(): WritableStream<MaybeConsumable<Uint8Array>> {
+        return this.#socket.writable;
+    }
+
+    get output(): ReadableStream<Uint8Array> {
+        return this.#socket.readable;
+    }
+
+    readonly #exited: Promise<undefined>;
+    get exited(): Promise<undefined> {
+        return this.#exited;
+    }
+
+    constructor(socket: AdbSocket, signal?: AbortSignal) {
+        this.#socket = socket;
+
+        if (signal) {
+            // `signal` won't affect `this.output`
+            // So remaining data can still be read
+            // (call `controller.error` will discard all pending data)
+
+            const exited = new PromiseResolver<undefined>();
+            this.#socket.closed.then(
+                () => exited.resolve(undefined),
+                (e) => exited.reject(e),
+            );
+            signal.addEventListener("abort", () => {
+                exited.reject(signal.reason);
+                this.#socket.close();
+            });
+            this.#exited = exited.promise;
+        } else {
+            this.#exited = this.#socket.closed;
+        }
+    }
+
+    kill(): MaybePromiseLike<void> {
+        return this.#socket.close();
+    }
+}

package/src/commands/subprocess/none/pty.ts

@@ -0,0 +1,45 @@
+import type { MaybePromiseLike } from "@yume-chan/async";
+import type {
+    ReadableStream,
+    WritableStream,
+    WritableStreamDefaultWriter,
+} 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 class AdbNoneProtocolPtyProcess implements AdbPtyProcess<undefined> {
+    readonly #socket: AdbSocket;
+    readonly #writer: WritableStreamDefaultWriter<MaybeConsumable<Uint8Array>>;
+
+    readonly #input: MaybeConsumable.WritableStream<Uint8Array>;
+    get input(): WritableStream<MaybeConsumable<Uint8Array>> {
+        return this.#input;
+    }
+
+    get output(): ReadableStream<Uint8Array> {
+        return this.#socket.readable;
+    }
+
+    get exited(): Promise<undefined> {
+        return this.#socket.closed;
+    }
+
+    constructor(socket: AdbSocket) {
+        this.#socket = socket;
+
+        this.#writer = this.#socket.writable.getWriter();
+        this.#input = new MaybeConsumable.WritableStream<Uint8Array>({
+            write: (chunk) => this.#writer.write(chunk),
+        });
+    }
+
+    sigint() {
+        return this.#writer.write(new Uint8Array([0x03]));
+    }
+
+    kill(): MaybePromiseLike<void> {
+        return this.#socket.close();
+    }
+}