@onekeyfe/hd-transport-react-native 1.2.11-alpha.8 → 1.2.11-alpha.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/src/index.ts CHANGED
@@ -1,6 +1,7 @@
1
1
  import { PermissionsAndroid, Platform } from 'react-native';
2
2
  import { Buffer } from 'buffer';
3
3
  import {
4
+ BleError,
4
5
  BleErrorCode,
5
6
  BleManager as BlePlxManager,
6
7
  ConnectionPriority,
@@ -31,12 +32,7 @@ import {
31
32
  parseOnekeyBleColorCode,
32
33
  } from '@onekeyfe/hd-shared';
33
34
 
34
- import {
35
- getBondedDevices,
36
- getConnectedDeviceIds,
37
- onDeviceBondState,
38
- pairDevice,
39
- } from './BleManager';
35
+ import { getConnectedDeviceIds, onDeviceBondState, pairDevice } from './BleManager';
40
36
  import {
41
37
  hasWritableCapability,
42
38
  resolveProtocolV2PacketCapacity,
@@ -54,14 +50,13 @@ import {
54
50
  isSameBleUuid,
55
51
  } from './constants';
56
52
  import { isNativeBleDisconnectError, toBleDisconnectHardwareError } from './bleNativeDisconnect';
57
- import { isIosPeerRemovedPairingInformation, toIosStaleBondError } from './bleIosBond';
58
53
  import { isHeaderChunk } from './utils/validateNotify';
59
54
  import BleTransport from './BleTransport';
60
55
  import timer from './utils/timer';
61
56
  import { bleLogger, setBleLogger } from './logger';
62
57
 
63
58
  import type { Deferred } from '@onekeyfe/hd-shared';
64
- import type { BleError, Characteristic, Device, Subscription } from 'react-native-ble-plx';
59
+ import type { Characteristic, Device, Subscription } from 'react-native-ble-plx';
65
60
  import type EventEmitter from 'events';
66
61
  import type { BleAcquireInput, TransportOptions } from './types';
67
62
 
@@ -77,7 +72,7 @@ type FirmwareInstallBleAcquireInput = BleAcquireInput & {
77
72
  const transport: typeof transportModule =
78
73
  (transportModule as typeof transportModule & { default?: typeof transportModule }).default ??
79
74
  transportModule;
80
- const { check, ProtocolV1, parseConfigure } = transport;
75
+ const { check, ProtocolV1, parseTransportConfigure } = transport;
81
76
 
82
77
  const Log = bleLogger;
83
78
 
@@ -131,32 +126,6 @@ const delay = (ms: number) =>
131
126
  setTimeout(resolve, ms);
132
127
  });
133
128
 
134
- /**
135
- * Android createBond() can transiently refuse to start (returns
136
- * { bonded: false, bonding: false }) right after the host removed a pairing while
137
- * the peripheral is between advertisements. Bounded retries give the stack a
138
- * chance to see the device again before we surface an error. This happens before
139
- * GATT, so no side-effecting command is ever replayed.
140
- */
141
- const ANDROID_BOND_ATTEMPTS = 3;
142
- const ANDROID_BOND_RETRY_DELAY_MS = 300;
143
-
144
- /**
145
- * BluetoothDevice#getAddress() and ble-plx ids are the same MAC but the exact
146
- * separators/case vary across Android builds. Compare against the authoritative
147
- * bonded list with separators stripped and case normalized.
148
- */
149
- const normalizeBleMac = (id?: string | null): string =>
150
- (id ?? '').replace(/[\s:-]/g, '').toUpperCase();
151
-
152
- /** Whether the Android system bonded-device list already contains this address. */
153
- const findBondedDevice = async (macAddress: string): Promise<boolean> => {
154
- const target = normalizeBleMac(macAddress);
155
- if (!target) return false;
156
- const bonded = await getBondedDevices();
157
- return bonded.some(device => normalizeBleMac(device.id) === target);
158
- };
159
-
160
129
  export const getFirmwareUploadWriteRetryType = (
161
130
  error: unknown
162
131
  ): FirmwareUploadWriteRetryType | null => {
@@ -216,11 +185,8 @@ const shouldRethrowProtocolProbeError = (error: unknown): boolean => {
216
185
  return (
217
186
  isNativeBleDisconnectError(error) ||
218
187
  code === HardwareErrorCode.BleDeviceNotBonded ||
219
- code === HardwareErrorCode.BleDeviceBondError ||
220
188
  code === HardwareErrorCode.BleDeviceBondedCanceled ||
221
- code === HardwareErrorCode.BlePeerRemovedPairingInformation ||
222
189
  code === HardwareErrorCode.BleDeviceDisconnected ||
223
- code === HardwareErrorCode.BleBondInvalid ||
224
190
  code === HardwareErrorCode.BleCharacteristicNotifyError ||
225
191
  code === HardwareErrorCode.BleCharacteristicNotifyChangeFailure ||
226
192
  code === HardwareErrorCode.BleWriteCharacteristicError
@@ -560,19 +526,6 @@ const isStaleGattTableNotifyReason = (reason: string | null | undefined): boolea
560
526
  * inside the native budget, so this only fires when the native timeout did not.
561
527
  */
562
528
  export const BLE_CONNECT_TIMEOUT_MS = BLE_NATIVE_CONNECT_TIMEOUT_MS * 2 + 2000;
563
- /**
564
- * iOS names a bond the device no longer holds only by failing the connect, and
565
- * on some phones that takes a little longer than the native budget: the
566
- * attempt is cancelled first, the answer is lost, and two such timeouts reset
567
- * the BLE manager and end as a connect timeout. A device that was just seen
568
- * advertising is present, so its connect gets the time iOS needs. Without that
569
- * sighting the budget stays short, because an absent device never answers.
570
- */
571
- export const IOS_PRESENT_DEVICE_CONNECT_TIMEOUT_MS = 8000;
572
- /** How recent a sighting must be to show that the device is present. */
573
- export const IOS_PRESENT_DEVICE_WINDOW_MS = 15_000;
574
- export const IOS_PRESENT_DEVICE_CONNECT_BACKSTOP_MS =
575
- IOS_PRESENT_DEVICE_CONNECT_TIMEOUT_MS + (BLE_CONNECT_TIMEOUT_MS - BLE_NATIVE_CONNECT_TIMEOUT_MS);
576
529
  /**
577
530
  * Service discovery and characteristic resolution run after connect() succeeds, but
578
531
  * CoreBluetooth schedules them on the same serial queue. If that queue is wedged by a
@@ -702,11 +655,6 @@ const resolveNegotiatedMtu = (
702
655
  type IOBleErrorRemap = Error | BleError | null | undefined;
703
656
 
704
657
  function remapError(error: IOBleErrorRemap) {
705
- // iOS can name the lost bond on the connect itself; that is the signal the
706
- // App's re-pair dialog is keyed on, not a generic connect failure.
707
- if (Platform.OS === 'ios' && isIosPeerRemovedPairingInformation(error)) {
708
- throw toIosStaleBondError(error);
709
- }
710
658
  if (isNativeBleDisconnectError(error)) {
711
659
  throw toBleDisconnectHardwareError(error);
712
660
  }
@@ -722,9 +670,9 @@ function remapError(error: IOBleErrorRemap) {
722
670
  export default class ReactNativeBleTransport {
723
671
  blePlxManager: BlePlxManager | undefined;
724
672
 
725
- _messages: ReturnType<typeof transport.parseConfigure> | undefined;
673
+ _messages: ReturnType<typeof transport.parseTransportConfigure> | undefined;
726
674
 
727
- _messagesV2: ReturnType<typeof transport.parseConfigure> | undefined;
675
+ _messagesV2: ReturnType<typeof transport.parseTransportConfigure> | undefined;
728
676
 
729
677
  private protocolV2SchemaConfiguration: string | undefined;
730
678
 
@@ -734,10 +682,7 @@ export default class ReactNativeBleTransport {
734
682
 
735
683
  stopped = false;
736
684
 
737
- private readonly activeBondControllers = new Map<string, Set<AbortController>>();
738
-
739
- /** When a scan last saw each device on iOS; a fresh sighting earns one longer connect. */
740
- private iosLastAdvertisedAt = new Map<string, number>();
685
+ private readonly bondAbortController = new AbortController();
741
686
 
742
687
  scanTimeout = DEVICE_SCAN_TIMEOUT_MS;
743
688
 
@@ -783,14 +728,6 @@ export default class ReactNativeBleTransport {
783
728
  /** Android endpoints whose cached GATT table is suspect; the next connect refreshes it. */
784
729
  private androidGattCacheRefreshes = new Set<string>();
785
730
 
786
- /**
787
- * Android MACs this transport has observed bonded (from the bonded list, a
788
- * successful pairDevice, or a completed onDeviceBondState). Used to distinguish
789
- * "previously paired but the host no longer holds a bond" (re-pair) from
790
- * "never paired" (plain not-bonded) when createBond() cannot be restarted.
791
- */
792
- private knownBondedDevices = new Set<string>();
793
-
794
731
  private protocolV2Assemblers: Map<string, ProtocolV2FrameAssembler> = new Map();
795
732
 
796
733
  private protocolV2FrameQueues: Map<string, Uint8Array[]> = new Map();
@@ -862,7 +799,7 @@ export default class ReactNativeBleTransport {
862
799
  }
863
800
 
864
801
  configure(signedData: any) {
865
- const messages = parseConfigure(signedData);
802
+ const messages = parseTransportConfigure(signedData);
866
803
  this.configured = true;
867
804
  this._messages = messages;
868
805
  }
@@ -874,7 +811,7 @@ export default class ReactNativeBleTransport {
874
811
  }
875
812
 
876
813
  const isReconfiguration = this.protocolV2SchemaConfiguration !== undefined;
877
- this._messagesV2 = parseConfigure(signedData);
814
+ this._messagesV2 = parseTransportConfigure(signedData);
878
815
  this.protocolV2SchemaConfiguration = configuration;
879
816
  if (isReconfiguration) {
880
817
  this.protocolV2Links
@@ -1238,9 +1175,6 @@ export default class ReactNativeBleTransport {
1238
1175
  );
1239
1176
 
1240
1177
  const addDevice = (device: Device) => {
1241
- // A sighting is presence evidence even when the same device was already
1242
- // listed by an earlier round; the connect that follows may spend it.
1243
- if (Platform.OS === 'ios') this.iosLastAdvertisedAt.set(device.id, Date.now());
1244
1178
  if (!finished && deviceList.every(d => d.id !== device.id)) {
1245
1179
  firstDeviceMs ??= Date.now() - scanStartedAt;
1246
1180
  const displayName = getDeviceDisplayName(device) ?? 'Unknown BLE Device';
@@ -1321,550 +1255,369 @@ export default class ReactNativeBleTransport {
1321
1255
  return this.runLifecycleOperation(uuid, () => this.acquireUnlocked(input));
1322
1256
  }
1323
1257
 
1324
- private createBondAbortController(uuid: string): AbortController {
1325
- const controller = new AbortController();
1326
- let controllers = this.activeBondControllers.get(uuid);
1327
- if (!controllers) {
1328
- controllers = new Set();
1329
- this.activeBondControllers.set(uuid, controllers);
1330
- }
1331
- controllers.add(controller);
1332
- return controller;
1333
- }
1334
-
1335
- private releaseBondAbortController(uuid: string, controller: AbortController): void {
1336
- const controllers = this.activeBondControllers.get(uuid);
1337
- if (!controllers) return;
1338
- controllers.delete(controller);
1339
- if (controllers.size === 0) {
1340
- this.activeBondControllers.delete(uuid);
1341
- }
1342
- }
1343
-
1344
- private abortActiveBonding(uuid?: string): void {
1345
- if (uuid !== undefined) {
1346
- this.activeBondControllers.get(uuid)?.forEach(controller => controller.abort());
1347
- return;
1348
- }
1349
- this.activeBondControllers.forEach(controllers => {
1350
- controllers.forEach(controller => controller.abort());
1351
- });
1352
- }
1353
-
1354
- /**
1355
- * stop(), cancel(), or disconnect() aborts bonding. Match other acquire
1356
- * paths: report BleDeviceDisconnected so callers do not treat this as a
1357
- * pairing failure that should pop another system dialog.
1358
- */
1359
- private throwIfBondingStopped(signal?: AbortSignal): void {
1360
- if (this.stopped || signal?.aborted) {
1361
- throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
1362
- }
1363
- }
1364
-
1365
- /** Retry delay that rejects as soon as stop() or cancel() aborts bonding. */
1366
- private delayUnlessBondingStopped(ms: number, signal?: AbortSignal): Promise<void> {
1367
- return new Promise((resolve, reject) => {
1368
- if (this.stopped || signal?.aborted) {
1369
- reject(ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected));
1370
- return;
1371
- }
1372
- const onAbort = () => {
1373
- clearTimeout(timeout);
1374
- reject(ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected));
1375
- };
1376
- const timeout = setTimeout(() => {
1377
- signal?.removeEventListener('abort', onAbort);
1378
- if (this.stopped || signal?.aborted) {
1379
- reject(ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected));
1380
- return;
1381
- }
1382
- resolve();
1383
- }, ms);
1384
- signal?.addEventListener('abort', onAbort, { once: true });
1385
- });
1386
- }
1387
-
1388
- /**
1389
- * Android must bond before GATT so the peripheral cannot trigger its own
1390
- * pairing mid-session. Three cases:
1391
- * - The authoritative bonded list already has the device (OK-66336): skip
1392
- * createBond entirely. BluetoothDevice#bondState can be stale (BOND_NONE)
1393
- * and a blind createBond() then pops a redundant system dialog.
1394
- * - createBond() returns { bonded: false, bonding: false } (OK-64703): retry a
1395
- * bounded number of times with a short settle delay.
1396
- * - Retries exhausted: report a re-pairing error for a device this transport
1397
- * previously observed bonded, otherwise keep the "never paired" error.
1398
- */
1399
- private async ensureAndroidBond(uuid: string, acquireSignal?: AbortSignal): Promise<void> {
1400
- const localController = acquireSignal ? undefined : this.createBondAbortController(uuid);
1401
- const signal = acquireSignal ?? localController?.signal;
1402
- try {
1403
- this.throwIfBondingStopped(signal);
1404
- const key = normalizeBleMac(uuid);
1405
-
1406
- try {
1407
- const bonded = await findBondedDevice(uuid);
1408
- this.throwIfBondingStopped(signal);
1409
- if (bonded) {
1410
- this.knownBondedDevices.add(key);
1411
- Log?.debug(
1412
- '[ReactNativeBleTransport] Android device already bonded, skipping createBond:',
1413
- uuid
1414
- );
1415
- return;
1416
- }
1417
- } catch (error) {
1418
- this.throwIfBondingStopped(signal);
1419
- // getBondedDevices can fail on older native builds or a transient adapter
1420
- // error; fall back to the legacy pairDevice path below.
1421
- Log?.debug(
1422
- '[ReactNativeBleTransport] Android bonded list query failed, using pairDevice:',
1423
- {
1424
- uuid,
1425
- error: error instanceof Error ? error.message : String(error),
1426
- }
1427
- );
1428
- }
1429
-
1430
- for (let attempt = 0; attempt < ANDROID_BOND_ATTEMPTS; attempt += 1) {
1431
- this.throwIfBondingStopped(signal);
1432
- let bondState;
1433
- try {
1434
- bondState = await pairDevice(uuid);
1435
- } catch (error) {
1436
- this.throwIfBondingStopped(signal);
1437
- throw error;
1438
- }
1439
- this.throwIfBondingStopped(signal);
1440
- if (bondState.bonding) {
1441
- await onDeviceBondState(uuid, signal, {
1442
- systemInitiated: bondState.initiated === false,
1443
- });
1444
- this.throwIfBondingStopped(signal);
1445
- this.knownBondedDevices.add(key);
1446
- return;
1447
- }
1448
- if (bondState.bonded) {
1449
- this.knownBondedDevices.add(key);
1450
- return;
1451
- }
1452
- // { bonded: false, bonding: false }: createBond() could not start. Give the
1453
- // device a moment to become visible/connectable before the next attempt.
1454
- if (attempt + 1 < ANDROID_BOND_ATTEMPTS) {
1455
- await this.delayUnlessBondingStopped(ANDROID_BOND_RETRY_DELAY_MS, signal);
1456
- }
1457
- }
1458
-
1459
- this.throwIfBondingStopped(signal);
1460
- if (this.knownBondedDevices.has(key)) {
1461
- throw ERRORS.TypedError(
1462
- HardwareErrorCode.BleDeviceBondError,
1463
- 'Bluetooth pairing could not be restarted for a previously paired device',
1464
- { phase: 'bond', reason: 'peer_removed_pairing', attempts: ANDROID_BOND_ATTEMPTS }
1465
- );
1466
- }
1467
- throw ERRORS.TypedError(HardwareErrorCode.BleDeviceNotBonded, 'device is not bonded');
1468
- } finally {
1469
- if (localController) {
1470
- this.releaseBondAbortController(uuid, localController);
1471
- }
1472
- }
1473
- }
1474
-
1475
1258
  private async acquireUnlocked(input: FirmwareInstallBleAcquireInput) {
1476
- this.throwIfBondingStopped();
1259
+ if (this.stopped) throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
1477
1260
  const { uuid, forceCleanRunPromise, expectedProtocol, skipProtocolProbe } = input;
1478
- const bondController = this.createBondAbortController(uuid);
1479
- const bondSignal = bondController.signal;
1480
- try {
1481
- const cachedTransport = transportCache[uuid];
1482
- if (skipProtocolProbe && !cachedTransport && this.blePlxManager) {
1261
+ const cachedTransport = transportCache[uuid];
1262
+ if (skipProtocolProbe && !cachedTransport && this.blePlxManager) {
1263
+ Log?.debug(
1264
+ '[ReactNativeBleTransport] refresh uncached BLE connection for firmware install:',
1265
+ uuid
1266
+ );
1267
+ const manager = this.blePlxManager;
1268
+ await this.runNativeTeardown(uuid, manager, async () => {
1269
+ await this.runBestEffortNativeOperation(
1270
+ 'firmware install reconnect: cancel uncached device connection',
1271
+ () => manager.cancelDeviceConnection(uuid)
1272
+ );
1273
+ });
1274
+ }
1275
+ if (cachedTransport) {
1276
+ if (skipProtocolProbe) {
1483
1277
  Log?.debug(
1484
- '[ReactNativeBleTransport] refresh uncached BLE connection for firmware install:',
1278
+ '[ReactNativeBleTransport] refresh cached BLE connection for firmware install:',
1485
1279
  uuid
1486
1280
  );
1487
1281
  const manager = this.blePlxManager;
1282
+ await this.releaseUnlocked(uuid, true);
1488
1283
  await this.runNativeTeardown(uuid, manager, async () => {
1489
- await this.runBestEffortNativeOperation(
1490
- 'firmware install reconnect: cancel uncached device connection',
1491
- () => manager.cancelDeviceConnection(uuid)
1492
- );
1493
- });
1494
- }
1495
- if (cachedTransport) {
1496
- if (skipProtocolProbe) {
1497
- Log?.debug(
1498
- '[ReactNativeBleTransport] refresh cached BLE connection for firmware install:',
1499
- uuid
1500
- );
1501
- const manager = this.blePlxManager;
1502
- await this.releaseUnlocked(uuid, true);
1503
- await this.runNativeTeardown(uuid, manager, async () => {
1504
- const operations: Promise<unknown>[] = [];
1505
- if (manager) {
1506
- operations.push(
1507
- this.runBestEffortNativeOperation(
1508
- 'firmware install reconnect: cancel device connection',
1509
- () => manager.cancelDeviceConnection(uuid)
1510
- )
1511
- );
1512
- }
1284
+ const operations: Promise<unknown>[] = [];
1285
+ if (manager) {
1513
1286
  operations.push(
1514
1287
  this.runBestEffortNativeOperation(
1515
- 'firmware install reconnect: device cancel connection',
1516
- () => cachedTransport.device.cancelConnection()
1288
+ 'firmware install reconnect: cancel device connection',
1289
+ () => manager.cancelDeviceConnection(uuid)
1517
1290
  )
1518
1291
  );
1519
- await Promise.all(operations);
1520
- });
1521
- } else {
1522
- const cachedProtocol = this.deviceProtocol.get(uuid);
1523
- const isCachedDeviceConnected = await cachedTransport.device
1524
- .isConnected()
1525
- .catch(() => false);
1526
- // A suspect GATT table is only refreshed through a new connect.
1527
- const isCachedAndroidLinkUsable =
1528
- Platform.OS !== 'android' || !this.androidGattCacheRefreshes.has(uuid);
1529
- if (
1530
- isCachedDeviceConnected &&
1531
- isCachedAndroidLinkUsable &&
1532
- cachedProtocol &&
1533
- (!expectedProtocol || cachedProtocol === expectedProtocol)
1534
- ) {
1535
- this.throwIfBondingStopped(bondSignal);
1536
- Log?.debug(
1537
- '[ReactNativeBleTransport] reuse cached BLE transport:',
1538
- uuid,
1539
- cachedProtocol
1540
- );
1541
- return { uuid, protocolType: cachedProtocol };
1542
1292
  }
1543
-
1544
- /**
1545
- * If the transport is not reusable due to a protocol mismatch or stale
1546
- * connection, clean it up before creating a new transport instance.
1547
- */
1548
- Log?.debug('transport not reusable, will release: ', uuid);
1549
- await this.releaseUnlocked(uuid, true);
1293
+ operations.push(
1294
+ this.runBestEffortNativeOperation(
1295
+ 'firmware install reconnect: device cancel connection',
1296
+ () => cachedTransport.device.cancelConnection()
1297
+ )
1298
+ );
1299
+ await Promise.all(operations);
1300
+ });
1301
+ } else {
1302
+ const cachedProtocol = this.deviceProtocol.get(uuid);
1303
+ const isCachedDeviceConnected = await cachedTransport.device
1304
+ .isConnected()
1305
+ .catch(() => false);
1306
+ // A suspect GATT table is only refreshed through a new connect.
1307
+ const isCachedAndroidLinkUsable =
1308
+ Platform.OS !== 'android' || !this.androidGattCacheRefreshes.has(uuid);
1309
+ if (
1310
+ isCachedDeviceConnected &&
1311
+ isCachedAndroidLinkUsable &&
1312
+ cachedProtocol &&
1313
+ (!expectedProtocol || cachedProtocol === expectedProtocol)
1314
+ ) {
1315
+ if (this.stopped) throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
1316
+ Log?.debug('[ReactNativeBleTransport] reuse cached BLE transport:', uuid, cachedProtocol);
1317
+ return { uuid, protocolType: cachedProtocol };
1550
1318
  }
1551
- }
1552
1319
 
1553
- let device: Device | null = null;
1554
- const isAndroid = Platform.OS === 'android';
1555
- // A firmware-install reconnect always refreshes: the new firmware may expose a different table.
1556
- const refreshAndroidGattCache =
1557
- isAndroid && (!!skipProtocolProbe || this.androidGattCacheRefreshes.has(uuid));
1558
- let nativeConnectOptions = connectOptions;
1559
- let bareConnectOptions = fallbackConnectOptions;
1560
- let connectBackstopMs = BLE_CONNECT_TIMEOUT_MS;
1561
- if (isAndroid) {
1562
- nativeConnectOptions = refreshAndroidGattCache
1563
- ? androidRefreshGattConnectOptions
1564
- : fallbackConnectOptions;
1565
- } else if (this.takeIosPresentDeviceSighting(uuid, skipProtocolProbe)) {
1566
- const timeout = IOS_PRESENT_DEVICE_CONNECT_TIMEOUT_MS;
1567
- nativeConnectOptions = { ...connectOptions, timeout };
1568
- bareConnectOptions = { ...fallbackConnectOptions, timeout };
1569
- connectBackstopMs = IOS_PRESENT_DEVICE_CONNECT_BACKSTOP_MS;
1570
- }
1571
- // Only a connect that carried refreshGatt clears the marker; the fallback connects drop it.
1572
- let androidRefreshConnectRan = false;
1573
-
1574
- if (forceCleanRunPromise && this.runPromise) {
1575
- const error = ERRORS.TypedError(HardwareErrorCode.BleForceCleanRunPromise);
1576
- this.runPromise.reject(error);
1577
- this.runPromise = null;
1578
- this.runPromiseDeviceId = null;
1579
- Log?.debug(
1580
- 'Force clean Bluetooth run promise, forceCleanRunPromise: ',
1581
- forceCleanRunPromise
1582
- );
1320
+ /**
1321
+ * If the transport is not reusable due to a protocol mismatch or stale
1322
+ * connection, clean it up before creating a new transport instance.
1323
+ */
1324
+ Log?.debug('transport not reusable, will release: ', uuid);
1325
+ await this.releaseUnlocked(uuid, true);
1583
1326
  }
1327
+ }
1584
1328
 
1585
- const blePlxManager = await this.getPlxManager();
1586
- let skipPostConnectMtu = false;
1587
- try {
1588
- await subscribeBleOn(blePlxManager);
1589
- } catch (error) {
1590
- Log?.debug('subscribeBleOn error: ', error);
1591
- throw error;
1592
- }
1329
+ let device: Device | null = null;
1330
+ const isAndroid = Platform.OS === 'android';
1331
+ // A firmware-install reconnect always refreshes: the new firmware may expose a different table.
1332
+ const refreshAndroidGattCache =
1333
+ isAndroid && (!!skipProtocolProbe || this.androidGattCacheRefreshes.has(uuid));
1334
+ let nativeConnectOptions = connectOptions;
1335
+ if (isAndroid) {
1336
+ nativeConnectOptions = refreshAndroidGattCache
1337
+ ? androidRefreshGattConnectOptions
1338
+ : fallbackConnectOptions;
1339
+ }
1340
+ // Only a connect that carried refreshGatt clears the marker; the fallback connects drop it.
1341
+ let androidRefreshConnectRan = false;
1593
1342
 
1594
- this.throwIfBondingStopped(bondSignal);
1595
- if (Platform.OS === 'android') {
1596
- // Initiate bonding locally before GATT can trigger peripheral-initiated pairing.
1597
- try {
1598
- await this.ensureAndroidBond(uuid, bondSignal);
1599
- } catch (error) {
1600
- await this.runNativeTeardown(uuid, blePlxManager, async () => {
1601
- await this.runBestEffortNativeOperation('bond failure: cancel manager connection', () =>
1602
- blePlxManager.cancelDeviceConnection(uuid)
1603
- );
1343
+ if (forceCleanRunPromise && this.runPromise) {
1344
+ const error = ERRORS.TypedError(HardwareErrorCode.BleForceCleanRunPromise);
1345
+ this.runPromise.reject(error);
1346
+ this.runPromise = null;
1347
+ this.runPromiseDeviceId = null;
1348
+ Log?.debug('Force clean Bluetooth run promise, forceCleanRunPromise: ', forceCleanRunPromise);
1349
+ }
1350
+
1351
+ const blePlxManager = await this.getPlxManager();
1352
+ let skipPostConnectMtu = false;
1353
+ try {
1354
+ await subscribeBleOn(blePlxManager);
1355
+ } catch (error) {
1356
+ Log?.debug('subscribeBleOn error: ', error);
1357
+ throw error;
1358
+ }
1359
+
1360
+ if (this.stopped) throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
1361
+ if (Platform.OS === 'android') {
1362
+ // Initiate bonding locally before GATT can trigger peripheral-initiated pairing.
1363
+ try {
1364
+ const bondState = await pairDevice(uuid);
1365
+ if (bondState.bonding) {
1366
+ await onDeviceBondState(uuid, this.bondAbortController.signal, {
1367
+ systemInitiated: bondState.initiated === false,
1604
1368
  });
1605
- throw error;
1369
+ } else if (!bondState.bonded) {
1370
+ throw ERRORS.TypedError(HardwareErrorCode.BleDeviceNotBonded, 'device is not bonded');
1606
1371
  }
1372
+ } catch (error) {
1373
+ await this.runNativeTeardown(uuid, blePlxManager, async () => {
1374
+ await this.runBestEffortNativeOperation('bond failure: cancel manager connection', () =>
1375
+ blePlxManager.cancelDeviceConnection(uuid)
1376
+ );
1377
+ });
1378
+ throw error;
1607
1379
  }
1608
- this.throwIfBondingStopped(bondSignal);
1380
+ }
1381
+ if (this.stopped) throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
1609
1382
 
1610
- if (!device) {
1611
- const devices = await blePlxManager.devices([uuid]);
1612
- [device] = devices;
1613
- }
1383
+ if (!device) {
1384
+ const devices = await blePlxManager.devices([uuid]);
1385
+ [device] = devices;
1386
+ }
1614
1387
 
1615
- if (!device) {
1616
- const connectedDevice = await blePlxManager.connectedDevices(getBluetoothServiceUuids());
1617
- const deviceFilter = connectedDevice.filter(device => device.id === uuid);
1618
- Log?.debug(`found connected device count: ${deviceFilter.length}`);
1619
- [device] = deviceFilter;
1620
- }
1388
+ if (!device) {
1389
+ const connectedDevice = await blePlxManager.connectedDevices(getBluetoothServiceUuids());
1390
+ const deviceFilter = connectedDevice.filter(device => device.id === uuid);
1391
+ Log?.debug(`found connected device count: ${deviceFilter.length}`);
1392
+ [device] = deviceFilter;
1393
+ }
1621
1394
 
1622
- if (!device) {
1623
- Log?.debug('try to connect to device: ', uuid);
1624
- try {
1625
- device = await this.connectWithTimeout(
1626
- uuid,
1627
- () => blePlxManager.connectToDevice(uuid, nativeConnectOptions),
1628
- connectBackstopMs
1395
+ if (!device) {
1396
+ Log?.debug('try to connect to device: ', uuid);
1397
+ try {
1398
+ device = await this.connectWithTimeout(uuid, () =>
1399
+ blePlxManager.connectToDevice(uuid, nativeConnectOptions)
1400
+ );
1401
+ androidRefreshConnectRan = refreshAndroidGattCache;
1402
+ } catch (e) {
1403
+ Log?.debug('try to connect to device has error: ', e);
1404
+ if (shouldRethrowBleSetupError(e)) {
1405
+ throw e;
1406
+ }
1407
+ if (isMtuOrCancelledConnectError(e)) {
1408
+ skipPostConnectMtu = true;
1409
+ Log?.debug('first try to reconnect without params');
1410
+ device = await this.connectWithTimeout(uuid, () =>
1411
+ blePlxManager.connectToDevice(uuid, fallbackConnectOptions)
1629
1412
  );
1630
- androidRefreshConnectRan = refreshAndroidGattCache;
1631
- } catch (e) {
1632
- Log?.debug('try to connect to device has error: ', e);
1633
- if (shouldRethrowBleSetupError(e)) {
1634
- throw e;
1635
- }
1636
- if (isMtuOrCancelledConnectError(e)) {
1637
- skipPostConnectMtu = true;
1638
- Log?.debug('first try to reconnect without params');
1639
- device = await this.connectWithTimeout(
1640
- uuid,
1641
- () => blePlxManager.connectToDevice(uuid, bareConnectOptions),
1642
- connectBackstopMs
1643
- );
1644
- } else if (e.errorCode === BleErrorCode.DeviceAlreadyConnected) {
1645
- Log?.debug('device already connected');
1646
- throw ERRORS.TypedError(HardwareErrorCode.BleAlreadyConnected);
1647
- } else {
1648
- remapError(e);
1649
- }
1413
+ } else if (e.errorCode === BleErrorCode.DeviceAlreadyConnected) {
1414
+ Log?.debug('device already connected');
1415
+ throw ERRORS.TypedError(HardwareErrorCode.BleAlreadyConnected);
1416
+ } else {
1417
+ remapError(e);
1650
1418
  }
1651
1419
  }
1420
+ }
1652
1421
 
1653
- if (!device) {
1654
- throw ERRORS.TypedError(HardwareErrorCode.BleConnectedError, 'unable to connect to device');
1655
- }
1422
+ if (!device) {
1423
+ throw ERRORS.TypedError(HardwareErrorCode.BleConnectedError, 'unable to connect to device');
1424
+ }
1656
1425
 
1657
- if (
1658
- refreshAndroidGattCache &&
1659
- !androidRefreshConnectRan &&
1660
- (await device.isConnected().catch(() => false))
1661
- ) {
1662
- // refreshGatt only reaches the stack through a connect. A link that is still up would
1663
- // skip the connect below and keep serving the stale table, so it is dropped first.
1664
- await this.dropAndroidLink(uuid, blePlxManager, device, 'gatt cache refresh');
1665
- this.throwIfBondingStopped(bondSignal);
1666
- }
1426
+ if (
1427
+ refreshAndroidGattCache &&
1428
+ !androidRefreshConnectRan &&
1429
+ (await device.isConnected().catch(() => false))
1430
+ ) {
1431
+ // refreshGatt only reaches the stack through a connect. A link that is still up would
1432
+ // skip the connect below and keep serving the stale table, so it is dropped first.
1433
+ await this.dropAndroidLink(uuid, blePlxManager, device, 'gatt cache refresh');
1434
+ if (this.stopped) throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
1435
+ }
1667
1436
 
1668
- if (!(await device.isConnected())) {
1669
- Log?.debug('not connected, try to connect to device: ', uuid);
1670
- const disconnectedDevice = device;
1437
+ if (!(await device.isConnected())) {
1438
+ Log?.debug('not connected, try to connect to device: ', uuid);
1439
+ const disconnectedDevice = device;
1671
1440
 
1672
- try {
1673
- device = await this.connectWithTimeout(
1674
- uuid,
1675
- () => disconnectedDevice.connect(nativeConnectOptions),
1676
- connectBackstopMs
1677
- );
1678
- androidRefreshConnectRan = refreshAndroidGattCache;
1679
- } catch (e) {
1680
- Log?.debug('not connected, try to connect to device has error: ', e);
1681
- if (shouldRethrowBleSetupError(e)) {
1682
- throw e;
1683
- }
1684
- if (isMtuOrCancelledConnectError(e)) {
1685
- skipPostConnectMtu = true;
1686
- Log?.debug('second try to reconnect without params');
1687
- try {
1688
- device = await this.connectWithTimeout(
1689
- uuid,
1690
- () => disconnectedDevice.connect(bareConnectOptions),
1691
- connectBackstopMs
1441
+ try {
1442
+ device = await this.connectWithTimeout(uuid, () =>
1443
+ disconnectedDevice.connect(nativeConnectOptions)
1444
+ );
1445
+ androidRefreshConnectRan = refreshAndroidGattCache;
1446
+ } catch (e) {
1447
+ Log?.debug('not connected, try to connect to device has error: ', e);
1448
+ if (shouldRethrowBleSetupError(e)) {
1449
+ throw e;
1450
+ }
1451
+ if (isMtuOrCancelledConnectError(e)) {
1452
+ skipPostConnectMtu = true;
1453
+ Log?.debug('second try to reconnect without params');
1454
+ try {
1455
+ device = await this.connectWithTimeout(uuid, () =>
1456
+ disconnectedDevice.connect(fallbackConnectOptions)
1457
+ );
1458
+ } catch (fallbackError) {
1459
+ Log?.debug('last try to reconnect error: ', fallbackError);
1460
+ // last try to reconnect device if this issue exists
1461
+ // https://github.com/dotintent/react-native-ble-plx/issues/426
1462
+ if (fallbackError.errorCode === BleErrorCode.OperationCancelled) {
1463
+ Log?.debug('last try to reconnect');
1464
+ await disconnectedDevice.cancelConnection();
1465
+ device = await this.connectWithTimeout(uuid, () =>
1466
+ disconnectedDevice.connect(fallbackConnectOptions)
1692
1467
  );
1693
- } catch (fallbackError) {
1694
- Log?.debug('last try to reconnect error: ', fallbackError);
1695
- // last try to reconnect device if this issue exists
1696
- // https://github.com/dotintent/react-native-ble-plx/issues/426
1697
- if (fallbackError.errorCode === BleErrorCode.OperationCancelled) {
1698
- Log?.debug('last try to reconnect');
1699
- await disconnectedDevice.cancelConnection();
1700
- device = await this.connectWithTimeout(
1701
- uuid,
1702
- () => disconnectedDevice.connect(bareConnectOptions),
1703
- connectBackstopMs
1704
- );
1705
- } else {
1706
- remapError(fallbackError);
1707
- }
1468
+ } else {
1469
+ remapError(fallbackError);
1708
1470
  }
1709
- } else {
1710
- remapError(e);
1711
1471
  }
1472
+ } else {
1473
+ remapError(e);
1712
1474
  }
1713
1475
  }
1476
+ }
1714
1477
 
1715
- if (this.stopped || bondSignal.aborted) {
1716
- // Native connect can succeed after cancellation, before this link enters
1717
- // transportCache. Drain manager-owned teardown before rejecting acquire.
1718
- await this.disconnectUnlocked(uuid);
1719
- this.throwIfBondingStopped(bondSignal);
1720
- }
1721
- if (Platform.OS === 'android' && !(await device.isConnected().catch(() => false))) {
1722
- const disconnectedDevice = device;
1478
+ if (this.stopped) throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
1479
+ if (Platform.OS === 'android' && !(await device.isConnected().catch(() => false))) {
1480
+ const disconnectedDevice = device;
1481
+ await this.runNativeTeardown(uuid, blePlxManager, async () => {
1482
+ await Promise.all([
1483
+ this.runBestEffortNativeOperation('connect failure: cancel manager connection', () =>
1484
+ blePlxManager.cancelDeviceConnection(uuid)
1485
+ ),
1486
+ this.runBestEffortNativeOperation('connect failure: cancel device connection', () =>
1487
+ disconnectedDevice.cancelConnection()
1488
+ ),
1489
+ ]);
1490
+ });
1491
+ throw ERRORS.TypedError(HardwareErrorCode.BleConnectedError, 'device is not connected');
1492
+ }
1493
+ if (this.stopped) throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
1494
+ let characteristics: ResolvedBleCharacteristics | undefined;
1495
+ if (isAndroid) {
1496
+ if (refreshAndroidGattCache) {
1497
+ // refreshGatt has already started a full rediscovery; let it finish before the MTU
1498
+ // exchange so the request is not queued behind it.
1499
+ characteristics = await this.resolveCharacteristicsWithTimeout(uuid, device);
1500
+ if (androidRefreshConnectRan) this.androidGattCacheRefreshes.delete(uuid);
1501
+ if (this.stopped) throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
1502
+ }
1503
+ device = await this.negotiateAndroidMtu(uuid, blePlxManager, device);
1504
+ } else if (!skipPostConnectMtu) {
1505
+ // Match 1.1.31: MTU is a connect() best-effort. If connect already fell back
1506
+ // without requestMTU, do not put another requestMTU on the native serial
1507
+ // queue — that is what wedges GATT after Account#2 reconnect.
1508
+ const mtuResult = await resolveNegotiatedMtu(device, transactionId =>
1509
+ blePlxManager.cancelTransaction(transactionId)
1510
+ );
1511
+ device = mtuResult.device;
1512
+ if (mtuResult.timedOut) {
1513
+ if (this.stopped) throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
1514
+ Log?.debug(
1515
+ '[ReactNativeBleTransport] post-connect MTU timed out, reconnecting without requesting MTU'
1516
+ );
1517
+ const timedOutDevice = device;
1518
+ let mtuTeardownSettled = false;
1723
1519
  await this.runNativeTeardown(uuid, blePlxManager, async () => {
1724
- await Promise.all([
1725
- this.runBestEffortNativeOperation('connect failure: cancel manager connection', () =>
1726
- blePlxManager.cancelDeviceConnection(uuid)
1727
- ),
1728
- this.runBestEffortNativeOperation('connect failure: cancel device connection', () =>
1729
- disconnectedDevice.cancelConnection()
1730
- ),
1731
- ]);
1520
+ await this.runBestEffortNativeOperation('mtu timeout: cancel device connection', () =>
1521
+ timedOutDevice.cancelConnection()
1522
+ );
1523
+ mtuTeardownSettled = true;
1732
1524
  });
1733
- throw ERRORS.TypedError(HardwareErrorCode.BleConnectedError, 'device is not connected');
1734
- }
1735
- this.throwIfBondingStopped(bondSignal);
1736
- let characteristics: ResolvedBleCharacteristics | undefined;
1737
- if (isAndroid) {
1738
- if (refreshAndroidGattCache) {
1739
- // refreshGatt has already started a full rediscovery; let it finish before the MTU
1740
- // exchange so the request is not queued behind it.
1741
- characteristics = await this.resolveCharacteristicsWithTimeout(uuid, device);
1742
- if (androidRefreshConnectRan) this.androidGattCacheRefreshes.delete(uuid);
1743
- this.throwIfBondingStopped(bondSignal);
1525
+ if (this.stopped) throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
1526
+ if (!mtuTeardownSettled || this.blePlxManager !== blePlxManager) {
1527
+ // The teardown budget expired and the manager that owned timedOutDevice was reset.
1528
+ throw ERRORS.TypedError(HardwareErrorCode.BleTimeoutError, 'BLE MTU cleanup timed out');
1744
1529
  }
1745
- device = await this.negotiateAndroidMtu(uuid, blePlxManager, device);
1746
- } else if (!skipPostConnectMtu) {
1747
- // Match 1.1.31: MTU is a connect() best-effort. If connect already fell back
1748
- // without requestMTU, do not put another requestMTU on the native serial
1749
- // queue — that is what wedges GATT after Account#2 reconnect.
1750
- const mtuResult = await resolveNegotiatedMtu(device, transactionId =>
1751
- blePlxManager.cancelTransaction(transactionId)
1752
- );
1753
- device = mtuResult.device;
1754
- if (mtuResult.timedOut) {
1755
- this.throwIfBondingStopped(bondSignal);
1756
- Log?.debug(
1757
- '[ReactNativeBleTransport] post-connect MTU timed out, reconnecting without requesting MTU'
1530
+ try {
1531
+ device = await this.connectWithTimeout(uuid, () =>
1532
+ timedOutDevice.connect(fallbackConnectOptions)
1758
1533
  );
1759
- const timedOutDevice = device;
1760
- let mtuTeardownSettled = false;
1761
- await this.runNativeTeardown(uuid, blePlxManager, async () => {
1762
- await this.runBestEffortNativeOperation('mtu timeout: cancel device connection', () =>
1763
- timedOutDevice.cancelConnection()
1764
- );
1765
- mtuTeardownSettled = true;
1766
- });
1767
- this.throwIfBondingStopped(bondSignal);
1768
- if (!mtuTeardownSettled || this.blePlxManager !== blePlxManager) {
1769
- // The teardown budget expired and the manager that owned timedOutDevice was reset.
1770
- throw ERRORS.TypedError(HardwareErrorCode.BleTimeoutError, 'BLE MTU cleanup timed out');
1771
- }
1772
- try {
1773
- device = await this.connectWithTimeout(
1774
- uuid,
1775
- () => timedOutDevice.connect(bareConnectOptions),
1776
- connectBackstopMs
1777
- );
1778
- } catch (error) {
1779
- if (shouldRethrowBleSetupError(error)) throw error;
1780
- if (
1781
- (error as { errorCode?: unknown })?.errorCode === BleErrorCode.DeviceAlreadyConnected
1782
- ) {
1783
- // GATT resolution and the protocol probe below still validate the retained link.
1784
- device = timedOutDevice;
1785
- } else {
1786
- remapError(error);
1787
- }
1534
+ } catch (error) {
1535
+ if (shouldRethrowBleSetupError(error)) throw error;
1536
+ if (
1537
+ (error as { errorCode?: unknown })?.errorCode === BleErrorCode.DeviceAlreadyConnected
1538
+ ) {
1539
+ // GATT resolution and the protocol probe below still validate the retained link.
1540
+ device = timedOutDevice;
1541
+ } else {
1542
+ remapError(error);
1788
1543
  }
1789
1544
  }
1790
1545
  }
1791
- this.throwIfBondingStopped(bondSignal);
1792
- const acquiredDevice = device;
1793
- const { writeCharacteristic, notifyCharacteristic } =
1794
- characteristics ?? (await this.resolveCharacteristicsWithTimeout(uuid, acquiredDevice));
1795
- this.throwIfBondingStopped(bondSignal);
1546
+ }
1547
+ if (this.stopped) throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
1548
+ const acquiredDevice = device;
1549
+ const { writeCharacteristic, notifyCharacteristic } =
1550
+ characteristics ?? (await this.resolveCharacteristicsWithTimeout(uuid, acquiredDevice));
1551
+ if (this.stopped) throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
1796
1552
 
1797
- const protocolHint = expectedProtocol
1798
- ? undefined
1799
- : input.protocolHint ?? this.deviceProtocolHints.get(uuid);
1553
+ const protocolHint = expectedProtocol
1554
+ ? undefined
1555
+ : input.protocolHint ?? this.deviceProtocolHints.get(uuid);
1800
1556
 
1801
- // release transport before new transport instance
1802
- await this.releaseUnlocked(uuid, true);
1803
- if (protocolHint) {
1804
- this.deviceProtocolHints.set(uuid, protocolHint);
1805
- }
1557
+ // release transport before new transport instance
1558
+ await this.releaseUnlocked(uuid, true);
1559
+ if (protocolHint) {
1560
+ this.deviceProtocolHints.set(uuid, protocolHint);
1561
+ }
1806
1562
 
1807
- try {
1808
- await this.installTransportForAcquire(uuid, acquiredDevice, {
1809
- writeCharacteristic,
1810
- notifyCharacteristic,
1811
- });
1563
+ try {
1564
+ await this.installTransportForAcquire(uuid, acquiredDevice, {
1565
+ writeCharacteristic,
1566
+ notifyCharacteristic,
1567
+ });
1812
1568
 
1813
- if (skipProtocolProbe) {
1814
- if (!expectedProtocol) {
1815
- throw ERRORS.TypedError(
1816
- HardwareErrorCode.RuntimeError,
1817
- 'skipProtocolProbe requires an expected BLE protocol'
1818
- );
1819
- }
1820
- const hasConfirmedProtocol =
1821
- this.sessionProtocols.get(uuid) === expectedProtocol ||
1822
- (expectedProtocol === 'V2' && this.confirmedProtocolV2.has(uuid));
1823
- if (!hasConfirmedProtocol) {
1824
- throw ERRORS.TypedError(
1825
- HardwareErrorCode.RuntimeError,
1826
- 'skipProtocolProbe requires a previously confirmed protocol for this BLE endpoint'
1827
- );
1828
- }
1829
- this.deviceProtocol.set(uuid, expectedProtocol);
1830
- this.sessionProtocols.set(uuid, expectedProtocol);
1831
- this.protocolReprobeFailures.delete(uuid);
1832
- Log?.debug('[ReactNativeBleTransport] protocol selected without probe', {
1833
- deviceId: uuid,
1834
- protocol: expectedProtocol,
1835
- source: 'firmware-install-reconnect',
1836
- });
1837
- const currentTransport = transportCache[uuid];
1838
- if (!currentTransport) {
1839
- throw ERRORS.TypedError(HardwareErrorCode.TransportNotFound);
1840
- }
1841
- this.attachDisconnectSubscription(currentTransport, currentTransport.device, uuid);
1842
- return { uuid, protocolType: expectedProtocol };
1569
+ if (skipProtocolProbe) {
1570
+ if (!expectedProtocol) {
1571
+ throw ERRORS.TypedError(
1572
+ HardwareErrorCode.RuntimeError,
1573
+ 'skipProtocolProbe requires an expected BLE protocol'
1574
+ );
1843
1575
  }
1844
-
1845
- const protocolType = await this.detectProtocol(
1846
- uuid,
1847
- expectedProtocol,
1848
- protocolHint,
1849
- async () => {
1850
- await this.installTransportForAcquire(uuid, acquiredDevice);
1851
- }
1852
- );
1853
- this.throwIfBondingStopped(bondSignal);
1576
+ const hasConfirmedProtocol =
1577
+ this.sessionProtocols.get(uuid) === expectedProtocol ||
1578
+ (expectedProtocol === 'V2' && this.confirmedProtocolV2.has(uuid));
1579
+ if (!hasConfirmedProtocol) {
1580
+ throw ERRORS.TypedError(
1581
+ HardwareErrorCode.RuntimeError,
1582
+ 'skipProtocolProbe requires a previously confirmed protocol for this BLE endpoint'
1583
+ );
1584
+ }
1585
+ this.deviceProtocol.set(uuid, expectedProtocol);
1586
+ this.sessionProtocols.set(uuid, expectedProtocol);
1587
+ this.protocolReprobeFailures.delete(uuid);
1588
+ Log?.debug('[ReactNativeBleTransport] protocol selected without probe', {
1589
+ deviceId: uuid,
1590
+ protocol: expectedProtocol,
1591
+ source: 'firmware-install-reconnect',
1592
+ });
1854
1593
  const currentTransport = transportCache[uuid];
1855
1594
  if (!currentTransport) {
1856
1595
  throw ERRORS.TypedError(HardwareErrorCode.TransportNotFound);
1857
1596
  }
1858
1597
  this.attachDisconnectSubscription(currentTransport, currentTransport.device, uuid);
1859
- return { uuid, protocolType };
1860
- } catch (error) {
1861
- // A failed acquire must retire the physical link before Core retries. Logical
1862
- // release leaves GATT connected even when neither protocol receives a response.
1863
- await this.disconnectUnlocked(uuid);
1864
- throw error;
1598
+ return { uuid, protocolType: expectedProtocol };
1865
1599
  }
1866
- } finally {
1867
- this.releaseBondAbortController(uuid, bondController);
1600
+
1601
+ const protocolType = await this.detectProtocol(
1602
+ uuid,
1603
+ expectedProtocol,
1604
+ protocolHint,
1605
+ async () => {
1606
+ await this.installTransportForAcquire(uuid, acquiredDevice);
1607
+ }
1608
+ );
1609
+ if (this.stopped) throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
1610
+ const currentTransport = transportCache[uuid];
1611
+ if (!currentTransport) {
1612
+ throw ERRORS.TypedError(HardwareErrorCode.TransportNotFound);
1613
+ }
1614
+ this.attachDisconnectSubscription(currentTransport, currentTransport.device, uuid);
1615
+ return { uuid, protocolType };
1616
+ } catch (error) {
1617
+ // A failed acquire must retire the physical link before Core retries. Logical
1618
+ // release leaves GATT connected even when neither protocol receives a response.
1619
+ await this.disconnectUnlocked(uuid);
1620
+ throw error;
1868
1621
  }
1869
1622
  }
1870
1623
 
@@ -1892,17 +1645,6 @@ export default class ReactNativeBleTransport {
1892
1645
  Log?.debug('monitor error ignored for stale transport: ', uuid, notifyTransactionId);
1893
1646
  return;
1894
1647
  }
1895
- if (Platform.OS === 'ios' && isIosPeerRemovedPairingInformation(error)) {
1896
- const staleBondError = toIosStaleBondError(error);
1897
- if (this.getActiveProtocol(uuid) === 'V2') {
1898
- this.rejectProtocolV2Frames(uuid, staleBondError);
1899
- return;
1900
- }
1901
- if (this.runPromise && this.runPromiseDeviceId === uuid) {
1902
- this.runPromise.reject(staleBondError);
1903
- }
1904
- return;
1905
- }
1906
1648
  if (Platform.OS === 'android' && isStaleGattTableNotifyReason(error.reason)) {
1907
1649
  this.androidGattCacheRefreshes.add(uuid);
1908
1650
  }
@@ -2409,7 +2151,7 @@ export default class ReactNativeBleTransport {
2409
2151
  if (this.stopPromise) return this.stopPromise;
2410
2152
  this.stopped = true;
2411
2153
  // Bonding precedes GATT, so cancelDeviceConnection cannot end this wait.
2412
- this.abortActiveBonding();
2154
+ this.bondAbortController.abort();
2413
2155
  const deviceIds = new Set([
2414
2156
  ...this.monitorTokens.keys(),
2415
2157
  ...this.sessionProtocols.keys(),
@@ -2420,7 +2162,6 @@ export default class ReactNativeBleTransport {
2420
2162
  this.androidPriorityResetTimers.forEach(timeout => clearTimeout(timeout));
2421
2163
  this.androidPriorityResetTimers.clear();
2422
2164
  this.androidHighPriorityDevices.clear();
2423
- this.iosLastAdvertisedAt.clear();
2424
2165
  const error = ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
2425
2166
  this.runPromise?.reject(error);
2426
2167
  this.runPromise = null;
@@ -2453,7 +2194,6 @@ export default class ReactNativeBleTransport {
2453
2194
  }
2454
2195
 
2455
2196
  async disconnect(session: string) {
2456
- this.abortActiveBonding(session);
2457
2197
  return this.runLifecycleOperation(session, () => this.disconnectUnlocked(session));
2458
2198
  }
2459
2199
 
@@ -2607,12 +2347,11 @@ export default class ReactNativeBleTransport {
2607
2347
  }
2608
2348
  }
2609
2349
 
2610
- async cancel(uuid?: string) {
2611
- Log?.debug('transport-react-native transport cancel', uuid);
2612
- this.abortActiveBonding(uuid);
2350
+ async cancel() {
2351
+ Log?.debug('transport-react-native transport cancel');
2613
2352
  const pending = this.runPromise;
2614
2353
  const deviceId = this.runPromiseDeviceId;
2615
- if (pending && (uuid === undefined || deviceId === uuid)) {
2354
+ if (pending) {
2616
2355
  pending.reject(ERRORS.TypedError(HardwareErrorCode.CallQueueActionCancelled));
2617
2356
  if (this.runPromise === pending) {
2618
2357
  this.runPromise = null;
@@ -2716,25 +2455,8 @@ export default class ReactNativeBleTransport {
2716
2455
  });
2717
2456
  }
2718
2457
 
2719
- /**
2720
- * Whether this acquire may spend the longer iOS connect budget. The sighting is used up: the
2721
- * retry that follows a timeout gets no new scan, and the device may have left by then. A
2722
- * firmware-install reconnect keeps its short polling cadence.
2723
- */
2724
- private takeIosPresentDeviceSighting(uuid: string, skipProtocolProbe?: boolean): boolean {
2725
- if (Platform.OS !== 'ios') return false;
2726
- const seenAt = this.iosLastAdvertisedAt.get(uuid);
2727
- this.iosLastAdvertisedAt.delete(uuid);
2728
- if (skipProtocolProbe || seenAt === undefined) return false;
2729
- return Date.now() - seenAt <= IOS_PRESENT_DEVICE_WINDOW_MS;
2730
- }
2731
-
2732
2458
  /** Run a native connect under the JS backstop budget. */
2733
- private async connectWithTimeout<T>(
2734
- uuid: string,
2735
- connect: () => Promise<T>,
2736
- backstopMs = BLE_CONNECT_TIMEOUT_MS
2737
- ): Promise<T> {
2459
+ private async connectWithTimeout<T>(uuid: string, connect: () => Promise<T>): Promise<T> {
2738
2460
  if (this.stopped) throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
2739
2461
  const startedAt = Date.now();
2740
2462
  let succeeded = false;
@@ -2753,10 +2475,10 @@ export default class ReactNativeBleTransport {
2753
2475
  reject(
2754
2476
  ERRORS.TypedError(
2755
2477
  HardwareErrorCode.BleConnectedError,
2756
- `BLE connect timeout after ${backstopMs}ms for ${uuid}`
2478
+ `BLE connect timeout after ${BLE_CONNECT_TIMEOUT_MS}ms for ${uuid}`
2757
2479
  )
2758
2480
  );
2759
- }, backstopMs);
2481
+ }, BLE_CONNECT_TIMEOUT_MS);
2760
2482
  }),
2761
2483
  ]);
2762
2484
  succeeded = true;
@@ -2779,7 +2501,6 @@ export default class ReactNativeBleTransport {
2779
2501
  elapsedMs: Date.now() - startedAt,
2780
2502
  succeeded,
2781
2503
  backstopExpired: timedOut,
2782
- backstopMs,
2783
2504
  });
2784
2505
  }
2785
2506
  }
@@ -2823,12 +2544,6 @@ export default class ReactNativeBleTransport {
2823
2544
  throw this.createWedgedBleSetupError();
2824
2545
  }
2825
2546
  }
2826
- if (Platform.OS === 'ios' && isIosPeerRemovedPairingInformation(error)) {
2827
- // iOS can report the lost bond on the first GATT operation instead of
2828
- // on the connect. Check it before the generic disconnect mapping: the
2829
- // same native failure may also carry the ble-plx disconnect code.
2830
- throw toIosStaleBondError(error);
2831
- }
2832
2547
  if (isNativeBleDisconnectError(error)) {
2833
2548
  throw toBleDisconnectHardwareError(error);
2834
2549
  }
@@ -2986,7 +2701,6 @@ export default class ReactNativeBleTransport {
2986
2701
 
2987
2702
  private resetPlxManager() {
2988
2703
  if (bleManagerResetPromise) return;
2989
- this.iosLastAdvertisedAt.clear();
2990
2704
  const manager = this.blePlxManager;
2991
2705
  this.blePlxManager = undefined;
2992
2706
  const reason = 'React Native BLE manager reset';
@@ -3291,29 +3005,24 @@ export default class ReactNativeBleTransport {
3291
3005
 
3292
3006
  this.probingProtocols.set(uuid, 'V2');
3293
3007
  this.protocolV2Assemblers.get(uuid)?.reset();
3294
- try {
3295
- const detected = await probeProtocolV2Helper({
3296
- call: (name: string, data: Record<string, unknown>, options?: TransportCallOptions) =>
3297
- this.callProtocolV2(uuid, name, data, options),
3298
- timeoutMs: PROTOCOL_V2_PROBE_TIMEOUT_MS,
3299
- logger: Log,
3300
- logPrefix: 'ProtocolV2 RN-BLE',
3301
- onProbeFailed: () => {
3302
- this.protocolV2Assemblers.get(uuid)?.reset();
3303
- this.resetProtocolV2Frames(uuid);
3304
- },
3305
- shouldRethrow: shouldRethrowProtocolProbeError,
3306
- });
3307
- if (!detected) {
3308
- this.clearProbeProtocol(uuid, 'V2');
3309
- } else {
3310
- this.probingProtocols.delete(uuid);
3311
- }
3312
- return detected;
3313
- } catch (error) {
3008
+ const detected = await probeProtocolV2Helper({
3009
+ call: (name: string, data: Record<string, unknown>, options?: TransportCallOptions) =>
3010
+ this.callProtocolV2(uuid, name, data, options),
3011
+ timeoutMs: PROTOCOL_V2_PROBE_TIMEOUT_MS,
3012
+ logger: Log,
3013
+ logPrefix: 'ProtocolV2 RN-BLE',
3014
+ onProbeFailed: () => {
3015
+ this.protocolV2Assemblers.get(uuid)?.reset();
3016
+ this.resetProtocolV2Frames(uuid);
3017
+ },
3018
+ shouldRethrow: shouldRethrowProtocolProbeError,
3019
+ });
3020
+ if (!detected) {
3314
3021
  this.clearProbeProtocol(uuid, 'V2');
3315
- throw error;
3022
+ } else {
3023
+ this.probingProtocols.delete(uuid);
3316
3024
  }
3025
+ return detected;
3317
3026
  }
3318
3027
 
3319
3028
  private handleProtocolV2Notification(uuid: string, monitorToken: number, data: Uint8Array) {