@onekeyfe/hd-core 1.2.0-alpha.41 → 1.2.0-alpha.42

package/src/api/BaseMethod.ts

@@ -16,16 +16,14 @@ import { getBleFirmwareReleaseInfo, getFirmwareReleaseInfo } from './firmware/re
 import { LoggerNames, getLogger } from '../utils';
 import { generateInstanceId } from '../utils/tracing';
 import { DeviceModelToTypes } from '../types';
-import {
-  type UnlockPolicy,
-  getProtocolV2UnlockPolicy,
-} from '../protocols/protocol-v2/unlockPolicy';
 
 import type { Device } from '../device/Device';
 import type DeviceConnector from '../device/DeviceConnector';
 import type { DeviceFirmwareRange, KnownDevice } from '../types';
 import type { CoreMessage } from '../events';
+import type { UnlockPolicy } from '../protocols/protocol-v2/unlockPolicy';
 import type { ProtocolV2InteractionDescriptor } from '../protocols/protocol-v2/uiInteraction';
+import type { ProtocolV2UnlockContext } from '../protocols/protocol-v2/unlockPolicyRunner';
 import type { RequestContext } from '../utils/tracing';
 import type { CoreContext } from '../core';
 
@@ -128,9 +126,7 @@ export abstract class BaseMethod<Params = undefined> {
    */
   checkDeviceId = false;
 
-  /**
-   * 该方法是否需要校验 passphrase state
-   */
+  /** Whether the method requires wallet-session selection and Protocol V2 pre-unlock. */
   useDevicePassphraseState = true;
 
   /**
@@ -168,9 +164,12 @@ export abstract class BaseMethod<Params = undefined> {
    */
   strictCheckDeviceSupport = false;
 
-  /** Core unlocks and retries only explicitly replay-safe Protocol V2 methods. */
+  /** Non-wallet methods may explicitly require Protocol V2 pre-unlock. */
   unlockPolicy: UnlockPolicy = 'none';
 
+  /** Shared by composite methods so nested calls do not repeat the root preflight. */
+  protocolV2UnlockContext?: ProtocolV2UnlockContext;
+
   getSupportedProtocols(): readonly ProtocolType[] {
     return ['V1'];
   }
@@ -188,7 +187,7 @@ export abstract class BaseMethod<Params = undefined> {
   /** Non-blocking Protocol V2 interaction synthesized by the SDK. */
   protocolV2UiInteraction?: ProtocolV2InteractionDescriptor;
 
-  /** Special background methods may suppress all synthesized Protocol V2 UI events. */
+  /** Special background methods may suppress method-level Protocol V2 UI events. */
   protocolV2UiMode: ProtocolV2UiMode = 'auto';
 
   protected throwIfAborted() {
@@ -217,7 +216,6 @@ export abstract class BaseMethod<Params = undefined> {
     this.useDevice = true;
     this.allowDeviceMode = [UI_REQUEST.NOT_INITIALIZE];
     this.requireDeviceMode = [];
-    this.unlockPolicy = getProtocolV2UnlockPolicy(this.name);
   }
 
   abstract init(): void;

package/src/api/CheckAllFirmwareRelease.ts

@@ -1,7 +1,6 @@
-import { EFirmwareType, ERRORS, HardwareError, HardwareErrorCode } from '@onekeyfe/hd-shared';
+import { EFirmwareType, ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 import semver from 'semver';
 
-import { BaseMethod } from './BaseMethod';
 import { UI_REQUEST } from '../constants/ui-request';
 import { DataManager } from '../data-manager';
 import {
@@ -9,18 +8,13 @@ import {
   getBootloaderReleaseInfo,
   getFirmwareReleaseInfo,
 } from './firmware/releaseHelper';
-import {
-  buildFirmwareUpdatePlan,
-  validateFirmwareUpdatePlanForceTargets,
-} from './firmware/FirmwareUpdatePlan';
 import { getBridgeReleaseInfo } from '../utils/bridgeUpdate';
+import { getDeviceFirmwareVersion, getDeviceType, getFirmwareType } from '../utils';
+import { BaseMethod } from './BaseMethod';
 import {
-  LoggerNames,
-  getDeviceFirmwareVersion,
-  getDeviceType,
-  getFirmwareType,
-  getLogger,
-} from '../utils';
+  buildProtocolV2ResourceUpdatePlan,
+  requestProtocolV2ResourceInventory,
+} from '../protocols/protocol-v2/resources';
 
 import type {
   AllFirmwareRelease,
@@ -36,7 +30,6 @@ import type {
   IProtocolV2FirmwareComponent,
   IProtocolV2FirmwareComponentTarget,
 } from '../types';
-import type { FirmwareUpdatePlan } from '../types/api/firmwareUpdatePlan';
 
 const UPDATE_TARGET_BY_COMPONENT_TARGET: Readonly<
   Partial<Record<IProtocolV2FirmwareComponentTarget, FirmwareUpdateV4Target>>
@@ -230,9 +223,6 @@ export function buildProtocolV2FirmwareRelease({
   const targetsToUpdate = components.flatMap(component =>
     component.status === 'outdated' && component.updateTarget ? [component.updateTarget] : []
   );
-  if (targetsToUpdate.length > 0 && release.resourceBundles?.length) {
-    targetsToUpdate.push('resource');
-  }
   const uniqueTargetsToUpdate = Array.from(new Set(targetsToUpdate));
   const hasUpgrade = uniqueTargetsToUpdate.length > 0;
   const required = release.required && hasUpgrade;
@@ -257,8 +247,6 @@ export function buildProtocolV2FirmwareRelease({
   };
 }
 
-const Log = getLogger(LoggerNames.Method);
-
 export default class CheckAllFirmwareRelease extends BaseMethod {
   getSupportedProtocols() {
     return ['V1', 'V2'] as const;
@@ -276,13 +264,8 @@ export default class CheckAllFirmwareRelease extends BaseMethod {
     }
 
     const { features } = this.device;
-    const {
-      checkBridgeRelease,
-      firmwareType: firmwareTypeParams,
-      platform,
-      forceUpdateTargets,
-    } = this.payload as CheckAllFirmwareReleaseParams;
-    const validatedForceUpdateTargets = validateFirmwareUpdatePlanForceTargets(forceUpdateTargets);
+    const { checkBridgeRelease, firmwareType: firmwareTypeParams } = this
+      .payload as CheckAllFirmwareReleaseParams;
 
     if (!features) {
       return Promise.resolve(null);
@@ -313,32 +296,6 @@ export default class CheckAllFirmwareRelease extends BaseMethod {
       firmwareType,
     });
     const bleFirmwareReleaseInfo = getBleFirmwareReleaseInfo(features);
-    let firmwareUpdatePlan: FirmwareUpdatePlan | undefined;
-    try {
-      firmwareUpdatePlan = buildFirmwareUpdatePlan({
-        features,
-        firmwareType,
-        platform: platform ?? 'web',
-        firmware: firmwareRelease,
-        ble: bleFirmwareReleaseInfo,
-        bootloader: bootloaderRelease,
-        forceUpdateTargets: validatedForceUpdateTargets,
-      });
-    } catch (error) {
-      if (
-        validatedForceUpdateTargets.length > 0 ||
-        !(error instanceof HardwareError) ||
-        error.params?.firmwareUpdateCode !== 'FirmwarePlanInvalid'
-      ) {
-        throw error;
-      }
-      // A Plan is an optional external-host capability. Release checks remain
-      // available for legacy and recovery flows when a Plan cannot be built.
-      Log.warn(
-        '[CheckAllFirmwareRelease] Optional firmware Plan is unavailable; using the legacy release result'
-      );
-      firmwareUpdatePlan = undefined;
-    }
 
     return {
       firmware: firmwareRelease,
@@ -353,8 +310,7 @@ export default class CheckAllFirmwareRelease extends BaseMethod {
           }
         : undefined,
       features,
-      firmwareUpdatePlan,
-    } as unknown as AllFirmwareRelease;
+    } as AllFirmwareRelease;
   }
 
   private async runProtocolV2(): Promise<AllFirmwareRelease> {
@@ -386,6 +342,34 @@ export default class CheckAllFirmwareRelease extends BaseMethod {
       firmwareType,
       release,
     });
+    const resources = DataManager.getProtocolV2Resources();
+    let resourceStatus: 'valid' | 'outdated' | 'unknown' = 'unknown';
+    if (resources?.length) {
+      const loaderMode = state.status.mode === 'bootloader' || state.status.mode === 'romloader';
+      if (loaderMode) {
+        resourceStatus = buildProtocolV2ResourceUpdatePlan({
+          resources,
+          mode: 'bootloader-recovery',
+        }).status;
+      } else if (state.status.mode === 'normal') {
+        try {
+          const inventory = await requestProtocolV2ResourceInventory({
+            commands: this.device.getCommands(),
+          });
+          resourceStatus = buildProtocolV2ResourceUpdatePlan({
+            resources,
+            inventory,
+            mode: 'application',
+          }).status;
+        } catch {
+          resourceStatus = 'unknown';
+        }
+      }
+    }
+    const targetsToUpdate = [
+      ...plan.targetsToUpdate,
+      ...(resourceStatus === 'outdated' ? (['resource'] as const) : []),
+    ];
     const firmwareStatus = plan.status === 'unavailable' ? 'unknown' : plan.status;
     const emptyRelease = 'none' as const;
 
@@ -408,6 +392,9 @@ export default class CheckAllFirmwareRelease extends BaseMethod {
       protocol: 'V2',
       deviceType: 'pro2',
       ...plan,
+      resourceStatus,
+      hasUpgrade: plan.hasUpgrade || resourceStatus === 'outdated',
+      targetsToUpdate,
     };
   }
 }