fix: touch hardware upgrade (#274)

* fix: hardware upgrade * chore: update hardware version
OneKeyHQ · Aug 14, 2023 · cf0501a · cf0501a
1 parent 65bc552
commit cf0501a
Show file tree

Hide file tree

Showing 15 changed files with 86 additions and 58 deletions.
diff --git a/packages/connect-examples/expo-example/package.json b/packages/connect-examples/expo-example/package.json
@@ -1,6 +1,6 @@
 {
   "name": "expo-example",
-  "version": "0.3.23",
+  "version": "0.3.24",
   "scripts": {
     "start": "expo start --dev-client",
     "android": "expo run:android",
@@ -10,10 +10,10 @@
   },
   "dependencies": {
     "@noble/hashes": "^1.1.3",
-    "@onekeyfe/hd-ble-sdk": "^0.3.23",
-    "@onekeyfe/hd-common-connect-sdk": "^0.3.23",
-    "@onekeyfe/hd-core": "^0.3.23",
-    "@onekeyfe/hd-web-sdk": "^0.3.23",
+    "@onekeyfe/hd-ble-sdk": "^0.3.24",
+    "@onekeyfe/hd-common-connect-sdk": "^0.3.24",
+    "@onekeyfe/hd-core": "^0.3.24",
+    "@onekeyfe/hd-web-sdk": "^0.3.24",
     "@onekeyfe/react-native-ble-plx": "3.0.0",
     "@react-native-async-storage/async-storage": "^1.17.6",
     "@react-native-picker/picker": "2.4.2",

diff --git a/packages/connect-examples/expo-example/src/utils/hardwareInstance.ts b/packages/connect-examples/expo-example/src/utils/hardwareInstance.ts
@@ -34,7 +34,7 @@ export const getHardwareSDKInstance = memoizee(
         console.log(HardwareSDK);
 
         if (Platform.OS === 'web') {
-          settings.connectSrc = 'https://jssdk.onekey.so/0.3.22/';
+          settings.connectSrc = 'https://jssdk.onekey.so/0.3.24/';
           // settings.connectSrc = 'https://localhost:8087/';
           settings.env = 'web';
           settings.preRelease = false;

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "0.3.23",
+  "version": "0.3.24",
   "description": "> TODO: description",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "^0.3.23",
-    "@onekeyfe/hd-transport": "^0.3.23",
+    "@onekeyfe/hd-shared": "^0.3.24",
+    "@onekeyfe/hd-transport": "^0.3.24",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
     "bytebuffer": "^5.0.1",

diff --git a/packages/core/src/api/firmware/getBinary.ts b/packages/core/src/api/firmware/getBinary.ts
@@ -5,6 +5,7 @@ import { getDeviceType, httpRequest } from '../../utils';
 import { DataManager } from '../../data-manager';
 import { findLatestRelease } from '../../utils/release';
 import { getFirmwareUpdateField } from '../../utils/deviceFeaturesUtils';
+import { FirmwareField } from '../../data-manager/DataManager';
 
 export interface GetInfoProps {
   features: Features;
@@ -74,15 +75,11 @@ export const getInfo = ({ features, updateType, targetVersion }: GetInfoProps) =
   const deviceType = getDeviceType(features);
   const { deviceMap } = DataManager;
 
-  let firmwareUpdateField: 'firmware' | 'ble' | 'firmware-v2' | 'firmware-v3' =
-    getFirmwareUpdateField(features, updateType);
-  if (deviceType === 'touch' && targetVersion) {
-    if (semver.eq(targetVersion, '4.0.0')) {
-      firmwareUpdateField = 'firmware-v2';
-    } else if (semver.gt(targetVersion, '4.0.0')) {
-      firmwareUpdateField = 'firmware-v3';
-    }
-  }
+  const firmwareUpdateField: 'ble' | FirmwareField = getFirmwareUpdateField({
+    features,
+    updateType,
+    targetVersion,
+  });
 
   const releaseInfo = deviceMap?.[deviceType]?.[firmwareUpdateField] ?? [];
   return findLatestRelease(releaseInfo);

diff --git a/packages/core/src/data-manager/DataManager.ts b/packages/core/src/data-manager/DataManager.ts
@@ -23,7 +23,7 @@ import type {
 } from '../types';
 import { findLatestRelease, getReleaseChangelog, getReleaseStatus } from '../utils/release';
 
-type FirmwareField = 'firmware' | 'firmware-v2' | 'firmware-v3' | 'firmware-v4';
+export type FirmwareField = 'firmware' | 'firmware-v2' | 'firmware-v4';
 
 export type MessageVersion = 'latest' | 'v1';
 
@@ -69,7 +69,7 @@ export default class DataManager {
       return 'unknown';
     }
 
-    const firmwareUpdateField = getFirmwareUpdateField(features, 'firmware');
+    const firmwareUpdateField = getFirmwareUpdateField({ features, updateType: 'firmware' });
     const targetDeviceConfigList = this.deviceMap[deviceType]?.[firmwareUpdateField] ?? [];
     const currentVersion = deviceFirmwareVersion.join('.');
     return getReleaseStatus(targetDeviceConfigList, currentVersion);
@@ -85,7 +85,10 @@ export default class DataManager {
 
     if (deviceType !== 'pro' && deviceType !== 'touch') return undefined;
 
-    const firmwareUpdateField = getFirmwareUpdateField(features, 'firmware') as FirmwareField;
+    const firmwareUpdateField = getFirmwareUpdateField({
+      features,
+      updateType: 'firmware',
+    }) as FirmwareField;
     const targetDeviceConfigList = this.deviceMap[deviceType]?.[firmwareUpdateField] ?? [];
     const currentVersion = deviceFirmwareVersion.join('.');
     const targetDeviceConfig = targetDeviceConfigList.filter(item =>
@@ -106,7 +109,10 @@ export default class DataManager {
 
     if (deviceType !== 'pro' && deviceType !== 'touch') return undefined;
 
-    const firmwareUpdateField = getFirmwareUpdateField(features, 'firmware') as FirmwareField;
+    const firmwareUpdateField = getFirmwareUpdateField({
+      features,
+      updateType: 'firmware',
+    }) as FirmwareField;
     const targetDeviceConfigList = this.deviceMap[deviceType]?.[firmwareUpdateField] ?? [];
     const targetDeviceConfig = targetDeviceConfigList.filter(item => !!item.fullResource);
 
@@ -117,7 +123,10 @@ export default class DataManager {
     const deviceType = getDeviceType(features);
 
     if (deviceType !== 'pro' && deviceType !== 'touch') return undefined;
-    const firmwareUpdateField = getFirmwareUpdateField(features, 'firmware') as FirmwareField;
+    const firmwareUpdateField = getFirmwareUpdateField({
+      features,
+      updateType: 'firmware',
+    }) as FirmwareField;
     const targetDeviceConfigList = this.deviceMap[deviceType]?.[firmwareUpdateField] ?? [];
     const targetDeviceConfig = targetDeviceConfigList.filter(item => !!item.bootloaderResource);
 
@@ -127,7 +136,10 @@ export default class DataManager {
   static getBootloaderTargetVersion = (features: Features): IVersionArray | undefined => {
     const deviceType = getDeviceType(features);
 
-    const firmwareUpdateField = getFirmwareUpdateField(features, 'firmware') as FirmwareField;
+    const firmwareUpdateField = getFirmwareUpdateField({
+      features,
+      updateType: 'firmware',
+    }) as FirmwareField;
     const targetDeviceConfigList = this.deviceMap[deviceType]?.[firmwareUpdateField] ?? [];
     const targetDeviceConfig = targetDeviceConfigList.filter(item => !!item.bootloaderResource);
 
@@ -138,7 +150,10 @@ export default class DataManager {
     const deviceType = getDeviceType(features);
 
     if (!(deviceType === 'classic' || deviceType === 'mini')) return undefined;
-    const firmwareUpdateField = getFirmwareUpdateField(features, 'firmware') as FirmwareField;
+    const firmwareUpdateField = getFirmwareUpdateField({
+      features,
+      updateType: 'firmware',
+    }) as FirmwareField;
     const targetDeviceConfigList = this.deviceMap[deviceType]?.[firmwareUpdateField] ?? [];
     const targetDeviceConfig = targetDeviceConfigList.filter(
       item => !!item.bootloaderRelatedFirmwareVersion
@@ -158,15 +173,21 @@ export default class DataManager {
       return [];
     }
 
-    const firmwareUpdateField = getFirmwareUpdateField(features, 'firmware') as FirmwareField;
+    const firmwareUpdateField = getFirmwareUpdateField({
+      features,
+      updateType: 'firmware',
+    }) as FirmwareField;
     const targetDeviceConfigList = this.deviceMap[deviceType]?.[firmwareUpdateField] ?? [];
     const currentVersion = deviceFirmwareVersion.join('.');
     return getReleaseChangelog(targetDeviceConfigList, currentVersion);
   };
 
   static getFirmwareLatestRelease = (features: Features) => {
     const deviceType = getDeviceType(features);
-    const firmwareUpdateField = getFirmwareUpdateField(features, 'firmware') as FirmwareField;
+    const firmwareUpdateField = getFirmwareUpdateField({
+      features,
+      updateType: 'firmware',
+    }) as FirmwareField;
     const targetDeviceConfigList = this.deviceMap[deviceType]?.[firmwareUpdateField] ?? [];
 
     const target = findLatestRelease(targetDeviceConfigList);

diff --git a/packages/core/src/types/settings.ts b/packages/core/src/types/settings.ts
@@ -65,7 +65,6 @@ export type DeviceTypeMap = {
   [k in IDeviceType]: {
     firmware: IFirmwareReleaseInfo[];
     'firmware-v2'?: IFirmwareReleaseInfo[];
-    'firmware-v3'?: IFirmwareReleaseInfo[];
     'firmware-v4'?: IFirmwareReleaseInfo[];
     ble: IBLEFirmwareReleaseInfo[];
   };

diff --git a/packages/core/src/utils/deviceFeaturesUtils.ts b/packages/core/src/utils/deviceFeaturesUtils.ts
@@ -10,7 +10,7 @@ import type {
   SupportFeatureType,
 } from '../types';
 import { DeviceTypeToModels } from '../types';
-import DataManager, { MessageVersion } from '../data-manager/DataManager';
+import DataManager, { FirmwareField, MessageVersion } from '../data-manager/DataManager';
 import { PROTOBUF_MESSAGE_CONFIG } from '../data-manager/MessagesConfig';
 import { Device } from '../device/Device';
 
@@ -240,10 +240,15 @@ export const supportModifyHomescreen = (features?: Features): SupportFeatureType
 /**
  *  Since 3.5.0, Touch uses the firmware-v3 field to get firmware release info
  */
-export const getFirmwareUpdateField = (
-  features: Features,
-  updateType: 'firmware' | 'ble'
-): 'firmware' | 'ble' | 'firmware-v4' => {
+export const getFirmwareUpdateField = ({
+  features,
+  updateType,
+  targetVersion,
+}: {
+  features: Features;
+  updateType: 'firmware' | 'ble';
+  targetVersion?: string;
+}): 'ble' | FirmwareField => {
   const deviceType = getDeviceType(features);
   const deviceFirmwareVersion = getDeviceFirmwareVersion(features);
   if (updateType === 'ble') {
@@ -255,7 +260,13 @@ export const getFirmwareUpdateField = (
   }
 
   if (deviceType === 'touch') {
+    if (targetVersion) {
+      if (semver.eq(targetVersion, '4.0.0')) return 'firmware-v2';
+      if (semver.gt(targetVersion, '4.0.0')) return 'firmware-v4';
+    }
+
     if (semver.lt(deviceFirmwareVersion.join('.'), '3.4.0')) return 'firmware';
+
     return 'firmware-v4';
   }
   return 'firmware';

diff --git a/packages/hd-ble-sdk/package.json b/packages/hd-ble-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-ble-sdk",
-  "version": "0.3.23",
+  "version": "0.3.24",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "ISC",
@@ -20,8 +20,8 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-core": "^0.3.23",
-    "@onekeyfe/hd-shared": "^0.3.23",
-    "@onekeyfe/hd-transport-react-native": "^0.3.23"
+    "@onekeyfe/hd-core": "^0.3.24",
+    "@onekeyfe/hd-shared": "^0.3.24",
+    "@onekeyfe/hd-transport-react-native": "^0.3.24"
   }
 }
diff --git a/packages/hd-common-connect-sdk/package.json b/packages/hd-common-connect-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-common-connect-sdk",
-  "version": "0.3.23",
+  "version": "0.3.24",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "ISC",
@@ -20,9 +20,9 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-core": "^0.3.23",
-    "@onekeyfe/hd-shared": "^0.3.23",
-    "@onekeyfe/hd-transport-http": "^0.3.23",
-    "@onekeyfe/hd-transport-webusb": "^0.3.23"
+    "@onekeyfe/hd-core": "^0.3.24",
+    "@onekeyfe/hd-shared": "^0.3.24",
+    "@onekeyfe/hd-transport-http": "^0.3.24",
+    "@onekeyfe/hd-transport-webusb": "^0.3.24"
   }
 }
diff --git a/packages/hd-transport-http/package.json b/packages/hd-transport-http/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-http",
-  "version": "0.3.23",
+  "version": "0.3.24",
   "description": "hardware http transport",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -24,8 +24,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "^0.3.23",
-    "@onekeyfe/hd-transport": "^0.3.23",
+    "@onekeyfe/hd-shared": "^0.3.24",
+    "@onekeyfe/hd-transport": "^0.3.24",
     "axios": "^0.27.2"
   }
 }
diff --git a/packages/hd-transport-react-native/package.json b/packages/hd-transport-react-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-react-native",
-  "version": "0.3.23",
+  "version": "0.3.24",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
   "main": "dist/index.js",
@@ -19,8 +19,8 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "^0.3.23",
-    "@onekeyfe/hd-transport": "^0.3.23",
+    "@onekeyfe/hd-shared": "^0.3.24",
+    "@onekeyfe/hd-transport": "^0.3.24",
     "@onekeyfe/react-native-ble-plx": "3.0.0",
     "react-native-ble-manager": "^8.1.0"
   }

diff --git a/packages/hd-transport-webusb/package.json b/packages/hd-transport-webusb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-webusb",
-  "version": "0.3.23",
+  "version": "0.3.24",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
@@ -20,8 +20,8 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "^0.3.23",
-    "@onekeyfe/hd-transport": "^0.3.23"
+    "@onekeyfe/hd-shared": "^0.3.24",
+    "@onekeyfe/hd-transport": "^0.3.24"
   },
   "devDependencies": {
     "@types/w3c-web-usb": "^1.0.6"

diff --git a/packages/hd-transport/package.json b/packages/hd-transport/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport",
-  "version": "0.3.23",
+  "version": "0.3.24",
   "description": "> TODO: description",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",

diff --git a/packages/hd-web-sdk/package.json b/packages/hd-web-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-web-sdk",
-  "version": "0.3.23",
+  "version": "0.3.24",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "ISC",
@@ -21,10 +21,10 @@
   },
   "dependencies": {
     "@onekeyfe/cross-inpage-provider-core": "^0.0.17",
-    "@onekeyfe/hd-core": "^0.3.23",
-    "@onekeyfe/hd-shared": "^0.3.23",
-    "@onekeyfe/hd-transport-http": "^0.3.23",
-    "@onekeyfe/hd-transport-webusb": "^0.3.23"
+    "@onekeyfe/hd-core": "^0.3.24",
+    "@onekeyfe/hd-shared": "^0.3.24",
+    "@onekeyfe/hd-transport-http": "^0.3.24",
+    "@onekeyfe/hd-transport-webusb": "^0.3.24"
   },
   "devDependencies": {
     "@babel/plugin-proposal-optional-chaining": "^7.17.12",

diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-shared",
-  "version": "0.3.23",
+  "version": "0.3.24",
   "description": "Hardware SDK's shared tool library",
   "keywords": [
     "Hardware-SDK",