@yume-chan/adb 2.6.0 → 3.0.0-beta.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2025 Simon Chan
+Copyright (c) 2020-2026 Simon Chan
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -37,7 +37,7 @@ Check the latest documentation at https://tangoadb.dev/
 
 ## Sponsors
 
-[Become a backer](https://opencollective.com/ya-webadb) and get your image on our README on Github with a link to your site.
+[Become a backer](https://opencollective.com/ya-webadb) and get your image on our README on GitHub with a link to your site.
 
 <a href="https://opencollective.com/ya-webadb/backer/0/website?requireActive=false" target="_blank"><img src="https://opencollective.com/ya-webadb/backer/0/avatar.svg?requireActive=false"></a>
 <a href="https://opencollective.com/ya-webadb/backer/1/website?requireActive=false" target="_blank"><img src="https://opencollective.com/ya-webadb/backer/1/avatar.svg?requireActive=false"></a>

package/esm/adb.d.ts

@@ -1,28 +1,20 @@
 import type { MaybePromiseLike } from "@yume-chan/async";
 import type { MaybeConsumable, ReadableWritablePair } from "@yume-chan/stream-extra";
 import type { AdbBanner } from "./banner.js";
-import type { AdbFrameBuffer } from "./commands/index.js";
-import { AdbPower, AdbReverseService, AdbSubprocessService, AdbSync, AdbTcpIpService } from "./commands/index.js";
 import type { AdbFeature } from "./features.js";
+import type { AdbFrameBuffer } from "./service/index.js";
+import { AdbPowerService, AdbReverseService, AdbSubprocessService, AdbSync, AdbTcpIpService } from "./service/index.js";
 export interface Closeable {
     close(): MaybePromiseLike<void>;
 }
-/**
- * Represents an ADB socket.
- */
-export interface AdbSocket extends ReadableWritablePair<Uint8Array, MaybeConsumable<Uint8Array>>, Closeable {
-    get service(): string;
-    get closed(): Promise<undefined>;
-}
-export type AdbIncomingSocketHandler = (socket: AdbSocket) => MaybePromiseLike<void>;
 export interface AdbTransport extends Closeable {
     readonly serial: string;
     readonly maxPayloadSize: number;
     readonly banner: AdbBanner;
     readonly disconnected: Promise<void>;
     readonly clientFeatures: readonly AdbFeature[];
-    connect(service: string): MaybePromiseLike<AdbSocket>;
-    addReverseTunnel(handler: AdbIncomingSocketHandler, address?: string): MaybePromiseLike<string>;
+    connect(service: string): MaybePromiseLike<Adb.Socket>;
+    addReverseTunnel(handler: Adb.IncomingSocketHandler, address?: string): MaybePromiseLike<string>;
     removeReverseTunnel(address: string): MaybePromiseLike<void>;
     clearReverseTunnels(): MaybePromiseLike<void>;
 }
@@ -36,23 +28,34 @@ export declare class Adb implements Closeable {
     get clientFeatures(): readonly AdbFeature[];
     get deviceFeatures(): readonly AdbFeature[];
     readonly subprocess: AdbSubprocessService;
-    readonly power: AdbPower;
+    readonly power: AdbPowerService;
     readonly reverse: AdbReverseService;
     readonly tcpip: AdbTcpIpService;
+    readonly sync: AdbSync.Service;
     constructor(transport: AdbTransport);
     canUseFeature(feature: AdbFeature): boolean;
     /**
      * Creates a new ADB Socket to the specified service or socket address.
      */
-    createSocket(service: string): Promise<AdbSocket>;
+    createSocket(service: string): Promise<Adb.Socket>;
     createSocketAndWait(service: string): Promise<string>;
     getProp(key: string): Promise<string>;
     rm(filenames: string | readonly string[], options?: {
         recursive?: boolean;
         force?: boolean;
     }): Promise<string>;
-    sync(): Promise<AdbSync>;
     framebuffer(): Promise<AdbFrameBuffer>;
+    [Symbol.asyncDispose](): Promise<void>;
     close(): Promise<void>;
 }
+export declare namespace Adb {
+    /**
+     * Represents an ADB socket.
+     */
+    interface Socket extends ReadableWritablePair<Uint8Array, MaybeConsumable<Uint8Array>>, Closeable {
+        get service(): string;
+        get closed(): Promise<undefined>;
+    }
+    type IncomingSocketHandler = (socket: Socket) => MaybePromiseLike<void>;
+}
 //# sourceMappingURL=adb.d.ts.map

package/esm/adb.d.ts.map

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

package/esm/adb.js

@@ -1,5 +1,5 @@
 import { ConcatStringStream, TextDecoderStream } from "@yume-chan/stream-extra";
-import { AdbPower, AdbReverseService, AdbSubprocessService, AdbSync, AdbTcpIpService, escapeArg, framebuffer, } from "./commands/index.js";
+import { AdbPowerService, AdbReverseService, AdbSubprocessService, AdbSync, AdbTcpIpService, escapeArg, framebuffer, } from "./service/index.js";
 export class Adb {
     #transport;
     get transport() {
@@ -27,12 +27,14 @@ export class Adb {
     power;
     reverse;
     tcpip;
+    sync;
     constructor(transport) {
         this.#transport = transport;
         this.subprocess = new AdbSubprocessService(this);
-        this.power = new AdbPower(this);
+        this.power = new AdbPowerService(this);
         this.reverse = new AdbReverseService(this);
         this.tcpip = new AdbTcpIpService(this);
+        this.sync = new AdbSync.Service(this);
     }
     canUseFeature(feature) {
         return (this.clientFeatures.includes(feature) &&
@@ -50,10 +52,12 @@ export class Adb {
             .pipeThrough(new TextDecoderStream())
             .pipeThrough(new ConcatStringStream());
     }
-    getProp(key) {
-        return this.subprocess.noneProtocol
-            .spawnWaitText(["getprop", key])
-            .then((output) => output.trim());
+    async getProp(key) {
+        const output = await this.subprocess.noneProtocol
+            .spawn(["getprop", key])
+            .wait()
+            .toString();
+        return output.trim();
     }
     rm(filenames, options) {
         const args = ["rm"];
@@ -75,15 +79,18 @@ export class Adb {
         }
         // https://android.googlesource.com/platform/packages/modules/adb/+/1a0fb8846d4e6b671c8aa7f137a8c21d7b248716/client/adb_install.cpp#984
         args.push("</dev/null");
-        return this.subprocess.noneProtocol.spawnWaitText(args);
-    }
-    async sync() {
-        const socket = await this.createSocket("sync:");
-        return new AdbSync(this, socket);
+        return this.subprocess.noneProtocol
+            .spawn(args)
+            .wait()
+            .toString()
+            .then((output) => output.trim());
     }
     async framebuffer() {
         return framebuffer(this);
     }
+    [Symbol.asyncDispose]() {
+        return this.close();
+    }
     async close() {
         await this.#transport.close();
     }

package/esm/adb.js.map

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

package/esm/banner.d.ts

@@ -10,7 +10,7 @@ export type AdbBannerKey = (typeof AdbBannerKey)[keyof typeof AdbBannerKey];
 export declare class AdbBanner {
     #private;
     static parse(banner: string): AdbBanner;
-    get state(): AdbServerClient.ConnectionState | undefined;
+    get state(): "offline" | "bootloader" | "device" | "host" | "recovery" | "rescue" | "sideload" | "unauthorized" | "authorizing" | "detached" | undefined;
     get product(): string | undefined;
     get model(): string | undefined;
     get device(): string | undefined;

package/esm/banner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"banner.d.ts","sourceRoot":"","sources":["../src/banner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAE1D,eAAO,MAAM,YAAY;;;;;CAKf,CAAC;AAEX,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,OAAO,YAAY,CAAC,CAAC;AAE5E,qBAAa,SAAS;;IAClB,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM;IA8C3B,IAAI,KAAK,gDAER;IAGD,IAAI,OAAO,uBAEV;IAGD,IAAI,KAAK,uBAER;IAGD,IAAI,MAAM,uBAET;IAGD,IAAI,QAAQ,0BAEX;gBAIG,KAAK,EAAE,eAAe,CAAC,eAAe,GAAG,SAAS,EAClD,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,QAAQ,EAAE,SAAS,UAAU,EAAE;CAQtC"}
+{"version":3,"file":"banner.d.ts","sourceRoot":"","sources":["../src/banner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAE1D,eAAO,MAAM,YAAY;;;;;CAKf,CAAC;AAEX,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,OAAO,YAAY,CAAC,CAAC;AAE5E,qBAAa,SAAS;;IAClB,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM;IA8C3B,IAAI,KAAK,gJAER;IAGD,IAAI,OAAO,uBAEV;IAGD,IAAI,KAAK,uBAER;IAGD,IAAI,MAAM,uBAET;IAGD,IAAI,QAAQ,0BAEX;gBAIG,KAAK,EAAE,eAAe,CAAC,eAAe,GAAG,SAAS,EAClD,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,QAAQ,EAAE,SAAS,UAAU,EAAE;CAQtC"}

package/esm/daemon/auth/authenticator.d.ts

@@ -0,0 +1,28 @@
+import type { MaybePromiseLike } from "@yume-chan/async";
+import type { AdbPacketData } from "../packet.js";
+import type { AdbDaemonTransportInit } from "../transport.js";
+import { AdbDaemonTransport } from "../transport.js";
+import type { AdbDaemonDefaultAuthProcessorInit } from "./packet-processor.js";
+export interface AdbDaemonAuthProcessor {
+    process(packet: AdbPacketData): Promise<AdbPacketData>;
+    close?(): MaybePromiseLike<undefined>;
+}
+export type AdbDaemonAuthenticateOptions = Pick<AdbDaemonTransportInit, "serial" | "connection" | "features" | "preserveConnection" | "readTimeLimit"> & {
+    /**
+     * The number of bytes the device can send before receiving an ack packet.
+     *
+     * Android 14 added the Delayed Acknowledgement feature to improve performance,
+     * especially for high-latency connections like ADB over Wi-Fi.
+     *
+     * Unlike {@linkcode AdbDaemonTransportInit.initialDelayedAckBytes},
+     * setting this parameter to 0 or a negative number will disable Delayed Ack.
+     */
+    initialDelayedAckBytes?: number | undefined;
+} & (AdbDaemonDefaultAuthProcessorInit | {
+    processor: AdbDaemonAuthProcessor;
+});
+/**
+ * Authenticates an `AdbDaemonConnection` using an `AdbDaemonAuthProcessor`.
+ */
+export declare function adbDaemonAuthenticate({ serial, connection, features, initialDelayedAckBytes, preserveConnection, readTimeLimit, ...processorInit }: AdbDaemonAuthenticateOptions): Promise<AdbDaemonTransport>;
+//# sourceMappingURL=authenticator.d.ts.map

package/esm/daemon/auth/authenticator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"authenticator.d.ts","sourceRoot":"","sources":["../../../src/daemon/auth/authenticator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAWzD,OAAO,KAAK,EAAE,aAAa,EAAiB,MAAM,cAAc,CAAC;AAEjE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAEH,kBAAkB,EACrB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,uBAAuB,CAAC;AAG/E,MAAM,WAAW,sBAAsB;IACnC,OAAO,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAEvD,KAAK,CAAC,IAAI,gBAAgB,CAAC,SAAS,CAAC,CAAC;CACzC;AAED,MAAM,MAAM,4BAA4B,GAAG,IAAI,CAC3C,sBAAsB,EACpB,QAAQ,GACR,YAAY,GACZ,UAAU,GACV,oBAAoB,GACpB,eAAe,CACpB,GAAG;IACA;;;;;;;;OAQG;IACH,sBAAsB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC/C,GAAG,CAAC,iCAAiC,GAAG;IAAE,SAAS,EAAE,sBAAsB,CAAA;CAAE,CAAC,CAAC;AAkBhF;;GAEG;AACH,wBAAsB,qBAAqB,CAAC,EACxC,MAAM,EACN,UAAU,EACV,QAA4B,EAC5B,sBAAgE,EAChE,kBAAkB,EAClB,aAAa,EACb,GAAG,aAAa,EACnB,EAAE,4BAA4B,+BA8G9B"}

package/esm/daemon/auth/authenticator.js

@@ -0,0 +1,108 @@
+import { PromiseResolver } from "@yume-chan/async";
+import { AbortController, Consumable, WritableStream, } from "@yume-chan/stream-extra";
+import { decodeUtf8, encodeUtf8 } from "@yume-chan/struct";
+import { AdbDeviceFeatures, AdbFeature } from "../../features.js";
+import { AdbCommand, calculateChecksum } from "../packet.js";
+import { ADB_DAEMON_DEFAULT_INITIAL_PAYLOAD_SIZE, AdbDaemonTransport, } from "../transport.js";
+import { AdbDaemonDefaultAuthProcessor } from "./packet-processor.js";
+/**
+ * Send a packet during authentication stage
+ * @param writer Writer to send packet to
+ * @param packet The packet to send. Note: this object will be modified.
+ */
+function sendPacket(writer, packet) {
+    // Always send checksum in auth steps
+    // Because we don't know if the device needs it or not.
+    packet.checksum = calculateChecksum(packet.payload);
+    packet.magic = packet.command ^ 0xffffffff;
+    return Consumable.WritableStream.write(writer, packet);
+}
+/**
+ * Authenticates an `AdbDaemonConnection` using an `AdbDaemonAuthProcessor`.
+ */
+export async function adbDaemonAuthenticate({ serial, connection, features = AdbDeviceFeatures, initialDelayedAckBytes = ADB_DAEMON_DEFAULT_INITIAL_PAYLOAD_SIZE, preserveConnection, readTimeLimit, ...processorInit }) {
+    const processor = "processor" in processorInit
+        ? processorInit.processor
+        : new AdbDaemonDefaultAuthProcessor(processorInit);
+    // Initially, set to highest-supported version and payload size.
+    let version = 0x01000001;
+    // Android 4: 4K, Android 7: 256K, Android 9: 1M
+    let maxPayloadSize = 1024 * 1024;
+    const resolver = new PromiseResolver();
+    const abortController = new AbortController();
+    const writer = connection.writable.getWriter();
+    const pipe = connection.readable
+        .pipeTo(new WritableStream({
+        write: async (packet) => {
+            // Here is similar to `AdbPacketDispatcher`,
+            // But the received packet types and send packet processing are different.
+            switch (packet.command) {
+                case AdbCommand.Connect:
+                    version = Math.min(version, packet.arg0);
+                    maxPayloadSize = Math.min(maxPayloadSize, packet.arg1);
+                    resolver.resolve(decodeUtf8(packet.payload));
+                    break;
+                case AdbCommand.Auth: {
+                    await sendPacket(writer, await processor.process(packet));
+                    break;
+                }
+                default:
+                    // Maybe the previous ADB client exited without reading all packets,
+                    // so they are still waiting in OS internal buffer.
+                    // Just ignore them.
+                    // Because a `Connect` packet will reset the device,
+                    // Eventually there will be `Connect` and `Auth` response packets.
+                    break;
+            }
+        },
+    }), {
+        // Don't cancel the source ReadableStream on AbortSignal abort.
+        preventCancel: true,
+        signal: abortController.signal,
+    })
+        .then(async () => {
+        await processor.close?.();
+        // If `resolver` is already settled, call `reject` won't do anything.
+        resolver.reject(new Error("Connection closed unexpectedly"));
+    }, async (e) => {
+        await processor.close?.();
+        resolver.reject(e);
+    });
+    if (initialDelayedAckBytes <= 0) {
+        // Disable delayed ack by not sending this feature to the device
+        features = features.filter((feature) => feature !== AdbFeature.DelayedAck);
+        initialDelayedAckBytes = 0;
+    }
+    let banner;
+    try {
+        await sendPacket(writer, {
+            command: AdbCommand.Connect,
+            arg0: version,
+            arg1: maxPayloadSize,
+            // The terminating `;` is required in formal definition
+            // But ADB daemon (all versions) can still work without it
+            payload: encodeUtf8(`host::features=${features.join(",")}`),
+        });
+        banner = await resolver.promise;
+    }
+    finally {
+        // When failed, release locks on `connection` so the caller can try again.
+        // When success, also release locks so `AdbPacketDispatcher` can use them.
+        abortController.abort();
+        writer.releaseLock();
+        // Wait until pipe stops (`ReadableStream` lock released)
+        await pipe;
+    }
+    return new AdbDaemonTransport({
+        serial,
+        connection,
+        version,
+        maxPayloadSize,
+        banner,
+        features,
+        initialDelayedAckBytes,
+        preserveConnection,
+        readTimeLimit,
+    });
+}
+//# sourceMappingURL=authenticator.js.map

package/esm/daemon/auth/authenticator.js.map

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

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

@@ -0,0 +1,5 @@
+export * from "./authenticator.js";
+export * from "./packet-processor.js";
+export * from "./public-key.js";
+export * from "./type.js";
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/daemon/auth/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC"}

package/esm/daemon/auth/index.js

@@ -0,0 +1,5 @@
+export * from "./authenticator.js";
+export * from "./packet-processor.js";
+export * from "./public-key.js";
+export * from "./type.js";
+//# sourceMappingURL=index.js.map

package/esm/daemon/auth/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/daemon/auth/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC"}

package/esm/daemon/auth/packet-processor.d.ts

@@ -0,0 +1,42 @@
+import type { MaybePromiseLike } from "@yume-chan/async";
+import type { AdbPacketData } from "../packet.js";
+import type { AdbDaemonAuthProcessor } from "./authenticator.js";
+import type { AdbPrivateKey } from "./type.js";
+export type MaybeError<T> = T | Error;
+export type AdbKeyIterable = Iterable<MaybeError<AdbPrivateKey>> | AsyncIterable<MaybeError<AdbPrivateKey>>;
+export interface AdbCredentialManager {
+    /**
+     * Generates and stores a RSA private key with modulus length `2048` and public exponent `65537`.
+     */
+    generateKey(): MaybePromiseLike<AdbPrivateKey>;
+    /**
+     * Synchronously or asynchronously iterates through all stored RSA private keys.
+     *
+     * Each call to `iterateKeys` must return a different iterator that iterate through all stored keys.
+     */
+    iterateKeys(): AdbKeyIterable;
+}
+export interface AdbKeyInfo {
+    fingerprint: string;
+    name: string | undefined;
+}
+export declare const AdbDaemonAuthType: {
+    readonly Token: 1;
+    readonly Signature: 2;
+    readonly PublicKey: 3;
+};
+export type AdbDaemonAuthType = (typeof AdbDaemonAuthType)[keyof typeof AdbDaemonAuthType];
+export interface AdbDaemonDefaultAuthProcessorInit {
+    credentialManager: AdbCredentialManager;
+    onKeyLoadError?: ((error: Error) => void) | undefined;
+    onSignatureAuthentication?: ((key: AdbKeyInfo) => void) | undefined;
+    onSignatureRejected?: ((key: AdbKeyInfo) => void) | undefined;
+    onPublicKeyAuthentication?: ((key: AdbKeyInfo) => void) | undefined;
+}
+export declare class AdbDaemonDefaultAuthProcessor implements AdbDaemonAuthProcessor {
+    #private;
+    constructor(init: AdbDaemonDefaultAuthProcessorInit);
+    process(packet: AdbPacketData): Promise<AdbPacketData>;
+    close(): Promise<undefined>;
+}
+//# sourceMappingURL=packet-processor.d.ts.map

package/esm/daemon/auth/packet-processor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"packet-processor.d.ts","sourceRoot":"","sources":["../../../src/daemon/auth/packet-processor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAQzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAGlD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAMjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE/C,MAAM,MAAM,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;AAEtC,MAAM,MAAM,cAAc,GACpB,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,GACnC,aAAa,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC;AAE/C,MAAM,WAAW,oBAAoB;IACjC;;OAEG;IACH,WAAW,IAAI,gBAAgB,CAAC,aAAa,CAAC,CAAC;IAE/C;;;;OAIG;IACH,WAAW,IAAI,cAAc,CAAC;CACjC;AAED,MAAM,WAAW,UAAU;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;CAC5B;AAED,eAAO,MAAM,iBAAiB;;;;CAIpB,CAAC;AAEX,MAAM,MAAM,iBAAiB,GACzB,CAAC,OAAO,iBAAiB,CAAC,CAAC,MAAM,OAAO,iBAAiB,CAAC,CAAC;AAE/D,MAAM,WAAW,iCAAiC;IAC9C,iBAAiB,EAAE,oBAAoB,CAAC;IACxC,cAAc,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IACtD,yBAAyB,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,UAAU,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IACpE,mBAAmB,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,UAAU,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IAC9D,yBAAyB,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,UAAU,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;CACvE;AAED,qBAAa,6BAA8B,YAAW,sBAAsB;;gBAe5D,IAAI,EAAE,iCAAiC;IAyE7C,OAAO,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAwDtD,KAAK,IAAI,OAAO,CAAC,SAAS,CAAC;CAMpC"}

package/esm/daemon/auth/packet-processor.js

@@ -0,0 +1,129 @@
+import { EmptyUint8Array, encodeUtf8 } from "@yume-chan/struct";
+import { calculateBase64EncodedLength, encodeBase64, } from "../../utils/base64.js";
+import { rsaSign } from "../crypto.js";
+import { AdbCommand } from "../packet.js";
+import { adbGeneratePublicKey, adbGetPublicKeyFingerprint, adbGetPublicKeySize, } from "./public-key.js";
+export const AdbDaemonAuthType = {
+    Token: 1,
+    Signature: 2,
+    PublicKey: 3,
+};
+export class AdbDaemonDefaultAuthProcessor {
+    #credentialManager;
+    #onKeyLoadError;
+    #onSignatureAuthentication;
+    #onSignatureRejected;
+    #onPublicKeyAuthentication;
+    #iterator;
+    #prevKeyInfo;
+    #firstKey;
+    constructor(init) {
+        this.#credentialManager = init.credentialManager;
+        this.#onKeyLoadError = init.onKeyLoadError;
+        this.#onSignatureAuthentication = init.onSignatureAuthentication;
+        this.#onSignatureRejected = init.onSignatureRejected;
+        this.#onPublicKeyAuthentication = init.onPublicKeyAuthentication;
+    }
+    /**
+     * Gets the next available private key.
+     * @returns The next available private key, or `undefined` if no more key is available
+     */
+    async #getNextKey() {
+        if (!this.#iterator) {
+            const iterable = this.#credentialManager.iterateKeys();
+            if (Symbol.iterator in iterable) {
+                this.#iterator = iterable[Symbol.iterator]();
+            }
+            else if (Symbol.asyncIterator in iterable) {
+                this.#iterator = iterable[Symbol.asyncIterator]();
+            }
+            else {
+                throw new Error("`iterateKeys` doesn't return an iterator");
+            }
+        }
+        while (true) {
+            const { done, value } = await this.#iterator.next();
+            if (done) {
+                return undefined;
+            }
+            if (value instanceof Error) {
+                // Report the error, then continue calling `next`
+                this.#onKeyLoadError?.(value);
+                continue;
+            }
+            return value;
+        }
+    }
+    /**
+     * Tries to sign the challenge using the next private key.
+     *
+     * @param challenge The data to sign
+     * @returns An `AdbPacket` containing the response, or `undefined` if no key is available
+     */
+    async #sign(challenge) {
+        const key = await this.#getNextKey();
+        if (!key) {
+            return undefined;
+        }
+        if (!this.#firstKey) {
+            this.#firstKey = key;
+        }
+        // A new challenge implies the previous signature was rejected.
+        if (this.#prevKeyInfo) {
+            this.#onSignatureRejected?.(this.#prevKeyInfo);
+        }
+        const fingerprint = adbGetPublicKeyFingerprint(key);
+        this.#prevKeyInfo = { fingerprint, name: key.name };
+        this.#onSignatureAuthentication?.(this.#prevKeyInfo);
+        return {
+            command: AdbCommand.Auth,
+            arg0: AdbDaemonAuthType.Signature,
+            arg1: 0,
+            payload: rsaSign(key, challenge),
+        };
+    }
+    async process(packet) {
+        if (packet.arg0 !== AdbDaemonAuthType.Token) {
+            throw new Error("Unsupported authentication packet");
+        }
+        const signature = await this.#sign(packet.payload);
+        if (signature) {
+            return signature;
+        }
+        let key = this.#firstKey;
+        if (!key) {
+            key = await this.#credentialManager.generateKey();
+        }
+        const publicKeyLength = adbGetPublicKeySize();
+        const [publicKeyBase64Length] = calculateBase64EncodedLength(publicKeyLength);
+        const nameBuffer = key.name?.length
+            ? encodeUtf8(key.name)
+            : EmptyUint8Array;
+        const publicKeyBuffer = new Uint8Array(publicKeyBase64Length +
+            (nameBuffer.length ? nameBuffer.length + 1 : 0) + // Space character + name
+            1);
+        adbGeneratePublicKey(key, publicKeyBuffer);
+        const fingerprint = adbGetPublicKeyFingerprint(publicKeyBuffer.subarray(0, publicKeyLength));
+        encodeBase64(publicKeyBuffer.subarray(0, publicKeyLength), publicKeyBuffer);
+        if (nameBuffer.length) {
+            publicKeyBuffer[publicKeyBase64Length] = 0x20;
+            publicKeyBuffer.set(nameBuffer, publicKeyBase64Length + 1);
+        }
+        this.#onPublicKeyAuthentication?.({
+            fingerprint,
+            name: key.name,
+        });
+        return {
+            command: AdbCommand.Auth,
+            arg0: AdbDaemonAuthType.PublicKey,
+            arg1: 0,
+            payload: publicKeyBuffer,
+        };
+    }
+    async close() {
+        await this.#iterator?.return?.();
+        this.#iterator = undefined;
+        this.#firstKey = undefined;
+    }
+}
+//# sourceMappingURL=packet-processor.js.map

package/esm/daemon/auth/packet-processor.js.map

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

package/esm/daemon/auth/public-key.d.ts

@@ -0,0 +1,8 @@
+import type { SimpleRsaPrivateKey } from "../crypto.js";
+import type { AdbPrivateKey } from "./type.js";
+export declare function adbGetPublicKeySize(): number;
+export declare function adbGeneratePublicKey(privateKey: SimpleRsaPrivateKey): Uint8Array<ArrayBuffer>;
+export declare function adbGeneratePublicKey(privateKey: SimpleRsaPrivateKey, output: Uint8Array): number;
+export declare function adbGetPublicKeyFingerprint(privateKey: AdbPrivateKey): string;
+export declare function adbGetPublicKeyFingerprint(publicKey: Uint8Array): string;
+//# sourceMappingURL=public-key.d.ts.map

package/esm/daemon/auth/public-key.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"public-key.d.ts","sourceRoot":"","sources":["../../../src/daemon/auth/public-key.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAGxD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAK/C,wBAAgB,mBAAmB,WAElC;AAED,wBAAgB,oBAAoB,CAChC,UAAU,EAAE,mBAAmB,GAChC,UAAU,CAAC,WAAW,CAAC,CAAC;AAC3B,wBAAgB,oBAAoB,CAChC,UAAU,EAAE,mBAAmB,EAC/B,MAAM,EAAE,UAAU,GACnB,MAAM,CAAC;AA+EV,wBAAgB,0BAA0B,CAAC,UAAU,EAAE,aAAa,GAAG,MAAM,CAAC;AAC9E,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,UAAU,GAAG,MAAM,CAAC"}