refactor(adb): refactor daemon authentication process (#810)

Author: yume-chan

libraries/adb-credential-nodejs/src/index.ts

@@ -225,7 +225,7 @@ export namespace TangoNodeStorage {
 
 // Re-export everything except Web-only storages
 export {
-    AdbWebCryptoCredentialStore,
+    AdbWebCryptoCredentialManager,
     TangoPasswordProtectedStorage,
     TangoPrfStorage,
 } from "@yume-chan/adb-credential-web";

libraries/adb-credential-web/src/index.ts

@@ -1,2 +1,2 @@
+export * from "./manager.js";
 export * from "./storage/index.js";
-export * from "./store.js";

libraries/adb-credential-web/src/store.ts renamed to libraries/adb-credential-web/src/manager.ts

@@ -1,13 +1,13 @@
 import type {
-    AdbCredentialStore,
+    AdbCredentialManager,
     AdbPrivateKey,
     MaybeError,
 } from "@yume-chan/adb";
 import { rsaParsePrivateKey } from "@yume-chan/adb";
 
 import type { TangoKeyStorage } from "./storage/index.js";
 
-export class AdbWebCryptoCredentialStore implements AdbCredentialStore {
+export class AdbWebCryptoCredentialManager implements AdbCredentialManager {
     readonly #storage: TangoKeyStorage;
 
     readonly #name: string | undefined;

libraries/adb-credential-web/src/storage/password.ts

@@ -55,8 +55,14 @@ async function deriveAesKey(password: string, salt?: Uint8Array<ArrayBuffer>) {
 }
 
 class PasswordIncorrectError extends Error {
-    constructor() {
+    #keyName: string | undefined;
+    get keyName() {
+        return this.#keyName;
+    }
+
+    constructor(keyName: string | undefined) {
         super("Password incorrect");
+        this.#keyName = keyName;
     }
 }
 
@@ -78,7 +84,7 @@ export class TangoPasswordProtectedStorage implements TangoKeyStorage {
         privateKey: Uint8Array<ArrayBuffer>,
         name: string | undefined,
     ): Promise<undefined> {
-        const password = await this.#requestPassword("save");
+        const password = await this.#requestPassword("save", name);
         const { salt, aesKey } = await deriveAesKey(password);
 
         const iv = new Uint8Array(AesIvLength);
@@ -101,7 +107,7 @@ export class TangoPasswordProtectedStorage implements TangoKeyStorage {
         // Clear secret memory
         //   * No way to clear `password` and `aesKey`
         //   * `salt`, `iv`, `encrypted` and `bundle` are not secrets
-        //   * `data` is owned by caller and will be cleared by caller
+        //   * `privateKey` is owned by caller and will be cleared by caller
     }
 
     async *load(): AsyncGenerator<MaybeError<TangoKey>, void, void> {
@@ -118,7 +124,7 @@ export class TangoPasswordProtectedStorage implements TangoKeyStorage {
                     new Uint8ArrayExactReadable(serialized),
                 );
 
-                const password = await this.#requestPassword("load");
+                const password = await this.#requestPassword("load", name);
                 const { aesKey } = await deriveAesKey(
                     password,
                     bundle.pbkdf2Salt as Uint8Array<ArrayBuffer>,
@@ -147,7 +153,7 @@ export class TangoPasswordProtectedStorage implements TangoKeyStorage {
                 }
             } catch (e) {
                 if (e instanceof DOMException && e.name === "OperationError") {
-                    yield new PasswordIncorrectError();
+                    yield new PasswordIncorrectError(name);
                     continue;
                 }
 
@@ -162,6 +168,7 @@ export class TangoPasswordProtectedStorage implements TangoKeyStorage {
 export namespace TangoPasswordProtectedStorage {
     export type RequestPassword = (
         reason: "save" | "load",
+        name: string | undefined,
     ) => MaybePromiseLike<string>;
 
     export type PasswordIncorrectError = typeof PasswordIncorrectError;

libraries/adb/src/commands/sync/socket.ts

@@ -41,14 +41,14 @@ export class AdbSyncSocketLocked implements AsyncExactReadable {
     }
 
     async flush() {
-        try {
-            await this.#writeLock.wait();
-            const buffer = this.#combiner.flush();
-            if (buffer) {
+        const buffer = this.#combiner.flush();
+        if (buffer) {
+            try {
+                await this.#writeLock.wait();
                 await this.#write(buffer);
+            } finally {
+                this.#writeLock.notifyOne();
             }
-        } finally {
-            this.#writeLock.notifyOne();
         }
     }
 

libraries/adb/src/commands/sync/sync.ts

@@ -42,14 +42,14 @@ export class AdbSync {
     protected _adb: Adb;
     protected _socket: AdbSyncSocket;
 
-    readonly #supportsStat: boolean;
+    readonly #supportsStat2: boolean;
     readonly #supportsLs2: boolean;
     readonly #fixedPushMkdir: boolean;
     readonly #supportsSendReceive2: boolean;
     readonly #needPushMkdirWorkaround: boolean;
 
-    get supportsStat(): boolean {
-        return this.#supportsStat;
+    get supportsStat2(): boolean {
+        return this.#supportsStat2;
     }
 
     get supportsLs2(): boolean {
@@ -72,7 +72,7 @@ export class AdbSync {
         this._adb = adb;
         this._socket = new AdbSyncSocket(socket, adb.maxPayloadSize);
 
-        this.#supportsStat = adb.canUseFeature(AdbFeature.Stat2);
+        this.#supportsStat2 = adb.canUseFeature(AdbFeature.Stat2);
         this.#supportsLs2 = adb.canUseFeature(AdbFeature.Ls2);
         this.#fixedPushMkdir = adb.canUseFeature(AdbFeature.FixedPushMkdir);
         this.#supportsSendReceive2 = adb.canUseFeature(AdbFeature.SendReceive2);
@@ -87,7 +87,7 @@ export class AdbSync {
      * If `path` points to a symbolic link, the returned information is about the link itself (with `type` being `LinuxFileType.Link`).
      */
     async lstat(path: string): Promise<AdbSyncStat> {
-        return await adbSyncLstat(this._socket, path, this.#supportsStat);
+        return await adbSyncLstat(this._socket, path, this.#supportsStat2);
     }
 
     /**
@@ -96,7 +96,7 @@ export class AdbSync {
      * If `path` points to a symbolic link, it will be resolved and the returned information is about the target (with `type` being `LinuxFileType.File` or `LinuxFileType.Directory`).
      */
     async stat(path: string) {
-        if (!this.#supportsStat) {
+        if (!this.#supportsStat2) {
             throw new Error("Not supported");
         }