@onekeyfe/hd-transport-react-native 1.2.0-alpha.67 → 1.2.0-alpha.68

package/dist/BleTransport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BleTransport.d.ts","sourceRoot":"","sources":["../src/BleTransport.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEjF,MAAM,CAAC,OAAO,OAAO,YAAY;IAC/B,EAAE,EAAE,MAAM,CAAC;IAEX,IAAI,SAA6B;IAEjC,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,SAAM;IAEb,mBAAmB,EAAE,cAAc,CAAC;IAEpC,oBAAoB,EAAE,cAAc,CAAC;IAErC,kBAAkB,CAAC,EAAE,YAAY,CAAC;IAElC,sBAAsB,CAAC,EAAE,YAAY,CAAC;IAEtC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAE7B,YAAY,CAAC,EAAE,MAAM,CAAC;gBAGpB,MAAM,EAAE,MAAM,EACd,mBAAmB,EAAE,cAAc,EACnC,oBAAoB,EAAE,cAAc;IAQhC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAGlD"}
+{"version":3,"file":"BleTransport.d.ts","sourceRoot":"","sources":["../src/BleTransport.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEjF,MAAM,CAAC,OAAO,OAAO,YAAY;IAC/B,EAAE,EAAE,MAAM,CAAC;IAEX,IAAI,SAA6B;IAEjC,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,SAAM;IAEb,mBAAmB,EAAE,cAAc,CAAC;IAEpC,oBAAoB,EAAE,cAAc,CAAC;IAErC,kBAAkB,CAAC,EAAE,YAAY,CAAC;IAElC,sBAAsB,CAAC,EAAE,YAAY,CAAC;IAEtC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAE7B,YAAY,CAAC,EAAE,MAAM,CAAC;gBAGpB,MAAM,EAAE,MAAM,EACd,mBAAmB,EAAE,cAAc,EACnC,oBAAoB,EAAE,cAAc;IAQhC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAOlD"}

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

@@ -210,6 +210,10 @@ class BleTransport {
     }
     writeWithRetry(data) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (reactNative.Platform.OS === 'ios' && this.writeCharacteristic.isWritableWithResponse) {
+                yield this.writeCharacteristic.writeWithResponse(data);
+                return;
+            }
             yield this.writeCharacteristic.writeWithoutResponse(data);
         });
     }
@@ -222,9 +226,36 @@ 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;
+const isAsciiWhitespace = (code) => code === 0x09 ||
+    code === 0x0a ||
+    code === 0x0b ||
+    code === 0x0c ||
+    code === 0x0d ||
+    code === 0x20;
+const hasGattCongestedStatus = (text) => {
+    let searchFrom = 0;
+    while (searchFrom < text.length) {
+        const statusIndex = text.indexOf('status', searchFrom);
+        if (statusIndex < 0)
+            return false;
+        let cursor = statusIndex + 'status'.length;
+        while (cursor < text.length && isAsciiWhitespace(text.charCodeAt(cursor)))
+            cursor += 1;
+        if (text[cursor] === ':' || text[cursor] === '=') {
+            cursor += 1;
+            while (cursor < text.length && isAsciiWhitespace(text.charCodeAt(cursor)))
+                cursor += 1;
+        }
+        if (text.startsWith(String(ANDROID_GATT_CONGESTED_STATUS), cursor))
+            return true;
+        searchFrom = statusIndex + 'status'.length;
+    }
+    return false;
+};
 const delay = (ms) => new Promise(resolve => {
     setTimeout(resolve, ms);
 });
@@ -239,7 +270,7 @@ const getFirmwareUploadWriteRetryType = (error) => {
     const text = [bleWriteError.reason, bleWriteError.message, bleWriteError.name]
         .filter(value => typeof value === 'string')
         .join(' ');
-    return /GATT_CONGESTED|status\s*[:=]?\s*143/.test(text) ? 'congested' : null;
+    return text.includes('GATT_CONGESTED') || hasGattCongestedStatus(text) ? 'congested' : null;
 };
 const resolveFirmwareUploadRetryDelay = (attempt, baseDelayMs = 200, maxDelayMs = 1200) => Math.min(baseDelayMs * Math.pow(2, attempt), maxDelayMs);
 const PROTOCOL_PROBE_TIMEOUT_MS = 1000;
@@ -638,12 +669,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);
                     }
@@ -661,12 +697,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);
                         }
@@ -1160,7 +1199,7 @@ class ReactNativeBleTransport {
                     let attempt = 0;
                     while (true) {
                         try {
-                            yield this.writeBlePacket(uuid, data, payload => transport.writeCharacteristic.writeWithoutResponse(payload), isCurrentOwner);
+                            yield this.writeBlePacket(uuid, data, payload => transport.writeWithRetry(payload), isCurrentOwner);
                             return;
                         }
                         catch (error) {
@@ -1187,7 +1226,10 @@ class ReactNativeBleTransport {
                 for (const o of buffers) {
                     const outData = o.toString('base64');
                     try {
-                        yield this.writeBlePacket(uuid, outData, payload => transport.writeCharacteristic.writeWithoutResponse(payload), isCurrentOwner);
+                        const shouldUseWriteWithResponse = reactNative.Platform.OS === 'ios' && transport.writeCharacteristic.isWritableWithResponse;
+                        yield this.writeBlePacket(uuid, outData, payload => shouldUseWriteWithResponse
+                            ? transport.writeCharacteristic.writeWithResponse(payload)
+                            : transport.writeCharacteristic.writeWithoutResponse(payload), isCurrentOwner);
                     }
                     catch (e) {
                         Log === null || Log === void 0 ? void 0 : Log.debug('writeCharacteristic write error: ', e);
@@ -1520,6 +1562,15 @@ class ReactNativeBleTransport {
     detectProtocol(uuid, expectedProtocol, protocolHint, rebuildTransport) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            if (reactNative.Platform.OS === 'ios' && expectedProtocol) {
+                this.deviceProtocol.set(uuid, expectedProtocol);
+                Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] protocol selected', {
+                    deviceId: uuid,
+                    protocol: expectedProtocol,
+                    source: 'expected',
+                });
+                return expectedProtocol;
+            }
             if (expectedProtocol === 'V1') {
                 if (yield this.probeProtocolV1(uuid)) {
                     this.deviceProtocol.set(uuid, 'V1');
@@ -1749,6 +1800,8 @@ class ReactNativeBleTransport {
     }
     writeProtocolV2Packet(uuid, transport, base64, context, assertCurrentGeneration) {
         return __awaiter(this, void 0, void 0, function* () {
+            const shouldUseWriteWithResponse = transport.writeCharacteristic.isWritableWithResponse &&
+                (context.writeWithResponse === true || (reactNative.Platform.OS === 'ios' && !context.highVolume));
             let attempt = 0;
             for (;;) {
                 assertCurrentGeneration();
@@ -1756,7 +1809,9 @@ class ReactNativeBleTransport {
                     throw new Error(`Protocol V2 BLE write aborted for ${context.messageName}`);
                 }
                 try {
-                    yield this.writeBlePacket(uuid, base64, payload => transport.writeCharacteristic.writeWithoutResponse(payload), () => {
+                    yield this.writeBlePacket(uuid, base64, payload => shouldUseWriteWithResponse
+                        ? transport.writeCharacteristic.writeWithResponse(payload)
+                        : transport.writeCharacteristic.writeWithoutResponse(payload), () => {
                         try {
                             assertCurrentGeneration();
                             return !context.signal.aborted;
@@ -1794,12 +1849,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,
@@ -1819,7 +1878,7 @@ class ReactNativeBleTransport {
                 const tuning = getProtocolV2BleTuning();
                 Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] Protocol V2 high-volume write configured', {
                     name,
-                    writeMode: 'withoutResponse',
+                    writeMode: (options === null || options === void 0 ? void 0 : options.writeWithResponse) ? 'withResponse' : 'withoutResponse',
                     packetCapacity: reactNative.Platform.OS === 'ios' ? tuning.iosPacketLength : tuning.androidPacketLength,
                 });
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-react-native",
-  "version": "1.2.0-alpha.67",
+  "version": "1.2.0-alpha.68",
   "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.67",
-    "@onekeyfe/hd-shared": "1.2.0-alpha.67",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.67",
+    "@onekeyfe/hd-core": "1.2.0-alpha.68",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.68",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.68",
     "@onekeyfe/react-native-ble-utils": "^0.1.6",
     "react-native-ble-plx": "3.5.1"
   },
-  "gitHead": "5fea66e8c65a1fab2ccc099b2811c8749b2487e0"
+  "gitHead": "6e8a931d08768980cfe7fa918bba447ed73e2724"
 }

package/src/BleTransport.ts

@@ -1,3 +1,5 @@
+import { Platform } from 'react-native';
+
 import type { Characteristic, Device, Subscription } from 'react-native-ble-plx';
 
 export default class BleTransport {
@@ -33,6 +35,10 @@ export default class BleTransport {
   }
 
   async writeWithRetry(data: string): Promise<void> {
+    if (Platform.OS === 'ios' && this.writeCharacteristic.isWritableWithResponse) {
+      await this.writeCharacteristic.writeWithResponse(data);
+      return;
+    }
     await this.writeCharacteristic.writeWithoutResponse(data);
   }
 }

package/src/__tests__/BleTransport.test.ts

@@ -1,7 +1,16 @@
 import { BleErrorCode } from 'react-native-ble-plx';
+import { Platform } from 'react-native';
 
 import BleTransport from '../BleTransport';
 
+jest.mock(
+  'react-native',
+  () => ({
+    Platform: { OS: 'ios' },
+  }),
+  { virtual: true }
+);
+
 jest.mock(
   'react-native-ble-plx',
   () => ({
@@ -19,12 +28,18 @@ jest.mock('@onekeyfe/hd-shared', () => ({
 }));
 
 describe('BleTransport side-effecting writes', () => {
+  beforeEach(() => {
+    Platform.OS = 'ios';
+  });
+
   test('does not reconnect or replay after the device disconnects', async () => {
     const error = Object.assign(new Error('device disconnected'), {
       errorCode: BleErrorCode.DeviceDisconnected,
     });
     const writeCharacteristic = {
-      writeWithoutResponse: jest.fn(() => Promise.reject(error)),
+      isWritableWithResponse: true,
+      writeWithResponse: jest.fn(() => Promise.reject(error)),
+      writeWithoutResponse: jest.fn(() => Promise.resolve()),
     };
     const device = {
       id: 'classic-id',
@@ -35,7 +50,44 @@ describe('BleTransport side-effecting writes', () => {
 
     await expect(transport.writeWithRetry('payload')).rejects.toBe(error);
 
-    expect(writeCharacteristic.writeWithoutResponse).toHaveBeenCalledTimes(1);
+    expect(writeCharacteristic.writeWithResponse).toHaveBeenCalledTimes(1);
     expect(device.connect).not.toHaveBeenCalled();
   });
+
+  test('keeps Android Protocol V1 writes on writeWithoutResponse', async () => {
+    Platform.OS = 'android';
+    const writeCharacteristic = {
+      isWritableWithResponse: true,
+      writeWithResponse: jest.fn(() => Promise.resolve()),
+      writeWithoutResponse: jest.fn(() => Promise.resolve()),
+    };
+    const transport = new BleTransport(
+      { id: 'classic-id' } as any,
+      writeCharacteristic as any,
+      {} as any
+    );
+
+    await transport.writeWithRetry('payload');
+
+    expect(writeCharacteristic.writeWithResponse).not.toHaveBeenCalled();
+    expect(writeCharacteristic.writeWithoutResponse).toHaveBeenCalledWith('payload');
+  });
+
+  test('uses writeWithoutResponse on iOS when the characteristic lacks response support', async () => {
+    const writeCharacteristic = {
+      isWritableWithResponse: false,
+      writeWithResponse: jest.fn(() => Promise.resolve()),
+      writeWithoutResponse: jest.fn(() => Promise.resolve()),
+    };
+    const transport = new BleTransport(
+      { id: 'classic-id' } as any,
+      writeCharacteristic as any,
+      {} as any
+    );
+
+    await transport.writeWithRetry('payload');
+
+    expect(writeCharacteristic.writeWithResponse).not.toHaveBeenCalled();
+    expect(writeCharacteristic.writeWithoutResponse).toHaveBeenCalledWith('payload');
+  });
 });

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,
   };
@@ -264,6 +290,19 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
     ).toBeNull();
   });
 
+  test.each(['status 143', 'status:143', 'status = 143', 'GATT_CONGESTED'])(
+    'classifies %s as transient GATT congestion',
+    message => {
+      expect(getFirmwareUploadWriteRetryType({ message })).toBe('congested');
+    }
+  );
+
+  test('handles long uncontrolled status messages without a backtracking regular expression', () => {
+    const message = `status${' '.repeat(100_000)}142`;
+
+    expect(getFirmwareUploadWriteRetryType({ message })).toBeNull();
+  });
+
   test('keeps another device reader when releasing a device with an active V1 call', async () => {
     const transport = new ReactNativeBleTransport({ scanTimeout: 1 }) as any;
     const activeV1Call = createDeferred<string>();
@@ -302,12 +341,101 @@ 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, expectedProtocol: 'V1' })).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, expectedProtocol: 'V1' });
+    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, expectedProtocol: 'V1' });
+    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('actively probes Protocol V2 on iOS when only a name-derived hint is available', async () => {
+    const { transport, uuid, sentSeqs, writeCharacteristic } = createHarness({
+      deviceName: 'Pro2 6E9E',
+    });
+
+    await expect(transport.acquire({ uuid })).resolves.toEqual({
+      uuid,
+      protocolType: 'V2',
+    });
+    expect(writeCharacteristic.writeWithResponse).toHaveBeenCalledTimes(1);
+
+    await expect(
+      transport.call(uuid, 'Ping', { message: 'first-core-command' })
+    ).resolves.toBeDefined();
+    expect(sentSeqs).toEqual([1, 2]);
+    await transport.release(uuid, true);
+  });
+
+  test('falls back to the other active probe on iOS when protocol metadata is absent', async () => {
+    const { transport, uuid } = createHarness({ deviceName: 'OneKey' });
+    const probeProtocolV1 = jest
+      .spyOn(transport as any, 'probeProtocolV1')
+      .mockResolvedValue(false);
+    const probeProtocolV2 = jest.spyOn(transport as any, 'probeProtocolV2').mockResolvedValue(true);
+
+    await expect(transport.acquire({ uuid })).resolves.toEqual({
+      uuid,
+      protocolType: 'V2',
+    });
+
+    expect(probeProtocolV1).toHaveBeenCalledTimes(1);
+    expect(probeProtocolV2).toHaveBeenCalledTimes(1);
+    expect(probeProtocolV1.mock.invocationCallOrder[0]).toBeLessThan(
+      probeProtocolV2.mock.invocationCallOrder[0]
+    );
+    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 +461,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 +482,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,29 +496,31 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
   });
 
   afterEach(() => {
+    setPlatformOS('ios');
     resetProtocolV2BleTuning();
   });
 
-  test('keeps the Protocol V2 sequence across probe and the next call', async () => {
+  test('uses the first Protocol V2 sequence for the first Core call when protocol is known', async () => {
     const { transport, uuid, sentSeqs } = createHarness();
 
-    await transport.acquire({ uuid });
-    await transport.call(uuid, 'Ping', { message: 'after-probe' });
+    await transport.acquire({ uuid, expectedProtocol: 'V2' });
+    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);
   });
 
   test('rejects the active Protocol V2 reader when the current monitor errors', async () => {
     const harness = createHarness();
     const { transport, uuid, sentSeqs } = harness;
-    await transport.acquire({ uuid });
+    await transport.acquire({ uuid, expectedProtocol: 'V2' });
     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);
@@ -402,40 +535,149 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
   test('retains the sequence cursor when a new monitor generation is acquired', async () => {
     const { transport, uuid, sentSeqs } = createHarness();
 
-    await transport.acquire({ uuid });
+    await transport.acquire({ uuid, expectedProtocol: 'V2' });
+    await transport.call(uuid, 'Ping', { message: 'first-generation' });
     await transport.release(uuid, true);
-    await transport.acquire({ uuid });
+    await transport.acquire({ uuid, expectedProtocol: 'V2' });
+    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);
+    await transport.acquire({ uuid, expectedProtocol: 'V2' });
+    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, expectedProtocol: 'V2' });
 
     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('uses withResponse for an iOS Protocol V2 firmware file write when requested', async () => {
+    const { transport, uuid, writeCharacteristic } = createHarness();
+
+    await transport.acquire({ uuid, expectedProtocol: 'V2' });
+
+    await transport.call(uuid, 'FileWrite', {}, { writeWithResponse: true });
+    expect(writeCharacteristic.writeWithResponse).toHaveBeenCalledTimes(1);
+    expect(writeCharacteristic.writeWithoutResponse).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, expectedProtocol: 'V2' });
+    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(
+        'test-device',
+        {
+          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(
+        'test-device',
+        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;
-    await transport.acquire({ uuid });
+    await transport.acquire({ uuid, expectedProtocol: 'V2' });
     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');
@@ -448,7 +690,7 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
     const disconnectListener = jest.fn();
     harness.emitter.on(TRANSPORT_EVENT.DEVICE_DISCONNECT, disconnectListener);
 
-    await harness.transport.acquire({ uuid: harness.uuid });
+    await harness.transport.acquire({ uuid: harness.uuid, expectedProtocol: 'V2' });
     harness.emitDisconnect();
     await harness.transport.disconnect(harness.uuid);
 

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;
@@ -71,6 +73,33 @@ type ResolvedBleCharacteristics = {
   notifyCharacteristic: Characteristic;
 };
 
+const isAsciiWhitespace = (code: number) =>
+  code === 0x09 ||
+  code === 0x0a ||
+  code === 0x0b ||
+  code === 0x0c ||
+  code === 0x0d ||
+  code === 0x20;
+
+const hasGattCongestedStatus = (text: string) => {
+  let searchFrom = 0;
+  while (searchFrom < text.length) {
+    const statusIndex = text.indexOf('status', searchFrom);
+    if (statusIndex < 0) return false;
+
+    let cursor = statusIndex + 'status'.length;
+    while (cursor < text.length && isAsciiWhitespace(text.charCodeAt(cursor))) cursor += 1;
+    if (text[cursor] === ':' || text[cursor] === '=') {
+      cursor += 1;
+      while (cursor < text.length && isAsciiWhitespace(text.charCodeAt(cursor))) cursor += 1;
+    }
+    if (text.startsWith(String(ANDROID_GATT_CONGESTED_STATUS), cursor)) return true;
+
+    searchFrom = statusIndex + 'status'.length;
+  }
+  return false;
+};
+
 const delay = (ms: number) =>
   new Promise<void>(resolve => {
     setTimeout(resolve, ms);
@@ -99,7 +128,7 @@ export const getFirmwareUploadWriteRetryType = (
   const text = [bleWriteError.reason, bleWriteError.message, bleWriteError.name]
     .filter(value => typeof value === 'string')
     .join(' ');
-  return /GATT_CONGESTED|status\s*[:=]?\s*143/.test(text) ? 'congested' : null;
+  return text.includes('GATT_CONGESTED') || hasGattCongestedStatus(text) ? 'congested' : null;
 };
 
 const resolveFirmwareUploadRetryDelay = (attempt: number, baseDelayMs = 200, maxDelayMs = 1200) =>
@@ -655,12 +684,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)) {
@@ -681,7 +719,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,
@@ -1331,7 +1374,7 @@ export default class ReactNativeBleTransport {
               await this.writeBlePacket(
                 uuid,
                 data,
-                payload => transport.writeCharacteristic.writeWithoutResponse(payload),
+                payload => transport.writeWithRetry(payload),
                 isCurrentOwner
               );
               return;
@@ -1361,10 +1404,15 @@ export default class ReactNativeBleTransport {
         const outData = o.toString('base64');
         // Upload resources on low-end phones may OOM
         try {
+          const shouldUseWriteWithResponse =
+            Platform.OS === 'ios' && transport.writeCharacteristic.isWritableWithResponse;
           await this.writeBlePacket(
             uuid,
             outData,
-            payload => transport.writeCharacteristic.writeWithoutResponse(payload),
+            payload =>
+              shouldUseWriteWithResponse
+                ? transport.writeCharacteristic.writeWithResponse(payload)
+                : transport.writeCharacteristic.writeWithoutResponse(payload),
             isCurrentOwner
           );
         } catch (e) {
@@ -1780,6 +1828,16 @@ export default class ReactNativeBleTransport {
     protocolHint?: ProtocolType,
     rebuildTransport?: () => Promise<void>
   ): Promise<ProtocolType> {
+    if (Platform.OS === 'ios' && expectedProtocol) {
+      this.deviceProtocol.set(uuid, expectedProtocol);
+      Log?.debug('[ReactNativeBleTransport] protocol selected', {
+        deviceId: uuid,
+        protocol: expectedProtocol,
+        source: 'expected',
+      });
+      return expectedProtocol;
+    }
+
     if (expectedProtocol === 'V1') {
       if (await this.probeProtocolV1(uuid)) {
         this.deviceProtocol.set(uuid, 'V1');
@@ -2048,6 +2106,9 @@ export default class ReactNativeBleTransport {
     context: ProtocolV2CallContext,
     assertCurrentGeneration: () => void
   ) {
+    const shouldUseWriteWithResponse =
+      transport.writeCharacteristic.isWritableWithResponse &&
+      (context.writeWithResponse === true || (Platform.OS === 'ios' && !context.highVolume));
     let attempt = 0;
     for (;;) {
       assertCurrentGeneration();
@@ -2058,7 +2119,10 @@ export default class ReactNativeBleTransport {
         await this.writeBlePacket(
           uuid,
           base64,
-          payload => transport.writeCharacteristic.writeWithoutResponse(payload),
+          payload =>
+            shouldUseWriteWithResponse
+              ? transport.writeCharacteristic.writeWithResponse(payload)
+              : transport.writeCharacteristic.writeWithoutResponse(payload),
           // Same rule as Protocol V1: a write from a superseded generation must not
           // tear down the link that the current generation is using.
           () => {
@@ -2105,12 +2169,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,
@@ -2143,7 +2214,7 @@ export default class ReactNativeBleTransport {
       const tuning = getProtocolV2BleTuning();
       Log?.debug('[ReactNativeBleTransport] Protocol V2 high-volume write configured', {
         name,
-        writeMode: 'withoutResponse',
+        writeMode: options?.writeWithResponse ? 'withResponse' : 'withoutResponse',
         packetCapacity: Platform.OS === 'ios' ? tuning.iosPacketLength : tuning.androidPacketLength,
       });
     }