Start over if the initial connection fails twice

src/connection-stage-actions.ts

@@ -214,10 +214,6 @@ export class ConnectionStageActions {
     };
   };
 
-  private handleConnectFail = () => {
-    this.setFlowStep(ConnectionFlowStep.ConnectFailed);
-  };
-
   private onConnected = () => {
     this.setFlowStep(ConnectionFlowStep.None);
     this.dataCollectionMicrobitConnected();
@@ -242,7 +238,11 @@ export class ConnectionStageActions {
         );
       }
       case ConnectionStatus.FailedToConnect: {
-        return this.handleConnectFail();
+        return this.setStage({
+          ...this.stage,
+          flowType,
+          flowStep: ConnectionFlowStep.ConnectFailed,
+        });
       }
       case ConnectionStatus.FailedToReconnectTwice: {
         return this.setStage({

src/get-next-connection-state.test.ts

@@ -173,9 +173,9 @@ describe("getNextConnectionState for radio connection", () => {
         type: "radioRemote",
       },
       initialOnFirstConnectAttempt: true,
-      expectedOnFirstConnectAttempt: true,
+      expectedOnFirstConnectAttempt: false,
       initialHasAttemptedReconnect: false,
-      expectedHasAttemptedReconnect: false,
+      expectedHasAttemptedReconnect: true,
       expectedNextConnectionState: {
         status: ConnectionStatus.FailedToConnect,
         flowType: ConnectionFlowType.ConnectRadioRemote,
@@ -217,6 +217,25 @@ describe("getNextConnectionState for radio connection", () => {
       },
     });
   });
+  test("radio reconnecting automatically (changing tabs) and the link micro:bit gets unplugged", () => {
+    testGetNextConnectionState({
+      input: {
+        currConnType: "radio",
+        currStatus: ConnectionStatus.ReconnectingAutomatically,
+        deviceStatus: DeviceConnectionStatus.NO_AUTHORIZED_DEVICE,
+        prevDeviceStatus: DeviceConnectionStatus.DISCONNECTED,
+        type: "radioRemote",
+      },
+      initialOnFirstConnectAttempt: false,
+      expectedOnFirstConnectAttempt: false,
+      initialHasAttemptedReconnect: false,
+      expectedHasAttemptedReconnect: false,
+      expectedNextConnectionState: {
+        status: ConnectionStatus.ConnectionLost,
+        flowType: ConnectionFlowType.ConnectRadioBridge,
+      },
+    });
+  });
   test("radio bridge device connection lost by unplugging device", () => {
     testGetNextConnectionState({
       input: {
@@ -342,9 +361,9 @@ describe("getNextConnectionState for radio connection", () => {
         type: "radioRemote",
       },
       initialOnFirstConnectAttempt: false,
-      expectedOnFirstConnectAttempt: false,
+      expectedOnFirstConnectAttempt: true,
       initialHasAttemptedReconnect: true,
-      expectedHasAttemptedReconnect: true,
+      expectedHasAttemptedReconnect: false,
       expectedNextConnectionState: {
         status: ConnectionStatus.FailedToReconnectTwice,
         flowType: ConnectionFlowType.ConnectRadioRemote,
@@ -456,9 +475,9 @@ describe("getNextConnectionState for bluetooth connection", () => {
         type: "bluetooth",
       },
       initialOnFirstConnectAttempt: true,
-      expectedOnFirstConnectAttempt: true,
+      expectedOnFirstConnectAttempt: false,
       initialHasAttemptedReconnect: false,
-      expectedHasAttemptedReconnect: false,
+      expectedHasAttemptedReconnect: true,
       expectedNextConnectionState: {
         status: ConnectionStatus.FailedToConnect,
         flowType: ConnectionFlowType.ConnectBluetooth,
@@ -548,9 +567,9 @@ describe("getNextConnectionState for bluetooth connection", () => {
         type: "bluetooth",
       },
       initialOnFirstConnectAttempt: false,
-      expectedOnFirstConnectAttempt: false,
+      expectedOnFirstConnectAttempt: true,
       initialHasAttemptedReconnect: true,
-      expectedHasAttemptedReconnect: true,
+      expectedHasAttemptedReconnect: false,
       expectedNextConnectionState: {
         status: ConnectionStatus.FailedToReconnectTwice,
         flowType: ConnectionFlowType.ConnectBluetooth,

src/get-next-connection-state.ts

@@ -20,18 +20,22 @@ export type NextConnectionState =
   | { status: ConnectionStatus; flowType: ConnectionFlowType }
   | undefined;
 
-export const getNextConnectionState = ({
-  currConnType,
-  currStatus,
-  deviceStatus,
-  prevDeviceStatus,
-  type,
-  hasAttempedReconnect,
-  setHasAttemptedReconnect,
-  onFirstConnectAttempt,
-  setOnFirstConnectAttempt,
-  isBrowserTabVisible,
-}: GetNextConnectionStateInput): NextConnectionState => {
+export const getNextConnectionState = (
+  input: GetNextConnectionStateInput
+): NextConnectionState => {
+  const {
+    currConnType,
+    currStatus,
+    deviceStatus,
+    prevDeviceStatus,
+    type,
+    hasAttempedReconnect,
+    setHasAttemptedReconnect,
+    onFirstConnectAttempt,
+    setOnFirstConnectAttempt,
+    isBrowserTabVisible,
+  } = input;
+
   if (currStatus === ConnectionStatus.Disconnected) {
     // Do not update connection status when user explicitly disconnected connection
     // until user reconnects explicitly
@@ -48,7 +52,8 @@ export const getNextConnectionState = ({
   // status is already set to an error case.
   if (
     !isBrowserTabVisible &&
-    (currStatus === ConnectionStatus.ConnectionLost ||
+    (currStatus === ConnectionStatus.FailedToConnect ||
+      currStatus === ConnectionStatus.ConnectionLost ||
       currStatus === ConnectionStatus.FailedToReconnect ||
       currStatus === ConnectionStatus.FailedToReconnectTwice)
   ) {
@@ -103,7 +108,6 @@ export const getNextConnectionState = ({
         : ConnectionStatus.FailedToReconnect;
     return { status, flowType };
   }
-
   if (
     // If user starts or restarts connection flow.
     // Disconnection happens for newly started / restarted
@@ -127,6 +131,11 @@ export const getNextConnectionState = ({
     currStatus === ConnectionStatus.Connecting &&
     deviceStatus === DeviceConnectionStatus.DISCONNECTED
   ) {
+    // We count this as the first connect failure.
+    // If we fail a second time, we should prompt the user to start over.
+    // Set the fields below appropriately to acheive this.
+    setOnFirstConnectAttempt(false);
+    setHasAttemptedReconnect(true);
     return { status: ConnectionStatus.FailedToConnect, flowType };
   }
   if (
@@ -143,6 +152,9 @@ export const getNextConnectionState = ({
     hasAttempedReconnect &&
     deviceStatus === DeviceConnectionStatus.DISCONNECTED
   ) {
+    // Reset connection state fields so that the next connection attempt is clean.
+    setOnFirstConnectAttempt(true);
+    setHasAttemptedReconnect(false);
     return { status: ConnectionStatus.FailedToReconnectTwice, flowType };
   }
   if (
@@ -177,5 +189,17 @@ export const getNextConnectionState = ({
   ) {
     return { status: ConnectionStatus.ReconnectingAutomatically, flowType };
   }
+  if (
+    deviceStatus === DeviceConnectionStatus.NO_AUTHORIZED_DEVICE &&
+    currStatus === ConnectionStatus.ReconnectingAutomatically &&
+    currConnType === "radio"
+  ) {
+    // The link micro:bit was unplugged while the user was viewing another tab.
+    // On return, show failed to reconnect.
+    return {
+      status: ConnectionStatus.ConnectionLost,
+      flowType: ConnectionFlowType.ConnectRadioBridge,
+    };
+  }
   return undefined;
 };