@yume-chan/adb 0.0.19 → 0.0.20

package/esm/{crypto.js → daemon/crypto.js}

@@ -1,8 +1,4 @@
 import { getBigUint64, setBigUint64, } from "@yume-chan/dataview-bigint-polyfill/esm/fallback.js";
-const BigInt0 = BigInt(0);
-const BigInt1 = BigInt(1);
-const BigInt2 = BigInt(2);
-const BigInt64 = BigInt(64);
 /**
  * Gets the `BigInt` value at the specified byte offset and length from the start of the view. There is
  * no alignment constraint; multi-byte values may be fetched from any offset.
@@ -11,11 +7,11 @@ const BigInt64 = BigInt(64);
  * @param byteOffset The place in the buffer at which the value should be retrieved.
  */
 export function getBigUint(dataView, byteOffset, length) {
-    let result = BigInt0;
+    let result = 0n;
     // Currently `length` must be a multiplication of 8
     // Support for arbitrary length can be easily added
     for (let i = byteOffset; i < byteOffset + length; i += 8) {
-        result <<= BigInt64;
+        result <<= 64n;
         const value = getBigUint64(dataView, i, false);
         result += value;
     }
@@ -31,19 +27,19 @@ export function getBigUint(dataView, byteOffset, length) {
 export function setBigUint(dataView, byteOffset, value, littleEndian) {
     const start = byteOffset;
     if (littleEndian) {
-        while (value > BigInt0) {
+        while (value > 0n) {
             setBigUint64(dataView, byteOffset, value, true);
             byteOffset += 8;
-            value >>= BigInt64;
+            value >>= 64n;
         }
     }
     else {
         // Because we don't know how long (in bits) the `value` is,
         // Convert it to an array of `uint64` first.
         const uint64Array = [];
-        while (value > BigInt0) {
+        while (value > 0n) {
             uint64Array.push(BigInt.asUintN(64, value));
-            value >>= BigInt64;
+            value >>= 64n;
         }
         for (let i = uint64Array.length - 1; i >= 0; i -= 1) {
             setBigUint64(dataView, byteOffset, uint64Array[i], false);
@@ -74,7 +70,7 @@ const RsaPrivateKeyNOffset = 38;
 const RsaPrivateKeyNLength = 2048 / 8;
 const RsaPrivateKeyDOffset = 303;
 const RsaPrivateKeyDLength = 2048 / 8;
-export function parsePrivateKey(key) {
+export function rsaParsePrivateKey(key) {
     const view = new DataView(key.buffer, key.byteOffset, key.byteLength);
     const n = getBigUint(view, RsaPrivateKeyNOffset, RsaPrivateKeyNLength);
     const d = getBigUint(view, RsaPrivateKeyDOffset, RsaPrivateKeyDLength);
@@ -106,10 +102,10 @@ export function modInverse(a, m) {
     }
     return ((y % m) + m) % m;
 }
-export function calculatePublicKeyLength() {
+export function adbGetPublicKeySize() {
     return 4 + 4 + 2048 / 8 + 2048 / 8 + 4;
 }
-export function calculatePublicKey(privateKey, output) {
+export function adbGeneratePublicKey(privateKey, output) {
     // Android has its own public key generation algorithm
     // See https://android.googlesource.com/platform/system/core.git/+/91784040db2b9273687f88d8b95f729d4a61ecc2/libcrypto_utils/android_pubkey.cpp#111
     // The public key is an array of
@@ -126,9 +122,9 @@ export function calculatePublicKey(privateKey, output) {
     // (All in little endian)
     // See https://android.googlesource.com/platform/system/core.git/+/91784040db2b9273687f88d8b95f729d4a61ecc2/libcrypto_utils/android_pubkey.cpp#38
     // extract `n` from private key
-    const [n] = parsePrivateKey(privateKey);
+    const [n] = rsaParsePrivateKey(privateKey);
     let outputType;
-    const outputLength = calculatePublicKeyLength();
+    const outputLength = adbGetPublicKeySize();
     if (!output) {
         output = new Uint8Array(outputLength);
         outputType = "Uint8Array";
@@ -145,16 +141,16 @@ export function calculatePublicKey(privateKey, output) {
     outputView.setUint32(outputOffset, 2048 / 8 / 4, true);
     outputOffset += 4;
     // Calculate `n0inv`
-    // Don't know why need to multiple -1
+    // Don't know why need to multiply by -1
     // Didn't exist in Android codebase
-    const n0inv = modInverse(Number(BigInt.asUintN(32, n) * BigInt(-1)), 2 ** 32);
+    const n0inv = modInverse(-Number(BigInt.asUintN(32, n)), 2 ** 32);
     outputView.setUint32(outputOffset, n0inv, true);
     outputOffset += 4;
     // Write n
     setBigUint(outputView, outputOffset, n, true);
     outputOffset += 256;
     // Calculate rr = (2^(rsa_size)) ^ 2 mod n
-    const rr = BigInt(2) ** BigInt(4096) % n;
+    const rr = 2n ** 4096n % n;
     outputOffset += setBigUint(outputView, outputOffset, rr, true);
     // exponent
     outputView.setUint32(outputOffset, 65537, true);
@@ -174,17 +170,17 @@ export function calculatePublicKey(privateKey, output) {
  * See https://en.wikipedia.org/wiki/Modular_exponentiation#Implementation_in_Lua
  */
 export function powMod(base, exponent, modulus) {
-    if (modulus === BigInt1) {
-        return BigInt0;
+    if (modulus === 1n) {
+        return 0n;
     }
-    let r = BigInt1;
+    let r = 1n;
     base = base % modulus;
-    while (exponent > BigInt0) {
-        if (BigInt.asUintN(1, exponent) === BigInt1) {
+    while (exponent > 0n) {
+        if (BigInt.asUintN(1, exponent) === 1n) {
             r = (r * base) % modulus;
         }
-        exponent >>= BigInt1;
-        base = base ** BigInt2 % modulus;
+        base = (base * base) % modulus;
+        exponent >>= 1n;
     }
     return r;
 }
@@ -218,8 +214,8 @@ export const SHA1_DIGEST_INFO = new Uint8Array([
 // encrypt the given data with its private key)
 // However SubtileCrypto.encrypt() doesn't accept 'RSASSA-PKCS1-v1_5' algorithm
 // So we need to implement the encryption by ourself
-export function sign(privateKey, data) {
-    const [n, d] = parsePrivateKey(privateKey);
+export function rsaSign(privateKey, data) {
+    const [n, d] = rsaParsePrivateKey(privateKey);
     // PKCS#1 padding
     const padded = new Uint8Array(256);
     let index = 0;

package/esm/daemon/crypto.js.map

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

package/esm/{backend.d.ts → daemon/device.d.ts}

@@ -1,9 +1,9 @@
 import type { Consumable, ReadableWritablePair } from "@yume-chan/stream-extra";
 import type { ValueOrPromise } from "@yume-chan/struct";
 import type { AdbPacketData, AdbPacketInit } from "./packet.js";
-export interface AdbBackend {
+export interface AdbDaemonDevice {
     readonly serial: string;
     readonly name: string | undefined;
     connect(): ValueOrPromise<ReadableWritablePair<AdbPacketData, Consumable<AdbPacketInit>>>;
 }
-//# sourceMappingURL=backend.d.ts.map
+//# sourceMappingURL=device.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"device.d.ts","sourceRoot":"","sources":["../../src/daemon/device.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEhE,MAAM,WAAW,eAAe;IAC5B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IAElC,OAAO,IAAI,cAAc,CACrB,oBAAoB,CAAC,aAAa,EAAE,UAAU,CAAC,aAAa,CAAC,CAAC,CACjE,CAAC;CACL"}

package/esm/daemon/device.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=device.js.map

package/esm/daemon/device.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"device.js","sourceRoot":"","sources":["../../src/daemon/device.ts"],"names":[],"mappings":""}

package/esm/{socket → daemon}/dispatcher.d.ts

@@ -1,9 +1,7 @@
-import type { RemoveEventListener } from "@yume-chan/event";
 import type { Consumable, ReadableWritablePair } from "@yume-chan/stream-extra";
-import type { ValueOrPromise } from "@yume-chan/struct";
-import type { AdbPacketData, AdbPacketInit } from "../packet.js";
-import { AdbCommand } from "../packet.js";
-import type { AdbSocket } from "./socket.js";
+import type { AdbIncomingSocketHandler, AdbSocket, Closeable } from "../adb.js";
+import type { AdbPacketData, AdbPacketInit } from "./packet.js";
+import { AdbCommand } from "./packet.js";
 export interface AdbPacketDispatcherOptions {
     calculateChecksum: boolean;
     /**
@@ -15,10 +13,6 @@ export interface AdbPacketDispatcherOptions {
     appendNullToServiceString: boolean;
     maxPayloadSize: number;
 }
-export type AdbIncomingSocketHandler = (socket: AdbSocket) => ValueOrPromise<boolean>;
-export interface Closeable {
-    close(): ValueOrPromise<void>;
-}
 /**
  * The dispatcher is the "dumb" part of the connection handling logic.
  *
@@ -30,29 +24,17 @@ export interface Closeable {
  * negotiating the options, and has shortcuts to high-level services.
  */
 export declare class AdbPacketDispatcher implements Closeable {
-    private readonly initializers;
-    /**
-     * Socket local ID to the socket controller.
-     */
-    private readonly sockets;
-    private _writer;
+    #private;
     readonly options: AdbPacketDispatcherOptions;
-    private _closed;
-    private _disconnected;
     get disconnected(): Promise<void>;
-    private _incomingSocketHandlers;
-    private _abortController;
     constructor(connection: ReadableWritablePair<AdbPacketData, Consumable<AdbPacketInit>>, options: AdbPacketDispatcherOptions);
     private handleOk;
     private handleClose;
-    /**
-     * Add a handler for incoming socket.
-     * @param handler A function to call with new incoming sockets. It must return `true` if it accepts the socket.
-     * @returns A function to remove the handler.
-     */
-    onIncomingSocket(handler: AdbIncomingSocketHandler): RemoveEventListener;
+    addReverseTunnel(service: string, handler: AdbIncomingSocketHandler): void;
+    removeReverseTunnel(address: string): void;
+    clearReverseTunnels(): void;
     private handleOpen;
-    createSocket(serviceString: string): Promise<AdbSocket>;
+    createSocket(service: string): Promise<AdbSocket>;
     sendPacket(command: AdbCommand, arg0: number, arg1: number, payload?: string | Uint8Array): Promise<void>;
     close(): Promise<void>;
     private dispose;

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

@@ -0,0 +1 @@
+{"version":3,"file":"dispatcher.d.ts","sourceRoot":"","sources":["../../src/daemon/dispatcher.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACR,UAAU,EACV,oBAAoB,EAEvB,MAAM,yBAAyB,CAAC;AAQjC,OAAO,KAAK,EAAE,wBAAwB,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAGhF,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,EAAE,UAAU,EAAqB,MAAM,aAAa,CAAC;AAG5D,MAAM,WAAW,0BAA0B;IACvC,iBAAiB,EAAE,OAAO,CAAC;IAC3B;;;;;OAKG;IACH,yBAAyB,EAAE,OAAO,CAAC;IACnC,cAAc,EAAE,MAAM,CAAC;CAC1B;AAED;;;;;;;;;GASG;AACH,qBAAa,mBAAoB,YAAW,SAAS;;IAWjD,SAAgB,OAAO,EAAE,0BAA0B,CAAC;IAIpD,IAAW,YAAY,kBAEtB;gBAMG,UAAU,EAAE,oBAAoB,CAC5B,aAAa,EACb,UAAU,CAAC,aAAa,CAAC,CAC5B,EACD,OAAO,EAAE,0BAA0B;IAuEvC,OAAO,CAAC,QAAQ;YAkBF,WAAW;IA6ClB,gBAAgB,CACnB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,wBAAwB;IAK9B,mBAAmB,CAAC,OAAO,EAAE,MAAM;IAInC,mBAAmB;YAIZ,UAAU;IAmCX,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IAsBjD,UAAU,CACnB,OAAO,EAAE,UAAU,EACnB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,MAAM,GAAG,UAA8B,GACjD,OAAO,CAAC,IAAI,CAAC;IAqBH,KAAK;IAgBlB,OAAO,CAAC,OAAO;CAOlB"}

package/esm/{socket → daemon}/dispatcher.js

@@ -1,9 +1,9 @@
 import { AsyncOperationManager, PromiseResolver } from "@yume-chan/async";
 import { AbortController, ConsumableWritableStream, WritableStream, } from "@yume-chan/stream-extra";
 import { EMPTY_UINT8_ARRAY } from "@yume-chan/struct";
-import { AdbCommand, calculateChecksum } from "../packet.js";
-import { decodeUtf8, encodeUtf8 } from "../utils/index.js";
-import { AdbSocketController } from "./socket.js";
+import { decodeUtf8, encodeUtf8, unreachable } from "../utils/index.js";
+import { AdbCommand, calculateChecksum } from "./packet.js";
+import { AdbDaemonSocketController } from "./socket.js";
 /**
  * The dispatcher is the "dumb" part of the connection handling logic.
  *
@@ -17,20 +17,20 @@ import { AdbSocketController } from "./socket.js";
 export class AdbPacketDispatcher {
     // ADB socket id starts from 1
     // (0 means open failed)
-    initializers = new AsyncOperationManager(1);
+    #initializers = new AsyncOperationManager(1);
     /**
      * Socket local ID to the socket controller.
      */
-    sockets = new Map();
-    _writer;
+    #sockets = new Map();
+    #writer;
     options;
-    _closed = false;
-    _disconnected = new PromiseResolver();
+    #closed = false;
+    #disconnected = new PromiseResolver();
     get disconnected() {
-        return this._disconnected.promise;
+        return this.#disconnected.promise;
     }
-    _incomingSocketHandlers = new Set();
-    _abortController = new AbortController();
+    #incomingSocketHandlers = new Map();
+    #readAbortController = new AbortController();
     constructor(connection, options) {
         this.options = options;
         connection.readable
@@ -44,8 +44,8 @@ export class AdbPacketDispatcher {
                         await this.handleClose(packet);
                         break;
                     case AdbCommand.Write:
-                        if (this.sockets.has(packet.arg1)) {
-                            await this.sockets
+                        if (this.#sockets.has(packet.arg1)) {
+                            await this.#sockets
                                 .get(packet.arg1)
                                 .enqueue(packet.payload);
                             await this.sendPacket(AdbCommand.OK, packet.arg1, packet.arg0);
@@ -70,24 +70,24 @@ export class AdbPacketDispatcher {
             // it's still possible to create another ADB connection.
             // So don't close `readable` here.
             preventCancel: true,
-            signal: this._abortController.signal,
+            signal: this.#readAbortController.signal,
         })
             .then(() => {
             this.dispose();
         }, (e) => {
-            if (!this._closed) {
-                this._disconnected.reject(e);
+            if (!this.#closed) {
+                this.#disconnected.reject(e);
             }
             this.dispose();
         });
-        this._writer = connection.writable.getWriter();
+        this.#writer = connection.writable.getWriter();
     }
     handleOk(packet) {
-        if (this.initializers.resolve(packet.arg1, packet.arg0)) {
+        if (this.#initializers.resolve(packet.arg1, packet.arg0)) {
             // Device successfully created the socket
             return;
         }
-        const socket = this.sockets.get(packet.arg1);
+        const socket = this.#sockets.get(packet.arg1);
         if (socket) {
             // Device has received last `WRTE` to the socket
             socket.ack();
@@ -100,7 +100,7 @@ export class AdbPacketDispatcher {
     async handleClose(packet) {
         // If the socket is still pending
         if (packet.arg0 === 0 &&
-            this.initializers.reject(packet.arg1, new Error("Socket open failed"))) {
+            this.#initializers.reject(packet.arg1, new Error("Socket open failed"))) {
             // Device failed to create the socket
             // (unknown service string, failed to execute command, etc.)
             // it doesn't break the connection,
@@ -115,72 +115,76 @@ export class AdbPacketDispatcher {
          * CLOSE() operations.
          */
         // Ignore `arg0` and search for the socket
-        const socket = this.sockets.get(packet.arg1);
+        const socket = this.#sockets.get(packet.arg1);
         if (socket) {
             // The device want to close the socket
             if (!socket.closed) {
                 await this.sendPacket(AdbCommand.Close, packet.arg1, packet.arg0);
             }
             await socket.dispose();
-            this.sockets.delete(packet.arg1);
+            this.#sockets.delete(packet.arg1);
             return;
         }
         // TODO: adb: is double closing an socket a catastrophic error?
         // If the client sends two `CLSE` packets for one socket,
         // the device may also respond with two `CLSE` packets.
     }
-    /**
-     * Add a handler for incoming socket.
-     * @param handler A function to call with new incoming sockets. It must return `true` if it accepts the socket.
-     * @returns A function to remove the handler.
-     */
-    onIncomingSocket(handler) {
-        this._incomingSocketHandlers.add(handler);
-        const remove = () => {
-            this._incomingSocketHandlers.delete(handler);
-        };
-        remove.dispose = remove;
-        return remove;
+    addReverseTunnel(service, handler) {
+        this.#incomingSocketHandlers.set(service, handler);
+    }
+    removeReverseTunnel(address) {
+        this.#incomingSocketHandlers.delete(address);
+    }
+    clearReverseTunnels() {
+        this.#incomingSocketHandlers.clear();
     }
     async handleOpen(packet) {
         // `AsyncOperationManager` doesn't support skipping IDs
         // Use `add` + `resolve` to simulate this behavior
-        const [localId] = this.initializers.add();
-        this.initializers.resolve(localId, undefined);
+        const [localId] = this.#initializers.add();
+        this.#initializers.resolve(localId, undefined);
         const remoteId = packet.arg0;
-        const serviceString = decodeUtf8(packet.payload);
-        const controller = new AdbSocketController({
+        let service = decodeUtf8(packet.payload);
+        if (service.endsWith("\0")) {
+            service = service.substring(0, service.length - 1);
+        }
+        const handler = this.#incomingSocketHandlers.get(service);
+        if (!handler) {
+            await this.sendPacket(AdbCommand.Close, 0, remoteId);
+            return;
+        }
+        const controller = new AdbDaemonSocketController({
             dispatcher: this,
             localId,
             remoteId,
             localCreated: false,
-            serviceString,
+            service,
         });
-        for (const handler of this._incomingSocketHandlers) {
-            if (await handler(controller.socket)) {
-                this.sockets.set(localId, controller);
-                await this.sendPacket(AdbCommand.OK, localId, remoteId);
-                return;
-            }
+        try {
+            await handler(controller.socket);
+            this.#sockets.set(localId, controller);
+            await this.sendPacket(AdbCommand.OK, localId, remoteId);
+        }
+        catch (e) {
+            await this.sendPacket(AdbCommand.Close, 0, remoteId);
         }
-        await this.sendPacket(AdbCommand.Close, 0, remoteId);
     }
-    async createSocket(serviceString) {
+    async createSocket(service) {
         if (this.options.appendNullToServiceString) {
-            serviceString += "\0";
+            service += "\0";
         }
-        const [localId, initializer] = this.initializers.add();
-        await this.sendPacket(AdbCommand.Open, localId, 0, serviceString);
+        const [localId, initializer] = this.#initializers.add();
+        await this.sendPacket(AdbCommand.Open, localId, 0, service);
         // Fulfilled by `handleOk`
         const remoteId = await initializer;
-        const controller = new AdbSocketController({
+        const controller = new AdbDaemonSocketController({
             dispatcher: this,
             localId,
             remoteId,
             localCreated: true,
-            serviceString,
+            service,
         });
-        this.sockets.set(localId, controller);
+        this.#sockets.set(localId, controller);
         return controller.socket;
     }
     async sendPacket(command, arg0, arg1, payload = EMPTY_UINT8_ARRAY) {
@@ -190,7 +194,7 @@ export class AdbPacketDispatcher {
         if (payload.byteLength > this.options.maxPayloadSize) {
             throw new Error("payload too large");
         }
-        await ConsumableWritableStream.write(this._writer, {
+        await ConsumableWritableStream.write(this.#writer, {
             command,
             arg0,
             arg1,
@@ -203,22 +207,20 @@ export class AdbPacketDispatcher {
     }
     async close() {
         // Send `CLSE` packets for all sockets
-        await Promise.all(Array.from(this.sockets.values(), (socket) => socket.close()));
+        await Promise.all(Array.from(this.#sockets.values(), (socket) => socket.close()));
         // Stop receiving
         // It's possible that we haven't received all `CLSE` confirm packets,
         // but it doesn't matter, the next connection can cope with them.
-        this._closed = true;
-        this._abortController.abort();
-        this._writer.releaseLock();
+        this.#closed = true;
+        this.#readAbortController.abort();
+        this.#writer.releaseLock();
         // `pipe().then()` will call `dispose`
     }
     dispose() {
-        for (const socket of this.sockets.values()) {
-            socket.dispose().catch((e) => {
-                void e;
-            });
+        for (const socket of this.#sockets.values()) {
+            socket.dispose().catch(unreachable);
         }
-        this._disconnected.resolve();
+        this.#disconnected.resolve();
     }
 }
 //# sourceMappingURL=dispatcher.js.map

package/esm/daemon/dispatcher.js.map

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

package/esm/daemon/index.d.ts

@@ -0,0 +1,8 @@
+export * from "./auth.js";
+export * from "./crypto.js";
+export * from "./device.js";
+export * from "./dispatcher.js";
+export * from "./packet.js";
+export * from "./socket.js";
+export * from "./transport.js";
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/daemon/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC"}

package/esm/daemon/index.js

@@ -0,0 +1,8 @@
+export * from "./auth.js";
+export * from "./crypto.js";
+export * from "./device.js";
+export * from "./dispatcher.js";
+export * from "./packet.js";
+export * from "./socket.js";
+export * from "./transport.js";
+//# sourceMappingURL=index.js.map

package/esm/daemon/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/daemon/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC"}

package/esm/{packet.d.ts → daemon/packet.d.ts}

@@ -30,11 +30,11 @@ export type AdbPacket = (typeof AdbPacket)["TDeserializeResult"];
 /**
  * `AdbPacketData` contains all the useful fields of `AdbPacket`.
  *
- * `AdbBackend#connect` will return a `ReadableStream<AdbPacketData>`,
- * so each backend can encode `AdbPacket` in different ways.
+ * `AdvDaemonConnection#connect` will return a `ReadableStream<AdbPacketData>`,
+ * allow each connection to encode `AdbPacket` in different methods.
  *
- * `AdbBackend#connect` will return a `WritableStream<AdbPacketInit>`,
- * however, `AdbPacketDispatcher` will transform `AdbPacketData` to `AdbPacketInit` for you,
+ * `AdbDaemonConnection#connect` will return a `WritableStream<AdbPacketInit>`,
+ * however, `AdbDaemonTransport` will transform `AdbPacketData` to `AdbPacketInit` for you,
  * so `AdbSocket#writable#write` only needs `AdbPacketData`.
  */
 export type AdbPacketData = Omit<(typeof AdbPacket)["TInit"], "checksum" | "magic">;

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

@@ -0,0 +1 @@
+{"version":3,"file":"packet.d.ts","sourceRoot":"","sources":["../../src/daemon/packet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,MAAM,MAAM,mBAAmB,CAAC;AAEvC,oBAAY,UAAU;IAClB,IAAI,aAAa;IACjB,KAAK,aAAa;IAClB,OAAO,aAAa;IACpB,EAAE,aAAa;IACf,IAAI,aAAa;IACjB,KAAK,aAAa;CACrB;AAED,eAAO,MAAM,eAAe;;;;;;;0CAMT,CAAC;AAEpB,MAAM,MAAM,eAAe,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,oBAAoB,CAAC,CAAC;AAI7E,eAAO,MAAM,SAAS;;;;;;;;oDAEsC,CAAC;AAE7D,MAAM,MAAM,SAAS,GAAG,CAAC,OAAO,SAAS,CAAC,CAAC,oBAAoB,CAAC,CAAC;AAEjE;;;;;;;;;GASG;AACH,MAAM,MAAM,aAAa,GAAG,IAAI,CAC5B,CAAC,OAAO,SAAS,CAAC,CAAC,OAAO,CAAC,EAC3B,UAAU,GAAG,OAAO,CACvB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC;AAExD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,UAAU,GAAG,MAAM,CAE7D;AAED,qBAAa,wBAAyB,SAAQ,yBAAyB,CACnE,aAAa,EACb,UAAU,CACb;;CAoBA"}

package/esm/{packet.js → daemon/packet.js}

@@ -17,7 +17,7 @@ export const AdbPacketHeader = new Struct({ littleEndian: true })
     .uint32("checksum")
     .int32("magic");
 export const AdbPacket = new Struct({ littleEndian: true })
-    .fields(AdbPacketHeader)
+    .concat(AdbPacketHeader)
     .uint8Array("payload", { lengthField: "payloadLength" });
 export function calculateChecksum(payload) {
     return payload.reduce((result, item) => result + item, 0);

package/esm/daemon/packet.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"packet.js","sourceRoot":"","sources":["../../src/daemon/packet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,MAAM,MAAM,mBAAmB,CAAC;AAEvC,MAAM,CAAN,IAAY,UAOX;AAPD,WAAY,UAAU;IAClB,oDAAiB,CAAA;IACjB,sDAAkB,CAAA;IAClB,0DAAoB,CAAA;IACpB,gDAAe,CAAA;IACf,oDAAiB,CAAA;IACjB,sDAAkB,CAAA;AACtB,CAAC,EAPW,UAAU,GAAV,UAAU,KAAV,UAAU,QAOrB;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,MAAM,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;KAC5D,MAAM,CAAC,SAAS,CAAC;KACjB,MAAM,CAAC,MAAM,CAAC;KACd,MAAM,CAAC,MAAM,CAAC;KACd,MAAM,CAAC,eAAe,CAAC;KACvB,MAAM,CAAC,UAAU,CAAC;KAClB,KAAK,CAAC,OAAO,CAAC,CAAC;AAMpB,MAAM,CAAC,MAAM,SAAS,GAAG,IAAI,MAAM,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;KACtD,MAAM,CAAC,eAAe,CAAC;KACvB,UAAU,CAAC,SAAS,EAAE,EAAE,WAAW,EAAE,eAAe,EAAE,CAAC,CAAC;AAqB7D,MAAM,UAAU,iBAAiB,CAAC,OAAmB;IACjD,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,MAAM,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC;AAC9D,CAAC;AAED,MAAM,OAAO,wBAAyB,SAAQ,yBAG7C;IACG;QACI,MAAM,YAAY,GAAG,IAAI,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAC1D,KAAK,CAAC;YACF,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;gBACnC,MAAM,IAAI,GAAG,KAA4C,CAAC;gBAC1D,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;gBAE7C,eAAe,CAAC,SAAS,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;gBAC9C,MAAM,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;gBAEvC,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;oBACzB,4CAA4C;oBAC5C,0DAA0D;oBAC1D,oDAAoD;oBACpD,MAAM,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;iBAC1C;YACL,CAAC;SACJ,CAAC,CAAC;IACP,CAAC;CACJ"}

package/esm/{socket → daemon}/socket.d.ts

@@ -1,29 +1,26 @@
 import type { Disposable } from "@yume-chan/event";
 import type { Consumable, ReadableStream, ReadableWritablePair, WritableStream } from "@yume-chan/stream-extra";
-import type { AdbPacketDispatcher, Closeable } from "./dispatcher.js";
-export interface AdbSocketInfo {
+import type { Closeable } from "../adb.js";
+import type { AdbPacketDispatcher } from "./dispatcher.js";
+export interface AdbDaemonSocketInfo {
     localId: number;
     remoteId: number;
     localCreated: boolean;
-    serviceString: string;
+    service: string;
 }
-export interface AdbSocketConstructionOptions extends AdbSocketInfo {
+export interface AdbDaemonSocketConstructionOptions extends AdbDaemonSocketInfo {
     dispatcher: AdbPacketDispatcher;
     highWaterMark?: number | undefined;
 }
-export declare class AdbSocketController implements AdbSocketInfo, ReadableWritablePair<Uint8Array, Consumable<Uint8Array>>, Closeable, Disposable {
+export declare class AdbDaemonSocketController implements AdbDaemonSocketInfo, ReadableWritablePair<Uint8Array, Consumable<Uint8Array>>, Closeable, Disposable {
+    #private;
     private readonly dispatcher;
     readonly localId: number;
     readonly remoteId: number;
     readonly localCreated: boolean;
-    readonly serviceString: string;
-    private _duplex;
-    private _readable;
-    private _readableController;
+    readonly service: string;
     get readable(): ReadableStream<Uint8Array>;
-    private _writePromise;
     readonly writable: WritableStream<Consumable<Uint8Array>>;
-    private _closed;
     /**
      * Whether the socket is half-closed (i.e. the local side initiated the close).
      *
@@ -31,8 +28,8 @@ export declare class AdbSocketController implements AdbSocketInfo, ReadableWrita
      */
     get closed(): boolean;
     private _socket;
-    get socket(): AdbSocket;
-    constructor(options: AdbSocketConstructionOptions);
+    get socket(): AdbDaemonSocket;
+    constructor(options: AdbDaemonSocketConstructionOptions);
     enqueue(data: Uint8Array): Promise<void>;
     ack(): void;
     close(): Promise<void>;
@@ -46,15 +43,16 @@ export declare class AdbSocketController implements AdbSocketInfo, ReadableWrita
  * `socket.writable.abort()`, `socket.writable.getWriter().abort()`,
  * `socket.writable.close()` or `socket.writable.getWriter().close()`.
  */
-export declare class AdbSocket implements AdbSocketInfo, ReadableWritablePair<Uint8Array, Consumable<Uint8Array>> {
-    private _controller;
+export declare class AdbDaemonSocket implements AdbDaemonSocketInfo, ReadableWritablePair<Uint8Array, Consumable<Uint8Array>> {
+    #private;
     get localId(): number;
     get remoteId(): number;
     get localCreated(): boolean;
-    get serviceString(): string;
+    get service(): string;
     get readable(): ReadableStream<Uint8Array>;
     get writable(): WritableStream<Consumable<Uint8Array>>;
-    constructor(controller: AdbSocketController);
+    get closed(): boolean;
+    constructor(controller: AdbDaemonSocketController);
     close(): Promise<void>;
 }
 //# sourceMappingURL=socket.d.ts.map

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

@@ -0,0 +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,EACR,UAAU,EAEV,cAAc,EACd,oBAAoB,EACpB,cAAc,EACjB,MAAM,yBAAyB,CAAC;AASjC,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,kCACb,SAAQ,mBAAmB;IAC3B,UAAU,EAAE,mBAAmB,CAAC;IAEhC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACtC;AAED,qBAAa,yBACT,YACI,mBAAmB,EACnB,oBAAoB,CAAC,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC,EACxD,SAAS,EACT,UAAU;;IAEd,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAuB;IAElD,SAAgB,OAAO,EAAG,MAAM,CAAC;IACjC,SAAgB,QAAQ,EAAG,MAAM,CAAC;IAClC,SAAgB,YAAY,EAAG,OAAO,CAAC;IACvC,SAAgB,OAAO,EAAG,MAAM,CAAC;IAMjC,IAAW,QAAQ,+BAElB;IAGD,SAAgB,QAAQ,EAAE,cAAc,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;IAGjE;;;;OAIG;IACH,IAAW,MAAM,YAEhB;IAED,OAAO,CAAC,OAAO,CAAkB;IACjC,IAAW,MAAM,oBAEhB;gBAEkB,OAAO,EAAE,kCAAkC;IAiEjD,OAAO,CAAC,IAAI,EAAE,UAAU;IAU9B,GAAG;IAIG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B,OAAO;CAGjB;AAED;;;;;;;GAOG;AACH,qBAAa,eACT,YACI,mBAAmB,EACnB,oBAAoB,CAAC,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,CAAC;;IAI5D,IAAW,OAAO,IAAI,MAAM,CAE3B;IACD,IAAW,QAAQ,IAAI,MAAM,CAE5B;IACD,IAAW,YAAY,IAAI,OAAO,CAEjC;IACD,IAAW,OAAO,IAAI,MAAM,CAE3B;IAED,IAAW,QAAQ,IAAI,cAAc,CAAC,UAAU,CAAC,CAEhD;IACD,IAAW,QAAQ,IAAI,cAAc,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAE5D;IAED,IAAW,MAAM,IAAI,OAAO,CAE3B;gBAEkB,UAAU,EAAE,yBAAyB;IAIjD,KAAK;CAGf"}