expo-dev-launcher 4.0.0 → 4.0.2

package/CHANGELOG.md

@@ -10,6 +10,16 @@
 
 ### 💡 Others
 
+## 4.0.2 — 2024-04-22
+
+_This version does not introduce any user-facing changes._
+
+## 4.0.1 — 2024-04-19
+
+### 🎉 New features
+
+- Added bridgeless mode support on Android. ([#28162](https://github.com/expo/expo/pull/28162) by [@kudo](https://github.com/kudo))
+
 ## 4.0.0 — 2024-04-18
 
 ### 🛠 Breaking changes

package/android/build.gradle

@@ -17,7 +17,7 @@ android {
   namespace "expo.modules.devlauncher"
   defaultConfig {
     versionCode 9
-    versionName "4.0.0"
+    versionName "4.0.2"
   }
 
   buildTypes {

package/android/src/debug/java/expo/modules/devlauncher/DevLauncherController.kt

@@ -7,24 +7,40 @@ import android.net.Uri
 import androidx.annotation.UiThread
 import com.facebook.react.ReactActivity
 import com.facebook.react.ReactActivityDelegate
-import com.facebook.react.ReactNativeHost
+import com.facebook.react.ReactApplication
 import com.facebook.react.ReactPackage
 import com.facebook.react.bridge.ReactContext
-import expo.modules.devlauncher.helpers.*
+import expo.modules.devlauncher.helpers.DevLauncherInstallationIDHelper
+import expo.modules.devlauncher.helpers.DevLauncherMetadataHelper
+import expo.modules.devlauncher.helpers.DevLauncherUrl
+import expo.interfaces.devmenu.ReactHostWrapper
+import expo.modules.devlauncher.helpers.getFieldInClassHierarchy
+import expo.modules.devlauncher.helpers.hasUrlQueryParam
+import expo.modules.devlauncher.helpers.isDevLauncherUrl
+import expo.modules.devlauncher.helpers.runBlockingOnMainThread
 import expo.modules.devlauncher.koin.DevLauncherKoinComponent
 import expo.modules.devlauncher.koin.DevLauncherKoinContext
 import expo.modules.devlauncher.koin.devLauncherKoin
 import expo.modules.devlauncher.koin.optInject
-import expo.modules.devlauncher.launcher.*
+import expo.modules.devlauncher.launcher.DevLauncherActivity
+import expo.modules.devlauncher.launcher.DevLauncherAppEntry
+import expo.modules.devlauncher.launcher.DevLauncherControllerInterface
+import expo.modules.devlauncher.launcher.DevLauncherIntentRegistryInterface
+import expo.modules.devlauncher.launcher.DevLauncherLifecycle
+import expo.modules.devlauncher.launcher.DevLauncherNetworkInterceptor
+import expo.modules.devlauncher.launcher.DevLauncherReactActivityDelegateSupplier
+import expo.modules.devlauncher.launcher.DevLauncherReactHost
+import expo.modules.devlauncher.launcher.DevLauncherReactNativeHost
+import expo.modules.devlauncher.launcher.DevLauncherRecentlyOpenedAppsRegistry
 import expo.modules.devlauncher.launcher.errors.DevLauncherAppError
 import expo.modules.devlauncher.launcher.errors.DevLauncherErrorActivity
 import expo.modules.devlauncher.launcher.errors.DevLauncherUncaughtExceptionHandler
 import expo.modules.devlauncher.launcher.loaders.DevLauncherAppLoaderFactoryInterface
 import expo.modules.devlauncher.launcher.manifest.DevLauncherManifestParser
-import expo.modules.devmenu.DevMenuManager
 import expo.modules.devlauncher.react.activitydelegates.DevLauncherReactActivityNOPDelegate
 import expo.modules.devlauncher.react.activitydelegates.DevLauncherReactActivityRedirectDelegate
 import expo.modules.devlauncher.tests.DevLauncherTestInterceptor
+import expo.modules.devmenu.DevMenuManager
 import expo.modules.manifests.core.Manifest
 import expo.modules.updatesinterface.UpdatesInterface
 import kotlinx.coroutines.CoroutineScope
@@ -36,7 +52,7 @@ import org.koin.core.component.inject
 import org.koin.dsl.module
 
 // Use this to load from a development server for the development client launcher UI
-//  private final String DEV_LAUNCHER_HOST = "10.0.0.175:8090";
+// private val DEV_LAUNCHER_HOST = "10.0.0.175:8090";
 private val DEV_LAUNCHER_HOST: String? = null
 
 private const val NEW_ACTIVITY_FLAGS = Intent.FLAG_ACTIVITY_NEW_TASK or
@@ -48,7 +64,7 @@ class DevLauncherController private constructor() :
   private val context: Context by lazy {
     DevLauncherKoinContext.app.koin.get()
   }
-  override val appHost: ReactNativeHost by inject()
+  override val appHost: ReactHostWrapper by inject()
   private val httpClient: OkHttpClient by inject()
   private val lifecycle: DevLauncherLifecycle by inject()
   private val pendingIntentRegistry: DevLauncherIntentRegistryInterface by inject()
@@ -66,7 +82,12 @@ class DevLauncherController private constructor() :
     )
   override val coroutineScope = CoroutineScope(Dispatchers.Default)
 
-  override val devClientHost = DevLauncherClientHost((context as Application), DEV_LAUNCHER_HOST)
+  override val devClientHost by lazy {
+    ReactHostWrapper(
+      reactNativeHost = DevLauncherReactNativeHost(context as Application, DEV_LAUNCHER_HOST),
+      reactHost = DevLauncherReactHost.create(context as Application, DEV_LAUNCHER_HOST)
+    )
+  }
 
   private val recentlyOpedAppsRegistry = DevLauncherRecentlyOpenedAppsRegistry(context)
   override var manifest: Manifest? = null
@@ -98,7 +119,7 @@ class DevLauncherController private constructor() :
     coroutineScope.launch {
       loadApp(
         latestLoadedApp,
-        appHost.reactInstanceManager.currentReactContext?.currentActivity as? ReactActivity?
+        appHost.currentReactContext?.currentActivity as? ReactActivity?
       )
     }
   }
@@ -258,8 +279,8 @@ class DevLauncherController private constructor() :
     return false
   }
 
-  private fun ensureHostWasCleared(host: ReactNativeHost, activityToBeInvalidated: ReactActivity? = null) {
-    if (host.hasInstance()) {
+  private fun ensureHostWasCleared(host: ReactHostWrapper, activityToBeInvalidated: ReactActivity? = null) {
+    if (host.hasInstance) {
       runBlockingOnMainThread {
         clearHost(host, activityToBeInvalidated)
       }
@@ -277,8 +298,8 @@ class DevLauncherController private constructor() :
   }
 
   @UiThread
-  private fun clearHost(host: ReactNativeHost, activityToBeInvalidated: ReactActivity?) {
-    host.clear()
+  private fun clearHost(host: ReactHostWrapper, activityToBeInvalidated: ReactActivity?) {
+    host.destroy()
     activityToBeInvalidated?.let {
       invalidateActivity(it)
     }
@@ -364,7 +385,7 @@ class DevLauncherController private constructor() :
       }
 
     @JvmStatic
-    fun initialize(context: Context, appHost: ReactNativeHost) {
+    internal fun initialize(context: Context, reactHost: ReactHostWrapper) {
       val testInterceptor = DevLauncherKoinContext.app.koin.get<DevLauncherTestInterceptor>()
       if (!testInterceptor.allowReinitialization()) {
         check(!wasInitialized()) { "DevelopmentClientController was initialized." }
@@ -373,7 +394,7 @@ class DevLauncherController private constructor() :
         listOf(
           module {
             single { context }
-            single { appHost }
+            single { reactHost }
           }
         ),
         allowOverride = true
@@ -394,8 +415,14 @@ class DevLauncherController private constructor() :
     }
 
     @JvmStatic
-    fun initialize(context: Context, appHost: ReactNativeHost, additionalPackages: List<ReactPackage>? = null, launcherClass: Class<*>? = null) {
-      initialize(context, appHost)
+    fun initialize(context: Context, reactHost: ReactHostWrapper, launcherClass: Class<*>? = null) {
+      initialize(context, reactHost)
+      sLauncherClass = launcherClass
+    }
+
+    @JvmStatic
+    fun initialize(reactApplication: ReactApplication, additionalPackages: List<ReactPackage>? = null, launcherClass: Class<*>? = null) {
+      initialize(reactApplication as Context, ReactHostWrapper(reactApplication.reactNativeHost, reactApplication.reactHost))
       sAdditionalPackages = additionalPackages
       sLauncherClass = launcherClass
     }

package/android/src/debug/java/expo/modules/devlauncher/DevLauncherPackageDelegate.kt

@@ -35,7 +35,7 @@ object DevLauncherPackageDelegate {
       object : ApplicationLifecycleListener {
         override fun onCreate(application: Application?) {
           check(application is ReactApplication)
-          DevLauncherController.initialize(application, application.reactNativeHost)
+          DevLauncherController.initialize(application)
           UpdatesControllerRegistry.controller?.get()?.let {
             DevLauncherController.instance.updatesInterface = it
             it.updatesInterfaceCallbacks = WeakReference(DevLauncherController.instance)

package/android/src/debug/java/expo/modules/devlauncher/helpers/DevLauncherReactUtils.kt

@@ -1,53 +1,69 @@
 package expo.modules.devlauncher.helpers
 
+import android.app.Application
 import android.content.Context
 import android.net.Uri
 import android.util.Log
+import com.facebook.react.ReactHost
 import com.facebook.react.ReactNativeHost
 import com.facebook.react.ReactPackage
 import com.facebook.react.bridge.JSBundleLoader
+import com.facebook.react.common.annotations.UnstableReactNativeAPI
+import com.facebook.react.defaults.DefaultReactHostDelegate
 import com.facebook.react.devsupport.DevLauncherInternalSettings
+import com.facebook.react.devsupport.DevSupportManagerBase
+import com.facebook.react.devsupport.interfaces.DevSupportManager
+import com.facebook.react.runtime.ReactHostDelegate
+import com.facebook.react.runtime.ReactHostImpl
+import expo.interfaces.devmenu.ReactHostWrapper
 import expo.interfaces.devmenu.annotations.ContainsDevMenuExtension
 import expo.modules.devlauncher.react.DevLauncherDevSupportManagerSwapper
-import expo.modules.devlauncher.rncompatibility.DevLauncherDevSupportManager
+import expo.modules.devlauncher.rncompatibility.DevLauncherBridgeDevSupportManager
+import expo.modules.devlauncher.rncompatibility.DevLauncherBridgelessDevSupportManager
+import expo.modules.devmenu.helpers.setPrivateDeclaredFieldValue
 import okhttp3.HttpUrl
 
+// Sync this class name with ExpoReactHostFactory.kt
+private const val EXPO_REACT_HOST_DELEGATE_CLASS = "expo.modules.ExpoReactHostFactory.ExpoReactHostDelegate"
+
 fun injectReactInterceptor(
   context: Context,
-  reactNativeHost: ReactNativeHost,
+  reactHost: ReactHostWrapper,
   url: Uri
 ): Boolean {
-  val port = if (url.port != -1) url.port else HttpUrl.defaultPort(url.scheme ?: "http")
-  val debugServerHost = url.host + ":" + port
-  // We need to remove "/" which is added to begin of the path by the Uri
-  // and the bundle type
-  val appBundleName = if (url.path.isNullOrEmpty()) {
-    "index"
-  } else {
-    url.path
-      ?.substring(1)
-      ?.replace(".bundle", "")
-      ?: "index"
-  }
+  val (debugServerHost, appBundleName) = parseUrl(url)
 
-  injectDevSupportManager(reactNativeHost)
+  injectDevSupportManager(reactHost)
 
   val result = injectDebugServerHost(
     context,
-    reactNativeHost,
+    reactHost,
     debugServerHost,
     appBundleName
   )
-  (reactNativeHost.reactInstanceManager.devSupportManager as? DevLauncherDevSupportManager)?.startInspectorWhenDevLauncherReady()
-
+  if (reactHost.isBridgelessMode) {
+    (reactHost.devSupportManager as? DevLauncherBridgelessDevSupportManager)?.startInspectorWhenDevLauncherReady()
+  } else {
+    (reactHost.devSupportManager as? DevLauncherBridgeDevSupportManager)?.startInspectorWhenDevLauncherReady()
+  }
   return result
 }
 
-fun injectDevSupportManager(
-  reactNativeHost: ReactNativeHost
-) {
-  DevLauncherDevSupportManagerSwapper()
-    .swapDevSupportManagerImpl(reactNativeHost.reactInstanceManager)
+private fun injectDevSupportManager(reactHost: ReactHostWrapper) {
+  DevLauncherDevSupportManagerSwapper().swapDevSupportManagerImpl(reactHost)
+}
+
+fun injectDebugServerHost(
+  context: Context,
+  reactHost: ReactHostWrapper,
+  debugServerHost: String,
+  appBundleName: String
+): Boolean {
+  if (reactHost.isBridgelessMode) {
+    return injectDebugServerHost(context, reactHost.reactHost, debugServerHost, appBundleName)
+  } else {
+    return injectDebugServerHost(context, reactHost.reactNativeHost, debugServerHost, appBundleName)
+  }
 }
 
 fun injectDebugServerHost(
@@ -58,27 +74,8 @@ fun injectDebugServerHost(
 ): Boolean {
   return try {
     val instanceManager = reactNativeHost.reactInstanceManager
-    val settings = DevLauncherInternalSettings(context, debugServerHost)
     val devSupportManager = instanceManager.devSupportManager
-    val devSupportManagerBaseClass: Class<*>? = devSupportManager.javaClass.superclass
-    devSupportManagerBaseClass!!.setProtectedDeclaredField(
-      devSupportManager,
-      "mJSAppBundleName",
-      appBundleName
-    )
-    val mDevSettingsField = devSupportManagerBaseClass.getDeclaredField("mDevSettings")
-    mDevSettingsField.isAccessible = true
-    mDevSettingsField[devSupportManager] = settings
-    val mDevServerHelperField = devSupportManagerBaseClass.getDeclaredField("mDevServerHelper")
-    mDevServerHelperField.isAccessible = true
-    val devServerHelper = mDevServerHelperField[devSupportManager]
-    val mSettingsField = devServerHelper.javaClass.getDeclaredField("mSettings")
-    mSettingsField.isAccessible = true
-    mSettingsField[devServerHelper] = settings
-
-    val packagerConnectionSettingsField = devServerHelper.javaClass.getDeclaredField("mPackagerConnectionSettings")
-    packagerConnectionSettingsField.isAccessible = true
-    packagerConnectionSettingsField[devServerHelper] = settings.public_getPackagerConnectionSettings()
+    injectDebugServerHost(context, devSupportManager, debugServerHost, appBundleName)
 
     // set useDeveloperSupport to true in case it was previously set to false from loading a published app
     val mUseDeveloperSupportField = instanceManager.javaClass.getDeclaredField("mUseDeveloperSupport")
@@ -91,7 +88,62 @@ fun injectDebugServerHost(
   }
 }
 
+fun injectDebugServerHost(
+  context: Context,
+  reactHost: ReactHost,
+  debugServerHost: String,
+  appBundleName: String
+): Boolean {
+  return try {
+    val devSupportManager = requireNotNull(reactHost.devSupportManager)
+    injectDebugServerHost(context, devSupportManager, debugServerHost, appBundleName)
+    true
+  } catch (e: Exception) {
+    Log.e("DevLauncher", "Unable to inject debug server host settings.", e)
+    false
+  }
+}
+
+private fun injectDebugServerHost(
+  context: Context,
+  devSupportManager: DevSupportManager,
+  debugServerHost: String,
+  appBundleName: String
+) {
+  val settings = DevLauncherInternalSettings(context, debugServerHost)
+  val devSupportManagerBaseClass: Class<*> = DevSupportManagerBase::class.java
+  devSupportManagerBaseClass.setProtectedDeclaredField(
+    devSupportManager,
+    "mJSAppBundleName",
+    appBundleName
+  )
+  val mDevSettingsField = devSupportManagerBaseClass.getDeclaredField("mDevSettings")
+  mDevSettingsField.isAccessible = true
+  mDevSettingsField[devSupportManager] = settings
+  val mDevServerHelperField = devSupportManagerBaseClass.getDeclaredField("mDevServerHelper")
+  mDevServerHelperField.isAccessible = true
+  val devServerHelper = mDevServerHelperField[devSupportManager]
+  val mSettingsField = devServerHelper.javaClass.getDeclaredField("mSettings")
+  mSettingsField.isAccessible = true
+  mSettingsField[devServerHelper] = settings
+
+  val packagerConnectionSettingsField = devServerHelper.javaClass.getDeclaredField("mPackagerConnectionSettings")
+  packagerConnectionSettingsField.isAccessible = true
+  packagerConnectionSettingsField[devServerHelper] = settings.public_getPackagerConnectionSettings()
+}
+
 fun injectLocalBundleLoader(
+  reactHost: ReactHostWrapper,
+  bundlePath: String
+): Boolean {
+  return if (reactHost.isBridgelessMode) {
+    injectLocalBundleLoader(reactHost.reactHost, bundlePath)
+  } else {
+    injectLocalBundleLoader(reactHost.reactNativeHost, bundlePath)
+  }
+}
+
+private fun injectLocalBundleLoader(
   reactNativeHost: ReactNativeHost,
   bundlePath: String
 ): Boolean {
@@ -114,6 +166,50 @@ fun injectLocalBundleLoader(
   }
 }
 
+@OptIn(UnstableReactNativeAPI::class)
+private fun injectLocalBundleLoader(
+  reactHost: ReactHost,
+  bundlePath: String
+): Boolean {
+  return try {
+    check(reactHost is ReactHostImpl)
+
+    // [0] Disable `mAllowPackagerServerAccess`
+    // so that ReactHost could use jsBundlerLoader from ReactHostDelegate
+    val reactHostClass = ReactHostImpl::class.java
+    val mAllowPackagerServerAccessField = reactHostClass.getDeclaredField("mAllowPackagerServerAccess")
+    mAllowPackagerServerAccessField.isAccessible = true
+    mAllowPackagerServerAccessField[reactHost] = false
+
+    val newJsBundleLoader = JSBundleLoader.createFileLoader(bundlePath)
+
+    // [1] Replace the ReactHostDelegate.jsBundlerLoader with our new loader
+    val mReactHostDelegateField = reactHostClass.getDeclaredField("mReactHostDelegate")
+    mReactHostDelegateField.isAccessible = true
+    val reactHostDelegate = mReactHostDelegateField[reactHost] as ReactHostDelegate
+    if (reactHostDelegate.javaClass.canonicalName == EXPO_REACT_HOST_DELEGATE_CLASS) {
+      reactHostDelegate.javaClass.setPrivateDeclaredFieldValue(
+        "_jsBundleLoader",
+        reactHostDelegate,
+        newJsBundleLoader
+      )
+    } else if (reactHostDelegate is DefaultReactHostDelegate) {
+      DefaultReactHostDelegate::class.java.setPrivateDeclaredFieldValue(
+        "jsBundleLoader",
+        reactHostDelegate,
+        newJsBundleLoader
+      )
+    } else {
+      throw IllegalStateException("[injectLocalBundleLoader] Unsupported reactHostDelegate: ${reactHostDelegate.javaClass}")
+    }
+
+    true
+  } catch (e: Exception) {
+    Log.e("DevLauncher", "Unable to load local bundle file", e)
+    false
+  }
+}
+
 fun findDevMenuPackage(): ReactPackage? {
   return try {
     val clazz = Class.forName("expo.modules.devmenu.DevMenuPackage")
@@ -123,11 +219,11 @@ fun findDevMenuPackage(): ReactPackage? {
   }
 }
 
-fun findPackagesWithDevMenuExtension(reactNativeHost: ReactNativeHost): List<ReactPackage> {
+fun findPackagesWithDevMenuExtension(application: Application): List<ReactPackage> {
   return try {
     val clazz = Class.forName("com.facebook.react.PackageList")
-    val ctor = clazz.getConstructor(ReactNativeHost::class.java)
-    val packageList = ctor.newInstance(reactNativeHost)
+    val ctor = clazz.getConstructor(Application::class.java)
+    val packageList = ctor.newInstance(application)
 
     val getPackagesMethod = packageList.javaClass.getDeclaredMethod("getPackages")
     val packages = getPackagesMethod.invoke(packageList) as List<*>
@@ -141,3 +237,19 @@ fun findPackagesWithDevMenuExtension(reactNativeHost: ReactNativeHost): List<Rea
     emptyList()
   }
 }
+
+private fun parseUrl(url: Uri): Pair<String, String> {
+  val port = if (url.port != -1) url.port else HttpUrl.defaultPort(url.scheme ?: "http")
+  val debugServerHost = url.host + ":" + port
+  // We need to remove "/" which is added to begin of the path by the Uri
+  // and the bundle type
+  val appBundleName = if (url.path.isNullOrEmpty()) {
+    "index"
+  } else {
+    url.path
+      ?.substring(1)
+      ?.replace(".bundle", "")
+      ?: "index"
+  }
+  return Pair(debugServerHost, appBundleName)
+}

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

@@ -8,11 +8,11 @@ import android.view.View
 import android.view.ViewGroup
 import com.facebook.react.ReactActivity
 import com.facebook.react.ReactActivityDelegate
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
-import com.facebook.react.defaults.DefaultReactActivityDelegate
-import com.facebook.react.ReactInstanceManager
+import com.facebook.react.ReactInstanceEventListener
 import com.facebook.react.ReactRootView
 import com.facebook.react.bridge.ReactContext
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
+import com.facebook.react.defaults.DefaultReactActivityDelegate
 import expo.modules.core.utilities.EmulatorUtilities
 import expo.modules.devlauncher.koin.DevLauncherKoinComponent
 import expo.modules.devlauncher.splashscreen.DevLauncherSplashScreen
@@ -22,7 +22,7 @@ import org.koin.core.component.inject
 
 const val SEARCH_FOR_ROOT_VIEW_INTERVAL = 20L
 
-class DevLauncherActivity : ReactActivity(), ReactInstanceManager.ReactInstanceEventListener, DevLauncherKoinComponent {
+class DevLauncherActivity : ReactActivity(), ReactInstanceEventListener, DevLauncherKoinComponent {
   private val controller: DevLauncherControllerInterface by inject()
   private var devMenuManager: DevMenuManager = DevMenuManager
   private var splashScreen: DevLauncherSplashScreen? = null
@@ -35,7 +35,9 @@ class DevLauncherActivity : ReactActivity(), ReactInstanceManager.ReactInstanceE
   override fun createReactActivityDelegate(): ReactActivityDelegate {
     return object : DefaultReactActivityDelegate(this, mainComponentName, fabricEnabled) {
 
-      override fun getReactNativeHost() = controller.devClientHost
+      override fun getReactNativeHost() = controller.devClientHost.reactNativeHost
+
+      override fun getReactHost() = controller.devClientHost.reactHost
 
       override fun getLaunchOptions() = Bundle().apply {
         putBoolean("isSimulator", isSimulator)
@@ -59,12 +61,12 @@ class DevLauncherActivity : ReactActivity(), ReactInstanceManager.ReactInstanceE
 
   override fun onPostCreate(savedInstanceState: Bundle?) {
     super.onPostCreate(savedInstanceState)
-    reactInstanceManager.currentReactContext?.let {
+    controller.devClientHost.currentReactContext?.let {
       onReactContextInitialized(it)
       return
     }
 
-    reactInstanceManager.addReactInstanceEventListener(this)
+    controller.devClientHost.addReactInstanceEventListener(this)
   }
 
   override fun onPause() {
@@ -82,7 +84,7 @@ class DevLauncherActivity : ReactActivity(), ReactInstanceManager.ReactInstanceE
   }
 
   override fun onReactContextInitialized(context: ReactContext) {
-    reactInstanceManager.removeReactInstanceEventListener(this)
+    controller.devClientHost.removeReactInstanceEventListener(this)
   }
 
   private val isSimulator

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

@@ -2,12 +2,13 @@
 
 package expo.modules.devlauncher.launcher
 
-import com.facebook.react.ReactInstanceManager
 import com.facebook.react.bridge.Inspector
 import com.facebook.react.common.LifecycleState
 import com.facebook.react.devsupport.DevServerHelper
+import com.facebook.react.devsupport.DevSupportManagerBase
 import com.facebook.react.devsupport.InspectorPackagerConnection
 import expo.modules.devlauncher.DevLauncherController
+import expo.interfaces.devmenu.ReactHostWrapper
 import expo.modules.kotlin.devtools.ExpoRequestCdpInterceptor
 import java.io.Closeable
 import java.lang.ref.WeakReference
@@ -16,20 +17,20 @@ import java.lang.reflect.Method
 
 internal class DevLauncherNetworkInterceptor(controller: DevLauncherController) : Closeable, ExpoRequestCdpInterceptor.Delegate {
   private val weakController = WeakReference(controller)
-  private var reactInstanceHashCode: Int = 0
+  private var reactHostHashCode: Int = 0
   private var _inspectorPackagerConnection: InspectorPackagerConnectionWrapper? = null
 
   private val inspectorPackagerConnection: InspectorPackagerConnectionWrapper
     get() {
-      val reactInstanceManager = requireNotNull(weakController.get()?.appHost?.reactInstanceManager)
-      if (reactInstanceHashCode != reactInstanceManager.hashCode()) {
+      val reactHost = requireNotNull(weakController.get()?.appHost)
+      if (reactHostHashCode != reactHost.hashCode()) {
         _inspectorPackagerConnection?.clear()
         _inspectorPackagerConnection = null
-        reactInstanceHashCode = 0
+        reactHostHashCode = 0
       }
       if (_inspectorPackagerConnection == null) {
-        _inspectorPackagerConnection = InspectorPackagerConnectionWrapper(reactInstanceManager)
-        reactInstanceHashCode = reactInstanceManager.hashCode()
+        _inspectorPackagerConnection = InspectorPackagerConnectionWrapper(reactHost)
+        reactHostHashCode = reactHost.hashCode()
       }
       return requireNotNull(_inspectorPackagerConnection)
     }
@@ -42,7 +43,7 @@ internal class DevLauncherNetworkInterceptor(controller: DevLauncherController)
    * Returns true when it is allowed to send CDP events
    */
   private fun shouldEmitEvents(): Boolean {
-    return DevLauncherController.wasInitialized() && weakController.get()?.appHost?.reactInstanceManager?.lifecycleState == LifecycleState.RESUMED
+    return DevLauncherController.wasInitialized() && weakController.get()?.appHost?.lifecycleState == LifecycleState.RESUMED
   }
 
   //region Closeable implementations
@@ -63,7 +64,7 @@ internal class DevLauncherNetworkInterceptor(controller: DevLauncherController)
 /**
  * A `InspectorPackagerConnection` wrapper to expose private members with reflection
  */
-internal class InspectorPackagerConnectionWrapper constructor(reactInstanceManager: ReactInstanceManager) {
+internal class InspectorPackagerConnectionWrapper constructor(reactHost: ReactHostWrapper) {
   private var inspectorPackagerConnectionWeak: WeakReference<InspectorPackagerConnection> = WeakReference(null)
   private val devServerHelperWeak: WeakReference<DevServerHelper>
   private val inspectorPackagerConnectionField: Field
@@ -84,8 +85,8 @@ internal class InspectorPackagerConnectionWrapper constructor(reactInstanceManag
     }
 
   init {
-    val devSupportManager = reactInstanceManager.devSupportManager
-    val devSupportManagerBaseClass: Class<*> = devSupportManager.javaClass.superclass
+    val devSupportManager = requireNotNull(reactHost.devSupportManager)
+    val devSupportManagerBaseClass = DevSupportManagerBase::class.java
     val mDevServerHelperField = devSupportManagerBaseClass.getDeclaredField("mDevServerHelper")
     mDevServerHelperField.isAccessible = true
     val devServerHelper = mDevServerHelperField[devSupportManager]