expo-updates 1.0.0-canary-20241008-90b13ad → 1.0.0-canary-20241018-bf4b2f7-1

package/CHANGELOG.md

@@ -21,6 +21,8 @@
 - Use expo-updates as source of truth for runtime version in dev client ([#31453](https://github.com/expo/expo/pull/31453) by [@wschurman](https://github.com/wschurman))
 - Fixed iOS reload crash on New Architecture mode. ([#31789](https://github.com/expo/expo/pull/31789) by [@kudo](https://github.com/kudo))
 - [cli] Disable console during runtime and fingeprint evaluation ([#31874](https://github.com/expo/expo/pull/31874) by [@wschurman](https://github.com/wschurman))
+- Refactor state machine event emitting and initial state ([#31819](https://github.com/expo/expo/pull/31819) by [@wschurman](https://github.com/wschurman))
+- Re-emit state on every observer observe event ([#32103](https://github.com/expo/expo/pull/32103) by [@wschurman](https://github.com/wschurman))
 
 ### 💡 Others
 
@@ -30,7 +32,9 @@
 - [Android] Use protected methods in room dao now that ksp allows it. ([#29080](https://github.com/expo/expo/pull/29080) by [@wschurman](https://github.com/wschurman))
 - Bumped Kotlin version to 1.9.24. ([#30199](https://github.com/expo/expo/pull/30199) by [@gabrieldonadel](https://github.com/gabrieldonadel))
 - Move location of assetPatternsToBeBundled config key ([#31584](https://github.com/expo/expo/pull/31584) by [@wschurman](https://github.com/wschurman))
-- Refactor JS event queueing and emitting ([#31818](https://github.com/expo/expo/pull/31818) by [@wschurman](https://github.com/wschurman))
+- Refactor JS event queueing and emitting ([#31818](https://github.com/expo/expo/pull/31818, [#31854](https://github.com/expo/expo/pull/31854) by [@wschurman](https://github.com/wschurman))
+- Remove clearUpdateCacheExperimentalAsync ([#31871](https://github.com/expo/expo/pull/31871) by [@wschurman](https://github.com/wschurman))
+- Refactor errors, context injection, and error logs ([#31929](https://github.com/expo/expo/pull/31929), [#31951](https://github.com/expo/expo/pull/31951), [#31953](https://github.com/expo/expo/pull/31953), [#32009](https://github.com/expo/expo/pull/32009) by [@wschurman](https://github.com/wschurman))
 
 ### ⚠️ Notices
 

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

@@ -3,19 +3,17 @@ package expo.modules.updates
 import android.app.Activity
 import android.content.Context
 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
 import expo.modules.kotlin.exception.CodedException
 import expo.modules.kotlin.exception.toCodedException
 import expo.modules.updates.events.IUpdatesEventManager
-import expo.modules.updates.events.QueueUpdatesEventManager
+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.statemachine.UpdatesStateContext
 import expo.modules.updates.statemachine.UpdatesStateMachine
 import expo.modules.updates.statemachine.UpdatesStateValue
 import java.io.File
@@ -34,16 +32,14 @@ class DisabledUpdatesController(
   private val context: Context,
   private val fatalException: Exception?
 ) : IUpdatesController {
-  override var appContext: WeakReference<AppContext>? = null
-
   /** Keep the activity for [RecreateReactContextProcedure] to relaunch the app. */
   private var weakActivity: WeakReference<Activity>? = null
 
   private val logger = UpdatesLogger(context)
-  override val eventManager: IUpdatesEventManager = QueueUpdatesEventManager(logger)
+  override val eventManager: IUpdatesEventManager = UpdatesEventManager(logger)
 
   // disabled controller state machine can only be idle or restarting
-  private val stateMachine = UpdatesStateMachine(context, eventManager, setOf(UpdatesStateValue.Idle, UpdatesStateValue.Restarting))
+  private val stateMachine = UpdatesStateMachine(logger, eventManager, setOf(UpdatesStateValue.Idle, UpdatesStateValue.Restarting))
 
   private var isStarted = false
   private var startupStartTimeMillis: Long? = null
@@ -69,7 +65,7 @@ class DisabledUpdatesController(
         try {
           (this as java.lang.Object).wait()
         } catch (e: InterruptedException) {
-          Log.e(TAG, "Interrupted while waiting for launch asset file", e)
+          logger.error("Interrupted while waiting for launch asset file", e, UpdatesErrorCode.InitializationError)
         }
       }
       return launcher?.launchAssetFile
@@ -78,6 +74,10 @@ class DisabledUpdatesController(
   override val bundleAssetName: String?
     get() = launcher?.bundleAssetName
 
+  override fun onEventListenerStartObserving() {
+    stateMachine.sendContextToJS()
+  }
+
   override fun onDidCreateDevSupportManager(devSupportManager: DevSupportManager) {}
 
   override fun onDidCreateReactInstance(reactContext: ReactContext) {
@@ -96,7 +96,7 @@ class DisabledUpdatesController(
     isStarted = true
     startupStartTimeMillis = System.currentTimeMillis()
 
-    launcher = NoDatabaseLauncher(context, fatalException)
+    launcher = NoDatabaseLauncher(context, logger, fatalException)
 
     startupEndTimeMillis = System.currentTimeMillis()
     notifyController()
@@ -116,7 +116,8 @@ class DisabledUpdatesController(
       checkOnLaunch = UpdatesConfiguration.CheckAutomaticallyConfiguration.NEVER,
       requestHeaders = mapOf(),
       localAssetFiles = launcher?.localAssetFiles,
-      shouldDeferToNativeForAPIMethodAvailabilityInDevelopment = false
+      shouldDeferToNativeForAPIMethodAvailabilityInDevelopment = false,
+      initialContext = stateMachine.context
     )
   }
 
@@ -137,10 +138,6 @@ class DisabledUpdatesController(
     stateMachine.queueExecution(procedure)
   }
 
-  override fun getNativeStateMachineContext(callback: IUpdatesController.ModuleCallback<UpdatesStateContext>) {
-    callback.onSuccess(stateMachine.context)
-  }
-
   override fun checkForUpdate(
     callback: IUpdatesController.ModuleCallback<IUpdatesController.CheckForUpdateResult>
   ) {

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

@@ -4,19 +4,18 @@ import android.app.Activity
 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
 import expo.modules.kotlin.exception.CodedException
 import expo.modules.kotlin.exception.toCodedException
 import expo.modules.updates.db.BuildData
 import expo.modules.updates.db.DatabaseHolder
 import expo.modules.updates.db.UpdatesDatabase
 import expo.modules.updates.events.IUpdatesEventManager
-import expo.modules.updates.events.QueueUpdatesEventManager
+import expo.modules.updates.events.UpdatesEventManager
 import expo.modules.updates.launcher.Launcher.LauncherCallback
 import expo.modules.updates.loader.FileDownloader
+import expo.modules.updates.logging.UpdatesErrorCode
 import expo.modules.updates.logging.UpdatesLogReader
 import expo.modules.updates.logging.UpdatesLogger
 import expo.modules.updates.manifest.EmbeddedManifestUtils
@@ -26,7 +25,6 @@ import expo.modules.updates.procedures.FetchUpdateProcedure
 import expo.modules.updates.procedures.RelaunchProcedure
 import expo.modules.updates.procedures.StartupProcedure
 import expo.modules.updates.selectionpolicy.SelectionPolicyFactory
-import expo.modules.updates.statemachine.UpdatesStateContext
 import expo.modules.updates.statemachine.UpdatesStateMachine
 import expo.modules.updates.statemachine.UpdatesStateValue
 import java.io.File
@@ -42,24 +40,22 @@ class EnabledUpdatesController(
   private val updatesConfiguration: UpdatesConfiguration,
   override val updatesDirectory: File
 ) : IUpdatesController {
-  override var appContext: WeakReference<AppContext>? = null
-
   /** Keep the activity for [RelaunchProcedure] to relaunch the app. */
   private var weakActivity: WeakReference<Activity>? = null
   private val logger = UpdatesLogger(context)
-  override val eventManager: IUpdatesEventManager = QueueUpdatesEventManager(logger)
+  override val eventManager: IUpdatesEventManager = UpdatesEventManager(logger)
 
-  private val fileDownloader = FileDownloader(context, updatesConfiguration)
+  private val fileDownloader = FileDownloader(context, updatesConfiguration, logger)
   private val selectionPolicy = SelectionPolicyFactory.createFilterAwarePolicy(
     updatesConfiguration.getRuntimeVersion()
   )
-  private val stateMachine = UpdatesStateMachine(context, eventManager, UpdatesStateValue.entries.toSet())
+  private val stateMachine = UpdatesStateMachine(logger, eventManager, UpdatesStateValue.entries.toSet())
   private val databaseHolder = DatabaseHolder(UpdatesDatabase.getInstance(context))
 
   private fun purgeUpdatesLogsOlderThanOneDay() {
     UpdatesLogReader(context).purgeLogEntries {
       if (it != null) {
-        Log.e(TAG, "UpdatesLogReader: error in purgeLogEntries", it)
+        logger.error("UpdatesLogReader: error in purgeLogEntries", it, UpdatesErrorCode.Unknown)
       }
     }
   }
@@ -111,7 +107,7 @@ class EnabledUpdatesController(
         try {
           (this as java.lang.Object).wait()
         } catch (e: InterruptedException) {
-          Log.e(TAG, "Interrupted while waiting for launch asset file", e)
+          logger.error("Interrupted while waiting for launch asset file", e, UpdatesErrorCode.InitializationError)
         }
       }
       return startupProcedure.launchAssetFile
@@ -119,6 +115,10 @@ class EnabledUpdatesController(
   override val bundleAssetName: String?
     get() = startupProcedure.bundleAssetName
 
+  override fun onEventListenerStartObserving() {
+    stateMachine.sendContextToJS()
+  }
+
   override fun onDidCreateDevSupportManager(devSupportManager: DevSupportManager) {
     startupProcedure.onDidCreateDevSupportManager(devSupportManager)
   }
@@ -154,6 +154,7 @@ class EnabledUpdatesController(
       context,
       weakActivity,
       updatesConfiguration,
+      logger,
       databaseHolder,
       updatesDirectory,
       fileDownloader,
@@ -178,7 +179,8 @@ class EnabledUpdatesController(
       checkOnLaunch = updatesConfiguration.checkOnLaunch,
       requestHeaders = updatesConfiguration.requestHeaders,
       localAssetFiles = localAssetFiles,
-      shouldDeferToNativeForAPIMethodAvailabilityInDevelopment = false
+      shouldDeferToNativeForAPIMethodAvailabilityInDevelopment = false,
+      initialContext = stateMachine.context
     )
   }
 
@@ -202,10 +204,6 @@ class EnabledUpdatesController(
     }
   }
 
-  override fun getNativeStateMachineContext(callback: IUpdatesController.ModuleCallback<UpdatesStateContext>) {
-    callback.onSuccess(stateMachine.context)
-  }
-
   override fun checkForUpdate(callback: IUpdatesController.ModuleCallback<IUpdatesController.CheckForUpdateResult>) {
     val procedure = CheckForUpdateProcedure(context, updatesConfiguration, databaseHolder, logger, fileDownloader, selectionPolicy, launchedUpdate) {
       callback.onSuccess(it)
@@ -214,7 +212,7 @@ class EnabledUpdatesController(
   }
 
   override fun fetchUpdate(callback: IUpdatesController.ModuleCallback<IUpdatesController.FetchUpdateResult>) {
-    val procedure = FetchUpdateProcedure(context, updatesConfiguration, databaseHolder, updatesDirectory, fileDownloader, selectionPolicy, launchedUpdate) {
+    val procedure = FetchUpdateProcedure(context, updatesConfiguration, logger, databaseHolder, updatesDirectory, fileDownloader, selectionPolicy, launchedUpdate) {
       callback.onSuccess(it)
     }
     stateMachine.queueExecution(procedure)

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

@@ -3,7 +3,6 @@ package expo.modules.updates
 import android.os.Bundle
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.devsupport.interfaces.DevSupportManager
-import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.exception.CodedException
 import expo.modules.updates.db.entity.AssetEntity
 import expo.modules.updates.db.entity.UpdateEntity
@@ -12,7 +11,6 @@ import expo.modules.updates.loader.LoaderTask
 import expo.modules.updates.manifest.Update
 import expo.modules.updates.statemachine.UpdatesStateContext
 import java.io.File
-import java.lang.ref.WeakReference
 import java.util.Date
 import kotlin.time.Duration
 import kotlin.time.DurationUnit
@@ -42,13 +40,10 @@ interface IUpdatesController {
    */
   val updatesDirectory: File?
 
-  /**
-   * The [AppContext] assigned from [UpdatesModule]
-   */
-  var appContext: WeakReference<AppContext>?
-
   val eventManager: IUpdatesEventManager
 
+  fun onEventListenerStartObserving()
+
   fun onDidCreateDevSupportManager(devSupportManager: DevSupportManager)
 
   fun onDidCreateReactInstance(reactContext: ReactContext)
@@ -99,7 +94,9 @@ interface IUpdatesController {
      * or a Dev Client, which have their own controller/JS API implementations, we want the JS API
      * calls to go through.
      */
-    val shouldDeferToNativeForAPIMethodAvailabilityInDevelopment: Boolean
+    val shouldDeferToNativeForAPIMethodAvailabilityInDevelopment: Boolean,
+
+    val initialContext: UpdatesStateContext
   ) {
     fun toModuleConstantsMap(): Map<String, Any?> = mutableMapOf<String, Any?>().apply {
       this["isEmergencyLaunch"] = emergencyLaunchException != null
@@ -112,6 +109,7 @@ interface IUpdatesController {
       this["checkAutomatically"] = checkOnLaunch.toJSString()
       this["channel"] = requestHeaders["expo-channel-name"] ?: ""
       this["shouldDeferToNativeForAPIMethodAvailabilityInDevelopment"] = shouldDeferToNativeForAPIMethodAvailabilityInDevelopment || BuildConfig.EX_UPDATES_NATIVE_DEBUG
+      this["initialContext"] = initialContext.bundle
 
       if (launchedUpdate != null) {
         this["updateId"] = launchedUpdate.id.toString()
@@ -134,8 +132,6 @@ interface IUpdatesController {
 
   fun relaunchReactApplicationForModule(callback: ModuleCallback<Unit>)
 
-  fun getNativeStateMachineContext(callback: ModuleCallback<UpdatesStateContext>)
-
   sealed class CheckForUpdateResult(private val status: Status) {
     private enum class Status {
       NO_UPDATE_AVAILABLE,
@@ -147,7 +143,7 @@ interface IUpdatesController {
     class NoUpdateAvailable(val reason: LoaderTask.RemoteCheckResultNotAvailableReason) : CheckForUpdateResult(Status.NO_UPDATE_AVAILABLE)
     class UpdateAvailable(val update: Update) : CheckForUpdateResult(Status.UPDATE_AVAILABLE)
     class RollBackToEmbedded(val commitTime: Date) : CheckForUpdateResult(Status.ROLL_BACK_TO_EMBEDDED)
-    class ErrorResult(val error: Exception, val message: String) : CheckForUpdateResult(Status.ERROR)
+    class ErrorResult(val error: Exception) : CheckForUpdateResult(Status.ERROR)
   }
   fun checkForUpdate(callback: ModuleCallback<CheckForUpdateResult>)
 

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

@@ -2,7 +2,6 @@ package expo.modules.updates
 
 import android.content.Context
 import com.facebook.react.ReactApplication
-import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.events.EventEmitter
 import expo.modules.updates.loader.LoaderTask
 import expo.modules.updates.logging.UpdatesErrorCode
@@ -51,7 +50,8 @@ class UpdatesController {
         UpdatesUtils.getOrCreateUpdatesDirectory(context)
       } catch (e: Exception) {
         logger.error(
-          "The expo-updates system is disabled due to a storage access error: ${e.message}",
+          "The expo-updates system is disabled due to a storage access error",
+          e,
           UpdatesErrorCode.InitializationError
         )
         singletonInstance = DisabledUpdatesController(context, e)
@@ -151,23 +151,13 @@ class UpdatesController {
       }
     }
 
-    /**
-     * For [UpdatesModule] to set the [shouldEmitJsEvents] property.
-     */
-    internal var shouldEmitJsEvents: Boolean
-      get() = singletonInstance?.eventManager?.shouldEmitJsEvents ?: false
-      set(value) {
-        singletonInstance?.eventManager?.shouldEmitJsEvents = value
-      }
+    internal fun onEventListenerStartObserving(eventEmitter: EventEmitter?) {
+      singletonInstance?.eventManager?.eventEmitter = eventEmitter
+      singletonInstance?.onEventListenerStartObserving()
+    }
 
-    /**
-     * Binds the [AppContext] and [EventEmitter] instance from [UpdatesModule].
-     */
-    internal fun bindAppContext(appContext: WeakReference<AppContext>, eventEmitter: EventEmitter?) {
-      singletonInstance?.let {
-        it.appContext = appContext
-        it.eventManager.eventEmitter = eventEmitter
-      }
+    internal fun onEventListenerStopObserving() {
+      singletonInstance?.eventManager?.eventEmitter = null
     }
   }
 }

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

@@ -3,11 +3,9 @@ package expo.modules.updates
 import android.content.Context
 import android.os.AsyncTask
 import android.os.Bundle
-import android.util.Log
 import android.net.Uri
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.devsupport.interfaces.DevSupportManager
-import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.exception.CodedException
 import expo.modules.updates.db.DatabaseHolder
 import expo.modules.updates.db.Reaper
@@ -22,6 +20,8 @@ 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.logging.UpdatesErrorCode
+import expo.modules.updates.logging.UpdatesLogger
 import expo.modules.updates.selectionpolicy.LauncherSelectionPolicySingleUpdate
 import expo.modules.updates.selectionpolicy.ReaperSelectionPolicyDevelopmentClient
 import expo.modules.updates.selectionpolicy.SelectionPolicy
@@ -49,12 +49,13 @@ class UpdatesDevLauncherController(
   override val updatesDirectory: File?,
   private val updatesDirectoryException: Exception?
 ) : IUpdatesController, UpdatesInterface {
-  override var appContext: WeakReference<AppContext>? = null
   override val eventManager = NoOpUpdatesEventManager()
   override var updatesInterfaceCallbacks: WeakReference<UpdatesInterfaceCallbacks>? = null
 
   private var launcher: Launcher? = null
 
+  private val logger = UpdatesLogger(context)
+
   private var previousUpdatesConfiguration: UpdatesConfiguration? = null
   private var updatesConfiguration: UpdatesConfiguration? = initialUpdatesConfiguration
 
@@ -83,6 +84,10 @@ class UpdatesDevLauncherController(
   override val bundleAssetName: String
     get() = throw Exception("IUpdatesController.bundleAssetName should not be called in dev client")
 
+  override fun onEventListenerStartObserving() {
+    // no-op for UpdatesDevLauncherController
+  }
+
   override fun onDidCreateDevSupportManager(devSupportManager: DevSupportManager) {}
 
   override fun onDidCreateReactInstance(reactContext: ReactContext) {}
@@ -108,13 +113,11 @@ class UpdatesDevLauncherController(
     launcher = null
   }
 
-  override fun getRuntimeVersion(context: Context): String? {
-    return updatesConfiguration?.getRuntimeVersion()
-  }
+  override val runtimeVersion: String?
+    get() = updatesConfiguration?.getRuntimeVersion()
 
-  override fun getUpdateUrl(context: Context): Uri? {
-    return updatesConfiguration?.updateUrl
-  }
+  override val updateUrl: Uri?
+    get() = updatesConfiguration?.updateUrl
 
   /**
    * Fetch an update using a dynamically generated configuration object (including a potentially
@@ -122,12 +125,11 @@ class UpdatesDevLauncherController(
    */
   override fun fetchUpdateWithConfiguration(
     configuration: HashMap<String, Any>,
-    context: Context,
     callback: UpdatesInterface.UpdateCallback
   ) {
     val newUpdatesConfiguration: UpdatesConfiguration
     try {
-      newUpdatesConfiguration = createUpdatesConfiguration(configuration, context)
+      newUpdatesConfiguration = createUpdatesConfiguration(configuration)
     } catch (e: Exception) {
       callback.onFailure(e)
       return
@@ -140,10 +142,11 @@ class UpdatesDevLauncherController(
 
     setDevelopmentSelectionPolicy()
 
-    val fileDownloader = FileDownloader(context, updatesConfiguration!!)
+    val fileDownloader = FileDownloader(context, updatesConfiguration!!, logger)
     val loader = RemoteLoader(
       context,
       updatesConfiguration!!,
+      logger,
       databaseHolder.database,
       fileDownloader,
       updatesDirectory,
@@ -164,7 +167,7 @@ class UpdatesDevLauncherController(
           callback.onSuccess(null)
           return
         }
-        launchUpdate(loaderResult.updateEntity, updatesConfiguration!!, fileDownloader, context, callback)
+        launchUpdate(loaderResult.updateEntity, updatesConfiguration!!, fileDownloader, callback)
       }
 
       override fun onAssetLoaded(
@@ -193,18 +196,18 @@ class UpdatesDevLauncherController(
     })
   }
 
-  override fun isValidUpdatesConfiguration(configuration: HashMap<String, Any>, context: Context): Boolean {
+  override fun isValidUpdatesConfiguration(configuration: HashMap<String, Any>): Boolean {
     return try {
-      createUpdatesConfiguration(configuration, context)
+      createUpdatesConfiguration(configuration)
       true
     } catch (e: Exception) {
-      Log.e(TAG, "Invalid updates configuration: ${e.localizedMessage}")
+      logger.error("Invalid updates configuration", e, UpdatesErrorCode.InitializationError)
       false
     }
   }
 
   @Throws(Exception::class)
-  private fun createUpdatesConfiguration(configuration: HashMap<String, Any>, context: Context): UpdatesConfiguration {
+  private fun createUpdatesConfiguration(configuration: HashMap<String, Any>): UpdatesConfiguration {
     if (updatesDirectory == null) {
       throw updatesDirectoryException!!
     }
@@ -240,7 +243,6 @@ class UpdatesDevLauncherController(
     update: UpdateEntity,
     configuration: UpdatesConfiguration,
     fileDownloader: FileDownloader,
-    context: Context,
     callback: UpdatesInterface.UpdateCallback
   ) {
     // ensure that we launch the update we want, even if it isn't the latest one
@@ -258,14 +260,15 @@ class UpdatesDevLauncherController(
     )
 
     val launcher = DatabaseLauncher(
+      context,
       configuration,
       updatesDirectory!!,
       fileDownloader,
-      selectionPolicy
+      selectionPolicy,
+      logger
     )
     launcher.launch(
       databaseHolder.database,
-      context,
       object : Launcher.LauncherCallback {
         override fun onFailure(e: Exception) {
           databaseHolder.releaseDatabase()
@@ -324,7 +327,8 @@ class UpdatesDevLauncherController(
       checkOnLaunch = updatesConfiguration?.checkOnLaunch ?: UpdatesConfiguration.CheckAutomaticallyConfiguration.ALWAYS,
       requestHeaders = updatesConfiguration?.requestHeaders ?: mapOf(),
       localAssetFiles = localAssetFiles,
-      shouldDeferToNativeForAPIMethodAvailabilityInDevelopment = true
+      shouldDeferToNativeForAPIMethodAvailabilityInDevelopment = true,
+      initialContext = UpdatesStateContext()
     )
   }
 
@@ -335,10 +339,6 @@ class UpdatesDevLauncherController(
     callback.onSuccess(Unit)
   }
 
-  override fun getNativeStateMachineContext(callback: IUpdatesController.ModuleCallback<UpdatesStateContext>) {
-    callback.onSuccess(UpdatesStateContext())
-  }
-
   override fun checkForUpdate(
     callback: IUpdatesController.ModuleCallback<IUpdatesController.CheckForUpdateResult>
   ) {

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

@@ -3,7 +3,6 @@ package expo.modules.updates
 import android.content.Context
 import android.os.AsyncTask
 import android.os.Bundle
-import android.util.Log
 import expo.modules.kotlin.Promise
 import expo.modules.kotlin.exception.CodedException
 import expo.modules.kotlin.exception.Exceptions
@@ -14,8 +13,6 @@ import expo.modules.updates.logging.UpdatesErrorCode
 import expo.modules.updates.logging.UpdatesLogEntry
 import expo.modules.updates.logging.UpdatesLogReader
 import expo.modules.updates.logging.UpdatesLogger
-import expo.modules.updates.statemachine.UpdatesStateContext
-import java.lang.ref.WeakReference
 import java.util.Date
 
 /**
@@ -42,19 +39,12 @@ class UpdatesModule : Module() {
       UpdatesController.instance.getConstantsForModule().toModuleConstantsMap()
     }
 
-    OnCreate {
-      UpdatesController.bindAppContext(
-        WeakReference(appContext),
-        appContext.eventEmitter(this@UpdatesModule)
-      )
-    }
-
     OnStartObserving {
-      UpdatesController.shouldEmitJsEvents = true
+      UpdatesController.onEventListenerStartObserving(appContext.eventEmitter(this@UpdatesModule))
     }
 
     OnStopObserving {
-      UpdatesController.shouldEmitJsEvents = false
+      UpdatesController.onEventListenerStopObserving()
     }
 
     AsyncFunction("reload") { promise: Promise ->
@@ -71,27 +61,13 @@ class UpdatesModule : Module() {
       )
     }
 
-    // Used internally by useUpdates() to get its initial state
-    AsyncFunction("getNativeStateMachineContextAsync") { promise: Promise ->
-      UpdatesController.instance.getNativeStateMachineContext(object : IUpdatesController.ModuleCallback<UpdatesStateContext> {
-        override fun onSuccess(result: UpdatesStateContext) {
-          promise.resolve(result.bundle)
-        }
-
-        override fun onFailure(exception: CodedException) {
-          promise.reject(exception)
-        }
-      })
-    }
-
     AsyncFunction("checkForUpdateAsync") { promise: Promise ->
       UpdatesController.instance.checkForUpdate(
         object : IUpdatesController.ModuleCallback<IUpdatesController.CheckForUpdateResult> {
           override fun onSuccess(result: IUpdatesController.CheckForUpdateResult) {
             when (result) {
               is IUpdatesController.CheckForUpdateResult.ErrorResult -> {
-                promise.reject("ERR_UPDATES_CHECK", result.message, result.error)
-                Log.e(TAG, result.message, result.error)
+                promise.reject("ERR_UPDATES_CHECK", "Failed to check for update", result.error)
               }
               is IUpdatesController.CheckForUpdateResult.NoUpdateAvailable -> {
                 promise.resolve(
@@ -256,7 +232,7 @@ class UpdatesModule : Module() {
         }
     }
 
-    internal fun clearLogEntries(context: Context, completionHandler: (_: Error?) -> Unit) {
+    internal fun clearLogEntries(context: Context, completionHandler: (_: Exception?) -> Unit) {
       val reader = UpdatesLogReader(context)
       reader.purgeLogEntries(
         olderThan = Date(),

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

@@ -6,6 +6,8 @@ import android.util.Base64
 import android.util.Log
 import expo.modules.updates.UpdatesConfiguration.CheckAutomaticallyConfiguration
 import expo.modules.updates.db.entity.AssetEntity
+import expo.modules.updates.logging.UpdatesErrorCode
+import expo.modules.updates.logging.UpdatesLogger
 import org.apache.commons.io.FileUtils
 import org.json.JSONArray
 import org.json.JSONObject
@@ -154,6 +156,7 @@ object UpdatesUtils {
 
   fun shouldCheckForUpdateOnLaunch(
     updatesConfiguration: UpdatesConfiguration,
+    logger: UpdatesLogger,
     context: Context
   ): Boolean {
     return when (updatesConfiguration.checkOnLaunch) {
@@ -163,10 +166,8 @@ object UpdatesUtils {
       CheckAutomaticallyConfiguration.WIFI_ONLY -> {
         val cm = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager?
         if (cm == null) {
-          Log.e(
-            TAG,
-            "Could not determine active network connection is metered; not checking for updates"
-          )
+          val cause = Exception("Null ConnectivityManager system service")
+          logger.error("Could not determine active network connection is metered; not checking for updates", cause, UpdatesErrorCode.Unknown)
           return false
         }
         !cm.isActiveNetworkMetered

package/android/src/main/java/expo/modules/updates/db/UpdatesDatabase.kt

@@ -58,9 +58,9 @@ abstract class UpdatesDatabase : RoomDatabase() {
     private const val DB_NAME = "updates.db"
 
     @JvmStatic @Synchronized
-    fun getInstance(context: Context?): UpdatesDatabase {
+    fun getInstance(context: Context): UpdatesDatabase {
       if (instance == null) {
-        instance = Room.databaseBuilder(context!!, UpdatesDatabase::class.java, DB_NAME)
+        instance = Room.databaseBuilder(context, UpdatesDatabase::class.java, DB_NAME)
           .addMigrations(MIGRATION_4_5)
           .addMigrations(MIGRATION_5_6)
           .addMigrations(MIGRATION_6_7)