expo-modules-core 2.0.0-preview.1 → 2.0.0-preview.3

package/CHANGELOG.md

@@ -10,6 +10,21 @@
 
 ### 💡 Others
 
+## 2.0.0-preview.3 — 2024-10-24
+
+_This version does not introduce any user-facing changes._
+
+## 2.0.0-preview.2 — 2024-10-24
+
+### 🐛 Bug fixes
+
+- [iOS] Fix optionals conversion. ([#32239](https://github.com/expo/expo/pull/32239) by [@aleqsio](https://github.com/aleqsio))
+- Fixed retain cycle for `ExpoRequestCdpInterceptor`. ([#32289](https://github.com/expo/expo/pull/32289) by [@kudo](https://github.com/kudo))
+
+### 💡 Others
+
+- [android] Add enum event support to OnStartObserving and OnStopObserving. ([#32251](https://github.com/expo/expo/pull/32251), [#32287](https://github.com/expo/expo/pull/32287) by [@wschurman](https://github.com/wschurman))
+
 ## 2.0.0-preview.1 — 2024-10-22
 
 ### 🐛 Bug fixes
@@ -56,6 +71,7 @@
 
 ### 🐛 Bug fixes
 
+- [Android] Fixed `RNHeadlessAppLoader` class for New Architecture support. ([#32146](https://github.com/expo/expo/pull/32146) by [@chrfalch](https://github.com/chrfalch))
 - [iOS] Fix using enums as optional arguments. ([#32147](https://github.com/expo/expo/pull/32147) by [@aleqsio](https://github.com/aleqsio))
 - [Android] Change JS return type for kotlin `null` to be `null` instead of `undefined`. ([#31301](https://github.com/expo/expo/pull/31301) by [@aleqsio](https://github.com/aleqsio))
 - [iOS] Swift `Enumerable`s did not correctly convert to JS values. ([#30191](https://github.com/expo/expo/pull/30191) by [@vonovak](https://github.com/vonovak))

package/android/build.gradle

@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '2.0.0-preview.1'
+version = '2.0.0-preview.3'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -67,7 +67,7 @@ android {
   defaultConfig {
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "2.0.0-preview.1"
+    versionName "2.0.0-preview.3"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"

package/android/src/main/java/expo/modules/adapters/react/apploader/RNHeadlessAppLoader.kt

@@ -1,16 +1,18 @@
 package expo.modules.adapters.react.apploader
 
+import android.annotation.SuppressLint
 import android.content.Context
 import com.facebook.react.ReactApplication
 import com.facebook.react.ReactInstanceEventListener
 import com.facebook.react.ReactInstanceManager
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.common.LifecycleState
+import expo.modules.BuildConfig
 import expo.modules.apploader.HeadlessAppLoader
 import expo.modules.core.interfaces.Consumer
 import expo.modules.core.interfaces.DoNotStrip
 
-private val appRecords: MutableMap<String, ReactInstanceManager> = mutableMapOf()
+private val appRecords: MutableMap<String, ReactContext> = mutableMapOf()
 
 class RNHeadlessAppLoader @DoNotStrip constructor(private val context: Context) : HeadlessAppLoader {
 
@@ -22,16 +24,35 @@ class RNHeadlessAppLoader @DoNotStrip constructor(private val context: Context)
     }
 
     if (context.applicationContext is ReactApplication) {
-      val reactInstanceManager = (context.applicationContext as ReactApplication).reactNativeHost.reactInstanceManager
       if (!appRecords.containsKey(params.appScopeKey)) {
-        reactInstanceManager.addReactInstanceEventListener(object : ReactInstanceEventListener {
-          override fun onReactContextInitialized(context: ReactContext) {
-            HeadlessAppLoaderNotifier.notifyAppLoaded(params.appScopeKey)
-            callback?.apply(true)
-          }
-        })
-        appRecords[params.appScopeKey] = reactInstanceManager
-        if (!reactInstanceManager.hasStartedCreatingInitialContext()) {
+        // In old arch reactHost will be null
+        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+          // New architecture
+          val reactHost = (context as ReactApplication).reactHost ?: throw IllegalStateException("Your application does not have a valid reactHost")
+          reactHost.addReactInstanceEventListener(
+            object : ReactInstanceEventListener {
+              override fun onReactContextInitialized(context: ReactContext) {
+                reactHost.removeReactInstanceEventListener(this)
+                HeadlessAppLoaderNotifier.notifyAppLoaded(params.appScopeKey)
+                appRecords[params.appScopeKey] = context
+                callback?.apply(true)
+              }
+            }
+          )
+          reactHost.start()
+        } else {
+          // Old architecture
+          val reactInstanceManager = (context as ReactApplication).reactNativeHost.reactInstanceManager
+          reactInstanceManager.addReactInstanceEventListener(
+            object : ReactInstanceEventListener {
+              override fun onReactContextInitialized(context: ReactContext) {
+                HeadlessAppLoaderNotifier.notifyAppLoaded(params.appScopeKey)
+                reactInstanceManager.removeReactInstanceEventListener(this)
+                appRecords[params.appScopeKey] = context
+                callback?.apply(true)
+              }
+            }
+          )
           reactInstanceManager.createReactContextInBackground()
         }
       } else {
@@ -42,18 +63,34 @@ class RNHeadlessAppLoader @DoNotStrip constructor(private val context: Context)
     }
   }
 
+  @SuppressLint("VisibleForTests")
   override fun invalidateApp(appScopeKey: String?): Boolean {
     return if (appRecords.containsKey(appScopeKey) && appRecords[appScopeKey] != null) {
-      val appRecord: ReactInstanceManager = appRecords[appScopeKey]!!
-      android.os.Handler(context.mainLooper).post {
-        // Only destroy the `ReactInstanceManager` if it does not bind with an Activity.
-        // And The Activity would take over the ownership of `ReactInstanceManager`.
-        // This case happens when a user clicks a background task triggered notification immediately.
-        if (appRecord.lifecycleState == LifecycleState.BEFORE_CREATE) {
-          appRecord.destroy()
+      val reactContext = appRecords[appScopeKey] ?: return false
+      if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+        // New architecture
+        val reactHost = (reactContext.baseContext as ReactApplication).reactHost ?: throw IllegalStateException("Your application does not have a valid reactHost")
+        android.os.Handler(reactContext.mainLooper).post {
+          reactHost.destroy("Closing headless task app", null)
+          HeadlessAppLoaderNotifier.notifyAppDestroyed(appScopeKey)
+          appRecords.remove(appScopeKey)
+        }
+      } else {
+        // Old architecture
+        val reactNativeHost = (reactContext as ReactApplication).reactNativeHost
+        if (reactNativeHost.hasInstance()) {
+          val reactInstanceManager: ReactInstanceManager = reactNativeHost.reactInstanceManager
+          android.os.Handler(reactContext.mainLooper).post {
+            // Only destroy the `ReactInstanceManager` if it does not bind with an Activity.
+            // And The Activity would take over the ownership of `ReactInstanceManager`.
+            // This case happens when a user clicks a background task triggered notification immediately.
+            if (reactInstanceManager.lifecycleState == LifecycleState.BEFORE_CREATE) {
+              reactInstanceManager.destroy()
+            }
+            HeadlessAppLoaderNotifier.notifyAppDestroyed(appScopeKey)
+            appRecords.remove(appScopeKey)
+          }
         }
-        HeadlessAppLoaderNotifier.notifyAppDestroyed(appScopeKey)
-        appRecords.remove(appScopeKey)
       }
       true
     } else {
@@ -61,8 +98,18 @@ class RNHeadlessAppLoader @DoNotStrip constructor(private val context: Context)
     }
   }
 
-  override fun isRunning(appScopeKey: String?): Boolean =
-    appRecords.contains(appScopeKey) && appRecords[appScopeKey]!!.hasStartedCreatingInitialContext()
+  override fun isRunning(appScopeKey: String?): Boolean {
+    val reactContext = appRecords[appScopeKey] ?: return false
+    if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+      // New architecture - We can return true since the fact that we have a reactContext
+      // means that we've already called start on the reactHost
+      return true
+    } else {
+      // Old architecture
+      val reactNativeHost = (reactContext.baseContext as ReactApplication).reactNativeHost
+      return reactNativeHost.reactInstanceManager.hasStartedCreatingInitialContext()
+    }
+  }
 
   //endregion HeadlessAppLoader
 }

package/android/src/main/java/expo/modules/kotlin/devtools/ExpoRequestCdpInterceptor.kt

@@ -14,6 +14,7 @@ import kotlinx.coroutines.launch
 import okhttp3.Request
 import okhttp3.Response
 import okhttp3.ResponseBody
+import java.lang.ref.WeakReference
 import java.math.BigDecimal
 import java.math.RoundingMode
 
@@ -22,18 +23,18 @@ import java.math.RoundingMode
  * dispatch CDP (Chrome DevTools Protocol: https://chromedevtools.github.io/devtools-protocol/) events.
  */
 object ExpoRequestCdpInterceptor : ExpoNetworkInspectOkHttpInterceptorsDelegate {
-  private var delegate: Delegate? = null
+  private var delegate: WeakReference<Delegate?> = WeakReference(null)
   internal var coroutineScope = CoroutineScope(Dispatchers.Default)
 
   fun setDelegate(delegate: Delegate?) {
     coroutineScope.launch {
-      this@ExpoRequestCdpInterceptor.delegate = delegate
+      this@ExpoRequestCdpInterceptor.delegate = WeakReference(delegate)
     }
   }
 
   private fun dispatchEvent(event: Event) {
     coroutineScope.launch {
-      this@ExpoRequestCdpInterceptor.delegate?.dispatch(event.toJson())
+      this@ExpoRequestCdpInterceptor.delegate.get()?.dispatch(event.toJson())
     }
   }
 

package/android/src/main/java/expo/modules/kotlin/modules/Module.kt

@@ -7,9 +7,6 @@ import expo.modules.kotlin.providers.AppContextProvider
 import expo.modules.kotlin.tracing.trace
 import expo.modules.kotlin.types.Enumerable
 import kotlinx.coroutines.CoroutineScope
-import kotlin.reflect.KProperty1
-import kotlin.reflect.full.declaredMemberProperties
-import kotlin.reflect.full.primaryConstructor
 
 abstract class Module : AppContextProvider {
 
@@ -54,25 +51,6 @@ abstract class Module : AppContextProvider {
   }
 
   abstract fun definition(): ModuleDefinitionData
-
-  private fun <T> convertEnumToString(enumValue: T): String where T : Enumerable, T : Enum<T> {
-    val enumClass = enumValue::class
-    val primaryConstructor = enumClass.primaryConstructor
-    if (primaryConstructor?.parameters?.size == 1) {
-      val parameterName = primaryConstructor.parameters.first().name
-      val parameterProperty = enumClass
-        .declaredMemberProperties
-        .find { it.name == parameterName }
-
-      requireNotNull(parameterProperty) { "Cannot find a property for $parameterName parameter" }
-      require(parameterProperty.returnType.classifier == String::class) { "The enum parameter has to be a string." }
-
-      @Suppress("UNCHECKED_CAST")
-      return (parameterProperty as KProperty1<T, String>).get(enumValue)
-    }
-
-    return enumValue.name
-  }
 }
 
 @Suppress("FunctionName")

package/android/src/main/java/expo/modules/kotlin/modules/ModuleUtils.kt

@@ -0,0 +1,25 @@
+package expo.modules.kotlin.modules
+
+import expo.modules.kotlin.types.Enumerable
+import kotlin.reflect.KProperty1
+import kotlin.reflect.full.declaredMemberProperties
+import kotlin.reflect.full.primaryConstructor
+
+internal fun <T> convertEnumToString(enumValue: T): String where T : Enumerable, T : Enum<T> {
+  val enumClass = enumValue::class
+  val primaryConstructor = enumClass.primaryConstructor
+  if (primaryConstructor?.parameters?.size == 1) {
+    val parameterName = primaryConstructor.parameters.first().name
+    val parameterProperty = enumClass
+      .declaredMemberProperties
+      .find { it.name == parameterName }
+
+    requireNotNull(parameterProperty) { "Cannot find a property for $parameterName parameter" }
+    require(parameterProperty.returnType.classifier == String::class) { "The enum parameter has to be a string." }
+
+    @Suppress("UNCHECKED_CAST")
+    return (parameterProperty as KProperty1<T, String>).get(enumValue)
+  }
+
+  return enumValue.name
+}

package/android/src/main/java/expo/modules/kotlin/objects/ObjectDefinitionBuilder.kt

@@ -18,6 +18,7 @@ import expo.modules.kotlin.jni.JavaScriptModuleObject
 import expo.modules.kotlin.jni.decorators.JSDecoratorsBridgingObject
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinitionBuilder
+import expo.modules.kotlin.modules.convertEnumToString
 import expo.modules.kotlin.types.Enumerable
 import expo.modules.kotlin.types.enforceType
 import expo.modules.kotlin.types.toArgsArray
@@ -473,6 +474,13 @@ open class ObjectDefinitionBuilder {
     }
   }
 
+  /**
+   * Creates module's lifecycle listener that is called right after the first event listener is added for given event.
+   */
+  fun <T> OnStartObserving(enum: T, body: () -> Unit) where T : Enumerable, T : Enum<T> {
+    OnStartObserving(convertEnumToString(enum), body)
+  }
+
   /**
    * Creates module's lifecycle listener that is called right after the first event listener is added.
    */
@@ -499,6 +507,13 @@ open class ObjectDefinitionBuilder {
     }
   }
 
+  /**
+   * Creates module's lifecycle listener that is called right after all event listeners are removed for given event.
+   */
+  fun <T> OnStopObserving(enum: T, body: () -> Unit) where T : Enumerable, T : Enum<T> {
+    OnStopObserving(convertEnumToString(enum), body)
+  }
+
   /**
    * Creates module's lifecycle listener that is called right after all event listeners are removed.
    */

package/ios/Core/DynamicTypes/DynamicOptionalType.swift

@@ -25,7 +25,7 @@ internal struct DynamicOptionalType: AnyDynamicType {
     if jsValue.isUndefined() || jsValue.isNull() {
       return Optional<Any>.none as Any
     }
-    return try appContext.converter.toNative(jsValue, wrappedType)
+    return try wrappedType.cast(jsValue: jsValue, appContext: appContext)
   }
 
   func cast<ValueType>(_ value: ValueType, appContext: AppContext) throws -> Any {

package/ios/Core/SharedObjects/SharedRef.swift

@@ -10,7 +10,7 @@ public protocol AnySharedRef {
  to native instances among different independent libraries.
  */
 open class SharedRef<RefType>: SharedObject, AnySharedRef {
-  public let ref: RefType
+  public var ref: RefType
 
   open var nativeRefType: String {
     "unknown"

package/ios/DevTools/ExpoRequestCdpInterceptor.swift

@@ -8,7 +8,7 @@ import Foundation
  */
 @objc(EXRequestCdpInterceptor)
 public final class ExpoRequestCdpInterceptor: NSObject, ExpoRequestInterceptorProtocolDelegate {
-  private var delegate: ExpoRequestCdpInterceptorDelegate?
+  private weak var delegate: ExpoRequestCdpInterceptorDelegate?
   public var dispatchQueue = DispatchQueue(label: "expo.requestCdpInterceptor")
 
   override private init() {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "2.0.0-preview.1",
+  "version": "2.0.0-preview.3",
   "description": "The core of Expo Modules architecture",
   "main": "src/index.ts",
   "types": "build/index.d.ts",
@@ -44,5 +44,5 @@
     "@testing-library/react-native": "^12.5.2",
     "expo-module-scripts": "^4.0.0"
   },
-  "gitHead": "f7adac0a6b82ab484a8254a68c3808ba6f2afde5"
+  "gitHead": "2e4f18d41da033c5ced0a4a045d91cf5250016b7"
 }