Handle packager reconnect message lifecycle

Author: ya-nsh

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.kt

@@ -199,7 +199,7 @@ public abstract class DevSupportManagerBase(
   private var isDevSupportEnabled = false
   private var isPackagerConnected = false
   private val packagerConnectionStatusNotifier =
-      PackagerConnectionStatusNotifier(devLoadingViewManager)
+      PackagerConnectionStatusNotifier(devLoadingViewManagerProvider = { devLoadingViewManager })
   private val errorCustomizers: MutableList<ErrorCustomizer> = mutableListOf()
   private var packagerLocationCustomizer: PackagerLocationCustomizer? = null
   private val jSExecutorDescription: String?
@@ -1018,6 +1018,7 @@ public abstract class DevSupportManagerBase(
       devLoadingViewManager?.hide()
       perfMonitorOverlayManager?.disable()
 
+      packagerConnectionStatusNotifier.onPackagerConnectionClosed()
       devServerHelper.closePackagerConnection()
     }
   }

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/PackagerConnectionStatusNotifier.kt

@@ -7,17 +7,35 @@
 
 package com.facebook.react.devsupport
 
+import android.os.Handler
+import android.os.Looper
 import com.facebook.react.devsupport.interfaces.DevLoadingViewManager
 
 internal class PackagerConnectionStatusNotifier(
-    private val devLoadingViewManager: DevLoadingViewManager?
+    private val devLoadingViewManagerProvider: () -> DevLoadingViewManager?,
+    private val postDelayed: (Runnable, Long) -> Unit = { runnable, delayMs ->
+      Handler(Looper.getMainLooper()).postDelayed(runnable, delayMs)
+    },
 ) {
   private var hasConnected = false
   private var connectionLost = false
+  private var reconnectMessageToken = 0
 
   fun onPackagerConnected() {
     if (connectionLost) {
+      val devLoadingViewManager = devLoadingViewManagerProvider()
       devLoadingViewManager?.showMessage(RECONNECTED_MESSAGE)
+      if (devLoadingViewManager != null) {
+        val token = ++reconnectMessageToken
+        postDelayed(
+            Runnable {
+              if (!connectionLost && reconnectMessageToken == token) {
+                devLoadingViewManager.hide()
+              }
+            },
+            RECONNECTED_MESSAGE_HIDE_DELAY_MS,
+        )
+      }
     }
     hasConnected = true
     connectionLost = false
@@ -26,12 +44,20 @@ internal class PackagerConnectionStatusNotifier(
   fun onPackagerDisconnected() {
     if (hasConnected && !connectionLost) {
       connectionLost = true
-      devLoadingViewManager?.showMessage(CONNECTION_LOST_MESSAGE)
+      reconnectMessageToken++
+      devLoadingViewManagerProvider()?.showMessage(CONNECTION_LOST_MESSAGE)
     }
   }
 
+  fun onPackagerConnectionClosed() {
+    hasConnected = false
+    connectionLost = false
+    reconnectMessageToken++
+  }
+
   private companion object {
     const val CONNECTION_LOST_MESSAGE = "Connection to Metro lost. Retrying..."
     const val RECONNECTED_MESSAGE = "Reconnected to Metro."
+    const val RECONNECTED_MESSAGE_HIDE_DELAY_MS = 2_000L
   }
 }

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/devsupport/PackagerConnectionStatusNotifierTest.kt

@@ -14,7 +14,11 @@ import org.junit.Test
 class PackagerConnectionStatusNotifierTest {
 
   private val devLoadingViewManager = RecordingDevLoadingViewManager()
-  private val notifier = PackagerConnectionStatusNotifier(devLoadingViewManager)
+  private val delayedActions = mutableListOf<Runnable>()
+  private val notifier =
+      PackagerConnectionStatusNotifier({ devLoadingViewManager }) { runnable, _ ->
+        delayedActions.add(runnable)
+      }
 
   @Test
   fun testInitialConnectionDoesNotShowReconnectedMessage() {
@@ -45,8 +49,58 @@ class PackagerConnectionStatusNotifierTest {
         .containsExactly("Connection to Metro lost. Retrying...", "Reconnected to Metro.")
   }
 
+  @Test
+  fun testReconnectMessageIsHiddenAfterDelay() {
+    notifier.onPackagerConnected()
+    notifier.onPackagerDisconnected()
+
+    notifier.onPackagerConnected()
+    delayedActions.single().run()
+
+    assertThat(devLoadingViewManager.hideCount).isEqualTo(1)
+  }
+
+  @Test
+  fun testReconnectMessageDelayDoesNotHideNewLostConnectionMessage() {
+    notifier.onPackagerConnected()
+    notifier.onPackagerDisconnected()
+    notifier.onPackagerConnected()
+
+    notifier.onPackagerDisconnected()
+    delayedActions.single().run()
+
+    assertThat(devLoadingViewManager.hideCount).isEqualTo(0)
+  }
+
+  @Test
+  fun testIntentionalCloseDoesNotShowConnectionLostMessage() {
+    notifier.onPackagerConnected()
+
+    notifier.onPackagerConnectionClosed()
+    notifier.onPackagerDisconnected()
+
+    assertThat(devLoadingViewManager.messages).isEmpty()
+  }
+
+  @Test
+  fun testUsesCurrentDevLoadingViewManager() {
+    var currentDevLoadingViewManager: RecordingDevLoadingViewManager? = null
+    val notifier =
+        PackagerConnectionStatusNotifier({ currentDevLoadingViewManager }) { runnable, _ ->
+          delayedActions.add(runnable)
+        }
+    currentDevLoadingViewManager = RecordingDevLoadingViewManager()
+
+    notifier.onPackagerConnected()
+    notifier.onPackagerDisconnected()
+
+    assertThat(currentDevLoadingViewManager.messages)
+        .containsExactly("Connection to Metro lost. Retrying...")
+  }
+
   private class RecordingDevLoadingViewManager : DevLoadingViewManager {
     val messages = mutableListOf<String>()
+    var hideCount = 0
 
     override fun showMessage(message: String) {
       messages.add(message)
@@ -63,6 +117,8 @@ class PackagerConnectionStatusNotifierTest {
 
     override fun updateProgress(status: String?, done: Int?, total: Int?, percent: Int?) = Unit
 
-    override fun hide() = Unit
+    override fun hide() {
+      hideCount++
+    }
   }
 }