@trezor/connect 9.4.8-beta.1 → 9.5.0-beta.1

package/lib/device/Device.js

@@ -20,46 +20,68 @@ const types_1 = require("../types");
 const debug_1 = require("../utils/debug");
 const deviceFeaturesUtils_1 = require("../utils/deviceFeaturesUtils");
 const _log = (0, debug_1.initLog)('Device');
-exports.GET_FEATURES_TIMEOUT = 3000;
-exports.GET_FEATURES_TIMEOUT_REACT_NATIVE = 20000;
+exports.GET_FEATURES_TIMEOUT = 3_000;
+exports.GET_FEATURES_TIMEOUT_REACT_NATIVE = 20_000;
 const parseRunOptions = (options) => {
     if (!options)
         options = {};
     return options;
 };
 class Device extends utils_1.TypedEmitter {
+    transport;
+    protocol;
+    transportPath;
+    transportSessionOwner;
+    transportDescriptorType;
+    session;
+    lastAcquiredHere;
+    unreadableError;
+    _firmwareStatus;
     get firmwareStatus() {
         return this._firmwareStatus;
     }
+    _firmwareRelease;
     get firmwareRelease() {
         return this._firmwareRelease;
     }
+    _features;
     get features() {
         return this._features;
     }
+    _featuresNeedsReload = false;
+    acquirePromise;
+    releasePromise;
+    runPromise;
+    keepTransportSession = false;
+    commands;
+    cancelableAction;
+    loaded = false;
+    inconsistent = false;
+    firstRunPromise;
+    instance = 0;
+    state = [];
+    stateStorage = undefined;
+    _unavailableCapabilities = {};
     get unavailableCapabilities() {
         return this._unavailableCapabilities;
     }
+    _firmwareType;
     get firmwareType() {
         return this._firmwareType;
     }
+    name = 'Trezor';
+    color;
+    availableTranslations = [];
+    authenticityChecks = {
+        firmwareRevision: null,
+        firmwareHash: null,
+    };
+    uniquePath;
+    emitLifecycle;
+    sessionDfd;
+    handshakeFinished = false;
     constructor({ id, transport, descriptor, listener }) {
         super();
-        this._featuresNeedsReload = false;
-        this.keepTransportSession = false;
-        this.loaded = false;
-        this.inconsistent = false;
-        this.instance = 0;
-        this.state = [];
-        this.stateStorage = undefined;
-        this._unavailableCapabilities = {};
-        this.name = 'Trezor';
-        this.availableTranslations = [];
-        this.authenticityChecks = {
-            firmwareRevision: null,
-            firmwareHash: null,
-        };
-        this.handshakeFinished = false;
         this.emitLifecycle = listener;
         this.protocol = protocol_1.v1;
         this.uniquePath = id;
@@ -107,11 +129,10 @@ class Device extends utils_1.TypedEmitter {
             .acquire({ input: { path: this.transportPath, previous: this.session } })
             .then(result => this.waitAndCompareSession(result, sessionPromise))
             .then(result => {
-            var _a;
             if (result.success) {
                 this.session = result.payload;
                 this.lastAcquiredHere = true;
-                (_a = this.commands) === null || _a === void 0 ? void 0 : _a.dispose();
+                this.commands?.dispose();
                 this.commands = new DeviceCommands_1.DeviceCommands(this, this.transport, this.session);
                 return result;
             }
@@ -165,9 +186,8 @@ class Device extends utils_1.TypedEmitter {
         }
     }
     async handshake(delay) {
-        var _a;
         if (delay) {
-            await (0, utils_1.createTimeoutPromise)(501 + delay);
+            await (0, utils_1.resolveAfter)(501 + delay);
         }
         while (true) {
             if (this.isUsedElsewhere()) {
@@ -192,12 +212,12 @@ class Device extends utils_1.TypedEmitter {
                         this.emitLifecycle(events_1.DEVICE.CONNECT_UNACQUIRED);
                     }
                     else if (error.message === transport_1.TRANSPORT_ERROR.INTERFACE_UNABLE_TO_OPEN_DEVICE ||
-                        ((_a = error.message) === null || _a === void 0 ? void 0 : _a.indexOf(constants_1.ERRORS.LIBUSB_ERROR_MESSAGE)) >= 0) {
-                        this.unreadableError = error === null || error === void 0 ? void 0 : error.message;
+                        error.message?.indexOf(constants_1.ERRORS.LIBUSB_ERROR_MESSAGE) >= 0) {
+                        this.unreadableError = error?.message;
                         this.emitLifecycle(events_1.DEVICE.CONNECT_UNACQUIRED);
                     }
                     else {
-                        await (0, utils_1.createTimeoutPromise)(501);
+                        await (0, utils_1.resolveAfter)(501);
                         continue;
                     }
                 }
@@ -207,14 +227,13 @@ class Device extends utils_1.TypedEmitter {
         }
     }
     async updateDescriptor(descriptor) {
-        var _a, _b;
-        (_a = this.sessionDfd) === null || _a === void 0 ? void 0 : _a.resolve(descriptor.session);
+        this.sessionDfd?.resolve(descriptor.session);
         await Promise.all([this.acquirePromise, this.releasePromise]);
         if (descriptor.session && descriptor.session !== this.session) {
             this.usedElsewhere();
         }
         if (!descriptor.session) {
-            const methodStillRunning = !((_b = this.commands) === null || _b === void 0 ? void 0 : _b.isDisposed());
+            const methodStillRunning = !this.commands?.isDisposed();
             if (methodStillRunning) {
                 this.releaseTransportSession();
             }
@@ -266,10 +285,9 @@ class Device extends utils_1.TypedEmitter {
         this.cancelableAction = undefined;
     }
     async interruptionFromUser(error) {
-        var _a, _b;
         _log.debug('interruptionFromUser');
-        await ((_a = this.cancelableAction) === null || _a === void 0 ? void 0 : _a.call(this, error));
-        await ((_b = this.commands) === null || _b === void 0 ? void 0 : _b.cancel());
+        await this.cancelableAction?.(error);
+        await this.commands?.cancel();
         if (this.runPromise) {
             this.runPromise.reject(error);
             delete this.runPromise;
@@ -294,11 +312,10 @@ class Device extends utils_1.TypedEmitter {
         }
     }
     async _runInner(fn, options) {
-        var _a, _b;
         if (this.releasePromise) {
             await this.releasePromise;
         }
-        const acquireNeeded = !this.isUsedHere() || ((_a = this.commands) === null || _a === void 0 ? void 0 : _a.disposed);
+        const acquireNeeded = !this.isUsedHere() || this.commands?.disposed;
         if (acquireNeeded) {
             await this.acquire();
         }
@@ -312,6 +329,14 @@ class Device extends utils_1.TypedEmitter {
                     const getFeaturesTimeout = DataManager_1.DataManager.getSettings('env') === 'react-native'
                         ? exports.GET_FEATURES_TIMEOUT_REACT_NATIVE
                         : exports.GET_FEATURES_TIMEOUT;
+                    if (['v1', 'bridge'].includes(this.protocol.name)) {
+                        _log.debug('sending a preventive cancel on the first encounter with the device');
+                        try {
+                            await this.getCommands().typedCall('Cancel', 'Failure', {});
+                        }
+                        catch {
+                        }
+                    }
                     let getFeaturesTimeoutId;
                     await Promise.race([
                         this.getFeatures().finally(() => clearTimeout(getFeaturesTimeoutId)),
@@ -345,7 +370,7 @@ class Device extends utils_1.TypedEmitter {
             await this.checkFirmwareRevisionWithRetries();
         }
         if (!options.skipLanguageChecks &&
-            ((_b = this.features) === null || _b === void 0 ? void 0 : _b.language) &&
+            this.features?.language &&
             !this.features.language_version_matches &&
             this.atLeast('2.7.0')) {
             _log.info('language version mismatch. silently updating...');
@@ -401,7 +426,6 @@ class Device extends utils_1.TypedEmitter {
         return this.state[this.instance];
     }
     setState(state) {
-        var _a;
         if (!state) {
             delete this.state[this.instance];
         }
@@ -412,11 +436,10 @@ class Device extends utils_1.TypedEmitter {
                 ...state,
             };
             this.state[this.instance] = newState;
-            (_a = this.stateStorage) === null || _a === void 0 ? void 0 : _a.saveState(this, newState);
+            this.stateStorage?.saveState(this, newState);
         }
     }
     async validateState(preauthorized = false) {
-        var _a;
         if (!this.features)
             return;
         if (!this.features.unlocked && preauthorized) {
@@ -424,7 +447,7 @@ class Device extends utils_1.TypedEmitter {
                 return;
             }
         }
-        const expectedState = (_a = this.getState()) === null || _a === void 0 ? void 0 : _a.staticSessionId;
+        const expectedState = this.getState()?.staticSessionId;
         const state = await this.getCommands().getDeviceState();
         const uniqueState = `${state}@${this.features.device_id}:${this.instance}`;
         if (this.features.session_id) {
@@ -450,7 +473,7 @@ class Device extends utils_1.TypedEmitter {
         }
         const { message } = await this.getCommands().typedCall('Initialize', 'Features', payload);
         this._updateFeatures(message);
-        this.setState({ deriveCardano: payload === null || payload === void 0 ? void 0 : payload.derive_cardano });
+        this.setState({ deriveCardano: payload?.derive_cardano });
     }
     initStorage(storage) {
         this.stateStorage = storage;
@@ -461,15 +484,14 @@ class Device extends utils_1.TypedEmitter {
         this._updateFeatures(message);
     }
     async checkFirmwareHashWithRetries() {
-        var _a;
         const lastResult = this.authenticityChecks.firmwareHash;
         const notDoneYet = lastResult === null;
-        const attemptsDone = (_a = lastResult === null || lastResult === void 0 ? void 0 : lastResult.attemptCount) !== null && _a !== void 0 ? _a : 0;
+        const attemptsDone = lastResult?.attemptCount ?? 0;
         if (attemptsDone >= constants_1.FIRMWARE.HASH_CHECK_MAX_ATTEMPTS)
             return;
         const wasError = lastResult !== null && !lastResult.success;
         const wasErrorRetriable = wasError && (0, utils_1.isArrayMember)(lastResult.error, constants_1.FIRMWARE.HASH_CHECK_RETRIABLE_ERRORS);
-        const lastErrorPayload = wasError ? lastResult === null || lastResult === void 0 ? void 0 : lastResult.errorPayload : null;
+        const lastErrorPayload = wasError ? lastResult?.errorPayload : null;
         if (notDoneYet || wasErrorRetriable) {
             const result = await this.checkFirmwareHash();
             this.authenticityChecks.firmwareHash = result;
@@ -482,7 +504,6 @@ class Device extends utils_1.TypedEmitter {
         }
     }
     async checkFirmwareHash() {
-        var _a;
         const createFailResult = (error, errorPayload) => ({
             success: false,
             error,
@@ -515,7 +536,7 @@ class Device extends utils_1.TypedEmitter {
         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 });
-            if (!((_a = deviceResponse === null || deviceResponse === void 0 ? void 0 : deviceResponse.message) === null || _a === void 0 ? void 0 : _a.hash)) {
+            if (!deviceResponse?.message?.hash) {
                 return createFailResult('other-error', 'Device response is missing hash');
             }
             if (deviceResponse.message.hash !== expectedHash) {
@@ -552,7 +573,7 @@ class Device extends utils_1.TypedEmitter {
             internalModel: this.features.internal_model,
             deviceRevision: this.features.revision,
             firmwareVersion,
-            expectedRevision: release === null || release === void 0 ? void 0 : release.firmware_revision,
+            expectedRevision: release?.firmware_revision,
         });
     }
     async changeLanguage({ language, binary, }) {
@@ -597,13 +618,12 @@ class Device extends utils_1.TypedEmitter {
         return response.message;
     }
     _updateFeatures(feat) {
-        var _a, _b, _c, _d;
         const capabilities = (0, deviceFeaturesUtils_1.parseCapabilities)(feat);
         feat.capabilities = capabilities;
         if (this.features && this.features.session_id && !feat.session_id) {
             feat.session_id = this.features.session_id;
         }
-        feat.unlocked = (_a = feat.unlocked) !== null && _a !== void 0 ? _a : true;
+        feat.unlocked = feat.unlocked ?? true;
         const revision = (0, deviceFeaturesUtils_1.parseRevision)(feat);
         feat.revision = revision;
         if (!feat.model && feat.major_version === 1) {
@@ -629,7 +649,7 @@ class Device extends utils_1.TypedEmitter {
             this._unavailableCapabilities = (0, deviceFeaturesUtils_1.getUnavailableCapabilities)(feat, (0, coinInfo_1.getAllNetworks)());
             this._firmwareStatus = (0, firmwareInfo_1.getFirmwareStatus)(feat);
             this._firmwareRelease = (0, firmwareInfo_1.getRelease)(feat);
-            this.availableTranslations = (_c = (_b = this.firmwareRelease) === null || _b === void 0 ? void 0 : _b.translations) !== null && _c !== void 0 ? _c : [];
+            this.availableTranslations = this.firmwareRelease?.translations ?? [];
         }
         this._features = feat;
         this._featuresNeedsReload = false;
@@ -647,12 +667,12 @@ class Device extends utils_1.TypedEmitter {
                     ? types_1.FirmwareType.BitcoinOnly
                     : types_1.FirmwareType.Regular;
         }
-        const deviceInfo = (_d = models_1.models[feat.internal_model]) !== null && _d !== void 0 ? _d : {
+        const deviceInfo = models_1.models[feat.internal_model] ?? {
             name: `Unknown ${feat.internal_model}`,
             colors: {},
         };
         this.name = deviceInfo.name;
-        if (feat === null || feat === void 0 ? void 0 : feat.unit_color) {
+        if (feat?.unit_color) {
             const deviceUnitColor = feat.unit_color.toString();
             if (deviceUnitColor in deviceInfo.colors) {
                 this.color = deviceInfo.colors[deviceUnitColor];
@@ -666,9 +686,8 @@ class Device extends utils_1.TypedEmitter {
         return !!this.unreadableError;
     }
     disconnect() {
-        var _a;
         _log.debug('Disconnect cleanup');
-        (_a = this.sessionDfd) === null || _a === void 0 ? void 0 : _a.reject(new Error());
+        this.sessionDfd?.reject(new Error());
         this.lastAcquiredHere = false;
         this.emitLifecycle(events_1.DEVICE.DISCONNECT);
         return this.interruptionFromUser(constants_1.ERRORS.TypedError('Device_Disconnected'));
@@ -746,12 +765,11 @@ class Device extends utils_1.TypedEmitter {
         return null;
     }
     async dispose() {
-        var _a, _b;
         this.removeAllListeners();
         if (this.session && this.lastAcquiredHere) {
             try {
-                await ((_a = this.cancelableAction) === null || _a === void 0 ? void 0 : _a.call(this));
-                await ((_b = this.commands) === null || _b === void 0 ? void 0 : _b.cancel());
+                await this.cancelableAction?.();
+                await this.commands?.cancel();
                 return this.transport.release({
                     session: this.session,
                     path: this.transportPath,
@@ -772,7 +790,6 @@ class Device extends utils_1.TypedEmitter {
         return 'normal';
     }
     toMessageObject() {
-        var _a;
         const { name, uniquePath: path } = this;
         const base = { path, name };
         if (this.unreadableError) {
@@ -804,7 +821,7 @@ class Device extends utils_1.TypedEmitter {
             id: this.features.device_id,
             label,
             _state: this.getState(),
-            state: (_a = this.getState()) === null || _a === void 0 ? void 0 : _a.staticSessionId,
+            state: this.getState()?.staticSessionId,
             status,
             mode: this.getMode(),
             color: this.color,

package/lib/device/DeviceCommands.d.ts

@@ -80,7 +80,11 @@ export declare class DeviceCommands {
     cancelWithFallback(): Promise<{
         readonly success: false;
         readonly error: "session not found";
-    } | import("@trezor/transport/lib/types").Success<import("@trezor/protobuf").MessageFromTrezor> | import("@trezor/transport/lib/types").ErrorGeneric<"session not found" | "Network request failed" | "Wrong result type." | "other call in progress" | "Malformed protocol format" | "device disconnected during action" | "unexpected error" | "Aborted by timeout" | "Aborted by signal" | "This transport can not be used in this environment" | "device not found" | "Unable to open device" | "A transfer error has occurred."> | import("@trezor/transport/lib/types").Success<undefined> | undefined>;
+    } | import("@trezor/transport/lib/types").Success<import("@trezor/protobuf").MessageFromTrezor> | {
+        success: false;
+        error: "session not found" | "Network request failed" | "Wrong result type." | "other call in progress" | "Malformed protocol format" | "device disconnected during action" | "unexpected error" | "Aborted by timeout" | "Aborted by signal" | "This transport can not be used in this environment" | "device not found" | "Unable to open device" | "A transfer error has occurred.";
+        message?: string;
+    } | import("@trezor/transport/lib/types").Success<undefined> | undefined>;
     cancel(): Promise<void>;
 }
 export type TypedCall = DeviceCommands['typedCall'];

package/lib/device/DeviceCommands.js

@@ -51,6 +51,11 @@ const filterForLog = (type, msg) => {
     return msg;
 };
 class DeviceCommands {
+    device;
+    transport;
+    transportSession;
+    disposed;
+    callPromise;
     constructor(device, transport, transportSession) {
         this.device = device;
         this.transport = transport;
@@ -234,7 +239,7 @@ class DeviceCommands {
         if (this.disposed) {
             throw constants_1.ERRORS.TypedError('Runtime', 'typedCall: DeviceCommands already disposed');
         }
-        (0, schema_utils_1.Assert)(protobuf_1.MessagesSchema.MessageType.properties[type], msg !== null && msg !== void 0 ? msg : {});
+        (0, schema_utils_1.Assert)(protobuf_1.MessagesSchema.MessageType.properties[type], msg ?? {});
         const response = await this._commonCall(type, msg);
         try {
             assertType(response, resType);
@@ -372,7 +377,7 @@ class DeviceCommands {
         const { name, version } = this.transport;
         if (name === 'BridgeTransport' && !utils_1.versionUtils.isNewer(version, '2.0.28')) {
             try {
-                await (0, utils_1.createTimeoutPromise)(1);
+                await (0, utils_1.resolveAfter)(1);
                 await this.device.acquire();
                 await (0, prompts_1.cancelPrompt)(this.device, false);
             }

package/lib/device/DeviceList.d.ts

@@ -45,6 +45,7 @@ export declare class DeviceList extends TypedEmitter<DeviceListEvents> implement
     }[];
     private readonly locks;
     private transportLock;
+    private readonly scheduledUpgradeChecks;
     constructor({ messages, priority, debug, _sessionsBackgroundUrl, manifest, }: ConstructorParams);
     private tryGetTransport;
     private getOrCreateTransport;
@@ -56,6 +57,7 @@ export declare class DeviceList extends TypedEmitter<DeviceListEvents> implement
     init(initParams?: InitParams): Promise<void>;
     private createInitPromise;
     private createReconnectDelay;
+    private scheduleUpgradeCheck;
     private selectTransport;
     private initializeTransport;
     private waitForDevices;

package/lib/device/DeviceList.js

@@ -9,7 +9,6 @@ const Device_1 = require("./Device");
 const transportInfo_1 = require("../data/transportInfo");
 const types_1 = require("../types");
 const utils_2 = require("../types/utils");
-const abortablePromise_1 = require("../utils/abortablePromise");
 const debug_1 = require("../utils/debug");
 const createAuthPenaltyManager = (priority) => {
     const penalizedDevices = {};
@@ -68,6 +67,13 @@ const assertDeviceListConnected = deviceList => {
 };
 exports.assertDeviceListConnected = assertDeviceListConnected;
 class DeviceList extends utils_1.TypedEmitter {
+    transport = {};
+    transports = [];
+    devices = createDeviceCollection();
+    deviceCounter = Date.now();
+    handshakeLock;
+    authPenaltyManager;
+    transportCommonArgs;
     isConnected() {
         return !!Object.keys(this.transport).length;
     }
@@ -81,13 +87,13 @@ class DeviceList extends utils_1.TypedEmitter {
     getActiveTransports() {
         return Object.values(this.transport).map(getTransportInfo);
     }
+    locks = {};
     async transportLock(apiType, abortMessage, action) {
-        var _a, _b;
-        const lock = (_a = this.locks[apiType]) !== null && _a !== void 0 ? _a : (this.locks[apiType] = { sequence: 0 });
+        const lock = this.locks[apiType] ?? (this.locks[apiType] = { sequence: 0 });
         lock.abortMessage = abortMessage;
         const sequence = ++lock.sequence;
         while (lock.promise) {
-            (_b = lock.abort) === null || _b === void 0 ? void 0 : _b.abort(new Error(abortMessage));
+            lock.abort?.abort(new Error(abortMessage));
             await lock.promise.catch(() => { });
         }
         if (sequence !== lock.sequence)
@@ -99,13 +105,9 @@ class DeviceList extends utils_1.TypedEmitter {
         });
         return lock.promise;
     }
+    scheduledUpgradeChecks = {};
     constructor({ messages, priority, debug, _sessionsBackgroundUrl, manifest, }) {
         super();
-        this.transport = {};
-        this.transports = [];
-        this.devices = createDeviceCollection();
-        this.deviceCounter = Date.now();
-        this.locks = {};
         const transportLogger = (0, debug_1.initLog)('@trezor/transport', debug);
         this.handshakeLock = (0, utils_1.getSynchronize)();
         this.authPenaltyManager = createAuthPenaltyManager(priority);
@@ -113,14 +115,13 @@ class DeviceList extends utils_1.TypedEmitter {
             messages,
             logger: transportLogger,
             sessionsBackgroundUrl: _sessionsBackgroundUrl,
-            id: (manifest === null || manifest === void 0 ? void 0 : manifest.appUrl) || 'unknown app',
+            id: manifest?.appUrl || 'unknown app',
         };
     }
     tryGetTransport(name) {
         return this.transports.find(t => t.name === name);
     }
     getOrCreateTransport(transportType) {
-        var _a;
         const { transportCommonArgs } = this;
         if (typeof transportType === 'string') {
             const existing = this.tryGetTransport(transportType);
@@ -143,7 +144,7 @@ class DeviceList extends utils_1.TypedEmitter {
         else if (typeof transportType === 'function' && 'prototype' in transportType) {
             const transportInstance = new transportType(transportCommonArgs);
             if ((0, transport_1.isTransportInstance)(transportInstance)) {
-                return (_a = this.tryGetTransport(transportInstance.name)) !== null && _a !== void 0 ? _a : transportInstance;
+                return this.tryGetTransport(transportInstance.name) ?? transportInstance;
             }
         }
         else if ((0, transport_1.isTransportInstance)(transportType)) {
@@ -158,7 +159,7 @@ class DeviceList extends utils_1.TypedEmitter {
         throw constants_1.ERRORS.TypedError('Runtime', `DeviceList.init: transports[] of unexpected type: ${transportType}`);
     }
     createTransports(transports) {
-        const transportTypes = (transports === null || transports === void 0 ? void 0 : transports.length) ? transports : ['BridgeTransport'];
+        const transportTypes = transports?.length ? transports : ['BridgeTransport'];
         return transportTypes.map(this.getOrCreateTransport.bind(this));
     }
     onDeviceConnected(descriptor, transport) {
@@ -179,15 +180,15 @@ class DeviceList extends utils_1.TypedEmitter {
     }
     onDeviceDisconnected(descriptor, transport) {
         const device = this.devices.remove(descriptor.path, transport);
-        device === null || device === void 0 ? void 0 : device.disconnect();
+        device?.disconnect();
     }
     onDeviceSessionChanged(descriptor, transport) {
         const device = this.devices.get(descriptor.path, transport);
-        device === null || device === void 0 ? void 0 : device.updateDescriptor(descriptor);
+        device?.updateDescriptor(descriptor);
     }
     onDeviceRequestRelease(descriptor, transport) {
         const device = this.devices.get(descriptor.path, transport);
-        device === null || device === void 0 ? void 0 : device.usedElsewhere();
+        device?.usedElsewhere();
     }
     async init(initParams = {}) {
         this.transports = this.createTransports(initParams.transports);
@@ -237,9 +238,12 @@ class DeviceList extends utils_1.TypedEmitter {
                     this.emit(transport_1.TRANSPORT.START, getTransportInfo(transport));
                 }
             }
+            if (transport && transport !== transports[0]) {
+                this.scheduleUpgradeCheck(apiType, initParams);
+            }
         }
         catch (error) {
-            this.emit(transport_1.TRANSPORT.ERROR, { apiType, error: error === null || error === void 0 ? void 0 : error.message });
+            this.emit(transport_1.TRANSPORT.ERROR, { apiType, error: error?.message });
             if (initParams.transportReconnect && !abortSignal.aborted) {
                 this.transportLock(apiType, 'Reconnecting', async (signal) => {
                     await this.createReconnectDelay(signal);
@@ -249,9 +253,25 @@ class DeviceList extends utils_1.TypedEmitter {
         }
     }
     createReconnectDelay(signal) {
-        const { promise, resolve } = (0, abortablePromise_1.abortablePromise)(signal);
-        const timeout = setTimeout(resolve, 1000);
-        return promise.finally(() => clearTimeout(timeout));
+        return (0, utils_1.resolveAfter)(1000, signal);
+    }
+    scheduleUpgradeCheck(apiType, initParams) {
+        clearTimeout(this.scheduledUpgradeChecks[apiType]);
+        this.scheduledUpgradeChecks[apiType] = setTimeout(async () => {
+            const transport = this.transport[apiType];
+            const transports = this.transports.filter(t => t.apiType === apiType);
+            if (!transport || transport === transports[0])
+                return;
+            for (const t of transports) {
+                if (t === transport)
+                    break;
+                if (await t.ping()) {
+                    this.transportLock(apiType, 'Upgrading', signal => this.createInitPromise(apiType, initParams, signal)).catch(() => { });
+                    return;
+                }
+            }
+            this.scheduleUpgradeCheck(apiType, initParams);
+        }, 1000);
     }
     async selectTransport([transport, ...rest], signal) {
         if (signal.aborted)
@@ -324,7 +344,7 @@ class DeviceList extends utils_1.TypedEmitter {
     }
     getDeviceByStaticState(state) {
         const deviceId = state.split('@')[1].split(':')[0];
-        return this.devices.all().find(d => { var _a; return ((_a = d.features) === null || _a === void 0 ? void 0 : _a.device_id) === deviceId; });
+        return this.devices.all().find(d => d.features?.device_id === deviceId);
     }
     async dispose() {
         this.removeAllListeners();
@@ -341,6 +361,7 @@ class DeviceList extends utils_1.TypedEmitter {
         await Promise.all(promises);
     }
     async stopTransport(transport) {
+        clearTimeout(this.scheduledUpgradeChecks[transport.apiType]);
         const devices = this.devices.clear(transport);
         devices.forEach(device => {
             this.emit(events_1.DEVICE.DISCONNECT, device);
@@ -349,7 +370,7 @@ class DeviceList extends utils_1.TypedEmitter {
             this.authPenaltyManager.remove(device);
             await device.dispose();
         }));
-        transport === null || transport === void 0 ? void 0 : transport.stop();
+        transport?.stop();
     }
     async enumerate() {
         const promises = Object.values(this.transport).map(async (transport) => {
@@ -358,8 +379,7 @@ class DeviceList extends utils_1.TypedEmitter {
                 return;
             }
             res.payload.forEach(d => {
-                var _a;
-                (_a = this.devices.get(d.path, transport)) === null || _a === void 0 ? void 0 : _a.updateDescriptor(d);
+                this.devices.get(d.path, transport)?.updateDescriptor(d);
             });
         });
         await Promise.all(promises);

package/lib/device/StateStorage.js

@@ -3,15 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebextensionStateStorage = void 0;
 const connect_common_1 = require("@trezor/connect-common");
 class WebextensionStateStorage {
+    origin;
     constructor(origin) {
         this.origin = origin;
     }
     loadState(device) {
-        var _a;
-        if (!((_a = device.getState()) === null || _a === void 0 ? void 0 : _a.sessionId)) {
+        if (!device.getState()?.sessionId) {
             const { preferredDevice } = connect_common_1.storage.loadForOrigin(this.origin) || {};
-            if ((preferredDevice === null || preferredDevice === void 0 ? void 0 : preferredDevice.internalState) &&
-                (preferredDevice === null || preferredDevice === void 0 ? void 0 : preferredDevice.internalStateExpiration) &&
+            if (preferredDevice?.internalState &&
+                preferredDevice?.internalStateExpiration &&
                 preferredDevice.internalStateExpiration > new Date().getTime()) {
                 return { sessionId: preferredDevice.internalState };
             }
@@ -19,8 +19,7 @@ class WebextensionStateStorage {
         return undefined;
     }
     saveState(device, state) {
-        var _a;
-        const expirationDelay = Math.max(1000 * 60 * 15, (_a = device.features.auto_lock_delay_ms) !== null && _a !== void 0 ? _a : 0);
+        const expirationDelay = Math.max(1000 * 60 * 15, device.features.auto_lock_delay_ms ?? 0);
         connect_common_1.storage.saveForOrigin(store => ({
             ...store,
             preferredDevice: store.preferredDevice

package/lib/device/checkFirmwareRevision.js

@@ -4,7 +4,13 @@ exports.checkFirmwareRevision = void 0;
 const versionUtils_1 = require("@trezor/utils/lib/versionUtils");
 const downloadReleasesMetadata_1 = require("../data/downloadReleasesMetadata");
 const calculateRevisionForDevice_1 = require("./calculateRevisionForDevice");
-const NODE_FETCH_OFFLINE_ERROR_NAMES = ['FetchError', 'AbortError'];
+const isNodeJSNetworkError = (e) => ['FetchError', 'AbortError'].includes(e.name);
+const isReactNativeNetworkError = (e) => e.name === 'TypeError' && e.message.includes('Network request failed');
+const isNetworkError = (e) => {
+    if (!(e instanceof Error))
+        return false;
+    return isNodeJSNetworkError(e) || isReactNativeNetworkError(e);
+};
 const getOnlineReleaseMetadata = async ({ firmwareVersion, internalModel, }) => {
     const onlineReleases = await (0, downloadReleasesMetadata_1.downloadReleasesMetadata)({ internal_model: internalModel });
     return onlineReleases.find(onlineRelease => (0, versionUtils_1.isEqual)(onlineRelease.version, firmwareVersion));
@@ -30,7 +36,7 @@ const checkFirmwareRevision = async ({ firmwareVersion, internalModel, deviceRev
                 firmwareVersion,
                 internalModel,
             });
-            if ((onlineRelease === null || onlineRelease === void 0 ? void 0 : onlineRelease.firmware_revision) === undefined) {
+            if (onlineRelease?.firmware_revision === undefined) {
                 return failFirmwareRevisionCheck('firmware-version-unknown');
             }
             if (!doRevisionsMatch({
@@ -43,10 +49,9 @@ const checkFirmwareRevision = async ({ firmwareVersion, internalModel, deviceRev
             return { success: true };
         }
         catch (e) {
-            if (NODE_FETCH_OFFLINE_ERROR_NAMES.includes(e.name)) {
-                return failFirmwareRevisionCheck('cannot-perform-check-offline');
-            }
-            return failFirmwareRevisionCheck('other-error');
+            return isNetworkError(e)
+                ? failFirmwareRevisionCheck('cannot-perform-check-offline')
+                : failFirmwareRevisionCheck('other-error');
         }
     }
     if (!doRevisionsMatch({