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

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":";AAEA,OAAO,EAGL,UAAU,IAAI,aAAa,EAG5B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,SAAS,EAAE,EAChB,KAAK,oBAAoB,EAIzB,KAAK,YAAY,EAKjB,KAAK,oBAAoB,EAI1B,MAAM,wBAAwB,CAAC;AAgChC,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAI1C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACjF,OAAO,KAAK,YAAY,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAEjE,KAAK,8BAA8B,GAAG,eAAe,GAAG;IAMtD,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAkBF,KAAK,4BAA4B,GAAG,WAAW,CAAC;AAChD,KAAK,0BAA0B,GAAG;IAChC,mBAAmB,EAAE,cAAc,CAAC;IACpC,oBAAoB,EAAE,cAAc,CAAC;CACtC,CAAC;AAkCF,eAAO,MAAM,+BAA+B,UACnC,OAAO,KACb,4BAA4B,GAAG,IAsBjC,CAAC;AAcF,eAAO,MAAM,2BAA2B,QAAS,CAAC;AAClD,eAAO,MAAM,8BAA8B,OAAQ,CAAC;AAwBpD,eAAO,MAAM,yCAAyC,IAAI,CAAC;AAI3D,MAAM,MAAM,mBAAmB,GAAG;IAChC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAiBF,wBAAgB,4BAA4B,CAAC,MAAM,GAAE,mBAAwB,QAY5E;AAED,wBAAgB,wBAAwB,SAGvC;AAED,wBAAgB,sBAAsB;;;EAErC;AAkCD,eAAO,MAAM,sBAAsB,QAA2C,CAAC;AAO/E,eAAO,MAAM,yBAAyB,QAAS,CAAC;AAQhD,eAAO,MAAM,kCAAkC,IAAI,CAAC;AAEpD,eAAO,MAAM,2CAA2C,IAAI,CAAC;AAE7D,eAAO,MAAM,wBAAwB,gCAAgC,CAAC;AActE,MAAM,MAAM,aAAa,GAAG,oBAAoB,GAAG,MAAM,CAAC;AAgE1D,MAAM,CAAC,OAAO,OAAO,uBAAuB;IAC1C,aAAa,EAAE,aAAa,GAAG,SAAS,CAAC;IAEzC,SAAS,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAEnE,WAAW,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;IAErE,OAAO,CAAC,6BAA6B,CAAqB;IAE1D,IAAI,SAA6B;IAEjC,UAAU,UAAS;IAEnB,OAAO,UAAS;IAEhB,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAyB;IAE7D,WAAW,SAA0B;IAErC,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAQ;IAExC,OAAO,CAAC,kBAAkB,CAAuB;IAEjD,OAAO,CAAC,EAAE,YAAY,CAAC;IAEvB,8BAA8B,cAAqB;IAGnD,OAAO,CAAC,cAAc,CAAwC;IAQ9D,OAAO,CAAC,gBAAgB,CAAwC;IAGhE,OAAO,CAAC,kBAAkB,CAAkC;IAG5D,OAAO,CAAC,4BAA4B,CAAkC;IAEtE,OAAO,CAAC,mBAAmB,CAAwC;IAGnE,OAAO,CAAC,gBAAgB,CAAwC;IAGhE,OAAO,CAAC,mBAAmB,CAAqB;IAGhD,OAAO,CAAC,uBAAuB,CAAkC;IAOjE,OAAO,CAAC,eAAe,CAAiC;IAGxD,OAAO,CAAC,mBAAmB,CAAqB;IAEhD,OAAO,CAAC,oBAAoB,CAAoD;IAEhF,OAAO,CAAC,qBAAqB,CAAwC;IAErE,OAAO,CAAC,uBAAuB,CAAgD;IAE/E,OAAO,CAAC,eAAe,CA2BpB;IAEH,OAAO,CAAC,aAAa,CAAkC;IAEvD,OAAO,CAAC,qBAAqB,CAAkC;IAE/D,OAAO,CAAC,iCAAiC,CAAuC;IAEhF,OAAO,CAAC,0BAA0B,CAA0B;IAE5D,OAAO,CAAC,0BAA0B,CAAyD;IAE3F,OAAO,CAAC,gBAAgB,CAAK;IAG7B,OAAO,CAAC,mBAAmB,CAAyC;IAEpE,OAAO,CAAC,WAAW,CAAC,CAAgB;IAEpC,OAAO,CAAC,YAAY,CAAkC;gBAE1C,OAAO,EAAE,gBAAgB;IAIrC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY;IAKvC,SAAS,CAAC,UAAU,EAAE,GAAG;IAMzB,mBAAmB,CAAC,UAAU,EAAE,GAAG;IAgBnC,MAAM;IAIA,aAAa,IAAI,OAAO,CAAC,aAAa,CAAC;YAS/B,mBAAmB;IAqB3B,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,0BAA0B,CAAC;IAmFjF,4BAA4B,CAAC,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAgClF,OAAO,CAAC,oBAAoB;IAgBtB,gCAAgC,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY;IAsDtE,SAAS;YA0JD,0BAA0B;IA8ElC,OAAO,CAAC,KAAK,EAAE,8BAA8B;;;;YAUrC,eAAe;IAwS7B,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;IA8CE,UAAU,CAAC,OAAO,EAAE,MAAM;YAIlB,kBAAkB;YAmFlB,iBAAiB;IAkC/B,OAAO,CAAC,4BAA4B;YAQtB,qBAAqB;IAoB7B,MAAM;YAiBE,kBAAkB;YAkDlB,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;YAmFd,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"}

package/dist/index.js

@@ -529,11 +529,20 @@ class ReactNativeBleTransport {
             },
             classifyError: () => 'link-fatal',
             onLinkInvalidated: (uuid, reason) => __awaiter(this, void 0, void 0, function* () {
-                var _b;
+                var _b, _c;
                 (_b = this.protocolV2Assemblers.get(uuid)) === null || _b === void 0 ? void 0 : _b.reset();
                 this.rejectProtocolV2Frames(uuid, new Error(reason));
                 Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] Protocol V2 link invalidated:', uuid, reason);
                 if (reason.startsWith('Protocol V2 link-fatal error:')) {
+                    if (this.probingProtocols.get(uuid) !== 'V2') {
+                        const transport = transportCache[uuid];
+                        try {
+                            this.emitDeviceDisconnect(uuid, (_c = transport === null || transport === void 0 ? void 0 : transport.device) === null || _c === void 0 ? void 0 : _c.name, transport === null || transport === void 0 ? void 0 : transport.monitorToken);
+                        }
+                        catch (_d) {
+                            Log === null || Log === void 0 ? void 0 : Log.error('[ReactNativeBleTransport] Protocol V2 disconnect listener failed');
+                        }
+                    }
                     yield this.releaseNative(uuid, true);
                 }
             }),
@@ -1195,12 +1204,7 @@ class ReactNativeBleTransport {
                 return { uuid, protocolType };
             }
             catch (error) {
-                if (hdShared.isBleStaleBondHardwareError(error) || shouldRethrowProtocolProbeError(error)) {
-                    yield this.disconnectUnlocked(uuid);
-                }
-                else {
-                    yield this.releaseUnlocked(uuid, true);
-                }
+                yield this.disconnectUnlocked(uuid);
                 throw error;
             }
             finally {
@@ -2378,6 +2382,7 @@ class ReactNativeBleTransport {
             if (!this._messages || !this._messagesV2) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
             }
+            const isProtocolProbe = this.probingProtocols.get(uuid) === 'V2';
             const callOptions = options;
             const highThroughputWrite = transport.isProtocolV2HighThroughputCall(name);
             if (highThroughputWrite) {
@@ -2418,6 +2423,14 @@ class ReactNativeBleTransport {
             }
             catch (e) {
                 Log === null || Log === void 0 ? void 0 : Log.error('[ReactNativeBleTransport] Protocol V2 call error:', e);
+                if (!isProtocolProbe &&
+                    (e === null || e === void 0 ? void 0 : e.errorCode) === hdShared.HardwareErrorCode.BleTimeoutError &&
+                    !this.monitorTokens.has(uuid)) {
+                    yield this.runLifecycleOperation(uuid, () => __awaiter(this, void 0, void 0, function* () {
+                        if (!this.monitorTokens.has(uuid))
+                            yield this.disconnectUnlocked(uuid);
+                    }));
+                }
                 throw e;
             }
             finally {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-react-native",
-  "version": "1.2.2-alpha.110",
+  "version": "1.2.2-alpha.111",
   "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.110",
-    "@onekeyfe/hd-shared": "1.2.2-alpha.110",
-    "@onekeyfe/hd-transport": "1.2.2-alpha.110",
+    "@onekeyfe/hd-core": "1.2.2-alpha.111",
+    "@onekeyfe/hd-shared": "1.2.2-alpha.111",
+    "@onekeyfe/hd-transport": "1.2.2-alpha.111",
     "@onekeyfe/react-native-ble-utils": "0.1.6",
     "react-native-ble-plx": "3.5.1"
   },
-  "gitHead": "80a959fb1e9383ce948b911fddece1265b40051f"
+  "gitHead": "a87be5a4ae4b59f91f853a9873a9e8e924bbdfd6"
 }

package/src/__tests__/protocolV2Link.test.ts

@@ -714,7 +714,72 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
   });
 
   test.each(['ios', 'android'] as const)(
-    'keeps a first expected Protocol V2 probe miss retryable on %s',
+    'waits for native disconnect after failed protocol detection before reconnecting on %s',
+    async platform => {
+      setPlatformOS(platform);
+      const { transport, uuid, device, bleManager } = createHarness();
+      const probes = transport as unknown as {
+        probeProtocolV1(uuid: string): Promise<boolean>;
+        probeProtocolV2(uuid: string): Promise<boolean>;
+        releaseNative(uuid: string, onclose: boolean): Promise<void>;
+      };
+      jest.spyOn(probes, 'probeProtocolV1').mockResolvedValueOnce(false);
+      const probesFinished = createDeferred<void>();
+      const probeProtocolV2 = jest
+        .spyOn(probes, 'probeProtocolV2')
+        .mockImplementationOnce(async () => {
+          // A link-fatal V2 timeout removes the cached transport before acquire fails.
+          await probes.releaseNative(uuid, true);
+          probesFinished.resolve();
+          return false;
+        });
+      let connected = true;
+      device.isConnected.mockImplementation(() => Promise.resolve(connected));
+      device.connect = jest.fn(() => {
+        connected = true;
+        return Promise.resolve(device);
+      });
+      const disconnectGate = createDeferred<void>();
+      bleManager.cancelDeviceConnection.mockImplementation(async () => {
+        await disconnectGate.promise;
+        connected = false;
+      });
+
+      const acquiring = transport.acquire({ uuid });
+      const failure = expect(acquiring).rejects.toMatchObject({
+        errorCode: HardwareErrorCode.BleTimeoutError,
+      });
+      const reconnecting = transport.acquire({ uuid, expectedProtocol: 'V2' });
+
+      try {
+        await probesFinished.promise;
+        await new Promise(resolve => {
+          setImmediate(resolve);
+        });
+        expect(bleManager.cancelDeviceConnection).toHaveBeenCalledWith(uuid);
+        expect(device.connect).not.toHaveBeenCalled();
+        expect(probeProtocolV2).toHaveBeenCalledTimes(1);
+
+        disconnectGate.resolve();
+        await failure;
+        await expect(reconnecting).resolves.toEqual({ uuid, protocolType: 'V2' });
+        expect(device.connect).toHaveBeenCalledTimes(1);
+        await expect(
+          transport.call(uuid, 'Ping', { message: 'after-reconnect' })
+        ).resolves.toMatchObject({
+          type: 'Success',
+          message: { message: 'ok' },
+        });
+      } finally {
+        disconnectGate.resolve();
+        await Promise.allSettled([failure, reconnecting]);
+        await transport.release(uuid, true);
+      }
+    }
+  );
+
+  test.each(['ios', 'android'] as const)(
+    'disconnects after a first expected Protocol V2 probe miss while keeping it retryable on %s',
     async platform => {
       setPlatformOS(platform);
       const { transport, uuid, device } = createHarness();
@@ -724,13 +789,13 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
         errorCode: HardwareErrorCode.RuntimeError,
       });
 
-      expect(device.cancelConnection).not.toHaveBeenCalled();
+      expect(device.cancelConnection).toHaveBeenCalledTimes(1);
       expect(transport.getProtocolType(uuid)).toBeUndefined();
     }
   );
 
   test.each(['ios', 'android'] as const)(
-    'keeps a second expected Protocol V2 probe miss retryable on %s',
+    'disconnects after each expected Protocol V2 probe miss while keeping it retryable on %s',
     async platform => {
       setPlatformOS(platform);
       const { transport, uuid, device } = createHarness();
@@ -743,7 +808,7 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
         errorCode: HardwareErrorCode.RuntimeError,
       });
 
-      expect(device.cancelConnection).not.toHaveBeenCalled();
+      expect(device.cancelConnection).toHaveBeenCalledTimes(2);
       expect(transport.getProtocolType(uuid)).toBeUndefined();
     }
   );
@@ -778,7 +843,7 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
   );
 
   test.each(['ios', 'android'] as const)(
-    'keeps a confirmed Protocol V2 probe miss retryable on %s without native bond evidence',
+    'disconnects after a confirmed Protocol V2 probe miss on %s without reporting a bond error',
     async platform => {
       setPlatformOS(platform);
       const { transport, uuid, device } = createHarness();
@@ -790,7 +855,7 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
         errorCode: HardwareErrorCode.RuntimeError,
       });
 
-      expect(device.cancelConnection).not.toHaveBeenCalled();
+      expect(device.cancelConnection).toHaveBeenCalledTimes(1);
       expect(transport.getProtocolType(uuid)).toBeUndefined();
     }
   );
@@ -974,7 +1039,7 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
   test.each(['V1', 'V2'] as const)(
     'still falls back after a silent %s probe timeout',
     async protocol => {
-      const { transport, uuid } = createHarness();
+      const { transport, uuid, device, bleManager } = createHarness();
       jest
         .spyOn(transport as any, protocol === 'V1' ? 'callProtocolV1' : 'callProtocolV2')
         .mockRejectedValue(ERRORS.TypedError(HardwareErrorCode.BleTimeoutError));
@@ -988,6 +1053,8 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
       });
 
       expect(otherProbe).toHaveBeenCalledTimes(1);
+      expect(bleManager.cancelDeviceConnection).not.toHaveBeenCalled();
+      expect(device.cancelConnection).not.toHaveBeenCalled();
       await transport.release(uuid, true);
     }
   );
@@ -1173,6 +1240,7 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
     expect(notifySubscriptionRemovers[0]).toHaveBeenCalledTimes(1);
     expect(notifySubscriptionRemovers[1]).toHaveBeenCalledTimes(1);
     expect(bleManager.cancelTransaction).toHaveBeenCalled();
+    expect(device.cancelConnection).toHaveBeenCalledTimes(1);
     expect(transport.getProtocolType(uuid)).toBeUndefined();
   });
 
@@ -1227,6 +1295,115 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
     });
   });
 
+  test.each(['ios', 'android'] as const)(
+    'disconnects after an active V2 timeout and reconnects even if a listener fails on %s',
+    async platform => {
+      setPlatformOS(platform);
+      const harness = createHarness();
+      const { transport, uuid, device, bleManager, sentSeqs, emitter } = harness;
+      const disconnected = jest.fn(() => {
+        throw new Error('Disconnect listener failed');
+      });
+      emitter.on(TRANSPORT_EVENT.DEVICE_DISCONNECT, disconnected);
+      let connected = true;
+      device.isConnected.mockImplementation(() => Promise.resolve(connected));
+      device.connect = jest.fn(() => {
+        connected = true;
+        return Promise.resolve(device);
+      });
+      bleManager.cancelDeviceConnection.mockImplementation(() => {
+        connected = false;
+        return Promise.resolve();
+      });
+
+      await transport.acquire({ uuid, expectedProtocol: 'V2' });
+      harness.setShouldRespond(false);
+      await expect(transport.call(uuid, 'Ping', {}, { timeoutMs: 10 })).rejects.toMatchObject({
+        errorCode: HardwareErrorCode.BleTimeoutError,
+      });
+
+      expect(bleManager.cancelDeviceConnection).toHaveBeenCalledWith(uuid);
+      expect(connected).toBe(false);
+      expect(transport.getProtocolType(uuid)).toBeUndefined();
+      expect(disconnected).toHaveBeenCalledTimes(1);
+      expect(disconnected).toHaveBeenCalledWith({
+        id: uuid,
+        connectId: uuid,
+        name: device.name,
+      });
+
+      harness.setShouldRespond(true);
+      await transport.acquire({ uuid, expectedProtocol: 'V2' });
+      await expect(transport.call(uuid, 'Ping', {})).resolves.toMatchObject({ type: 'Success' });
+      expect(device.connect).toHaveBeenCalledTimes(1);
+      expect(sentSeqs).toEqual([1, 2, 3, 4]);
+      await transport.release(uuid, true);
+    }
+  );
+
+  test('does not disconnect an active Protocol V2 call when a queued call times out', async () => {
+    const harness = createHarness();
+    const { transport, uuid, bleManager } = harness;
+    await transport.acquire({ uuid, expectedProtocol: 'V2' });
+    harness.setShouldRespond(false);
+    const active = transport.call(uuid, 'Ping', {}, { timeoutMs: 1000 }).catch(error => error);
+    await new Promise(resolve => {
+      setImmediate(resolve);
+    });
+
+    try {
+      await expect(transport.call(uuid, 'Ping', {}, { timeoutMs: 10 })).rejects.toMatchObject({
+        errorCode: HardwareErrorCode.BleTimeoutError,
+      });
+      expect(bleManager.cancelDeviceConnection).not.toHaveBeenCalled();
+      expect(transport.getProtocolType(uuid)).toBe('V2');
+    } finally {
+      await transport.disconnect(uuid);
+      await active;
+    }
+  });
+
+  test('does not disconnect a newer acquire when V2 timeout cleanup waits for the lifecycle lock', async () => {
+    const harness = createHarness();
+    const { transport, uuid, bleManager } = harness;
+    await transport.acquire({ uuid, expectedProtocol: 'V2' });
+    const lifecycle = transport as unknown as {
+      runLifecycleOperation(id: string, operation: () => Promise<void>): Promise<void>;
+      releaseNative(id: string, onclose: boolean): Promise<boolean>;
+    };
+    const gate = createDeferred<void>();
+    const holding = lifecycle.runLifecycleOperation(uuid, () => gate.promise);
+    const reacquiring = transport.acquire({ uuid, expectedProtocol: 'V2' });
+    const invalidated = createDeferred<void>();
+    const releaseNative = lifecycle.releaseNative.bind(lifecycle);
+    jest.spyOn(lifecycle, 'releaseNative').mockImplementationOnce(async (id, onclose) => {
+      const result = await releaseNative(id, onclose);
+      invalidated.resolve();
+      return result;
+    });
+    harness.setShouldRespond(false);
+    const failure = expect(
+      transport.call(uuid, 'Ping', {}, { timeoutMs: 10 })
+    ).rejects.toMatchObject({
+      errorCode: HardwareErrorCode.BleTimeoutError,
+    });
+
+    try {
+      await invalidated.promise;
+      harness.setShouldRespond(true);
+      gate.resolve();
+      await holding;
+      await reacquiring;
+      await failure;
+      expect(bleManager.cancelDeviceConnection).not.toHaveBeenCalled();
+      await expect(transport.call(uuid, 'Ping', {})).resolves.toMatchObject({ type: 'Success' });
+    } finally {
+      gate.resolve();
+      await Promise.allSettled([holding, reacquiring, failure]);
+      await transport.release(uuid, true);
+    }
+  });
+
   test('retains the sequence cursor when a new monitor generation is acquired', async () => {
     const { transport, uuid, sentSeqs } = createHarness();
 

package/src/index.ts

@@ -452,6 +452,14 @@ export default class ReactNativeBleTransport {
       this.rejectProtocolV2Frames(uuid, new Error(reason));
       Log?.debug('[ReactNativeBleTransport] Protocol V2 link invalidated:', uuid, reason);
       if (reason.startsWith('Protocol V2 link-fatal error:')) {
+        if (this.probingProtocols.get(uuid) !== 'V2') {
+          const transport = transportCache[uuid];
+          try {
+            this.emitDeviceDisconnect(uuid, transport?.device?.name, transport?.monitorToken);
+          } catch {
+            Log?.error('[ReactNativeBleTransport] Protocol V2 disconnect listener failed');
+          }
+        }
         await this.releaseNative(uuid, true);
       }
     },
@@ -1255,11 +1263,9 @@ export default class ReactNativeBleTransport {
       this.attachDisconnectSubscription(currentTransport, currentTransport.device, uuid);
       return { uuid, protocolType };
     } catch (error) {
-      if (isBleStaleBondHardwareError(error) || shouldRethrowProtocolProbeError(error)) {
-        await this.disconnectUnlocked(uuid);
-      } else {
-        await this.releaseUnlocked(uuid, true);
-      }
+      // A failed acquire must retire the physical link before Core retries. Logical
+      // release leaves GATT connected even when neither protocol receives a response.
+      await this.disconnectUnlocked(uuid);
       throw error;
     } finally {
       this.acquiringProtocolV2.delete(uuid);
@@ -2738,6 +2744,7 @@ export default class ReactNativeBleTransport {
       throw ERRORS.TypedError(HardwareErrorCode.TransportNotConfigured);
     }
 
+    const isProtocolProbe = this.probingProtocols.get(uuid) === 'V2';
     const callOptions = options;
     const highThroughputWrite = isProtocolV2HighThroughputCall(name);
 
@@ -2789,6 +2796,19 @@ export default class ReactNativeBleTransport {
       );
     } catch (e) {
       Log?.error('[ReactNativeBleTransport] Protocol V2 call error:', e);
+      if (
+        !isProtocolProbe &&
+        e?.errorCode === HardwareErrorCode.BleTimeoutError &&
+        !this.monitorTokens.has(uuid)
+      ) {
+        // The failed link has finished invalidating. Disconnect outside that
+        // callback to avoid waiting on its own invalidation or acquire lock.
+        await this.runLifecycleOperation(uuid, async () => {
+          // A queued timeout leaves its active monitor intact; a newer acquire
+          // may also have installed one while cleanup waited for the lifecycle lock.
+          if (!this.monitorTokens.has(uuid)) await this.disconnectUnlocked(uuid);
+        });
+      }
       throw e;
     } finally {
       if (highThroughputWrite) {