@onekeyfe/hd-transport-react-native 1.2.0-alpha.6 → 1.2.0-alpha.61

package/src/index.ts

@@ -12,26 +12,31 @@ import transport, {
   LogBlockCommand,
   type OneKeyDeviceInfoBase,
   PROTOCOL_V1_MESSAGE_HEADER_SIZE,
+  PROTOCOL_V2_BLE_FRAME_MAX_BYTES,
   PROTOCOL_V2_CHANNEL_BLE_UART,
   type ProtocolType,
+  type ProtocolV2CallContext,
   ProtocolV2FrameAssembler,
-  ProtocolV2Session,
+  ProtocolV2LinkManager,
+  TRANSPORT_EVENT,
   type TransportCallOptions,
   probeProtocolV2 as probeProtocolV2Helper,
+  writeProtocolV2BleFrame,
 } from '@onekeyfe/hd-transport';
-import { ERRORS, HardwareErrorCode, createDeferred, isOnekeyDevice } from '@onekeyfe/hd-shared';
+import {
+  ERRORS,
+  HardwareErrorCode,
+  createDeferred,
+  isOnekeyBluetoothDevice,
+  isPro2FindMyAdvertisementName,
+} from '@onekeyfe/hd-shared';
 
 import { getConnectedDeviceIds, onDeviceBondState, pairDevice } from './BleManager';
-import {
-  hasWritableCapability,
-  resolveBleWriteMode,
-  resolveProtocolV2PacketCapacity,
-} from './bleStrategy';
+import { hasWritableCapability, resolveProtocolV2PacketCapacity } from './bleStrategy';
 import { subscribeBleOn } from './subscribeBleOn';
 import {
   ANDROID_PACKET_LENGTH,
   IOS_PACKET_LENGTH,
-  getBleUuidKey,
   getBluetoothServiceUuids,
   getInfosForServiceUuid,
   isSameBleUuid,
@@ -40,6 +45,7 @@ import { isHeaderChunk } from './utils/validateNotify';
 import BleTransport from './BleTransport';
 import timer from './utils/timer';
 import { bleLogger, setBleLogger } from './logger';
+import { createTransportCallLog } from './transportLog';
 
 import type { Deferred } from '@onekeyfe/hd-shared';
 import type { Characteristic, Device, Subscription } from 'react-native-ble-plx';
@@ -55,24 +61,53 @@ const FIRMWARE_UPLOAD_WRITE_BURST_SIZE = Platform.OS === 'ios' ? 4 : 5;
 const FIRMWARE_UPLOAD_WRITE_PAUSE_MS = Platform.OS === 'ios' ? 8 : 10;
 const FIRMWARE_UPLOAD_WRITE_FLUSH_DELAY_MS = Platform.OS === 'ios' ? 24 : 30;
 const FIRMWARE_UPLOAD_WRITE_MAX_RETRIES = 8;
-const FIRMWARE_UPLOAD_RECONNECT_RETRY_DELAY_MS = 2000;
+const IOS_PROTOCOL_V2_CONTROL_WRITE_DELAY_MS = 5;
 const ANDROID_FIRMWARE_UPLOAD_PACKET_LENGTH = 192;
 const FIRMWARE_UPLOAD_WRITE_PACKET_CAPACITY =
   Platform.OS === 'ios' ? IOS_PACKET_LENGTH : ANDROID_FIRMWARE_UPLOAD_PACKET_LENGTH;
 const ANDROID_GATT_CONGESTED_STATUS = 143;
 
-type FirmwareUploadWriteRetryType = 'congested' | 'reconnectable';
+type FirmwareUploadWriteRetryType = 'congested';
 type ResolvedBleCharacteristics = {
   writeCharacteristic: Characteristic;
   notifyCharacteristic: Characteristic;
 };
 
+const isAsciiWhitespace = (code: number) =>
+  code === 0x09 ||
+  code === 0x0a ||
+  code === 0x0b ||
+  code === 0x0c ||
+  code === 0x0d ||
+  code === 0x20;
+
+const hasGattCongestedStatus = (text: string) => {
+  let searchFrom = 0;
+  while (searchFrom < text.length) {
+    const statusIndex = text.indexOf('status', searchFrom);
+    if (statusIndex < 0) return false;
+
+    let cursor = statusIndex + 'status'.length;
+    while (cursor < text.length && isAsciiWhitespace(text.charCodeAt(cursor))) cursor += 1;
+    if (text[cursor] === ':' || text[cursor] === '=') {
+      cursor += 1;
+      while (cursor < text.length && isAsciiWhitespace(text.charCodeAt(cursor))) cursor += 1;
+    }
+    if (text.startsWith(String(ANDROID_GATT_CONGESTED_STATUS), cursor)) return true;
+
+    searchFrom = statusIndex + 'status'.length;
+  }
+  return false;
+};
+
 const delay = (ms: number) =>
   new Promise<void>(resolve => {
     setTimeout(resolve, ms);
   });
 
-const getFirmwareUploadWriteRetryType = (error: unknown): FirmwareUploadWriteRetryType | null => {
+export const getFirmwareUploadWriteRetryType = (
+  error: unknown
+): FirmwareUploadWriteRetryType | null => {
   if (!error || typeof error !== 'object') return null;
   const bleWriteError = error as {
     androidErrorCode?: unknown;
@@ -83,13 +118,6 @@ const getFirmwareUploadWriteRetryType = (error: unknown): FirmwareUploadWriteRet
     name?: unknown;
   };
 
-  if (
-    bleWriteError.errorCode === BleErrorCode.DeviceDisconnected ||
-    bleWriteError.errorCode === BleErrorCode.CharacteristicNotFound
-  ) {
-    return 'reconnectable';
-  }
-
   if (
     bleWriteError.androidErrorCode === ANDROID_GATT_CONGESTED_STATUS ||
     bleWriteError.status === ANDROID_GATT_CONGESTED_STATUS
@@ -100,28 +128,19 @@ const getFirmwareUploadWriteRetryType = (error: unknown): FirmwareUploadWriteRet
   const text = [bleWriteError.reason, bleWriteError.message, bleWriteError.name]
     .filter(value => typeof value === 'string')
     .join(' ');
-  return /GATT_CONGESTED|status\s*[:=]?\s*143/.test(text) ? 'congested' : null;
+  return text.includes('GATT_CONGESTED') || hasGattCongestedStatus(text) ? 'congested' : null;
 };
 
 const resolveFirmwareUploadRetryDelay = (attempt: number, baseDelayMs = 200, maxDelayMs = 1200) =>
   Math.min(baseDelayMs * 2 ** attempt, maxDelayMs);
-const BLE_RESPONSE_TIMEOUT_MS = 30_000;
 const PROTOCOL_PROBE_TIMEOUT_MS = 1000;
 const PROTOCOL_V2_PROBE_TIMEOUT_MS = 10_000;
-const DEVICE_SCAN_TIMEOUT_MS = 8000;
+const DEVICE_SCAN_TIMEOUT_MS = 3000;
 const IOS_NOTIFY_READY_DELAY_MS = 150;
 const ANDROID_NOTIFY_READY_DELAY_MS = 300;
-const HIGH_VOLUME_WRITE_BURST_SIZE = Platform.OS === 'ios' ? 4 : 6;
-const HIGH_VOLUME_WRITE_PAUSE_MS = Platform.OS === 'ios' ? 6 : 2;
-const HIGH_VOLUME_WRITE_FLUSH_DELAY_MS = Platform.OS === 'ios' ? 20 : 8;
-
 export type ProtocolV2BleTuning = {
   iosPacketLength?: number;
   androidPacketLength?: number;
-  highVolumeWriteBurstSize?: number;
-  highVolumeWritePauseMs?: number;
-  highVolumeWriteFlushDelayMs?: number;
-  highVolumeWriteWithResponse?: boolean;
 };
 
 type ResolvedProtocolV2BleTuning = Required<ProtocolV2BleTuning>;
@@ -129,10 +148,6 @@ type ResolvedProtocolV2BleTuning = Required<ProtocolV2BleTuning>;
 const DEFAULT_PROTOCOL_V2_BLE_TUNING: ResolvedProtocolV2BleTuning = {
   iosPacketLength: IOS_PACKET_LENGTH,
   androidPacketLength: ANDROID_PACKET_LENGTH,
-  highVolumeWriteBurstSize: HIGH_VOLUME_WRITE_BURST_SIZE,
-  highVolumeWritePauseMs: HIGH_VOLUME_WRITE_PAUSE_MS,
-  highVolumeWriteFlushDelayMs: HIGH_VOLUME_WRITE_FLUSH_DELAY_MS,
-  highVolumeWriteWithResponse: false,
 };
 
 let protocolV2BleTuning: ResolvedProtocolV2BleTuning = { ...DEFAULT_PROTOCOL_V2_BLE_TUNING };
@@ -153,27 +168,13 @@ export function configureProtocolV2BleTuning(tuning: ProtocolV2BleTuning = {}) {
       tuning.androidPacketLength,
       protocolV2BleTuning.androidPacketLength
     ),
-    highVolumeWriteBurstSize: normalizePositiveInteger(
-      tuning.highVolumeWriteBurstSize,
-      protocolV2BleTuning.highVolumeWriteBurstSize
-    ),
-    highVolumeWritePauseMs: normalizePositiveInteger(
-      tuning.highVolumeWritePauseMs,
-      protocolV2BleTuning.highVolumeWritePauseMs
-    ),
-    highVolumeWriteFlushDelayMs: normalizePositiveInteger(
-      tuning.highVolumeWriteFlushDelayMs,
-      protocolV2BleTuning.highVolumeWriteFlushDelayMs
-    ),
-    highVolumeWriteWithResponse:
-      tuning.highVolumeWriteWithResponse ?? protocolV2BleTuning.highVolumeWriteWithResponse,
   };
-  Log?.debug('[ReactNativeBleTransport] Protocol V2 BLE tuning configured:', protocolV2BleTuning);
+  Log?.debug('[ReactNativeBleTransport] BLE tuning configured', protocolV2BleTuning);
 }
 
 export function resetProtocolV2BleTuning() {
   protocolV2BleTuning = { ...DEFAULT_PROTOCOL_V2_BLE_TUNING };
-  Log?.debug('[ReactNativeBleTransport] Protocol V2 BLE tuning reset:', protocolV2BleTuning);
+  Log?.debug('[ReactNativeBleTransport] BLE tuning reset', protocolV2BleTuning);
 }
 
 export function getProtocolV2BleTuning() {
@@ -188,16 +189,6 @@ function getDeviceDisplayName(device?: Device | null) {
   return device?.name || device?.localName || null;
 }
 
-function isGenericBleService(uuid?: string | null) {
-  return ['1800', '1801', '180a'].includes(getBleUuidKey(uuid));
-}
-
-function hasKnownOneKeyService(device?: Device | null) {
-  return (device?.serviceUUIDs ?? []).some(serviceUuid =>
-    getInfosForServiceUuid(serviceUuid, 'classic')
-  );
-}
-
 const ANDROID_REQUEST_MTU = 256;
 
 const connectOptions: Record<string, unknown> = {
@@ -222,9 +213,10 @@ const requestAndroidMtu = async (device: Device) => {
 
   try {
     const mtuDevice = await device.requestMTU(ANDROID_REQUEST_MTU);
-    Log?.debug('[ReactNativeBleTransport] Android MTU requested:', {
+    Log?.debug('[ReactNativeBleTransport] MTU configured', {
+      deviceId: device.id,
       requested: ANDROID_REQUEST_MTU,
-      mtu: mtuDevice.mtu,
+      actual: mtuDevice.mtu,
     });
     return mtuDevice;
   } catch (error) {
@@ -272,6 +264,8 @@ export default class ReactNativeBleTransport {
 
   _messagesV2: ReturnType<typeof transport.parseConfigure> | undefined;
 
+  private protocolV2SchemaConfiguration: string | undefined;
+
   name = 'ReactNativeBleTransport';
 
   configured = false;
@@ -282,6 +276,8 @@ export default class ReactNativeBleTransport {
 
   runPromise: Deferred<any> | null = null;
 
+  private runPromiseDeviceId: string | null = null;
+
   emitter?: EventEmitter;
 
   firmwareUploadWriteRecoveryIds = new Set<string>();
@@ -297,12 +293,31 @@ export default class ReactNativeBleTransport {
 
   private protocolV2FramePromises: Map<string, Deferred<Uint8Array>> = new Map();
 
-  private activeProtocolV2Call: { uuid: string; token: number } | null = null;
-
-  private nextProtocolV2CallToken = 1;
+  private protocolV2Links = new ProtocolV2LinkManager<string>({
+    getSchemas: () => {
+      if (!this._messages || !this._messagesV2) {
+        throw ERRORS.TypedError(HardwareErrorCode.TransportNotConfigured);
+      }
+      return {
+        protocolV1: this._messages,
+        protocolV2: this._messagesV2,
+      };
+    },
+    classifyError: () => 'link-fatal',
+    onLinkInvalidated: async (uuid, reason) => {
+      this.protocolV2Assemblers.get(uuid)?.reset();
+      this.rejectProtocolV2Frames(uuid, new Error(reason));
+      Log?.debug('[ReactNativeBleTransport] Protocol V2 link invalidated:', uuid, reason);
+      if (reason.startsWith('Protocol V2 link-fatal error:')) {
+        await this.releaseNative(uuid, true);
+      }
+    },
+  });
 
   private monitorTokens: Map<string, number> = new Map();
 
+  private disconnectEventTokens: Map<string, number> = new Map();
+
   private nextMonitorToken = 1;
 
   constructor(options: TransportOptions) {
@@ -321,8 +336,19 @@ export default class ReactNativeBleTransport {
   }
 
   configureProtocolV2(signedData: any) {
+    const configuration = typeof signedData === 'string' ? signedData : JSON.stringify(signedData);
+    if (this.protocolV2SchemaConfiguration === configuration) {
+      return;
+    }
+
+    const isReconfiguration = this.protocolV2SchemaConfiguration !== undefined;
     this._messagesV2 = parseConfigure(signedData);
-    Log?.debug('[ReactNativeBleTransport] Protocol V2 schema configured');
+    this.protocolV2SchemaConfiguration = configuration;
+    if (isReconfiguration) {
+      this.protocolV2Links
+        .invalidateAllLinks('Protocol V2 schema reconfigured')
+        .catch(error => Log?.debug('Protocol V2 schema link cleanup failed:', error));
+    }
   }
 
   listen() {
@@ -352,29 +378,15 @@ export default class ReactNativeBleTransport {
       }
     }
 
-    let fallbackServiceUuid: string | undefined;
-
     if (!infos) {
       const services = await device.services();
       Log?.debug(
         '[ReactNativeBleTransport] Known OneKey service UUID not found, discovered services:',
         services?.map(service => service.uuid)
       );
-
-      const knownService = services.find(service =>
-        getInfosForServiceUuid(service.uuid, 'classic')
-      );
-      const fallbackService =
-        knownService ?? services.find(service => !isGenericBleService(service.uuid)) ?? services[0];
-
-      if (fallbackService) {
-        fallbackServiceUuid = fallbackService.uuid;
-        characteristics = await device.characteristicsForService(fallbackService.uuid);
-        Log?.debug('[ReactNativeBleTransport] Using fallback BLE service:', fallbackService.uuid);
-      }
     }
 
-    if (!infos && !fallbackServiceUuid) {
+    if (!infos) {
       try {
         Log?.debug('cancel connection when service not found');
         await device.cancelConnection();
@@ -384,9 +396,7 @@ export default class ReactNativeBleTransport {
       throw ERRORS.TypedError(HardwareErrorCode.BleServiceNotFound);
     }
 
-    const serviceUuid = infos?.serviceUuid ?? fallbackServiceUuid;
-    const writeUuid = infos?.writeUuid ?? '00000002-0000-1000-8000-00805f9b34fb';
-    const notifyUuid = infos?.notifyUuid ?? '00000003-0000-1000-8000-00805f9b34fb';
+    const { serviceUuid, writeUuid, notifyUuid } = infos;
 
     if (!serviceUuid) {
       throw ERRORS.TypedError(HardwareErrorCode.BleServiceNotFound);
@@ -436,6 +446,7 @@ export default class ReactNativeBleTransport {
 
   attachDisconnectSubscription(transport: BleTransport, device: Device, uuid: string) {
     transport.disconnectSubscription?.remove();
+    const { monitorToken } = transport;
     transport.disconnectSubscription = device.onDisconnected(() => {
       if (this.firmwareUploadWriteRecoveryIds.has(uuid)) {
         Log?.debug('device disconnect ignored during FirmwareUpload write recovery: ', uuid);
@@ -445,18 +456,17 @@ export default class ReactNativeBleTransport {
         Log?.debug('device disconnect ignored for stale transport: ', device?.id);
         return;
       }
+      if (this.monitorTokens.get(uuid) !== monitorToken) {
+        Log?.debug('device disconnect ignored for stale generation: ', device?.id);
+        return;
+      }
 
       try {
         Log?.debug('device disconnect: ', device?.id);
-        this.emitter?.emit('device-disconnect', {
-          name: device?.name,
-          id: device?.id,
-          connectId: device?.id,
-        });
-        if (this.runPromise) {
+        this.emitDeviceDisconnect(uuid, device?.name, monitorToken);
+        if (this.runPromise && this.runPromiseDeviceId === uuid) {
           const error = ERRORS.TypedError(HardwareErrorCode.BleConnectedError);
           this.runPromise.reject(error);
-          this.rejectAllProtocolV2Frames(error);
         }
       } catch (e) {
         Log?.debug('device disconnect error: ', e);
@@ -466,6 +476,22 @@ export default class ReactNativeBleTransport {
     });
   }
 
+  private emitDeviceDisconnect(uuid: string, name: string | null | undefined, token?: number) {
+    if (token === undefined || this.disconnectEventTokens.get(uuid) === token) {
+      return;
+    }
+    if (this.monitorTokens.get(uuid) !== token) {
+      Log?.debug('device disconnect event ignored for stale generation: ', uuid);
+      return;
+    }
+    this.disconnectEventTokens.set(uuid, token);
+    this.emitter?.emit(TRANSPORT_EVENT.DEVICE_DISCONNECT, {
+      name,
+      id: uuid,
+      connectId: uuid,
+    });
+  }
+
   async reconnectFirmwareUploadTransport(uuid: string, transport: BleTransport) {
     this.firmwareUploadWriteRecoveryIds.add(uuid);
     try {
@@ -553,14 +579,13 @@ export default class ReactNativeBleTransport {
       }
 
       blePlxManager.startDeviceScan(
-        null,
+        getBluetoothServiceUuids(),
         {
           allowDuplicates: true,
           scanMode: ScanMode.LowLatency,
         },
         (error, device) => {
           if (error) {
-            Log?.debug('ble scan manager: ', blePlxManager);
             Log?.debug('ble scan error: ', error);
             if (
               [BleErrorCode.BluetoothPoweredOff, BleErrorCode.BluetoothInUnknownState].includes(
@@ -584,33 +609,23 @@ export default class ReactNativeBleTransport {
           }
 
           const displayName = getDeviceDisplayName(device);
+          // iOS may report a service-only advertisement before the named scan response.
+          // Do not cache that incomplete advertisement as an unknown device.
+          const isUnnamedIOSPeripheral = Platform.OS === 'ios' && !displayName?.trim();
+          const isFindMyPeripheral =
+            isPro2FindMyAdvertisementName(device?.name) ||
+            isPro2FindMyAdvertisementName(device?.localName);
           const isOneKey =
-            isOnekeyDevice(device?.name ?? null, device?.id) ||
-            isOnekeyDevice(device?.localName ?? null, device?.id) ||
-            hasKnownOneKeyService(device);
-          const shouldTraceCandidate =
-            !!displayName && /onekey|bixinkey|pro\s*2|pro\b|touch|^k\d|^t\d/i.test(displayName);
-
-          if (shouldTraceCandidate) {
-            Log?.debug('[ReactNativeBleTransport] scan candidate', {
+            !isUnnamedIOSPeripheral &&
+            !isFindMyPeripheral &&
+            isOnekeyBluetoothDevice({
+              id: device?.id,
               name: device?.name,
               localName: device?.localName,
-              id: device?.id,
-              serviceUUIDs: device?.serviceUUIDs,
-              accepted: isOneKey,
+              serviceUuids: device?.serviceUUIDs,
             });
-          }
-
           if (isOneKey) {
-            Log?.debug('search device start ======================');
-            const { name, localName, id, serviceUUIDs } = device ?? {};
-            Log?.debug(
-              `device name: ${name ?? ''}\nlocalName: ${localName ?? ''}\nid: ${
-                id ?? ''
-              }\nserviceUUIDs: ${(serviceUUIDs ?? []).join(',')}`
-            );
             addDevice(device as unknown as Device);
-            Log?.debug('search device end ======================\n');
           } else if (displayName && /\bpro\s*2\b/i.test(displayName)) {
             Log?.debug('[ReactNativeBleTransport] Pro2-like BLE device was not accepted:', {
               name: device?.name,
@@ -622,12 +637,32 @@ export default class ReactNativeBleTransport {
         }
       );
 
-      getConnectedDeviceIds(getBluetoothServiceUuids()).then(devices => {
-        for (const device of devices) {
-          Log?.debug('search connected peripheral: ', device.id);
-          addDevice(device as unknown as Device);
+      getConnectedDeviceIds(Platform.OS === 'ios' ? getBluetoothServiceUuids() : []).then(
+        devices => {
+          for (const device of devices) {
+            const localName =
+              'localName' in device && typeof device.localName === 'string'
+                ? device.localName
+                : null;
+            const isFindMyPeripheral =
+              isPro2FindMyAdvertisementName(device.name) ||
+              isPro2FindMyAdvertisementName(localName);
+
+            if (
+              !isFindMyPeripheral &&
+              isOnekeyBluetoothDevice({
+                id: device.id,
+                name: device.name,
+                localName,
+                serviceUuids: device.serviceUUIDs,
+              })
+            ) {
+              Log?.debug('search connected peripheral: ', device.id);
+              addDevice(device as unknown as Device);
+            }
+          }
         }
-      });
+      );
 
       const addDevice = (device: Device) => {
         if (deviceList.every(d => d.id !== device.id)) {
@@ -641,6 +676,12 @@ export default class ReactNativeBleTransport {
             name: displayName,
             commType: 'ble',
           } as IOneKeyDevice);
+          Log?.debug('[ReactNativeBleTransport] OneKey BLE device discovered', {
+            deviceId: device.id,
+            name: displayName,
+            serviceUUIDs: device.serviceUUIDs,
+            protocolHint,
+          });
         }
       };
 
@@ -651,6 +692,46 @@ export default class ReactNativeBleTransport {
     });
   }
 
+  private async installTransportForAcquire(
+    uuid: string,
+    device: Device,
+    characteristics?: ResolvedBleCharacteristics
+  ) {
+    const { writeCharacteristic, notifyCharacteristic } =
+      characteristics ?? (await this.resolveCharacteristics(device));
+    const transport = new BleTransport(device, writeCharacteristic, notifyCharacteristic);
+    if (Platform.OS === 'android') {
+      transport.mtuSize = typeof device.mtu === 'number' ? device.mtu : transport.mtuSize;
+    }
+    const monitorToken = this.nextMonitorToken;
+    this.nextMonitorToken += 1;
+    const notifyTransactionId = `${uuid}:notify:${monitorToken}`;
+    transport.monitorToken = monitorToken;
+    transport.notifyTransactionId = notifyTransactionId;
+    this.monitorTokens.set(uuid, monitorToken);
+    transport.notifySubscription = this._monitorCharacteristic(
+      transport.notifyCharacteristic,
+      uuid,
+      monitorToken,
+      notifyTransactionId
+    );
+    transportCache[uuid] = transport;
+    this.protocolV2Assemblers.set(
+      uuid,
+      new ProtocolV2FrameAssembler(PROTOCOL_V2_BLE_FRAME_MAX_BYTES)
+    );
+
+    if (Platform.OS === 'ios') {
+      await new Promise<void>(resolve => {
+        setTimeout(resolve, IOS_NOTIFY_READY_DELAY_MS);
+      });
+    } else if (Platform.OS === 'android') {
+      await delay(ANDROID_NOTIFY_READY_DELAY_MS);
+    }
+
+    return transport;
+  }
+
   async acquire(input: BleAcquireInput) {
     const { uuid, forceCleanRunPromise, expectedProtocol } = input;
 
@@ -684,9 +765,8 @@ export default class ReactNativeBleTransport {
     if (forceCleanRunPromise && this.runPromise) {
       const error = ERRORS.TypedError(HardwareErrorCode.BleForceCleanRunPromise);
       this.runPromise.reject(error);
-      this.rejectAllProtocolV2Frames(error);
       this.runPromise = null;
-      this.activeProtocolV2Call = null;
+      this.runPromiseDeviceId = null;
       Log?.debug('Force clean Bluetooth run promise, forceCleanRunPromise: ', forceCleanRunPromise);
     }
 
@@ -775,12 +855,16 @@ export default class ReactNativeBleTransport {
     }
 
     device = await requestAndroidMtu(device);
-    const { writeCharacteristic, notifyCharacteristic } = await this.resolveCharacteristics(device);
+    const acquiredDevice = device;
+    const { writeCharacteristic, notifyCharacteristic } = await this.resolveCharacteristics(
+      acquiredDevice
+    );
 
     const protocolHint = expectedProtocol
       ? undefined
-      : this.deviceProtocolHints.get(uuid) ??
-        inferProtocolHintFromDeviceName(getDeviceDisplayName(device));
+      : input.protocolHint ??
+        this.deviceProtocolHints.get(uuid) ??
+        inferProtocolHintFromDeviceName(getDeviceDisplayName(acquiredDevice));
 
     // release transport before new transport instance
     await this.release(uuid, true);
@@ -788,45 +872,30 @@ export default class ReactNativeBleTransport {
       this.deviceProtocolHints.set(uuid, protocolHint);
     }
 
-    const transport = new BleTransport(device, writeCharacteristic, notifyCharacteristic);
-    if (Platform.OS === 'android') {
-      transport.mtuSize = typeof device.mtu === 'number' ? device.mtu : transport.mtuSize;
-    }
-    const monitorToken = this.nextMonitorToken;
-    this.nextMonitorToken += 1;
-    const notifyTransactionId = `${uuid}:notify:${monitorToken}`;
-    transport.monitorToken = monitorToken;
-    transport.notifyTransactionId = notifyTransactionId;
-    this.monitorTokens.set(uuid, monitorToken);
-    transport.notifySubscription = this._monitorCharacteristic(
-      transport.notifyCharacteristic,
-      uuid,
-      monitorToken,
-      notifyTransactionId
-    );
-    transportCache[uuid] = transport;
-
-    this.protocolV2Assemblers.set(uuid, new ProtocolV2FrameAssembler());
-
-    if (Platform.OS === 'ios') {
-      await new Promise<void>(resolve => {
-        setTimeout(resolve, IOS_NOTIFY_READY_DELAY_MS);
-      });
-    } else if (Platform.OS === 'android') {
-      await delay(ANDROID_NOTIFY_READY_DELAY_MS);
-    }
-
-    const protocolType = await this.detectProtocol(uuid, expectedProtocol, protocolHint);
-
-    this.emitter?.emit('device-connect', {
-      name: device.name,
-      id: device.id,
-      connectId: device.id,
+    await this.installTransportForAcquire(uuid, acquiredDevice, {
+      writeCharacteristic,
+      notifyCharacteristic,
     });
 
-    this.attachDisconnectSubscription(transport, device, uuid);
-
-    return { uuid, protocolType };
+    try {
+      const protocolType = await this.detectProtocol(
+        uuid,
+        expectedProtocol,
+        protocolHint,
+        async () => {
+          await this.installTransportForAcquire(uuid, acquiredDevice);
+        }
+      );
+      const currentTransport = transportCache[uuid];
+      if (!currentTransport) {
+        throw ERRORS.TypedError(HardwareErrorCode.TransportNotFound);
+      }
+      this.attachDisconnectSubscription(currentTransport, acquiredDevice, uuid);
+      return { uuid, protocolType };
+    } catch (error) {
+      await this.release(uuid, true);
+      throw error;
+    }
   }
 
   _monitorCharacteristic(
@@ -853,7 +922,30 @@ export default class ReactNativeBleTransport {
           Log?.debug('monitor error ignored for stale transport: ', uuid, notifyTransactionId);
           return;
         }
-        if (this.runPromise) {
+        if (this.deviceProtocol.get(uuid) === 'V2') {
+          let errorCode:
+            | typeof HardwareErrorCode.BleDeviceBondError
+            | typeof HardwareErrorCode.BleCharacteristicNotifyError
+            | typeof HardwareErrorCode.BleCharacteristicNotifyChangeFailure
+            | typeof HardwareErrorCode.BleTimeoutError =
+            HardwareErrorCode.BleCharacteristicNotifyError;
+          if (error.reason?.includes('The connection has timed out unexpectedly')) {
+            errorCode = HardwareErrorCode.BleTimeoutError;
+          } else if (error.reason?.includes('Encryption is insufficient')) {
+            errorCode = HardwareErrorCode.BleDeviceBondError;
+          } else if (
+            error.reason?.includes('Cannot write client characteristic config descriptor') ||
+            error.reason?.includes('Cannot find client characteristic config descriptor') ||
+            error.reason?.includes('The handle is invalid') ||
+            error.reason?.includes('Writing is not permitted') ||
+            error.reason?.includes('notify change failed for device')
+          ) {
+            errorCode = HardwareErrorCode.BleCharacteristicNotifyChangeFailure;
+          }
+          this.rejectProtocolV2Frames(uuid, ERRORS.TypedError(errorCode));
+          return;
+        }
+        if (this.runPromise && this.runPromiseDeviceId === uuid) {
           let ERROR:
             | typeof HardwareErrorCode.BleDeviceBondError
             | typeof HardwareErrorCode.BleCharacteristicNotifyError
@@ -876,7 +968,6 @@ export default class ReactNativeBleTransport {
               HardwareErrorCode.BleCharacteristicNotifyChangeFailure
             );
             this.runPromise.reject(notifyError);
-            this.rejectAllProtocolV2Frames(notifyError);
             Log?.debug(
               `${HardwareErrorCode.BleCharacteristicNotifyChangeFailure} ${error.message}    ${error.reason}`
             );
@@ -884,7 +975,6 @@ export default class ReactNativeBleTransport {
           }
           const notifyError = ERRORS.TypedError(ERROR);
           this.runPromise.reject(notifyError);
-          this.rejectAllProtocolV2Frames(notifyError);
           Log?.debug(': monitor notify error, and has unreleased Promise', Error);
         }
 
@@ -908,7 +998,7 @@ export default class ReactNativeBleTransport {
           return;
         }
         if (protocol === 'V2') {
-          this.handleProtocolV2Notification(uuid, new Uint8Array(data));
+          this.handleProtocolV2Notification(uuid, monitorToken, new Uint8Array(data));
           return;
         }
         // console.log('[hd-transport-react-native] Received a packet, ', 'buffer: ', data);
@@ -929,13 +1019,18 @@ export default class ReactNativeBleTransport {
           // );
           bufferLength = 0;
           buffer = [];
-          this.runPromise?.resolve(value.toString('hex'));
+          if (this.runPromiseDeviceId === uuid) {
+            this.runPromise?.resolve(value.toString('hex'));
+          }
         }
       } catch (error) {
         Log?.debug('monitor data error: ', error);
         const notifyError = ERRORS.TypedError(HardwareErrorCode.BleWriteCharacteristicError);
-        this.runPromise?.reject(notifyError);
-        this.rejectAllProtocolV2Frames(notifyError);
+        if (this.deviceProtocol.get(uuid) === 'V2') {
+          this.rejectProtocolV2Frames(uuid, notifyError);
+        } else if (this.runPromiseDeviceId === uuid) {
+          this.runPromise?.reject(notifyError);
+        }
       }
     }, notifyTransactionId);
 
@@ -943,13 +1038,18 @@ export default class ReactNativeBleTransport {
   }
 
   async release(uuid: string, onclose = false) {
+    await this.protocolV2Links.invalidateLink(uuid, 'React Native BLE transport released');
+    return this.releaseNative(uuid, onclose);
+  }
+
+  private async releaseNative(uuid: string, onclose = false) {
     const transport = transportCache[uuid];
-    if (this.runPromise) {
+    if (this.runPromise && this.runPromiseDeviceId === uuid) {
       const error = ERRORS.TypedError(HardwareErrorCode.BleForceCleanRunPromise);
       this.runPromise.reject(error);
       this.runPromise = null;
-      this.rejectAllProtocolV2Frames(error);
-      this.activeProtocolV2Call = null;
+      this.runPromiseDeviceId = null;
+      this.rejectProtocolV2Frames(uuid, error);
     } else {
       this.resetProtocolV2Frames(uuid);
     }
@@ -957,9 +1057,6 @@ export default class ReactNativeBleTransport {
     if (Platform.OS === 'android' && !onclose && transport) {
       this.protocolV2Assemblers.get(uuid)?.reset();
       this.resetProtocolV2Frames(uuid);
-      if (this.activeProtocolV2Call?.uuid === uuid) {
-        this.activeProtocolV2Call = null;
-      }
       return Promise.resolve(true);
     }
 
@@ -993,7 +1090,7 @@ export default class ReactNativeBleTransport {
     }
 
     this.deviceProtocol.delete(uuid);
-    this.deviceProtocolHints.delete(uuid);
+    // Preserve a name-derived hint across disconnects so reconnect can probe V2 first.
     this.protocolV2Assemblers.get(uuid)?.reset();
     this.protocolV2Assemblers.delete(uuid);
     this.resetProtocolV2Frames(uuid);
@@ -1025,13 +1122,6 @@ export default class ReactNativeBleTransport {
       throw ERRORS.TypedError(HardwareErrorCode.TransportNotConfigured);
     }
 
-    const forceRun = name === 'Initialize' || name === 'Cancel';
-
-    Log?.debug('transport-react-native call this.runPromise', this.runPromise);
-    if (this.runPromise && !forceRun) {
-      throw ERRORS.TypedError(HardwareErrorCode.TransportCallInProgress);
-    }
-
     const protocol = this.getProtocolType(uuid);
     if (!protocol) {
       throw ERRORS.TypedError(
@@ -1039,31 +1129,17 @@ export default class ReactNativeBleTransport {
         `Device protocol has not been detected for ${uuid}`
       );
     }
-    // Upload resources on low-end phones may OOM
-    if (name === 'ResourceUpdate' || name === 'ResourceAck') {
-      Log?.debug('transport-react-native', 'call-', ' name: ', name, ' data: ', {
-        file_name: data?.file_name,
-        hash: data?.hash,
-      });
-    } else if (LogBlockCommand.has(name)) {
-      Log?.debug('transport-react-native', 'call-', ' name: ', name, ' protocol: ', protocol);
-    } else {
-      Log?.debug(
-        'transport-react-native',
-        'call-',
-        ' name: ',
-        name,
-        ' data: ',
-        data,
-        ' protocol: ',
-        protocol
-      );
-    }
+    Log?.debug('transport call', createTransportCallLog(name, protocol, data));
 
     if (protocol === 'V2') {
       return this.callProtocolV2(uuid, name, data, options);
     }
 
+    const forceRun = name === 'Initialize' || name === 'Cancel';
+    if (this.runPromise && !forceRun) {
+      throw ERRORS.TypedError(HardwareErrorCode.TransportCallInProgress);
+    }
+
     return this.callProtocolV1(uuid, name, data, options);
   }
 
@@ -1081,6 +1157,7 @@ export default class ReactNativeBleTransport {
     const runPromise = createDeferred<string>();
     runPromise.promise.catch(() => undefined);
     this.runPromise = runPromise;
+    this.runPromiseDeviceId = uuid;
     const messages = this._messages;
     const buffers = ProtocolV1.encodeTransportPackets(messages, name, data);
     let timeout: ReturnType<typeof setTimeout> | undefined;
@@ -1157,14 +1234,13 @@ export default class ReactNativeBleTransport {
         }
       );
     } else if (name === 'FirmwareUpload') {
-      Log?.debug('[ReactNativeBleTransport] FirmwareUpload write uses throttled BLE packets:', {
+      Log?.debug('[ReactNativeBleTransport] Firmware upload transport configured', {
         packetCapacity: FIRMWARE_UPLOAD_WRITE_PACKET_CAPACITY,
         burstSize: FIRMWARE_UPLOAD_WRITE_BURST_SIZE,
         pauseMs: FIRMWARE_UPLOAD_WRITE_PAUSE_MS,
         flushDelayMs: FIRMWARE_UPLOAD_WRITE_FLUSH_DELAY_MS,
         maxRetries: FIRMWARE_UPLOAD_WRITE_MAX_RETRIES,
       });
-
       await writeFirmwareUploadChunkedData(
         buffers,
         async data => {
@@ -1174,38 +1250,21 @@ export default class ReactNativeBleTransport {
           // eslint-disable-next-line no-constant-condition
           while (true) {
             try {
-              await transport.writeCharacteristic.writeWithoutResponse(data);
+              await transport.writeWithRetry(data);
               return;
             } catch (error) {
               const retryType = getFirmwareUploadWriteRetryType(error);
               if (!retryType || attempt >= FIRMWARE_UPLOAD_WRITE_MAX_RETRIES) {
                 throw error;
               }
-              const shouldReconnect = retryType === 'reconnectable';
-              const delayMs = shouldReconnect
-                ? FIRMWARE_UPLOAD_RECONNECT_RETRY_DELAY_MS
-                : resolveFirmwareUploadRetryDelay(attempt);
+              const delayMs = resolveFirmwareUploadRetryDelay(attempt);
               Log?.debug('[ReactNativeBleTransport] FirmwareUpload write retry:', {
                 attempt: attempt + 1,
                 delayMs,
-                reconnect: shouldReconnect,
                 error,
               });
-              if (shouldReconnect) {
-                this.firmwareUploadWriteRecoveryIds.add(uuid);
-              }
               await delay(delayMs);
               attempt += 1;
-              if (shouldReconnect) {
-                try {
-                  await this.reconnectFirmwareUploadTransport(uuid, transport);
-                } catch (e) {
-                  Log?.debug('[ReactNativeBleTransport] FirmwareUpload reconnect error:', e);
-                  if (attempt >= FIRMWARE_UPLOAD_WRITE_MAX_RETRIES) {
-                    throw e;
-                  }
-                }
-              }
             }
           }
         },
@@ -1218,9 +1277,14 @@ export default class ReactNativeBleTransport {
       for (const o of buffers) {
         const outData = o.toString('base64');
         // Upload resources on low-end phones may OOM
-        // this.Log.debug('send hex strting: ', o.toString('hex'));
         try {
-          await transport.writeCharacteristic.writeWithoutResponse(outData);
+          const shouldUseWriteWithResponse =
+            Platform.OS === 'ios' && transport.writeCharacteristic.isWritableWithResponse;
+          if (shouldUseWriteWithResponse) {
+            await transport.writeCharacteristic.writeWithResponse(outData);
+          } else {
+            await transport.writeCharacteristic.writeWithoutResponse(outData);
+          }
         } catch (e) {
           Log?.debug('writeCharacteristic write error: ', e);
           this.runPromise = null;
@@ -1256,20 +1320,28 @@ export default class ReactNativeBleTransport {
         throw new Error('Returning data is not string.');
       }
 
-      Log?.debug('receive data: ', response);
       const jsonData = ProtocolV1.decodeMessage(messages, response);
       return check.call(jsonData);
     } catch (e) {
-      if (name === 'Initialize' && options?.timeoutMs === PROTOCOL_PROBE_TIMEOUT_MS) {
-        Log?.debug('[ReactNativeBleTransport] Protocol V1 Initialize probe call failed:', e);
+      if (name === 'GetFeatures' && options?.timeoutMs === PROTOCOL_PROBE_TIMEOUT_MS) {
+        Log?.debug('[ReactNativeBleTransport] Protocol V1 GetFeatures probe call failed:', e);
       } else {
         Log?.error('call error: ', e);
       }
+      const isProbeTimeout =
+        name === 'GetFeatures' && options?.timeoutMs === PROTOCOL_PROBE_TIMEOUT_MS;
+      if (
+        !isProbeTimeout &&
+        (e as { errorCode?: unknown })?.errorCode === HardwareErrorCode.BleTimeoutError
+      ) {
+        await this.disconnect(uuid);
+      }
       throw e;
     } finally {
       if (timeout) clearTimeout(timeout);
       if (this.runPromise === runPromise) {
         this.runPromise = null;
+        this.runPromiseDeviceId = null;
       }
     }
   }
@@ -1279,8 +1351,9 @@ export default class ReactNativeBleTransport {
   }
 
   async disconnect(session: string) {
-    Log?.debug('transport-react-native transport resetSession: ', session);
+    await this.protocolV2Links.invalidateLink(session, 'React Native BLE transport disconnected');
     const transport = transportCache[session];
+    const monitorToken = transport?.monitorToken ?? this.monitorTokens.get(session);
 
     // Clean up disconnect subscription first to prevent onDisconnected callback
     // from being triggered when we cancel the connection below
@@ -1341,20 +1414,16 @@ export default class ReactNativeBleTransport {
     this.deviceProtocolHints.delete(session);
     this.protocolV2Assemblers.delete(session);
     this.resetProtocolV2Frames(session);
-    if (this.activeProtocolV2Call?.uuid === session) {
-      this.activeProtocolV2Call = null;
-    }
 
     // emit the disconnect event
     try {
-      this.emitter?.emit('device-disconnect', {
-        name: transport?.device?.name,
-        id: session,
-        connectId: session,
-      });
+      this.emitDeviceDisconnect(session, transport?.device?.name, monitorToken);
     } catch (e) {
       Log?.error('resetSession: emit disconnect event error: ', e);
     }
+    if (monitorToken !== undefined && this.monitorTokens.get(session) === monitorToken) {
+      this.monitorTokens.delete(session);
+    }
     // eslint-disable-next-line no-promise-executor-return
     await new Promise<void>(resolve => setTimeout(() => resolve(), 100));
   }
@@ -1365,6 +1434,7 @@ export default class ReactNativeBleTransport {
       // this.runPromise.reject(new Error('Transport_CallCanceled'));
     }
     this.runPromise = null;
+    this.runPromiseDeviceId = null;
   }
 
   private getCachedTransport(uuid: string) {
@@ -1385,7 +1455,7 @@ export default class ReactNativeBleTransport {
   private createProtocolDetectionError() {
     return ERRORS.TypedError(
       HardwareErrorCode.BleTimeoutError,
-      'Unable to detect BLE protocol: device did not respond to Protocol V1 Initialize or Protocol V2 Ping'
+      'Unable to detect BLE protocol: device did not respond to Protocol V1 GetFeatures or Protocol V2 Ping'
     );
   }
 
@@ -1398,42 +1468,71 @@ export default class ReactNativeBleTransport {
   private async detectProtocol(
     uuid: string,
     expectedProtocol?: ProtocolType,
-    protocolHint?: ProtocolType
+    protocolHint?: ProtocolType,
+    rebuildTransport?: () => Promise<void>
   ): Promise<ProtocolType> {
+    if (Platform.OS === 'ios' && expectedProtocol) {
+      this.deviceProtocol.set(uuid, expectedProtocol);
+      Log?.debug('[ReactNativeBleTransport] protocol selected', {
+        deviceId: uuid,
+        protocol: expectedProtocol,
+        source: 'expected',
+      });
+      return expectedProtocol;
+    }
+
     if (expectedProtocol === 'V1') {
       if (await this.probeProtocolV1(uuid)) {
         this.deviceProtocol.set(uuid, 'V1');
-        Log?.debug(`[ReactNativeBleTransport] detectProtocol: uuid=${uuid} -> V1 (expected)`);
+        Log?.debug('[ReactNativeBleTransport] protocol detected', {
+          deviceId: uuid,
+          protocol: 'V1',
+          source: 'expected',
+        });
         return 'V1';
       }
       throw this.createProtocolMismatchError(expectedProtocol);
     }
 
     if (expectedProtocol === 'V2') {
-      // 免探测路径：调用方显式承诺该设备是 V2（例如固件升级重启后的重连场景，
-      // 上层已经探测过协议并通过 expectedProtocol 传回），这里不再重复探测。
-      this.deviceProtocol.set(uuid, 'V2');
-      Log?.debug(`[ReactNativeBleTransport] detectProtocol: uuid=${uuid} -> V2 (expected)`);
-      return 'V2';
+      if (await this.probeProtocolV2(uuid)) {
+        this.deviceProtocol.set(uuid, 'V2');
+        Log?.debug('[ReactNativeBleTransport] protocol detected', {
+          deviceId: uuid,
+          protocol: 'V2',
+          source: 'expected',
+        });
+        return 'V2';
+      }
+      throw this.createProtocolMismatchError(expectedProtocol);
     }
 
-    // 项目约束：协议判断必须在连接后主动探测，不能依赖设备名/PID/descriptor。
-    // 设备名 hint（如 "Pro 2"）只用于调整探测顺序：hint=V2 时先探 V2、失败回落 V1，
-    // 不能作为最终结论。
+    // Protocol must be actively probed after connection. Name, PID, and descriptors only
+    // influence probe order; a V2 hint probes V2 first and falls back to V1.
     const probeOrder: ProtocolType[] =
       protocolHint === 'V2' || this.deviceProtocol.get(uuid) === 'V2' ? ['V2', 'V1'] : ['V1', 'V2'];
 
     for (let i = 0; i < probeOrder.length; i += 1) {
       const protocol = probeOrder[i];
       if (i > 0) {
-        // 上一个协议探测失败后，重置订阅与缓冲，避免残留数据干扰下一个协议的探测。
+        // Reset subscriptions and buffers after a failed probe before trying another protocol.
         await this.resetProbeStateAfterProtocolProbe(uuid, probeOrder[i - 1]);
+        if (!transportCache[uuid]) {
+          if (!rebuildTransport) {
+            throw ERRORS.TypedError(HardwareErrorCode.TransportNotFound);
+          }
+          await rebuildTransport();
+        }
       }
       const detected =
         protocol === 'V1' ? await this.probeProtocolV1(uuid) : await this.probeProtocolV2(uuid);
       if (detected) {
         this.deviceProtocol.set(uuid, protocol);
-        Log?.debug(`[ReactNativeBleTransport] detectProtocol: uuid=${uuid} -> ${protocol}`);
+        Log?.debug('[ReactNativeBleTransport] protocol detected', {
+          deviceId: uuid,
+          protocol,
+          source: 'probe',
+        });
         return protocol;
       }
     }
@@ -1444,11 +1543,12 @@ export default class ReactNativeBleTransport {
 
   private async resetProbeStateAfterProtocolProbe(uuid: string, protocol: ProtocolType) {
     const transport = transportCache[uuid];
+    await this.protocolV2Links.invalidateLink(
+      uuid,
+      `Reset notify state after Protocol ${protocol} probe`
+    );
     this.protocolV2Assemblers.get(uuid)?.reset();
     this.resetProtocolV2Frames(uuid);
-    if (this.activeProtocolV2Call?.uuid === uuid) {
-      this.activeProtocolV2Call = null;
-    }
     if (this.runPromise) {
       const error = ERRORS.TypedError(HardwareErrorCode.BleForceCleanRunPromise);
       this.runPromise.reject(error);
@@ -1500,11 +1600,13 @@ export default class ReactNativeBleTransport {
 
     try {
       this.deviceProtocol.set(uuid, 'V1');
-      await this.callProtocolV1(uuid, 'Initialize', {}, { timeoutMs: PROTOCOL_PROBE_TIMEOUT_MS });
+      // GetFeatures identifies Protocol V1 without resetting an existing wallet
+      // session before Core has a chance to restore a hidden wallet.
+      await this.callProtocolV1(uuid, 'GetFeatures', {}, { timeoutMs: PROTOCOL_PROBE_TIMEOUT_MS });
       return true;
     } catch (error) {
       this.clearProbeProtocol(uuid, 'V1');
-      Log?.debug('[ReactNativeBleTransport] Protocol V1 Initialize probe failed:', error);
+      Log?.debug('[ReactNativeBleTransport] Protocol V1 GetFeatures probe failed:', error);
       return false;
     }
   }
@@ -1533,13 +1635,9 @@ export default class ReactNativeBleTransport {
     return detected;
   }
 
-  private handleProtocolV2Notification(uuid: string, data: Uint8Array) {
+  private handleProtocolV2Notification(uuid: string, monitorToken: number, data: Uint8Array) {
     try {
-      if (!this.runPromise || this.activeProtocolV2Call?.uuid !== uuid) {
-        this.protocolV2Assemblers.get(uuid)?.reset();
-        this.resetProtocolV2Frames(uuid);
-        return;
-      }
+      if (this.monitorTokens.get(uuid) !== monitorToken) return;
 
       if (data.length === 0) return;
 
@@ -1552,8 +1650,15 @@ export default class ReactNativeBleTransport {
     } catch (error) {
       Log?.debug('[ReactNativeBleTransport] Protocol V2 notification error:', error);
       const notifyError = ERRORS.TypedError(HardwareErrorCode.BleWriteCharacteristicError);
-      this.runPromise?.reject(notifyError);
-      this.rejectAllProtocolV2Frames(notifyError);
+      this.rejectProtocolV2Frames(uuid, notifyError);
+      this.protocolV2Links
+        .invalidateLink(uuid, `Protocol V2 notification error: ${error}`)
+        .catch(invalidateError =>
+          Log?.debug(
+            '[ReactNativeBleTransport] Protocol V2 notify cleanup failed:',
+            invalidateError
+          )
+        );
     }
   }
 
@@ -1576,21 +1681,17 @@ export default class ReactNativeBleTransport {
     this.getProtocolV2FrameQueue(uuid).push(frame);
   }
 
-  private rejectAllProtocolV2Frames(error: Error) {
-    this.protocolV2FrameQueues.clear();
-    for (const framePromise of this.protocolV2FramePromises.values()) {
-      framePromise.reject(error);
-    }
-    this.protocolV2FramePromises.clear();
-  }
-
   private resetProtocolV2Frames(uuid: string) {
-    this.protocolV2FrameQueues.delete(uuid);
-    this.protocolV2FramePromises.delete(uuid);
+    this.rejectProtocolV2Frames(uuid, new Error(`Protocol V2 frame state reset for ${uuid}`));
   }
 
-  private isActiveProtocolV2Call(uuid: string, token: number) {
-    return this.activeProtocolV2Call?.uuid === uuid && this.activeProtocolV2Call.token === token;
+  private rejectProtocolV2Frames(uuid: string, error: Error) {
+    this.protocolV2FrameQueues.delete(uuid);
+    const framePromise = this.protocolV2FramePromises.get(uuid);
+    if (framePromise) {
+      this.protocolV2FramePromises.delete(uuid);
+      framePromise.reject(error);
+    }
   }
 
   private async readProtocolV2Frame(uuid: string) {
@@ -1610,10 +1711,53 @@ export default class ReactNativeBleTransport {
     }
   }
 
+  private async writeProtocolV2Packet(
+    transport: BleTransport,
+    base64: string,
+    context: ProtocolV2CallContext,
+    assertCurrentGeneration: () => void
+  ) {
+    const shouldUseWriteWithResponse =
+      transport.writeCharacteristic.isWritableWithResponse &&
+      (context.writeWithResponse === true || (Platform.OS === 'ios' && !context.highVolume));
+    let attempt = 0;
+    for (;;) {
+      assertCurrentGeneration();
+      if (context.signal.aborted) {
+        throw new Error(`Protocol V2 BLE write aborted for ${context.messageName}`);
+      }
+      try {
+        if (shouldUseWriteWithResponse) {
+          await transport.writeCharacteristic.writeWithResponse(base64);
+        } else {
+          await transport.writeCharacteristic.writeWithoutResponse(base64);
+        }
+        assertCurrentGeneration();
+        return;
+      } catch (error) {
+        if (
+          getFirmwareUploadWriteRetryType(error) !== 'congested' ||
+          attempt >= FIRMWARE_UPLOAD_WRITE_MAX_RETRIES
+        ) {
+          throw error;
+        }
+        const delayMs = resolveFirmwareUploadRetryDelay(attempt);
+        attempt += 1;
+        Log?.debug('[ReactNativeBleTransport] Protocol V2 congested write retry:', {
+          name: context.messageName,
+          attempt,
+          delayMs,
+        });
+        await delay(delayMs);
+      }
+    }
+  }
+
   private async writeProtocolV2Frame(
     transport: BleTransport,
     frame: Uint8Array,
-    options?: { highVolume?: boolean; writeWithResponse?: boolean }
+    context: ProtocolV2CallContext,
+    assertCurrentGeneration: () => void
   ) {
     const tuning = getProtocolV2BleTuning();
     const packetCapacity = resolveProtocolV2PacketCapacity({
@@ -1622,37 +1766,31 @@ export default class ReactNativeBleTransport {
       androidPacketLength: tuning.androidPacketLength,
       mtu: Platform.OS === 'android' ? transport.mtuSize : undefined,
     });
-    const writeWithResponse =
-      !!options?.writeWithResponse || (!!options?.highVolume && tuning.highVolumeWriteWithResponse);
-    const writeMode = resolveBleWriteMode(
-      transport.writeCharacteristic,
-      writeWithResponse ? 'withResponse' : 'withoutResponse'
-    );
-    const shouldThrottle = !!options?.highVolume && writeMode === 'withoutResponse';
-    let packetsWritten = 0;
-
-    for (let offset = 0; offset < frame.length; offset += packetCapacity) {
-      const chunk = frame.slice(offset, offset + packetCapacity);
-      const base64 = Buffer.from(chunk).toString('base64');
-      if (writeMode === 'withResponse') {
-        await transport.writeCharacteristic.writeWithResponse(base64);
-      } else {
-        await transport.writeCharacteristic.writeWithoutResponse(base64);
-      }
-      packetsWritten += 1;
-
-      if (
-        shouldThrottle &&
-        packetsWritten % tuning.highVolumeWriteBurstSize === 0 &&
-        offset + packetCapacity < frame.length
-      ) {
-        await delay(tuning.highVolumeWritePauseMs);
-      }
-    }
-
-    if (shouldThrottle) {
-      await delay(tuning.highVolumeWriteFlushDelayMs);
-    }
+    // Match Desktop BLE pacing so Pro2 firmware can finish the previous response
+    // before the next single-packet control command is written.
+    const initialDelayMs =
+      Platform.OS === 'ios' && !context.highVolume && frame.length <= packetCapacity
+        ? IOS_PROTOCOL_V2_CONTROL_WRITE_DELAY_MS
+        : 0;
+    await writeProtocolV2BleFrame({
+      frame,
+      packetCapacity,
+      assertActive: assertCurrentGeneration,
+      signal: context.signal,
+      abortMessage: `Protocol V2 BLE write aborted for ${context.messageName}`,
+      initialDelayMs,
+      burstSize: FIRMWARE_UPLOAD_WRITE_BURST_SIZE,
+      burstPauseMs: FIRMWARE_UPLOAD_WRITE_PAUSE_MS,
+      flushDelayMs: FIRMWARE_UPLOAD_WRITE_FLUSH_DELAY_MS,
+      wait: delay,
+      writePacket: packet =>
+        this.writeProtocolV2Packet(
+          transport,
+          Buffer.from(packet).toString('base64'),
+          context,
+          assertCurrentGeneration
+        ),
+    });
   }
 
   private async callProtocolV2(
@@ -1665,101 +1803,76 @@ export default class ReactNativeBleTransport {
       throw ERRORS.TypedError(HardwareErrorCode.TransportNotConfigured);
     }
 
-    const forceRun = name === 'Initialize' || name === 'Cancel' || name === 'Ping';
-    if (this.runPromise) {
-      if (!forceRun) {
-        throw ERRORS.TypedError(HardwareErrorCode.TransportCallInProgress);
-      }
-      const error = ERRORS.TypedError(HardwareErrorCode.BleForceCleanRunPromise);
-      this.runPromise.reject(error);
-      this.rejectAllProtocolV2Frames(error);
-      this.runPromise = null;
-      this.activeProtocolV2Call = null;
-    }
-
-    const transport = this.getCachedTransport(uuid);
-    const runPromise = createDeferred<Uint8Array>();
-    runPromise.promise.catch(() => undefined);
-    this.runPromise = runPromise;
-    const callToken = this.nextProtocolV2CallToken++;
-    this.activeProtocolV2Call = { uuid, token: callToken };
-    this.protocolV2Assemblers.get(uuid)?.reset();
-    this.resetProtocolV2Frames(uuid);
-    let completed = false;
-    const callOptions = {
-      ...options,
-      timeoutMs: options?.timeoutMs ?? BLE_RESPONSE_TIMEOUT_MS,
-    };
+    const callOptions = options;
     const highVolumeWrite = LogBlockCommand.has(name);
 
     if (highVolumeWrite) {
       const tuning = getProtocolV2BleTuning();
-      Log?.debug(
-        '[ReactNativeBleTransport] Protocol V2 high-volume write uses throttled writeWithoutResponse:',
+      Log?.debug('[ReactNativeBleTransport] Protocol V2 high-volume write configured', {
         name,
-        {
-          packetCapacity:
-            Platform.OS === 'ios' ? tuning.iosPacketLength : tuning.androidPacketLength,
-          burstSize: tuning.highVolumeWriteBurstSize,
-          pauseMs: tuning.highVolumeWritePauseMs,
-          flushDelayMs: tuning.highVolumeWriteFlushDelayMs,
-          writeWithResponse: tuning.highVolumeWriteWithResponse,
-        }
-      );
+        writeMode: options?.writeWithResponse ? 'withResponse' : 'withoutResponse',
+        packetCapacity: Platform.OS === 'ios' ? tuning.iosPacketLength : tuning.androidPacketLength,
+      });
     }
 
     try {
-      const session = new ProtocolV2Session({
-        schemas: {
-          protocolV1: this._messages,
-          protocolV2: this._messagesV2,
-        },
-        router: PROTOCOL_V2_CHANNEL_BLE_UART,
-        writeFrame: async (frame: Uint8Array) => {
-          await this.writeProtocolV2Frame(transport, frame, {
-            highVolume: highVolumeWrite,
-          });
-        },
-        readFrame: async () => {
-          const rxFrame = await this.readProtocolV2Frame(uuid);
-          if (!(rxFrame instanceof Uint8Array)) {
-            throw new Error('Protocol V2 response is not Uint8Array');
-          }
-          return rxFrame;
-        },
-        logger: Log,
-        logPrefix: 'ProtocolV2 RN-BLE',
-        createTimeoutError: (_messageName: string, timeout: number) =>
-          ERRORS.TypedError(
-            HardwareErrorCode.BleTimeoutError,
-            `BLE response timeout after ${timeout}ms for ${name}`
-          ),
-      });
-
-      const result = await session.call(name, data, callOptions);
-      completed = true;
-      return result;
+      return await this.protocolV2Links.call(
+        uuid,
+        () => this.createProtocolV2Adapter(uuid),
+        name,
+        data,
+        callOptions
+      );
     } catch (e) {
-      if (this.isActiveProtocolV2Call(uuid, callToken)) {
-        this.protocolV2Assemblers.get(uuid)?.reset();
-        this.resetProtocolV2Frames(uuid);
-      }
       Log?.error('[ReactNativeBleTransport] Protocol V2 call error:', e);
       throw e;
-    } finally {
-      if (this.isActiveProtocolV2Call(uuid, callToken)) {
-        if (!completed) {
-          this.protocolV2Assemblers.get(uuid)?.reset();
-        }
-        this.resetProtocolV2Frames(uuid);
-        this.activeProtocolV2Call = null;
-      }
-      if (this.runPromise === runPromise) {
-        this.runPromise = null;
-      }
     }
   }
 
+  private createProtocolV2Adapter(uuid: string) {
+    const generation = this.monitorTokens.get(uuid) ?? 0;
+    const assertCurrentGeneration = () => {
+      if (this.monitorTokens.get(uuid) !== generation) {
+        throw new Error(`Protocol V2 monitor generation changed for ${uuid}`);
+      }
+    };
+
+    return {
+      router: PROTOCOL_V2_CHANNEL_BLE_UART,
+      maxFrameBytes: PROTOCOL_V2_BLE_FRAME_MAX_BYTES,
+      generation,
+      prepareCall: () => {
+        assertCurrentGeneration();
+        this.protocolV2Assemblers.get(uuid)?.reset();
+        this.resetProtocolV2Frames(uuid);
+      },
+      writeFrame: async (frame: Uint8Array, context: ProtocolV2CallContext) => {
+        assertCurrentGeneration();
+        const currentTransport = this.getCachedTransport(uuid);
+        await this.writeProtocolV2Frame(currentTransport, frame, context, assertCurrentGeneration);
+      },
+      readFrame: async () => {
+        assertCurrentGeneration();
+        const rxFrame = await this.readProtocolV2Frame(uuid);
+        if (!(rxFrame instanceof Uint8Array)) {
+          throw new Error('Protocol V2 response is not Uint8Array');
+        }
+        return rxFrame;
+      },
+      reset: (reason: string) => {
+        this.protocolV2Assemblers.get(uuid)?.reset();
+        this.rejectProtocolV2Frames(uuid, new Error(reason));
+      },
+      logger: Log,
+      logPrefix: 'ProtocolV2 RN-BLE',
+      createTimeoutError: (messageName: string, timeout: number) =>
+        ERRORS.TypedError(
+          HardwareErrorCode.BleTimeoutError,
+          `BLE response timeout after ${timeout}ms for ${messageName}`
+        ),
+    };
+  }
+
   getProtocolType(path: string): ProtocolType | undefined {
     return this.deviceProtocol.get(path);
   }