@onekeyfe/hd-core 0.0.8 → 0.1.0

package/src/types/device.ts

@@ -73,8 +73,60 @@ export type Features = PROTO.Features;
 
 export type IDeviceType = 'classic' | 'mini' | 'touch' | 'pro';
 
+// model_mini: 'classic' | 'mini'
+// model_touch: 'touch' | 'pro'
+export type IDeviceModel = 'model_mini' | 'model_touch';
+
 export type IDeviceFirmwareStatus = 'valid' | 'outdated' | 'required' | 'unknown' | 'none';
 
 export type IDeviceBLEFirmwareStatus = 'valid' | 'outdated' | 'required' | 'unknown' | 'none';
 
 export type ITransportStatus = 'valid' | 'outdated';
+
+export type DeviceFirmwareRange = {
+  [deviceType in IDeviceType | IDeviceModel]?: { min: string; max?: string };
+};
+
+type FeaturesNarrowing =
+  | {
+      major_version: 2;
+      fw_major: null;
+      fw_minor: null;
+      fw_patch: null;
+      bootloader_mode: true;
+      firmware_present: false;
+    }
+  | {
+      major_version: 2;
+      fw_major: null;
+      fw_minor: null;
+      fw_patch: null;
+      bootloader_mode: null;
+      firmware_present: null;
+    }
+  | {
+      major_version: 2;
+      fw_major: 2;
+      fw_minor: number;
+      fw_patch: number;
+      bootloader_mode: true;
+      firmware_present: true;
+    }
+  | {
+      major_version: 1;
+      fw_major: null;
+      fw_minor: null;
+      fw_patch: null;
+      bootloader_mode: true;
+      firmware_present: false;
+    }
+  | {
+      major_version: 1;
+      fw_major: null;
+      fw_minor: null;
+      fw_patch: null;
+      bootloader_mode: true;
+      firmware_present: true;
+    };
+
+export type StrictFeatures = Features & FeaturesNarrowing;

package/src/types/firmware.ts

@@ -9,7 +9,8 @@ export interface FirmwareRange {
   };
 }
 
-export type VersionArray = [1 | 2, number, number];
+export type MajorVersion = 1 | 2;
+export type VersionArray = [MajorVersion, number, number];
 
 export type FirmwareRelease = {
   required: boolean;

package/src/types/params.ts

@@ -2,6 +2,8 @@ export interface CommonParams {
   keepSession?: boolean;
 }
 
+export type Params<T> = CommonParams & T & { bundle?: undefined };
+
 export interface Unsuccessful {
   success: false;
   payload: { error: string; code?: string };

package/src/utils/assets.ts

@@ -1,5 +1,5 @@
 import { httpRequest as browserHttpRequest } from './networkUtils';
 
-export const httpRequest = (url: string, _type: string): any => browserHttpRequest(url);
+export const httpRequest = (url: string, type: string): any => browserHttpRequest(url, type);
 
 export const getTimeStamp = () => new Date().getTime();

package/src/utils/deviceFeaturesUtils.ts

@@ -1,4 +1,16 @@
-import type { Features, IVersionArray, IDeviceType } from '../types';
+import type { Features, IVersionArray, IDeviceType, IDeviceModel } from '../types';
+
+export const getDeviceModel = (features?: Features): IDeviceModel => {
+  if (!features || typeof features !== 'object') {
+    return 'model_mini';
+  }
+
+  if (features.model === '1') {
+    return 'model_mini';
+  }
+  // model === 'T'
+  return 'model_touch';
+};
 
 export const getDeviceType = (features?: Features): IDeviceType => {
   if (!features || typeof features !== 'object' || !features.serial_no) {
@@ -49,7 +61,9 @@ export const getDeviceLabel = (features: Features) => {
 /**
  * Get Connected Device version by features
  */
-export const getDeviceFirmwareVersion = (features: Features): IVersionArray => {
+export const getDeviceFirmwareVersion = (features: Features | undefined): IVersionArray => {
+  if (!features) return [0, 0, 0];
+
   if (features.onekey_version) {
     return features.onekey_version.split('.') as unknown as IVersionArray;
   }

package/src/utils/networkUtils.ts

@@ -4,13 +4,15 @@ export const httpRequest = async (url: string, type = 'text') => {
   const response = await axios.request({
     url,
     withCredentials: false,
+    responseType: type === 'binary' ? 'arraybuffer' : 'json',
   });
+
   if (+response.status === 200) {
     if (type === 'json') {
       return response.data;
     }
     if (type === 'binary') {
-      return response.data.arrayBuffer();
+      return response.data;
     }
     return response.data;
   }