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

package/dist/index.js

@@ -138,11 +138,11 @@ const createCoreApi = (call) => ({
     deviceRebootToBootloader: connectId => call({ connectId, method: 'deviceRebootToBootloader' }),
     getProtoVersion: (connectId, params) => call(Object.assign(Object.assign({}, params), { connectId, method: 'getProtoVersion' })),
     ping: (connectId, params) => call(Object.assign(Object.assign({}, params), { connectId, method: 'ping' })),
-    devReboot: (connectId, params) => call(Object.assign(Object.assign({}, params), { connectId, method: 'devReboot' })),
-    devGetDeviceInfo: (connectId, params) => call(Object.assign(Object.assign({}, params), { connectId, method: 'devGetDeviceInfo' })),
-    devGetOnboardingStatus: (connectId, params) => call(Object.assign(Object.assign({}, params), { connectId, method: 'devGetOnboardingStatus' })),
-    devFirmwareUpdate: (connectId, params) => call(Object.assign(Object.assign({}, params), { connectId, method: 'devFirmwareUpdate' })),
-    devGetFirmwareUpdateStatus: (connectId, params) => call(Object.assign(Object.assign({}, params), { connectId, method: 'devGetFirmwareUpdateStatus' })),
+    deviceReboot: (connectId, params) => call(Object.assign(Object.assign({}, params), { connectId, method: 'deviceReboot' })),
+    deviceGetDeviceInfo: (connectId, params) => call(Object.assign(Object.assign({}, params), { connectId, method: 'deviceGetDeviceInfo' })),
+    deviceGetOnboardingStatus: (connectId, params) => call(Object.assign(Object.assign({}, params), { connectId, method: 'deviceGetOnboardingStatus' })),
+    deviceFirmwareUpdate: (connectId, params) => call(Object.assign(Object.assign({}, params), { connectId, method: 'deviceFirmwareUpdate' })),
+    deviceGetFirmwareUpdateStatus: (connectId, params) => call(Object.assign(Object.assign({}, params), { connectId, method: 'deviceGetFirmwareUpdateStatus' })),
     factoryDeviceInfoSettings: (connectId, params) => call(Object.assign(Object.assign({}, params), { connectId, method: 'factoryDeviceInfoSettings' })),
     factoryGetDeviceInfo: connectId => call({ connectId, method: 'factoryGetDeviceInfo' }),
     filesystemFixPermission: connectId => call({ connectId, method: 'filesystemFixPermission' }),
@@ -25801,11 +25801,11 @@ var nested = {
 			MessageType_Ping: 60206,
 			MessageType_Success: 60207,
 			MessageType_Failure: 60208,
-			MessageType_DevReboot: 60400,
-			MessageType_DevGetDeviceInfo: 60600,
+			MessageType_DeviceReboot: 60400,
+			MessageType_DeviceGetDeviceInfo: 60600,
 			MessageType_DeviceInfo: 60601,
-			MessageType_DevGetOnboardingStatus: 60602,
-			MessageType_DevOnboardingStatus: 60603,
+			MessageType_DeviceGetOnboardingStatus: 60602,
+			MessageType_DeviceOnboardingStatus: 60603,
 			MessageType_FilesystemFixPermission: 60800,
 			MessageType_FilesystemPathInfo: 60801,
 			MessageType_FilesystemPathInfoQuery: 60802,
@@ -25818,10 +25818,10 @@ var nested = {
 			MessageType_FilesystemDirMake: 60809,
 			MessageType_FilesystemDirRemove: 60810,
 			MessageType_FilesystemFormat: 60811,
-			MessageType_DevFirmwareUpdate: 61000,
-			MessageType_DevFirmwareInstallProgress: 61001,
-			MessageType_DevGetFirmwareUpdateStatus: 61002,
-			MessageType_DevFirmwareUpdateStatus: 61003
+			MessageType_DeviceFirmwareUpdate: 61000,
+			MessageType_DeviceFirmwareInstallProgress: 61001,
+			MessageType_DeviceGetFirmwareUpdateStatus: 61002,
+			MessageType_DeviceFirmwareUpdateStatus: 61003
 		}
 	},
 	AlephiumGetAddress: {
@@ -37142,18 +37142,18 @@ var nested = {
 			}
 		}
 	},
-	DevRebootType: {
+	DeviceRebootType: {
 		values: {
 			Normal: 0,
 			Boardloader: 1,
 			Bootloader: 2
 		}
 	},
-	DevReboot: {
+	DeviceReboot: {
 		fields: {
 			reboot_type: {
 				rule: "required",
-				type: "DevRebootType",
+				type: "DeviceRebootType",
 				id: 1
 			}
 		}
@@ -37168,20 +37168,20 @@ var nested = {
 			CLASSIC1S_PURE: 6
 		}
 	},
-	DevSeType: {
+	DeviceSeType: {
 		values: {
 			THD89: 0,
 			SE608A: 1
 		}
 	},
-	DevSEState: {
+	DeviceSEState: {
 		values: {
 			BOOT: 0,
 			APP_FACTORY: 51,
 			APP: 85
 		}
 	},
-	DevFirmwareImageInfo: {
+	DeviceFirmwareImageInfo: {
 		fields: {
 			version: {
 				type: "string",
@@ -37197,9 +37197,9 @@ var nested = {
 			}
 		}
 	},
-	DevHardwareInfo: {
+	DeviceHardwareInfo: {
 		fields: {
-			device_type: {
+			Device_type: {
 				type: "DeviceType",
 				id: 10
 			},
@@ -37217,30 +37217,30 @@ var nested = {
 			}
 		}
 	},
-	DevMainMcuInfo: {
+	DeviceMainMcuInfo: {
 		fields: {
 			board: {
-				type: "DevFirmwareImageInfo",
+				type: "DeviceFirmwareImageInfo",
 				id: 10
 			},
 			boot: {
-				type: "DevFirmwareImageInfo",
+				type: "DeviceFirmwareImageInfo",
 				id: 20
 			},
 			app: {
-				type: "DevFirmwareImageInfo",
+				type: "DeviceFirmwareImageInfo",
 				id: 30
 			}
 		}
 	},
-	DevBluetoothInfo: {
+	DeviceBluetoothInfo: {
 		fields: {
 			boot: {
-				type: "DevFirmwareImageInfo",
+				type: "DeviceFirmwareImageInfo",
 				id: 20
 			},
 			app: {
-				type: "DevFirmwareImageInfo",
+				type: "DeviceFirmwareImageInfo",
 				id: 30
 			},
 			adv_name: {
@@ -37253,27 +37253,27 @@ var nested = {
 			}
 		}
 	},
-	DevSEInfo: {
+	DeviceSEInfo: {
 		fields: {
 			boot: {
-				type: "DevFirmwareImageInfo",
+				type: "DeviceFirmwareImageInfo",
 				id: 20
 			},
 			app: {
-				type: "DevFirmwareImageInfo",
+				type: "DeviceFirmwareImageInfo",
 				id: 30
 			},
 			type: {
-				type: "DevSeType",
+				type: "DeviceSeType",
 				id: 100
 			},
 			state: {
-				type: "DevSEState",
+				type: "DeviceSEState",
 				id: 110
 			}
 		}
 	},
-	DevInfoTargets: {
+	DeviceInfoTargets: {
 		fields: {
 			hw: {
 				type: "bool",
@@ -37309,7 +37309,7 @@ var nested = {
 			}
 		}
 	},
-	DevInfoTypes: {
+	DeviceInfoTypes: {
 		fields: {
 			version: {
 				type: "bool",
@@ -37329,7 +37329,7 @@ var nested = {
 			}
 		}
 	},
-	DevStatus: {
+	DeviceStatus: {
 		fields: {
 			language: {
 				type: "string",
@@ -37357,14 +37357,14 @@ var nested = {
 			}
 		}
 	},
-	DevGetDeviceInfo: {
+	DeviceGetDeviceInfo: {
 		fields: {
 			targets: {
-				type: "DevInfoTargets",
+				type: "DeviceInfoTargets",
 				id: 1
 			},
 			types: {
-				type: "DevInfoTypes",
+				type: "DeviceInfoTypes",
 				id: 2
 			}
 		}
@@ -37377,56 +37377,56 @@ var nested = {
 				id: 1
 			},
 			hw: {
-				type: "DevHardwareInfo",
+				type: "DeviceHardwareInfo",
 				id: 100
 			},
 			fw: {
-				type: "DevMainMcuInfo",
+				type: "DeviceMainMcuInfo",
 				id: 200
 			},
 			bt: {
-				type: "DevBluetoothInfo",
+				type: "DeviceBluetoothInfo",
 				id: 300
 			},
 			se1: {
-				type: "DevSEInfo",
+				type: "DeviceSEInfo",
 				id: 400
 			},
 			se2: {
-				type: "DevSEInfo",
+				type: "DeviceSEInfo",
 				id: 410
 			},
 			se3: {
-				type: "DevSEInfo",
+				type: "DeviceSEInfo",
 				id: 420
 			},
 			se4: {
-				type: "DevSEInfo",
+				type: "DeviceSEInfo",
 				id: 430
 			},
 			status: {
-				type: "DevStatus",
+				type: "DeviceStatus",
 				id: 10000
 			}
 		}
 	},
-	DevFirmwareTargetType: {
+	DeviceFirmwareTargetType: {
 		values: {
-			TARGET_MAIN_APP: 0,
-			TARGET_MAIN_BOOT: 1,
-			TARGET_BT: 2,
-			TARGET_SE1: 3,
-			TARGET_SE2: 4,
-			TARGET_SE3: 5,
-			TARGET_SE4: 6,
+			TARGET_INVALID: 0,
+			TARGET_ROMLOADER: 1,
+			TARGET_BOOTLOADER: 2,
+			TARGET_FIRMWARE_P1: 3,
+			TARGET_FIRMWARE_P2: 4,
+			TARGET_COPROCESSOR: 5,
+			TARGET_SE: 6,
 			TARGET_RESOURCE: 10
 		}
 	},
-	DevFirmwareTarget: {
+	DeviceFirmwareTarget: {
 		fields: {
 			target_id: {
 				rule: "required",
-				type: "DevFirmwareTargetType",
+				type: "DeviceFirmwareTargetType",
 				id: 1
 			},
 			path: {
@@ -37436,20 +37436,24 @@ var nested = {
 			}
 		}
 	},
-	DevFirmwareUpdate: {
+	DeviceFirmwareUpdate: {
 		fields: {
 			targets: {
 				rule: "repeated",
-				type: "DevFirmwareTarget",
+				type: "DeviceFirmwareTarget",
 				id: 1
+			},
+			max_concurrent: {
+				type: "uint32",
+				id: 2
 			}
 		}
 	},
-	DevFirmwareInstallProgress: {
+	DeviceFirmwareInstallProgress: {
 		fields: {
 			target_id: {
 				rule: "required",
-				type: "DevFirmwareTargetType",
+				type: "DeviceFirmwareTargetType",
 				id: 1
 			},
 			progress: {
@@ -37463,11 +37467,11 @@ var nested = {
 			}
 		}
 	},
-	DevFirmwareUpdateStatusEntry: {
+	DeviceFirmwareUpdateStatusEntry: {
 		fields: {
 			target_id: {
 				rule: "required",
-				type: "DevFirmwareTargetType",
+				type: "DeviceFirmwareTargetType",
 				id: 1
 			},
 			status: {
@@ -37477,15 +37481,15 @@ var nested = {
 			}
 		}
 	},
-	DevGetFirmwareUpdateStatus: {
+	DeviceGetFirmwareUpdateStatus: {
 		fields: {
 		}
 	},
-	DevFirmwareUpdateStatus: {
+	DeviceFirmwareUpdateStatus: {
 		fields: {
 			targets: {
 				rule: "repeated",
-				type: "DevFirmwareUpdateStatusEntry",
+				type: "DeviceFirmwareUpdateStatusEntry",
 				id: 1
 			}
 		}
@@ -37755,11 +37759,11 @@ var nested = {
 		fields: {
 		}
 	},
-	DevGetOnboardingStatus: {
+	DeviceGetOnboardingStatus: {
 		fields: {
 		}
 	},
-	DevOnboardingStatus: {
+	DeviceOnboardingStatus: {
 		fields: {
 			page_index: {
 				type: "uint32",
@@ -38511,7 +38515,7 @@ var nested = {
 		}
 	}
 };
-var MessagesPro2JSON = {
+var MessagesProtocolV2JSON = {
 	nested: nested
 };
 
@@ -38666,8 +38670,8 @@ class DataManager {
             }
         });
     }
-    static getProtobufMessages(messageVersion = 'latest') {
-        return this.messages[messageVersion];
+    static getProtobufMessages(schema = 'v1CurrentSchema') {
+        return this.messages[schema];
     }
     static getSettings(key) {
         if (!this.settings)
@@ -38707,9 +38711,9 @@ DataManager.deviceMap = {
 };
 DataManager.assets = null;
 DataManager.messages = {
-    latest: MessagesJSON,
-    v1: MessagesLegacyV1JSON,
-    protocolV2: MessagesPro2JSON,
+    v1CurrentSchema: MessagesJSON,
+    v1LegacySchema: MessagesLegacyV1JSON,
+    v2Schema: MessagesProtocolV2JSON,
 };
 DataManager.lastCheckTimestamp = 0;
 DataManager.getFirmwareStatus = (features, firmwareType) => {
@@ -38908,23 +38912,23 @@ DataManager.isBrowserWebUsb = (env) => env === 'webusb';
 
 const PROTOBUF_MESSAGE_CONFIG = {
     model_mini: [
-        { minVersion: '3.3.0', messageVersion: 'latest' },
-        { minVersion: '0.0.1', messageVersion: 'v1' },
-        { minVersion: '0.0.0', messageVersion: 'latest' },
+        { minVersion: '3.3.0', protocolV1MessageSchema: 'v1CurrentSchema' },
+        { minVersion: '0.0.1', protocolV1MessageSchema: 'v1LegacySchema' },
+        { minVersion: '0.0.0', protocolV1MessageSchema: 'v1CurrentSchema' },
     ],
     model_touch: [
-        { minVersion: '4.5.0', messageVersion: 'latest' },
-        { minVersion: '0.0.1', messageVersion: 'v1' },
-        { minVersion: '0.0.0', messageVersion: 'latest' },
+        { minVersion: '4.5.0', protocolV1MessageSchema: 'v1CurrentSchema' },
+        { minVersion: '0.0.1', protocolV1MessageSchema: 'v1LegacySchema' },
+        { minVersion: '0.0.0', protocolV1MessageSchema: 'v1CurrentSchema' },
     ],
 };
 
-const getSupportMessageVersion = (features) => {
+const getSupportProtocolV1MessageSchema = (features) => {
     var _a;
     if (!features)
         return {
-            messages: DataManager.messages.latest,
-            messageVersion: 'latest',
+            messages: DataManager.messages.v1CurrentSchema,
+            protocolV1MessageSchema: 'v1CurrentSchema',
         };
     const currentDeviceVersion = getDeviceFirmwareVersion(features).join('.');
     const deviceType = getDeviceType(features);
@@ -38934,17 +38938,17 @@ const getSupportMessageVersion = (features) => {
                 .map(model => PROTOBUF_MESSAGE_CONFIG[model])
                 .find(range => range !== undefined));
     const sortedDeviceVersionConfigs = (_a = deviceVersionConfigs === null || deviceVersionConfigs === void 0 ? void 0 : deviceVersionConfigs.sort((a, b) => semver__default["default"].compare(b.minVersion, a.minVersion))) !== null && _a !== void 0 ? _a : [];
-    for (const { minVersion, messageVersion } of sortedDeviceVersionConfigs) {
+    for (const { minVersion, protocolV1MessageSchema } of sortedDeviceVersionConfigs) {
         if (semver__default["default"].gte(currentDeviceVersion, minVersion)) {
             return {
-                messages: DataManager.messages[messageVersion],
-                messageVersion,
+                messages: DataManager.messages[protocolV1MessageSchema],
+                protocolV1MessageSchema,
             };
         }
     }
     return {
-        messages: DataManager.messages.latest,
-        messageVersion: 'latest',
+        messages: DataManager.messages.v1CurrentSchema,
+        protocolV1MessageSchema: 'v1CurrentSchema',
     };
 };
 const supportInputPinOnSoftware = (features) => {
@@ -38961,7 +38965,9 @@ const supportNewPassphrase = (features) => {
     if (!features)
         return { support: false };
     const deviceType = getDeviceType(features);
-    if (deviceType === hdShared.EDeviceType.Touch || deviceType === hdShared.EDeviceType.Pro) {
+    if (deviceType === hdShared.EDeviceType.Touch ||
+        deviceType === hdShared.EDeviceType.Pro ||
+        deviceType === hdShared.EDeviceType.Pro2) {
         return { support: true };
     }
     const currentVersion = getDeviceFirmwareVersion(features).join('.');
@@ -38971,15 +38977,25 @@ const getPassphraseStateWithRefreshDeviceInfo = (device, options) => __awaiter(v
     var _a, _b, _c, _d, _e;
     const { features, commands } = device;
     const locked = (features === null || features === void 0 ? void 0 : features.unlocked) === false;
+    const deviceType = getDeviceType(features);
+    const isPro2 = deviceType === hdShared.EDeviceType.Pro2;
     const { passphraseState, newSession, unlockedAttachPin } = yield getPassphraseState(features, commands, Object.assign({}, options));
-    const isModeT = getDeviceType(features) === hdShared.EDeviceType.Touch || getDeviceType(features) === hdShared.EDeviceType.Pro;
-    const needRefreshWithPassphrase = passphraseState && (features === null || features === void 0 ? void 0 : features.passphrase_protection) !== true;
+    const isModeT = deviceType === hdShared.EDeviceType.Touch || deviceType === hdShared.EDeviceType.Pro;
+    const needRefreshWithPassphrase = !isPro2 && passphraseState && (features === null || features === void 0 ? void 0 : features.passphrase_protection) !== true;
     const needRefreshWithLocked = isModeT && locked;
     if (needRefreshWithLocked || needRefreshWithPassphrase) {
         yield device.getFeatures();
     }
+    if (isPro2 && device.features) {
+        if (passphraseState) {
+            device.features.passphrase_protection = true;
+        }
+        if (newSession) {
+            device.features.session_id = newSession;
+        }
+    }
     if (features === null || features === void 0 ? void 0 : features.device_id) {
-        device.updateInternalState((_b = (_a = device.features) === null || _a === void 0 ? void 0 : _a.passphrase_protection) !== null && _b !== void 0 ? _b : false, passphraseState, (_d = (_c = device.features) === null || _c === void 0 ? void 0 : _c.device_id) !== null && _d !== void 0 ? _d : '', newSession, (_e = device.features) === null || _e === void 0 ? void 0 : _e.session_id);
+        device.updateInternalState(((_b = (_a = device.features) === null || _a === void 0 ? void 0 : _a.passphrase_protection) !== null && _b !== void 0 ? _b : false) || isPro2, passphraseState, (_d = (_c = device.features) === null || _c === void 0 ? void 0 : _c.device_id) !== null && _d !== void 0 ? _d : '', newSession, (_e = device.features) === null || _e === void 0 ? void 0 : _e.session_id);
     }
     return { passphraseState, newSession, unlockedAttachPin };
 });
@@ -38990,11 +39006,16 @@ const getPassphraseState = (features, commands, options) => __awaiter(void 0, vo
     const deviceType = getDeviceType(features);
     const supportAttachPinCapability = existCapability(features, hdTransport.Enum_Capability.Capability_AttachToPin);
     const supportGetPassphraseState = supportAttachPinCapability ||
+        deviceType === hdShared.EDeviceType.Pro2 ||
         (deviceType === hdShared.EDeviceType.Pro && semver__default["default"].gte(firmwareVersion.join('.'), '4.15.0'));
     if (supportGetPassphraseState) {
-        const { message, type } = yield commands.typedCall('GetPassphraseState', 'PassphraseState', {
-            passphrase_state: (options === null || options === void 0 ? void 0 : options.onlyMainPin) ? undefined : options === null || options === void 0 ? void 0 : options.expectPassphraseState,
-        });
+        const payload = (options === null || options === void 0 ? void 0 : options.onlyMainPin)
+            ? { _only_main_pin: true }
+            : { passphrase_state: options === null || options === void 0 ? void 0 : options.expectPassphraseState };
+        if (options === null || options === void 0 ? void 0 : options.allowCreateAttachPin) {
+            payload.allow_create_attach_pin = true;
+        }
+        const { message, type } = yield commands.typedCall('GetPassphraseState', 'PassphraseState', payload);
         if (type === 'CallMethodError') {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Get the passphrase state error');
         }
@@ -40135,7 +40156,7 @@ class TransportManager {
         Log$d.debug('transport manager load');
         this.defaultMessages = DataManager.getProtobufMessages();
         this.currentMessages = this.defaultMessages;
-        this.messageVersion = 'latest';
+        this.protocolV1MessageSchema = 'v1CurrentSchema';
     }
     static configure() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -40172,7 +40193,7 @@ class TransportManager {
                 Log$d.debug('Configuring transports');
                 yield this.transport.configure(JSON.stringify(this.defaultMessages));
                 this.currentMessages = this.defaultMessages;
-                this.messageVersion = 'latest';
+                this.protocolV1MessageSchema = 'v1CurrentSchema';
                 yield this.configureProtocolV2Messages();
                 Log$d.debug('Configuring transports done');
             }
@@ -40189,15 +40210,15 @@ class TransportManager {
             if (!features) {
                 return;
             }
-            const { messageVersion, messages } = getSupportMessageVersion(features);
+            const { protocolV1MessageSchema, messages } = getSupportProtocolV1MessageSchema(features);
             if (this.currentMessages === messages || !messages) {
                 return;
             }
-            Log$d.debug(`Reconfiguring transports version:${messageVersion}`);
+            Log$d.debug(`Reconfiguring transports Protocol V1 schema:${protocolV1MessageSchema}`);
             try {
                 yield this.transport.configure(JSON.stringify(messages));
                 this.currentMessages = messages;
-                this.messageVersion = messageVersion;
+                this.protocolV1MessageSchema = protocolV1MessageSchema;
             }
             catch (error) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportInvalidProtobuf, `Transport_InvalidProtobuf:  ${error.message}`);
@@ -40225,7 +40246,7 @@ class TransportManager {
     }
     static configureProtocolV2Messages() {
         return __awaiter(this, void 0, void 0, function* () {
-            const protocolV2Messages = DataManager.getProtobufMessages('protocolV2');
+            const protocolV2Messages = DataManager.getProtobufMessages('v2Schema');
             const { configureProtocolV2 } = this.transport;
             if (protocolV2Messages && typeof configureProtocolV2 === 'function') {
                 yield configureProtocolV2.call(this.transport, JSON.stringify(protocolV2Messages));
@@ -40239,12 +40260,12 @@ class TransportManager {
     static getCurrentMessages() {
         return this.currentMessages;
     }
-    static getMessageVersion() {
-        return this.messageVersion;
+    static getProtocolV1MessageSchema() {
+        return this.protocolV1MessageSchema;
     }
 }
 TransportManager.reactNativeInit = false;
-TransportManager.messageVersion = 'latest';
+TransportManager.protocolV1MessageSchema = 'v1CurrentSchema';
 TransportManager.plugin = null;
 
 const MAX_DEBUG_ARRAY_ITEMS = 20;
@@ -40802,6 +40823,24 @@ class DeviceCommands {
     }
 }
 
+const PROTOCOL_V2_DEVICE_INFO_REQUEST = {
+    targets: {
+        hw: true,
+        fw: true,
+        bt: true,
+        se1: true,
+        se2: true,
+        se3: true,
+        se4: true,
+        status: true,
+    },
+    types: {
+        version: true,
+        build_id: true,
+        hash: true,
+        specific: true,
+    },
+};
 function parseVersion(version) {
     if (!version)
         return [0, 0, 0];
@@ -40857,7 +40896,7 @@ function createBaseFeatures(descriptor) {
         bootloader_mode: false,
         device_id: descriptorId,
         pin_protection: null,
-        passphrase_protection: false,
+        passphrase_protection: null,
         language: null,
         label: null,
         initialized: false,
@@ -40902,7 +40941,7 @@ function normalizeProtocolV2Features(descriptor, deviceInfo) {
     const [fwMajor, fwMinor, fwPatch] = parseVersion(firmwareVersion);
     return Object.assign(Object.assign({}, features), { major_version: fwMajor, minor_version: fwMinor, patch_version: fwPatch, fw_major: fwMajor, fw_minor: fwMinor, fw_patch: fwPatch, device_id: serialNo, serial_no: serialNo, onekey_serial_no: serialNo, label: (_d = (_c = deviceInfo.status) === null || _c === void 0 ? void 0 : _c.label) !== null && _d !== void 0 ? _d : features.label, language: (_f = (_e = deviceInfo.status) === null || _e === void 0 ? void 0 : _e.language) !== null && _f !== void 0 ? _f : features.language, initialized: (_h = (_g = deviceInfo.status) === null || _g === void 0 ? void 0 : _g.init_states) !== null && _h !== void 0 ? _h : features.initialized, passphrase_protection: (_k = (_j = deviceInfo.status) === null || _j === void 0 ? void 0 : _j.passphrase_protection) !== null && _k !== void 0 ? _k : features.passphrase_protection, needs_backup: (_m = (_l = deviceInfo.status) === null || _l === void 0 ? void 0 : _l.backup_required) !== null && _m !== void 0 ? _m : features.needs_backup, ble_enable: (_o = deviceInfo.status) === null || _o === void 0 ? void 0 : _o.bt_enable, onekey_ble_name: (_p = deviceInfo.bt) === null || _p === void 0 ? void 0 : _p.adv_name, ble_name: (_q = deviceInfo.bt) === null || _q === void 0 ? void 0 : _q.adv_name, onekey_firmware_version: firmwareVersion, onekey_firmware_build_id: getImageBuildId((_r = deviceInfo.fw) === null || _r === void 0 ? void 0 : _r.app), onekey_firmware_hash: getImageHash((_s = deviceInfo.fw) === null || _s === void 0 ? void 0 : _s.app), onekey_boot_version: getImageVersion((_t = deviceInfo.fw) === null || _t === void 0 ? void 0 : _t.boot), bootloader_version: getImageVersion((_u = deviceInfo.fw) === null || _u === void 0 ? void 0 : _u.boot), onekey_boot_build_id: getImageBuildId((_v = deviceInfo.fw) === null || _v === void 0 ? void 0 : _v.boot), onekey_boot_hash: getImageHash((_w = deviceInfo.fw) === null || _w === void 0 ? void 0 : _w.boot), onekey_board_version: getImageVersion((_x = deviceInfo.fw) === null || _x === void 0 ? void 0 : _x.board), onekey_board_hash: getImageHash((_y = deviceInfo.fw) === null || _y === void 0 ? void 0 : _y.board), onekey_ble_version: getImageVersion((_z = deviceInfo.bt) === null || _z === void 0 ? void 0 : _z.app), ble_ver: getImageVersion((_0 = deviceInfo.bt) === null || _0 === void 0 ? void 0 : _0.app), onekey_ble_build_id: getImageBuildId((_1 = deviceInfo.bt) === null || _1 === void 0 ? void 0 : _1.app), onekey_ble_hash: getImageHash((_2 = deviceInfo.bt) === null || _2 === void 0 ? void 0 : _2.app), onekey_se01_version: getImageVersion((_3 = deviceInfo.se1) === null || _3 === void 0 ? void 0 : _3.app), onekey_se01_hash: getImageHash((_4 = deviceInfo.se1) === null || _4 === void 0 ? void 0 : _4.app), onekey_se01_build_id: getImageBuildId((_5 = deviceInfo.se1) === null || _5 === void 0 ? void 0 : _5.app), onekey_se01_state: getSeState(deviceInfo.se1), onekey_se02_version: getImageVersion((_6 = deviceInfo.se2) === null || _6 === void 0 ? void 0 : _6.app), onekey_se02_state: getSeState(deviceInfo.se2), onekey_se03_version: getImageVersion((_7 = deviceInfo.se3) === null || _7 === void 0 ? void 0 : _7.app), onekey_se03_state: getSeState(deviceInfo.se3), onekey_se04_version: getImageVersion((_8 = deviceInfo.se4) === null || _8 === void 0 ? void 0 : _8.app), onekey_se04_state: getSeState(deviceInfo.se4) });
 }
-function getProtocolV2Features({ commands, descriptor, timeoutMs, }) {
+function getProtocolV2Features({ commands, descriptor, onDeviceInfoError, timeoutMs, }) {
     return __awaiter(this, void 0, void 0, function* () {
         const callOptions = timeoutMs ? { timeoutMs } : undefined;
         if (callOptions) {
@@ -40911,34 +40950,42 @@ function getProtocolV2Features({ commands, descriptor, timeoutMs, }) {
         else {
             yield commands.typedCall('Ping', 'Success', { message: 'init' });
         }
-        return normalizeProtocolV2Features(descriptor);
+        try {
+            const { message } = callOptions
+                ? yield commands.typedCall('DeviceGetDeviceInfo', 'DeviceInfo', PROTOCOL_V2_DEVICE_INFO_REQUEST, callOptions)
+                : yield commands.typedCall('DeviceGetDeviceInfo', 'DeviceInfo', PROTOCOL_V2_DEVICE_INFO_REQUEST);
+            return normalizeProtocolV2Features(descriptor, message);
+        }
+        catch (error) {
+            onDeviceInfoError === null || onDeviceInfoError === void 0 ? void 0 : onDeviceInfoError(error);
+            return normalizeProtocolV2Features(descriptor);
+        }
     });
 }
 
 const ProtocolV2FirmwareTargetType = {
-    TARGET_MAIN_APP: 0,
-    TARGET_MAIN_BOOT: 1,
-    TARGET_BT: 2,
-    TARGET_SE1: 3,
-    TARGET_SE2: 4,
-    TARGET_SE3: 5,
-    TARGET_SE4: 6,
+    TARGET_INVALID: 0,
+    TARGET_ROMLOADER: 1,
+    TARGET_BOOTLOADER: 2,
+    TARGET_FIRMWARE_P1: 3,
+    TARGET_FIRMWARE_P2: 4,
+    TARGET_COPROCESSOR: 5,
+    TARGET_SE: 6,
     TARGET_RESOURCE: 10,
 };
 function protocolV2FileNameToTargetId(fileName) {
-    if (fileName.includes('ble'))
-        return ProtocolV2FirmwareTargetType.TARGET_BT;
-    if (fileName.includes('bootloader'))
-        return ProtocolV2FirmwareTargetType.TARGET_MAIN_BOOT;
-    if (fileName.includes('se1'))
-        return ProtocolV2FirmwareTargetType.TARGET_SE1;
-    if (fileName.includes('se2'))
-        return ProtocolV2FirmwareTargetType.TARGET_SE2;
-    if (fileName.includes('se3'))
-        return ProtocolV2FirmwareTargetType.TARGET_SE3;
-    if (fileName.includes('se4'))
-        return ProtocolV2FirmwareTargetType.TARGET_SE4;
-    return ProtocolV2FirmwareTargetType.TARGET_MAIN_APP;
+    const normalized = fileName.toLowerCase();
+    if (normalized.includes('romloader'))
+        return ProtocolV2FirmwareTargetType.TARGET_ROMLOADER;
+    if (normalized.includes('bootloader'))
+        return ProtocolV2FirmwareTargetType.TARGET_BOOTLOADER;
+    if (normalized.includes('ble'))
+        return ProtocolV2FirmwareTargetType.TARGET_COPROCESSOR;
+    if (normalized.includes('se'))
+        return ProtocolV2FirmwareTargetType.TARGET_SE;
+    if (normalized.includes('p2'))
+        return ProtocolV2FirmwareTargetType.TARGET_FIRMWARE_P2;
+    return ProtocolV2FirmwareTargetType.TARGET_FIRMWARE_P1;
 }
 
 const parseRunOptions = (options) => {
@@ -41511,7 +41558,10 @@ class Device extends events.exports {
             const firmwareVersion = (_a = getDeviceFirmwareVersion(this.features)) === null || _a === void 0 ? void 0 : _a.join('.');
             const versionRange = getMethodVersionRange(this.features, type => this.supportUnlockVersionRange()[type]);
             const supportAttachPinCapability = existCapability(this.features, hdTransport.Enum_Capability.Capability_AttachToPin);
-            const supportUnlock = supportAttachPinCapability || (versionRange && semver__default["default"].gte(firmwareVersion, versionRange.min));
+            const isPro2 = getDeviceType(this.features) === hdShared.EDeviceType.Pro2;
+            const supportUnlock = supportAttachPinCapability ||
+                isPro2 ||
+                (versionRange && semver__default["default"].gte(firmwareVersion, versionRange.min));
             if (supportUnlock) {
                 const res = yield this.commands.typedCall('UnLockDevice', 'UnLockDeviceResponse');
                 if (this.features) {
@@ -41936,11 +41986,25 @@ class GetPassphraseState extends BaseMethod {
         this.useDevicePassphraseState = false;
     }
     run() {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.device.features)
                 return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceInitializeFailed));
-            const { passphraseState } = yield getPassphraseStateWithRefreshDeviceInfo(this.device);
+            const { passphraseState, newSession, unlockedAttachPin } = yield getPassphraseStateWithRefreshDeviceInfo(this.device, {
+                expectPassphraseState: this.payload.passphraseState,
+                onlyMainPin: this.payload.useEmptyPassphrase,
+                allowCreateAttachPin: this.payload.allowCreateAttachPin,
+            });
             const { features } = this.device;
+            const isPro2 = getDeviceType(features) === hdShared.EDeviceType.Pro2;
+            if (isPro2) {
+                return Promise.resolve({
+                    passphrase_state: passphraseState,
+                    session_id: (_a = newSession !== null && newSession !== void 0 ? newSession : features === null || features === void 0 ? void 0 : features.session_id) !== null && _a !== void 0 ? _a : undefined,
+                    unlocked_attach_pin: unlockedAttachPin,
+                    passphrase_protection: (_b = features === null || features === void 0 ? void 0 : features.passphrase_protection) !== null && _b !== void 0 ? _b : null,
+                });
+            }
             if (features && features.passphrase_protection === true) {
                 return Promise.resolve(passphraseState);
             }
@@ -42321,37 +42385,37 @@ function parseChainId(chainId) {
     throw new Error(`Invalid chainId ${chainId}`);
 }
 
-const invalidParameter = (message) => hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodInvalidParameter, message);
+const invalidParameter$1 = (message) => hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodInvalidParameter, message);
 const invalidResponse = (message) => hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodError, message);
 const validateParams = (values, fields) => {
     fields.forEach(field => {
         const existsProp = Object.prototype.hasOwnProperty.call(values, field.name);
         if (!existsProp && field.required) {
-            throw invalidParameter(`Missing required parameter: ${field.name}`);
+            throw invalidParameter$1(`Missing required parameter: ${field.name}`);
         }
         const value = values[field.name];
         if (value && field.type) {
             switch (field.type) {
                 case 'array':
                     if (!Array.isArray(value)) {
-                        throw invalidParameter(`Parameter [${field.name}] is of type invalid and should be [${field.type}].`);
+                        throw invalidParameter$1(`Parameter [${field.name}] is of type invalid and should be [${field.type}].`);
                     }
                     else if (!field.allowEmpty && value.length < 1) {
-                        throw invalidParameter(`Parameter "${field.name}" is empty.`);
+                        throw invalidParameter$1(`Parameter "${field.name}" is empty.`);
                     }
                     break;
                 case 'uint':
                     if (typeof value !== 'string' && typeof value !== 'number') {
-                        throw invalidParameter(`Parameter [${field.name}] has invalid type. "string|number" expected.`);
+                        throw invalidParameter$1(`Parameter [${field.name}] has invalid type. "string|number" expected.`);
                     }
                     if ((typeof value === 'number' && !Number.isSafeInteger(value)) ||
                         !/^(?:[1-9]\d*|\d)$/.test(value.toString().replace(/^-/, field.allowNegative ? '' : '-'))) {
-                        throw invalidParameter(`Parameter [${field.name}] has invalid value "${value}". Integer representation expected.`);
+                        throw invalidParameter$1(`Parameter [${field.name}] has invalid value "${value}". Integer representation expected.`);
                     }
                     break;
                 case 'bigNumber':
                     if (typeof value !== 'string') {
-                        throw invalidParameter(`Parameter [${field.name}] is of type invalid and should be [string].`);
+                        throw invalidParameter$1(`Parameter [${field.name}] is of type invalid and should be [string].`);
                     }
                     try {
                         const bn = new BigNumber__default["default"](value);
@@ -42360,12 +42424,12 @@ const validateParams = (values, fields) => {
                         }
                     }
                     catch (error) {
-                        throw invalidParameter(`Parameter [${field.name}] is of type invalid and should be [${field.type}].`);
+                        throw invalidParameter$1(`Parameter [${field.name}] is of type invalid and should be [${field.type}].`);
                     }
                     break;
                 case 'buffer': {
                     if (typeof value === 'undefined' || value === null) {
-                        throw invalidParameter(`Parameter [${field.name}] is of type invalid and should be [buffer].`);
+                        throw invalidParameter$1(`Parameter [${field.name}] is of type invalid and should be [buffer].`);
                     }
                     const isNodeBuffer = typeof Buffer !== 'undefined' &&
                         typeof Buffer.isBuffer === 'function' &&
@@ -42378,18 +42442,18 @@ const validateParams = (values, fields) => {
                         typeof ArrayBuffer.isView === 'function' &&
                         ArrayBuffer.isView(value);
                     if (!isNodeBuffer && !isCustomBuffer && !isArrayBuffer && !isArrayBufferView) {
-                        throw invalidParameter(`Parameter [${field.name}] is of type invalid and should be [buffer].`);
+                        throw invalidParameter$1(`Parameter [${field.name}] is of type invalid and should be [buffer].`);
                     }
                     break;
                 }
                 case 'hexString':
                     if (typeof value !== 'string' || !isHexString(addHexPrefix(value))) {
-                        throw invalidParameter(`Parameter [${field.name}] is of type invalid and should be [${field.type}].`);
+                        throw invalidParameter$1(`Parameter [${field.name}] is of type invalid and should be [${field.type}].`);
                     }
                     break;
                 default:
                     if (typeof value !== field.type) {
-                        throw invalidParameter(`Parameter [${field.name}] is of type invalid and should be [${field.type}].`);
+                        throw invalidParameter$1(`Parameter [${field.name}] is of type invalid and should be [${field.type}].`);
                     }
                     break;
             }
@@ -42472,8 +42536,8 @@ class DeviceRebootToBootloader extends BaseMethod {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (((_a = this.device.originalDescriptor) === null || _a === void 0 ? void 0 : _a.protocolType) === 'V2') {
-                const res = yield this.device.commands.typedCall('DevReboot', 'Success', {
-                    reboot_type: hdTransport.DevRebootType.Bootloader,
+                const res = yield this.device.commands.typedCall('DeviceReboot', 'Success', {
+                    reboot_type: hdTransport.DeviceRebootType.Bootloader,
                 });
                 return Promise.resolve(res.message);
             }
@@ -42502,8 +42566,8 @@ class DeviceRebootToBoardloader extends BaseMethod {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (((_a = this.device.originalDescriptor) === null || _a === void 0 ? void 0 : _a.protocolType) === 'V2') {
-                const res = yield this.device.commands.typedCall('DevReboot', 'Success', {
-                    reboot_type: hdTransport.DevRebootType.Boardloader,
+                const res = yield this.device.commands.typedCall('DeviceReboot', 'Success', {
+                    reboot_type: hdTransport.DeviceRebootType.Boardloader,
                 });
                 return Promise.resolve(res.message);
             }
@@ -44703,18 +44767,57 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
     }
 }
 
-const DEV_REBOOT_TYPES = {
-    Normal: hdTransport.DevRebootType.Normal,
-    normal: hdTransport.DevRebootType.Normal,
-    Boardloader: hdTransport.DevRebootType.Boardloader,
-    boardloader: hdTransport.DevRebootType.Boardloader,
-    Bootloader: hdTransport.DevRebootType.Bootloader,
-    bootloader: hdTransport.DevRebootType.Bootloader,
+const invalidParameter = (message) => hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodInvalidParameter, message);
+function validateNonEmptyString(value, name) {
+    if (typeof value !== 'string' || value.trim().length === 0) {
+        throw invalidParameter(`Parameter [${name}] is required and must be a non-empty string.`);
+    }
+    return value;
+}
+function validateNonNegativeInteger(value, name, defaultValue) {
+    if (value === undefined || value === null) {
+        if (defaultValue !== undefined)
+            return defaultValue;
+        throw invalidParameter(`Missing required parameter: ${name}`);
+    }
+    const numeric = typeof value === 'string' && value.trim() !== '' ? Number(value) : value;
+    if (typeof numeric !== 'number' || !Number.isSafeInteger(numeric) || numeric < 0) {
+        throw invalidParameter(`Parameter [${name}] must be a non-negative integer.`);
+    }
+    return numeric;
+}
+function validateOptionalNonNegativeInteger(value, name) {
+    if (value === undefined || value === null)
+        return undefined;
+    return validateNonNegativeInteger(value, name);
+}
+function validateOptionalPercentage(value, name) {
+    const numeric = validateOptionalNonNegativeInteger(value, name);
+    if (numeric === undefined)
+        return undefined;
+    if (numeric > 100) {
+        throw invalidParameter(`Parameter [${name}] must be between 0 and 100.`);
+    }
+    return numeric;
+}
+function validateRequiredData(value, name) {
+    if (value === undefined || value === null) {
+        throw invalidParameter(`Missing required parameter: ${name}`);
+    }
+}
+
+const DEVICE_REBOOT_TYPES = {
+    Normal: hdTransport.DeviceRebootType.Normal,
+    normal: hdTransport.DeviceRebootType.Normal,
+    Boardloader: hdTransport.DeviceRebootType.Boardloader,
+    boardloader: hdTransport.DeviceRebootType.Boardloader,
+    Bootloader: hdTransport.DeviceRebootType.Bootloader,
+    bootloader: hdTransport.DeviceRebootType.Bootloader,
 };
 const PROTOCOL_V2_FIRMWARE_UPDATE_OPTIONS = {
-    intermediateTypes: ['DevFirmwareInstallProgress'],
+    intermediateTypes: ['DeviceFirmwareInstallProgress'],
 };
-const PROTOCOL_V2_FIRMWARE_UPDATE_RESPONSE_TYPES = ['Success', 'DevFirmwareUpdateStatus'];
+const PROTOCOL_V2_FIRMWARE_UPDATE_RESPONSE_TYPES = ['Success', 'DeviceFirmwareUpdateStatus'];
 function normalizeRebootType(value) {
     if (typeof value === 'number')
         return value;
@@ -44722,18 +44825,24 @@ function normalizeRebootType(value) {
         const numeric = Number(value);
         if (Number.isFinite(numeric))
             return numeric;
-        if (value in DEV_REBOOT_TYPES)
-            return DEV_REBOOT_TYPES[value];
+        if (value in DEVICE_REBOOT_TYPES)
+            return DEVICE_REBOOT_TYPES[value];
     }
-    return hdTransport.DevRebootType.Normal;
+    return hdTransport.DeviceRebootType.Normal;
 }
-function normalizeTargetId(value) {
-    if (typeof value === 'number')
-        return value;
+function normalizeTargetId(value, name) {
+    if (value === undefined || value === null) {
+        throw invalidParameter(`Missing required parameter: ${name}`);
+    }
+    if (typeof value === 'number') {
+        if (Number.isSafeInteger(value) && value > 0)
+            return value;
+        throw invalidParameter(`Parameter [${name}] must be a valid firmware target id.`);
+    }
     const numeric = Number(value);
-    if (Number.isFinite(numeric))
+    if (Number.isSafeInteger(numeric) && numeric > 0)
         return numeric;
-    return 0;
+    throw invalidParameter(`Parameter [${name}] must be a valid firmware target id.`);
 }
 function normalizeFirmwareTargets(params) {
     var _a, _b, _c;
@@ -44745,10 +44854,20 @@ function normalizeFirmwareTargets(params) {
             },
         ]
         : []);
-    return targets.map(target => ({
-        target_id: normalizeTargetId('target_id' in target ? target.target_id : target.targetId),
-        path: target.path,
-    }));
+    if (!Array.isArray(targets) || targets.length === 0) {
+        throw invalidParameter('Parameter [targets] must contain at least one firmware target.');
+    }
+    return targets.map((target, index) => {
+        var _a;
+        if (!target || typeof target !== 'object') {
+            throw invalidParameter(`Parameter [targets.${index}] must be an object.`);
+        }
+        const targetId = (_a = target.target_id) !== null && _a !== void 0 ? _a : target.targetId;
+        return {
+            target_id: normalizeTargetId(targetId, `targets.${index}.target_id`),
+            path: validateNonEmptyString(target.path, `targets.${index}.path`),
+        };
+    });
 }
 function buildTargets(params) {
     if (params.targets)
@@ -44844,7 +44963,7 @@ const isProtocolV2PollingTransientError = (error) => {
     const message = getUnknownErrorText(error).toLowerCase();
     return (isDeviceDisconnectedError(error) ||
         isProtocolV2ReconnectProbeError(error) ||
-        (message.includes('response timeout') && message.includes('devgetfirmwareupdatestatus')) ||
+        (message.includes('response timeout') && message.includes('devicegetfirmwareupdatestatus')) ||
         message.includes('device not found') ||
         message.includes('transportnotfound'));
 };
@@ -45076,7 +45195,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                     transferStartTime,
                 });
                 targets.push({
-                    target_id: ProtocolV2FirmwareTargetType.TARGET_MAIN_BOOT,
+                    target_id: ProtocolV2FirmwareTargetType.TARGET_BOOTLOADER,
                     path: bootloaderPath,
                 });
             }
@@ -45102,7 +45221,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
     queryProtocolV2FirmwareUpdateStatus() {
         return __awaiter(this, void 0, void 0, function* () {
             const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
-            return typedCall('DevGetFirmwareUpdateStatus', 'DevFirmwareUpdateStatus', {}, {
+            return typedCall('DeviceGetFirmwareUpdateStatus', 'DeviceFirmwareUpdateStatus', {}, {
                 timeoutMs: PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT,
             });
         });
@@ -45140,7 +45259,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             if ((startResponse === null || startResponse === void 0 ? void 0 : startResponse.type) === 'Success') {
                 return;
             }
-            if ((startResponse === null || startResponse === void 0 ? void 0 : startResponse.type) === 'DevFirmwareUpdateStatus') {
+            if ((startResponse === null || startResponse === void 0 ? void 0 : startResponse.type) === 'DeviceFirmwareUpdateStatus') {
                 const statusTargets = ((_a = startResponse.message.targets) !== null && _a !== void 0 ? _a : []);
                 if (this.assertProtocolV2TargetStatus(statusTargets, expectedTargetIds)) {
                     return;
@@ -45189,7 +45308,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
     exitProtocolV2BootloaderToNormal() {
         return __awaiter(this, void 0, void 0, function* () {
             this.postTipMessage(exports.FirmwareUpdateTipMessage.SwitchFirmwareReconnectDevice);
-            yield this.protocolV2Reboot(hdTransport.DevRebootType.Normal);
+            yield this.protocolV2Reboot(hdTransport.DeviceRebootType.Normal);
         });
     }
     waitForProtocolV2FinalFeatures() {
@@ -45356,10 +45475,10 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
             let response;
             try {
-                response = yield typedCall('DevFirmwareUpdate', PROTOCOL_V2_FIRMWARE_UPDATE_RESPONSE_TYPES, {
+                response = yield typedCall('DeviceFirmwareUpdate', PROTOCOL_V2_FIRMWARE_UPDATE_RESPONSE_TYPES, {
                     targets,
                 }, {
-                    intermediateTypes: ['DevFirmwareInstallProgress'],
+                    intermediateTypes: ['DeviceFirmwareInstallProgress'],
                     onIntermediateResponse: (response) => {
                         var _a;
                         const progress = Number((_a = response.message) === null || _a === void 0 ? void 0 : _a.progress);
@@ -45385,7 +45504,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         return __awaiter(this, void 0, void 0, function* () {
             const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
             try {
-                const res = yield typedCall('DevReboot', 'Success', {
+                const res = yield typedCall('DeviceReboot', 'Success', {
                     reboot_type: rebootType,
                 });
                 return res.message;
@@ -45494,7 +45613,7 @@ class Ping extends BaseMethod {
     }
 }
 
-class DevReboot extends BaseMethod {
+class DeviceReboot extends BaseMethod {
     init() {
         this.skipForceUpdateCheck = true;
         this.useDevicePassphraseState = false;
@@ -45506,7 +45625,7 @@ class DevReboot extends BaseMethod {
     run() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const res = yield this.device.commands.typedCall('DevReboot', 'Success', {
+            const res = yield this.device.commands.typedCall('DeviceReboot', 'Success', {
                 reboot_type: normalizeRebootType((_a = this.params.reboot_type) !== null && _a !== void 0 ? _a : this.params.rebootType),
             });
             return Promise.resolve(res.message);
@@ -45514,7 +45633,7 @@ class DevReboot extends BaseMethod {
     }
 }
 
-class DevGetDeviceInfo extends BaseMethod {
+class DeviceGetDeviceInfo extends BaseMethod {
     init() {
         this.skipForceUpdateCheck = true;
         this.useDevicePassphraseState = false;
@@ -45537,7 +45656,7 @@ class DevGetDeviceInfo extends BaseMethod {
     }
     run() {
         return __awaiter(this, void 0, void 0, function* () {
-            const res = yield this.device.commands.typedCall('DevGetDeviceInfo', 'DeviceInfo', {
+            const res = yield this.device.commands.typedCall('DeviceGetDeviceInfo', 'DeviceInfo', {
                 targets: buildTargets(this.params),
                 types: buildTypes(this.params),
             });
@@ -45546,7 +45665,7 @@ class DevGetDeviceInfo extends BaseMethod {
     }
 }
 
-class DevGetOnboardingStatus extends BaseMethod {
+class DeviceGetOnboardingStatus extends BaseMethod {
     init() {
         this.skipForceUpdateCheck = true;
         this.useDevicePassphraseState = false;
@@ -45554,13 +45673,13 @@ class DevGetOnboardingStatus extends BaseMethod {
     }
     run() {
         return __awaiter(this, void 0, void 0, function* () {
-            const res = yield this.device.commands.typedCall('DevGetOnboardingStatus', 'DevOnboardingStatus', {});
+            const res = yield this.device.commands.typedCall('DeviceGetOnboardingStatus', 'DeviceOnboardingStatus', {});
             return Promise.resolve(res.message);
         });
     }
 }
 
-class DevFirmwareUpdate extends BaseMethod {
+class DeviceFirmwareUpdate extends BaseMethod {
     init() {
         this.skipForceUpdateCheck = true;
         this.useDevicePassphraseState = false;
@@ -45573,15 +45692,16 @@ class DevFirmwareUpdate extends BaseMethod {
     }
     run() {
         return __awaiter(this, void 0, void 0, function* () {
-            const res = yield this.device.commands.typedCall('DevFirmwareUpdate', PROTOCOL_V2_FIRMWARE_UPDATE_RESPONSE_TYPES, {
-                targets: normalizeFirmwareTargets(this.params),
+            const targets = normalizeFirmwareTargets(this.params);
+            const res = yield this.device.commands.typedCall('DeviceFirmwareUpdate', PROTOCOL_V2_FIRMWARE_UPDATE_RESPONSE_TYPES, {
+                targets,
             }, PROTOCOL_V2_FIRMWARE_UPDATE_OPTIONS);
             return Promise.resolve(res.message);
         });
     }
 }
 
-class DevGetFirmwareUpdateStatus extends BaseMethod {
+class DeviceGetFirmwareUpdateStatus extends BaseMethod {
     init() {
         this.skipForceUpdateCheck = true;
         this.useDevicePassphraseState = false;
@@ -45589,7 +45709,7 @@ class DevGetFirmwareUpdateStatus extends BaseMethod {
     }
     run() {
         return __awaiter(this, void 0, void 0, function* () {
-            const res = yield this.device.commands.typedCall('DevGetFirmwareUpdateStatus', 'DevFirmwareUpdateStatus', {});
+            const res = yield this.device.commands.typedCall('DeviceGetFirmwareUpdateStatus', 'DeviceFirmwareUpdateStatus', {});
             return Promise.resolve(res.message);
         });
     }
@@ -45713,15 +45833,15 @@ function toUint8Array(value) {
 }
 class FileRead extends BaseMethod {
     init() {
-        var _a, _b;
         this.skipForceUpdateCheck = true;
         this.useDevicePassphraseState = false;
+        const path = validateNonEmptyString(this.payload.path, 'path');
         this.params = {
-            path: this.payload.path,
-            offset: (_a = this.payload.offset) !== null && _a !== void 0 ? _a : 0,
-            totalSize: (_b = this.payload.totalSize) !== null && _b !== void 0 ? _b : 0,
-            chunkLen: this.payload.chunkLen,
-            uiPercentage: this.payload.uiPercentage,
+            path,
+            offset: validateNonNegativeInteger(this.payload.offset, 'offset', 0),
+            totalSize: validateNonNegativeInteger(this.payload.totalSize, 'totalSize', 0),
+            chunkLen: validateOptionalNonNegativeInteger(this.payload.chunkLen, 'chunkLen'),
+            uiPercentage: validateOptionalPercentage(this.payload.uiPercentage, 'uiPercentage'),
         };
     }
     run() {
@@ -45801,7 +45921,7 @@ function dataToUint8Array(data) {
         if (typeof Blob !== 'undefined' && data instanceof Blob) {
             return new Uint8Array(yield data.arrayBuffer());
         }
-        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Unsupported FilesystemFileWrite data');
+        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodInvalidParameter, 'Unsupported FilesystemFileWrite data');
     });
 }
 function normalizeChunkSize(value, maxChunkSize) {
@@ -45825,20 +45945,22 @@ function getConfirmedProgress(processedByte, totalSize, written, dataLength) {
 }
 class FileWrite extends BaseMethod {
     init() {
-        var _a, _b, _c, _d;
+        var _a, _b;
         this.skipForceUpdateCheck = true;
         this.useDevicePassphraseState = false;
-        const offset = (_a = this.payload.offset) !== null && _a !== void 0 ? _a : 0;
+        validateRequiredData(this.payload.data, 'data');
+        const path = validateNonEmptyString(this.payload.path, 'path');
+        const offset = validateNonNegativeInteger(this.payload.offset, 'offset', 0);
         this.params = {
-            path: this.payload.path,
+            path,
             offset,
-            totalSize: (_b = this.payload.totalSize) !== null && _b !== void 0 ? _b : 0,
+            totalSize: validateNonNegativeInteger(this.payload.totalSize, 'totalSize', 0),
             data: this.payload.data,
-            chunkSize: this.payload.chunkSize,
-            chunkLen: this.payload.chunkLen,
-            overwrite: (_c = this.payload.overwrite) !== null && _c !== void 0 ? _c : offset === 0,
-            append: (_d = this.payload.append) !== null && _d !== void 0 ? _d : false,
-            uiPercentage: this.payload.uiPercentage,
+            chunkSize: validateOptionalNonNegativeInteger(this.payload.chunkSize, 'chunkSize'),
+            chunkLen: validateOptionalNonNegativeInteger(this.payload.chunkLen, 'chunkLen'),
+            overwrite: (_a = this.payload.overwrite) !== null && _a !== void 0 ? _a : offset === 0,
+            append: (_b = this.payload.append) !== null && _b !== void 0 ? _b : false,
+            uiPercentage: validateOptionalPercentage(this.payload.uiPercentage, 'uiPercentage'),
         };
     }
     run() {
@@ -45915,7 +46037,7 @@ class FileDelete extends BaseMethod {
     init() {
         this.skipForceUpdateCheck = true;
         this.useDevicePassphraseState = false;
-        this.params = { path: this.payload.path };
+        this.params = { path: validateNonEmptyString(this.payload.path, 'path') };
     }
     run() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -45932,8 +46054,8 @@ class DirList extends BaseMethod {
         this.skipForceUpdateCheck = true;
         this.useDevicePassphraseState = false;
         this.params = {
-            path: this.payload.path,
-            depth: this.payload.depth,
+            path: validateNonEmptyString(this.payload.path, 'path'),
+            depth: validateOptionalNonNegativeInteger(this.payload.depth, 'depth'),
         };
     }
     run() {
@@ -45951,7 +46073,7 @@ class DirMake extends BaseMethod {
     init() {
         this.skipForceUpdateCheck = true;
         this.useDevicePassphraseState = false;
-        this.params = { path: this.payload.path };
+        this.params = { path: validateNonEmptyString(this.payload.path, 'path') };
     }
     run() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -45967,7 +46089,7 @@ class DirRemove extends BaseMethod {
     init() {
         this.skipForceUpdateCheck = true;
         this.useDevicePassphraseState = false;
-        this.params = { path: this.payload.path };
+        this.params = { path: validateNonEmptyString(this.payload.path, 'path') };
     }
     run() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -45983,7 +46105,7 @@ class PathInfo extends BaseMethod {
     init() {
         this.skipForceUpdateCheck = true;
         this.useDevicePassphraseState = false;
-        this.params = { path: this.payload.path };
+        this.params = { path: validateNonEmptyString(this.payload.path, 'path') };
     }
     run() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -46393,10 +46515,16 @@ function preCheckDeviceSupport(device, method) {
     }
 }
 function handleSkippableHardwareError(e, device, method) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     let error;
+    const skipMethodSupportCheck = shouldSkipMethodSupportCheck(device.features, (_a = device.originalDescriptor) === null || _a === void 0 ? void 0 : _a.protocolType);
     if (e instanceof hdShared.HardwareError && e.errorCode !== hdShared.HardwareErrorCode.RuntimeError) {
         const { errorCode } = e;
+        if (skipMethodSupportCheck &&
+            (errorCode === hdShared.HardwareErrorCode.CallMethodNeedUpgradeFirmware ||
+                errorCode === hdShared.HardwareErrorCode.DeviceNotSupportMethod)) {
+            return undefined;
+        }
         if (errorCode === hdShared.HardwareErrorCode.CallMethodNeedUpgradeFirmware) {
             error = e;
         }
@@ -46404,8 +46532,11 @@ function handleSkippableHardwareError(e, device, method) {
             error = e;
         }
     }
-    else if (((_a = e.message) === null || _a === void 0 ? void 0 : _a.includes('Failure_UnexpectedMessage')) ||
-        ((_b = e.message) === null || _b === void 0 ? void 0 : _b.includes('Failure_UnknownMessage'))) {
+    else if (((_b = e.message) === null || _b === void 0 ? void 0 : _b.includes('Failure_UnexpectedMessage')) ||
+        ((_c = e.message) === null || _c === void 0 ? void 0 : _c.includes('Failure_UnknownMessage'))) {
+        if (skipMethodSupportCheck) {
+            return undefined;
+        }
         const versionRange = getMethodVersionRange(device.features, type => method.getVersionRange()[type]);
         const currentVersion = getDeviceFirmwareVersion(device.features).join('.');
         if (versionRange &&
@@ -46422,8 +46553,8 @@ function handleSkippableHardwareError(e, device, method) {
             error = hdShared.ERRORS.createDeviceNotSupportMethodError(method.name, getFirmwareType(device.features));
         }
     }
-    else if (((_d = (_c = e.message) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === null || _d === void 0 ? void 0 : _d.includes('forbidden key path')) ||
-        ((_f = (_e = e.message) === null || _e === void 0 ? void 0 : _e.toLowerCase()) === null || _f === void 0 ? void 0 : _f.includes('invalid path'))) {
+    else if (((_e = (_d = e.message) === null || _d === void 0 ? void 0 : _d.toLowerCase()) === null || _e === void 0 ? void 0 : _e.includes('forbidden key path')) ||
+        ((_g = (_f = e.message) === null || _f === void 0 ? void 0 : _f.toLowerCase()) === null || _g === void 0 ? void 0 : _g.includes('invalid path'))) {
         error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodInvalidParameter, e.message);
     }
     return error;
@@ -46936,13 +47067,14 @@ function splitArray(array, size) {
 }
 
 function batchGetPublickeys(device, paths, ecdsaCurveName, coinType, options) {
-    var _a;
+    var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         const existsPathNotValid = paths.find(p => p.address_n.length < 3);
         if (existsPathNotValid) {
             throw hdShared.TypedError(hdShared.HardwareErrorCode.ForbiddenKeyPath, 'Path length must be greater than 3');
         }
-        const supportsBatchPublicKey = supportBatchPublicKey(device.features, options);
+        const supportsBatchPublicKey = shouldSkipMethodSupportCheck(device.features, (_a = device.originalDescriptor) === null || _a === void 0 ? void 0 : _a.protocolType) ||
+            supportBatchPublicKey(device.features, options);
         if (!supportsBatchPublicKey) {
             throw hdShared.createDeviceNotSupportMethodError('BatchGetPublickeys', getFirmwareType(device.features));
         }
@@ -46967,7 +47099,7 @@ function batchGetPublickeys(device, paths, ecdsaCurveName, coinType, options) {
             const res = yield device.commands.typedCall('BatchGetPublickeys', 'EcdsaPublicKeys', {
                 paths,
                 ecdsa_curve_name: ecdsaCurveName,
-                include_node: (_a = options === null || options === void 0 ? void 0 : options.includeNode) !== null && _a !== void 0 ? _a : false,
+                include_node: (_b = options === null || options === void 0 ? void 0 : options.includeNode) !== null && _b !== void 0 ? _b : false,
             });
             if (res.type !== 'EcdsaPublicKeys') {
                 throw hdShared.createDeviceNotSupportMethodError('BatchGetPublickeys', getFirmwareType(device.features));
@@ -47873,7 +48005,7 @@ class ConfluxSignTransaction extends BaseMethod {
         this.addressN = validatePath(path, 3);
         const tx = transaction;
         const schema = [
-            { name: 'to', type: 'hexString', required: true },
+            { name: 'to', type: 'string', required: true },
             { name: 'value', type: 'hexString', required: true },
             { name: 'gasLimit', type: 'hexString', required: true },
             { name: 'gasPrice', type: 'hexString', required: true },
@@ -47884,7 +48016,7 @@ class ConfluxSignTransaction extends BaseMethod {
             { name: 'data', type: 'hexString' },
         ];
         validateParams(tx, schema);
-        this.formattedTx = formatAnyHex(tx);
+        this.formattedTx = Object.assign(Object.assign({}, formatAnyHex(tx)), { to: tx.to });
     }
     getVersionRange() {
         return {
@@ -47952,7 +48084,7 @@ class EvmGetAddress extends BaseMethod {
     }
     getEvmAddress(param) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (TransportManager.getMessageVersion() === 'v1') {
+            if (TransportManager.getProtocolV1MessageSchema() === 'v1LegacySchema') {
                 return getAddressLegacyV1({
                     typedCall: this.device.commands.typedCall.bind(this.device.commands),
                     param,
@@ -48039,7 +48171,7 @@ class EVMGetPublicKey extends BaseMethod {
         });
     }
     getEvmPublicKey(param) {
-        if (TransportManager.getMessageVersion() === 'v1') {
+        if (TransportManager.getProtocolV1MessageSchema() === 'v1LegacySchema') {
             return getPublicKeyLegacyV1({
                 typedCall: this.device.commands.typedCall.bind(this.device.commands),
                 param,
@@ -48123,7 +48255,7 @@ class EVMSignMessage$2 extends BaseMethod {
     }
     run() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (TransportManager.getMessageVersion() === 'v1') {
+            if (TransportManager.getProtocolV1MessageSchema() === 'v1LegacySchema') {
                 return signMessageLegacyV1({
                     typedCall: this.device.commands.typedCall.bind(this.device.commands),
                     params: this.params,
@@ -48436,7 +48568,7 @@ class EVMSignTransaction extends BaseMethod {
             const { addressN, isEIP1559, isEIP7702, formattedTx } = this;
             if (formattedTx == null)
                 throw hdShared.ERRORS.TypedError('Runtime', 'formattedTx is not set');
-            if (TransportManager.getMessageVersion() === 'v1') {
+            if (TransportManager.getProtocolV1MessageSchema() === 'v1LegacySchema') {
                 return signTransaction({
                     typedCall: this.device.commands.typedCall.bind(this.device.commands),
                     addressN,
@@ -48782,8 +48914,8 @@ class EVMSignTypedData extends BaseMethod {
             const { addressN, data, metamaskV4Compat, chainId } = this.params;
             let supportTrezor = false;
             let response;
-            switch (TransportManager.getMessageVersion()) {
-                case 'v1':
+            switch (TransportManager.getProtocolV1MessageSchema()) {
+                case 'v1LegacySchema':
                     supportTrezor = true;
                     response = yield signTypedData$1({
                         typedCall: this.device.commands.typedCall.bind(this.device.commands),
@@ -48793,7 +48925,7 @@ class EVMSignTypedData extends BaseMethod {
                         chainId,
                     });
                     break;
-                case 'latest':
+                case 'v1CurrentSchema':
                 default:
                     supportTrezor = false;
                     response = yield signTypedData({
@@ -48816,8 +48948,8 @@ class EVMSignTypedData extends BaseMethod {
     signTypedHash({ typedCall, addressN, chainId, domainHash, messageHash, }) {
         if (!domainHash)
             throw hdShared.ERRORS.TypedError('Runtime', 'domainHash is required');
-        switch (TransportManager.getMessageVersion()) {
-            case 'v1':
+        switch (TransportManager.getProtocolV1MessageSchema()) {
+            case 'v1LegacySchema':
                 return signTypedHash$1({
                     typedCall,
                     addressN,
@@ -48826,7 +48958,7 @@ class EVMSignTypedData extends BaseMethod {
                     chainId,
                     device: this.device,
                 });
-            case 'latest':
+            case 'v1CurrentSchema':
             default:
                 return signTypedHash({
                     typedCall,
@@ -49087,7 +49219,7 @@ class EVMSignMessage$1 extends BaseMethod {
     }
     run() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (TransportManager.getMessageVersion() === 'v1') {
+            if (TransportManager.getProtocolV1MessageSchema() === 'v1LegacySchema') {
                 return verifyMessageLegacyV1({
                     typedCall: this.device.commands.typedCall.bind(this.device.commands),
                     params: this.params,
@@ -50088,6 +50220,7 @@ class TronGetAddress extends BaseMethod {
 
 class TronSignMessage extends BaseMethod {
     init() {
+        var _a;
         this.checkDeviceId = true;
         this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
         validateParams(this.payload, [
@@ -50098,7 +50231,7 @@ class TronSignMessage extends BaseMethod {
         const { path, messageHex } = this.payload;
         const addressN = validatePath(path, 3);
         if (this.payload.messageType === 'V1' || this.payload.messageType == null) {
-            throw hdShared.createDeviceNotSupportMethodError('TronSignMessage', getFirmwareType(this.device.features));
+            throw hdShared.createDeviceNotSupportMethodError('TronSignMessage', getFirmwareType((_a = this.device) === null || _a === void 0 ? void 0 : _a.features));
         }
         const messageType = hdTransport.TronMessageType.V2;
         this.params = {
@@ -51053,7 +51186,7 @@ class XrpGetAddress extends BaseMethod {
             { name: 'payment', type: 'object' },
         ]);
         validateParams(transaction.payment, [
-            { name: 'amount', type: 'number', required: true },
+            { name: 'amount', type: 'uint', required: true },
             { name: 'destination', type: 'string', required: true },
             { name: 'destinationTag', type: 'number' },
         ]);
@@ -53755,7 +53888,11 @@ class DnxGetAddress extends BaseMethod {
         };
     }
     run() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            if (((_a = this.device.originalDescriptor) === null || _a === void 0 ? void 0 : _a.protocolType) === 'V2') {
+                throw hdShared.createDeviceNotSupportMethodError(this.name, getFirmwareType(this.device.features));
+            }
             const responses = [];
             for (let i = 0; i < this.params.length; i++) {
                 const param = this.params[i];
@@ -53859,7 +53996,11 @@ class DnxSignTransaction extends BaseMethod {
         });
     }
     run() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            if (((_a = this.device.originalDescriptor) === null || _a === void 0 ? void 0 : _a.protocolType) === 'V2') {
+                throw hdShared.createDeviceNotSupportMethodError(this.name, getFirmwareType(this.device.features));
+            }
             const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
             const res = yield this.device.commands.typedCall('DnxSignTx', 'DnxInputRequest', Object.assign({}, this.params));
             return this.processTxRequest(typedCall, res, {});
@@ -54937,11 +55078,11 @@ var ApiMethods = /*#__PURE__*/Object.freeze({
     promptWebDeviceAccess: PromptWebDeviceAccess,
     getProtoVersion: GetProtoVersion,
     ping: Ping,
-    devReboot: DevReboot,
-    devGetDeviceInfo: DevGetDeviceInfo,
-    devGetOnboardingStatus: DevGetOnboardingStatus,
-    devFirmwareUpdate: DevFirmwareUpdate,
-    devGetFirmwareUpdateStatus: DevGetFirmwareUpdateStatus,
+    deviceReboot: DeviceReboot,
+    deviceGetDeviceInfo: DeviceGetDeviceInfo,
+    deviceGetOnboardingStatus: DeviceGetOnboardingStatus,
+    deviceFirmwareUpdate: DeviceFirmwareUpdate,
+    deviceGetFirmwareUpdateStatus: DeviceGetFirmwareUpdateStatus,
     factoryDeviceInfoSettings: FactoryDeviceInfoSettings,
     factoryGetDeviceInfo: FactoryGetDeviceInfo,
     filesystemFixPermission: FilesystemFixPermission,
@@ -55595,7 +55736,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
                 yield TransportManager.reconfigure(device.features);
             }
             checkPassphraseEnableState(method, device.features);
-            if (device.hasUsePassphrase() && method.useDevicePassphraseState) {
+            if (shouldCheckPassphraseState(method, device)) {
                 const support = supportNewPassphrase(device.features);
                 if (!support.support) {
                     return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotSupportPassphrase, `Device not support passphrase, please update to ${support.require}`, {
@@ -55995,6 +56136,14 @@ const checkPassphraseEnableState = (method, features) => {
         throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotOpenedPassphrase);
     }
 };
+const shouldCheckPassphraseState = (method, device) => {
+    var _a, _b;
+    if (!method.useDevicePassphraseState)
+        return false;
+    const isPro2 = getDeviceType(device.features) === hdShared.EDeviceType.Pro2;
+    const pro2ExplicitWalletSelection = isPro2 && (!!((_a = method.payload) === null || _a === void 0 ? void 0 : _a.passphraseState) || !!((_b = method.payload) === null || _b === void 0 ? void 0 : _b.useEmptyPassphrase));
+    return device.hasUsePassphrase() || pro2ExplicitWalletSelection;
+};
 const cleanup = () => {
     _uiPromises = [];
     Log.debug('Cleanup...');