Use hasPrevBonded to infer isBonded for iOS

We have no way of knowing whether iOS isBonded or not so we need to remember it.

For the scenario where the user forgets the micro:bit, ideally we would let flashing fail and set hasPrevBonded to false so that we can prepare to bond in the next try.

However, currently, when we have let flashing fail (due to not waiting for disconnect before flashing when the micro:bit shows tick icon), the download progress hangs and due to the reconnecting logic, the micro:bit reconnects automatically.

Author: microbit-grace

lib/bluetooth-device-wrapper.ts

@@ -110,6 +110,7 @@ export class BluetoothDeviceWrapper implements Logging {
   constructor(
     public readonly device: BleDevice,
     private logging: Logging = new ConsoleLogging(),
+    private hasPrevBonded: boolean = false,
     dispatchTypedEvent: TypedServiceEventDispatcher,
     private currentEvents: () => Array<keyof ServiceConnectionEventMap>,
     private callbacks: ConnectCallbacks,
@@ -476,8 +477,8 @@ export class BluetoothDeviceWrapper implements Logging {
 
   private async bondConnectDeviceInternal(): Promise<boolean> {
     const { deviceId } = this.device;
+    let justBonded = false;
     if (isAndroid()) {
-      let justBonded = false;
       // This gets us a nicer pairing dialog than just going straight for the characteristic.
       if (!(await BleClient.isBonded(deviceId))) {
         await BleClient.createBond(deviceId, { timeout: bondingTimeoutInMs });
@@ -493,11 +494,14 @@ export class BluetoothDeviceWrapper implements Logging {
       // need to call startNotifications again. We need to be connected to
       // startNotifications.
       await this.connectInternal();
-      const pf = new PartialFlashingService(this);
-      await pf.startNotifications({ timeout: bondingTimeoutInMs });
-      // We just did it now to trigger pairing at a well defined point.
-      await pf.stopNotifications();
-      return true;
+      if (!this.hasPrevBonded) {
+        const pf = new PartialFlashingService(this);
+        await pf.startNotifications({ timeout: bondingTimeoutInMs });
+        // We just did it now to trigger pairing at a well defined point.
+        await pf.stopNotifications();
+        justBonded = true
+      }
+      return justBonded;
     }
   }
 }

lib/bluetooth.ts

@@ -292,6 +292,8 @@ class MicrobitWebBluetoothConnectionImpl
     return this.connection?.boardVersion;
   }
 
+  private hasPrevBonded: boolean = false;
+
   async connect(options?: ConnectOptions): Promise<void> {
     const progress = options?.progress ?? (() => {});
 
@@ -306,11 +308,15 @@ class MicrobitWebBluetoothConnectionImpl
       this.connection = new BluetoothDeviceWrapper(
         device,
         this.logging,
+        this.hasPrevBonded,
         this.dispatchTypedEvent.bind(this),
         () => this.getActiveEvents() as Array<keyof ServiceConnectionEventMap>,
         {
           onConnecting: () => this.setStatus(ConnectionStatus.CONNECTING),
-          onSuccess: () => this.setStatus(ConnectionStatus.CONNECTED),
+          onSuccess: () => {
+            this.hasPrevBonded = true;
+            this.setStatus(ConnectionStatus.CONNECTED);
+          },
           onDisconnect: () => this.setStatus(ConnectionStatus.DISCONNECTED),
         },
       );