@onekeyfe/hd-core 1.2.8-alpha.128 → 1.2.8-alpha.129

package/src/device/Device.ts

@@ -236,6 +236,9 @@ export class Device extends EventEmitter {
    */
   private deviceAcquired = false;
 
+  /** A completed BLE release left the physical link available for the next call. */
+  private releasedBleConnection = false;
+
   /**
    * Connection-attempt generation. interruptionFromUser() pins the current
    * attempt so a late acquire cannot finish, while the next public connect
@@ -452,6 +455,7 @@ export class Device extends EventEmitter {
   ) {
     const attempt = this.connectionAttempt;
     this.throwIfInterruptedByUser();
+    this.releasedBleConnection = false;
     const env = DataManager.getSettings('env');
     const mainIdKey = DataManager.isBleConnect(env) ? 'id' : 'session';
     const previousProtocol = this.originalDescriptor.protocolType;
@@ -562,6 +566,7 @@ export class Device extends EventEmitter {
       (this.isUsedHere() && !this.keepSession && this.mainId) ||
       (this.mainId && DataManager.isBleConnect(env))
     ) {
+      this.releasedBleConnection = false;
       // wait for callback tasks to complete before releasing device
       if (this.pendingCallbackPromise) {
         try {
@@ -585,8 +590,18 @@ export class Device extends EventEmitter {
         }
       }
       try {
+        const deviceType = this.getCurrentDeviceType();
+        const keepBleConnection =
+          (env === 'react-native' || env === 'desktop-web-ble') &&
+          this.isProtocolV2() &&
+          (deviceType === EDeviceType.Pro2 || deviceType === EDeviceType.Neo);
         // BLE releases even when keepSession is set, so forward the intent.
-        await this.deviceConnector?.release(this.mainId, false, this.keepSession);
+        await this.deviceConnector?.release(
+          this.mainId,
+          false,
+          this.keepSession || keepBleConnection
+        );
+        this.releasedBleConnection = keepBleConnection;
       } catch (err) {
         Log.error('[Device] release error: ', err);
       } finally {
@@ -1371,6 +1386,7 @@ export class Device extends EventEmitter {
 
   markTransportDisconnected() {
     this.deviceAcquired = false;
+    this.releasedBleConnection = false;
     this.invalidateProtocolV2RuntimeState();
   }
 
@@ -1633,7 +1649,7 @@ export class Device extends EventEmitter {
           await commands?.cancelDevice?.().catch(cancelError => {
             Log.debug('Protocol V2 fallback cancel error', cancelError);
           });
-        } else if (!acquired) {
+        } else if (!acquired && !this.releasedBleConnection) {
           // Abort setup without acquiring a session just to send Cancel.
           if (mainId && deviceConnector?.disconnect) {
             // The connector drops the link silently, so without this line a

package/src/events/ui-request.ts

@@ -211,6 +211,7 @@ export interface DeviceProgress {
     totalBytes?: number;
     rateBytesPerSecond?: number;
     elapsedMs?: number;
+    retryCount?: number;
   };
 }
 

package/src/protocols/protocol-v2/resources.ts

@@ -7,6 +7,8 @@ export const PROTOCOL_V2_BOOT_RESOURCE_PACKAGE_PATH =
 export const PROTOCOL_V2_BOOT_RESOURCE_PACKAGE_STAGING_PATH = `${PROTOCOL_V2_BOOT_RESOURCE_PACKAGE_PATH}.staging`;
 export const PROTOCOL_V2_ROM_PARAMS_PACKAGE_PATH = 'vol0:/loaders/rom/params.okpkg';
 export const PROTOCOL_V2_RESOURCE_PACKAGE_HEADER_SIZE = 0x5f90;
+// Installed-package comparison only needs the prefix through the header hash.
+export const PROTOCOL_V2_RESOURCE_PACKAGE_COMPARE_SIZE = 0x280;
 
 const PROTOCOL_V2_RESOURCE_PACKAGE_HEADER_VERSION = 1;
 const PROTOCOL_V2_RESOURCE_PACKAGE_FLEXIBLE_OFFSET = 0x6c;
@@ -123,7 +125,7 @@ export function parseProtocolV2ResourcePackageHeader(
   bytes: Uint8Array,
   packageSize: number
 ): ProtocolV2ResourcePackageHeader {
-  if (bytes.byteLength < PROTOCOL_V2_RESOURCE_PACKAGE_HEADER_SIZE) {
+  if (bytes.byteLength < PROTOCOL_V2_RESOURCE_PACKAGE_COMPARE_SIZE) {
     throw new Error('Pro2 RESOURCE package is shorter than its header');
   }
   const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
@@ -169,5 +171,8 @@ export function parseProtocolV2ResourcePackage(
   binary: ArrayBuffer | Uint8Array
 ): ProtocolV2ResourcePackageHeader {
   const bytes = binary instanceof Uint8Array ? binary : new Uint8Array(binary);
+  if (bytes.byteLength < PROTOCOL_V2_RESOURCE_PACKAGE_HEADER_SIZE) {
+    throw new Error('Pro2 RESOURCE package is shorter than its header');
+  }
   return parseProtocolV2ResourcePackageHeader(bytes, bytes.byteLength);
 }