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

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

@@ -222,6 +222,7 @@ const FIRMWARE_UPLOAD_WRITE_BURST_SIZE = reactNative.Platform.OS === 'ios' ? 4 :
 const FIRMWARE_UPLOAD_WRITE_PAUSE_MS = reactNative.Platform.OS === 'ios' ? 8 : 10;
 const FIRMWARE_UPLOAD_WRITE_FLUSH_DELAY_MS = reactNative.Platform.OS === 'ios' ? 24 : 30;
 const FIRMWARE_UPLOAD_WRITE_MAX_RETRIES = 8;
+const IOS_PROTOCOL_V2_CONTROL_WRITE_DELAY_MS = 5;
 const ANDROID_FIRMWARE_UPLOAD_PACKET_LENGTH = 192;
 const FIRMWARE_UPLOAD_WRITE_PACKET_CAPACITY = reactNative.Platform.OS === 'ios' ? IOS_PACKET_LENGTH : ANDROID_FIRMWARE_UPLOAD_PACKET_LENGTH;
 const ANDROID_GATT_CONGESTED_STATUS = 143;
@@ -614,12 +615,17 @@ class ReactNativeBleTransport {
                         return;
                     }
                     const displayName = getDeviceDisplayName(device);
-                    const isOneKey = hdShared.isOnekeyBluetoothDevice({
-                        id: device === null || device === void 0 ? void 0 : device.id,
-                        name: device === null || device === void 0 ? void 0 : device.name,
-                        localName: device === null || device === void 0 ? void 0 : device.localName,
-                        serviceUuids: device === null || device === void 0 ? void 0 : device.serviceUUIDs,
-                    });
+                    const isUnnamedIOSPeripheral = reactNative.Platform.OS === 'ios' && !(displayName === null || displayName === void 0 ? void 0 : displayName.trim());
+                    const isFindMyPeripheral = hdShared.isPro2FindMyAdvertisementName(device === null || device === void 0 ? void 0 : device.name) ||
+                        hdShared.isPro2FindMyAdvertisementName(device === null || device === void 0 ? void 0 : device.localName);
+                    const isOneKey = !isUnnamedIOSPeripheral &&
+                        !isFindMyPeripheral &&
+                        hdShared.isOnekeyBluetoothDevice({
+                            id: device === null || device === void 0 ? void 0 : device.id,
+                            name: device === null || device === void 0 ? void 0 : device.name,
+                            localName: device === null || device === void 0 ? void 0 : device.localName,
+                            serviceUuids: device === null || device === void 0 ? void 0 : device.serviceUUIDs,
+                        });
                     if (isOneKey) {
                         addDevice(device);
                     }
@@ -637,12 +643,15 @@ class ReactNativeBleTransport {
                         const localName = 'localName' in device && typeof device.localName === 'string'
                             ? device.localName
                             : null;
-                        if (hdShared.isOnekeyBluetoothDevice({
-                            id: device.id,
-                            name: device.name,
-                            localName,
-                            serviceUuids: device.serviceUUIDs,
-                        })) {
+                        const isFindMyPeripheral = hdShared.isPro2FindMyAdvertisementName(device.name) ||
+                            hdShared.isPro2FindMyAdvertisementName(localName);
+                        if (!isFindMyPeripheral &&
+                            hdShared.isOnekeyBluetoothDevice({
+                                id: device.id,
+                                name: device.name,
+                                localName,
+                                serviceUuids: device.serviceUUIDs,
+                            })) {
                             Log === null || Log === void 0 ? void 0 : Log.debug('search connected peripheral: ', device.id);
                             addDevice(device);
                         }
@@ -1035,18 +1044,8 @@ class ReactNativeBleTransport {
             const transport = this.getCachedTransport(uuid);
             const runPromise = hdShared.createDeferred();
             runPromise.promise.catch(() => undefined);
-            const supersededRunPromise = this.runPromise;
-            if (supersededRunPromise) {
-                supersededRunPromise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleForceCleanRunPromise));
-            }
             this.runPromise = runPromise;
             this.runPromiseDeviceId = uuid;
-            const releaseOwnershipIfCurrent = () => {
-                if (this.runPromise === runPromise) {
-                    this.runPromise = null;
-                    this.runPromiseDeviceId = null;
-                }
-            };
             const messages = this._messages;
             const buffers = ProtocolV1.encodeTransportPackets(messages, name, data);
             let timeout;
@@ -1105,7 +1104,7 @@ class ReactNativeBleTransport {
             }
             if (name === 'EmmcFileWrite') {
                 yield writeChunkedData(buffers, data => transport.writeWithRetry(data), e => {
-                    releaseOwnershipIfCurrent();
+                    this.runPromise = null;
                     Log === null || Log === void 0 ? void 0 : Log.error('writeCharacteristic write error: ', e);
                 });
             }
@@ -1140,7 +1139,7 @@ class ReactNativeBleTransport {
                         }
                     }
                 }), e => {
-                    releaseOwnershipIfCurrent();
+                    this.runPromise = null;
                     Log === null || Log === void 0 ? void 0 : Log.error('writeCharacteristic write error: ', e);
                 });
             }
@@ -1148,11 +1147,17 @@ class ReactNativeBleTransport {
                 for (const o of buffers) {
                     const outData = o.toString('base64');
                     try {
-                        yield transport.writeCharacteristic.writeWithoutResponse(outData);
+                        const shouldUseWriteWithResponse = reactNative.Platform.OS === 'ios' && transport.writeCharacteristic.isWritableWithResponse;
+                        if (shouldUseWriteWithResponse) {
+                            yield transport.writeCharacteristic.writeWithResponse(outData);
+                        }
+                        else {
+                            yield transport.writeCharacteristic.writeWithoutResponse(outData);
+                        }
                     }
                     catch (e) {
                         Log === null || Log === void 0 ? void 0 : Log.debug('writeCharacteristic write error: ', e);
-                        releaseOwnershipIfCurrent();
+                        this.runPromise = null;
                         if (e.errorCode === reactNativeBlePlx.BleErrorCode.DeviceDisconnected) {
                             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleDeviceNotBonded);
                         }
@@ -1192,9 +1197,7 @@ class ReactNativeBleTransport {
                     Log === null || Log === void 0 ? void 0 : Log.error('call error: ', e);
                 }
                 const isProbeTimeout = name === 'GetFeatures' && (options === null || options === void 0 ? void 0 : options.timeoutMs) === PROTOCOL_PROBE_TIMEOUT_MS;
-                const isStaleCall = this.runPromise !== runPromise;
                 if (!isProbeTimeout &&
-                    !isStaleCall &&
                     (e === null || e === void 0 ? void 0 : e.errorCode) === hdShared.HardwareErrorCode.BleTimeoutError) {
                     yield this.disconnect(uuid);
                 }
@@ -1305,7 +1308,25 @@ class ReactNativeBleTransport {
         }
     }
     detectProtocol(uuid, expectedProtocol, protocolHint, rebuildTransport) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            if (reactNative.Platform.OS === 'ios') {
+                const protocol = (_a = expectedProtocol !== null && expectedProtocol !== void 0 ? expectedProtocol : protocolHint) !== null && _a !== void 0 ? _a : 'V1';
+                let source = 'ios-legacy-default';
+                if (expectedProtocol) {
+                    source = 'expected';
+                }
+                else if (protocolHint) {
+                    source = 'hint';
+                }
+                this.deviceProtocol.set(uuid, protocol);
+                Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] protocol selected', {
+                    deviceId: uuid,
+                    protocol,
+                    source,
+                });
+                return protocol;
+            }
             if (expectedProtocol === 'V1') {
                 if (yield this.probeProtocolV1(uuid)) {
                     this.deviceProtocol.set(uuid, 'V1');
@@ -1511,6 +1532,9 @@ class ReactNativeBleTransport {
     }
     writeProtocolV2Packet(transport, base64, context, assertCurrentGeneration) {
         return __awaiter(this, void 0, void 0, function* () {
+            const shouldUseWriteWithResponse = reactNative.Platform.OS === 'ios' &&
+                !context.highVolume &&
+                transport.writeCharacteristic.isWritableWithResponse;
             let attempt = 0;
             for (;;) {
                 assertCurrentGeneration();
@@ -1518,7 +1542,12 @@ class ReactNativeBleTransport {
                     throw new Error(`Protocol V2 BLE write aborted for ${context.messageName}`);
                 }
                 try {
-                    yield transport.writeCharacteristic.writeWithoutResponse(base64);
+                    if (shouldUseWriteWithResponse) {
+                        yield transport.writeCharacteristic.writeWithResponse(base64);
+                    }
+                    else {
+                        yield transport.writeCharacteristic.writeWithoutResponse(base64);
+                    }
                     assertCurrentGeneration();
                     return;
                 }
@@ -1548,12 +1577,16 @@ class ReactNativeBleTransport {
                 androidPacketLength: tuning.androidPacketLength,
                 mtu: reactNative.Platform.OS === 'android' ? transport$1.mtuSize : undefined,
             });
+            const initialDelayMs = reactNative.Platform.OS === 'ios' && !context.highVolume && frame.length <= packetCapacity
+                ? IOS_PROTOCOL_V2_CONTROL_WRITE_DELAY_MS
+                : 0;
             yield transport.writeProtocolV2BleFrame({
                 frame,
                 packetCapacity,
                 assertActive: assertCurrentGeneration,
                 signal: context.signal,
                 abortMessage: `Protocol V2 BLE write aborted for ${context.messageName}`,
+                initialDelayMs,
                 burstSize: FIRMWARE_UPLOAD_WRITE_BURST_SIZE,
                 burstPauseMs: FIRMWARE_UPLOAD_WRITE_PAUSE_MS,
                 flushDelayMs: FIRMWARE_UPLOAD_WRITE_FLUSH_DELAY_MS,

package/jest.config.js

@@ -2,9 +2,4 @@ module.exports = {
   preset: '../../jest.config.js',
   testEnvironment: 'node',
   modulePathIgnorePatterns: ['node_modules', '<rootDir>/dist'],
-  moduleNameMapper: {
-    // The workspace symlinks resolve to prebuilt dist outputs that can lag behind src.
-    '^@onekeyfe/hd-transport$': '<rootDir>/../hd-transport/src/index.ts',
-    '^@onekeyfe/hd-shared$': '<rootDir>/../shared/src/index.ts',
-  },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-react-native",
-  "version": "1.2.0-alpha.52",
+  "version": "1.2.0-alpha.53",
   "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.52",
-    "@onekeyfe/hd-shared": "1.2.0-alpha.52",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.52",
+    "@onekeyfe/hd-core": "1.2.0-alpha.53",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.53",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.53",
     "@onekeyfe/react-native-ble-utils": "^0.1.6",
     "react-native-ble-plx": "3.5.1"
   },
-  "gitHead": "d8fd8f3d30c4ff3653d0379d5c3e1c100414b61e"
+  "gitHead": "196b7301f81d730460045c65c90d22706434b04d"
 }

package/src/__tests__/enumerate.test.ts

@@ -0,0 +1,132 @@
+import { EventEmitter } from 'events';
+
+import { getConnectedDeviceIds } from '../BleManager';
+import ReactNativeBleTransport from '../index';
+
+jest.mock(
+  'react-native',
+  () => ({
+    PermissionsAndroid: {},
+    Platform: { OS: 'ios' },
+  }),
+  { virtual: true }
+);
+
+jest.mock('react-native-ble-plx', () => ({
+  BleError: class BleError extends Error {},
+  BleErrorCode: {},
+  BleManager: jest.fn(),
+  ScanMode: { LowLatency: 2 },
+}));
+
+jest.mock('../BleManager', () => ({
+  getConnectedDeviceIds: jest.fn(),
+  onDeviceBondState: jest.fn(),
+  pairDevice: jest.fn(),
+}));
+
+jest.mock('../subscribeBleOn', () => ({
+  subscribeBleOn: jest.fn(() => Promise.resolve()),
+}));
+
+const ONEKEY_SERVICE_UUID = '00000001-0000-1000-8000-00805f9b34fb';
+
+describe('ReactNativeBleTransport iOS discovery', () => {
+  test('filters a bonded Pro2 Find My peripheral while keeping the wallet peripheral', async () => {
+    jest.mocked(getConnectedDeviceIds).mockResolvedValueOnce([
+      {
+        id: 'find-my-peripheral',
+        name: 'Pro2 6E9E - Find My',
+        localName: null,
+        serviceUUIDs: [ONEKEY_SERVICE_UUID],
+      },
+      {
+        id: 'wallet-peripheral',
+        name: 'Pro2 6E9E',
+        localName: 'Pro2 6E9E',
+        serviceUUIDs: [ONEKEY_SERVICE_UUID],
+      },
+    ] as never);
+    const blePlxManager = {
+      startDeviceScan: jest.fn(),
+      stopDeviceScan: jest.fn(),
+    };
+    const transport = new ReactNativeBleTransport({ scanTimeout: 1 });
+    transport.blePlxManager = blePlxManager as never;
+    transport.init({ debug: jest.fn(), error: jest.fn() }, new EventEmitter());
+
+    const devices = await transport.enumerate();
+
+    expect(devices.map(device => device.id)).toEqual(['wallet-peripheral']);
+  });
+
+  test('filters a scanned Pro2 Find My peripheral by name when localName is null', async () => {
+    jest.mocked(getConnectedDeviceIds).mockResolvedValueOnce([]);
+    const blePlxManager = {
+      startDeviceScan: jest.fn((_serviceUUIDs, _options, listener) => {
+        queueMicrotask(() => {
+          listener(null, {
+            id: 'find-my-peripheral',
+            name: 'Pro2 6E9E - Find My',
+            localName: null,
+            serviceUUIDs: [ONEKEY_SERVICE_UUID],
+          });
+          listener(null, {
+            id: 'wallet-peripheral',
+            name: 'Pro2 6E9E',
+            localName: 'Pro2 6E9E',
+            serviceUUIDs: [ONEKEY_SERVICE_UUID],
+          });
+        });
+      }),
+      stopDeviceScan: jest.fn(),
+    };
+    const transport = new ReactNativeBleTransport({ scanTimeout: 1 });
+    transport.blePlxManager = blePlxManager as never;
+    transport.init({ debug: jest.fn(), error: jest.fn() }, new EventEmitter());
+
+    const devices = await transport.enumerate();
+
+    expect(devices.map(device => device.id)).toEqual(['wallet-peripheral']);
+  });
+
+  test('ignores an unnamed scanned advertisement while keeping the named wallet peripheral', async () => {
+    jest.mocked(getConnectedDeviceIds).mockResolvedValueOnce([]);
+    const blePlxManager = {
+      startDeviceScan: jest.fn((_serviceUUIDs, _options, listener) => {
+        queueMicrotask(() => {
+          listener(null, {
+            id: 'unnamed-peripheral',
+            name: null,
+            localName: null,
+            serviceUUIDs: [
+              '0000180a-0000-1000-8000-00805f9b34fb',
+              '0000180f-0000-1000-8000-00805f9b34fb',
+              '0000fffd-0000-1000-8000-00805f9b34fb',
+              ONEKEY_SERVICE_UUID,
+            ],
+          });
+          listener(null, {
+            id: 'wallet-peripheral',
+            name: 'Pro2 769D',
+            localName: 'Pro2 769D',
+            serviceUUIDs: [
+              '0000180a-0000-1000-8000-00805f9b34fb',
+              '0000180f-0000-1000-8000-00805f9b34fb',
+              '0000fffd-0000-1000-8000-00805f9b34fb',
+              ONEKEY_SERVICE_UUID,
+            ],
+          });
+        });
+      }),
+      stopDeviceScan: jest.fn(),
+    };
+    const transport = new ReactNativeBleTransport({ scanTimeout: 1 });
+    transport.blePlxManager = blePlxManager as never;
+    transport.init({ debug: jest.fn(), error: jest.fn() }, new EventEmitter());
+
+    const devices = await transport.enumerate();
+
+    expect(devices.map(device => device.id)).toEqual(['wallet-peripheral']);
+  });
+});

package/src/__tests__/protocolV2Link.test.ts

@@ -3,7 +3,6 @@ import transportPackage, {
   PROTOCOL_V2_CHANNEL_BLE_UART,
   ProtocolV2,
   TRANSPORT_EVENT,
-  bytesToHex,
 } from '@onekeyfe/hd-transport';
 import { HardwareErrorCode, createDeferred } from '@onekeyfe/hd-shared';
 
@@ -46,6 +45,11 @@ 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 = {
@@ -69,11 +73,13 @@ const protocolV1Schema = {
 
 const protocolV2Schema = {
   nested: {
+    ProtocolInfoRequest: { fields: {} },
     Ping: {
       fields: {
         message: { type: 'string', id: 1 },
       },
     },
+    DeviceInfoGet: { fields: {} },
     FileWrite: { fields: {} },
     Success: {
       fields: {
@@ -82,8 +88,10 @@ const protocolV2Schema = {
     },
     MessageType: {
       values: {
+        MessageType_ProtocolInfoRequest: 60200,
         MessageType_Ping: 60206,
         MessageType_Success: 60207,
+        MessageType_DeviceInfoGet: 60600,
         MessageType_FileWrite: 60805,
       },
     },
@@ -95,7 +103,13 @@ const schemas = {
   protocolV2: parseConfigure(protocolV2Schema),
 };
 
-const createHarness = () => {
+const createHarness = ({
+  deviceName = 'OneKey Pro 2',
+  isWritableWithResponse = true,
+}: {
+  deviceName?: string;
+  isWritableWithResponse?: boolean;
+} = {}) => {
   const uuid = 'rn-pro2-id';
   const sentSeqs: number[] = [];
   let responseSeq = 0;
@@ -134,15 +148,15 @@ const createHarness = () => {
   const writeCharacteristic = {
     uuid: '0002',
     deviceID: uuid,
-    isWritableWithResponse: true,
+    isWritableWithResponse,
     isWritableWithoutResponse: true,
     writeWithResponse: jest.fn(handleWrite),
     writeWithoutResponse: jest.fn(handleWrite),
   };
   const device = {
     id: uuid,
-    name: 'OneKey Pro 2',
-    localName: 'OneKey Pro 2',
+    name: deviceName,
+    localName: deviceName,
     serviceUUIDs: ['00000001-0000-1000-8000-00805f9b34fb'],
     isConnected: jest.fn(() => Promise.resolve(true)),
     cancelConnection: jest.fn(() => Promise.resolve()),
@@ -184,7 +198,13 @@ const createHarness = () => {
   };
 };
 
-const createV1Harness = () => {
+const createV1Harness = ({
+  respondOnWriteCount = 1,
+  isWritableWithResponse = true,
+}: {
+  respondOnWriteCount?: number | number[];
+  isWritableWithResponse?: boolean;
+} = {}) => {
   const uuid = 'rn-classic-id';
   const notifySubscriptionRemovers: jest.Mock[] = [];
   const disconnectSubscriptionRemovers: jest.Mock[] = [];
@@ -203,20 +223,25 @@ 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: true,
+    isWritableWithResponse,
     isWritableWithoutResponse: true,
-    writeWithoutResponse: jest.fn(() => {
-      writeCount += 1;
-      if (writeCount === 1) {
-        notifyCallback?.(null, {
-          value: Buffer.from('3f23230002000000040a026f6b', 'hex').toString('base64'),
-        });
-      }
-      return Promise.resolve();
-    }),
+    writeWithResponse: jest.fn(handleWrite),
+    writeWithoutResponse: jest.fn(handleWrite),
   };
   const device = {
     id: uuid,
@@ -249,6 +274,7 @@ const createV1Harness = () => {
     uuid,
     device,
     bleManager,
+    writeCharacteristic,
     notifySubscriptionRemovers,
     disconnectSubscriptionRemovers,
   };
@@ -302,12 +328,81 @@ 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')
-      .mockImplementationOnce(async () => {
+      .mockImplementation(async () => {
         await (transport as any).releaseNative(uuid, true);
         return false;
       });
@@ -333,8 +428,9 @@ 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').mockImplementationOnce(async () => {
+    jest.spyOn(transport as any, 'probeProtocolV2').mockImplementation(async () => {
       await (transport as any).releaseNative(uuid, true);
       return false;
     });
@@ -353,7 +449,9 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
   });
 
   test('disconnects and invalidates a Protocol V1 link after a response timeout', async () => {
-    const { transport, uuid, device } = createV1Harness();
+    const { transport, uuid, device } = createV1Harness({
+      respondOnWriteCount: Number.POSITIVE_INFINITY,
+    });
 
     await transport.acquire({ uuid, expectedProtocol: 'V1' });
     await expect(transport.call(uuid, 'Initialize', {}, { timeoutMs: 5 })).rejects.toMatchObject({
@@ -365,17 +463,17 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
   });
 
   afterEach(() => {
+    setPlatformOS('ios');
     resetProtocolV2BleTuning();
   });
 
-  test('keeps the Protocol V2 sequence across probe and the next call', async () => {
+  test('starts the Protocol V2 sequence with the first Core call on iOS', async () => {
     const { transport, uuid, sentSeqs } = createHarness();
 
     await transport.acquire({ uuid });
-    await transport.call(uuid, 'Ping', { message: 'after-probe' });
+    await transport.call(uuid, 'Ping', { message: 'first-core-command' });
 
-    expect(sentSeqs).toEqual([1, 2]);
-    expect(bytesToHex(new Uint8Array([sentSeqs[0], sentSeqs[1]]))).toBe('0102');
+    expect(sentSeqs).toEqual([1]);
     await transport.release(uuid, true);
   });
 
@@ -386,8 +484,10 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
     harness.setShouldRespond(false);
 
     const call = transport.call(uuid, 'Ping', { message: 'wait-for-monitor' }, { timeoutMs: 50 });
-    while (sentSeqs.length < 2) {
-      await Promise.resolve();
+    while (sentSeqs.length < 1) {
+      await new Promise(resolve => {
+        setTimeout(resolve, 0);
+      });
     }
     await new Promise(resolve => {
       setTimeout(resolve, 0);
@@ -403,30 +503,124 @@ 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 withoutResponse for normal and high-volume calls', async () => {
+  test('uses withResponse for consecutive iOS Protocol V2 control calls without releasing', async () => {
     const { transport, uuid, writeCharacteristic } = createHarness();
 
     await transport.acquire({ uuid });
-    expect(writeCharacteristic.writeWithoutResponse).toHaveBeenCalledTimes(1);
+    const releaseNative = jest.spyOn(transport as any, 'releaseNative');
+    expect(writeCharacteristic.writeWithoutResponse).not.toHaveBeenCalled();
     expect(writeCharacteristic.writeWithResponse).not.toHaveBeenCalled();
 
-    await transport.call(uuid, 'Ping', { message: 'normal' });
-    expect(writeCharacteristic.writeWithoutResponse).toHaveBeenCalledTimes(2);
-    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 () => {
+    const { transport, uuid, writeCharacteristic } = createHarness();
+
+    await transport.acquire({ uuid });
 
     await transport.call(uuid, 'FileWrite', {});
-    expect(writeCharacteristic.writeWithoutResponse).toHaveBeenCalledTimes(3);
+    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', {});
+
     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;
@@ -434,8 +628,10 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
     harness.setShouldRespond(false);
 
     const call = transport.call(uuid, 'Ping', { message: 'disconnect' }, { timeoutMs: 50 });
-    while (sentSeqs.length < 2) {
-      await Promise.resolve();
+    while (sentSeqs.length < 1) {
+      await new Promise(resolve => {
+        setTimeout(resolve, 0);
+      });
     }
 
     const rejection = expect(call).rejects.toThrow('React Native BLE transport disconnected');

package/src/index.ts

@@ -28,6 +28,7 @@ import {
   HardwareErrorCode,
   createDeferred,
   isOnekeyBluetoothDevice,
+  isPro2FindMyAdvertisementName,
 } from '@onekeyfe/hd-shared';
 
 import { getConnectedDeviceIds, onDeviceBondState, pairDevice } from './BleManager';
@@ -60,6 +61,7 @@ const FIRMWARE_UPLOAD_WRITE_BURST_SIZE = Platform.OS === 'ios' ? 4 : 5;
 const FIRMWARE_UPLOAD_WRITE_PAUSE_MS = Platform.OS === 'ios' ? 8 : 10;
 const FIRMWARE_UPLOAD_WRITE_FLUSH_DELAY_MS = Platform.OS === 'ios' ? 24 : 30;
 const FIRMWARE_UPLOAD_WRITE_MAX_RETRIES = 8;
+const IOS_PROTOCOL_V2_CONTROL_WRITE_DELAY_MS = 5;
 const ANDROID_FIRMWARE_UPLOAD_PACKET_LENGTH = 192;
 const FIRMWARE_UPLOAD_WRITE_PACKET_CAPACITY =
   Platform.OS === 'ios' ? IOS_PACKET_LENGTH : ANDROID_FIRMWARE_UPLOAD_PACKET_LENGTH;
@@ -580,12 +582,21 @@ export default class ReactNativeBleTransport {
           }
 
           const displayName = getDeviceDisplayName(device);
-          const isOneKey = isOnekeyBluetoothDevice({
-            id: device?.id,
-            name: device?.name,
-            localName: device?.localName,
-            serviceUuids: device?.serviceUUIDs,
-          });
+          // iOS may report a service-only advertisement before the named scan response.
+          // Do not cache that incomplete advertisement as an unknown device.
+          const isUnnamedIOSPeripheral = Platform.OS === 'ios' && !displayName?.trim();
+          const isFindMyPeripheral =
+            isPro2FindMyAdvertisementName(device?.name) ||
+            isPro2FindMyAdvertisementName(device?.localName);
+          const isOneKey =
+            !isUnnamedIOSPeripheral &&
+            !isFindMyPeripheral &&
+            isOnekeyBluetoothDevice({
+              id: device?.id,
+              name: device?.name,
+              localName: device?.localName,
+              serviceUuids: device?.serviceUUIDs,
+            });
           if (isOneKey) {
             addDevice(device as unknown as Device);
           } else if (displayName && /\bpro\s*2\b/i.test(displayName)) {
@@ -606,7 +617,12 @@ export default class ReactNativeBleTransport {
               'localName' in device && typeof device.localName === 'string'
                 ? device.localName
                 : null;
+            const isFindMyPeripheral =
+              isPro2FindMyAdvertisementName(device.name) ||
+              isPro2FindMyAdvertisementName(localName);
+
             if (
+              !isFindMyPeripheral &&
               isOnekeyBluetoothDevice({
                 id: device.id,
                 name: device.name,
@@ -1113,24 +1129,8 @@ export default class ReactNativeBleTransport {
     const transport = this.getCachedTransport(uuid);
     const runPromise = createDeferred<string>();
     runPromise.promise.catch(() => undefined);
-    const supersededRunPromise = this.runPromise;
-    if (supersededRunPromise) {
-      // Only forceRun calls (Initialize/Cancel) reach here with a pending call. Settle
-      // the superseded deferred now so its response race resolves and its finally block
-      // clears its timeout timer; an orphaned timer would otherwise fire much later and
-      // tear down the shared connection while another call is using it.
-      supersededRunPromise.reject(ERRORS.TypedError(HardwareErrorCode.BleForceCleanRunPromise));
-    }
     this.runPromise = runPromise;
     this.runPromiseDeviceId = uuid;
-    // A superseded call's late write failure must not clear the successor's ownership;
-    // only the call that still owns the slot may release it.
-    const releaseOwnershipIfCurrent = () => {
-      if (this.runPromise === runPromise) {
-        this.runPromise = null;
-        this.runPromiseDeviceId = null;
-      }
-    };
     const messages = this._messages;
     const buffers = ProtocolV1.encodeTransportPackets(messages, name, data);
     let timeout: ReturnType<typeof setTimeout> | undefined;
@@ -1202,7 +1202,7 @@ export default class ReactNativeBleTransport {
         buffers,
         data => transport.writeWithRetry(data),
         e => {
-          releaseOwnershipIfCurrent();
+          this.runPromise = null;
           Log?.error('writeCharacteristic write error: ', e);
         }
       );
@@ -1242,7 +1242,7 @@ export default class ReactNativeBleTransport {
           }
         },
         e => {
-          releaseOwnershipIfCurrent();
+          this.runPromise = null;
           Log?.error('writeCharacteristic write error: ', e);
         }
       );
@@ -1251,10 +1251,16 @@ export default class ReactNativeBleTransport {
         const outData = o.toString('base64');
         // Upload resources on low-end phones may OOM
         try {
-          await transport.writeCharacteristic.writeWithoutResponse(outData);
+          const shouldUseWriteWithResponse =
+            Platform.OS === 'ios' && transport.writeCharacteristic.isWritableWithResponse;
+          if (shouldUseWriteWithResponse) {
+            await transport.writeCharacteristic.writeWithResponse(outData);
+          } else {
+            await transport.writeCharacteristic.writeWithoutResponse(outData);
+          }
         } catch (e) {
           Log?.debug('writeCharacteristic write error: ', e);
-          releaseOwnershipIfCurrent();
+          this.runPromise = null;
           if (e.errorCode === BleErrorCode.DeviceDisconnected) {
             throw ERRORS.TypedError(HardwareErrorCode.BleDeviceNotBonded);
           } else if (e.errorCode === BleErrorCode.OperationStartFailed) {
@@ -1297,13 +1303,8 @@ export default class ReactNativeBleTransport {
       }
       const isProbeTimeout =
         name === 'GetFeatures' && options?.timeoutMs === PROTOCOL_PROBE_TIMEOUT_MS;
-      // A call that has been superseded (forceRun) or cleaned up no longer owns the
-      // transport; its late timeout must not tear down the connection the current
-      // call is actively using.
-      const isStaleCall = this.runPromise !== runPromise;
       if (
         !isProbeTimeout &&
-        !isStaleCall &&
         (e as { errorCode?: unknown })?.errorCode === HardwareErrorCode.BleTimeoutError
       ) {
         await this.disconnect(uuid);
@@ -1443,6 +1444,23 @@ export default class ReactNativeBleTransport {
     protocolHint?: ProtocolType,
     rebuildTransport?: () => Promise<void>
   ): Promise<ProtocolType> {
+    if (Platform.OS === 'ios') {
+      const protocol = expectedProtocol ?? protocolHint ?? 'V1';
+      let source = 'ios-legacy-default';
+      if (expectedProtocol) {
+        source = 'expected';
+      } else if (protocolHint) {
+        source = 'hint';
+      }
+      this.deviceProtocol.set(uuid, protocol);
+      Log?.debug('[ReactNativeBleTransport] protocol selected', {
+        deviceId: uuid,
+        protocol,
+        source,
+      });
+      return protocol;
+    }
+
     if (expectedProtocol === 'V1') {
       if (await this.probeProtocolV1(uuid)) {
         this.deviceProtocol.set(uuid, 'V1');
@@ -1679,6 +1697,10 @@ export default class ReactNativeBleTransport {
     context: ProtocolV2CallContext,
     assertCurrentGeneration: () => void
   ) {
+    const shouldUseWriteWithResponse =
+      Platform.OS === 'ios' &&
+      !context.highVolume &&
+      transport.writeCharacteristic.isWritableWithResponse;
     let attempt = 0;
     for (;;) {
       assertCurrentGeneration();
@@ -1686,7 +1708,11 @@ export default class ReactNativeBleTransport {
         throw new Error(`Protocol V2 BLE write aborted for ${context.messageName}`);
       }
       try {
-        await transport.writeCharacteristic.writeWithoutResponse(base64);
+        if (shouldUseWriteWithResponse) {
+          await transport.writeCharacteristic.writeWithResponse(base64);
+        } else {
+          await transport.writeCharacteristic.writeWithoutResponse(base64);
+        }
         assertCurrentGeneration();
         return;
       } catch (error) {
@@ -1721,12 +1747,19 @@ export default class ReactNativeBleTransport {
       androidPacketLength: tuning.androidPacketLength,
       mtu: Platform.OS === 'android' ? transport.mtuSize : undefined,
     });
+    // Match Desktop BLE pacing so Pro2 firmware can finish the previous response
+    // before the next single-packet control command is written.
+    const initialDelayMs =
+      Platform.OS === 'ios' && !context.highVolume && frame.length <= packetCapacity
+        ? IOS_PROTOCOL_V2_CONTROL_WRITE_DELAY_MS
+        : 0;
     await writeProtocolV2BleFrame({
       frame,
       packetCapacity,
       assertActive: assertCurrentGeneration,
       signal: context.signal,
       abortMessage: `Protocol V2 BLE write aborted for ${context.messageName}`,
+      initialDelayMs,
       burstSize: FIRMWARE_UPLOAD_WRITE_BURST_SIZE,
       burstPauseMs: FIRMWARE_UPLOAD_WRITE_PAUSE_MS,
       flushDelayMs: FIRMWARE_UPLOAD_WRITE_FLUSH_DELAY_MS,

package/src/__tests__/staleCallTimeout.test.ts

@@ -1,211 +0,0 @@
-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);
-  });
-});