@yume-chan/adb 1.0.0 → 2.0.0

package/esm/daemon/socket.d.ts

@@ -25,7 +25,7 @@ export declare class AdbDaemonSocketController implements AdbDaemonSocketInfo, A
     readonly service: string;
     get readable(): ReadableStream<Uint8Array<ArrayBufferLike>>;
     readonly writable: WritableStream<MaybeConsumable<Uint8Array>>;
-    get closed(): Promise<void>;
+    get closed(): Promise<undefined>;
     get socket(): AdbDaemonSocket;
     constructor(options: AdbDaemonSocketInit);
     enqueue(data: Uint8Array): Promise<void>;
@@ -44,7 +44,7 @@ export declare class AdbDaemonSocket implements AdbDaemonSocketInfo, AdbSocket {
     get service(): string;
     get readable(): ReadableStream<Uint8Array>;
     get writable(): WritableStream<MaybeConsumable<Uint8Array>>;
-    get closed(): Promise<void>;
+    get closed(): Promise<undefined>;
     constructor(controller: AdbDaemonSocketController);
     close(): Promise<void>;
 }

package/esm/daemon/socket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../../src/daemon/socket.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAER,cAAc,EACd,cAAc,EAEjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAG9E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE3C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAG3D,MAAM,WAAW,mBAAmB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IAEjB,YAAY,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,mBAAoB,SAAQ,mBAAmB;IAC5D,UAAU,EAAE,mBAAmB,CAAC;IAEhC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEnC;;OAEG;IACH,mBAAmB,EAAE,MAAM,CAAC;CAC/B;AAED,qBAAa,yBACT,YAAW,mBAAmB,EAAE,SAAS,EAAE,UAAU;;IAIrD,QAAQ,CAAC,OAAO,EAAG,MAAM,CAAC;IAC1B,QAAQ,CAAC,QAAQ,EAAG,MAAM,CAAC;IAC3B,QAAQ,CAAC,YAAY,EAAG,OAAO,CAAC;IAChC,QAAQ,CAAC,OAAO,EAAG,MAAM,CAAC;IAI1B,IAAI,QAAQ,gDAEX;IAGD,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;IAK/D,IAAI,MAAM,kBAET;IAGD,IAAI,MAAM,oBAET;gBAaW,OAAO,EAAE,mBAAmB;IA8DlC,OAAO,CAAC,IAAI,EAAE,UAAU;IAIvB,GAAG,CAAC,KAAK,EAAE,MAAM;IAKlB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB5B,OAAO;CAIV;AAED;;GAEG;AACH,qBAAa,eAAgB,YAAW,mBAAmB,EAAE,SAAS;;IAGlE,IAAI,OAAO,IAAI,MAAM,CAEpB;IACD,IAAI,QAAQ,IAAI,MAAM,CAErB;IACD,IAAI,YAAY,IAAI,OAAO,CAE1B;IACD,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED,IAAI,QAAQ,IAAI,cAAc,CAAC,UAAU,CAAC,CAEzC;IACD,IAAI,QAAQ,IAAI,cAAc,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAE1D;IAED,IAAI,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAE1B;gBAEW,UAAU,EAAE,yBAAyB;IAIjD,KAAK;CAGR"}
+{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../../src/daemon/socket.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAER,cAAc,EACd,cAAc,EAEjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,eAAe,EAAsB,MAAM,yBAAyB,CAAC;AAG9E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE3C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAG3D,MAAM,WAAW,mBAAmB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IAEjB,YAAY,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,mBAAoB,SAAQ,mBAAmB;IAC5D,UAAU,EAAE,mBAAmB,CAAC;IAEhC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEnC;;OAEG;IACH,mBAAmB,EAAE,MAAM,CAAC;CAC/B;AAED,qBAAa,yBACT,YAAW,mBAAmB,EAAE,SAAS,EAAE,UAAU;;IAIrD,QAAQ,CAAC,OAAO,EAAG,MAAM,CAAC;IAC1B,QAAQ,CAAC,QAAQ,EAAG,MAAM,CAAC;IAC3B,QAAQ,CAAC,YAAY,EAAG,OAAO,CAAC;IAChC,QAAQ,CAAC,OAAO,EAAG,MAAM,CAAC;IAI1B,IAAI,QAAQ,gDAEX;IAGD,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;IAK/D,IAAI,MAAM,uBAET;IAGD,IAAI,MAAM,oBAET;gBAaW,OAAO,EAAE,mBAAmB;IA8DlC,OAAO,CAAC,IAAI,EAAE,UAAU;IAIvB,GAAG,CAAC,KAAK,EAAE,MAAM;IAKlB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB5B,OAAO;CAIV;AAED;;GAEG;AACH,qBAAa,eAAgB,YAAW,mBAAmB,EAAE,SAAS;;IAGlE,IAAI,OAAO,IAAI,MAAM,CAEpB;IACD,IAAI,QAAQ,IAAI,MAAM,CAErB;IACD,IAAI,YAAY,IAAI,OAAO,CAE1B;IACD,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED,IAAI,QAAQ,IAAI,cAAc,CAAC,UAAU,CAAC,CAEzC;IACD,IAAI,QAAQ,IAAI,cAAc,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAE1D;IAED,IAAI,MAAM,IAAI,OAAO,CAAC,SAAS,CAAC,CAE/B;gBAEW,UAAU,EAAE,yBAAyB;IAIjD,KAAK;CAGR"}

package/esm/daemon/socket.js

@@ -102,7 +102,7 @@ export class AdbDaemonSocketController {
     }
     dispose() {
         this.#readableController.close();
-        this.#closedPromise.resolve();
+        this.#closedPromise.resolve(undefined);
     }
 }
 /**

package/esm/daemon/socket.js.map

@@ -1 +1 @@
-{"version":3,"file":"socket.js","sourceRoot":"","sources":["../../src/daemon/socket.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"socket.js","sourceRoot":"","sources":["../../src/daemon/socket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAQnD,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAKpD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAqBzC,MAAM,OAAO,yBAAyB;IAGzB,WAAW,CAAuB;IAElC,OAAO,CAAU;IACjB,QAAQ,CAAU;IAClB,YAAY,CAAW;IACvB,OAAO,CAAU;IAEjB,SAAS,CAA6B;IAC/C,mBAAmB,CAA4C;IAC/D,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED,mBAAmB,CAAmC;IAC7C,QAAQ,CAA8C;IAE/D,OAAO,GAAG,KAAK,CAAC;IAEP,cAAc,GAAG,IAAI,eAAe,EAAa,CAAC;IAC3D,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;IACvC,CAAC;IAEQ,OAAO,CAAkB;IAClC,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAED,2BAA2B,CAAoC;IAC/D;;;;;;;OAOG;IACH,oBAAoB,GAAG,CAAC,CAAC;IAEzB,YAAY,OAA4B;QACpC,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;QACtC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;QACzC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAE/B,IAAI,CAAC,SAAS,GAAG,IAAI,kBAAkB,CAAC,CAAC,UAAU,EAAE,EAAE;YACnD,IAAI,CAAC,mBAAmB,GAAG,UAAU,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,GAAG,IAAI,eAAe,CAAC,cAAc,CAAa;YAC3D,KAAK,EAAE,CAAC,UAAU,EAAE,EAAE;gBAClB,IAAI,CAAC,mBAAmB,GAAG,UAAU,CAAC;gBACtC,UAAU,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE;oBAC7C,IAAI,CAAC,2BAA2B,EAAE,MAAM,CACpC,UAAU,CAAC,MAAM,CAAC,MAAM,CAC3B,CAAC;gBACN,CAAC,CAAC,CAAC;YACP,CAAC;YACD,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;gBAClB,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC;gBACzB,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC;gBAC1D,KACI,IAAI,KAAK,GAAG,CAAC,EAAE,GAAG,GAAG,SAAS,EAC9B,KAAK,GAAG,IAAI,EACZ,KAAK,GAAG,GAAG,EAAE,GAAG,IAAI,SAAS,EAC/B,CAAC;oBACC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;oBACxC,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;gBAClC,CAAC;YACL,CAAC;SACJ,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,CAAC,oBAAoB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,IAAgB;QAC9B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,OAAO,IAAI,CAAC,oBAAoB,GAAG,MAAM,EAAE,CAAC;YACxC,+DAA+D;YAC/D,iCAAiC;YACjC,MAAM,QAAQ,GAAG,IAAI,eAAe,EAAQ,CAAC;YAC7C,IAAI,CAAC,2BAA2B,GAAG,QAAQ,CAAC;YAC5C,MAAM,QAAQ,CAAC,OAAO,CAAC;QAC3B,CAAC;QAED,IAAI,IAAI,CAAC,oBAAoB,KAAK,QAAQ,EAAE,CAAC;YACzC,IAAI,CAAC,oBAAoB,GAAG,CAAC,CAAC,CAAC;QACnC,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,oBAAoB,IAAI,MAAM,CAAC;QACxC,CAAC;QAED,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAC7B,UAAU,CAAC,KAAK,EAChB,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,QAAQ,EACb,IAAI,CACP,CAAC;IACN,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAgB;QAC1B,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjD,CAAC;IAEM,GAAG,CAAC,KAAa;QACpB,IAAI,CAAC,oBAAoB,IAAI,KAAK,CAAC;QACnC,IAAI,CAAC,2BAA2B,EAAE,OAAO,EAAE,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,KAAK;QACP,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,OAAO;QACX,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QAEpB,IAAI,CAAC,2BAA2B,EAAE,MAAM,CAAC,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC;QAErE,IAAI,CAAC;YACD,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC;QAC/D,CAAC;QAAC,MAAM,CAAC;YACL,SAAS;QACb,CAAC;QAED,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAC7B,UAAU,CAAC,KAAK,EAChB,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,QAAQ,EACb,eAAe,CAClB,CAAC;IACN,CAAC;IAED,OAAO;QACH,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,CAAC;QACjC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAC3C,CAAC;CACJ;AAED;;GAEG;AACH,MAAM,OAAO,eAAe;IACf,WAAW,CAA4B;IAEhD,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;IACpC,CAAC;IACD,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC;IACrC,CAAC;IACD,IAAI,YAAY;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC;IACzC,CAAC;IACD,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;IACpC,CAAC;IAED,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC;IACrC,CAAC;IACD,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC;IACrC,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;IACnC,CAAC;IAED,YAAY,UAAqC;QAC7C,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;IAClC,CAAC;IAED,KAAK;QACD,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;IACpC,CAAC;CACJ"}

package/esm/device-observer.d.ts

@@ -1,10 +1,10 @@
 import type { MaybePromiseLike } from "@yume-chan/async";
 import type { Event } from "@yume-chan/event";
 export interface DeviceObserver<T> {
-    onDeviceAdd: Event<T[]>;
-    onDeviceRemove: Event<T[]>;
-    onListChange: Event<T[]>;
-    current: T[];
+    readonly onDeviceAdd: Event<readonly T[]>;
+    readonly onDeviceRemove: Event<readonly T[]>;
+    readonly onListChange: Event<readonly T[]>;
+    readonly current: readonly T[];
     stop(): MaybePromiseLike<void>;
 }
 //# sourceMappingURL=device-observer.d.ts.map

package/esm/device-observer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"device-observer.d.ts","sourceRoot":"","sources":["../src/device-observer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAE9C,MAAM,WAAW,cAAc,CAAC,CAAC;IAC7B,WAAW,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;IACxB,cAAc,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;IAC3B,YAAY,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;IACzB,OAAO,EAAE,CAAC,EAAE,CAAC;IACb,IAAI,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC;CAClC"}
+{"version":3,"file":"device-observer.d.ts","sourceRoot":"","sources":["../src/device-observer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAE9C,MAAM,WAAW,cAAc,CAAC,CAAC;IAC7B,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IAC1C,QAAQ,CAAC,cAAc,EAAE,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IAC7C,QAAQ,CAAC,YAAY,EAAE,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IAC3C,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,CAAC;IAC/B,IAAI,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC;CAClC"}

package/esm/server/client.d.ts

@@ -4,39 +4,29 @@ import type { AbortSignal, MaybeConsumable, ReadableWritablePair } from "@yume-c
 import type { AdbIncomingSocketHandler, AdbSocket, Closeable } from "../adb.js";
 import type { DeviceObserver as DeviceObserverBase } from "../device-observer.js";
 import type { AdbFeature } from "../features.js";
+import { MDnsCommands, WirelessCommands, AlreadyConnectedError as _AlreadyConnectedError, NetworkError as _NetworkError, UnauthorizedError as _UnauthorizedError } from "./commands/index.js";
+import { AdbServerStream } from "./stream.js";
 import { AdbServerTransport } from "./transport.js";
-declare class AdbServerStream {
-    #private;
-    constructor(connection: AdbServerClient.ServerConnection);
-    readExactly(length: number): MaybePromiseLike<Uint8Array>;
-    readString: (this: AdbServerStream) => MaybePromiseLike<string>;
-    writeString(value: string): Promise<void>;
-    readOkay(): Promise<void>;
-    release(): {
-        readable: import("@yume-chan/stream-extra").ReadableStream<Uint8Array<ArrayBufferLike>>;
-        writable: import("@yume-chan/stream-extra/esm/types.js").WritableStream<MaybeConsumable<Uint8Array<ArrayBufferLike>>>;
-        closed: Promise<void>;
-        close: () => MaybePromiseLike<void>;
-    };
-    dispose(): Promise<void>;
-}
 /**
  * Client for the ADB Server.
  */
 export declare class AdbServerClient {
-    static readonly VERSION = 41;
+    #private;
+    static NetworkError: typeof _NetworkError;
+    static UnauthorizedError: typeof _UnauthorizedError;
+    static AlreadyConnectedError: typeof _AlreadyConnectedError;
     static parseDeviceList(value: string): AdbServerClient.Device[];
     static formatDeviceService(device: AdbServerClient.DeviceSelector, command: string): string;
     readonly connector: AdbServerClient.ServerConnector;
-    readonly wireless: AdbServerClient.WirelessCommands;
-    readonly mDns: AdbServerClient.MDnsCommands;
+    readonly wireless: WirelessCommands;
+    readonly mDns: MDnsCommands;
     constructor(connector: AdbServerClient.ServerConnector);
     createConnection(request: string, options?: AdbServerClient.ServerConnectionOptions): Promise<AdbServerStream>;
     /**
      * `adb version`
      */
     getVersion(): Promise<number>;
-    validateVersion(): Promise<void>;
+    validateVersion(minimalVersion: number): Promise<void>;
     /**
      * `adb kill-server`
      */
@@ -54,7 +44,7 @@ export declare class AdbServerClient {
     /**
      * Monitors device list changes.
      */
-    trackDevices(): Promise<AdbServerClient.DeviceObserver>;
+    trackDevices(options?: AdbServerClient.ServerConnectionOptions): Promise<AdbServerClient.DeviceObserver>;
     /**
      * `adb -s <device> reconnect` or `adb reconnect offline`
      */
@@ -88,6 +78,7 @@ export declare class AdbServerClient {
      * @returns A promise that resolves when the condition is met.
      */
     waitFor(device: AdbServerClient.DeviceSelector, state: "device" | "disconnect", options?: AdbServerClient.ServerConnectionOptions): Promise<void>;
+    waitForDisconnect(transportId: bigint, options?: AdbServerClient.ServerConnectionOptions): Promise<void>;
     /**
      * Creates an ADB Transport for the specified device.
      */
@@ -100,7 +91,7 @@ export declare namespace AdbServerClient {
         signal?: AbortSignal | undefined;
     }
     interface ServerConnection extends ReadableWritablePair<Uint8Array, MaybeConsumable<Uint8Array>>, Closeable {
-        get closed(): Promise<void>;
+        get closed(): Promise<undefined>;
     }
     interface ServerConnector {
         connect(options?: ServerConnectionOptions): MaybePromiseLike<ServerConnection>;
@@ -131,44 +122,11 @@ export declare namespace AdbServerClient {
         device?: string | undefined;
         transportId: bigint;
     }
-    class NetworkError extends Error {
-        constructor(message: string);
-    }
-    class UnauthorizedError extends Error {
-        constructor(message: string);
-    }
-    class AlreadyConnectedError extends Error {
-        constructor(message: string);
-    }
-    class WirelessCommands {
-        #private;
-        constructor(client: AdbServerClient);
-        /**
-         * `adb pair <password> <address>`
-         */
-        pair(address: string, password: string): Promise<void>;
-        /**
-         * `adb connect <address>`
-         */
-        connect(address: string): Promise<void>;
-        /**
-         * `adb disconnect <address>`
-         */
-        disconnect(address: string): Promise<void>;
-    }
-    class MDnsCommands {
-        #private;
-        constructor(client: AdbServerClient);
-        check(): Promise<boolean>;
-        getServices(): Promise<{
-            name: string;
-            service: string;
-            address: string;
-        }[]>;
-    }
     interface DeviceObserver extends DeviceObserverBase<Device> {
         onError: Event<Error>;
     }
+    type NetworkError = _NetworkError;
+    type UnauthorizedError = _UnauthorizedError;
+    type AlreadyConnectedError = _AlreadyConnectedError;
 }
-export {};
 //# sourceMappingURL=client.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/server/client.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAG9C,OAAO,KAAK,EACR,WAAW,EACX,eAAe,EACf,oBAAoB,EAEvB,MAAM,yBAAyB,CAAC;AAajC,OAAO,KAAK,EAAE,wBAAwB,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEhF,OAAO,KAAK,EAAE,cAAc,IAAI,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAClF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAGjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAKpD,cAAM,eAAe;;gBAKL,UAAU,EAAE,eAAe,CAAC,gBAAgB;IAMxD,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,CAAC,UAAU,CAAC;IAIzD,UAAU,sDAmBP;IAEG,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUzC,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAiB/B,OAAO;;;;;;IAUD,OAAO;CAKhB;AAED;;GAEG;AACH,qBAAa,eAAe;IACxB,MAAM,CAAC,QAAQ,CAAC,OAAO,MAAM;IAE7B,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe,CAAC,MAAM,EAAE;IAkD/D,MAAM,CAAC,mBAAmB,CACtB,MAAM,EAAE,eAAe,CAAC,cAAc,EACtC,OAAO,EAAE,MAAM;IAoBnB,QAAQ,CAAC,SAAS,EAAE,eAAe,CAAC,eAAe,CAAC;IAEpD,QAAQ,CAAC,QAAQ,mCAA8C;IAC/D,QAAQ,CAAC,IAAI,+BAA0C;gBAE3C,SAAS,EAAE,eAAe,CAAC,eAAe;IAIhD,gBAAgB,CAClB,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,eAAe,CAAC,uBAAuB,GAClD,OAAO,CAAC,eAAe,CAAC;IAsB3B;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAW7B,eAAe;IASrB;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAKjC;;OAEG;IACG,iBAAiB,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;IAUhD;;;;OAIG;IACG,UAAU,IAAI,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC;IAUrD;;OAEG;IACG,YAAY,IAAI,OAAO,CAAC,eAAe,CAAC,cAAc,CAAC;IAyD7D;;OAEG;IACG,eAAe,CAAC,MAAM,EAAE,eAAe,CAAC,cAAc,GAAG,SAAS;IAaxE;;;;;;OAMG;IACG,iBAAiB,CACnB,MAAM,EAAE,eAAe,CAAC,cAAc,GACvC,OAAO,CAAC;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,UAAU,EAAE,CAAA;KAAE,CAAC;IAgC3D;;;;;OAKG;IACG,sBAAsB,CACxB,MAAM,EAAE,eAAe,CAAC,cAAc,EACtC,OAAO,EAAE,MAAM,GAChB,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC;IAyDlC;;;;;;;;;OASG;IACG,OAAO,CACT,MAAM,EAAE,eAAe,CAAC,cAAc,EACtC,KAAK,EAAE,QAAQ,GAAG,YAAY,EAC9B,OAAO,CAAC,EAAE,eAAe,CAAC,uBAAuB,GAClD,OAAO,CAAC,IAAI,CAAC;IA+BhB;;OAEG;IACG,eAAe,CACjB,MAAM,EAAE,eAAe,CAAC,cAAc,GACvC,OAAO,CAAC,kBAAkB,CAAC;CAsBjC;AAED,wBAAsB,UAAU,CAAC,CAAC,EAC9B,QAAQ,EAAE,MAAM,WAAW,CAAC,CAAC,CAAC,EAC9B,GAAG,OAAO,EAAE,CAAC,WAAW,GAAG,SAAS,CAAC,EAAE,GACxC,OAAO,CAAC,CAAC,CAAC,CA0BZ;AAED,yBAAiB,eAAe,CAAC;IAC7B,UAAiB,uBAAuB;QACpC,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;QAC5B,MAAM,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;KACpC;IAED,UAAiB,gBACb,SAAQ,oBAAoB,CAAC,UAAU,EAAE,eAAe,CAAC,UAAU,CAAC,CAAC,EACjE,SAAS;QACb,IAAI,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;KAC/B;IAED,UAAiB,eAAe;QAC5B,OAAO,CACH,OAAO,CAAC,EAAE,uBAAuB,GAClC,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;QAEtC,gBAAgB,CACZ,OAAO,EAAE,wBAAwB,EACjC,OAAO,CAAC,EAAE,MAAM,GACjB,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAE5B,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAE7D,mBAAmB,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC;KACjD;IAED,UAAiB,MAAO,SAAQ,SAAS;QACrC,WAAW,EAAE,MAAM,CAAC;KACvB;IAED;;OAEG;IACH,KAAY,cAAc,GACpB;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,GACvB;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,GAClB;QAAE,GAAG,EAAE,IAAI,CAAA;KAAE,GACb;QAAE,GAAG,EAAE,IAAI,CAAA;KAAE,GACb,SAAS,CAAC;IAEhB,UAAiB,MAAM;QACnB,MAAM,EAAE,MAAM,CAAC;QACf,cAAc,EAAE,OAAO,CAAC;QACxB,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAC7B,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAC3B,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;QAC5B,WAAW,EAAE,MAAM,CAAC;KACvB;IAED,MAAa,YAAa,SAAQ,KAAK;oBACvB,OAAO,EAAE,MAAM;KAI9B;IAED,MAAa,iBAAkB,SAAQ,KAAK;oBAC5B,OAAO,EAAE,MAAM;KAI9B;IAED,MAAa,qBAAsB,SAAQ,KAAK;oBAChC,OAAO,EAAE,MAAM;KAI9B;IAED,MAAa,gBAAgB;;oBAGb,MAAM,EAAE,eAAe;QAInC;;WAEG;QACG,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;QAkB5D;;WAEG;QACG,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;QAwB7C;;WAEG;QACG,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;KAUnD;IAED,MAAa,YAAY;;oBAGT,MAAM,EAAE,eAAe;QAI7B,KAAK;QAWL,WAAW;;;;;KAoBpB;IAED,UAAiB,cAAe,SAAQ,kBAAkB,CAAC,MAAM,CAAC;QAC9D,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;KACzB;CACJ"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/server/client.ts"],"names":[],"mappings":"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"}

package/esm/server/client.js

@@ -1,90 +1,20 @@
 // cspell:ignore tport
 import { PromiseResolver } from "@yume-chan/async";
-import { EventEmitter } from "@yume-chan/event";
 import { getUint64LittleEndian } from "@yume-chan/no-data-view";
-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 { AdbBanner } from "../banner.js";
-import { hexToNumber, sequenceEqual, write4HexDigits } from "../utils/index.js";
+import { hexToNumber } from "../utils/index.js";
+import { MDnsCommands, WirelessCommands, AlreadyConnectedError as _AlreadyConnectedError, NetworkError as _NetworkError, UnauthorizedError as _UnauthorizedError, } from "./commands/index.js";
+import { AdbServerDeviceObserverOwner } from "./observer.js";
+import { AdbServerStream } from "./stream.js";
 import { AdbServerTransport } from "./transport.js";
-const OKAY = encodeUtf8("OKAY");
-const FAIL = encodeUtf8("FAIL");
-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 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);
-    }
-    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)}`);
-    }
-    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 VERSION = 41;
+    static NetworkError = _NetworkError;
+    static UnauthorizedError = _UnauthorizedError;
+    static AlreadyConnectedError = _AlreadyConnectedError;
     static parseDeviceList(value) {
         const devices = [];
         for (const line of value.split("\n")) {
@@ -151,8 +81,9 @@ export class AdbServerClient {
         throw new TypeError("Invalid device selector");
     }
     connector;
-    wireless = new AdbServerClient.WirelessCommands(this);
-    mDns = new AdbServerClient.MDnsCommands(this);
+    wireless = new WirelessCommands(this);
+    mDns = new MDnsCommands(this);
+    #observerOwner = new AdbServerDeviceObserverOwner(this);
     constructor(connector) {
         this.connector = connector;
     }
@@ -191,10 +122,10 @@ export class AdbServerClient {
             await connection.dispose();
         }
     }
-    async validateVersion() {
+    async validateVersion(minimalVersion) {
         const version = await this.getVersion();
-        if (version !== AdbServerClient.VERSION) {
-            throw new Error(`adb server version (${version}) doesn't match this client (${AdbServerClient.VERSION})`);
+        if (version < minimalVersion) {
+            throw new Error(`adb server version (${version}) doesn't match this client (${minimalVersion})`);
         }
     }
     /**
@@ -235,52 +166,8 @@ export class AdbServerClient {
     /**
      * Monitors device list changes.
      */
-    async trackDevices() {
-        const connection = await this.createConnection("host:track-devices-l");
-        let current = [];
-        const onError = new EventEmitter();
-        const onDeviceAdd = new EventEmitter();
-        const onDeviceRemove = new EventEmitter();
-        const onListChange = new EventEmitter();
-        void (async () => {
-            try {
-                while (true) {
-                    const response = await connection.readString();
-                    const next = AdbServerClient.parseDeviceList(response);
-                    const added = [];
-                    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);
-            }
-        })();
-        return {
-            onError: onError.event,
-            onDeviceAdd: onDeviceAdd.event,
-            onDeviceRemove: onDeviceRemove.event,
-            onListChange: onListChange.event,
-            get current() {
-                return current;
-            },
-            stop: () => connection.dispose(),
-        };
+    async trackDevices(options) {
+        return this.#observerOwner.createObserver(options);
     }
     /**
      * `adb -s <device> reconnect` or `adb reconnect offline`
@@ -339,10 +226,10 @@ export class AdbServerClient {
      * @returns An `AdbServerClient.Socket` that can be used to communicate with the service
      */
     async createDeviceConnection(device, service) {
-        await this.validateVersion();
         let switchService;
         let transportId;
         if (!device) {
+            await this.validateVersion(41);
             switchService = `host:tport:any`;
         }
         else if ("transportId" in device) {
@@ -350,12 +237,15 @@ export class AdbServerClient {
             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 {
@@ -394,17 +284,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(device, state, options) {
+    async #waitForUnchecked(device, state, options) {
         let type;
         if (!device) {
             type = "any";
@@ -435,6 +315,43 @@ export class AdbServerClient {
             await connection.dispose();
         }
     }
+    /**
+     * 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, state, options) {
+        if (state === "disconnect") {
+            await this.validateVersion(41);
+        }
+        return this.#waitForUnchecked(device, state, options);
+    }
+    async waitForDisconnect(transportId, options) {
+        const serverVersion = await this.getVersion();
+        if (serverVersion >= 41) {
+            return this.#waitForUnchecked({ transportId }, "disconnect", options);
+        }
+        else {
+            const observer = await this.trackDevices(options);
+            return new Promise((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.
      */
@@ -443,7 +360,14 @@ export class AdbServerClient {
         const devices = await this.getDevices();
         const info = devices.find((device) => device.transportId === transportId);
         const banner = new AdbBanner(info?.product, info?.model, info?.device, features);
-        return new AdbServerTransport(this, info?.serial ?? "", banner, transportId);
+        const waitAbortController = new AbortController();
+        const disconnected = this.waitForDisconnect(transportId, {
+            unref: true,
+            signal: waitAbortController.signal,
+        });
+        const transport = new AdbServerTransport(this, info?.serial ?? "", banner, transportId, disconnected);
+        void transport.disconnected.finally(() => waitAbortController.abort());
+        return transport;
     }
 }
 export async function raceSignal(callback, ...signals) {
@@ -472,125 +396,4 @@ export async function raceSignal(callback, ...signals) {
         }
     }
 }
-(function (AdbServerClient) {
-    class NetworkError extends Error {
-        constructor(message) {
-            super(message);
-            this.name = "NetworkError";
-        }
-    }
-    AdbServerClient.NetworkError = NetworkError;
-    class UnauthorizedError extends Error {
-        constructor(message) {
-            super(message);
-            this.name = "UnauthorizedError";
-        }
-    }
-    AdbServerClient.UnauthorizedError = UnauthorizedError;
-    class AlreadyConnectedError extends Error {
-        constructor(message) {
-            super(message);
-            this.name = "AlreadyConnectedError";
-        }
-    }
-    AdbServerClient.AlreadyConnectedError = AlreadyConnectedError;
-    class WirelessCommands {
-        #client;
-        constructor(client) {
-            this.#client = client;
-        }
-        /**
-         * `adb pair <password> <address>`
-         */
-        async pair(address, password) {
-            const connection = await this.#client.createConnection(`host:pair:${password}:${address}`);
-            try {
-                const response = await connection.readExactly(4);
-                // `response` is either `FAIL`, or 4 hex digits for length of the string
-                if (sequenceEqual(response, FAIL)) {
-                    throw new Error(await connection.readString());
-                }
-                const length = hexToNumber(response);
-                // Ignore the string as it's always `Successful ...`
-                await connection.readExactly(length);
-            }
-            finally {
-                await connection.dispose();
-            }
-        }
-        /**
-         * `adb connect <address>`
-         */
-        async connect(address) {
-            const connection = await this.#client.createConnection(`host:connect:${address}`);
-            try {
-                const response = await connection.readString();
-                switch (response) {
-                    case `already connected to ${address}`:
-                        throw new AdbServerClient.AlreadyConnectedError(response);
-                    case `failed to connect to ${address}`: // `adb pair` mode not authorized
-                    case `failed to authenticate to ${address}`: // `adb tcpip` mode not authorized
-                        throw new AdbServerClient.UnauthorizedError(response);
-                    case `connected to ${address}`:
-                        return;
-                    default:
-                        throw new AdbServerClient.NetworkError(response);
-                }
-            }
-            finally {
-                await connection.dispose();
-            }
-        }
-        /**
-         * `adb disconnect <address>`
-         */
-        async disconnect(address) {
-            const connection = await this.#client.createConnection(`host:disconnect:${address}`);
-            try {
-                await connection.readString();
-            }
-            finally {
-                await connection.dispose();
-            }
-        }
-    }
-    AdbServerClient.WirelessCommands = WirelessCommands;
-    class MDnsCommands {
-        #client;
-        constructor(client) {
-            this.#client = client;
-        }
-        async check() {
-            const connection = await this.#client.createConnection("host:mdns:check");
-            try {
-                const response = await connection.readString();
-                return !response.startsWith("ERROR:");
-            }
-            finally {
-                await connection.dispose();
-            }
-        }
-        async getServices() {
-            const connection = await this.#client.createConnection("host:mdns:services");
-            try {
-                const response = await connection.readString();
-                return response
-                    .split("\n")
-                    .filter(Boolean)
-                    .map((line) => {
-                    const parts = line.split("\t");
-                    return {
-                        name: parts[0],
-                        service: parts[1],
-                        address: parts[2],
-                    };
-                });
-            }
-            finally {
-                await connection.dispose();
-            }
-        }
-    }
-    AdbServerClient.MDnsCommands = MDnsCommands;
-})(AdbServerClient || (AdbServerClient = {}));
 //# sourceMappingURL=client.js.map