@trezor/connect 9.3.1-beta.1 → 9.3.1-beta.2

package/CHANGELOG.md

@@ -1,15 +1,73 @@
 |             Package              | Stable |    Canary    |
 | :------------------------------: | :----: | :----------: |
-|       npm @trezor/connect        | 9.3.0  | 9.3.1-beta.1 |
-|     npm @trezor/connect-web      | 9.3.0  | 9.3.1-beta.1 |
-| npm @trezor/connect-webextension | 9.3.0  | 9.3.1-beta.1 |
+|       npm @trezor/connect        | 9.3.0  | 9.3.1-beta.2 |
+|     npm @trezor/connect-web      | 9.3.0  | 9.3.1-beta.2 |
+| npm @trezor/connect-webextension | 9.3.0  | 9.3.1-beta.2 |
 
 |     Deployment     | Stable |    Canary    |
 | :----------------: | :----: | :----------: |
-| connect.trezor.io/ | 9.3.0  | 9.3.1-beta.1 |
+| connect.trezor.io/ | 9.3.0  | 9.3.1-beta.2 |
 
 Use the persistent link [connect.trezor.io/9](https://connect.trezor.io/9/) to access the latest stable version of Connect Explorer.
 
+# 9.3.1-beta.2
+
+-   refactor(connect): removed initDeviceList, move transportReconnect inside DeviceList, make DeviceList reusable, device list constructor not throwing, singleton-like DeviceList, separate onTransportUpdate, pendingTransportEvent improved, improve DeviceList init flow (f4b3694, 02215de, b53259b, e8c6c25, e395dc8, 6509e5c, 3e30d64, d173966, 50cbbea, 1a81d89, 4780c51, 75bfe75, 83c0cb3, 73261c8, f2167bf, bb7dfee)
+-   fix(connect): correctly wait for device selection in case of overriding (0c7a3bd)
+-   fix(connect): Fork old PassphraseTypeCard to connect (155afda)
+-   fix(connect): longer timeout for getFeatures due to suite-native performance issue (0910ab7)
+-   fix(connect): handle malformed EIP-712 data (d111006)
+-   fix(connect): remove superfluous space from error message (81be584)
+-   fix(connect): correctly await transport.receive (31c8519)
+-   fix(connect): proper pendingTransportEvent waiting (baa4144)
+-   chore(connect): add a comment to legacy code (a23a365)
+
+## connect-web
+
+-   don't fallback to core in popup with no webusb (7120e83)
+-   clean up in popupmanager when useUi=false (9bc2ea9)
+
+## connect-popup
+
+-   add missing device icons (9fdd1d7)
+
+## connect-webextension
+
+-   Allow multiple content script extension conflicts (348b32a)
+
+## connect-explorer
+
+-   wrong default coreMode in settings (3a81f14)
+-   don't validate connectSrc in webextension (8737d47)
+-   add link to new webextension example (86a13b1)
+
+## Dependencies update
+
+-   bump react-intl from 6.6.2 to 6.6.8
+-   bump @types/chrome from 0.0.260 to 0.0.269
+-   bump playwright from 1.41.2 to 1.45.3
+-   bump webpack-merge from 5.10.0 to 6.0.1
+-   bump webpack-dev-server from 4.15.1 to 5.0.4
+-   bump @babel/preset-typescript from 7.23.3 to 7.24.7
+-   bump @babel/preset-react from 7.23.3 to 7.24.7
+-   bump webpack from 5.90.1 to 5.93.0
+-   bump rimraf from 5.0.5 to 6.0.1
+-   bump txs from 4.7.0 to 4.16.2
+
+-   npm-prerelease: @trezor/blockchain-link 2.2.1-beta.2
+-   npm-prerelease: @trezor/blockchain-link-utils 1.1.1-beta.2
+-   npm-prerelease: @trezor/blockchain-link-types 1.1.1-beta.2
+-   npm-prerelease: @trezor/analytics 1.1.1-beta.1
+-   npm-prerelease: @trezor/connect-common 0.1.1-beta.2
+-   npm-prerelease: @trezor/env-utils 1.1.1-beta.1
+-   npm-prerelease: @trezor/transport 1.2.1-beta.2
+-   npm-prerelease: @trezor/protobuf 1.1.1-beta.2
+-   npm-prerelease: @trezor/schema-utils 1.1.1-beta.1
+-   npm-prerelease: @trezor/protocol 1.1.1-beta.1
+-   npm-prerelease: @trezor/utxo-lib 2.1.1-beta.1
+-   npm-prerelease: @trezor/utils 9.1.1-beta.2
+-   npm-release: @trezor/connect 9.3.1-beta.2
+
 # 9.3.1-beta.1
 
 We introduce a new init option `coreMode`, which allows websites to interact either using the existing `iframe` mode or the new `popup` mode. The `popup` mode is allows to use WebUSB even on third-party websites, which is not possible with the `iframe` mode. By default, the `coreMode` is set to `auto`, which means that the library will automatically choose the best mode based on the environment. More information can be found in [init method documentation](https://connect.trezor.io/9.3.1-beta.1/methods/other/init/).
@@ -20,50 +78,50 @@ AuthenticateDevice verify CA cert extensions (4ba4445)
 
 Add support for T3B1 (f7f1705)
 
-    - chore(connect): Add Ambire Browser Extension to knownHosts (cbe81ab)
-    - chore(connect): remove ethereum-cryptography (18851d1)
-    - chore(connect): split public and internal settings type (3aab4ea)
-    - chore(connect): remove useCoreInPopup from explorer and tests (fee60c1)
-    - chore(connect): add new CA pubkeys and update timestamp (48ec951)
-    - chore(connect): refactoring of the CheckFirmwareAuthenticity to support local binary (and wont download it from web, when its available in the suite) (82ab513)
-    - docs(connect): describe coreMode (a5238d6)
-    - fix(connect): disallow interaction-less fw update when switching fw type (4936939)
-    - fix(connect): validate x509 asn1 component (bc13fe2)
-    - fix(connect): handle missing language binary (954dbb9)
-    - fix(connect): proceed with fw install even when language data fails to download (b40d1b7)
-    - test(connect): x509 extensions parser (163c82c)
-    - test(connect): update to min version fw 1.0.9 and 2.3.0 (544c311)
+-   chore(connect): Add Ambire Browser Extension to knownHosts (cbe81ab)
+-   chore(connect): remove ethereum-cryptography (18851d1)
+-   chore(connect): split public and internal settings type (3aab4ea)
+-   chore(connect): remove useCoreInPopup from explorer and tests (fee60c1)
+-   chore(connect): add new CA pubkeys and update timestamp (48ec951)
+-   chore(connect): refactoring of the CheckFirmwareAuthenticity to support local binary (and wont download it from web, when its available in the suite) (82ab513)
+-   docs(connect): describe coreMode (a5238d6)
+-   fix(connect): disallow interaction-less fw update when switching fw type (4936939)
+-   fix(connect): validate x509 asn1 component (bc13fe2)
+-   fix(connect): handle missing language binary (954dbb9)
+-   fix(connect): proceed with fw install even when language data fails to download (b40d1b7)
+-   test(connect): x509 extensions parser (163c82c)
+-   test(connect): update to min version fw 1.0.9 and 2.3.0 (544c311)
 
 ## connect-ui
 
-    - remove bridge references, deeplink to suite desktop (98e98a4)
+-   remove bridge references, deeplink to suite desktop (98e98a4)
 
 ## connect-plugin-stellar
 
-    - update stellar sdk (89cf20e)
-    - update trends libs (70b9c11)
+-   update stellar sdk (89cf20e)
+-   update trends libs (70b9c11)
 
 ## connect-web
 
-    - default coreMode to auto (e45d47e)
-    - automatic fallback to core in popup (e4e1fcc)
+-   default coreMode to auto (e45d47e)
+-   automatic fallback to core in popup (e4e1fcc)
 
 ## connect-webextension
 
-    - link changelog to the one in connect (a02ec72)
+-   link changelog to the one in connect (a02ec72)
 
 ## connect-explorer
 
-    - applySettings optional values (0bcd83a)
-    - hide extra headings from toc in homepage (14f89c4)
-    - show success message in settings (0ca7c0c)
-    - remove MTT for firmwareUpdate (ebbe96c)
-    - bad styled-components prop (e2b7fc7)
+-   applySettings optional values (0bcd83a)
+-   hide extra headings from toc in homepage (14f89c4)
+-   show success message in settings (0ca7c0c)
+-   remove MTT for firmwareUpdate (ebbe96c)
+-   bad styled-components prop (e2b7fc7)
 
 ## connect-common
 
-    - add new fw 2.8.0 (314052b)
-    - fw version 1.9.0 and 2.3.0 required (ee623e4)
+-   add new fw 2.8.0 (314052b)
+-   fw version 1.9.0 and 2.3.0 required (ee623e4)
 
 # 9.3.0
 

package/README.md

@@ -1,6 +1,6 @@
 # @trezor/connect
 
-API version 9.3.1-beta.1
+API version 9.3.1-beta.2
 
 [![Build Status](https://github.com/trezor/trezor-suite/actions/workflows/test-connect.yml/badge.svg)](https://github.com/trezor/trezor-suite/actions/workflows/test-connect.yml)
 [![NPM](https://img.shields.io/npm/v/@trezor/connect.svg)](https://www.npmjs.org/package/@trezor/connect)

package/lib/api/ethereum/api/ethereumSignTypedData.js

@@ -150,7 +150,9 @@ class EthereumSignTypedData extends AbstractMethod_1.AbstractMethod {
                     memberTypeName = memberTypeDefinition.type;
                     memberData = memberData[memberTypeDefinition.name];
                 }
-                else {
+                if (memberData === null || memberData === undefined) {
+                    cmd.typedCall('Cancel', 'Success');
+                    throw constants_1.ERRORS.TypedError('Runtime', `Value from member path ${member_path} is missing in the data object`);
                 }
             }
             let encodedData;

package/lib/core/index.js

@@ -24,7 +24,7 @@ let _core;
 let _deviceList;
 const _callMethods = [];
 let _interactionTimeout;
-let _deviceListInitTimeout;
+let _deviceListInitReject;
 let _overridePromise;
 const methodSynchronize = (0, utils_2.getSynchronize)();
 let waitForFirstMethod = (0, utils_1.createDeferred)();
@@ -51,13 +51,8 @@ const interactionTimeout = () => _interactionTimeout.start(() => {
 });
 const uiPromises = (0, uiPromiseManager_1.createUiPromiseManager)(interactionTimeout);
 const initDevice = async (devicePath) => {
-    if (!_deviceList) {
-        throw constants_1.ERRORS.TypedError('Transport_Missing');
-    }
-    await _deviceList.transportFirstEventPromise;
-    if (!_deviceList) {
-        throw constants_1.ERRORS.TypedError('Transport_Missing');
-    }
+    await _deviceList.pendingConnection();
+    _deviceList.assertConnected();
     const isWebUsb = _deviceList.transportType() === 'WebUsbTransport';
     let device;
     let showDeviceSelection = isWebUsb;
@@ -91,9 +86,7 @@ const initDevice = async (devicePath) => {
     if (showDeviceSelection) {
         uiPromises.create(events_2.UI.RECEIVE_DEVICE);
         await waitForPopup();
-        if (!_deviceList) {
-            throw constants_1.ERRORS.TypedError('Transport_Missing');
-        }
+        _deviceList.assertConnected();
         const devices = _deviceList.asArray();
         if (devices.length === 1 &&
             devices[0].type !== 'unreadable' &&
@@ -123,6 +116,9 @@ const initDevice = async (devicePath) => {
             }
         }
     }
+    else if (uiPromises.exists(events_2.UI.RECEIVE_DEVICE)) {
+        await uiPromises.get(events_2.UI.RECEIVE_DEVICE);
+    }
     if (!device) {
         throw constants_1.ERRORS.TypedError('Device_NotFound');
     }
@@ -332,8 +328,10 @@ const onCall = async (message) => {
         postMessage(messageResponse);
         return Promise.resolve();
     }
-    if (!_deviceList && !DataManager_1.DataManager.getSettings('transportReconnect')) {
-        await initDeviceList(false);
+    if (!_deviceList.isConnected() && !_deviceList.pendingConnection()) {
+        const { transports, pendingTransportEvent } = DataManager_1.DataManager.getSettings();
+        _deviceList.setTransports(transports);
+        await _deviceList.init({ pendingTransportEvent });
     }
     if (method.isManagementRestricted()) {
         postMessage((0, events_2.createPopupMessage)(events_2.POPUP.CANCEL_POPUP_REQUEST));
@@ -433,11 +431,12 @@ const onCall = async (message) => {
         });
     }
     catch (error) {
-        if (_deviceList && error.code === 'Device_Disconnected') {
+        if (error.code === 'Device_Disconnected') {
             _deviceList.addAuthPenalty(device);
         }
         if (method) {
-            if (_deviceList && error.message === transport_1.TRANSPORT_ERROR.SESSION_WRONG_PREVIOUS) {
+            if (_deviceList.isConnected() &&
+                error.message === transport_1.TRANSPORT_ERROR.SESSION_WRONG_PREVIOUS) {
                 await _deviceList.enumerate();
             }
             messageResponse = (0, events_2.createResponseMessage)(method.responseID, false, { error });
@@ -466,10 +465,8 @@ const onCall = async (message) => {
             if (method) {
                 method.dispose();
             }
-            if (_deviceList) {
-                if (response.success) {
-                    _deviceList.removeAuthPenalty(device);
-                }
+            if (response.success) {
+                _deviceList.removeAuthPenalty(device);
             }
             if (!useCoreInPopup) {
                 postMessage(response);
@@ -541,7 +538,7 @@ const onPopupClosed = (customErrorMessage) => {
     const error = customErrorMessage
         ? constants_1.ERRORS.TypedError('Method_Cancel', customErrorMessage)
         : constants_1.ERRORS.TypedError('Method_Interrupted');
-    if (_deviceList && _deviceList.asArray().length > 0) {
+    if (_deviceList.isConnected() && _deviceList.asArray().length > 0) {
         _deviceList.allDevices().forEach(d => {
             d.keepSession = false;
             if (d.isUsedHere()) {
@@ -567,7 +564,7 @@ const onPopupClosed = (customErrorMessage) => {
 };
 const handleDeviceSelectionChanges = (interruptDevice) => {
     const promiseExists = uiPromises.exists(events_2.UI.RECEIVE_DEVICE);
-    if (promiseExists && _deviceList) {
+    if (promiseExists && _deviceList.isConnected()) {
         const list = _deviceList.asArray();
         const isWebUsb = _deviceList.transportType() === 'WebUsbTransport';
         if (list.length === 1 && !isWebUsb) {
@@ -592,62 +589,29 @@ const handleDeviceSelectionChanges = (interruptDevice) => {
         }
     }
 };
-const initDeviceList = async (transportReconnect) => {
-    try {
-        _deviceList = new DeviceList_1.DeviceList({
-            settings: DataManager_1.DataManager.getSettings(),
-            messages: DataManager_1.DataManager.getProtobufMessages(),
-        });
-        _deviceList.on(events_2.DEVICE.CONNECT, device => {
-            handleDeviceSelectionChanges();
-            postMessage((0, events_2.createDeviceMessage)(events_2.DEVICE.CONNECT, device));
-        });
-        _deviceList.on(events_2.DEVICE.CONNECT_UNACQUIRED, device => {
-            handleDeviceSelectionChanges();
-            postMessage((0, events_2.createDeviceMessage)(events_2.DEVICE.CONNECT_UNACQUIRED, device));
-        });
-        _deviceList.on(events_2.DEVICE.DISCONNECT, device => {
-            handleDeviceSelectionChanges(device);
-            postMessage((0, events_2.createDeviceMessage)(events_2.DEVICE.DISCONNECT, device));
-        });
-        _deviceList.on(events_2.DEVICE.CHANGED, device => {
-            postMessage((0, events_2.createDeviceMessage)(events_2.DEVICE.CHANGED, device));
-        });
-        _deviceList.on(transport_1.TRANSPORT.ERROR, error => {
-            _log.warn('TRANSPORT.ERROR', error);
-            if (_deviceList) {
-                _deviceList.disconnectDevices();
-                _deviceList.dispose();
-            }
-            _deviceList = undefined;
-            postMessage((0, events_2.createTransportMessage)(transport_1.TRANSPORT.ERROR, { error }));
-            if (transportReconnect) {
-                const { promise, timeout } = (0, promiseUtils_1.resolveAfter)(1000, null);
-                _deviceListInitTimeout = timeout;
-                promise.then(() => {
-                    initDeviceList(transportReconnect);
-                });
-            }
-        });
-        _deviceList.on(transport_1.TRANSPORT.START, transportType => postMessage((0, events_2.createTransportMessage)(transport_1.TRANSPORT.START, transportType)));
-        _deviceList.init();
-        if (_deviceList) {
-            await _deviceList.waitForTransportFirstEvent();
-        }
-    }
-    catch (error) {
-        _deviceList = undefined;
+const createDeviceList = (params) => {
+    const deviceList = new DeviceList_1.DeviceList(params);
+    deviceList.on(events_2.DEVICE.CONNECT, device => {
+        handleDeviceSelectionChanges();
+        postMessage((0, events_2.createDeviceMessage)(events_2.DEVICE.CONNECT, device));
+    });
+    deviceList.on(events_2.DEVICE.CONNECT_UNACQUIRED, device => {
+        handleDeviceSelectionChanges();
+        postMessage((0, events_2.createDeviceMessage)(events_2.DEVICE.CONNECT_UNACQUIRED, device));
+    });
+    deviceList.on(events_2.DEVICE.DISCONNECT, device => {
+        handleDeviceSelectionChanges(device);
+        postMessage((0, events_2.createDeviceMessage)(events_2.DEVICE.DISCONNECT, device));
+    });
+    deviceList.on(events_2.DEVICE.CHANGED, device => {
+        postMessage((0, events_2.createDeviceMessage)(events_2.DEVICE.CHANGED, device));
+    });
+    deviceList.on(transport_1.TRANSPORT.START, transportType => postMessage((0, events_2.createTransportMessage)(transport_1.TRANSPORT.START, transportType)));
+    deviceList.on(transport_1.TRANSPORT.ERROR, error => {
+        _log.warn('TRANSPORT.ERROR', error);
         postMessage((0, events_2.createTransportMessage)(transport_1.TRANSPORT.ERROR, { error }));
-        if (!transportReconnect) {
-            throw error;
-        }
-        else {
-            const { promise, timeout } = (0, promiseUtils_1.resolveAfter)(3000, null);
-            _deviceListInitTimeout = timeout;
-            await promise;
-            await initDeviceList(transportReconnect);
-        }
-    }
+    });
+    return deviceList;
 };
 class Core extends events_1.default {
     constructor() {
@@ -668,7 +632,9 @@ class Core extends events_1.default {
                 disableWebUSBTransport();
                 break;
             case transport_1.TRANSPORT.REQUEST_DEVICE:
-                _deviceList === null || _deviceList === void 0 ? void 0 : _deviceList.enumerate();
+                if (_deviceList.isConnected()) {
+                    _deviceList.enumerate();
+                }
                 break;
             case transport_1.TRANSPORT.GET_INFO:
                 postMessage((0, events_2.createResponseMessage)(message.id, true, this.getTransportInfo()));
@@ -687,6 +653,7 @@ class Core extends events_1.default {
                 break;
             case events_2.IFRAME.CALL:
                 if (message.payload.method === 'firmwareUpdate') {
+                    _deviceList.assertConnected();
                     (0, onCallFirmwareUpdate_1.onCallFirmwareUpdate)({
                         params: message.payload,
                         context: {
@@ -714,30 +681,24 @@ class Core extends events_1.default {
     }
     dispose() {
         (0, BlockchainLink_1.dispose)();
-        if (_deviceListInitTimeout) {
-            clearTimeout(_deviceListInitTimeout);
-        }
+        _deviceListInitReject === null || _deviceListInitReject === void 0 ? void 0 : _deviceListInitReject(new Error('Disposed during initialization'));
         this.removeAllListeners();
         this.abortController.abort();
-        if (_deviceList) {
-            _deviceList.dispose();
-        }
+        _deviceList.dispose();
     }
     async getCurrentMethod() {
         await waitForFirstMethod.promise;
         return await methodSynchronize(() => _callMethods[0]);
     }
     getTransportInfo() {
-        if (!_deviceList) {
-            return undefined;
+        if (_deviceList.isConnected()) {
+            return _deviceList.getTransportInfo();
         }
-        return _deviceList.getTransportInfo();
     }
     enumerate() {
-        if (!_deviceList) {
-            return;
+        if (_deviceList.isConnected()) {
+            _deviceList.enumerate();
         }
-        _deviceList.enumerate();
     }
     async init(settings, onCoreEvent, logWriterFactory) {
         if (logWriterFactory) {
@@ -745,8 +706,11 @@ class Core extends events_1.default {
         }
         try {
             await DataManager_1.DataManager.load(settings);
-            (0, debug_1.enableLog)(DataManager_1.DataManager.getSettings('debug'));
+            const { debug, priority } = DataManager_1.DataManager.getSettings();
+            const messages = DataManager_1.DataManager.getProtobufMessages();
+            (0, debug_1.enableLog)(debug);
             _core = this;
+            _deviceList = createDeviceList({ debug, messages, priority });
             _interactionTimeout = new interactionTimeout_1.InteractionTimeout(settings.popup ? settings.interactionTimeout : 0);
             this.on(events_2.CORE_EVENT, onCoreEvent);
         }
@@ -754,43 +718,44 @@ class Core extends events_1.default {
             _log.error('init', error);
             throw error;
         }
+        const { transports, pendingTransportEvent, transportReconnect, coreMode } = DataManager_1.DataManager.getSettings();
         try {
-            if (!DataManager_1.DataManager.getSettings('transportReconnect') ||
-                DataManager_1.DataManager.getSettings('coreMode') === 'auto') {
-                await initDeviceList(false);
-            }
-            else {
-                initDeviceList(true);
-            }
+            _deviceList.setTransports(transports);
         }
         catch (error) {
-            _log.error('initTransport', error);
+            _log.error('setTransports', error);
+            postMessage((0, events_2.createTransportMessage)(transport_1.TRANSPORT.ERROR, { error }));
             throw error;
         }
+        _deviceList.init({ pendingTransportEvent, transportReconnect });
+        if (!transportReconnect || coreMode === 'auto') {
+            await _deviceList.pendingConnection();
+        }
     }
 }
 exports.Core = Core;
 const disableWebUSBTransport = async () => {
-    var _a;
-    if (!_deviceList)
+    if (!_deviceList.isConnected())
         return;
     if (_deviceList.transportType() !== 'WebUsbTransport')
         return;
-    const settings = DataManager_1.DataManager.getSettings();
-    if (settings.transports) {
-        const transportStr = (_a = settings.transports) === null || _a === void 0 ? void 0 : _a.filter(transport => typeof transport !== 'object');
+    const { transports, pendingTransportEvent, transportReconnect } = DataManager_1.DataManager.getSettings();
+    if (transports) {
+        const transportStr = transports === null || transports === void 0 ? void 0 : transports.filter(transport => typeof transport !== 'object');
         if (transportStr.includes('WebUsbTransport')) {
-            settings.transports.splice(settings.transports.indexOf('WebUsbTransport'), 1);
+            transports.splice(transports.indexOf('WebUsbTransport'), 1);
         }
         if (!transportStr.includes('BridgeTransport')) {
-            settings.transports.unshift('BridgeTransport');
+            transports.unshift('BridgeTransport');
         }
     }
     try {
-        _deviceList.dispose();
-        await initDeviceList(settings.transportReconnect);
+        _deviceList.cleanup();
+        _deviceList.setTransports(transports);
+        await _deviceList.init({ pendingTransportEvent, transportReconnect });
     }
     catch (error) {
+        postMessage((0, events_2.createTransportMessage)(transport_1.TRANSPORT.ERROR, { error }));
     }
 };
 const initCore = async (settings, onCoreEvent, logWriterFactory) => {

package/lib/data/version.d.ts

@@ -1,3 +1,4 @@
-export declare const VERSION = "9.3.1-beta.1";
+export declare const VERSION = "9.3.1-beta.2";
 export declare const DEFAULT_DOMAIN: string;
+export declare const CONTENT_SCRIPT_VERSION = 1;
 //# sourceMappingURL=version.d.ts.map

package/lib/data/version.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_DOMAIN = exports.VERSION = void 0;
-exports.VERSION = '9.3.1-beta.1';
+exports.CONTENT_SCRIPT_VERSION = exports.DEFAULT_DOMAIN = exports.VERSION = void 0;
+exports.VERSION = '9.3.1-beta.2';
 const versionN = exports.VERSION.split('.').map(s => parseInt(s, 10));
 const isBeta = exports.VERSION.includes('beta');
 exports.DEFAULT_DOMAIN = isBeta
     ? `https://connect.trezor.io/${exports.VERSION}/`
     : `https://connect.trezor.io/${versionN[0]}/`;
+exports.CONTENT_SCRIPT_VERSION = 1;
 //# sourceMappingURL=version.js.map

package/lib/device/Device.d.ts

@@ -15,6 +15,7 @@ export type RunOptions = {
     useCardanoDerivation?: boolean;
 };
 export declare const GET_FEATURES_TIMEOUT = 3000;
+export declare const GET_FEATURES_TIMEOUT_REACT_NATIVE = 20000;
 export interface DeviceEvents {
     [DEVICE.PIN]: (device: Device, b: PROTO.PinMatrixRequestType | undefined, callback: (err: any, pin: string) => void) => void;
     [DEVICE.WORD]: (device: Device, b: PROTO.WordRequestType, callback: (err: any, word: string) => void) => void;

package/lib/device/Device.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Device = exports.GET_FEATURES_TIMEOUT = void 0;
+exports.Device = exports.GET_FEATURES_TIMEOUT_REACT_NATIVE = exports.GET_FEATURES_TIMEOUT = void 0;
 const utils_1 = require("@trezor/utils");
 const protocol_1 = require("@trezor/protocol");
 const DeviceCommands_1 = require("./DeviceCommands");
 const constants_1 = require("../constants");
 const events_1 = require("../events");
 const coinInfo_1 = require("../data/coinInfo");
+const DataManager_1 = require("../data/DataManager");
 const firmwareInfo_1 = require("../data/firmwareInfo");
 const deviceFeaturesUtils_1 = require("../utils/deviceFeaturesUtils");
 const debug_1 = require("../utils/debug");
@@ -16,6 +17,7 @@ const models_1 = require("../data/models");
 const getLanguage_1 = require("../data/getLanguage");
 const _log = (0, debug_1.initLog)('Device');
 exports.GET_FEATURES_TIMEOUT = 3000;
+exports.GET_FEATURES_TIMEOUT_REACT_NATIVE = 20000;
 const parseRunOptions = (options) => {
     if (!options)
         options = {};
@@ -175,9 +177,12 @@ class Device extends utils_1.TypedEmitter {
                     await this.initialize(!!options.useCardanoDerivation);
                 }
                 else {
+                    const getFeaturesTimeout = DataManager_1.DataManager.getSettings('env') === 'react-native'
+                        ? exports.GET_FEATURES_TIMEOUT_REACT_NATIVE
+                        : exports.GET_FEATURES_TIMEOUT;
                     await Promise.race([
                         this.getFeatures(),
-                        new Promise((_resolve, reject) => setTimeout(() => reject(new Error('GetFeatures timeout')), exports.GET_FEATURES_TIMEOUT)),
+                        new Promise((_resolve, reject) => setTimeout(() => reject(new Error('GetFeatures timeout')), getFeaturesTimeout)),
                     ]);
                 }
             }
@@ -191,7 +196,7 @@ class Device extends utils_1.TypedEmitter {
                 }
                 this.inconsistent = true;
                 delete this.runPromise;
-                return Promise.reject(constants_1.ERRORS.TypedError('Device_InitializeFailed', `Initialize failed: ${error.message} ${error.code ? `, code: ${error.code}` : ''}`));
+                return Promise.reject(constants_1.ERRORS.TypedError('Device_InitializeFailed', `Initialize failed: ${error.message}${error.code ? `, code: ${error.code}` : ''}`));
             }
         }
         if (options.keepSession) {

package/lib/device/DeviceCommands.js

@@ -230,7 +230,7 @@ class DeviceCommands {
             await this.transport.receive({
                 session: this.sessionId,
                 protocol: this.device.protocol,
-            });
+            }).promise;
             throw error;
         }
         return response;