@onekeyfe/hd-core 1.0.0-alpha.5 → 1.0.0-alpha.7

package/dist/api/CheckBootloaderRelease.d.ts

@@ -4,7 +4,11 @@ export default class CheckBootloaderRelease extends BaseMethod {
     run(): Promise<{
         shouldUpdate: boolean;
         status: string;
-        release: string | undefined;
+        changelog: ({
+            "zh-CN": string;
+            "en-US": string;
+        } | undefined)[];
+        release: import("../types").IFirmwareReleaseInfo | undefined;
         bootloaderMode: boolean;
     } | null>;
 }

package/dist/api/CheckBootloaderRelease.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CheckBootloaderRelease.d.ts","sourceRoot":"","sources":["../../src/api/CheckBootloaderRelease.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAW1C,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,UAAU;IAC5D,IAAI;IAME,GAAG;;;;;;CAwBV"}
+{"version":3,"file":"CheckBootloaderRelease.d.ts","sourceRoot":"","sources":["../../src/api/CheckBootloaderRelease.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAW1C,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,UAAU;IAC5D,IAAI;IAME,GAAG;;;;;;;;;;CAuBV"}

package/dist/api/firmware/releaseHelper.d.ts

@@ -17,4 +17,13 @@ export declare const getBleFirmwareReleaseInfo: (features: Features) => {
     release: import("../../types").IBLEFirmwareReleaseInfo | undefined;
     bootloaderMode: boolean;
 };
+export declare const getBootloaderReleaseInfo: (features: Features) => {
+    status: undefined;
+    changelog: ({
+        "zh-CN": string;
+        "en-US": string;
+    } | undefined)[];
+    release: import("../../types").IFirmwareReleaseInfo | undefined;
+    bootloaderMode: boolean;
+};
 //# sourceMappingURL=releaseHelper.d.ts.map

package/dist/api/firmware/releaseHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"releaseHelper.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/releaseHelper.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE5C,eAAO,MAAM,sBAAsB,aAAc,QAAQ;;;;;;;;CAWxD,CAAC;AAEF,eAAO,MAAM,yBAAyB,aAAc,QAAQ;;;;;;;;CAW3D,CAAC"}
+{"version":3,"file":"releaseHelper.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/releaseHelper.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE5C,eAAO,MAAM,sBAAsB,aAAc,QAAQ;;;;;;;;CAWxD,CAAC;AAEF,eAAO,MAAM,yBAAyB,aAAc,QAAQ;;;;;;;;CAW3D,CAAC;AAEF,eAAO,MAAM,wBAAwB,aAAc,QAAQ;;;;;;;;CAiB1D,CAAC"}

package/dist/index.js

@@ -25332,6 +25332,20 @@ const getBleFirmwareReleaseInfo = (features) => {
         bootloaderMode,
     };
 };
+const getBootloaderReleaseInfo = (features) => {
+    const release = DataManager.getFirmwareLatestRelease(features);
+    const changelog = [release === null || release === void 0 ? void 0 : release.bootloaderChangelog].filter(item => item != null &&
+        typeof item === 'object' &&
+        Object.prototype.hasOwnProperty.call(item, 'zh-CN') &&
+        Object.prototype.hasOwnProperty.call(item, 'en-US'));
+    const bootloaderMode = !!features.bootloader_mode;
+    return {
+        status: undefined,
+        changelog,
+        release,
+        bootloaderMode,
+    };
+};
 
 const Log$5 = getLogger(exports.LoggerNames.Method);
 class BaseMethod {
@@ -25437,8 +25451,8 @@ class GetFeatures extends BaseMethod {
         this.skipForceUpdateCheck = true;
     }
     run() {
-        var _a;
-        if (this.payload.detectBootloaderDevice && ((_a = this.device.features) === null || _a === void 0 ? void 0 : _a.bootloader_mode)) {
+        var _a, _b;
+        if (((_a = this.payload) === null || _a === void 0 ? void 0 : _a.detectBootloaderDevice) && ((_b = this.device.features) === null || _b === void 0 ? void 0 : _b.bootloader_mode)) {
             return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceDetectInBootloaderMode));
         }
         return Promise.resolve(this.device.features);
@@ -25665,13 +25679,8 @@ class CheckBootloaderRelease extends BaseMethod {
             else if (deviceType === 'touch') {
                 shouldUpdate = checkNeedUpdateBootForTouch(features);
             }
-            const resource = DataManager.getBootloaderResource(features);
-            return Promise.resolve({
-                shouldUpdate,
-                status: shouldUpdate ? 'outdated' : 'valid',
-                release: resource,
-                bootloaderMode: !!features.bootloader_mode,
-            });
+            const releaseInfo = getBootloaderReleaseInfo(features);
+            return Promise.resolve(Object.assign(Object.assign({}, releaseInfo), { shouldUpdate, status: shouldUpdate ? 'outdated' : 'valid' }));
         });
     }
 }
@@ -33604,12 +33613,13 @@ function initDeviceList(method) {
     });
 }
 function initDevice(method) {
+    var _a;
     if (!_deviceList) {
         throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceListNotInitialized);
     }
     let device;
     const allDevices = _deviceList.allDevices();
-    if (method.payload.detectBootloaderDevice && allDevices.some(d => { var _a; return (_a = d.features) === null || _a === void 0 ? void 0 : _a.bootloader_mode; })) {
+    if (((_a = method.payload) === null || _a === void 0 ? void 0 : _a.detectBootloaderDevice) && allDevices.some(d => { var _a; return (_a = d.features) === null || _a === void 0 ? void 0 : _a.bootloader_mode; })) {
         throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceDetectInBootloaderMode);
     }
     if (method.connectId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.0.0-alpha.5",
+  "version": "1.0.0-alpha.7",
   "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": "^1.0.0-alpha.5",
-    "@onekeyfe/hd-transport": "^1.0.0-alpha.5",
+    "@onekeyfe/hd-shared": "^1.0.0-alpha.7",
+    "@onekeyfe/hd-transport": "^1.0.0-alpha.7",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
     "bytebuffer": "^5.0.1",
@@ -44,5 +44,5 @@
     "@types/semver": "^7.3.9",
     "ripple-keypairs": "^1.1.4"
   },
-  "gitHead": "696f26b0e802655779bdebf147b5da33dfff4357"
+  "gitHead": "ce326ee68e0a22a49ee5469a6c408314c24604e4"
 }

package/src/api/CheckBootloaderRelease.ts

@@ -5,9 +5,9 @@ import {
   checkNeedUpdateBootForClassicAndMini,
   checkNeedUpdateBootForTouch,
 } from './firmware/updateBootloader';
-import { DataManager } from '../data-manager';
 import { getDeviceType } from '../utils';
 import { DeviceModelToTypes } from '../types';
+import { getBootloaderReleaseInfo } from './firmware/releaseHelper';
 
 export default class CheckBootloaderRelease extends BaseMethod {
   init() {
@@ -32,12 +32,11 @@ export default class CheckBootloaderRelease extends BaseMethod {
     } else if (deviceType === 'touch') {
       shouldUpdate = checkNeedUpdateBootForTouch(features);
     }
-    const resource = DataManager.getBootloaderResource(features);
+    const releaseInfo = getBootloaderReleaseInfo(features);
     return Promise.resolve({
+      ...releaseInfo,
       shouldUpdate,
       status: shouldUpdate ? 'outdated' : 'valid',
-      release: resource,
-      bootloaderMode: !!features.bootloader_mode,
     });
   }
 }

package/src/api/GetFeatures.ts

@@ -14,7 +14,7 @@ export default class GetFeatures extends BaseMethod {
   }
 
   run() {
-    if (this.payload.detectBootloaderDevice && this.device.features?.bootloader_mode) {
+    if (this.payload?.detectBootloaderDevice && this.device.features?.bootloader_mode) {
       return Promise.reject(ERRORS.TypedError(HardwareErrorCode.DeviceDetectInBootloaderMode));
     }
     return Promise.resolve(this.device.features);

package/src/api/firmware/releaseHelper.ts

@@ -26,3 +26,22 @@ export const getBleFirmwareReleaseInfo = (features: Features) => {
     bootloaderMode,
   };
 };
+
+export const getBootloaderReleaseInfo = (features: Features) => {
+  const release = DataManager.getFirmwareLatestRelease(features);
+  const changelog = [release?.bootloaderChangelog].filter(
+    item =>
+      item != null &&
+      typeof item === 'object' &&
+      Object.prototype.hasOwnProperty.call(item, 'zh-CN') &&
+      Object.prototype.hasOwnProperty.call(item, 'en-US')
+  );
+
+  const bootloaderMode = !!features.bootloader_mode;
+  return {
+    status: undefined,
+    changelog,
+    release,
+    bootloaderMode,
+  };
+};

package/src/core/index.ts

@@ -365,7 +365,7 @@ function initDevice(method: BaseMethod) {
   let device: Device | typeof undefined;
   const allDevices = _deviceList.allDevices();
 
-  if (method.payload.detectBootloaderDevice && allDevices.some(d => d.features?.bootloader_mode)) {
+  if (method.payload?.detectBootloaderDevice && allDevices.some(d => d.features?.bootloader_mode)) {
     throw ERRORS.TypedError(HardwareErrorCode.DeviceDetectInBootloaderMode);
   }