Don't show offer to reconnect on final attempt (#226)

Author: microbit-robert

src/script/microbit-interfacing/MicrobitBluetooth.ts

@@ -64,6 +64,8 @@ export class MicrobitBluetooth implements MicrobitConnection {
   private connecting = false;
   private isReconnect = false;
   private reconnectReadyPromise: Promise<void> | undefined;
+  // Whether this is the final reconnection attempt.
+  private finalAttempt = false;
 
   private outputWriteQueue: {
     busy: boolean;
@@ -173,6 +175,7 @@ export class MicrobitBluetooth implements MicrobitConnection {
       await this.disconnectInternal(false);
       throw new Error('Failed to establish a connection!');
     } finally {
+      this.finalAttempt = false;
       this.duringExplicitConnectDisconnect--;
     }
   }
@@ -204,14 +207,19 @@ export class MicrobitBluetooth implements MicrobitConnection {
       this.inUseAs.forEach(value =>
         stateOnDisconnected(
           value,
-          userTriggered ? false : this.isReconnect ? 'autoReconnect' : 'connect',
+          userTriggered || this.finalAttempt
+            ? false
+            : this.isReconnect
+              ? 'autoReconnect'
+              : 'connect',
           'bluetooth',
         ),
       );
     }
   }
 
-  async reconnect(): Promise<void> {
+  async reconnect(finalAttempt: boolean = false): Promise<void> {
+    this.finalAttempt = finalAttempt;
     logMessage('Bluetooth reconnect');
     this.isReconnect = true;
     const as = Array.from(this.inUseAs);

src/script/microbit-interfacing/MicrobitConnection.ts

@@ -16,7 +16,7 @@ export enum DeviceRequestStates {
 interface MicrobitConnection {
   connect(...states: DeviceRequestStates[]): Promise<void>;
 
-  reconnect(): Promise<void>;
+  reconnect(finalAttempt: boolean): Promise<void>;
 
   disconnect(): Promise<void>;
 }

src/script/microbit-interfacing/MicrobitSerial.ts

@@ -35,6 +35,8 @@ export class MicrobitSerial implements MicrobitConnection {
   private connectionCheckIntervalId: ReturnType<typeof setInterval> | undefined;
   private lastReceivedMessageTimestamp: number | undefined;
   private isReconnect: boolean = false;
+  // Whether this is the final reconnection attempt.
+  private finalAttempt = false;
 
   constructor(
     private usb: MicrobitUSB,
@@ -174,6 +176,7 @@ export class MicrobitSerial implements MicrobitConnection {
       await this.disconnectInternal(false, reconnectHelp);
       throw e;
     } finally {
+      this.finalAttempt = false;
       this.isConnecting = false;
     }
   }
@@ -202,7 +205,11 @@ export class MicrobitSerial implements MicrobitConnection {
     await this.usb.stopSerial();
     stateOnDisconnected(
       DeviceRequestStates.INPUT,
-      userDisconnect ? false : this.isReconnect ? 'autoReconnect' : 'connect',
+      userDisconnect || this.finalAttempt
+        ? false
+        : this.isReconnect
+          ? 'autoReconnect'
+          : 'connect',
       reconnectHelp,
     );
   }
@@ -226,7 +233,8 @@ export class MicrobitSerial implements MicrobitConnection {
     }
   }
 
-  async reconnect(): Promise<void> {
+  async reconnect(finalAttempt: boolean = false): Promise<void> {
+    this.finalAttempt = finalAttempt;
     logMessage('Serial reconnect');
     this.isReconnect = true;
     await this.connect(DeviceRequestStates.INPUT);

src/script/microbit-interfacing/Microbits.ts

@@ -91,8 +91,9 @@ class Microbits {
 
   public static async reconnect(
     requestState: DeviceRequestStates.INPUT | DeviceRequestStates.OUTPUT,
+    finalAttempt: boolean = false,
   ) {
-    return this.getMicrobit(requestState)?.reconnect();
+    return this.getMicrobit(requestState)?.reconnect(finalAttempt);
   }
 
   public static async disconnect(

src/script/utils/reconnect.ts

@@ -34,7 +34,7 @@ export const reconnect = async (finalAttempt: boolean = false) => {
   }
   try {
     for (const inUseAs of reconnectState.inUseAs.values()) {
-      await Microbits.reconnect(inUseAs);
+      await Microbits.reconnect(inUseAs, finalAttempt);
     }
     connectionDialogState.update(s => {
       s.connectionState = ConnectDialogStates.NONE;