@onekeyfe/hd-core 1.1.34-alpha.3 → 1.1.34-alpha.4

package/src/data-manager/DataManager.ts

@@ -4,7 +4,6 @@ import { EDeviceType, EFirmwareType } from '@onekeyfe/hd-shared';
 
 import MessagesJSON from '../data/messages/messages.json';
 import MessagesLegacyV1JSON from '../data/messages/messages_legacy_v1.json';
-import MessagesProtocolV2JSON from '../data/messages/messages-protocol-v2.json';
 import {
   LoggerNames,
   getDeviceBLEFirmwareVersion,
@@ -34,7 +33,6 @@ const Log = getLogger(LoggerNames.Core);
 
 export const FIRMWARE_FIELDS = [
   'firmware',
-  'firmware-v1',
   'firmware-v2',
   'firmware-v8',
   'firmware-btc-v8',
@@ -42,12 +40,10 @@ export const FIRMWARE_FIELDS = [
 
 export type IFirmwareField = (typeof FIRMWARE_FIELDS)[number];
 
-export type ProtocolV1MessageSchema = 'v1CurrentSchema' | 'v1LegacySchema';
-export type ProtobufMessageSchema = ProtocolV1MessageSchema | 'v2Schema';
+export type MessageVersion = 'latest' | 'v1';
 
 const FIRMWARE_FIELD_TYPE_MAP: Readonly<Record<IFirmwareField, EFirmwareType>> = {
   firmware: EFirmwareType.Universal,
-  'firmware-v1': EFirmwareType.Universal,
   'firmware-v2': EFirmwareType.Universal,
   'firmware-v8': EFirmwareType.Universal,
   'firmware-btc-v8': EFirmwareType.BitcoinOnly,
@@ -66,9 +62,7 @@ function getFirmwareTypeFromField(firmwareField: IFirmwareField): EFirmwareType
 }
 
 export default class DataManager {
-  static deviceMap: DeviceTypeMap & {
-    [k: string]: DeviceTypeMap[keyof DeviceTypeMap] | undefined;
-  } = {
+  static deviceMap: DeviceTypeMap = {
     [EDeviceType.Classic]: {
       firmware: [],
       ble: [],
@@ -89,10 +83,6 @@ export default class DataManager {
       firmware: [],
       ble: [],
     },
-    [EDeviceType.Pro2]: {
-      firmware: [],
-      ble: [],
-    },
     [EDeviceType.ClassicPure]: {
       firmware: [],
       ble: [],
@@ -103,10 +93,9 @@ export default class DataManager {
 
   static settings: ConnectSettings;
 
-  static messages: { [schema in ProtobufMessageSchema]: JSON } = {
-    v1CurrentSchema: MessagesJSON as unknown as JSON,
-    v1LegacySchema: MessagesLegacyV1JSON as unknown as JSON,
-    v2Schema: MessagesProtocolV2JSON as unknown as JSON,
+  static messages: { [version in MessageVersion]: JSON } = {
+    latest: MessagesJSON as unknown as JSON,
+    v1: MessagesLegacyV1JSON as unknown as JSON,
   };
 
   static lastCheckTimestamp = 0;
@@ -120,11 +109,11 @@ export default class DataManager {
 
     const deviceFirmwareType = getFirmwareType(features);
     const deviceFirmwareVersion = getDeviceFirmwareVersion(features);
-    if (features.firmwarePresent === false) {
+    if (features.firmware_present === false) {
       return 'none';
     }
 
-    if (DeviceModelToTypes.model_mini.includes(deviceType) && features.bootloaderMode) {
+    if (DeviceModelToTypes.model_mini.includes(deviceType) && features.bootloader_mode) {
       return 'unknown';
     }
 
@@ -270,8 +259,8 @@ export default class DataManager {
     const targetDeviceConfigList = this.deviceMap[deviceType]?.[firmwareUpdateField] ?? [];
 
     if (
-      features.firmwarePresent === false ||
-      (DeviceModelToTypes.model_classic.includes(deviceType) && features.bootloaderMode)
+      features.firmware_present === false ||
+      (DeviceModelToTypes.model_classic.includes(deviceType) && features.bootloader_mode)
     ) {
       // Always return least changelog
       return getReleaseChangelog(targetDeviceConfigList, '0.0.0');
@@ -309,15 +298,15 @@ export default class DataManager {
     const deviceType = getDeviceType(features);
     if (deviceType === EDeviceType.Unknown) return 'unknown';
 
-    const deviceBleFirmwareVersion = getDeviceBLEFirmwareVersion(features);
+    const deviceBLEFirmwareVersion = getDeviceBLEFirmwareVersion(features);
 
     /** mini has no device ble_ver */
-    if (!deviceBleFirmwareVersion) {
+    if (!deviceBLEFirmwareVersion) {
       return 'none';
     }
 
     const targetDeviceConfigList = this.deviceMap[deviceType]?.ble ?? [];
-    const currentVersion = deviceBleFirmwareVersion.join('.');
+    const currentVersion = deviceBLEFirmwareVersion.join('.');
     return getReleaseStatus(targetDeviceConfigList, currentVersion);
   };
 
@@ -325,14 +314,14 @@ export default class DataManager {
     const deviceType = getDeviceType(features);
     if (deviceType === EDeviceType.Unknown) return [];
 
-    const deviceBleFirmwareVersion = getDeviceBLEFirmwareVersion(features);
+    const deviceBLEFirmwareVersion = getDeviceBLEFirmwareVersion(features);
 
-    if (!deviceBleFirmwareVersion) {
+    if (!deviceBLEFirmwareVersion) {
       return [];
     }
 
     const targetDeviceConfigList = this.deviceMap[deviceType]?.ble ?? [];
-    const currentVersion = deviceBleFirmwareVersion.join('.');
+    const currentVersion = deviceBLEFirmwareVersion.join('.');
     return getReleaseChangelog(targetDeviceConfigList, currentVersion);
   };
 
@@ -399,17 +388,7 @@ export default class DataManager {
 
   static async load(settings: ConnectSettings) {
     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') {
+    if (!settings.fetchConfig) {
       return;
     }
 
@@ -419,50 +398,59 @@ 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);
+      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),
+      };
+      this.assets = {
+        bridge: data.bridge,
+      };
     } else {
-      Log.warn('[DataConfig] SDK-managed config request failed, using built-in default config');
+      Log.warn('[DataConfig] All fetch methods failed, using built-in default config');
     }
   }
 
-  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,
-    };
-  }
-
   static updateEnv(newEnv: ConnectSettings['env']) {
     if (this.settings) {
       const prevEnv = this.settings.env;
@@ -484,8 +472,8 @@ export default class DataManager {
     }
   }
 
-  static getProtobufMessages(schema: ProtobufMessageSchema = 'v1CurrentSchema'): JSON {
-    return this.messages[schema];
+  static getProtobufMessages(messageVersion: MessageVersion = 'latest'): JSON {
+    return this.messages[messageVersion];
   }
 
   static getSettings(key?: undefined): ConnectSettings;

package/src/data-manager/MessagesConfig.ts

@@ -1,28 +1,28 @@
 import type { IDeviceModel, IDeviceType } from '../types';
-import type { ProtocolV1MessageSchema } from './DataManager';
+import type { MessageVersion } from './DataManager';
 
 type DeviceVersionConfig = {
   [deviceType in IDeviceType | IDeviceModel]?: {
     minVersion: string;
-    protocolV1MessageSchema: ProtocolV1MessageSchema;
+    messageVersion: MessageVersion;
   }[];
 };
 
 export const PROTOBUF_MESSAGE_CONFIG: DeviceVersionConfig = {
   model_mini: [
-    // Classic1s starts from 3.5.0, so use the current Protocol V1 schema by default.
-    // Only use the legacy Protocol V1 schema for specific old versions (< 3.3.0).
-    { minVersion: '3.3.0', protocolV1MessageSchema: 'v1CurrentSchema' },
-    { minVersion: '0.0.1', protocolV1MessageSchema: 'v1LegacySchema' },
-    // Fallback to current Protocol V1 schema for unknown versions (0.0.0).
-    { minVersion: '0.0.0', protocolV1MessageSchema: 'v1CurrentSchema' },
+    // Classic1s starts from 3.5.0, so use latest by default
+    // Only use v1 for specific old versions (< 3.3.0)
+    { minVersion: '3.3.0', messageVersion: 'latest' },
+    { minVersion: '0.0.1', messageVersion: 'v1' },
+    // Fallback to latest for unknown versions (0.0.0) to prevent device type detection issues
+    { minVersion: '0.0.0', messageVersion: 'latest' },
   ],
   model_touch: [
-    // Use the current Protocol V1 schema by default for Touch/Pro.
-    // Only use the legacy Protocol V1 schema for specific old versions (< 4.5.0).
-    { minVersion: '4.5.0', protocolV1MessageSchema: 'v1CurrentSchema' },
-    { minVersion: '0.0.1', protocolV1MessageSchema: 'v1LegacySchema' },
-    // Fallback to current Protocol V1 schema for unknown versions (0.0.0).
-    { minVersion: '0.0.0', protocolV1MessageSchema: 'v1CurrentSchema' },
+    // Use latest by default for Touch/Pro
+    // Only use v1 for specific old versions (< 4.5.0)
+    { minVersion: '4.5.0', messageVersion: 'latest' },
+    { minVersion: '0.0.1', messageVersion: 'v1' },
+    // Fallback to latest for unknown versions (0.0.0)
+    { minVersion: '0.0.0', messageVersion: 'latest' },
   ],
 };

package/src/data-manager/TransportManager.ts

@@ -4,9 +4,9 @@ import DataManager from './DataManager';
 import { LoggerNames, getLogger } from '../utils';
 // eslint-disable-next-line import/no-cycle
 import { DevicePool } from '../device/DevicePool';
-import { getSupportProtocolV1MessageSchema } from '../utils/deviceFeaturesUtils';
+import { getSupportMessageVersion } from '../utils/deviceFeaturesUtils';
 
-import type { ProtocolV1MessageSchema } from './DataManager';
+import type { MessageVersion } from './DataManager';
 import type { LowlevelTransportSharedPlugin, Transport } from '@onekeyfe/hd-transport';
 import type { Features } from '../types';
 
@@ -17,7 +17,6 @@ const LowLevelLogger = getLogger(LoggerNames.HdTransportLowLevel);
 const NodeUsbLogger = getLogger(LoggerNames.HdTransportNodeUsb);
 const WebBleLogger = getLogger(LoggerNames.HdWebBleTransport);
 const WebUsbLogger = getLogger(LoggerNames.HdTransportWebUsb);
-const REACT_NATIVE_BLE_SCAN_TIMEOUT_MS = 8000;
 
 /**
  * transport 在同一个环境中只会存在一个
@@ -33,7 +32,7 @@ export default class TransportManager {
 
   static reactNativeInit = false;
 
-  static protocolV1MessageSchema: ProtocolV1MessageSchema = 'v1CurrentSchema';
+  static messageVersion: MessageVersion = 'latest';
 
   static plugin: LowlevelTransportSharedPlugin | null = null;
 
@@ -41,7 +40,7 @@ export default class TransportManager {
     Log.debug('transport manager load');
     this.defaultMessages = DataManager.getProtobufMessages();
     this.currentMessages = this.defaultMessages;
-    this.protocolV1MessageSchema = 'v1CurrentSchema';
+    this.messageVersion = 'latest';
   }
 
   static async configure() {
@@ -75,9 +74,6 @@ export default class TransportManager {
       }
       Log.debug('Configuring transports');
       await this.transport.configure(JSON.stringify(this.defaultMessages));
-      this.currentMessages = this.defaultMessages;
-      this.protocolV1MessageSchema = 'v1CurrentSchema';
-      await this.configureProtocolV2Messages();
       Log.debug('Configuring transports done');
     } catch (error) {
       Log.debug('Initializing transports error: ', error);
@@ -87,31 +83,20 @@ export default class TransportManager {
     }
   }
 
-  /**
-   * Re-load the transport's main protobuf schema based on a device's reported features.
-   *
-   * This handles protobuf schema compatibility within Protocol V1 (e.g. Touch's legacy
-   * vs current Protocol V1 schema). It is NOT used to switch between Protocol V1 and Protocol V2 —
-   * the transport already holds both schemas after initial configure(), and routes per
-   * device by `getProtocolType()`.
-   */
-  static async reconfigure(features?: Features) {
-    if (!features) {
-      return;
-    }
-
-    const { protocolV1MessageSchema, messages } = getSupportProtocolV1MessageSchema(features);
+  static async reconfigure(features?: Features | undefined) {
+    Log.debug(`Begin reconfiguring transports`);
+    const { messageVersion, messages } = getSupportMessageVersion(features);
 
     if (this.currentMessages === messages || !messages) {
       return;
     }
 
-    Log.debug(`Reconfiguring transports Protocol V1 schema:${protocolV1MessageSchema}`);
+    Log.debug(`Reconfiguring transports version:${messageVersion}`);
 
     try {
       await this.transport.configure(JSON.stringify(messages));
       this.currentMessages = messages;
-      this.protocolV1MessageSchema = protocolV1MessageSchema;
+      this.messageVersion = messageVersion;
     } catch (error) {
       throw ERRORS.TypedError(
         HardwareErrorCode.TransportInvalidProtobuf,
@@ -124,9 +109,7 @@ export default class TransportManager {
     const env = DataManager.getSettings('env');
     if (env === 'react-native') {
       /** Actually initializes the ReactNativeTransport */
-      this.transport = new TransportConstructor({
-        scanTimeout: REACT_NATIVE_BLE_SCAN_TIMEOUT_MS,
-      }) as unknown as Transport;
+      this.transport = new TransportConstructor({ scanTimeout: 3000 }) as unknown as Transport;
     } else {
       /** Actually initializes the HttpTransport */
       this.transport = new TransportConstructor() as unknown as Transport;
@@ -147,15 +130,6 @@ export default class TransportManager {
     return this.transport;
   }
 
-  private static async configureProtocolV2Messages() {
-    const protocolV2Messages = DataManager.getProtobufMessages('v2Schema');
-    const { configureProtocolV2 } = this.transport;
-    if (protocolV2Messages && typeof configureProtocolV2 === 'function') {
-      await configureProtocolV2.call(this.transport, JSON.stringify(protocolV2Messages));
-      Log.debug('Protocol V2 messages configured');
-    }
-  }
-
   static getDefaultMessages() {
     return this.defaultMessages;
   }
@@ -164,7 +138,7 @@ export default class TransportManager {
     return this.currentMessages;
   }
 
-  static getProtocolV1MessageSchema() {
-    return this.protocolV1MessageSchema;
+  static getMessageVersion() {
+    return this.messageVersion;
   }
 }

package/src/data-manager/connectSettings.ts

@@ -115,21 +115,6 @@ 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;
 };