@ledgerhq/react-native-hw-transport-ble 6.15.0 → 6.25.1-alpha.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/react-native-hw-transport-ble",
-  "version": "6.15.0",
+  "version": "6.25.1-alpha.3+eb669e17",
   "description": "Ledger Hardware Wallet Bluetooth BLE transport for React Native",
   "keywords": [
     "Ledger",
@@ -25,9 +25,9 @@
   "types": "lib/BleTransport.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@ledgerhq/devices": "^6.11.2",
+    "@ledgerhq/devices": "^6.24.1",
     "@ledgerhq/errors": "^6.10.0",
-    "@ledgerhq/hw-transport": "^6.11.2",
+    "@ledgerhq/hw-transport": "^6.25.1-alpha.3+eb669e17",
     "@ledgerhq/logs": "^6.10.0",
     "invariant": "^2.2.4",
     "react-native-ble-plx": "2.0.3",
@@ -39,5 +39,5 @@
     "build": "bash ../../script/build.sh",
     "watch": "bash ../../script/watch.sh"
   },
-  "gitHead": "135d8720bf141b7fb5e98bdefc266eb99be8274b"
+  "gitHead": "eb669e17dd87d3ab568beab1f9a5ddb1a2536e83"
 }

package/src/BleTransport.ts

@@ -26,6 +26,7 @@ import { awaitsBleOn } from "./awaitsBleOn";
 import { decoratePromiseErrors, remapError } from "./remapErrors";
 let connectOptions: Record<string, unknown> = {
   requestMTU: 156,
+  connectionPriority: 1,
 };
 const transportsCache = {};
 const bleManager = new BleManager();
@@ -147,7 +148,7 @@ async function open(deviceOrId: Device | string, needsReconnect: boolean) {
     throw new TransportError("service not found", "BLEServiceNotFound");
   }
 
-  const { deviceModel, serviceUuid, writeUuid, notifyUuid } = res;
+  const { deviceModel, serviceUuid, writeUuid, writeCmdUuid, notifyUuid } = res;
 
   if (!characteristics) {
     characteristics = await device.characteristicsForService(serviceUuid);
@@ -158,11 +159,14 @@ async function open(deviceOrId: Device | string, needsReconnect: boolean) {
   }
 
   let writeC;
+  let writeCmdC;
   let notifyC;
 
   for (const c of characteristics) {
     if (c.uuid === writeUuid) {
       writeC = c;
+    } else if (c.uuid === writeCmdUuid) {
+      writeCmdC = c;
     } else if (c.uuid === notifyUuid) {
       notifyC = c;
     }
@@ -196,6 +200,15 @@ async function open(deviceOrId: Device | string, needsReconnect: boolean) {
     );
   }
 
+  if (writeCmdC) {
+    if (!writeCmdC.isWritableWithoutResponse) {
+      throw new TransportError(
+        "write cmd characteristic not writableWithoutResponse",
+        "BLEChracteristicInvalid"
+      );
+    }
+  }
+
   log("ble-verbose", `device.mtu=${device.mtu}`);
   const notifyObservable = monitorCharacteristic(notifyC).pipe(
     tap((value) => {
@@ -207,6 +220,7 @@ async function open(deviceOrId: Device | string, needsReconnect: boolean) {
   const transport = new BluetoothTransport(
     device,
     writeC,
+    writeCmdC,
     notifyObservable,
     deviceModel
   );
@@ -373,6 +387,7 @@ export default class BluetoothTransport extends Transport {
   device: Device;
   mtuSize = 20;
   writeCharacteristic: Characteristic;
+  writeCmdCharacteristic: Characteristic;
   notifyObservable: Observable<Buffer>;
   deviceModel: DeviceModel;
   notYetDisconnected = true;
@@ -380,6 +395,7 @@ export default class BluetoothTransport extends Transport {
   constructor(
     device: Device,
     writeCharacteristic: Characteristic,
+    writeCmdCharacteristic: Characteristic,
     notifyObservable: Observable<Buffer>,
     deviceModel: DeviceModel
   ) {
@@ -387,6 +403,7 @@ export default class BluetoothTransport extends Transport {
     this.id = device.id;
     this.device = device;
     this.writeCharacteristic = writeCharacteristic;
+    this.writeCmdCharacteristic = writeCmdCharacteristic;
     this.notifyObservable = notifyObservable;
     this.deviceModel = deviceModel;
     log("ble-verbose", `BleTransport(${String(this.id)}) new instance`);
@@ -470,13 +487,24 @@ export default class BluetoothTransport extends Transport {
   write = async (buffer: Buffer, txid?: string | null | undefined) => {
     log("ble-frame", "=> " + buffer.toString("hex"));
 
-    try {
-      await this.writeCharacteristic.writeWithResponse(
-        buffer.toString("base64"),
-        txid
-      );
-    } catch (e: any) {
-      throw new DisconnectedDeviceDuringOperation(e.message);
+    if (!this.writeCmdCharacteristic) {
+      try {
+        await this.writeCharacteristic.writeWithResponse(
+          buffer.toString("base64"),
+          txid
+        );
+      } catch (e: any) {
+        throw new DisconnectedDeviceDuringOperation(e.message);
+      }
+    } else {
+      try {
+        await this.writeCmdCharacteristic.writeWithoutResponse(
+          buffer.toString("base64"),
+          txid
+        );
+      } catch (e: any) {
+        throw new DisconnectedDeviceDuringOperation(e.message);
+      }
     }
   };