@onekeyfe/hd-transport-react-native 1.2.2-alpha.6 → 1.2.2-alpha.7

package/dist/bleStrategy.d.ts

@@ -11,7 +11,7 @@ export declare function resolveProtocolV2PacketCapacity({ platform, iosPacketLen
     mtu?: number | null;
 }): number;
 export declare function shouldRefreshNegotiatedMtu(mtu?: number | null): boolean;
-export declare function shouldWriteProtocolV2WithResponse({ platform, highThroughput, requestedWithResponse, characteristic, }: {
+export declare function shouldWriteProtocolV2WithResponse({ requestedWithResponse, characteristic, }: {
     platform: BlePlatform;
     highThroughput: boolean;
     requestedWithResponse?: boolean;

package/dist/bleStrategy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bleStrategy.d.ts","sourceRoot":"","sources":["../src/bleStrategy.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,WAAW,GAAG,KAAK,GAAG,SAAS,GAAG,MAAM,CAAC;AAErD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,sBAAsB,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACxC,yBAAyB,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CAC5C,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,cAAc,EAAE,kBAAkB,WAEvE;AAED,wBAAgB,+BAA+B,CAAC,EAC9C,QAAQ,EACR,eAA+C,EAC/C,mBAAuD,EACvD,GAAG,GACJ,EAAE;IACD,QAAQ,EAAE,WAAW,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB,UAMA;AAED,wBAAgB,0BAA0B,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,WAE7D;AAED,wBAAgB,iCAAiC,CAAC,EAChD,QAAQ,EACR,cAAc,EACd,qBAAqB,EACrB,cAAc,GACf,EAAE;IACD,QAAQ,EAAE,WAAW,CAAC;IACtB,cAAc,EAAE,OAAO,CAAC;IACxB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,cAAc,EAAE,kBAAkB,CAAC;CACpC,WAIA"}
+{"version":3,"file":"bleStrategy.d.ts","sourceRoot":"","sources":["../src/bleStrategy.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,WAAW,GAAG,KAAK,GAAG,SAAS,GAAG,MAAM,CAAC;AAErD,MAAM,MAAM,kBAAkB,GAAG;IAC/B,sBAAsB,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACxC,yBAAyB,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CAC5C,CAAC;AAEF,wBAAgB,qBAAqB,CAAC,cAAc,EAAE,kBAAkB,WAEvE;AAED,wBAAgB,+BAA+B,CAAC,EAC9C,QAAQ,EACR,eAA+C,EAC/C,mBAAuD,EACvD,GAAG,GACJ,EAAE;IACD,QAAQ,EAAE,WAAW,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB,UAMA;AAED,wBAAgB,0BAA0B,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,WAE7D;AAED,wBAAgB,iCAAiC,CAAC,EAChD,qBAAqB,EACrB,cAAc,GACf,EAAE;IACD,QAAQ,EAAE,WAAW,CAAC;IACtB,cAAc,EAAE,OAAO,CAAC;IACxB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,cAAc,EAAE,kBAAkB,CAAC;CACpC,WAIA"}

package/dist/index.js

@@ -144,12 +144,12 @@ function resolveProtocolV2PacketCapacity({ platform, iosPacketLength = IOS_PROTO
 function shouldRefreshNegotiatedMtu(mtu) {
     return typeof mtu !== 'number' || !Number.isFinite(mtu) || mtu <= 23;
 }
-function shouldWriteProtocolV2WithResponse({ platform, highThroughput, requestedWithResponse, characteristic, }) {
+function shouldWriteProtocolV2WithResponse({ requestedWithResponse, characteristic, }) {
     if (!characteristic.isWritableWithResponse)
         return false;
     if (!characteristic.isWritableWithoutResponse)
         return true;
-    return requestedWithResponse === true || (platform === 'ios' && !highThroughput);
+    return requestedWithResponse === true;
 }
 
 const timer = process.env.NODE_ENV === 'development'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-react-native",
-  "version": "1.2.2-alpha.6",
+  "version": "1.2.2-alpha.7",
   "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.2-alpha.6",
-    "@onekeyfe/hd-shared": "1.2.2-alpha.6",
-    "@onekeyfe/hd-transport": "1.2.2-alpha.6",
+    "@onekeyfe/hd-core": "1.2.2-alpha.7",
+    "@onekeyfe/hd-shared": "1.2.2-alpha.7",
+    "@onekeyfe/hd-transport": "1.2.2-alpha.7",
     "@onekeyfe/react-native-ble-utils": "^0.1.6",
     "react-native-ble-plx": "3.5.1"
   },
-  "gitHead": "538d5371d9369747beabf68c5dc7a617531bace2"
+  "gitHead": "29b87f1c04fea60459d900ef1f61cb9f17eaa4d3"
 }

package/src/__tests__/bleStrategy.test.ts

@@ -90,7 +90,7 @@ describe('React Native BLE strategy', () => {
     ).toBe(182);
   });
 
-  test('uses withoutResponse for a high-volume write unless explicitly overridden', () => {
+  test('uses withoutResponse by default unless explicitly overridden', () => {
     const characteristic = {
       isWritableWithResponse: true,
       isWritableWithoutResponse: true,
@@ -99,8 +99,7 @@ describe('React Native BLE strategy', () => {
     expect(
       shouldWriteProtocolV2WithResponse({
         platform: 'ios',
-        highThroughput: true,
-        requestedWithResponse: false,
+        highThroughput: false,
         characteristic,
       })
     ).toBe(false);

package/src/__tests__/protocolV2Link.test.ts

@@ -436,7 +436,8 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
       protocolType: 'V2',
     });
     expect(device.requestMTU).toHaveBeenCalledWith(247);
-    expect(writeCharacteristic.writeWithResponse.mock.calls.length).toBeGreaterThan(1);
+    expect(writeCharacteristic.writeWithResponse).toHaveBeenCalledTimes(1);
+    expect(writeCharacteristic.writeWithoutResponse).toHaveBeenCalled();
 
     await expect(
       transport.call(uuid, 'Ping', { message: 'first-core-command' })
@@ -795,7 +796,7 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
     });
     expect(device.requestMTU).toHaveBeenCalledTimes(3);
     expect((transport as any).getCachedTransport(uuid).mtuSize).toBeUndefined();
-    expect(writeCharacteristic.writeWithResponse).toHaveBeenCalled();
+    expect(writeCharacteristic.writeWithoutResponse).toHaveBeenCalled();
     await transport.release(uuid, true);
   });
 
@@ -804,6 +805,7 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
     device.mtu = undefined;
 
     await transport.acquire({ uuid, expectedProtocol: 'V2' });
+    const writesBeforeFileWrite = writeCharacteristic.writeWithoutResponse.mock.calls.length;
     device.requestMTU.mockImplementationOnce(() => {
       device.mtu = 247;
       return Promise.resolve(device);
@@ -811,7 +813,9 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
 
     await expect(transport.call(uuid, 'FileWrite', {})).resolves.toBeDefined();
     expect(device.requestMTU).toHaveBeenCalledTimes(4);
-    expect(writeCharacteristic.writeWithoutResponse).toHaveBeenCalledTimes(1);
+    expect(writeCharacteristic.writeWithoutResponse).toHaveBeenCalledTimes(
+      writesBeforeFileWrite + 1
+    );
     await transport.release(uuid, true);
   });
 
@@ -820,12 +824,13 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
     device.mtu = undefined;
 
     await transport.acquire({ uuid, expectedProtocol: 'V2' });
+    const writesBeforeFileWrite = writeCharacteristic.writeWithoutResponse.mock.calls.length;
 
     await expect(transport.call(uuid, 'FileWrite', {})).rejects.toMatchObject({
       errorCode: HardwareErrorCode.BleConnectedError,
     });
     expect(device.requestMTU).toHaveBeenCalledTimes(4);
-    expect(writeCharacteristic.writeWithoutResponse).not.toHaveBeenCalled();
+    expect(writeCharacteristic.writeWithoutResponse).toHaveBeenCalledTimes(writesBeforeFileWrite);
     await transport.release(uuid, true);
   });
 
@@ -945,19 +950,19 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
     await transport.release(uuid, true);
   });
 
-  test('uses withResponse for consecutive iOS Protocol V2 control calls without releasing', async () => {
+  test('uses withoutResponse for consecutive iOS Protocol V2 control calls without releasing', async () => {
     const { transport, uuid, writeCharacteristic } = createHarness();
 
     await transport.acquire({ uuid, expectedProtocol: 'V2' });
     const releaseNative = jest.spyOn(transport as any, 'releaseNative');
-    expect(writeCharacteristic.writeWithoutResponse).not.toHaveBeenCalled();
-    expect(writeCharacteristic.writeWithResponse).toHaveBeenCalledTimes(1);
+    expect(writeCharacteristic.writeWithoutResponse).toHaveBeenCalledTimes(1);
+    expect(writeCharacteristic.writeWithResponse).not.toHaveBeenCalled();
 
     await transport.call(uuid, 'DeviceInfoGet', {});
     await transport.call(uuid, 'ProtocolInfoRequest', {});
 
-    expect(writeCharacteristic.writeWithResponse).toHaveBeenCalledTimes(3);
-    expect(writeCharacteristic.writeWithoutResponse).not.toHaveBeenCalled();
+    expect(writeCharacteristic.writeWithoutResponse).toHaveBeenCalledTimes(3);
+    expect(writeCharacteristic.writeWithResponse).not.toHaveBeenCalled();
     expect(releaseNative).not.toHaveBeenCalled();
 
     await transport.release(uuid, true);
@@ -970,8 +975,8 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
 
     await transport.call(uuid, 'FileWrite', {});
     await transport.call(uuid, 'FileWrite', {});
-    expect(writeCharacteristic.writeWithoutResponse).toHaveBeenCalledTimes(2);
-    expect(writeCharacteristic.writeWithResponse).toHaveBeenCalledTimes(1);
+    expect(writeCharacteristic.writeWithoutResponse).toHaveBeenCalledTimes(3);
+    expect(writeCharacteristic.writeWithResponse).not.toHaveBeenCalled();
     expect(
       logger.debug.mock.calls.filter(
         ([message]) =>
@@ -1004,8 +1009,8 @@ describe('ReactNativeBleTransport Protocol V2 link lifecycle', () => {
     await transport.acquire({ uuid, expectedProtocol: 'V2' });
 
     await transport.call(uuid, 'FileWrite', {}, { writeWithResponse: true });
-    expect(writeCharacteristic.writeWithResponse).toHaveBeenCalledTimes(2);
-    expect(writeCharacteristic.writeWithoutResponse).not.toHaveBeenCalled();
+    expect(writeCharacteristic.writeWithResponse).toHaveBeenCalledTimes(1);
+    expect(writeCharacteristic.writeWithoutResponse).toHaveBeenCalledTimes(1);
     await transport.release(uuid, true);
   });
 

package/src/bleStrategy.ts

@@ -34,8 +34,6 @@ export function shouldRefreshNegotiatedMtu(mtu?: number | null) {
 }
 
 export function shouldWriteProtocolV2WithResponse({
-  platform,
-  highThroughput,
   requestedWithResponse,
   characteristic,
 }: {
@@ -46,5 +44,5 @@ export function shouldWriteProtocolV2WithResponse({
 }) {
   if (!characteristic.isWritableWithResponse) return false;
   if (!characteristic.isWritableWithoutResponse) return true;
-  return requestedWithResponse === true || (platform === 'ios' && !highThroughput);
+  return requestedWithResponse === true;
 }