@yume-chan/adb 1.0.0 → 2.0.0

package/esm/server/transport.js

@@ -1,7 +1,6 @@
 import { PromiseResolver } from "@yume-chan/async";
-import { AbortController } from "@yume-chan/stream-extra";
 import { AdbFeature } from "../features.js";
-export const ADB_SERVER_DEFAULT_FEATURES = [
+export const ADB_SERVER_DEFAULT_FEATURES = /* #__PURE__ */ (() => [
     AdbFeature.ShellV2,
     AdbFeature.Cmd,
     AdbFeature.StatV2,
@@ -20,36 +19,36 @@ export const ADB_SERVER_DEFAULT_FEATURES = [
     "sendrecv_v2_lz4",
     "sendrecv_v2_zstd",
     "sendrecv_v2_dry_run_send",
-];
+])();
 export class AdbServerTransport {
     #client;
     serial;
     transportId;
     maxPayloadSize = 1 * 1024 * 1024;
     banner;
+    #sockets = [];
     #closed = new PromiseResolver();
-    #waitAbortController = new AbortController();
-    disconnected;
+    #disconnected;
+    get disconnected() {
+        return this.#disconnected;
+    }
     get clientFeatures() {
         // No need to get host features (features supported by ADB server)
         // Because we create all ADB packets ourselves
         return ADB_SERVER_DEFAULT_FEATURES;
     }
-    constructor(client, serial, banner, transportId) {
+    // eslint-disable-next-line @typescript-eslint/max-params
+    constructor(client, serial, banner, transportId, disconnected) {
         this.#client = client;
         this.serial = serial;
         this.banner = banner;
         this.transportId = transportId;
-        this.disconnected = Promise.race([
-            this.#closed.promise,
-            client.waitFor({ transportId }, "disconnect", {
-                signal: this.#waitAbortController.signal,
-                unref: true,
-            }),
-        ]);
+        this.#disconnected = Promise.race([this.#closed.promise, disconnected]);
     }
     async connect(service) {
-        return await this.#client.createDeviceConnection({ transportId: this.transportId }, service);
+        const socket = await this.#client.createDeviceConnection({ transportId: this.transportId }, service);
+        this.#sockets.push(socket);
+        return socket;
     }
     async addReverseTunnel(handler, address) {
         return await this.#client.connector.addReverseTunnel(handler, address);
@@ -60,9 +59,12 @@ export class AdbServerTransport {
     async clearReverseTunnels() {
         await this.#client.connector.clearReverseTunnels();
     }
-    close() {
+    async close() {
+        for (const socket of this.#sockets) {
+            await socket.close();
+        }
+        this.#sockets.length = 0;
         this.#closed.resolve();
-        this.#waitAbortController.abort();
     }
 }
 //# sourceMappingURL=transport.js.map

package/esm/server/transport.js.map

@@ -1 +1 @@
-{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../src/server/transport.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAQ1D,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,OAAO,GAAG,IAAI,eAAe,EAAQ,CAAC;IACtC,oBAAoB,GAAG,IAAI,eAAe,EAAE,CAAC;IACpC,YAAY,CAAgB;IAErC,IAAI,cAAc;QACd,kEAAkE;QAClE,8CAA8C;QAC9C,OAAO,2BAA2B,CAAC;IACvC,CAAC;IAED,YACI,MAAuB,EACvB,MAAc,EACd,MAAiB,EACjB,WAAmB;QAEnB,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,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;YAC7B,IAAI,CAAC,OAAO,CAAC,OAAO;YACpB,MAAM,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,EAAE,YAAY,EAAE;gBAC1C,MAAM,EAAE,IAAI,CAAC,oBAAoB,CAAC,MAAM;gBACxC,KAAK,EAAE,IAAI;aACd,CAAC;SACL,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAe;QACzB,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAC5C,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,EACjC,OAAO,CACV,CAAC;IACN,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;QACD,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QACvB,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,CAAC;IACtC,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/esm/utils/index.d.ts

@@ -3,5 +3,6 @@ export * from "./auto-reset-event.js";
 export * from "./base64.js";
 export * from "./hex.js";
 export * from "./no-op.js";
+export * from "./ref.js";
 export * from "./sequence-equal.js";
 //# sourceMappingURL=index.d.ts.map

package/esm/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC3D,cAAc,uBAAuB,CAAC;AACtC,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC3D,cAAc,uBAAuB,CAAC;AACtC,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,qBAAqB,CAAC"}

package/esm/utils/index.js

@@ -3,5 +3,6 @@ export * from "./auto-reset-event.js";
 export * from "./base64.js";
 export * from "./hex.js";
 export * from "./no-op.js";
+export * from "./ref.js";
 export * from "./sequence-equal.js";
 //# sourceMappingURL=index.js.map

package/esm/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC3D,cAAc,uBAAuB,CAAC;AACtC,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC3D,cAAc,uBAAuB,CAAC;AACtC,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,qBAAqB,CAAC"}

package/esm/utils/ref.d.ts

@@ -0,0 +1,18 @@
+/**
+ * An object to keep current Node.js process alive even when no code is running.
+ *
+ * Does nothing in Web environments.
+ *
+ * Note that it does't have reference counting. Calling `unref` will
+ * remove the ref no matter how many times `ref` has been previously called, and vice versa.
+ * This is the same as how Node.js works.
+ */
+export declare class Ref {
+    #private;
+    constructor(options?: {
+        unref?: boolean | undefined;
+    });
+    ref(): void;
+    unref(): void;
+}
+//# sourceMappingURL=ref.d.ts.map

package/esm/utils/ref.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ref.d.ts","sourceRoot":"","sources":["../../src/utils/ref.ts"],"names":[],"mappings":"AAOA;;;;;;;;GAQG;AACH,qBAAa,GAAG;;gBAGA,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;KAAE;IAMrD,GAAG;IAKH,KAAK;CAMR"}

package/esm/utils/ref.js

@@ -0,0 +1,29 @@
+const { setInterval, clearInterval } = globalThis;
+/**
+ * An object to keep current Node.js process alive even when no code is running.
+ *
+ * Does nothing in Web environments.
+ *
+ * Note that it does't have reference counting. Calling `unref` will
+ * remove the ref no matter how many times `ref` has been previously called, and vice versa.
+ * This is the same as how Node.js works.
+ */
+export class Ref {
+    #intervalId;
+    constructor(options) {
+        if (!options?.unref) {
+            this.ref();
+        }
+    }
+    ref() {
+        // `setInterval` can keep current Node.js alive, the delay value doesn't matter
+        this.#intervalId = setInterval(() => { }, 60 * 1000);
+    }
+    unref() {
+        if (this.#intervalId) {
+            clearInterval(this.#intervalId);
+            this.#intervalId = undefined;
+        }
+    }
+}
+//# sourceMappingURL=ref.js.map

package/esm/utils/ref.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ref.js","sourceRoot":"","sources":["../../src/utils/ref.ts"],"names":[],"mappings":"AAKA,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,UAAwC,CAAC;AAEhF;;;;;;;;GAQG;AACH,MAAM,OAAO,GAAG;IACZ,WAAW,CAAqB;IAEhC,YAAY,OAAyC;QACjD,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC;YAClB,IAAI,CAAC,GAAG,EAAE,CAAC;QACf,CAAC;IACL,CAAC;IAED,GAAG;QACC,+EAA+E;QAC/E,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC,GAAG,EAAE,GAAE,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;IACxD,CAAC;IAED,KAAK;QACD,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACnB,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAChC,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC;QACjC,CAAC;IACL,CAAC;CACJ"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yume-chan/adb",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "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/stream-extra": "^1.0.0",
-    "@yume-chan/struct": "^1.0.0",
-    "@yume-chan/no-data-view": "^1.0.0"
+    "@yume-chan/event": "^2.0.0",
+    "@yume-chan/stream-extra": "^2.0.0",
+    "@yume-chan/no-data-view": "^2.0.0",
+    "@yume-chan/struct": "^2.0.0"
   },
   "devDependencies": {
-    "@types/node": "^22.10.0",
-    "prettier": "^3.4.1",
-    "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/test-runner": "^1.0.0",
-    "@yume-chan/tsconfig": "^1.0.0"
+    "@yume-chan/tsconfig": "^1.0.0",
+    "@yume-chan/test-runner": "^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();
+    }
+}

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

@@ -0,0 +1,42 @@
+import type { Adb } from "../../../adb.js";
+
+import { AdbNoneProtocolProcessImpl } from "./process.js";
+import { AdbNoneProtocolPtyProcess } from "./pty.js";
+import { AdbNoneProtocolSpawner } from "./spawner.js";
+
+export class AdbNoneProtocolSubprocessService extends AdbNoneProtocolSpawner {
+    readonly #adb: Adb;
+    get adb(): Adb {
+        return this.#adb;
+    }
+
+    constructor(adb: Adb) {
+        super(async (command, signal) => {
+            // `shell,raw:${command}` also triggers raw mode,
+            // But is not supported on Android version <7.
+            const socket = await this.#adb.createSocket(
+                `exec:${command.join(" ")}`,
+            );
+
+            if (signal?.aborted) {
+                await socket.close();
+                throw signal.reason;
+            }
+
+            return new AdbNoneProtocolProcessImpl(socket, signal);
+        });
+        this.#adb = adb;
+    }
+
+    async pty(command?: string | string[]): Promise<AdbNoneProtocolPtyProcess> {
+        if (command === undefined) {
+            command = "";
+        } else if (Array.isArray(command)) {
+            command = command.join(" ");
+        }
+
+        return new AdbNoneProtocolPtyProcess(
+            await this.#adb.createSocket(`shell:${command}`),
+        );
+    }
+}