@onekeyfe/hd-transport-react-native 1.2.0-alpha.53 → 1.2.0-alpha.54

package/src/__tests__/protocolV2Link.test.ts

@@ -3,6 +3,7 @@ import transportPackage, {
   PROTOCOL_V2_CHANNEL_BLE_UART,
   ProtocolV2,
   TRANSPORT_EVENT,
+  bytesToHex,
 } from '@onekeyfe/hd-transport';
 import { HardwareErrorCode, createDeferred } from '@onekeyfe/hd-shared';
 
@@ -45,11 +46,6 @@ jest.mock('../subscribeBleOn', () => ({
   subscribeBleOn: jest.fn(() => Promise.resolve()),
 }));
 
-const setPlatformOS = (os: 'ios' | 'android') => {
-  const reactNative: { Platform: { OS: string } } = jest.requireMock('react-native');
-  reactNative.Platform.OS = os;
-};
-
 const { parseConfigure } = transportPackage;
 
 const protocolV1Schema = {
@@ -73,13 +69,11 @@ const protocolV1Schema = {
 
 const protocolV2Schema = {
   nested: {
-    ProtocolInfoRequest: { fields: {} },
     Ping: {
       fields: {
         message: { type: 'string', id: 1 },
       },
     },
-    DeviceInfoGet: { fields: {} },
     FileWrite: { fields: {} },
     Success: {
       fields: {
@@ -88,10 +82,8 @@ const protocolV2Schema = {
     },
     MessageType: {
       values: {
-        MessageType_ProtocolInfoRequest: 60200,
         MessageType_Ping: 60206,
         MessageType_Success: 60207,
-        MessageType_DeviceInfoGet: 60600,
         MessageType_FileWrite: 60805,
       },
     },
@@ -103,13 +95,7 @@ const schemas = {
   protocolV2: parseConfigure(protocolV2Schema),
 };
 
-const createHarness = ({
-  deviceName = 'OneKey Pro 2',
-  isWritableWithResponse = true,
-}: {
-  deviceName?: string;
-  isWritableWithResponse?: boolean;
-} = {}) => {
+const createHarness = () => {
   const uuid = 'rn-pro2-id';
   const sentSeqs: number[] = [];
   let responseSeq = 0;
@@ -148,15 +134,15 @@ const createHarness = ({
   const writeCharacteristic = {
     uuid: '0002',
     deviceID: uuid,
-    isWritableWithResponse,
+    isWritableWithResponse: true,
     isWritableWithoutResponse: true,
     writeWithResponse: jest.fn(handleWrite),
     writeWithoutResponse: jest.fn(handleWrite),
   };
   const device = {
     id: uuid,
-    name: deviceName,
-    localName: deviceName,
+    name: 'OneKey Pro 2',
+    localName: 'OneKey Pro 2',
     serviceUUIDs: ['00000001-0000-1000-8000-00805f9b34fb'],
     isConnected: jest.fn(() => Promise.resolve(true)),
     cancelConnection: jest.fn(() => Promise.resolve()),
@@ -198,13 +184,7 @@ const createHarness = ({
   };
 };
 
-const createV1Harness = ({
-  respondOnWriteCount = 1,
-  isWritableWithResponse = true,
-}: {
-  respondOnWriteCount?: number | number[];
-  isWritableWithResponse?: boolean;
-} = {}) => {
+const createV1Harness = () => {
   const uuid = 'rn-classic-id';
   const notifySubscriptionRemovers: jest.Mock[] = [];
   const disconnectSubscriptionRemovers: jest.Mock[] = [];
@@ -223,25 +203,20 @@ const createV1Harness = ({
     }),
   };
   let writeCount = 0;
-  const responseWriteCounts = new Set(
-    Array.isArray(respondOnWriteCount) ? respondOnWriteCount : [respondOnWriteCount]
-  );
-  const handleWrite = () => {
-    writeCount += 1;
-    if (responseWriteCounts.has(writeCount)) {
-      notifyCallback?.(null, {
-        value: Buffer.from('3f23230002000000040a026f6b', 'hex').toString('base64'),
-      });
-    }
-    return Promise.resolve();
-  };
   const writeCharacteristic = {
     uuid: '0002',
     deviceID: uuid,
-    isWritableWithResponse,
+    isWritableWithResponse: true,
     isWritableWithoutResponse: true,
-    writeWithResponse: jest.fn(handleWrite),
-    writeWithoutResponse: jest.fn(handleWrite),
+    writeWithoutResponse: jest.fn(() => {
+      writeCount += 1;
+      if (writeCount === 1) {
+        notifyCallback?.(null, {
+          value: Buffer.from('3f23230002000000040a026f6b', 'hex').toString('base64'),
+        });
+      }
+      return Promise.resolve();
+    }),
   };
   const device = {
     id: uuid,
@@ -274,7 +249,6 @@ const createV1Harness = ({
     uuid,
     device,
     bleManager,
-    writeCharacteristic,
     notifySubscriptionRemovers,
     disconnectSubscriptionRemovers,
   };
@@ -328,81 +302,12 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
     expect(new ReactNativeBleTransport({}).scanTimeout).toBe(3000);
   });
 
-  test('uses withResponse for consecutive iOS Protocol V1 control commands without releasing', async () => {
-    const { transport, uuid, writeCharacteristic } = createV1Harness({
-      respondOnWriteCount: [1, 2],
-    });
-
-    await expect(transport.acquire({ uuid })).resolves.toEqual({
-      uuid,
-      protocolType: 'V1',
-    });
-    const releaseNative = jest.spyOn(transport as any, 'releaseNative');
-    expect(writeCharacteristic.writeWithResponse).not.toHaveBeenCalled();
-    expect(writeCharacteristic.writeWithoutResponse).not.toHaveBeenCalled();
-
-    await expect(transport.call(uuid, 'Initialize', {}, { timeoutMs: 50 })).resolves.toBeDefined();
-    await expect(transport.call(uuid, 'GetFeatures', {}, { timeoutMs: 50 })).resolves.toBeDefined();
-
-    expect(writeCharacteristic.writeWithResponse).toHaveBeenCalledTimes(2);
-    expect(writeCharacteristic.writeWithoutResponse).not.toHaveBeenCalled();
-    expect(releaseNative).not.toHaveBeenCalled();
-    await transport.release(uuid, true);
-  });
-
-  test('falls back to withoutResponse for an iOS Protocol V1 control command when required', async () => {
-    const { transport, uuid, writeCharacteristic } = createV1Harness({
-      isWritableWithResponse: false,
-    });
-
-    await transport.acquire({ uuid });
-    await expect(transport.call(uuid, 'Initialize', {}, { timeoutMs: 50 })).resolves.toBeDefined();
-
-    expect(writeCharacteristic.writeWithResponse).not.toHaveBeenCalled();
-    expect(writeCharacteristic.writeWithoutResponse).toHaveBeenCalledTimes(1);
-    await transport.release(uuid, true);
-  });
-
-  test('does not resend a failed iOS Protocol V1 control write without response', async () => {
-    const { transport, uuid, writeCharacteristic } = createV1Harness();
-    const writeError = new Error('write with response failed');
-
-    await transport.acquire({ uuid });
-    writeCharacteristic.writeWithResponse.mockRejectedValueOnce(writeError);
-
-    await expect(transport.call(uuid, 'Initialize', {}, { timeoutMs: 50 })).rejects.toMatchObject({
-      errorCode: HardwareErrorCode.BleWriteCharacteristicError,
-    });
-    expect(writeCharacteristic.writeWithResponse).toHaveBeenCalledTimes(1);
-    expect(writeCharacteristic.writeWithoutResponse).not.toHaveBeenCalled();
-    await transport.release(uuid, true);
-  });
-
-  test('keeps the first Core command as the first iOS BLE request for a Protocol V2 device', async () => {
-    const { transport, uuid, sentSeqs, writeCharacteristic } = createHarness({
-      deviceName: 'Pro2 6E9E',
-    });
-
-    await expect(transport.acquire({ uuid })).resolves.toEqual({
-      uuid,
-      protocolType: 'V2',
-    });
-    expect(writeCharacteristic.writeWithoutResponse).not.toHaveBeenCalled();
-
-    await expect(
-      transport.call(uuid, 'Ping', { message: 'first-core-command' })
-    ).resolves.toBeDefined();
-    expect(sentSeqs).toEqual([1]);
-    await transport.release(uuid, true);
-  });
-
   test('reconnects before falling back to Protocol V1 after a fatal V2 probe failure', async () => {
-    setPlatformOS('android');
     const { transport, uuid, device, notifySubscriptionRemovers, disconnectSubscriptionRemovers } =
       createV1Harness();
     const probeProtocolV2 = jest
       .spyOn(transport as any, 'probeProtocolV2')
-      .mockImplementation(async () => {
+      .mockImplementationOnce(async () => {
         await (transport as any).releaseNative(uuid, true);
         return false;
       });
@@ -428,9 +333,8 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
   });
 
   test('cleans the rebuilt transport when Protocol V1 fallback also fails', async () => {
-    setPlatformOS('android');
     const { transport, uuid, device, bleManager, notifySubscriptionRemovers } = createV1Harness();
-    jest.spyOn(transport as any, 'probeProtocolV2').mockImplementation(async () => {
+    jest.spyOn(transport as any, 'probeProtocolV2').mockImplementationOnce(async () => {
       await (transport as any).releaseNative(uuid, true);
       return false;
     });
@@ -449,9 +353,7 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
   });
 
   test('disconnects and invalidates a Protocol V1 link after a response timeout', async () => {
-    const { transport, uuid, device } = createV1Harness({
-      respondOnWriteCount: Number.POSITIVE_INFINITY,
-    });
+    const { transport, uuid, device } = createV1Harness();
 
     await transport.acquire({ uuid, expectedProtocol: 'V1' });
     await expect(transport.call(uuid, 'Initialize', {}, { timeoutMs: 5 })).rejects.toMatchObject({
@@ -463,17 +365,17 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
   });
 
   afterEach(() => {
-    setPlatformOS('ios');
     resetProtocolV2BleTuning();
   });
 
-  test('starts the Protocol V2 sequence with the first Core call on iOS', async () => {
+  test('keeps the Protocol V2 sequence across probe and the next call', async () => {
     const { transport, uuid, sentSeqs } = createHarness();
 
     await transport.acquire({ uuid });
-    await transport.call(uuid, 'Ping', { message: 'first-core-command' });
+    await transport.call(uuid, 'Ping', { message: 'after-probe' });
 
-    expect(sentSeqs).toEqual([1]);
+    expect(sentSeqs).toEqual([1, 2]);
+    expect(bytesToHex(new Uint8Array([sentSeqs[0], sentSeqs[1]]))).toBe('0102');
     await transport.release(uuid, true);
   });
 
@@ -484,10 +386,8 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
     harness.setShouldRespond(false);
 
     const call = transport.call(uuid, 'Ping', { message: 'wait-for-monitor' }, { timeoutMs: 50 });
-    while (sentSeqs.length < 1) {
-      await new Promise(resolve => {
-        setTimeout(resolve, 0);
-      });
+    while (sentSeqs.length < 2) {
+      await Promise.resolve();
     }
     await new Promise(resolve => {
       setTimeout(resolve, 0);
@@ -503,124 +403,30 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
     const { transport, uuid, sentSeqs } = createHarness();
 
     await transport.acquire({ uuid });
-    await transport.call(uuid, 'Ping', { message: 'first-generation' });
     await transport.release(uuid, true);
     await transport.acquire({ uuid });
-    await transport.call(uuid, 'Ping', { message: 'second-generation' });
 
     expect(sentSeqs).toEqual([1, 2]);
     await transport.release(uuid, true);
   });
 
-  test('uses withResponse for consecutive iOS Protocol V2 control calls without releasing', async () => {
-    const { transport, uuid, writeCharacteristic } = createHarness();
-
-    await transport.acquire({ uuid });
-    const releaseNative = jest.spyOn(transport as any, 'releaseNative');
-    expect(writeCharacteristic.writeWithoutResponse).not.toHaveBeenCalled();
-    expect(writeCharacteristic.writeWithResponse).not.toHaveBeenCalled();
-
-    await transport.call(uuid, 'DeviceInfoGet', {});
-    await transport.call(uuid, 'ProtocolInfoRequest', {});
-
-    expect(writeCharacteristic.writeWithResponse).toHaveBeenCalledTimes(2);
-    expect(writeCharacteristic.writeWithoutResponse).not.toHaveBeenCalled();
-    expect(releaseNative).not.toHaveBeenCalled();
-
-    await transport.release(uuid, true);
-  });
-
-  test('keeps iOS Protocol V2 high-volume calls on withoutResponse', async () => {
+  test('uses withoutResponse for normal and high-volume calls', async () => {
     const { transport, uuid, writeCharacteristic } = createHarness();
 
     await transport.acquire({ uuid });
-
-    await transport.call(uuid, 'FileWrite', {});
     expect(writeCharacteristic.writeWithoutResponse).toHaveBeenCalledTimes(1);
     expect(writeCharacteristic.writeWithResponse).not.toHaveBeenCalled();
-    await transport.release(uuid, true);
-  });
 
-  test('falls back to withoutResponse for an iOS Protocol V2 control call when required', async () => {
-    const { transport, uuid, writeCharacteristic } = createHarness({
-      isWritableWithResponse: false,
-    });
-
-    await transport.acquire({ uuid });
-    await transport.call(uuid, 'ProtocolInfoRequest', {});
+    await transport.call(uuid, 'Ping', { message: 'normal' });
+    expect(writeCharacteristic.writeWithoutResponse).toHaveBeenCalledTimes(2);
+    expect(writeCharacteristic.writeWithResponse).not.toHaveBeenCalled();
 
+    await transport.call(uuid, 'FileWrite', {});
+    expect(writeCharacteristic.writeWithoutResponse).toHaveBeenCalledTimes(3);
     expect(writeCharacteristic.writeWithResponse).not.toHaveBeenCalled();
-    expect(writeCharacteristic.writeWithoutResponse).toHaveBeenCalledTimes(1);
     await transport.release(uuid, true);
   });
 
-  test('does not resend a failed iOS Protocol V2 control write without response', async () => {
-    const transport = new ReactNativeBleTransport({ scanTimeout: 1 }) as any;
-    const writeError = new Error('write with response failed');
-    const writeWithResponse = jest.fn().mockRejectedValue(writeError);
-    const writeWithoutResponse = jest.fn().mockResolvedValue(undefined);
-    const context = {
-      messageName: 'ProtocolInfoRequest',
-      timeoutMs: 1000,
-      highVolume: false,
-      generation: 1,
-      signal: new AbortController().signal,
-    };
-
-    await expect(
-      transport.writeProtocolV2Packet(
-        {
-          writeCharacteristic: {
-            isWritableWithResponse: true,
-            writeWithResponse,
-            writeWithoutResponse,
-          },
-        },
-        Buffer.from('control').toString('base64'),
-        context,
-        jest.fn()
-      )
-    ).rejects.toBe(writeError);
-    expect(writeWithResponse).toHaveBeenCalledTimes(1);
-    expect(writeWithoutResponse).not.toHaveBeenCalled();
-  });
-
-  test('paces a one-packet Protocol V2 control write on iOS', async () => {
-    const transport = new ReactNativeBleTransport({ scanTimeout: 1 }) as any;
-    const writeWithoutResponse = jest.fn().mockResolvedValue(undefined);
-    const bleTransport = {
-      mtuSize: 23,
-      writeCharacteristic: { writeWithoutResponse },
-    };
-    const context = {
-      messageName: 'ProtocolInfoRequest',
-      timeoutMs: 1000,
-      highVolume: false,
-      generation: 1,
-      signal: new AbortController().signal,
-    };
-    configureProtocolV2BleTuning({ iosPacketLength: 20 });
-    const setTimeoutSpy = jest.spyOn(global, 'setTimeout');
-
-    try {
-      const call = transport.writeProtocolV2Frame(
-        bleTransport,
-        new Uint8Array(10),
-        context,
-        jest.fn()
-      );
-
-      await Promise.resolve();
-      expect(setTimeoutSpy).toHaveBeenCalledWith(expect.any(Function), 5);
-      expect(writeWithoutResponse).not.toHaveBeenCalled();
-
-      await call;
-      expect(writeWithoutResponse).toHaveBeenCalledTimes(1);
-    } finally {
-      setTimeoutSpy.mockRestore();
-    }
-  });
-
   test('rejects an active Protocol V2 reader when disconnect resets the link', async () => {
     const harness = createHarness();
     const { transport, uuid, sentSeqs } = harness;
@@ -628,10 +434,8 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
     harness.setShouldRespond(false);
 
     const call = transport.call(uuid, 'Ping', { message: 'disconnect' }, { timeoutMs: 50 });
-    while (sentSeqs.length < 1) {
-      await new Promise(resolve => {
-        setTimeout(resolve, 0);
-      });
+    while (sentSeqs.length < 2) {
+      await Promise.resolve();
     }
 
     const rejection = expect(call).rejects.toThrow('React Native BLE transport disconnected');
@@ -678,6 +482,7 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
     configureProtocolV2BleTuning({ iosPacketLength: 20 });
 
     await transport.writeProtocolV2Frame(
+      'device-uuid',
       bleTransport,
       new Uint8Array(30),
       context,
@@ -709,7 +514,13 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
     configureProtocolV2BleTuning({ iosPacketLength: 20 });
 
     await expect(
-      transport.writeProtocolV2Frame(bleTransport, new Uint8Array(30), context, jest.fn())
+      transport.writeProtocolV2Frame(
+        'device-uuid',
+        bleTransport,
+        new Uint8Array(30),
+        context,
+        jest.fn()
+      )
     ).rejects.toMatchObject({ errorCode: 205 });
     expect(writeWithoutResponse).toHaveBeenCalledTimes(1);
   });

package/src/__tests__/staleCallTimeout.test.ts

@@ -0,0 +1,211 @@
+import { HardwareErrorCode } from '@onekeyfe/hd-shared';
+
+import ReactNativeBleTransport 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 },
+  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 = 'stale-timeout-device';
+
+const flush = () =>
+  new Promise(resolve => {
+    setImmediate(resolve);
+  });
+
+function createHarness() {
+  const t = new ReactNativeBleTransport({});
+  t.configure(messages);
+  (t as any).deviceProtocol.set(UUID, 'V1');
+  const writeWithoutResponse = jest.fn(() => Promise.resolve());
+  const fakeBleTransport = {
+    writeCharacteristic: { writeWithoutResponse },
+    writeWithRetry: jest.fn(() => Promise.resolve()),
+  };
+  (t as any).getCachedTransport = () => fakeBleTransport;
+  const disconnectSpy = jest.spyOn(t, 'disconnect').mockResolvedValue(undefined);
+  return { t, disconnectSpy, writeWithoutResponse };
+}
+
+describe('Protocol V1 stale call timeout', () => {
+  beforeAll(() => {
+    jest.useFakeTimers({ doNotFake: ['setImmediate', 'performance'] });
+  });
+
+  afterAll(() => {
+    jest.useRealTimers();
+  });
+
+  afterEach(() => {
+    jest.clearAllTimers();
+    jest.restoreAllMocks();
+  });
+
+  test('superseded Initialize timeout does not tear down the shared transport', async () => {
+    const { t, disconnectSpy } = createHarness();
+
+    // Initialize #1: written while the device reboots, never answered.
+    const firstErrors: unknown[] = [];
+    const first = t.call(UUID, 'Initialize', {}, { timeoutMs: 25000 });
+    first.catch(e => firstErrors.push(e));
+    await flush();
+
+    // Initialize #2 (forceRun) supersedes #1 three seconds later.
+    jest.advanceTimersByTime(3000);
+    const secondErrors: unknown[] = [];
+    const second = t.call(UUID, 'Initialize', {}, { timeoutMs: 25000 });
+    second.catch(e => secondErrors.push(e));
+    await flush();
+
+    // The device answers Initialize #2 (settle its deferred at the transport seam).
+    expect(t.runPromise).not.toBeNull();
+    t.runPromise?.reject(new Error('settled by device response'));
+    await flush();
+
+    // FirmwareUpload is now the active call on the same transport, awaiting its response.
+    const uploadErrors: unknown[] = [];
+    const upload = t.call(UUID, 'FirmwareUpload', { payload: Buffer.alloc(300) });
+    upload.catch(e => uploadErrors.push(e));
+    await flush();
+    jest.advanceTimersByTime(100); // firmware upload flush delay
+    await flush();
+
+    // Initialize #1's 25s response timer elapses while the upload is in flight.
+    jest.advanceTimersByTime(25000);
+    await flush();
+
+    expect(disconnectSpy).not.toHaveBeenCalled();
+    expect(firstErrors).toHaveLength(1);
+    expect(uploadErrors).toHaveLength(0);
+  });
+
+  test('forceRun supersede settles the previous pending call immediately', async () => {
+    const { t } = createHarness();
+
+    const firstErrors: Array<{ errorCode?: unknown }> = [];
+    const first = t.call(UUID, 'Initialize', {}, { timeoutMs: 25000 });
+    first.catch(e => firstErrors.push(e));
+    await flush();
+
+    const second = t.call(UUID, 'Initialize', {}, { timeoutMs: 25000 });
+    second.catch(() => undefined);
+    await flush();
+
+    expect(firstErrors).toHaveLength(1);
+    expect(firstErrors[0]?.errorCode).toBe(HardwareErrorCode.BleForceCleanRunPromise);
+
+    t.runPromise?.reject(new Error('settle second call'));
+    await flush();
+  });
+
+  test('late write failure of a superseded call keeps the successor as owner', async () => {
+    const { t, disconnectSpy } = createHarness();
+
+    // First call's write hangs; its promise is controlled by the test.
+    let rejectFirstWrite: ((e: Error) => void) | undefined;
+    const fakeBleTransport = {
+      writeCharacteristic: {
+        writeWithoutResponse: jest
+          .fn()
+          .mockImplementationOnce(
+            () =>
+              new Promise((_resolve, reject) => {
+                rejectFirstWrite = reject;
+              })
+          )
+          .mockImplementation(() => Promise.resolve()),
+      },
+      writeWithRetry: jest.fn(() => Promise.resolve()),
+    };
+    (t as any).getCachedTransport = () => fakeBleTransport;
+
+    const firstErrors: unknown[] = [];
+    const first = t.call(UUID, 'Initialize', {}, { timeoutMs: 25000 });
+    first.catch(e => firstErrors.push(e));
+    await flush();
+
+    // forceRun successor takes ownership while the first call is stuck writing.
+    const secondErrors: unknown[] = [];
+    const second = t.call(UUID, 'Initialize', {}, { timeoutMs: 5000 });
+    second.catch(e => secondErrors.push(e));
+    await flush();
+
+    // The first call's write now fails late; it must not clear the successor's slot.
+    rejectFirstWrite?.(new Error('late write failure'));
+    await flush();
+
+    expect(t.runPromise).not.toBeNull();
+
+    // The successor's genuine timeout must still tear the connection down.
+    jest.advanceTimersByTime(5000);
+    await flush();
+
+    expect(disconnectSpy).toHaveBeenCalledTimes(1);
+    expect(secondErrors).toHaveLength(1);
+  });
+
+  test('orphan timer left behind by cancel() must not disconnect the transport', async () => {
+    const { t, disconnectSpy } = createHarness();
+
+    // cancel() nulls the ownership slot without settling the deferred, so the
+    // call's response timer stays armed (reachable via DeviceCommands.dispose).
+    const errors: Array<{ errorCode?: unknown }> = [];
+    const p = t.call(UUID, 'GetFeatures', {}, { timeoutMs: 5000 });
+    p.catch(e => errors.push(e));
+    await flush();
+
+    t.cancel();
+
+    jest.advanceTimersByTime(5000);
+    await flush();
+
+    expect(disconnectSpy).not.toHaveBeenCalled();
+    expect(errors).toHaveLength(1);
+    expect(errors[0]?.errorCode).toBe(HardwareErrorCode.BleTimeoutError);
+  });
+
+  test('timeout on the active call still disconnects the transport', async () => {
+    const { t, disconnectSpy } = createHarness();
+
+    const errors: Array<{ errorCode?: unknown }> = [];
+    const p = t.call(UUID, 'GetFeatures', {}, { timeoutMs: 5000 });
+    p.catch(e => errors.push(e));
+    await flush();
+
+    jest.advanceTimersByTime(5000);
+    await flush();
+
+    expect(disconnectSpy).toHaveBeenCalledTimes(1);
+    expect(errors).toHaveLength(1);
+    expect(errors[0]?.errorCode).toBe(HardwareErrorCode.BleTimeoutError);
+  });
+});