@onekeyfe/hd-core 1.1.18 → 1.1.19-alpha.1

package/dist/index.js

@@ -787,7 +787,7 @@ const createLogMessage = (type, payload) => ({
 
 const MAX_ENTRIES = 500;
 let postMessage$1;
-class Log$e {
+class Log$f {
     constructor(prefix, enabled) {
         this.prefix = prefix;
         this.enabled = enabled;
@@ -839,7 +839,7 @@ class Log$e {
 }
 const _logs = {};
 const initLog = (prefix, enabled) => {
-    const instance = new Log$e(prefix, !!enabled);
+    const instance = new Log$f(prefix, !!enabled);
     _logs[prefix] = instance;
     return instance;
 };
@@ -1035,6 +1035,108 @@ function patchFeatures(response) {
     return response;
 }
 
+const Log$e = getLogger(exports.LoggerNames.Core);
+let globalInstanceCounter = 0;
+let sdkInstanceCounter = 0;
+function generateSdkInstanceId() {
+    sdkInstanceCounter++;
+    const timestamp = Date.now().toString().slice(-6);
+    return `SDK-${sdkInstanceCounter}-${timestamp}`;
+}
+function generateInstanceId(type, sdkInstanceId) {
+    globalInstanceCounter++;
+    const timestamp = Date.now().toString().slice(-6);
+    const baseId = `${type}-${globalInstanceCounter}-${timestamp}`;
+    return sdkInstanceId ? `${sdkInstanceId}.${baseId}` : baseId;
+}
+const sdkInstances = new Map();
+const globalActiveRequests = new Map();
+function createSdkTracingContext() {
+    const sdkInstanceId = generateSdkInstanceId();
+    const context = {
+        sdkInstanceId,
+        createdAt: Date.now(),
+        activeRequests: new Map(),
+    };
+    sdkInstances.set(sdkInstanceId, context);
+    return context;
+}
+function createRequestContext(responseID, methodName, options) {
+    const context = {
+        responseID,
+        sdkInstanceId: options === null || options === void 0 ? void 0 : options.sdkInstanceId,
+        methodName,
+        connectId: options === null || options === void 0 ? void 0 : options.connectId,
+        deviceInstanceId: options === null || options === void 0 ? void 0 : options.deviceInstanceId,
+        commandsInstanceId: options === null || options === void 0 ? void 0 : options.commandsInstanceId,
+        parentResponseID: options === null || options === void 0 ? void 0 : options.parentResponseID,
+        startTime: Date.now(),
+        status: 'pending',
+    };
+    globalActiveRequests.set(context.responseID, context);
+    if (options === null || options === void 0 ? void 0 : options.sdkInstanceId) {
+        const sdkContext = sdkInstances.get(options.sdkInstanceId);
+        if (sdkContext) {
+            sdkContext.activeRequests.set(context.responseID, context);
+        }
+    }
+    return context;
+}
+function updateRequestContext(responseID, updates) {
+    const context = globalActiveRequests.get(responseID);
+    if (context) {
+        Object.assign(context, updates);
+    }
+}
+function completeRequestContext(responseID, error) {
+    const context = globalActiveRequests.get(responseID);
+    if (context) {
+        context.endTime = Date.now();
+        context.status = error ? 'error' : 'success';
+        if (error) {
+            context.error = error.message;
+            Log$e.error(`[RequestContext] [completeRequestContext] Error: ${formatRequestContext(context)}`);
+        }
+        globalActiveRequests.delete(responseID);
+        if (context.sdkInstanceId) {
+            const sdkContext = sdkInstances.get(context.sdkInstanceId);
+            if (sdkContext) {
+                sdkContext.activeRequests.delete(responseID);
+            }
+        }
+    }
+}
+function getActiveRequestsByDeviceInstance(deviceInstanceId) {
+    return Array.from(globalActiveRequests.values()).filter(ctx => ctx.deviceInstanceId === deviceInstanceId);
+}
+function formatRequestContext(context) {
+    const duration = context.endTime
+        ? context.endTime - context.startTime
+        : Date.now() - context.startTime;
+    const parts = [
+        `[req:${context.responseID}]`,
+        context.sdkInstanceId ? `sdk=${context.sdkInstanceId}` : null,
+        `method=${context.methodName}`,
+        context.connectId ? `connectId=${context.connectId}` : null,
+        context.deviceInstanceId ? `deviceInst=${context.deviceInstanceId}` : null,
+        context.commandsInstanceId ? `commandsInst=${context.commandsInstanceId}` : null,
+        context.parentResponseID ? `parent=${context.parentResponseID}` : null,
+        `duration=${duration}ms`,
+        `status=${context.status}`,
+        `error=${context.error}`,
+    ].filter(Boolean);
+    return parts.join(' ');
+}
+function cleanupSdkInstance(sdkInstanceId) {
+    const sdkContext = sdkInstances.get(sdkInstanceId);
+    if (sdkContext) {
+        for (const responseID of sdkContext.activeRequests.keys()) {
+            globalActiveRequests.delete(responseID);
+        }
+        sdkInstances.delete(sdkInstanceId);
+    }
+}
+
 exports.EOneKeyDeviceMode = void 0;
 (function (EOneKeyDeviceMode) {
     EOneKeyDeviceMode["bootloader"] = "bootloader";
@@ -3351,6 +3453,15 @@ var nested$1 = {
 			}
 		}
 	},
+	UpgradeFileHeader: {
+		fields: {
+			data: {
+				rule: "required",
+				type: "bytes",
+				id: 1
+			}
+		}
+	},
 	CardanoDerivationType: {
 		values: {
 			LEDGER: 0,
@@ -13795,7 +13906,8 @@ var nested$1 = {
 			MessageType_GetPassphraseState: 10028,
 			MessageType_PassphraseState: 10029,
 			MessageType_UnLockDevice: 10030,
-			MessageType_UnLockDeviceResponse: 10031
+			MessageType_UnLockDeviceResponse: 10031,
+			MessageType_UpgradeFileHeader: 10050
 		}
 	},
 	google: {
@@ -24930,7 +25042,54 @@ const findLatestRelease = (releases) => {
 };
 
 var _a$1;
+const FIRMWARE_FIELDS = [
+    'firmware',
+    'firmware-v2',
+    'firmware-v7',
+    'firmware-btc-v7',
+];
+const FIRMWARE_FIELD_TYPE_MAP = {
+    firmware: hdShared.EFirmwareType.Universal,
+    'firmware-v2': hdShared.EFirmwareType.Universal,
+    'firmware-v7': hdShared.EFirmwareType.Universal,
+    'firmware-btc-v7': hdShared.EFirmwareType.BitcoinOnly,
+};
+function getFirmwareTypeFromField(firmwareField) {
+    const firmwareType = FIRMWARE_FIELD_TYPE_MAP[firmwareField];
+    if (firmwareType === undefined) {
+        return hdShared.EFirmwareType.Universal;
+    }
+    return firmwareType;
+}
 class DataManager {
+    static enrichFirmwareReleaseInfo(deviceData) {
+        if (!deviceData || typeof deviceData !== 'object') {
+            return {
+                firmware: [],
+                ble: [],
+            };
+        }
+        const enrichedData = Object.assign({}, deviceData);
+        FIRMWARE_FIELDS.forEach(field => {
+            const releases = enrichedData[field];
+            if (!releases || !Array.isArray(releases) || releases.length === 0) {
+                return;
+            }
+            try {
+                enrichedData[field] = releases.map(release => {
+                    if (!release || typeof release !== 'object' || !!release.firmwareType) {
+                        return release;
+                    }
+                    const firmwareType = getFirmwareTypeFromField(field);
+                    return Object.assign(Object.assign({}, release), { firmwareType });
+                });
+            }
+            catch (error) {
+                console.error(`Error enriching firmware field "${field}":`, error);
+            }
+        });
+        return enrichedData;
+    }
     static load(settings) {
         return __awaiter(this, void 0, void 0, function* () {
             this.settings = settings;
@@ -24945,12 +25104,12 @@ class DataManager {
                     timeout: 7000,
                 });
                 this.deviceMap = {
-                    [hdShared.EDeviceType.Classic]: data.classic,
-                    [hdShared.EDeviceType.Classic1s]: data.classic1s,
-                    [hdShared.EDeviceType.ClassicPure]: data.classicpure,
-                    [hdShared.EDeviceType.Mini]: data.mini,
-                    [hdShared.EDeviceType.Touch]: data.touch,
-                    [hdShared.EDeviceType.Pro]: data.pro,
+                    [hdShared.EDeviceType.Classic]: this.enrichFirmwareReleaseInfo(data.classic),
+                    [hdShared.EDeviceType.Classic1s]: this.enrichFirmwareReleaseInfo(data.classic1s),
+                    [hdShared.EDeviceType.ClassicPure]: this.enrichFirmwareReleaseInfo(data.classicpure),
+                    [hdShared.EDeviceType.Mini]: this.enrichFirmwareReleaseInfo(data.mini),
+                    [hdShared.EDeviceType.Touch]: this.enrichFirmwareReleaseInfo(data.touch),
+                    [hdShared.EDeviceType.Pro]: this.enrichFirmwareReleaseInfo(data.pro),
                 };
                 this.assets = {
                     bridge: data.bridge,
@@ -25021,11 +25180,12 @@ DataManager.messages = {
     v1: MessagesLegacyV1JSON,
 };
 DataManager.lastCheckTimestamp = 0;
-DataManager.getFirmwareStatus = (features) => {
+DataManager.getFirmwareStatus = (features, firmwareType) => {
     var _b, _c;
     const deviceType = getDeviceType(features);
     if (deviceType === hdShared.EDeviceType.Unknown)
         return 'unknown';
+    const deviceFirmwareType = getFirmwareType(features);
     const deviceFirmwareVersion = getDeviceFirmwareVersion(features);
     if (features.firmware_present === false) {
         return 'none';
@@ -25033,12 +25193,19 @@ DataManager.getFirmwareStatus = (features) => {
     if (DeviceModelToTypes.model_mini.includes(deviceType) && features.bootloader_mode) {
         return 'unknown';
     }
-    const firmwareUpdateField = getFirmwareUpdateField({ features, updateType: 'firmware' });
+    const firmwareUpdateField = getFirmwareUpdateField({
+        features,
+        updateType: 'firmware',
+        firmwareType,
+    });
     const targetDeviceConfigList = (_c = (_b = _a$1.deviceMap[deviceType]) === null || _b === void 0 ? void 0 : _b[firmwareUpdateField]) !== null && _c !== void 0 ? _c : [];
-    const currentVersion = deviceFirmwareVersion.join('.');
+    let currentVersion = deviceFirmwareVersion.join('.');
+    if (targetDeviceConfigList.length > 0 && deviceFirmwareType !== firmwareType) {
+        currentVersion = '0.0.0';
+    }
     return getReleaseStatus(targetDeviceConfigList, currentVersion);
 };
-DataManager.getSysResourcesLatestRelease = (features, forcedUpdateRes) => {
+DataManager.getSysResourcesLatestRelease = ({ features, forcedUpdateRes, firmwareType, }) => {
     var _b, _c, _d;
     const deviceType = getDeviceType(features);
     const deviceFirmwareVersion = getDeviceFirmwareVersion(features);
@@ -25047,6 +25214,7 @@ DataManager.getSysResourcesLatestRelease = (features, forcedUpdateRes) => {
     const firmwareUpdateField = getFirmwareUpdateField({
         features,
         updateType: 'firmware',
+        firmwareType,
     });
     const targetDeviceConfigList = (_c = (_b = _a$1.deviceMap[deviceType]) === null || _b === void 0 ? void 0 : _b[firmwareUpdateField]) !== null && _c !== void 0 ? _c : [];
     const currentVersion = deviceFirmwareVersion.join('.');
@@ -25055,7 +25223,7 @@ DataManager.getSysResourcesLatestRelease = (features, forcedUpdateRes) => {
         : semver__default["default"].gt(item.version.join('.'), currentVersion) && !!item.resource);
     return (_d = findLatestRelease(targetDeviceConfig)) === null || _d === void 0 ? void 0 : _d.resource;
 };
-DataManager.getSysFullResource = (features) => {
+DataManager.getSysFullResource = (features, firmwareType) => {
     var _b, _c, _d;
     const deviceType = getDeviceType(features);
     if (deviceType === hdShared.EDeviceType.Unknown)
@@ -25065,12 +25233,13 @@ DataManager.getSysFullResource = (features) => {
     const firmwareUpdateField = getFirmwareUpdateField({
         features,
         updateType: 'firmware',
+        firmwareType,
     });
     const targetDeviceConfigList = (_c = (_b = _a$1.deviceMap[deviceType]) === null || _b === void 0 ? void 0 : _b[firmwareUpdateField]) !== null && _c !== void 0 ? _c : [];
     const targetDeviceConfig = targetDeviceConfigList.filter(item => !!item.fullResource);
     return (_d = findLatestRelease(targetDeviceConfig)) === null || _d === void 0 ? void 0 : _d.fullResource;
 };
-DataManager.getBootloaderResource = (features) => {
+DataManager.getBootloaderResource = (features, firmwareType) => {
     var _b, _c, _d;
     const deviceType = getDeviceType(features);
     if (deviceType === hdShared.EDeviceType.Unknown)
@@ -25080,6 +25249,7 @@ DataManager.getBootloaderResource = (features) => {
     const firmwareUpdateField = getFirmwareUpdateField({
         features,
         updateType: 'firmware',
+        firmwareType,
     });
     const targetDeviceConfigList = (_c = (_b = _a$1.deviceMap[deviceType]) === null || _b === void 0 ? void 0 : _b[firmwareUpdateField]) !== null && _c !== void 0 ? _c : [];
     if (targetDeviceConfigList.length === 0) {
@@ -25088,7 +25258,7 @@ DataManager.getBootloaderResource = (features) => {
     const targetDeviceConfig = targetDeviceConfigList.filter(item => !!item.bootloaderResource);
     return (_d = findLatestRelease(targetDeviceConfig)) === null || _d === void 0 ? void 0 : _d.bootloaderResource;
 };
-DataManager.getBootloaderTargetVersion = (features) => {
+DataManager.getBootloaderTargetVersion = (features, firmwareType) => {
     var _b, _c, _d, _e;
     const deviceType = getDeviceType(features);
     if (deviceType === hdShared.EDeviceType.Unknown)
@@ -25096,12 +25266,13 @@ DataManager.getBootloaderTargetVersion = (features) => {
     const firmwareUpdateField = getFirmwareUpdateField({
         features,
         updateType: 'firmware',
+        firmwareType,
     });
     const targetDeviceConfigList = (_c = (_b = _a$1.deviceMap[deviceType]) === null || _b === void 0 ? void 0 : _b[firmwareUpdateField]) !== null && _c !== void 0 ? _c : [];
     const targetDeviceConfig = targetDeviceConfigList.filter(item => !!item.bootloaderResource);
     return (_e = (_d = targetDeviceConfig === null || targetDeviceConfig === void 0 ? void 0 : targetDeviceConfig[0]) === null || _d === void 0 ? void 0 : _d.bootloaderVersion) !== null && _e !== void 0 ? _e : undefined;
 };
-DataManager.getBootloaderRelatedFirmwareVersion = (features) => {
+DataManager.getBootloaderRelatedFirmwareVersion = (features, firmwareType) => {
     var _b, _c, _d, _e;
     const deviceType = getDeviceType(features);
     if (deviceType === hdShared.EDeviceType.Unknown)
@@ -25111,12 +25282,13 @@ DataManager.getBootloaderRelatedFirmwareVersion = (features) => {
     const firmwareUpdateField = getFirmwareUpdateField({
         features,
         updateType: 'firmware',
+        firmwareType,
     });
     const targetDeviceConfigList = (_c = (_b = _a$1.deviceMap[deviceType]) === null || _b === void 0 ? void 0 : _b[firmwareUpdateField]) !== null && _c !== void 0 ? _c : [];
     const targetDeviceConfig = targetDeviceConfigList.filter(item => !!item.bootloaderRelatedFirmwareVersion);
     return (_e = (_d = targetDeviceConfig === null || targetDeviceConfig === void 0 ? void 0 : targetDeviceConfig[0]) === null || _d === void 0 ? void 0 : _d.bootloaderRelatedFirmwareVersion) !== null && _e !== void 0 ? _e : undefined;
 };
-DataManager.getFirmwareChangelog = (features) => {
+DataManager.getFirmwareChangelog = (features, firmwareType) => {
     var _b, _c;
     const deviceType = getDeviceType(features);
     if (deviceType === hdShared.EDeviceType.Unknown)
@@ -25125,6 +25297,7 @@ DataManager.getFirmwareChangelog = (features) => {
     const firmwareUpdateField = getFirmwareUpdateField({
         features,
         updateType: 'firmware',
+        firmwareType,
     });
     const targetDeviceConfigList = (_c = (_b = _a$1.deviceMap[deviceType]) === null || _b === void 0 ? void 0 : _b[firmwareUpdateField]) !== null && _c !== void 0 ? _c : [];
     if (features.firmware_present === false ||
@@ -25134,7 +25307,7 @@ DataManager.getFirmwareChangelog = (features) => {
     const currentVersion = deviceFirmwareVersion.join('.');
     return getReleaseChangelog(targetDeviceConfigList, currentVersion);
 };
-DataManager.getFirmwareLatestRelease = (features) => {
+DataManager.getFirmwareLatestRelease = (features, firmwareType) => {
     var _b, _c;
     const deviceType = getDeviceType(features);
     if (deviceType === hdShared.EDeviceType.Unknown)
@@ -25142,13 +25315,14 @@ DataManager.getFirmwareLatestRelease = (features) => {
     const firmwareUpdateField = getFirmwareUpdateField({
         features,
         updateType: 'firmware',
+        firmwareType,
     });
     const targetDeviceConfigList = (_c = (_b = _a$1.deviceMap[deviceType]) === null || _b === void 0 ? void 0 : _b[firmwareUpdateField]) !== null && _c !== void 0 ? _c : [];
     const target = findLatestRelease(targetDeviceConfigList);
     if (!target)
         return target;
     if (!target.resource) {
-        const resource = _a$1.getSysResourcesLatestRelease(features);
+        const resource = _a$1.getSysResourcesLatestRelease({ features, firmwareType });
         return Object.assign(Object.assign({}, target), { resource });
     }
     return target;
@@ -25347,28 +25521,35 @@ const supportModifyHomescreen = (features) => {
     }
     return { support: semver__default["default"].gte(currentVersion, '3.4.0') };
 };
-const getFirmwareUpdateField = ({ features, updateType, targetVersion, }) => {
+const getLatestFirmwareField = (firmwareType) => {
+    if (firmwareType === 'bitcoinonly') {
+        return `firmware-btc-v7`;
+    }
+    return `firmware-v7`;
+};
+const getFirmwareUpdateField = ({ features, updateType, targetVersion, firmwareType, }) => {
     const deviceType = getDeviceType(features);
     const deviceFirmwareVersion = getDeviceFirmwareVersion(features);
     if (updateType === 'ble') {
         return 'ble';
     }
+    const latestFirmwareField = getLatestFirmwareField(firmwareType);
     if (DeviceModelToTypes.model_mini.includes(deviceType)) {
-        return 'firmware-v7';
+        return latestFirmwareField;
     }
     if (deviceType === hdShared.EDeviceType.Touch) {
         if (targetVersion) {
             if (semver__default["default"].eq(targetVersion, '4.0.0'))
                 return 'firmware-v2';
             if (semver__default["default"].gt(targetVersion, '4.0.0'))
-                return 'firmware-v7';
+                return latestFirmwareField;
         }
         if (semver__default["default"].lt(deviceFirmwareVersion.join('.'), '3.4.0'))
             return 'firmware';
-        return 'firmware-v7';
+        return latestFirmwareField;
     }
     if (deviceType === hdShared.EDeviceType.Pro) {
-        return 'firmware-v7';
+        return latestFirmwareField;
     }
     return 'firmware';
 };
@@ -25550,20 +25731,20 @@ function isEnteredManuallyBoot(features, updateType) {
     return isMini || isBoot183ClassicUpBle;
 }
 
-function checkNeedUpdateBootForTouch(features) {
+function checkNeedUpdateBootForTouch(features, firmwareType) {
     const deviceType = getDeviceType(features);
     if (!DeviceModelToTypes.model_touch.includes(deviceType))
         return false;
     const currentVersion = getDeviceFirmwareVersion(features).join('.');
     const bootloaderVersion = getDeviceBootloaderVersion(features).join('.');
-    const targetBootloaderVersion = DataManager.getBootloaderTargetVersion(features);
+    const targetBootloaderVersion = DataManager.getBootloaderTargetVersion(features, firmwareType);
     if (!targetBootloaderVersion)
         return false;
     return (semver__default["default"].gte(currentVersion, '3.2.0') &&
         semver__default["default"].gte(currentVersion, '4.1.0') &&
         semver__default["default"].lte(bootloaderVersion, targetBootloaderVersion.join('.')));
 }
-function checkNeedUpdateBootForClassicAndMini(features, willUpdateFirmware) {
+function checkNeedUpdateBootForClassicAndMini({ features, willUpdateFirmware, firmwareType, }) {
     const deviceType = getDeviceType(features);
     if (!DeviceModelToTypes.model_mini.includes(deviceType))
         return false;
@@ -25571,11 +25752,11 @@ function checkNeedUpdateBootForClassicAndMini(features, willUpdateFirmware) {
         return false;
     const currentVersion = getDeviceFirmwareVersion(features).join('.');
     const bootloaderVersion = getDeviceBootloaderVersion(features).join('.');
-    const targetBootloaderVersion = DataManager.getBootloaderTargetVersion(features);
+    const targetBootloaderVersion = DataManager.getBootloaderTargetVersion(features, firmwareType);
     if (targetBootloaderVersion && semver__default["default"].gte(bootloaderVersion, targetBootloaderVersion.join('.'))) {
         return false;
     }
-    const bootloaderRelatedFirmwareVersion = DataManager.getBootloaderRelatedFirmwareVersion(features);
+    const bootloaderRelatedFirmwareVersion = DataManager.getBootloaderRelatedFirmwareVersion(features, firmwareType);
     if (!bootloaderRelatedFirmwareVersion)
         return false;
     return shouldUpdateBootloaderForClassicAndMini({
@@ -26487,12 +26668,15 @@ const cancelDeviceWithInitialize = (device) => {
     }));
 };
 const Log$b = getLogger(exports.LoggerNames.DeviceCommands);
+const LogCore = getLogger(exports.LoggerNames.Core);
 class DeviceCommands {
     constructor(device, mainId) {
         this.device = device;
         this.mainId = mainId;
         this.transport = TransportManager.getTransport();
         this.disposed = false;
+        this.instanceId = generateInstanceId('DeviceCommands', device.sdkInstanceId);
+        Log$b.debug(`[DeviceCommands] Created: ${this.instanceId}, device: ${this.device.instanceId}`);
     }
     dispose(_cancelRequest) {
         var _a, _b;
@@ -26565,11 +26749,11 @@ class DeviceCommands {
                 const promise = this.transport.call(this.mainId, type, msg);
                 this.callPromise = promise;
                 const res = yield promise;
-                Log$b.debug('[DeviceCommands] [call] Received', res.type);
+                LogCore.debug('[DeviceCommands] [call] Received', res.type);
                 return res;
             }
             catch (error) {
-                Log$b.debug('[DeviceCommands] [call] Received error', error);
+                LogCore.debug('[DeviceCommands] [call] Received error', error);
                 if (error.errorCode === hdShared.HardwareErrorCode.BleDeviceBondError) {
                     return {
                         type: 'BleDeviceBondError',
@@ -26768,7 +26952,7 @@ class DeviceCommands {
         return new Promise((resolve, reject) => {
             const cancelAndReject = (_error) => cancelDeviceInPrompt(this.device, false)
                 .then(onCancel => {
-                const error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.ActionCancelled, `${DEVICE.PIN} canceled`);
+                const error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallQueueActionCancelled, `${DEVICE.PIN} canceled`);
                 if (onCancel) {
                     const { payload } = onCancel || {};
                     reject(error || new Error(payload === null || payload === void 0 ? void 0 : payload.message));
@@ -26780,7 +26964,13 @@ class DeviceCommands {
                 .catch(error => {
                 reject(error);
             });
-            if (this.device.listenerCount(DEVICE.PIN) > 0) {
+            const listenerCount = this.device.listenerCount(DEVICE.PIN);
+            Log$b.debug(`[${this.instanceId}] _promptPin called`, {
+                responseID: this.currentResponseID,
+                deviceInstanceId: this.device.instanceId,
+                listenerCount,
+            });
+            if (listenerCount > 0) {
                 this.device.setCancelableAction(cancelAndReject);
                 this.device.emit(DEVICE.PIN, this.device, type, (err, pin) => {
                     this.device.clearCancelableAction();
@@ -26793,8 +26983,16 @@ class DeviceCommands {
                 });
             }
             else {
-                console.warn('[DeviceCommands] [call] PIN callback not configured, cancelling request');
-                reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, '_promptPin: PIN callback not configured'));
+                const activeRequests = getActiveRequestsByDeviceInstance(this.device.instanceId);
+                const errorInfo = {
+                    commandsInstanceId: this.instanceId,
+                    deviceInstanceId: this.device.instanceId,
+                    currentResponseID: this.currentResponseID,
+                    listenerCount,
+                    activeRequests: activeRequests.map(formatRequestContext),
+                };
+                LogCore.error('[DeviceCommands] [call] PIN callback not configured, cancelling request', Object.assign({}, errorInfo));
+                reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `_promptPin: PIN callback not configured: ${JSON.stringify(errorInfo)}`));
             }
         });
     }
@@ -26802,7 +27000,7 @@ class DeviceCommands {
         return new Promise((resolve, reject) => {
             const cancelAndReject = (_error) => cancelDeviceInPrompt(this.device, false)
                 .then(onCancel => {
-                const error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.ActionCancelled, `${DEVICE.PASSPHRASE} canceled`);
+                const error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallQueueActionCancelled, `${DEVICE.PASSPHRASE} canceled`);
                 if (onCancel) {
                     const { payload } = onCancel || {};
                     reject(error || new Error(payload === null || payload === void 0 ? void 0 : payload.message));
@@ -26827,7 +27025,7 @@ class DeviceCommands {
                 });
             }
             else {
-                Log$b.error('[DeviceCommands] [call] Passphrase callback not configured, cancelling request');
+                LogCore.error('[DeviceCommands] [call] Passphrase callback not configured, cancelling request');
                 reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, '_promptPassphrase: Passphrase callback not configured'));
             }
         });
@@ -26842,7 +27040,7 @@ const parseRunOptions = (options) => {
 const Log$a = getLogger(exports.LoggerNames.Device);
 const deviceSessionCache = {};
 class Device extends events.exports {
-    constructor(descriptor) {
+    constructor(descriptor, sdkInstanceId) {
         super();
         this.deviceConnector = null;
         this.deviceAcquired = false;
@@ -26856,10 +27054,14 @@ class Device extends events.exports {
         this.keepSession = false;
         this.passphraseState = undefined;
         this.originalDescriptor = descriptor;
+        this.sdkInstanceId = sdkInstanceId;
+        this.instanceId = generateInstanceId('Device', this.sdkInstanceId);
+        this.createdAt = Date.now();
+        Log$a.debug(`[Device] Created: ${this.instanceId}${this.sdkInstanceId ? ` for SDK: ${this.sdkInstanceId}` : ''}`);
     }
-    static fromDescriptor(originalDescriptor) {
+    static fromDescriptor(originalDescriptor, sdkInstanceId) {
         const descriptor = Object.assign({}, originalDescriptor);
-        return new Device(descriptor);
+        return new Device(descriptor, sdkInstanceId);
     }
     toMessageObject() {
         if (this.isUnacquired() || !this.features)
@@ -26871,6 +27073,9 @@ class Device extends events.exports {
         return {
             connectId: DataManager.isBleConnect(env) ? this.mainId || null : getDeviceUUID(this.features),
             uuid: getDeviceUUID(this.features),
+            sdkInstanceId: this.sdkInstanceId,
+            instanceId: this.instanceId,
+            createdAt: this.createdAt,
             deviceType,
             deviceId: this.features.device_id || null,
             path: this.originalDescriptor.path,
@@ -27445,10 +27650,10 @@ class DeviceList extends events.exports {
     }
 }
 
-const getFirmwareReleaseInfo = (features) => {
-    const firmwareStatus = DataManager.getFirmwareStatus(features);
-    const changelog = DataManager.getFirmwareChangelog(features);
-    const release = DataManager.getFirmwareLatestRelease(features);
+const getFirmwareReleaseInfo = (features, firmwareType) => {
+    const firmwareStatus = DataManager.getFirmwareStatus(features, firmwareType);
+    const changelog = DataManager.getFirmwareChangelog(features, firmwareType);
+    const release = DataManager.getFirmwareLatestRelease(features, firmwareType);
     const bootloaderMode = !!features.bootloader_mode;
     return {
         status: firmwareStatus,
@@ -27469,8 +27674,8 @@ const getBleFirmwareReleaseInfo = (features) => {
         bootloaderMode,
     };
 };
-const getBootloaderReleaseInfo = (features, willUpdateFirmwareVersion) => {
-    const release = DataManager.getFirmwareLatestRelease(features);
+const getBootloaderReleaseInfo = ({ features, willUpdateFirmwareVersion, firmwareType, }) => {
+    const release = DataManager.getFirmwareLatestRelease(features, firmwareType);
     const changelog = [release === null || release === void 0 ? void 0 : release.bootloaderChangelog].filter(item => item != null &&
         typeof item === 'object' &&
         Object.prototype.hasOwnProperty.call(item, 'zh-CN') &&
@@ -27479,10 +27684,14 @@ const getBootloaderReleaseInfo = (features, willUpdateFirmwareVersion) => {
     let shouldUpdate = false;
     const deviceType = getDeviceType(features);
     if (DeviceModelToTypes.model_mini.includes(deviceType)) {
-        shouldUpdate = !!checkNeedUpdateBootForClassicAndMini(features, willUpdateFirmwareVersion);
+        shouldUpdate = !!checkNeedUpdateBootForClassicAndMini({
+            features,
+            willUpdateFirmware: willUpdateFirmwareVersion,
+            firmwareType,
+        });
     }
     else if (DeviceModelToTypes.model_touch.includes(deviceType)) {
-        shouldUpdate = checkNeedUpdateBootForTouch(features);
+        shouldUpdate = checkNeedUpdateBootForTouch(features, firmwareType);
     }
     return {
         status: shouldUpdate ? 'outdated' : 'valid',
@@ -27520,13 +27729,36 @@ class BaseMethod {
     getVersionRange() {
         return {};
     }
+    setContext(context) {
+        this.sdkInstanceId = context.sdkInstanceId;
+        this.instanceId = generateInstanceId('Method', this.sdkInstanceId);
+        Log$9.debug(`[BaseMethod] Created: ${this.instanceId}, method: ${this.name}, SDK: ${this.sdkInstanceId}`);
+    }
     setDevice(device) {
+        var _a, _b;
         this.device = device;
+        if (!device.sdkInstanceId && this.sdkInstanceId) {
+            device.sdkInstanceId = this.sdkInstanceId;
+            device.instanceId = generateInstanceId('Device', this.sdkInstanceId);
+        }
+        if (this.requestContext) {
+            this.requestContext.deviceInstanceId = device.instanceId;
+            this.requestContext.commandsInstanceId = (_a = device.commands) === null || _a === void 0 ? void 0 : _a.instanceId;
+            this.requestContext.sdkInstanceId = this.sdkInstanceId;
+        }
+        if (device.commands && this.sdkInstanceId) {
+            device.commands.instanceId = generateInstanceId('DeviceCommands', this.sdkInstanceId);
+        }
+        if (device.commands) {
+            device.commands.currentResponseID = this.responseID;
+        }
+        Log$9.debug(`[${this.instanceId}] setDevice: ${device.instanceId}, commands: ${(_b = device.commands) === null || _b === void 0 ? void 0 : _b.instanceId}`);
     }
     checkFirmwareRelease() {
         if (!this.device || !this.device.features)
             return;
-        const releaseInfo = getFirmwareReleaseInfo(this.device.features);
+        const firmwareType = getFirmwareType(this.device.features);
+        const releaseInfo = getFirmwareReleaseInfo(this.device.features, firmwareType);
         this.postMessage(createFirmwareMessage(FIRMWARE.RELEASE_INFO, Object.assign(Object.assign({}, releaseInfo), { device: this.device.toMessageObject() })));
         const bleReleaseInfo = getBleFirmwareReleaseInfo(this.device.features);
         this.postMessage(createFirmwareMessage(FIRMWARE.BLE_RELEASE_INFO, Object.assign(Object.assign({}, bleReleaseInfo), { device: this.device.toMessageObject() })));
@@ -27726,8 +27958,12 @@ class CheckFirmwareRelease extends BaseMethod {
         this.skipForceUpdateCheck = true;
     }
     run() {
+        var _a;
+        const payload = this.payload;
         if (this.device.features) {
-            const releaseInfo = getFirmwareReleaseInfo(this.device.features);
+            const deviceFirmwareType = getFirmwareType(this.device.features);
+            const firmwareType = (_a = payload.firmwareType) !== null && _a !== void 0 ? _a : deviceFirmwareType;
+            const releaseInfo = getFirmwareReleaseInfo(this.device.features, firmwareType);
             return Promise.resolve(releaseInfo);
         }
         return Promise.resolve(null);
@@ -27868,12 +28104,20 @@ class CheckBootloaderRelease extends BaseMethod {
         this.skipForceUpdateCheck = true;
     }
     run() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.device.features) {
                 return null;
             }
             const { features } = this.device;
-            const releaseInfo = getBootloaderReleaseInfo(features, this.payload.willUpdateFirmwareVersion);
+            const payload = this.payload;
+            const deviceFirmwareType = getFirmwareType(features);
+            const firmwareType = (_a = payload.firmwareType) !== null && _a !== void 0 ? _a : deviceFirmwareType;
+            const releaseInfo = getBootloaderReleaseInfo({
+                features,
+                willUpdateFirmwareVersion: payload.willUpdateFirmwareVersion,
+                firmwareType,
+            });
             return Promise.resolve(releaseInfo);
         });
     }
@@ -27889,11 +28133,14 @@ class CheckAllFirmwareRelease extends BaseMethod {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const { features } = this.device;
-            const { checkBridgeRelease } = this.payload;
+            const { checkBridgeRelease, firmwareType: firmwareTypeParams } = this
+                .payload;
             if (!features) {
                 return Promise.resolve(null);
             }
-            const firmwareRelease = getFirmwareReleaseInfo(features);
+            const deviceFirmwareType = getFirmwareType(features);
+            const firmwareType = firmwareTypeParams !== null && firmwareTypeParams !== void 0 ? firmwareTypeParams : deviceFirmwareType;
+            const firmwareRelease = getFirmwareReleaseInfo(features, firmwareType);
             const currentFirmwareVersion = getDeviceFirmwareVersion(features).join('.');
             const willUpdateFirmwareVersion = (_b = (_a = firmwareRelease.release) === null || _a === void 0 ? void 0 : _a.version) === null || _b === void 0 ? void 0 : _b.join('.');
             const deviceType = getDeviceType(features);
@@ -27906,7 +28153,11 @@ class CheckAllFirmwareRelease extends BaseMethod {
                     willUpdateFirmwareVersion,
                 });
             }
-            const bootloaderRelease = getBootloaderReleaseInfo(features, willUpdateFirmwareVersion);
+            const bootloaderRelease = getBootloaderReleaseInfo({
+                features,
+                willUpdateFirmwareVersion,
+                firmwareType,
+            });
             const bleFirmwareReleaseInfo = getBleFirmwareReleaseInfo(features);
             return {
                 firmware: firmwareRelease,
@@ -27920,6 +28171,7 @@ class CheckAllFirmwareRelease extends BaseMethod {
                         release: bridgeReleaseInfo.releaseVersion,
                     }
                     : undefined,
+                features,
             };
         });
     }
@@ -28552,8 +28804,13 @@ class DeviceWipe extends BaseMethod {
     }
 }
 
-const getBinary = ({ features, updateType, version, isUpdateBootloader, }) => __awaiter(void 0, void 0, void 0, function* () {
-    const releaseInfo = getInfo({ features, updateType, targetVersion: version === null || version === void 0 ? void 0 : version.join('.') });
+const getBinary = ({ features, updateType, version, isUpdateBootloader, firmwareType, }) => __awaiter(void 0, void 0, void 0, function* () {
+    const releaseInfo = getInfo({
+        features,
+        updateType,
+        targetVersion: version === null || version === void 0 ? void 0 : version.join('.'),
+        firmwareType,
+    });
     if (!releaseInfo) {
         throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'no firmware found for this device');
     }
@@ -28590,7 +28847,7 @@ const getSysResourceBinary = (url) => __awaiter(void 0, void 0, void 0, function
         binary: fw,
     };
 });
-const getInfo = ({ features, updateType, targetVersion }) => {
+const getInfo = ({ features, updateType, targetVersion, firmwareType }) => {
     var _a, _b;
     const deviceType = getDeviceType(features);
     if (deviceType === 'unknown') {
@@ -28601,6 +28858,7 @@ const getInfo = ({ features, updateType, targetVersion }) => {
         features,
         updateType,
         targetVersion,
+        firmwareType,
     });
     const releaseInfo = (_b = (_a = deviceMap === null || deviceMap === void 0 ? void 0 : deviceMap[deviceType]) === null || _a === void 0 ? void 0 : _a[firmwareUpdateField]) !== null && _b !== void 0 ? _b : [];
     return findLatestRelease(releaseInfo);
@@ -28648,11 +28906,34 @@ const waitBleInstall = (updateType) => __awaiter(void 0, void 0, void 0, functio
     }
 });
 const uploadFirmware = (updateType, typedCall, postMessage, device, { payload, rebootOnSuccess, }) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b;
     const deviceType = getDeviceType(device.features);
     if (DeviceModelToTypes.model_mini.includes(deviceType)) {
         postConfirmationMessage(device);
         postProgressTip(device, 'ConfirmOnDevice', postMessage);
-        const eraseCommand = updateType === 'firmware' ? 'FirmwareErase' : 'FirmwareErase_ex';
+        const isFirmware = updateType === 'firmware';
+        const deviceBootloaderVersion = getDeviceBootloaderVersion(device.features).join('.');
+        const supportUpgradeFileHeader = semver__default["default"].gt(deviceBootloaderVersion, '2.1.0');
+        Log$8.debug('supportUpgradeFileHeader:', supportUpgradeFileHeader, 'deviceBootloaderVersion:', deviceBootloaderVersion);
+        if (isFirmware && 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$8.debug('Uploading firmware header:', { size: HEADER_SIZE, totalSize: payload.byteLength });
+            postProgressTip(device, 'UploadingFirmwareHeader', postMessage);
+            const header = new Uint8Array(payload.slice(0, HEADER_SIZE));
+            const headerRes = (yield typedCall('UpgradeFileHeader', 'Success', {
+                data: bytesToHex(header),
+            }));
+            const isUnexpectedMessage = (_b = (_a = headerRes.message) === null || _a === void 0 ? void 0 : _a.message) === null || _b === void 0 ? void 0 : _b.includes('Failure_UnexpectedMessage');
+            if (headerRes.type !== 'Success' && !isUnexpectedMessage) {
+                Log$8.error('Firmware header upload failed:', headerRes);
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'failed to upload firmware header');
+            }
+            Log$8.debug('Firmware header uploaded successfully, isUnexpectedMessage:', isUnexpectedMessage);
+        }
+        const eraseCommand = isFirmware ? 'FirmwareErase' : 'FirmwareErase_ex';
         const eraseRes = yield typedCall(eraseCommand, 'Success', {});
         if (eraseRes.type !== 'Success') {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'erase firmware error');
@@ -28705,7 +28986,7 @@ const uploadFirmware = (updateType, typedCall, postMessage, device, { payload, r
     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'uploadFirmware: unknown device model');
 });
 const newTouchUpdateProcess = (updateType, postMessage, device, { payload }, rebootOnSuccess = true) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d, _e;
+    var _c, _d, _e, _f, _g;
     let typedCall = device.getCommands().typedCall.bind(device.getCommands());
     postProgressTip(device, 'StartTransferData', postMessage);
     const filePath = `0:${updateType === 'ble' ? 'ble-' : ''}firmware.bin`;
@@ -28749,7 +29030,7 @@ const newTouchUpdateProcess = (updateType, postMessage, device, { payload }, reb
         }
     }
     if (response.type === 'Success' &&
-        ((_a = response === null || response === void 0 ? void 0 : response.message) === null || _a === void 0 ? void 0 : _a.message) === FIRMWARE_UPDATE_CONFIRM$1) {
+        ((_c = response === null || response === void 0 ? void 0 : response.message) === null || _c === void 0 ? void 0 : _c.message) === FIRMWARE_UPDATE_CONFIRM$1) {
         const timeout = 2 * 60 * 1000;
         const startTime = Date.now();
         const isBleReconnect = DataManager.isBleConnect(env);
@@ -28757,7 +29038,7 @@ const newTouchUpdateProcess = (updateType, postMessage, device, { payload }, reb
             try {
                 if (isBleReconnect) {
                     try {
-                        yield ((_b = device.deviceConnector) === null || _b === void 0 ? void 0 : _b.acquire(device.originalDescriptor.id, null, true));
+                        yield ((_d = device.deviceConnector) === null || _d === void 0 ? void 0 : _d.acquire(device.originalDescriptor.id, null, true));
                         const typedCall = device.getCommands().typedCall.bind(device.getCommands());
                         yield Promise.race([
                             typedCall('Initialize', 'Features', {}),
@@ -28773,14 +29054,14 @@ const newTouchUpdateProcess = (updateType, postMessage, device, { payload }, reb
                     }
                 }
                 else {
-                    const deviceDiff = yield ((_c = device.deviceConnector) === null || _c === void 0 ? void 0 : _c.enumerate());
-                    const devicesDescriptor = (_d = deviceDiff === null || deviceDiff === void 0 ? void 0 : deviceDiff.descriptors) !== null && _d !== void 0 ? _d : [];
+                    const deviceDiff = yield ((_e = device.deviceConnector) === null || _e === void 0 ? void 0 : _e.enumerate());
+                    const devicesDescriptor = (_f = deviceDiff === null || deviceDiff === void 0 ? void 0 : deviceDiff.descriptors) !== null && _f !== void 0 ? _f : [];
                     const { deviceList } = yield DevicePool.getDevices(devicesDescriptor, device.originalDescriptor.id);
                     if (deviceList.length === 1) {
                         device.updateFromCache(deviceList[0]);
                         yield device.acquire();
                         device.commands.disposed = false;
-                        device.getCommands().mainId = (_e = device.mainId) !== null && _e !== void 0 ? _e : '';
+                        device.getCommands().mainId = (_g = device.mainId) !== null && _g !== void 0 ? _g : '';
                     }
                 }
                 const typedCall = device.getCommands().typedCall.bind(device.getCommands());
@@ -28798,9 +29079,9 @@ const newTouchUpdateProcess = (updateType, postMessage, device, { payload }, reb
     return response;
 });
 const emmcFileWriteWithRetry = (device, filePath, chunkLength, offset, chunk, overwrite, progress) => __awaiter(void 0, void 0, void 0, function* () {
-    var _f, _g, _h, _j, _k, _l, _m, _o, _p;
+    var _h, _j, _k, _l, _m, _o, _p, _q, _r;
     const writeFunc = () => __awaiter(void 0, void 0, void 0, function* () {
-        var _q;
+        var _s;
         const typedCall = device.getCommands().typedCall.bind(device.getCommands());
         const writeRes = yield typedCall('EmmcFileWrite', 'EmmcFile', {
             file: {
@@ -28815,7 +29096,7 @@ const emmcFileWriteWithRetry = (device, filePath, chunkLength, offset, chunk, ov
         });
         if (writeRes.type !== 'EmmcFile') {
             if (writeRes.type === 'CallMethodError') {
-                if (((_q = writeRes.message.error) !== null && _q !== void 0 ? _q : '').indexOf(SESSION_ERROR$1) > -1) {
+                if (((_s = writeRes.message.error) !== null && _s !== void 0 ? _s : '').indexOf(SESSION_ERROR$1) > -1) {
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, SESSION_ERROR$1);
                 }
             }
@@ -28838,18 +29119,18 @@ const emmcFileWriteWithRetry = (device, filePath, chunkLength, offset, chunk, ov
             const env = DataManager.getSettings('env');
             if (DataManager.isBleConnect(env)) {
                 yield wait(3000);
-                yield ((_f = device.deviceConnector) === null || _f === void 0 ? void 0 : _f.acquire(device.originalDescriptor.id, null, true));
+                yield ((_h = device.deviceConnector) === null || _h === void 0 ? void 0 : _h.acquire(device.originalDescriptor.id, null, true));
                 yield device.initialize();
             }
-            else if (((_g = error === null || error === void 0 ? void 0 : error.message) === null || _g === void 0 ? void 0 : _g.indexOf(SESSION_ERROR$1)) > -1 ||
-                ((_j = (_h = error === null || error === void 0 ? void 0 : error.response) === null || _h === void 0 ? void 0 : _h.data) === null || _j === void 0 ? void 0 : _j.indexOf(SESSION_ERROR$1)) > -1) {
-                const deviceDiff = yield ((_k = device.deviceConnector) === null || _k === void 0 ? void 0 : _k.enumerate());
-                const devicesDescriptor = (_l = deviceDiff === null || deviceDiff === void 0 ? void 0 : deviceDiff.descriptors) !== null && _l !== void 0 ? _l : [];
+            else if (((_j = error === null || error === void 0 ? void 0 : error.message) === null || _j === void 0 ? void 0 : _j.indexOf(SESSION_ERROR$1)) > -1 ||
+                ((_l = (_k = error === null || error === void 0 ? void 0 : error.response) === null || _k === void 0 ? void 0 : _k.data) === null || _l === void 0 ? void 0 : _l.indexOf(SESSION_ERROR$1)) > -1) {
+                const deviceDiff = yield ((_m = device.deviceConnector) === null || _m === void 0 ? void 0 : _m.enumerate());
+                const devicesDescriptor = (_o = deviceDiff === null || deviceDiff === void 0 ? void 0 : deviceDiff.descriptors) !== null && _o !== void 0 ? _o : [];
                 const { deviceList } = yield DevicePool.getDevices(devicesDescriptor, undefined);
-                if (deviceList.length === 1 && ((_o = (_m = deviceList[0]) === null || _m === void 0 ? void 0 : _m.features) === null || _o === void 0 ? void 0 : _o.bootloader_mode)) {
+                if (deviceList.length === 1 && ((_q = (_p = deviceList[0]) === null || _p === void 0 ? void 0 : _p.features) === null || _q === void 0 ? void 0 : _q.bootloader_mode)) {
                     device.updateFromCache(deviceList[0]);
                     yield device.acquire();
-                    device.getCommands().mainId = (_p = device.mainId) !== null && _p !== void 0 ? _p : '';
+                    device.getCommands().mainId = (_r = device.mainId) !== null && _r !== void 0 ? _r : '';
                 }
             }
             yield wait(3000);
@@ -28943,15 +29224,19 @@ class DeviceFullyUploadResource extends BaseMethod {
         return isTouchMode && semver__default["default"].gte(currentVersion, '3.4.0');
     }
     run() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const { device } = this;
             const { features } = device;
+            const payload = this.payload;
+            const deviceFirmwareType = getFirmwareType(features);
+            const firmwareType = (_a = payload.firmwareType) !== null && _a !== void 0 ? _a : deviceFirmwareType;
             if (!(features === null || features === void 0 ? void 0 : features.bootloader_mode) && features) {
                 if (features) {
                     let { binary } = this.payload;
                     if (!binary) {
                         this.postTipMessage('CheckLatestUiResource');
-                        const resourceUrl = DataManager.getSysFullResource(features);
+                        const resourceUrl = DataManager.getSysFullResource(features, firmwareType);
                         if (resourceUrl) {
                             this.postTipMessage('DownloadLatestUiResource');
                             const resource = yield getSysResourceBinary(resourceUrl);
@@ -29315,12 +29600,14 @@ class DeviceUpdateBootloader extends FirmwareUpdateBaseMethod {
             return true;
         });
     }
-    updateTouchBootloader(device, features) {
+    updateTouchBootloader({ device, features, firmwareType, }) {
         return __awaiter(this, void 0, void 0, function* () {
             let { binary } = this.payload;
             if (!binary) {
                 this.postTipMessage(exports.FirmwareUpdateTipMessage.CheckLatestUiResource);
-                const resourceUrl = features ? DataManager.getBootloaderResource(features) : null;
+                const resourceUrl = features
+                    ? DataManager.getBootloaderResource(features, firmwareType)
+                    : null;
                 if (resourceUrl) {
                     this.postTipMessage(exports.FirmwareUpdateTipMessage.DownloadLatestBootloaderResource);
                     const resource = yield getSysResourceBinary(resourceUrl);
@@ -29344,12 +29631,16 @@ class DeviceUpdateBootloader extends FirmwareUpdateBaseMethod {
         });
     }
     run() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const { device } = this;
             const { features } = device;
+            const payload = this.payload;
             const deviceType = getDeviceType(features);
+            const deviceFirmwareType = getFirmwareType(features);
+            const firmwareType = (_a = payload.firmwareType) !== null && _a !== void 0 ? _a : deviceFirmwareType;
             if (DeviceModelToTypes.model_touch.includes(deviceType)) {
-                return this.updateTouchBootloader(device, features);
+                return this.updateTouchBootloader({ device, features, firmwareType });
             }
             return Promise.resolve(true);
         });
@@ -29541,6 +29832,7 @@ class FirmwareUpdate extends BaseMethod {
                         features: device.features,
                         version: params.version,
                         updateType: params.updateType,
+                        firmwareType: hdShared.EFirmwareType.Universal,
                     });
                     binary = firmware.binary;
                     this.postTipMessage('DownloadFirmwareSuccess');
@@ -29584,6 +29876,7 @@ class FirmwareUpdateV2 extends BaseMethod {
             { name: 'binary', type: 'buffer' },
             { name: 'forcedUpdateRes', type: 'boolean' },
             { name: 'platform', type: 'string', required: true },
+            { name: 'firmwareType', type: 'string' },
         ]);
         if (!payload.updateType) {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodInvalidParameter, 'updateType is required');
@@ -29594,7 +29887,7 @@ class FirmwareUpdateV2 extends BaseMethod {
             isUpdateBootloader: payload.isUpdateBootloader,
         };
         if ('version' in payload) {
-            this.params = Object.assign(Object.assign({}, this.params), { version: payload.version });
+            this.params = Object.assign(Object.assign({}, this.params), { version: payload.version, firmwareType: payload.firmwareType });
         }
         if ('binary' in payload) {
             this.params = Object.assign(Object.assign({}, this.params), { binary: payload.binary });
@@ -29715,7 +30008,7 @@ class FirmwareUpdateV2 extends BaseMethod {
         const currentVersion = getDeviceFirmwareVersion(features).join('.');
         return isTouchMode && semver__default["default"].gte(currentVersion, '3.2.0');
     }
-    checkVersionForCopyTouchResource(features) {
+    checkVersionForCopyTouchResource(features, firmwareType) {
         var _a;
         if (!features)
             return;
@@ -29723,7 +30016,7 @@ class FirmwareUpdateV2 extends BaseMethod {
         const currentVersion = getDeviceFirmwareVersion(features).join('.');
         const targetVersion = (_a = this.params.version) === null || _a === void 0 ? void 0 : _a.join('.');
         const { updateType } = this.params;
-        const releaseInfo = getInfo({ features, updateType });
+        const releaseInfo = getInfo({ features, updateType, firmwareType });
         if (!releaseInfo)
             return;
         const { fullResourceRange } = releaseInfo;
@@ -29739,12 +30032,14 @@ class FirmwareUpdateV2 extends BaseMethod {
         }
     }
     run() {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         return __awaiter(this, void 0, void 0, function* () {
             const { device, params } = this;
             const { features, commands } = device;
             const deviceType = getDeviceType(features);
-            this.checkVersionForCopyTouchResource(features);
+            const deviceFirmwareType = getFirmwareType(device.features);
+            const firmwareType = (_a = params.firmwareType) !== null && _a !== void 0 ? _a : deviceFirmwareType;
+            this.checkVersionForCopyTouchResource(features, firmwareType);
             if (!(features === null || features === void 0 ? void 0 : features.bootloader_mode) && features) {
                 const uuid = getDeviceUUID(features);
                 if (this.isEnteredManuallyBoot(features)) {
@@ -29752,7 +30047,11 @@ class FirmwareUpdateV2 extends BaseMethod {
                 }
                 if (features && this.isSupportResourceUpdate(features, params.updateType)) {
                     this.postTipMessage('CheckLatestUiResource');
-                    const resourceUrl = DataManager.getSysResourcesLatestRelease(features, params.forcedUpdateRes);
+                    const resourceUrl = DataManager.getSysResourcesLatestRelease({
+                        features,
+                        forcedUpdateRes: params.forcedUpdateRes,
+                        firmwareType,
+                    });
                     if (resourceUrl) {
                         this.postTipMessage('DownloadLatestUiResource');
                         const resource = yield getSysResourceBinary(resourceUrl);
@@ -29762,7 +30061,7 @@ class FirmwareUpdateV2 extends BaseMethod {
                         }
                     }
                 }
-                (_b = (_a = this.device) === null || _a === void 0 ? void 0 : _a.commands) === null || _b === void 0 ? void 0 : _b.checkDisposed();
+                (_c = (_b = this.device) === null || _b === void 0 ? void 0 : _b.commands) === null || _c === void 0 ? void 0 : _c.checkDisposed();
                 try {
                     this.postTipMessage('AutoRebootToBootloader');
                     const bootRes = yield commands.typedCall('DeviceBackToBoot', 'Success');
@@ -29775,9 +30074,9 @@ class FirmwareUpdateV2 extends BaseMethod {
                         DevicePool.clearDeviceCache(uuid);
                     }
                     delete DevicePool.devicesCache[''];
-                    yield ((_c = this.checkPromise) === null || _c === void 0 ? void 0 : _c.promise);
+                    yield ((_d = this.checkPromise) === null || _d === void 0 ? void 0 : _d.promise);
                     this.checkPromise = null;
-                    (_e = (_d = this.device) === null || _d === void 0 ? void 0 : _d.commands) === null || _e === void 0 ? void 0 : _e.checkDisposed();
+                    (_f = (_e = this.device) === null || _e === void 0 ? void 0 : _e.commands) === null || _f === void 0 ? void 0 : _f.checkDisposed();
                     const isTouch = DeviceModelToTypes.model_touch.includes(deviceType);
                     yield wait(isTouch ? 3000 : 1500);
                 }
@@ -29804,15 +30103,16 @@ class FirmwareUpdateV2 extends BaseMethod {
                         version: params.version,
                         updateType: params.updateType,
                         isUpdateBootloader: params.isUpdateBootloader,
+                        firmwareType,
                     });
                     binary = firmware.binary;
                     this.postTipMessage('DownloadFirmwareSuccess');
                 }
             }
             catch (err) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareUpdateDownloadFailed, (_f = err.message) !== null && _f !== void 0 ? _f : err);
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareUpdateDownloadFailed, (_g = err.message) !== null && _g !== void 0 ? _g : err);
             }
-            (_h = (_g = this.device) === null || _g === void 0 ? void 0 : _g.commands) === null || _h === void 0 ? void 0 : _h.checkDisposed();
+            (_j = (_h = this.device) === null || _h === void 0 ? void 0 : _h.commands) === null || _j === void 0 ? void 0 : _j.checkDisposed();
             yield this.device.acquire();
             const response = yield uploadFirmware(params.updateType, this.device.getCommands().typedCall.bind(this.device.getCommands()), this.postMessage, device, { payload: binary, rebootOnSuccess: true });
             if (this.connectId) {
@@ -29845,6 +30145,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
             { name: 'forcedUpdateRes', type: 'boolean' },
             { name: 'bootloaderVersion', type: 'array' },
             { name: 'bootloaderBinary', type: 'buffer' },
+            { name: 'firmwareType', type: 'string' },
             { name: 'platform', type: 'string' },
         ]);
         this.params = {
@@ -29856,11 +30157,12 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
             bootloaderBinary: payload.bootloaderBinary,
             firmwareVersion: payload.firmwareVersion,
             resourceBinary: payload.resourceBinary,
+            firmwareType: payload.firmwareType,
             platform: payload.platform,
         };
     }
     run() {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const { device } = this;
             const { features } = device;
@@ -29870,18 +30172,20 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
             if (!features) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Device features not available');
             }
+            const deviceFirmwareType = getFirmwareType(features);
+            const firmwareType = (_a = this.params.firmwareType) !== null && _a !== void 0 ? _a : deviceFirmwareType;
             let resourceBinary = null;
             let fwBinaryMap = [];
             let bootloaderBinary = null;
             try {
                 this.postTipMessage(exports.FirmwareUpdateTipMessage.StartDownloadFirmware);
-                resourceBinary = yield this.prepareResourceBinary();
-                fwBinaryMap = yield this.prepareFirmwareAndBleBinary();
-                bootloaderBinary = yield this.prepareBootloaderBinary();
+                resourceBinary = yield this.prepareResourceBinary(firmwareType);
+                fwBinaryMap = yield this.prepareFirmwareAndBleBinary(firmwareType);
+                bootloaderBinary = yield this.prepareBootloaderBinary(firmwareType);
                 this.postTipMessage(exports.FirmwareUpdateTipMessage.FinishDownloadFirmware);
             }
             catch (err) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareUpdateDownloadFailed, (_a = err.message) !== null && _a !== void 0 ? _a : err);
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareUpdateDownloadFailed, (_b = err.message) !== null && _b !== void 0 ? _b : err);
             }
             if (!bootloaderBinary && fwBinaryMap.length === 0) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareUpdateDownloadFailed, 'No firmware to update');
@@ -29906,7 +30210,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'bootloader version needs to be updated');
         }
     }
-    prepareResourceBinary() {
+    prepareResourceBinary(firmwareType) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.params.resourceBinary) {
                 return this.params.resourceBinary;
@@ -29914,7 +30218,11 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
             const { features } = this.device;
             if (!features)
                 return null;
-            const resourceUrl = DataManager.getSysResourcesLatestRelease(features, this.params.forcedUpdateRes);
+            const resourceUrl = DataManager.getSysResourcesLatestRelease({
+                features,
+                forcedUpdateRes: this.params.forcedUpdateRes,
+                firmwareType,
+            });
             if (resourceUrl) {
                 const resource = (yield getSysResourceBinary(resourceUrl)).binary;
                 return resource;
@@ -29923,7 +30231,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
             return null;
         });
     }
-    prepareBootloaderBinary() {
+    prepareBootloaderBinary(firmwareType) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.params.bootloaderBinary) {
                 return this.params.bootloaderBinary;
@@ -29932,7 +30240,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
             if (!features)
                 return null;
             if (this.params.bootloaderVersion) {
-                const bootResourceUrl = DataManager.getBootloaderResource(features);
+                const bootResourceUrl = DataManager.getBootloaderResource(features, firmwareType);
                 if (bootResourceUrl) {
                     const bootBinary = (yield getSysResourceBinary(bootResourceUrl)).binary;
                     return bootBinary;
@@ -29941,7 +30249,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
             return null;
         });
     }
-    prepareFirmwareAndBleBinary() {
+    prepareFirmwareAndBleBinary(firmwareType) {
         return __awaiter(this, void 0, void 0, function* () {
             const fwBinaryMap = [];
             if (this.params.firmwareBinary) {
@@ -29958,6 +30266,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
                         version: this.params.firmwareVersion,
                         updateType: 'firmware',
                         isUpdateBootloader: false,
+                        firmwareType,
                     })).binary;
                     fwBinaryMap.push({
                         fileName: 'firmware.bin',
@@ -29978,6 +30287,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
                         features,
                         version: this.params.bleVersion,
                         updateType: 'ble',
+                        firmwareType,
                     });
                     fwBinaryMap.push({
                         fileName: 'ble-firmware.bin',
@@ -30049,6 +30359,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
                 if (error === null || error === void 0 ? void 0 : error.errorCode) {
                     const unexpectedError = [
                         hdShared.HardwareErrorCode.ActionCancelled,
+                        hdShared.HardwareErrorCode.CallQueueActionCancelled,
                         hdShared.HardwareErrorCode.FirmwareVerificationFailed,
                         hdShared.HardwareErrorCode.BleDeviceNotBonded,
                         hdShared.HardwareErrorCode.BleServiceNotFound,
@@ -30495,7 +30806,7 @@ class AllNetworkGetAddressBase extends BaseMethod {
         };
     }
     callMethod(methodName, params, rootFingerprint) {
-        var _a;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const method = findMethod({
                 event: IFRAME.CALL,
@@ -30504,25 +30815,38 @@ class AllNetworkGetAddressBase extends BaseMethod {
             });
             method.connector = this.connector;
             method.postMessage = this.postMessage;
+            if (this.context) {
+                (_a = method.setContext) === null || _a === void 0 ? void 0 : _a.call(method, this.context);
+            }
+            method.requestContext = createRequestContext(method.responseID, methodName, {
+                sdkInstanceId: this.sdkInstanceId,
+                connectId: this.payload.connectId,
+                parentResponseID: this.responseID,
+            });
+            const onSignalAbort = () => {
+                var _a;
+                (_a = this.abortController) === null || _a === void 0 ? void 0 : _a.abort(hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.RepeatUnlocking]);
+            };
+            const buttonListener = (...[device, request]) => {
+                if (request.code === 'ButtonRequest_PinEntry' || request.code === 'ButtonRequest_AttachPin') {
+                    onSignalAbort();
+                }
+                else {
+                    onDeviceButtonHandler(device, request);
+                }
+            };
             let result;
             try {
                 method.init();
-                (_a = method.setDevice) === null || _a === void 0 ? void 0 : _a.call(method, this.device);
+                (_b = method.setDevice) === null || _b === void 0 ? void 0 : _b.call(method, this.device);
                 method.context = this.context;
-                const onSignalAbort = () => {
-                    var _a;
-                    (_a = this.abortController) === null || _a === void 0 ? void 0 : _a.abort(hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.RepeatUnlocking]);
-                };
-                const _onDeviceButtonHandler = (...[device, request]) => {
-                    if (request.code === 'ButtonRequest_PinEntry' ||
-                        request.code === 'ButtonRequest_AttachPin') {
-                        onSignalAbort();
-                    }
-                    else {
-                        onDeviceButtonHandler(device, request);
-                    }
-                };
-                this.device.on(DEVICE.BUTTON, _onDeviceButtonHandler);
+                if (method.requestContext && this.device) {
+                    updateRequestContext(method.requestContext.responseID, {
+                        deviceInstanceId: this.device.instanceId,
+                        commandsInstanceId: (_c = this.device.commands) === null || _c === void 0 ? void 0 : _c.instanceId,
+                    });
+                }
+                this.device.on(DEVICE.BUTTON, buttonListener);
                 this.device.on(DEVICE.PIN, onSignalAbort);
                 this.device.on(DEVICE.PASSPHRASE, onSignalAbort);
                 preCheckDeviceSupport(this.device, method);
@@ -30531,6 +30855,9 @@ class AllNetworkGetAddressBase extends BaseMethod {
                     throw new Error('No response');
                 }
                 result = response.map((item, index) => (Object.assign(Object.assign({}, params.bundle[index]._originRequestParams), { success: true, payload: Object.assign(Object.assign({}, item), { rootFingerprint }) })));
+                if (method.requestContext) {
+                    completeRequestContext(method.requestContext.responseID);
+                }
             }
             catch (e) {
                 const error = handleSkippableHardwareError(e, this.device, method);
@@ -30546,6 +30873,14 @@ class AllNetworkGetAddressBase extends BaseMethod {
                 else {
                     throw e;
                 }
+                if (method.requestContext) {
+                    completeRequestContext(method.requestContext.responseID, e instanceof Error ? e : new Error(String(e)));
+                }
+            }
+            finally {
+                this.device.off(DEVICE.BUTTON, buttonListener);
+                this.device.off(DEVICE.PIN, onSignalAbort);
+                this.device.off(DEVICE.PASSPHRASE, onSignalAbort);
             }
             return result;
         });
@@ -39217,7 +39552,33 @@ const pollingState = {};
 let preConnectCache = {
     passphraseState: undefined,
 };
+const toError = (error) => {
+    if (error instanceof Error)
+        return error;
+    if (error == null)
+        return undefined;
+    if (typeof error === 'string')
+        return new Error(error);
+    try {
+        return new Error(JSON.stringify(error));
+    }
+    catch (_a) {
+        return new Error(String(error));
+    }
+};
+const updateMethodRequestContext = (method, updates) => {
+    if (method.requestContext) {
+        updateRequestContext(method.requestContext.responseID, updates);
+    }
+};
+const completeMethodRequestContext = (method, error) => {
+    if (!method.requestContext) {
+        return;
+    }
+    completeRequestContext(method.requestContext.responseID, toError(error));
+};
 const callAPI = (context, message) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     if (!message.id || !message.payload || message.type !== IFRAME.CALL) {
         return Promise.reject(hdShared.ERRORS.TypedError('on call: message.id or message.payload is missing'));
     }
@@ -39226,6 +39587,12 @@ const callAPI = (context, message) => __awaiter(void 0, void 0, void 0, function
         method = findMethod(message);
         method.connector = _connector;
         method.postMessage = postMessage;
+        (_a = method.setContext) === null || _a === void 0 ? void 0 : _a.call(method, context);
+        method.requestContext = createRequestContext(method.responseID, method.name, {
+            sdkInstanceId: context.sdkInstanceId,
+            connectId: method.connectId,
+        });
+        Log.debug(`[${context.sdkInstanceId}] callAPI: ${formatRequestContext(method.requestContext)}`);
         method.init();
     }
     catch (error) {
@@ -39233,11 +39600,14 @@ const callAPI = (context, message) => __awaiter(void 0, void 0, void 0, function
     }
     DevicePool.emitter.on(DEVICE.CONNECT, onDeviceConnectHandler);
     if (!method.useDevice) {
+        updateMethodRequestContext(method, { status: 'running' });
         try {
             const response = yield method.run();
+            completeMethodRequestContext(method);
             return createResponseMessage(method.responseID, true, response);
         }
         catch (error) {
+            completeMethodRequestContext(method, error);
             return createResponseMessage(method.responseID, false, { error });
         }
     }
@@ -39277,9 +39647,10 @@ const waitForPendingPromise = (getPrePendingCallPromise, removePrePendingCallPro
     }
 });
 const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b;
+    var _b, _c, _d;
     let messageResponse;
     const { requestQueue, getPrePendingCallPromise, setPrePendingCallPromise } = context;
+    updateMethodRequestContext(method, { status: 'running' });
     const connectStateChange = preConnectCache.passphraseState !== method.payload.passphraseState;
     preConnectCache = {
         passphraseState: method.payload.passphraseState,
@@ -39299,10 +39670,11 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
             pollingState[pollingId] = false;
         }
         pollingId += 1;
-        device = yield ensureConnected(context, method, pollingId, (_a = task.abortController) === null || _a === void 0 ? void 0 : _a.signal);
+        device = yield ensureConnected(context, method, pollingId, (_b = task.abortController) === null || _b === void 0 ? void 0 : _b.signal);
     }
     catch (e) {
         console.log('ensureConnected error: ', e);
+        completeMethodRequestContext(method, e);
         if (e.name === 'AbortError' || e.message === 'Request aborted') {
             requestQueue.releaseTask(method.responseID);
             return createResponseMessage(method.responseID, false, {
@@ -39313,8 +39685,16 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
         return createResponseMessage(method.responseID, false, { error: e });
     }
     Log.debug('Call API - setDevice: ', device.mainId);
-    (_b = method.setDevice) === null || _b === void 0 ? void 0 : _b.call(method, device);
+    (_c = method.setDevice) === null || _c === void 0 ? void 0 : _c.call(method, device);
     method.context = context;
+    updateMethodRequestContext(method, {
+        deviceInstanceId: device.instanceId,
+        commandsInstanceId: (_d = device.commands) === null || _d === void 0 ? void 0 : _d.instanceId,
+    });
+    const activeRequests = getActiveRequestsByDeviceInstance(device.instanceId);
+    if (activeRequests.length > 0) {
+        Log.warn(`[${method.instanceId}] Device ${device.instanceId} has ${activeRequests.length} active requests:`, activeRequests.map(formatRequestContext));
+    }
     device.on(DEVICE.PIN, onDevicePinHandler);
     device.on(DEVICE.BUTTON, onDeviceButtonHandler);
     device.on(DEVICE.PASSPHRASE, message.payload.useEmptyPassphrase ? onEmptyPassphraseHandler : onDevicePassphraseHandler);
@@ -39327,7 +39707,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
         }
         yield waitForPendingPromise(getPrePendingCallPromise, setPrePendingCallPromise);
         const inner = () => __awaiter(void 0, void 0, void 0, function* () {
-            var _c, _d, _e, _f, _g;
+            var _e, _f, _g, _h, _j;
             const versionRange = getMethodVersionRange(device.features, type => method.getVersionRange()[type]);
             if (device.features) {
                 yield DataManager.checkAndReloadData();
@@ -39337,7 +39717,8 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
                         throw hdShared.createDefectiveFirmwareError(defectiveInfo.serialNo, defectiveInfo.seVersion || 'Unknown', defectiveInfo.deviceType, method.connectId, method.deviceId);
                     }
                 }
-                const newVersionStatus = DataManager.getFirmwareStatus(device.features);
+                const deviceFirmwareType = getFirmwareType(device.features);
+                const newVersionStatus = DataManager.getFirmwareStatus(device.features, deviceFirmwareType);
                 const bleVersionStatus = DataManager.getBLEFirmwareStatus(device.features);
                 const currentFirmwareVersion = getDeviceFirmwareVersion(device.features).join('.');
                 const currentBleVersion = getDeviceBLEFirmwareVersion(device.features).join('.');
@@ -39403,7 +39784,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
                         require: support.require,
                     }));
                 }
-                const passphraseStateSafety = yield device.checkPassphraseStateSafety((_c = method.payload) === null || _c === void 0 ? void 0 : _c.passphraseState, (_d = method.payload) === null || _d === void 0 ? void 0 : _d.useEmptyPassphrase, (_e = method.payload) === null || _e === void 0 ? void 0 : _e.skipPassphraseCheck);
+                const passphraseStateSafety = yield device.checkPassphraseStateSafety((_e = method.payload) === null || _e === void 0 ? void 0 : _e.passphraseState, (_f = method.payload) === null || _f === void 0 ? void 0 : _f.useEmptyPassphrase, (_g = method.payload) === null || _g === void 0 ? void 0 : _g.skipPassphraseCheck);
                 checkPassphraseEnableState(method, device.features);
                 if (!passphraseStateSafety) {
                     DevicePool.clearDeviceCache(method.payload.connectId);
@@ -39420,17 +39801,19 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
                     : hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'open safety check failed.');
                 throw error;
             }
-            (_g = (_f = method.device) === null || _f === void 0 ? void 0 : _f.commands) === null || _g === void 0 ? void 0 : _g.checkDisposed();
+            (_j = (_h = method.device) === null || _h === void 0 ? void 0 : _h.commands) === null || _j === void 0 ? void 0 : _j.checkDisposed();
             try {
                 const response = yield method.run();
                 Log.debug('Call API - Inner Method Run: ');
                 messageResponse = createResponseMessage(method.responseID, true, response);
                 requestQueue.resolveRequest(method.responseID, messageResponse);
+                completeMethodRequestContext(method);
             }
             catch (error) {
-                Log.debug('Call API - Inner Method Run Error: ', error);
+                Log.debug(`Call API - Inner Method Run Error`, error);
                 messageResponse = createResponseMessage(method.responseID, false, { error });
                 requestQueue.resolveRequest(method.responseID, messageResponse);
+                completeMethodRequestContext(method, error);
             }
         });
         Log.debug('Call API - Device Run: ', device.mainId);
@@ -39442,6 +39825,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
         }
         catch (e) {
             Log.debug('Device Run Error: ', e);
+            completeMethodRequestContext(method, e);
             return createResponseMessage(method.responseID, false, { error: e });
         }
     }
@@ -39449,6 +39833,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
         messageResponse = createResponseMessage(method.responseID, false, { error });
         requestQueue.rejectRequest(method.responseID, hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodError, error.message));
         Log.debug('Call API - Run Error: ', error);
+        completeMethodRequestContext(method, error);
     }
     finally {
         const response = messageResponse;
@@ -39460,7 +39845,17 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
         requestQueue.releaseTask(method.responseID);
         closePopup();
         cleanup();
-        removeDeviceListener(device);
+        if (device) {
+            const stillActive = getActiveRequestsByDeviceInstance(device.instanceId);
+            if (stillActive.length > 1) {
+                Log.warn(`[${method.instanceId}] Removing listeners while ${stillActive.length} requests are active!`, {
+                    deviceInstanceId: device.instanceId,
+                    activeRequests: stillActive.map(formatRequestContext),
+                    pinListeners: device.listenerCount(DEVICE.PIN),
+                });
+            }
+            removeDeviceListener(device);
+        }
     }
 });
 function initDeviceList(method) {
@@ -39530,7 +39925,7 @@ function initDeviceForBle(method) {
         device = deviceCacheMap.get(method.connectId);
     }
     else {
-        device = Device.fromDescriptor({ id: method.connectId });
+        device = Device.fromDescriptor({ id: method.connectId }, method.sdkInstanceId);
         deviceCacheMap.set(method.connectId, device);
     }
     device.deviceConnector = _connector;
@@ -39570,7 +39965,7 @@ const ensureConnected = (_context, method, pollingId, abortSignal) => __awaiter(
                     if (timer) {
                         clearTimeout(timer);
                     }
-                    reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.ActionCancelled));
+                    reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallQueueActionCancelled));
                     return true;
                 }
                 return false;
@@ -39700,7 +40095,7 @@ const cancel = (context, connectId) => {
                         setPrePendingCallPromise(device === null || device === void 0 ? void 0 : device.interruptionFromUser());
                         canceledDevices.push(device);
                     }
-                    requestQueue.rejectRequest(requestId, hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.ActionCancelled));
+                    requestQueue.rejectRequest(requestId, hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallQueueActionCancelled));
                 }
             }
             requestQueue.abortRequestsByConnectId(connectId);
@@ -39723,7 +40118,7 @@ const cancel = (context, connectId) => {
                         device === null || device === void 0 ? void 0 : device.interruptionFromUser();
                         canceledDevices.push(device);
                     }
-                    requestQueue.rejectRequest(requestId, hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.ActionCancelled));
+                    requestQueue.rejectRequest(requestId, hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallQueueActionCancelled));
                 }
             }
         }
@@ -39735,7 +40130,7 @@ const cancel = (context, connectId) => {
                 }
             });
             requestQueue.getRequestTasksId().forEach(requestId => {
-                requestQueue.rejectRequest(requestId, hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.ActionCancelled));
+                requestQueue.rejectRequest(requestId, hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallQueueActionCancelled));
             });
         }
     }
@@ -39856,12 +40251,17 @@ const removeUiPromise = (promise) => {
 };
 class Core extends events.exports {
     constructor() {
-        super(...arguments);
+        super();
         this.requestQueue = new RequestQueue();
         this.methodSynchronize = getSynchronize();
+        this.tracingContext = createSdkTracingContext();
+        this.sdkInstanceId = this.tracingContext.sdkInstanceId;
+        Log.debug(`[Core] Created SDK instance: ${this.sdkInstanceId}`);
     }
     getCoreContext() {
         return {
+            sdkInstanceId: this.sdkInstanceId,
+            tracingContext: this.tracingContext,
             requestQueue: this.requestQueue,
             methodSynchronize: this.methodSynchronize,
             getPrePendingCallPromise: () => this.prePendingCallPromise,
@@ -39926,6 +40326,8 @@ class Core extends events.exports {
     dispose() {
         _deviceList = undefined;
         _connector = undefined;
+        Log.debug(`[Core] Disposing SDK instance: ${this.sdkInstanceId}`);
+        cleanupSdkInstance(this.sdkInstanceId);
     }
 }
 const initCore = () => {
@@ -39946,7 +40348,7 @@ const init = (settings, Transport, plugin) => __awaiter(void 0, void 0, void 0,
             yield DataManager.load(settings);
             initTransport(Transport, plugin);
         }
-        catch (_h) {
+        catch (_k) {
             Log.error('DataManager.load error');
         }
         enableLog(DataManager.getSettings('debug'));
@@ -40020,18 +40422,26 @@ exports.UI_RESPONSE = UI_RESPONSE;
 exports.checkNeedUpdateBootForClassicAndMini = checkNeedUpdateBootForClassicAndMini;
 exports.checkNeedUpdateBootForTouch = checkNeedUpdateBootForTouch;
 exports.cleanupCallback = cleanupCallback;
+exports.cleanupSdkInstance = cleanupSdkInstance;
+exports.completeRequestContext = completeRequestContext;
 exports.corsValidator = corsValidator;
 exports.createDeviceMessage = createDeviceMessage;
 exports.createErrorMessage = createErrorMessage;
 exports.createFirmwareMessage = createFirmwareMessage;
 exports.createIFrameMessage = createIFrameMessage;
 exports.createLogMessage = createLogMessage;
+exports.createRequestContext = createRequestContext;
 exports.createResponseMessage = createResponseMessage;
+exports.createSdkTracingContext = createSdkTracingContext;
 exports.createUiMessage = createUiMessage;
 exports.createUiResponse = createUiResponse;
 exports["default"] = HardwareSdk;
 exports.enableLog = enableLog;
 exports.executeCallback = executeCallback;
+exports.formatRequestContext = formatRequestContext;
+exports.generateInstanceId = generateInstanceId;
+exports.generateSdkInstanceId = generateSdkInstanceId;
+exports.getActiveRequestsByDeviceInstance = getActiveRequestsByDeviceInstance;
 exports.getDeviceBLEFirmwareVersion = getDeviceBLEFirmwareVersion;
 exports.getDeviceBleName = getDeviceBleName;
 exports.getDeviceBoardloaderVersion = getDeviceBoardloaderVersion;
@@ -40069,6 +40479,7 @@ exports.safeThrowError = safeThrowError;
 exports.setLoggerPostMessage = setLoggerPostMessage;
 exports.supportInputPinOnSoftware = supportInputPinOnSoftware;
 exports.switchTransport = switchTransport;
+exports.updateRequestContext = updateRequestContext;
 exports.versionCompare = versionCompare;
 exports.versionSplit = versionSplit;
 exports.wait = wait;