@ledgerhq/react-native-hw-transport-ble 6.29.5 → 6.29.6-nightly.0

package/lib/monitorCharacteristic.js

@@ -4,15 +4,20 @@ exports.monitorCharacteristic = void 0;
 const rxjs_1 = require("rxjs");
 const errors_1 = require("@ledgerhq/errors");
 const logs_1 = require("@ledgerhq/logs");
-const monitorCharacteristic = (characteristic) => new rxjs_1.Observable(o => {
-    (0, logs_1.log)("ble-verbose", "start monitor " + characteristic.uuid);
+const LOG_TYPE = "ble-verbose";
+const monitorCharacteristic = (characteristic, context) => new rxjs_1.Observable(o => {
+    const tracer = new logs_1.LocalTracer(LOG_TYPE, context);
+    tracer.trace(`Start monitoring BLE characteristics`, {
+        characteristicUuid: characteristic.uuid,
+    });
     const subscription = characteristic.monitor((error, c) => {
         if (error) {
-            (0, logs_1.log)("ble-verbose", "error monitor " + characteristic.uuid + ": " + error);
+            tracer.trace("Error while monitoring characteristics", { error });
             o.error(error);
         }
         else if (!c) {
-            o.error(new errors_1.TransportError("characteristic monitor null value", "CharacteristicMonitorNull"));
+            tracer.trace("BLE monitored characteristic null value");
+            o.error(new errors_1.TransportError("Characteristic monitor null value", "CharacteristicMonitorNull"));
         }
         else {
             try {
@@ -25,7 +30,6 @@ const monitorCharacteristic = (characteristic) => new rxjs_1.Observable(o => {
         }
     });
     return () => {
-        (0, logs_1.log)("ble-verbose", "end monitor " + characteristic.uuid);
         subscription.remove();
     };
 });

package/lib/monitorCharacteristic.js.map

@@ -1 +1 @@
-{"version":3,"file":"monitorCharacteristic.js","sourceRoot":"","sources":["../src/monitorCharacteristic.ts"],"names":[],"mappings":";;;AAAA,+BAAkC;AAClC,6CAAkD;AAElD,yCAAqC;AAC9B,MAAM,qBAAqB,GAAG,CAAC,cAA8B,EAAsB,EAAE,CAC1F,IAAI,iBAAU,CAAC,CAAC,CAAC,EAAE;IACjB,IAAA,UAAG,EAAC,aAAa,EAAE,gBAAgB,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;IAC3D,MAAM,YAAY,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;QACvD,IAAI,KAAK,EAAE;YACT,IAAA,UAAG,EAAC,aAAa,EAAE,gBAAgB,GAAG,cAAc,CAAC,IAAI,GAAG,IAAI,GAAG,KAAK,CAAC,CAAC;YAC1E,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAChB;aAAM,IAAI,CAAC,CAAC,EAAE;YACb,CAAC,CAAC,KAAK,CACL,IAAI,uBAAc,CAAC,mCAAmC,EAAE,2BAA2B,CAAC,CACrF,CAAC;SACH;aAAM;YACL,IAAI;gBACF,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;gBAC7C,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aACf;YAAC,OAAO,KAAK,EAAE;gBACd,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;aAChB;SACF;IACH,CAAC,CAAC,CAAC;IACH,OAAO,GAAG,EAAE;QACV,IAAA,UAAG,EAAC,aAAa,EAAE,cAAc,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;QACzD,YAAY,CAAC,MAAM,EAAE,CAAC;IACxB,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC;AAxBQ,QAAA,qBAAqB,yBAwB7B"}
+{"version":3,"file":"monitorCharacteristic.js","sourceRoot":"","sources":["../src/monitorCharacteristic.ts"],"names":[],"mappings":";;;AAAA,+BAAkC;AAClC,6CAAkD;AAElD,yCAA2D;AAE3D,MAAM,QAAQ,GAAG,aAAa,CAAC;AAExB,MAAM,qBAAqB,GAAG,CACnC,cAA8B,EAC9B,OAAsB,EACF,EAAE,CACtB,IAAI,iBAAU,CAAC,CAAC,CAAC,EAAE;IACjB,MAAM,MAAM,GAAG,IAAI,kBAAW,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAClD,MAAM,CAAC,KAAK,CAAC,sCAAsC,EAAE;QACnD,kBAAkB,EAAE,cAAc,CAAC,IAAI;KACxC,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;QACvD,IAAI,KAAK,EAAE;YACT,MAAM,CAAC,KAAK,CAAC,wCAAwC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;YAClE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAChB;aAAM,IAAI,CAAC,CAAC,EAAE;YACb,MAAM,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;YACxD,CAAC,CAAC,KAAK,CACL,IAAI,uBAAc,CAAC,mCAAmC,EAAE,2BAA2B,CAAC,CACrF,CAAC;SACH;aAAM;YACL,IAAI;gBACF,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;gBAC7C,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aACf;YAAC,OAAO,KAAK,EAAE;gBACd,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;aAChB;SACF;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,GAAG,EAAE;QACV,YAAY,CAAC,MAAM,EAAE,CAAC;IACxB,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC;AAhCQ,QAAA,qBAAqB,yBAgC7B"}

package/lib-es/BleTransport.d.ts

@@ -3,10 +3,16 @@ import Transport from "@ledgerhq/hw-transport";
 import type { Subscription as TransportSubscription, Observer as TransportObserver } from "@ledgerhq/hw-transport";
 import { DeviceId, Device, Characteristic } from "react-native-ble-plx";
 import type { DeviceModel } from "@ledgerhq/devices";
+import { TraceContext } from "@ledgerhq/logs";
 import { Observable, Observer } from "rxjs";
 import { HwTransportError } from "@ledgerhq/errors";
 import { ReconnectionConfig } from "./types";
 export declare const setReconnectionConfig: (config: ReconnectionConfig | null | undefined) => void;
+/**
+ * react-native bluetooth BLE implementation
+ * @example
+ * import BleTransport from "@ledgerhq/react-native-hw-transport-ble";
+ */
 export default class BleTransport extends Transport {
     static disconnectTimeoutMs: number;
     /**
@@ -38,17 +44,21 @@ export default class BleTransport extends Transport {
      * @param observer Device is partial in order to avoid the live-common/this dep
      * @returns TransportSubscription
      */
-    static listen(observer: TransportObserver<any, HwTransportError>): TransportSubscription;
+    static listen(observer: TransportObserver<any, HwTransportError>, context?: TraceContext): TransportSubscription;
     /**
-     * Open a BLE transport
+     * Opens a BLE transport
+     *
      * @param {Device | string} deviceOrId
+     * @param timeoutMs TODO: to keep, used in a separate PR
+     * @param context An optional context object for log/tracing strategy
      */
-    static open(deviceOrId: Device | string): Promise<BleTransport>;
+    static open(deviceOrId: Device | string, timeoutMs?: number, context?: TraceContext): Promise<BleTransport>;
     /**
-     * Exposed method from the ble-plx library
+     * Exposes method from the ble-plx library to disconnect a device
+     *
      * Disconnects from {@link Device} if it's connected or cancels pending connection.
      */
-    static disconnect: (id: DeviceId) => Promise<void>;
+    static disconnect: (id: DeviceId, context?: TraceContext) => Promise<void>;
     device: Device;
     deviceModel: DeviceModel;
     disconnectTimeout: null | ReturnType<typeof setTimeout>;
@@ -59,10 +69,13 @@ export default class BleTransport extends Transport {
     notYetDisconnected: boolean;
     writeCharacteristic: Characteristic;
     writeCmdCharacteristic: Characteristic | undefined;
-    constructor(device: Device, writeCharacteristic: Characteristic, writeCmdCharacteristic: Characteristic | undefined, notifyObservable: Observable<any>, deviceModel: DeviceModel);
+    constructor(device: Device, writeCharacteristic: Characteristic, writeCmdCharacteristic: Characteristic | undefined, notifyObservable: Observable<any>, deviceModel: DeviceModel, { context }?: {
+        context?: TraceContext;
+    });
     /**
      * Send data to the device using a low level API.
      * It's recommended to use the "send" method for a higher level API.
+     *
      * @param {Buffer} apdu - The data to send.
      * @returns {Promise<Buffer>} A promise that resolves with the response data from the device.
      */

package/lib-es/BleTransport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BleTransport.d.ts","sourceRoot":"","sources":["../src/BleTransport.ts"],"names":[],"mappings":";AAAA,OAAO,SAAS,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,EACV,YAAY,IAAI,qBAAqB,EACrC,QAAQ,IAAI,iBAAiB,EAC9B,MAAM,wBAAwB,CAAC;AAYhC,OAAO,EAKL,QAAQ,EACR,MAAM,EACN,cAAc,EAGf,MAAM,sBAAsB,CAAC;AAO9B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD,OAAO,EAAE,UAAU,EAAsC,QAAQ,EAAE,MAAM,MAAM,CAAC;AAEhF,OAAO,EAML,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAW7C,eAAO,MAAM,qBAAqB,WAAY,kBAAkB,GAAG,IAAI,GAAG,SAAS,KAAG,IAErF,CAAC;AAqSF,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,SAAS;IACjD,MAAM,CAAC,mBAAmB,SAAQ;IAClC;;OAEG;IACH,MAAM,CAAC,WAAW,QAAO,QAAQ,OAAO,CAAC,CAAsD;IAE/F;;OAEG;IACH,MAAM,CAAC,IAAI,QAAO,QAAQ,IAAI,EAAE,CAAC,CAE/B;IAEF;;;;OAIG;IACH,MAAM,CAAC,WAAW,aAAc,MAAM,KAAG,IAAI,CAM3C;IAEF;;;;;OAKG;IACH,MAAM,CAAC,YAAY,CACjB,QAAQ,EAAE,QAAQ,CAAC;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,OAAO,CAAC;KACpB,CAAC,GACD,qBAAqB;IAexB;;;;OAIG;IACH,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,iBAAiB,CAAC,GAAG,EAAE,gBAAgB,CAAC,GAAG,qBAAqB;IAuDxF;;;OAGG;WACU,IAAI,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAIrE;;;OAGG;IACH,MAAM,CAAC,UAAU,OAAc,QAAQ,KAAG,QAAQ,IAAI,CAAC,CAIrD;IAEF,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,WAAW,CAAC;IACzB,iBAAiB,EAAE,IAAI,GAAG,UAAU,CAAC,OAAO,UAAU,CAAC,CAAQ;IAC/D,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,UAAQ;IACnB,OAAO,SAAM;IACb,gBAAgB,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;IAClC,kBAAkB,UAAQ;IAC1B,mBAAmB,EAAE,cAAc,CAAC;IACpC,sBAAsB,EAAE,cAAc,GAAG,SAAS,CAAC;gBAGjD,MAAM,EAAE,MAAM,EACd,mBAAmB,EAAE,cAAc,EACnC,sBAAsB,EAAE,cAAc,GAAG,SAAS,EAClD,gBAAgB,EAAE,UAAU,CAAC,GAAG,CAAC,EACjC,WAAW,EAAE,WAAW;IAc1B;;;;;OAKG;IACH,QAAQ,SAAU,MAAM,KAAG,QAAQ,GAAG,CAAC,CA2BlC;IAEL;;;OAGG;IACG,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC;IAkCjC;;;;;OAKG;IACG,yBAAyB,CAC7B,kBAAkB,EAAE,UAAU,GAAG,MAAM,GAAG,UAAU,GACnD,OAAO,CAAC,MAAM,CAAC;IAMlB;;;;;OAKG;IACH,KAAK,WAAkB,MAAM,SAAS,MAAM,GAAG,SAAS,KAAG,QAAQ,IAAI,CAAC,CAetE;IAEF;;;;;;;OAOG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CA2B7B"}
+{"version":3,"file":"BleTransport.d.ts","sourceRoot":"","sources":["../src/BleTransport.ts"],"names":[],"mappings":"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"}

package/lib-es/BleTransport.js

@@ -21,13 +21,14 @@ import { sendAPDU } from "@ledgerhq/devices/lib/ble/sendAPDU";
 import { receiveAPDU } from "@ledgerhq/devices/lib/ble/receiveAPDU";
 import { BleManager, ConnectionPriority, BleErrorCode, LogLevel, } from "react-native-ble-plx";
 import { DeviceModelId, getBluetoothServiceUuids, getInfosForServiceUuid, } from "@ledgerhq/devices";
-import { log } from "@ledgerhq/logs";
-import { defer, merge, from, of, throwError } from "rxjs";
+import { trace, LocalTracer } from "@ledgerhq/logs";
+import { defer, merge, from, of, throwError, firstValueFrom } from "rxjs";
 import { share, ignoreElements, first, map, tap, catchError } from "rxjs/operators";
 import { CantOpenDevice, TransportError, DisconnectedDeviceDuringOperation, PairingFailed, PeerRemovedPairing, } from "@ledgerhq/errors";
 import { monitorCharacteristic } from "./monitorCharacteristic";
 import { awaitsBleOn } from "./awaitsBleOn";
 import { decoratePromiseErrors, remapError, mapBleErrorToHwTransportError } from "./remapErrors";
+const LOG_TYPE = "ble-verbose";
 /**
  * This is potentially not needed anymore, to be checked if the bug is still
  * happening.
@@ -82,28 +83,40 @@ const bleManagerInstance = () => {
     }
     return _bleManager;
 };
-const clearDisconnectTimeout = (deviceId) => {
+const clearDisconnectTimeout = (deviceId, context) => {
     const cachedTransport = transportsCache[deviceId];
     if (cachedTransport && cachedTransport.disconnectTimeout) {
-        log(TAG, "Clearing queued disconnect");
+        trace({ type: LOG_TYPE, message: "Clearing queued disconnect", context });
         clearTimeout(cachedTransport.disconnectTimeout);
     }
 };
-function open(deviceOrId, needsReconnect) {
+/**
+ * Opens a BLE connection with a given device. Returns a Transport instance.
+ *
+ * @param deviceOrId
+ * @param needsReconnect
+ * @param timeoutMs TODO: to keep, used in a separate PR
+ * @param context Optional tracing/log context
+ * @returns A BleTransport instance
+ */
+function open(deviceOrId, needsReconnect, timeoutMs, context) {
     return __awaiter(this, void 0, void 0, function* () {
+        const tracer = new LocalTracer(LOG_TYPE, context);
         let device;
-        log(TAG, `open with ${deviceOrId}`);
+        tracer.trace(`Opening ${deviceOrId}`, { needsReconnect });
         if (typeof deviceOrId === "string") {
             if (transportsCache[deviceOrId]) {
-                log(TAG, "Transport in cache, using that.");
+                tracer.trace(`Transport in cache, using it`);
                 clearDisconnectTimeout(deviceOrId);
+                // The cached transport probably has an older trace/log context
+                transportsCache[deviceOrId].setTraceContext(context);
                 return transportsCache[deviceOrId];
             }
-            log(TAG, `Tries to open device: ${deviceOrId}`);
+            tracer.trace(`Trying to open device: ${deviceOrId}`);
             yield awaitsBleOn(bleManagerInstance());
             // Returns a list of known devices by their identifiers
             const devices = yield bleManagerInstance().devices([deviceOrId]);
-            log(TAG, `found ${devices.length} devices`);
+            tracer.trace(`Found ${devices.length} already known device(s) with given id`, { deviceOrId });
             [device] = devices;
             if (!device) {
                 // Returns a list of the peripherals currently connected to the system
@@ -111,18 +124,21 @@ function open(deviceOrId, needsReconnect) {
                 // connected to our app, we check that below.
                 const connectedDevices = yield bleManagerInstance().connectedDevices(getBluetoothServiceUuids());
                 const connectedDevicesFiltered = connectedDevices.filter(d => d.id === deviceOrId);
-                log(TAG, `found ${connectedDevicesFiltered.length} connected devices`);
+                tracer.trace(`No known device with given id. Found ${connectedDevicesFiltered.length} devices from already connected devices`, { deviceOrId });
                 [device] = connectedDevicesFiltered;
             }
             if (!device) {
                 // We still don't have a device, so we attempt to connect to it.
-                log(TAG, `connectToDevice(${deviceOrId})`);
+                tracer.trace(`No known nor connected devices with given id. Trying to connect to device`, {
+                    deviceOrId,
+                    timeoutMs,
+                });
                 // Nb ConnectionOptions dropped since it's not used internally by ble-plx.
                 try {
                     device = yield bleManagerInstance().connectToDevice(deviceOrId, connectOptions);
                 }
                 catch (e) {
-                    log(TAG, `error code ${e.errorCode}`);
+                    tracer.trace(`Error code: ${e.errorCode}`);
                     if (e.errorCode === BleErrorCode.DeviceMTUChangeFailed) {
                         // If the MTU update did not work, we try to connect without requesting for a specific MTU
                         connectOptions = {};
@@ -142,21 +158,22 @@ function open(deviceOrId, needsReconnect) {
             device = deviceOrId;
         }
         if (!(yield device.isConnected())) {
-            log(TAG, "not connected. connecting...");
+            tracer.trace(`Device found but not connected. connecting...`, { timeoutMs, connectOptions });
             try {
-                yield device.connect(connectOptions);
+                yield device.connect(Object.assign({}, connectOptions));
             }
-            catch (e) {
-                log("ble-verbose", `connect error - ${JSON.stringify(e)}`);
-                if (e.errorCode === BleErrorCode.DeviceMTUChangeFailed) {
-                    log("ble-verbose", `device.mtu=${device.mtu}, reconnecting`);
+            catch (error) {
+                tracer.trace(`Connect error`, { error });
+                if (error.errorCode === BleErrorCode.DeviceMTUChangeFailed) {
+                    tracer.trace(`Device mtu=${device.mtu}, reconnecting`);
                     connectOptions = {};
                     yield device.connect();
                 }
-                else if (e.iosErrorCode === 14 || e.reason === "Peer removed pairing information") {
-                    log("ble-verbose", "iOS broken pairing");
-                    log("ble-verbose", JSON.stringify(device));
-                    log("ble-verbose", JSON.stringify(bluetoothInfoCache[device.id]));
+                else if (error.iosErrorCode === 14 || error.reason === "Peer removed pairing information") {
+                    tracer.trace(`iOS broken pairing`, {
+                        device,
+                        bluetoothInfoCache: bluetoothInfoCache[device.id],
+                    });
                     const { deviceModel } = bluetoothInfoCache[device.id] || {};
                     const { productName } = deviceModel || {};
                     throw new PeerRemovedPairing(undefined, {
@@ -165,10 +182,11 @@ function open(deviceOrId, needsReconnect) {
                     });
                 }
                 else {
-                    throw remapError(e);
+                    throw remapError(error);
                 }
             }
         }
+        tracer.trace(`Device is connected now, getting services and characteristics`);
         yield device.discoverAllServicesAndCharacteristics();
         let res = retrieveInfos(device);
         let characteristics;
@@ -185,6 +203,7 @@ function open(deviceOrId, needsReconnect) {
             }
         }
         if (!res) {
+            tracer.trace(`Service not found`);
             throw new TransportError("service not found", "BLEServiceNotFound");
         }
         const { deviceModel, serviceUuid, writeUuid, writeCmdUuid, notifyUuid } = res;
@@ -192,6 +211,7 @@ function open(deviceOrId, needsReconnect) {
             characteristics = yield device.characteristicsForService(serviceUuid);
         }
         if (!characteristics) {
+            tracer.trace(`Characteristics not found`);
             throw new TransportError("service not found", "BLEServiceNotFound");
         }
         let writeC;
@@ -225,31 +245,36 @@ function open(deviceOrId, needsReconnect) {
                 throw new TransportError("write cmd characteristic not writableWithoutResponse", "BLECharacteristicInvalid");
             }
         }
-        log(TAG, `device.mtu=${device.mtu}`);
-        const notifyObservable = monitorCharacteristic(notifyC).pipe(catchError(e => {
+        tracer.trace(`device.mtu=${device.mtu}`);
+        const notifyObservable = monitorCharacteristic(notifyC, context).pipe(catchError(e => {
             // LL-9033 fw 2.0.2 introduced this case, we silence the inner unhandled error.
             const msg = String(e);
-            return msg.includes("notify change failed") ? of(new PairingFailed(msg)) : throwError(e);
+            return msg.includes("notify change failed")
+                ? of(new PairingFailed(msg))
+                : throwError(() => e);
         }), tap(value => {
             if (value instanceof PairingFailed)
                 return;
-            log("ble-frame", "<= " + value.toString("hex"));
+            trace({ type: "ble-frame", message: `<= ${value.toString("hex")}`, context });
         }), share());
         const notif = notifyObservable.subscribe();
-        const transport = new BleTransport(device, writeC, writeCmdC, notifyObservable, deviceModel);
+        const transport = new BleTransport(device, writeC, writeCmdC, notifyObservable, deviceModel, {
+            context,
+        });
+        tracer.trace(`New BleTransport created`);
         // Keeping it as a comment for now but if no new bluetooth issues occur, we will be able to remove it
         // await transport.requestConnectionPriority("High");
         // eslint-disable-next-line prefer-const
         let disconnectedSub;
-        const onDisconnect = (e) => {
+        const onDisconnect = (error) => {
             transport.isConnected = false;
             transport.notYetDisconnected = false;
             notif.unsubscribe();
             disconnectedSub === null || disconnectedSub === void 0 ? void 0 : disconnectedSub.remove();
             clearDisconnectTimeout(transport.id);
             delete transportsCache[transport.id];
-            log(TAG, `BleTransport(${transport.id}) disconnected`);
-            transport.emit("disconnect", e);
+            tracer.trace(`On device disconnected callback: cleared cached transport for ${transport.id}, emitting Transport event "disconnect"`, { reason: error });
+            transport.emit("disconnect", error);
         };
         // eslint-disable-next-line require-atomic-updates
         transportsCache[transport.id] = transport;
@@ -273,7 +298,7 @@ function open(deviceOrId, needsReconnect) {
                     needsReconnect = false;
                 }
                 else if (deviceModel.id === DeviceModelId.stax) {
-                    log(TAG, "skipping needsReconnect for stax");
+                    tracer.trace(`Skipping "needsReconnect" strategy for Stax`);
                     needsReconnect = false;
                 }
                 if (needsReconnect) {
@@ -286,8 +311,8 @@ function open(deviceOrId, needsReconnect) {
             }
         }
         if (needsReconnect) {
-            log(TAG, "reconnecting");
-            return open(device, false);
+            tracer.trace(`Reconnecting`);
+            return open(device, false, timeoutMs, context);
         }
         return transport;
     });
@@ -297,7 +322,6 @@ function open(deviceOrId, needsReconnect) {
  * @example
  * import BleTransport from "@ledgerhq/react-native-hw-transport-ble";
  */
-const TAG = "ble-verbose";
 class BleTransport extends Transport {
     /**
      * Listen to state changes on the bleManagerInstance and notify the
@@ -322,8 +346,9 @@ class BleTransport extends Transport {
      * @param observer Device is partial in order to avoid the live-common/this dep
      * @returns TransportSubscription
      */
-    static listen(observer) {
-        log(TAG, "listening for devices");
+    static listen(observer, context) {
+        const tracer = new LocalTracer(LOG_TYPE, context);
+        tracer.trace("Listening for devices ...");
         let unsubscribed;
         const stateSub = bleManagerInstance().onStateChange((state) => __awaiter(this, void 0, void 0, function* () {
             if (state === "PoweredOn") {
@@ -332,7 +357,7 @@ class BleTransport extends Transport {
                 if (unsubscribed)
                     return;
                 if (devices.length) {
-                    log(TAG, "disconnecting from devices");
+                    tracer.trace("Disconnecting from all devices", { deviceCount: devices.length });
                     yield Promise.all(devices.map(d => BleTransport.disconnect(d.id).catch(() => { })));
                 }
                 if (unsubscribed)
@@ -359,23 +384,26 @@ class BleTransport extends Transport {
             unsubscribed = true;
             bleManagerInstance().stopDeviceScan();
             stateSub.remove();
-            log(TAG, "done listening.");
+            tracer.trace("Done listening");
         };
         return {
             unsubscribe,
         };
     }
     /**
-     * Open a BLE transport
+     * Opens a BLE transport
+     *
      * @param {Device | string} deviceOrId
+     * @param timeoutMs TODO: to keep, used in a separate PR
+     * @param context An optional context object for log/tracing strategy
      */
-    static open(deviceOrId) {
+    static open(deviceOrId, timeoutMs, context) {
         return __awaiter(this, void 0, void 0, function* () {
-            return open(deviceOrId, true);
+            return open(deviceOrId, true, timeoutMs, context);
         });
     }
-    constructor(device, writeCharacteristic, writeCmdCharacteristic, notifyObservable, deviceModel) {
-        super();
+    constructor(device, writeCharacteristic, writeCmdCharacteristic, notifyObservable, deviceModel, { context } = {}) {
+        super({ context, logType: LOG_TYPE });
         this.disconnectTimeout = null;
         this.isConnected = true;
         this.mtuSize = 20;
@@ -383,29 +411,40 @@ class BleTransport extends Transport {
         /**
          * Send data to the device using a low level API.
          * It's recommended to use the "send" method for a higher level API.
+         *
          * @param {Buffer} apdu - The data to send.
          * @returns {Promise<Buffer>} A promise that resolves with the response data from the device.
          */
-        this.exchange = (apdu) => this.exchangeAtomicImpl(() => __awaiter(this, void 0, void 0, function* () {
-            try {
-                const msgIn = apdu.toString("hex");
-                log("apdu", `=> ${msgIn}`);
-                const data = yield merge(this.notifyObservable.pipe(receiveAPDU), sendAPDU(this.write, apdu, this.mtuSize)).toPromise();
-                const msgOut = data.toString("hex");
-                log("apdu", `<= ${msgOut}`);
-                return data;
-            }
-            catch (e) {
-                log("ble-error", "exchange got " + String(e));
-                if (this.notYetDisconnected) {
-                    // in such case we will always disconnect because something is bad.
-                    yield bleManagerInstance()
-                        .cancelDeviceConnection(this.id)
-                        .catch(() => { }); // but we ignore if disconnect worked.
+        this.exchange = (apdu) => {
+            const tracer = this.tracer.withUpdatedContext({
+                function: "exchange",
+            });
+            tracer.trace("Exchanging APDU ...");
+            return this.exchangeAtomicImpl(() => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const msgIn = apdu.toString("hex");
+                    tracer.withType("apdu").trace(`=> ${msgIn}`);
+                    const data = yield firstValueFrom(merge(this.notifyObservable.pipe(receiveAPDU), sendAPDU(this.write, apdu, this.mtuSize)));
+                    const msgOut = data.toString("hex");
+                    tracer.withType("apdu").trace(`<= ${msgOut}`);
+                    return data;
                 }
-                throw remapError(e);
-            }
-        }));
+                catch (error) {
+                    tracer.withType("ble-error").trace(`Error while exchanging APDU`, { error });
+                    if (this.notYetDisconnected) {
+                        // in such case we will always disconnect because something is bad.
+                        yield bleManagerInstance()
+                            .cancelDeviceConnection(this.id)
+                            .catch(() => { }); // but we ignore if disconnect worked.
+                    }
+                    const mappedError = remapError(error);
+                    tracer.trace("Error while exchanging APDU, mapped and throws following error", {
+                        mappedError,
+                    });
+                    throw mappedError;
+                }
+            }));
+        };
         /**
          * Do not call this directly unless you know what you're doing. Communication
          * with a Ledger device should be through the {@link exchange} method.
@@ -413,22 +452,18 @@ class BleTransport extends Transport {
          * @param txid
          */
         this.write = (buffer, txid) => __awaiter(this, void 0, void 0, function* () {
-            log("ble-frame", "=> " + buffer.toString("hex"));
-            if (!this.writeCmdCharacteristic) {
-                try {
+            try {
+                if (!this.writeCmdCharacteristic) {
                     yield this.writeCharacteristic.writeWithResponse(buffer.toString("base64"), txid);
                 }
-                catch (e) {
-                    throw new DisconnectedDeviceDuringOperation(e.message);
-                }
-            }
-            else {
-                try {
+                else {
                     yield this.writeCmdCharacteristic.writeWithoutResponse(buffer.toString("base64"), txid);
                 }
-                catch (e) {
-                    throw new DisconnectedDeviceDuringOperation(e.message);
-                }
+                this.tracer.withType("ble-frame").trace("=> " + buffer.toString("hex"));
+            }
+            catch (error) {
+                this.tracer.trace("Error while writing APDU", { error });
+                throw new DisconnectedDeviceDuringOperation(error instanceof Error ? error.message : `${error}`);
             }
         });
         this.id = device.id;
@@ -437,8 +472,8 @@ class BleTransport extends Transport {
         this.writeCmdCharacteristic = writeCmdCharacteristic;
         this.notifyObservable = notifyObservable;
         this.deviceModel = deviceModel;
-        log(TAG, `BleTransport(${String(this.id)}) new instance`);
         clearDisconnectTimeout(this.id);
+        this.tracer.trace(`New instance of BleTransport for device ${this.id}`);
     }
     /**
      * Negotiate with the device the maximum transfer unit for the ble frames
@@ -447,24 +482,32 @@ class BleTransport extends Transport {
     inferMTU() {
         return __awaiter(this, void 0, void 0, function* () {
             let { mtu } = this.device;
+            this.tracer.trace(`Inferring MTU ...`, { currentDeviceMtu: mtu });
             yield this.exchangeAtomicImpl(() => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    mtu = yield merge(this.notifyObservable.pipe(tap(maybeError => {
+                    mtu = yield firstValueFrom(merge(this.notifyObservable.pipe(tap(maybeError => {
                         if (maybeError instanceof Error)
                             throw maybeError;
-                    }), first(buffer => buffer.readUInt8(0) === 0x08), map(buffer => buffer.readUInt8(5))), defer(() => from(this.write(Buffer.from([0x08, 0, 0, 0, 0])))).pipe(ignoreElements())).toPromise();
+                    }), first(buffer => buffer.readUInt8(0) === 0x08), map(buffer => buffer.readUInt8(5))), defer(() => from(this.write(Buffer.from([0x08, 0, 0, 0, 0])))).pipe(ignoreElements())));
                 }
-                catch (e) {
-                    log("ble-error", "inferMTU got " + JSON.stringify(e));
+                catch (error) {
+                    this.tracer.withType("ble-error").trace("Error while inferring MTU", { mtu });
                     yield bleManagerInstance()
                         .cancelDeviceConnection(this.id)
                         .catch(() => { }); // but we ignore if disconnect worked.
-                    throw remapError(e);
+                    const mappedError = remapError(error);
+                    this.tracer.trace("Error while inferring APDU, mapped and throws following error", {
+                        mappedError,
+                    });
+                    throw mappedError;
                 }
             }));
+            this.tracer.trace(`Successfully negotiated MTU with device`, {
+                mtu,
+                mtuSize: this.mtuSize,
+            });
             if (mtu > 20) {
                 this.mtuSize = mtu;
-                log(TAG, `BleTransport(${this.id}) mtu set to ${this.mtuSize}`);
             }
             return this.mtuSize;
         });
@@ -490,16 +533,15 @@ class BleTransport extends Transport {
      */
     close() {
         return __awaiter(this, void 0, void 0, function* () {
+            this.tracer.trace("Closing, queuing a disconnect ...");
             let resolve;
             const disconnectPromise = new Promise(innerResolve => {
                 resolve = innerResolve;
             });
             clearDisconnectTimeout(this.id);
-            log(TAG, "Queuing a disconnect");
             this.disconnectTimeout = setTimeout(() => {
-                log(TAG, `Triggering a disconnect from ${this.id}`);
                 if (this.isConnected) {
-                    BleTransport.disconnect(this.id)
+                    BleTransport.disconnect(this.id, this.tracer.getContext())
                         .catch(() => { })
                         .finally(resolve);
                 }
@@ -540,13 +582,22 @@ BleTransport.setLogLevel = (logLevel) => {
     }
 };
 /**
- * Exposed method from the ble-plx library
+ * Exposes method from the ble-plx library to disconnect a device
+ *
  * Disconnects from {@link Device} if it's connected or cancels pending connection.
  */
-BleTransport.disconnect = (id) => __awaiter(void 0, void 0, void 0, function* () {
-    log(TAG, `user disconnect(${id})`);
+BleTransport.disconnect = (id, context) => __awaiter(void 0, void 0, void 0, function* () {
+    trace({
+        type: LOG_TYPE,
+        message: `Trying to disconnect device ${id})`,
+        context,
+    });
     yield bleManagerInstance().cancelDeviceConnection(id);
-    log(TAG, "disconnected");
+    trace({
+        type: LOG_TYPE,
+        message: `Device ${id} disconnected`,
+        context,
+    });
 });
 export default BleTransport;
 //# sourceMappingURL=BleTransport.js.map