@yume-chan/adb 0.0.19 → 0.0.21

package/esm/utils/conditional-variable.js.map

@@ -1 +1 @@
-{"version":3,"file":"conditional-variable.js","sourceRoot":"","sources":["../../src/utils/conditional-variable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAQnD,MAAM,OAAO,mBAAmB;IACpB,OAAO,GAAG,KAAK,CAAC;IACP,MAAM,GAAgB,EAAE,CAAC;IAEnC,IAAI,CAAC,SAAwB;QAChC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YACpB,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,SAAS,EAAE,EAAE;gBACzC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;aAC5B;SACJ;QAED,MAAM,QAAQ,GAAG,IAAI,eAAe,EAAQ,CAAC;QAC7C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC1C,OAAO,QAAQ,CAAC,OAAO,CAAC;IAC5B,CAAC;IAEM,SAAS;QACZ,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAClC,IAAI,KAAK,EAAE;YACP,IAAI,KAAK,CAAC,SAAS,EAAE,EAAE;gBACnB,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;aAC5B;SACJ;aAAM;YACH,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;SACxB;IACL,CAAC;IAEM,OAAO;QACV,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,EAAE;YAC5B,IAAI,CAAC,QAAQ,CAAC,MAAM,CAChB,IAAI,KAAK,CAAC,2CAA2C,CAAC,CACzD,CAAC;SACL;QACD,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;IAC3B,CAAC;CACJ"}
+{"version":3,"file":"conditional-variable.js","sourceRoot":"","sources":["../../src/utils/conditional-variable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAQnD,MAAM,OAAO,mBAAmB;IAC5B,OAAO,GAAG,KAAK,CAAC;IACP,MAAM,GAAgB,EAAE,CAAC;IAElC,IAAI,CAAC,SAAwB;QACzB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YACpB,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,SAAS,EAAE,EAAE;gBACzC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;aAC5B;SACJ;QAED,MAAM,QAAQ,GAAG,IAAI,eAAe,EAAQ,CAAC;QAC7C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC1C,OAAO,QAAQ,CAAC,OAAO,CAAC;IAC5B,CAAC;IAED,SAAS;QACL,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAClC,IAAI,KAAK,EAAE;YACP,IAAI,KAAK,CAAC,SAAS,EAAE,EAAE;gBACnB,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;aAC5B;SACJ;aAAM;YACH,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;SACxB;IACL,CAAC;IAED,OAAO;QACH,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,EAAE;YAC5B,IAAI,CAAC,QAAQ,CAAC,MAAM,CAChB,IAAI,KAAK,CAAC,2CAA2C,CAAC,CACzD,CAAC;SACL;QACD,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;IAC3B,CAAC;CACJ"}

package/esm/utils/hex.d.ts

@@ -0,0 +1,3 @@
+export declare function hexToNumber(data: Uint8Array): number;
+export declare function numberToHex(value: number): Uint8Array;
+//# sourceMappingURL=hex.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"hex.d.ts","sourceRoot":"","sources":["../../src/utils/hex.ts"],"names":[],"mappings":"AA8BA,wBAAgB,WAAW,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,CAMpD;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,cAmBxC"}

package/esm/utils/hex.js

@@ -0,0 +1,55 @@
+function hexCharToNumber(char) {
+    if (char < 48) {
+        throw new Error(`Invalid hex char ${char}`);
+    }
+    if (char < 58) {
+        // 0-9
+        return char - 48;
+    }
+    if (char < 65) {
+        throw new Error(`Invalid hex char ${char}`);
+    }
+    if (char < 71) {
+        // A-F
+        return char - 55;
+    }
+    if (char < 97) {
+        throw new Error(`Invalid hex char ${char}`);
+    }
+    if (char < 103) {
+        // a-f
+        return char - 87;
+    }
+    throw new Error(`Invalid hex char ${char}`);
+}
+// It's 22x faster than converting `data` to string then `Number.parseInt`
+// https://jsbench.me/dglha94ozl/1
+export function hexToNumber(data) {
+    let result = 0;
+    for (let i = 0; i < data.length; i += 1) {
+        result = (result << 4) | hexCharToNumber(data[i]);
+    }
+    return result;
+}
+export function numberToHex(value) {
+    const result = new Uint8Array(4);
+    let index = 3;
+    while (index >= 0 && value > 0) {
+        const digit = value & 0xf;
+        value >>= 4;
+        if (digit < 10) {
+            result[index] = digit + 48;
+        }
+        else {
+            result[index] = digit + 87;
+        }
+        index -= 1;
+    }
+    while (index >= 0) {
+        // '0'
+        result[index] = 48;
+        index -= 1;
+    }
+    return result;
+}
+//# sourceMappingURL=hex.js.map

package/esm/utils/hex.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hex.js","sourceRoot":"","sources":["../../src/utils/hex.ts"],"names":[],"mappings":"AAAA,SAAS,eAAe,CAAC,IAAY;IACjC,IAAI,IAAI,GAAG,EAAE,EAAE;QACX,MAAM,IAAI,KAAK,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC;KAC/C;IACD,IAAI,IAAI,GAAG,EAAE,EAAE;QACX,MAAM;QACN,OAAO,IAAI,GAAG,EAAE,CAAC;KACpB;IAED,IAAI,IAAI,GAAG,EAAE,EAAE;QACX,MAAM,IAAI,KAAK,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC;KAC/C;IACD,IAAI,IAAI,GAAG,EAAE,EAAE;QACX,MAAM;QACN,OAAO,IAAI,GAAG,EAAE,CAAC;KACpB;IAED,IAAI,IAAI,GAAG,EAAE,EAAE;QACX,MAAM,IAAI,KAAK,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC;KAC/C;IACD,IAAI,IAAI,GAAG,GAAG,EAAE;QACZ,MAAM;QACN,OAAO,IAAI,GAAG,EAAE,CAAC;KACpB;IAED,MAAM,IAAI,KAAK,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC;AAChD,CAAC;AAED,0EAA0E;AAC1E,kCAAkC;AAClC,MAAM,UAAU,WAAW,CAAC,IAAgB;IACxC,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE;QACrC,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,CAAC;KACtD;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,KAAa;IACrC,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC;IACjC,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,OAAO,KAAK,IAAI,CAAC,IAAI,KAAK,GAAG,CAAC,EAAE;QAC5B,MAAM,KAAK,GAAG,KAAK,GAAG,GAAG,CAAC;QAC1B,KAAK,KAAK,CAAC,CAAC;QACZ,IAAI,KAAK,GAAG,EAAE,EAAE;YACZ,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,GAAG,EAAE,CAAC;SAC9B;aAAM;YACH,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,GAAG,EAAE,CAAC;SAC9B;QACD,KAAK,IAAI,CAAC,CAAC;KACd;IACD,OAAO,KAAK,IAAI,CAAC,EAAE;QACf,MAAM;QACN,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QACnB,KAAK,IAAI,CAAC,CAAC;KACd;IACD,OAAO,MAAM,CAAC;AAClB,CAAC"}

package/esm/utils/index.d.ts

@@ -2,4 +2,6 @@ export { decodeUtf8, encodeUtf8 } from "@yume-chan/struct";
 export * from "./auto-reset-event.js";
 export * from "./base64.js";
 export * from "./conditional-variable.js";
+export * from "./hex.js";
+export * from "./no-op.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,2BAA2B,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,2BAA2B,CAAC;AAC1C,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC"}

package/esm/utils/index.js

@@ -2,4 +2,6 @@ export { decodeUtf8, encodeUtf8 } from "@yume-chan/struct";
 export * from "./auto-reset-event.js";
 export * from "./base64.js";
 export * from "./conditional-variable.js";
+export * from "./hex.js";
+export * from "./no-op.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,2BAA2B,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,2BAA2B,CAAC;AAC1C,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC"}

package/esm/utils/no-op.d.ts

@@ -0,0 +1,7 @@
+export declare const NOOP: () => void;
+/**
+ * When used in `Promise#catch`, means the promise should never throw errors.
+ * An explicit way to suppress ESLint floating promise warnings.
+ */
+export declare function unreachable(...args: unknown[]): never;
+//# sourceMappingURL=no-op.d.ts.map

package/esm/utils/no-op.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"no-op.d.ts","sourceRoot":"","sources":["../../src/utils/no-op.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,IAAI,YAEhB,CAAC;AAEF;;;GAGG;AACH,wBAAgB,WAAW,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,KAAK,CAGrD"}

package/esm/utils/no-op.js

@@ -0,0 +1,12 @@
+export const NOOP = () => {
+    // no-op
+};
+/**
+ * When used in `Promise#catch`, means the promise should never throw errors.
+ * An explicit way to suppress ESLint floating promise warnings.
+ */
+export function unreachable(...args) {
+    // Trigger runtime's unhandled rejection event.
+    throw new Error("Unreachable. Arguments:\n" + args.join("\n"));
+}
+//# sourceMappingURL=no-op.js.map

package/esm/utils/no-op.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"no-op.js","sourceRoot":"","sources":["../../src/utils/no-op.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,IAAI,GAAG,GAAG,EAAE;IACrB,QAAQ;AACZ,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,UAAU,WAAW,CAAC,GAAG,IAAe;IAC1C,+CAA+C;IAC/C,MAAM,IAAI,KAAK,CAAC,2BAA2B,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AACnE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yume-chan/adb",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "description": "TypeScript implementation of Android Debug Bridge (ADB) protocol.",
   "keywords": [
     "adb",
@@ -26,23 +26,23 @@
   "types": "esm/index.d.ts",
   "dependencies": {
     "@yume-chan/async": "^2.2.0",
-    "@yume-chan/dataview-bigint-polyfill": "^0.0.19",
-    "@yume-chan/event": "^0.0.19",
-    "@yume-chan/stream-extra": "^0.0.19",
-    "@yume-chan/struct": "^0.0.19",
-    "tslib": "^2.4.1"
+    "@yume-chan/dataview-bigint-polyfill": "^0.0.21",
+    "@yume-chan/event": "^0.0.21",
+    "@yume-chan/stream-extra": "^0.0.21",
+    "@yume-chan/struct": "^0.0.21",
+    "tslib": "^2.6.0"
   },
   "devDependencies": {
-    "@jest/globals": "^29.5.0",
-    "@types/node": "^18.15.0",
+    "@jest/globals": "^29.6.1",
+    "@types/node": "^20.4.0",
     "@yume-chan/eslint-config": "^1.0.0",
     "@yume-chan/tsconfig": "^1.0.0",
     "cross-env": "^7.0.3",
-    "eslint": "^8.36.0",
+    "eslint": "^8.44.0",
     "jest": "^29.5.0",
-    "prettier": "^2.8.4",
-    "ts-jest": "^29.0.4",
-    "typescript": "^4.9.4"
+    "prettier": "^3.0.0",
+    "ts-jest": "^29.1.1",
+    "typescript": "^5.1.6"
   },
   "scripts": {
     "build": "tsc -b tsconfig.build.json",

package/src/adb.ts

@@ -1,18 +1,8 @@
-import { PromiseResolver } from "@yume-chan/async";
 import type { Consumable, ReadableWritablePair } from "@yume-chan/stream-extra";
-import {
-    AbortController,
-    ConsumableWritableStream,
-    DecodeUtf8Stream,
-    GatherStringStream,
-    WritableStream,
-} from "@yume-chan/stream-extra";
+import { ConcatStringStream, DecodeUtf8Stream } from "@yume-chan/stream-extra";
+import type { ValueOrPromise } from "@yume-chan/struct";
 
-import type { AdbCredentialStore } from "./auth.js";
-import {
-    ADB_DEFAULT_AUTHENTICATORS,
-    AdbAuthenticationProcessor,
-} from "./auth.js";
+import type { AdbBanner } from "./banner.js";
 import type { AdbFrameBuffer } from "./commands/index.js";
 import {
     AdbPower,
@@ -23,221 +13,69 @@ import {
     escapeArg,
     framebuffer,
 } from "./commands/index.js";
-import { AdbFeature } from "./features.js";
-import type { AdbPacketData, AdbPacketInit } from "./packet.js";
-import { AdbCommand, calculateChecksum } from "./packet.js";
-import type {
-    AdbIncomingSocketHandler,
-    AdbSocket,
-    Closeable,
-} from "./socket/index.js";
-import { AdbPacketDispatcher } from "./socket/index.js";
-import { decodeUtf8, encodeUtf8 } from "./utils/index.js";
+import type { AdbFeature } from "./features.js";
 
-export enum AdbPropKey {
-    Product = "ro.product.name",
-    Model = "ro.product.model",
-    Device = "ro.product.device",
-    Features = "features",
+export interface AdbSocket
+    extends ReadableWritablePair<Uint8Array, Consumable<Uint8Array>>,
+        Closeable {
+    readonly service: string;
 }
 
-export const VERSION_OMIT_CHECKSUM = 0x01000001;
-
-export class Adb implements Closeable {
-    /**
-     * It's possible to call `authenticate` multiple times on a single connection,
-     * every time the device receives a `CNXN` packet, it resets its internal state,
-     * and starts a new authentication process.
-     */
-    public static async authenticate(
-        connection: ReadableWritablePair<
-            AdbPacketData,
-            Consumable<AdbPacketInit>
-        >,
-        credentialStore: AdbCredentialStore,
-        authenticators = ADB_DEFAULT_AUTHENTICATORS
-    ): Promise<Adb> {
-        // Initially, set to highest-supported version and payload size.
-        let version = 0x01000001;
-        // Android 4: 4K, Android 7: 256K, Android 9: 1M
-        let maxPayloadSize = 1024 * 1024;
-
-        const resolver = new PromiseResolver<string>();
-        const authProcessor = new AdbAuthenticationProcessor(
-            authenticators,
-            credentialStore
-        );
+export type AdbIncomingSocketHandler = (
+    socket: AdbSocket,
+) => ValueOrPromise<void>;
 
-        // Here is similar to `AdbPacketDispatcher`,
-        // But the received packet types and send packet processing are different.
-        const abortController = new AbortController();
-        const pipe = connection.readable
-            .pipeTo(
-                new WritableStream({
-                    async write(packet) {
-                        switch (packet.command) {
-                            case AdbCommand.Connect:
-                                version = Math.min(version, packet.arg0);
-                                maxPayloadSize = Math.min(
-                                    maxPayloadSize,
-                                    packet.arg1
-                                );
-                                resolver.resolve(decodeUtf8(packet.payload));
-                                break;
-                            case AdbCommand.Auth: {
-                                const response = await authProcessor.process(
-                                    packet
-                                );
-                                await sendPacket(response);
-                                break;
-                            }
-                            default:
-                                // Maybe the previous ADB client exited without reading all packets,
-                                // so they are still waiting in OS internal buffer.
-                                // Just ignore them.
-                                // Because a `Connect` packet will reset the device,
-                                // Eventually there will be `Connect` and `Auth` response packets.
-                                break;
-                        }
-                    },
-                }),
-                {
-                    // Don't cancel the source ReadableStream on AbortSignal abort.
-                    preventCancel: true,
-                    signal: abortController.signal,
-                }
-            )
-            .catch((e) => {
-                resolver.reject(e);
-            });
-
-        const writer = connection.writable.getWriter();
-        async function sendPacket(init: AdbPacketData) {
-            // Always send checksum in auth steps
-            // Because we don't know if the device needs it or not.
-            (init as AdbPacketInit).checksum = calculateChecksum(init.payload);
-            (init as AdbPacketInit).magic = init.command ^ 0xffffffff;
-            await ConsumableWritableStream.write(writer, init as AdbPacketInit);
-        }
+export interface Closeable {
+    close(): ValueOrPromise<void>;
+}
 
-        let banner: string;
-        try {
-            // https://android.googlesource.com/platform/packages/modules/adb/+/79010dc6d5ca7490c493df800d4421730f5466ca/transport.cpp#1252
-            // There are some other feature constants, but some of them are only used by ADB server, not devices (daemons).
-            const features = [
-                AdbFeature.ShellV2,
-                AdbFeature.Cmd,
-                AdbFeature.StatV2,
-                AdbFeature.ListV2,
-                AdbFeature.FixedPushMkdir,
-                "apex",
-                AdbFeature.Abb,
-                // only tells the client the symlink timestamp issue in `adb push --sync` has been fixed.
-                // No special handling required.
-                "fixed_push_symlink_timestamp",
-                AdbFeature.AbbExec,
-                "remount_shell",
-                "track_app",
-                "sendrecv_v2",
-                "sendrecv_v2_brotli",
-                "sendrecv_v2_lz4",
-                "sendrecv_v2_zstd",
-                "sendrecv_v2_dry_run_send",
-            ].join(",");
+export interface AdbTransport extends Closeable {
+    readonly serial: string;
 
-            await sendPacket({
-                command: AdbCommand.Connect,
-                arg0: version,
-                arg1: maxPayloadSize,
-                // The terminating `;` is required in formal definition
-                // But ADB daemon (all versions) can still work without it
-                payload: encodeUtf8(`host::features=${features};`),
-            });
+    readonly maxPayloadSize: number;
 
-            banner = await resolver.promise;
-        } finally {
-            // When failed, release locks on `connection` so the caller can try again.
-            // When success, also release locks so `AdbPacketDispatcher` can use them.
-            abortController.abort();
-            writer.releaseLock();
+    readonly banner: AdbBanner;
 
-            // Wait until pipe stops (`ReadableStream` lock released)
-            await pipe;
-        }
+    readonly disconnected: Promise<void>;
 
-        return new Adb(connection, version, maxPayloadSize, banner);
-    }
+    connect(service: string): ValueOrPromise<AdbSocket>;
 
-    private readonly dispatcher: AdbPacketDispatcher;
+    addReverseTunnel(
+        handler: AdbIncomingSocketHandler,
+        address?: string,
+    ): ValueOrPromise<string>;
 
-    public get disconnected() {
-        return this.dispatcher.disconnected;
-    }
+    removeReverseTunnel(address: string): ValueOrPromise<void>;
 
-    private _protocolVersion: number;
-    public get protocolVersion() {
-        return this._protocolVersion;
-    }
+    clearReverseTunnels(): ValueOrPromise<void>;
+}
 
-    private _maxPayloadSize: number;
-    public get maxPayloadSize() {
-        return this._maxPayloadSize;
-    }
+export class Adb implements Closeable {
+    readonly transport: AdbTransport;
 
-    private _product: string | undefined;
-    public get product() {
-        return this._product;
+    get serial() {
+        return this.transport.serial;
     }
 
-    private _model: string | undefined;
-    public get model() {
-        return this._model;
+    get maxPayloadSize() {
+        return this.transport.maxPayloadSize;
     }
 
-    private _device: string | undefined;
-    public get device() {
-        return this._device;
+    get banner() {
+        return this.transport.banner;
     }
 
-    private _features: AdbFeature[] = [];
-    public get features() {
-        return this._features;
+    get disconnected() {
+        return this.transport.disconnected;
     }
 
-    public readonly subprocess: AdbSubprocess;
-    public readonly power: AdbPower;
-    public readonly reverse: AdbReverseCommand;
-    public readonly tcpip: AdbTcpIpCommand;
-
-    public constructor(
-        connection: ReadableWritablePair<
-            AdbPacketData,
-            Consumable<AdbPacketInit>
-        >,
-        version: number,
-        maxPayloadSize: number,
-        banner: string
-    ) {
-        this.parseBanner(banner);
+    readonly subprocess: AdbSubprocess;
+    readonly power: AdbPower;
+    readonly reverse: AdbReverseCommand;
+    readonly tcpip: AdbTcpIpCommand;
 
-        let calculateChecksum: boolean;
-        let appendNullToServiceString: boolean;
-        if (version >= VERSION_OMIT_CHECKSUM) {
-            calculateChecksum = false;
-            appendNullToServiceString = false;
-        } else {
-            calculateChecksum = true;
-            appendNullToServiceString = true;
-        }
-
-        this.dispatcher = new AdbPacketDispatcher(connection, {
-            calculateChecksum,
-            appendNullToServiceString,
-            maxPayloadSize,
-        });
-
-        this._protocolVersion = version;
-        this._maxPayloadSize = maxPayloadSize;
+    constructor(transport: AdbTransport) {
+        this.transport = transport;
 
         this.subprocess = new AdbSubprocess(this);
         this.power = new AdbPower(this);
@@ -245,66 +83,22 @@ export class Adb implements Closeable {
         this.tcpip = new AdbTcpIpCommand(this);
     }
 
-    private parseBanner(banner: string): void {
-        const pieces = banner.split("::");
-        if (pieces.length > 1) {
-            const props = pieces[1]!;
-            for (const prop of props.split(";")) {
-                if (!prop) {
-                    continue;
-                }
-
-                const keyValue = prop.split("=");
-                if (keyValue.length !== 2) {
-                    continue;
-                }
-
-                const [key, value] = keyValue;
-                switch (key) {
-                    case AdbPropKey.Product:
-                        this._product = value;
-                        break;
-                    case AdbPropKey.Model:
-                        this._model = value;
-                        break;
-                    case AdbPropKey.Device:
-                        this._device = value;
-                        break;
-                    case AdbPropKey.Features:
-                        this._features = value!.split(",") as AdbFeature[];
-                        break;
-                }
-            }
-        }
-    }
-
-    public supportsFeature(feature: AdbFeature): boolean {
-        return this._features.includes(feature);
+    supportsFeature(feature: AdbFeature): boolean {
+        return this.banner.features.includes(feature);
     }
 
-    /**
-     * Add a handler for incoming socket.
-     * @param handler A function to call with new incoming sockets. It must return `true` if it accepts the socket.
-     * @returns A function to remove the handler.
-     */
-    public onIncomingSocket(handler: AdbIncomingSocketHandler) {
-        return this.dispatcher.onIncomingSocket(handler);
+    async createSocket(service: string): Promise<AdbSocket> {
+        return this.transport.connect(service);
     }
 
-    public async createSocket(service: string): Promise<AdbSocket> {
-        return this.dispatcher.createSocket(service);
-    }
-
-    public async createSocketAndWait(service: string): Promise<string> {
+    async createSocketAndWait(service: string): Promise<string> {
         const socket = await this.createSocket(service);
-        const gatherStream = new GatherStringStream();
-        await socket.readable
+        return await socket.readable
             .pipeThrough(new DecodeUtf8Stream())
-            .pipeTo(gatherStream);
-        return gatherStream.result;
+            .pipeThrough(new ConcatStringStream());
     }
 
-    public async getProp(key: string): Promise<string> {
+    async getProp(key: string): Promise<string> {
         const stdout = await this.subprocess.spawnAndWaitLegacy([
             "getprop",
             key,
@@ -312,33 +106,40 @@ export class Adb implements Closeable {
         return stdout.trim();
     }
 
-    public async rm(...filenames: string[]): Promise<string> {
+    async rm(
+        filenames: string | string[],
+        options?: { recursive?: boolean; force?: boolean },
+    ): Promise<string> {
+        const args = ["rm"];
+        if (options?.recursive) {
+            args.push("-r");
+        }
+        if (options?.force) {
+            args.push("-f");
+        }
+        if (Array.isArray(filenames)) {
+            for (const filename of filenames) {
+                args.push(escapeArg(filename));
+            }
+        } else {
+            args.push(escapeArg(filenames));
+        }
         // https://android.googlesource.com/platform/packages/modules/adb/+/1a0fb8846d4e6b671c8aa7f137a8c21d7b248716/client/adb_install.cpp#984
-        const stdout = await this.subprocess.spawnAndWaitLegacy([
-            "rm",
-            ...filenames.map((arg) => escapeArg(arg)),
-            "</dev/null",
-        ]);
+        args.push("</dev/null");
+        const stdout = await this.subprocess.spawnAndWaitLegacy(args);
         return stdout;
     }
 
-    public async sync(): Promise<AdbSync> {
+    async sync(): Promise<AdbSync> {
         const socket = await this.createSocket("sync:");
         return new AdbSync(this, socket);
     }
 
-    public async framebuffer(): Promise<AdbFrameBuffer> {
+    async framebuffer(): Promise<AdbFrameBuffer> {
         return framebuffer(this);
     }
 
-    /**
-     * Close the ADB connection.
-     *
-     * Note that it won't close the streams from backends.
-     * The streams are both physically and logically intact,
-     * and can be reused.
-     */
-    public async close(): Promise<void> {
-        await this.dispatcher.close();
+    async close(): Promise<void> {
+        await this.transport.close();
     }
 }