@onekeyfe/hd-core 1.2.0-alpha.95 → 1.2.0-alpha.97

package/src/data-manager/DataManager.ts

@@ -94,10 +94,12 @@ export default class DataManager {
       ble: [],
     },
     [EDeviceType.Pro2]: {
-      'firmware-v1': [],
+      firmware: [],
+      ble: [],
     },
     [EDeviceType.Neo]: {
-      'firmware-v1': [],
+      firmware: [],
+      ble: [],
     },
     [EDeviceType.ClassicPure]: {
       firmware: [],
@@ -119,8 +121,6 @@ export default class DataManager {
 
   static protocolV2ResourcesConfigError: Error | undefined;
 
-  private static protocolV2NeoResourcesConfigError: Error | undefined;
-
   static getFirmwareStatus = (
     features: Features,
     firmwareType: EFirmwareType
@@ -410,7 +410,6 @@ export default class DataManager {
   static async load(settings: ConnectSettings): Promise<boolean> {
     this.settings = settings;
     this.protocolV2ResourcesConfigError = undefined;
-    this.protocolV2NeoResourcesConfigError = undefined;
     const manifestMode =
       settings.firmwareManifestMode ?? (settings.fetchConfig ? 'sdk-managed' : undefined);
     if (settings.preloadedConfig) {
@@ -477,21 +476,15 @@ export default class DataManager {
       pro2Resources = parseProtocolV2Resources(
         (data.pro2 as { resources?: unknown } | undefined)?.resources
       );
-    } catch (error) {
-      // Firmware resource metadata is not required for base communication. If the
-      // remote config is temporarily incomplete, disable this resource update only.
-      this.protocolV2ResourcesConfigError =
-        error instanceof Error ? error : new Error(String(error));
-      Log.warn('[DataConfig] Ignoring invalid Pro2 resources config:', error);
-    }
-    try {
       neoResources = parseProtocolV2Resources(
         (data.neo as { resources?: unknown } | undefined)?.resources
       );
     } catch (error) {
-      this.protocolV2NeoResourcesConfigError =
+      // Firmware resource metadata is not required for base communication. If the
+      // remote config is temporarily incomplete, disable this resource update only.
+      this.protocolV2ResourcesConfigError =
         error instanceof Error ? error : new Error(String(error));
-      Log.warn('[DataConfig] Ignoring invalid Neo resources config:', error);
+      Log.warn('[DataConfig] Ignoring invalid Protocol V2 resources config:', error);
     }
     const enrichedPro2Config = this.enrichFirmwareReleaseInfo(data.pro2);
     const enrichedNeoConfig = this.enrichFirmwareReleaseInfo(data.neo);
@@ -544,12 +537,7 @@ export default class DataManager {
   /** Force a fresh remote config before an update is allowed to mutate the device. */
   static async forceReloadData({
     requireResources = false,
-    resourceDeviceType = EDeviceType.Pro2,
-  }: {
-    requireResources?: boolean;
-    resourceDeviceType?: EDeviceType.Pro2 | EDeviceType.Neo;
-  } = {}): Promise<void> {
-    const resourceDeviceName = resourceDeviceType === EDeviceType.Pro2 ? 'Pro2' : 'Neo';
+  }: { requireResources?: boolean } = {}): Promise<void> {
     if (!this.settings) {
       throw new Error('Remote config settings are not initialized');
     }
@@ -557,14 +545,10 @@ export default class DataManager {
       this.lastCheckTimestamp > 0 &&
       getTimeStamp() - this.lastCheckTimestamp <= FIRMWARE_UPDATE_CONFIG_FRESHNESS_MS;
     if (hasFreshConfig) {
-      const resourcesConfigError =
-        resourceDeviceType === EDeviceType.Pro2
-          ? this.protocolV2ResourcesConfigError
-          : this.protocolV2NeoResourcesConfigError;
-      if (requireResources && resourcesConfigError) {
+      if (requireResources && this.protocolV2ResourcesConfigError) {
         throw ERRORS.TypedError(
           HardwareErrorCode.FirmwareUpdateDownloadFailed,
-          `Invalid ${resourceDeviceName} resources config: ${resourcesConfigError.message}`
+          `Invalid Pro2 resources config: ${this.protocolV2ResourcesConfigError.message}`
         );
       }
       return;
@@ -576,23 +560,23 @@ export default class DataManager {
         'Unable to refresh the latest remote config'
       );
     }
-    const resourcesConfigError =
-      resourceDeviceType === EDeviceType.Pro2
-        ? this.protocolV2ResourcesConfigError
-        : this.protocolV2NeoResourcesConfigError;
-    if (requireResources && resourcesConfigError) {
+    if (requireResources && this.protocolV2ResourcesConfigError) {
       throw ERRORS.TypedError(
         HardwareErrorCode.FirmwareUpdateDownloadFailed,
-        `Invalid ${resourceDeviceName} resources config: ${resourcesConfigError.message}`
+        `Invalid Pro2 resources config: ${this.protocolV2ResourcesConfigError.message}`
       );
     }
     this.lastCheckTimestamp = getTimeStamp();
   }
 
-  static getProtocolV2ResourceSource(
+  static getProtocolV2Resources(deviceType: EDeviceType.Pro2 | EDeviceType.Neo = EDeviceType.Pro2) {
+    return this.deviceMap[deviceType]?.resources?.stable;
+  }
+
+  static getProtocolV2BootResources(
     deviceType: EDeviceType.Pro2 | EDeviceType.Neo = EDeviceType.Pro2
   ) {
-    return this.deviceMap[deviceType]?.resources?.source;
+    return this.deviceMap[deviceType]?.resources?.boot;
   }
 
   static getProtobufMessages(schema: ProtobufMessageSchema = 'v1CurrentSchema'): JSON {

package/src/index.ts

@@ -21,16 +21,6 @@ export { executeCallback, cleanupCallback };
 export { preloadSessionCache } from './device/Device';
 export { projectFeatures as projectDeviceStateFeatures } from './device/DeviceStateProjector';
 export { getMethodSupportedProtocols } from './api/utils';
-export {
-  parseProtocolV2ResourceManifest,
-  selectProtocolV2ResourceManifestFiles,
-} from './protocols/protocol-v2/resources';
-export { prepareFirmwareUpdateV4MemoryHost } from './api/firmware/FirmwareMemoryHost';
-export type {
-  FirmwareMemoryArtifact,
-  FirmwareMemoryArtifactEntry,
-  FirmwareUpdateV4MemoryHost,
-} from './api/firmware/FirmwareMemoryHost';
 export {
   getFirmwareUpdateHostBindingGeneration,
   registerFirmwareUpdateHostBinding,