expo-dev-launcher 4.0.0 → 4.0.1

package/android/src/debug/java/expo/modules/devlauncher/launcher/DevLauncherReactHost.kt

@@ -0,0 +1,109 @@
+package expo.modules.devlauncher.launcher
+
+import android.app.Application
+import com.facebook.react.JSEngineResolutionAlgorithm
+import com.facebook.react.ReactHost
+import com.facebook.react.ReactPackage
+import com.facebook.react.bridge.JSBundleLoader
+import com.facebook.react.common.annotations.UnstableReactNativeAPI
+import com.facebook.react.defaults.DefaultComponentsRegistry
+import com.facebook.react.defaults.DefaultReactHostDelegate
+import com.facebook.react.defaults.DefaultTurboModuleManagerDelegate
+import com.facebook.react.fabric.ComponentFactory
+import com.facebook.react.interfaces.exceptionmanager.ReactJsExceptionHandler
+import com.facebook.react.runtime.JSCInstance
+import com.facebook.react.runtime.ReactHostImpl
+import com.facebook.react.runtime.hermes.HermesInstance
+import com.facebook.react.shell.MainReactPackage
+import com.facebook.soloader.SoLoader
+import devmenu.com.th3rdwave.safeareacontext.SafeAreaProviderManager
+import expo.modules.adapters.react.ModuleRegistryAdapter
+import expo.modules.adapters.react.ReactModuleRegistryProvider
+import expo.modules.devlauncher.DevLauncherController
+import expo.modules.devlauncher.DevLauncherPackage
+import expo.modules.devlauncher.helpers.findDevMenuPackage
+import expo.modules.devlauncher.helpers.findPackagesWithDevMenuExtension
+import expo.modules.devlauncher.helpers.injectDebugServerHost
+import expo.modules.devmenu.modules.DevMenuPreferences
+import expo.modules.kotlin.ModulesProvider
+
+object DevLauncherReactHost {
+
+  @OptIn(UnstableReactNativeAPI::class)
+  fun create(application: Application, launcherIp: String?): ReactHost {
+    val jsBundleAssetPath = "expo_dev_launcher_android.bundle"
+    val jsBundleLoader =
+      JSBundleLoader.createAssetLoader(application, "assets://$jsBundleAssetPath", true)
+    val jsResolutionAlgorithm = createJSEngineResolutionAlgorithm(application)
+    val jsRuntimeFactory = if (jsResolutionAlgorithm == JSEngineResolutionAlgorithm.JSC) {
+      JSCInstance()
+    } else {
+      HermesInstance()
+    }
+    val jsMainModuleName = "index"
+    val defaultReactHostDelegate =
+      DefaultReactHostDelegate(
+        jsMainModulePath = jsMainModuleName,
+        jsBundleLoader = jsBundleLoader,
+        reactPackages = getPackages(application),
+        jsRuntimeFactory = jsRuntimeFactory,
+        turboModuleManagerDelegateBuilder = DefaultTurboModuleManagerDelegate.Builder()
+      )
+    val reactJsExceptionHandler = ReactJsExceptionHandler { _ -> }
+    val componentFactory = ComponentFactory()
+    DefaultComponentsRegistry.register(componentFactory)
+    val useDeveloperSupport = launcherIp != null
+    val reactHost = ReactHostImpl(
+      application,
+      defaultReactHostDelegate,
+      componentFactory,
+      useDeveloperSupport,
+      reactJsExceptionHandler,
+      useDeveloperSupport
+    )
+      .apply {
+        jsEngineResolutionAlgorithm = jsResolutionAlgorithm
+      }
+    if (useDeveloperSupport) {
+      injectDebugServerHost(application.applicationContext, reactHost, launcherIp!!, jsMainModuleName)
+    }
+    return reactHost
+  }
+
+  private fun getPackages(application: Application): List<ReactPackage> {
+    val devMenuPackage = findDevMenuPackage()
+    val devMenuRelatedPackages: List<ReactPackage> =
+      if (devMenuPackage != null) {
+        findPackagesWithDevMenuExtension(application) + devMenuPackage
+      } else {
+        emptyList()
+      }
+
+    val additionalPackages = (DevLauncherController.sAdditionalPackages ?: emptyList())
+
+    return listOf(
+      MainReactPackage(null),
+      ModuleRegistryAdapter(
+        ReactModuleRegistryProvider(emptyList()),
+        object : ModulesProvider {
+          override fun getModulesList() =
+            listOf(
+              DevMenuPreferences::class.java,
+              SafeAreaProviderManager::class.java
+            )
+        }
+      ),
+      DevLauncherPackage()
+    ) +
+      devMenuRelatedPackages +
+      additionalPackages
+  }
+
+  private fun createJSEngineResolutionAlgorithm(application: Application): JSEngineResolutionAlgorithm {
+    SoLoader.init(application.applicationContext, /* native exopackage */ false)
+    if (SoLoader.getLibraryPath("libjsc.so") != null) {
+      return JSEngineResolutionAlgorithm.JSC
+    }
+    return JSEngineResolutionAlgorithm.HERMES
+  }
+}

package/android/src/debug/java/expo/modules/devlauncher/launcher/{DevLauncherClientHost.kt → DevLauncherReactNativeHost.kt}

@@ -17,7 +17,7 @@ import expo.modules.devmenu.modules.DevMenuPreferences
 import expo.modules.devmenu.react.createNonDebuggableJavaScriptExecutorFactory
 import expo.modules.kotlin.ModulesProvider
 
-class DevLauncherClientHost(
+class DevLauncherReactNativeHost(
   application: Application,
   private val launcherIp: String?
 ) : DefaultReactNativeHost(application) {
@@ -34,7 +34,7 @@ class DevLauncherClientHost(
     val devMenuPackage = findDevMenuPackage()
     val devMenuRelatedPackages: List<ReactPackage> =
       if (devMenuPackage != null) {
-        findPackagesWithDevMenuExtension(this) + devMenuPackage
+        findPackagesWithDevMenuExtension(application) + devMenuPackage
       } else {
         emptyList()
       }

package/android/src/debug/java/expo/modules/devlauncher/launcher/errors/DevLauncherErrorActivity.kt

@@ -85,7 +85,7 @@ class DevLauncherErrorActivity :
       controller
         .loadApp(
           appUrl,
-          controller.appHost.reactInstanceManager.currentReactContext?.currentActivity as? ReactActivity?
+          controller.appHost.currentReactContext?.currentActivity as? ReactActivity?
         )
     }
   }

package/android/src/debug/java/expo/modules/devlauncher/launcher/errors/DevLauncherUncaughtExceptionHandler.kt

@@ -102,8 +102,8 @@ class DevLauncherUncaughtExceptionHandler(
   private fun tryToSendExceptionToBundler(exception: Throwable) {
     if (
       controller.mode != DevLauncherController.Mode.APP ||
-      !controller.appHost.hasInstance() ||
-      controller.appHost.reactInstanceManager.currentReactContext === null
+      !controller.appHost.hasInstance ||
+      controller.appHost.currentReactContext === null
     ) {
       return
     }
@@ -124,8 +124,9 @@ class DevLauncherUncaughtExceptionHandler(
   private fun getWebSocketUrl(): Uri {
     // URL structure replicates
     // https://github.com/facebook/react-native/blob/0.69-stable/Libraries/Utilities/HMRClient.js#L164
+    val devSupportManager = requireNotNull(controller.appHost.devSupportManager)
     return Uri
-      .parse(controller.appHost.reactInstanceManager.devSupportManager.sourceUrl)
+      .parse(devSupportManager.sourceUrl)
       .buildUpon()
       .path("hot")
       .clearQuery()

package/android/src/debug/java/expo/modules/devlauncher/launcher/loaders/DevLauncherAppLoader.kt

@@ -6,9 +6,9 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
 import com.facebook.react.ReactActivity
-import com.facebook.react.ReactInstanceManager
-import com.facebook.react.ReactNativeHost
+import com.facebook.react.ReactInstanceEventListener
 import com.facebook.react.bridge.ReactContext
+import expo.interfaces.devmenu.ReactHostWrapper
 import expo.modules.devlauncher.launcher.DevLauncherControllerInterface
 import kotlin.coroutines.Continuation
 import kotlin.coroutines.resume
@@ -34,7 +34,7 @@ import kotlin.coroutines.suspendCoroutine
  * - `onReactContext` - is called after the `ReactContext` was loaded.
  */
 abstract class DevLauncherAppLoader(
-  private val appHost: ReactNativeHost,
+  private val appHost: ReactHostWrapper,
   private val context: Context,
   private val controller: DevLauncherControllerInterface
 ) {
@@ -45,8 +45,8 @@ abstract class DevLauncherAppLoader(
     return { activity ->
       onDelegateWillBeCreated(activity)
 
-      require(appHost.reactInstanceManager.currentReactContext == null) { "App react context shouldn't be created before." }
-      appHost.reactInstanceManager.addReactInstanceEventListener(object : ReactInstanceManager.ReactInstanceEventListener {
+      require(appHost.currentReactContext == null) { "App react context shouldn't be created before." }
+      appHost.addReactInstanceEventListener(object : ReactInstanceEventListener {
         override fun onReactContextInitialized(context: ReactContext) {
           if (reactContextWasInitialized) {
             return
@@ -54,7 +54,7 @@ abstract class DevLauncherAppLoader(
 
           controller.onAppLoaded(context)
           onReactContext(context)
-          appHost.reactInstanceManager.removeReactInstanceEventListener(this)
+          appHost.removeReactInstanceEventListener(this)
           reactContextWasInitialized = true
           continuation!!.resume(true)
         }

package/android/src/debug/java/expo/modules/devlauncher/launcher/loaders/DevLauncherAppLoaderFactory.kt

@@ -2,8 +2,8 @@ package expo.modules.devlauncher.launcher.loaders
 
 import android.content.Context
 import android.net.Uri
-import com.facebook.react.ReactNativeHost
 import expo.modules.devlauncher.helpers.DevLauncherInstallationIDHelper
+import expo.interfaces.devmenu.ReactHostWrapper
 import expo.modules.devlauncher.helpers.createUpdatesConfigurationWithUrl
 import expo.modules.devlauncher.helpers.getRuntimeVersion
 import expo.modules.devlauncher.helpers.loadUpdate
@@ -14,7 +14,6 @@ import expo.modules.devlauncher.launcher.manifest.DevLauncherManifestParser
 import expo.modules.manifests.core.Manifest
 import expo.modules.updatesinterface.UpdatesInterface
 import org.koin.core.component.inject
-import java.lang.IllegalStateException
 
 interface DevLauncherAppLoaderFactoryInterface {
   suspend fun createAppLoader(url: Uri, projectUrl: Uri, manifestParser: DevLauncherManifestParser): DevLauncherAppLoader
@@ -24,7 +23,7 @@ interface DevLauncherAppLoaderFactoryInterface {
 
 class DevLauncherAppLoaderFactory : DevLauncherKoinComponent, DevLauncherAppLoaderFactoryInterface {
   private val context: Context by inject()
-  private val appHost: ReactNativeHost by inject()
+  private val appHost: ReactHostWrapper by inject()
   private val updatesInterface: UpdatesInterface? by optInject()
   private val controller: DevLauncherControllerInterface by inject()
   private val installationIDHelper: DevLauncherInstallationIDHelper by inject()

package/android/src/debug/java/expo/modules/devlauncher/launcher/loaders/DevLauncherExpoAppLoader.kt

@@ -5,9 +5,9 @@ import android.graphics.Color
 import android.util.Log
 import android.view.View
 import com.facebook.react.ReactActivity
-import com.facebook.react.ReactNativeHost
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.modules.appearance.AppearanceModule
+import expo.interfaces.devmenu.ReactHostWrapper
 import expo.modules.devlauncher.helpers.isValidColor
 import expo.modules.devlauncher.helpers.setProtectedDeclaredField
 import expo.modules.devlauncher.launcher.DevLauncherControllerInterface
@@ -17,7 +17,7 @@ import expo.modules.manifests.core.Manifest
 
 abstract class DevLauncherExpoAppLoader(
   private val manifest: Manifest,
-  appHost: ReactNativeHost,
+  appHost: ReactHostWrapper,
   context: Context,
   controller: DevLauncherControllerInterface,
   private val activityConfigurator: DevLauncherExpoActivityConfigurator =

package/android/src/debug/java/expo/modules/devlauncher/launcher/loaders/DevLauncherLocalAppLoader.kt

@@ -2,7 +2,7 @@ package expo.modules.devlauncher.launcher.loaders
 
 import android.content.Context
 import android.net.Uri
-import com.facebook.react.ReactNativeHost
+import expo.interfaces.devmenu.ReactHostWrapper
 import expo.modules.devlauncher.helpers.injectReactInterceptor
 import expo.modules.devlauncher.launcher.DevLauncherControllerInterface
 import expo.modules.manifests.core.Manifest
@@ -13,7 +13,7 @@ import expo.modules.manifests.core.Manifest
  */
 class DevLauncherLocalAppLoader(
   private val manifest: Manifest,
-  private val appHost: ReactNativeHost,
+  private val appHost: ReactHostWrapper,
   private val context: Context,
   controller: DevLauncherControllerInterface
 ) : DevLauncherExpoAppLoader(manifest, appHost, context, controller) {

package/android/src/debug/java/expo/modules/devlauncher/launcher/loaders/DevLauncherPublishedAppLoader.kt

@@ -1,7 +1,7 @@
 package expo.modules.devlauncher.launcher.loaders
 
 import android.content.Context
-import com.facebook.react.ReactNativeHost
+import expo.interfaces.devmenu.ReactHostWrapper
 import expo.modules.devlauncher.helpers.injectLocalBundleLoader
 import expo.modules.devlauncher.launcher.DevLauncherControllerInterface
 import expo.modules.manifests.core.Manifest
@@ -13,7 +13,7 @@ import expo.modules.manifests.core.Manifest
 class DevLauncherPublishedAppLoader(
   manifest: Manifest,
   private val localBundlePath: String,
-  private val appHost: ReactNativeHost,
+  private val appHost: ReactHostWrapper,
   context: Context,
   controller: DevLauncherControllerInterface
 ) : DevLauncherExpoAppLoader(manifest, appHost, context, controller) {

package/android/src/debug/java/expo/modules/devlauncher/launcher/loaders/DevLauncherReactNativeAppLoader.kt

@@ -2,13 +2,13 @@ package expo.modules.devlauncher.launcher.loaders
 
 import android.content.Context
 import android.net.Uri
-import com.facebook.react.ReactNativeHost
+import expo.interfaces.devmenu.ReactHostWrapper
 import expo.modules.devlauncher.helpers.injectReactInterceptor
 import expo.modules.devlauncher.launcher.DevLauncherControllerInterface
 
 class DevLauncherReactNativeAppLoader(
   private val url: Uri,
-  private val appHost: ReactNativeHost,
+  private val appHost: ReactHostWrapper,
   private val context: Context,
   controller: DevLauncherControllerInterface
 ) : DevLauncherAppLoader(appHost, context, controller) {

package/android/src/debug/java/expo/modules/devlauncher/react/DevLauncherDevSupportManagerSwapper.kt

@@ -1,101 +1,163 @@
 package expo.modules.devlauncher.react
 
 import android.util.Log
+import com.facebook.react.ReactHost
 import com.facebook.react.ReactInstanceManager
+import com.facebook.react.ReactNativeHost
 import com.facebook.react.common.ShakeDetector
 import com.facebook.react.devsupport.DevServerHelper
 import com.facebook.react.devsupport.DevSupportManagerBase
 import com.facebook.react.devsupport.DisabledDevSupportManager
 import com.facebook.react.devsupport.interfaces.DevSupportManager
 import com.facebook.react.packagerconnection.JSPackagerClient
+import com.facebook.react.runtime.ReactHostImpl
+import expo.interfaces.devmenu.ReactHostWrapper
 import expo.modules.devlauncher.helpers.getProtectedFieldValue
 import expo.modules.devlauncher.helpers.setProtectedDeclaredField
 import expo.modules.devlauncher.koin.DevLauncherKoinComponent
 import expo.modules.devlauncher.launcher.DevLauncherControllerInterface
-import expo.modules.devlauncher.rncompatibility.DevLauncherDevSupportManager
+import expo.modules.devlauncher.rncompatibility.DevLauncherBridgeDevSupportManager
+import expo.modules.devlauncher.rncompatibility.DevLauncherBridgelessDevSupportManager
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.koin.core.component.inject
 
-class DevLauncherDevSupportManagerSwapper : DevLauncherKoinComponent {
+internal class DevLauncherDevSupportManagerSwapper : DevLauncherKoinComponent {
   private val controller: DevLauncherControllerInterface by inject()
 
-  fun swapDevSupportManagerImpl(
-    reactInstanceManager: ReactInstanceManager
-  ) {
+  fun swapDevSupportManagerImpl(reactHost: ReactHostWrapper) {
+    if (reactHost.isBridgelessMode) {
+      swapDevSupportManagerImpl(reactHost.reactHost)
+    } else {
+      swapDevSupportManagerImpl(reactHost.reactNativeHost)
+    }
+  }
+
+  private fun swapDevSupportManagerImpl(reactNativeHost: ReactNativeHost) {
+    val reactInstanceManager = reactNativeHost.reactInstanceManager
     val currentDevSupportManager = reactInstanceManager.devSupportManager
-    if (currentDevSupportManager is DevLauncherDevSupportManager) {
+    if (currentDevSupportManager is DevLauncherBridgeDevSupportManager) {
       // DevSupportManager was swapped by the DevLauncherReactNativeHostHandler
       return
     }
+    if (currentDevSupportManager is DisabledDevSupportManager) {
+      Log.i("DevLauncher", "DevSupportManager is disabled. So we don't want to override it.")
+      return
+    }
+
+    try {
+      val devManagerClass = DevSupportManagerBase::class.java
+      val newDevSupportManager = createDevLauncherBridgeDevSupportManager(devManagerClass, currentDevSupportManager)
 
+      ReactInstanceManager::class.java.setProtectedDeclaredField(reactInstanceManager, "mDevSupportManager", newDevSupportManager)
+
+      closeExistingConnection(devManagerClass, currentDevSupportManager)
+    } catch (e: Exception) {
+      Log.i("DevLauncher", "Couldn't inject `DevLauncherDevSupportManager`.", e)
+    }
+  }
+
+  private fun swapDevSupportManagerImpl(reactHost: ReactHost) {
+    val currentDevSupportManager = requireNotNull(reactHost.devSupportManager)
+    if (currentDevSupportManager is DevLauncherBridgelessDevSupportManager) {
+      // DevSupportManager was swapped by the DevLauncherReactNativeHostHandler
+      return
+    }
     if (currentDevSupportManager is DisabledDevSupportManager) {
       Log.i("DevLauncher", "DevSupportManager is disabled. So we don't want to override it.")
       return
     }
+
     try {
       val devManagerClass = DevSupportManagerBase::class.java
-      val newDevSupportManager = DevLauncherDevSupportManager(
-        applicationContext = devManagerClass.getProtectedFieldValue(currentDevSupportManager, "mApplicationContext"),
-        reactInstanceManagerHelper = devManagerClass.getProtectedFieldValue(currentDevSupportManager, DevLauncherDevSupportManager.getDevHelperInternalFieldName()),
-        packagerPathForJSBundleName = devManagerClass.getProtectedFieldValue(currentDevSupportManager, "mJSAppBundleName"),
-        enableOnCreate = true,
-        redBoxHandler = devManagerClass.getProtectedFieldValue(currentDevSupportManager, "mRedBoxHandler"),
-        devBundleDownloadListener = devManagerClass.getProtectedFieldValue(currentDevSupportManager, "mBundleDownloadListener"),
-        minNumShakes = 1,
-        customPackagerCommandHandlers = devManagerClass.getProtectedFieldValue(currentDevSupportManager, "mCustomPackagerCommandHandlers")
+      val newDevSupportManager = createDevLauncherBridgelessDevSupportManager(
+        devManagerClass,
+        currentDevSupportManager,
+        reactHost
       )
 
-      ReactInstanceManager::class.java.setProtectedDeclaredField(reactInstanceManager, "mDevSupportManager", newDevSupportManager)
+      ReactHostImpl::class.java.setProtectedDeclaredField(reactHost, "mDevSupportManager", newDevSupportManager)
+
+      closeExistingConnection(devManagerClass, currentDevSupportManager)
+    } catch (e: Exception) {
+      Log.i("DevLauncher", "Couldn't inject `DevLauncherDevSupportManager`.", e)
+    }
+  }
+
+  private fun createDevLauncherBridgeDevSupportManager(
+    devManagerClass: Class<*>,
+    currentDevSupportManager: DevSupportManager
+  ): DevLauncherBridgeDevSupportManager {
+    return DevLauncherBridgeDevSupportManager(
+      applicationContext = devManagerClass.getProtectedFieldValue(currentDevSupportManager, "mApplicationContext"),
+      reactInstanceDevHelper = devManagerClass.getProtectedFieldValue(currentDevSupportManager, DevLauncherBridgeDevSupportManager.getDevHelperInternalFieldName()),
+      packagerPathForJSBundleName = devManagerClass.getProtectedFieldValue(currentDevSupportManager, "mJSAppBundleName"),
+      enableOnCreate = true,
+      redBoxHandler = devManagerClass.getProtectedFieldValue(currentDevSupportManager, "mRedBoxHandler"),
+      devBundleDownloadListener = devManagerClass.getProtectedFieldValue(currentDevSupportManager, "mBundleDownloadListener"),
+      minNumShakes = 1,
+      customPackagerCommandHandlers = devManagerClass.getProtectedFieldValue(currentDevSupportManager, "mCustomPackagerCommandHandlers")
+    )
+  }
 
-      /**
-       * We need to invalidate the old packager connection.
-       * However, this connection is established in the background
-       * and we don't know when it will be available (see [DevServerHelper.openPackagerConnection]).
-       * So we just wait for connection and then we kill it.
-       */
-      controller.coroutineScope.launch {
-        try {
-          while (true) {
-            // Invalidate shake detector - not doing that leads to memory leaks
-            tryToStopShakeDetector(currentDevSupportManager)
-
-            val devServerHelper: DevServerHelper = devManagerClass.getProtectedFieldValue(
-              currentDevSupportManager,
-              "mDevServerHelper"
+  private fun createDevLauncherBridgelessDevSupportManager(
+    devManagerClass: Class<*>,
+    currentDevSupportManager: DevSupportManager,
+    reactHost: ReactHost
+  ): DevLauncherBridgelessDevSupportManager {
+    return DevLauncherBridgelessDevSupportManager(
+      host = reactHost as ReactHostImpl,
+      context = devManagerClass.getProtectedFieldValue(currentDevSupportManager, "mApplicationContext"),
+      packagerPathForJSBundleName = devManagerClass.getProtectedFieldValue(currentDevSupportManager, "mJSAppBundleName")
+    )
+  }
+
+  /**
+   * We need to invalidate the old packager connection.
+   * However, this connection is established in the background
+   * and we don't know when it will be available (see [DevServerHelper.openPackagerConnection]).
+   * So we just wait for connection and then we kill it.
+   */
+  private fun closeExistingConnection(devManagerClass: Class<*>, devSupportManager: DevSupportManager) {
+    controller.coroutineScope.launch {
+      try {
+        while (true) {
+          // Invalidate shake detector - not doing that leads to memory leaks
+          tryToStopShakeDetector(devSupportManager)
+
+          val devServerHelper: DevServerHelper = devManagerClass.getProtectedFieldValue(
+            devSupportManager,
+            "mDevServerHelper"
+          )
+
+          try {
+            val packagerConnectionLock: Boolean = DevServerHelper::class.java.getProtectedFieldValue(
+              devServerHelper,
+              "mPackagerConnectionLock"
             )
 
-            try {
-              val packagerConnectionLock: Boolean = DevServerHelper::class.java.getProtectedFieldValue(
-                devServerHelper,
-                "mPackagerConnectionLock"
-              )
-
-              if (!packagerConnectionLock) {
-                devServerHelper.closePackagerConnection()
-                return@launch
-              }
-            } catch (_: NoSuchFieldException) {
-              // mPackagerConnectionLock was removed from the React Native in v0.63.4
-              val packagerClient: JSPackagerClient? = DevServerHelper::class.java.getProtectedFieldValue(
-                devServerHelper,
-                "mPackagerClient"
-              )
-
-              if (packagerClient != null) {
-                devServerHelper.closePackagerConnection()
-                return@launch
-              }
+            if (!packagerConnectionLock) {
+              devServerHelper.closePackagerConnection()
+              return@launch
             }
+          } catch (_: NoSuchFieldException) {
+            // mPackagerConnectionLock was removed from the React Native in v0.63.4
+            val packagerClient: JSPackagerClient? = DevServerHelper::class.java.getProtectedFieldValue(
+              devServerHelper,
+              "mPackagerClient"
+            )
 
-            delay(50)
+            if (packagerClient != null) {
+              devServerHelper.closePackagerConnection()
+              return@launch
+            }
           }
-        } catch (e: Exception) {
-          Log.w("DevLauncher", "Couldn't close the packager connection: ${e.message}", e)
+
+          delay(50)
         }
+      } catch (e: Exception) {
+        Log.w("DevLauncher", "Couldn't close the packager connection: ${e.message}", e)
       }
-    } catch (e: Exception) {
-      Log.i("DevLauncher", "Couldn't inject `DevLauncherDevSupportManager`.", e)
     }
   }