expo-updates 0.24.6 → 0.24.7

package/CHANGELOG.md

@@ -10,6 +10,25 @@
 
 ### 💡 Others
 
+## 0.24.7 — 2024-01-10
+
+### 🎉 New features
+
+- Added `AppController.overrideConfiguration()` to override the `UpdatesConfig` on iOS. ([#26093](https://github.com/expo/expo/pull/26093) by [@kudo](https://github.com/kudo))
+
+### 🛠 Breaking changes
+
+- Deprecated `UpdatesController.initialize(Context, Map)` and replaced with `UpdatesController.overrideConfiguration()` method to prevent ANR when overriding the `UpdatesConfiguration` on Android. [#26093](https://github.com/expo/expo/pull/26093) by [@kudo](https://github.com/kudo))
+
+### 🐛 Bug fixes
+
+- Fix metro asset call in embedded manifest creation step. ([#26307](https://github.com/expo/expo/pull/26307) by [@wschurman](https://github.com/wschurman))
+- [expo-updates] dev launcher updates controller should not read embedded manifest. ([#26336](https://github.com/expo/expo/pull/26336) by [@douglowder](https://github.com/douglowder))
+
+### 💡 Others
+
+- Replace deprecated `com.facebook.react:react-native:+` Android dependency with `com.facebook.react:react-android`. ([#26237](https://github.com/expo/expo/pull/26237) by [@kudo](https://github.com/kudo))
+
 ## 0.24.6 — 2024-01-05
 
 ### 🎉 New features

package/DEVELOPMENT.md

@@ -33,7 +33,7 @@ To test the new EAS update manifest format, set `EXUpdatesUsesLegacyManifest` an
 
 ### Additional Headers
 
-If you want any additional headers to be sent in manifest requests, you can add these to a map under the key `EXUpdatesRequestHeaders` on iOS, or `requestHeaders` on Android (currently, this can't be configured in AndroidManifest.xml and you need to use the `UpdatesController.initialize(Context context, Map<String, Object> configuration)` method in MainApplication.java).
+If you want any additional headers to be sent in manifest requests, you can add these to a map under the key `EXUpdatesRequestHeaders` on iOS, or `requestHeaders` on Android (currently, this can't be configured in AndroidManifest.xml and you need to use the `UpdatesController.overrideConfiguration(Context context, Map<String, Object> configuration)` method in MainApplication.java).
 
 ## Making a Build
 

package/android/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '0.24.6'
+version = '0.24.7'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 if (expoModulesCorePlugin.exists()) {
@@ -122,7 +122,7 @@ android {
   namespace "expo.modules.updates"
   defaultConfig {
     versionCode 31
-    versionName '0.24.6'
+    versionName '0.24.7'
     consumerProguardFiles("proguard-rules.pro")
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -159,8 +159,7 @@ dependencies {
   implementation project(':expo-manifests')
   implementation project(':expo-json-utils')
   implementation project(':expo-eas-client')
-  //noinspection GradleDynamicVersion
-  implementation "com.facebook.react:react-native:+"
+  implementation "com.facebook.react:react-android"
 
   def room_version = "2.4.2"
 

package/android/src/main/java/expo/modules/updates/UpdatesController.kt

@@ -23,13 +23,14 @@ import expo.modules.updatesinterface.UpdatesInterfaceCallbacks
 class UpdatesController {
   companion object {
     private var singletonInstance: IUpdatesController? = null
+    private var overrideConfiguration: UpdatesConfiguration? = null
 
     @JvmStatic val instance: IUpdatesController
       get() {
         return checkNotNull(singletonInstance) { "UpdatesController.instance was called before the module was initialized" }
       }
 
-    @JvmStatic fun initializeWithoutStarting(context: Context, configuration: Map<String, Any>? = null) {
+    @JvmStatic fun initializeWithoutStarting(context: Context) {
       if (singletonInstance == null) {
         var updatesDirectoryException: Exception? = null
         val updatesDirectory = try {
@@ -39,19 +40,11 @@ class UpdatesController {
           null
         }
 
-        val updatesConfigurationValidationResult = UpdatesConfiguration.getUpdatesConfigurationValidationResult(context, configuration)
-        singletonInstance = if (updatesConfigurationValidationResult == UpdatesConfigurationValidationResult.VALID && updatesDirectory != null) {
-          val updatesConfiguration = UpdatesConfiguration(context, null)
-          EnabledUpdatesController(context, updatesConfiguration, updatesDirectory)
-        } else {
+        val updatesConfiguration: UpdatesConfiguration? = overrideConfiguration ?: run {
           val logger = UpdatesLogger(context)
-          when (updatesConfigurationValidationResult) {
+          when (UpdatesConfiguration.getUpdatesConfigurationValidationResult(context, null)) {
             UpdatesConfigurationValidationResult.VALID -> {
-              // this means there was a storage error
-              logger.error(
-                "The expo-updates system is disabled due to a storage access error: ${updatesDirectoryException?.message ?: "Unknown Error"}",
-                UpdatesErrorCode.InitializationError
-              )
+              return@run UpdatesConfiguration(context, null)
             }
             UpdatesConfigurationValidationResult.INVALID_NOT_ENABLED -> logger.warn(
               "The expo-updates system is explicitly disabled. To enable it, set the enabled setting to true.",
@@ -66,8 +59,21 @@ class UpdatesController {
               UpdatesErrorCode.InitializationError
             )
           }
+          return@run null
+        }
 
-          DisabledUpdatesController(context, updatesDirectoryException, UpdatesConfiguration.isMissingRuntimeVersion(context, configuration))
+        singletonInstance = if (updatesConfiguration != null && updatesDirectory != null) {
+          EnabledUpdatesController(context, updatesConfiguration, updatesDirectory)
+        } else {
+          val logger = UpdatesLogger(context)
+          if (updatesDirectory == null) {
+            // this means there was a storage error
+            logger.error(
+              "The expo-updates system is disabled due to a storage access error: ${updatesDirectoryException?.message ?: "Unknown Error"}",
+              UpdatesErrorCode.InitializationError
+            )
+          }
+          DisabledUpdatesController(context, updatesDirectoryException, UpdatesConfiguration.isMissingRuntimeVersion(context, null))
         }
       }
     }
@@ -83,11 +89,14 @@ class UpdatesController {
         null
       }
 
-      val initialUpdatesConfiguration = if (UpdatesConfiguration.getUpdatesConfigurationValidationResult(context, null) == UpdatesConfigurationValidationResult.VALID) {
-        UpdatesConfiguration(context, null)
-      } else {
-        null
+      val initialUpdatesConfiguration = overrideConfiguration ?: run {
+        if (UpdatesConfiguration.getUpdatesConfigurationValidationResult(context, null) == UpdatesConfigurationValidationResult.VALID) {
+          UpdatesConfiguration(context, null)
+        } else {
+          null
+        }
       }
+
       val instance = UpdatesDevLauncherController(
         context,
         initialUpdatesConfiguration,
@@ -107,11 +116,34 @@ class UpdatesController {
      * @param context the base context of the application, ideally a [ReactApplication]
      * @param configuration map of configuration pairs to override those from AndroidManifest.xml
      */
-    @JvmStatic fun initialize(context: Context, configuration: Map<String, Any>? = null) {
+    @JvmStatic fun initialize(context: Context) {
       if (singletonInstance == null) {
-        initializeWithoutStarting(context, configuration)
+        initializeWithoutStarting(context)
         singletonInstance!!.start()
       }
     }
+
+    /**
+     * Overrides the [UpdatesConfiguration] that will be used inside [UpdatesController]
+     * This should be called as early as possible in the application's lifecycle.
+     * Can pass additional configuration to this method to set or override
+     * configuration values at runtime rather than just AndroidManifest.xml.
+     *
+     * @param context the base context of the application, ideally a [ReactApplication]
+     * @param configuration map of configuration pairs to override those from AndroidManifest.xml
+     */
+    @JvmStatic
+    fun overrideConfiguration(context: Context, configuration: Map<String, Any>) {
+      if (singletonInstance != null) {
+        throw AssertionError("The method should be called before UpdatesController.initialize()")
+      }
+      val updatesConfigurationValidationResult = UpdatesConfiguration.getUpdatesConfigurationValidationResult(context, configuration)
+      if (updatesConfigurationValidationResult == UpdatesConfigurationValidationResult.VALID) {
+        overrideConfiguration = UpdatesConfiguration(context, configuration)
+      } else {
+        val logger = UpdatesLogger(context)
+        logger.warn("Failed to overrideConfiguration: invalid configuration: ${updatesConfigurationValidationResult.name}")
+      }
+    }
   }
 }

package/android/src/main/java/expo/modules/updates/UpdatesDevLauncherController.kt

@@ -17,7 +17,6 @@ import expo.modules.updates.loader.Loader
 import expo.modules.updates.loader.RemoteLoader
 import expo.modules.updates.loader.UpdateDirective
 import expo.modules.updates.loader.UpdateResponse
-import expo.modules.updates.manifest.EmbeddedManifest
 import expo.modules.updates.selectionpolicy.LauncherSelectionPolicySingleUpdate
 import expo.modules.updates.selectionpolicy.ReaperSelectionPolicyDevelopmentClient
 import expo.modules.updates.selectionpolicy.SelectionPolicy
@@ -280,7 +279,7 @@ class UpdatesDevLauncherController(
   override fun getConstantsForModule(): IUpdatesController.UpdatesModuleConstants {
     return IUpdatesController.UpdatesModuleConstants(
       launchedUpdate = launchedUpdate,
-      embeddedUpdate = updatesConfiguration?.let { EmbeddedManifest.get(context, it) }?.updateEntity,
+      embeddedUpdate = null, // no embedded update in debug builds
       isEmergencyLaunch = isEmergencyLaunch,
       isEnabled = true,
       releaseChannel = updatesConfiguration?.releaseChannel ?: "default",

package/expo-module.config.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-updates",
-  "platforms": ["ios", "android"],
+  "platforms": ["ios", "android", "tvos"],
   "ios": {
     "modules": ["UpdatesModule"],
     "appDelegateSubscribers": ["ExpoUpdatesAppDelegateSubscriber"],

package/ios/EXUpdates/AppController.swift

@@ -151,45 +151,29 @@ public class AppController: NSObject {
     assert(_sharedInstance != nil, "AppController.sharedInstace was called before the module was initialized")
     return _sharedInstance!
   }
+  private static var _overrideConfig: UpdatesConfig?
 
-  public static func initializeWithoutStarting(configuration: [String: Any]?) {
+  public static func initializeWithoutStarting() {
     if _sharedInstance != nil {
       return
     }
 
     let logger = UpdatesLogger()
 
-    let updatesConfigurationValidationResult = UpdatesConfig.getUpdatesConfigurationValidationResult(mergingOtherDictionary: configuration)
-    if updatesConfigurationValidationResult == UpdatesConfigurationValidationResult.Valid {
-      var config: UpdatesConfig?
-      do {
-        config = try UpdatesConfig.configWithExpoPlist(mergingOtherDictionary: configuration)
-      } catch {
-        NSException(
-          name: .internalInconsistencyException,
-          reason: "Cannot load configuration from Expo.plist. Please ensure you've followed the setup and installation instructions for expo-updates to create Expo.plist and add it to your Xcode project."
-        )
-        .raise()
-      }
-
-      let updatesDatabase = UpdatesDatabase()
-      do {
-        let directory = try initializeUpdatesDirectory()
-        try initializeUpdatesDatabase(updatesDatabase: updatesDatabase, inUpdatesDirectory: directory)
-        _sharedInstance = EnabledAppController(config: config!, database: updatesDatabase, updatesDirectory: directory)
-      } catch {
-        logger.error(
-          message: "The expo-updates system is disabled due to an error during initialization: \(error.localizedDescription)",
-          code: .initializationError
-        )
-        _sharedInstance = DisabledAppController(error: error, isMissingRuntimeVersion: UpdatesConfig.isMissingRuntimeVersion(mergingOtherDictionary: configuration))
-        return
-      }
-    } else {
+    // swiftlint:disable closure_body_length
+    let config = _overrideConfig != nil ? _overrideConfig : {
+      let updatesConfigurationValidationResult = UpdatesConfig.getUpdatesConfigurationValidationResult(mergingOtherDictionary: nil)
       switch updatesConfigurationValidationResult {
       case .Valid:
-        assertionFailure("Valid case should be handled above")
-        break
+        guard let config = try? UpdatesConfig.configWithExpoPlist(mergingOtherDictionary: nil) else {
+          NSException(
+            name: .internalInconsistencyException,
+            reason: "Cannot load configuration from Expo.plist. Please ensure you've followed the setup and installation instructions for expo-updates to create Expo.plist and add it to your Xcode project."
+          )
+          .raise()
+          return nil
+        }
+        return config
       case .InvalidPlistError:
         logger.warn(
           message: "The expo-updates system is disabled due to an invalid configuration. Ensure a valid Expo.plist is present in the application bundle.",
@@ -211,8 +195,42 @@ public class AppController: NSObject {
           code: .initializationError
         )
       }
+      return nil
+    }()
+    // swiftlint:enable closure_body_length
+
+    if let config = config {
+      let updatesDatabase = UpdatesDatabase()
+      do {
+        let directory = try initializeUpdatesDirectory()
+        try initializeUpdatesDatabase(updatesDatabase: updatesDatabase, inUpdatesDirectory: directory)
+        _sharedInstance = EnabledAppController(config: config, database: updatesDatabase, updatesDirectory: directory)
+      } catch {
+        logger.error(
+          message: "The expo-updates system is disabled due to an error during initialization: \(error.localizedDescription)",
+          code: .initializationError
+        )
+        _sharedInstance = DisabledAppController(error: error, isMissingRuntimeVersion: UpdatesConfig.isMissingRuntimeVersion(mergingOtherDictionary: nil))
+        return
+      }
+    } else {
+      _sharedInstance = DisabledAppController(error: nil, isMissingRuntimeVersion: UpdatesConfig.isMissingRuntimeVersion(mergingOtherDictionary: nil))
+    }
+  }
 
-      _sharedInstance = DisabledAppController(error: nil, isMissingRuntimeVersion: UpdatesConfig.isMissingRuntimeVersion(mergingOtherDictionary: configuration))
+  public static func overrideConfiguration(configuration: [String: Any]?) {
+    if _sharedInstance != nil {
+      fatalError("The method should be called before AppController.initializeWithoutStarting()")
+    }
+    let updatesConfigurationValidationResult = UpdatesConfig.getUpdatesConfigurationValidationResult(mergingOtherDictionary: configuration)
+    if updatesConfigurationValidationResult == UpdatesConfigurationValidationResult.Valid {
+      do {
+        _overrideConfig = try UpdatesConfig.configWithExpoPlist(mergingOtherDictionary: configuration)
+      } catch {
+        UpdatesLogger().warn(message: "Failed to overrideConfiguration: invalid configuration: Cannot load configuration from Expo.plist")
+      }
+    } else {
+      UpdatesLogger().warn(message: "Failed to overrideConfiguration: \(updatesConfigurationValidationResult)")
     }
   }
 

package/ios/EXUpdates/DevLauncherAppController.swift

@@ -300,16 +300,9 @@ public final class DevLauncherAppController: NSObject, InternalAppControllerInte
   }
 
   public func getConstantsForModule() -> UpdatesModuleConstants {
-    let embeddedUpdate: Update?
-    if isStarted {
-      embeddedUpdate = self.config.let { it in EmbeddedAppLoader.embeddedManifest(withConfig: it, database: self.database) }
-    } else {
-      embeddedUpdate = nil
-    }
-
     return UpdatesModuleConstants(
       launchedUpdate: launcher?.launchedUpdate,
-      embeddedUpdate: embeddedUpdate,
+      embeddedUpdate: nil, // no embedded update in debug builds
       isEmergencyLaunch: isEmergencyLaunch,
       isEnabled: true,
       releaseChannel: self.config?.releaseChannel ?? "default",

package/ios/EXUpdates/ReactDelegateHandler/ExpoUpdatesReactDelegateHandler.swift

@@ -49,7 +49,7 @@ public final class ExpoUpdatesReactDelegateHandler: ExpoReactDelegateHandler, Ap
     }
 
     self.reactDelegate = reactDelegate
-    AppController.initializeWithoutStarting(configuration: nil)
+    AppController.initializeWithoutStarting()
     let controller = AppController.sharedInstance
     controller.delegate = self
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-updates",
-  "version": "0.24.6",
+  "version": "0.24.7",
   "description": "Fetches and manages remotely-hosted assets and updates to your app's JS bundle.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -64,5 +64,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "b5a3db3c8993f3b22e8cba1e2c6005fee57988c2"
+  "gitHead": "ca014bf2516c7644ef303f4c21fdd68de4d99f76"
 }

package/scripts/createManifest.js

@@ -1,8 +1,10 @@
-const { loadMetroConfigAsync } = require('@expo/cli/build/src/start/server/metro/instantiateMetro');
+const {
+  createMetroServerAndBundleRequestAsync,
+  exportEmbedAssetsAsync,
+} = require('@expo/cli/build/src/export/embed/exportEmbedAsync');
 const { resolveEntryPoint } = require('@expo/config/paths');
 const crypto = require('crypto');
 const fs = require('fs');
-const Server = require('metro/src/Server');
 const path = require('path');
 
 const filterPlatformAssetScales = require('./filterPlatformAssetScales');
@@ -50,38 +52,28 @@ function getRelativeEntryPoint(projectRoot, platform) {
 
   process.chdir(projectRoot);
 
-  let metroConfig;
-  try {
-    // Load the metro config the same way it would be loaded in Expo CLI.
-    // This ensures dynamic features like tsconfig paths can be used.
-    metroConfig = (
-      await loadMetroConfigAsync(
-        projectRoot,
-        {
-          // No config options can be passed to this point.
-        },
-        {
-          isExporting: true,
-        }
-      )
-    ).config;
-  } catch (e) {
-    let message = `Error loading Metro config and Expo app config: ${e.message}\n\nMake sure your project is configured properly and your app.json / app.config.js is valid.`;
-    if (process.env.EAS_BUILD) {
-      message +=
-        '\nIf you are using environment variables in app.config.js, verify that you have set them in your EAS Build profile configuration or secrets.';
-    }
-    throw new Error(message);
-  }
+  const options = {
+    platform,
+    entryFile,
+    minify: false,
+    dev: false,
+  };
+
+  const { server, bundleRequest } = await createMetroServerAndBundleRequestAsync(
+    projectRoot,
+    options
+  );
 
   let assets;
   try {
-    assets = await fetchAssetManifestAsync(platform, projectRoot, entryFile, metroConfig);
+    assets = await exportEmbedAssetsAsync(server, bundleRequest, projectRoot, options);
   } catch (e) {
     throw new Error(
       "Error loading assets JSON from Metro. Ensure you've followed all expo-updates installation steps correctly. " +
         e.message
     );
+  } finally {
+    server.end();
   }
 
   const manifest = {
@@ -155,38 +147,3 @@ function getBasePath(asset) {
   }
   return basePath;
 }
-
-// Spawn a Metro server to get the asset manifest
-async function fetchAssetManifestAsync(platform, projectRoot, entryFile, metroConfig) {
-  // Project-level babel config does not load unless we change to the
-  // projectRoot before instantiating the server
-  process.chdir(projectRoot);
-
-  const server = new Server(metroConfig);
-
-  const requestOpts = {
-    entryFile,
-    dev: false,
-    minify: false,
-    platform,
-  };
-
-  let assetManifest;
-  let error;
-  try {
-    assetManifest = await server.getAssets({
-      ...Server.DEFAULT_BUNDLE_OPTIONS,
-      ...requestOpts,
-    });
-  } catch (e) {
-    error = e;
-  } finally {
-    server.end();
-  }
-
-  if (error) {
-    throw error;
-  }
-
-  return assetManifest;
-}