@onekeyfe/hd-core 1.2.0-alpha.136 → 1.2.0-alpha.140

package/dist/index.js

@@ -43538,7 +43538,7 @@ const DEVICE_CONTROL_CALLS = new Set([
     'DeviceCertificateSign',
     'DeviceMiscUsbMscControl',
 ]);
-const isProtocolV2ActionCancelledMessage = (message) => /^(?:cancel(?:led|ed)(?: on device)?|confirm dismissed|user cancel(?:led|ed)(?:\s+.*)?)$/i.test(message);
+const isProtocolV2ActionCancelledMessage = (message) => /^(?:cancel(?:led|ed)(?: on device)?|confirm dismissed|update cancel(?:led|ed)|user cancel(?:led|ed)(?:\s+.*)?)$/i.test(message);
 function shouldReduceDebugForCall(type) {
     return HIGH_VOLUME_DEBUG_CALLS.has(type);
 }
@@ -44627,7 +44627,7 @@ const mapProtocolV2DeviceInfoToState = (info, mode = 'unknown') => {
     };
 };
 const mapProtocolV2DeviceStatusToState = (status) => {
-    var _a;
+    var _a, _b, _c;
     return ({
         identity: definedEntries({ deviceId: status.device_id }),
         status: definedEntries({
@@ -44636,8 +44636,8 @@ const mapProtocolV2DeviceStatusToState = (status) => {
             unlocked: status.unlocked,
             passphraseProtection: status.unlocked === true ? (_a = status.passphrase_enabled) !== null && _a !== void 0 ? _a : null : undefined,
             backupRequired: status.backup_required,
-            attachToPinEnabled: status.attach_to_pin_enabled,
-            unlockedAttachPin: status.unlocked_by_attach_to_pin,
+            attachToPinEnabled: status.unlocked === true ? (_b = status.attach_to_pin_enabled) !== null && _b !== void 0 ? _b : undefined : undefined,
+            unlockedAttachPin: status.unlocked === true ? (_c = status.unlocked_by_attach_to_pin) !== null && _c !== void 0 ? _c : null : undefined,
         }),
         raw: { protocolV2DeviceStatus: status },
     });
@@ -44659,21 +44659,24 @@ const mapApplySettingsToState = (settings) => {
     return Object.assign(Object.assign(Object.assign({}, (Object.keys(identity).length ? { identity } : {})), (Object.keys(status).length ? { status } : {})), (Object.keys(stateSettings).length ? { settings: stateSettings } : {}));
 };
 const mapDeviceSettingsToState = (settings) => {
-    const identity = definedEntries({ label: settings.label });
-    const status = definedEntries({ passphraseProtection: settings.passphrase_enable });
+    var _a, _b, _c, _d, _e;
+    const identity = definedEntries({ label: (_a = settings.label) !== null && _a !== void 0 ? _a : undefined });
+    const status = definedEntries({
+        passphraseProtection: (_b = settings.passphrase_enable) !== null && _b !== void 0 ? _b : undefined,
+    });
     const stateSettings = definedEntries({
         bleEnabled: settings.bt_enable,
         language: mapLanguageFromProtocolV2(settings.language),
         wallpaperPath: settings.wallpaper_path,
         brightness: settings.brightness,
-        autoLockDelayMs: settings.autolock_delay_ms,
-        autoShutdownDelayMs: settings.autoshutdown_delay_ms,
+        autoLockDelayMs: (_c = settings.autolock_delay_ms) !== null && _c !== void 0 ? _c : undefined,
+        autoShutdownDelayMs: (_d = settings.autoshutdown_delay_ms) !== null && _d !== void 0 ? _d : undefined,
         animationEnabled: settings.animation_enable,
         tapToWake: settings.tap_to_wake,
         hapticFeedback: settings.haptic_feedback,
         deviceNameDisplayEnabled: settings.device_name_display_enabled,
         airgapMode: settings.airgap_mode,
-        fidoEnabled: settings.fido_enabled,
+        fidoEnabled: (_e = settings.fido_enabled) !== null && _e !== void 0 ? _e : undefined,
         usbLockEnabled: settings.usb_lock_enable,
         randomKeypad: settings.random_keypad,
     });
@@ -45617,6 +45620,15 @@ class Device extends events.exports {
                     yield TransportManager.reconfigure(this.features);
                 });
                 const expectedDeviceId = options === null || options === void 0 ? void 0 : options.deviceId;
+                if (expectedDeviceId) {
+                    this.passphraseState = undefined;
+                    const { message } = yield this.commands.typedCall('GetFeatures', 'Features', {});
+                    this._updateFeatures(message);
+                    yield TransportManager.reconfigure(this.features);
+                    if (!this.checkDeviceId(expectedDeviceId)) {
+                        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckDeviceIdError);
+                    }
+                }
                 this.passphraseState = options === null || options === void 0 ? void 0 : options.passphraseState;
                 if (options === null || options === void 0 ? void 0 : options.initSession) {
                     this.clearInternalState(options === null || options === void 0 ? void 0 : options.deviceId);
@@ -45632,23 +45644,7 @@ class Device extends events.exports {
                 if (options === null || options === void 0 ? void 0 : options.deriveCardano) {
                     payload.derive_cardano = true;
                 }
-                if (this.features) {
-                    yield TransportManager.reconfigure(this.features);
-                }
-                const assertExpectedDeviceIdentity = () => {
-                    if (expectedDeviceId && !this.checkDeviceId(expectedDeviceId)) {
-                        this.clearInternalState();
-                        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckDeviceIdError);
-                    }
-                };
-                try {
-                    yield callInitialize(payload, options === null || options === void 0 ? void 0 : options.initSession);
-                }
-                catch (error) {
-                    assertExpectedDeviceIdentity();
-                    throw error;
-                }
-                assertExpectedDeviceIdentity();
+                yield callInitialize(payload, options === null || options === void 0 ? void 0 : options.initSession);
             }
             catch (error) {
                 Log$h.error('Initialization failed:', error);
@@ -46122,14 +46118,17 @@ class Device extends events.exports {
             const error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceInterruptedFromUser);
             const cleanupPromise = this.runCleanupPromise;
             const { cancelableAction } = this;
+            const env = DataManager.getSettings('env');
             if (cancelableAction) {
                 yield cancelableAction(error);
             }
             else if (this.isProtocolV2() &&
-                DataManager.isBleConnect(DataManager.getSettings('env')) &&
+                (DataManager.isBleConnect(env) ||
+                    DataManager.isBrowserWebUsb(env) ||
+                    DataManager.isDesktopWebUsb(env)) &&
                 this.hasDeviceAcquire()) {
                 yield ((_b = (_a = this.commands) === null || _a === void 0 ? void 0 : _a.cancelDevice) === null || _b === void 0 ? void 0 : _b.call(_a).catch(cancelError => {
-                    Log$h.debug('Protocol V2 BLE fallback cancel error', cancelError);
+                    Log$h.debug('Protocol V2 fallback cancel error', cancelError);
                 }));
             }
             yield ((_c = this.commands) === null || _c === void 0 ? void 0 : _c.cancel());
@@ -47520,11 +47519,12 @@ function loadProtocolV2FirmwareReleaseContext({ device, firmwareType: firmwareTy
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `${methodName} requires initialized device features`);
         }
         const firmwareType = (_a = firmwareTypeParam !== null && firmwareTypeParam !== void 0 ? firmwareTypeParam : state.identity.firmwareType) !== null && _a !== void 0 ? _a : hdShared.EFirmwareType.Universal;
+        const normalizedFeatures = Object.assign(Object.assign({}, features), { deviceType: state.identity.deviceType, firmwareType });
         return {
             state: state,
-            features,
+            features: normalizedFeatures,
             firmwareType,
-            release: DataManager.getFirmwareLatestRelease(features, firmwareType),
+            release: DataManager.getFirmwareLatestRelease(normalizedFeatures, firmwareType),
         };
     });
 }
@@ -48184,6 +48184,7 @@ class DeviceChangePin extends BaseMethod {
     }
     init() {
         this.unlockPolicy = 'unlock-before-run';
+        this.protocolV2PreUnlockPinType = hdTransport.DeviceSessionPinType.Any;
         this.useDevicePassphraseState = false;
         validateParams(this.payload, [{ name: 'remove', type: 'boolean' }]);
         this.params = {
@@ -48533,6 +48534,9 @@ class DeviceSettings extends BaseMethod {
                         const res = yield this.device.commands.typedCall('DeviceSettingsPageShow', 'Success', {
                             page: hdTransport.DeviceSettingsPage.DevicePassphrase,
                         });
+                        this.device.updateState({
+                            status: Object.assign({ passphraseProtection: requestedPassphrase }, (requestedPassphrase === false ? { unlockedAttachPin: false } : undefined)),
+                        }, 'settings-write');
                         yield refreshStatusAndSettings();
                         return res.message;
                     }
@@ -48793,7 +48797,12 @@ class DeviceSupportFeatures extends BaseMethod {
 }
 
 class DeviceVerify extends BaseMethod {
+    getSupportedProtocols() {
+        return ['V1', 'V2'];
+    }
     init() {
+        this.unlockPolicy = 'unlock-before-run';
+        this.protocolV2PreUnlockPinType = hdTransport.DeviceSessionPinType.Any;
         this.useDevicePassphraseState = false;
         validateParams(this.payload, [{ name: 'dataHex', type: 'hexString' }]);
         this.params = {
@@ -48808,6 +48817,16 @@ class DeviceVerify extends BaseMethod {
                 const res = yield this.device.commands.typedCall('BixinVerifyDeviceRequest', 'BixinVerifyDeviceAck', Object.assign(Object.assign({}, this.params), { data: utils.bytesToHex(sha256.sha256(this.params.data)) }));
                 response = res.message;
             }
+            else if (this.device.isProtocolV2()) {
+                const signatureRes = yield this.device.commands.typedCall('DeviceCertificateSign', 'DeviceCertificateSignature', {
+                    data: this.params.data,
+                });
+                const certRes = yield this.device.commands.typedCall('DeviceCertificateRead', 'DeviceCertificate');
+                response = {
+                    cert: certRes.message.cert_and_pubkey,
+                    signature: signatureRes.message.data,
+                };
+            }
             else {
                 const signatureRes = yield this.device.commands.typedCall('SESignMessage', 'SEMessageSignature', {
                     message: this.params.data,
@@ -48832,6 +48851,7 @@ class DeviceWipe extends BaseMethod {
     }
     init() {
         this.unlockPolicy = 'unlock-before-run';
+        this.protocolV2PreUnlockPinType = hdTransport.DeviceSessionPinType.Any;
         this.useDevicePassphraseState = false;
         this.protocolV2UiInteraction = {
             request: 'button',
@@ -51719,9 +51739,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 = 8 * 60 * 1000;
+const PROTOCOL_V2_INSTALL_TIMEOUT = 5 * 60 * 1000;
 const PROTOCOL_V2_INSTALL_STATUS_INITIAL_DELAY = 1000;
-const PROTOCOL_V2_MISSING_TARGET_STATUS_GRACE_TIMEOUT = 30 * 1000;
 const PROTOCOL_V2_TARGET_STATUS_PENDING = 0;
 const PROTOCOL_V2_TARGET_STATUS_IN_PROGRESS = 1;
 const PROTOCOL_V2_TARGET_STATUS_FINISHED = 2;
@@ -51735,6 +51754,8 @@ const PROTOCOL_V2_CONNECT_SINGLE_TIMEOUT = 75 * 1000;
 const PROTOCOL_V2_DEVICE_INFO_READY_TIMEOUT = 30 * 1000;
 const PROTOCOL_V2_FILE_TRANSFER_RETRY_COUNT = 3;
 const PROTOCOL_V2_INSTALL_STATUS_CONFLICT_CODE = 'FirmwareInstallStatusConflict';
+const PROTOCOL_V2_INSTALL_FAILED_CODE = 'FirmwareInstallFailed';
+const PROTOCOL_V2_INSTALL_TIMEOUT_CODE = 'FirmwareInstallTimeout';
 const PROTOCOL_V2_OKPP_HEADER_SIZE = 0x52a0;
 const PROTOCOL_V2_OKPP_PAYLOAD_HASH_OFFSET = 0x200;
 const PROTOCOL_V2_OKPP_HEADER_HASH_OFFSET = 0x240;
@@ -51890,7 +51911,8 @@ const isProtocolV2FirmwareStatusEndpointUnavailable = (error) => {
 const isProtocolV2TerminalInstallStatusError = (error) => {
     var _a;
     return error instanceof hdShared.HardwareError &&
-        (error.errorCode === hdShared.HardwareErrorCode.FirmwareError ||
+        (error.errorCode === hdShared.HardwareErrorCode.ActionCancelled ||
+            error.errorCode === hdShared.HardwareErrorCode.FirmwareError ||
             error.errorCode === hdShared.HardwareErrorCode.FirmwareVerificationFailed ||
             ((_a = error.params) === null || _a === void 0 ? void 0 : _a.firmwareUpdateCode) === PROTOCOL_V2_INSTALL_STATUS_CONFLICT_CODE);
 };
@@ -52021,7 +52043,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         this.protocolV2ExecutionInLoader = false;
         this.protocolV2BootResourceStagingSafe = false;
         this.protocolV2CompletedTargetVersions = new Map();
-        this.protocolV2FinalStatusVerified = false;
+        this.protocolV2CompletedTargetIds = new Set();
         this.protocolV2InstallBaselineVersions = new Map();
     }
     getSupportedProtocols() {
@@ -52032,6 +52054,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         this.allowDeviceMode = [UI_REQUEST.BOOTLOADER, UI_REQUEST.NOT_INITIALIZE];
         this.requireDeviceMode = [];
         this.unlockPolicy = 'unlock-before-run';
+        this.protocolV2PreUnlockPinType = hdTransport.DeviceSessionPinType.Any;
         this.useDevicePassphraseState = false;
         this.skipForceUpdateCheck = true;
         const { payload } = this;
@@ -52765,8 +52788,16 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 ? visibleVersions[target]
                 : `${Math.floor(statusVersion / 0x10000) % 0x100}.${Math.floor(statusVersion / 0x100) % 0x100}.${statusVersion % 0x100}`;
             if (!observedVersion) {
-                if (this.protocolV2FinalStatusVerified) {
-                    Log$7.warn(`Protocol V2 target ${target} has no observable final version; completed target status is authoritative`);
+                const requestedTargetIds = requestedTargets.flatMap(requestedTarget => {
+                    if (requestedTarget === 'resource' || requestedTarget === 'boot_resources')
+                        return [];
+                    const installTarget = PROTOCOL_V2_INSTALL_TARGET_BY_UPDATE_TARGET.get(requestedTarget);
+                    return installTarget ? [installTarget.targetId] : [];
+                });
+                const hasCompleteTargetEvidence = requestedTargetIds.length > 0 &&
+                    requestedTargetIds.every(targetId => this.protocolV2CompletedTargetIds.has(targetId));
+                if (hasCompleteTargetEvidence) {
+                    Log$7.warn(`Protocol V2 target ${target} has no observable final version; install completion is authoritative`);
                 }
                 else {
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareVerificationFailed, `Protocol V2 target ${target} has no observable final version after status fallback`);
@@ -52807,15 +52838,18 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
     }
     getProtocolV2DeviceFeatures() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.device.features) {
-                return this.device.features;
-            }
+            let { features } = this.device;
             if (typeof this.device.getFeatures === 'function') {
-                const features = yield this.device.getFeatures();
-                if (features)
-                    return features;
+                features !== null && features !== void 0 ? features : (features = yield this.device.getFeatures());
+            }
+            if (!features) {
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Device features not available');
+            }
+            const deviceType = this.device.getCurrentDeviceType();
+            if (deviceType !== hdShared.EDeviceType.Pro2 && deviceType !== hdShared.EDeviceType.Neo) {
+                return features;
             }
-            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Device features not available');
+            return Object.assign(Object.assign({}, features), { deviceType, firmwareType: this.device.getCurrentFirmwareType() });
         });
     }
     getProtocolV2SerialNumber(deviceInfo) {
@@ -53003,7 +53037,8 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         });
     }
     prepareRemoteProtocolV2Binaries(firmwareType, features, explicitInstallItems = []) {
-        var _a, _b;
+        var _a, _b, _c;
+        var _d;
         return __awaiter(this, void 0, void 0, function* () {
             const release = DataManager.getFirmwareLatestRelease(features, firmwareType);
             let bootloaderBinary = null;
@@ -53031,6 +53066,10 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                     ? PROTOCOL_V2_UPDATE_TARGET_BY_TARGET_ID.get(target.targetId)
                     : undefined;
                 if (updateTarget && targetsToUpdate.has(updateTarget)) {
+                    if (component.version) {
+                        (_c = (_d = this.params).expectedTargetVersions) !== null && _c !== void 0 ? _c : (_d.expectedTargetVersions = {});
+                        this.params.expectedTargetVersions[updateTarget] = component.version.join('.');
+                    }
                     const explicitInstallItem = explicitInstallItemByTargetId.get(target.targetId);
                     const installItem = explicitInstallItem !== null && explicitInstallItem !== void 0 ? explicitInstallItem : (yield this.downloadRemoteProtocolV2Component(key, component));
                     if (installItem.kind === 'bootloader') {
@@ -53436,7 +53475,6 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         });
     }
     assertProtocolV2TargetStatus(statusTargets, expectedTargetIds, expectedPaths = new Map()) {
-        var _a, _b, _c;
         Log$7.log(`[FirmwareUpdateV4] DeviceFirmwareUpdateStatus records=${JSON.stringify(statusTargets)}`);
         const failedTarget = statusTargets.find(target => {
             var _a;
@@ -53451,7 +53489,9 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 path: failedTarget.path,
             });
             Log$7.error(`[FirmwareUpdateV4] firmware install failed target=${failedTargetDetails}`);
-            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareError, `Protocol V2 firmware target failed: target=${failedTarget.target_id} status=${(_a = failedTarget.status) !== null && _a !== void 0 ? _a : 'unknown'} payloadVersion=${(_b = failedTarget.payload_version) !== null && _b !== void 0 ? _b : 'unknown'} path=${(_c = failedTarget.path) !== null && _c !== void 0 ? _c : 'unknown'}`);
+            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareError, undefined, {
+                firmwareUpdateCode: PROTOCOL_V2_INSTALL_FAILED_CODE,
+            });
         }
         const matchingTargets = statusTargets.filter(target => { var _a; return expectedTargetIds.has((_a = normalizeProtocolV2TargetId(target.target_id)) !== null && _a !== void 0 ? _a : -1); });
         const seenTargetIds = new Set();
@@ -53460,7 +53500,8 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             if (targetId === undefined ||
                 seenTargetIds.has(targetId) ||
                 (target.path && expectedPaths.get(targetId) && target.path !== expectedPaths.get(targetId))) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Protocol V2 install status conflicts with target ${target.target_id}`, {
+                Log$7.error(`[FirmwareUpdateV4] install status conflicts with target=${target.target_id}`);
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareError, undefined, {
                     firmwareUpdateCode: PROTOCOL_V2_INSTALL_STATUS_CONFLICT_CODE,
                 });
             }
@@ -53472,6 +53513,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             const targetId = normalizeProtocolV2TargetId(target.target_id);
             if (targetId !== undefined) {
                 completedTargetIds.add(targetId);
+                this.protocolV2CompletedTargetIds.add(targetId);
             }
         });
         if (completedTargetIds.size === expectedTargetIds.size && expectedTargetIds.size > 0) {
@@ -53546,22 +53588,14 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
     waitForProtocolV2FirmwareUpdateComplete(targets, requireCurrentInstallStatus = false) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            this.protocolV2FinalStatusVerified = false;
             const expectedTargetIds = new Set(targets.map(target => target.target_id));
             const expectedPaths = new Map(targets.map(target => [target.target_id, target.path]));
             const startTime = Date.now();
             let lastError;
             let shouldReconnect = false;
             let deviceInfo;
-            let missingTargetStatusSince;
-            let missingTargetStatusKey;
-            let normalModeWithoutInstallEvidenceSince;
             let installEvidenceObserved = false;
             let currentInstallStatusObserved = false;
-            const resetMissingTargetStatusGrace = () => {
-                missingTargetStatusSince = undefined;
-                missingTargetStatusKey = undefined;
-            };
             while (Date.now() - startTime < PROTOCOL_V2_INSTALL_TIMEOUT) {
                 this.throwIfAborted();
                 try {
@@ -53581,7 +53615,6 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                         }, { timeoutMs: PROTOCOL_V2_FIRMWARE_STATUS_RESPONSE_TIMEOUT });
                         if (statusResponse.type === 'Success') {
                             installEvidenceObserved = true;
-                            resetMissingTargetStatusGrace();
                             lastError = new Error('Protocol V2 firmware install acknowledged; waiting for target status');
                         }
                         const statusTargets = statusResponse.type === 'DeviceFirmwareUpdateStatus'
@@ -53603,7 +53636,6 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                         if (hasMatchingTargetStatus &&
                             (!requireCurrentInstallStatus || currentInstallStatusObserved)) {
                             installEvidenceObserved = true;
-                            normalModeWithoutInstallEvidenceSince = undefined;
                         }
                         const matchingStatusTargets = statusTargets.filter(target => {
                             const targetId = normalizeProtocolV2TargetId(target.target_id);
@@ -53612,7 +53644,6 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                         const shouldVerifyTargetCompletion = !requireCurrentInstallStatus || currentInstallStatusObserved;
                         if (shouldVerifyTargetCompletion &&
                             this.assertProtocolV2TargetStatus(statusTargets, expectedTargetIds, expectedPaths)) {
-                            this.protocolV2FinalStatusVerified = true;
                             return;
                         }
                         if (requireCurrentInstallStatus &&
@@ -53631,7 +53662,6 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                             }
                         }
                         if (statusTargets.length === 0) {
-                            resetMissingTargetStatusGrace();
                             if (statusResponse.type !== 'Success') {
                                 lastError = new Error('Protocol V2 firmware update is waiting for user confirmation or target status');
                             }
@@ -53639,23 +53669,10 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                         else {
                             const missingTargetIds = this.getProtocolV2MissingTargetIds(statusTargets, expectedTargetIds);
                             if (missingTargetIds.length > 0) {
-                                const now = Date.now();
                                 const missingKey = missingTargetIds.join(',');
-                                if (missingTargetStatusSince === undefined || missingTargetStatusKey !== missingKey) {
-                                    missingTargetStatusSince = now;
-                                    missingTargetStatusKey = missingKey;
-                                }
-                                else if (now - missingTargetStatusSince >=
-                                    PROTOCOL_V2_MISSING_TARGET_STATUS_GRACE_TIMEOUT) {
-                                    const reportedTargetIds = statusTargets
-                                        .map(target => normalizeProtocolV2TargetId(target.target_id))
-                                        .filter((targetId) => targetId !== undefined);
-                                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareError, `Protocol V2 firmware status is missing requested records: targetIds=${missingKey} reportedTargetIds=${reportedTargetIds.join(',')}`);
-                                }
                                 lastError = new Error(`Protocol V2 firmware status is temporarily missing targetIds=${missingKey}`);
                             }
                             else {
-                                resetMissingTargetStatusGrace();
                                 lastError = new Error('Protocol V2 firmware targets are still installing');
                             }
                         }
@@ -53664,7 +53681,6 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                         if (isProtocolV2TerminalInstallStatusError(error)) {
                             throw error;
                         }
-                        resetMissingTargetStatusGrace();
                         if (isProtocolV2FirmwareStatusEndpointUnavailable(error)) {
                             if (!currentDeviceInfo) {
                                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 device identity is unavailable during install polling');
@@ -53678,16 +53694,9 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                                 return;
                             }
                             if (isNormalMode) {
-                                const now = Date.now();
-                                normalModeWithoutInstallEvidenceSince !== null && normalModeWithoutInstallEvidenceSince !== void 0 ? normalModeWithoutInstallEvidenceSince : (normalModeWithoutInstallEvidenceSince = now);
-                                if (now - normalModeWithoutInstallEvidenceSince >=
-                                    PROTOCOL_V2_MISSING_TARGET_STATUS_GRACE_TIMEOUT) {
-                                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareError, 'Protocol V2 device returned to normal mode without install ACK, target status, or version change');
-                                }
                                 lastError = new Error('Protocol V2 device is in normal mode but installation is not yet confirmed');
                             }
                             else {
-                                normalModeWithoutInstallEvidenceSince = undefined;
                                 lastError = new Error('Protocol V2 firmware status endpoint is unavailable while the device remains in loader mode');
                             }
                         }
@@ -53713,12 +53722,14 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                     }
                     shouldReconnect = true;
                     deviceInfo = undefined;
-                    resetMissingTargetStatusGrace();
                     Log$7.log('Protocol V2 firmware install device readiness probe failed: ', error);
                 }
                 yield hdShared.wait(1000);
             }
-            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Protocol V2 firmware update status not complete within ${PROTOCOL_V2_INSTALL_TIMEOUT / 1000}s: ${this.normalizeErrorMessage(lastError)}`);
+            Log$7.error(`[FirmwareUpdateV4] install timed out after ${PROTOCOL_V2_INSTALL_TIMEOUT / 1000}s: ${this.normalizeErrorMessage(lastError)}`);
+            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareError, undefined, {
+                firmwareUpdateCode: PROTOCOL_V2_INSTALL_TIMEOUT_CODE,
+            });
         });
     }
     exitProtocolV2BootloaderToNormal() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.0-alpha.136",
+  "version": "1.2.0-alpha.140",
   "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.0-alpha.136",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.136",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.140",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.140",
     "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": "92945bc4aae3d6602dd44c2e028e902e6bce7b55"
+  "gitHead": "15e3f0dc6c543c83a96e63b5d19aad70cdd6efb1"
 }