@ledgerhq/react-native-hw-transport-ble 6.28.5 → 6.28.6-nightly.0

package/lib-es/awaitsBleOn.js

@@ -1,31 +1,28 @@
 import { BluetoothRequired } from "@ledgerhq/errors";
 import { log } from "@ledgerhq/logs";
 import timer from "./timer";
-export var awaitsBleOn = function (bleManager, ms) {
-    if (ms === void 0) { ms = 3000; }
-    return new Promise(function (resolve, reject) {
-        var done = false;
-        var lastState = "Unknown";
-        var stateSub = bleManager.onStateChange(function (state) {
-            lastState = state;
-            log("ble-verbose", "ble state -> ".concat(state));
-            if (state === "PoweredOn") {
-                if (done)
-                    return;
-                removeTimeout();
-                done = true;
-                stateSub.remove();
-                resolve();
-            }
-        }, true);
-        var removeTimeout = timer.timeout(function () {
+export const awaitsBleOn = (bleManager, ms = 3000) => new Promise((resolve, reject) => {
+    let done = false;
+    let lastState = "Unknown";
+    const stateSub = bleManager.onStateChange((state) => {
+        lastState = state;
+        log("ble-verbose", `ble state -> ${state}`);
+        if (state === "PoweredOn") {
             if (done)
                 return;
+            removeTimeout();
+            done = true;
             stateSub.remove();
-            reject(new BluetoothRequired("", {
-                state: lastState
-            }));
-        }, ms);
-    });
-};
+            resolve();
+        }
+    }, true);
+    const removeTimeout = timer.timeout(() => {
+        if (done)
+            return;
+        stateSub.remove();
+        reject(new BluetoothRequired("", {
+            state: lastState,
+        }));
+    }, ms);
+});
 //# sourceMappingURL=awaitsBleOn.js.map

package/lib-es/awaitsBleOn.js.map

@@ -1 +1 @@
-{"version":3,"file":"awaitsBleOn.js","sourceRoot":"","sources":["../src/awaitsBleOn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,KAAK,MAAM,SAAS,CAAC;AAE5B,MAAM,CAAC,IAAM,WAAW,GAAG,UAAC,UAAsB,EAAE,EAAS;IAAT,mBAAA,EAAA,SAAS;IAC3D,OAAA,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QAC1B,IAAI,IAAI,GAAG,KAAK,CAAC;QACjB,IAAI,SAAS,GAAG,SAAS,CAAC;QAC1B,IAAM,QAAQ,GAAG,UAAU,CAAC,aAAa,CAAC,UAAC,KAAK;YAC9C,SAAS,GAAG,KAAK,CAAC;YAClB,GAAG,CAAC,aAAa,EAAE,uBAAgB,KAAK,CAAE,CAAC,CAAC;YAE5C,IAAI,KAAK,KAAK,WAAW,EAAE;gBACzB,IAAI,IAAI;oBAAE,OAAO;gBACjB,aAAa,EAAE,CAAC;gBAChB,IAAI,GAAG,IAAI,CAAC;gBACZ,QAAQ,CAAC,MAAM,EAAE,CAAC;gBAClB,OAAO,EAAE,CAAC;aACX;QACH,CAAC,EAAE,IAAI,CAAC,CAAC;QACT,IAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC;YAClC,IAAI,IAAI;gBAAE,OAAO;YACjB,QAAQ,CAAC,MAAM,EAAE,CAAC;YAClB,MAAM,CACJ,IAAI,iBAAiB,CAAC,EAAE,EAAE;gBACxB,KAAK,EAAE,SAAS;aACjB,CAAC,CACH,CAAC;QACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IACT,CAAC,CAAC;AAxBF,CAwBE,CAAC"}
+{"version":3,"file":"awaitsBleOn.js","sourceRoot":"","sources":["../src/awaitsBleOn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,KAAK,MAAM,SAAS,CAAC;AAE5B,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,UAAsB,EAAE,EAAE,GAAG,IAAI,EAAiB,EAAE,CAC9E,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;IAC9B,IAAI,IAAI,GAAG,KAAK,CAAC;IACjB,IAAI,SAAS,GAAG,SAAS,CAAC;IAC1B,MAAM,QAAQ,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC,KAAK,EAAE,EAAE;QAClD,SAAS,GAAG,KAAK,CAAC;QAClB,GAAG,CAAC,aAAa,EAAE,gBAAgB,KAAK,EAAE,CAAC,CAAC;QAE5C,IAAI,KAAK,KAAK,WAAW,EAAE;YACzB,IAAI,IAAI;gBAAE,OAAO;YACjB,aAAa,EAAE,CAAC;YAChB,IAAI,GAAG,IAAI,CAAC;YACZ,QAAQ,CAAC,MAAM,EAAE,CAAC;YAClB,OAAO,EAAE,CAAC;SACX;IACH,CAAC,EAAE,IAAI,CAAC,CAAC;IACT,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QACvC,IAAI,IAAI;YAAE,OAAO;QACjB,QAAQ,CAAC,MAAM,EAAE,CAAC;QAClB,MAAM,CACJ,IAAI,iBAAiB,CAAC,EAAE,EAAE;YACxB,KAAK,EAAE,SAAS;SACjB,CAAC,CACH,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC,CAAC,CAAC"}

package/lib-es/monitorCharacteristic.js

@@ -1,31 +1,29 @@
 import { Observable } from "rxjs";
 import { TransportError } from "@ledgerhq/errors";
 import { log } from "@ledgerhq/logs";
-export var monitorCharacteristic = function (characteristic) {
-    return new Observable(function (o) {
-        log("ble-verbose", "start monitor " + characteristic.uuid);
-        var subscription = characteristic.monitor(function (error, c) {
-            if (error) {
-                log("ble-verbose", "error monitor " + characteristic.uuid + ": " + error);
-                o.error(error);
-            }
-            else if (!c) {
-                o.error(new TransportError("characteristic monitor null value", "CharacteristicMonitorNull"));
+export const monitorCharacteristic = (characteristic) => new Observable((o) => {
+    log("ble-verbose", "start monitor " + characteristic.uuid);
+    const subscription = characteristic.monitor((error, c) => {
+        if (error) {
+            log("ble-verbose", "error monitor " + characteristic.uuid + ": " + error);
+            o.error(error);
+        }
+        else if (!c) {
+            o.error(new TransportError("characteristic monitor null value", "CharacteristicMonitorNull"));
+        }
+        else {
+            try {
+                const value = Buffer.from(c.value, "base64");
+                o.next(value);
             }
-            else {
-                try {
-                    var value = Buffer.from(c.value, "base64");
-                    o.next(value);
-                }
-                catch (error) {
-                    o.error(error);
-                }
+            catch (error) {
+                o.error(error);
             }
-        });
-        return function () {
-            log("ble-verbose", "end monitor " + characteristic.uuid);
-            subscription.remove();
-        };
+        }
     });
-};
+    return () => {
+        log("ble-verbose", "end monitor " + characteristic.uuid);
+        subscription.remove();
+    };
+});
 //# sourceMappingURL=monitorCharacteristic.js.map

package/lib-es/monitorCharacteristic.js.map

@@ -1 +1 @@
-{"version":3,"file":"monitorCharacteristic.js","sourceRoot":"","sources":["../src/monitorCharacteristic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,MAAM,CAAC,IAAM,qBAAqB,GAAG,UACnC,cAA8B;IAE9B,OAAA,IAAI,UAAU,CAAC,UAAC,CAAC;QACf,GAAG,CAAC,aAAa,EAAE,gBAAgB,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;QAC3D,IAAM,YAAY,GAAG,cAAc,CAAC,OAAO,CAAC,UAAC,KAAK,EAAE,CAAC;YACnD,IAAI,KAAK,EAAE;gBACT,GAAG,CACD,aAAa,EACb,gBAAgB,GAAG,cAAc,CAAC,IAAI,GAAG,IAAI,GAAG,KAAK,CACtD,CAAC;gBACF,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;aAChB;iBAAM,IAAI,CAAC,CAAC,EAAE;gBACb,CAAC,CAAC,KAAK,CACL,IAAI,cAAc,CAChB,mCAAmC,EACnC,2BAA2B,CAC5B,CACF,CAAC;aACH;iBAAM;gBACL,IAAI;oBACF,IAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;oBAC7C,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;iBACf;gBAAC,OAAO,KAAK,EAAE;oBACd,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;iBAChB;aACF;QACH,CAAC,CAAC,CAAC;QACH,OAAO;YACL,GAAG,CAAC,aAAa,EAAE,cAAc,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;YACzD,YAAY,CAAC,MAAM,EAAE,CAAC;QACxB,CAAC,CAAC;IACJ,CAAC,CAAC;AA7BF,CA6BE,CAAC"}
+{"version":3,"file":"monitorCharacteristic.js","sourceRoot":"","sources":["../src/monitorCharacteristic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,cAA8B,EACV,EAAE,CACtB,IAAI,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE;IACnB,GAAG,CAAC,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,GAAG,CACD,aAAa,EACb,gBAAgB,GAAG,cAAc,CAAC,IAAI,GAAG,IAAI,GAAG,KAAK,CACtD,CAAC;YACF,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAChB;aAAM,IAAI,CAAC,CAAC,EAAE;YACb,CAAC,CAAC,KAAK,CACL,IAAI,cAAc,CAChB,mCAAmC,EACnC,2BAA2B,CAC5B,CACF,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,GAAG,CAAC,aAAa,EAAE,cAAc,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;QACzD,YAAY,CAAC,MAAM,EAAE,CAAC;IACxB,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}

package/lib-es/remapErrors.d.ts

@@ -1,8 +1,10 @@
 import { HwTransportError, HwTransportErrorType } from "@ledgerhq/errors";
 import { BleError, BleErrorCode } from "react-native-ble-plx";
-export declare const remapError: (error: Error | null | undefined) => Error | null | undefined;
+type IOBleErrorRemap = Error | BleError | null | undefined;
+export declare const remapError: (error: IOBleErrorRemap) => IOBleErrorRemap;
 export declare const rethrowError: (e: Error | null | undefined) => never;
 export declare const decoratePromiseErrors: <A>(promise: Promise<A>) => Promise<A>;
 export declare const bleErrorToHwTransportError: Map<BleErrorCode, HwTransportErrorType>;
 export declare const mapBleErrorToHwTransportError: (bleError: BleError) => HwTransportError;
+export {};
 //# sourceMappingURL=remapErrors.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"remapErrors.d.ts","sourceRoot":"","sources":["../src/remapErrors.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,gBAAgB,EAChB,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAE9D,eAAO,MAAM,UAAU,UAAW,KAAK,GAAG,IAAI,GAAG,SAAS,6BAWzD,CAAC;AAEF,eAAO,MAAM,YAAY,MAAO,KAAK,GAAG,IAAI,GAAG,SAAS,KAAG,KAE1D,CAAC;AAEF,eAAO,MAAM,qBAAqB,wCACL,CAAC;AAE9B,eAAO,MAAM,0BAA0B,yCAWrC,CAAC;AAEH,eAAO,MAAM,6BAA6B,aAC9B,QAAQ,KACjB,gBAOF,CAAC"}
+{"version":3,"file":"remapErrors.d.ts","sourceRoot":"","sources":["../src/remapErrors.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,gBAAgB,EAChB,oBAAoB,EAGrB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAmB,QAAQ,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAE/E,KAAK,eAAe,GAAG,KAAK,GAAG,QAAQ,GAAG,IAAI,GAAG,SAAS,CAAC;AAC3D,eAAO,MAAM,UAAU,UAAW,eAAe,KAAG,eAsBnD,CAAC;AAEF,eAAO,MAAM,YAAY,MAAO,KAAK,GAAG,IAAI,GAAG,SAAS,KAAG,KAE1D,CAAC;AAEF,eAAO,MAAM,qBAAqB,wCACL,CAAC;AAE9B,eAAO,MAAM,0BAA0B,yCAWrC,CAAC;AAEH,eAAO,MAAM,6BAA6B,aAC9B,QAAQ,KACjB,gBAOF,CAAC"}

package/lib-es/remapErrors.js

@@ -1,21 +1,30 @@
-import { DisconnectedDevice, HwTransportError, HwTransportErrorType, } from "@ledgerhq/errors";
-import { BleErrorCode } from "react-native-ble-plx";
-export var remapError = function (error) {
+import { DisconnectedDevice, HwTransportError, HwTransportErrorType, PairingFailed, PeerRemovedPairing, } from "@ledgerhq/errors";
+import { BleATTErrorCode, BleError, BleErrorCode } from "react-native-ble-plx";
+export const remapError = (error) => {
     if (!error || !error.message)
         return error;
-    if (error.message.includes("was disconnected") ||
+    if (error instanceof BleError) {
+        if (error.iosErrorCode === BleATTErrorCode.UnlikelyError ||
+            error.reason === "Peer removed pairing information") {
+            return new PeerRemovedPairing();
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore It's not documented but seems to match a refusal on Android pairing
+        }
+        else if ((error === null || error === void 0 ? void 0 : error.attErrorCode) === 22) {
+            return new PairingFailed();
+        }
+    }
+    else if (error.message.includes("was disconnected") ||
         error.message.includes("not found")) {
         return new DisconnectedDevice();
     }
     return error;
 };
-export var rethrowError = function (e) {
+export const rethrowError = (e) => {
     throw remapError(e);
 };
-export var decoratePromiseErrors = function (promise) {
-    return promise["catch"](rethrowError);
-};
-export var bleErrorToHwTransportError = new Map([
+export const decoratePromiseErrors = (promise) => promise.catch(rethrowError);
+export const bleErrorToHwTransportError = new Map([
     [BleErrorCode.ScanStartFailed, HwTransportErrorType.BluetoothScanStartFailed],
     [
         BleErrorCode.LocationServicesDisabled,
@@ -27,10 +36,10 @@ export var bleErrorToHwTransportError = new Map([
         HwTransportErrorType.LocationServicesUnauthorized,
     ],
 ]);
-export var mapBleErrorToHwTransportError = function (bleError) {
-    var message = "".concat(bleError.message, ". Origin: ").concat(bleError.errorCode);
-    var inferedType = bleErrorToHwTransportError.get(bleError.errorCode);
-    var type = !inferedType ? HwTransportErrorType.Unknown : inferedType;
+export const mapBleErrorToHwTransportError = (bleError) => {
+    const message = `${bleError.message}. Origin: ${bleError.errorCode}`;
+    const inferedType = bleErrorToHwTransportError.get(bleError.errorCode);
+    const type = !inferedType ? HwTransportErrorType.Unknown : inferedType;
     return new HwTransportError(type, message);
 };
 //# sourceMappingURL=remapErrors.js.map

package/lib-es/remapErrors.js.map

@@ -1 +1 @@
-{"version":3,"file":"remapErrors.js","sourceRoot":"","sources":["../src/remapErrors.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,oBAAoB,GACrB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAY,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAE9D,MAAM,CAAC,IAAM,UAAU,GAAG,UAAC,KAA+B;IACxD,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO;QAAE,OAAO,KAAK,CAAC;IAE3C,IACE,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC;QAC1C,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EACnC;QACA,OAAO,IAAI,kBAAkB,EAAE,CAAC;KACjC;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,CAAC,IAAM,YAAY,GAAG,UAAC,CAA2B;IACtD,MAAM,UAAU,CAAC,CAAC,CAAC,CAAC;AACtB,CAAC,CAAC;AAEF,MAAM,CAAC,IAAM,qBAAqB,GAAG,UAAI,OAAmB;IAC1D,OAAA,OAAO,CAAC,OAAK,CAAA,CAAC,YAAY,CAAC;AAA3B,CAA2B,CAAC;AAE9B,MAAM,CAAC,IAAM,0BAA0B,GAAG,IAAI,GAAG,CAAC;IAChD,CAAC,YAAY,CAAC,eAAe,EAAE,oBAAoB,CAAC,wBAAwB,CAAC;IAC7E;QACE,YAAY,CAAC,wBAAwB;QACrC,oBAAoB,CAAC,wBAAwB;KAC9C;IACD;QACE,kFAAkF;QAClF,YAAY,CAAC,qBAAqB;QAClC,oBAAoB,CAAC,4BAA4B;KAClD;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,IAAM,6BAA6B,GAAG,UAC3C,QAAkB;IAElB,IAAM,OAAO,GAAG,UAAG,QAAQ,CAAC,OAAO,uBAAa,QAAQ,CAAC,SAAS,CAAE,CAAC;IAErE,IAAM,WAAW,GAAG,0BAA0B,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IACvE,IAAM,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC;IAEvE,OAAO,IAAI,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAC7C,CAAC,CAAC"}
+{"version":3,"file":"remapErrors.js","sourceRoot":"","sources":["../src/remapErrors.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,oBAAoB,EACpB,aAAa,EACb,kBAAkB,GACnB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAG/E,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAsB,EAAmB,EAAE;IACpE,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO;QAAE,OAAO,KAAK,CAAC;IAE3C,IAAI,KAAK,YAAY,QAAQ,EAAE;QAC7B,IACE,KAAK,CAAC,YAAY,KAAK,eAAe,CAAC,aAAa;YACpD,KAAK,CAAC,MAAM,KAAK,kCAAkC,EACnD;YACA,OAAO,IAAI,kBAAkB,EAAE,CAAC;YAChC,6DAA6D;YAC7D,iFAAiF;SAClF;aAAM,IAAI,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,YAAY,MAAK,EAAE,EAAE;YACrC,OAAO,IAAI,aAAa,EAAE,CAAC;SAC5B;KACF;SAAM,IACL,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC;QAC1C,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EACnC;QACA,OAAO,IAAI,kBAAkB,EAAE,CAAC;KACjC;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,CAA2B,EAAS,EAAE;IACjE,MAAM,UAAU,CAAC,CAAC,CAAC,CAAC;AACtB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAI,OAAmB,EAAc,EAAE,CAC1E,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;AAE9B,MAAM,CAAC,MAAM,0BAA0B,GAAG,IAAI,GAAG,CAAC;IAChD,CAAC,YAAY,CAAC,eAAe,EAAE,oBAAoB,CAAC,wBAAwB,CAAC;IAC7E;QACE,YAAY,CAAC,wBAAwB;QACrC,oBAAoB,CAAC,wBAAwB;KAC9C;IACD;QACE,kFAAkF;QAClF,YAAY,CAAC,qBAAqB;QAClC,oBAAoB,CAAC,4BAA4B;KAClD;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAC3C,QAAkB,EACA,EAAE;IACpB,MAAM,OAAO,GAAG,GAAG,QAAQ,CAAC,OAAO,aAAa,QAAQ,CAAC,SAAS,EAAE,CAAC;IAErE,MAAM,WAAW,GAAG,0BAA0B,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IACvE,MAAM,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC;IAEvE,OAAO,IAAI,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAC7C,CAAC,CAAC"}

package/lib-es/timer.js

@@ -1,24 +1,24 @@
-var timer = process.env.NODE_ENV === "development"
+const timer = process.env.NODE_ENV === "development"
     ? {
-        timeout: function (fn, ms) {
+        timeout: (fn, ms) => {
             // hack for a bug in RN https://github.com/facebook/react-native/issues/9030
-            var startTime = Date.now();
-            var interval = setInterval(function () {
+            const startTime = Date.now();
+            const interval = setInterval(() => {
                 if (Date.now() - startTime >= ms) {
                     clearInterval(interval);
                     fn();
                 }
             }, 100);
-            return function () {
+            return () => {
                 clearInterval(interval);
             };
-        }
+        },
     }
     : {
-        timeout: function (fn, ms) {
-            var timeout = setTimeout(fn, ms);
-            return function () { return clearTimeout(timeout); };
-        }
+        timeout: (fn, ms) => {
+            const timeout = setTimeout(fn, ms);
+            return () => clearTimeout(timeout);
+        },
     };
 export default timer;
 //# sourceMappingURL=timer.js.map

package/lib-es/timer.js.map

@@ -1 +1 @@
-{"version":3,"file":"timer.js","sourceRoot":"","sources":["../src/timer.ts"],"names":[],"mappings":"AAAA,IAAM,KAAK,GACT,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa;IACpC,CAAC,CAAC;QACE,OAAO,EAAE,UAAC,EAAgC,EAAE,EAAU;YACpD,4EAA4E;YAC5E,IAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC7B,IAAM,QAAQ,GAAG,WAAW,CAAC;gBAC3B,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,IAAI,EAAE,EAAE;oBAChC,aAAa,CAAC,QAAQ,CAAC,CAAC;oBACxB,EAAE,EAAE,CAAC;iBACN;YACH,CAAC,EAAE,GAAG,CAAC,CAAC;YACR,OAAO;gBACL,aAAa,CAAC,QAAQ,CAAC,CAAC;YAC1B,CAAC,CAAC;QACJ,CAAC;KACF;IACH,CAAC,CAAC;QACE,OAAO,EAAE,UAAC,EAAgC,EAAE,EAAU;YACpD,IAAM,OAAO,GAAG,UAAU,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACnC,OAAO,cAAM,OAAA,YAAY,CAAC,OAAO,CAAC,EAArB,CAAqB,CAAC;QACrC,CAAC;KACF,CAAC;AACR,eAAe,KAAK,CAAC"}
+{"version":3,"file":"timer.js","sourceRoot":"","sources":["../src/timer.ts"],"names":[],"mappings":"AAAA,MAAM,KAAK,GACT,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa;IACpC,CAAC,CAAC;QACE,OAAO,EAAE,CAAC,EAAgC,EAAE,EAAU,EAAE,EAAE;YACxD,4EAA4E;YAC5E,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC7B,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE;gBAChC,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,IAAI,EAAE,EAAE;oBAChC,aAAa,CAAC,QAAQ,CAAC,CAAC;oBACxB,EAAE,EAAE,CAAC;iBACN;YACH,CAAC,EAAE,GAAG,CAAC,CAAC;YACR,OAAO,GAAG,EAAE;gBACV,aAAa,CAAC,QAAQ,CAAC,CAAC;YAC1B,CAAC,CAAC;QACJ,CAAC;KACF;IACH,CAAC,CAAC;QACE,OAAO,EAAE,CAAC,EAAgC,EAAE,EAAU,EAAE,EAAE;YACxD,MAAM,OAAO,GAAG,UAAU,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACnC,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACrC,CAAC;KACF,CAAC;AACR,eAAe,KAAK,CAAC"}

package/lib-es/types.d.ts

@@ -1,7 +1,7 @@
 export type { BleManager } from "react-native-ble-plx";
-export declare type Device = any;
-export declare type Characteristic = any;
-export declare type ReconnectionConfig = {
+export type Device = any;
+export type Characteristic = any;
+export type ReconnectionConfig = {
     pairingThreshold: number;
     delayAfterFirstPairing: number;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,oBAAY,MAAM,GAAG,GAAG,CAAC;AACzB,oBAAY,cAAc,GAAG,GAAG,CAAC;AAEjC,oBAAY,kBAAkB,GAAG;IAC/B,gBAAgB,EAAE,MAAM,CAAC;IACzB,sBAAsB,EAAE,MAAM,CAAC;CAChC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,MAAM,MAAM,MAAM,GAAG,GAAG,CAAC;AACzB,MAAM,MAAM,cAAc,GAAG,GAAG,CAAC;AAEjC,MAAM,MAAM,kBAAkB,GAAG;IAC/B,gBAAgB,EAAE,MAAM,CAAC;IACzB,sBAAsB,EAAE,MAAM,CAAC;CAChC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/react-native-hw-transport-ble",
-  "version": "6.28.5",
+  "version": "6.28.6-nightly.0",
   "description": "Ledger Hardware Wallet Bluetooth BLE transport for React Native",
   "keywords": [
     "Ledger",
@@ -29,9 +29,9 @@
     "react-native-ble-plx": "2.0.3",
     "rxjs": "6",
     "uuid": "^3.4.0",
-    "@ledgerhq/devices": "^8.0.1",
-    "@ledgerhq/errors": "^6.12.4",
-    "@ledgerhq/hw-transport": "^6.28.2",
+    "@ledgerhq/devices": "^8.0.2-nightly.0",
+    "@ledgerhq/errors": "^6.12.5-nightly.0",
+    "@ledgerhq/hw-transport": "^6.28.3-nightly.0",
     "@ledgerhq/logs": "^6.10.1"
   },
   "gitHead": "dd0dea64b58e5a9125c8a422dcffd29e5ef6abec",
@@ -40,11 +40,10 @@
     "@types/node": "^18.15.3",
     "documentation": "13.2.4",
     "jest": "^28.1.1",
-    "rimraf": "^4.1.2",
+    "rimraf": "^4.4.1",
     "source-map-support": "^0.5.21",
     "ts-jest": "^28.0.5",
-    "ts-node": "^10.4.0",
-    "typescript": "^4"
+    "ts-node": "^10.4.0"
   },
   "scripts": {
     "clean": "rimraf lib lib-es",

package/src/BleTransport.test.ts

@@ -12,7 +12,17 @@ import { Subscription } from "rxjs";
  * to cover test cases. It should be noted that this mock is not comprehensive
  * and may require further refinement to meet all requirements.
  */
+
 jest.mock("react-native-ble-plx", () => {
+  class BleError {
+    iosErrorCode: number;
+    reason: string;
+    constructor(iosErrorCode: number, reason: string) {
+      this.iosErrorCode = iosErrorCode;
+      this.reason = reason;
+    }
+  }
+
   // Set of callbacks that we can trigger from our tests.
   const callbacks: { [key: string]: (...args: any[]) => void } = {};
 
@@ -20,6 +30,12 @@ jest.mock("react-native-ble-plx", () => {
     BleErrorCode: {
       ScanStartFailed: 0,
     },
+    BleError,
+    ConnectionPriority: {
+      Balanced: 0,
+      High: 1,
+      LowPower: 2,
+    },
     BleManager: function () {
       const dynamicProps = {
         isConnected: true,
@@ -53,6 +69,10 @@ jest.mock("react-native-ble-plx", () => {
             manufacturerData: null,
             solicitedServiceUUIDs: null,
 
+            requestConnectionPriority: async () => {
+              return null; // Should return self.
+            },
+
             isConnected: () => {
               return dynamicProps.isConnected;
             },
@@ -116,7 +136,7 @@ jest.mock("react-native-ble-plx", () => {
                     serviceID: 105553179758272,
                     writeWithoutResponse: async (raw) => {
                       if (!dynamicProps.isConnected)
-                        throw new Error("Device is not connected");
+                        throw new BleError(22, "Device is not connected");
 
                       const hex = Buffer.from(raw, "base64").toString("hex");
                       let value: Buffer;
@@ -246,7 +266,7 @@ describe("BleTransport connectivity test coverage", () => {
       await BleTransport.disconnect(deviceId);
       await expect(
         transport.exchange(Buffer.from("b010000000", "hex"))
-      ).rejects.toThrow("Device is not connected"); // More specific errors some day.
+      ).rejects.toThrow(); // More specific errors some day.
     });
 
     it("should disconnect if close is called, even if pending response", (done) => {

package/src/BleTransport.ts

@@ -1,4 +1,8 @@
 import Transport from "@ledgerhq/hw-transport";
+import type {
+  Subscription as TransportSubscription,
+  Observer as TransportObserver,
+} from "@ledgerhq/hw-transport";
 // ---------------------------------------------------------------------------------------------
 // Since this is a react-native library and metro bundler does not support
 // package exports yet (see: https://github.com/facebook/metro/issues/670)
@@ -10,10 +14,6 @@ import Transport from "@ledgerhq/hw-transport";
 import { sendAPDU } from "@ledgerhq/devices/lib/ble/sendAPDU";
 import { receiveAPDU } from "@ledgerhq/devices/lib/ble/receiveAPDU";
 
-import type {
-  Subscription as TransportSubscription,
-  Observer as TransportObserver,
-} from "@ledgerhq/hw-transport";
 import {
   BleManager,
   ConnectionPriority,
@@ -46,14 +46,15 @@ import {
   TransportError,
   DisconnectedDeviceDuringOperation,
   PairingFailed,
+  PeerRemovedPairing,
   HwTransportError,
 } from "@ledgerhq/errors";
 import { monitorCharacteristic } from "./monitorCharacteristic";
 import { awaitsBleOn } from "./awaitsBleOn";
 import {
   decoratePromiseErrors,
-  mapBleErrorToHwTransportError,
   remapError,
+  mapBleErrorToHwTransportError,
 } from "./remapErrors";
 import { ReconnectionConfig } from "./types";
 
@@ -78,6 +79,9 @@ const retrieveInfos = (device: Device | null) => {
   if (!serviceUUID) return;
   const infos = getInfosForServiceUuid(serviceUUID);
   if (!infos) return;
+
+  // If we retrieved information, update the cache
+  bluetoothInfoCache[device.id] = infos;
   return infos;
 };
 
@@ -90,6 +94,7 @@ const delay = (ms: number | undefined) =>
  * @type {Object.<string, BluetoothTransport>}
  */
 const transportsCache: { [deviceId: string]: BleTransport } = {};
+const bluetoothInfoCache: { [deviceUuid: string]: BluetoothInfos } = {}; // Allows us to give more granulary error messages.
 
 // connectOptions is actually used by react-native-ble-plx even if comment above ConnectionOptions says it's not used
 let connectOptions: Record<string, unknown> = {
@@ -191,12 +196,26 @@ async function open(deviceOrId: Device | string, needsReconnect: boolean) {
     try {
       await device.connect(connectOptions);
     } catch (e: any) {
+      log("ble-verbose", `connect error - ${JSON.stringify(e)}`);
       if (e.errorCode === BleErrorCode.DeviceMTUChangeFailed) {
-        // If the MTU update did not work, we try to connect without requesting for a specific MTU
+        log("ble-verbose", `device.mtu=${device.mtu}, reconnecting`);
         connectOptions = {};
         await 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]));
+        const { deviceModel } = bluetoothInfoCache[device.id] || {};
+        const { productName } = deviceModel || {};
+        throw new PeerRemovedPairing(undefined, {
+          deviceName: device.name,
+          productName,
+        });
       } else {
-        throw e;
+        throw remapError(e);
       }
     }
   }
@@ -621,7 +640,7 @@ export default class BleTransport extends Transport {
   ): Promise<Device> {
     return await decoratePromiseErrors(
       this.device.requestConnectionPriority(
-        ConnectionPriority[connectionPriority as keyof ConnectionPriority]
+        ConnectionPriority[connectionPriority]
       )
     );
   }

package/src/remapErrors.ts

@@ -2,13 +2,27 @@ import {
   DisconnectedDevice,
   HwTransportError,
   HwTransportErrorType,
+  PairingFailed,
+  PeerRemovedPairing,
 } from "@ledgerhq/errors";
-import { BleError, BleErrorCode } from "react-native-ble-plx";
+import { BleATTErrorCode, BleError, BleErrorCode } from "react-native-ble-plx";
 
-export const remapError = (error: Error | null | undefined) => {
+type IOBleErrorRemap = Error | BleError | null | undefined;
+export const remapError = (error: IOBleErrorRemap): IOBleErrorRemap => {
   if (!error || !error.message) return error;
 
-  if (
+  if (error instanceof BleError) {
+    if (
+      error.iosErrorCode === BleATTErrorCode.UnlikelyError ||
+      error.reason === "Peer removed pairing information"
+    ) {
+      return new PeerRemovedPairing();
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore It's not documented but seems to match a refusal on Android pairing
+    } else if (error?.attErrorCode === 22) {
+      return new PairingFailed();
+    }
+  } else if (
     error.message.includes("was disconnected") ||
     error.message.includes("not found")
   ) {