@onekeyfe/hd-core 1.2.5 → 1.2.6-alpha.1

package/dist/index.js

@@ -44209,6 +44209,12 @@ class DeviceCommands {
                 const isProtocolV2DeviceBusyFailure = this.device.isProtocolV2() &&
                     DEVICE_CONTROL_CALLS.has(callType) &&
                     subcode === hdTransport.DeviceErrorCode.DeviceError_Busy;
+                const isProtocolV2PinCancelledBusyFailure = this.device.isProtocolV2() &&
+                    !DEVICE_SESSION_CALLS.has(callType) &&
+                    subcode === hdTransport.DeviceSessionErrorCode.DeviceSessionError_UserCancelled &&
+                    /^pin cancelled$/i.test(normalizedMessage);
+                const isProtocolV2FirmwareUpdateBusyFailure = this.device.isProtocolV2() &&
+                    /^requested command not allowed while a firmware update is in progress$/i.test(normalizedMessage);
                 const isLegacyProtocolV2LockedFailure = this.device.isProtocolV2() && /^device (?:is )?locked$/i.test(normalizedMessage);
                 if (DEVICE_SESSION_CALLS.has(callType) &&
                     subcode === hdTransport.DeviceSessionErrorCode.DeviceSessionError_InvalidSession) {
@@ -44259,7 +44265,9 @@ class DeviceCommands {
                         firmwareMessage: message,
                     });
                 }
-                else if (isProtocolV2DeviceBusyFailure) {
+                else if (isProtocolV2DeviceBusyFailure ||
+                    isProtocolV2PinCancelledBusyFailure ||
+                    isProtocolV2FirmwareUpdateBusyFailure) {
                     error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceBusy, message, {
                         failureCode: code,
                         subcode,
@@ -44899,7 +44907,7 @@ const mapProtocolV2DeviceInfoToState = (info, mode = 'unknown') => {
         versions: definedEntries({
             firmware: imageVersion((_d = info.main_mcu) === null || _d === void 0 ? void 0 : _d.application),
             applicationP1: imageVersion((_e = info.main_mcu) === null || _e === void 0 ? void 0 : _e.application),
-            applicationP2: imageVersion((_f = info.main_mcu) === null || _f === void 0 ? void 0 : _f.application_data),
+            applicationP2: mode === 'normal' ? null : imageVersion((_f = info.main_mcu) === null || _f === void 0 ? void 0 : _f.application_data),
             bootloader: imageVersion((_g = info.main_mcu) === null || _g === void 0 ? void 0 : _g.bootloader),
             board: imageVersion((_h = info.main_mcu) === null || _h === void 0 ? void 0 : _h.romloader),
             ble: imageVersion((_j = info.coprocessor) === null || _j === void 0 ? void 0 : _j.application),
@@ -44917,8 +44925,8 @@ const mapProtocolV2DeviceInfoToState = (info, mode = 'unknown') => {
             firmwareHash: imageHash((_u = info.main_mcu) === null || _u === void 0 ? void 0 : _u.application),
             applicationP1BuildId: imageBuildId((_v = info.main_mcu) === null || _v === void 0 ? void 0 : _v.application),
             applicationP1Hash: imageHash((_w = info.main_mcu) === null || _w === void 0 ? void 0 : _w.application),
-            applicationP2BuildId: imageBuildId((_x = info.main_mcu) === null || _x === void 0 ? void 0 : _x.application_data),
-            applicationP2Hash: imageHash((_y = info.main_mcu) === null || _y === void 0 ? void 0 : _y.application_data),
+            applicationP2BuildId: mode === 'normal' ? null : imageBuildId((_x = info.main_mcu) === null || _x === void 0 ? void 0 : _x.application_data),
+            applicationP2Hash: mode === 'normal' ? null : imageHash((_y = info.main_mcu) === null || _y === void 0 ? void 0 : _y.application_data),
             bootloaderBuildId: imageBuildId((_z = info.main_mcu) === null || _z === void 0 ? void 0 : _z.bootloader),
             bootloaderHash: imageHash((_0 = info.main_mcu) === null || _0 === void 0 ? void 0 : _0.bootloader),
             boardBuildId: imageBuildId((_1 = info.main_mcu) === null || _1 === void 0 ? void 0 : _1.romloader),
@@ -46655,7 +46663,7 @@ class Device extends events.exports {
     }
     hasUnexpectedMode(allow, require) {
         if (!this.isUnacquired()) {
-            if (this.isBootloader() && !this.isProtocolV2() && !allow.includes(UI_REQUEST.BOOTLOADER)) {
+            if ((this.isBootloader() || this.isRomloader()) && !allow.includes(UI_REQUEST.BOOTLOADER)) {
                 return UI_REQUEST.BOOTLOADER;
             }
             if (!this.isInitialized() && !allow.includes(UI_REQUEST.NOT_INITIALIZE)) {
@@ -47466,7 +47474,7 @@ class GetDeviceState extends BaseMethod {
             if (this.params.scope === 'settings' &&
                 this.device.isProtocolV2() &&
                 isLoaderMode(state.status.mode)) {
-                throw hdShared.createDeviceNotSupportMethodError(`${this.name}:${this.params.scope}`, this.device.getCurrentFirmwareType());
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.NotAllowInBootloaderMode);
             }
             return state;
         });
@@ -52412,7 +52420,8 @@ const PROTOCOL_V2_BOOTLOADER_RECONNECT_TIMEOUT = 90 * 1000;
 const PROTOCOL_V2_FINAL_RECONNECT_TIMEOUT = 3 * 60 * 1000;
 const PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT = 5 * 1000;
 const PROTOCOL_V2_FIRMWARE_STATUS_RESPONSE_TIMEOUT = 15 * 1000;
-const PROTOCOL_V2_INSTALL_TIMEOUT = 5 * 60 * 1000;
+const PROTOCOL_V2_FILE_WRITE_RESPONSE_TIMEOUT = 10 * 1000;
+const PROTOCOL_V2_INSTALL_TIMEOUT = 10 * 60 * 1000;
 const PROTOCOL_V2_INSTALL_STATUS_INITIAL_DELAY = 1000;
 const PROTOCOL_V2_INSTALL_FINISHED_AFTER_DISCONNECT_POLLS = 4;
 const PROTOCOL_V2_TARGET_STATUS_PENDING = 0;
@@ -52891,8 +52900,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.captureProtocolV2PhysicalIdentity();
             const deviceFeatures = yield this.getProtocolV2DeviceFeatures();
-            this.protocolV2InstallBaselineVersions =
-                this.getProtocolV2ObservableTargetVersions(deviceFeatures);
+            this.protocolV2InstallBaselineVersions = this.getProtocolV2ObservableTargetVersions(deviceFeatures, this.protocolV2InitialDeviceInfo);
             this.protocolV2LastRuntimeProbeFeatures = undefined;
             const currentDeviceType = this.device.getCurrentDeviceType();
             const capabilityDeviceType = currentDeviceType === hdShared.EDeviceType.Pro2 || currentDeviceType === hdShared.EDeviceType.Neo
@@ -53297,7 +53305,9 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             app_v1: features
                 ? getDeviceFirmwareVersion(features).join('.')
                 : (_c = (_b = deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.main_mcu) === null || _b === void 0 ? void 0 : _b.application) === null || _c === void 0 ? void 0 : _c.version,
-            app_v2: (_e = (_d = deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.main_mcu) === null || _d === void 0 ? void 0 : _d.application_data) === null || _e === void 0 ? void 0 : _e.version,
+            app_v2: (features === null || features === void 0 ? void 0 : features.mode) === 'normal'
+                ? getDeviceFirmwareVersion(features).join('.')
+                : (_e = (_d = deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.main_mcu) === null || _d === void 0 ? void 0 : _d.application_data) === null || _e === void 0 ? void 0 : _e.version,
             coprocessor: features ? getDeviceBLEFirmwareVersion(features).join('.') : undefined,
             se01: (_f = features === null || features === void 0 ? void 0 : features.se01Version) !== null && _f !== void 0 ? _f : undefined,
             se02: (_g = features === null || features === void 0 ? void 0 : features.se02Version) !== null && _g !== void 0 ? _g : undefined,
@@ -53308,9 +53318,12 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         for (const [target, expectedVersion] of expectedEntries) {
             const targetId = (_k = Array.from(PROTOCOL_V2_UPDATE_TARGET_BY_TARGET_ID.entries()).find(([, mappedTarget]) => mappedTarget === target)) === null || _k === void 0 ? void 0 : _k[0];
             const statusVersion = targetId === undefined ? undefined : this.protocolV2CompletedTargetVersions.get(targetId);
-            const observedVersion = statusVersion === undefined
-                ? visibleVersions[target]
+            const statusVersionString = statusVersion === undefined
+                ? undefined
                 : `${Math.floor(statusVersion / 0x10000) % 0x100}.${Math.floor(statusVersion / 0x100) % 0x100}.${statusVersion % 0x100}`;
+            const observedVersion = target === 'app_v2' && visibleVersions.app_v2
+                ? visibleVersions.app_v2
+                : statusVersionString !== null && statusVersionString !== void 0 ? statusVersionString : visibleVersions[target];
             if (!observedVersion) {
                 const hasCompleteTargetEvidence = targetId !== undefined && this.protocolV2CompletedTargetIds.has(targetId);
                 if (hasCompleteTargetEvidence) {
@@ -53402,11 +53415,16 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             }
             this.protocolV2ExpectedSerialNumber = serialNumber;
             this.protocolV2ExpectedPath = path;
+            this.protocolV2InitialDeviceInfo = deviceInfo;
         });
     }
-    verifyProtocolV2ReconnectIdentity() {
+    verifyProtocolV2ReconnectIdentity(request) {
         return __awaiter(this, void 0, void 0, function* () {
-            const deviceInfo = yield this.requestProtocolV2PhysicalIdentity();
+            const deviceInfo = yield requestProtocolV2DeviceInfo({
+                commands: this.device.getCommands(),
+                timeoutMs: this.getProtocolV2DeviceInfoTimeout(),
+                request,
+            });
             this.assertProtocolV2DeviceInfoIdentity(deviceInfo);
             return deviceInfo;
         });
@@ -54158,12 +54176,18 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         });
         return Array.from(expectedTargetIds).filter(targetId => !reportedTargetIds.has(targetId));
     }
-    getProtocolV2ObservableTargetVersions(features) {
+    getProtocolV2ObservableTargetVersions(features, deviceInfo) {
+        var _a, _b;
         const versions = new Map();
         versions.set(ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_BOOTLOADER, getDeviceBootloaderVersion(features).join('.'));
         const applicationVersion = getDeviceFirmwareVersion(features).join('.');
         versions.set(ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P1, applicationVersion);
-        versions.set(ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P2, applicationVersion);
+        const applicationP2Version = features.mode === 'normal'
+            ? applicationVersion
+            : (_b = (_a = deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.main_mcu) === null || _a === void 0 ? void 0 : _a.application_data) === null || _b === void 0 ? void 0 : _b.version;
+        if (applicationP2Version) {
+            versions.set(ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P2, applicationP2Version);
+        }
         versions.set(ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_COPROCESSOR, getDeviceBLEFirmwareVersion(features).join('.'));
         const secureElementVersions = [
             [ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_SE01, features.se01Version],
@@ -54177,17 +54201,31 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         });
         return versions;
     }
-    hasProtocolV2InstallVersionChanged(expectedTargetIds) {
+    hasProtocolV2InstallVersionChanged(expectedTargetIds, deviceInfo) {
         if (!this.protocolV2LastRuntimeProbeFeatures)
             return false;
-        const currentVersions = this.getProtocolV2ObservableTargetVersions(this.protocolV2LastRuntimeProbeFeatures);
-        return Array.from(expectedTargetIds).some(targetId => {
-            const previousVersion = this.protocolV2InstallBaselineVersions.get(targetId);
-            const currentVersion = currentVersions.get(targetId);
-            return (previousVersion !== undefined &&
-                currentVersion !== undefined &&
-                previousVersion !== currentVersion);
-        });
+        const currentVersions = this.getProtocolV2ObservableTargetVersions(this.protocolV2LastRuntimeProbeFeatures, deviceInfo);
+        const p1TargetId = ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P1;
+        const p2TargetId = ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P2;
+        return (expectedTargetIds.size > 0 &&
+            Array.from(expectedTargetIds).every(targetId => {
+                var _a, _b, _c;
+                if (targetId === p2TargetId && ((_a = this.protocolV2LastRuntimeProbeFeatures) === null || _a === void 0 ? void 0 : _a.mode) === 'normal') {
+                    if (!expectedTargetIds.has(p1TargetId))
+                        return false;
+                    const previousP1Version = this.protocolV2InstallBaselineVersions.get(p1TargetId);
+                    const currentP1Version = currentVersions.get(p1TargetId);
+                    return (previousP1Version !== undefined &&
+                        currentP1Version !== undefined &&
+                        previousP1Version !== currentP1Version &&
+                        currentP1Version === ((_c = (_b = this.params) === null || _b === void 0 ? void 0 : _b.expectedTargetVersions) === null || _c === void 0 ? void 0 : _c.app_v2));
+                }
+                const previousVersion = this.protocolV2InstallBaselineVersions.get(targetId);
+                const currentVersion = currentVersions.get(targetId);
+                return (previousVersion !== undefined &&
+                    currentVersion !== undefined &&
+                    previousVersion !== currentVersion);
+            }));
     }
     recordProtocolV2AuthoritativeInstallCompletion(expectedTargetIds) {
         expectedTargetIds.forEach(targetId => this.protocolV2CompletedTargetIds.add(targetId));
@@ -54224,8 +54262,9 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 finishedStatusSnapshotKey = undefined;
                 finishedStatusSnapshotPolls = 0;
             };
-            while (Date.now() - startTime < PROTOCOL_V2_INSTALL_TIMEOUT) {
+            while (true) {
                 this.throwIfAborted();
+                const isFinalStatusCheck = Date.now() - startTime >= PROTOCOL_V2_INSTALL_TIMEOUT;
                 try {
                     if (shouldReconnect) {
                         const isBleInstallReconnect = this.isBleReconnect();
@@ -54347,17 +54386,13 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                             lastError = new Error('Protocol V2 firmware status is stale; waiting for the current install to start');
                         }
                         if (statusTargets.length === 0 &&
-                            !currentDeviceInfo &&
-                            bleInstallLinkReady &&
-                            installEvidenceObserved) {
-                            currentDeviceInfo = yield this.verifyProtocolV2ReconnectIdentity();
+                            (currentDeviceInfo || bleInstallLinkReady || isFinalStatusCheck)) {
+                            currentDeviceInfo = yield this.verifyProtocolV2ReconnectIdentity(PROTOCOL_V2_VERSIONS_DEVICE_INFO_REQUEST);
                             deviceInfo = currentDeviceInfo;
-                        }
-                        if (statusTargets.length === 0 && currentDeviceInfo) {
                             const isNormalMode = yield this.probeProtocolV2NormalMode(currentDeviceInfo);
                             if (isNormalMode &&
                                 (installEvidenceObserved ||
-                                    this.hasProtocolV2InstallVersionChanged(expectedTargetIds))) {
+                                    this.hasProtocolV2InstallVersionChanged(expectedTargetIds, currentDeviceInfo))) {
                                 Log$6.log('[FirmwareUpdateV4] empty firmware status after confirmed App reboot; update complete');
                                 this.recordProtocolV2AuthoritativeInstallCompletion(expectedTargetIds);
                                 this.postProgressMessage(100, 'installingFirmware');
@@ -54379,24 +54414,19 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                         }
                     }
                     catch (error) {
-                        if (isProtocolV2TerminalInstallStatusError(error)) {
+                        if (this.isProtocolV2ReconnectIdentityError(error) ||
+                            isProtocolV2TerminalInstallStatusError(error)) {
                             throw error;
                         }
                         if (isProtocolV2FirmwareStatusEndpointUnavailable(error)) {
-                            if (!currentDeviceInfo) {
-                                if (!bleInstallLinkReady) {
-                                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 device identity is unavailable during install polling');
-                                }
-                                deviceInfo = yield this.verifyProtocolV2ReconnectIdentity();
-                            }
-                            const reconnectDeviceInfo = currentDeviceInfo !== null && currentDeviceInfo !== void 0 ? currentDeviceInfo : deviceInfo;
-                            if (!reconnectDeviceInfo) {
+                            if (!currentDeviceInfo && !bleInstallLinkReady && !isFinalStatusCheck) {
                                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 device identity is unavailable during install polling');
                             }
-                            const isNormalMode = yield this.probeProtocolV2NormalMode(reconnectDeviceInfo);
+                            deviceInfo = yield this.verifyProtocolV2ReconnectIdentity(PROTOCOL_V2_VERSIONS_DEVICE_INFO_REQUEST);
+                            const isNormalMode = yield this.probeProtocolV2NormalMode(deviceInfo);
                             if (isNormalMode &&
                                 (installEvidenceObserved ||
-                                    this.hasProtocolV2InstallVersionChanged(expectedTargetIds))) {
+                                    this.hasProtocolV2InstallVersionChanged(expectedTargetIds, deviceInfo))) {
                                 Log$6.log('[FirmwareUpdateV4] firmware status endpoint unavailable after confirmed App reboot');
                                 this.recordProtocolV2AuthoritativeInstallCompletion(expectedTargetIds);
                                 this.postProgressMessage(100, 'installingFirmware');
@@ -54437,6 +54467,8 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                     bleInstallLinkReady = false;
                     Log$6.log('Protocol V2 firmware install device readiness probe failed: ', error);
                 }
+                if (isFinalStatusCheck)
+                    break;
                 yield hdShared.wait(1000);
             }
             Log$6.error(`[FirmwareUpdateV4] install timed out after ${PROTOCOL_V2_INSTALL_TIMEOUT / 1000}s: ${this.normalizeErrorMessage(lastError)}`);
@@ -54467,7 +54499,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
     }
     probeProtocolV2NormalMode(deviceInfo) {
         return __awaiter(this, void 0, void 0, function* () {
-            const features = yield this.device.probeProtocolV2RuntimeState(deviceInfo, PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT);
+            const features = yield this.device.probeProtocolV2RuntimeState(deviceInfo, PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT, { forceRuntimeContextRefresh: true });
             this.protocolV2LastRuntimeProbeFeatures = features;
             return this.isProtocolV2ApplicationMode(features);
         });
@@ -54627,6 +54659,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
+            const env = DataManager.getSettings('env');
             const writeRes = yield typedCall('FilesystemFileWrite', 'FilesystemFile', {
                 file: {
                     path: filePath,
@@ -54638,6 +54671,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 append: false,
                 ui_percentage: progress !== null && progress !== void 0 ? progress : undefined,
             }, {
+                timeoutMs: env === 'react-native' ? PROTOCOL_V2_FILE_WRITE_RESPONSE_TIMEOUT : undefined,
                 writeWithResponse: false,
                 onWriteCompleted: () => undefined,
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.5",
+  "version": "1.2.6-alpha.1",
   "description": "Core processes and APIs for communicating with OneKey hardware devices.",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.2.5",
-    "@onekeyfe/hd-transport": "1.2.5",
+    "@onekeyfe/hd-shared": "1.2.6-alpha.1",
+    "@onekeyfe/hd-transport": "1.2.6-alpha.1",
     "axios": "1.15.2",
     "bignumber.js": "^9.0.2",
     "buffer": "^6.0.3",
@@ -46,5 +46,5 @@
     "@types/w3c-web-usb": "^1.0.10",
     "@types/web-bluetooth": "^0.0.21"
   },
-  "gitHead": "c5df28718166f8c55ae7f3fe33b559d67a5c093e"
+  "gitHead": "32f41a09724c316ccefe39daae56c22f539d76bd"
 }

package/src/api/FirmwareUpdateV4.ts

@@ -70,7 +70,7 @@ import type {
   FirmwareUpdateV4Target,
 } from '../types/api/firmwareUpdate';
 import type { EFirmwareType } from '@onekeyfe/hd-shared';
-import type { ProtocolV2DeviceInfo } from '@onekeyfe/hd-transport';
+import type { DeviceInfoGet, ProtocolV2DeviceInfo } from '@onekeyfe/hd-transport';
 import type { TypedResponseMessage } from '../device/DeviceCommands';
 import type {
   Features,
@@ -91,7 +91,9 @@ const PROTOCOL_V2_BOOTLOADER_RECONNECT_TIMEOUT = 90 * 1000;
 const PROTOCOL_V2_FINAL_RECONNECT_TIMEOUT = 3 * 60 * 1000;
 const PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT = 5 * 1000;
 const PROTOCOL_V2_FIRMWARE_STATUS_RESPONSE_TIMEOUT = 15 * 1000;
-const PROTOCOL_V2_INSTALL_TIMEOUT = 5 * 60 * 1000;
+// React Native invalidates a timed-out BLE link, and V4 can safely replay the staging file.
+const PROTOCOL_V2_FILE_WRITE_RESPONSE_TIMEOUT = 10 * 1000;
+const PROTOCOL_V2_INSTALL_TIMEOUT = 10 * 60 * 1000;
 const PROTOCOL_V2_INSTALL_STATUS_INITIAL_DELAY = 1000;
 const PROTOCOL_V2_INSTALL_FINISHED_AFTER_DISCONNECT_POLLS = 4;
 const PROTOCOL_V2_TARGET_STATUS_PENDING = 0;
@@ -577,6 +579,8 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
 
   private protocolV2LatestFinalDeviceInfo?: ProtocolV2DeviceInfo;
 
+  private protocolV2InitialDeviceInfo?: ProtocolV2DeviceInfo;
+
   private protocolV2InstallBaselineVersions = new Map<number, string>();
 
   private protocolV2InstallNeedsReconnect = false;
@@ -814,8 +818,10 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
   private async runProtocolV2() {
     await this.captureProtocolV2PhysicalIdentity();
     const deviceFeatures = await this.getProtocolV2DeviceFeatures();
-    this.protocolV2InstallBaselineVersions =
-      this.getProtocolV2ObservableTargetVersions(deviceFeatures);
+    this.protocolV2InstallBaselineVersions = this.getProtocolV2ObservableTargetVersions(
+      deviceFeatures,
+      this.protocolV2InitialDeviceInfo
+    );
     this.protocolV2LastRuntimeProbeFeatures = undefined;
     const currentDeviceType = this.device.getCurrentDeviceType();
     const capabilityDeviceType =
@@ -1382,7 +1388,11 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       app_v1: features
         ? getDeviceFirmwareVersion(features).join('.')
         : deviceInfo?.main_mcu?.application?.version,
-      app_v2: deviceInfo?.main_mcu?.application_data?.version,
+      // Production boot verifies P2 against P1 before normal firmware can run.
+      app_v2:
+        features?.mode === 'normal'
+          ? getDeviceFirmwareVersion(features).join('.')
+          : deviceInfo?.main_mcu?.application_data?.version,
       coprocessor: features ? getDeviceBLEFirmwareVersion(features).join('.') : undefined,
       se01: features?.se01Version ?? undefined,
       se02: features?.se02Version ?? undefined,
@@ -1398,12 +1408,16 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       )?.[0];
       const statusVersion =
         targetId === undefined ? undefined : this.protocolV2CompletedTargetVersions.get(targetId);
-      const observedVersion =
+      const statusVersionString =
         statusVersion === undefined
-          ? visibleVersions[target]
+          ? undefined
           : `${Math.floor(statusVersion / 0x10000) % 0x100}.${
               Math.floor(statusVersion / 0x100) % 0x100
             }.${statusVersion % 0x100}`;
+      const observedVersion =
+        target === 'app_v2' && visibleVersions.app_v2
+          ? visibleVersions.app_v2
+          : statusVersionString ?? visibleVersions[target];
       if (!observedVersion) {
         const hasCompleteTargetEvidence =
           targetId !== undefined && this.protocolV2CompletedTargetIds.has(targetId);
@@ -1511,10 +1525,15 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     }
     this.protocolV2ExpectedSerialNumber = serialNumber;
     this.protocolV2ExpectedPath = path;
+    this.protocolV2InitialDeviceInfo = deviceInfo;
   }
 
-  private async verifyProtocolV2ReconnectIdentity() {
-    const deviceInfo = await this.requestProtocolV2PhysicalIdentity();
+  private async verifyProtocolV2ReconnectIdentity(request?: DeviceInfoGet) {
+    const deviceInfo = await requestProtocolV2DeviceInfo({
+      commands: this.device.getCommands(),
+      timeoutMs: this.getProtocolV2DeviceInfoTimeout(),
+      request,
+    });
     this.assertProtocolV2DeviceInfoIdentity(deviceInfo);
     return deviceInfo;
   }
@@ -2505,7 +2524,10 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     return Array.from(expectedTargetIds).filter(targetId => !reportedTargetIds.has(targetId));
   }
 
-  private getProtocolV2ObservableTargetVersions(features: Features) {
+  private getProtocolV2ObservableTargetVersions(
+    features: Features,
+    deviceInfo?: ProtocolV2DeviceInfo
+  ) {
     const versions = new Map<number, string>();
     versions.set(
       ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_BOOTLOADER,
@@ -2513,7 +2535,16 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     );
     const applicationVersion = getDeviceFirmwareVersion(features).join('.');
     versions.set(ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P1, applicationVersion);
-    versions.set(ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P2, applicationVersion);
+    const applicationP2Version =
+      features.mode === 'normal'
+        ? applicationVersion
+        : deviceInfo?.main_mcu?.application_data?.version;
+    if (applicationP2Version) {
+      versions.set(
+        ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P2,
+        applicationP2Version
+      );
+    }
     versions.set(
       ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_COPROCESSOR,
       getDeviceBLEFirmwareVersion(features).join('.')
@@ -2530,20 +2561,41 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     return versions;
   }
 
-  private hasProtocolV2InstallVersionChanged(expectedTargetIds: Set<number>) {
+  private hasProtocolV2InstallVersionChanged(
+    expectedTargetIds: Set<number>,
+    deviceInfo: ProtocolV2DeviceInfo
+  ) {
     if (!this.protocolV2LastRuntimeProbeFeatures) return false;
     const currentVersions = this.getProtocolV2ObservableTargetVersions(
-      this.protocolV2LastRuntimeProbeFeatures
+      this.protocolV2LastRuntimeProbeFeatures,
+      deviceInfo
+    );
+    const p1TargetId = ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P1;
+    const p2TargetId = ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P2;
+    return (
+      expectedTargetIds.size > 0 &&
+      Array.from(expectedTargetIds).every(targetId => {
+        if (targetId === p2TargetId && this.protocolV2LastRuntimeProbeFeatures?.mode === 'normal') {
+          // P1 must change in this install; a pre-existing P1 version cannot prove a P2-only update.
+          if (!expectedTargetIds.has(p1TargetId)) return false;
+          const previousP1Version = this.protocolV2InstallBaselineVersions.get(p1TargetId);
+          const currentP1Version = currentVersions.get(p1TargetId);
+          return (
+            previousP1Version !== undefined &&
+            currentP1Version !== undefined &&
+            previousP1Version !== currentP1Version &&
+            currentP1Version === this.params?.expectedTargetVersions?.app_v2
+          );
+        }
+        const previousVersion = this.protocolV2InstallBaselineVersions.get(targetId);
+        const currentVersion = currentVersions.get(targetId);
+        return (
+          previousVersion !== undefined &&
+          currentVersion !== undefined &&
+          previousVersion !== currentVersion
+        );
+      })
     );
-    return Array.from(expectedTargetIds).some(targetId => {
-      const previousVersion = this.protocolV2InstallBaselineVersions.get(targetId);
-      const currentVersion = currentVersions.get(targetId);
-      return (
-        previousVersion !== undefined &&
-        currentVersion !== undefined &&
-        previousVersion !== currentVersion
-      );
-    });
   }
 
   private recordProtocolV2AuthoritativeInstallCompletion(expectedTargetIds: Set<number>) {
@@ -2588,10 +2640,12 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       finishedStatusSnapshotPolls = 0;
     };
 
-    while (Date.now() - startTime < PROTOCOL_V2_INSTALL_TIMEOUT) {
+    while (true) {
       // A transport release caused by an explicit workflow cancellation must not
       // be mistaken for the expected device reboot during installation.
       this.throwIfAborted();
+      // Read once more at the deadline so a completed reboot is not reported as a timeout.
+      const isFinalStatusCheck = Date.now() - startTime >= PROTOCOL_V2_INSTALL_TIMEOUT;
       try {
         if (shouldReconnect) {
           const isBleInstallReconnect = this.isBleReconnect();
@@ -2750,22 +2804,19 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
 
           if (
             statusTargets.length === 0 &&
-            !currentDeviceInfo &&
-            bleInstallLinkReady &&
-            installEvidenceObserved
+            (currentDeviceInfo || bleInstallLinkReady || isFinalStatusCheck)
           ) {
-            // BLE install reconnect skips generic probes because loaders may not answer Ping.
-            // Restore the verified identity only after current-install evidence disappears.
-            currentDeviceInfo = await this.verifyProtocolV2ReconnectIdentity();
+            // Installation can finish while BLE is disconnected, hiding all progress.
+            // Refresh identity and target versions even without observed install status.
+            currentDeviceInfo = await this.verifyProtocolV2ReconnectIdentity(
+              PROTOCOL_V2_VERSIONS_DEVICE_INFO_REQUEST
+            );
             deviceInfo = currentDeviceInfo;
-          }
-
-          if (statusTargets.length === 0 && currentDeviceInfo) {
             const isNormalMode = await this.probeProtocolV2NormalMode(currentDeviceInfo);
             if (
               isNormalMode &&
               (installEvidenceObserved ||
-                this.hasProtocolV2InstallVersionChanged(expectedTargetIds))
+                this.hasProtocolV2InstallVersionChanged(expectedTargetIds, currentDeviceInfo))
             ) {
               Log.log(
                 '[FirmwareUpdateV4] empty firmware status after confirmed App reboot; update complete'
@@ -2795,33 +2846,29 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
             }
           }
         } catch (error) {
-          if (isProtocolV2TerminalInstallStatusError(error)) {
+          if (
+            this.isProtocolV2ReconnectIdentityError(error) ||
+            isProtocolV2TerminalInstallStatusError(error)
+          ) {
             throw error;
           }
-          // App firmware does not register DeviceFirmwareUpdateStatusGet. Treat the
-          // missing endpoint as completion only after the runtime probe confirms App mode.
+          // Some firmware builds do not expose install status. Require a fresh runtime
+          // probe and current-install evidence or changed versions before accepting completion.
           if (isProtocolV2FirmwareStatusEndpointUnavailable(error)) {
-            if (!currentDeviceInfo) {
-              if (!bleInstallLinkReady) {
-                throw ERRORS.TypedError(
-                  HardwareErrorCode.RuntimeError,
-                  'Protocol V2 device identity is unavailable during install polling'
-                );
-              }
-              deviceInfo = await this.verifyProtocolV2ReconnectIdentity();
-            }
-            const reconnectDeviceInfo = currentDeviceInfo ?? deviceInfo;
-            if (!reconnectDeviceInfo) {
+            if (!currentDeviceInfo && !bleInstallLinkReady && !isFinalStatusCheck) {
               throw ERRORS.TypedError(
                 HardwareErrorCode.RuntimeError,
                 'Protocol V2 device identity is unavailable during install polling'
               );
             }
-            const isNormalMode = await this.probeProtocolV2NormalMode(reconnectDeviceInfo);
+            deviceInfo = await this.verifyProtocolV2ReconnectIdentity(
+              PROTOCOL_V2_VERSIONS_DEVICE_INFO_REQUEST
+            );
+            const isNormalMode = await this.probeProtocolV2NormalMode(deviceInfo);
             if (
               isNormalMode &&
               (installEvidenceObserved ||
-                this.hasProtocolV2InstallVersionChanged(expectedTargetIds))
+                this.hasProtocolV2InstallVersionChanged(expectedTargetIds, deviceInfo))
             ) {
               Log.log(
                 '[FirmwareUpdateV4] firmware status endpoint unavailable after confirmed App reboot'
@@ -2871,6 +2918,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         bleInstallLinkReady = false;
         Log.log('Protocol V2 firmware install device readiness probe failed: ', error);
       }
+      if (isFinalStatusCheck) break;
       await wait(1000);
     }
 
@@ -2909,7 +2957,8 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
   private async probeProtocolV2NormalMode(deviceInfo: ProtocolV2DeviceInfo) {
     const features = await this.device.probeProtocolV2RuntimeState(
       deviceInfo,
-      PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT
+      PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT,
+      { forceRuntimeContextRefresh: true }
     );
     this.protocolV2LastRuntimeProbeFeatures = features;
     return this.isProtocolV2ApplicationMode(features);
@@ -3132,6 +3181,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     progress: number | null
   ): Promise<TypedResponseMessage<'FilesystemFile'>> {
     const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
+    const env = DataManager.getSettings('env');
     const writeRes = await typedCall(
       'FilesystemFileWrite',
       'FilesystemFile',
@@ -3147,6 +3197,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         ui_percentage: progress ?? undefined,
       },
       {
+        timeoutMs: env === 'react-native' ? PROTOCOL_V2_FILE_WRITE_RESPONSE_TIMEOUT : undefined,
         writeWithResponse: false,
         onWriteCompleted: () => undefined,
       }

package/src/api/GetDeviceState.ts

@@ -1,4 +1,4 @@
-import { ERRORS, HardwareErrorCode, createDeviceNotSupportMethodError } from '@onekeyfe/hd-shared';
+import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 
 import { UI_REQUEST } from '../constants/ui-request';
 import { BaseMethod } from './BaseMethod';
@@ -49,10 +49,7 @@ export default class GetDeviceState extends BaseMethod<
       this.device.isProtocolV2() &&
       isLoaderMode(state.status.mode)
     ) {
-      throw createDeviceNotSupportMethodError(
-        `${this.name}:${this.params.scope}`,
-        this.device.getCurrentFirmwareType()
-      );
+      throw ERRORS.TypedError(HardwareErrorCode.NotAllowInBootloaderMode);
     }
     return state;
   }

package/src/device/Device.ts

@@ -1801,7 +1801,7 @@ export class Device extends EventEmitter {
     // both allow and require cases might generate single unexpected mode
     if (!this.isUnacquired()) {
       // allow cases
-      if (this.isBootloader() && !this.isProtocolV2() && !allow.includes(UI_REQUEST.BOOTLOADER)) {
+      if ((this.isBootloader() || this.isRomloader()) && !allow.includes(UI_REQUEST.BOOTLOADER)) {
         return UI_REQUEST.BOOTLOADER;
       }
       if (!this.isInitialized() && !allow.includes(UI_REQUEST.NOT_INITIALIZE)) {