@yume-chan/adb 0.0.18 → 0.0.20

package/esm/commands/framebuffer.js

@@ -1,47 +1,47 @@
-import { BufferedReadableStream } from "@yume-chan/stream-extra";
-import Struct from "@yume-chan/struct";
-const Version = new Struct({ littleEndian: true }).uint32("version");
-export const AdbFrameBufferV1 = new Struct({ littleEndian: true })
-    .uint32("bpp")
-    .uint32("size")
-    .uint32("width")
-    .uint32("height")
-    .uint32("red_offset")
-    .uint32("red_length")
-    .uint32("blue_offset")
-    .uint32("blue_length")
-    .uint32("green_offset")
-    .uint32("green_length")
-    .uint32("alpha_offset")
-    .uint32("alpha_length")
-    .uint8Array("data", { lengthField: "size" });
-export const AdbFrameBufferV2 = new Struct({ littleEndian: true })
-    .uint32("bpp")
-    .uint32("colorSpace")
-    .uint32("size")
-    .uint32("width")
-    .uint32("height")
-    .uint32("red_offset")
-    .uint32("red_length")
-    .uint32("blue_offset")
-    .uint32("blue_length")
-    .uint32("green_offset")
-    .uint32("green_length")
-    .uint32("alpha_offset")
-    .uint32("alpha_length")
-    .uint8Array("data", { lengthField: "size" });
-export async function framebuffer(adb) {
-    const socket = await adb.createSocket("framebuffer:");
-    const stream = new BufferedReadableStream(socket.readable);
-    const { version } = await Version.deserialize(stream);
-    switch (version) {
-        case 1:
-            // TODO: AdbFrameBuffer: does all v1 responses uses the same color space? Add it so the command returns same format for all versions.
-            return AdbFrameBufferV1.deserialize(stream);
-        case 2:
-            return AdbFrameBufferV2.deserialize(stream);
-        default:
-            throw new Error("Unknown FrameBuffer version");
-    }
-}
+import { BufferedReadableStream } from "@yume-chan/stream-extra";
+import Struct from "@yume-chan/struct";
+const Version = new Struct({ littleEndian: true }).uint32("version");
+export const AdbFrameBufferV1 = new Struct({ littleEndian: true })
+    .uint32("bpp")
+    .uint32("size")
+    .uint32("width")
+    .uint32("height")
+    .uint32("red_offset")
+    .uint32("red_length")
+    .uint32("blue_offset")
+    .uint32("blue_length")
+    .uint32("green_offset")
+    .uint32("green_length")
+    .uint32("alpha_offset")
+    .uint32("alpha_length")
+    .uint8Array("data", { lengthField: "size" });
+export const AdbFrameBufferV2 = new Struct({ littleEndian: true })
+    .uint32("bpp")
+    .uint32("colorSpace")
+    .uint32("size")
+    .uint32("width")
+    .uint32("height")
+    .uint32("red_offset")
+    .uint32("red_length")
+    .uint32("blue_offset")
+    .uint32("blue_length")
+    .uint32("green_offset")
+    .uint32("green_length")
+    .uint32("alpha_offset")
+    .uint32("alpha_length")
+    .uint8Array("data", { lengthField: "size" });
+export async function framebuffer(adb) {
+    const socket = await adb.createSocket("framebuffer:");
+    const stream = new BufferedReadableStream(socket.readable);
+    const { version } = await Version.deserialize(stream);
+    switch (version) {
+        case 1:
+            // TODO: AdbFrameBuffer: does all v1 responses uses the same color space? Add it so the command returns same format for all versions.
+            return AdbFrameBufferV1.deserialize(stream);
+        case 2:
+            return AdbFrameBufferV2.deserialize(stream);
+        default:
+            throw new Error("Unsupported FrameBuffer version");
+    }
+}
 //# sourceMappingURL=framebuffer.js.map

package/esm/commands/framebuffer.js.map

@@ -1 +1 @@
-{"version":3,"file":"framebuffer.js","sourceRoot":"","sources":["../../src/commands/framebuffer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,MAAM,MAAM,mBAAmB,CAAC;AAIvC,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;AAErE,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,MAAM,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;KAC7D,MAAM,CAAC,KAAK,CAAC;KACb,MAAM,CAAC,MAAM,CAAC;KACd,MAAM,CAAC,OAAO,CAAC;KACf,MAAM,CAAC,QAAQ,CAAC;KAChB,MAAM,CAAC,YAAY,CAAC;KACpB,MAAM,CAAC,YAAY,CAAC;KACpB,MAAM,CAAC,aAAa,CAAC;KACrB,MAAM,CAAC,aAAa,CAAC;KACrB,MAAM,CAAC,cAAc,CAAC;KACtB,MAAM,CAAC,cAAc,CAAC;KACtB,MAAM,CAAC,cAAc,CAAC;KACtB,MAAM,CAAC,cAAc,CAAC;KACtB,UAAU,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CAAC;AAIjD,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,MAAM,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;KAC7D,MAAM,CAAC,KAAK,CAAC;KACb,MAAM,CAAC,YAAY,CAAC;KACpB,MAAM,CAAC,MAAM,CAAC;KACd,MAAM,CAAC,OAAO,CAAC;KACf,MAAM,CAAC,QAAQ,CAAC;KAChB,MAAM,CAAC,YAAY,CAAC;KACpB,MAAM,CAAC,YAAY,CAAC;KACpB,MAAM,CAAC,aAAa,CAAC;KACrB,MAAM,CAAC,aAAa,CAAC;KACrB,MAAM,CAAC,cAAc,CAAC;KACtB,MAAM,CAAC,cAAc,CAAC;KACtB,MAAM,CAAC,cAAc,CAAC;KACtB,MAAM,CAAC,cAAc,CAAC;KACtB,UAAU,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CAAC;AAsBjD,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,GAAQ;IACtC,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;IACtD,MAAM,MAAM,GAAG,IAAI,sBAAsB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC3D,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACtD,QAAQ,OAAO,EAAE;QACb,KAAK,CAAC;YACF,qIAAqI;YACrI,OAAO,gBAAgB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAChD,KAAK,CAAC;YACF,OAAO,gBAAgB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAChD;YACI,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;KACtD;AACL,CAAC"}
+{"version":3,"file":"framebuffer.js","sourceRoot":"","sources":["../../src/commands/framebuffer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,MAAM,MAAM,mBAAmB,CAAC;AAIvC,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;AAErE,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,MAAM,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;KAC7D,MAAM,CAAC,KAAK,CAAC;KACb,MAAM,CAAC,MAAM,CAAC;KACd,MAAM,CAAC,OAAO,CAAC;KACf,MAAM,CAAC,QAAQ,CAAC;KAChB,MAAM,CAAC,YAAY,CAAC;KACpB,MAAM,CAAC,YAAY,CAAC;KACpB,MAAM,CAAC,aAAa,CAAC;KACrB,MAAM,CAAC,aAAa,CAAC;KACrB,MAAM,CAAC,cAAc,CAAC;KACtB,MAAM,CAAC,cAAc,CAAC;KACtB,MAAM,CAAC,cAAc,CAAC;KACtB,MAAM,CAAC,cAAc,CAAC;KACtB,UAAU,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CAAC;AAIjD,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,MAAM,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;KAC7D,MAAM,CAAC,KAAK,CAAC;KACb,MAAM,CAAC,YAAY,CAAC;KACpB,MAAM,CAAC,MAAM,CAAC;KACd,MAAM,CAAC,OAAO,CAAC;KACf,MAAM,CAAC,QAAQ,CAAC;KAChB,MAAM,CAAC,YAAY,CAAC;KACpB,MAAM,CAAC,YAAY,CAAC;KACpB,MAAM,CAAC,aAAa,CAAC;KACrB,MAAM,CAAC,aAAa,CAAC;KACrB,MAAM,CAAC,cAAc,CAAC;KACtB,MAAM,CAAC,cAAc,CAAC;KACtB,MAAM,CAAC,cAAc,CAAC;KACtB,MAAM,CAAC,cAAc,CAAC;KACtB,UAAU,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CAAC;AAsBjD,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,GAAQ;IACtC,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;IACtD,MAAM,MAAM,GAAG,IAAI,sBAAsB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC3D,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACtD,QAAQ,OAAO,EAAE;QACb,KAAK,CAAC;YACF,qIAAqI;YACrI,OAAO,gBAAgB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAChD,KAAK,CAAC;YACF,OAAO,gBAAgB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAChD;YACI,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;KAC1D;AACL,CAAC"}

package/esm/commands/index.d.ts

@@ -1,9 +1,8 @@
-export * from './base.js';
-export * from './framebuffer.js';
-export * from './install.js';
-export * from './power.js';
-export * from './reverse.js';
-export * from './subprocess/index.js';
-export * from './sync/index.js';
-export * from './tcpip.js';
+export * from "./base.js";
+export * from "./framebuffer.js";
+export * from "./power.js";
+export * from "./reverse.js";
+export * from "./subprocess/index.js";
+export * from "./sync/index.js";
+export * from "./tcpip.js";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,kBAAkB,CAAC;AACjC,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,kBAAkB,CAAC;AACjC,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC"}

package/esm/commands/index.js

@@ -1,9 +1,8 @@
-export * from './base.js';
-export * from './framebuffer.js';
-export * from './install.js';
-export * from './power.js';
-export * from './reverse.js';
-export * from './subprocess/index.js';
-export * from './sync/index.js';
-export * from './tcpip.js';
+export * from "./base.js";
+export * from "./framebuffer.js";
+export * from "./power.js";
+export * from "./reverse.js";
+export * from "./subprocess/index.js";
+export * from "./sync/index.js";
+export * from "./tcpip.js";
 //# sourceMappingURL=index.js.map

package/esm/commands/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,kBAAkB,CAAC;AACjC,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/commands/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,kBAAkB,CAAC;AACjC,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC"}

package/esm/commands/power.d.ts

@@ -1,23 +1,23 @@
-import { AdbCommandBase } from "./base.js";
-export declare class AdbPower extends AdbCommandBase {
-    reboot(name?: string): Promise<string>;
-    bootloader(): Promise<string>;
-    fastboot(): Promise<string>;
-    recovery(): Promise<string>;
-    sideload(): Promise<string>;
-    /**
-     * Reboot to Qualcomm Emergency Download (EDL) Mode.
-     *
-     * Only works on some Qualcomm devices.
-     */
-    qualcommEdlMode(): Promise<string>;
-    powerOff(): Promise<string>;
-    powerButton(longPress?: boolean): Promise<string>;
-    /**
-     * Reboot to Samsung Odin download mode.
-     *
-     * Only works on Samsung devices.
-     */
-    samsungOdin(): Promise<string>;
-}
+import { AdbCommandBase } from "./base.js";
+export declare class AdbPower extends AdbCommandBase {
+    reboot(mode?: string): Promise<string>;
+    bootloader(): Promise<string>;
+    fastboot(): Promise<string>;
+    recovery(): Promise<string>;
+    sideload(): Promise<string>;
+    /**
+     * Reboot to Qualcomm Emergency Download (EDL) Mode.
+     *
+     * Only works on some Qualcomm devices.
+     */
+    qualcommEdlMode(): Promise<string>;
+    powerOff(): Promise<string>;
+    powerButton(longPress?: boolean): Promise<string>;
+    /**
+     * Reboot to Samsung Odin download mode.
+     *
+     * Only works on Samsung devices.
+     */
+    samsungOdin(): Promise<string>;
+}
 //# sourceMappingURL=power.d.ts.map

package/esm/commands/power.js

@@ -1,49 +1,49 @@
-// cspell: ignore bootloader
-// cspell: ignore fastboot
-// cspell: ignore keyevent
-// cspell: ignore longpress
-import { AdbCommandBase } from "./base.js";
-export class AdbPower extends AdbCommandBase {
-    reboot(name = "") {
-        return this.adb.createSocketAndWait(`reboot:${name}`);
-    }
-    bootloader() {
-        return this.reboot("bootloader");
-    }
-    fastboot() {
-        return this.reboot("fastboot");
-    }
-    recovery() {
-        return this.reboot("recovery");
-    }
-    sideload() {
-        return this.reboot("sideload");
-    }
-    /**
-     * Reboot to Qualcomm Emergency Download (EDL) Mode.
-     *
-     * Only works on some Qualcomm devices.
-     */
-    qualcommEdlMode() {
-        return this.reboot("edl");
-    }
-    powerOff() {
-        return this.adb.subprocess.spawnAndWaitLegacy(["reboot", "-p"]);
-    }
-    powerButton(longPress = false) {
-        return this.adb.subprocess.spawnAndWaitLegacy([
-            "input",
-            "keyevent",
-            longPress ? "--longpress POWER" : "POWER",
-        ]);
-    }
-    /**
-     * Reboot to Samsung Odin download mode.
-     *
-     * Only works on Samsung devices.
-     */
-    samsungOdin() {
-        return this.reboot("download");
-    }
-}
+// cspell: ignore bootloader
+// cspell: ignore fastboot
+// cspell: ignore keyevent
+// cspell: ignore longpress
+import { AdbCommandBase } from "./base.js";
+export class AdbPower extends AdbCommandBase {
+    reboot(mode = "") {
+        return this.adb.createSocketAndWait(`reboot:${mode}`);
+    }
+    bootloader() {
+        return this.reboot("bootloader");
+    }
+    fastboot() {
+        return this.reboot("fastboot");
+    }
+    recovery() {
+        return this.reboot("recovery");
+    }
+    sideload() {
+        return this.reboot("sideload");
+    }
+    /**
+     * Reboot to Qualcomm Emergency Download (EDL) Mode.
+     *
+     * Only works on some Qualcomm devices.
+     */
+    qualcommEdlMode() {
+        return this.reboot("edl");
+    }
+    powerOff() {
+        return this.adb.subprocess.spawnAndWaitLegacy(["reboot", "-p"]);
+    }
+    powerButton(longPress = false) {
+        return this.adb.subprocess.spawnAndWaitLegacy([
+            "input",
+            "keyevent",
+            longPress ? "--longpress POWER" : "POWER",
+        ]);
+    }
+    /**
+     * Reboot to Samsung Odin download mode.
+     *
+     * Only works on Samsung devices.
+     */
+    samsungOdin() {
+        return this.reboot("download");
+    }
+}
 //# sourceMappingURL=power.js.map

package/esm/commands/reverse.d.ts

@@ -1,29 +1,41 @@
-import { AutoDisposable } from "@yume-chan/event";
-import { type Adb } from "../adb.js";
-import { type AdbIncomingSocketHandler, type AdbSocket } from "../socket/index.js";
-export interface AdbForwardListener {
-    deviceSerial: string;
-    localName: string;
-    remoteName: string;
-}
-export declare class AdbReverseCommand extends AutoDisposable {
-    protected localAddressToHandler: Map<string, AdbIncomingSocketHandler>;
-    protected deviceAddressToLocalAddress: Map<string, string>;
-    protected adb: Adb;
-    protected listening: boolean;
-    constructor(adb: Adb);
-    protected handleIncomingSocket: (socket: AdbSocket) => Promise<boolean>;
-    private createBufferedStream;
-    private sendRequest;
-    list(): Promise<AdbForwardListener[]>;
-    /**
-     * @param deviceAddress The address adbd on device is listening on. Can be `tcp:0` to let adbd choose an available TCP port by itself.
-     * @param localAddress Native ADB client will open a connection to this address when reverse connection received. In WebADB, it's only used to uniquely identify a reverse tunnel registry, `handler` will be called to handle the connection.
-     * @param handler A callback to handle incoming connections. It must return `true` if it accepts the connection.
-     * @returns `tcp:{ACTUAL_LISTENING_PORT}`, If `deviceAddress` is `tcp:0`; otherwise, `deviceAddress`.
-     */
-    add(deviceAddress: string, localAddress: string, handler: AdbIncomingSocketHandler): Promise<string>;
-    remove(deviceAddress: string): Promise<void>;
-    removeAll(): Promise<void>;
-}
+import { AutoDisposable } from "@yume-chan/event";
+import { BufferedReadableStream } from "@yume-chan/stream-extra";
+import type { Adb, AdbIncomingSocketHandler } from "../adb.js";
+export interface AdbForwardListener {
+    deviceSerial: string;
+    localName: string;
+    remoteName: string;
+}
+export declare class AdbReverseError extends Error {
+    constructor(message: string);
+}
+export declare class AdbReverseNotSupportedError extends AdbReverseError {
+    constructor();
+}
+export declare class AdbReverseCommand extends AutoDisposable {
+    #private;
+    protected adb: Adb;
+    constructor(adb: Adb);
+    protected createBufferedStream(service: string): Promise<BufferedReadableStream>;
+    protected sendRequest(service: string): Promise<BufferedReadableStream>;
+    list(): Promise<AdbForwardListener[]>;
+    /**
+     * Add an already existing reverse tunnel. Depends on the transport type, this may not do anything.
+     * @param deviceAddress The address to be listened on device by ADB daemon. Or `tcp:0` to choose an available TCP port.
+     * @param localAddress The address that listens on the local machine.
+     * @returns `tcp:{ACTUAL_LISTENING_PORT}`, If `deviceAddress` is `tcp:0`; otherwise, `deviceAddress`.
+     */
+    addExternal(deviceAddress: string, localAddress: string): Promise<string>;
+    /**
+     * @param deviceAddress The address to be listened on device by ADB daemon. Or `tcp:0` to choose an available TCP port.
+     * @param handler A callback to handle incoming connections.
+     * @param localAddressThe The address that listens on the local machine. May be `undefined` to let the transport choose an appropriate one.
+     * @returns `tcp:{ACTUAL_LISTENING_PORT}`, If `deviceAddress` is `tcp:0`; otherwise, `deviceAddress`.
+     * @throws {AdbReverseNotSupportedError} If ADB reverse tunnel is not supported on this device when connected wirelessly.
+     * @throws {AdbReverseError} If ADB daemon returns an error.
+     */
+    add(deviceAddress: string, handler: AdbIncomingSocketHandler, localAddress?: string): Promise<string>;
+    remove(deviceAddress: string): Promise<void>;
+    removeAll(): Promise<void>;
+}
 //# sourceMappingURL=reverse.d.ts.map

package/esm/commands/reverse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reverse.d.ts","sourceRoot":"","sources":["../../src/commands/reverse.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAOlD,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EACH,KAAK,wBAAwB,EAC7B,KAAK,SAAS,EACjB,MAAM,oBAAoB,CAAC;AAG5B,MAAM,WAAW,kBAAkB;IAC/B,YAAY,EAAE,MAAM,CAAC;IAErB,SAAS,EAAE,MAAM,CAAC;IAElB,UAAU,EAAE,MAAM,CAAC;CACtB;AAYD,qBAAa,iBAAkB,SAAQ,cAAc;IACjD,SAAS,CAAC,qBAAqB,wCAG3B;IAEJ,SAAS,CAAC,2BAA2B,sBAA6B;IAElE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAEnB,SAAS,CAAC,SAAS,UAAS;gBAET,GAAG,EAAE,GAAG;IAS3B,SAAS,CAAC,oBAAoB,WAAkB,SAAS,sBAKvD;YAEY,oBAAoB;YAKpB,WAAW;IASZ,IAAI,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAgBlD;;;;;OAKG;IACU,GAAG,CACZ,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,wBAAwB,GAClC,OAAO,CAAC,MAAM,CAAC;IAoCL,MAAM,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAa5C,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAQ1C"}
+{"version":3,"file":"reverse.d.ts","sourceRoot":"","sources":["../../src/commands/reverse.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAGjE,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAG/D,MAAM,WAAW,kBAAkB;IAC/B,YAAY,EAAE,MAAM,CAAC;IAErB,SAAS,EAAE,MAAM,CAAC;IAElB,UAAU,EAAE,MAAM,CAAC;CACtB;AAMD,qBAAa,eAAgB,SAAQ,KAAK;gBACnB,OAAO,EAAE,MAAM;CAIrC;AAED,qBAAa,2BAA4B,SAAQ,eAAe;;CAM/D;AAoBD,qBAAa,iBAAkB,SAAQ,cAAc;;IACjD,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;gBAIA,GAAG,EAAE,GAAG;cAMX,oBAAoB,CAAC,OAAO,EAAE,MAAM;cAKpC,WAAW,CAAC,OAAO,EAAE,MAAM;IAS9B,IAAI,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAgBlD;;;;;OAKG;IACU,WAAW,CAAC,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IA8BpE;;;;;;;OAOG;IACU,GAAG,CACZ,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,wBAAwB,EACjC,YAAY,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,MAAM,CAAC;IAgBL,MAAM,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAY5C,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAQ1C"}

package/esm/commands/reverse.js

@@ -1,101 +1,131 @@
-// cspell: ignore killforward
-import { AutoDisposable } from "@yume-chan/event";
-import { BufferedReadableStream, BufferedReadableStreamEndedError, } from "@yume-chan/stream-extra";
-import Struct from "@yume-chan/struct";
-import { decodeUtf8 } from "../utils/index.js";
-const AdbReverseStringResponse = new Struct()
-    .string("length", { length: 4 })
-    .string("content", { lengthField: "length", lengthFieldRadix: 16 });
-const AdbReverseErrorResponse = new Struct()
-    .fields(AdbReverseStringResponse)
-    .postDeserialize((value) => {
-    throw new Error(value.content);
-});
-export class AdbReverseCommand extends AutoDisposable {
-    localAddressToHandler = new Map();
-    deviceAddressToLocalAddress = new Map();
-    adb;
-    listening = false;
-    constructor(adb) {
-        super();
-        this.adb = adb;
-        this.addDisposable(this.adb.onIncomingSocket(this.handleIncomingSocket));
-    }
-    handleIncomingSocket = async (socket) => {
-        let address = socket.serviceString;
-        // ADB daemon appends `\0` to the service string
-        address = address.replace(/\0/g, "");
-        return !!(await this.localAddressToHandler.get(address)?.(socket));
-    };
-    async createBufferedStream(service) {
-        const socket = await this.adb.createSocket(service);
-        return new BufferedReadableStream(socket.readable);
-    }
-    async sendRequest(service) {
-        const stream = await this.createBufferedStream(service);
-        const success = decodeUtf8(await stream.read(4)) === "OKAY";
-        if (!success) {
-            await AdbReverseErrorResponse.deserialize(stream);
-        }
-        return stream;
-    }
-    async list() {
-        const stream = await this.createBufferedStream("reverse:list-forward");
-        const response = await AdbReverseStringResponse.deserialize(stream);
-        return response.content.split("\n").map((line) => {
-            const [deviceSerial, localName, remoteName] = line.split(" ");
-            return { deviceSerial, localName, remoteName };
-        });
-        // No need to close the stream, device will close it
-    }
-    /**
-     * @param deviceAddress The address adbd on device is listening on. Can be `tcp:0` to let adbd choose an available TCP port by itself.
-     * @param localAddress Native ADB client will open a connection to this address when reverse connection received. In WebADB, it's only used to uniquely identify a reverse tunnel registry, `handler` will be called to handle the connection.
-     * @param handler A callback to handle incoming connections. It must return `true` if it accepts the connection.
-     * @returns `tcp:{ACTUAL_LISTENING_PORT}`, If `deviceAddress` is `tcp:0`; otherwise, `deviceAddress`.
-     */
-    async add(deviceAddress, localAddress, handler) {
-        // TODO(reverse): handle ADB bug
-        // https://issuetracker.google.com/issues/37066218
-        const stream = await this.sendRequest(`reverse:forward:${deviceAddress};${localAddress}`);
-        // `tcp:0` tells the device to pick an available port.
-        // On Android >=8, device will respond with the selected port for all `tcp:` requests.
-        if (deviceAddress.startsWith("tcp:")) {
-            let length;
-            try {
-                length = Number.parseInt(decodeUtf8(await stream.read(4)), 16);
-            }
-            catch (e) {
-                if (!(e instanceof BufferedReadableStreamEndedError)) {
-                    throw e;
-                }
-                // Android <8 doesn't have this response.
-                // (the stream is closed now)
-                // Can be safely ignored.
-            }
-            if (length !== undefined) {
-                const port = decodeUtf8(await stream.read(length));
-                deviceAddress = `tcp:${Number.parseInt(port, 10)}`;
-            }
-        }
-        this.localAddressToHandler.set(localAddress, handler);
-        this.deviceAddressToLocalAddress.set(deviceAddress, localAddress);
-        return deviceAddress;
-        // No need to close the stream, device will close it
-    }
-    async remove(deviceAddress) {
-        await this.sendRequest(`reverse:killforward:${deviceAddress}`);
-        if (this.deviceAddressToLocalAddress.has(deviceAddress)) {
-            this.localAddressToHandler.delete(this.deviceAddressToLocalAddress.get(deviceAddress));
-            this.deviceAddressToLocalAddress.delete(deviceAddress);
-        }
-        // No need to close the stream, device will close it
-    }
-    async removeAll() {
-        await this.sendRequest(`reverse:killforward-all`);
-        this.deviceAddressToLocalAddress.clear();
-        this.localAddressToHandler.clear();
-        // No need to close the stream, device will close it
-    }
-}
+// cspell: ignore killforward
+import { AutoDisposable } from "@yume-chan/event";
+import { BufferedReadableStream } from "@yume-chan/stream-extra";
+import Struct, { ExactReadableEndedError } from "@yume-chan/struct";
+import { decodeUtf8, hexToNumber } from "../utils/index.js";
+const AdbReverseStringResponse = new Struct()
+    .string("length", { length: 4 })
+    .string("content", { lengthField: "length", lengthFieldRadix: 16 });
+export class AdbReverseError extends Error {
+    constructor(message) {
+        super(message);
+        Object.setPrototypeOf(this, new.target.prototype);
+    }
+}
+export class AdbReverseNotSupportedError extends AdbReverseError {
+    constructor() {
+        super("ADB reverse tunnel is not supported on this device when connected wirelessly.");
+    }
+}
+const AdbReverseErrorResponse = new Struct()
+    .concat(AdbReverseStringResponse)
+    .postDeserialize((value) => {
+    // https://issuetracker.google.com/issues/37066218
+    // ADB on Android <9 can't create reverse tunnels when connected wirelessly (ADB over WiFi),
+    // and returns this confusing "more than one device/emulator" error.
+    if (value.content === "more than one device/emulator") {
+        throw new AdbReverseNotSupportedError();
+    }
+    else {
+        throw new AdbReverseError(value.content);
+    }
+});
+async function readString(stream, length) {
+    const buffer = await stream.readExactly(length);
+    return decodeUtf8(buffer);
+}
+export class AdbReverseCommand extends AutoDisposable {
+    adb;
+    #deviceAddressToLocalAddress = new Map();
+    constructor(adb) {
+        super();
+        this.adb = adb;
+    }
+    async createBufferedStream(service) {
+        const socket = await this.adb.createSocket(service);
+        return new BufferedReadableStream(socket.readable);
+    }
+    async sendRequest(service) {
+        const stream = await this.createBufferedStream(service);
+        const success = (await readString(stream, 4)) === "OKAY";
+        if (!success) {
+            await AdbReverseErrorResponse.deserialize(stream);
+        }
+        return stream;
+    }
+    async list() {
+        const stream = await this.createBufferedStream("reverse:list-forward");
+        const response = await AdbReverseStringResponse.deserialize(stream);
+        return response.content.split("\n").map((line) => {
+            const [deviceSerial, localName, remoteName] = line.split(" ");
+            return { deviceSerial, localName, remoteName };
+        });
+        // No need to close the stream, device will close it
+    }
+    /**
+     * Add an already existing reverse tunnel. Depends on the transport type, this may not do anything.
+     * @param deviceAddress The address to be listened on device by ADB daemon. Or `tcp:0` to choose an available TCP port.
+     * @param localAddress The address that listens on the local machine.
+     * @returns `tcp:{ACTUAL_LISTENING_PORT}`, If `deviceAddress` is `tcp:0`; otherwise, `deviceAddress`.
+     */
+    async addExternal(deviceAddress, localAddress) {
+        const stream = await this.sendRequest(`reverse:forward:${deviceAddress};${localAddress}`);
+        // `tcp:0` tells the device to pick an available port.
+        // On Android >=8, device will respond with the selected port for all `tcp:` requests.
+        if (deviceAddress.startsWith("tcp:")) {
+            const position = stream.position;
+            try {
+                const length = hexToNumber(await stream.readExactly(4));
+                const port = await readString(stream, length);
+                deviceAddress = `tcp:${Number.parseInt(port, 10)}`;
+            }
+            catch (e) {
+                if (e instanceof ExactReadableEndedError &&
+                    stream.position === position) {
+                    // Android <8 doesn't have this response.
+                    // (the stream is closed now)
+                    // Can be safely ignored.
+                }
+                else {
+                    throw e;
+                }
+            }
+        }
+        return deviceAddress;
+    }
+    /**
+     * @param deviceAddress The address to be listened on device by ADB daemon. Or `tcp:0` to choose an available TCP port.
+     * @param handler A callback to handle incoming connections.
+     * @param localAddressThe The address that listens on the local machine. May be `undefined` to let the transport choose an appropriate one.
+     * @returns `tcp:{ACTUAL_LISTENING_PORT}`, If `deviceAddress` is `tcp:0`; otherwise, `deviceAddress`.
+     * @throws {AdbReverseNotSupportedError} If ADB reverse tunnel is not supported on this device when connected wirelessly.
+     * @throws {AdbReverseError} If ADB daemon returns an error.
+     */
+    async add(deviceAddress, handler, localAddress) {
+        localAddress = await this.adb.transport.addReverseTunnel(handler, localAddress);
+        try {
+            deviceAddress = await this.addExternal(deviceAddress, localAddress);
+            this.#deviceAddressToLocalAddress.set(deviceAddress, localAddress);
+            return deviceAddress;
+        }
+        catch (e) {
+            await this.adb.transport.removeReverseTunnel(localAddress);
+            throw e;
+        }
+    }
+    async remove(deviceAddress) {
+        const localAddress = this.#deviceAddressToLocalAddress.get(deviceAddress);
+        if (localAddress) {
+            await this.adb.transport.removeReverseTunnel(localAddress);
+        }
+        await this.sendRequest(`reverse:killforward:${deviceAddress}`);
+        // No need to close the stream, device will close it
+    }
+    async removeAll() {
+        await this.adb.transport.clearReverseTunnels();
+        this.#deviceAddressToLocalAddress.clear();
+        await this.sendRequest(`reverse:killforward-all`);
+        // No need to close the stream, device will close it
+    }
+}
 //# sourceMappingURL=reverse.js.map