expo-updates 0.25.21 → 0.25.23

package/CHANGELOG.md

@@ -10,6 +10,18 @@
 
 ### 💡 Others
 
+## 0.25.23 — 2024-08-21
+
+### 🐛 Bug fixes
+
+- Fixed build error with React Native 0.75 on Android. ([#31084](https://github.com/expo/expo/pull/31084) by [@kudo](https://github.com/kudo))
+
+## 0.25.22 — 2024-08-07
+
+### 💡 Others
+
+- Re-exported `@expo/fingerprint` as `expo-updates/fingerprint`. ([#30757](https://github.com/expo/expo/pull/30757) by [@kudo](https://github.com/kudo))
+
 ## 0.25.21 — 2024-07-22
 
 _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.21'
+version = '0.25.23'
 
 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.21'
+    versionName '0.25.23'
     consumerProguardFiles("proguard-rules.pro")
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -76,6 +76,13 @@ android {
     main.assets.srcDirs += files("$projectDir/src/main/certificates".toString())
     androidTest.assets.srcDirs += files("$projectDir/src/androidTest/schemas".toString())
     androidTest.assets.srcDirs += files("$projectDir/src/androidTest/certificates".toString())
+
+    def rnVersion = getRNVersion()
+    if (rnVersion >= versionToNumber(0, 75, 0)) {
+      main.java.srcDirs += "src/react-native-75/main"
+    } else {
+      main.java.srcDirs += "src/react-native-74/main"
+    }
   }
 }
 
@@ -118,3 +125,28 @@ dependencies {
 
   implementation "org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion()}"
 }
+
+def versionToNumber(major, minor, patch) {
+  return patch * 100 + minor * 10000 + major * 1000000
+}
+
+def getNodeModulesPackageVersion(packageName, overridePropName) {
+  def nodeModulesVersion = providers.exec {
+    workingDir(projectDir)
+    commandLine("node", "-e", "console.log(require('$packageName/package.json').version);")
+  }.standardOutput.asText.get().trim()
+  def version = safeExtGet(overridePropName, nodeModulesVersion)
+
+  def coreVersion = version.split("-")[0]
+  def (major, minor, patch) = coreVersion.tokenize('.').collect { it.toInteger() }
+
+  return versionToNumber(
+    major,
+    minor,
+    patch
+  )
+}
+
+def getRNVersion() {
+  return getNodeModulesPackageVersion("react-native", "reactNativeVersion")
+}

package/android/src/react-native-75/main/expo/modules/updates/errorrecovery/ErrorRecovery.kt

@@ -0,0 +1,172 @@
+package expo.modules.updates.errorrecovery
+
+import android.content.Context
+import android.os.Handler
+import android.os.HandlerThread
+import android.util.Log
+import com.facebook.react.bridge.DefaultJSExceptionHandler
+import com.facebook.react.bridge.ReactMarker
+import com.facebook.react.bridge.ReactMarker.MarkerListener
+import com.facebook.react.bridge.ReactMarkerConstants
+import com.facebook.react.config.ReactFeatureFlags
+import com.facebook.react.devsupport.ReleaseDevSupportManager
+import com.facebook.react.devsupport.interfaces.DevSupportManager
+import expo.modules.updates.logging.UpdatesErrorCode
+import expo.modules.updates.logging.UpdatesLogger
+import java.lang.ref.WeakReference
+
+/**
+ * Entry point for the error recovery flow. Responsible for initializing the error recovery handler
+ * and handler thread, and for registering (and unregistering) listeners to lifecycle events so that
+ * the appropriate error recovery flows will be triggered.
+ *
+ * The error recovery flow is intended to be lightweight and is *not* a full safety net whose
+ * purpose is to avoid crashes at all costs. Rather, its primary purpose is to prevent bad updates
+ * from "bricking" an app by causing crashes before there is ever a chance to download a fix.
+ *
+ * Notably, the error listener will be unregistered 10 seconds after content has appeared; we assume
+ * that by this point, expo-updates has had enough time to download a new update if there is one,
+ * and so there is no more need to trigger the error recovery pipeline.
+ */
+class ErrorRecovery(
+  private val context: Context
+) {
+  internal val handlerThread = HandlerThread("expo-updates-error-recovery")
+  internal lateinit var handler: Handler
+  internal val logger = UpdatesLogger(context)
+
+  private var weakDevSupportManager: WeakReference<DevSupportManager>? = null
+  private var previousExceptionHandler: DefaultJSExceptionHandler? = null
+  private var shouldHandleReactInstanceException = false
+
+  fun initialize(delegate: ErrorRecoveryDelegate) {
+    if (!::handler.isInitialized) {
+      handlerThread.start()
+      handler = ErrorRecoveryHandler(handlerThread.looper, delegate, logger)
+    }
+  }
+
+  fun startMonitoring(devSupportManager: DevSupportManager) {
+    registerContentAppearedListener()
+    registerErrorHandler(devSupportManager)
+  }
+
+  /**
+   * Exception notifications sending from [expo.modules.core.interfaces.ReactNativeHostHandler]
+   * This is only used for bridgeless mode.
+   */
+  internal fun onReactInstanceException(exception: Exception) {
+    if (shouldHandleReactInstanceException) {
+      handleException(exception)
+    }
+  }
+
+  fun notifyNewRemoteLoadStatus(newStatus: ErrorRecoveryDelegate.RemoteLoadStatus) {
+    logger.info("ErrorRecovery: remote load status changed: $newStatus")
+    handler.sendMessage(handler.obtainMessage(ErrorRecoveryHandler.MessageType.REMOTE_LOAD_STATUS_CHANGED, newStatus))
+  }
+
+  internal fun handleException(exception: Exception) {
+    logger.error("ErrorRecovery: exception encountered: ${exception.localizedMessage}", UpdatesErrorCode.Unknown, exception)
+    handler.sendMessage(handler.obtainMessage(ErrorRecoveryHandler.MessageType.EXCEPTION_ENCOUNTERED, exception))
+  }
+
+  internal fun handleContentAppeared() {
+    handler.sendMessage(handler.obtainMessage(ErrorRecoveryHandler.MessageType.CONTENT_APPEARED))
+
+    unregisterContentAppearedListener()
+
+    // wait 10s before unsetting error handlers; even though we won't try to relaunch if our
+    // handlers are triggered after now, we still want to give the app a reasonable window of time
+    // to start the WAIT_FOR_REMOTE_UPDATE task and check for a new update is there is one
+    //
+    // it's safe to use the handler thread for this since nothing else
+    // touches this class's fields
+    handler.postDelayed({ unregisterErrorHandler() }, 10000)
+  }
+
+  private val contentAppearedListener = MarkerListener { name, _, _ ->
+    if (name == ReactMarkerConstants.CONTENT_APPEARED) {
+      handleContentAppeared()
+    }
+  }
+
+  private fun registerContentAppearedListener() {
+    ReactMarker.addListener(contentAppearedListener)
+  }
+
+  private fun unregisterContentAppearedListener() {
+    ReactMarker.removeListener(contentAppearedListener)
+  }
+
+  private fun registerErrorHandler(devSupportManager: DevSupportManager) {
+    if (ReactFeatureFlags.enableBridgelessArchitecture) {
+      registerErrorHandlerImplBridgeless(devSupportManager)
+    } else {
+      registerErrorHandlerImplBridge(devSupportManager)
+    }
+  }
+
+  private fun registerErrorHandlerImplBridgeless(devSupportManager: DevSupportManager) {
+    shouldHandleReactInstanceException = true
+  }
+
+  private fun registerErrorHandlerImplBridge(devSupportManager: DevSupportManager) {
+    if (devSupportManager !is ReleaseDevSupportManager) {
+      Log.d(TAG, "Unexpected type of ReactInstanceManager.DevSupportManager. expo-updates error recovery will not behave properly.")
+      return
+    }
+
+    val defaultJSExceptionHandler = object : DefaultJSExceptionHandler() {
+      override fun handleException(e: Exception) {
+        this@ErrorRecovery.handleException(e)
+      }
+    }
+    val devSupportManagerClass = devSupportManager.javaClass
+    previousExceptionHandler = devSupportManagerClass.getDeclaredField("mDefaultJSExceptionHandler").let { field ->
+      field.isAccessible = true
+      val previousValue = field[devSupportManager]
+      field[devSupportManager] = defaultJSExceptionHandler
+      return@let previousValue as DefaultJSExceptionHandler
+    }
+    weakDevSupportManager = WeakReference(devSupportManager)
+  }
+
+  private fun unregisterErrorHandler() {
+    if (ReactFeatureFlags.enableBridgelessArchitecture) {
+      unregisterErrorHandlerImplBridgeless()
+    } else {
+      unregisterErrorHandlerImplBridge()
+    }
+  }
+
+  private fun unregisterErrorHandlerImplBridgeless() {
+    shouldHandleReactInstanceException = false
+  }
+
+  private fun unregisterErrorHandlerImplBridge() {
+    weakDevSupportManager?.get()?.let { devSupportManager ->
+      if (devSupportManager !is ReleaseDevSupportManager) {
+        Log.d(TAG, "Unexpected type of ReactInstanceManager.DevSupportManager. expo-updates could not unregister its error handler")
+        return
+      }
+      if (previousExceptionHandler == null) {
+        return
+      }
+
+      val devSupportManagerClass = devSupportManager.javaClass
+      devSupportManagerClass.getDeclaredField("mDefaultJSExceptionHandler").let { field ->
+        field.isAccessible = true
+        field[devSupportManager] = previousExceptionHandler
+      }
+      weakDevSupportManager = null
+    }
+    // quitSafely will wait for processing messages to finish but cancel all messages scheduled for
+    // a future time, so delay for a few more seconds in case there are any scheduled messages
+    handler.postDelayed({ handlerThread.quitSafely() }, 10000)
+  }
+
+  companion object {
+    private val TAG = ErrorRecovery::class.java.simpleName
+  }
+}

package/fingerprint.d.ts

@@ -0,0 +1 @@
+export * from '@expo/fingerprint';

package/fingerprint.js

@@ -0,0 +1 @@
+module.exports = require('@expo/fingerprint');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-updates",
-  "version": "0.25.21",
+  "version": "0.25.23",
   "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": "7254cc3de7d97ccaf7e9c0864188cb233ba919e5"
+  "gitHead": "a9cfcf600ccaf5122932629472eb3bb2adb941fe"
 }