@trezor/connect 9.1.11 → 9.2.0

package/lib/core/index.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initTransport = exports.initCore = exports.Core = exports.onCall = exports.handleMessage = void 0;
+exports.initCore = exports.Core = void 0;
 const tslib_1 = require("tslib");
 const events_1 = tslib_1.__importDefault(require("events"));
 const transport_1 = require("@trezor/transport");
-const createDeferred_1 = require("@trezor/utils/lib/createDeferred");
+const utils_1 = require("@trezor/utils");
+const utils_2 = require("@trezor/utils");
+const connect_common_1 = require("@trezor/connect-common");
 const DataManager_1 = require("../data/DataManager");
 const DeviceList_1 = require("../device/DeviceList");
 const analyticsInfo_1 = require("../data/analyticsInfo");
@@ -19,18 +21,21 @@ let _core;
 let _deviceList;
 let _popupPromise;
 const _uiPromises = [];
-let _preferredDevice;
 const _callMethods = [];
 let _interactionTimeout;
 let _deviceListInitTimeout;
 let _overridePromise;
-let _getMethodPromise;
+const methodSynchronize = (0, utils_2.getSynchronize)();
+let waitForFirstMethod = (0, utils_1.createDeferred)();
 const _log = (0, debug_1.initLog)('Core');
 const postMessage = (message) => {
     if (message.event === events_2.RESPONSE_EVENT) {
         const index = _callMethods.findIndex(call => call && call.responseID === message.id);
         if (index >= 0) {
             _callMethods.splice(index, 1);
+            if (_callMethods.length === 0) {
+                waitForFirstMethod = (0, utils_1.createDeferred)();
+            }
         }
     }
     _core.emit(events_2.CORE_EVENT, message);
@@ -40,7 +45,7 @@ const getPopupPromise = (requestWindow = true) => {
         postMessage((0, events_2.createUiMessage)(events_2.UI.REQUEST_UI_WINDOW));
     }
     if (!_popupPromise) {
-        _popupPromise = (0, createDeferred_1.createDeferred)();
+        _popupPromise = (0, utils_1.createDeferred)();
     }
     return _popupPromise;
 };
@@ -49,7 +54,7 @@ const interactionTimeout = () => _interactionTimeout.start(() => {
 });
 const createUiPromise = (promiseEvent, device) => {
     const uiPromise = {
-        ...(0, createDeferred_1.createDeferred)(promiseEvent),
+        ...(0, utils_1.createDeferred)(promiseEvent),
         device,
     };
     _uiPromises.push(uiPromise);
@@ -93,13 +98,12 @@ const handleMessage = (message) => {
             break;
         }
         case events_2.IFRAME.CALL:
-            (0, exports.onCall)(message).catch(error => {
+            onCall(message).catch(error => {
                 _log.error('onCall', error);
             });
             break;
     }
 };
-exports.handleMessage = handleMessage;
 const initDevice = async (method) => {
     if (!_deviceList) {
         throw constants_1.ERRORS.TypedError('Transport_Missing');
@@ -108,15 +112,26 @@ const initDevice = async (method) => {
     const isWebUsb = _deviceList.transportType() === 'WebUsbTransport';
     let device;
     let showDeviceSelection = isWebUsb;
+    const isUsingPopup = DataManager_1.DataManager.getSettings('popup');
+    const origin = DataManager_1.DataManager.getSettings('origin');
+    const { preferredDevice } = connect_common_1.storage.load().origin[origin] || {};
+    const preferredDeviceInList = preferredDevice && _deviceList.getDevice(preferredDevice.path);
+    if (preferredDevice && !preferredDeviceInList) {
+        connect_common_1.storage.save(store => {
+            store.origin[origin] = { ...store.origin[origin], preferredDevice: undefined };
+            return store;
+        });
+    }
     if (method.devicePath) {
         device = _deviceList.getDevice(method.devicePath);
-        showDeviceSelection = !!(device === null || device === void 0 ? void 0 : device.unreadableError);
+        showDeviceSelection =
+            !device || !!(device === null || device === void 0 ? void 0 : device.unreadableError) || (device.isUnacquired() && !!isUsingPopup);
     }
     else {
         const devices = _deviceList.asArray();
         if (devices.length === 1 && !isWebUsb) {
             device = _deviceList.getDevice(devices[0].path);
-            showDeviceSelection = !!(device === null || device === void 0 ? void 0 : device.unreadableError);
+            showDeviceSelection = !!(device === null || device === void 0 ? void 0 : device.unreadableError) || device.isUnacquired();
         }
         else {
             showDeviceSelection = true;
@@ -129,7 +144,10 @@ const initDevice = async (method) => {
             throw constants_1.ERRORS.TypedError('Transport_Missing');
         }
         const devices = _deviceList.asArray();
-        if (devices.length === 1 && devices[0].type !== 'unreadable' && !isWebUsb) {
+        if (devices.length === 1 &&
+            devices[0].type !== 'unreadable' &&
+            devices[0].features &&
+            !isWebUsb) {
             device = _deviceList.getDevice(devices[0].path);
         }
         else {
@@ -141,7 +159,14 @@ const initDevice = async (method) => {
             if (uiPromise) {
                 const { payload } = await uiPromise.promise;
                 if (payload.remember) {
-                    _preferredDevice = payload.device;
+                    const { path, state } = payload.device;
+                    connect_common_1.storage.save(store => {
+                        store.origin[origin] = {
+                            ...store.origin[origin],
+                            preferredDevice: { path, state },
+                        };
+                        return store;
+                    });
                 }
                 device = _deviceList.getDevice(payload.device.path);
             }
@@ -160,25 +185,28 @@ const onCall = async (message) => {
     const responseID = message.id;
     const trustedHost = DataManager_1.DataManager.getSettings('trustedHost');
     const isUsingPopup = DataManager_1.DataManager.getSettings('popup');
-    if (_preferredDevice && !message.payload.device) {
-        message.payload.device = _preferredDevice;
+    const origin = DataManager_1.DataManager.getSettings('origin');
+    const { preferredDevice } = connect_common_1.storage.loadForOrigin(origin) || {};
+    if (preferredDevice && !message.payload.device) {
+        message.payload.device = preferredDevice;
     }
     let method;
     let messageResponse;
     try {
-        _log.debug('loading method...');
-        _getMethodPromise = (0, method_1.getMethod)(message);
-        method = await _getMethodPromise;
-        _log.debug('method selected', method.name);
-        method.postMessage = postMessage;
-        method.getPopupPromise = getPopupPromise;
-        method.createUiPromise = createUiPromise;
-        method.init();
+        method = await methodSynchronize(async () => {
+            var _a;
+            _log.debug('loading method...');
+            const method = await (0, method_1.getMethod)(message);
+            _log.debug('method selected', method.name);
+            method.postMessage = postMessage;
+            method.getPopupPromise = getPopupPromise;
+            method.createUiPromise = createUiPromise;
+            method.init();
+            await ((_a = method.initAsync) === null || _a === void 0 ? void 0 : _a.call(method));
+            return method;
+        });
+        waitForFirstMethod.resolve();
         _callMethods.push(method);
-        if (method.initAsync) {
-            method.initAsyncPromise = method.initAsync();
-            await method.initAsyncPromise;
-        }
     }
     catch (error) {
         postMessage((0, events_2.createPopupMessage)(events_2.POPUP.CANCEL_POPUP_REQUEST));
@@ -203,7 +231,7 @@ const onCall = async (message) => {
         return Promise.resolve();
     }
     if (!_deviceList && !DataManager_1.DataManager.getSettings('transportReconnect')) {
-        await (0, exports.initTransport)(DataManager_1.DataManager.getSettings());
+        await initDeviceList(false);
     }
     if (method.isManagementRestricted()) {
         postMessage((0, events_2.createPopupMessage)(events_2.POPUP.CANCEL_POPUP_REQUEST));
@@ -396,7 +424,7 @@ const onCall = async (message) => {
         }
         const response = messageResponse;
         if (response) {
-            if (method.device.isT1() && method.name === 'rebootToBootloader' && response.success) {
+            if (method.name === 'rebootToBootloader' && response.success) {
                 await (0, promiseUtils_1.resolveAfter)(1000).promise;
                 try {
                     await device.run(() => Promise.resolve(), { skipFinalReload: true });
@@ -419,7 +447,6 @@ const onCall = async (message) => {
         }
     }
 };
-exports.onCall = onCall;
 const cleanup = () => {
     _popupPromise = undefined;
     _uiPromises.splice(0);
@@ -500,6 +527,7 @@ const onPopupClosed = (customErrorMessage) => {
                         postMessage((0, events_2.createResponseMessage)(m.responseID, false, { error }));
                     });
                     _callMethods.splice(0, _callMethods.length);
+                    waitForFirstMethod = (0, utils_1.createDeferred)();
                 }
             }
         });
@@ -549,16 +577,13 @@ const handleDeviceSelectionChanges = (interruptDevice) => {
                 shouldClosePopup = true;
             }
         });
-        if (_preferredDevice && _preferredDevice.path === path) {
-            _preferredDevice = undefined;
-        }
         if (shouldClosePopup) {
             closePopup();
             cleanup();
         }
     }
 };
-const initDeviceList = async (settings) => {
+const initDeviceList = async (transportReconnect) => {
     try {
         _deviceList = new DeviceList_1.DeviceList();
         _deviceList.on(events_2.DEVICE.CONNECT, device => {
@@ -584,11 +609,11 @@ const initDeviceList = async (settings) => {
             }
             _deviceList = undefined;
             postMessage((0, events_2.createTransportMessage)(transport_1.TRANSPORT.ERROR, { error }));
-            if (settings.transportReconnect) {
+            if (transportReconnect) {
                 const { promise, timeout } = (0, promiseUtils_1.resolveAfter)(1000, null);
                 _deviceListInitTimeout = timeout;
                 promise.then(() => {
-                    initDeviceList(settings);
+                    initDeviceList(transportReconnect);
                 });
             }
         });
@@ -601,20 +626,20 @@ const initDeviceList = async (settings) => {
     catch (error) {
         _deviceList = undefined;
         postMessage((0, events_2.createTransportMessage)(transport_1.TRANSPORT.ERROR, { error }));
-        if (!settings.transportReconnect) {
+        if (!transportReconnect) {
             throw error;
         }
         else {
             const { promise, timeout } = (0, promiseUtils_1.resolveAfter)(3000, null);
             _deviceListInitTimeout = timeout;
             await promise;
-            await initDeviceList(settings);
+            await initDeviceList(transportReconnect);
         }
     }
 };
 class Core extends events_1.default {
     handleMessage(message) {
-        (0, exports.handleMessage)(message);
+        handleMessage(message);
     }
     async dispose() {
         (0, BlockchainLink_1.dispose)();
@@ -627,10 +652,8 @@ class Core extends events_1.default {
         }
     }
     async getCurrentMethod() {
-        if (_getMethodPromise) {
-            await _getMethodPromise;
-        }
-        return _callMethods[0];
+        await waitForFirstMethod.promise;
+        return await methodSynchronize(() => _callMethods[0]);
     }
     getTransportInfo() {
         if (!_deviceList) {
@@ -646,7 +669,7 @@ class Core extends events_1.default {
     }
 }
 exports.Core = Core;
-const initCore = async (settings, logWriterFactory) => {
+const initCore = async (settings, onCoreEvent, logWriterFactory) => {
     if (logWriterFactory) {
         (0, debug_1.setLogWriter)(logWriterFactory);
     }
@@ -655,29 +678,27 @@ const initCore = async (settings, logWriterFactory) => {
         (0, debug_1.enableLog)(DataManager_1.DataManager.getSettings('debug'));
         _core = new Core();
         _interactionTimeout = new interactionTimeout_1.InteractionTimeout(settings.popup ? settings.interactionTimeout : 0);
-        return _core;
+        _core.on(events_2.CORE_EVENT, onCoreEvent);
     }
     catch (error) {
         _log.error('init', error);
         throw error;
     }
-};
-exports.initCore = initCore;
-const initTransport = async (settings) => {
     try {
-        if (!settings.transportReconnect) {
-            await initDeviceList(settings);
+        if (!DataManager_1.DataManager.getSettings('transportReconnect')) {
+            await initDeviceList(false);
         }
         else {
-            initDeviceList(settings);
+            initDeviceList(true);
         }
     }
     catch (error) {
         _log.error('initTransport', error);
         throw error;
     }
+    return _core;
 };
-exports.initTransport = initTransport;
+exports.initCore = initCore;
 const disableWebUSBTransport = async () => {
     var _a;
     if (!_deviceList)
@@ -696,7 +717,7 @@ const disableWebUSBTransport = async () => {
     }
     try {
         await _deviceList.dispose();
-        await initDeviceList(settings);
+        await initDeviceList(settings.transportReconnect);
     }
     catch (error) {
     }

package/lib/core/method.d.ts

@@ -1,6 +1,4 @@
 import type { IFrameCallMessage } from '../events';
 import type { AbstractMethod } from './AbstractMethod';
-export declare const getMethod: (message: IFrameCallMessage & {
-    id?: number;
-}) => Promise<AbstractMethod<any>>;
+export declare const getMethod: (message: IFrameCallMessage) => Promise<AbstractMethod<any>>;
 //# sourceMappingURL=method.d.ts.map

package/lib/core/method.native.d.ts

@@ -1,5 +1,3 @@
 import type { IFrameCallMessage } from '../events';
-export declare const getMethod: (message: IFrameCallMessage & {
-    id?: number;
-}) => Promise<any>;
+export declare const getMethod: (message: IFrameCallMessage) => Promise<any>;
 //# sourceMappingURL=method.native.d.ts.map

package/lib/data/DataManager.d.ts

@@ -1,13 +1,13 @@
 import { ConnectSettings } from '../types';
 type AssetCollection = {
-    [key: string]: JSON;
+    [key: string]: Record<string, any>;
 };
 export declare class DataManager {
     static assets: AssetCollection;
     private static settings;
     private static messages;
     static load(settings: ConnectSettings, withAssets?: boolean): Promise<void>;
-    static getProtobufMessages(): JSON;
+    static getProtobufMessages(): Record<string, any>;
     static getSettings(key?: undefined): ConnectSettings;
     static getSettings<T extends keyof ConnectSettings>(key: T): ConnectSettings[T];
     static getConfig(): {

package/lib/data/analyticsInfo.d.ts

@@ -1,6 +1,6 @@
-import { CoreMessage, PostMessage } from '../events';
+import { CoreEventMessage } from '../events';
 import type { Device } from '../types';
-export declare const enhancePostMessageWithAnalytics: (callback: PostMessage, message: CoreMessage, data: {
+export declare const enhancePostMessageWithAnalytics: (callback: (message: CoreEventMessage) => void, message: CoreEventMessage, data: {
     device?: Device;
 }) => void;
 //# sourceMappingURL=analyticsInfo.d.ts.map