@onekeyfe/hd-core 1.2.0-alpha.68 → 1.2.0-alpha.69

package/src/api/CheckAllFirmwareRelease.ts

@@ -1,13 +1,6 @@
-import {
-  EDeviceType,
-  EFirmwareType,
-  ERRORS,
-  HardwareError,
-  HardwareErrorCode,
-} from '@onekeyfe/hd-shared';
+import { EDeviceType, 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 {
@@ -15,22 +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 {
   buildProtocolV2ResourceUpdatePlan,
   readProtocolV2ResourceInventory,
 } from '../protocols/protocol-v2/resources';
-import {
-  LoggerNames,
-  getDeviceFirmwareVersion,
-  getDeviceType,
-  getFirmwareType,
-  getLogger,
-} from '../utils';
 
 import type {
   AllFirmwareRelease,
@@ -46,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>>
@@ -191,6 +174,7 @@ export function buildProtocolV2FirmwareRelease({
   remotePayloadHashes = {},
   firmwareType,
   release,
+  deviceType,
 }: {
   currentVersions: DeviceStateVersions;
   currentVerification?: Partial<DeviceFeaturesVerify>;
@@ -198,6 +182,7 @@ export function buildProtocolV2FirmwareRelease({
   remotePayloadHashes?: Readonly<Record<string, string | null>>;
   firmwareType: EFirmwareType;
   release: IFirmwareReleaseInfo | undefined;
+  deviceType?: 'pro2' | 'neo';
 }): ProtocolV2FirmwareReleasePlan {
   if (!release) {
     return {
@@ -212,8 +197,8 @@ export function buildProtocolV2FirmwareRelease({
     };
   }
 
-  let components = getOrderedComponentEntries(release).map(([configKey, component]) =>
-    buildComponentRelease({
+  let components = getOrderedComponentEntries(release).map(([configKey, component]) => {
+    const result = buildComponentRelease({
       configKey,
       component,
       currentVersions,
@@ -223,8 +208,20 @@ export function buildProtocolV2FirmwareRelease({
         ? remotePayloadHashes[configKey]
         : normalizeHex(component.payloadHash),
       releaseRequired: release.required,
-    })
-  );
+    });
+    if (
+      deviceType === 'neo' &&
+      (result.componentTarget === 'SE03' || result.componentTarget === 'SE04')
+    ) {
+      return {
+        ...result,
+        updateTarget: null,
+        status: 'unsupported' as const,
+        required: false,
+      };
+    }
+    return result;
+  });
   if (!currentVersions.applicationP2) {
     const applicationP1 = components.find(
       component => component.componentTarget === 'APPLICATION_P1'
@@ -269,8 +266,6 @@ export function buildProtocolV2FirmwareRelease({
   };
 }
 
-const Log = getLogger(LoggerNames.Method);
-
 export default class CheckAllFirmwareRelease extends BaseMethod {
   getSupportedProtocols() {
     return ['V1', 'V2'] as const;
@@ -288,13 +283,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);
@@ -325,32 +315,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,
@@ -365,8 +329,7 @@ export default class CheckAllFirmwareRelease extends BaseMethod {
           }
         : undefined,
       features,
-      firmwareUpdatePlan,
-    } as unknown as AllFirmwareRelease;
+    } as AllFirmwareRelease;
   }
 
   private async runProtocolV2(): Promise<AllFirmwareRelease> {
@@ -401,6 +364,7 @@ export default class CheckAllFirmwareRelease extends BaseMethod {
       checkFirmwareHash,
       firmwareType,
       release,
+      deviceType: state.identity.deviceType,
     });
     const resourceDeviceType =
       state.identity.deviceType === 'neo' ? EDeviceType.Neo : EDeviceType.Pro2;

package/src/api/FirmwareUpdate.ts

@@ -10,7 +10,6 @@ import { UI_REQUEST } from '../constants/ui-request';
 import { BaseMethod } from './BaseMethod';
 import { validateParams } from './helpers/paramsValidator';
 import { getBinary } from './firmware/getBinary';
-import { BOOTLOADER_POLL_INITIALIZE_TIMEOUT_MS } from './firmware/FirmwareUpdateBaseMethod';
 import { uploadFirmware } from './firmware/uploadFirmware';
 import { createUiMessage } from '../events';
 import { DeviceModelToTypes, type KnownDevice } from '../types';
@@ -79,10 +78,6 @@ export default class FirmwareUpdate extends BaseMethod<Params> {
     this.checkPromise = createDeferred();
     const env = DataManager.getSettings('env');
     const isBleReconnect = connectId && DataManager.isBleConnect(env);
-    // Tracks the in-flight BLE probe so interval ticks never overlap: a superseded
-    // Initialize left pending on the V1 transport is exactly what later times out
-    // and used to tear down the connection mid-firmware-upload.
-    let bleProbeInFlight = false;
 
     Log.log('FirmwareUpdate [checkDeviceToBootloader] isBleReconnect: ', isBleReconnect);
 
@@ -90,8 +85,6 @@ export default class FirmwareUpdate extends BaseMethod<Params> {
     const intervalTimer: ReturnType<typeof setInterval> | undefined = setInterval(
       async () => {
         if (isBleReconnect) {
-          if (bleProbeInFlight) return;
-          bleProbeInFlight = true;
           try {
             await this.device.deviceConnector?.acquire(
               this.device.originalDescriptor.id,
@@ -99,10 +92,7 @@ export default class FirmwareUpdate extends BaseMethod<Params> {
               true,
               this.payload.connectProtocol ?? this.device.originalDescriptor.protocolType
             );
-            // Bound each probe so a request the rebooting device never received
-            // frees the slot for the next tick instead of hanging into the
-            // 30s reboot budget.
-            await this.device.initialize({ timeoutMs: BOOTLOADER_POLL_INITIALIZE_TIMEOUT_MS });
+            await this.device.initialize();
             if (this.device.isBootloader()) {
               clearInterval(intervalTimer);
               this.checkPromise?.resolve(true);
@@ -110,8 +100,6 @@ export default class FirmwareUpdate extends BaseMethod<Params> {
           } catch (e) {
             // ignore error because of device is not connected
             Log.log('catch Bluetooth error when device is restarting: ', e);
-          } finally {
-            bleProbeInFlight = false;
           }
         } else {
           const deviceDiff = await this.device.deviceConnector?.enumerate();