@onekeyfe/hd-core 0.2.54 → 0.2.55

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

@@ -1 +1 @@
-{"version":3,"file":"uploadFirmware.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/uploadFirmware.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,OAAO,EAAU,WAAW,EAA+B,MAAM,cAAc,CAAC;AAChF,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAwB,MAAM,6BAA6B,CAAC;AAwCnF,eAAO,MAAM,cAAc,eAAsB,MAAM,kBAKtD,CAAC;AAEF,eAAO,MAAM,cAAc,eACb,UAAU,GAAG,KAAK,aACnB,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,eACD,MAAM,cAAc,qBAqDlC,CAAC;AAmCF,eAAO,MAAM,cAAc,cAAqB,SAAS,YAAY,MAAM,QAAQ,WAAW,qBAY7F,CAAC;AAEF,eAAO,MAAM,eAAe,cACf,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,UACN,WAAW,qBAwBpB,CAAC;AAEF,eAAO,MAAM,gBAAgB,cAChB,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,UACN,WAAW,qBAQpB,CAAC"}
+{"version":3,"file":"uploadFirmware.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/uploadFirmware.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,OAAO,EAAU,WAAW,EAA+B,MAAM,cAAc,CAAC;AAChF,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,KAAK,EAAE,SAAS,EAAwB,MAAM,6BAA6B,CAAC;AAwCnF,eAAO,MAAM,cAAc,eAAsB,MAAM,kBAKtD,CAAC;AAEF,eAAO,MAAM,cAAc,eACb,UAAU,GAAG,KAAK,aACnB,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,eACD,MAAM,cAAc,qBA2DlC,CAAC;AAmCF,eAAO,MAAM,cAAc,cAAqB,SAAS,YAAY,MAAM,QAAQ,WAAW,qBAY7F,CAAC;AAEF,eAAO,MAAM,eAAe,cACf,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,UACN,WAAW,qBAwBpB,CAAC;AAEF,eAAO,MAAM,gBAAgB,cAChB,SAAS,yBACG,WAAW,KAAK,IAAI,UACnC,MAAM,UACN,WAAW,qBAQpB,CAAC"}

package/dist/index.js

@@ -917,7 +917,7 @@ const getFirmwareUpdateField = (features, updateType) => {
     if (updateType === 'ble') {
         return 'ble';
     }
-    if (deviceType === 'classic' || deviceType === 'mini') {
+    if (deviceType === 'classic') {
         return 'firmware-v2';
     }
     if (deviceType === 'touch') {
@@ -10997,7 +10997,7 @@ function checkNeedUpdateBootForTouch(features) {
 }
 function checkNeedUpdateBootForClassicAndMini(features, willUpdateFirmware) {
     const deviceType = getDeviceType(features);
-    if (!(deviceType === 'classic' || deviceType === 'mini'))
+    if (deviceType !== 'classic')
         return false;
     if (!willUpdateFirmware)
         return false;
@@ -12985,7 +12985,7 @@ class CheckBootloaderRelease extends BaseMethod {
             const { features } = this.device;
             const deviceType = getDeviceType(features);
             let shouldUpdate = false;
-            if (deviceType === 'classic' || deviceType === 'mini') {
+            if (deviceType === 'classic') {
                 shouldUpdate = !!checkNeedUpdateBootForClassicAndMini(features, this.payload.willUpdateFirmwareVersion);
             }
             else if (deviceType === 'touch') {
@@ -13599,14 +13599,20 @@ const uploadFirmware = (updateType, typedCall, postMessage, device, { payload })
         postConfirmationMessage(device);
         postProgressTip(device, 'ConfirmOnDevice', postMessage);
         const eraseCommand = updateType === 'firmware' ? 'FirmwareErase' : 'FirmwareErase_ex';
-        yield typedCall(eraseCommand, 'Success', {});
+        const eraseRes = yield typedCall(eraseCommand, 'Success', {});
+        if (eraseRes.type !== 'Success') {
+            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'erase firmware error');
+        }
         postProgressTip(device, 'FirmwareEraseSuccess', postMessage);
         postProgressMessage(device, 0, postMessage);
-        const { message } = yield typedCall('FirmwareUpload', 'Success', {
+        const { message, type } = yield typedCall('FirmwareUpload', 'Success', {
             payload,
         });
         postProgressMessage(device, 100, postMessage);
         yield waitBleInstall(updateType);
+        if (type !== 'Success') {
+            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'install firmware error');
+        }
         return message;
     }
     if (deviceModel === 'model_touch') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "0.2.54",
+  "version": "0.2.55",
   "description": "> TODO: description",
   "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.2.54",
-    "@onekeyfe/hd-transport": "^0.2.54",
+    "@onekeyfe/hd-shared": "^0.2.55",
+    "@onekeyfe/hd-transport": "^0.2.55",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
     "bytebuffer": "^5.0.1",
@@ -43,5 +43,5 @@
     "@types/semver": "^7.3.9",
     "ripple-keypairs": "^1.1.4"
   },
-  "gitHead": "6a241ca2b12d684b9638c808b8c6c822c7f74143"
+  "gitHead": "7815dafd6d55e51fda855ff813fb9be6768ed4e9"
 }

package/src/api/CheckBootloaderRelease.ts

@@ -23,7 +23,7 @@ export default class CheckBootloaderRelease extends BaseMethod {
     const { features } = this.device;
     const deviceType = getDeviceType(features);
     let shouldUpdate = false;
-    if (deviceType === 'classic' || deviceType === 'mini') {
+    if (deviceType === 'classic') {
       shouldUpdate = !!checkNeedUpdateBootForClassicAndMini(
         features,
         this.payload.willUpdateFirmwareVersion

package/src/api/firmware/updateBootloader.ts

@@ -31,7 +31,7 @@ export function checkNeedUpdateBootForClassicAndMini(
   willUpdateFirmware: string
 ) {
   const deviceType = getDeviceType(features);
-  if (!(deviceType === 'classic' || deviceType === 'mini')) return false;
+  if (deviceType !== 'classic') return false;
   if (!willUpdateFirmware) return false;
   const currentVersion = getDeviceFirmwareVersion(features).join('.');
   const bootloaderVersion = getDeviceBootloaderVersion(features).join('.');

package/src/api/firmware/uploadFirmware.ts

@@ -65,15 +65,21 @@ export const uploadFirmware = async (
     postConfirmationMessage(device);
     postProgressTip(device, 'ConfirmOnDevice', postMessage);
     const eraseCommand = updateType === 'firmware' ? 'FirmwareErase' : 'FirmwareErase_ex';
-    await typedCall(eraseCommand as unknown as any, 'Success', {});
+    const eraseRes = await typedCall(eraseCommand as unknown as any, 'Success', {});
+    if (eraseRes.type !== 'Success') {
+      throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, 'erase firmware error');
+    }
     postProgressTip(device, 'FirmwareEraseSuccess', postMessage);
     postProgressMessage(device, 0, postMessage);
-    const { message } = await typedCall('FirmwareUpload', 'Success', {
+    const { message, type } = await typedCall('FirmwareUpload', 'Success', {
       payload,
     });
     postProgressMessage(device, 100, postMessage);
 
     await waitBleInstall(updateType);
+    if (type !== 'Success') {
+      throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, 'install firmware error');
+    }
     return message;
   }
 

package/src/utils/deviceFeaturesUtils.ts

@@ -184,7 +184,7 @@ export const getFirmwareUpdateField = (features: Features, updateType: 'firmware
     return 'ble';
   }
 
-  if (deviceType === 'classic' || deviceType === 'mini') {
+  if (deviceType === 'classic') {
     return 'firmware-v2';
   }