expo-updates 1.0.0-canary-20250404-3c3b5fd → 29.0.0

package/CHANGELOG.md

@@ -4,6 +4,133 @@
 
 ### 🛠 Breaking changes
 
+### 🎉 New features
+
+### 🐛 Bug fixes
+
+### 💡 Others
+
+## 29.0.0 — 2025-08-13
+
+### 🎉 New features
+
+- Add experimental support for macOS. ([#37629](https://github.com/expo/expo/pull/37629) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+- Add support for a customisable reloading view when `reloadAsync` is called. ([#38074](https://github.com/expo/expo/pull/38074) by [@alanjhughes](https://github.com/alanjhughes)), ([#38362](https://github.com/expo/expo/pull/38362) by [@alanjhughes](https://github.com/alanjhughes)) and ([#38409](https://github.com/expo/expo/pull/38409) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+- Add `downloadProgress` state to the `useUpdates` hook to support listening to overall asset download progress. ([#38307](https://github.com/expo/expo/pull/38307)) by [@nishan](https://github.com/intergalacticspacehighway)
+- [iOS] dev-client support for Apple TV. ([#38388](https://github.com/expo/expo/pull/38388) by [@douglowder](https://github.com/douglowder))
+- Added reload support to `setUpdateURLAndRequestHeadersOverride`. ([#38167](https://github.com/expo/expo/pull/38167), [#38180](https://github.com/expo/expo/pull/38180) by [@kudo](https://github.com/kudo))
+- Added `setUpdateRequestHeadersOverride` to allow runtime `requestHeaders` override. ([#38623](https://github.com/expo/expo/pull/38623), [#38628](https://github.com/expo/expo/pull/38628), [#38624](https://github.com/expo/expo/pull/38624) by [@kudo](https://github.com/kudo))
+
+### 🐛 Bug fixes
+
+- Fixed imports after upgrading to Metro 0.83 ([#38375](https://github.com/expo/expo/pull/38375) by [@chrfalch](https://github.com/chrfalch))
+
+### 💡 Others
+
+- [Android] Cleanup state machine resources when the module is destroyed. ([#37193](https://github.com/expo/expo/pull/37193) by [@alanjhughes](https://github.com/alanjhughes))
+- [CI] convert E2E (enabled) tests to Maestro. ([#37492](https://github.com/expo/expo/pull/37492) by [@douglowder](https://github.com/douglowder))
+- [CI] convert E2E (disabled) tests to Maestro. ([#37558](https://github.com/expo/expo/pull/37558) by [@douglowder](https://github.com/douglowder))
+- [CI] convert E2E (fingerprint and startup) tests to Maestro. ([#37592](https://github.com/expo/expo/pull/37592) by [@douglowder](https://github.com/douglowder))
+- [CI] convert E2E (old arch, custom init, error recovery, bricking measures disabled) tests to Maestro. ([#37600](https://github.com/expo/expo/pull/37600) by [@douglowder](https://github.com/douglowder))
+- Bump Express and types to `express@5`. ([#37635](https://github.com/expo/expo/pull/37635) by [@byCedric](https://github.com/byCedric))
+- [CI] Removed Detox testing workaround code on Android. ([#37707](https://github.com/expo/expo/pull/37707) by [@kudo](https://github.com/kudo))
+- [CI] Removed Detox dependency and unused files in E2E code. ([#37751](https://github.com/expo/expo/pull/37751) by [@douglowder](https://github.com/douglowder))
+- Updates imports from `@expo/config`, `@expo/config-plugins` to `expo/config`, `expo/config-plugins`. ([#37860](https://github.com/expo/expo/pull/37860) by [@aleqsio](https://github.com/aleqsio))
+- [Android] Migrate loaders and file downloader to coroutines. ([#37959](https://github.com/expo/expo/pull/37959) by [@alanjhughes](https://github.com/alanjhughes))
+- [Android] Fix procedure scope no surviving app reloads. ([#38073](https://github.com/expo/expo/pull/38073) by [@alanjhughes](https://github.com/alanjhughes))
+- [Internal] Replace dependency chain to `@expo/cli` internals with an internal entrypoint ([#38574](https://github.com/expo/expo/pull/38574) by [@kitten](https://github.com/kitten))
+
+### 📚 3rd party library updates
+
+- Bumped `form-data@4.0.4`. ([#38214](https://github.com/expo/expo/pull/38214) by [@kudo](https://github.com/kudo))
+
+## 0.28.17 - 2025-07-08
+
+_This version does not introduce any user-facing changes._
+
+## 0.28.16 - 2025-07-03
+
+_This version does not introduce any user-facing changes._
+
+## 0.28.15 - 2025-06-18
+
+### 🐛 Bug fixes
+
+- Fix updates native debug for iOS. ([#37323](https://github.com/expo/expo/pull/37323) by [@douglowder](https://github.com/douglowder))
+
+## 0.28.14 - 2025-06-04
+
+### 🐛 Bug fixes
+
+- Fix update failure reason not populated on iOS. ([#36893](https://github.com/expo/expo/pull/36893) by [@brainbicycle](https://github.com/brainbicycle))
+
+### 💡 Others
+
+- Remove "Please" from warnings and errors ([#36862](https://github.com/expo/expo/pull/36862) by [@brentvatne](https://github.com/brentvatne))
+
+## 0.28.13 — 2025-05-08
+
+### 🐛 Bug fixes
+
+- [Android] Fixed errors when `configuration-cache` is enabled. ([#36678](https://github.com/expo/expo/pull/36678) by [@lukmccall](https://github.com/lukmccall))
+- [iOS] Update the constraints of the deferred root view. ([#36744](https://github.com/expo/expo/pull/36744) by [@alanjhughes](https://github.com/alanjhughes))
+
+## 0.28.12 — 2025-05-01
+
+_This version does not introduce any user-facing changes._
+
+## 0.28.11 — 2025-04-30
+
+_This version does not introduce any user-facing changes._
+
+## 0.28.10 — 2025-04-30
+
+_This version does not introduce any user-facing changes._
+
+## 0.28.9 — 2025-04-28
+
+_This version does not introduce any user-facing changes._
+
+## 0.28.8 — 2025-04-28
+
+_This version does not introduce any user-facing changes._
+
+## 0.28.7 — 2025-04-25
+
+### 🐛 Bug fixes
+
+- Fixed build error from **AppDelegate.swift** integration. ([#36368](https://github.com/expo/expo/pull/36368) by [@kudo](https://github.com/kudo))
+
+## 0.28.6 — 2025-04-22
+
+_This version does not introduce any user-facing changes._
+
+## 0.28.5 — 2025-04-14
+
+_This version does not introduce any user-facing changes._
+
+## 0.28.4 — 2025-04-14
+
+### 🎉 New features
+
+- [Android] Added `EX_UPDATES_COPY_EMBEDDED_ASSETS` flag which is false by default, to not copy embedded assets. ([#36059](https://github.com/expo/expo/pull/36059) by [@kudo](https://github.com/kudo))
+
+## 0.28.3 — 2025-04-11
+
+_This version does not introduce any user-facing changes._
+
+## 0.28.2 — 2025-04-09
+
+_This version does not introduce any user-facing changes._
+
+## 0.28.1 — 2025-04-08
+
+_This version does not introduce any user-facing changes._
+
+## 0.28.0 — 2025-04-04
+
+### 🛠 Breaking changes
+
 - upgrade RN to 0.78 ([#35050](https://github.com/expo/expo/pull/35050) by [@vonovak](https://github.com/vonovak))
 - Remove a few long-deprecated typescript types. ([#34215](https://github.com/expo/expo/pull/34215) by [@wschurman](https://github.com/wschurman))
 

package/android/build.gradle

@@ -11,7 +11,10 @@ buildscript {
       // We can remove this path once we update the test environment
       // to use the same version of Kotlin as the `expo/expo` repo.
       def kotlinVersion = rootProject["kotlinVersion"]
-      if (kotlinVersion == "2.0.21") {
+      
+      if (kotlinVersion == "2.1.20") {
+        return "2.1.20-2.0.1"
+      } else if (kotlinVersion == "2.0.21") {
         return "2.0.21-1.0.28"
       } else if (kotlinVersion == "1.9.25") {
         return "1.9.25-1.0.20"
@@ -39,7 +42,7 @@ expoModule {
 }
 
 group = 'host.exp.exponent'
-version = '0.26.9'
+version = '29.0.0'
 
 // Utility method to derive boolean values from the environment or from Java properties,
 // and return them as strings to be used in BuildConfig fields
@@ -72,6 +75,9 @@ def exUpdatesCustomInit = getBoolStringFromPropOrEnv("EX_UPDATES_CUSTOM_INIT", f
 // (default true)
 def exUpdatesAndroidDelayLoadApp = getBoolStringFromPropOrEnv("EX_UPDATES_ANDROID_DELAY_LOAD_APP", true)
 
+// If true, updates will copy embedded assets to file system when startup. (default false)
+def exUpdatesCopyEmbeddedAssets = getBoolStringFromPropOrEnv("EX_UPDATES_COPY_EMBEDDED_ASSETS", false)
+
 def useDevClient = findProject(":expo-dev-client") != null
 
 android {
@@ -82,13 +88,14 @@ android {
   namespace "expo.modules.updates"
   defaultConfig {
     versionCode 31
-    versionName '0.26.9'
+    versionName '29.0.0'
     consumerProguardFiles("proguard-rules.pro")
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     buildConfigField("boolean", "EX_UPDATES_NATIVE_DEBUG", exUpdatesNativeDebug)
     buildConfigField("boolean", "EX_UPDATES_CUSTOM_INIT", exUpdatesCustomInit)
     buildConfigField("boolean", "EX_UPDATES_ANDROID_DELAY_LOAD_APP", exUpdatesAndroidDelayLoadApp)
+    buildConfigField("boolean", "EX_UPDATES_COPY_EMBEDDED_ASSETS", exUpdatesCopyEmbeddedAssets)
     buildConfigField("boolean", "USE_DEV_CLIENT", useDevClient.toString())
   }
   testOptions {
@@ -127,6 +134,7 @@ dependencies {
   def mockk_version = "1.13.11"
 
   implementation "androidx.room:room-runtime:$room_version"
+  implementation "androidx.room:room-ktx:$room_version"
   ksp "androidx.room:room-compiler:$room_version"
 
   implementation("com.squareup.okhttp3:okhttp:4.9.2")
@@ -135,16 +143,17 @@ dependencies {
   implementation("org.bouncycastle:bcutil-jdk15to18:1.78.1")
 
   testImplementation 'junit:junit:4.13.2'
-  testImplementation 'androidx.test:core:1.5.0'
+  testImplementation 'androidx.test:core:1.6.1'
+  testImplementation 'com.google.truth:truth:1.1.2'
   testImplementation "io.mockk:mockk:$mockk_version"
   testImplementation "org.jetbrains.kotlin:kotlin-test-junit:${kotlinVersion}"
   testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
   testImplementation 'org.robolectric:robolectric:4.14.1'
 
   androidTestImplementation 'com.squareup.okio:okio:2.9.0'
-  androidTestImplementation 'androidx.test:runner:1.5.2'
-  androidTestImplementation 'androidx.test:core:1.5.0'
-  androidTestImplementation 'androidx.test:rules:1.5.0'
+  androidTestImplementation 'androidx.test:runner:1.6.2'
+  androidTestImplementation 'androidx.test:core:1.6.1'
+  androidTestImplementation 'androidx.test:rules:1.6.1'
   androidTestImplementation "io.mockk:mockk-android:$mockk_version"
   androidTestImplementation "androidx.room:room-testing:$room_version"
   androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'

package/android/proguard-rules.pro

@@ -3,5 +3,5 @@
 }
 
 -keepclassmembers class com.facebook.react.devsupport.ReleaseDevSupportManager {
-  private final com.facebook.react.bridge.DefaultJSExceptionHandler defaultJSExceptionHandler;
+  private final com.facebook.react.bridge.JSExceptionHandler defaultJSExceptionHandler;
 }

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

@@ -11,13 +11,24 @@ import expo.modules.updates.events.IUpdatesEventManager
 import expo.modules.updates.events.UpdatesEventManager
 import expo.modules.updates.launcher.Launcher
 import expo.modules.updates.launcher.NoDatabaseLauncher
-import expo.modules.updates.logging.UpdatesErrorCode
 import expo.modules.updates.logging.UpdatesLogger
 import expo.modules.updates.procedures.RecreateReactContextProcedure
+import expo.modules.updates.reloadscreen.ReloadScreenManager
 import expo.modules.updates.statemachine.UpdatesStateMachine
 import expo.modules.updates.statemachine.UpdatesStateValue
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import java.io.File
 import java.lang.ref.WeakReference
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
 import kotlin.time.DurationUnit
 import kotlin.time.toDuration
 
@@ -34,6 +45,7 @@ class DisabledUpdatesController(
 ) : IUpdatesController {
   /** Keep the activity for [RecreateReactContextProcedure] to relaunch the app. */
   private var weakActivity: WeakReference<Activity>? = null
+  private val controllerScope = CoroutineScope(Dispatchers.IO)
 
   private val logger = UpdatesLogger(context.filesDir)
   override val eventManager: IUpdatesEventManager = UpdatesEventManager(logger)
@@ -55,24 +67,22 @@ class DisabledUpdatesController(
     }
 
   private var launcher: Launcher? = null
-  private var isLoaderTaskFinished = false
   override var updatesDirectory: File? = null
+  private val loaderTaskFinishedDeferred = CompletableDeferred<Unit>()
+  private val loaderTaskFinishedMutex = Mutex()
 
-  @get:Synchronized
   override val launchAssetFile: String?
     get() {
-      while (!isLoaderTaskFinished) {
-        try {
-          (this as java.lang.Object).wait()
-        } catch (e: InterruptedException) {
-          logger.error("Interrupted while waiting for launch asset file", e, UpdatesErrorCode.InitializationError)
-        }
+      runBlocking {
+        loaderTaskFinishedDeferred.await()
       }
       return launcher?.launchAssetFile
     }
 
   override val bundleAssetName: String?
     get() = launcher?.bundleAssetName
+  override val reloadScreenManager: ReloadScreenManager?
+    get() = null
 
   override fun onEventListenerStartObserving() {
     stateMachine.sendContextToJS()
@@ -121,58 +131,66 @@ class DisabledUpdatesController(
     )
   }
 
-  override fun relaunchReactApplicationForModule(callback: IUpdatesController.ModuleCallback<Unit>) {
+  override suspend fun relaunchReactApplicationForModule() = suspendCancellableCoroutine { continuation ->
     val procedure = RecreateReactContextProcedure(
       context,
       weakActivity,
       object : Launcher.LauncherCallback {
         override fun onFailure(e: Exception) {
-          callback.onFailure(e.toCodedException())
+          continuation.resumeWithException(e.toCodedException())
         }
 
         override fun onSuccess() {
-          callback.onSuccess(Unit)
+          continuation.resume(Unit)
         }
       }
     )
     stateMachine.queueExecution(procedure)
   }
 
-  override fun checkForUpdate(
-    callback: IUpdatesController.ModuleCallback<IUpdatesController.CheckForUpdateResult>
-  ) {
-    callback.onFailure(UpdatesDisabledException("Updates.checkForUpdateAsync() is not supported when expo-updates is not enabled."))
+  override suspend fun checkForUpdate(): IUpdatesController.CheckForUpdateResult {
+    throw UpdatesDisabledException("Updates.checkForUpdateAsync() is not supported when expo-updates is not enabled.")
   }
 
-  override fun fetchUpdate(
-    callback: IUpdatesController.ModuleCallback<IUpdatesController.FetchUpdateResult>
-  ) {
-    callback.onFailure(UpdatesDisabledException("Updates.fetchUpdateAsync() is not supported when expo-updates is not enabled."))
+  override suspend fun fetchUpdate(): IUpdatesController.FetchUpdateResult {
+    throw UpdatesDisabledException("Updates.fetchUpdateAsync() is not supported when expo-updates is not enabled.")
   }
 
-  override fun getExtraParams(callback: IUpdatesController.ModuleCallback<Bundle>) {
-    callback.onFailure(UpdatesDisabledException("Updates.getExtraParamsAsync() is not supported when expo-updates is not enabled."))
+  override suspend fun getExtraParams(): Bundle {
+    throw UpdatesDisabledException("Updates.getExtraParamsAsync() is not supported when expo-updates is not enabled.")
   }
 
-  override fun setExtraParam(
+  override suspend fun setExtraParam(
     key: String,
-    value: String?,
-    callback: IUpdatesController.ModuleCallback<Unit>
+    value: String?
   ) {
-    callback.onFailure(UpdatesDisabledException("Updates.setExtraParamAsync() is not supported when expo-updates is not enabled."))
+    throw UpdatesDisabledException("Updates.setExtraParamAsync() is not supported when expo-updates is not enabled.")
   }
 
   override fun setUpdateURLAndRequestHeadersOverride(configOverride: UpdatesConfigurationOverride?) {
     throw UpdatesDisabledException("Updates.setUpdateURLAndRequestHeadersOverride() is not supported when expo-updates is not enabled.")
   }
 
+  override fun setUpdateRequestHeadersOverride(requestHeaders: Map<String, String>?) {
+    throw UpdatesDisabledException("Updates.setUpdateRequestHeadersOverride() is not supported when expo-updates is not enabled.")
+  }
+
   @Synchronized
   private fun notifyController() {
-    if (launcher == null) {
-      throw AssertionError("UpdatesController.notifyController was called with a null launcher, which is an error. This method should only be called when an update is ready to launch.")
+    controllerScope.launch {
+      loaderTaskFinishedMutex.withLock {
+        if (!loaderTaskFinishedDeferred.isCompleted) {
+          if (launcher == null) {
+            throw AssertionError("UpdatesController.notifyController was called with a null launcher, which is an error. This method should only be called when an update is ready to launch.")
+          }
+          loaderTaskFinishedDeferred.complete(Unit)
+        }
+      }
     }
-    isLoaderTaskFinished = true
-    (this as java.lang.Object).notify()
+  }
+
+  override fun shutdown() {
+    controllerScope.cancel()
   }
 
   companion object {

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

@@ -5,6 +5,7 @@ import android.content.Context
 import android.os.Bundle
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.devsupport.interfaces.DevSupportManager
+import expo.modules.easclient.EASClientID
 import expo.modules.kotlin.exception.CodedException
 import expo.modules.kotlin.exception.toCodedException
 import expo.modules.updates.db.BuildData
@@ -23,14 +24,24 @@ import expo.modules.updates.procedures.CheckForUpdateProcedure
 import expo.modules.updates.procedures.FetchUpdateProcedure
 import expo.modules.updates.procedures.RelaunchProcedure
 import expo.modules.updates.procedures.StartupProcedure
+import expo.modules.updates.reloadscreen.ReloadScreenManager
+import expo.modules.updates.selectionpolicy.SelectionPolicy
 import expo.modules.updates.selectionpolicy.SelectionPolicyFactory
 import expo.modules.updates.statemachine.UpdatesStateMachine
 import expo.modules.updates.statemachine.UpdatesStateValue
+import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import java.io.File
 import java.lang.ref.WeakReference
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
 import kotlin.time.DurationUnit
 import kotlin.time.toDuration
 
@@ -39,7 +50,7 @@ import kotlin.time.toDuration
  */
 class EnabledUpdatesController(
   private val context: Context,
-  private val updatesConfiguration: UpdatesConfiguration,
+  private var updatesConfiguration: UpdatesConfiguration,
   override val updatesDirectory: File
 ) : IUpdatesController {
   /** Keep the activity for [RelaunchProcedure] to relaunch the app. */
@@ -47,13 +58,16 @@ class EnabledUpdatesController(
   private val logger = UpdatesLogger(context.filesDir)
   override val eventManager: IUpdatesEventManager = UpdatesEventManager(logger)
 
-  private val fileDownloader = FileDownloader(context, updatesConfiguration, logger)
-  private val selectionPolicy = SelectionPolicyFactory.createFilterAwarePolicy(
-    updatesConfiguration.getRuntimeVersion()
-  )
+  private val selectionPolicy: SelectionPolicy
+    get() = SelectionPolicyFactory.createFilterAwarePolicy(updatesConfiguration.getRuntimeVersion(), updatesConfiguration)
   private val stateMachine = UpdatesStateMachine(logger, eventManager, UpdatesStateValue.entries.toSet())
-  private val databaseHolder = DatabaseHolder(UpdatesDatabase.getInstance(context))
   private val controllerScope = CoroutineScope(Dispatchers.IO)
+  private val fileDownloader: FileDownloader
+    get() = FileDownloader(context.filesDir, EASClientID(context).uuid.toString(), updatesConfiguration, logger)
+  private val databaseHolder = DatabaseHolder(UpdatesDatabase.getInstance(context, Dispatchers.IO))
+  private val startupFinishedDeferred = CompletableDeferred<Unit>()
+  private val startupFinishedMutex = Mutex()
+  override val reloadScreenManager = ReloadScreenManager()
 
   private fun purgeUpdatesLogsOlderThanOneDay() {
     UpdatesLogReader(context.filesDir).purgeLogEntries {
@@ -70,9 +84,15 @@ class EnabledUpdatesController(
 
   @Synchronized
   private fun onStartupProcedureFinished() {
+    controllerScope.launch {
+      startupFinishedMutex.withLock {
+        if (!startupFinishedDeferred.isCompleted) {
+          startupFinishedDeferred.complete(Unit)
+        }
+      }
+    }
     isStartupFinished = true
     startupEndTimeMillis = System.currentTimeMillis()
-    (this@EnabledUpdatesController as java.lang.Object).notify()
   }
 
   private val startupProcedure = StartupProcedure(
@@ -103,18 +123,14 @@ class EnabledUpdatesController(
   private val localAssetFiles
     get() = startupProcedure.localAssetFiles
 
-  @get:Synchronized
   override val launchAssetFile: String?
     get() {
-      while (!isStartupFinished) {
-        try {
-          (this as java.lang.Object).wait()
-        } catch (e: InterruptedException) {
-          logger.error("Interrupted while waiting for launch asset file", e, UpdatesErrorCode.InitializationError)
-        }
+      runBlocking {
+        startupFinishedDeferred.await()
       }
       return startupProcedure.launchAssetFile
     }
+
   override val bundleAssetName: String?
     get() = startupProcedure.bundleAssetName
 
@@ -146,8 +162,9 @@ class EnabledUpdatesController(
 
     purgeUpdatesLogsOlderThanOneDay()
 
-    BuildData.ensureBuildDataIsConsistent(updatesConfiguration, databaseHolder.database)
-    databaseHolder.releaseDatabase()
+    if (!updatesConfiguration.hasUpdatesOverride) {
+      BuildData.ensureBuildDataIsConsistent(updatesConfiguration, databaseHolder.database)
+    }
 
     stateMachine.queueExecution(startupProcedure)
   }
@@ -165,6 +182,7 @@ class EnabledUpdatesController(
       getCurrentLauncher = { startupProcedure.launcher!! },
       setCurrentLauncher = { currentLauncher -> startupProcedure.setLauncher(currentLauncher) },
       shouldRunReaper = shouldRunReaper,
+      reloadScreenManager = reloadScreenManager,
       callback
     )
     stateMachine.queueExecution(procedure)
@@ -187,48 +205,47 @@ class EnabledUpdatesController(
     )
   }
 
-  override fun relaunchReactApplicationForModule(callback: IUpdatesController.ModuleCallback<Unit>) {
+  override suspend fun relaunchReactApplicationForModule() = suspendCancellableCoroutine { continuation ->
     val canRelaunch = launchedUpdate != null
     if (!canRelaunch) {
-      callback.onFailure(object : CodedException("ERR_UPDATES_RELOAD", "Cannot relaunch without a launched update.", null) {})
+      continuation.resumeWithException(object : CodedException("ERR_UPDATES_RELOAD", "Cannot relaunch without a launched update.", null) {})
     } else {
       relaunchReactApplication(
         shouldRunReaper = true,
         object : LauncherCallback {
           override fun onFailure(e: Exception) {
-            callback.onFailure(e.toCodedException())
+            continuation.resumeWithException(e.toCodedException())
           }
 
           override fun onSuccess() {
-            callback.onSuccess(Unit)
+            continuation.resume(Unit)
           }
         }
       )
     }
   }
 
-  override fun checkForUpdate(callback: IUpdatesController.ModuleCallback<IUpdatesController.CheckForUpdateResult>) {
+  override suspend fun checkForUpdate() = suspendCancellableCoroutine { continuation ->
     val procedure = CheckForUpdateProcedure(context, updatesConfiguration, databaseHolder, logger, fileDownloader, selectionPolicy, launchedUpdate) {
-      callback.onSuccess(it)
+      continuation.resume(it)
     }
     stateMachine.queueExecution(procedure)
   }
 
-  override fun fetchUpdate(callback: IUpdatesController.ModuleCallback<IUpdatesController.FetchUpdateResult>) {
+  override suspend fun fetchUpdate() = suspendCancellableCoroutine { continuation ->
     val procedure = FetchUpdateProcedure(context, updatesConfiguration, logger, databaseHolder, updatesDirectory, fileDownloader, selectionPolicy, launchedUpdate) {
-      callback.onSuccess(it)
+      continuation.resume(it)
     }
     stateMachine.queueExecution(procedure)
   }
 
-  override fun getExtraParams(callback: IUpdatesController.ModuleCallback<Bundle>) {
+  override suspend fun getExtraParams() = suspendCancellableCoroutine { continuation ->
     controllerScope.launch {
       try {
         val result = ManifestMetadata.getExtraParams(
           databaseHolder.database,
           updatesConfiguration
         )
-        databaseHolder.releaseDatabase()
         val resultMap = when (result) {
           null -> Bundle()
           else -> {
@@ -239,37 +256,51 @@ class EnabledUpdatesController(
             }
           }
         }
-        callback.onSuccess(resultMap)
+        continuation.resume(resultMap)
       } catch (e: Exception) {
-        databaseHolder.releaseDatabase()
-        callback.onFailure(e.toCodedException())
+        continuation.resumeWithException(e.toCodedException())
       }
     }
   }
 
-  override fun setExtraParam(key: String, value: String?, callback: IUpdatesController.ModuleCallback<Unit>) {
+  override suspend fun setExtraParam(key: String, value: String?) = suspendCancellableCoroutine { continuation ->
     controllerScope.launch {
-      try {
+      runCatching {
         ManifestMetadata.setExtraParam(
           databaseHolder.database,
           updatesConfiguration,
           key,
           value
         )
-        databaseHolder.releaseDatabase()
-        callback.onSuccess(Unit)
-      } catch (e: Exception) {
-        databaseHolder.releaseDatabase()
-        callback.onFailure(e.toCodedException())
+        continuation.resume(Unit)
+      }.onFailure { e ->
+        continuation.resumeWithException(e.toCodedException())
       }
     }
   }
 
+  override fun shutdown() {
+    controllerScope.cancel()
+  }
+
   override fun setUpdateURLAndRequestHeadersOverride(configOverride: UpdatesConfigurationOverride?) {
     if (!updatesConfiguration.disableAntiBrickingMeasures) {
       throw CodedException("ERR_UPDATES_RUNTIME_OVERRIDE", "Must set disableAntiBrickingMeasures configuration to use updates overriding", null)
     }
     UpdatesConfigurationOverride.save(context, configOverride)
+    updatesConfiguration = UpdatesConfiguration.create(context, updatesConfiguration, configOverride)
+  }
+
+  override fun setUpdateRequestHeadersOverride(requestHeaders: Map<String, String>?) {
+    val isValidRequestHeaders = UpdatesConfiguration.isValidRequestHeadersOverride(
+      updatesConfiguration.originalEmbeddedRequestHeaders,
+      requestHeaders
+    )
+    if (!isValidRequestHeaders) {
+      throw CodedException("ERR_UPDATES_RUNTIME_OVERRIDE", "Invalid update requestHeaders override: $requestHeaders", null)
+    }
+    val configOverride = UpdatesConfigurationOverride.saveRequestHeaders(context, requestHeaders)
+    updatesConfiguration = UpdatesConfiguration.create(context, updatesConfiguration, configOverride)
   }
 
   companion object {