@onekeyfe/hd-core 1.2.0-alpha.56 → 1.2.0-alpha.58

package/dist/index.js

@@ -837,7 +837,7 @@ const createLogMessage = (type, payload) => ({
 
 const MAX_ENTRIES = 500;
 let postMessage$1;
-class Log$k {
+class Log$l {
     constructor(prefix, enabled) {
         this.prefix = prefix;
         this.enabled = enabled;
@@ -889,7 +889,7 @@ class Log$k {
 }
 const _logs = {};
 const initLog = (prefix, enabled) => {
-    const instance = new Log$k(prefix, !!enabled);
+    const instance = new Log$l(prefix, !!enabled);
     _logs[prefix] = instance;
     return instance;
 };
@@ -1287,7 +1287,7 @@ function patchFeatures(response) {
     return response;
 }
 
-const Log$j = getLogger(exports.LoggerNames.Core);
+const Log$k = getLogger(exports.LoggerNames.Core);
 let globalInstanceCounter = 0;
 let sdkInstanceCounter = 0;
 function generateSdkInstanceId() {
@@ -1347,7 +1347,7 @@ function completeRequestContext(responseID, error) {
         context.status = error ? 'error' : 'success';
         if (error) {
             context.error = error.message;
-            Log$j.debug(`[RequestContext] [completeRequestContext] Error: ${formatRequestContext(context)}`);
+            Log$k.debug(`[RequestContext] [completeRequestContext] Error: ${formatRequestContext(context)}`);
         }
         globalActiveRequests.delete(responseID);
         if (context.sdkInstanceId) {
@@ -39716,7 +39716,7 @@ function isProtocolV2ResourceFileValid(binary, resource) {
 }
 
 var _a$1;
-const Log$i = getLogger(exports.LoggerNames.Core);
+const Log$j = getLogger(exports.LoggerNames.Core);
 const FIRMWARE_FIELDS = [
     'firmware',
     'firmware-v1',
@@ -39771,6 +39771,7 @@ class DataManager {
         var _b;
         return __awaiter(this, void 0, void 0, function* () {
             this.settings = settings;
+            this.protocolV2ResourcesConfigError = undefined;
             if (!settings.fetchConfig) {
                 return false;
             }
@@ -39781,38 +39782,48 @@ class DataManager {
             let data = null;
             let fetchMethod = 'none';
             if (settings.configFetcher) {
-                Log$i.debug('[DataConfig] Trying configFetcher (client-side fetcher)...');
+                Log$j.debug('[DataConfig] Trying configFetcher (client-side fetcher)...');
                 try {
                     data = yield settings.configFetcher(urlWithCache);
                     if (data) {
                         fetchMethod = 'configFetcher';
-                        Log$i.log('[DataConfig] ConfigFetcher success');
+                        Log$j.log('[DataConfig] ConfigFetcher success');
                     }
                     else {
-                        Log$i.debug('[DataConfig] ConfigFetcher returned null, will fallback to axios');
+                        Log$j.debug('[DataConfig] ConfigFetcher returned null, will fallback to axios');
                     }
                 }
                 catch (e) {
-                    Log$i.warn('[DataConfig] ConfigFetcher error, will fallback to axios:', e);
+                    Log$j.warn('[DataConfig] ConfigFetcher error, will fallback to axios:', e);
                 }
             }
             if (!data) {
-                Log$i.debug('[DataConfig] Trying axios (SDK default fetcher)...');
+                Log$j.debug('[DataConfig] Trying axios (SDK default fetcher)...');
                 try {
                     const response = yield axios__default["default"].get(urlWithCache, {
                         timeout: 7000,
                     });
                     data = response.data;
                     fetchMethod = 'axios';
-                    Log$i.log('[DataConfig] Axios fetch success');
+                    Log$j.log('[DataConfig] Axios fetch success');
                 }
                 catch (e) {
-                    Log$i.warn('[DataConfig] Axios fetch error:', e);
+                    Log$j.warn('[DataConfig] Axios fetch error:', e);
                 }
             }
             if (data) {
-                const pro2Resources = parseProtocolV2Resources((_b = data.pro2) === null || _b === void 0 ? void 0 : _b.resources);
-                Log$i.log(`[DataConfig] Config loaded successfully via [${fetchMethod}]`);
+                let pro2Resources;
+                try {
+                    pro2Resources = parseProtocolV2Resources((_b = data.pro2) === null || _b === void 0 ? void 0 : _b.resources);
+                }
+                catch (error) {
+                    this.protocolV2ResourcesConfigError =
+                        error instanceof Error ? error : new Error(String(error));
+                    Log$j.warn('[DataConfig] Ignoring invalid Pro2 resources config:', error);
+                }
+                const enrichedPro2Config = this.enrichFirmwareReleaseInfo(data.pro2);
+                const pro2Config = __rest(enrichedPro2Config, ["resources"]);
+                Log$j.log(`[DataConfig] Config loaded successfully via [${fetchMethod}]`);
                 this.deviceMap = {
                     [hdShared.EDeviceType.Classic]: this.enrichFirmwareReleaseInfo(data.classic),
                     [hdShared.EDeviceType.Classic1s]: this.enrichFirmwareReleaseInfo(data.classic1s),
@@ -39820,14 +39831,14 @@ class DataManager {
                     [hdShared.EDeviceType.Mini]: this.enrichFirmwareReleaseInfo(data.mini),
                     [hdShared.EDeviceType.Touch]: this.enrichFirmwareReleaseInfo(data.touch),
                     [hdShared.EDeviceType.Pro]: this.enrichFirmwareReleaseInfo(data.pro),
-                    [hdShared.EDeviceType.Pro2]: Object.assign(Object.assign({}, this.enrichFirmwareReleaseInfo(data.pro2)), (pro2Resources ? { resources: pro2Resources } : undefined)),
+                    [hdShared.EDeviceType.Pro2]: Object.assign(Object.assign({}, pro2Config), (pro2Resources ? { resources: pro2Resources } : undefined)),
                 };
                 this.assets = {
                     bridge: data.bridge,
                 };
                 return true;
             }
-            Log$i.warn('[DataConfig] All fetch methods failed, using built-in default config');
+            Log$j.warn('[DataConfig] All fetch methods failed, using built-in default config');
             return false;
         });
     }
@@ -39857,6 +39868,9 @@ class DataManager {
             if (!loaded) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.NetworkError, 'Unable to refresh the latest remote config');
             }
+            if (this.protocolV2ResourcesConfigError) {
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.NetworkError, `Invalid Pro2 resources config: ${this.protocolV2ResourcesConfigError.message}`);
+            }
             this.lastCheckTimestamp = getTimeStamp();
         });
     }
@@ -41933,7 +41947,7 @@ const getDefectiveDeviceInfo = (features) => {
     };
 };
 
-const Log$h = getLogger(exports.LoggerNames.DevicePool);
+const Log$i = getLogger(exports.LoggerNames.DevicePool);
 const getDiff = (current, descriptors) => {
     const connected = descriptors.filter(d => current.find(x => x.path === d.path) === undefined);
     const disconnected = current.filter(d => descriptors.find(x => x.path === d.path) === undefined);
@@ -41991,7 +42005,7 @@ class DevicePool extends events.exports {
                         yield this._checkDevicePool(initOptions, connectId);
                         return { devices, deviceList };
                     }
-                    Log$h.debug('found device in cache, but path is different: ', connectId);
+                    Log$i.debug('found device in cache, but path is different: ', connectId);
                 }
             }
             const matchedDescriptor = connectId
@@ -42083,7 +42097,7 @@ class DevicePool extends events.exports {
                 yield device.getDeviceState({ refreshSections: ['settings'] });
             }
             catch (error) {
-                Log$h.debug('Unable to refresh Protocol V2 device label during discovery', error);
+                Log$i.debug('Unable to refresh Protocol V2 device label during discovery', error);
             }
         });
     }
@@ -42099,7 +42113,7 @@ class DevicePool extends events.exports {
                 const descriptor = this.connectedPool[i];
                 if (!connectId || descriptor.path === connectId) {
                     const device = yield this._createDevice(descriptor, initOptions);
-                    Log$h.debug('emit DEVICE.CONNECT: ', device === null || device === void 0 ? void 0 : device.features);
+                    Log$i.debug('emit DEVICE.CONNECT: ', device === null || device === void 0 ? void 0 : device.features);
                     this.emitter.emit(DEVICE.CONNECT, device);
                     this.connectedPool.splice(i, 1);
                 }
@@ -42121,9 +42135,9 @@ class DevicePool extends events.exports {
         const diff = getDiff(this.current || [], upcoming);
         this.upcoming = upcoming;
         this.current = this.upcoming;
-        Log$h.debug('device pool -> current: ', this.current);
-        Log$h.debug('device pool -> upcomming: ', this.upcoming);
-        Log$h.debug('DeviceCache.reportDeviceChange diff: ', diff);
+        Log$i.debug('device pool -> current: ', this.current);
+        Log$i.debug('device pool -> upcomming: ', this.upcoming);
+        Log$i.debug('DeviceCache.reportDeviceChange diff: ', diff);
         if (!diff.didUpdate) {
             return;
         }
@@ -42133,7 +42147,7 @@ class DevicePool extends events.exports {
                 this._addConnectedDeviceToPool(d);
                 return;
             }
-            Log$h.debug('emit DEVICE.CONNECT: ', device.features);
+            Log$i.debug('emit DEVICE.CONNECT: ', device.features);
             this.emitter.emit(DEVICE.CONNECT, device);
         });
         diff.disconnected.forEach(d => {
@@ -42143,7 +42157,7 @@ class DevicePool extends events.exports {
                 this._addDisconnectedDeviceToPool(d);
                 return;
             }
-            Log$h.debug('emit DEVICE.DISCONNECT: ', device.features);
+            Log$i.debug('emit DEVICE.DISCONNECT: ', device.features);
             device.markTransportDisconnected();
             this.emitter.emit(DEVICE.DISCONNECT, device);
         });
@@ -42179,7 +42193,7 @@ class DevicePool extends events.exports {
         this.connectedPool = [];
         this.disconnectPool = [];
         this.devicesCache = {};
-        Log$h.debug('DevicePool state has been reset');
+        Log$i.debug('DevicePool state has been reset');
     }
     static dispose() {
         this.resetState();
@@ -42193,7 +42207,7 @@ DevicePool.disconnectPool = [];
 DevicePool.devicesCache = {};
 DevicePool.emitter = new events.exports();
 
-const Log$g = getLogger(exports.LoggerNames.Transport);
+const Log$h = getLogger(exports.LoggerNames.Transport);
 const BleLogger = getLogger(exports.LoggerNames.HdBleTransport);
 const HttpLogger = getLogger(exports.LoggerNames.HdTransportHttp);
 const LowLevelLogger = getLogger(exports.LoggerNames.HdTransportLowLevel);
@@ -42203,7 +42217,7 @@ const WebUsbLogger = getLogger(exports.LoggerNames.HdTransportWebUsb);
 const REACT_NATIVE_BLE_SCAN_TIMEOUT_MS = 3000;
 class TransportManager {
     static load() {
-        Log$g.debug('transport manager load');
+        Log$h.debug('transport manager load');
         this.defaultMessages = DataManager.getProtobufMessages();
         this.currentMessages = this.defaultMessages;
         this.protocolV1MessageSchema = 'v1CurrentSchema';
@@ -42212,14 +42226,14 @@ class TransportManager {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const env = DataManager.getSettings('env');
-                Log$g.debug('Initializing transports', env);
+                Log$h.debug('Initializing transports', env);
                 if (env === 'react-native') {
                     if (!this.reactNativeInit) {
                         yield this.transport.init(BleLogger, DevicePool.emitter);
                         this.reactNativeInit = true;
                     }
                     else {
-                        Log$g.debug('React Native Do Not Initializing transports');
+                        Log$h.debug('React Native Do Not Initializing transports');
                     }
                 }
                 else if (env === 'node-usb') {
@@ -42240,15 +42254,15 @@ class TransportManager {
                 else {
                     yield this.transport.init(HttpLogger);
                 }
-                Log$g.debug('Configuring transports');
+                Log$h.debug('Configuring transports');
                 yield this.transport.configure(JSON.stringify(this.defaultMessages));
                 this.currentMessages = this.defaultMessages;
                 this.protocolV1MessageSchema = 'v1CurrentSchema';
                 yield this.configureProtocolV2Messages();
-                Log$g.debug('Configuring transports done');
+                Log$h.debug('Configuring transports done');
             }
             catch (error) {
-                Log$g.debug('Initializing transports error: ', error);
+                Log$h.debug('Initializing transports error: ', error);
                 if (error.code === 'ECONNABORTED') {
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BridgeTimeoutError);
                 }
@@ -42264,7 +42278,7 @@ class TransportManager {
             if (this.currentMessages === messages || !messages) {
                 return;
             }
-            Log$g.debug(`Reconfiguring transports Protocol V1 schema:${protocolV1MessageSchema}`);
+            Log$h.debug(`Reconfiguring transports Protocol V1 schema:${protocolV1MessageSchema}`);
             try {
                 yield this.transport.configure(JSON.stringify(messages));
                 this.currentMessages = messages;
@@ -42276,6 +42290,9 @@ class TransportManager {
         });
     }
     static setTransport(TransportConstructor, plugin) {
+        if (typeof TransportConstructor !== 'function') {
+            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured, 'Transport constructor is not available');
+        }
         const env = DataManager.getSettings('env');
         if (env === 'react-native') {
             this.transport = new TransportConstructor({
@@ -42287,9 +42304,9 @@ class TransportManager {
         }
         if (plugin) {
             this.plugin = plugin;
-            Log$g.debug('set transport plugin: ', this.plugin);
+            Log$h.debug('set transport plugin: ', this.plugin);
         }
-        Log$g.debug('set transport: ', this.transport.name, this.transport.version, this.transport.configured);
+        Log$h.debug('set transport: ', this.transport.name, this.transport.version, this.transport.configured);
     }
     static getTransport() {
         return this.transport;
@@ -42300,7 +42317,7 @@ class TransportManager {
             const { configureProtocolV2 } = this.transport;
             if (protocolV2Messages && typeof configureProtocolV2 === 'function') {
                 yield configureProtocolV2.call(this.transport, JSON.stringify(protocolV2Messages));
-                Log$g.debug('Protocol V2 messages configured');
+                Log$h.debug('Protocol V2 messages configured');
             }
         });
     }
@@ -42333,6 +42350,7 @@ const DEVICE_SESSION_CALLS = new Set([
     'DeviceSessionAskPin',
     'DeviceSessionAskPassphrase',
 ]);
+const PROTOCOL_V2_ACTION_CANCELLED_SUBCODE = 1;
 const isProtocolV2ActionCancelledMessage = (message) => /^(?:cancel(?:led|ed)(?: on device)?|confirm dismissed|user cancel(?:led|ed)(?:\s+.*)?)$/i.test(message);
 function shouldReduceDebugForCall(type) {
     return HIGH_VOLUME_DEBUG_CALLS.has(type);
@@ -42412,7 +42430,7 @@ const cancelDeviceWithInitialize = (device) => {
         },
     }));
 };
-const Log$f = getLogger(exports.LoggerNames.DeviceCommands);
+const Log$g = getLogger(exports.LoggerNames.DeviceCommands);
 const LogCore = getLogger(exports.LoggerNames.Core);
 class DeviceCommands {
     constructor(device, mainId) {
@@ -42421,7 +42439,7 @@ class DeviceCommands {
         this.transport = TransportManager.getTransport();
         this.disposed = false;
         this.instanceId = generateInstanceId('DeviceCommands', device.sdkInstanceId);
-        Log$f.debug(`[DeviceCommands] Created: ${this.instanceId}, device: ${this.device.instanceId}`);
+        Log$g.debug(`[DeviceCommands] Created: ${this.instanceId}, device: ${this.device.instanceId}`);
     }
     dispose(_cancelRequest) {
         var _a, _b;
@@ -42501,7 +42519,7 @@ class DeviceCommands {
         return __awaiter(this, void 0, void 0, function* () {
             const shouldReduceDebug = shouldReduceDebugForCall(type);
             if (!shouldReduceDebug) {
-                Log$f.debug('[DeviceCommands] [call] Sending', type, hdTransport.getSafeTransportLogPayload(msg !== null && msg !== void 0 ? msg : {}, type));
+                Log$g.debug('[DeviceCommands] [call] Sending', type, hdTransport.getSafeTransportLogPayload(msg !== null && msg !== void 0 ? msg : {}, type));
             }
             try {
                 const promise = this.transport.call(this.mainId, type, msg !== null && msg !== void 0 ? msg : {}, options);
@@ -42563,10 +42581,10 @@ class DeviceCommands {
                 assertType(response, resType);
             }
             catch (error) {
-                Log$f.debug('DeviceCommands typedcall error: ', error);
+                Log$g.debug('DeviceCommands typedcall error: ', error);
                 if (error instanceof hdShared.HardwareError) {
                     if (error.errorCode === hdShared.HardwareErrorCode.ResponseUnexpectTypeError) {
-                        Log$f.debug('[DeviceCommands] [typedCall] Unexpected response type', {
+                        Log$g.debug('[DeviceCommands] [typedCall] Unexpected response type', {
                             request: type,
                             expected: resType,
                             received: response.type,
@@ -42600,7 +42618,7 @@ class DeviceCommands {
         var _a;
         try {
             if (!shouldReduceDebugForCall(callType)) {
-                Log$f.debug('_filterCommonTypes: ', {
+                Log$g.debug('_filterCommonTypes: ', {
                     request: callType,
                     response: callType === 'DeviceFirmwareUpdateStatusGet'
                         ? {
@@ -42652,6 +42670,11 @@ class DeviceCommands {
             if (code === 'Failure_ProcessError') {
                 const normalizedMessage = (_a = message === null || message === void 0 ? void 0 : message.trim()) !== null && _a !== void 0 ? _a : '';
                 const isProtocolV2ActionCancelledFailure = this.device.isProtocolV2() && isProtocolV2ActionCancelledMessage(normalizedMessage);
+                const isProtocolV2ActionCancelledSubcode = this.device.isProtocolV2() && subcode === PROTOCOL_V2_ACTION_CANCELLED_SUBCODE;
+                const isProtocolV2DeviceBusyFailure = this.device.isProtocolV2() &&
+                    callType.startsWith('Device') &&
+                    !DEVICE_SESSION_CALLS.has(callType) &&
+                    subcode === hdTransport.DeviceErrorCode.DeviceError_Busy;
                 const isLegacyProtocolV2LockedFailure = this.device.isProtocolV2() && /^device (?:is )?locked$/i.test(normalizedMessage);
                 if (DEVICE_SESSION_CALLS.has(callType) &&
                     subcode === hdTransport.DeviceSessionErrorCode.DeviceSessionError_InvalidSession) {
@@ -42702,7 +42725,15 @@ class DeviceCommands {
                         firmwareMessage: message,
                     });
                 }
+                else if (isProtocolV2DeviceBusyFailure) {
+                    error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceBusy, message, {
+                        failureCode: code,
+                        subcode,
+                        firmwareMessage: message,
+                    });
+                }
                 else if (subcode === hdTransport.DeviceErrorCode.DeviceError_ActionCancelled ||
+                    isProtocolV2ActionCancelledSubcode ||
                     isProtocolV2ActionCancelledFailure) {
                     error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.ActionCancelled, message, {
                         failureCode: code,
@@ -42805,7 +42836,7 @@ class DeviceCommands {
                 reject(error);
             });
             const listenerCount = this.device.listenerCount(DEVICE.PIN);
-            Log$f.debug(`[${this.instanceId}] _promptPin called`, {
+            Log$g.debug(`[${this.instanceId}] _promptPin called`, {
                 responseID: this.currentResponseID,
                 deviceInstanceId: this.device.instanceId,
                 listenerCount,
@@ -43712,7 +43743,7 @@ const parseRunOptions = (options) => {
         options = {};
     return options;
 };
-const Log$e = getLogger(exports.LoggerNames.Device);
+const Log$f = getLogger(exports.LoggerNames.Device);
 const isProtocolV2DeviceStatusUnsupportedError = (error) => {
     var _a, _b, _c;
     if (error instanceof hdShared.HardwareError) {
@@ -43773,7 +43804,7 @@ class Device extends events.exports {
         this.sdkInstanceId = sdkInstanceId;
         this.instanceId = generateInstanceId('Device', this.sdkInstanceId);
         this.createdAt = Date.now();
-        Log$e.debug(`[Device] Created: ${this.instanceId}${this.sdkInstanceId ? ` for SDK: ${this.sdkInstanceId}` : ''}`);
+        Log$f.debug(`[Device] Created: ${this.instanceId}${this.sdkInstanceId ? ` for SDK: ${this.sdkInstanceId}` : ''}`);
     }
     static fromDescriptor(originalDescriptor, sdkInstanceId) {
         const descriptor = Object.assign({}, originalDescriptor);
@@ -43864,12 +43895,12 @@ class Device extends events.exports {
                 if (DataManager.isBleConnect(env)) {
                     acquireResult = yield ((_a = this.deviceConnector) === null || _a === void 0 ? void 0 : _a.acquire(this.originalDescriptor.id, undefined, true, strictProtocol, undefined));
                     this.mainId = (_b = acquireResult === null || acquireResult === void 0 ? void 0 : acquireResult.uuid) !== null && _b !== void 0 ? _b : '';
-                    Log$e.debug('Expected uuid:', this.mainId);
+                    Log$f.debug('Expected uuid:', this.mainId);
                 }
                 else {
                     acquireResult = yield ((_c = this.deviceConnector) === null || _c === void 0 ? void 0 : _c.acquire(this.originalDescriptor.path, this.originalDescriptor.session, undefined, strictProtocol, undefined));
                     this.mainId = acquireResult;
-                    Log$e.debug('Expected session id:', this.mainId);
+                    Log$f.debug('Expected session id:', this.mainId);
                 }
                 const detectedProtocol = (_d = acquireResult === null || acquireResult === void 0 ? void 0 : acquireResult.protocolType) !== null && _d !== void 0 ? _d : (_f = (_e = TransportManager.transport) === null || _e === void 0 ? void 0 : _e.getProtocolType) === null || _f === void 0 ? void 0 : _f.call(_e, DataManager.isBleConnect(env) ? this.originalDescriptor.id : this.originalDescriptor.path);
                 if ((options === null || options === void 0 ? void 0 : options.forceProtocolDetection) && !detectedProtocol) {
@@ -43895,7 +43926,7 @@ class Device extends events.exports {
                             yield ((_j = (_h = this.deviceConnector) === null || _h === void 0 ? void 0 : _h.release) === null || _j === void 0 ? void 0 : _j.call(_h, failedSession, false));
                         }
                         catch (releaseError) {
-                            Log$e.debug('Failed to release an unsuccessful protocol probe', releaseError);
+                            Log$f.debug('Failed to release an unsuccessful protocol probe', releaseError);
                         }
                     }
                     if (!DataManager.isBleConnect(env)) {
@@ -43924,11 +43955,11 @@ class Device extends events.exports {
                 (this.mainId && DataManager.isBleConnect(env))) {
                 if (this.pendingCallbackPromise) {
                     try {
-                        Log$e.debug('Waiting for callback tasks to complete before releasing device (in release method)');
+                        Log$f.debug('Waiting for callback tasks to complete before releasing device (in release method)');
                         yield this.pendingCallbackPromise.promise;
                     }
                     catch (error) {
-                        Log$e.error('Error waiting for callback tasks in release method:', error);
+                        Log$f.error('Error waiting for callback tasks in release method:', error);
                     }
                 }
                 if (this.commands) {
@@ -43947,7 +43978,7 @@ class Device extends events.exports {
                     this.updateDescriptor({ session: null });
                 }
                 catch (err) {
-                    Log$e.error('[Device] release error: ', err);
+                    Log$f.error('[Device] release error: ', err);
                 }
                 finally {
                     this.needReloadDevice = true;
@@ -44149,7 +44180,7 @@ class Device extends events.exports {
         });
     }
     getInternalState(_deviceId) {
-        Log$e.debug('getInternalState session param: ', `device_id: ${_deviceId}`, `currentDeviceId: ${this.getCurrentDeviceId()}`, `hasPassphraseState: ${Boolean(this.passphraseState)}`);
+        Log$f.debug('getInternalState session param: ', `device_id: ${_deviceId}`, `currentDeviceId: ${this.getCurrentDeviceId()}`, `hasPassphraseState: ${Boolean(this.passphraseState)}`);
         const deviceId = this.getSessionCacheDeviceKey(_deviceId);
         if (!deviceId)
             return undefined;
@@ -44164,7 +44195,7 @@ class Device extends events.exports {
         return deviceWalletSessionStore.getStandard(deviceId);
     }
     updateInternalState(enablePassphrase, passphraseState, deviceId, sessionId = null, featuresSessionId = null, walletType = 'hidden') {
-        Log$e.debug('updateInternalState session param: ', `device_id: ${deviceId}`, `enablePassphrase: ${enablePassphrase}`, `hasPassphraseState: ${Boolean(passphraseState)}`, `hasSessionId: ${Boolean(sessionId)}`, `hasFeaturesSessionId: ${Boolean(featuresSessionId)}`);
+        Log$f.debug('updateInternalState session param: ', `device_id: ${deviceId}`, `enablePassphrase: ${enablePassphrase}`, `hasPassphraseState: ${Boolean(passphraseState)}`, `hasSessionId: ${Boolean(sessionId)}`, `hasFeaturesSessionId: ${Boolean(featuresSessionId)}`);
         const cacheDeviceKey = this.getSessionCacheDeviceKey(deviceId);
         if (!cacheDeviceKey)
             return;
@@ -44180,7 +44211,7 @@ class Device extends events.exports {
         deviceWalletSessionStore.deletePending(cacheDeviceKey);
     }
     setInternalState(state, initSession) {
-        Log$e.debug('setInternalState session param: ', `hasState: ${Boolean(state)}`, `initSession: ${initSession}`, `deviceId: ${this.getCurrentDeviceId()}`, `hasPassphraseState: ${Boolean(this.passphraseState)}`);
+        Log$f.debug('setInternalState session param: ', `hasState: ${Boolean(state)}`, `initSession: ${initSession}`, `deviceId: ${this.getCurrentDeviceId()}`, `hasPassphraseState: ${Boolean(this.passphraseState)}`);
         if (!this.passphraseState && !initSession)
             return;
         const deviceId = this.getSessionCacheDeviceKey();
@@ -44194,7 +44225,7 @@ class Device extends events.exports {
         }
     }
     clearInternalState(_deviceId) {
-        Log$e.debug('clearInternalState param: ', _deviceId);
+        Log$f.debug('clearInternalState param: ', _deviceId);
         const deviceId = this.getSessionCacheDeviceKey(_deviceId);
         if (!deviceId)
             return;
@@ -44261,24 +44292,24 @@ class Device extends events.exports {
                 yield callInitialize(payload, options === null || options === void 0 ? void 0 : options.initSession);
             }
             catch (error) {
-                Log$e.error('Initialization failed:', error);
+                Log$f.error('Initialization failed:', error);
                 throw error;
             }
         });
     }
     _initializeProtocolV2(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            Log$e.debug('Initialize device via Protocol V2 features adapter');
+            Log$f.debug('Initialize device via Protocol V2 features adapter');
             try {
                 const deviceInfo = yield requestProtocolV2DeviceInfo({
                     commands: this.commands,
                     timeoutMs: options === null || options === void 0 ? void 0 : options.protocolV2DeviceInfoTimeoutMs,
                 });
                 const features = yield this.probeProtocolV2RuntimeState(deviceInfo, options === null || options === void 0 ? void 0 : options.protocolV2DeviceInfoTimeoutMs);
-                Log$e.debug('Protocol V2 features:', features);
+                Log$f.debug('Protocol V2 features:', features);
             }
             catch (error) {
-                Log$e.error('Protocol V2 initialization failed:', error);
+                Log$f.error('Protocol V2 initialization failed:', error);
                 throw error;
             }
         });
@@ -44384,7 +44415,7 @@ class Device extends events.exports {
             source,
             changedKeys: result.changedKeys,
         };
-        Log$e.debug('Device state patch committed', {
+        Log$f.debug('Device state patch committed', {
             source,
             keys: result.changedKeys,
         });
@@ -44602,7 +44633,7 @@ class Device extends events.exports {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.runPromise) {
                 yield this.interruptionFromOutside();
-                Log$e.debug('[Device] run error:', 'Device is running, but will cancel previous operate');
+                Log$f.debug('[Device] run error:', 'Device is running, but will cancel previous operate');
             }
             options = parseRunOptions(options);
             const runPromise = hdShared.createDeferred();
@@ -44679,7 +44710,7 @@ class Device extends events.exports {
                             yield ((_a = this.deviceConnector) === null || _a === void 0 ? void 0 : _a.disconnect(this.mainId));
                         }
                         yield this.release();
-                        Log$e.debug(`error code ${e.errorCode} release device, mainId: ${this.mainId}`);
+                        Log$f.debug(`error code ${e.errorCode} release device, mainId: ${this.mainId}`);
                     }
                     clearRunPromise();
                     return;
@@ -44689,7 +44720,7 @@ class Device extends events.exports {
                 options.keepSession === false) {
                 this.keepSession = false;
                 yield this.release();
-                Log$e.debug('release device, mainId: ', this.mainId);
+                Log$f.debug('release device, mainId: ', this.mainId);
             }
             runPromise.resolve();
             clearRunPromise();
@@ -44720,7 +44751,7 @@ class Device extends events.exports {
     setCancelableAction(callback) {
         this.cancelableAction = (e) => callback(e)
             .catch(e2 => {
-            Log$e.debug('cancelableAction error', e2);
+            Log$f.debug('cancelableAction error', e2);
         })
             .finally(() => {
             this.clearCancelableAction();
@@ -45001,7 +45032,7 @@ class Device extends events.exports {
                 expectedPassphraseState &&
                 expectedPassphraseState !== newPassphraseState;
             const passphraseStateMismatch = !!expectedPassphraseState && expectedPassphraseState !== newPassphraseState;
-            Log$e.debug('Check passphrase state safety: ', {
+            Log$f.debug('Check passphrase state safety: ', {
                 hasExpectedPassphraseState: Boolean(expectedPassphraseState),
                 hasNewPassphraseState: Boolean(newPassphraseState),
                 passphraseStateMatches: Boolean(expectedPassphraseState) && expectedPassphraseState === newPassphraseState,
@@ -45139,7 +45170,7 @@ const getBootloaderReleaseInfo = ({ features, willUpdateFirmwareVersion, firmwar
     };
 };
 
-const Log$d = getLogger(exports.LoggerNames.Method);
+const Log$e = getLogger(exports.LoggerNames.Method);
 const isEvmLedgerLegacyPathWithHighIndex = (path) => {
     let addressN;
     if (typeof path === 'string') {
@@ -45223,7 +45254,7 @@ class BaseMethod {
     setContext(context) {
         this.sdkInstanceId = context.sdkInstanceId;
         this.instanceId = generateInstanceId('Method', this.sdkInstanceId);
-        Log$d.debug(`[BaseMethod] Created: ${this.instanceId}, method: ${this.name}, SDK: ${this.sdkInstanceId}`);
+        Log$e.debug(`[BaseMethod] Created: ${this.instanceId}, method: ${this.name}, SDK: ${this.sdkInstanceId}`);
     }
     setDevice(device) {
         var _a, _b;
@@ -45243,7 +45274,7 @@ class BaseMethod {
         if (device.commands) {
             device.commands.currentResponseID = this.responseID;
         }
-        Log$d.debug(`[${this.instanceId}] setDevice: ${device.instanceId}, commands: ${(_b = device.commands) === null || _b === void 0 ? void 0 : _b.instanceId}`);
+        Log$e.debug(`[${this.instanceId}] setDevice: ${device.instanceId}, commands: ${(_b = device.commands) === null || _b === void 0 ? void 0 : _b.instanceId}`);
     }
     checkFirmwareRelease() {
         if (!this.device || this.device.isProtocolV2())
@@ -45318,7 +45349,7 @@ class BaseMethod {
                 checkFlag = true;
             }
             if (checkFlag && this.device.getCurrentSafetyChecks() === hdTransport.Enum_SafetyCheckLevel.Strict) {
-                Log$d.debug('will change safety_checks level');
+                Log$e.debug('will change safety_checks level');
                 yield this.device.commands.typedCall('ApplySettings', 'Success', {
                     safety_checks: hdTransport.Enum_SafetyCheckLevel.PromptTemporarily,
                 });
@@ -45394,7 +45425,7 @@ class Ping extends BaseMethod {
     }
 }
 
-const Log$c = getLogger(exports.LoggerNames.Core);
+const Log$d = getLogger(exports.LoggerNames.Core);
 const parseInitOptions$1 = (payload) => ({
     initSession: payload === null || payload === void 0 ? void 0 : payload.initSession,
     passphraseState: payload === null || payload === void 0 ? void 0 : payload.passphraseState,
@@ -45420,14 +45451,14 @@ class PreInitialize extends BaseMethod {
             }
             catch (_a) {
                 this.device.clearPreInitialized();
-                Log$c.debug('[PRE-INIT][FAILED]');
+                Log$d.debug('[PRE-INIT][FAILED]');
                 return false;
             }
         });
     }
 }
 
-const Log$b = getLogger(exports.LoggerNames.DevicePool);
+const Log$c = getLogger(exports.LoggerNames.DevicePool);
 class SearchDevices extends BaseMethod {
     init() {
         this.useDevice = false;
@@ -45468,7 +45499,7 @@ class SearchDevices extends BaseMethod {
                     const errorCode = error && typeof error === 'object' && 'errorCode' in error
                         ? error.errorCode
                         : undefined;
-                    Log$b.debug('Skip unavailable device during search', Object.assign({ path: descriptor.path }, (errorCode !== undefined ? { errorCode } : {})));
+                    Log$c.debug('Skip unavailable device during search', Object.assign({ path: descriptor.path }, (errorCode !== undefined ? { errorCode } : {})));
                 }
             }
             return deviceList.map(device => device.toMessageObject());
@@ -46886,6 +46917,7 @@ class DeviceSettings extends BaseMethod {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 if (this.device.isProtocolV2()) {
+                    const refreshStatusAndSettings = () => this.device.getDeviceState({ refreshSections: ['status', 'settings'] });
                     assertSettingsSupported(this.payload, DEVICE_SETTINGS_V1_ONLY_FIELDS, 'Protocol V2');
                     const capabilities = getDeviceSettingsCapabilities(this.device.getCurrentDeviceType(), 'V2');
                     assertProtocolV2SettingValues(this.payload, capabilities);
@@ -46908,7 +46940,7 @@ class DeviceSettings extends BaseMethod {
                         const res = yield this.device.commands.typedCall('DeviceSettingsPageShow', 'Success', {
                             page: hdTransport.DeviceSettingsPage.DevicePassphrase,
                         });
-                        const updated = yield this.device.getDeviceState({ refreshSections: ['status'] });
+                        const updated = yield refreshStatusAndSettings();
                         const lockedAfterDisabling = requestedPassphrase === false &&
                             current.status.unlocked === true &&
                             updated.status.unlocked === false;
@@ -46926,7 +46958,7 @@ class DeviceSettings extends BaseMethod {
                         const res = yield this.device.commands.typedCall('DeviceSettingsPageShow', 'Success', {
                             page: hdTransport.DeviceSettingsPage.DeviceAirgap,
                         });
-                        const updated = yield this.device.getDeviceState({ refreshSections: ['settings'] });
+                        const updated = yield refreshStatusAndSettings();
                         if (updated.settings.airgapMode !== requestedAirgap) {
                             throw hdShared.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 air-gap setting did not reach the requested value.');
                         }
@@ -46938,7 +46970,7 @@ class DeviceSettings extends BaseMethod {
                     const res = yield this.device.commands.typedCall('DeviceSettingsSet', 'Success', {
                         settings,
                     });
-                    this.device.updateState(mapDeviceSettingsToState(settings), 'settings-write');
+                    yield refreshStatusAndSettings();
                     return res.message;
                 }
                 assertSettingsSupported(this.payload, DEVICE_SETTINGS_V2_ONLY_FIELDS, 'Protocol V1');
@@ -47303,7 +47335,7 @@ const getInfo = ({ features, updateType, targetVersion, firmwareType }) => {
 const NEW_BOOT_UPRATE_FIRMWARE_VERSION = '2.4.5';
 const SESSION_ERROR$2 = 'session not found';
 const FIRMWARE_UPDATE_CONFIRM$1 = 'Firmware install confirmed';
-const Log$a = getLogger(exports.LoggerNames.Method);
+const Log$b = getLogger(exports.LoggerNames.Method);
 const isDeviceDisconnectedError$1 = (error) => {
     const message = error instanceof Error ? error.message : String(error !== null && error !== void 0 ? error : '');
     return (message.includes('device was disconnected') ||
@@ -47352,13 +47384,13 @@ const uploadFirmware = (updateType, typedCall, postMessage, device, { payload, r
             const newFeatures = yield typedCall('GetFeatures', 'Features', {});
             const deviceBootloaderVersion = getDeviceBootloaderVersion(buildProtocolV1FeaturesPayload(newFeatures.message, device.features)).join('.');
             const supportUpgradeFileHeader = semver__default["default"].gte(deviceBootloaderVersion, '2.1.0');
-            Log$a.debug('supportUpgradeFileHeader:', supportUpgradeFileHeader);
+            Log$b.debug('supportUpgradeFileHeader:', supportUpgradeFileHeader);
             if (supportUpgradeFileHeader) {
                 const HEADER_SIZE = 1024;
                 if (payload.byteLength < HEADER_SIZE) {
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `firmware payload too small: ${payload.byteLength} bytes, expected at least ${HEADER_SIZE} bytes`);
                 }
-                Log$a.debug('Uploading firmware header:', {
+                Log$b.debug('Uploading firmware header:', {
                     size: HEADER_SIZE,
                     totalSize: payload.byteLength,
                 });
@@ -47370,18 +47402,18 @@ const uploadFirmware = (updateType, typedCall, postMessage, device, { payload, r
                     });
                     const isUnknownMessage = (_b = (_a = headerRes.message) === null || _a === void 0 ? void 0 : _a.message) === null || _b === void 0 ? void 0 : _b.includes('Failure_UnknownMessage');
                     if (headerRes.type !== 'Success' && !isUnknownMessage) {
-                        Log$a.error('Firmware header upload failed:', headerRes);
+                        Log$b.error('Firmware header upload failed:', headerRes);
                         throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'failed to upload firmware header');
                     }
                 }
                 catch (error) {
-                    Log$a.error('Firmware header upload failed:', error);
+                    Log$b.error('Firmware header upload failed:', error);
                     const message = error instanceof Error ? error.message : String(error !== null && error !== void 0 ? error : '');
                     if (!message.includes('Failure_UnknownMessage')) {
                         throw error;
                     }
                 }
-                Log$a.debug('Firmware header uploaded successfully');
+                Log$b.debug('Firmware header uploaded successfully');
             }
         }
         const eraseCommand = isFirmware ? 'FirmwareErase' : 'FirmwareErase_ex';
@@ -47399,7 +47431,7 @@ const uploadFirmware = (updateType, typedCall, postMessage, device, { payload, r
         }
         catch (error) {
             if (isDeviceDisconnectedError$1(error)) {
-                Log$a.log('Rebooting device');
+                Log$b.log('Rebooting device');
                 updateResponse = {
                     type: 'Success',
                     message: { message: FIRMWARE_UPDATE_CONFIRM$1 },
@@ -47485,7 +47517,7 @@ const newTouchUpdateProcess = (updateType, postMessage, device, { payload }, reb
     }
     catch (error) {
         if (isDeviceDisconnectedError$1(error)) {
-            Log$a.log('Rebooting device');
+            Log$b.log('Rebooting device');
             response = {
                 type: 'Success',
                 message: { message: FIRMWARE_UPDATE_CONFIRM$1 },
@@ -47516,7 +47548,7 @@ const newTouchUpdateProcess = (updateType, postMessage, device, { payload }, reb
                         ]);
                     }
                     catch (e) {
-                        Log$a.log('catch Bluetooth error when device is restarting: ', e);
+                        Log$b.log('catch Bluetooth error when device is restarting: ', e);
                     }
                 }
                 else {
@@ -47537,7 +47569,7 @@ const newTouchUpdateProcess = (updateType, postMessage, device, { payload }, reb
             }
             catch (error) {
                 console.error('Device reconnect failed: ', error);
-                Log$a.error('Device reconnect failed:', error);
+                Log$b.error('Device reconnect failed:', error);
                 yield wait(1000);
             }
         }
@@ -47577,7 +47609,7 @@ const emmcFileWriteWithRetry = (device, filePath, chunkLength, offset, chunk, ov
             return result;
         }
         catch (error) {
-            Log$a.error(`emmcWrite error: `, error);
+            Log$b.error(`emmcWrite error: `, error);
             retryCount--;
             if (retryCount === 0) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.EmmcFileWriteFirmwareError, 'transfer data error');
@@ -47722,7 +47754,7 @@ class DeviceFullyUploadResource extends BaseMethod {
     }
 }
 
-const Log$9 = getLogger(exports.LoggerNames.Method);
+const Log$a = getLogger(exports.LoggerNames.Method);
 const SESSION_ERROR$1 = 'session not found';
 const FIRMWARE_UPDATE_CONFIRM = 'Firmware install confirmed';
 const isDeviceDisconnectedError = (error) => {
@@ -47748,12 +47780,9 @@ class FirmwareUpdateBaseMethod extends BaseMethod {
                 type,
             }));
         };
-        this.postProgressMessage = (progress, progressType) => {
-            this.postMessage(createUiMessage(UI_REQUEST.FIRMWARE_PROGRESS, {
-                device: this.device.toMessageObject(),
-                progress,
-                progressType,
-            }));
+        this.postProgressMessage = (progress, progressType, metrics) => {
+            this.postMessage(createUiMessage(UI_REQUEST.FIRMWARE_PROGRESS, Object.assign({ device: this.device.toMessageObject(), progress,
+                progressType }, metrics)));
         };
     }
     init() { }
@@ -47801,7 +47830,7 @@ class FirmwareUpdateBaseMethod extends BaseMethod {
         this.checkPromise = hdShared.createDeferred();
         const env = DataManager.getSettings('env');
         const isBleReconnect = connectId && DataManager.isBleConnect(env);
-        Log$9.log('FirmwareUpdateBaseMethod [checkDeviceToBootloader] isBleReconnect: ', isBleReconnect);
+        Log$a.log('FirmwareUpdateBaseMethod [checkDeviceToBootloader] isBleReconnect: ', isBleReconnect);
         let isFirstCheck = true;
         let checkCount = 0;
         let hasPromptedWebDevice = false;
@@ -47812,10 +47841,10 @@ class FirmwareUpdateBaseMethod extends BaseMethod {
         const intervalTimer = setInterval(() => __awaiter(this, void 0, void 0, function* () {
             var _c, _d, _e, _f;
             checkCount += 1;
-            Log$9.log('FirmwareUpdateBaseMethod [checkDeviceToBootloader] isFirstCheck: ', isFirstCheck);
+            Log$a.log('FirmwareUpdateBaseMethod [checkDeviceToBootloader] isFirstCheck: ', isFirstCheck);
             if (isTouchOrProDevice && isFirstCheck) {
                 isFirstCheck = false;
-                Log$9.log('FirmwareUpdateBaseMethod [checkDeviceToBootloader] wait 3000ms');
+                Log$a.log('FirmwareUpdateBaseMethod [checkDeviceToBootloader] wait 3000ms');
                 yield wait(3000);
             }
             if (checkCount > 4 &&
@@ -47835,7 +47864,7 @@ class FirmwareUpdateBaseMethod extends BaseMethod {
                 catch (e) {
                     clearInterval(intervalTimer);
                     clearTimeout(timeoutTimer);
-                    Log$9.log('FirmwareUpdateBaseMethod [checkDeviceToBootloader] _promptDeviceInBootloaderForWebDevice failed: ', e);
+                    Log$a.log('FirmwareUpdateBaseMethod [checkDeviceToBootloader] _promptDeviceInBootloaderForWebDevice failed: ', e);
                     (_c = this.checkPromise) === null || _c === void 0 ? void 0 : _c.reject(e);
                 }
                 finally {
@@ -47853,7 +47882,7 @@ class FirmwareUpdateBaseMethod extends BaseMethod {
                     }
                 }
                 catch (e) {
-                    Log$9.log('catch Bluetooth error when device is restarting: ', e);
+                    Log$a.log('catch Bluetooth error when device is restarting: ', e);
                 }
             }
             else {
@@ -47936,7 +47965,7 @@ class FirmwareUpdateBaseMethod extends BaseMethod {
             }
             catch (error) {
                 if (isDeviceDisconnectedError(error)) {
-                    Log$9.log('Rebooting device');
+                    Log$a.log('Rebooting device');
                     updateResponse = {
                         type: 'Success',
                         message: { message: FIRMWARE_UPDATE_CONFIRM },
@@ -48026,7 +48055,7 @@ class FirmwareUpdateBaseMethod extends BaseMethod {
                     return result;
                 }
                 catch (error) {
-                    Log$9.error(`emmcWrite error: `, error);
+                    Log$a.error(`emmcWrite error: `, error);
                     retryCount--;
                     if (retryCount === 0) {
                         throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.EmmcFileWriteFirmwareError, 'transfer data error');
@@ -48230,7 +48259,7 @@ class GetNextU2FCounter extends BaseMethod {
     }
 }
 
-const Log$8 = getLogger(exports.LoggerNames.Method);
+const Log$9 = getLogger(exports.LoggerNames.Method);
 class FirmwareUpdate extends BaseMethod {
     constructor() {
         super(...arguments);
@@ -48268,7 +48297,7 @@ class FirmwareUpdate extends BaseMethod {
         this.checkPromise = hdShared.createDeferred();
         const env = DataManager.getSettings('env');
         const isBleReconnect = connectId && DataManager.isBleConnect(env);
-        Log$8.log('FirmwareUpdate [checkDeviceToBootloader] isBleReconnect: ', isBleReconnect);
+        Log$9.log('FirmwareUpdate [checkDeviceToBootloader] isBleReconnect: ', isBleReconnect);
         const intervalTimer = setInterval(() => __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d, _e, _f, _g, _h;
             if (isBleReconnect) {
@@ -48281,7 +48310,7 @@ class FirmwareUpdate extends BaseMethod {
                     }
                 }
                 catch (e) {
-                    Log$8.log('catch Bluetooth error when device is restarting: ', e);
+                    Log$9.log('catch Bluetooth error when device is restarting: ', e);
                 }
             }
             else {
@@ -48337,7 +48366,7 @@ class FirmwareUpdate extends BaseMethod {
                     if (e instanceof hdShared.HardwareError) {
                         return Promise.reject(e);
                     }
-                    Log$8.log('auto go to bootloader mode failed: ', e);
+                    Log$9.log('auto go to bootloader mode failed: ', e);
                     return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareUpdateAutoEnterBootFailure));
                 }
             }
@@ -48377,7 +48406,7 @@ class FirmwareUpdate extends BaseMethod {
     }
 }
 
-const Log$7 = getLogger(exports.LoggerNames.Method);
+const Log$8 = getLogger(exports.LoggerNames.Method);
 const FIRMWARE_DOWNLOAD_REQUEST_OPTIONS = {
     connectTimeoutMs: 60000,
     readTimeoutMs: 60000,
@@ -48493,7 +48522,7 @@ class FirmwareUpdateV2 extends BaseMethod {
         this.checkPromise = hdShared.createDeferred();
         const env = DataManager.getSettings('env');
         const isBleReconnect = connectId && DataManager.isBleConnect(env);
-        Log$7.log('FirmwareUpdateV2 [checkDeviceToBootloader] isBleReconnect: ', isBleReconnect);
+        Log$8.log('FirmwareUpdateV2 [checkDeviceToBootloader] isBleReconnect: ', isBleReconnect);
         let isFirstCheck = true;
         let checkCount = 0;
         let timeoutTimer;
@@ -48502,10 +48531,10 @@ class FirmwareUpdateV2 extends BaseMethod {
         const intervalTimer = setInterval(() => __awaiter(this, void 0, void 0, function* () {
             var _b, _c, _d, _e;
             checkCount += 1;
-            Log$7.log('FirmwareUpdateV2 [checkDeviceToBootloader] isFirstCheck: ', isFirstCheck);
+            Log$8.log('FirmwareUpdateV2 [checkDeviceToBootloader] isFirstCheck: ', isFirstCheck);
             if (isTouchOrProDevice && isFirstCheck) {
                 isFirstCheck = false;
-                Log$7.log('FirmwareUpdateV2 [checkDeviceToBootloader] wait 3000ms');
+                Log$8.log('FirmwareUpdateV2 [checkDeviceToBootloader] wait 3000ms');
                 yield wait(3000);
             }
             if (checkCount > 4 &&
@@ -48521,7 +48550,7 @@ class FirmwareUpdateV2 extends BaseMethod {
                     }
                 }
                 catch (e) {
-                    Log$7.log('FirmwareUpdateV2 [checkDeviceToBootloader] promptDeviceInBootloaderForWebDevice failed: ', e);
+                    Log$8.log('FirmwareUpdateV2 [checkDeviceToBootloader] promptDeviceInBootloaderForWebDevice failed: ', e);
                     (_b = this.checkPromise) === null || _b === void 0 ? void 0 : _b.reject(e);
                 }
                 return;
@@ -48536,7 +48565,7 @@ class FirmwareUpdateV2 extends BaseMethod {
                     }
                 }
                 catch (e) {
-                    Log$7.log('catch Bluetooth error when device is restarting: ', e);
+                    Log$8.log('catch Bluetooth error when device is restarting: ', e);
                 }
             }
             else {
@@ -48719,7 +48748,7 @@ class FirmwareUpdateV2 extends BaseMethod {
     }
 }
 
-const Log$6 = getLogger(exports.LoggerNames.Method);
+const Log$7 = getLogger(exports.LoggerNames.Method);
 const MIN_UPDATE_V3_BOOTLOADER_VERSION = '2.8.0';
 class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
     constructor() {
@@ -48760,7 +48789,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
     }
     run() {
         return __awaiter(this, void 0, void 0, function* () {
-            Log$6.debug('FirmwareUpdateV3 strategy: Protocol V1');
+            Log$7.debug('FirmwareUpdateV3 strategy: Protocol V1');
             return this.runProtocolV1();
         });
     }
@@ -48831,7 +48860,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
                 const resource = (yield getSysResourceBinary(resourceUrl)).binary;
                 return resource;
             }
-            Log$6.warn('No resource url found');
+            Log$7.warn('No resource url found');
             return null;
         });
     }
@@ -48956,7 +48985,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
                 yield this.startEmmcFirmwareUpdate({ path: '0:updates' });
             }
             catch (error) {
-                Log$6.error('triggerFirmwareUpdateEmmc error: ', error);
+                Log$7.error('triggerFirmwareUpdateEmmc error: ', error);
                 if (error === null || error === void 0 ? void 0 : error.errorCode) {
                     const unexpectedError = [
                         hdShared.HardwareErrorCode.ActionCancelled,
@@ -49017,7 +49046,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
                     yield hdShared.wait(1000);
                 }
                 catch (error) {
-                    Log$6.log('getFeatures error', error);
+                    Log$7.log('getFeatures error', error);
                     let shouldReconnect = true;
                     const progress = this.extractUpdateModeProgress(error);
                     if (progress !== null) {
@@ -49115,7 +49144,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
                             return;
                         }
                         catch (e) {
-                            Log$6.log('catch Bluetooth error when device is restarting: ', e);
+                            Log$7.log('catch Bluetooth error when device is restarting: ', e);
                         }
                     }
                     else {
@@ -49130,7 +49159,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
                                     yield this._promptDeviceForSwitchFirmwareWebDevice();
                                 }
                                 catch (e) {
-                                    Log$6.log('WebUSB re-authorization failed: ', e);
+                                    Log$7.log('WebUSB re-authorization failed: ', e);
                                 }
                                 webUsbCheckCount = 0;
                             }
@@ -49153,7 +49182,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
                 }
                 catch (error) {
                     console.error('Device reconnect failed: ', error);
-                    Log$6.error('Device reconnect failed:', error);
+                    Log$7.error('Device reconnect failed:', error);
                     yield hdShared.wait(1000);
                 }
             }
@@ -49162,6 +49191,238 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
     }
 }
 
+const Log$6 = getLogger(exports.LoggerNames.Method);
+const MIN_FILE_CHUNK_SIZE = 64;
+const FILE_TRANSFER_RATE_WINDOW_MS = 1000;
+const FILE_TRANSFER_LOG_INTERVAL_MS = 10000;
+const SESSION_ERROR = 'session not found';
+function formatFileTransferRate(bytesPerSecond) {
+    return (Math.max(bytesPerSecond, 0) / 1024).toFixed(2);
+}
+function getAverageFileTransferRate(transferredBytes, elapsedMs) {
+    if (elapsedMs <= 0)
+        return 0;
+    return Math.round((Math.max(transferredBytes, 0) / elapsedMs) * 1000);
+}
+function getFileTransferTransport() {
+    const env = DataManager.getSettings('env');
+    return env && DataManager.isBleConnect(env) ? 'BLE' : String(env !== null && env !== void 0 ? env : 'unknown');
+}
+function logFileTransferMetrics({ transport, status, transferredBytes, totalBytes, elapsedMs, rateBytesPerSecond, }) {
+    Log$6.log(`[FileWrite] metrics transport=${transport} status=${status} bytes=${transferredBytes}/${totalBytes} elapsed=${(elapsedMs / 1000).toFixed(2)}s speed=${formatFileTransferRate(rateBytesPerSecond)} KiB/s`);
+}
+function isProtocolV2ResponseTimeout(error) {
+    var _a, _b;
+    if (!error || typeof error !== 'object')
+        return false;
+    const candidate = error;
+    const code = (_a = candidate.errorCode) !== null && _a !== void 0 ? _a : candidate.code;
+    return (code === hdShared.HardwareErrorCode.BleTimeoutError ||
+        code === 'response-timeout' ||
+        /(?:BLE|Lowlevel|Protocol V2) response timeout/i.test((_b = candidate.message) !== null && _b !== void 0 ? _b : ''));
+}
+function getProtocolV2FileChunkLimit() {
+    const env = DataManager.getSettings('env');
+    return env && DataManager.isBleConnect(env)
+        ? hdTransport.PROTOCOL_V2_BLE_FILE_CHUNK_SIZE
+        : hdTransport.PROTOCOL_V2_WEBUSB_FILE_CHUNK_SIZE;
+}
+function dataToUint8Array(data) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (typeof data === 'string')
+            return new TextEncoder().encode(data);
+        if (data instanceof ArrayBuffer)
+            return new Uint8Array(data);
+        if (ArrayBuffer.isView(data)) {
+            return new Uint8Array(data.buffer, data.byteOffset, data.byteLength);
+        }
+        if (typeof Blob !== 'undefined' && data instanceof Blob) {
+            return new Uint8Array(yield data.arrayBuffer());
+        }
+        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodInvalidParameter, 'Unsupported FilesystemFileWrite data');
+    });
+}
+function normalizeChunkSize(value, maxChunkSize) {
+    const numeric = Number(value);
+    if (!Number.isFinite(numeric) || numeric <= 0)
+        return maxChunkSize;
+    return Math.min(Math.max(Math.floor(numeric), MIN_FILE_CHUNK_SIZE), maxChunkSize);
+}
+function getDeviceTransferProgress(before, after, total) {
+    if (!Number.isFinite(total) || total <= 0)
+        return 100;
+    if (before <= 0 && after < total)
+        return 0;
+    if (after >= total)
+        return 100;
+    return Math.min(Math.max(Math.ceil((after / total) * 100), 1), 99);
+}
+function getConfirmedProgress(processed, total, written, length) {
+    if (Number.isFinite(processed) && Number.isFinite(total) && total > 0) {
+        if (processed >= total)
+            return 100;
+        return Math.min(Math.max(Math.floor((processed / total) * 100), 0), 99);
+    }
+    if (length > 0)
+        return written >= length ? 100 : Math.floor((written / length) * 100);
+    return 100;
+}
+function writeProtocolV2File(options) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+    return __awaiter(this, void 0, void 0, function* () {
+        (_a = options.throwIfAborted) === null || _a === void 0 ? void 0 : _a.call(options);
+        const data = yield dataToUint8Array(options.data);
+        const dataLength = data.byteLength;
+        const startOffset = Number.isFinite(options.offset) && Number(options.offset) > 0 ? Number(options.offset) : 0;
+        const totalSize = Number.isFinite(options.totalSize) && Number(options.totalSize) > 0
+            ? Number(options.totalSize)
+            : startOffset + dataLength;
+        if (totalSize < startOffset + dataLength) {
+            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `FilesystemFileWrite totalSize ${totalSize} is smaller than offset + data length ${startOffset + dataLength}`);
+        }
+        const chunkSize = normalizeChunkSize((_b = options.chunkSize) !== null && _b !== void 0 ? _b : options.chunkLen, getProtocolV2FileChunkLimit());
+        let written = 0;
+        let chunks = 0;
+        let lastMessage;
+        const startTime = Date.now();
+        let rateWindowStartedAt = startTime;
+        let rateWindowStartedBytes = 0;
+        let rateBytesPerSecond;
+        let lastConfirmedAt = startTime;
+        let logWindowStartedAt = startTime;
+        let logWindowStartedBytes = 0;
+        const transport = getFileTransferTransport();
+        try {
+            while (written < dataLength) {
+                (_c = options.throwIfAborted) === null || _c === void 0 ? void 0 : _c.call(options);
+                const chunk = data.slice(written, Math.min(written + chunkSize, dataLength));
+                const offset = startOffset + written;
+                const progress = (_f = (_d = options.uiPercentage) !== null && _d !== void 0 ? _d : (_e = options.getUiPercentage) === null || _e === void 0 ? void 0 : _e.call(options, {
+                    offset,
+                    chunkLength: chunk.byteLength,
+                    totalSize,
+                })) !== null && _f !== void 0 ? _f : getDeviceTransferProgress(offset, offset + chunk.byteLength, totalSize);
+                const request = {
+                    file: { path: options.path, offset, total_size: totalSize, data: chunk },
+                    overwrite: chunks === 0 ? (_g = options.overwrite) !== null && _g !== void 0 ? _g : false : false,
+                    append: (_h = options.append) !== null && _h !== void 0 ? _h : false,
+                    ui_percentage: progress,
+                };
+                const maxChunkRetries = Math.max(Math.floor((_j = options.maxChunkRetries) !== null && _j !== void 0 ? _j : 0), 0);
+                let retryCount = 0;
+                let response;
+                let isWritePending = true;
+                while (isWritePending) {
+                    try {
+                        const callOptions = options.writeWithResponse === undefined
+                            ? { timeoutMs: options.timeoutMs }
+                            : Object.assign(Object.assign({}, (options.timeoutMs === undefined ? {} : { timeoutMs: options.timeoutMs })), { writeWithResponse: options.writeWithResponse });
+                        response = yield options.commands.typedCall('FilesystemFileWrite', 'FilesystemFile', request, callOptions);
+                        isWritePending = false;
+                    }
+                    catch (error) {
+                        if (retryCount >= maxChunkRetries || !isProtocolV2ResponseTimeout(error))
+                            throw error;
+                        retryCount += 1;
+                        (_k = options.throwIfAborted) === null || _k === void 0 ? void 0 : _k.call(options);
+                    }
+                }
+                if (!response) {
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'FilesystemFileWrite completed without a response');
+                }
+                const responseType = response.type;
+                if (responseType && responseType !== 'FilesystemFile') {
+                    const responseError = (_l = response.message) === null || _l === void 0 ? void 0 : _l.error;
+                    if (typeof responseError === 'string' && responseError.includes(SESSION_ERROR)) {
+                        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, SESSION_ERROR);
+                    }
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `FilesystemFileWrite received unexpected response ${responseType}`);
+                }
+                (_m = options.throwIfAborted) === null || _m === void 0 ? void 0 : _m.call(options);
+                lastMessage = response.message;
+                const rawProcessedByte = (_o = response.message) === null || _o === void 0 ? void 0 : _o.processed_byte;
+                const processedByte = Number(rawProcessedByte);
+                if (rawProcessedByte !== undefined &&
+                    (!Number.isFinite(processedByte) ||
+                        processedByte <= offset ||
+                        processedByte > offset + chunk.byteLength)) {
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `FilesystemFileWrite invalid processed_byte ${processedByte}`);
+                }
+                written =
+                    rawProcessedByte === undefined ? written + chunk.byteLength : processedByte - startOffset;
+                chunks += 1;
+                const now = Date.now();
+                lastConfirmedAt = now;
+                const elapsedMs = now - startTime;
+                const transferredBytes = Math.min(written, dataLength);
+                const rateWindowElapsedMs = now - rateWindowStartedAt;
+                if (rateWindowElapsedMs >= FILE_TRANSFER_RATE_WINDOW_MS) {
+                    const rateWindowBytes = Math.max(transferredBytes - rateWindowStartedBytes, 0);
+                    rateBytesPerSecond = Math.round((rateWindowBytes / rateWindowElapsedMs) * 1000);
+                    rateWindowStartedAt = now;
+                    rateWindowStartedBytes = transferredBytes;
+                }
+                else if (rateBytesPerSecond === undefined && elapsedMs > 0) {
+                    rateBytesPerSecond = Math.round((transferredBytes / elapsedMs) * 1000);
+                }
+                (_p = options.onProgress) === null || _p === void 0 ? void 0 : _p.call(options, {
+                    progress: getConfirmedProgress(startOffset + written, totalSize, written, dataLength),
+                    transferredBytes,
+                    totalBytes: dataLength,
+                    rateBytesPerSecond,
+                    elapsedMs,
+                });
+                const logWindowElapsedMs = now - logWindowStartedAt;
+                if (logWindowElapsedMs >= FILE_TRANSFER_LOG_INTERVAL_MS && transferredBytes < dataLength) {
+                    const logWindowBytes = Math.max(transferredBytes - logWindowStartedBytes, 0);
+                    logFileTransferMetrics({
+                        transport,
+                        status: 'progress',
+                        transferredBytes,
+                        totalBytes: dataLength,
+                        elapsedMs,
+                        rateBytesPerSecond: getAverageFileTransferRate(logWindowBytes, logWindowElapsedMs),
+                    });
+                    logWindowStartedAt = now;
+                    logWindowStartedBytes = transferredBytes;
+                }
+                if (options.paceMs && options.paceMs > 0) {
+                    yield new Promise(resolve => {
+                        setTimeout(resolve, options.paceMs);
+                    });
+                }
+            }
+        }
+        catch (error) {
+            const now = Date.now();
+            const elapsedMs = Math.max(now - startTime, 0);
+            const logWindowElapsedMs = Math.max(now - logWindowStartedAt, 0);
+            const logWindowBytes = Math.max(written - logWindowStartedBytes, 0);
+            logFileTransferMetrics({
+                transport,
+                status: 'failed',
+                transferredBytes: written,
+                totalBytes: dataLength,
+                elapsedMs,
+                rateBytesPerSecond: getAverageFileTransferRate(logWindowBytes, logWindowElapsedMs),
+            });
+            throw error;
+        }
+        const elapsedMs = Math.max(lastConfirmedAt - startTime, 0);
+        const logWindowElapsedMs = Math.max(lastConfirmedAt - logWindowStartedAt, 0);
+        const logWindowBytes = Math.max(written - logWindowStartedBytes, 0);
+        logFileTransferMetrics({
+            transport,
+            status: 'completed',
+            transferredBytes: written,
+            totalBytes: dataLength,
+            elapsedMs,
+            rateBytesPerSecond: getAverageFileTransferRate(logWindowBytes, logWindowElapsedMs),
+        });
+        return Object.assign(Object.assign({}, lastMessage), { path: options.path, offset: startOffset, total_size: totalSize, processed_byte: startOffset + written, chunks });
+    });
+}
+
 const ProtocolV2FirmwareTargetType = {
     FW_MGMT_TARGET_INVALID: 0,
     FW_MGMT_TARGET_CRATE: 1,
@@ -49259,7 +49520,6 @@ const INSTALLABLE_FIRMWARE_TARGET_IDS = new Set([
 new Map(Object.entries(ProtocolV2FirmwareTargetType).flatMap(([key, value]) => INSTALLABLE_FIRMWARE_TARGET_IDS.has(value) ? [[key, value]] : []));
 
 const Log$5 = getLogger(exports.LoggerNames.Method);
-const SESSION_ERROR = 'session not found';
 const PROTOCOL_V2_BOOTLOADER_RECONNECT_TIMEOUT = 90 * 1000;
 const PROTOCOL_V2_FINAL_RECONNECT_TIMEOUT = 3 * 60 * 1000;
 const PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT = 5 * 1000;
@@ -49970,14 +50230,15 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             }
             if (this.isProtocolV2BootloaderMode()) {
                 Log$5.debug('Protocol V2 device is already in bootloader mode, skip reboot');
+                this.postTipMessage(exports.FirmwareUpdateTipMessage.GoToBootloaderSuccess);
                 return false;
             }
             try {
                 this.postTipMessage(exports.FirmwareUpdateTipMessage.AutoRebootToBootloader);
                 yield this.protocolV2Reboot(hdTransport.DeviceRebootType.Bootloader);
-                this.postTipMessage(exports.FirmwareUpdateTipMessage.GoToBootloaderSuccess);
                 yield hdShared.wait(1000);
                 yield this.waitForProtocolV2BootloaderMode();
+                this.postTipMessage(exports.FirmwareUpdateTipMessage.GoToBootloaderSuccess);
                 return true;
             }
             catch (error) {
@@ -50433,29 +50694,43 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
     protocolV2WriteWholeFile({ payload, filePath, processedSize, totalSize, onTransferredBytes, }) {
         return __awaiter(this, void 0, void 0, function* () {
             const chunkSize = this.getProtocolV2FirmwareChunkSize();
-            let offset = 0;
             const getUploadProgress = (fileOffset) => {
                 if (totalSize !== undefined && processedSize !== undefined) {
                     return Math.min(Math.ceil(((processedSize + fileOffset) / totalSize) * 100), 99);
                 }
                 return Math.min(Math.ceil((fileOffset / payload.byteLength) * 100), 99);
             };
-            while (offset < payload.byteLength) {
-                const chunkEnd = Math.min(offset + chunkSize, payload.byteLength);
-                const chunkLength = chunkEnd - offset;
-                const chunk = payload.slice(offset, chunkEnd);
-                const overwrite = offset === 0;
-                const progress = getProtocolV2DeviceTransferProgress((processedSize !== null && processedSize !== void 0 ? processedSize : 0) + offset, (processedSize !== null && processedSize !== void 0 ? processedSize : 0) + chunkEnd, totalSize !== null && totalSize !== void 0 ? totalSize : payload.byteLength);
-                const writeRes = yield this.fileWriteChunk(filePath, payload.byteLength, offset, chunk, overwrite, progress);
-                const rawProcessedByte = writeRes.message.processed_byte;
-                const processedByte = Number(rawProcessedByte);
-                const nextOffset = rawProcessedByte === undefined ? offset + chunkLength : processedByte;
-                if (!Number.isFinite(nextOffset) || nextOffset <= offset || nextOffset > chunkEnd) {
-                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.EmmcFileWriteFirmwareError, `invalid processed_byte ${writeRes.message.processed_byte} for offset ${offset}`);
+            try {
+                yield writeProtocolV2File({
+                    commands: this.device.getCommands(),
+                    path: filePath,
+                    data: payload,
+                    totalSize: payload.byteLength,
+                    chunkSize,
+                    overwrite: true,
+                    append: false,
+                    writeWithResponse: true,
+                    maxChunkRetries: 0,
+                    getUiPercentage: ({ offset, chunkLength }) => getProtocolV2DeviceTransferProgress((processedSize !== null && processedSize !== void 0 ? processedSize : 0) + offset, (processedSize !== null && processedSize !== void 0 ? processedSize : 0) + offset + chunkLength, totalSize !== null && totalSize !== void 0 ? totalSize : payload.byteLength),
+                    onProgress: progress => {
+                        const transferredBytes = (processedSize !== null && processedSize !== void 0 ? processedSize : 0) + progress.transferredBytes;
+                        onTransferredBytes === null || onTransferredBytes === void 0 ? void 0 : onTransferredBytes(transferredBytes);
+                        this.postProgressMessage(getUploadProgress(progress.transferredBytes), 'transferData', {
+                            transferredBytes,
+                            totalBytes: totalSize !== null && totalSize !== void 0 ? totalSize : payload.byteLength,
+                            rateBytesPerSecond: progress.rateBytesPerSecond,
+                            elapsedMs: progress.elapsedMs,
+                        });
+                    },
+                });
+            }
+            catch (error) {
+                if (error instanceof hdShared.HardwareError &&
+                    error.errorCode === hdShared.HardwareErrorCode.RuntimeError &&
+                    error.message.includes('FilesystemFileWrite')) {
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.EmmcFileWriteFirmwareError, error.message);
                 }
-                offset = nextOffset;
-                onTransferredBytes === null || onTransferredBytes === void 0 ? void 0 : onTransferredBytes((processedSize !== null && processedSize !== void 0 ? processedSize : 0) + offset);
-                this.postProgressMessage(getUploadProgress(offset), 'transferData');
+                throw error;
             }
             return totalSize !== undefined ? (processedSize !== null && processedSize !== void 0 ? processedSize : 0) + payload.byteLength : 0;
         });
@@ -50471,32 +50746,6 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         }
         return env !== null && env !== void 0 ? env : 'unknown';
     }
-    fileWriteChunk(filePath, totalFileSize, offset, chunk, overwrite, progress) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
-            const writeRes = yield typedCall('FilesystemFileWrite', 'FilesystemFile', {
-                file: {
-                    path: filePath,
-                    offset,
-                    total_size: totalFileSize,
-                    data: chunk,
-                },
-                overwrite,
-                append: false,
-                ui_percentage: progress !== null && progress !== void 0 ? progress : undefined,
-            }, { writeWithResponse: true });
-            if (writeRes.type !== 'FilesystemFile') {
-                if (writeRes.type === 'CallMethodError') {
-                    if (((_a = writeRes.message.error) !== null && _a !== void 0 ? _a : '').indexOf(SESSION_ERROR) > -1) {
-                        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, SESSION_ERROR);
-                    }
-                }
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.EmmcFileWriteFirmwareError, 'transfer data error');
-            }
-            return writeRes;
-        });
-    }
     recoverProtocolV2FileTransfer() {
         return __awaiter(this, void 0, void 0, function* () {
             const env = DataManager.getSettings('env');
@@ -50654,158 +50903,6 @@ class DeviceGetOnboardingStatus extends BaseMethod {
     }
 }
 
-const MIN_FILE_CHUNK_SIZE = 64;
-const FILE_TRANSFER_RATE_WINDOW_MS = 1000;
-function isProtocolV2ResponseTimeout(error) {
-    var _a, _b;
-    if (!error || typeof error !== 'object')
-        return false;
-    const candidate = error;
-    const code = (_a = candidate.errorCode) !== null && _a !== void 0 ? _a : candidate.code;
-    return (code === hdShared.HardwareErrorCode.BleTimeoutError ||
-        code === 'response-timeout' ||
-        /(?:BLE|Lowlevel|Protocol V2) response timeout/i.test((_b = candidate.message) !== null && _b !== void 0 ? _b : ''));
-}
-function getProtocolV2FileChunkLimit() {
-    const env = DataManager.getSettings('env');
-    return env && DataManager.isBleConnect(env)
-        ? hdTransport.PROTOCOL_V2_BLE_FILE_CHUNK_SIZE
-        : hdTransport.PROTOCOL_V2_WEBUSB_FILE_CHUNK_SIZE;
-}
-function dataToUint8Array(data) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (typeof data === 'string')
-            return new TextEncoder().encode(data);
-        if (data instanceof ArrayBuffer)
-            return new Uint8Array(data);
-        if (ArrayBuffer.isView(data)) {
-            return new Uint8Array(data.buffer, data.byteOffset, data.byteLength);
-        }
-        if (typeof Blob !== 'undefined' && data instanceof Blob) {
-            return new Uint8Array(yield data.arrayBuffer());
-        }
-        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodInvalidParameter, 'Unsupported FilesystemFileWrite data');
-    });
-}
-function normalizeChunkSize(value, maxChunkSize) {
-    const numeric = Number(value);
-    if (!Number.isFinite(numeric) || numeric <= 0)
-        return maxChunkSize;
-    return Math.min(Math.max(Math.floor(numeric), MIN_FILE_CHUNK_SIZE), maxChunkSize);
-}
-function getDeviceTransferProgress(before, after, total) {
-    if (!Number.isFinite(total) || total <= 0)
-        return 100;
-    if (before <= 0 && after < total)
-        return 0;
-    if (after >= total)
-        return 100;
-    return Math.min(Math.max(Math.ceil((after / total) * 100), 1), 99);
-}
-function getConfirmedProgress(processed, total, written, length) {
-    if (Number.isFinite(processed) && Number.isFinite(total) && total > 0) {
-        if (processed >= total)
-            return 100;
-        return Math.min(Math.max(Math.floor((processed / total) * 100), 0), 99);
-    }
-    if (length > 0)
-        return written >= length ? 100 : Math.floor((written / length) * 100);
-    return 100;
-}
-function writeProtocolV2File(options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-    return __awaiter(this, void 0, void 0, function* () {
-        (_a = options.throwIfAborted) === null || _a === void 0 ? void 0 : _a.call(options);
-        const data = yield dataToUint8Array(options.data);
-        const dataLength = data.byteLength;
-        const startOffset = Number.isFinite(options.offset) && Number(options.offset) > 0 ? Number(options.offset) : 0;
-        const totalSize = Number.isFinite(options.totalSize) && Number(options.totalSize) > 0
-            ? Number(options.totalSize)
-            : startOffset + dataLength;
-        if (totalSize < startOffset + dataLength) {
-            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `FilesystemFileWrite totalSize ${totalSize} is smaller than offset + data length ${startOffset + dataLength}`);
-        }
-        const chunkSize = normalizeChunkSize((_b = options.chunkSize) !== null && _b !== void 0 ? _b : options.chunkLen, getProtocolV2FileChunkLimit());
-        let written = 0;
-        let chunks = 0;
-        let lastMessage;
-        const startTime = Date.now();
-        let rateWindowStartedAt = startTime;
-        let rateWindowStartedBytes = 0;
-        let rateBytesPerSecond;
-        while (written < dataLength) {
-            (_c = options.throwIfAborted) === null || _c === void 0 ? void 0 : _c.call(options);
-            const chunk = data.slice(written, Math.min(written + chunkSize, dataLength));
-            const offset = startOffset + written;
-            const progress = (_d = options.uiPercentage) !== null && _d !== void 0 ? _d : getDeviceTransferProgress(offset, offset + chunk.byteLength, totalSize);
-            const request = {
-                file: { path: options.path, offset, total_size: totalSize, data: chunk },
-                overwrite: chunks === 0 ? (_e = options.overwrite) !== null && _e !== void 0 ? _e : false : false,
-                append: (_f = options.append) !== null && _f !== void 0 ? _f : false,
-                ui_percentage: progress,
-            };
-            const maxChunkRetries = Math.max(Math.floor((_g = options.maxChunkRetries) !== null && _g !== void 0 ? _g : 0), 0);
-            let retryCount = 0;
-            let response;
-            let isWritePending = true;
-            while (isWritePending) {
-                try {
-                    response = yield options.commands.typedCall('FilesystemFileWrite', 'FilesystemFile', request, { timeoutMs: options.timeoutMs });
-                    isWritePending = false;
-                }
-                catch (error) {
-                    if (retryCount >= maxChunkRetries || !isProtocolV2ResponseTimeout(error))
-                        throw error;
-                    retryCount += 1;
-                    (_h = options.throwIfAborted) === null || _h === void 0 ? void 0 : _h.call(options);
-                }
-            }
-            if (!response) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'FilesystemFileWrite completed without a response');
-            }
-            (_j = options.throwIfAborted) === null || _j === void 0 ? void 0 : _j.call(options);
-            lastMessage = response.message;
-            const rawProcessedByte = (_k = response.message) === null || _k === void 0 ? void 0 : _k.processed_byte;
-            const processedByte = Number(rawProcessedByte);
-            if (rawProcessedByte !== undefined &&
-                (!Number.isFinite(processedByte) ||
-                    processedByte <= offset ||
-                    processedByte > offset + chunk.byteLength)) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `FilesystemFileWrite invalid processed_byte ${processedByte}`);
-            }
-            written =
-                rawProcessedByte === undefined ? written + chunk.byteLength : processedByte - startOffset;
-            chunks += 1;
-            const now = Date.now();
-            const elapsedMs = now - startTime;
-            const transferredBytes = Math.min(written, dataLength);
-            const rateWindowElapsedMs = now - rateWindowStartedAt;
-            if (rateWindowElapsedMs >= FILE_TRANSFER_RATE_WINDOW_MS) {
-                const rateWindowBytes = Math.max(transferredBytes - rateWindowStartedBytes, 0);
-                rateBytesPerSecond = Math.round((rateWindowBytes / rateWindowElapsedMs) * 1000);
-                rateWindowStartedAt = now;
-                rateWindowStartedBytes = transferredBytes;
-            }
-            else if (rateBytesPerSecond === undefined && elapsedMs > 0) {
-                rateBytesPerSecond = Math.round((transferredBytes / elapsedMs) * 1000);
-            }
-            (_l = options.onProgress) === null || _l === void 0 ? void 0 : _l.call(options, {
-                progress: getConfirmedProgress(startOffset + written, totalSize, written, dataLength),
-                transferredBytes,
-                totalBytes: dataLength,
-                rateBytesPerSecond,
-                elapsedMs,
-            });
-            if (options.paceMs && options.paceMs > 0) {
-                yield new Promise(resolve => {
-                    setTimeout(resolve, options.paceMs);
-                });
-            }
-        }
-        return Object.assign(Object.assign({}, lastMessage), { path: options.path, offset: startOffset, total_size: totalSize, processed_byte: startOffset + written, chunks });
-    });
-}
-
 const WALLPAPER_DIRECTORY = 'vol1:/wallpapers';
 const SAFE_FILE_NAME = /^[A-Za-z0-9_-]+(?:\.bin)?$/;
 function normalizeFileName(fileName, data) {
@@ -51619,9 +51716,10 @@ class AllNetworkGetAddressBase extends BaseMethod {
                             }
                         }
                         const useEmptyPassphrase = this.payload.useEmptyPassphrase === true;
+                        const deriveCardano = method.name.startsWith('cardano');
                         const shouldResumeWalletSession = useEmptyPassphrase || !!this.payload.passphraseState;
                         if (this.device.isProtocolV2() && shouldResumeWalletSession) {
-                            const passphraseStateSafety = yield this.device.checkPassphraseStateSafety(this.payload.passphraseState, useEmptyPassphrase, this.payload.skipPassphraseCheck);
+                            const passphraseStateSafety = yield this.device.checkPassphraseStateSafety(this.payload.passphraseState, useEmptyPassphrase, this.payload.skipPassphraseCheck, deriveCardano);
                             if (!passphraseStateSafety) {
                                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckPassphraseStateError);
                             }
@@ -60992,10 +61090,19 @@ class DeviceConnector {
         this.transport = TransportManager.getTransport();
         DevicePool.setConnector(this);
     }
+    getActiveTransport() {
+        var _a;
+        const transport = (_a = this.transport) !== null && _a !== void 0 ? _a : TransportManager.getTransport();
+        if (!transport) {
+            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured, 'Device connector was created before transport initialization');
+        }
+        this.transport = transport;
+        return transport;
+    }
     enumerate() {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const descriptors = yield this.transport.enumerate();
+                const descriptors = yield this.getActiveTransport().enumerate();
                 this.upcoming = descriptors;
                 this._reportDevicesChange();
                 return { descriptors };
@@ -61012,11 +61119,10 @@ class DeviceConnector {
             this.listening = true;
             let descriptors;
             try {
+                const transport = this.getActiveTransport();
                 Log$2.debug('Start listening', current);
                 this.listenTimestamp = new Date().getTime();
-                descriptors = waitForEvent
-                    ? yield this.transport.listen(current)
-                    : yield this.transport.enumerate();
+                descriptors = waitForEvent ? yield transport.listen(current) : yield transport.enumerate();
                 if (!this.listening)
                     return;
                 this.upcoming = descriptors;
@@ -61047,9 +61153,10 @@ class DeviceConnector {
             Log$2.debug('acquire', path, session, expectedProtocol, protocolHint);
             const env = DataManager.getSettings('env');
             try {
+                const transport = this.getActiveTransport();
                 let res;
                 if (DataManager.isBleConnect(env)) {
-                    res = yield this.transport.acquire({
+                    res = yield transport.acquire({
                         uuid: path,
                         forceCleanRunPromise,
                         expectedProtocol,
@@ -61057,7 +61164,7 @@ class DeviceConnector {
                     });
                 }
                 else {
-                    res = yield this.transport.acquire({
+                    res = yield transport.acquire({
                         path,
                         previous: session !== null && session !== void 0 ? session : null,
                         expectedProtocol,
@@ -61065,7 +61172,10 @@ class DeviceConnector {
                     });
                 }
                 if (expectedProtocol) {
-                    const detectedProtocol = this.transport.getProtocolType(path);
+                    const acquiredProtocol = typeof res === 'object' && res !== null
+                        ? res.protocolType
+                        : undefined;
+                    const detectedProtocol = acquiredProtocol !== null && acquiredProtocol !== void 0 ? acquiredProtocol : transport.getProtocolType(path);
                     if (detectedProtocol !== expectedProtocol) {
                         throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Device protocol mismatch: expected ${expectedProtocol}, detected ${detectedProtocol}`);
                     }
@@ -61081,7 +61191,7 @@ class DeviceConnector {
     release(session, onclose) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const res = yield this.transport.release(session, onclose);
+                const res = yield this.getActiveTransport().release(session, onclose);
                 return res;
             }
             catch (error) {
@@ -61092,8 +61202,9 @@ class DeviceConnector {
     disconnect(session) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                if (this.transport.disconnect && !!session) {
-                    yield this.transport.disconnect(session);
+                const transport = this.getActiveTransport();
+                if (transport.disconnect && !!session) {
+                    yield transport.disconnect(session);
                 }
             }
             catch (error) {
@@ -61102,10 +61213,11 @@ class DeviceConnector {
         });
     }
     promptDeviceAccess() {
-        if (!this.transport.promptDeviceAccess) {
+        const transport = this.getActiveTransport();
+        if (!transport.promptDeviceAccess) {
             return Promise.resolve(null);
         }
-        return this.transport.promptDeviceAccess();
+        return transport.promptDeviceAccess();
     }
     _reportDevicesChange() {
         DevicePool.reportDeviceChange(this.upcoming);
@@ -61701,6 +61813,10 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
                 completeMethodRequestContext(method);
             }
             catch (error) {
+                if (!requestQueue.getTask(method.responseID)) {
+                    Log.debug(`Call API - Ignore late inner method result`, error);
+                    return;
+                }
                 Log.debug(`Call API - Inner Method Run Error`, error);
                 messageResponse = createResponseMessage(method.responseID, false, { error });
                 requestQueue.resolveRequest(method.responseID, messageResponse);
@@ -62423,13 +62539,8 @@ const initTransport = (Transport, plugin) => {
 };
 const init = (settings, Transport, plugin) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        try {
-            yield DataManager.load(settings);
-            initTransport(Transport, plugin);
-        }
-        catch (_s) {
-            Log.error('DataManager.load error');
-        }
+        yield DataManager.load(settings);
+        initTransport(Transport, plugin);
         enableLog(DataManager.getSettings('debug'));
         if (DataManager.getSettings('env') !== 'react-native') {
             setLoggerPostMessage(postMessage);
@@ -62440,6 +62551,7 @@ const init = (settings, Transport, plugin) => __awaiter(void 0, void 0, void 0,
     }
     catch (error) {
         Log.error('core init', error);
+        throw error;
     }
 });
 const switchTransport = ({ env, Transport, plugin, }) => {