@ukeyfe/hardware-core 1.1.29 → 1.1.31

package/src/types/device.ts

@@ -96,12 +96,13 @@ export type IDeviceType =
   | EDeviceType.ClassicPure
   | EDeviceType.Mini
   | EDeviceType.Touch
-  | EDeviceType.Pro;
+  | EDeviceType.Core26
+  | EDeviceType.Core27Pro;
 
 /**
  * model_classic: 'classic' | 'classic1s' | 'classicpure'
  * model_mini: 'classic' | 'classic1s' | 'classicpure' | 'mini'
- * model_touch: 'touch' | 'pro'
+ * model_touch: 'touch' | 'core26' | 'core27pro'
  */
 export type IDeviceModel = 'model_classic' | 'model_mini' | 'model_touch' | 'model_classic1s';
 
@@ -112,7 +113,7 @@ export const DeviceModelToTypes: { [deviceModel in IDeviceModel]: IDeviceType[]
     EDeviceType.ClassicPure,
     EDeviceType.Mini,
   ],
-  model_touch: [EDeviceType.Touch, EDeviceType.Pro],
+  model_touch: [EDeviceType.Touch, EDeviceType.Core26, EDeviceType.Core27Pro],
   model_classic: [EDeviceType.Classic, EDeviceType.Classic1s, EDeviceType.ClassicPure],
   model_classic1s: [EDeviceType.Classic1s, EDeviceType.ClassicPure],
 };
@@ -123,7 +124,8 @@ export const DeviceTypeToModels: { [deviceType in IDeviceType]: IDeviceModel[] }
   [EDeviceType.ClassicPure]: ['model_classic', 'model_mini', 'model_classic1s'],
   [EDeviceType.Mini]: ['model_mini'],
   [EDeviceType.Touch]: ['model_touch'],
-  [EDeviceType.Pro]: ['model_touch'],
+  [EDeviceType.Core26]: ['model_touch'],
+  [EDeviceType.Core27Pro]: ['model_touch'],
   [EDeviceType.Unknown]: [],
 };
 

package/src/types/settings.ts

@@ -109,7 +109,7 @@ export type DeviceTypeMap = {
   [k in IKnownDevice]: {
     /** Base firmware field (required for backward compatibility) */
     firmware: IFirmwareReleaseInfo[];
-    /** Firmware v2 (Touch/Pro specific) */
+    /** Firmware v2 (Touch/Core26/Core27Pro specific) */
     'firmware-v2'?: IFirmwareReleaseInfo[];
     /** Universal firmware v7 */
     'firmware-v8'?: IFirmwareReleaseInfo[];

package/src/utils/deviceFeaturesUtils.ts

@@ -56,7 +56,7 @@ export const supportInputPinOnSoftware = (features: Features): SupportFeatureTyp
   if (!features) return { support: false };
 
   const deviceType = getDeviceType(features);
-  if (deviceType === EDeviceType.Touch || deviceType === EDeviceType.Pro) {
+  if (deviceType === EDeviceType.Touch || deviceType === EDeviceType.Core26 || deviceType === EDeviceType.Core27Pro) {
     return { support: false };
   }
 
@@ -68,7 +68,7 @@ export const supportNewPassphrase = (features?: Features): SupportFeatureType =>
   if (!features) return { support: false };
 
   const deviceType = getDeviceType(features);
-  if (deviceType === EDeviceType.Touch || deviceType === EDeviceType.Pro) {
+  if (deviceType === EDeviceType.Touch || deviceType === EDeviceType.Core26 || deviceType === EDeviceType.Core27Pro) {
     return { support: true };
   }
 
@@ -96,13 +96,13 @@ export const getPassphraseStateWithRefreshDeviceInfo = async (
   );
 
   const isModeT =
-    getDeviceType(features) === EDeviceType.Touch || getDeviceType(features) === EDeviceType.Pro;
+    getDeviceType(features) === EDeviceType.Touch || getDeviceType(features) === EDeviceType.Core26 || getDeviceType(features) === EDeviceType.Core27Pro;
 
   // 如果可以获取到 passphraseState，但是设备 features 显示设备未开启 passphrase，需要刷新设备状态
   // if passphraseState can be obtained, but the device features show that the device has not enabled passphrase, the device status needs to be refreshed
   const needRefreshWithPassphrase = passphraseState && features?.passphrase_protection !== true;
-  // 如果 Touch/Pro 在之前是锁定状态，刷新设备状态
-  // if Touch/Pro was locked before, refresh the device state
+  // 如果 Touch/Core26/Core27Pro 在之前是锁定状态，刷新设备状态
+  // if Touch/Core26/Core27Pro was locked before, refresh the device state
   const needRefreshWithLocked = isModeT && locked;
 
   if (needRefreshWithLocked || needRefreshWithPassphrase) {
@@ -148,7 +148,7 @@ export const getPassphraseState = async (
   );
   const supportGetPassphraseState =
     supportAttachPinCapability ||
-    (deviceType === EDeviceType.Pro && semver.gte(firmwareVersion.join('.'), '4.15.0'));
+    ((deviceType === EDeviceType.Core26 || deviceType === EDeviceType.Core27Pro) && semver.gte(firmwareVersion.join('.'), '4.15.0'));
 
   if (supportGetPassphraseState) {
     const { message, type } = await commands.typedCall('GetPassphraseState', 'PassphraseState', {
@@ -197,7 +197,7 @@ export const supportBatchPublicKey = (
 
   const deviceType = getDeviceType(features);
   // btc batch get public key
-  if (!!options?.includeNode && deviceType === EDeviceType.Pro) {
+  if (!!options?.includeNode && (deviceType === EDeviceType.Core26 || deviceType === EDeviceType.Core27Pro)) {
     return semver.gte(currentVersion, '4.14.0');
   }
   if (!!options?.includeNode && deviceType === EDeviceType.Touch) {
@@ -214,7 +214,7 @@ export const supportBatchPublicKey = (
   }
 
   // support batch get public key
-  if (deviceType === EDeviceType.Touch || deviceType === EDeviceType.Pro) {
+  if (deviceType === EDeviceType.Touch || deviceType === EDeviceType.Core26 || deviceType === EDeviceType.Core27Pro) {
     return semver.gte(currentVersion, '3.1.0');
   }
 
@@ -275,7 +275,7 @@ export const getFirmwareUpdateField = ({
 
     return latestFirmwareField;
   }
-  if (deviceType === EDeviceType.Pro) {
+  if (deviceType === EDeviceType.Core26 || deviceType === EDeviceType.Core27Pro) {
     return latestFirmwareField;
   }
   return 'firmware';
@@ -317,7 +317,7 @@ export const getFirmwareUpdateFieldArray = (
     return ['firmware'];
   }
 
-  if (deviceType === 'pro') {
+  if (deviceType === 'core26' || deviceType === 'core27pro') {
     return ['firmware-v8'];
   }
 
@@ -336,8 +336,8 @@ export function fixVersion(version: string) {
 }
 
 export const fixFeaturesFirmwareVersion = (features: Features): Features => {
-  // 修复 Touch、Pro 设备 bootloader 低于 2.5.2 版本时，返回的 features 中没有 firmware_version 错误的问题
-  // fix Touch、Pro device when bootloader version is lower than 2.5.2, the features returned do not have firmware_version error
+  // 修复 Touch、Core26、Core27Pro 设备 bootloader 低于 2.5.2 版本时，返回的 features 中没有 firmware_version 错误的问题
+  // fix Touch、Core26、Core27Pro device when bootloader version is lower than 2.5.2, the features returned do not have firmware_version error
   const tempFeatures = { ...features };
 
   if (tempFeatures.ukey_firmware_version && !semver.valid(tempFeatures.ukey_firmware_version)) {

package/src/utils/deviceInfoUtils.ts

@@ -15,7 +15,7 @@ export const getDeviceType = (features?: Features): IDeviceType => {
     return EDeviceType.Unknown;
   }
 
-  // classic1s 3.5.0 pro 4.6.0
+  // classic1s 3.5.0, core26 4.6.0
   switch (features.ukey_device_type) {
     case 'CLASSIC':
       return EDeviceType.Classic;
@@ -25,8 +25,10 @@ export const getDeviceType = (features?: Features): IDeviceType => {
       return EDeviceType.Mini;
     case 'TOUCH':
       return EDeviceType.Touch;
-    case 'PRO':
-      return EDeviceType.Pro;
+    case 'CORE26':
+      return EDeviceType.Core26;
+    case 'CORE27PRO':
+      return EDeviceType.Core27Pro;
     case 'PURE':
       return EDeviceType.ClassicPure;
     default:
@@ -55,7 +57,8 @@ export const getDeviceType = (features?: Features): IDeviceType => {
   if (miniFlag.toLowerCase() === 'cp') return EDeviceType.ClassicPure;
   if (miniFlag.toLowerCase() === 'mi') return EDeviceType.Mini;
   if (miniFlag.toLowerCase() === 'tc') return EDeviceType.Touch;
-  if (miniFlag.toLowerCase() === 'pr') return EDeviceType.Pro;
+  if (miniFlag.toLowerCase() === 'c6') return EDeviceType.Core26;
+  if (miniFlag.toLowerCase() === 'c7') return EDeviceType.Core27Pro;
 
   // unknown device
   return EDeviceType.Unknown;
@@ -74,7 +77,8 @@ export const getDeviceTypeByBleName = (name?: string): IDeviceType => {
   if (name.startsWith('T')) return EDeviceType.Touch;
   if (name.startsWith('Touch')) return EDeviceType.Touch;
 
-  if (name.startsWith('Pro')) return EDeviceType.Pro;
+  if (name.startsWith('Core26')) return EDeviceType.Core26;
+  if (name.startsWith('Core27')) return EDeviceType.Core27Pro;
 
   return EDeviceType.Unknown;
 };
@@ -115,6 +119,12 @@ export const getDeviceLabel = (features?: Features) => {
   if (deviceType === EDeviceType.ClassicPure) {
     return 'UKey Classic 1S';
   }
+  if (deviceType === EDeviceType.Core26) {
+    return 'UKey Core 26';
+  }
+  if (deviceType === EDeviceType.Core27Pro) {
+    return 'UKey Core 27 Pro';
+  }
 
   return `UKey ${deviceType.charAt(0).toUpperCase() + deviceType.slice(1)}`;
 };

package/src/utils/deviceSettings.ts

@@ -33,7 +33,8 @@ export const getLanguageConfig = (deviceType: IDeviceType): Record<string, strin
       break;
 
     case EDeviceType.Touch:
-    case EDeviceType.Pro:
+    case EDeviceType.Core26:
+    case EDeviceType.Core27Pro:
       keys = Object.keys(LANGUAGE_LABELS) as LanguageKey[];
       break;
     default:
@@ -65,7 +66,8 @@ export const getAutoLockOptions = (_deviceType: IDeviceType): DurationParts[] =>
         { seconds: 0, minute: 0, hour: 0, day: 0 },
       ];
     case EDeviceType.Touch:
-    case EDeviceType.Pro:
+    case EDeviceType.Core26:
+    case EDeviceType.Core27Pro:
       return [
         { seconds: 30, minute: 0, hour: 0, day: 0 },
         { seconds: 0, minute: 1, hour: 0, day: 0 },
@@ -95,7 +97,8 @@ export const getAutoShutDownOptions = (_deviceType: IDeviceType): DurationParts[
         { seconds: 0, minute: 0, hour: 0, day: 0 },
       ];
     case EDeviceType.Touch:
-    case EDeviceType.Pro:
+    case EDeviceType.Core26:
+    case EDeviceType.Core27Pro:
       return [
         { seconds: 0, minute: 1, hour: 0, day: 0 },
         { seconds: 0, minute: 2, hour: 0, day: 0 },

package/src/utils/deviceVersionUtils.ts

@@ -45,7 +45,7 @@ export const getDeviceBLEFirmwareVersion = (features: Features): IVersionArray =
 export const getDeviceBootloaderVersion = (features: Features | undefined): IVersionArray => {
   if (!features) return [0, 0, 0];
 
-  // classic1s 3.5.0 pro 4.6.0
+  // classic1s 3.5.0, core26 4.6.0
   if (semver.valid(features.ukey_boot_version)) {
     return features.ukey_boot_version?.split('.') as unknown as IVersionArray;
   }

package/src/utils/homescreen.ts

@@ -229,7 +229,7 @@ export const getTouchData = (): Record<string, IScreenData> => ({
   'wallpaper-3': { name: 'wallpaper-3', hex: '77616c6c70617065722d332e706e67' },
   'wallpaper-4': { name: 'wallpaper-4', hex: '77616c6c70617065722d342e706e67' },
 });
-export const getProData = (): Record<string, IScreenData> => ({
+export const getCore26Data = (): Record<string, IScreenData> => ({
   'wallpaper-1': { name: 'wallpaper-1', hex: '77616c6c70617065722d312e6a7067' },
   'wallpaper-2': { name: 'wallpaper-2', hex: '77616c6c70617065722d322e6a7067' },
   'wallpaper-3': { name: 'wallpaper-3', hex: '77616c6c70617065722d332e6a7067' },
@@ -251,8 +251,11 @@ export const getHomeScreenHex = (deviceType: IDeviceType, name: string) => {
     case EDeviceType.Touch:
       data = getTouchData();
       break;
-    case EDeviceType.Pro:
-      data = getProData();
+    case EDeviceType.Core26:
+      data = getCore26Data();
+      break;
+    case EDeviceType.Core27Pro:
+      data = getCore26Data();
       break;
     default:
       data = {};
@@ -276,14 +279,26 @@ export const getHomeScreenDefaultList = (features: Features) => {
     case EDeviceType.Touch:
       data = getTouchData();
       break;
-    case EDeviceType.Pro:
+    case EDeviceType.Core26:
       if (semver.gte(deviceVersion, '4.10.0')) {
-        data = getProData();
+        data = getCore26Data();
       } else {
-        data = Object.keys(getProData())
+        data = Object.keys(getCore26Data())
           .slice(0, 4)
           .reduce((obj, key) => {
-            obj[key] = getProData()[key];
+            obj[key] = getCore26Data()[key];
+            return obj;
+          }, {} as Record<string, IScreenData>);
+      }
+      break;
+    case EDeviceType.Core27Pro:
+      if (semver.gte(deviceVersion, '4.10.0')) {
+        data = getCore26Data();
+      } else {
+        data = Object.keys(getCore26Data())
+          .slice(0, 4)
+          .reduce((obj, key) => {
+            obj[key] = getCore26Data()[key];
             return obj;
           }, {} as Record<string, IScreenData>);
       }
@@ -324,15 +339,22 @@ export const getHomeScreenSize = ({
   > = {
     touch: {
       thumbnail: {
-        Nft: { width: 238, height: 238 },
+        Nft: { width: 204, height: 204 },
         WallPaper: { width: 144, height: 240 },
       },
       full: { width: 480, height: 800 },
     },
-    pro: {
+    core26: {
+      thumbnail: {
+        Nft: { width: 204, height: 204, radius: 20 },
+        WallPaper: { width: 144, height: 240, radius: 20 },
+      },
+      full: { width: 480, height: 800 },
+    },
+    core27pro: {
       thumbnail: {
-        Nft: { width: 226, height: 226, radius: 40 },
-        WallPaper: { width: 144, height: 240, radius: 40 },
+        Nft: { width: 204, height: 204, radius: 20 },
+        WallPaper: { width: 144, height: 240, radius: 20 },
       },
       full: { width: 480, height: 800 },
     },