expo-updates 29.0.8 → 29.0.9

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 29.0.9 — 2025-09-10
+
+### 🐛 Bug fixes
+
+- [Android] Propagate controller scope to state machine. ([#39526](https://github.com/expo/expo/pull/39526) by [@alanjhughes](https://github.com/alanjhughes))
+
 ## 29.0.8 — 2025-09-02
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -42,7 +42,7 @@ expoModule {
 }
 
 group = 'host.exp.exponent'
-version = '29.0.8'
+version = '29.0.9'
 
 // Utility method to derive boolean values from the environment or from Java properties,
 // and return them as strings to be used in BuildConfig fields
@@ -88,7 +88,7 @@ android {
   namespace "expo.modules.updates"
   defaultConfig {
     versionCode 31
-    versionName '29.0.8'
+    versionName '29.0.9'
     consumerProguardFiles("proguard-rules.pro")
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

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

@@ -19,6 +19,7 @@ import expo.modules.updates.statemachine.UpdatesStateValue
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
@@ -45,13 +46,13 @@ 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 controllerScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
 
   private val logger = UpdatesLogger(context.filesDir)
   override val eventManager: IUpdatesEventManager = UpdatesEventManager(logger)
 
   // disabled controller state machine can only be idle or restarting
-  private val stateMachine = UpdatesStateMachine(logger, eventManager, setOf(UpdatesStateValue.Idle, UpdatesStateValue.Restarting))
+  private val stateMachine = UpdatesStateMachine(logger, eventManager, setOf(UpdatesStateValue.Idle, UpdatesStateValue.Restarting), controllerScope)
 
   private var isStarted = false
   private var startupStartTimeMillis: Long? = null
@@ -106,7 +107,7 @@ class DisabledUpdatesController(
     isStarted = true
     startupStartTimeMillis = System.currentTimeMillis()
 
-    launcher = NoDatabaseLauncher(context, logger, fatalException)
+    launcher = NoDatabaseLauncher(context, logger, fatalException, controllerScope)
 
     startupEndTimeMillis = System.currentTimeMillis()
     notifyController()
@@ -143,7 +144,8 @@ class DisabledUpdatesController(
         override fun onSuccess() {
           continuation.resume(Unit)
         }
-      }
+      },
+      controllerScope
     )
     stateMachine.queueExecution(procedure)
   }

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

@@ -32,6 +32,7 @@ import expo.modules.updates.statemachine.UpdatesStateValue
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
@@ -60,8 +61,8 @@ class EnabledUpdatesController(
 
   private val selectionPolicy: SelectionPolicy
     get() = SelectionPolicyFactory.createFilterAwarePolicy(updatesConfiguration.getRuntimeVersion(), updatesConfiguration)
-  private val stateMachine = UpdatesStateMachine(logger, eventManager, UpdatesStateValue.entries.toSet())
-  private val controllerScope = CoroutineScope(Dispatchers.IO)
+  private val controllerScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+  private val stateMachine = UpdatesStateMachine(logger, eventManager, UpdatesStateValue.entries.toSet(), controllerScope)
   private val fileDownloader: FileDownloader
     get() = FileDownloader(context.filesDir, EASClientID(context).uuid.toString(), updatesConfiguration, logger)
   private val databaseHolder = DatabaseHolder(UpdatesDatabase.getInstance(context, Dispatchers.IO))
@@ -111,7 +112,8 @@ class EnabledUpdatesController(
       override fun onRequestRelaunch(shouldRunReaper: Boolean, callback: LauncherCallback) {
         relaunchReactApplication(shouldRunReaper, callback)
       }
-    }
+    },
+    controllerScope
   )
 
   private val launchedUpdate
@@ -183,7 +185,8 @@ class EnabledUpdatesController(
       setCurrentLauncher = { currentLauncher -> startupProcedure.setLauncher(currentLauncher) },
       shouldRunReaper = shouldRunReaper,
       reloadScreenManager = reloadScreenManager,
-      callback
+      callback,
+      controllerScope
     )
     stateMachine.queueExecution(procedure)
   }

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

@@ -33,6 +33,7 @@ import expo.modules.updatesinterface.UpdatesInterface
 import expo.modules.updatesinterface.UpdatesInterfaceCallbacks
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
 import org.json.JSONObject
@@ -67,7 +68,7 @@ class UpdatesDevLauncherController(
   private var updatesConfiguration: UpdatesConfiguration? = initialUpdatesConfiguration
 
   private val databaseHolder = DatabaseHolder(UpdatesDatabase.getInstance(context, Dispatchers.IO))
-  private val controllerScope = CoroutineScope(Dispatchers.IO)
+  private val controllerScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
 
   private var mSelectionPolicy: SelectionPolicy? = null
   private var defaultSelectionPolicy: SelectionPolicy = SelectionPolicy(

package/android/src/main/java/expo/modules/updates/launcher/NoDatabaseLauncher.kt

@@ -5,6 +5,7 @@ import expo.modules.updates.loader.EmbeddedLoader
 import expo.modules.updates.logging.UpdatesLogger
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import java.io.File
 
@@ -20,7 +21,7 @@ class NoDatabaseLauncher @JvmOverloads constructor(
   private val context: Context,
   private val logger: UpdatesLogger,
   fatalException: Exception? = null,
-  launcherScope: CoroutineScope = CoroutineScope(Dispatchers.IO)
+  launcherScope: CoroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
 ) : Launcher {
   override val bundleAssetName = EmbeddedLoader.BARE_BUNDLE_FILENAME
   override val launchedUpdate = null

package/android/src/main/java/expo/modules/updates/loader/Loader.kt

@@ -19,6 +19,7 @@ import expo.modules.updates.manifest.ManifestMetadata
 import expo.modules.updates.manifest.Update
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
 import java.io.File
 import java.io.IOException
 import java.util.*
@@ -38,7 +39,7 @@ abstract class Loader protected constructor(
   private val database: UpdatesDatabase,
   private val updatesDirectory: File,
   private val loaderFiles: LoaderFiles,
-  private var scope: CoroutineScope = CoroutineScope(Dispatchers.IO)
+  private var scope: CoroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
 ) {
   private var updateResponse: UpdateResponse? = null
   private var updateEntity: UpdateEntity? = null

package/android/src/main/java/expo/modules/updates/procedures/StartupProcedure.kt

@@ -80,7 +80,7 @@ class StartupProcedure(
     object : LoaderTask.LoaderTaskCallback {
       override fun onFailure(e: Exception) {
         logger.error("UpdatesController loaderTask onFailure", e, UpdatesErrorCode.None)
-        launcher = NoDatabaseLauncher(context, logger, e)
+        launcher = NoDatabaseLauncher(context, logger, e, procedureScope)
         emergencyLaunchException = e
         notifyController()
       }

package/android/src/main/java/expo/modules/updates/statemachine/UpdatesStateMachine.kt

@@ -4,6 +4,8 @@ import expo.modules.updates.events.IUpdatesEventManager
 import expo.modules.updates.logging.UpdatesLogger
 import expo.modules.updates.procedures.StateMachineProcedure
 import expo.modules.updates.procedures.StateMachineSerialExecutorQueue
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import java.util.Date
 
 /**
@@ -13,7 +15,8 @@ import java.util.Date
 class UpdatesStateMachine(
   private val logger: UpdatesLogger,
   private val eventManager: IUpdatesEventManager,
-  private val validUpdatesStateValues: Set<UpdatesStateValue>
+  private val validUpdatesStateValues: Set<UpdatesStateValue>,
+  scope: CoroutineScope = CoroutineScope(Dispatchers.IO)
 ) {
   private val serialExecutorQueue = StateMachineSerialExecutorQueue(
     logger,
@@ -30,7 +33,8 @@ class UpdatesStateMachine(
       override fun resetStateAfterRestart() {
         resetAndIncrementRestartCount()
       }
-    }
+    },
+    scope
   )
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-updates",
-  "version": "29.0.8",
+  "version": "29.0.9",
   "description": "Fetches and manages remotely-hosted assets and updates to your app's JS bundle.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -60,7 +60,7 @@
     "@types/node-forge": "^1.0.0",
     "@types/picomatch": "^4.0.0",
     "@vercel/ncc": "^0.38.3",
-    "expo-module-scripts": "^5.0.6",
+    "expo-module-scripts": "^5.0.7",
     "express": "^5.1.0",
     "form-data": "^4.0.4",
     "js-yaml": "^4.1.0",
@@ -73,5 +73,5 @@
     "react": "*",
     "react-native": "*"
   },
-  "gitHead": "d635404a12ea7996b987ce0fb7679a238ebcf31b"
+  "gitHead": "87186d10c8239c6469e055417e67bd4d0ed63efb"
 }