@onekeyfe/hd-core 1.1.26 → 1.1.27-alpha.30

package/src/data-manager/DataManager.ts

@@ -4,6 +4,7 @@ import { EDeviceType, EFirmwareType } from '@onekeyfe/hd-shared';
 
 import MessagesJSON from '../data/messages/messages.json';
 import MessagesLegacyV1JSON from '../data/messages/messages_legacy_v1.json';
+import MessagesPro2JSON from '../data/messages/messages-pro2.json';
 import {
   LoggerNames,
   getDeviceBLEFirmwareVersion,
@@ -40,7 +41,7 @@ export const FIRMWARE_FIELDS = [
 
 export type IFirmwareField = (typeof FIRMWARE_FIELDS)[number];
 
-export type MessageVersion = 'latest' | 'v1';
+export type MessageVersion = 'latest' | 'v1' | 'protocolV2';
 
 const FIRMWARE_FIELD_TYPE_MAP: Readonly<Record<IFirmwareField, EFirmwareType>> = {
   firmware: EFirmwareType.Universal,
@@ -62,7 +63,9 @@ function getFirmwareTypeFromField(firmwareField: IFirmwareField): EFirmwareType
 }
 
 export default class DataManager {
-  static deviceMap: DeviceTypeMap = {
+  static deviceMap: DeviceTypeMap & {
+    [k: string]: DeviceTypeMap[keyof DeviceTypeMap] | undefined;
+  } = {
     [EDeviceType.Classic]: {
       firmware: [],
       ble: [],
@@ -96,6 +99,7 @@ export default class DataManager {
   static messages: { [version in MessageVersion]: JSON } = {
     latest: MessagesJSON as unknown as JSON,
     v1: MessagesLegacyV1JSON as unknown as JSON,
+    protocolV2: MessagesPro2JSON as unknown as JSON,
   };
 
   static lastCheckTimestamp = 0;

package/src/data-manager/TransportManager.ts

@@ -17,6 +17,7 @@ const LowLevelLogger = getLogger(LoggerNames.HdTransportLowLevel);
 const NodeUsbLogger = getLogger(LoggerNames.HdTransportNodeUsb);
 const WebBleLogger = getLogger(LoggerNames.HdWebBleTransport);
 const WebUsbLogger = getLogger(LoggerNames.HdTransportWebUsb);
+const REACT_NATIVE_BLE_SCAN_TIMEOUT_MS = 8000;
 
 /**
  * transport 在同一个环境中只会存在一个
@@ -74,6 +75,9 @@ export default class TransportManager {
       }
       Log.debug('Configuring transports');
       await this.transport.configure(JSON.stringify(this.defaultMessages));
+      this.currentMessages = this.defaultMessages;
+      this.messageVersion = 'latest';
+      await this.configureProtocolV2Messages();
       Log.debug('Configuring transports done');
     } catch (error) {
       Log.debug('Initializing transports error: ', error);
@@ -83,8 +87,19 @@ export default class TransportManager {
     }
   }
 
-  static async reconfigure(features?: Features | undefined) {
-    Log.debug(`Begin reconfiguring transports`);
+  /**
+   * Re-load the transport's main protobuf schema based on a device's reported features.
+   *
+   * This handles message-version compatibility within Protocol V1 (e.g. Touch's classic
+   * vs latest schema). It is NOT used to switch between Protocol V1 and Protocol V2 —
+   * the transport already holds both schemas after initial configure(), and routes per
+   * device by `getProtocolType()`.
+   */
+  static async reconfigure(features?: Features) {
+    if (!features) {
+      return;
+    }
+
     const { messageVersion, messages } = getSupportMessageVersion(features);
 
     if (this.currentMessages === messages || !messages) {
@@ -109,7 +124,9 @@ export default class TransportManager {
     const env = DataManager.getSettings('env');
     if (env === 'react-native') {
       /** Actually initializes the ReactNativeTransport */
-      this.transport = new TransportConstructor({ scanTimeout: 3000 }) as unknown as Transport;
+      this.transport = new TransportConstructor({
+        scanTimeout: REACT_NATIVE_BLE_SCAN_TIMEOUT_MS,
+      }) as unknown as Transport;
     } else {
       /** Actually initializes the HttpTransport */
       this.transport = new TransportConstructor() as unknown as Transport;
@@ -130,6 +147,15 @@ export default class TransportManager {
     return this.transport;
   }
 
+  private static async configureProtocolV2Messages() {
+    const protocolV2Messages = DataManager.getProtobufMessages('protocolV2');
+    const { configureProtocolV2 } = this.transport;
+    if (protocolV2Messages && typeof configureProtocolV2 === 'function') {
+      await configureProtocolV2.call(this.transport, JSON.stringify(protocolV2Messages));
+      Log.debug('Protocol V2 messages configured');
+    }
+  }
+
   static getDefaultMessages() {
     return this.defaultMessages;
   }

package/src/device/Device.ts

@@ -41,6 +41,7 @@ import { DataManager } from '../data-manager';
 import TransportManager from '../data-manager/TransportManager';
 import { toHardened } from '../api/helpers/pathUtils';
 import { existCapability } from '../utils/capabilitieUtils';
+import { getProtocolV2Features } from '../protocols/protocol-v2';
 
 import type { PROTO } from '../constants';
 import type {
@@ -49,7 +50,7 @@ import type {
   PassphraseRequestPayload,
 } from '../events';
 import type { PassphrasePromptResponse } from './DeviceCommands';
-import type { Deferred } from '@onekeyfe/hd-shared';
+import type { Deferred, HardwareConnectProtocol } from '@onekeyfe/hd-shared';
 import type { OneKeyDeviceInfo as DeviceDescriptor } from '@onekeyfe/hd-transport';
 import type DeviceConnector from './DeviceConnector';
 
@@ -58,6 +59,7 @@ export type InitOptions = {
   deviceId?: string;
   passphraseState?: string;
   deriveCardano?: boolean;
+  connectProtocol?: HardwareConnectProtocol;
 };
 
 export type RunOptions = {
@@ -252,13 +254,13 @@ export class Device extends EventEmitter {
    * Device connect
    * @returns {Promise<boolean>}
    */
-  connect() {
+  connect(connectProtocol?: HardwareConnectProtocol) {
     const env = DataManager.getSettings('env');
     // eslint-disable-next-line no-async-promise-executor
     return new Promise<boolean>(async (resolve, reject) => {
       if (DataManager.isBleConnect(env)) {
         try {
-          await this.acquire();
+          await this.acquire(connectProtocol);
           resolve(true);
         } catch (error) {
           reject(error);
@@ -268,7 +270,7 @@ export class Device extends EventEmitter {
       // 不存在 Session ID 或存在 Session ID 但设备在别处使用，都需要 acquire 获取最新 sessionID
       if (!this.mainId || (!this.isUsedHere() && this.originalDescriptor)) {
         try {
-          await this.acquire();
+          await this.acquire(connectProtocol);
           resolve(true);
         } catch (error) {
           reject(error);
@@ -283,23 +285,40 @@ export class Device extends EventEmitter {
     });
   }
 
-  async acquire() {
+  async acquire(connectProtocol?: HardwareConnectProtocol) {
     const env = DataManager.getSettings('env');
     const mainIdKey = DataManager.isBleConnect(env) ? 'id' : 'session';
+    const expectedProtocol = connectProtocol ?? this.originalDescriptor.protocolType;
     try {
       if (DataManager.isBleConnect(env)) {
-        const res = await this.deviceConnector?.acquire(this.originalDescriptor.id);
+        const res = await this.deviceConnector?.acquire(
+          this.originalDescriptor.id,
+          undefined,
+          true,
+          expectedProtocol
+        );
         this.mainId = (res as unknown as any).uuid ?? '';
         Log.debug('Expected uuid:', this.mainId);
       } else {
         this.mainId = await this.deviceConnector?.acquire(
           this.originalDescriptor.path,
-          this.originalDescriptor.session
+          this.originalDescriptor.session,
+          undefined,
+          expectedProtocol
         );
         Log.debug('Expected session id:', this.mainId);
       }
       this.deviceAcquired = true;
       this.updateDescriptor({ [mainIdKey]: this.mainId } as unknown as DeviceDescriptor);
+
+      // Propagate protocol version detected during acquire.
+      const detectedProtocol = TransportManager.transport?.getProtocolType?.(
+        DataManager.isBleConnect(env) ? this.originalDescriptor.id : this.originalDescriptor.path
+      );
+      if (detectedProtocol) {
+        this.originalDescriptor.protocolType = detectedProtocol;
+      }
+
       if (this.commands) {
         await this.commands.dispose(false);
       }
@@ -462,6 +481,17 @@ export class Device extends EventEmitter {
   }
 
   async initialize(options?: InitOptions) {
+    // Protocol V2 不支持传统 Initialize，直接使用协议专用初始化流程。
+    if (this.originalDescriptor.protocolType === 'V2') {
+      this.passphraseState = options?.passphraseState;
+      if (this.features && !this.featuresNeedsReload && !options?.initSession) {
+        Log.debug('Skip Protocol V2 feature adapter; cached features are available');
+        return;
+      }
+      await this._initializeProtocolV2();
+      return;
+    }
+
     // Log.debug('initialize param:', options);
 
     this.passphraseState = options?.passphraseState;
@@ -510,6 +540,36 @@ export class Device extends EventEmitter {
     }
   }
 
+  /**
+   * Device initialization over Protocol V2.
+   *
+   * Protocol V2 不走传统 Initialize/GetFeatures。当前固件暂不支持
+   * DevGetDeviceInfo，初始化阶段只通过 Ping 建立基础 Features 视图。
+   */
+  private async _initializeProtocolV2() {
+    Log.debug('Initialize device via Protocol V2 feature adapter');
+
+    try {
+      const features = await Promise.race([
+        getProtocolV2Features({
+          commands: this.commands,
+          descriptor: this.originalDescriptor,
+          timeoutMs: 10 * 1000,
+        }),
+        new Promise<never>((_, reject) => {
+          setTimeout(() => {
+            reject(ERRORS.TypedError(HardwareErrorCode.DeviceInitializeFailed));
+          }, 10 * 1000);
+        }),
+      ]);
+      Log.debug('Protocol V2 normalized features:', features);
+      this._updateFeatures(features);
+    } catch (error) {
+      Log.error('Protocol V2 initialization failed:', error);
+      throw error;
+    }
+  }
+
   async getFeatures() {
     const { message } = await this.commands.typedCall('GetFeatures', 'Features', {});
     this._updateFeatures(message);
@@ -580,7 +640,7 @@ export class Device extends EventEmitter {
       const env = DataManager.getSettings('env');
       if (env !== 'react-native') {
         try {
-          await this.acquire();
+          await this.acquire(options.connectProtocol);
         } catch (error) {
           this.runPromise = null;
           return Promise.reject(error);

package/src/device/DeviceCommands.ts

@@ -12,7 +12,12 @@ import {
 } from '../utils/tracing';
 
 import type { Device } from './Device';
-import type { FailureType, Messages, Transport } from '@onekeyfe/hd-transport';
+import type {
+  FailureType,
+  Messages,
+  Transport,
+  TransportCallOptions,
+} from '@onekeyfe/hd-transport';
 
 export type PassphrasePromptResponse = {
   passphrase?: string;
@@ -22,16 +27,119 @@ export type PassphrasePromptResponse = {
 };
 
 type MessageType = Messages.MessageType;
-type MessageKey = keyof MessageType;
+type MessageKey = Extract<keyof MessageType, string>;
 export type TypedResponseMessage<T extends MessageKey> = {
   type: T;
   message: MessageType[T];
 };
 type TypedCallResponseMap = {
-  [K in keyof MessageType]: TypedResponseMessage<K>;
+  [K in MessageKey]: TypedResponseMessage<K>;
 };
 export type DefaultMessageResponse = TypedCallResponseMap[keyof MessageType];
 
+const MAX_DEBUG_ARRAY_ITEMS = 20;
+const MAX_DEBUG_OBJECT_KEYS = 40;
+const MAX_DEBUG_STRING_LENGTH = 512;
+const MAX_DEBUG_DEPTH = 4;
+const HIGH_VOLUME_DEBUG_CALLS = new Set([
+  'FilesystemFileRead',
+  'FilesystemFileWrite',
+  'FileRead',
+  'FileWrite',
+  'EmmcFileRead',
+  'EmmcFileWrite',
+  'FirmwareUpload',
+  'ResourceAck',
+]);
+
+function shouldReduceDebugForCall(type: string) {
+  return HIGH_VOLUME_DEBUG_CALLS.has(type);
+}
+
+function getBinaryByteLength(value: unknown): number | undefined {
+  if (value instanceof ArrayBuffer) {
+    return value.byteLength;
+  }
+
+  if (ArrayBuffer.isView(value)) {
+    return value.byteLength;
+  }
+
+  if (typeof Blob !== 'undefined' && value instanceof Blob) {
+    return value.size;
+  }
+
+  return undefined;
+}
+
+function summarizeRedactedData(value: unknown): string {
+  const byteLength = getBinaryByteLength(value);
+  if (byteLength !== undefined) {
+    return `[redacted data: ${byteLength} bytes]`;
+  }
+
+  if (typeof value === 'string') {
+    return `[redacted data: string length=${value.length}]`;
+  }
+
+  if (Array.isArray(value)) {
+    return `[redacted data: array length=${value.length}]`;
+  }
+
+  if (value && typeof value === 'object') {
+    return `[redacted data: object keys=${Object.keys(value).length}]`;
+  }
+
+  return `[redacted data: ${typeof value}]`;
+}
+
+function sanitizeDebugPayload(value: unknown, key = '', depth = 0): unknown {
+  if (key === 'data' && value !== null && value !== undefined) {
+    return summarizeRedactedData(value);
+  }
+
+  const byteLength = getBinaryByteLength(value);
+  if (byteLength !== undefined) {
+    return `[binary: ${byteLength} bytes]`;
+  }
+
+  if (typeof value === 'string') {
+    return value.length > MAX_DEBUG_STRING_LENGTH
+      ? `${value.slice(0, MAX_DEBUG_STRING_LENGTH)}... (len=${value.length})`
+      : value;
+  }
+
+  if (!value || typeof value !== 'object') {
+    return value;
+  }
+
+  if (depth >= MAX_DEBUG_DEPTH) {
+    return Array.isArray(value)
+      ? `[array length=${value.length}]`
+      : `[object keys=${Object.keys(value).length}]`;
+  }
+
+  if (Array.isArray(value)) {
+    const items = value
+      .slice(0, MAX_DEBUG_ARRAY_ITEMS)
+      .map(item => sanitizeDebugPayload(item, key, depth + 1));
+    if (value.length > MAX_DEBUG_ARRAY_ITEMS) {
+      items.push(`... (${value.length - MAX_DEBUG_ARRAY_ITEMS} more)`);
+    }
+    return items;
+  }
+
+  const entries = Object.entries(value).slice(0, MAX_DEBUG_OBJECT_KEYS);
+  const sanitized: Record<string, unknown> = {};
+  entries.forEach(([entryKey, entryValue]) => {
+    sanitized[entryKey] = sanitizeDebugPayload(entryValue, entryKey, depth + 1);
+  });
+  if (Object.keys(value).length > MAX_DEBUG_OBJECT_KEYS) {
+    sanitized.__truncated__ = `${Object.keys(value).length - MAX_DEBUG_OBJECT_KEYS} more keys`;
+  }
+  return sanitized;
+}
+
 const assertType = (res: DefaultMessageResponse, resType: string | string[]) => {
   const splitResTypes = Array.isArray(resType) ? resType : resType.split('|');
   if (!splitResTypes.includes(res.type)) {
@@ -224,17 +332,21 @@ export class DeviceCommands {
   // Sends an async message to the opened device.
   async call(
     type: MessageKey,
-    msg: DefaultMessageResponse['message'] = {}
+    msg?: DefaultMessageResponse['message'],
+    options?: TransportCallOptions
   ): Promise<DefaultMessageResponse> {
-    Log.debug('[DeviceCommands] [call] Sending', type);
+    const shouldReduceDebug = shouldReduceDebugForCall(type);
+    if (!shouldReduceDebug) {
+      Log.debug('[DeviceCommands] [call] Sending', type);
+    }
 
     try {
-      const promise = this.transport.call(this.mainId, type, msg) as any;
+      const promise = this.transport.call(this.mainId, type, msg ?? {}, options) as any;
       this.callPromise = promise;
       const res = await promise;
       if (res.type === 'Failure') {
         LogCore.debug('[DeviceCommands] [call] Received', res.type, res.message);
-      } else {
+      } else if (!shouldReduceDebug) {
         LogCore.debug('[DeviceCommands] [call] Received', res.type);
       }
       return res;
@@ -283,19 +395,22 @@ export class DeviceCommands {
   typedCall<T extends MessageKey, R extends MessageKey[]>(
     type: T,
     resType: R,
-    msg?: MessageType[T]
+    msg?: MessageType[T],
+    options?: TransportCallOptions
   ): Promise<TypedCallResponseMap[R[number]]>;
 
   typedCall<T extends MessageKey, R extends MessageKey>(
     type: T,
     resType: R,
-    msg?: MessageType[T]
+    msg?: MessageType[T],
+    options?: TransportCallOptions
   ): Promise<TypedResponseMessage<R>>;
 
   async typedCall(
     type: MessageKey,
     resType: MessageKey | MessageKey[],
-    msg?: DefaultMessageResponse['message']
+    msg?: DefaultMessageResponse['message'],
+    options?: TransportCallOptions
   ) {
     if (this.disposed) {
       throw ERRORS.TypedError(
@@ -312,16 +427,24 @@ export class DeviceCommands {
         'PassphraseAck',
         'Cancel',
         'BixinPinInputOnDevice',
+        'FilesystemFileRead',
+        'FilesystemFileWrite',
+        'FileRead',
+        'FileWrite',
+        'EmmcFileRead',
+        'EmmcFileWrite',
+        'FirmwareUpload',
+        'ResourceAck',
       ] as any;
       if (!skipTypes.includes(type) && msg) {
         // Use debug channel to avoid noise escalation
-        Log.debug('[DeviceCommands] [typedCall] Sending payload', type, msg);
+        Log.debug('[DeviceCommands] [typedCall] Sending payload', type, sanitizeDebugPayload(msg));
       }
     } catch (e) {
       // ignore logging errors
     }
 
-    const response = await this._commonCall(type, msg);
+    const response = await this._commonCall(type, msg, options);
     try {
       assertType(response, resType);
     } catch (error) {
@@ -334,6 +457,12 @@ export class DeviceCommands {
       // throw bridge network error
       if (error instanceof HardwareError) {
         if (error.errorCode === HardwareErrorCode.ResponseUnexpectTypeError) {
+          Log.debug('[DeviceCommands] [typedCall] Unexpected response type', {
+            request: type,
+            expected: resType,
+            received: response.type,
+            response: sanitizeDebugPayload(response.message),
+          });
           // Do not intercept CallMethodError
           // Do not intercept “assertType: Response of unexpected type” error
           // Blocking the above two messages will not know what the specific error message is, and the specific error should be handled by the subsequent business logic.
@@ -347,7 +476,7 @@ export class DeviceCommands {
           if (error.message.indexOf('BridgeDeviceDisconnected') > -1) {
             throw ERRORS.TypedError(HardwareErrorCode.BridgeDeviceDisconnected);
           }
-          throw ERRORS.TypedError(HardwareErrorCode.ResponseUnexpectTypeError);
+          throw error;
         }
       } else {
         // throw error anyway, next call should be resolved properly// throw error anyway, next call should be resolved properly
@@ -357,20 +486,27 @@ export class DeviceCommands {
     return response;
   }
 
-  async _commonCall(type: MessageKey, msg?: DefaultMessageResponse['message']) {
-    const resp = await this.call(type, msg);
-    return this._filterCommonTypes(resp, type);
+  async _commonCall(
+    type: MessageKey,
+    msg?: DefaultMessageResponse['message'],
+    options?: TransportCallOptions
+  ) {
+    const resp = await this.call(type, msg, options);
+    return this._filterCommonTypes(resp, type, options);
   }
 
   _filterCommonTypes(
     res: DefaultMessageResponse,
-    callType: MessageKey
+    callType: MessageKey,
+    options?: TransportCallOptions
   ): Promise<DefaultMessageResponse> {
     try {
-      if (DataManager.getSettings('env') === 'react-native') {
-        Log.debug('_filterCommonTypes: ', JSON.stringify(res));
+      if (shouldReduceDebugForCall(callType)) {
+        // 高频文件写入每个 chunk 都会经过这里，避免 debug log 反向拖慢传输。
+      } else if (DataManager.getSettings('env') === 'react-native') {
+        Log.debug('_filterCommonTypes: ', JSON.stringify(sanitizeDebugPayload(res)));
       } else {
-        Log.debug('_filterCommonTypes: ', res);
+        Log.debug('_filterCommonTypes: ', sanitizeDebugPayload(res));
       }
     } catch (error) {
       // ignore
@@ -472,7 +608,7 @@ export class DeviceCommands {
       } else {
         this.device.emit(DEVICE.BUTTON, this.device, res.message);
       }
-      return this._commonCall('ButtonAck', {});
+      return this._commonCall('ButtonAck', {}, options);
     }
 
     if (res.type === 'EntropyRequest') {
@@ -485,11 +621,11 @@ export class DeviceCommands {
           if (pin === '@@ONEKEY_INPUT_PIN_IN_DEVICE') {
             // only classic\1s\mini\pure
             this.device.setCancelableAction(() => this.cancelDeviceOnOneKeyDevice());
-            return this._commonCall('BixinPinInputOnDevice').finally(() => {
+            return this._commonCall('BixinPinInputOnDevice', {}, options).finally(() => {
               this.device.clearCancelableAction();
             });
           }
-          return this._commonCall('PinMatrixAck', { pin });
+          return this._commonCall('PinMatrixAck', { pin }, options);
         },
         error => Promise.reject(error)
       );
@@ -504,12 +640,12 @@ export class DeviceCommands {
 
         // Attach PIN on device
         if (attachPinOnDevice && existsAttachPinUser) {
-          return this._commonCall('PassphraseAck', { on_device_attach_pin: true });
+          return this._commonCall('PassphraseAck', { on_device_attach_pin: true }, options);
         }
 
         return !passphraseOnDevice
-          ? this._commonCall('PassphraseAck', { passphrase })
-          : this._commonCall('PassphraseAck', { on_device: true });
+          ? this._commonCall('PassphraseAck', { passphrase }, options)
+          : this._commonCall('PassphraseAck', { on_device: true }, options);
       });
     }
 

package/src/device/DeviceConnector.ts

@@ -1,3 +1,5 @@
+import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
+
 import { safeThrowError } from '../constants';
 import { DataManager } from '../data-manager';
 import TransportManager from '../data-manager/TransportManager';
@@ -6,6 +8,7 @@ import { resolveAfter } from '../utils/promiseUtils';
 import { LoggerNames, getLogger } from '../utils';
 
 import type { DeviceDescriptorDiff } from './DevicePool';
+import type { HardwareConnectProtocol } from '@onekeyfe/hd-shared';
 import type { OneKeyDeviceInfo as DeviceDescriptor, Transport } from '@onekeyfe/hd-transport';
 
 const Log = getLogger(LoggerNames.DeviceConnector);
@@ -75,15 +78,37 @@ export default class DeviceConnector {
     this.listening = false;
   }
 
-  async acquire(path: string, session?: string | null, forceCleanRunPromise?: boolean) {
-    Log.debug('acquire', path, session);
+  async acquire(
+    path: string,
+    session?: string | null,
+    forceCleanRunPromise?: boolean,
+    connectProtocol?: HardwareConnectProtocol
+  ) {
+    Log.debug('acquire', path, session, connectProtocol);
     const env = DataManager.getSettings('env');
     try {
       let res;
       if (DataManager.isBleConnect(env)) {
-        res = await this.transport.acquire({ uuid: path, forceCleanRunPromise });
+        res = await this.transport.acquire({
+          uuid: path,
+          forceCleanRunPromise,
+          expectedProtocol: connectProtocol,
+        });
       } else {
-        res = await this.transport.acquire({ path, previous: session ?? null });
+        res = await this.transport.acquire({
+          path,
+          previous: session ?? null,
+          expectedProtocol: connectProtocol,
+        });
+      }
+      if (connectProtocol) {
+        const detectedProtocol = this.transport.getProtocolType(path);
+        if (detectedProtocol !== connectProtocol) {
+          throw ERRORS.TypedError(
+            HardwareErrorCode.RuntimeError,
+            `Device protocol mismatch: expected ${connectProtocol}, detected ${detectedProtocol}`
+          );
+        }
       }
       return res;
     } catch (error) {

package/src/device/DevicePool.ts

@@ -150,7 +150,7 @@ export class DevicePool extends EventEmitter {
     if (!device) {
       device = Device.fromDescriptor(descriptor);
       device.deviceConnector = this.connector;
-      await device.connect();
+      await device.connect(initOptions?.connectProtocol);
       await device.initialize(initOptions);
       await device.release();
     }

package/src/events/ui-request.ts

@@ -129,6 +129,10 @@ export interface FirmwareProgress {
     device: Device;
     progress: number;
     progressType: IFirmwareUpdateProgressType;
+    transferredBytes?: number;
+    totalBytes?: number;
+    rateBytesPerSecond?: number;
+    elapsedMs?: number;
   };
 }
 
@@ -144,6 +148,10 @@ export interface DeviceProgress {
   type: typeof UI_REQUEST.DEVICE_PROGRESS;
   payload: {
     progress?: number;
+    transferredBytes?: number;
+    totalBytes?: number;
+    rateBytesPerSecond?: number;
+    elapsedMs?: number;
   };
 }