@onekeyfe/hd-transport-react-native 1.2.0-alpha.63 → 1.2.0-alpha.65

package/dist/index.d.ts

@@ -64,7 +64,22 @@ declare function getProtocolV2BleTuning(): {
  * inside the native budget, so this only fires when the native timeout did not.
  */
 declare const BLE_CONNECT_TIMEOUT_MS: number;
-/** Consecutive connect timeouts on one device before the BLE manager itself is recreated. */
+/**
+ * Service discovery and characteristic resolution run after connect() succeeds, but
+ * CoreBluetooth schedules them on the same serial queue. If that queue is wedged by a
+ * device reboot, these calls can remain pending forever unless they have their own
+ * budget.
+ */
+declare const BLE_GATT_SETUP_TIMEOUT_MS = 10000;
+/**
+ * How many times a known device may fail its own protocol before we probe the others
+ * again. Reconnect polling during a device reboot repeats this every few seconds, and
+ * probing Protocol V2 costs a 10s Ping timeout, so paying it on every attempt for a
+ * device we just spoke V1 to dominates the wait. A firmware update can legitimately
+ * change a device's protocol, so the shortcut has to expire rather than stick.
+ */
+declare const PROTOCOL_REPROBE_FALLBACK_ATTEMPTS = 3;
+/** BLE setup timeouts since the last successful setup before the manager is recreated. */
 declare const BLE_CONNECT_TIMEOUT_MANAGER_RESET_THRESHOLD = 2;
 type IOneKeyDevice = OneKeyDeviceInfoBase & Device;
 declare class ReactNativeBleTransport {
@@ -91,9 +106,13 @@ declare class ReactNativeBleTransport {
     private probingProtocols;
     /** Consecutive write timeouts per device; reset by any write that completes. */
     private writeTimeoutCounts;
-    /** Consecutive connect timeouts per device; reset by any connect that settles. */
-    private connectTimeoutCounts;
+    /** BLE setup timeouts per device since the last complete characteristic resolution. */
+    private connectionSetupTimeoutCounts;
     private deviceProtocolHints;
+    /** Protocol this device actually answered on, kept across reconnects of one session. */
+    private sessionProtocols;
+    /** Consecutive detections that failed while trusting sessionProtocols. */
+    private protocolReprobeFailures;
     private protocolV2Assemblers;
     private protocolV2FrameQueues;
     private protocolV2FramePromises;
@@ -133,13 +152,14 @@ declare class ReactNativeBleTransport {
     cancel(): void;
     /** Run a native connect under the JS backstop budget. */
     private connectWithTimeout;
+    /** Resolve the complete GATT shape under a budget so acquire() always settles. */
+    private resolveCharacteristicsWithTimeout;
     /**
-     * Give up on a connect the native layer never settled. The abandoned attempt still
-     * holds a native "connecting" entry that would cancel the NEXT attempt out from under
-     * itself, so it is cleared here — fire and forget, because that call talks to the very
-     * queue that just stopped responding.
+     * Give up on a BLE setup operation the native layer did not settle. The abandoned
+     * operation still owns native connection/GATT state that can poison the next attempt,
+     * so it is cleared here without awaiting the same queue that stopped responding.
      */
-    private abandonStalledConnect;
+    private abandonStalledConnection;
     private getCachedTransport;
     /**
      * Write one packet under a bounded budget. A write that never settles means the
@@ -178,4 +198,4 @@ declare class ReactNativeBleTransport {
     getProtocolType(path: string): ProtocolType | undefined;
 }
 
-export { BLE_CONNECT_TIMEOUT_MANAGER_RESET_THRESHOLD, BLE_CONNECT_TIMEOUT_MS, BLE_WRITE_PACKET_TIMEOUT_MS, BLE_WRITE_TIMEOUT_MANAGER_RESET_THRESHOLD, IOneKeyDevice, ProtocolV2BleTuning, configureProtocolV2BleTuning, ReactNativeBleTransport as default, getFirmwareUploadWriteRetryType, getProtocolV2BleTuning, resetProtocolV2BleTuning };
+export { BLE_CONNECT_TIMEOUT_MANAGER_RESET_THRESHOLD, BLE_CONNECT_TIMEOUT_MS, BLE_GATT_SETUP_TIMEOUT_MS, BLE_WRITE_PACKET_TIMEOUT_MS, BLE_WRITE_TIMEOUT_MANAGER_RESET_THRESHOLD, IOneKeyDevice, PROTOCOL_REPROBE_FALLBACK_ATTEMPTS, ProtocolV2BleTuning, configureProtocolV2BleTuning, ReactNativeBleTransport as default, getFirmwareUploadWriteRetryType, getProtocolV2BleTuning, resetProtocolV2BleTuning };

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -295,11 +295,14 @@ const fallbackConnectOptions = {
     timeout: BLE_NATIVE_CONNECT_TIMEOUT_MS,
 };
 const BLE_CONNECT_TIMEOUT_MS = BLE_NATIVE_CONNECT_TIMEOUT_MS * 2 + 2000;
+const BLE_GATT_SETUP_TIMEOUT_MS = 10000;
+const PROTOCOL_REPROBE_FALLBACK_ATTEMPTS = 3;
 const BLE_CONNECT_TIMEOUT_MANAGER_RESET_THRESHOLD = 2;
 const CONNECT_TIMEOUT_MESSAGE = 'BLE connect timeout after';
 const isConnectTimeoutError = (error) => (error === null || error === void 0 ? void 0 : error.errorCode) === hdShared.HardwareErrorCode.BleConnectedError &&
     typeof (error === null || error === void 0 ? void 0 : error.message) === 'string' &&
     error.message.startsWith(CONNECT_TIMEOUT_MESSAGE);
+const isNativeOperationTimeoutError = (error) => (error === null || error === void 0 ? void 0 : error.errorCode) === reactNativeBlePlx.BleErrorCode.OperationTimedOut;
 const tryToGetConfiguration = (device) => {
     if (!device || !device.serviceUUIDs)
         return null;
@@ -359,8 +362,10 @@ class ReactNativeBleTransport {
         this.deviceProtocol = new Map();
         this.probingProtocols = new Map();
         this.writeTimeoutCounts = new Map();
-        this.connectTimeoutCounts = new Map();
+        this.connectionSetupTimeoutCounts = new Map();
         this.deviceProtocolHints = new Map();
+        this.sessionProtocols = new Map();
+        this.protocolReprobeFailures = new Map();
         this.protocolV2Assemblers = new Map();
         this.protocolV2FrameQueues = new Map();
         this.protocolV2FramePromises = new Map();
@@ -564,7 +569,7 @@ class ReactNativeBleTransport {
                         }
                     }
                 }
-                const { writeCharacteristic, notifyCharacteristic } = yield this.resolveCharacteristics(device);
+                const { writeCharacteristic, notifyCharacteristic } = yield this.resolveCharacteristicsWithTimeout(uuid, device);
                 transport.device = device;
                 transport.writeCharacteristic = writeCharacteristic;
                 transport.notifyCharacteristic = notifyCharacteristic;
@@ -693,7 +698,7 @@ 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.resolveCharacteristics(device));
+            const { writeCharacteristic, notifyCharacteristic } = characteristics !== null && characteristics !== void 0 ? characteristics : (yield this.resolveCharacteristicsWithTimeout(uuid, device));
             const transport$1 = new BleTransport(device, writeCharacteristic, notifyCharacteristic);
             if (reactNative.Platform.OS === 'android') {
                 transport$1.mtuSize = typeof device.mtu === 'number' ? device.mtu : transport$1.mtuSize;
@@ -833,7 +838,7 @@ class ReactNativeBleTransport {
             }
             device = yield requestAndroidMtu(device);
             const acquiredDevice = device;
-            const { writeCharacteristic, notifyCharacteristic } = yield this.resolveCharacteristics(acquiredDevice);
+            const { writeCharacteristic, notifyCharacteristic } = yield this.resolveCharacteristicsWithTimeout(uuid, acquiredDevice);
             const protocolHint = expectedProtocol
                 ? undefined
                 : (_b = (_a = input.protocolHint) !== null && _a !== void 0 ? _a : this.deviceProtocolHints.get(uuid)) !== null && _b !== void 0 ? _b : inferProtocolHintFromDeviceName(getDeviceDisplayName(acquiredDevice));
@@ -1304,6 +1309,8 @@ class ReactNativeBleTransport {
             this.deviceProtocol.delete(session);
             this.probingProtocols.delete(session);
             this.deviceProtocolHints.delete(session);
+            this.sessionProtocols.delete(session);
+            this.protocolReprobeFailures.delete(session);
             this.protocolV2Assemblers.delete(session);
             this.resetProtocolV2Frames(session);
             try {
@@ -1340,12 +1347,11 @@ class ReactNativeBleTransport {
                         }, BLE_CONNECT_TIMEOUT_MS);
                     }),
                 ]);
-                this.connectTimeoutCounts.delete(uuid);
                 return result;
             }
             catch (error) {
-                if (timedOut) {
-                    this.abandonStalledConnect(uuid);
+                if (timedOut || isNativeOperationTimeoutError(error)) {
+                    this.abandonStalledConnection(uuid, timedOut ? 'connect-backstop' : 'connect-native');
                 }
                 throw error;
             }
@@ -1355,12 +1361,44 @@ class ReactNativeBleTransport {
             }
         });
     }
-    abandonStalledConnect(uuid) {
+    resolveCharacteristicsWithTimeout(uuid, device) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let timer;
+            let timedOut = false;
+            const pending = this.resolveCharacteristics(device);
+            pending.catch(() => undefined);
+            try {
+                const result = yield Promise.race([
+                    pending,
+                    new Promise((_, reject) => {
+                        timer = setTimeout(() => {
+                            timedOut = true;
+                            reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleConnectedError, `BLE GATT setup timeout after ${BLE_GATT_SETUP_TIMEOUT_MS}ms for ${uuid}`));
+                        }, BLE_GATT_SETUP_TIMEOUT_MS);
+                    }),
+                ]);
+                this.connectionSetupTimeoutCounts.delete(uuid);
+                return result;
+            }
+            catch (error) {
+                if (timedOut || isNativeOperationTimeoutError(error)) {
+                    this.abandonStalledConnection(uuid, timedOut ? 'gatt-backstop' : 'gatt-native');
+                }
+                throw error;
+            }
+            finally {
+                if (timer)
+                    clearTimeout(timer);
+            }
+        });
+    }
+    abandonStalledConnection(uuid, stage) {
         var _a, _b;
-        const timeouts = ((_a = this.connectTimeoutCounts.get(uuid)) !== null && _a !== void 0 ? _a : 0) + 1;
-        this.connectTimeoutCounts.set(uuid, timeouts);
-        Log === null || Log === void 0 ? void 0 : Log.error('[ReactNativeBleTransport] BLE connect timed out:', uuid, {
-            consecutiveConnectTimeouts: timeouts,
+        const timeouts = ((_a = this.connectionSetupTimeoutCounts.get(uuid)) !== null && _a !== void 0 ? _a : 0) + 1;
+        this.connectionSetupTimeoutCounts.set(uuid, timeouts);
+        Log === null || Log === void 0 ? void 0 : Log.error('[ReactNativeBleTransport] BLE setup timed out:', uuid, {
+            stage,
+            setupTimeoutsSinceSuccess: timeouts,
         });
         (_b = this.blePlxManager) === null || _b === void 0 ? void 0 : _b.cancelDeviceConnection(uuid).catch(() => {
         });
@@ -1373,9 +1411,9 @@ class ReactNativeBleTransport {
         this.protocolV2Assemblers.delete(uuid);
         this.resetProtocolV2Frames(uuid);
         if (timeouts >= BLE_CONNECT_TIMEOUT_MANAGER_RESET_THRESHOLD) {
-            Log === null || Log === void 0 ? void 0 : Log.error('[ReactNativeBleTransport] BLE connects wedged repeatedly, resetting BLE manager');
+            Log === null || Log === void 0 ? void 0 : Log.error('[ReactNativeBleTransport] BLE setup wedged repeatedly, resetting BLE manager');
             this.resetPlxManager();
-            this.connectTimeoutCounts.delete(uuid);
+            this.connectionSetupTimeoutCounts.delete(uuid);
         }
     }
     getCachedTransport(uuid) {
@@ -1450,6 +1488,8 @@ class ReactNativeBleTransport {
         });
         this.deviceProtocol.clear();
         this.probingProtocols.clear();
+        this.sessionProtocols.clear();
+        this.protocolReprobeFailures.clear();
         this.monitorTokens.clear();
         this.protocolV2Assemblers.clear();
         try {
@@ -1478,10 +1518,12 @@ class ReactNativeBleTransport {
         return (_a = this.deviceProtocol.get(uuid)) !== null && _a !== void 0 ? _a : this.probingProtocols.get(uuid);
     }
     detectProtocol(uuid, expectedProtocol, protocolHint, rebuildTransport) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (expectedProtocol === 'V1') {
                 if (yield this.probeProtocolV1(uuid)) {
                     this.deviceProtocol.set(uuid, 'V1');
+                    this.sessionProtocols.set(uuid, 'V1');
                     Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] protocol detected', {
                         deviceId: uuid,
                         protocol: 'V1',
@@ -1494,6 +1536,7 @@ class ReactNativeBleTransport {
             if (expectedProtocol === 'V2') {
                 if (yield this.probeProtocolV2(uuid)) {
                     this.deviceProtocol.set(uuid, 'V2');
+                    this.sessionProtocols.set(uuid, 'V2');
                     Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] protocol detected', {
                         deviceId: uuid,
                         protocol: 'V2',
@@ -1503,7 +1546,13 @@ class ReactNativeBleTransport {
                 }
                 throw this.createProtocolMismatchError(expectedProtocol);
             }
-            const probeOrder = protocolHint === 'V2' || this.deviceProtocol.get(uuid) === 'V2' ? ['V2', 'V1'] : ['V1', 'V2'];
+            const sessionProtocol = this.sessionProtocols.get(uuid);
+            const reprobeFailures = (_a = this.protocolReprobeFailures.get(uuid)) !== null && _a !== void 0 ? _a : 0;
+            const fullProbeOrder = protocolHint === 'V2' || this.deviceProtocol.get(uuid) === 'V2' ? ['V2', 'V1'] : ['V1', 'V2'];
+            const trustSessionProtocol = sessionProtocol !== undefined &&
+                !protocolHint &&
+                reprobeFailures < PROTOCOL_REPROBE_FALLBACK_ATTEMPTS;
+            const probeOrder = trustSessionProtocol ? [sessionProtocol] : fullProbeOrder;
             for (let i = 0; i < probeOrder.length; i += 1) {
                 const protocol = probeOrder[i];
                 if (i > 0) {
@@ -1518,6 +1567,8 @@ class ReactNativeBleTransport {
                 const detected = protocol === 'V1' ? yield this.probeProtocolV1(uuid) : yield this.probeProtocolV2(uuid);
                 if (detected) {
                     this.deviceProtocol.set(uuid, protocol);
+                    this.sessionProtocols.set(uuid, protocol);
+                    this.protocolReprobeFailures.delete(uuid);
                     Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] protocol detected', {
                         deviceId: uuid,
                         protocol,
@@ -1526,6 +1577,12 @@ class ReactNativeBleTransport {
                     return protocol;
                 }
             }
+            if (trustSessionProtocol) {
+                this.protocolReprobeFailures.set(uuid, reprobeFailures + 1);
+            }
+            else {
+                this.protocolReprobeFailures.delete(uuid);
+            }
             this.deviceProtocol.delete(uuid);
             this.probingProtocols.delete(uuid);
             throw this.createProtocolDetectionError();
@@ -1823,8 +1880,10 @@ class ReactNativeBleTransport {
 
 exports.BLE_CONNECT_TIMEOUT_MANAGER_RESET_THRESHOLD = BLE_CONNECT_TIMEOUT_MANAGER_RESET_THRESHOLD;
 exports.BLE_CONNECT_TIMEOUT_MS = BLE_CONNECT_TIMEOUT_MS;
+exports.BLE_GATT_SETUP_TIMEOUT_MS = BLE_GATT_SETUP_TIMEOUT_MS;
 exports.BLE_WRITE_PACKET_TIMEOUT_MS = BLE_WRITE_PACKET_TIMEOUT_MS;
 exports.BLE_WRITE_TIMEOUT_MANAGER_RESET_THRESHOLD = BLE_WRITE_TIMEOUT_MANAGER_RESET_THRESHOLD;
+exports.PROTOCOL_REPROBE_FALLBACK_ATTEMPTS = PROTOCOL_REPROBE_FALLBACK_ATTEMPTS;
 exports.configureProtocolV2BleTuning = configureProtocolV2BleTuning;
 exports["default"] = ReactNativeBleTransport;
 exports.getFirmwareUploadWriteRetryType = getFirmwareUploadWriteRetryType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-react-native",
-  "version": "1.2.0-alpha.63",
+  "version": "1.2.0-alpha.65",
   "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.0-alpha.63",
-    "@onekeyfe/hd-shared": "1.2.0-alpha.63",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.63",
+    "@onekeyfe/hd-core": "1.2.0-alpha.65",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.65",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.65",
     "@onekeyfe/react-native-ble-utils": "^0.1.6",
     "react-native-ble-plx": "3.5.1"
   },
-  "gitHead": "c5f9c9e47a1198a4ff1022ffafeeb6ca7af83fa0"
+  "gitHead": "2850b5b34935d4e97a1fe8a6459eb5a96a5cf0f6"
 }

package/src/__tests__/connectTimeout.test.ts

@@ -1,10 +1,12 @@
 import { EventEmitter } from 'events';
+import { BleErrorCode } from 'react-native-ble-plx';
 
 import { HardwareErrorCode } from '@onekeyfe/hd-shared';
 
 import ReactNativeBleTransport, {
   BLE_CONNECT_TIMEOUT_MS,
   BLE_CONNECT_TIMEOUT_MANAGER_RESET_THRESHOLD,
+  BLE_GATT_SETUP_TIMEOUT_MS,
 } from '../index';
 
 import messages from '@onekeyfe/hd-transport/messages.json';
@@ -31,6 +33,7 @@ jest.mock('react-native-ble-plx', () => ({
     OperationStartFailed: 601,
     DeviceMTUChangeFailed: 401,
     OperationCancelled: 2,
+    OperationTimedOut: 3,
     DeviceAlreadyConnected: 203,
   },
   BleManager: jest.fn(),
@@ -66,6 +69,14 @@ async function advanceUntil(settled: () => boolean, totalMs: number, stepMs = 25
 /** A device whose native connect() never settles — the observed iOS failure mode. */
 function createHarness(connectImpl: () => Promise<unknown>) {
   const connect = jest.fn(connectImpl);
+  const writeCharacteristic = {
+    uuid: '00000002-0000-1000-8000-00805f9b34fb',
+    isWritableWithResponse: true,
+  };
+  const notifyCharacteristic = {
+    uuid: '00000003-0000-1000-8000-00805f9b34fb',
+    isNotifiable: true,
+  };
   const device = {
     id: UUID,
     name: 'OneKey Classic',
@@ -74,6 +85,11 @@ function createHarness(connectImpl: () => Promise<unknown>) {
     isConnected: jest.fn(() => Promise.resolve(false)),
     cancelConnection: jest.fn(() => Promise.resolve()),
     connect,
+    discoverAllServicesAndCharacteristics: jest.fn(() => Promise.resolve()),
+    characteristicsForService: jest.fn(() =>
+      Promise.resolve([writeCharacteristic, notifyCharacteristic])
+    ),
+    services: jest.fn(() => Promise.resolve([])),
     onDisconnected: jest.fn(() => ({ remove: jest.fn() })),
   };
   const transport = new ReactNativeBleTransport({ scanTimeout: 1 });
@@ -189,4 +205,78 @@ describe('BLE connect timeout', () => {
     expect(destroy).toHaveBeenCalledTimes(1);
     expect((transport as unknown as { blePlxManager?: unknown }).blePlxManager).toBeUndefined();
   });
+
+  test('native connect timeouts contribute to the same manager reset budget', async () => {
+    const { transport, bleManager } = createHarness(() => Promise.resolve());
+    const destroy = jest.fn();
+    (bleManager as unknown as { destroy: jest.Mock }).destroy = destroy;
+    const nativeTimeout = Object.assign(new Error('Operation timed out'), {
+      errorCode: BleErrorCode.OperationTimedOut,
+    });
+
+    for (let attempt = 0; attempt < BLE_CONNECT_TIMEOUT_MANAGER_RESET_THRESHOLD; attempt += 1) {
+      // eslint-disable-next-line no-await-in-loop
+      await expect(
+        (transport as any).connectWithTimeout(UUID, () => Promise.reject(nativeTimeout))
+      ).rejects.toBe(nativeTimeout);
+    }
+
+    expect(destroy).toHaveBeenCalledTimes(1);
+  });
+
+  test('GATT discovery is bounded and abandons the native connection', async () => {
+    const { transport, device, bleManager } = createHarness(() => Promise.resolve());
+    device.discoverAllServicesAndCharacteristics.mockImplementation(
+      () =>
+        new Promise(() => {
+          // never settles
+        })
+    );
+
+    const errors: Array<{ errorCode?: unknown }> = [];
+    let settled = false;
+    (transport as any).resolveCharacteristicsWithTimeout(UUID, device).catch((error: unknown) => {
+      errors.push(error as { errorCode?: unknown });
+      settled = true;
+    });
+    await flush();
+    await advanceUntil(() => settled, BLE_GATT_SETUP_TIMEOUT_MS + 5000);
+
+    expect(errors).toHaveLength(1);
+    expect(errors[0]?.errorCode).toBe(HardwareErrorCode.BleConnectedError);
+    expect(bleManager.cancelDeviceConnection).toHaveBeenCalledWith(UUID);
+  });
+
+  test('a successful GATT retry clears the timeout budget before an abandoned call settles', async () => {
+    const { transport, device, bleManager } = createHarness(() => Promise.resolve());
+    let resolveAbandonedDiscovery: (() => void) | undefined;
+    device.discoverAllServicesAndCharacteristics
+      .mockImplementationOnce(
+        () =>
+          new Promise<void>(resolve => {
+            resolveAbandonedDiscovery = resolve;
+          })
+      )
+      .mockResolvedValueOnce(undefined);
+
+    let firstSettled = false;
+    (transport as any).resolveCharacteristicsWithTimeout(UUID, device).catch(() => {
+      firstSettled = true;
+    });
+    await flush();
+    await advanceUntil(() => firstSettled, BLE_GATT_SETUP_TIMEOUT_MS + 5000);
+
+    await expect(
+      (transport as any).resolveCharacteristicsWithTimeout(UUID, device)
+    ).resolves.toMatchObject({
+      writeCharacteristic: expect.any(Object),
+      notifyCharacteristic: expect.any(Object),
+    });
+
+    resolveAbandonedDiscovery?.();
+    await flush();
+
+    expect(bleManager.cancelDeviceConnection).toHaveBeenCalledTimes(1);
+    expect((transport as any).connectionSetupTimeoutCounts.has(UUID)).toBe(false);
+  });
 });

package/src/__tests__/protocolReprobe.test.ts

@@ -0,0 +1,133 @@
+import ReactNativeBleTransport, { PROTOCOL_REPROBE_FALLBACK_ATTEMPTS } from '../index';
+
+import messages from '@onekeyfe/hd-transport/messages.json';
+
+jest.mock(
+  'react-native',
+  () => ({
+    Platform: { OS: 'ios', select: (spec: Record<string, unknown>) => spec.ios },
+    PermissionsAndroid: {
+      PERMISSIONS: {},
+      RESULTS: {},
+      request: jest.fn(),
+      requestMultiple: jest.fn(),
+    },
+  }),
+  { virtual: true }
+);
+
+jest.mock('react-native-ble-plx', () => ({
+  BleATTErrorCode: { InvalidHandle: 1, UnlikelyError: 14 },
+  BleError: Error,
+  BleErrorCode: { DeviceDisconnected: 201, OperationStartFailed: 601 },
+  BleManager: jest.fn(),
+  ScanMode: { LowLatency: 2 },
+}));
+
+jest.mock('@onekeyfe/react-native-ble-utils', () => ({
+  __esModule: true,
+  default: {
+    getConnectedPeripherals: jest.fn(() => Promise.resolve([])),
+    getBondedPeripherals: jest.fn(() => Promise.resolve([])),
+    pairDevice: jest.fn(() => Promise.resolve()),
+  },
+}));
+
+const UUID = 'reprobe-device';
+
+/** Drive detectProtocol with stubbed probes so we can observe which are attempted. */
+function createHarness({ v1, v2 }: { v1: boolean; v2: boolean }) {
+  const transport = new ReactNativeBleTransport({});
+  transport.configure(messages);
+  const probeV1 = jest.fn(() => {
+    if (v1) {
+      (transport as any).deviceProtocol.set(UUID, 'V1');
+    }
+    return Promise.resolve(v1);
+  });
+  const probeV2 = jest.fn(() => {
+    if (v2) {
+      (transport as any).deviceProtocol.set(UUID, 'V2');
+    }
+    return Promise.resolve(v2);
+  });
+  (transport as any).probeProtocolV1 = probeV1;
+  (transport as any).probeProtocolV2 = probeV2;
+  (transport as any).resetProbeStateAfterProtocolProbe = jest.fn(() => Promise.resolve());
+  return { transport, probeV1, probeV2 };
+}
+
+const detect = (transport: ReactNativeBleTransport) =>
+  (transport as any).detectProtocol(UUID, undefined, undefined, () =>
+    Promise.resolve()
+  ) as Promise<string>;
+
+describe('protocol re-probe after a known device goes away', () => {
+  test('an unknown device still probes both protocols', async () => {
+    const { transport, probeV1, probeV2 } = createHarness({ v1: false, v2: false });
+
+    await expect(detect(transport)).rejects.toBeDefined();
+
+    expect(probeV1).toHaveBeenCalledTimes(1);
+    expect(probeV2).toHaveBeenCalledTimes(1);
+  });
+
+  test('a device already known to speak V1 does not pay the V2 probe while it is away', async () => {
+    const known = createHarness({ v1: true, v2: false });
+    // First detection confirms V1 (this is the session that just talked to the device).
+    await expect(detect(known.transport)).resolves.toBe('V1');
+
+    // The device now reboots after a firmware install: V1 stops answering.
+    (known.transport as any).deviceProtocol.delete(UUID);
+    const probeV1 = jest.fn(() => Promise.resolve(false));
+    const probeV2 = jest.fn(() => Promise.resolve(false));
+    (known.transport as any).probeProtocolV1 = probeV1;
+    (known.transport as any).probeProtocolV2 = probeV2;
+
+    await expect(detect(known.transport)).rejects.toBeDefined();
+
+    expect(probeV1).toHaveBeenCalledTimes(1);
+    // The 10s Protocol V2 ping is pure waste for a device we just spoke V1 to.
+    expect(probeV2).not.toHaveBeenCalled();
+  });
+
+  test('after repeated failures it re-probes every protocol again', async () => {
+    const known = createHarness({ v1: true, v2: false });
+    await expect(detect(known.transport)).resolves.toBe('V1');
+
+    (known.transport as any).deviceProtocol.delete(UUID);
+    const probeV1 = jest.fn(() => Promise.resolve(false));
+    const probeV2 = jest.fn(() => Promise.resolve(false));
+    (known.transport as any).probeProtocolV1 = probeV1;
+    (known.transport as any).probeProtocolV2 = probeV2;
+
+    for (let attempt = 0; attempt < PROTOCOL_REPROBE_FALLBACK_ATTEMPTS; attempt += 1) {
+      // eslint-disable-next-line no-await-in-loop
+      await expect(detect(known.transport)).rejects.toBeDefined();
+    }
+    expect(probeV2).not.toHaveBeenCalled();
+
+    // The device may genuinely have changed protocol, so the shortcut must expire.
+    await expect(detect(known.transport)).rejects.toBeDefined();
+    expect(probeV2).toHaveBeenCalled();
+  });
+
+  test('a successful detection clears the failure streak', async () => {
+    const known = createHarness({ v1: true, v2: false });
+    await expect(detect(known.transport)).resolves.toBe('V1');
+    (known.transport as any).deviceProtocol.delete(UUID);
+
+    const failingV1 = jest.fn(() => Promise.resolve(false));
+    (known.transport as any).probeProtocolV1 = failingV1;
+    await expect(detect(known.transport)).rejects.toBeDefined();
+
+    // Device comes back.
+    (known.transport as any).probeProtocolV1 = jest.fn(() => {
+      (known.transport as any).deviceProtocol.set(UUID, 'V1');
+      return Promise.resolve(true);
+    });
+    await expect(detect(known.transport)).resolves.toBe('V1');
+
+    expect((known.transport as any).protocolReprobeFailures.get(UUID)).toBeUndefined();
+  });
+});

package/src/index.ts

@@ -199,13 +199,30 @@ const fallbackConnectOptions: Record<string, unknown> = {
  * inside the native budget, so this only fires when the native timeout did not.
  */
 export const BLE_CONNECT_TIMEOUT_MS = BLE_NATIVE_CONNECT_TIMEOUT_MS * 2 + 2000;
-/** Consecutive connect timeouts on one device before the BLE manager itself is recreated. */
+/**
+ * Service discovery and characteristic resolution run after connect() succeeds, but
+ * CoreBluetooth schedules them on the same serial queue. If that queue is wedged by a
+ * device reboot, these calls can remain pending forever unless they have their own
+ * budget.
+ */
+export const BLE_GATT_SETUP_TIMEOUT_MS = 10_000;
+/**
+ * How many times a known device may fail its own protocol before we probe the others
+ * again. Reconnect polling during a device reboot repeats this every few seconds, and
+ * probing Protocol V2 costs a 10s Ping timeout, so paying it on every attempt for a
+ * device we just spoke V1 to dominates the wait. A firmware update can legitimately
+ * change a device's protocol, so the shortcut has to expire rather than stick.
+ */
+export const PROTOCOL_REPROBE_FALLBACK_ATTEMPTS = 3;
+/** BLE setup timeouts since the last successful setup before the manager is recreated. */
 export const BLE_CONNECT_TIMEOUT_MANAGER_RESET_THRESHOLD = 2;
 const CONNECT_TIMEOUT_MESSAGE = 'BLE connect timeout after';
 const isConnectTimeoutError = (error: unknown): boolean =>
   (error as { errorCode?: unknown })?.errorCode === HardwareErrorCode.BleConnectedError &&
   typeof (error as { message?: unknown })?.message === 'string' &&
   (error as { message: string }).message.startsWith(CONNECT_TIMEOUT_MESSAGE);
+const isNativeOperationTimeoutError = (error: unknown): boolean =>
+  (error as { errorCode?: unknown })?.errorCode === BleErrorCode.OperationTimedOut;
 
 export type IOneKeyDevice = OneKeyDeviceInfoBase & Device;
 
@@ -306,11 +323,17 @@ export default class ReactNativeBleTransport {
   /** Consecutive write timeouts per device; reset by any write that completes. */
   private writeTimeoutCounts: Map<string, number> = new Map();
 
-  /** Consecutive connect timeouts per device; reset by any connect that settles. */
-  private connectTimeoutCounts: Map<string, number> = new Map();
+  /** BLE setup timeouts per device since the last complete characteristic resolution. */
+  private connectionSetupTimeoutCounts: Map<string, number> = new Map();
 
   private deviceProtocolHints: Map<string, ProtocolType> = new Map();
 
+  /** Protocol this device actually answered on, kept across reconnects of one session. */
+  private sessionProtocols: Map<string, ProtocolType> = new Map();
+
+  /** Consecutive detections that failed while trusting sessionProtocols. */
+  private protocolReprobeFailures: Map<string, number> = new Map();
+
   private protocolV2Assemblers: Map<string, ProtocolV2FrameAssembler> = new Map();
 
   private protocolV2FrameQueues: Map<string, Uint8Array[]> = new Map();
@@ -541,9 +564,8 @@ export default class ReactNativeBleTransport {
         }
       }
 
-      const { writeCharacteristic, notifyCharacteristic } = await this.resolveCharacteristics(
-        device
-      );
+      const { writeCharacteristic, notifyCharacteristic } =
+        await this.resolveCharacteristicsWithTimeout(uuid, device);
 
       transport.device = device;
       transport.writeCharacteristic = writeCharacteristic;
@@ -708,7 +730,7 @@ export default class ReactNativeBleTransport {
     characteristics?: ResolvedBleCharacteristics
   ) {
     const { writeCharacteristic, notifyCharacteristic } =
-      characteristics ?? (await this.resolveCharacteristics(device));
+      characteristics ?? (await this.resolveCharacteristicsWithTimeout(uuid, device));
     const transport = new BleTransport(device, writeCharacteristic, notifyCharacteristic);
     if (Platform.OS === 'android') {
       transport.mtuSize = typeof device.mtu === 'number' ? device.mtu : transport.mtuSize;
@@ -883,9 +905,8 @@ export default class ReactNativeBleTransport {
 
     device = await requestAndroidMtu(device);
     const acquiredDevice = device;
-    const { writeCharacteristic, notifyCharacteristic } = await this.resolveCharacteristics(
-      acquiredDevice
-    );
+    const { writeCharacteristic, notifyCharacteristic } =
+      await this.resolveCharacteristicsWithTimeout(uuid, acquiredDevice);
 
     const protocolHint = expectedProtocol
       ? undefined
@@ -1482,6 +1503,8 @@ export default class ReactNativeBleTransport {
     this.deviceProtocol.delete(session);
     this.probingProtocols.delete(session);
     this.deviceProtocolHints.delete(session);
+    this.sessionProtocols.delete(session);
+    this.protocolReprobeFailures.delete(session);
     this.protocolV2Assemblers.delete(session);
     this.resetProtocolV2Frames(session);
 
@@ -1530,11 +1553,46 @@ export default class ReactNativeBleTransport {
           }, BLE_CONNECT_TIMEOUT_MS);
         }),
       ]);
-      this.connectTimeoutCounts.delete(uuid);
       return result;
     } catch (error) {
-      if (timedOut) {
-        this.abandonStalledConnect(uuid);
+      if (timedOut || isNativeOperationTimeoutError(error)) {
+        this.abandonStalledConnection(uuid, timedOut ? 'connect-backstop' : 'connect-native');
+      }
+      throw error;
+    } finally {
+      if (timer) clearTimeout(timer);
+    }
+  }
+
+  /** Resolve the complete GATT shape under a budget so acquire() always settles. */
+  private async resolveCharacteristicsWithTimeout(
+    uuid: string,
+    device: Device
+  ): Promise<ResolvedBleCharacteristics> {
+    let timer: ReturnType<typeof setTimeout> | undefined;
+    let timedOut = false;
+    const pending = this.resolveCharacteristics(device);
+    pending.catch(() => undefined);
+    try {
+      const result = await Promise.race([
+        pending,
+        new Promise<never>((_, reject) => {
+          timer = setTimeout(() => {
+            timedOut = true;
+            reject(
+              ERRORS.TypedError(
+                HardwareErrorCode.BleConnectedError,
+                `BLE GATT setup timeout after ${BLE_GATT_SETUP_TIMEOUT_MS}ms for ${uuid}`
+              )
+            );
+          }, BLE_GATT_SETUP_TIMEOUT_MS);
+        }),
+      ]);
+      this.connectionSetupTimeoutCounts.delete(uuid);
+      return result;
+    } catch (error) {
+      if (timedOut || isNativeOperationTimeoutError(error)) {
+        this.abandonStalledConnection(uuid, timedOut ? 'gatt-backstop' : 'gatt-native');
       }
       throw error;
     } finally {
@@ -1543,16 +1601,19 @@ export default class ReactNativeBleTransport {
   }
 
   /**
-   * Give up on a connect the native layer never settled. The abandoned attempt still
-   * holds a native "connecting" entry that would cancel the NEXT attempt out from under
-   * itself, so it is cleared here — fire and forget, because that call talks to the very
-   * queue that just stopped responding.
+   * Give up on a BLE setup operation the native layer did not settle. The abandoned
+   * operation still owns native connection/GATT state that can poison the next attempt,
+   * so it is cleared here without awaiting the same queue that stopped responding.
    */
-  private abandonStalledConnect(uuid: string) {
-    const timeouts = (this.connectTimeoutCounts.get(uuid) ?? 0) + 1;
-    this.connectTimeoutCounts.set(uuid, timeouts);
-    Log?.error('[ReactNativeBleTransport] BLE connect timed out:', uuid, {
-      consecutiveConnectTimeouts: timeouts,
+  private abandonStalledConnection(
+    uuid: string,
+    stage: 'connect-backstop' | 'connect-native' | 'gatt-backstop' | 'gatt-native'
+  ) {
+    const timeouts = (this.connectionSetupTimeoutCounts.get(uuid) ?? 0) + 1;
+    this.connectionSetupTimeoutCounts.set(uuid, timeouts);
+    Log?.error('[ReactNativeBleTransport] BLE setup timed out:', uuid, {
+      stage,
+      setupTimeoutsSinceSuccess: timeouts,
     });
 
     this.blePlxManager?.cancelDeviceConnection(uuid).catch(() => {
@@ -1570,9 +1631,9 @@ export default class ReactNativeBleTransport {
     if (timeouts >= BLE_CONNECT_TIMEOUT_MANAGER_RESET_THRESHOLD) {
       // BleManager.destroy() force-rejects every promise the native queue abandoned —
       // the only JS-reachable way to settle them — and drops all cached peripherals.
-      Log?.error('[ReactNativeBleTransport] BLE connects wedged repeatedly, resetting BLE manager');
+      Log?.error('[ReactNativeBleTransport] BLE setup wedged repeatedly, resetting BLE manager');
       this.resetPlxManager();
-      this.connectTimeoutCounts.delete(uuid);
+      this.connectionSetupTimeoutCounts.delete(uuid);
     }
   }
 
@@ -1674,6 +1735,8 @@ export default class ReactNativeBleTransport {
     });
     this.deviceProtocol.clear();
     this.probingProtocols.clear();
+    this.sessionProtocols.clear();
+    this.protocolReprobeFailures.clear();
     this.monitorTokens.clear();
     this.protocolV2Assemblers.clear();
     try {
@@ -1720,6 +1783,7 @@ export default class ReactNativeBleTransport {
     if (expectedProtocol === 'V1') {
       if (await this.probeProtocolV1(uuid)) {
         this.deviceProtocol.set(uuid, 'V1');
+        this.sessionProtocols.set(uuid, 'V1');
         Log?.debug('[ReactNativeBleTransport] protocol detected', {
           deviceId: uuid,
           protocol: 'V1',
@@ -1733,6 +1797,7 @@ export default class ReactNativeBleTransport {
     if (expectedProtocol === 'V2') {
       if (await this.probeProtocolV2(uuid)) {
         this.deviceProtocol.set(uuid, 'V2');
+        this.sessionProtocols.set(uuid, 'V2');
         Log?.debug('[ReactNativeBleTransport] protocol detected', {
           deviceId: uuid,
           protocol: 'V2',
@@ -1745,8 +1810,18 @@ export default class ReactNativeBleTransport {
 
     // Protocol must be actively probed after connection. Name, PID, and descriptors only
     // influence probe order; a V2 hint probes V2 first and falls back to V1.
-    const probeOrder: ProtocolType[] =
+    const sessionProtocol = this.sessionProtocols.get(uuid);
+    const reprobeFailures = this.protocolReprobeFailures.get(uuid) ?? 0;
+    const fullProbeOrder: ProtocolType[] =
       protocolHint === 'V2' || this.deviceProtocol.get(uuid) === 'V2' ? ['V2', 'V1'] : ['V1', 'V2'];
+    // A device that already answered on a protocol in this session keeps answering on
+    // it; while it is rebooting nothing answers at all, so probing the other protocol
+    // only adds its timeout to every poll.
+    const trustSessionProtocol =
+      sessionProtocol !== undefined &&
+      !protocolHint &&
+      reprobeFailures < PROTOCOL_REPROBE_FALLBACK_ATTEMPTS;
+    const probeOrder: ProtocolType[] = trustSessionProtocol ? [sessionProtocol] : fullProbeOrder;
 
     for (let i = 0; i < probeOrder.length; i += 1) {
       const protocol = probeOrder[i];
@@ -1764,6 +1839,8 @@ export default class ReactNativeBleTransport {
         protocol === 'V1' ? await this.probeProtocolV1(uuid) : await this.probeProtocolV2(uuid);
       if (detected) {
         this.deviceProtocol.set(uuid, protocol);
+        this.sessionProtocols.set(uuid, protocol);
+        this.protocolReprobeFailures.delete(uuid);
         Log?.debug('[ReactNativeBleTransport] protocol detected', {
           deviceId: uuid,
           protocol,
@@ -1773,6 +1850,14 @@ export default class ReactNativeBleTransport {
       }
     }
 
+    if (trustSessionProtocol) {
+      // Still silent on its own protocol: count it, and let the streak expire the
+      // shortcut so a device that genuinely switched protocols is found again.
+      this.protocolReprobeFailures.set(uuid, reprobeFailures + 1);
+    } else {
+      this.protocolReprobeFailures.delete(uuid);
+    }
+
     this.deviceProtocol.delete(uuid);
     this.probingProtocols.delete(uuid);
     throw this.createProtocolDetectionError();