expo-updates 0.25.9 → 0.25.11

package/CHANGELOG.md

@@ -10,6 +10,16 @@
 
 ### 💡 Others
 
+## 0.25.11 — 2024-05-09
+
+_This version does not introduce any user-facing changes._
+
+## 0.25.10 — 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))
+
 ## 0.25.9 — 2024-05-07
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-kapt'
 
 group = 'host.exp.exponent'
-version = '0.25.9'
+version = '0.25.11'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -48,7 +48,7 @@ android {
   namespace "expo.modules.updates"
   defaultConfig {
     versionCode 31
-    versionName '0.25.9'
+    versionName '0.25.11'
     consumerProguardFiles("proguard-rules.pro")
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

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

@@ -3,6 +3,7 @@ package expo.modules.updates
 import android.content.Context
 import android.os.AsyncTask
 import android.os.Bundle
+import android.util.Log
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.devsupport.interfaces.DevSupportManager
 import expo.modules.kotlin.AppContext
@@ -114,26 +115,14 @@ class UpdatesDevLauncherController(
     context: Context,
     callback: UpdatesInterface.UpdateCallback
   ) {
-    if (updatesDirectory == null) {
-      callback.onFailure(updatesDirectoryException!!)
+    val newUpdatesConfiguration: UpdatesConfiguration
+    try {
+      newUpdatesConfiguration = createUpdatesConfiguration(configuration, context)
+    } catch (e: Exception) {
+      callback.onFailure(e)
       return
     }
-
-    val newUpdatesConfiguration = when (UpdatesConfiguration.getUpdatesConfigurationValidationResult(context, configuration)) {
-      UpdatesConfigurationValidationResult.VALID -> UpdatesConfiguration(context, configuration)
-      UpdatesConfigurationValidationResult.INVALID_NOT_ENABLED -> {
-        callback.onFailure(Exception("Failed to load update: UpdatesConfiguration object is not enabled"))
-        return
-      }
-      UpdatesConfigurationValidationResult.INVALID_MISSING_URL -> {
-        callback.onFailure(Exception("Failed to load update: UpdatesConfiguration object must include a valid update URL"))
-        return
-      }
-      UpdatesConfigurationValidationResult.INVALID_MISSING_RUNTIME_VERSION -> {
-        callback.onFailure(Exception("Failed to load update: UpdatesConfiguration object must include a valid runtime version"))
-        return
-      }
-    }
+    check(updatesDirectory != null)
 
     // since controller is a singleton, save its config so we can reset to it if our request fails
     previousUpdatesConfiguration = updatesConfiguration
@@ -194,6 +183,36 @@ class UpdatesDevLauncherController(
     })
   }
 
+  override fun isValidUpdatesConfiguration(configuration: HashMap<String, Any>, context: Context): Boolean {
+    return try {
+      createUpdatesConfiguration(configuration, context)
+      true
+    } catch (e: Exception) {
+      Log.e(TAG, "Invalid updates configuration: ${e.localizedMessage}")
+      false
+    }
+  }
+
+  @Throws(Exception::class)
+  private fun createUpdatesConfiguration(configuration: HashMap<String, Any>, context: Context): UpdatesConfiguration {
+    if (updatesDirectory == null) {
+      throw updatesDirectoryException!!
+    }
+
+    return when (UpdatesConfiguration.getUpdatesConfigurationValidationResult(context, configuration)) {
+      UpdatesConfigurationValidationResult.VALID -> UpdatesConfiguration(context, configuration)
+      UpdatesConfigurationValidationResult.INVALID_NOT_ENABLED -> {
+        throw Exception("Failed to load update: UpdatesConfiguration object is not enabled")
+      }
+      UpdatesConfigurationValidationResult.INVALID_MISSING_URL -> {
+        throw Exception("Failed to load update: UpdatesConfiguration object must include a valid update URL")
+      }
+      UpdatesConfigurationValidationResult.INVALID_MISSING_RUNTIME_VERSION -> {
+        throw Exception("Failed to load update: UpdatesConfiguration object must include a valid runtime version")
+      }
+    }
+  }
+
   private fun setDevelopmentSelectionPolicy() {
     resetSelectionPolicyToDefault()
     val currentSelectionPolicy = selectionPolicy
@@ -332,4 +351,8 @@ class UpdatesDevLauncherController(
   ) {
     callback.onFailure(NotAvailableInDevClientException("Updates.setExtraParamAsync() is not supported in development builds."))
   }
+
+  companion object {
+    private val TAG = UpdatesDevLauncherController::class.java.simpleName
+  }
 }

package/ios/EXUpdates/DevLauncherAppController.swift

@@ -102,65 +102,11 @@ public final class DevLauncherAppController: NSObject, InternalAppControllerInte
     success successBlock: @escaping UpdatesUpdateSuccessBlock,
     error errorBlock: @escaping UpdatesErrorBlock
   ) {
-    if let directoryDatabaseException = directoryDatabaseException {
-      errorBlock(directoryDatabaseException)
-      return
-    }
-
-    // swiftlint:disable:next identifier_name
-    let updatesConfigurationValidationResult = UpdatesConfig.getUpdatesConfigurationValidationResult(mergingOtherDictionary: configuration)
-    switch updatesConfigurationValidationResult {
-    case .Valid:
-      break
-    case .InvalidNotEnabled:
-      errorBlock(NSError(
-        domain: DevLauncherAppController.ErrorDomain,
-        code: ErrorCode.invalidUpdateURL.rawValue,
-        userInfo: [
-          NSLocalizedDescriptionKey: "Failed to read stored updates: configuration object is not enabled"
-        ]
-      ))
-      return
-    case .InvalidPlistError:
-      errorBlock(NSError(
-        domain: DevLauncherAppController.ErrorDomain,
-        code: ErrorCode.invalidUpdateURL.rawValue,
-        userInfo: [
-          NSLocalizedDescriptionKey: "Failed to read stored updates: invalid Expo.plist"
-        ]
-      ))
-      return
-    case .InvalidMissingURL:
-      errorBlock(NSError(
-        domain: DevLauncherAppController.ErrorDomain,
-        code: ErrorCode.invalidUpdateURL.rawValue,
-        userInfo: [
-          NSLocalizedDescriptionKey: "Failed to read stored updates: configuration object must include a valid update URL"
-        ]
-      ))
-      return
-    case .InvalidMissingRuntimeVersion:
-      errorBlock(NSError(
-        domain: DevLauncherAppController.ErrorDomain,
-        code: ErrorCode.invalidUpdateURL.rawValue,
-        userInfo: [
-          NSLocalizedDescriptionKey: "Failed to read stored updates: configuration object must include a valid runtime version"
-        ]
-      ))
-      return
-    }
-
-    var updatesConfiguration: UpdatesConfig
+    let updatesConfiguration: UpdatesConfig
     do {
-      updatesConfiguration = try UpdatesConfig.configWithExpoPlist(mergingOtherDictionary: configuration)
-    } catch {
-      errorBlock(NSError(
-        domain: DevLauncherAppController.ErrorDomain,
-        code: ErrorCode.configFailed.rawValue,
-        userInfo: [
-          NSLocalizedDescriptionKey: "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."
-        ]
-      ))
+      updatesConfiguration = try createUpdatesConfiguration(configuration)
+    } catch let error {
+      errorBlock(error)
       return
     }
 
@@ -213,6 +159,16 @@ public final class DevLauncherAppController: NSObject, InternalAppControllerInte
     }
   }
 
+  public func isValidUpdatesConfiguration(_ configuration: [String: Any]) -> Bool {
+    do {
+      try createUpdatesConfiguration(configuration)
+      return true
+    } catch let error {
+      NSLog("Invalid updates configuration: %@", error.localizedDescription)
+    }
+    return false
+  }
+
   public func selectionPolicy() -> SelectionPolicy {
     if _selectionPolicy == nil {
       _selectionPolicy = defaultSelectionPolicy
@@ -226,6 +182,65 @@ public final class DevLauncherAppController: NSObject, InternalAppControllerInte
     _selectionPolicy = nil
   }
 
+  private func createUpdatesConfiguration(_ configuration: [String: Any]) throws -> UpdatesConfig {
+    if let directoryDatabaseException = directoryDatabaseException {
+      throw directoryDatabaseException
+    }
+
+    // swiftlint:disable:next identifier_name
+    let updatesConfigurationValidationResult = UpdatesConfig.getUpdatesConfigurationValidationResult(mergingOtherDictionary: configuration)
+    switch updatesConfigurationValidationResult {
+    case .Valid:
+      break
+    case .InvalidNotEnabled:
+      throw NSError(
+        domain: DevLauncherAppController.ErrorDomain,
+        code: ErrorCode.invalidUpdateURL.rawValue,
+        userInfo: [
+          NSLocalizedDescriptionKey: "Failed to read stored updates: configuration object is not enabled"
+        ]
+      )
+    case .InvalidPlistError:
+      throw NSError(
+        domain: DevLauncherAppController.ErrorDomain,
+        code: ErrorCode.invalidUpdateURL.rawValue,
+        userInfo: [
+          NSLocalizedDescriptionKey: "Failed to read stored updates: invalid Expo.plist"
+        ]
+      )
+    case .InvalidMissingURL:
+      throw NSError(
+        domain: DevLauncherAppController.ErrorDomain,
+        code: ErrorCode.invalidUpdateURL.rawValue,
+        userInfo: [
+          NSLocalizedDescriptionKey: "Failed to read stored updates: configuration object must include a valid update URL"
+        ]
+      )
+    case .InvalidMissingRuntimeVersion:
+      throw NSError(
+        domain: DevLauncherAppController.ErrorDomain,
+        code: ErrorCode.invalidUpdateURL.rawValue,
+        userInfo: [
+          NSLocalizedDescriptionKey: "Failed to read stored updates: configuration object must include a valid runtime version"
+        ]
+      )
+    }
+
+    let updatesConfiguration: UpdatesConfig
+    do {
+      updatesConfiguration = try UpdatesConfig.configWithExpoPlist(mergingOtherDictionary: configuration)
+    } catch {
+      throw NSError(
+        domain: DevLauncherAppController.ErrorDomain,
+        code: ErrorCode.configFailed.rawValue,
+        userInfo: [
+          NSLocalizedDescriptionKey: "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."
+        ]
+      )
+    }
+    return updatesConfiguration
+  }
+
   private func setDevelopmentSelectionPolicy() {
     resetSelectionPolicyToDefault()
     let currentSelectionPolicy = selectionPolicy()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-updates",
-  "version": "0.25.9",
+  "version": "0.25.11",
   "description": "Fetches and manages remotely-hosted assets and updates to your app's JS bundle.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -47,7 +47,7 @@
     "expo-eas-client": "~0.12.0",
     "expo-manifests": "~0.14.0",
     "expo-structured-headers": "~3.8.0",
-    "expo-updates-interface": "~0.16.0",
+    "expo-updates-interface": "~0.16.2",
     "fast-glob": "^3.3.2",
     "fbemitter": "^3.0.0",
     "ignore": "^5.3.1",
@@ -67,5 +67,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "1b95b402af6ec95f885aaf93eedfbfe521c548d9"
+  "gitHead": "4e22804b01274792b017515aebf37bb0cee46200"
 }