@onekeyfe/hd-transport-react-native 1.2.2-alpha.11 → 1.2.2-alpha.111

package/src/index.ts

@@ -47,6 +47,7 @@ import {
   getInfosForServiceUuid,
   isSameBleUuid,
 } from './constants';
+import { isNativeBleDisconnectError, toBleDisconnectHardwareError } from './bleNativeDisconnect';
 import {
   isBleStaleBondHardwareError,
   isNativeBleStaleBondError,
@@ -76,6 +77,8 @@ const { check, ProtocolV1, parseConfigure } = transport;
 const Log = bleLogger;
 
 const transportCache: Record<string, BleTransport> = {};
+// ble-plx shares one manager across transport instances in this JS runtime.
+let bleManagerResetPromise: Promise<void> | undefined;
 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;
@@ -168,6 +171,23 @@ const isWedgedWriteError = (error: unknown): boolean =>
   (error as { errorCode?: unknown })?.errorCode === HardwareErrorCode.BleWriteCharacteristicError &&
   typeof (error as { message?: unknown })?.message === 'string' &&
   (error as { message: string }).message.startsWith(WEDGED_WRITE_MESSAGE);
+const shouldRethrowProtocolProbeError = (error: unknown): boolean => {
+  const code = (error as { errorCode?: unknown })?.errorCode;
+  // Bonding and GATT failures are not evidence of a protocol mismatch. Preserve
+  // them instead of probing another protocol on an unusable connection.
+  // Native PLX disconnects (errorCode 201 / iOS 7) must match before they are
+  // mapped: Protocol V2 writes rethrow them unchanged unless normalized first.
+  return (
+    isBleStaleBondHardwareError(error) ||
+    isNativeBleDisconnectError(error) ||
+    code === HardwareErrorCode.BleDeviceNotBonded ||
+    code === HardwareErrorCode.BleDeviceBondedCanceled ||
+    code === HardwareErrorCode.BleDeviceDisconnected ||
+    code === HardwareErrorCode.BleCharacteristicNotifyError ||
+    code === HardwareErrorCode.BleCharacteristicNotifyChangeFailure ||
+    code === HardwareErrorCode.BleWriteCharacteristicError
+  );
+};
 /** Consecutive wedged writes on one device before the BLE manager itself is recreated. */
 export const BLE_WRITE_TIMEOUT_MANAGER_RESET_THRESHOLD = 2;
 const DEVICE_SCAN_TIMEOUT_MS = 3000;
@@ -320,9 +340,9 @@ const resolveNegotiatedMtu = (device: Device) => requestNegotiatedMtu(device, 'c
 
 type IOBleErrorRemap = Error | BleError | null | undefined;
 
-function remapError(error: IOBleErrorRemap, mapProtocolV2StaleBond: boolean) {
+function remapError(error: IOBleErrorRemap) {
   if (error instanceof BleError) {
-    if (mapProtocolV2StaleBond && isNativeBleStaleBondError(error)) {
+    if (isNativeBleStaleBondError(error)) {
       throw toBleStaleBondHardwareError(error);
     }
 
@@ -360,6 +380,8 @@ export default class ReactNativeBleTransport {
 
   stopped = false;
 
+  private readonly bondAbortController = new AbortController();
+
   scanTimeout = DEVICE_SCAN_TIMEOUT_MS;
 
   runPromise: Deferred<any> | null = null;
@@ -430,6 +452,14 @@ export default class ReactNativeBleTransport {
       this.rejectProtocolV2Frames(uuid, new Error(reason));
       Log?.debug('[ReactNativeBleTransport] Protocol V2 link invalidated:', uuid, reason);
       if (reason.startsWith('Protocol V2 link-fatal error:')) {
+        if (this.probingProtocols.get(uuid) !== 'V2') {
+          const transport = transportCache[uuid];
+          try {
+            this.emitDeviceDisconnect(uuid, transport?.device?.name, transport?.monitorToken);
+          } catch {
+            Log?.error('[ReactNativeBleTransport] Protocol V2 disconnect listener failed');
+          }
+        }
         await this.releaseNative(uuid, true);
       }
     },
@@ -450,6 +480,10 @@ export default class ReactNativeBleTransport {
   /** Serializes transport lifecycle changes for the same physical device. */
   private lifecycleOperations: Map<string, Promise<void>> = new Map();
 
+  private stopPromise?: Promise<void>;
+
+  private scanCleanups = new Set<() => Promise<void>>();
+
   constructor(options: TransportOptions) {
     this.scanTimeout = options.scanTimeout ?? DEVICE_SCAN_TIMEOUT_MS;
   }
@@ -485,10 +519,34 @@ export default class ReactNativeBleTransport {
     // empty
   }
 
-  getPlxManager(): Promise<BlePlxManager> {
-    if (this.blePlxManager) return Promise.resolve(this.blePlxManager);
-    this.blePlxManager = new BlePlxManager();
-    return Promise.resolve(this.blePlxManager);
+  async getPlxManager(): Promise<BlePlxManager> {
+    while (bleManagerResetPromise) {
+      await this.waitForManagerReset();
+    }
+    if (this.stopped) throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
+    if (!this.blePlxManager) this.blePlxManager = new BlePlxManager();
+    return this.blePlxManager;
+  }
+
+  private async waitForManagerReset(): Promise<void> {
+    if (!bleManagerResetPromise) return;
+    let timeout: ReturnType<typeof setTimeout> | undefined;
+    try {
+      await Promise.race([
+        bleManagerResetPromise,
+        new Promise<never>((_, reject) => {
+          timeout = setTimeout(
+            () => reject(this.createWedgedBleSetupError()),
+            BLE_CONNECT_TIMEOUT_MS
+          );
+        }),
+      ]);
+    } catch {
+      // A timeout or failed destroy is not permission to reuse the old singleton.
+      throw this.createWedgedBleSetupError();
+    } finally {
+      if (timeout) clearTimeout(timeout);
+    }
   }
 
   async resolveCharacteristics(device: Device): Promise<ResolvedBleCharacteristics> {
@@ -677,35 +735,58 @@ export default class ReactNativeBleTransport {
    * @returns
    */
   async enumerate() {
-    // eslint-disable-next-line no-async-promise-executor
-    return new Promise<IOneKeyDevice[]>(async (resolve, reject) => {
-      const deviceList: IOneKeyDevice[] = [];
-      const blePlxManager = await this.getPlxManager();
-      try {
-        await subscribeBleOn(blePlxManager);
-      } catch (error) {
-        Log?.debug('subscribeBleOn error: ', error);
-        reject(error);
-        return;
-      }
-
-      if (Platform.OS === 'android' && Platform.Version >= 31) {
-        Log?.debug('requesting permissions, please wait...');
+    const scanStartedAt = Date.now();
+    let firstDeviceMs: number | undefined;
+    const blePlxManager = await this.getPlxManager();
+    await subscribeBleOn(blePlxManager);
+    if (Platform.OS === 'android' && Platform.Version >= 31) {
+      Log?.debug('requesting permissions, please wait...');
 
-        const resultConnect = await PermissionsAndroid.requestMultiple([
-          PermissionsAndroid.PERMISSIONS.BLUETOOTH_CONNECT,
-          PermissionsAndroid.PERMISSIONS.BLUETOOTH_SCAN,
-        ]);
+      const resultConnect = await PermissionsAndroid.requestMultiple([
+        PermissionsAndroid.PERMISSIONS.BLUETOOTH_CONNECT,
+        PermissionsAndroid.PERMISSIONS.BLUETOOTH_SCAN,
+      ]);
 
-        Log?.debug('requesting permissions, result: ', resultConnect);
-        if (
-          resultConnect[PermissionsAndroid.PERMISSIONS.BLUETOOTH_CONNECT] !== 'granted' ||
-          resultConnect[PermissionsAndroid.PERMISSIONS.BLUETOOTH_SCAN] !== 'granted'
-        ) {
-          reject(ERRORS.TypedError(HardwareErrorCode.BlePermissionError));
-          return;
-        }
+      Log?.debug('requesting permissions, result: ', resultConnect);
+      if (
+        resultConnect[PermissionsAndroid.PERMISSIONS.BLUETOOTH_CONNECT] !== 'granted' ||
+        resultConnect[PermissionsAndroid.PERMISSIONS.BLUETOOTH_SCAN] !== 'granted'
+      ) {
+        throw ERRORS.TypedError(HardwareErrorCode.BlePermissionError);
       }
+    }
+
+    if (this.stopped) throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
+    return new Promise<IOneKeyDevice[]>((resolve, reject) => {
+      const deviceList: IOneKeyDevice[] = [];
+      let finished = false;
+      let scanCleanup: Promise<void> | undefined;
+      const finishScan = (error?: unknown) => {
+        if (scanCleanup) return scanCleanup;
+        finished = true;
+        clearScanTimer();
+        scanCleanup = this.runNativeTeardown('scan', blePlxManager, async () => {
+          await blePlxManager.stopDeviceScan();
+        }).then(() => {
+          this.scanCleanups.delete(cancelScan);
+          if (error) reject(error);
+          else resolve(deviceList);
+        });
+        return scanCleanup;
+      };
+      const cancelScan = () =>
+        finishScan(ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected));
+      this.scanCleanups.add(cancelScan);
+
+      const clearScanTimer = timer.timeout(() => {
+        Log?.debug('[ReactNativeBleTransport] scan completed', {
+          elapsedMs: Date.now() - scanStartedAt,
+          firstDeviceMs,
+          deviceCount: deviceList.length,
+          scanWindowMs: this.scanTimeout,
+        });
+        finishScan();
+      }, this.scanTimeout);
 
       blePlxManager.startDeviceScan(
         getBluetoothServiceUuids(),
@@ -721,18 +802,17 @@ export default class ReactNativeBleTransport {
                 error.errorCode
               )
             ) {
-              reject(ERRORS.TypedError(HardwareErrorCode.BlePermissionError));
+              finishScan(ERRORS.TypedError(HardwareErrorCode.BlePermissionError));
             } else if (error.errorCode === BleErrorCode.BluetoothUnauthorized) {
-              reject(ERRORS.TypedError(HardwareErrorCode.BleLocationError));
+              finishScan(ERRORS.TypedError(HardwareErrorCode.BleLocationError));
             } else if (error.errorCode === BleErrorCode.LocationServicesDisabled) {
-              reject(ERRORS.TypedError(HardwareErrorCode.BleLocationServicesDisabled));
+              finishScan(ERRORS.TypedError(HardwareErrorCode.BleLocationServicesDisabled));
             } else if (error.errorCode === BleErrorCode.ScanStartFailed) {
               // Android Bluetooth will report an error when the search frequency is too fast,
               // then nothing is processed and an empty array of devices is returned.
               // Then the next search will be back to normal
-              timer.timeout(() => {}, this.scanTimeout);
             } else {
-              reject(ERRORS.TypedError(HardwareErrorCode.BleScanError, error.reason ?? ''));
+              finishScan(ERRORS.TypedError(HardwareErrorCode.BleScanError, error.reason ?? ''));
             }
             return;
           }
@@ -764,6 +844,7 @@ export default class ReactNativeBleTransport {
         }
       );
 
+      if (finished) return;
       getConnectedDeviceIds(Platform.OS === 'ios' ? getBluetoothServiceUuids() : []).then(
         devices => {
           for (const device of devices) {
@@ -783,11 +864,13 @@ export default class ReactNativeBleTransport {
               addDevice(device as unknown as Device);
             }
           }
-        }
+        },
+        error => Log?.debug('search connected peripheral failed:', error)
       );
 
       const addDevice = (device: Device) => {
-        if (deviceList.every(d => d.id !== device.id)) {
+        if (!finished && deviceList.every(d => d.id !== device.id)) {
+          firstDeviceMs ??= Date.now() - scanStartedAt;
           const displayName = getDeviceDisplayName(device) ?? 'Unknown BLE Device';
 
           deviceList.push({
@@ -802,11 +885,6 @@ export default class ReactNativeBleTransport {
           });
         }
       };
-
-      timer.timeout(() => {
-        blePlxManager.stopDeviceScan();
-        resolve(deviceList);
-      }, this.scanTimeout);
     });
   }
 
@@ -817,6 +895,7 @@ export default class ReactNativeBleTransport {
   ) {
     const { writeCharacteristic, notifyCharacteristic } =
       characteristics ?? (await this.resolveCharacteristicsWithTimeout(uuid, device));
+    if (this.stopped) throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
     const transport = new BleTransport(device, writeCharacteristic, notifyCharacteristic);
     transport.mtuSize = typeof device.mtu === 'number' ? device.mtu : undefined;
     const monitorToken = this.nextMonitorToken;
@@ -845,6 +924,7 @@ export default class ReactNativeBleTransport {
     } else if (Platform.OS === 'android') {
       await delay(ANDROID_NOTIFY_READY_DELAY_MS);
     }
+    if (this.stopped) throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
 
     const initialMtu = transport.mtuSize;
     let refreshAttempts = 0;
@@ -858,12 +938,14 @@ export default class ReactNativeBleTransport {
         'servicesAndNotifyReady',
         1
       );
+      if (this.stopped) throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
       transport.device = refreshedDevice;
       transport.mtuSize =
         typeof refreshedDevice.mtu === 'number' ? refreshedDevice.mtu : transport.mtuSize;
 
       if (shouldRefreshNegotiatedMtu(transport.mtuSize)) {
         await delay(BLE_MTU_REFRESH_RETRY_DELAY_MS);
+        if (this.stopped) throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
         refreshAttempts += 1;
         refreshedDevice = await requestNegotiatedMtu(transport.device, 'servicesAndNotifyReady', 2);
         transport.device = refreshedDevice;
@@ -872,6 +954,7 @@ export default class ReactNativeBleTransport {
       }
     }
 
+    if (this.stopped) throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
     Log?.debug('[ReactNativeBleTransport] BLE MTU ready', {
       platform: Platform.OS,
       requested: getRequestedBleMtu(),
@@ -894,6 +977,7 @@ export default class ReactNativeBleTransport {
   }
 
   private async acquireUnlocked(input: FirmwareInstallBleAcquireInput) {
+    if (this.stopped) throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
     const { uuid, forceCleanRunPromise, expectedProtocol, skipProtocolProbe } = input;
     const shouldMapProtocolV2StaleBond = expectedProtocol
       ? expectedProtocol === 'V2'
@@ -949,6 +1033,7 @@ export default class ReactNativeBleTransport {
           cachedProtocol &&
           (!expectedProtocol || cachedProtocol === expectedProtocol)
         ) {
+          if (this.stopped) throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
           Log?.debug('[ReactNativeBleTransport] reuse cached BLE transport:', uuid, cachedProtocol);
           return { uuid, protocolType: cachedProtocol };
         }
@@ -980,14 +1065,26 @@ export default class ReactNativeBleTransport {
       throw error;
     }
 
+    if (this.stopped) throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
     if (Platform.OS === 'android') {
-      const bondState = await pairDevice(uuid);
-      if (bondState.bonding) {
-        await onDeviceBondState(uuid);
-      } else if (!bondState.bonded) {
-        throw ERRORS.TypedError(HardwareErrorCode.BleDeviceNotBonded, 'device is not bonded');
+      // Initiate bonding locally before GATT can trigger peripheral-initiated pairing.
+      try {
+        const bondState = await pairDevice(uuid);
+        if (bondState.bonding) {
+          await onDeviceBondState(uuid, this.bondAbortController.signal);
+        } else if (!bondState.bonded) {
+          throw ERRORS.TypedError(HardwareErrorCode.BleDeviceNotBonded, 'device is not bonded');
+        }
+      } catch (error) {
+        await this.runNativeTeardown(uuid, blePlxManager, async () => {
+          await this.runBestEffortNativeOperation('bond failure: cancel manager connection', () =>
+            blePlxManager.cancelDeviceConnection(uuid)
+          );
+        });
+        throw error;
       }
     }
+    if (this.stopped) throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
 
     if (!device) {
       const devices = await blePlxManager.devices([uuid]);
@@ -1024,7 +1121,7 @@ export default class ReactNativeBleTransport {
           Log?.debug('device already connected');
           throw ERRORS.TypedError(HardwareErrorCode.BleAlreadyConnected);
         } else {
-          remapError(e, shouldMapProtocolV2StaleBond);
+          remapError(e);
         }
       }
     }
@@ -1055,28 +1152,48 @@ export default class ReactNativeBleTransport {
             device = await this.connectWithTimeout(uuid, () =>
               disconnectedDevice.connect(fallbackConnectOptions)
             );
-          } catch (e) {
-            Log?.debug('last try to reconnect error: ', e);
+          } catch (fallbackError) {
+            Log?.debug('last try to reconnect error: ', fallbackError);
             // last try to reconnect device if this issue exists
             // https://github.com/dotintent/react-native-ble-plx/issues/426
-            if (e.errorCode === BleErrorCode.OperationCancelled) {
+            if (fallbackError.errorCode === BleErrorCode.OperationCancelled) {
               Log?.debug('last try to reconnect');
               await disconnectedDevice.cancelConnection();
               device = await this.connectWithTimeout(uuid, () =>
                 disconnectedDevice.connect(fallbackConnectOptions)
               );
+            } else {
+              remapError(fallbackError);
             }
           }
         } else {
-          remapError(e, shouldMapProtocolV2StaleBond);
+          remapError(e);
         }
       }
     }
 
+    if (this.stopped) throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
+    if (Platform.OS === 'android' && !(await device.isConnected().catch(() => false))) {
+      const disconnectedDevice = device;
+      await this.runNativeTeardown(uuid, blePlxManager, async () => {
+        await Promise.all([
+          this.runBestEffortNativeOperation('connect failure: cancel manager connection', () =>
+            blePlxManager.cancelDeviceConnection(uuid)
+          ),
+          this.runBestEffortNativeOperation('connect failure: cancel device connection', () =>
+            disconnectedDevice.cancelConnection()
+          ),
+        ]);
+      });
+      throw ERRORS.TypedError(HardwareErrorCode.BleConnectedError, 'device is not connected');
+    }
+    if (this.stopped) throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
     device = await resolveNegotiatedMtu(device);
+    if (this.stopped) throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
     const acquiredDevice = device;
     const { writeCharacteristic, notifyCharacteristic } =
       await this.resolveCharacteristicsWithTimeout(uuid, acquiredDevice);
+    if (this.stopped) throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
 
     const protocolHint = expectedProtocol
       ? undefined
@@ -1138,6 +1255,7 @@ export default class ReactNativeBleTransport {
           await this.installTransportForAcquire(uuid, acquiredDevice);
         }
       );
+      if (this.stopped) throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
       const currentTransport = transportCache[uuid];
       if (!currentTransport) {
         throw ERRORS.TypedError(HardwareErrorCode.TransportNotFound);
@@ -1145,11 +1263,9 @@ export default class ReactNativeBleTransport {
       this.attachDisconnectSubscription(currentTransport, currentTransport.device, uuid);
       return { uuid, protocolType };
     } catch (error) {
-      if (isBleStaleBondHardwareError(error)) {
-        await this.disconnectUnlocked(uuid);
-      } else {
-        await this.releaseUnlocked(uuid, true);
-      }
+      // A failed acquire must retire the physical link before Core retries. Logical
+      // release leaves GATT connected even when neither protocol receives a response.
+      await this.disconnectUnlocked(uuid);
       throw error;
     } finally {
       this.acquiringProtocolV2.delete(uuid);
@@ -1678,7 +1794,49 @@ export default class ReactNativeBleTransport {
   }
 
   stop() {
+    if (this.stopPromise) return this.stopPromise;
     this.stopped = true;
+    // Bonding precedes GATT, so cancelDeviceConnection cannot end this wait.
+    this.bondAbortController.abort();
+    const deviceIds = new Set([
+      ...this.monitorTokens.keys(),
+      ...this.sessionProtocols.keys(),
+      ...this.lifecycleOperations.keys(),
+      ...(this.runPromiseDeviceId ? [this.runPromiseDeviceId] : []),
+    ]);
+    const scans = Array.from(this.scanCleanups, cleanup => cleanup());
+    this.androidPriorityResetTimers.forEach(timeout => clearTimeout(timeout));
+    this.androidPriorityResetTimers.clear();
+    this.androidHighPriorityDevices.clear();
+    const error = ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
+    this.runPromise?.reject(error);
+    this.runPromise = null;
+    this.runPromiseDeviceId = null;
+    deviceIds.forEach(uuid => this.rejectProtocolV2Frames(uuid, error));
+    const manager = this.blePlxManager;
+    // Cancel native setup before waiting for its lifecycle lock. Otherwise stop
+    // waits for the very connect/MTU/GATT operation it needs to interrupt.
+    const pendingConnections = manager
+      ? Array.from(this.lifecycleOperations.keys(), uuid =>
+          this.runNativeTeardown(uuid, manager, async () => {
+            await this.runBestEffortNativeOperation('stop: cancel pending device connection', () =>
+              manager.cancelDeviceConnection(uuid)
+            );
+          })
+        )
+      : [];
+    // Release only this transport's endpoints; other connectors may share ble-plx.
+    this.stopPromise = Promise.all([
+      ...scans,
+      ...pendingConnections,
+      ...Array.from(deviceIds, uuid => this.disconnect(uuid)),
+    ]).then(async () => {
+      await this.protocolV2Links.invalidateAllLinks('React Native BLE transport stopped');
+      await this.waitForManagerReset();
+      this.blePlxManager = undefined;
+      this.emitter = undefined;
+    });
+    return this.stopPromise;
   }
 
   async disconnect(session: string) {
@@ -1830,17 +1988,27 @@ export default class ReactNativeBleTransport {
     }
   }
 
-  cancel() {
+  async cancel() {
     Log?.debug('transport-react-native transport cancel');
-    if (this.runPromise) {
-      // this.runPromise.reject(new Error('Transport_CallCanceled'));
+    const pending = this.runPromise;
+    const deviceId = this.runPromiseDeviceId;
+    if (pending) {
+      pending.reject(ERRORS.TypedError(HardwareErrorCode.CallQueueActionCancelled));
+      if (this.runPromise === pending) {
+        this.runPromise = null;
+        this.runPromiseDeviceId = null;
+      }
+      // A V1 read cannot be safely reused after abandoning its response.
+      // Drain native teardown before DeviceCommands releases the operation.
+      if (deviceId) await this.disconnect(deviceId);
     }
-    this.runPromise = null;
-    this.runPromiseDeviceId = null;
   }
 
   /** Run a native connect under the JS backstop budget. */
   private async connectWithTimeout<T>(uuid: string, connect: () => Promise<T>): Promise<T> {
+    if (this.stopped) throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
+    const startedAt = Date.now();
+    let succeeded = false;
     let timer: ReturnType<typeof setTimeout> | undefined;
     let timedOut = false;
     const pending = connect();
@@ -1862,6 +2030,7 @@ export default class ReactNativeBleTransport {
           }, BLE_CONNECT_TIMEOUT_MS);
         }),
       ]);
+      succeeded = true;
       return result;
     } catch (error) {
       if (timedOut || isNativeOperationTimeoutError(error)) {
@@ -1876,6 +2045,12 @@ export default class ReactNativeBleTransport {
       throw error;
     } finally {
       if (timer) clearTimeout(timer);
+      Log?.debug('[ReactNativeBleTransport] connect completed', {
+        connectIdSuffix: uuid.slice(-8),
+        elapsedMs: Date.now() - startedAt,
+        succeeded,
+        backstopExpired: timedOut,
+      });
     }
   }
 
@@ -1884,6 +2059,8 @@ export default class ReactNativeBleTransport {
     uuid: string,
     device: Device
   ): Promise<ResolvedBleCharacteristics> {
+    const startedAt = Date.now();
+    let succeeded = false;
     let timer: ReturnType<typeof setTimeout> | undefined;
     let timedOut = false;
     const pending = this.resolveCharacteristics(device);
@@ -1904,6 +2081,7 @@ export default class ReactNativeBleTransport {
         }),
       ]);
       this.connectionSetupTimeoutCounts.delete(uuid);
+      succeeded = true;
       return result;
     } catch (error) {
       if (timedOut || isNativeOperationTimeoutError(error)) {
@@ -1918,6 +2096,12 @@ export default class ReactNativeBleTransport {
       throw error;
     } finally {
       if (timer) clearTimeout(timer);
+      Log?.debug('[ReactNativeBleTransport] GATT setup completed', {
+        connectIdSuffix: uuid.slice(-8),
+        elapsedMs: Date.now() - startedAt,
+        succeeded,
+        backstopExpired: timedOut,
+      });
     }
   }
 
@@ -2061,6 +2245,7 @@ export default class ReactNativeBleTransport {
   }
 
   private resetPlxManager() {
+    if (bleManagerResetPromise) return;
     const manager = this.blePlxManager;
     this.blePlxManager = undefined;
     const reason = 'React Native BLE manager reset';
@@ -2107,11 +2292,21 @@ export default class ReactNativeBleTransport {
     this.connectionSetupTimeoutCounts.clear();
     this.monitorTokens.clear();
     this.protocolV2Assemblers.clear();
+    let reset: Promise<void>;
     try {
-      manager?.destroy();
+      reset = Promise.resolve(manager?.destroy());
     } catch (error) {
-      Log?.debug('[ReactNativeBleTransport] BLE manager destroy failed (ignored):', error);
+      reset = Promise.reject(error);
     }
+    bleManagerResetPromise = reset;
+    reset.then(
+      () => {
+        if (bleManagerResetPromise === reset) bleManagerResetPromise = undefined;
+      },
+      error => {
+        Log?.error('[ReactNativeBleTransport] BLE manager destroy failed:', error);
+      }
+    );
   }
 
   private createProtocolMismatchError(expected: ProtocolType) {
@@ -2314,9 +2509,7 @@ export default class ReactNativeBleTransport {
     } catch (error) {
       this.clearProbeProtocol(uuid, 'V1');
       Log?.debug('[ReactNativeBleTransport] Protocol V1 GetFeatures probe failed:', error);
-      // A wedged write already dropped the link, so probing another protocol on it
-      // would only fail against a torn-down transport: surface the real cause.
-      if (isWedgedWriteError(error)) {
+      if (shouldRethrowProtocolProbeError(error)) {
         throw error;
       }
       return false;
@@ -2341,7 +2534,7 @@ export default class ReactNativeBleTransport {
         this.protocolV2Assemblers.get(uuid)?.reset();
         this.resetProtocolV2Frames(uuid);
       },
-      shouldRethrow: isBleStaleBondHardwareError,
+      shouldRethrow: shouldRethrowProtocolProbeError,
     });
     if (!detected) {
       this.clearProbeProtocol(uuid, 'V2');
@@ -2488,6 +2681,9 @@ export default class ReactNativeBleTransport {
           this.rememberStaleBondError(uuid, bondError);
           throw bondError;
         }
+        if (isNativeBleDisconnectError(error)) {
+          throw toBleDisconnectHardwareError(error);
+        }
         if (
           getFirmwareUploadWriteRetryType(error) !== 'congested' ||
           attempt >= FIRMWARE_UPLOAD_WRITE_MAX_RETRIES
@@ -2548,6 +2744,7 @@ export default class ReactNativeBleTransport {
       throw ERRORS.TypedError(HardwareErrorCode.TransportNotConfigured);
     }
 
+    const isProtocolProbe = this.probingProtocols.get(uuid) === 'V2';
     const callOptions = options;
     const highThroughputWrite = isProtocolV2HighThroughputCall(name);
 
@@ -2599,6 +2796,19 @@ export default class ReactNativeBleTransport {
       );
     } catch (e) {
       Log?.error('[ReactNativeBleTransport] Protocol V2 call error:', e);
+      if (
+        !isProtocolProbe &&
+        e?.errorCode === HardwareErrorCode.BleTimeoutError &&
+        !this.monitorTokens.has(uuid)
+      ) {
+        // The failed link has finished invalidating. Disconnect outside that
+        // callback to avoid waiting on its own invalidation or acquire lock.
+        await this.runLifecycleOperation(uuid, async () => {
+          // A queued timeout leaves its active monitor intact; a newer acquire
+          // may also have installed one while cleanup waited for the lifecycle lock.
+          if (!this.monitorTokens.has(uuid)) await this.disconnectUnlocked(uuid);
+        });
+      }
       throw e;
     } finally {
       if (highThroughputWrite) {