@yume-chan/adb 1.0.0 → 1.1.0

package/esm/server/stream.js

@@ -0,0 +1,77 @@
+import { BufferedReadableStream, tryCancel, tryClose, } from "@yume-chan/stream-extra";
+import { bipedal, decodeUtf8, encodeUtf8, TextDecoder, } from "@yume-chan/struct";
+import { hexToNumber, sequenceEqual, write4HexDigits } from "../utils/index.js";
+const OKAY = encodeUtf8("OKAY");
+export const FAIL = encodeUtf8("FAIL");
+export class AdbServerStream {
+    #connection;
+    #buffered;
+    #writer;
+    constructor(connection) {
+        this.#connection = connection;
+        this.#buffered = new BufferedReadableStream(connection.readable);
+        this.#writer = connection.writable.getWriter();
+    }
+    readExactly(length) {
+        return this.#buffered.readExactly(length);
+    }
+    readString = bipedal(function* (then) {
+        const data = yield* then(this.readExactly(4));
+        const length = hexToNumber(data);
+        if (length === 0) {
+            return "";
+        }
+        else {
+            const decoder = new TextDecoder();
+            let result = "";
+            const iterator = this.#buffered.iterateExactly(length);
+            while (true) {
+                const { done, value } = iterator.next();
+                if (done) {
+                    break;
+                }
+                result += decoder.decode(yield* then(value), { stream: true });
+            }
+            result += decoder.decode();
+            return result;
+        }
+    });
+    async readOkay() {
+        const response = await this.readExactly(4);
+        if (sequenceEqual(response, OKAY)) {
+            // `OKAY` is followed by data length and data
+            // But different services want to parse the data differently
+            // So don't read the data here
+            return;
+        }
+        if (sequenceEqual(response, FAIL)) {
+            const reason = await this.readString();
+            throw new Error(reason);
+        }
+        throw new Error(`Unexpected response: ${decodeUtf8(response)}`);
+    }
+    async writeString(value) {
+        // TODO: investigate using `encodeUtf8("0000" + value)` then modifying the length
+        // That way allocates a new string (hopefully only a rope) instead of a new buffer
+        const encoded = encodeUtf8(value);
+        const buffer = new Uint8Array(4 + encoded.length);
+        write4HexDigits(buffer, 0, encoded.length);
+        buffer.set(encoded, 4);
+        await this.#writer.write(buffer);
+    }
+    release() {
+        this.#writer.releaseLock();
+        return {
+            readable: this.#buffered.release(),
+            writable: this.#connection.writable,
+            closed: this.#connection.closed,
+            close: () => this.#connection.close(),
+        };
+    }
+    async dispose() {
+        void tryCancel(this.#buffered);
+        void tryClose(this.#writer);
+        await this.#connection.close();
+    }
+}
+//# sourceMappingURL=stream.js.map

package/esm/server/stream.js.map

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

package/esm/server/transport.d.ts

@@ -1,4 +1,3 @@
-import type { MaybePromiseLike } from "@yume-chan/async";
 import type { AdbIncomingSocketHandler, AdbSocket, AdbTransport } from "../adb.js";
 import type { AdbBanner } from "../banner.js";
 import { AdbFeature } from "../features.js";
@@ -10,13 +9,13 @@ export declare class AdbServerTransport implements AdbTransport {
     readonly transportId: bigint;
     readonly maxPayloadSize: number;
     readonly banner: AdbBanner;
-    readonly disconnected: Promise<void>;
+    get disconnected(): Promise<void>;
     get clientFeatures(): AdbFeature[];
-    constructor(client: AdbServerClient, serial: string, banner: AdbBanner, transportId: bigint);
+    constructor(client: AdbServerClient, serial: string, banner: AdbBanner, transportId: bigint, disconnected: Promise<void>);
     connect(service: string): Promise<AdbSocket>;
     addReverseTunnel(handler: AdbIncomingSocketHandler, address?: string): Promise<string>;
     removeReverseTunnel(address: string): Promise<void>;
     clearReverseTunnels(): Promise<void>;
-    close(): MaybePromiseLike<void>;
+    close(): Promise<void>;
 }
 //# sourceMappingURL=transport.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../src/server/transport.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAIzD,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;IAI3B,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAErC,IAAI,cAAc,iBAIjB;gBAGG,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,MAAM;IAgBjB,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IAO5C,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;IAI1C,KAAK,IAAI,gBAAgB,CAAC,IAAI,CAAC;CAIlC"}
+{"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"}

package/esm/server/transport.js

@@ -1,5 +1,4 @@
 import { PromiseResolver } from "@yume-chan/async";
-import { AbortController } from "@yume-chan/stream-extra";
 import { AdbFeature } from "../features.js";
 export const ADB_SERVER_DEFAULT_FEATURES = [
     AdbFeature.ShellV2,
@@ -27,29 +26,29 @@ export class AdbServerTransport {
     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;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"}

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": "1.1.0",
   "description": "TypeScript implementation of Android Debug Bridge (ADB) protocol.",
   "keywords": [
     "adb",
@@ -28,17 +28,17 @@
   "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/no-data-view": "^1.0.0"
+    "@yume-chan/struct": "^1.0.0"
   },
   "devDependencies": {
-    "@types/node": "^22.10.0",
-    "prettier": "^3.4.1",
+    "@types/node": "^22.10.2",
+    "prettier": "^3.4.2",
     "typescript": "^5.7.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/server/client.ts

@@ -3,123 +3,28 @@
 import type { MaybePromiseLike } from "@yume-chan/async";
 import { PromiseResolver } from "@yume-chan/async";
 import type { Event } from "@yume-chan/event";
-import { EventEmitter } from "@yume-chan/event";
 import { getUint64LittleEndian } from "@yume-chan/no-data-view";
 import type {
     AbortSignal,
     MaybeConsumable,
     ReadableWritablePair,
-    WritableStreamDefaultWriter,
 } from "@yume-chan/stream-extra";
-import {
-    BufferedReadableStream,
-    tryCancel,
-    tryClose,
-} from "@yume-chan/stream-extra";
-import {
-    bipedal,
-    decodeUtf8,
-    encodeUtf8,
-    TextDecoder,
-} from "@yume-chan/struct";
+import { AbortController } from "@yume-chan/stream-extra";
 
 import type { AdbIncomingSocketHandler, AdbSocket, Closeable } from "../adb.js";
 import { AdbBanner } from "../banner.js";
 import type { DeviceObserver as DeviceObserverBase } from "../device-observer.js";
 import type { AdbFeature } from "../features.js";
-import { hexToNumber, sequenceEqual, write4HexDigits } from "../utils/index.js";
+import { hexToNumber, sequenceEqual } from "../utils/index.js";
 
+import { AdbServerDeviceObserverOwner } from "./observer.js";
+import { AdbServerStream, FAIL } from "./stream.js";
 import { AdbServerTransport } from "./transport.js";
 
-const OKAY = encodeUtf8("OKAY");
-const FAIL = encodeUtf8("FAIL");
-
-class AdbServerStream {
-    #connection: AdbServerClient.ServerConnection;
-    #buffered: BufferedReadableStream;
-    #writer: WritableStreamDefaultWriter<Uint8Array>;
-
-    constructor(connection: AdbServerClient.ServerConnection) {
-        this.#connection = connection;
-        this.#buffered = new BufferedReadableStream(connection.readable);
-        this.#writer = connection.writable.getWriter();
-    }
-
-    readExactly(length: number): MaybePromiseLike<Uint8Array> {
-        return this.#buffered.readExactly(length);
-    }
-
-    readString = bipedal(function* (this: AdbServerStream, then) {
-        const data = yield* then(this.readExactly(4));
-        const length = hexToNumber(data);
-        if (length === 0) {
-            return "";
-        } else {
-            const decoder = new TextDecoder();
-            let result = "";
-            const iterator = this.#buffered.iterateExactly(length);
-            while (true) {
-                const { done, value } = iterator.next();
-                if (done) {
-                    break;
-                }
-                result += decoder.decode(yield* then(value), { stream: true });
-            }
-            result += decoder.decode();
-            return result;
-        }
-    });
-
-    async writeString(value: string): Promise<void> {
-        // TODO: investigate using `encodeUtf8("0000" + value)` then modifying the length
-        // That way allocates a new string (hopefully only a rope) instead of a new buffer
-        const encoded = encodeUtf8(value);
-        const buffer = new Uint8Array(4 + encoded.length);
-        write4HexDigits(buffer, 0, encoded.length);
-        buffer.set(encoded, 4);
-        await this.#writer.write(buffer);
-    }
-
-    async readOkay(): Promise<void> {
-        const response = await this.readExactly(4);
-        if (sequenceEqual(response, OKAY)) {
-            // `OKAY` is followed by data length and data
-            // But different services want to parse the data differently
-            // So don't read the data here
-            return;
-        }
-
-        if (sequenceEqual(response, FAIL)) {
-            const reason = await this.readString();
-            throw new Error(reason);
-        }
-
-        throw new Error(`Unexpected response: ${decodeUtf8(response)}`);
-    }
-
-    release() {
-        this.#writer.releaseLock();
-        return {
-            readable: this.#buffered.release(),
-            writable: this.#connection.writable,
-            closed: this.#connection.closed,
-            close: () => this.#connection.close(),
-        };
-    }
-
-    async dispose() {
-        void tryCancel(this.#buffered);
-        void tryClose(this.#writer);
-        await this.#connection.close();
-    }
-}
-
 /**
  * Client for the ADB Server.
  */
 export class AdbServerClient {
-    static readonly VERSION = 41;
-
     static parseDeviceList(value: string): AdbServerClient.Device[] {
         const devices: AdbServerClient.Device[] = [];
         for (const line of value.split("\n")) {
@@ -196,6 +101,7 @@ export class AdbServerClient {
 
     readonly wireless = new AdbServerClient.WirelessCommands(this);
     readonly mDns = new AdbServerClient.MDnsCommands(this);
+    #observerOwner = new AdbServerDeviceObserverOwner(this);
 
     constructor(connector: AdbServerClient.ServerConnector) {
         this.connector = connector;
@@ -240,11 +146,11 @@ export class AdbServerClient {
         }
     }
 
-    async validateVersion() {
+    async validateVersion(minimalVersion: number) {
         const version = await this.getVersion();
-        if (version !== AdbServerClient.VERSION) {
+        if (version < minimalVersion) {
             throw new Error(
-                `adb server version (${version}) doesn't match this client (${AdbServerClient.VERSION})`,
+                `adb server version (${version}) doesn't match this client (${minimalVersion})`,
             );
         }
     }
@@ -288,61 +194,10 @@ export class AdbServerClient {
     /**
      * Monitors device list changes.
      */
-    async trackDevices(): Promise<AdbServerClient.DeviceObserver> {
-        const connection = await this.createConnection("host:track-devices-l");
-
-        let current: AdbServerClient.Device[] = [];
-        const onError = new EventEmitter<Error>();
-        const onDeviceAdd = new EventEmitter<AdbServerClient.Device[]>();
-        const onDeviceRemove = new EventEmitter<AdbServerClient.Device[]>();
-        const onListChange = new EventEmitter<AdbServerClient.Device[]>();
-
-        void (async () => {
-            try {
-                while (true) {
-                    const response = await connection.readString();
-                    const next = AdbServerClient.parseDeviceList(response);
-
-                    const added: AdbServerClient.Device[] = [];
-                    for (const nextDevice of next) {
-                        const index = current.findIndex(
-                            (device) =>
-                                device.transportId === nextDevice.transportId,
-                        );
-                        if (index === -1) {
-                            added.push(nextDevice);
-                            continue;
-                        }
-
-                        current[index] = current[current.length - 1]!;
-                        current.length -= 1;
-                    }
-
-                    if (added.length) {
-                        onDeviceAdd.fire(added);
-                    }
-                    if (current.length) {
-                        onDeviceRemove.fire(current);
-                    }
-
-                    current = next;
-                    onListChange.fire(current);
-                }
-            } catch (e) {
-                onError.fire(e as Error);
-            }
-        })();
-
-        return {
-            onError: onError.event,
-            onDeviceAdd: onDeviceAdd.event,
-            onDeviceRemove: onDeviceRemove.event,
-            onListChange: onListChange.event,
-            get current() {
-                return current;
-            },
-            stop: () => connection.dispose(),
-        };
+    async trackDevices(
+        options?: AdbServerClient.ServerConnectionOptions,
+    ): Promise<AdbServerClient.DeviceObserver> {
+        return this.#observerOwner.createObserver(options);
     }
 
     /**
@@ -412,20 +267,22 @@ export class AdbServerClient {
         device: AdbServerClient.DeviceSelector,
         service: string,
     ): Promise<AdbServerClient.Socket> {
-        await this.validateVersion();
-
         let switchService: string;
         let transportId: bigint | undefined;
         if (!device) {
+            await this.validateVersion(41);
             switchService = `host:tport:any`;
         } else if ("transportId" in device) {
             switchService = `host:transport-id:${device.transportId}`;
             transportId = device.transportId;
         } else if ("serial" in device) {
+            await this.validateVersion(41);
             switchService = `host:tport:serial:${device.serial}`;
         } else if ("usb" in device) {
+            await this.validateVersion(41);
             switchService = `host:tport:usb`;
         } else if ("tcp" in device) {
+            await this.validateVersion(41);
             switchService = `host:tport:local`;
         } else {
             throw new TypeError("Invalid device selector");
@@ -467,18 +324,7 @@ export class AdbServerClient {
             throw e;
         }
     }
-
-    /**
-     * Wait for a device to be connected or disconnected.
-     *
-     * `adb wait-for-<state>`
-     *
-     * @param device The device selector
-     * @param state The state to wait for
-     * @param options The options
-     * @returns A promise that resolves when the condition is met.
-     */
-    async waitFor(
+    async #waitForUnchecked(
         device: AdbServerClient.DeviceSelector,
         state: "device" | "disconnect",
         options?: AdbServerClient.ServerConnectionOptions,
@@ -513,6 +359,60 @@ export class AdbServerClient {
         }
     }
 
+    /**
+     * Wait for a device to be connected or disconnected.
+     *
+     * `adb wait-for-<state>`
+     *
+     * @param device The device selector
+     * @param state The state to wait for
+     * @param options The options
+     * @returns A promise that resolves when the condition is met.
+     */
+    async waitFor(
+        device: AdbServerClient.DeviceSelector,
+        state: "device" | "disconnect",
+        options?: AdbServerClient.ServerConnectionOptions,
+    ): Promise<void> {
+        if (state === "disconnect") {
+            await this.validateVersion(41);
+        }
+
+        return this.#waitForUnchecked(device, state, options);
+    }
+
+    async waitForDisconnect(
+        transportId: bigint,
+        options?: AdbServerClient.ServerConnectionOptions,
+    ): Promise<void> {
+        const serverVersion = await this.getVersion();
+        if (serverVersion >= 41) {
+            return this.#waitForUnchecked(
+                { transportId },
+                "disconnect",
+                options,
+            );
+        } else {
+            const observer = await this.trackDevices(options);
+            return new Promise<void>((resolve, reject) => {
+                observer.onDeviceRemove((devices) => {
+                    if (
+                        devices.some(
+                            (device) => device.transportId === transportId,
+                        )
+                    ) {
+                        observer.stop();
+                        resolve();
+                    }
+                });
+                observer.onError((e) => {
+                    observer.stop();
+                    reject(e);
+                });
+            });
+        }
+    }
+
     /**
      * Creates an ADB Transport for the specified device.
      */
@@ -533,12 +433,26 @@ export class AdbServerClient {
             features,
         );
 
-        return new AdbServerTransport(
+        const waitAbortController = new AbortController();
+        const disconnected = this.waitForDisconnect(transportId, {
+            unref: true,
+            signal: waitAbortController.signal,
+        });
+
+        const transport = new AdbServerTransport(
             this,
             info?.serial ?? "",
             banner,
             transportId,
+            disconnected,
         );
+
+        transport.disconnected.then(
+            () => waitAbortController.abort(),
+            () => waitAbortController.abort(),
+        );
+
+        return transport;
     }
 }
 

package/src/server/index.ts

@@ -1,2 +1,4 @@
 export * from "./client.js";
+export * from "./observer.js";
+export * from "./stream.js";
 export * from "./transport.js";