@trezor/connect 9.4.1-beta.1 → 9.4.2-beta.1

package/CHANGELOG.md

@@ -1,16 +1,35 @@
 |             Package              | Stable |    Canary    |
 | :------------------------------: | :----: | :----------: |
-|       npm @trezor/connect        | 9.4.0  | 9.4.1-beta.1 |
-|     npm @trezor/connect-web      | 9.4.0  | 9.4.1-beta.1 |
-| npm @trezor/connect-webextension | 9.4.0  | 9.4.1-beta.1 |
+|       npm @trezor/connect        | 9.4.1  | 9.4.2-beta.1 |
+|     npm @trezor/connect-web      | 9.4.1  | 9.4.2-beta.1 |
+| npm @trezor/connect-webextension | 9.4.1  | 9.4.2-beta.1 |
 
 |     Deployment     | Stable |    Canary    |
 | :----------------: | :----: | :----------: |
-| connect.trezor.io/ | 9.4.0  | 9.4.1-beta.1 |
+| connect.trezor.io/ | 9.4.1  | 9.4.2-beta.1 |
 
 Use the persistent link [connect.trezor.io/9](https://connect.trezor.io/9/) to access the latest stable version of Connect Explorer.
 
-# 9.4.1-beta.1
+## 9.4.2-beta.1
+
+### Features
+
+-   feat(connect): return device info with method response (a378def)
+-   docs(connect-explorer): flowchart for auto core mode (9501d3d)
+-   docs(connect-explorer): diagram and explanation for core in popup (3bbb032)
+
+### Fixes
+
+-   Fixing an issue with typescript not being able to resolve @sinclair/typebox and USB types correctly ((98d6437))
+-   Fixing regression that made it impossible to acquire (steal) device session over webusb (5cf83b4)
+-   Couple of other fixes and improvements of device handling:
+
+    -   fix(connect): pending transport event fix (231899f)
+    -   fix(connect): DeviceList create devices sequentially (b4a915b)
+
+-   fix(connect-explorer): icons on index page (fef3791)
+
+## 9.4.1
 
 Automatic retry for no transport issue: If the transport (bridge) is initially not available, the automatic retry feature allows the user to continue after starting the transport, without having to restart the entire flow.
 
@@ -28,7 +47,7 @@ NodeBridge new version compatibility fix: Resolved an issue where NodeBridge ver
 -   docs(connect-explorer): step by step tutorial to build connect webextension (9d5ba70)
 -   docs(connect-explorer): add more ways to test getAccountInfo (62101d6)
 
-### Fixes:
+### Fixes
 
 -   New NodeBridge version not parsed correctly - ignore semver labels in version utils (6501704)
 -   fw releases value for custom device model (265028d)
@@ -71,7 +90,7 @@ NodeBridge new version compatibility fix: Resolved an issue where NodeBridge ver
 -   transport: sessions background without abort signal (4f6e8cf)
 -   transport: better abortable methods (583f4aa)
 
-### Deps
+### Dependencies update
 
 -   @sinclair/typebox 0.31.28=>0.33.7 (43ae297)
 -   webpack from 5.93.0 to 5.94.0 (358b96d)
@@ -85,6 +104,19 @@ NodeBridge new version compatibility fix: Resolved an issue where NodeBridge ver
 -   various patch versions deps (ed3e9bf)
 -   TS 5.5 (198c91f)
 
+-   npm-release: @trezor/blockchain-link 2.3.1
+-   npm-release: @trezor/blockchain-link-utils 1.2.1
+-   npm-release: @trezor/blockchain-link-types 1.2.1
+-   npm-release: @trezor/connect-analytics 1.2.1
+-   npm-release: @trezor/analytics 1.2.1
+-   npm-release: @trezor/connect-common 0.2.1
+-   npm-release: @trezor/transport 1.3.1
+-   npm-release: @trezor/protobuf 1.2.1
+-   npm-release: @trezor/schema-utils 1.2.1
+-   npm-release: @trezor/protocol 1.2.1
+-   npm-release: @trezor/utxo-lib 2.2.1
+-   npm-release: @trezor/utils 9.2.1
+
 # 9.4.0
 
 ## connect

package/README.md

@@ -1,6 +1,6 @@
 # @trezor/connect
 
-API version 9.4.1-beta.1
+API version 9.4.2-beta.1
 
 [![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/bitcoin/inputs.js

@@ -36,7 +36,7 @@ exports.validateTrezorInputs = validateTrezorInputs;
 const enhanceTrezorInputs = (inputs, rawTxs) => {
     inputs.forEach(input => {
         if (!input.amount) {
-            console.warn('TrezorConnect.singTransaction deprecation: missing input amount.');
+            console.warn('TrezorConnect.signTransaction deprecation: missing input amount.');
             const refTx = rawTxs.find(t => t.getId() === input.prev_hash);
             if (refTx && refTx.outs[input.prev_index]) {
                 input.amount = refTx.outs[input.prev_index].value;

package/lib/core/index.js

@@ -250,7 +250,7 @@ const inner = async (context, method, device) => {
     }
     try {
         const response = await method.run();
-        return (0, events_2.createResponseMessage)(method.responseID, true, response);
+        return (0, events_2.createResponseMessage)(method.responseID, true, response, device);
     }
     catch (error) {
         return Promise.reject(error);

package/lib/data/version.d.ts

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

package/lib/data/version.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CONTENT_SCRIPT_VERSION = exports.DEFAULT_DOMAIN = exports.VERSION = void 0;
-exports.VERSION = '9.4.1-beta.1';
+exports.VERSION = '9.4.2-beta.1';
 const versionN = exports.VERSION.split('.').map(s => parseInt(s, 10));
 const isBeta = exports.VERSION.includes('beta');
 exports.DEFAULT_DOMAIN = isBeta

package/lib/device/Device.d.ts

@@ -84,7 +84,7 @@ export declare class Device extends TypedEmitter<DeviceEvents> {
         message: string;
     }>;
     private _uploadTranslationData;
-    _updateFeatures(feat: Features): void;
+    private _updateFeatures;
     isUnacquired(): boolean;
     disconnect(): void;
     isBootloader(): boolean;
@@ -99,7 +99,7 @@ export declare class Device extends TypedEmitter<DeviceEvents> {
     isRunning(): boolean;
     isLoaded(): boolean;
     waitForFirstRun(): Promise<boolean>;
-    getDevicePath(): `${number}`;
+    getDevicePath(): import("@trezor/transport/lib/types").PathPublic;
     isT1(): boolean;
     hasUnexpectedMode(allow: string[], require: string[]): "ui-device_bootloader_mode" | "ui-device_not_in_bootloader_mode" | "ui-device_not_initialized" | "ui-device_seedless" | null;
     updateDescriptor(descriptor: Descriptor): void;

package/lib/device/Device.js

@@ -161,7 +161,9 @@ class Device extends utils_1.TypedEmitter {
             this.runPromise.reject(constants_1.ERRORS.TypedError('Device_UsedElsewhere'));
             delete this.runPromise;
         }
-        this.transport.releaseDevice(this.originalDescriptor.path);
+        if (this.originalDescriptor.session) {
+            this.transport.releaseDevice(this.originalDescriptor.session);
+        }
     }
     async _runInner(fn, options) {
         var _a, _b;

package/lib/device/DeviceList.d.ts

@@ -34,6 +34,7 @@ export declare class DeviceList extends TypedEmitter<DeviceListEvents> implement
     private transports;
     private devices;
     private creatingDevicesDescriptors;
+    private createDevicesQueue;
     private readonly authPenaltyManager;
     private initPromise?;
     private rejectPending?;
@@ -44,6 +45,8 @@ export declare class DeviceList extends TypedEmitter<DeviceListEvents> implement
     private createTransport;
     setTransports(transports: ConnectSettings['transports']): void;
     private onTransportUpdate;
+    private waitForCreateDevicesQueue;
+    private removeFromCreateDevicesQueue;
     init(initParams?: InitParams): Promise<void>;
     private createInitPromise;
     private createReconnectPromise;

package/lib/device/DeviceList.js

@@ -46,6 +46,7 @@ class DeviceList extends utils_1.TypedEmitter {
         super();
         this.devices = {};
         this.creatingDevicesDescriptors = {};
+        this.createDevicesQueue = [];
         const transportLogger = (0, debug_1.initLog)('@trezor/transport', debug);
         const abortController = new AbortController();
         this.authPenaltyManager = createAuthPenaltyManager(priority);
@@ -104,6 +105,7 @@ class DeviceList extends utils_1.TypedEmitter {
             this.creatingDevicesDescriptors[path] = descriptor;
             switch (category.type) {
                 case 'disconnected':
+                    this.removeFromCreateDevicesQueue(path);
                     if (!device)
                         break;
                     device.disconnect();
@@ -111,6 +113,9 @@ class DeviceList extends utils_1.TypedEmitter {
                     this.emit(events_1.DEVICE.DISCONNECT, device.toMessageObject());
                     break;
                 case 'connected':
+                    if (!(await this.waitForCreateDevicesQueue(path))) {
+                        break;
+                    }
                     const penalty = this.authPenaltyManager.get();
                     if (penalty) {
                         await (0, promiseUtils_1.resolveAfter)(501 + penalty, null).promise;
@@ -123,14 +128,18 @@ class DeviceList extends utils_1.TypedEmitter {
                         this.devices[path] = device;
                         this.emit(events_1.DEVICE.CONNECT_UNACQUIRED, device.toMessageObject());
                     }
+                    this.removeFromCreateDevicesQueue(path);
                     break;
                 case 'acquired':
-                    if (!device)
-                        break;
                     if (category.subtype === 'elsewhere') {
-                        device.featuresNeedsReload = true;
-                        device.interruptionFromOutside();
+                        this.removeFromCreateDevicesQueue(path);
+                        if (device) {
+                            device.featuresNeedsReload = true;
+                            device.interruptionFromOutside();
+                        }
                     }
+                    if (!device)
+                        break;
                     _log.debug('Event', events_1.DEVICE.CHANGED, device.toMessageObject());
                     this.emit(events_1.DEVICE.CHANGED, device.toMessageObject());
                     _log.debug('Event', events_1.DEVICE.ACQUIRED, device.toMessageObject());
@@ -159,6 +168,20 @@ class DeviceList extends utils_1.TypedEmitter {
             device === null || device === void 0 ? void 0 : device.updateDescriptor(descriptor);
         });
     }
+    async waitForCreateDevicesQueue(path) {
+        const dfd = (0, utils_1.createDeferred)(path);
+        const prevQueue = this.createDevicesQueue.slice();
+        this.createDevicesQueue.push(dfd);
+        await (0, utils_1.promiseAllSequence)(prevQueue.map(pr => () => pr.promise));
+        return this.createDevicesQueue.includes(dfd);
+    }
+    removeFromCreateDevicesQueue(path) {
+        const index = this.createDevicesQueue.findIndex(dfd => dfd.id === path);
+        if (index >= 0) {
+            const [dfd] = this.createDevicesQueue.splice(index, 1);
+            dfd.resolve();
+        }
+    }
     init(initParams = {}) {
         if (!this.initPromise) {
             _log.debug('Initializing transports');
@@ -210,12 +233,12 @@ class DeviceList extends utils_1.TypedEmitter {
             throw new Error(enumerateResult.error);
         }
         const descriptors = enumerateResult.payload;
+        const waitForDevicesPromise = initParams.pendingTransportEvent && descriptors.length
+            ? this.waitForDevices(descriptors.length, 10000)
+            : Promise.resolve();
         transport.handleDescriptorsChange(descriptors);
         transport.listen();
-        const awaitedDevices = descriptors.length - Object.keys(this.devices).length;
-        if (awaitedDevices > 0 && initParams.pendingTransportEvent) {
-            await this.waitForDevices(awaitedDevices, 10000);
-        }
+        await waitForDevicesPromise;
         return transport;
     }
     waitForDevices(deviceCount, autoResolveMs) {
@@ -294,6 +317,8 @@ class DeviceList extends utils_1.TypedEmitter {
         devices.forEach(device => {
             this.emit(events_1.DEVICE.DISCONNECT, device.toMessageObject());
         });
+        this.createDevicesQueue.forEach(dfd => dfd.resolve());
+        this.createDevicesQueue = [];
         await Promise.all(devices.map(device => device.dispose()));
         transport === null || transport === void 0 ? void 0 : transport.stop();
     }

package/lib/events/call.d.ts

@@ -1,6 +1,7 @@
 import type { IFRAME } from './iframe';
 import type { TrezorConnect } from '../types/api';
-import type { CommonParams } from '../types/params';
+import type { CommonParams, DeviceIdentity } from '../types/params';
+import { Device } from '../device/Device';
 type UnwrappedResponse<T> = T extends Promise<infer R> ? (R extends {
     success: true;
     payload: infer P;
@@ -35,7 +36,8 @@ export interface MethodResponseMessage {
     id: number;
     success: boolean;
     payload: CallMethodResponse<keyof CallApi>;
+    device?: DeviceIdentity;
 }
-export declare const createResponseMessage: (id: number, success: boolean, payload: any) => MethodResponseMessage;
+export declare const createResponseMessage: (id: number, success: boolean, payload: any, device?: Device) => MethodResponseMessage;
 export {};
 //# sourceMappingURL=call.d.ts.map

package/lib/events/call.js

@@ -3,12 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createResponseMessage = exports.RESPONSE_EVENT = void 0;
 const errors_1 = require("../constants/errors");
 exports.RESPONSE_EVENT = 'RESPONSE_EVENT';
-const createResponseMessage = (id, success, payload) => ({
+const createResponseMessage = (id, success, payload, device) => ({
     event: exports.RESPONSE_EVENT,
     type: exports.RESPONSE_EVENT,
     id,
     success,
     payload: success ? payload : (0, errors_1.serializeError)(payload),
+    device: device
+        ? {
+            path: device === null || device === void 0 ? void 0 : device.originalDescriptor.path,
+            state: device === null || device === void 0 ? void 0 : device.getState(),
+            instance: device === null || device === void 0 ? void 0 : device.instance,
+        }
+        : undefined,
 });
 exports.createResponseMessage = createResponseMessage;
 //# sourceMappingURL=call.js.map

package/lib/events/core.js

@@ -7,6 +7,7 @@ const parseMessage = (messageData) => {
         event: messageData.event,
         type: messageData.type,
         payload: messageData.payload,
+        device: messageData.device,
     };
     if (typeof messageData.id === 'number') {
         message.id = messageData.id;

package/lib/index.js

@@ -38,8 +38,8 @@ const onCoreEvent = (message) => {
     _log.debug('handleMessage', message);
     switch (event) {
         case events_2.RESPONSE_EVENT: {
-            const { id = 0, success } = message;
-            const resolved = messagePromises.resolve(id, { id, success, payload });
+            const { id = 0, success, device } = message;
+            const resolved = messagePromises.resolve(id, { id, success, payload, device });
             if (!resolved)
                 _log.warn(`Unknown message id ${id}`);
             break;

package/lib/types/params.d.ts

@@ -1,11 +1,12 @@
 import { TSchema, Static } from '@trezor/schema-utils';
 import { DeviceState } from './device';
+export interface DeviceIdentity {
+    path?: string;
+    state?: string | DeviceState;
+    instance?: number;
+}
 export interface CommonParams {
-    device?: {
-        path?: string;
-        state?: string | DeviceState;
-        instance?: number;
-    };
+    device?: DeviceIdentity;
     useEmptyPassphrase?: boolean;
     useEventListener?: boolean;
     allowSeedlessDevice?: boolean;
@@ -40,7 +41,10 @@ export interface Success<T> {
     success: true;
     payload: T;
 }
-export type Response<T> = Promise<Success<T> | Unsuccessful>;
+export interface SuccessWithDevice<T> extends Success<T> {
+    device?: DeviceIdentity;
+}
+export type Response<T> = Promise<SuccessWithDevice<T> | Unsuccessful>;
 export type DerivationPath = string | number[];
 export declare const DerivationPath: import("@sinclair/typebox/build/esm/index.mjs").TUnion<[import("@sinclair/typebox/build/esm/index.mjs").TString, import("@sinclair/typebox/build/esm/index.mjs").TArray<import("@sinclair/typebox/build/esm/index.mjs").TNumber>]>;
 type ProtoWithExtendedAddressN<T, A, R> = Omit<Extract<T, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trezor/connect",
-  "version": "9.4.1-beta.1",
+  "version": "9.4.2-beta.1",
   "author": "Trezor <info@trezor.io>",
   "homepage": "https://github.com/trezor/trezor-suite/tree/develop/packages/connect",
   "description": "High-level javascript interface for Trezor hardware wallet.",
@@ -73,16 +73,16 @@
     "@ethereumjs/common": "^4.3.0",
     "@ethereumjs/tx": "^5.3.0",
     "@fivebinaries/coin-selection": "2.2.1",
-    "@trezor/blockchain-link": "2.3.1-beta.1",
-    "@trezor/blockchain-link-types": "1.2.0",
-    "@trezor/connect-analytics": "1.2.0",
-    "@trezor/connect-common": "0.2.1-beta.1",
-    "@trezor/protobuf": "1.2.1-beta.1",
-    "@trezor/protocol": "1.2.1-beta.1",
-    "@trezor/schema-utils": "1.2.1-beta.1",
-    "@trezor/transport": "1.3.1-beta.1",
-    "@trezor/utils": "9.2.1-beta.1",
-    "@trezor/utxo-lib": "2.2.1-beta.1",
+    "@trezor/blockchain-link": "2.3.1",
+    "@trezor/blockchain-link-types": "1.2.1",
+    "@trezor/connect-analytics": "1.2.1",
+    "@trezor/connect-common": "0.2.2-beta.1",
+    "@trezor/protobuf": "1.2.2-beta.1",
+    "@trezor/protocol": "1.2.1",
+    "@trezor/schema-utils": "1.2.1",
+    "@trezor/transport": "1.3.2-beta.1",
+    "@trezor/utils": "9.2.1",
+    "@trezor/utxo-lib": "2.2.1",
     "blakejs": "^1.2.1",
     "bs58": "^6.0.0",
     "bs58check": "^4.0.0",