chore: fix update error bug

OneKeyHQ · Mar 19, 2024 · 37cfabc · 37cfabc
1 parent 58db0db
commit 37cfabc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 19 deletions.
diff --git a/packages/connect-examples/expo-example/src/views/FirmwareScreen/index.tsx b/packages/connect-examples/expo-example/src/views/FirmwareScreen/index.tsx
@@ -213,25 +213,14 @@ function FirmwareUpdate({ selectDevice, onDisconnectDevice }: FirmwareUpdateProp
 
       if (type === 'ble' || type === 'firmware' || type === 'bootloader') {
         setShowUpdateDialog(true);
-        // @ts-expect-error
         const res = await sdk.firmwareUpdate(
           Platform.OS === 'web' ? undefined : selectDevice.connectId,
           {
             updateType: type === 'bootloader' ? 'firmware' : type,
             binary: fileData,
-            platform: Platform.OS === 'web' ? 'web' : 'native',
           }
         );
 
-        // const res = await sdk.firmwareUpdateV2(
-        //   Platform.OS === 'web' ? undefined : selectDevice.connectId,
-        //   {
-        //     updateType: type === 'bootloader' ? 'firmware' : type,
-        //     binary: fileData,
-        //     platform: Platform.OS === 'web' ? 'web' : 'native',
-        //   }
-        // );
-
         setShowUpdateDialog(false);
         if (!res.success) {
           return {

diff --git a/packages/core/src/api/FirmwareUpdate.ts b/packages/core/src/api/FirmwareUpdate.ts
@@ -41,15 +41,9 @@ export default class FirmwareUpdate extends BaseMethod<Params> {
     validateParams(payload, [
       { name: 'version', type: 'array' },
       { name: 'binary', type: 'buffer' },
+      { name: 'updateType', type: 'string', required: true },
     ]);
 
-    if (!payload.updateType) {
-      throw ERRORS.TypedError(
-        HardwareErrorCode.CallMethodInvalidParameter,
-        'updateType is required'
-      );
-    }
-
     this.params = { updateType: payload.updateType };
 
     if ('version' in payload) {
@@ -201,6 +195,8 @@ export default class FirmwareUpdate extends BaseMethod<Params> {
       throw ERRORS.TypedError(HardwareErrorCode.FirmwareUpdateDownloadFailed, err.message ?? err);
     }
 
+    await this.device.acquire();
+
     return uploadFirmware(
       params.updateType,
       this.device.getCommands().typedCall.bind(this.device.getCommands()),

diff --git a/packages/core/src/types/api/firmwareUpdate.ts b/packages/core/src/types/api/firmwareUpdate.ts
@@ -1,14 +1,17 @@
 import type { PROTO } from '../../constants';
 import type { Params, Response } from '../params';
 
+type IUpdateType = 'firmware' | 'ble';
+
 export interface FirmwareUpdateBinaryParams {
   binary: ArrayBuffer;
+  updateType: IUpdateType;
 }
 
 export interface FirmwareUpdateParams {
   version?: number[];
   btcOnly?: boolean;
-  updateType: 'firmware' | 'ble';
+  updateType: IUpdateType;
   forcedUpdateRes?: boolean;
   isUpdateBootloader?: boolean;
 }