Merge pull request #1871 from LedgerHQ/bugfix/FAT-588

bugfix/FAT-588 Improve LLM background device communication

.changeset/cyan-feet-worry.md

@@ -0,0 +1,5 @@
+---
+"@ledgerhq/live-common": patch
+---
+
+Allow runner errors to bubble up and not be silenced

.changeset/giant-walls-march.md

@@ -0,0 +1,5 @@
+---
+"@ledgerhq/react-native-hw-transport-ble": patch
+---
+
+Provide a forceful disconnection mechanism for close request on BleTransport

.changeset/sour-countries-learn.md

@@ -0,0 +1,5 @@
+---
+"live-mobile": patch
+---
+
+Enabled BLE background capabilities again

apps/ledger-live-mobile/ios/ledgerlivemobile/Info.plist

@@ -2,6 +2,11 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>Braze</key>
+	<dict>
+		<key>Endpoint</key>
+		<string>sdk.fra-02.braze.eu</string>
+	</dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
@@ -103,6 +108,7 @@
 	</array>
 	<key>UIBackgroundModes</key>
 	<array>
+		<string>bluetooth-central</string>
 		<string>fetch</string>
 		<string>remote-notification</string>
 	</array>
@@ -118,10 +124,5 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
-	<key>Braze</key>
-	<dict>
-		<key>Endpoint</key>
-		<string>sdk.fra-02.braze.eu</string>
-	</dict>
 </dict>
 </plist>

libs/ledger-live-common/src/apps/runner.ts

@@ -100,13 +100,15 @@ export const runAllWithProgress = (
   return concat(
     ...getActionPlan(state).map((appOp) => runAppOp(state, appOp, exec))
   ).pipe(
-    map(
-      (event) =>
-        <Action>{
-          type: "onRunnerEvent",
-          event,
-        }
-    ),
+    map((event) => {
+      if (event.type === "runError") {
+        throw event.error;
+      }
+      return <Action>{
+        type: "onRunnerEvent",
+        event,
+      };
+    }),
     scan(reducer, state),
     mergeMap((s) => {
       // Nb if you also want to expose the uninstall queue, feel free.

libs/ledgerjs/packages/react-native-hw-transport-ble/src/BleTransport.ts

@@ -40,6 +40,7 @@ import { decoratePromiseErrors, remapError } from "./remapErrors";
 let connectOptions: Record<string, unknown> = {
   requestMTU: 156,
   connectionPriority: 1,
+  forceDisconnectTimeout: 4000,
 };
 const transportsCache = {};
 const bleManager = new BleManager();
@@ -58,12 +59,10 @@ type ReconnectionConfig = {
   delayAfterFirstPairing: number;
 };
 let reconnectionConfig: ReconnectionConfig | null | undefined = {
-  pairingThreshold: 1000,
+  pairingThreshold: 2000,
   delayAfterFirstPairing: 4000,
 };
-export function setReconnectionConfig(
-  config: ReconnectionConfig | null | undefined
-) {
+export function setReconnectionConfig(config: ReconnectionConfig | null): void {
   reconnectionConfig = config;
 }
 
@@ -75,6 +74,11 @@ async function open(deviceOrId: Device | string, needsReconnect: boolean) {
   if (typeof deviceOrId === "string") {
     if (transportsCache[deviceOrId]) {
       log("ble-verbose", "Transport in cache, using that.");
+      const maybeTimeout = transportsCache[deviceOrId].disconnectTimeout;
+      if (maybeTimeout) {
+        log("ble-verbose", "Clearing queued disconnect");
+        clearTimeout(transportsCache[deviceOrId].disconnectTimeout);
+      }
       return transportsCache[deviceOrId];
     }
 
@@ -408,6 +412,7 @@ export default class BluetoothTransport extends Transport {
   static disconnect = async (id: any) => {
     log("ble-verbose", `user disconnect(${id})`);
     await bleManager.cancelDeviceConnection(id);
+    await delay(1000); // Nb Test to improve stability of re-connections.
   };
   id: string;
   device: Device;
@@ -417,6 +422,7 @@ export default class BluetoothTransport extends Transport {
   notifyObservable: Observable<any>;
   deviceModel: DeviceModel;
   notYetDisconnected = true;
+  disconnectTimeout: null | ReturnType<typeof setTimeout> = null;
 
   constructor(
     device: Device,
@@ -537,9 +543,31 @@ export default class BluetoothTransport extends Transport {
     }
   };
 
-  async close() {
-    if (this.exchangeBusyPromise) {
-      await this.exchangeBusyPromise;
+  async close(): Promise<void> {
+    // Clear any potential leftover timeouts
+    if (this.disconnectTimeout) {
+      clearTimeout(this.disconnectTimeout);
     }
+
+    let resolve;
+    const disconnectPromise = new Promise<void>((res) => {
+      resolve = res;
+    });
+
+    // Queue a disconnect
+    this.disconnectTimeout = setTimeout(() => {
+      BluetoothTransport.disconnect(this.id);
+      resolve();
+    }, connectOptions.forceDisconnectTimeout as number);
+
+    // For cases where an exchange hasn't resolve and we triggered a `close` we
+    // introduce a timeout to forcefully disconnect in order to unblock subsequent
+    // usages of the `withDevice` logic.
+    await Promise.race([
+      this.exchangeBusyPromise || Promise.resolve(),
+      disconnectPromise,
+    ]);
+
+    return;
   }
 }