@onekeyfe/hd-transport-react-native 1.2.0-alpha.21 → 1.2.0-alpha.22

package/dist/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,iBAAiB,MAAM,CAAC;AACrC,eAAO,MAAM,qBAAqB,MAAM,CAAC;AACzC,eAAO,MAAM,mBAAmB,KAAK,CAAC;AA8BtC,eAAO,MAAM,wBAAwB,gBAA0B,CAAC;AAChE,eAAO,MAAM,sBAAsB,gBAAiB,MAAM,cAAc,SAAS;iBA1BhE,MAAM;;;QAyCtB,CAAC;AAEF,eAAO,MAAM,gBAAgB,UAAW,MAAM,GAAG,IAAI,WACP,CAAC;AAE/C,eAAO,MAAM,aAAa,UAAW,MAAM,GAAG,IAAI,WAGjD,CAAC;AAEF,eAAO,MAAM,aAAa,UAAW,MAAM,GAAG,IAAI,UAAU,MAAM,GAAG,IAAI,YAQxE,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,iBAAiB,MAAM,CAAC;AACrC,eAAO,MAAM,qBAAqB,MAAM,CAAC;AACzC,eAAO,MAAM,mBAAmB,KAAK,CAAC;AAoCtC,eAAO,MAAM,wBAAwB,gBAA0B,CAAC;AAChE,eAAO,MAAM,sBAAsB,gBAAiB,MAAM,cAAc,SAAS;iBAhChE,MAAM;;;QAiDtB,CAAC;AAEF,eAAO,MAAM,gBAAgB,UAAW,MAAM,GAAG,IAAI,WACP,CAAC;AAE/C,eAAO,MAAM,aAAa,UAAW,MAAM,GAAG,IAAI,WAGjD,CAAC;AAEF,eAAO,MAAM,aAAa,UAAW,MAAM,GAAG,IAAI,UAAU,MAAM,GAAG,IAAI,YAQxE,CAAC"}

package/dist/index.d.ts

@@ -113,6 +113,7 @@ declare class ReactNativeBleTransport {
     private resetProtocolV2Frames;
     private rejectProtocolV2Frames;
     private readProtocolV2Frame;
+    private writeProtocolV2Packet;
     private writeProtocolV2Frame;
     private callProtocolV2;
     private createProtocolV2Adapter;

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

@@ -95,6 +95,7 @@ const IOS_PACKET_LENGTH = 128;
 const ANDROID_PACKET_LENGTH = 192;
 const ANDROID_DEFAULT_MTU = 23;
 const ClassicServiceUUID = '00000001-0000-1000-8000-00805f9b34fb';
+const Pro2ServiceUUID = 'fffd';
 const OneKeyServices = {
     classic: {
         [ClassicServiceUUID]: {
@@ -102,6 +103,11 @@ const OneKeyServices = {
             writeUuid: '00000002-0000-1000-8000-00805f9b34fb',
             notifyUuid: '00000003-0000-1000-8000-00805f9b34fb',
         },
+        [Pro2ServiceUUID]: {
+            serviceUuid: Pro2ServiceUUID,
+            writeUuid: '00000002-0000-1000-8000-00805f9b34fb',
+            notifyUuid: '00000003-0000-1000-8000-00805f9b34fb',
+        },
     },
 };
 const bluetoothServices = [];
@@ -117,7 +123,8 @@ const getInfosForServiceUuid = (serviceUuid, deviceType) => {
         return null;
     }
     const normalizedServiceUuid = normalizeBleUuid(serviceUuid);
-    const service = (_a = services[serviceUuid]) !== null && _a !== void 0 ? _a : Object.values(services).find(item => normalizeBleUuid(item.serviceUuid) === normalizedServiceUuid);
+    const service = (_a = services[serviceUuid]) !== null && _a !== void 0 ? _a : Object.values(services).find(item => normalizeBleUuid(item.serviceUuid) === normalizedServiceUuid ||
+        getBleUuidKey(item.serviceUuid) === getBleUuidKey(serviceUuid));
     if (!service) {
         return null;
     }
@@ -289,7 +296,6 @@ const getFirmwareUploadWriteRetryType = (error) => {
     return /GATT_CONGESTED|status\s*[:=]?\s*143/.test(text) ? 'congested' : null;
 };
 const resolveFirmwareUploadRetryDelay = (attempt, baseDelayMs = 200, maxDelayMs = 1200) => Math.min(baseDelayMs * Math.pow(2, attempt), maxDelayMs);
-const BLE_RESPONSE_TIMEOUT_MS = 30000;
 const PROTOCOL_PROBE_TIMEOUT_MS = 1000;
 const PROTOCOL_V2_PROBE_TIMEOUT_MS = 10000;
 const DEVICE_SCAN_TIMEOUT_MS = 8000;
@@ -1326,13 +1332,16 @@ class ReactNativeBleTransport {
                 throw this.createProtocolMismatchError(expectedProtocol);
             }
             if (expectedProtocol === 'V2') {
-                this.deviceProtocol.set(uuid, 'V2');
-                Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] protocol detected', {
-                    deviceId: uuid,
-                    protocol: 'V2',
-                    source: 'expected',
-                });
-                return 'V2';
+                if (yield this.probeProtocolV2(uuid)) {
+                    this.deviceProtocol.set(uuid, 'V2');
+                    Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] protocol detected', {
+                        deviceId: uuid,
+                        protocol: 'V2',
+                        source: 'expected',
+                    });
+                    return 'V2';
+                }
+                throw this.createProtocolMismatchError(expectedProtocol);
             }
             const probeOrder = protocolHint === 'V2' || this.deviceProtocol.get(uuid) === 'V2' ? ['V2', 'V1'] : ['V1', 'V2'];
             for (let i = 0; i < probeOrder.length; i += 1) {
@@ -1515,7 +1524,37 @@ class ReactNativeBleTransport {
             }
         });
     }
-    writeProtocolV2Frame(transport, frame) {
+    writeProtocolV2Packet(transport, base64, context, assertCurrentGeneration) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let attempt = 0;
+            for (;;) {
+                assertCurrentGeneration();
+                if (context.signal.aborted) {
+                    throw new Error(`Protocol V2 BLE write aborted for ${context.messageName}`);
+                }
+                try {
+                    yield transport.writeCharacteristic.writeWithoutResponse(base64);
+                    assertCurrentGeneration();
+                    return;
+                }
+                catch (error) {
+                    if (getFirmwareUploadWriteRetryType(error) !== 'congested' ||
+                        attempt >= FIRMWARE_UPLOAD_WRITE_MAX_RETRIES) {
+                        throw error;
+                    }
+                    const delayMs = resolveFirmwareUploadRetryDelay(attempt);
+                    attempt += 1;
+                    Log === null || Log === void 0 ? void 0 : Log.debug('[ReactNativeBleTransport] Protocol V2 congested write retry:', {
+                        name: context.messageName,
+                        attempt,
+                        delayMs,
+                    });
+                    yield delay(delayMs);
+                }
+            }
+        });
+    }
+    writeProtocolV2Frame(transport, frame, context, assertCurrentGeneration) {
         return __awaiter(this, void 0, void 0, function* () {
             const tuning = getProtocolV2BleTuning();
             const packetCapacity = resolveProtocolV2PacketCapacity({
@@ -1524,20 +1563,28 @@ class ReactNativeBleTransport {
                 androidPacketLength: tuning.androidPacketLength,
                 mtu: reactNative.Platform.OS === 'android' ? transport.mtuSize : undefined,
             });
+            let packetsWritten = 0;
             for (let offset = 0; offset < frame.length; offset += packetCapacity) {
                 const chunk = frame.slice(offset, offset + packetCapacity);
                 const base64 = buffer.Buffer.from(chunk).toString('base64');
-                yield transport.writeCharacteristic.writeWithoutResponse(base64);
+                yield this.writeProtocolV2Packet(transport, base64, context, assertCurrentGeneration);
+                packetsWritten += 1;
+                if (offset + packetCapacity < frame.length &&
+                    packetsWritten % FIRMWARE_UPLOAD_WRITE_BURST_SIZE === 0) {
+                    yield delay(FIRMWARE_UPLOAD_WRITE_PAUSE_MS);
+                }
+            }
+            if (packetsWritten > FIRMWARE_UPLOAD_WRITE_BURST_SIZE) {
+                yield delay(FIRMWARE_UPLOAD_WRITE_FLUSH_DELAY_MS);
             }
         });
     }
     callProtocolV2(uuid, name, data, options) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (!this._messages || !this._messagesV2) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
             }
-            const callOptions = Object.assign(Object.assign({}, options), { timeoutMs: (_a = options === null || options === void 0 ? void 0 : options.timeoutMs) !== null && _a !== void 0 ? _a : BLE_RESPONSE_TIMEOUT_MS });
+            const callOptions = options;
             const highVolumeWrite = transport.LogBlockCommand.has(name);
             if (highVolumeWrite) {
                 const tuning = getProtocolV2BleTuning();
@@ -1574,10 +1621,10 @@ class ReactNativeBleTransport {
                 (_a = this.protocolV2Assemblers.get(uuid)) === null || _a === void 0 ? void 0 : _a.reset();
                 this.resetProtocolV2Frames(uuid);
             },
-            writeFrame: (frame) => __awaiter(this, void 0, void 0, function* () {
+            writeFrame: (frame, context) => __awaiter(this, void 0, void 0, function* () {
                 assertCurrentGeneration();
                 const currentTransport = this.getCachedTransport(uuid);
-                yield this.writeProtocolV2Frame(currentTransport, frame);
+                yield this.writeProtocolV2Frame(currentTransport, frame, context, assertCurrentGeneration);
             }),
             readFrame: () => __awaiter(this, void 0, void 0, function* () {
                 assertCurrentGeneration();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-react-native",
-  "version": "1.2.0-alpha.21",
+  "version": "1.2.0-alpha.22",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
   "main": "dist/index.js",
@@ -19,11 +19,11 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-core": "1.2.0-alpha.21",
-    "@onekeyfe/hd-shared": "1.2.0-alpha.21",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.21",
+    "@onekeyfe/hd-core": "1.2.0-alpha.22",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.22",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.22",
     "@onekeyfe/react-native-ble-utils": "^0.1.6",
     "react-native-ble-plx": "3.5.1"
   },
-  "gitHead": "efe594367fb3b196a5126baee7e2aba3e94986cd"
+  "gitHead": "ce94a5ebbe141b0c15db7c68d08085ca1ddb0166"
 }

package/src/__tests__/protocolV2Link.test.ts

@@ -6,7 +6,10 @@ import transportPackage, {
 } from '@onekeyfe/hd-transport';
 import { HardwareErrorCode } from '@onekeyfe/hd-shared';
 
-import ReactNativeBleTransport from '../index';
+import ReactNativeBleTransport, {
+  configureProtocolV2BleTuning,
+  resetProtocolV2BleTuning,
+} from '../index';
 
 jest.mock(
   'react-native',
@@ -91,6 +94,7 @@ const schemas = {
 const createHarness = () => {
   const uuid = 'rn-pro2-id';
   const sentSeqs: number[] = [];
+  let responseSeq = 0;
   let shouldRespond = true;
   let notifyCallback:
     | ((
@@ -111,11 +115,12 @@ const createHarness = () => {
     const frame = Buffer.from(base64, 'base64');
     sentSeqs.push(frame[6]);
     if (shouldRespond) {
+      responseSeq += 1;
       const response = ProtocolV2.encodeFrame(
         schemas,
         'Success',
         { message: 'ok' },
-        { router: PROTOCOL_V2_CHANNEL_BLE_UART }
+        { router: PROTOCOL_V2_CHANNEL_BLE_UART, seq: responseSeq }
       );
       notifyCallback?.(null, { value: Buffer.from(response).toString('base64') });
     }
@@ -166,6 +171,10 @@ const createHarness = () => {
 };
 
 describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
+  afterEach(() => {
+    resetProtocolV2BleTuning();
+  });
+
   test('keeps the Protocol V2 sequence across probe and the next call', async () => {
     const { transport, uuid, sentSeqs } = createHarness();
 
@@ -240,4 +249,62 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
     await transport.disconnect(uuid);
     await rejection;
   });
+
+  test('chunks large frames and retries only transient GATT congestion', async () => {
+    const transport = new ReactNativeBleTransport({ scanTimeout: 1 }) as any;
+    const congested = { status: 143, message: 'GATT_CONGESTED' };
+    const writeWithoutResponse = jest
+      .fn()
+      .mockRejectedValueOnce(congested)
+      .mockResolvedValue(undefined);
+    const bleTransport = {
+      mtuSize: 23,
+      writeCharacteristic: { writeWithoutResponse },
+    };
+    const context = {
+      messageName: 'Ping',
+      timeoutMs: 1000,
+      highVolume: false,
+      generation: 1,
+      signal: new AbortController().signal,
+    };
+    const assertCurrentGeneration = jest.fn();
+    configureProtocolV2BleTuning({ iosPacketLength: 20 });
+
+    await transport.writeProtocolV2Frame(
+      bleTransport,
+      new Uint8Array(30),
+      context,
+      assertCurrentGeneration
+    );
+
+    expect(writeWithoutResponse).toHaveBeenCalledTimes(3);
+    expect(writeWithoutResponse.mock.calls[0][0]).toBe(writeWithoutResponse.mock.calls[1][0]);
+    expect(Buffer.from(writeWithoutResponse.mock.calls[2][0], 'base64')).toHaveLength(10);
+    expect(assertCurrentGeneration).toHaveBeenCalled();
+  });
+
+  test('does not retry a disconnected Protocol V2 write inside a partial frame', async () => {
+    const transport = new ReactNativeBleTransport({ scanTimeout: 1 }) as any;
+    const writeWithoutResponse = jest
+      .fn()
+      .mockRejectedValue({ errorCode: 205, message: 'Device disconnected' });
+    const bleTransport = {
+      mtuSize: 23,
+      writeCharacteristic: { writeWithoutResponse },
+    };
+    const context = {
+      messageName: 'FileWrite',
+      timeoutMs: 1000,
+      highVolume: true,
+      generation: 1,
+      signal: new AbortController().signal,
+    };
+    configureProtocolV2BleTuning({ iosPacketLength: 20 });
+
+    await expect(
+      transport.writeProtocolV2Frame(bleTransport, new Uint8Array(30), context, jest.fn())
+    ).rejects.toMatchObject({ errorCode: 205 });
+    expect(writeWithoutResponse).toHaveBeenCalledTimes(1);
+  });
 });

package/src/constants.ts

@@ -12,6 +12,7 @@ type BluetoothServices = Record<
 >;
 
 const ClassicServiceUUID = '00000001-0000-1000-8000-00805f9b34fb';
+const Pro2ServiceUUID = 'fffd';
 
 const OneKeyServices: Record<string, BluetoothServices> = {
   classic: {
@@ -20,6 +21,11 @@ const OneKeyServices: Record<string, BluetoothServices> = {
       writeUuid: '00000002-0000-1000-8000-00805f9b34fb',
       notifyUuid: '00000003-0000-1000-8000-00805f9b34fb',
     },
+    [Pro2ServiceUUID]: {
+      serviceUuid: Pro2ServiceUUID,
+      writeUuid: '00000002-0000-1000-8000-00805f9b34fb',
+      notifyUuid: '00000003-0000-1000-8000-00805f9b34fb',
+    },
   },
 };
 
@@ -40,7 +46,9 @@ export const getInfosForServiceUuid = (serviceUuid: string, deviceType: 'classic
   const service =
     services[serviceUuid] ??
     Object.values(services).find(
-      item => normalizeBleUuid(item.serviceUuid) === normalizedServiceUuid
+      item =>
+        normalizeBleUuid(item.serviceUuid) === normalizedServiceUuid ||
+        getBleUuidKey(item.serviceUuid) === getBleUuidKey(serviceUuid)
     );
   if (!service) {
     return null;

package/src/index.ts

@@ -15,6 +15,7 @@ import transport, {
   PROTOCOL_V2_BLE_FRAME_MAX_BYTES,
   PROTOCOL_V2_CHANNEL_BLE_UART,
   type ProtocolType,
+  type ProtocolV2CallContext,
   ProtocolV2FrameAssembler,
   ProtocolV2LinkManager,
   type TransportCallOptions,
@@ -103,7 +104,6 @@ const getFirmwareUploadWriteRetryType = (error: unknown): FirmwareUploadWriteRet
 
 const resolveFirmwareUploadRetryDelay = (attempt: number, baseDelayMs = 200, maxDelayMs = 1200) =>
   Math.min(baseDelayMs * 2 ** attempt, maxDelayMs);
-const BLE_RESPONSE_TIMEOUT_MS = 30_000;
 const PROTOCOL_PROBE_TIMEOUT_MS = 1000;
 const PROTOCOL_V2_PROBE_TIMEOUT_MS = 10_000;
 const DEVICE_SCAN_TIMEOUT_MS = 8000;
@@ -1392,15 +1392,16 @@ export default class ReactNativeBleTransport {
     }
 
     if (expectedProtocol === 'V2') {
-      // Skip probing when the caller explicitly confirms V2, such as reconnect after a
-      // firmware reboot where expectedProtocol carries the previously probed result.
-      this.deviceProtocol.set(uuid, 'V2');
-      Log?.debug('[ReactNativeBleTransport] protocol detected', {
-        deviceId: uuid,
-        protocol: 'V2',
-        source: 'expected',
-      });
-      return 'V2';
+      if (await this.probeProtocolV2(uuid)) {
+        this.deviceProtocol.set(uuid, 'V2');
+        Log?.debug('[ReactNativeBleTransport] protocol detected', {
+          deviceId: uuid,
+          protocol: 'V2',
+          source: 'expected',
+        });
+        return 'V2';
+      }
+      throw this.createProtocolMismatchError(expectedProtocol);
     }
 
     // Protocol must be actively probed after connection. Name, PID, and descriptors only
@@ -1608,7 +1609,47 @@ export default class ReactNativeBleTransport {
     }
   }
 
-  private async writeProtocolV2Frame(transport: BleTransport, frame: Uint8Array) {
+  private async writeProtocolV2Packet(
+    transport: BleTransport,
+    base64: string,
+    context: ProtocolV2CallContext,
+    assertCurrentGeneration: () => void
+  ) {
+    let attempt = 0;
+    for (;;) {
+      assertCurrentGeneration();
+      if (context.signal.aborted) {
+        throw new Error(`Protocol V2 BLE write aborted for ${context.messageName}`);
+      }
+      try {
+        await transport.writeCharacteristic.writeWithoutResponse(base64);
+        assertCurrentGeneration();
+        return;
+      } catch (error) {
+        if (
+          getFirmwareUploadWriteRetryType(error) !== 'congested' ||
+          attempt >= FIRMWARE_UPLOAD_WRITE_MAX_RETRIES
+        ) {
+          throw error;
+        }
+        const delayMs = resolveFirmwareUploadRetryDelay(attempt);
+        attempt += 1;
+        Log?.debug('[ReactNativeBleTransport] Protocol V2 congested write retry:', {
+          name: context.messageName,
+          attempt,
+          delayMs,
+        });
+        await delay(delayMs);
+      }
+    }
+  }
+
+  private async writeProtocolV2Frame(
+    transport: BleTransport,
+    frame: Uint8Array,
+    context: ProtocolV2CallContext,
+    assertCurrentGeneration: () => void
+  ) {
     const tuning = getProtocolV2BleTuning();
     const packetCapacity = resolveProtocolV2PacketCapacity({
       platform: Platform.OS,
@@ -1616,10 +1657,21 @@ export default class ReactNativeBleTransport {
       androidPacketLength: tuning.androidPacketLength,
       mtu: Platform.OS === 'android' ? transport.mtuSize : undefined,
     });
+    let packetsWritten = 0;
     for (let offset = 0; offset < frame.length; offset += packetCapacity) {
       const chunk = frame.slice(offset, offset + packetCapacity);
       const base64 = Buffer.from(chunk).toString('base64');
-      await transport.writeCharacteristic.writeWithoutResponse(base64);
+      await this.writeProtocolV2Packet(transport, base64, context, assertCurrentGeneration);
+      packetsWritten += 1;
+      if (
+        offset + packetCapacity < frame.length &&
+        packetsWritten % FIRMWARE_UPLOAD_WRITE_BURST_SIZE === 0
+      ) {
+        await delay(FIRMWARE_UPLOAD_WRITE_PAUSE_MS);
+      }
+    }
+    if (packetsWritten > FIRMWARE_UPLOAD_WRITE_BURST_SIZE) {
+      await delay(FIRMWARE_UPLOAD_WRITE_FLUSH_DELAY_MS);
     }
   }
 
@@ -1633,10 +1685,7 @@ export default class ReactNativeBleTransport {
       throw ERRORS.TypedError(HardwareErrorCode.TransportNotConfigured);
     }
 
-    const callOptions = {
-      ...options,
-      timeoutMs: options?.timeoutMs ?? BLE_RESPONSE_TIMEOUT_MS,
-    };
+    const callOptions = options;
     const highVolumeWrite = LogBlockCommand.has(name);
 
     if (highVolumeWrite) {
@@ -1679,10 +1728,10 @@ export default class ReactNativeBleTransport {
         this.protocolV2Assemblers.get(uuid)?.reset();
         this.resetProtocolV2Frames(uuid);
       },
-      writeFrame: async (frame: Uint8Array) => {
+      writeFrame: async (frame: Uint8Array, context: ProtocolV2CallContext) => {
         assertCurrentGeneration();
         const currentTransport = this.getCachedTransport(uuid);
-        await this.writeProtocolV2Frame(currentTransport, frame);
+        await this.writeProtocolV2Frame(currentTransport, frame, context, assertCurrentGeneration);
       },
       readFrame: async () => {
         assertCurrentGeneration();