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

package/src/data-manager/DataManager.ts

@@ -1,6 +1,6 @@
 import axios from 'axios';
 import semver from 'semver';
-import { EDeviceType, EFirmwareType } from '@onekeyfe/hd-shared';
+import { EDeviceType, EFirmwareType, ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 
 import MessagesJSON from '../data/messages/messages.json';
 import MessagesLegacyV1JSON from '../data/messages/messages_legacy_v1.json';
@@ -17,6 +17,7 @@ import {
 } from '../utils';
 import { DeviceModelToTypes } from '../types';
 import { findLatestRelease, getReleaseChangelog, getReleaseStatus } from '../utils/release';
+import { parseProtocolV2Resources } from '../protocols/protocol-v2/resources';
 
 import type {
   AssetsMap,
@@ -25,6 +26,7 @@ import type {
   Features,
   IDeviceBLEFirmwareStatus,
   IDeviceFirmwareStatus,
+  IProtocolV2Resources,
   ITransportStatus,
   IVersionArray,
   RemoteConfigResponse,
@@ -67,7 +69,7 @@ function getFirmwareTypeFromField(firmwareField: IFirmwareField): EFirmwareType
 
 export default class DataManager {
   static deviceMap: DeviceTypeMap & {
-    [k: string]: DeviceTypeMap[keyof DeviceTypeMap] | undefined;
+    [k: string]: NonNullable<DeviceTypeMap[keyof DeviceTypeMap]> | undefined;
   } = {
     [EDeviceType.Classic]: {
       firmware: [],
@@ -93,6 +95,10 @@ export default class DataManager {
       firmware: [],
       ble: [],
     },
+    [EDeviceType.Neo]: {
+      firmware: [],
+      ble: [],
+    },
     [EDeviceType.ClassicPure]: {
       firmware: [],
       ble: [],
@@ -111,6 +117,8 @@ export default class DataManager {
 
   static lastCheckTimestamp = 0;
 
+  static protocolV2ResourcesConfigError: Error | undefined;
+
   static getFirmwareStatus = (
     features: Features,
     firmwareType: EFirmwareType
@@ -355,7 +363,7 @@ export default class DataManager {
 
   private static enrichFirmwareReleaseInfo(
     deviceData: DeviceTypeMap[keyof DeviceTypeMap] | undefined
-  ): DeviceTypeMap[keyof DeviceTypeMap] {
+  ): NonNullable<DeviceTypeMap[keyof DeviceTypeMap]> {
     // Safety check: return default structure if input is undefined/null
     if (!deviceData || typeof deviceData !== 'object') {
       return {
@@ -397,20 +405,11 @@ export default class DataManager {
     return enrichedData;
   }
 
-  static async load(settings: ConnectSettings) {
+  static async load(settings: ConnectSettings): Promise<boolean> {
     this.settings = settings;
-    const manifestMode =
-      settings.firmwareManifestMode ?? (settings.fetchConfig ? 'sdk-managed' : undefined);
-    if (settings.preloadedConfig) {
-      this.applyRemoteConfig(settings.preloadedConfig);
-      Log.log('[DataConfig] Preloaded firmware config loaded');
-      return;
-    }
-    if (manifestMode === 'external-only') {
-      throw new Error('External firmware config snapshot is required');
-    }
-    if (manifestMode !== 'sdk-managed') {
-      return;
+    this.protocolV2ResourcesConfigError = undefined;
+    if (!settings.fetchConfig) {
+      return false;
     }
 
     const url = settings.preRelease
@@ -419,48 +418,87 @@ export default class DataManager {
 
     const urlWithCache = `${url}?noCache=${getTimeStamp()}`;
     let data: RemoteConfigResponse | null = null;
+    let fetchMethod: 'configFetcher' | 'axios' | 'none' = 'none';
+
+    // 1. Try custom configFetcher first (client-side IP direct connection support)
     if (settings.configFetcher) {
-      Log.debug('[DataConfig] Trying client configFetcher...');
+      Log.debug('[DataConfig] Trying configFetcher (client-side fetcher)...');
       try {
         data = await settings.configFetcher(urlWithCache);
+        if (data) {
+          fetchMethod = 'configFetcher';
+          Log.log('[DataConfig] ConfigFetcher success');
+        } else {
+          Log.debug('[DataConfig] ConfigFetcher returned null, will fallback to axios');
+        }
       } catch (e) {
-        Log.warn('[DataConfig] Client configFetcher failed:', e);
+        Log.warn('[DataConfig] ConfigFetcher error, will fallback to axios:', e);
       }
     }
+
+    // 2. Fallback to default axios request
     if (!data) {
-      Log.debug('[DataConfig] Trying SDK-managed config request...');
+      Log.debug('[DataConfig] Trying axios (SDK default fetcher)...');
       try {
         const response = await axios.get<RemoteConfigResponse>(urlWithCache, {
           // because of iframe timeout is 10000
           timeout: 7000,
         });
         data = response.data;
-        Log.log('[DataConfig] SDK-managed config request succeeded');
+        fetchMethod = 'axios';
+        Log.log('[DataConfig] Axios fetch success');
       } catch (e) {
-        Log.warn('[DataConfig] SDK-managed config request failed:', e);
+        Log.warn('[DataConfig] Axios fetch error:', e);
       }
     }
 
+    // 3. Apply config if available
     if (data) {
-      this.applyRemoteConfig(data);
-    } else {
-      Log.warn('[DataConfig] SDK-managed config request failed, using built-in default config');
+      let pro2Resources: IProtocolV2Resources | undefined;
+      let neoResources: IProtocolV2Resources | undefined;
+      this.protocolV2ResourcesConfigError = undefined;
+      try {
+        pro2Resources = parseProtocolV2Resources(
+          (data.pro2 as { resources?: unknown } | undefined)?.resources
+        );
+        neoResources = parseProtocolV2Resources(
+          (data.neo 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);
+      }
+      const enrichedPro2Config = this.enrichFirmwareReleaseInfo(data.pro2);
+      const enrichedNeoConfig = this.enrichFirmwareReleaseInfo(data.neo);
+      const { resources: _unvalidatedResources, ...pro2Config } = enrichedPro2Config;
+      const { resources: _unvalidatedNeoResources, ...neoConfig } = enrichedNeoConfig;
+      Log.log(`[DataConfig] Config loaded successfully via [${fetchMethod}]`);
+      this.deviceMap = {
+        [EDeviceType.Classic]: this.enrichFirmwareReleaseInfo(data.classic),
+        [EDeviceType.Classic1s]: this.enrichFirmwareReleaseInfo(data.classic1s),
+        [EDeviceType.ClassicPure]: this.enrichFirmwareReleaseInfo(data.classicpure),
+        [EDeviceType.Mini]: this.enrichFirmwareReleaseInfo(data.mini),
+        [EDeviceType.Touch]: this.enrichFirmwareReleaseInfo(data.touch),
+        [EDeviceType.Pro]: this.enrichFirmwareReleaseInfo(data.pro),
+        [EDeviceType.Pro2]: {
+          ...pro2Config,
+          ...(pro2Resources ? { resources: pro2Resources } : undefined),
+        },
+        [EDeviceType.Neo]: {
+          ...neoConfig,
+          ...(neoResources ? { resources: neoResources } : undefined),
+        },
+      };
+      this.assets = {
+        bridge: data.bridge,
+      };
+      return true;
     }
-  }
-
-  private static applyRemoteConfig(data: RemoteConfigResponse) {
-    this.deviceMap = {
-      [EDeviceType.Classic]: this.enrichFirmwareReleaseInfo(data.classic),
-      [EDeviceType.Classic1s]: this.enrichFirmwareReleaseInfo(data.classic1s),
-      [EDeviceType.ClassicPure]: this.enrichFirmwareReleaseInfo(data.classicpure),
-      [EDeviceType.Mini]: this.enrichFirmwareReleaseInfo(data.mini),
-      [EDeviceType.Touch]: this.enrichFirmwareReleaseInfo(data.touch),
-      [EDeviceType.Pro]: this.enrichFirmwareReleaseInfo(data.pro),
-      [EDeviceType.Pro2]: this.enrichFirmwareReleaseInfo(data.pro2),
-    };
-    this.assets = {
-      bridge: data.bridge,
-    };
+    Log.warn('[DataConfig] All fetch methods failed, using built-in default config');
+    return false;
   }
 
   static updateEnv(newEnv: ConnectSettings['env']) {
@@ -478,10 +516,44 @@ export default class DataManager {
 
   static async checkAndReloadData() {
     if (getTimeStamp() - this.lastCheckTimestamp > 1000 * 60 * 60 * 3) {
-      await this.load(this.settings).then(() => {
+      const loaded = await this.load(this.settings);
+      if (loaded) {
         this.lastCheckTimestamp = getTimeStamp();
-      });
+      }
+    }
+  }
+
+  /** Force a fresh remote config before an update is allowed to mutate the device. */
+  static async forceReloadData({
+    requireResources = false,
+  }: { requireResources?: boolean } = {}): Promise<void> {
+    if (!this.settings) {
+      throw new Error('Remote config settings are not initialized');
+    }
+    const loaded = await this.load(this.settings);
+    if (!loaded) {
+      throw ERRORS.TypedError(
+        HardwareErrorCode.NetworkError,
+        'Unable to refresh the latest remote config'
+      );
     }
+    if (requireResources && this.protocolV2ResourcesConfigError) {
+      throw ERRORS.TypedError(
+        HardwareErrorCode.FirmwareUpdateDownloadFailed,
+        `Invalid Pro2 resources config: ${this.protocolV2ResourcesConfigError.message}`
+      );
+    }
+    this.lastCheckTimestamp = getTimeStamp();
+  }
+
+  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?.boot;
   }
 
   static getProtobufMessages(schema: ProtobufMessageSchema = 'v1CurrentSchema'): JSON {

package/src/data-manager/TransportManager.ts

@@ -121,6 +121,12 @@ export default class TransportManager {
   }
 
   static setTransport(TransportConstructor: any, plugin?: LowlevelTransportSharedPlugin) {
+    if (typeof TransportConstructor !== 'function') {
+      throw ERRORS.TypedError(
+        HardwareErrorCode.TransportNotConfigured,
+        'Transport constructor is not available'
+      );
+    }
     const env = DataManager.getSettings('env');
     if (env === 'react-native') {
       /** Actually initializes the ReactNativeTransport */

package/src/data-manager/connectSettings.ts

@@ -115,21 +115,10 @@ export const parseConnectSettings = (input: Partial<ConnectSettings> = {}) => {
     settings.fetchConfig = input.fetchConfig;
   }
 
-  if (
-    input.firmwareManifestMode === 'sdk-managed' ||
-    input.firmwareManifestMode === 'external-only'
-  ) {
-    settings.firmwareManifestMode = input.firmwareManifestMode;
-  }
-
   if (input.configFetcher) {
     settings.configFetcher = input.configFetcher;
   }
 
-  if (input.preloadedConfig) {
-    settings.preloadedConfig = input.preloadedConfig;
-  }
-
   return settings;
 };