@onekeyfe/hd-transport-react-native 1.2.0-alpha.73 → 1.2.0-alpha.75

package/package.json

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

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 {
@@ -32,16 +34,11 @@ export default class BleTransport {
     this.notifyCharacteristic = notifyCharacteristic;
   }
 
-  /**
-   * Bulk-transfer write (Protocol V1 FirmwareUpload / EmmcFileWrite only).
-   *
-   * Must stay writeWithoutResponse on every platform. writeWithResponse serialises
-   * each packet into its own connection-interval round trip, which on iOS turned a
-   * 1.7MB firmware upload (~13.5k packets) into a >10 minute transfer that never
-   * finished before the app-level timeout. Protocol V2 and ordinary V1 control
-   * messages pick their write type separately and are unaffected by this method.
-   */
   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

@@ -38,8 +38,8 @@ describe('BleTransport side-effecting writes', () => {
     });
     const writeCharacteristic = {
       isWritableWithResponse: true,
-      writeWithResponse: jest.fn(() => Promise.resolve()),
-      writeWithoutResponse: jest.fn(() => Promise.reject(error)),
+      writeWithResponse: jest.fn(() => Promise.reject(error)),
+      writeWithoutResponse: jest.fn(() => Promise.resolve()),
     };
     const device = {
       id: 'classic-id',
@@ -50,31 +50,10 @@ 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 iOS bulk transfer on writeWithoutResponse even when the characteristic supports responses', async () => {
-    // writeWithResponse serialises every packet into its own connection-interval
-    // round trip. On a ~1.7MB firmware (~13.5k packets) that stalled the upload past
-    // the 600s app-level timeout, so bulk transfer must never opt into it.
-    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('keeps Android Protocol V1 writes on writeWithoutResponse', async () => {
     Platform.OS = 'android';
     const writeCharacteristic = {

package/src/__tests__/protocolV2Link.test.ts

@@ -7,7 +7,6 @@ import transportPackage, {
 import { HardwareErrorCode, createDeferred } from '@onekeyfe/hd-shared';
 
 import ReactNativeBleTransport, {
-  BLE_WRITE_PACKET_TIMEOUT_MS,
   configureProtocolV2BleTuning,
   getFirmwareUploadWriteRetryType,
   resetProtocolV2BleTuning,
@@ -756,7 +755,6 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
 
     await expect(
       transport.writeProtocolV2Packet(
-        'test-device',
         {
           writeCharacteristic: {
             isWritableWithResponse: true,
@@ -791,19 +789,9 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
     const setTimeoutSpy = jest.spyOn(global, 'setTimeout');
 
     try {
-      const call = transport.writeProtocolV2Frame(
-        'test-device',
-        bleTransport,
-        new Uint8Array(10),
-        context,
-        jest.fn()
-      );
+      await transport.writeProtocolV2Frame(bleTransport, new Uint8Array(10), context, jest.fn());
 
-      await call;
-      // The only scheduled timer is the per-packet BLE write watchdog: no pacing delay.
-      expect(setTimeoutSpy.mock.calls.map(([, timeout]) => timeout)).toEqual([
-        BLE_WRITE_PACKET_TIMEOUT_MS,
-      ]);
+      expect(setTimeoutSpy).not.toHaveBeenCalled();
       expect(writeWithoutResponse).toHaveBeenCalledTimes(1);
     } finally {
       setTimeoutSpy.mockRestore();
@@ -867,7 +855,6 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
     configureProtocolV2BleTuning({ iosPacketLength: 20 });
 
     await transport.writeProtocolV2Frame(
-      'device-uuid',
       bleTransport,
       new Uint8Array(30),
       context,
@@ -899,13 +886,7 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
     configureProtocolV2BleTuning({ iosPacketLength: 20 });
 
     await expect(
-      transport.writeProtocolV2Frame(
-        'device-uuid',
-        bleTransport,
-        new Uint8Array(30),
-        context,
-        jest.fn()
-      )
+      transport.writeProtocolV2Frame(bleTransport, new Uint8Array(30), context, jest.fn())
     ).rejects.toMatchObject({ errorCode: 205 });
     expect(writeWithoutResponse).toHaveBeenCalledTimes(1);
   });
@@ -927,21 +908,10 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
     const setTimeoutSpy = jest.spyOn(global, 'setTimeout');
 
     try {
-      await transport.writeProtocolV2Frame(
-        'test-device',
-        bleTransport,
-        new Uint8Array(600),
-        context,
-        jest.fn()
-      );
+      await transport.writeProtocolV2Frame(bleTransport, new Uint8Array(600), context, jest.fn());
 
       expect(writeWithoutResponse).toHaveBeenCalledTimes(3);
-      // One BLE write watchdog per packet and nothing else: no burst or flush pauses.
-      expect(setTimeoutSpy.mock.calls.map(([, timeout]) => timeout)).toEqual([
-        BLE_WRITE_PACKET_TIMEOUT_MS,
-        BLE_WRITE_PACKET_TIMEOUT_MS,
-        BLE_WRITE_PACKET_TIMEOUT_MS,
-      ]);
+      expect(setTimeoutSpy).not.toHaveBeenCalled();
     } finally {
       setTimeoutSpy.mockRestore();
     }