expo-dev-launcher 4.0.11 → 4.0.13

package/CHANGELOG.md

@@ -10,6 +10,19 @@
 
 ### 💡 Others
 
+## 4.0.13 — 2024-05-09
+
+### 🐛 Bug fixes
+
+- Fixed loading error when both `expo-dev-client` and `expo-updates` installed but no `runtimeVersion` configured. ([#28662](https://github.com/expo/expo/pull/28662) by [@kudo](https://github.com/kudo))
+- Fixed loading error from a https dev-server on Android. ([#28691](https://github.com/expo/expo/pull/28691) by [@kudo](https://github.com/kudo))
+
+## 4.0.12 — 2024-05-08
+
+### 🐛 Bug fixes
+
+- [iOS] Fixed DevMenu getting unresponsive after reloading bundle. ([#28664](https://github.com/expo/expo/pull/28664) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+
 ## 4.0.11 — 2024-05-04
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

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

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

@@ -38,15 +38,16 @@ class DevLauncherAppLoaderFactory : DevLauncherKoinComponent, DevLauncherAppLoad
       // It's (maybe) a raw React Native bundle
       DevLauncherReactNativeAppLoader(url, appHost, context, controller)
     } else {
-      if (updatesInterface == null) {
+      val runtimeVersion = getRuntimeVersion(context)
+      val configuration = createUpdatesConfigurationWithUrl(url, projectUrl, runtimeVersion, installationIDHelper.getOrCreateInstallationID(context))
+
+      if (updatesInterface?.isValidUpdatesConfiguration(configuration, context) != true) {
         manifest = manifestParser.parseManifest()
         if (!manifest!!.isUsingDeveloperTool()) {
           throw Exception("expo-updates is not properly installed or integrated. In order to load published projects with this development client, follow all installation and setup instructions for both the expo-dev-client and expo-updates packages.")
         }
         DevLauncherLocalAppLoader(manifest!!, appHost, context, controller)
       } else {
-        val runtimeVersion = getRuntimeVersion(context)
-        val configuration = createUpdatesConfigurationWithUrl(url, projectUrl, runtimeVersion, installationIDHelper.getOrCreateInstallationID(context))
         val update = updatesInterface!!.loadUpdate(configuration, context) {
           manifest = Manifest.fromManifestJson(it) // TODO: might be able to pass actual manifest object in here
           return@loadUpdate !manifest!!.isUsingDeveloperTool()

package/android/src/main/java/com/facebook/react/devsupport/DevLauncherDevServerHelper.kt

@@ -2,17 +2,36 @@ package com.facebook.react.devsupport
 
 import android.content.Context
 import android.net.Uri
+import com.facebook.react.devsupport.interfaces.PackagerStatusCallback
 import com.facebook.react.modules.debug.interfaces.DeveloperSettings
 import com.facebook.react.packagerconnection.PackagerConnectionSettings
 import expo.modules.devlauncher.launcher.DevLauncherControllerInterface
+import okhttp3.Call
+import okhttp3.Callback
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+import java.io.IOException
+import java.util.concurrent.TimeUnit
+
+private const val PACKAGER_OK_STATUS = "packager-status:running"
+private const val HTTP_CONNECT_TIMEOUT_MS = 5000L
+private const val PACKAGER_STATUS_ENDPOINT = "status"
 
 class DevLauncherDevServerHelper(
   context: Context,
   private val controller: DevLauncherControllerInterface?,
   devSettings: DeveloperSettings,
   packagerConnection: PackagerConnectionSettings
-) :
-  DevServerHelper(devSettings, context.packageName, packagerConnection) {
+) : DevServerHelper(devSettings, context.packageName, packagerConnection) {
+
+  private val httpClient: OkHttpClient by lazy {
+    OkHttpClient.Builder()
+      .connectTimeout(HTTP_CONNECT_TIMEOUT_MS, TimeUnit.MILLISECONDS)
+      .readTimeout(0, TimeUnit.MILLISECONDS)
+      .writeTimeout(0, TimeUnit.MILLISECONDS)
+      .build()
+  }
 
   override fun getDevServerBundleURL(jsModulePath: String?): String {
     return controller?.manifest?.getBundleURL() ?: super.getDevServerBundleURL(jsModulePath)
@@ -47,4 +66,35 @@ class DevLauncherDevServerHelper(
     }
     return "$defaultValue&$customOptionsString"
   }
+
+  /**
+   * Re-implement [PackagerStatusCheck](https://github.com/facebook/react-native/blob/958f8e2bb55ba3a2ac/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/PackagerStatusCheck.java)
+   * to support https.
+   */
+  override fun isPackagerRunning(callback: PackagerStatusCallback) {
+    val bundleURL = controller?.manifest?.getBundleURL() ?: return super.isPackagerRunning(callback)
+    val bundleUri = Uri.parse(bundleURL)
+    val statusUrl = bundleUri.buildUpon()
+      .path(PACKAGER_STATUS_ENDPOINT)
+      .clearQuery()
+      .build()
+      .toString()
+    val request = Request.Builder().url(statusUrl).build()
+    httpClient
+      .newCall(request)
+      .enqueue(object : Callback {
+        override fun onFailure(call: Call, e: IOException) {
+          callback.onPackagerStatusFetched(false)
+        }
+
+        override fun onResponse(call: Call, response: Response) {
+          if (!response.isSuccessful) {
+            callback.onPackagerStatusFetched(false)
+            return
+          }
+          val body = response.body?.string() ?: ""
+          callback.onPackagerStatusFetched(body == PACKAGER_OK_STATUS)
+        }
+      })
+  }
 }

package/android/src/testDebug/java/expo/modules/devlauncher/launcher/loaders/DevLauncherAppLoaderFactoryTest.kt

@@ -13,6 +13,7 @@ import expo.modules.devlauncher.launcher.manifest.DevLauncherManifestParser
 import expo.modules.manifests.core.Manifest
 import expo.modules.updatesinterface.UpdatesInterface
 import io.mockk.coEvery
+import io.mockk.every
 import io.mockk.mockk
 import io.mockk.mockkStatic
 import io.mockk.slot
@@ -94,6 +95,8 @@ internal class DevLauncherAppLoaderFactoryTest {
   fun `loads app locally if manifest indicates developer tool and updatesInterface exists`() = runBlocking<Unit> {
     mockUpdatesInterface(developmentManifestJSONString) {
       Truth.assertThat(it).isFalse()
+    }.let { updatesInterface ->
+      every { updatesInterface.isValidUpdatesConfiguration(any(), any()) } returns true
     }
     val appLoaderFactory = DevLauncherAppLoaderFactory()
 
@@ -109,6 +112,8 @@ internal class DevLauncherAppLoaderFactoryTest {
   fun `loads published app if manifest is published and updatesInterface exists`() = runBlocking<Unit> {
     mockUpdatesInterface(publishedManifestJSONString) {
       Truth.assertThat(it).isTrue()
+    }.let { updatesInterface ->
+      every { updatesInterface.isValidUpdatesConfiguration(any(), any()) } returns true
     }
     val appLoaderFactory = DevLauncherAppLoaderFactory()
 
@@ -120,7 +125,26 @@ internal class DevLauncherAppLoaderFactoryTest {
     Truth.assertThat(appLoaderFactory.shouldUseDeveloperSupport()).isFalse()
   }
 
-  private fun mockUpdatesInterface(manifestJSONString: String, verifyShouldContinue: (Boolean) -> Unit) {
+  @Test
+  fun `loads app locally if manifest indicates developer tool but updates is mis-configured`() = runBlocking<Unit> {
+    mockUpdatesInterface(developmentManifestJSONString) {
+      Truth.assertThat(it).isTrue()
+    }.let { updatesInterface ->
+      every { updatesInterface.isValidUpdatesConfiguration(any(), any()) } returns false
+    }
+    val appLoaderFactory = DevLauncherAppLoaderFactory()
+
+    val manifestParser = mockk<DevLauncherManifestParser>()
+    val manifest = Manifest.fromManifestJson(JSONObject(developmentManifestJSONString))
+    coEvery { manifestParser.isManifestUrl() } returns true
+    coEvery { manifestParser.parseManifest() } returns manifest
+
+    val appLoader = appLoaderFactory.createAppLoader(developmentManifestURL, developmentManifestURL, manifestParser)
+    Truth.assertThat(appLoader).isInstanceOf(DevLauncherLocalAppLoader::class.java)
+    Truth.assertThat(appLoaderFactory.shouldUseDeveloperSupport()).isTrue()
+  }
+
+  private fun mockUpdatesInterface(manifestJSONString: String, verifyShouldContinue: (Boolean) -> Unit): UpdatesInterface {
     val updatesInterface = mockk<UpdatesInterface>()
     val manifest = JSONObject(manifestJSONString)
     val slot = slot<(JSONObject) -> Boolean>()
@@ -151,5 +175,7 @@ internal class DevLauncherAppLoaderFactoryTest {
         }
       )
     )
+
+    return updatesInterface
   }
 }

package/ios/EXDevLauncherController.m

@@ -503,7 +503,7 @@
       return;
     }
 
-    if (!self->_updatesInterface) {
+    if ([self->_updatesInterface isValidUpdatesConfiguration:updatesConfiguration] != YES) {
       [manifestParser tryToParseManifest:^(EXManifestsManifest *manifest) {
         if (!manifest.isUsingDeveloperTool) {
           onError([NSError errorWithDomain:@"DevelopmentClient" code:1 userInfo:@{NSLocalizedDescriptionKey: @"expo-updates is not properly installed or integrated. In order to load published projects with this development client, follow all installation and setup instructions for both the expo-dev-client and expo-updates packages."}]);
@@ -672,6 +672,8 @@
     // expo-dev-menu registers its commands here: https://github.com/expo/expo/blob/6da15324ff0b4a9cb24055e9815b8aa11f0ac3af/packages/expo-dev-menu/ios/Interceptors/DevMenuKeyCommandsInterceptor.swift#L27-L29
     [[RCTKeyCommands sharedInstance] unregisterKeyCommandWithInput:@"d"
                                                      modifierFlags:UIKeyModifierCommand];
+    [[RCTKeyCommands sharedInstance] unregisterKeyCommandWithInput:@"r"
+                                                    modifierFlags:UIKeyModifierCommand];
   }
 }
 
@@ -722,7 +724,7 @@
 - (void)setDevMenuAppBridge
 {
   DevMenuManager *manager = [DevMenuManager shared];
-  manager.currentBridge = self.appBridge;
+  manager.currentBridge = self.appBridge.parentBridge;
 
   if (self.manifest != nil) {
     manager.currentManifest = self.manifest;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-dev-launcher",
   "title": "Expo Development Launcher",
-  "version": "4.0.11",
+  "version": "4.0.13",
   "description": "Pre-release version of the Expo development launcher package for testing.",
   "main": "build/DevLauncher.js",
   "types": "build/DevLauncher.d.ts",
@@ -31,7 +31,7 @@
   "homepage": "https://docs.expo.dev",
   "dependencies": {
     "ajv": "8.11.0",
-    "expo-dev-menu": "5.0.12",
+    "expo-dev-menu": "5.0.13",
     "expo-manifests": "~0.14.0",
     "resolve-from": "^5.0.0",
     "semver": "^7.6.0"
@@ -66,5 +66,5 @@
       "./setupTests.ts"
     ]
   },
-  "gitHead": "2d80ee3cc6b1703101e8fa2639474efa7dc75097"
+  "gitHead": "9c05bec11c7f5b031d1b9b0ebee78c3b71a7e11d"
 }