@onekeyfe/hd-core 1.1.19-alpha.0 → 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: {
@@ -26556,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;
@@ -26634,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',
@@ -26837,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));
@@ -26849,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();
@@ -26862,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)}`));
             }
         });
     }
@@ -26871,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));
@@ -26896,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'));
             }
         });
@@ -26911,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;
@@ -26925,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)
@@ -26940,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,
@@ -27593,8 +27729,30 @@ 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)
@@ -28748,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');
@@ -28805,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`;
@@ -28849,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);
@@ -28857,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', {}),
@@ -28873,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());
@@ -28898,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: {
@@ -28915,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);
                 }
             }
@@ -28938,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);
@@ -30178,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,
@@ -30624,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,
@@ -30633,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);
@@ -30660,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);
@@ -30675,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;
         });
@@ -33159,8 +33365,12 @@ class EVMSignTypedData extends BaseMethod {
             return false;
         let biggerLimit = 1024;
         const currentVersion = getDeviceFirmwareVersion(this.device.features).join('.');
+        const currentDeviceType = getDeviceType(this.device.features);
         const supportBiggerDataVersion = '4.4.0';
-        if (semver__default["default"].gte(currentVersion, supportBiggerDataVersion)) {
+        const supportBiggerData = DeviceModelToTypes.model_classic1s.includes(currentDeviceType) ||
+            (DeviceModelToTypes.model_touch.includes(currentDeviceType) &&
+                semver__default["default"].gte(currentVersion, supportBiggerDataVersion));
+        if (supportBiggerData) {
             biggerLimit = 1536;
         }
         const startIndex = data.startsWith('0x') ? 2 : 0;
@@ -39342,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'));
     }
@@ -39351,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) {
@@ -39358,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 });
         }
     }
@@ -39402,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,
@@ -39424,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, {
@@ -39438,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);
@@ -39452,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();
@@ -39529,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);
@@ -39546,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);
@@ -39568,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 });
         }
     }
@@ -39575,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;
@@ -39586,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) {
@@ -39656,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;
@@ -39696,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;
@@ -39826,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);
@@ -39849,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));
                 }
             }
         }
@@ -39861,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));
             });
         }
     }
@@ -39982,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,
@@ -40052,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 = () => {
@@ -40072,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'));
@@ -40146,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;
@@ -40195,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;