expo-updates 0.25.16 → 0.25.17

package/CHANGELOG.md

@@ -10,6 +10,13 @@
 
 ### 💡 Others
 
+## 0.25.17 — 2024-06-13
+
+### 💡 Others
+
+- Improved stability of E2E testing. ([#29402](https://github.com/expo/expo/pull/29402) by [@kudo](https://github.com/kudo))
+- Improved JS event performance on Android and stability of E2E testing. ([#29593](https://github.com/expo/expo/pull/29593) by [@kudo](https://github.com/kudo))
+
 ## 0.25.16 — 2024-06-06
 
 _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.16'
+version = '0.25.17'
 
 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.16'
+    versionName '0.25.17'
     consumerProguardFiles("proguard-rules.pro")
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

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

@@ -8,6 +8,7 @@ import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.devsupport.interfaces.DevSupportManager
 import expo.modules.kotlin.AppContext
+import expo.modules.kotlin.events.EventEmitter
 import expo.modules.kotlin.exception.CodedException
 import expo.modules.kotlin.exception.toCodedException
 import expo.modules.updates.launcher.Launcher
@@ -34,6 +35,7 @@ class DisabledUpdatesController(
   private val fatalException: Exception?
 ) : IUpdatesController, UpdatesStateChangeEventSender {
   override var appContext: WeakReference<AppContext>? = null
+  override var eventEmitter: EventEmitter? = null
 
   /** Keep the activity for [RecreateReactContextProcedure] to relaunch the app. */
   private var weakActivity: WeakReference<Activity>? = null
@@ -174,6 +176,6 @@ class DisabledUpdatesController(
   }
 
   private fun sendEventToJS(eventName: String, eventType: String, params: WritableMap?) {
-    UpdatesUtils.sendEventToAppContext(shouldEmitJsEvents, appContext, logger, eventName, eventType, params)
+    UpdatesUtils.sendEvent(eventEmitter, shouldEmitJsEvents, logger, eventName, eventType, params)
   }
 }

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

@@ -9,6 +9,7 @@ import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.devsupport.interfaces.DevSupportManager
 import expo.modules.kotlin.AppContext
+import expo.modules.kotlin.events.EventEmitter
 import expo.modules.kotlin.exception.CodedException
 import expo.modules.kotlin.exception.toCodedException
 import expo.modules.updates.db.BuildData
@@ -42,6 +43,7 @@ class EnabledUpdatesController(
   override val updatesDirectory: File
 ) : IUpdatesController, UpdatesStateChangeEventSender {
   override var appContext: WeakReference<AppContext>? = null
+  override var eventEmitter: EventEmitter? = null
 
   /** Keep the activity for [RelaunchProcedure] to relaunch the app. */
   private var weakActivity: WeakReference<Activity>? = null
@@ -170,7 +172,7 @@ class EnabledUpdatesController(
   }
 
   private fun sendEventToJS(eventName: String, eventType: String, params: WritableMap?) {
-    UpdatesUtils.sendEventToAppContext(shouldEmitJsEvents, appContext, logger, eventName, eventType, params)
+    UpdatesUtils.sendEvent(eventEmitter, shouldEmitJsEvents, logger, eventName, eventType, params)
   }
 
   override fun getConstantsForModule(): IUpdatesController.UpdatesModuleConstants {

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

@@ -5,6 +5,7 @@ import com.facebook.react.ReactApplication
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.devsupport.interfaces.DevSupportManager
 import expo.modules.kotlin.AppContext
+import expo.modules.kotlin.events.EventEmitter
 import expo.modules.kotlin.exception.CodedException
 import expo.modules.updates.db.entity.AssetEntity
 import expo.modules.updates.db.entity.UpdateEntity
@@ -45,6 +46,11 @@ interface IUpdatesController {
    */
   var appContext: WeakReference<AppContext>?
 
+  /**
+   * The [EventEmitter] assigned from [UpdatesModule]
+   */
+  var eventEmitter: EventEmitter?
+
   fun onDidCreateDevSupportManager(devSupportManager: DevSupportManager)
 
   fun onDidCreateReactInstance(reactContext: ReactContext)

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

@@ -3,6 +3,7 @@ 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
 import expo.modules.updates.logging.UpdatesLogger
@@ -160,11 +161,12 @@ class UpdatesController {
       }
 
     /**
-     * Binds the [AppContext] instance from [UpdatesModule].
+     * Binds the [AppContext] and [EventEmitter] instance from [UpdatesModule].
      */
-    internal fun bindAppContext(appContext: WeakReference<AppContext>) {
+    internal fun bindAppContext(appContext: WeakReference<AppContext>, eventEmitter: EventEmitter?) {
       singletonInstance?.let {
         it.appContext = appContext
+        it.eventEmitter = eventEmitter
       }
     }
   }

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

@@ -7,6 +7,7 @@ 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.events.EventEmitter
 import expo.modules.kotlin.exception.CodedException
 import expo.modules.updates.db.DatabaseHolder
 import expo.modules.updates.db.Reaper
@@ -48,6 +49,7 @@ class UpdatesDevLauncherController(
   private val updatesDirectoryException: Exception?
 ) : IUpdatesController, UpdatesInterface {
   override var appContext: WeakReference<AppContext>? = null
+  override var eventEmitter: EventEmitter? = null
   override var shouldEmitJsEvents = false
   override var updatesInterfaceCallbacks: WeakReference<UpdatesInterfaceCallbacks>? = null
 

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

@@ -74,7 +74,10 @@ class UpdatesModule : Module() {
     }
 
     OnCreate {
-      UpdatesController.bindAppContext(WeakReference(appContext))
+      UpdatesController.bindAppContext(
+        WeakReference(appContext),
+        appContext.eventEmitter(this@UpdatesModule)
+      )
     }
 
     OnStartObserving {

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

@@ -7,6 +7,7 @@ import android.util.Log
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import expo.modules.kotlin.AppContext
+import expo.modules.kotlin.events.EventEmitter
 import expo.modules.updates.UpdatesConfiguration.CheckAutomaticallyConfiguration
 import expo.modules.updates.db.entity.AssetEntity
 import expo.modules.updates.logging.UpdatesErrorCode
@@ -160,9 +161,9 @@ object UpdatesUtils {
     }
   }
 
-  fun sendEventToAppContext(
+  fun sendEvent(
+    eventEmitter: EventEmitter?,
     shouldEmitJsEvents: Boolean,
-    weakAppContext: WeakReference<AppContext>?,
     logger: UpdatesLogger,
     eventName: String,
     eventType: String,
@@ -176,24 +177,19 @@ object UpdatesUtils {
       logger.error("Could not emit $eventName $eventType event; no subscribers registered.", UpdatesErrorCode.JSRuntimeError)
       return
     }
-    val appContext = weakAppContext?.get() ?: run {
-      eventsToSendToJS.add(Pair(eventName, eventParams))
-      logger.error("Could not emit $eventName $eventType event; no app context was found.", UpdatesErrorCode.JSRuntimeError)
-      return
-    }
-    val updatesModule = appContext.registry.getModule("ExpoUpdates") ?: run {
-      eventsToSendToJS.add(Pair(eventName, eventParams))
-      logger.error("Could not emit $eventName $eventType event; no ExpoUpdates module was found.", UpdatesErrorCode.JSRuntimeError)
-      return
-    }
-    val eventEmitter = appContext.eventEmitter(updatesModule) ?: run {
+    if (eventEmitter == null) {
       eventsToSendToJS.add(Pair(eventName, eventParams))
       logger.error("Could not emit $eventName $eventType event; no event emitter was found.", UpdatesErrorCode.JSRuntimeError)
       return
     }
 
     logger.info("Emitted event: name = $eventName, type = $eventType")
-    eventEmitter.emit(eventName, eventParams)
+    try {
+      eventEmitter.emit(eventName, eventParams)
+    } catch (e: Exception) {
+      logger.error("Could not emit $eventName $eventType event; ${e.message}", UpdatesErrorCode.JSRuntimeError)
+      eventsToSendToJS.add(Pair(eventName, eventParams))
+    }
   }
 
   fun sendQueuedEventsToAppContext(

package/e2e/README.md

@@ -76,9 +76,8 @@ eas build --profile=updates_testing_debug --platform=<android|ios>
 @@ -15,7 +15,8 @@
      "updates_testing_debug": {
        "env": {
-         "EX_UPDATES_NATIVE_DEBUG": "1",
--        "NO_FLIPPER": "1"
-+        "NO_FLIPPER": "1",
+-        "EX_UPDATES_NATIVE_DEBUG": "1"
++        "EX_UPDATES_NATIVE_DEBUG": "1",
 +        "LOCAL_TESTING": "1"
        },
        "android": {

package/e2e/fixtures/App-updates-disabled.tsx

@@ -15,7 +15,7 @@ function TestValue(props: { testID: string; value: string }) {
         <Text style={styles.labelText}>{props.testID}</Text>
         <Text style={styles.labelText}>&nbsp;</Text>
         <Text style={styles.labelText} testID={props.testID}>
-          {props.value}
+          {props.value || 'null'}
         </Text>
       </View>
     </View>

package/e2e/fixtures/App.tsx

@@ -24,7 +24,7 @@ function TestValue(props: { testID: string; value: string }) {
         <Text style={styles.labelText}>{props.testID}</Text>
         <Text style={styles.labelText}>&nbsp;</Text>
         <Text style={styles.labelText} testID={props.testID}>
-          {props.value}
+          {props.value || 'null'}
         </Text>
       </View>
     </View>

package/e2e/fixtures/Updates-dev-client.e2e.ts

@@ -14,7 +14,7 @@ const pressTestButtonAsync = async (testID: string) => await element(by.id(testI
 const waitForAppToBecomeVisible = async () => {
   await waitFor(element(by.id('updateString')))
     .toBeVisible()
-    .withTimeout(2000);
+    .withTimeout(3000);
 };
 
 describe('Basic tests', () => {
@@ -34,7 +34,7 @@ describe('Basic tests', () => {
 
     jestExpect(await testElementValueAsync('updateString')).toBe('test');
     jestExpect(await testElementValueAsync('updateID')).toBeTruthy();
-    jestExpect(await testElementValueAsync('runtimeVersion')).toBe('');
+    jestExpect(await testElementValueAsync('runtimeVersion')).toBe('null');
     jestExpect(await testElementValueAsync('checkAutomatically')).toBe('NEVER');
     jestExpect(await testElementValueAsync('isEmbeddedLaunch')).toBe('false');
     jestExpect(await testElementValueAsync('availableUpdateID')).toBe('undefined');

package/e2e/fixtures/Updates-disabled.e2e.ts

@@ -14,7 +14,7 @@ const pressTestButtonAsync = async (testID: string) => await element(by.id(testI
 const waitForAppToBecomeVisible = async () => {
   await waitFor(element(by.id('updateString')))
     .toBeVisible()
-    .withTimeout(2000);
+    .withTimeout(3000);
 };
 
 describe('Basic tests', () => {
@@ -32,7 +32,7 @@ describe('Basic tests', () => {
 
     jestExpect(await testElementValueAsync('updateString')).toBe('test');
     jestExpect(await testElementValueAsync('updateID')).toBeTruthy();
-    jestExpect(await testElementValueAsync('runtimeVersion')).toBe('');
+    jestExpect(await testElementValueAsync('runtimeVersion')).toBe('null');
     jestExpect(await testElementValueAsync('checkAutomatically')).toBe('NEVER');
     jestExpect(await testElementValueAsync('isEmbeddedLaunch')).toBe('false');
     jestExpect(await testElementValueAsync('availableUpdateID')).toBe('undefined');
@@ -49,6 +49,11 @@ describe('Basic tests', () => {
     await device.installApp();
     await device.launchApp({
       newInstance: true,
+
+      // The ReactContext is required by detox synchronization on Android.
+      // However ReactContext will be changed after the app is reloaded.
+      // All future tests will be blocked after reloading, so we need to disable synchronization for reload tests.
+      launchArgs: device.getPlatform() === 'android' ? { detoxEnableSynchronization: 0 } : {},
     });
     await waitForAppToBecomeVisible();
 
@@ -63,18 +68,6 @@ describe('Basic tests', () => {
     // it's delayed 2 seconds after the button press in the client so the button press finish registers in detox
     await setTimeout(3000);
 
-    // on android, the react context must be reacquired by detox.
-    // there's no detox public API to tell it that react native
-    // has been reloaded by the client application and that it should
-    // reacquire the react context. Instead, we use the detox reload
-    // API to do a second reload which reacquires the context. This
-    // detox reload method does the same thing that expo-updates reload does
-    // under the hood, so this is ok and is the best we can do. It should
-    // do the job of catching issues in react native either way.
-    if (device.getPlatform() === 'android') {
-      await device.reloadReactNative();
-    }
-
     const isReloadingAfter = await testElementValueAsync('isReloading');
     jestExpect(isReloadingAfter).toBe('false');
     const startTimeAfter = parseInt(await testElementValueAsync('startTime'), 10);

package/e2e/fixtures/Updates-error-recovery.e2e.ts

@@ -16,7 +16,7 @@ const testElementValueAsync = async (testID: string) => {
 const waitForAppToBecomeVisible = async () => {
   await waitFor(element(by.id('updateString')))
     .toBeVisible()
-    .withTimeout(2000);
+    .withTimeout(3000);
 };
 
 describe('Error recovery tests', () => {

package/e2e/fixtures/Updates-startup.e2e.ts

@@ -16,7 +16,7 @@ const testElementValueAsync = async (testID: string) => {
 const waitForAppToBecomeVisible = async () => {
   await waitFor(element(by.id('updateString')))
     .toBeVisible()
-    .withTimeout(2000);
+    .withTimeout(3000);
 };
 
 describe('Basic tests', () => {

package/e2e/fixtures/Updates.e2e.ts

@@ -81,7 +81,7 @@ const readLogEntriesAsync = async () => {
 const waitForAppToBecomeVisible = async () => {
   await waitFor(element(by.id('updateString')))
     .toBeVisible()
-    .withTimeout(2000);
+    .withTimeout(3000);
 };
 
 describe('Basic tests', () => {
@@ -117,6 +117,11 @@ describe('Basic tests', () => {
     await device.installApp();
     await device.launchApp({
       newInstance: true,
+
+      // The ReactContext is required by detox synchronization on Android.
+      // However ReactContext will be changed after the app is reloaded.
+      // All future tests will be blocked after reloading, so we need to disable synchronization for reload tests.
+      launchArgs: device.getPlatform() === 'android' ? { detoxEnableSynchronization: 0 } : {},
     });
     await waitForAppToBecomeVisible();
 
@@ -131,18 +136,6 @@ describe('Basic tests', () => {
     // it's delayed 2 seconds after the button press in the client so the button press finish registers in detox
     await setTimeout(3000);
 
-    // on android, the react context must be reacquired by detox.
-    // there's no detox public API to tell it that react native
-    // has been reloaded by the client application and that it should
-    // reacquire the react context. Instead, we use the detox reload
-    // API to do a second reload which reacquires the context. This
-    // detox reload method does the same thing that expo-updates reload does
-    // under the hood, so this is ok and is the best we can do. It should
-    // do the job of catching issues in react native either way.
-    if (device.getPlatform() === 'android') {
-      await device.reloadReactNative();
-    }
-
     const isReloadingAfter = await testElementValueAsync('isReloading');
     jestExpect(isReloadingAfter).toBe('false');
     const startTimeAfter = parseInt(await testElementValueAsync('startTime'), 10);
@@ -775,14 +768,14 @@ describe('JS API tests', () => {
     jestExpect(isUpdateAvailable).toEqual('false');
     jestExpect(isUpdatePending).toEqual('false');
     jestExpect(isRollback).toEqual('false');
-    jestExpect(latestManifestId).toEqual('');
-    jestExpect(downloadedManifestId).toEqual('');
+    jestExpect(latestManifestId).toEqual('null');
+    jestExpect(downloadedManifestId).toEqual('null');
     // After check for update and getting a manifest
     jestExpect(isUpdateAvailable2).toEqual('true');
     jestExpect(isUpdatePending2).toEqual('false');
     jestExpect(isRollback2).toEqual('false');
     jestExpect(latestManifestId2).toEqual(manifest.id);
-    jestExpect(downloadedManifestId2).toEqual('');
+    jestExpect(downloadedManifestId2).toEqual('null');
     // After downloading the update
     jestExpect(isUpdateAvailable3).toEqual('true');
     jestExpect(isUpdatePending3).toEqual('true');
@@ -797,16 +790,16 @@ describe('JS API tests', () => {
     jestExpect(isUpdateAvailable4).toEqual('false');
     jestExpect(isUpdatePending4).toEqual('false');
     jestExpect(isRollback4).toEqual('false');
-    jestExpect(latestManifestId4).toEqual('');
-    jestExpect(downloadedManifestId4).toEqual('');
-    jestExpect(rollbackCommitTime4).toEqual('');
+    jestExpect(latestManifestId4).toEqual('null');
+    jestExpect(downloadedManifestId4).toEqual('null');
+    jestExpect(rollbackCommitTime4).toEqual('null');
     // After check for update and getting a rollback
     jestExpect(isUpdateAvailable5).toEqual('true');
     jestExpect(isUpdatePending5).toEqual('false');
     jestExpect(isRollback5).toEqual('true');
-    jestExpect(latestManifestId5).toEqual('');
-    jestExpect(downloadedManifestId5).toEqual('');
-    jestExpect(rollbackCommitTime5).not.toEqual('');
+    jestExpect(latestManifestId5).toEqual('null');
+    jestExpect(downloadedManifestId5).toEqual('null');
+    jestExpect(rollbackCommitTime5).not.toEqual('null');
 
     // Check for update, and expect isRollback to be true
     await pressTestButtonAsync('triggerParallelFetchAndDownload');

package/e2e/fixtures/project_files/.detoxrc.json

@@ -36,7 +36,7 @@
       "type": "ios.simulator",
       "headless": true,
       "device": {
-        "type": "iPhone 14"
+        "type": "iPhone 15"
       }
     },
     "emulator": {

package/e2e/fixtures/project_files/eas-hooks/eas-build-on-success.sh

@@ -32,7 +32,6 @@ export UPDATES_PORT=4747
 export PROJECT_ROOT=$PWD
 
 export EX_UPDATES_NATIVE_DEBUG=1
-export NO_FLIPPER=1
 
 mkdir ./logs
 

package/e2e/fixtures/project_files/eas.json

@@ -4,7 +4,13 @@
   },
   "build": {
     "base": {
-      "node": "18.18.0"
+      "node": "20.14.0",
+      "android": {
+        "image": "latest"
+      },
+      "ios": {
+        "image": "latest"
+      }
     },
     "development": {
       "extends": "base",
@@ -19,23 +25,17 @@
     "updates_testing_debug": {
       "extends": "base",
       "env": {
-        "EX_UPDATES_NATIVE_DEBUG": "1",
-        "NO_FLIPPER": "1"
+        "EX_UPDATES_NATIVE_DEBUG": "1"
       },
       "android": {
-        "image": "ubuntu-22.04-jdk-17-ndk-r21e",
+        "applicationArchivePath": "eas.json",
         "gradleCommand": ":app:assembleDebug :app:assembleAndroidTest -DtestBuildType=debug",
-        "withoutCredentials": true,
-        "resourceClass": "large"
+        "withoutCredentials": true
       },
       "ios": {
+        "applicationArchivePath": "eas.json",
         "simulator": true,
-        "resourceClass": "m-medium",
-        "image": "macos-ventura-13.3-xcode-14.3",
-        "buildConfiguration": "Debug",
-        "cache": {
-          "cacheDefaultPaths": false
-        }
+        "buildConfiguration": "Debug"
       },
       "distribution": "internal",
       "buildArtifactPaths": ["logs/*.log"]
@@ -43,27 +43,20 @@
     "updates_testing_release": {
       "extends": "base",
       "env": {
-        "EX_UPDATES_NATIVE_DEBUG": "1",
-        "NO_FLIPPER": "1"
+        "EX_UPDATES_NATIVE_DEBUG": "1"
       },
       "android": {
-        "image": "ubuntu-22.04-jdk-17-ndk-r21e",
         "gradleCommand": ":app:assembleRelease :app:assembleAndroidTest -DtestBuildType=release",
-        "withoutCredentials": true,
-        "resourceClass": "large"
+        "withoutCredentials": true
       },
       "ios": {
         "simulator": true,
-        "resourceClass": "m-medium",
-        "image": "macos-ventura-13.3-xcode-14.3",
-        "buildConfiguration": "Release",
-        "cache": {
-          "cacheDefaultPaths": false
-        }
+        "buildConfiguration": "Release"
       },
       "distribution": "internal",
       "buildArtifactPaths": ["logs/*.log"]
     },
+
     "production": {
       "extends": "base"
     }

package/package.json

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