@onekeyfe/hd-transport-react-native 1.2.0-alpha.72 → 1.2.0-alpha.74

package/dist/BleTransport.d.ts.map

@@ -1 +1 @@
-{"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,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B,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"}
+{"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,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B,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;IAiBhC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAGlD"}

package/dist/index.d.ts

@@ -16,6 +16,15 @@ declare class BleTransport {
     notifyTransactionId?: string;
     monitorToken?: number;
     constructor(device: Device, writeCharacteristic: Characteristic, notifyCharacteristic: Characteristic);
+    /**
+     * 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.
+     */
     writeWithRetry(data: string): Promise<void>;
 }
 

package/dist/index.js

@@ -216,10 +216,6 @@ 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);
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-react-native",
-  "version": "1.2.0-alpha.72",
+  "version": "1.2.0-alpha.74",
   "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.72",
-    "@onekeyfe/hd-shared": "1.2.0-alpha.72",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.72",
+    "@onekeyfe/hd-core": "1.2.0-alpha.74",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.74",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.74",
     "@onekeyfe/react-native-ble-utils": "^0.1.6",
     "react-native-ble-plx": "3.5.1"
   },
-  "gitHead": "76311ccd3753eca8e492b5324f93542bd38525ba"
+  "gitHead": "4b263fb8e60a3286d9ad12d6b3bce3b0f8d023ce"
 }

package/src/BleTransport.ts

@@ -1,5 +1,3 @@
-import { Platform } from 'react-native';
-
 import type { Characteristic, Device, Subscription } from 'react-native-ble-plx';
 
 export default class BleTransport {
@@ -34,11 +32,16 @@ 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.reject(error)),
-      writeWithoutResponse: jest.fn(() => Promise.resolve()),
+      writeWithResponse: jest.fn(() => Promise.resolve()),
+      writeWithoutResponse: jest.fn(() => Promise.reject(error)),
     };
     const device = {
       id: 'classic-id',
@@ -50,10 +50,31 @@ describe('BleTransport side-effecting writes', () => {
 
     await expect(transport.writeWithRetry('payload')).rejects.toBe(error);
 
-    expect(writeCharacteristic.writeWithResponse).toHaveBeenCalledTimes(1);
+    expect(writeCharacteristic.writeWithoutResponse).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__/connectTimeout.test.ts

@@ -1,11 +1,10 @@
 import { EventEmitter } from 'events';
 import { BleErrorCode } from 'react-native-ble-plx';
-
 import { HardwareErrorCode } from '@onekeyfe/hd-shared';
 
 import ReactNativeBleTransport, {
-  BLE_CONNECT_TIMEOUT_MS,
   BLE_CONNECT_TIMEOUT_MANAGER_RESET_THRESHOLD,
+  BLE_CONNECT_TIMEOUT_MS,
   BLE_GATT_SETUP_TIMEOUT_MS,
 } from '../index';
 import protocolV1Schema from './protocolV1SchemaFixture';