@yume-chan/adb 0.0.10 → 0.0.13

package/esm/adb.js

@@ -1,55 +1,78 @@
-import { __awaiter } from "tslib";
+// cspell: ignore libusb
 import { PromiseResolver } from '@yume-chan/async';
-import { DisposableList } from '@yume-chan/event';
-import { AdbAuthenticationHandler, AdbDefaultAuthenticators } from './auth';
-import { AdbChildProcess, AdbDemoMode, AdbReverseCommand, AdbSync, AdbTcpIpCommand, escapeArg, framebuffer, install } from './commands';
-import { AdbFeatures } from './features';
-import { AdbCommand } from './packet';
-import { AdbPacketDispatcher } from './socket';
-import { decodeUtf8 } from "./utils";
+import { AdbAuthenticationProcessor, ADB_DEFAULT_AUTHENTICATORS } from './auth.js';
+import { AdbPower, AdbReverseCommand, AdbSubprocess, AdbSync, AdbTcpIpCommand, escapeArg, framebuffer, install } from './commands/index.js';
+import { AdbFeatures } from './features.js';
+import { AdbCommand, calculateChecksum } from './packet.js';
+import { AdbPacketDispatcher } from './socket/index.js';
+import { AbortController, DecodeUtf8Stream, GatherStringStream, WritableStream } from "./stream/index.js";
+import { decodeUtf8, encodeUtf8 } from "./utils/index.js";
 export var AdbPropKey;
 (function (AdbPropKey) {
     AdbPropKey["Product"] = "ro.product.name";
     AdbPropKey["Model"] = "ro.product.model";
     AdbPropKey["Device"] = "ro.product.device";
     AdbPropKey["Features"] = "features";
-})(AdbPropKey || (AdbPropKey = {}));
+})(AdbPropKey = AdbPropKey || (AdbPropKey = {}));
+export const VERSION_OMIT_CHECKSUM = 0x01000001;
 export class Adb {
-    constructor(backend, logger) {
-        this._connected = false;
-        this._backend = backend;
-        this.packetDispatcher = new AdbPacketDispatcher(backend, logger);
-        this.tcpip = new AdbTcpIpCommand(this);
-        this.reverse = new AdbReverseCommand(this.packetDispatcher);
-        this.demoMode = new AdbDemoMode(this);
-        this.childProcess = new AdbChildProcess(this);
-        backend.onDisconnected(this.dispose, this);
-    }
-    get backend() { return this._backend; }
-    get onDisconnected() { return this.backend.onDisconnected; }
-    get connected() { return this._connected; }
-    get name() { return this.backend.name; }
-    get protocolVersion() { return this._protocolVersion; }
-    get product() { return this._product; }
-    get model() { return this._model; }
-    get device() { return this._device; }
-    get features() { return this._features; }
-    connect(credentialStore, authenticators = AdbDefaultAuthenticators) {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
-            yield ((_b = (_a = this.backend).connect) === null || _b === void 0 ? void 0 : _b.call(_a));
-            this.packetDispatcher.maxPayloadSize = 0x1000;
-            this.packetDispatcher.calculateChecksum = true;
-            this.packetDispatcher.appendNullToServiceString = true;
-            this.packetDispatcher.start();
-            const version = 0x01000001;
-            const versionNoChecksum = 0x01000001;
-            const maxPayloadSize = 0x100000;
+    /**
+     * It's possible to call `authenticate` multiple times on a single connection,
+     * every time the device receives a `CNXN` packet, it resets its internal state,
+     * and starts a new authentication process.
+     */
+    static async authenticate(connection, credentialStore, authenticators = ADB_DEFAULT_AUTHENTICATORS) {
+        // Initially, set to highest-supported version and payload size.
+        let version = 0x01000001;
+        let maxPayloadSize = 0x100000;
+        const resolver = new PromiseResolver();
+        const authProcessor = new AdbAuthenticationProcessor(authenticators, credentialStore);
+        // Here is similar to `AdbPacketDispatcher`,
+        // But the received packet types and send packet processing are different.
+        const abortController = new AbortController();
+        const pipe = connection.readable
+            .pipeTo(new WritableStream({
+            async write(packet) {
+                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:
+                        const response = await authProcessor.process(packet);
+                        await sendPacket(response);
+                        break;
+                    default:
+                        // Maybe the previous ADB session 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;
+                }
+            }
+        }), {
+            preventCancel: true,
+            signal: abortController.signal,
+        })
+            .catch((e) => {
+            resolver.reject(e);
+        });
+        const writer = connection.writable.getWriter();
+        async function sendPacket(init) {
+            // Always send checksum in auth steps
+            // Because we don't know if the device needs it or not.
+            await writer.write(calculateChecksum(init));
+        }
+        try {
+            // https://android.googlesource.com/platform/packages/modules/adb/+/79010dc6d5ca7490c493df800d4421730f5466ca/transport.cpp#1252
+            // There are some other feature constants, but some of them are only used by ADB server, not devices.
             const features = [
-                'shell_v2',
-                'cmd',
+                AdbFeatures.ShellV2,
+                AdbFeatures.Cmd,
                 AdbFeatures.StatV2,
-                'ls_v2',
+                AdbFeatures.ListV2,
                 'fixed_push_mkdir',
                 'apex',
                 'abb',
@@ -63,59 +86,67 @@ export class Adb {
                 'sendrecv_v2_zstd',
                 'sendrecv_v2_dry_run_send',
             ].join(',');
-            const resolver = new PromiseResolver();
-            const authHandler = new AdbAuthenticationHandler(authenticators, credentialStore);
-            const disposableList = new DisposableList();
-            disposableList.add(this.packetDispatcher.onPacket((e) => __awaiter(this, void 0, void 0, function* () {
-                e.handled = true;
-                const { packet } = e;
-                try {
-                    switch (packet.command) {
-                        case AdbCommand.Connect:
-                            this.packetDispatcher.maxPayloadSize = Math.min(maxPayloadSize, packet.arg1);
-                            const finalVersion = Math.min(version, packet.arg0);
-                            this._protocolVersion = finalVersion;
-                            if (finalVersion >= versionNoChecksum) {
-                                this.packetDispatcher.calculateChecksum = false;
-                                // Android prior to 9.0.0 uses char* to parse service string
-                                // thus requires an extra null character
-                                this.packetDispatcher.appendNullToServiceString = false;
-                            }
-                            this.parseBanner(decodeUtf8(packet.payload));
-                            resolver.resolve();
-                            break;
-                        case AdbCommand.Auth:
-                            const authPacket = yield authHandler.handle(e.packet);
-                            yield this.packetDispatcher.sendPacket(authPacket);
-                            break;
-                        case AdbCommand.Close:
-                            // Last connection was interrupted
-                            // Ignore this packet, device will recover
-                            break;
-                        default:
-                            throw new Error('Device not in correct state. Reconnect your device and try again');
-                    }
-                }
-                catch (e) {
-                    resolver.reject(e);
-                }
-            })));
-            disposableList.add(this.packetDispatcher.onError(e => {
-                resolver.reject(e);
-            }));
-            // Android prior 9.0.0 requires the null character
-            // Newer versions can also handle the null character
-            // The terminating `;` is required in formal definition
-            // But ADB daemon can also work without it
-            yield this.packetDispatcher.sendPacket(AdbCommand.Connect, version, maxPayloadSize, `host::features=${features};\0`);
-            try {
-                yield resolver.promise;
-                this._connected = true;
-            }
-            finally {
-                disposableList.dispose();
-            }
+            await sendPacket({
+                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};`),
+            });
+            const banner = await resolver.promise;
+            // Stop piping before creating `Adb` object
+            // Because `AdbPacketDispatcher` will lock the streams when initializing
+            abortController.abort();
+            writer.releaseLock();
+            // Wait until pipe stops (`ReadableStream` lock released)
+            await pipe;
+            return new Adb(connection, version, maxPayloadSize, banner);
+        }
+        catch (e) {
+            abortController.abort();
+            writer.releaseLock();
+            throw e;
+        }
+    }
+    packetDispatcher;
+    get disconnected() { return this.packetDispatcher.disconnected; }
+    _protocolVersion;
+    get protocolVersion() { return this._protocolVersion; }
+    _product;
+    get product() { return this._product; }
+    _model;
+    get model() { return this._model; }
+    _device;
+    get device() { return this._device; }
+    _features;
+    get features() { return this._features; }
+    subprocess;
+    power;
+    reverse;
+    tcpip;
+    constructor(connection, version, maxPayloadSize, banner) {
+        this.parseBanner(banner);
+        let calculateChecksum;
+        let appendNullToServiceString;
+        if (version >= VERSION_OMIT_CHECKSUM) {
+            calculateChecksum = false;
+            appendNullToServiceString = false;
+        }
+        else {
+            calculateChecksum = true;
+            appendNullToServiceString = true;
+        }
+        this.packetDispatcher = new AdbPacketDispatcher(connection, {
+            calculateChecksum,
+            appendNullToServiceString,
+            maxPayloadSize,
         });
+        this._protocolVersion = version;
+        this.subprocess = new AdbSubprocess(this);
+        this.power = new AdbPower(this);
+        this.reverse = new AdbReverseCommand(this.packetDispatcher);
+        this.tcpip = new AdbTcpIpCommand(this);
     }
     parseBanner(banner) {
         this._features = [];
@@ -148,55 +179,37 @@ export class Adb {
             }
         }
     }
-    getProp(key) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const output = yield this.childProcess.exec('getprop', key);
-            return output.trim();
-        });
+    async createSocket(service) {
+        return this.packetDispatcher.createSocket(service);
     }
-    rm(...filenames) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.childProcess.exec('rm', '-rf', ...filenames.map(arg => escapeArg(arg)));
-        });
+    async createSocketAndWait(service) {
+        const socket = await this.createSocket(service);
+        const gatherStream = new GatherStringStream();
+        await socket.readable
+            .pipeThrough(new DecodeUtf8Stream())
+            .pipeTo(gatherStream);
+        return gatherStream.result;
     }
-    install(apk, onProgress) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield install(this, apk, onProgress);
-        });
+    async getProp(key) {
+        const stdout = await this.subprocess.spawnAndWaitLegacy(['getprop', key]);
+        return stdout.trim();
     }
-    sync() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const socket = yield this.createSocket('sync:');
-            return new AdbSync(this, socket);
-        });
+    async rm(...filenames) {
+        const stdout = await this.subprocess.spawnAndWaitLegacy(['rm', '-rf', ...filenames.map(arg => escapeArg(arg))]);
+        return stdout;
     }
-    framebuffer() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return framebuffer(this);
-        });
+    install() {
+        return install(this);
     }
-    createSocket(service) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.packetDispatcher.createSocket(service);
-        });
+    async sync() {
+        const socket = await this.createSocket('sync:');
+        return new AdbSync(this, socket);
     }
-    createSocketAndReadAll(service) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const socket = yield this.createSocket(service);
-            const resolver = new PromiseResolver();
-            let result = '';
-            socket.onData(buffer => {
-                result += decodeUtf8(buffer);
-            });
-            socket.onClose(() => resolver.resolve(result));
-            return resolver.promise;
-        });
+    async framebuffer() {
+        return framebuffer(this);
     }
-    dispose() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.packetDispatcher.dispose();
-            yield this.backend.dispose();
-        });
+    async dispose() {
+        this.packetDispatcher.dispose();
     }
 }
 //# sourceMappingURL=adb.js.map

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/{dts → esm}/auth.d.ts

@@ -1,14 +1,14 @@
-import { Disposable } from '@yume-chan/event';
-import { ValueOrPromise } from '@yume-chan/struct';
-import { AdbPacket, AdbPacketInit } from './packet';
-export declare type AdbKeyIterable = Iterable<ArrayBuffer> | AsyncIterable<ArrayBuffer>;
+import type { Disposable } from '@yume-chan/event';
+import type { ValueOrPromise } from '@yume-chan/struct';
+import { type AdbPacketData } from './packet.js';
+export declare type AdbKeyIterable = Iterable<Uint8Array> | AsyncIterable<Uint8Array>;
 export interface AdbCredentialStore {
     /**
      * Generate and store a RSA private key with modulus length `2048` and public exponent `65537`.
      *
-     * The returned `ArrayBuffer` is the private key in PKCS #8 format.
+     * The returned `Uint8Array` is the private key in PKCS #8 format.
      */
-    generateKey(): ValueOrPromise<ArrayBuffer>;
+    generateKey(): ValueOrPromise<Uint8Array>;
     /**
      * Synchronously or asynchronously iterate through all stored RSA private keys.
      *
@@ -33,20 +33,20 @@ export interface AdbAuthenticator {
      *
      * Calling `getNextRequest` multiple times without `yield` or `return` will always return the same request.
      */
-    (credentialStore: AdbCredentialStore, getNextRequest: () => Promise<AdbPacket>): AsyncIterable<AdbPacketInit>;
+    (credentialStore: AdbCredentialStore, getNextRequest: () => Promise<AdbPacketData>): AsyncIterable<AdbPacketData>;
 }
 export declare const AdbSignatureAuthenticator: AdbAuthenticator;
 export declare const AdbPublicKeyAuthenticator: AdbAuthenticator;
-export declare const AdbDefaultAuthenticators: AdbAuthenticator[];
-export declare class AdbAuthenticationHandler implements Disposable {
+export declare const ADB_DEFAULT_AUTHENTICATORS: AdbAuthenticator[];
+export declare class AdbAuthenticationProcessor implements Disposable {
     readonly authenticators: readonly AdbAuthenticator[];
     private readonly credentialStore;
     private pendingRequest;
     private iterator;
     constructor(authenticators: readonly AdbAuthenticator[], credentialStore: AdbCredentialStore);
     private getNextRequest;
-    private runAuthenticator;
-    handle(packet: AdbPacket): Promise<AdbPacketInit>;
+    private invokeAuthenticator;
+    process(packet: AdbPacketData): Promise<AdbPacketData>;
     dispose(): void;
 }
 //# sourceMappingURL=auth.d.ts.map

package/esm/auth.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,EAAc,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAG7D,oBAAY,cAAc,GAAG,QAAQ,CAAC,UAAU,CAAC,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC;AAE9E,MAAM,WAAW,kBAAkB;IAC/B;;;;OAIG;IACH,WAAW,IAAI,cAAc,CAAC,UAAU,CAAC,CAAC;IAE1C;;;;OAIG;IACH,WAAW,IAAI,cAAc,CAAC;CACjC;AAED,oBAAY,WAAW;IACnB,KAAK,IAAI;IACT,SAAS,IAAI;IACb,SAAS,IAAI;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC7B;;;;;;;;;;OAUG;IACH,CACI,eAAe,EAAE,kBAAkB,EACnC,cAAc,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC,GAC7C,aAAa,CAAC,aAAa,CAAC,CAAC;CACnC;AAED,eAAO,MAAM,yBAAyB,EAAE,gBAmBvC,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,gBAwCvC,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,gBAAgB,EAGxD,CAAC;AAEF,qBAAa,0BAA2B,YAAW,UAAU;IACzD,SAAgB,cAAc,EAAE,SAAS,gBAAgB,EAAE,CAAC;IAE5D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAqB;IAErD,OAAO,CAAC,cAAc,CAAwC;IAE9D,OAAO,CAAC,QAAQ,CAAuD;gBAGnE,cAAc,EAAE,SAAS,gBAAgB,EAAE,EAC3C,eAAe,EAAE,kBAAkB;IAMvC,OAAO,CAAC,cAAc,CAEpB;YAEa,mBAAmB;IAgBrB,OAAO,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAe5D,OAAO;CAGjB"}

package/esm/auth.js

@@ -1,135 +1,97 @@
-import { __asyncGenerator, __asyncValues, __await, __awaiter } from "tslib";
 import { PromiseResolver } from '@yume-chan/async';
-import { calculatePublicKey, calculatePublicKeyLength, sign } from './crypto';
-import { AdbCommand } from './packet';
-import { calculateBase64EncodedLength, encodeBase64 } from './utils';
+import { calculatePublicKey, calculatePublicKeyLength, sign } from './crypto.js';
+import { AdbCommand } from './packet.js';
+import { calculateBase64EncodedLength, encodeBase64 } from './utils/index.js';
 export var AdbAuthType;
 (function (AdbAuthType) {
     AdbAuthType[AdbAuthType["Token"] = 1] = "Token";
     AdbAuthType[AdbAuthType["Signature"] = 2] = "Signature";
     AdbAuthType[AdbAuthType["PublicKey"] = 3] = "PublicKey";
-})(AdbAuthType || (AdbAuthType = {}));
-export const AdbSignatureAuthenticator = function (credentialStore, getNextRequest) {
-    return __asyncGenerator(this, arguments, function* () {
-        var e_1, _a;
-        try {
-            for (var _b = __asyncValues(credentialStore.iterateKeys()), _c; _c = yield __await(_b.next()), !_c.done;) {
-                const key = _c.value;
-                const packet = yield __await(getNextRequest());
-                if (packet.arg0 !== AdbAuthType.Token) {
-                    return yield __await(void 0);
-                }
-                const signature = sign(key, packet.payload);
-                yield yield __await({
-                    command: AdbCommand.Auth,
-                    arg0: AdbAuthType.Signature,
-                    arg1: 0,
-                    payload: signature,
-                });
-            }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) yield __await(_a.call(_b));
-            }
-            finally { if (e_1) throw e_1.error; }
-        }
-    });
-};
-export const AdbPublicKeyAuthenticator = function (credentialStore, getNextRequest) {
-    return __asyncGenerator(this, arguments, function* () {
-        var e_2, _a;
-        const packet = yield __await(getNextRequest());
+})(AdbAuthType = AdbAuthType || (AdbAuthType = {}));
+export const AdbSignatureAuthenticator = async function* (credentialStore, getNextRequest) {
+    for await (const key of credentialStore.iterateKeys()) {
+        const packet = await getNextRequest();
         if (packet.arg0 !== AdbAuthType.Token) {
-            return yield __await(void 0);
+            return;
         }
-        let privateKey;
-        try {
-            for (var _b = __asyncValues(credentialStore.iterateKeys()), _c; _c = yield __await(_b.next()), !_c.done;) {
-                const key = _c.value;
-                privateKey = key;
-                break;
-            }
-        }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) yield __await(_a.call(_b));
-            }
-            finally { if (e_2) throw e_2.error; }
-        }
-        if (!privateKey) {
-            privateKey = yield __await(credentialStore.generateKey());
-        }
-        const publicKeyLength = calculatePublicKeyLength();
-        const [publicKeyBase64Length] = calculateBase64EncodedLength(publicKeyLength);
-        // The public key is null terminated,
-        // So we allocate the buffer with one extra byte.
-        const publicKeyBuffer = new ArrayBuffer(publicKeyBase64Length + 1);
-        calculatePublicKey(privateKey, publicKeyBuffer);
-        encodeBase64(publicKeyBuffer, 0, publicKeyLength, publicKeyBuffer);
-        yield yield __await({
+        const signature = sign(key, packet.payload);
+        yield {
             command: AdbCommand.Auth,
-            arg0: AdbAuthType.PublicKey,
+            arg0: AdbAuthType.Signature,
             arg1: 0,
-            payload: publicKeyBuffer,
-        });
-    });
+            payload: new Uint8Array(signature),
+        };
+    }
+};
+export const AdbPublicKeyAuthenticator = async function* (credentialStore, getNextRequest) {
+    const packet = await getNextRequest();
+    if (packet.arg0 !== AdbAuthType.Token) {
+        return;
+    }
+    let privateKey;
+    for await (const key of credentialStore.iterateKeys()) {
+        privateKey = key;
+        break;
+    }
+    if (!privateKey) {
+        privateKey = await credentialStore.generateKey();
+    }
+    const publicKeyLength = calculatePublicKeyLength();
+    const [publicKeyBase64Length] = calculateBase64EncodedLength(publicKeyLength);
+    // The public key is null terminated,
+    // So we allocate the buffer with one extra byte.
+    const publicKeyBuffer = new Uint8Array(publicKeyBase64Length + 1);
+    calculatePublicKey(privateKey, publicKeyBuffer);
+    encodeBase64(publicKeyBuffer.subarray(0, publicKeyLength), publicKeyBuffer);
+    yield {
+        command: AdbCommand.Auth,
+        arg0: AdbAuthType.PublicKey,
+        arg1: 0,
+        payload: publicKeyBuffer,
+    };
 };
-export const AdbDefaultAuthenticators = [
+export const ADB_DEFAULT_AUTHENTICATORS = [
     AdbSignatureAuthenticator,
     AdbPublicKeyAuthenticator,
 ];
-export class AdbAuthenticationHandler {
+export class AdbAuthenticationProcessor {
+    authenticators;
+    credentialStore;
+    pendingRequest = new PromiseResolver();
+    iterator;
     constructor(authenticators, credentialStore) {
-        this.pendingRequest = new PromiseResolver();
-        this.getNextRequest = () => {
-            return this.pendingRequest.promise;
-        };
         this.authenticators = authenticators;
         this.credentialStore = credentialStore;
     }
-    runAuthenticator() {
-        return __asyncGenerator(this, arguments, function* runAuthenticator_1() {
-            var e_3, _a;
-            for (const authenticator of this.authenticators) {
-                try {
-                    for (var _b = (e_3 = void 0, __asyncValues(authenticator(this.credentialStore, this.getNextRequest))), _c; _c = yield __await(_b.next()), !_c.done;) {
-                        const packet = _c.value;
-                        // If the authenticator yielded a response
-                        // Prepare `nextRequest` for next authentication request
-                        this.pendingRequest = new PromiseResolver();
-                        // Yield the response to outer layer
-                        yield yield __await(packet);
-                    }
-                }
-                catch (e_3_1) { e_3 = { error: e_3_1 }; }
-                finally {
-                    try {
-                        if (_c && !_c.done && (_a = _b.return)) yield __await(_a.call(_b));
-                    }
-                    finally { if (e_3) throw e_3.error; }
-                }
-                // If the authenticator returned,
-                // Next authenticator will be given the same `pendingRequest`
+    getNextRequest = () => {
+        return this.pendingRequest.promise;
+    };
+    async *invokeAuthenticator() {
+        for (const authenticator of this.authenticators) {
+            for await (const packet of authenticator(this.credentialStore, this.getNextRequest)) {
+                // If the authenticator yielded a response
+                // Prepare `nextRequest` for next authentication request
+                this.pendingRequest = new PromiseResolver();
+                // Yield the response to outer layer
+                yield packet;
             }
-            throw new Error('Cannot authenticate with device');
-        });
+            // If the authenticator returned,
+            // Next authenticator will be given the same `pendingRequest`
+        }
     }
-    handle(packet) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.iterator) {
-                this.iterator = this.runAuthenticator();
-            }
-            this.pendingRequest.resolve(packet);
-            const result = yield this.iterator.next();
-            return result.value;
-        });
+    async process(packet) {
+        if (!this.iterator) {
+            this.iterator = this.invokeAuthenticator();
+        }
+        this.pendingRequest.resolve(packet);
+        const result = await this.iterator.next();
+        if (result.done) {
+            throw new Error('No authenticator can handle the request');
+        }
+        return result.value;
     }
     dispose() {
-        var _a, _b;
-        (_b = (_a = this.iterator) === null || _a === void 0 ? void 0 : _a.return) === null || _b === void 0 ? void 0 : _b.call(_a);
+        this.iterator?.return?.();
     }
 }
 //# sourceMappingURL=auth.js.map