@trezor/connect 9.5.3 → 9.5.4

package/lib/device/Device.js

@@ -8,8 +8,8 @@ const transport_1 = require("@trezor/transport");
 const utils_1 = require("@trezor/utils");
 const DeviceCommands_1 = require("./DeviceCommands");
 const constants_1 = require("../constants");
+const DeviceCurrentSession_1 = require("./DeviceCurrentSession");
 const checkFirmwareRevision_1 = require("./checkFirmwareRevision");
-const prompts_1 = require("./prompts");
 const firmware_1 = require("../api/firmware");
 const DataManager_1 = require("../data/DataManager");
 const coinInfo_1 = require("../data/coinInfo");
@@ -20,6 +20,7 @@ const events_1 = require("../events");
 const types_1 = require("../types");
 const debug_1 = require("../utils/debug");
 const deviceFeaturesUtils_1 = require("../utils/deviceFeaturesUtils");
+const pathUtils_1 = require("../utils/pathUtils");
 const _log = (0, debug_1.initLog)('Device');
 exports.CANCEL_TIMEOUT = 1_000;
 exports.GET_FEATURES_TIMEOUT = 3_000;
@@ -33,10 +34,10 @@ class Device extends utils_1.TypedEmitter {
     transport;
     protocol;
     transportPath;
-    transportSessionOwner;
     transportDescriptorType;
     bluetoothProps;
     session;
+    transportSessionOwner;
     lastAcquiredHere;
     unreadableError;
     _firmwareStatus;
@@ -56,8 +57,7 @@ class Device extends utils_1.TypedEmitter {
     releasePromise;
     runPromise;
     keepTransportSession = false;
-    commands;
-    cancelableAction;
+    currentSession;
     loaded = false;
     inconsistent = false;
     firstRunPromise;
@@ -136,8 +136,8 @@ class Device extends utils_1.TypedEmitter {
             if (result.success) {
                 this.session = result.payload;
                 this.lastAcquiredHere = true;
-                this.commands?.dispose();
-                this.commands = new DeviceCommands_1.DeviceCommands(this, this.transport, this.session);
+                this.currentSession?.dispose();
+                this.currentSession = new DeviceCurrentSession_1.DeviceCurrentSession(this, this.transport, this.protocol, this.session);
                 return result;
             }
             else {
@@ -154,16 +154,11 @@ class Device extends utils_1.TypedEmitter {
         return this.acquirePromise;
     }
     async release() {
-        const localSession = this.getLocalSession();
+        const localSession = this.lastAcquiredHere ? this.session : null;
         if (!localSession || this.keepTransportSession || this.releasePromise) {
             return;
         }
-        if (this.commands) {
-            this.commands.dispose();
-            if (this.commands.callPromise) {
-                await this.commands.callPromise;
-            }
-        }
+        await this.currentSession?.dispose();
         const sessionPromise = this.getSessionChangePromise();
         this.releasePromise = this.transport
             .release({ session: localSession, path: this.transportPath })
@@ -237,12 +232,13 @@ class Device extends utils_1.TypedEmitter {
             this.usedElsewhere();
         }
         if (!descriptor.session) {
-            const methodStillRunning = !this.commands?.isDisposed();
+            const methodStillRunning = !this.currentSession?.isDisposed();
             if (methodStillRunning) {
                 this.releaseTransportSession();
             }
         }
         this.session = descriptor.session;
+        this.transportSessionOwner = descriptor.sessionOwner;
         this.emitLifecycle(events_1.DEVICE.CHANGED);
     }
     run(fn, options) {
@@ -276,22 +272,10 @@ class Device extends utils_1.TypedEmitter {
             await this.releasePromise;
         }
     }
-    setCancelableAction(callback) {
-        this.cancelableAction = (e) => callback(e)
-            .catch(e2 => {
-            _log.debug('cancelableAction error', e2);
-        })
-            .finally(() => {
-            this.clearCancelableAction();
-        });
-    }
-    clearCancelableAction() {
-        this.cancelableAction = undefined;
-    }
     async interruptionFromUser(error) {
         _log.debug('interruptionFromUser');
-        await this.cancelableAction?.(error.toString());
-        await this.commands?.cancel();
+        await this.currentSession?.abort(error);
+        await this.currentSession?.dispose();
         if (this.runPromise) {
             this.runPromise.reject(error);
             delete this.runPromise;
@@ -304,9 +288,7 @@ class Device extends utils_1.TypedEmitter {
         this.lastAcquiredHere = false;
         this._featuresNeedsReload = true;
         _log.debug('interruptionFromOutside');
-        if (this.commands) {
-            this.commands.dispose();
-        }
+        this.currentSession?.dispose();
         if (this.runPromise) {
             this.runPromise.reject(constants_1.ERRORS.TypedError('Device_UsedElsewhere'));
             delete this.runPromise;
@@ -319,7 +301,7 @@ class Device extends utils_1.TypedEmitter {
         if (this.releasePromise) {
             await this.releasePromise;
         }
-        const acquireNeeded = !this.isUsedHere() || this.commands?.disposed;
+        const acquireNeeded = !this.isUsedHere() || this.currentSession?.isDisposed();
         if (acquireNeeded) {
             await this.acquire();
         }
@@ -341,9 +323,7 @@ class Device extends utils_1.TypedEmitter {
                         ![0, 2].includes(this.transportDescriptorType)) {
                         _log.debug('sending a preventive cancel on the first encounter with the device');
                         await Promise.race([
-                            this.getCommands()
-                                .typedCall('Cancel', 'Failure', {})
-                                .catch(() => { }),
+                            this.getCurrentSession().cancelCall(),
                             new Promise((_, reject) => setTimeout(reject, cancelTimeout)),
                         ]).catch(() => this.acquire());
                     }
@@ -351,10 +331,9 @@ class Device extends utils_1.TypedEmitter {
                     await Promise.race([
                         this.getFeatures().finally(() => clearTimeout(getFeaturesTimeoutId)),
                         new Promise((_resolve, reject) => {
-                            getFeaturesTimeoutId = setTimeout(() => {
-                                (0, prompts_1.cancelPrompt)(this, false).finally(() => {
-                                    reject(new Error('GetFeatures timeout'));
-                                });
+                            getFeaturesTimeoutId = setTimeout(async () => {
+                                await this.getCurrentSession().cancelCall(false);
+                                reject(new Error('GetFeatures timeout'));
                             }, getFeaturesTimeout);
                         }),
                     ]);
@@ -414,11 +393,14 @@ class Device extends utils_1.TypedEmitter {
             this.firstRunPromise.resolve(true);
         }
     }
-    getCommands() {
-        if (!this.commands) {
+    getCurrentSession() {
+        if (!this.currentSession) {
             throw constants_1.ERRORS.TypedError('Runtime', `Device: commands not defined`);
         }
-        return this.commands;
+        return this.currentSession;
+    }
+    getCommands() {
+        return (0, DeviceCommands_1.DeviceCommands)(this.getCurrentSession());
     }
     setInstance(instance = 0) {
         if (this.instance !== instance) {
@@ -458,8 +440,12 @@ class Device extends utils_1.TypedEmitter {
             }
         }
         const expectedState = this.getState()?.staticSessionId;
-        const state = await this.getCommands().getDeviceState();
-        const uniqueState = `${state}@${this.features.device_id}:${this.instance}`;
+        const { message } = await this.getCurrentSession().typedCall('GetAddress', 'Address', {
+            address_n: [(0, pathUtils_1.toHardened)(44), (0, pathUtils_1.toHardened)(1), (0, pathUtils_1.toHardened)(0), 0, 0],
+            coin_name: 'Testnet',
+            script_type: 'SPENDADDRESS',
+        });
+        const uniqueState = `${message.address}@${this.features.device_id}:${this.instance}`;
         if (this.features.session_id) {
             this.setState({ sessionId: this.features.session_id });
         }
@@ -481,7 +467,7 @@ class Device extends utils_1.TypedEmitter {
                 payload.session_id = sessionId;
             }
         }
-        const { message } = await this.getCommands().typedCall('Initialize', 'Features', payload);
+        const { message } = await this.getCurrentSession().typedCall('Initialize', 'Features', payload);
         this._updateFeatures(message);
         this.setState({ deriveCardano: payload?.derive_cardano });
     }
@@ -490,7 +476,7 @@ class Device extends utils_1.TypedEmitter {
         this.setState(storage.loadState(this));
     }
     async getFeatures() {
-        const { message } = await this.getCommands().typedCall('GetFeatures', 'Features', {});
+        const { message } = await this.getCurrentSession().typedCall('GetFeatures', 'Features', {});
         this._updateFeatures(message);
     }
     async checkFirmwareHashWithRetries() {
@@ -548,7 +534,7 @@ class Device extends utils_1.TypedEmitter {
         const strippedBinary = (0, firmware_1.stripFwHeaders)(binary);
         const { hash: expectedHash, challenge } = (0, firmware_1.calculateFirmwareHash)(this.features.major_version, strippedBinary, (0, crypto_1.randomBytes)(32));
         try {
-            const deviceResponse = await this.getCommands().typedCall('GetFirmwareHash', 'FirmwareHash', { challenge });
+            const deviceResponse = await this.getCurrentSession().typedCall('GetFirmwareHash', 'FirmwareHash', { challenge });
             if (!deviceResponse?.message?.hash) {
                 return createFailResult('other-error', 'Device response is missing hash');
             }
@@ -612,20 +598,17 @@ class Device extends utils_1.TypedEmitter {
         return this._uploadTranslationData(downloadedBinary);
     }
     async _uploadTranslationData(payload) {
-        if (!this.commands) {
-            throw constants_1.ERRORS.TypedError('Runtime', 'uploadTranslationData: device.commands is not set');
-        }
         if (payload === null) {
-            const response = await this.commands.typedCall('ChangeLanguage', ['Success'], { data_length: 0 });
+            const response = await this.getCurrentSession().typedCall('ChangeLanguage', ['Success'], { data_length: 0 });
             return response.message;
         }
         const length = payload.byteLength;
-        let response = await this.commands.typedCall('ChangeLanguage', ['TranslationDataRequest', 'Success'], { data_length: length });
+        let response = await this.getCurrentSession().typedCall('ChangeLanguage', ['TranslationDataRequest', 'Success'], { data_length: length });
         while (response.type !== 'Success') {
             const start = response.message.data_offset;
             const end = response.message.data_offset + response.message.data_length;
             const chunk = payload.slice(start, end);
-            response = await this.commands.typedCall('TranslationDataAck', ['TranslationDataRequest', 'Success'], {
+            response = await this.getCurrentSession().typedCall('TranslationDataAck', ['TranslationDataRequest', 'Success'], {
                 data_chunk: Buffer.from(chunk).toString('hex'),
             });
         }
@@ -693,6 +676,20 @@ class Device extends utils_1.TypedEmitter {
             }
         }
     }
+    prompt(type, args) {
+        return new Promise(callback => {
+            if (!this.listenerCount(type)) {
+                const payload = {
+                    success: false,
+                    error: new Error(`${type} callback not configured`),
+                };
+                callback(payload);
+            }
+            else {
+                this.emit(type, { callback, ...args });
+            }
+        });
+    }
     isUnacquired() {
         return this.features === undefined;
     }
@@ -752,9 +749,6 @@ class Device extends utils_1.TypedEmitter {
     waitForFirstRun() {
         return this.firstRunPromise.promise;
     }
-    getLocalSession() {
-        return this.lastAcquiredHere ? this.session : null;
-    }
     getUniquePath() {
         return this.uniquePath;
     }
@@ -781,11 +775,7 @@ class Device extends utils_1.TypedEmitter {
     dispose() {
         this.removeAllListeners();
         if (this.session && this.lastAcquiredHere) {
-            return this.transport.release({
-                session: this.session,
-                path: this.transportPath,
-                onClose: true,
-            });
+            this.transport.releaseSync(this.session);
         }
     }
     getMode() {