npm - @onekeyfe/hd-transport-react-native - Versions diffs - 1.2.2-alpha.106 → 1.2.2-alpha.108 - Mend

@onekeyfe/hd-transport-react-native 1.2.2-alpha.106 → 1.2.2-alpha.108

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.

Files changed (8) hide show

package/dist/BleManager.d.ts.map +1 -1
package/dist/index.d.ts.map +1 -1
package/dist/index.js +93 -28
package/package.json +6 -6
package/src/BleManager.ts +58 -4
package/src/__tests__/connectTimeout.test.ts +173 -2
package/src/__tests__/protocolV2Link.test.ts +81 -29
package/src/index.ts +59 -31

package/dist/BleManager.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"BleManager.d.ts","sourceRoot":"","sources":["../src/BleManager.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;~~AASnE~~,eAAO,MAAM,qBAAqB,iBAAkB,MAAM,EAAE,0BACZ,CAAC;AAEjD,eAAO,MAAM,gBAAgB,6BAAwC,CAAC;AAEtE,eAAO,MAAM,UAAU,eAAgB,MAAM;;;EAAoC,CAAC;AAElF,eAAO,MAAM,iBAAiB,kBAAmB,MAAM,KAAG,QAAQ,UAAU,GAAG,SAAS,~~CA+BpF~~,CAAC"}
1	+ {"version":3,"file":"BleManager.d.ts","sourceRoot":"","sources":["../src/BleManager.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAsBnE,eAAO,MAAM,qBAAqB,iBAAkB,MAAM,EAAE,0BACZ,CAAC;AAEjD,eAAO,MAAM,gBAAgB,6BAAwC,CAAC;AAEtE,eAAO,MAAM,UAAU,eAAgB,MAAM;;;EAAoC,CAAC;AAElF,eAAO,MAAM,iBAAiB,kBAAmB,MAAM,KAAG,QAAQ,UAAU,GAAG,SAAS,CAwEpF,CAAC"}

package/dist/index.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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~~IAyElC~~,OAAO,CAAC,KAAK,EAAE,8BAA8B;;;;YAUrC,eAAe;~~IAiS7B~~,sBAAsB,CACpB,cAAc,EAAE,cAAc,EAC9B,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,MAAM,EACpB,mBAAmB,EAAE,MAAM,GAC1B,YAAY;IAsIT,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,UAAQ;YAI7B,eAAe;YAKf,aAAa;IA8ErB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAajE,IAAI,CACR,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,EAAE,oBAAoB;YA6BlB,cAAc;IAyP5B,IAAI;~~IA+BE~~,UAAU,CAAC,OAAO,EAAE,MAAM;YAIlB,kBAAkB;YAmFlB,iBAAiB;IAkC/B,OAAO,CAAC,4BAA4B;YAQtB,qBAAqB;IAoB7B,MAAM;YAiBE,kBAAkB;~~YAiDlB~~,iCAAiC;IAwD/C,OAAO,CAAC,wBAAwB;IAoChC,OAAO,CAAC,yBAAyB;IAMjC,OAAO,CAAC,kBAAkB;YAcZ,cAAc;IA8C5B,OAAO,CAAC,kBAAkB;IA+B1B,OAAO,CAAC,eAAe;IAiEvB,OAAO,CAAC,2BAA2B;IASnC,OAAO,CAAC,4BAA4B;IAOpC,OAAO,CAAC,kBAAkB;IAU1B,OAAO,CAAC,iBAAiB;YAIX,cAAc;YAuGd,iCAAiC;YAoDjC,eAAe;YAsBf,eAAe;IA4B7B,OAAO,CAAC,4BAA4B;IA2BpC,OAAO,CAAC,uBAAuB;IAS/B,OAAO,CAAC,sBAAsB;IAU9B,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,sBAAsB;IAS9B,OAAO,CAAC,sBAAsB;IAQ9B,OAAO,CAAC,qBAAqB;YAOf,mBAAmB;YAiBnB,qBAAqB;YAmErB,oBAAoB;YAgCpB,cAAc;YAqEd,iCAAiC;IAiB/C,OAAO,CAAC,8BAA8B;YAQxB,mCAAmC;IAsBjD,OAAO,CAAC,yCAAyC;YAanC,gCAAgC;IAoB9C,OAAO,CAAC,uBAAuB;IAmD/B,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;CAGxD"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/index.js CHANGED Viewed

@@ -57,6 +57,17 @@ const bleLogger = {
 };
 const Logger = bleLogger;
+const bondFailureReasons = {
+    1: 'authentication_failed',
+    2: 'rejected',
+    3: 'canceled',
+    4: 'device_unreachable',
+    5: 'discovery_in_progress',
+    6: 'timeout',
+    7: 'repeated_attempts',
+    8: 'remote_canceled',
+    9: 'removed',
+};
 const getConnectedDeviceIds = (serviceUuids) => BleUtils__default["default"].getConnectedPeripherals(serviceUuids);
 const pairDevice = (macAddress) => BleUtils__default["default"].pairDevice(macAddress);
 const onDeviceBondState = (bleMacAddress) => new Promise((resolve, reject) => {
@@ -69,24 +80,40 @@ const onDeviceBondState = (bleMacAddress) => new Promise((resolve, reject) => {
     };
     const timeout = setTimeout(() => {
         cleanup();
-        reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceNotBonded, 'device is not bonded'));
+        reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceNotBonded, 'Bluetooth pairing timed out', {
+            phase: 'bond',
+            reason: 'timeout',
+        }));
     }, 60 * 1000);
     const cleanupListener = BleUtils__default["default"].onDeviceBondState(peripheral => {
-        var _a;
+        var _a, _b;
         if (((_a = peripheral.id) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== bleMacAddress.toLowerCase()) {
             return;
         }
         const { bondState } = peripheral;
         const hasBonded = bondState.preState === 'BOND_BONDING' && bondState.state === 'BOND_BONDED';
-        const hasCanceled = bondState.preState === 'BOND_BONDING' && bondState.state === 'BOND_NONE';
+        const hasFailed = bondState.preState === 'BOND_BONDING' && bondState.state === 'BOND_NONE';
         Logger.debug('onDeviceBondState bondState:', bondState);
         if (hasBonded) {
             cleanup();
             resolve(peripheral);
         }
-        else if (hasCanceled) {
+        else if (hasFailed) {
             cleanup();
-            reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceBondedCanceled, 'bonding canceled'));
+            const nativeReason = 'reason' in bondState && typeof bondState.reason === 'number'
+                ? bondState.reason
+                : undefined;
+            const reason = nativeReason === undefined ? 'unknown' : (_b = bondFailureReasons[nativeReason]) !== null && _b !== void 0 ? _b : 'unknown';
+            const params = Object.assign({ phase: 'bond', reason }, (nativeReason === undefined ? {} : { nativeReason }));
+            if (reason === 'timeout') {
+                reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceNotBonded, 'Bluetooth pairing timed out', params));
+            }
+            else if (reason === 'canceled') {
+                reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceBondedCanceled, 'Bluetooth pairing canceled', params));
+            }
+            else {
+                reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceNotBonded, 'Bluetooth pairing failed', params));
+            }
         }
     });
 });
@@ -861,6 +888,8 @@ class ReactNativeBleTransport {
     installTransportForAcquire(uuid, device, characteristics) {
         return __awaiter(this, void 0, void 0, function* () {
             const { writeCharacteristic, notifyCharacteristic } = characteristics !== null && characteristics !== void 0 ? characteristics : (yield this.resolveCharacteristicsWithTimeout(uuid, device));
+            if (this.stopped)
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected);
             const transport$1 = new BleTransport(device, writeCharacteristic, notifyCharacteristic);
             transport$1.mtuSize = typeof device.mtu === 'number' ? device.mtu : undefined;
             const monitorToken = this.nextMonitorToken;
@@ -881,17 +910,23 @@ class ReactNativeBleTransport {
             else if (reactNative.Platform.OS === 'android') {
                 yield delay(ANDROID_NOTIFY_READY_DELAY_MS);
             }
+            if (this.stopped)
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected);
             const initialMtu = transport$1.mtuSize;
             let refreshAttempts = 0;
             if ((reactNative.Platform.OS === 'ios' || reactNative.Platform.OS === 'android') &&
                 shouldRefreshNegotiatedMtu(transport$1.mtuSize)) {
                 refreshAttempts += 1;
                 let refreshedDevice = yield requestNegotiatedMtu(transport$1.device, 'servicesAndNotifyReady', 1);
+                if (this.stopped)
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected);
                 transport$1.device = refreshedDevice;
                 transport$1.mtuSize =
                     typeof refreshedDevice.mtu === 'number' ? refreshedDevice.mtu : transport$1.mtuSize;
                 if (shouldRefreshNegotiatedMtu(transport$1.mtuSize)) {
                     yield delay(BLE_MTU_REFRESH_RETRY_DELAY_MS);
+                    if (this.stopped)
+                        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected);
                     refreshAttempts += 1;
                     refreshedDevice = yield requestNegotiatedMtu(transport$1.device, 'servicesAndNotifyReady', 2);
                     transport$1.device = refreshedDevice;
@@ -899,6 +934,8 @@ class ReactNativeBleTransport {
                         typeof refreshedDevice.mtu === 'number' ? refreshedDevice.mtu : transport$1.mtuSize;
                 }
             }
+            if (this.stopped)
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected);
             Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] BLE MTU ready', {
                 platform: reactNative.Platform.OS,
                 requested: getRequestedBleMtu(),
@@ -957,6 +994,8 @@ class ReactNativeBleTransport {
                     if (isCachedDeviceConnected &&
                         cachedProtocol &&
                         (!expectedProtocol || cachedProtocol === expectedProtocol)) {
+                        if (this.stopped)
+                            throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected);
                         Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] reuse cached BLE transport:', uuid, cachedProtocol);
                         return { uuid, protocolType: cachedProtocol };
                     }
@@ -980,6 +1019,27 @@ class ReactNativeBleTransport {
                 Log === null || Log === void 0 ? void 0 : Log.debug('subscribeBleOn error: ', error);
                 throw error;
             }
+            if (this.stopped)
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected);
+            if (reactNative.Platform.OS === 'android') {
+                try {
+                    const bondState = yield pairDevice(uuid);
+                    if (bondState.bonding) {
+                        yield onDeviceBondState(uuid);
+                    }
+                    else if (!bondState.bonded) {
+                        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceNotBonded, 'device is not bonded');
+                    }
+                }
+                catch (error) {
+                    yield this.runNativeTeardown(uuid, blePlxManager, () => __awaiter(this, void 0, void 0, function* () {
+                        yield this.runBestEffortNativeOperation('bond failure: cancel manager connection', () => blePlxManager.cancelDeviceConnection(uuid));
+                    }));
+                    throw error;
+                }
+            }
+            if (this.stopped)
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected);
             if (!device) {
                 const devices = yield blePlxManager.devices([uuid]);
                 [device] = devices;
@@ -1051,33 +1111,27 @@ class ReactNativeBleTransport {
                     }
                 }
             }
-            if (reactNative.Platform.OS === 'android') {
-                const connectedDevice = device;
-                try {
-                    if (!(yield connectedDevice.isConnected().catch(() => false))) {
-                        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, `Device ${uuid} is not connected before bonding`);
-                    }
-                    const bondState = yield pairDevice(uuid);
-                    if (bondState.bonding) {
-                        yield onDeviceBondState(uuid);
-                    }
-                    else if (!bondState.bonded) {
-                        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceNotBonded, 'device is not bonded');
-                    }
-                }
-                catch (error) {
-                    yield this.runNativeTeardown(uuid, blePlxManager, () => __awaiter(this, void 0, void 0, function* () {
-                        yield Promise.all([
-                            this.runBestEffortNativeOperation('bond failure: cancel manager connection', () => blePlxManager.cancelDeviceConnection(uuid)),
-                            this.runBestEffortNativeOperation('bond failure: cancel device connection', () => connectedDevice.cancelConnection()),
-                        ]);
-                    }));
-                    throw error;
-                }
+            if (this.stopped)
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected);
+            if (reactNative.Platform.OS === 'android' && !(yield device.isConnected().catch(() => false))) {
+                const disconnectedDevice = device;
+                yield this.runNativeTeardown(uuid, blePlxManager, () => __awaiter(this, void 0, void 0, function* () {
+                    yield Promise.all([
+                        this.runBestEffortNativeOperation('connect failure: cancel manager connection', () => blePlxManager.cancelDeviceConnection(uuid)),
+                        this.runBestEffortNativeOperation('connect failure: cancel device connection', () => disconnectedDevice.cancelConnection()),
+                    ]);
+                }));
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, 'device is not connected');
             }
+            if (this.stopped)
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected);
             device = yield resolveNegotiatedMtu(device);
+            if (this.stopped)
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected);
             const acquiredDevice = device;
             const { writeCharacteristic, notifyCharacteristic } = yield this.resolveCharacteristicsWithTimeout(uuid, acquiredDevice);
+            if (this.stopped)
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected);
             const protocolHint = expectedProtocol
                 ? undefined
                 : (_a = input.protocolHint) !== null && _a !== void 0 ? _a : this.deviceProtocolHints.get(uuid);
@@ -1120,6 +1174,8 @@ class ReactNativeBleTransport {
                 const protocolType = yield this.detectProtocol(uuid, expectedProtocol, protocolHint, () => __awaiter(this, void 0, void 0, function* () {
                     yield this.installTransportForAcquire(uuid, acquiredDevice);
                 }));
+                if (this.stopped)
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected);
                 const currentTransport = transportCache[uuid];
                 if (!currentTransport) {
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotFound);
@@ -1560,8 +1616,15 @@ class ReactNativeBleTransport {
         this.runPromise = null;
         this.runPromiseDeviceId = null;
         deviceIds.forEach(uuid => this.rejectProtocolV2Frames(uuid, error));
+        const manager = this.blePlxManager;
+        const pendingConnections = manager
+            ? Array.from(this.lifecycleOperations.keys(), uuid => this.runNativeTeardown(uuid, manager, () => __awaiter(this, void 0, void 0, function* () {
+                yield this.runBestEffortNativeOperation('stop: cancel pending device connection', () => manager.cancelDeviceConnection(uuid));
+            })))
+            : [];
         this.stopPromise = Promise.all([
             ...scans,
+            ...pendingConnections,
             ...Array.from(deviceIds, uuid => this.disconnect(uuid)),
         ]).then(() => __awaiter(this, void 0, void 0, function* () {
             yield this.protocolV2Links.invalidateAllLinks('React Native BLE transport stopped');
@@ -1716,6 +1779,8 @@ class ReactNativeBleTransport {
     }
     connectWithTimeout(uuid, connect) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.stopped)
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceDisconnected);
             const startedAt = Date.now();
             let succeeded = false;
             let timer;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-react-native",
-  "version": "1.2.2-alpha.106",
+  "version": "1.2.2-alpha.108",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
   "main": "dist/index.js",
@@ -20,11 +20,11 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-core": "1.2.2-alpha.106",
-    "@onekeyfe/hd-shared": "1.2.2-alpha.106",
-    "@onekeyfe/hd-transport": "1.2.2-alpha.106",
-    "@onekeyfe/react-native-ble-utils": "^0.1.6",
+    "@onekeyfe/hd-core": "1.2.2-alpha.108",
+    "@onekeyfe/hd-shared": "1.2.2-alpha.108",
+    "@onekeyfe/hd-transport": "1.2.2-alpha.108",
+    "@onekeyfe/react-native-ble-utils": "0.1.6",
     "react-native-ble-plx": "3.5.1"
   },
-  "gitHead": "e52ad091098aaab6b2845154457ace5e2f8c9098"
+  "gitHead": "962db9ecea348976a93de3c3039ac171ca0086d8"
 }

package/src/BleManager.ts CHANGED Viewed

@@ -7,6 +7,19 @@ import type { Peripheral } from '@onekeyfe/react-native-ble-utils';
 const Logger = bleLogger;
+// Android BluetoothDevice.EXTRA_UNBOND_REASON values.
+const bondFailureReasons: Record<number, string> = {
+  1: 'authentication_failed',
+  2: 'rejected',
+  3: 'canceled',
+  4: 'device_unreachable',
+  5: 'discovery_in_progress',
+  6: 'timeout',
+  7: 'repeated_attempts',
+  8: 'remote_canceled',
+  9: 'removed',
+};
 /**
  * get the device basic info of connected devices
  * @param serviceUuids
@@ -30,7 +43,12 @@ export const onDeviceBondState = (bleMacAddress: string): Promise<Peripheral | u
     const timeout = setTimeout(() => {
       cleanup();
-      reject(ERRORS.TypedError(HardwareErrorCode.BleDeviceNotBonded, 'device is not bonded'));
+      reject(
+        ERRORS.TypedError(HardwareErrorCode.BleDeviceNotBonded, 'Bluetooth pairing timed out', {
+          phase: 'bond',
+          reason: 'timeout',
+        })
+      );
     }, 60 * 1000);
     const cleanupListener = BleUtils.onDeviceBondState(peripheral => {
@@ -40,14 +58,50 @@ export const onDeviceBondState = (bleMacAddress: string): Promise<Peripheral | u
       const { bondState } = peripheral;
       const hasBonded = bondState.preState === 'BOND_BONDING' && bondState.state === 'BOND_BONDED';
-      const hasCanceled = bondState.preState === 'BOND_BONDING' && bondState.state === 'BOND_NONE';
+      const hasFailed = bondState.preState === 'BOND_BONDING' && bondState.state === 'BOND_NONE';
       Logger.debug('onDeviceBondState bondState:', bondState);
       if (hasBonded) {
         cleanup();
         resolve(peripheral);
-      } else if (hasCanceled) {
+      } else if (hasFailed) {
         cleanup();
-        reject(ERRORS.TypedError(HardwareErrorCode.BleDeviceBondedCanceled, 'bonding canceled'));
+        const nativeReason =
+          'reason' in bondState && typeof bondState.reason === 'number'
+            ? bondState.reason
+            : undefined;
+        const reason =
+          nativeReason === undefined ? 'unknown' : bondFailureReasons[nativeReason] ?? 'unknown';
+        const params = {
+          phase: 'bond',
+          reason,
+          ...(nativeReason === undefined ? {} : { nativeReason }),
+        };
+        if (reason === 'timeout') {
+          // Connection timeouts are retried by Core; pairing requires a new user attempt.
+          reject(
+            ERRORS.TypedError(
+              HardwareErrorCode.BleDeviceNotBonded,
+              'Bluetooth pairing timed out',
+              params
+            )
+          );
+        } else if (reason === 'canceled') {
+          reject(
+            ERRORS.TypedError(
+              HardwareErrorCode.BleDeviceBondedCanceled,
+              'Bluetooth pairing canceled',
+              params
+            )
+          );
+        } else {
+          reject(
+            ERRORS.TypedError(
+              HardwareErrorCode.BleDeviceNotBonded,
+              'Bluetooth pairing failed',
+              params
+            )
+          );
+        }
       }
     });
   });

package/src/__tests__/connectTimeout.test.ts CHANGED Viewed

@@ -1,7 +1,10 @@
 import { EventEmitter } from 'events';
+import { Platform } from 'react-native';
 import { BleErrorCode, BleManager } from 'react-native-ble-plx';
-import { HardwareErrorCode, createDeferred } from '@onekeyfe/hd-shared';
+import BleUtils from '@onekeyfe/react-native-ble-utils';
+import { ERRORS, HardwareErrorCode, createDeferred } from '@onekeyfe/hd-shared';
+import { onDeviceBondState } from '../BleManager';
 import ReactNativeBleTransport, {
   BLE_CONNECT_TIMEOUT_MANAGER_RESET_THRESHOLD,
   BLE_CONNECT_TIMEOUT_MS,
@@ -10,6 +13,8 @@ import ReactNativeBleTransport, {
 } from '../index';
 import protocolV1Schema from './protocolV1SchemaFixture';
+import type { Peripheral } from '@onekeyfe/react-native-ble-utils';
 jest.mock(
   'react-native',
   () => ({
@@ -44,12 +49,105 @@ jest.mock('@onekeyfe/react-native-ble-utils', () => ({
   default: {
     getConnectedPeripherals: jest.fn(() => Promise.resolve([])),
     getBondedPeripherals: jest.fn(() => Promise.resolve([])),
-    pairDevice: jest.fn(() => Promise.resolve()),
+    pairDevice: jest.fn(() => Promise.resolve({ bonded: true, bonding: false })),
+    onDeviceBondState: jest.fn(),
   },
 }));
 const UUID = 'stalled-connect-device';
+describe('Android bond failure reasons', () => {
+  let emitBondState: (peripheral: Peripheral) => void;
+  const cleanup = jest.fn();
+  beforeEach(() => {
+    jest.useFakeTimers({ doNotFake: ['performance'] });
+    cleanup.mockClear();
+    jest.spyOn(BleUtils, 'onDeviceBondState').mockImplementation(listener => {
+      emitBondState = listener;
+      return cleanup;
+    });
+  });
+  afterEach(() => {
+    jest.restoreAllMocks();
+    jest.useRealTimers();
+  });
+  test.each([
+    [6, 'timeout', HardwareErrorCode.BleDeviceNotBonded, 'Bluetooth pairing timed out'],
+    [3, 'canceled', HardwareErrorCode.BleDeviceBondedCanceled, 'Bluetooth pairing canceled'],
+    [1, 'authentication_failed', HardwareErrorCode.BleDeviceNotBonded, 'Bluetooth pairing failed'],
+    [2, 'rejected', HardwareErrorCode.BleDeviceNotBonded, 'Bluetooth pairing failed'],
+    [4, 'device_unreachable', HardwareErrorCode.BleDeviceNotBonded, 'Bluetooth pairing failed'],
+    [5, 'discovery_in_progress', HardwareErrorCode.BleDeviceNotBonded, 'Bluetooth pairing failed'],
+    [7, 'repeated_attempts', HardwareErrorCode.BleDeviceNotBonded, 'Bluetooth pairing failed'],
+    [8, 'remote_canceled', HardwareErrorCode.BleDeviceNotBonded, 'Bluetooth pairing failed'],
+    [9, 'removed', HardwareErrorCode.BleDeviceNotBonded, 'Bluetooth pairing failed'],
+    [undefined, 'unknown', HardwareErrorCode.BleDeviceNotBonded, 'Bluetooth pairing failed'],
+    [999, 'unknown', HardwareErrorCode.BleDeviceNotBonded, 'Bluetooth pairing failed'],
+  ] as const)(
+    'preserves Android reason %s as %s across serialization',
+    async (nativeReason, reason, code, message) => {
+      const result = onDeviceBondState(UUID).catch(error =>
+        JSON.parse(JSON.stringify(ERRORS.serializeError({ error })))
+      );
+      emitBondState({
+        id: UUID,
+        advertising: {},
+        bondState: {
+          preState: 'BOND_BONDING',
+          state: 'BOND_NONE',
+          ...(nativeReason === undefined ? {} : { reason: nativeReason }),
+        },
+      });
+      await expect(result).resolves.toEqual({
+        code,
+        error: message,
+        params: {
+          phase: 'bond',
+          reason,
+          ...(nativeReason === undefined ? {} : { nativeReason }),
+        },
+      });
+      expect(cleanup).toHaveBeenCalledTimes(1);
+      expect(jest.getTimerCount()).toBe(0);
+    }
+  );
+  test('reports a timeout if no bond event arrives within the SDK deadline', async () => {
+    const result = onDeviceBondState(UUID);
+    const rejection = expect(result).rejects.toMatchObject({
+      errorCode: HardwareErrorCode.BleDeviceNotBonded,
+      params: { phase: 'bond', reason: 'timeout' },
+    });
+    jest.advanceTimersByTime(60_000);
+    await rejection;
+    expect(cleanup).toHaveBeenCalledTimes(1);
+  });
+  test('ignores other devices and clears the deadline after bonding succeeds', async () => {
+    const result = onDeviceBondState(UUID);
+    const otherPeripheral = {
+      id: 'another-device',
+      advertising: {},
+      bondState: { preState: 'BOND_BONDING', state: 'BOND_NONE', reason: 6 },
+    };
+    emitBondState(otherPeripheral);
+    expect(cleanup).not.toHaveBeenCalled();
+    const peripheral: Peripheral = {
+      id: UUID.toUpperCase(),
+      advertising: {},
+      bondState: { preState: 'BOND_BONDING', state: 'BOND_BONDED' },
+    };
+    emitBondState(peripheral);
+    await expect(result).resolves.toBe(peripheral);
+    expect(cleanup).toHaveBeenCalledTimes(1);
+    expect(jest.getTimerCount()).toBe(0);
+  });
+});
 const flush = () =>
   new Promise(resolve => {
     setImmediate(resolve);
@@ -129,6 +227,7 @@ describe('BLE connect timeout', () => {
   afterEach(() => {
     jest.clearAllTimers();
     jest.restoreAllMocks();
+    Object.assign(Platform, { OS: 'ios' });
   });
   test('waits for singleton destruction before creating the next manager', async () => {
@@ -270,6 +369,78 @@ describe('BLE connect timeout', () => {
     expect(BLE_CONNECT_TIMEOUT_MS).toBeLessThanOrEqual(12000);
   });
+  test.each(
+    (['ios', 'android'] as const).flatMap(platform =>
+      (['connect', 'mtu', 'gatt'] as const).flatMap(stage =>
+        (['reject', 'resolve'] as const).map(completion => ({ platform, stage, completion }))
+      )
+    )
+  )(
+    'stop cancels $platform $stage before draining a late $completion',
+    async ({ platform, stage, completion }) => {
+      Object.assign(Platform, { OS: platform });
+      const { transport, device, bleManager, connect } = createHarness(
+        () => nativeOperation.promise
+      );
+      const nativeOperation = createDeferred<typeof device>();
+      const nativeDisconnect = createDeferred<void>();
+      const requestMtu = jest.fn(() => Promise.resolve(device));
+      Object.assign(device, { mtu: 247, requestMTU: requestMtu });
+      device.isConnected.mockResolvedValue(true);
+      if (stage === 'connect') device.isConnected.mockResolvedValueOnce(false);
+      if (stage === 'mtu') requestMtu.mockImplementationOnce(() => nativeOperation.promise);
+      if (stage === 'gatt') {
+        device.discoverAllServicesAndCharacteristics.mockImplementationOnce(() =>
+          nativeOperation.promise.then(() => undefined)
+        );
+      }
+      const destroy = jest.fn();
+      Object.assign(bleManager, { destroy });
+      const monitor = jest.spyOn(transport, '_monitorCharacteristic');
+      const acquire = transport.acquire({ uuid: UUID }).catch(error => error);
+      await flush();
+      await flush();
+      const pending = {
+        connect,
+        mtu: requestMtu,
+        gatt: device.discoverAllServicesAndCharacteristics,
+      }[stage];
+      expect(pending).toHaveBeenCalledTimes(1);
+      bleManager.cancelDeviceConnection.mockImplementation(() => nativeDisconnect.promise);
+      let stopped = false;
+      const stopping = transport.stop().then(() => {
+        stopped = true;
+      });
+      try {
+        await flush();
+        expect(bleManager.cancelDeviceConnection).toHaveBeenCalledWith(UUID);
+        expect(stopped).toBe(false);
+      } finally {
+        // Native completion can race cancellation; neither outcome may restart setup.
+        if (completion === 'resolve') nativeOperation.resolve(device);
+        else
+          nativeOperation.reject(
+            Object.assign(new Error('Operation was cancelled'), {
+              errorCode: BleErrorCode.OperationCancelled,
+            })
+          );
+        nativeDisconnect.resolve();
+        await advanceUntil(() => stopped, BLE_CONNECT_TIMEOUT_MS + BLE_GATT_SETUP_TIMEOUT_MS);
+        await stopping;
+      }
+      await expect(acquire).resolves.toBeInstanceOf(Error);
+      expect(connect).toHaveBeenCalledTimes(stage === 'connect' ? 1 : 0);
+      expect(monitor).not.toHaveBeenCalled();
+      if (stage === 'mtu')
+        expect(device.discoverAllServicesAndCharacteristics).not.toHaveBeenCalled();
+      expect(bleManager.cancelDeviceConnection.mock.calls).toEqual(
+        Array.from({ length: bleManager.cancelDeviceConnection.mock.calls.length }, () => [UUID])
+      );
+      expect(destroy).not.toHaveBeenCalled();
+    }
+  );
   test('a stalled connect is abandoned natively so the next attempt is not cancelled by it', async () => {
     const { transport, bleManager } = createHarness(
       () =>

package/src/__tests__/protocolV2Link.test.ts CHANGED Viewed

@@ -360,32 +360,46 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
     expect(new ReactNativeBleTransport({}).scanTimeout).toBe(3000);
   });
-  test('connects the Android GATT link before starting system bonding', async () => {
-    setPlatformOS('android');
-    const { transport, uuid, device } = createHarness();
-    const operationOrder: string[] = [];
-    const pairDeviceMock = jest.requireMock('../BleManager').pairDevice as jest.Mock;
+  test.each(['V1', 'V2'] as const)(
+    'waits for Android bonding before connecting the %s GATT link',
+    async protocol => {
+      setPlatformOS('android');
+      const { transport, uuid, device } = protocol === 'V1' ? createV1Harness() : createHarness();
+      const operationOrder: string[] = [];
+      const pairDeviceMock = jest.requireMock('../BleManager').pairDevice as jest.Mock;
+      const bondStateMock = jest.requireMock('../BleManager').onDeviceBondState as jest.Mock;
+      const bonding = createDeferred<void>();
-    device.isConnected.mockResolvedValueOnce(false);
-    device.connect = jest.fn(() => {
-      operationOrder.push('connect');
-      return Promise.resolve(device);
-    });
-    pairDeviceMock.mockImplementationOnce(() => {
-      operationOrder.push('bond');
-      return Promise.resolve({ bonded: true, bonding: false });
-    });
+      device.isConnected.mockResolvedValueOnce(false);
+      device.connect = jest.fn(() => {
+        operationOrder.push('connect');
+        return Promise.resolve(device);
+      });
+      pairDeviceMock.mockImplementationOnce(() => {
+        operationOrder.push('bond');
+        return Promise.resolve({ bonded: false, bonding: true });
+      });
+      bondStateMock.mockImplementationOnce(() => bonding.promise);
-    await expect(transport.acquire({ uuid, expectedProtocol: 'V2' })).resolves.toEqual({
-      uuid,
-      protocolType: 'V2',
-    });
+      const acquiring = transport.acquire({ uuid, expectedProtocol: protocol });
+      await new Promise(resolve => {
+        setImmediate(resolve);
+      });
+      expect(operationOrder).toEqual(['bond']);
+      expect(device.connect).not.toHaveBeenCalled();
-    expect(operationOrder).toEqual(['connect', 'bond']);
-    await transport.release(uuid, true);
-  });
+      bonding.resolve();
+      await expect(acquiring).resolves.toEqual({
+        uuid,
+        protocolType: protocol,
+      });
-  test('does not start Android bonding when both reconnect attempts fail', async () => {
+      expect(operationOrder).toEqual(['bond', 'connect']);
+      await transport.release(uuid, true);
+    }
+  );
+  test('preserves Android connect errors after bonding when both reconnect attempts fail', async () => {
     setPlatformOS('android');
     const { transport, uuid, device } = createHarness();
     const BleErrorMock = jest.requireMock('react-native-ble-plx').BleError as new (
@@ -412,22 +426,35 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
       errorCode: HardwareErrorCode.BleConnectedError,
     });
     expect(device.connect).toHaveBeenCalledTimes(2);
-    expect(pairDeviceMock).not.toHaveBeenCalled();
+    expect(pairDeviceMock).toHaveBeenCalledTimes(1);
   });
-  test('checks that the Android GATT link is connected before bonding', async () => {
+  test('does not connect Android GATT when the system cannot start bonding', async () => {
     setPlatformOS('android');
     const { transport, uuid, device, bleManager } = createHarness();
     const pairDeviceMock = jest.requireMock('../BleManager').pairDevice as jest.Mock;
-    device.isConnected.mockResolvedValueOnce(false).mockResolvedValueOnce(false);
     device.connect = jest.fn().mockResolvedValue(device);
     pairDeviceMock.mockClear();
+    pairDeviceMock.mockResolvedValueOnce({ bonded: false, bonding: false });
+    await expect(transport.acquire({ uuid, expectedProtocol: 'V2' })).rejects.toMatchObject({
+      errorCode: HardwareErrorCode.BleDeviceNotBonded,
+    });
+    expect(device.connect).not.toHaveBeenCalled();
+    expect(bleManager.devices).not.toHaveBeenCalled();
+    expect(bleManager.cancelDeviceConnection).toHaveBeenCalledWith(uuid);
+  });
+  test('checks that Android GATT is connected after bonding and reconnecting', async () => {
+    setPlatformOS('android');
+    const { transport, uuid, device, bleManager } = createHarness();
+    device.isConnected.mockResolvedValueOnce(false).mockResolvedValueOnce(false);
+    device.connect = jest.fn().mockResolvedValue(device);
     await expect(transport.acquire({ uuid, expectedProtocol: 'V2' })).rejects.toMatchObject({
       errorCode: HardwareErrorCode.BleConnectedError,
     });
-    expect(pairDeviceMock).not.toHaveBeenCalled();
     expect(bleManager.cancelDeviceConnection).toHaveBeenCalledWith(uuid);
     expect(device.cancelConnection).toHaveBeenCalledTimes(1);
   });
@@ -468,12 +495,12 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
         .mockRejectedValue(Object.assign(new BleErrorMock(nativeError.reason), nativeError));
       await expect(transport.acquire({ uuid })).rejects.toMatchObject({ errorCode });
-      expect(pairDeviceMock).not.toHaveBeenCalled();
+      expect(pairDeviceMock).toHaveBeenCalledTimes(platform === 'android' ? 1 : 0);
       expect(transport.getProtocolType(uuid)).toBeUndefined();
     }
   );
-  test('closes the Android GATT link when system bonding fails', async () => {
+  test('cleans up Android bonding failures without starting GATT', async () => {
     setPlatformOS('android');
     const { transport, uuid, device, bleManager } = createHarness();
     const pairDeviceMock = jest.requireMock('../BleManager').pairDevice as jest.Mock;
@@ -485,7 +512,32 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
     );
     expect(bleManager.cancelDeviceConnection).toHaveBeenCalledWith(uuid);
-    expect(device.cancelConnection).toHaveBeenCalledTimes(1);
+    expect(bleManager.devices).not.toHaveBeenCalled();
+    expect(device.isConnected).not.toHaveBeenCalled();
+  });
+  test('does not connect after stop while Android bonding is pending', async () => {
+    setPlatformOS('android');
+    const { transport, uuid, bleManager } = createHarness();
+    const pairDeviceMock = jest.requireMock('../BleManager').pairDevice as jest.Mock;
+    const bondStateMock = jest.requireMock('../BleManager').onDeviceBondState as jest.Mock;
+    const bonding = createDeferred<void>();
+    pairDeviceMock.mockResolvedValueOnce({ bonded: false, bonding: true });
+    bondStateMock.mockImplementationOnce(() => bonding.promise);
+    const acquiring = transport.acquire({ uuid, expectedProtocol: 'V2' });
+    const rejection = expect(acquiring).rejects.toMatchObject({
+      errorCode: HardwareErrorCode.BleDeviceDisconnected,
+    });
+    await new Promise(resolve => {
+      setImmediate(resolve);
+    });
+    const stopping = transport.stop();
+    bonding.resolve();
+    await rejection;
+    await stopping;
+    expect(bleManager.devices).not.toHaveBeenCalled();
   });
   test('uses withResponse for consecutive iOS Protocol V1 control commands without releasing', async () => {

package/src/index.ts CHANGED Viewed

@@ -885,6 +885,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;
@@ -913,6 +914,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;
@@ -926,12 +928,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;
@@ -940,6 +944,7 @@ export default class ReactNativeBleTransport {
       }
     }
+    if (this.stopped) throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
     Log?.debug('[ReactNativeBleTransport] BLE MTU ready', {
       platform: Platform.OS,
       requested: getRequestedBleMtu(),
@@ -1018,6 +1023,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 };
         }
@@ -1049,6 +1055,27 @@ export default class ReactNativeBleTransport {
       throw error;
     }
+    if (this.stopped) throw ERRORS.TypedError(HardwareErrorCode.BleDeviceDisconnected);
+    if (Platform.OS === 'android') {
+      // Initiate bonding locally before GATT can trigger peripheral-initiated pairing.
+      try {
+        const bondState = await pairDevice(uuid);
+        if (bondState.bonding) {
+          await onDeviceBondState(uuid);
+        } 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]);
       [device] = devices;
@@ -1135,42 +1162,28 @@ export default class ReactNativeBleTransport {
       }
     }
-    if (Platform.OS === 'android') {
-      // Establish the LE link before createBond(). Without an existing LE ACL,
-      // Android TRANSPORT_AUTO can choose BR/EDR for a BLE-only device.
-      const connectedDevice = device;
-      try {
-        if (!(await connectedDevice.isConnected().catch(() => false))) {
-          throw ERRORS.TypedError(
-            HardwareErrorCode.BleConnectedError,
-            `Device ${uuid} is not connected before bonding`
-          );
-        }
-        const bondState = await pairDevice(uuid);
-        if (bondState.bonding) {
-          await onDeviceBondState(uuid);
-        } else if (!bondState.bonded) {
-          throw ERRORS.TypedError(HardwareErrorCode.BleDeviceNotBonded, 'device is not bonded');
-        }
-      } catch (error) {
-        await this.runNativeTeardown(uuid, blePlxManager, async () => {
-          await Promise.all([
-            this.runBestEffortNativeOperation('bond failure: cancel manager connection', () =>
-              blePlxManager.cancelDeviceConnection(uuid)
-            ),
-            this.runBestEffortNativeOperation('bond failure: cancel device connection', () =>
-              connectedDevice.cancelConnection()
-            ),
-          ]);
-        });
-        throw error;
-      }
+    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
@@ -1232,6 +1245,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);
@@ -1789,9 +1803,22 @@ export default class ReactNativeBleTransport {
     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');
@@ -1969,6 +1996,7 @@ export default class ReactNativeBleTransport {
   /** 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;