@yume-chan/adb 0.0.18 → 0.0.19

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/install.d.ts

@@ -1,4 +1,10 @@
-import { type WritableStream } from "@yume-chan/stream-extra";
-import { type Adb } from "../adb.js";
-export declare function install(adb: Adb): WritableStream<Uint8Array>;
+import type { ReadableStream } from "@yume-chan/stream-extra";
+import type { Adb } from "../adb.js";
+/**
+ * Install an apk file to the device.
+ * @param adb An Adb instance
+ * @returns A writable stream that accepts an APK file
+ * @deprecated Use `PackageManager#installStream` from `@yume-chan/android-bin` package instead.
+ */
+export declare function install(adb: Adb, file: ReadableStream<Uint8Array>): Promise<void>;
 //# sourceMappingURL=install.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../src/commands/install.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,KAAK,cAAc,EACtB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,WAAW,CAAC;AAKrC,wBAAgB,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,cAAc,CAAC,UAAU,CAAC,CA6B5D"}
+{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../src/commands/install.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE9D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAIrC;;;;;GAKG;AACH,wBAAsB,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,cAAc,CAAC,UAAU,CAAC,iBAoBvE"}

package/esm/commands/install.js

@@ -1,29 +1,29 @@
-import { WrapWritableStream, } from "@yume-chan/stream-extra";
 import { escapeArg } from "./subprocess/index.js";
-export function install(adb) {
-    const filename = `/data/local/tmp/${Math.random()
-        .toString()
-        .substring(2)}.apk`;
-    let sync;
-    return new WrapWritableStream({
-        async start() {
-            // TODO: install: support other install apk methods (streaming, etc.)
-            // TODO: install: support split apk formats (`adb install-multiple`)
-            // Upload apk file to tmp folder
-            sync = await adb.sync();
-            return sync.write(filename, undefined, undefined);
-        },
-        async close() {
-            await sync.dispose();
-            // Invoke `pm install` to install it
-            await adb.subprocess.spawnAndWaitLegacy([
-                "pm",
-                "install",
-                escapeArg(filename),
-            ]);
-            // Remove the temp file
-            await adb.rm(filename);
-        },
-    });
+/**
+ * Install an apk file to the device.
+ * @param adb An Adb instance
+ * @returns A writable stream that accepts an APK file
+ * @deprecated Use `PackageManager#installStream` from `@yume-chan/android-bin` package instead.
+ */
+export async function install(adb, file) {
+    const fileName = Math.random().toString().substring(2);
+    const filePath = `/data/local/tmp/${fileName}.apk`;
+    const sync = await adb.sync();
+    try {
+        await sync.write(filePath, file, undefined, undefined);
+    }
+    finally {
+        await sync.dispose();
+    }
+    try {
+        await adb.subprocess.spawnAndWaitLegacy([
+            "pm",
+            "install",
+            escapeArg(filePath),
+        ]);
+    }
+    finally {
+        await adb.rm(filePath);
+    }
 }
 //# sourceMappingURL=install.js.map

package/esm/commands/install.js.map

@@ -1 +1 @@
-{"version":3,"file":"install.js","sourceRoot":"","sources":["../../src/commands/install.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,kBAAkB,GAErB,MAAM,yBAAyB,CAAC;AAIjC,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAGlD,MAAM,UAAU,OAAO,CAAC,GAAQ;IAC5B,MAAM,QAAQ,GAAG,mBAAmB,IAAI,CAAC,MAAM,EAAE;SAC5C,QAAQ,EAAE;SACV,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;IAExB,IAAI,IAAc,CAAC;IACnB,OAAO,IAAI,kBAAkB,CAAa;QACtC,KAAK,CAAC,KAAK;YACP,qEAAqE;YACrE,oEAAoE;YAEpE,gCAAgC;YAChC,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;QACtD,CAAC;QACD,KAAK,CAAC,KAAK;YACP,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;YAErB,oCAAoC;YACpC,MAAM,GAAG,CAAC,UAAU,CAAC,kBAAkB,CAAC;gBACpC,IAAI;gBACJ,SAAS;gBACT,SAAS,CAAC,QAAQ,CAAC;aACtB,CAAC,CAAC;YAEH,uBAAuB;YACvB,MAAM,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;QAC3B,CAAC;KACJ,CAAC,CAAC;AACP,CAAC"}
+{"version":3,"file":"install.js","sourceRoot":"","sources":["../../src/commands/install.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,GAAQ,EAAE,IAAgC;IACpE,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACvD,MAAM,QAAQ,GAAG,mBAAmB,QAAQ,MAAM,CAAC;IAEnD,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;IAC9B,IAAI;QACA,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;KAC1D;YAAS;QACN,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;KACxB;IAED,IAAI;QACA,MAAM,GAAG,CAAC,UAAU,CAAC,kBAAkB,CAAC;YACpC,IAAI;YACJ,SAAS;YACT,SAAS,CAAC,QAAQ,CAAC;SACtB,CAAC,CAAC;KACN;YAAS;QACN,MAAM,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;KAC1B;AACL,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(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>;
+}
 //# 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(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");
+    }
+}
 //# sourceMappingURL=power.js.map

package/esm/commands/reverse.d.ts

@@ -1,29 +1,42 @@
-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 type { Adb } from "../adb.js";
+import type { AdbIncomingSocketHandler, AdbSocket } from "../socket/index.js";
+export interface AdbForwardListener {
+    deviceSerial: string;
+    localName: string;
+    remoteName: string;
+}
+export declare class AdbReverseError extends Error {
+    constructor(message: string);
+}
+export declare class AdbReverseNotSupportedError extends Error {
+    constructor();
+}
+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 to be listened on device by ADB daemon. Or `tcp:0` to choose an available TCP port.
+     * @param localAddress
+     * An identifier for the reverse tunnel.
+     *
+     * When a socket wants to connect to {@link deviceAddress}, native ADB client will forward that connection to {@link localAddress}.
+     * However in this library, the {@link handler} is invoked instead. So this parameter is only used to identify the reverse tunnel.
+     * @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`.
+     * @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, localAddress: string, handler: AdbIncomingSocketHandler): 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;AAOlD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,EAAE,wBAAwB,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAG9E,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,KAAK;;CAOrD;AAeD,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;;;;;;;;;;;;OAYG;IACU,GAAG,CACZ,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,wBAAwB,GAClC,OAAO,CAAC,MAAM,CAAC;IAkCL,MAAM,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAa5C,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAQ1C"}

package/esm/commands/reverse.js

@@ -1,101 +1,126 @@
-// 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, 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 });
+export class AdbReverseError extends Error {
+    constructor(message) {
+        super(message);
+        Object.setPrototypeOf(this, AdbReverseError.prototype);
+    }
+}
+export class AdbReverseNotSupportedError extends Error {
+    constructor() {
+        super("ADB reverse tunnel is not supported on this device when connected wirelessly.");
+        Object.setPrototypeOf(this, AdbReverseNotSupportedError.prototype);
+    }
+}
+const AdbReverseErrorResponse = new Struct()
+    .fields(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);
+    }
+});
+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 to be listened on device by ADB daemon. Or `tcp:0` to choose an available TCP port.
+     * @param localAddress
+     * An identifier for the reverse tunnel.
+     *
+     * When a socket wants to connect to {@link deviceAddress}, native ADB client will forward that connection to {@link localAddress}.
+     * However in this library, the {@link handler} is invoked instead. So this parameter is only used to identify the reverse tunnel.
+     * @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`.
+     * @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, localAddress, handler) {
+        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
+    }
+}
 //# sourceMappingURL=reverse.js.map

package/esm/commands/reverse.js.map

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