expo-modules-core 1.5.11 → 1.5.13

package/CHANGELOG.md

@@ -10,6 +10,21 @@
 
 ### 💡 Others
 
+## 1.5.13 — 2024-01-10
+
+### 🐛 Bug fixes
+
+- Fixed random `NullPointerExceptions` when calling `Updates.reloadAsync` on Android. ([#24442](https://github.com/expo/expo/pull/24442) by [@lukmccall](https://github.com/lukmccall))
+
+## 1.5.12 — 2023-11-17
+
+### 🐛 Bug fixes
+
+- [Android] Improve boot time on low-end devices. ([#25267](https://github.com/expo/expo/pull/25267) by [@lukmccall](https://github.com/lukmccall))
+- [Android] Improve performance of enum and map converters. ([#25272](https://github.com/expo/expo/pull/25272) by [@lukmccall](https://github.com/lukmccall))
+- [Android] Improve logic responsible for obtaining converters that slow down the startup time. ([#25273](https://github.com/expo/expo/pull/25273) by [@lukmccall](https://github.com/lukmccall))
+- [Android] Improving the creation process of views for better performance. ([#25274](https://github.com/expo/expo/pull/25274) by [@lukmccall](https://github.com/lukmccall))
+
 ## 1.5.11 — 2023-08-29
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'maven-publish'
 apply plugin: "de.undercouch.download"
 
 group = 'host.exp.exponent'
-version = '1.5.11'
+version = '1.5.13'
 
 buildscript {
   def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
@@ -160,7 +160,7 @@ android {
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "1.5.11"
+    versionName "1.5.13"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"

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

@@ -1,5 +1,6 @@
 package expo.modules.kotlin
 
+import android.view.View
 import expo.modules.kotlin.events.EventName
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.tracing.trace
@@ -7,9 +8,7 @@ import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.launch
 import java.lang.ref.WeakReference
-import kotlin.reflect.full.declaredMemberProperties
 
 class ModuleRegistry(
   private val appContext: WeakReference<AppContext>
@@ -33,18 +32,6 @@ class ModuleRegistry(
     holder.apply {
       post(EventName.MODULE_CREATE)
       registerContracts()
-
-      // The initial invocation of `declaredMemberProperties` appears to be slow,
-      // as Kotlin must deserialize metadata internally.
-      // This is a known issue that may be resolved by the new K2 compiler in the future.
-      // However, until then, we must find a way to address this problem.
-      // Therefore, we have decided to dispatch a lambda
-      // that invokes `declaredMemberProperties` during module creation.
-      viewClass()?.let { viewType ->
-        appContext.get()?.backgroundCoroutineScope?.launch {
-          viewType.declaredMemberProperties
-        }
-      }
     }
 
     registry[holder.name] = holder
@@ -70,6 +57,16 @@ class ModuleRegistry(
   fun getModuleHolder(module: Module): ModuleHolder? =
     registry.values.find { it.module === module }
 
+  fun <T : View> getModuleHolder(viewClass: Class<T>): ModuleHolder? {
+    return registry.firstNotNullOfOrNull { (_, holder) ->
+      if (holder.definition.viewManagerDefinition?.viewType == viewClass) {
+        holder
+      } else {
+        null
+      }
+    }
+  }
+
   fun post(eventName: EventName) {
     forEach {
       it.post(eventName)

package/android/src/main/java/expo/modules/kotlin/jni/JavaCallback.kt

@@ -5,24 +5,36 @@ import com.facebook.react.bridge.WritableNativeArray
 import com.facebook.react.bridge.WritableNativeMap
 import expo.modules.core.interfaces.DoNotStrip
 import expo.modules.kotlin.exception.UnexpectedException
+import expo.modules.kotlin.logger
 
 @Suppress("KotlinJniMissingFunction")
 @DoNotStrip
 class JavaCallback @DoNotStrip internal constructor(@DoNotStrip private val mHybridData: HybridData) : Destructible {
   operator fun invoke(result: Any?) {
-    if (result == null) {
-      invoke()
-      return
-    }
-    when (result) {
-      is Int -> invoke(result)
-      is Boolean -> invoke(result)
-      is Double -> invoke(result)
-      is Float -> invoke(result)
-      is String -> invoke(result)
-      is WritableNativeArray -> invoke(result)
-      is WritableNativeMap -> invoke(result)
-      else -> throw UnexpectedException("Unknown type: ${result.javaClass}")
+    try {
+
+      if (result == null) {
+        invoke()
+        return
+      }
+      when (result) {
+        is Int -> invoke(result)
+        is Boolean -> invoke(result)
+        is Double -> invoke(result)
+        is Float -> invoke(result)
+        is String -> invoke(result)
+        is WritableNativeArray -> invoke(result)
+        is WritableNativeMap -> invoke(result)
+        else -> throw UnexpectedException("Unknown type: ${result.javaClass}")
+      }
+    } catch (e: Throwable) {
+      if (!mHybridData.isValid) {
+        // We know that this particular JavaCallback was invalidated, so it shouldn't be invoked.
+        // To prevent crashes, we decided to suppress the error here.
+        logger.error("Invalidated JavaCallback was invoked", e)
+        return
+      }
+      throw e
     }
   }
 

package/android/src/main/java/expo/modules/kotlin/types/EnumTypeConverter.kt

@@ -8,8 +8,6 @@ import expo.modules.kotlin.logger
 import expo.modules.kotlin.toKType
 import kotlin.reflect.KClass
 import kotlin.reflect.full.createType
-import kotlin.reflect.full.declaredMemberProperties
-import kotlin.reflect.full.isSubclassOf
 import kotlin.reflect.full.primaryConstructor
 
 class EnumTypeConverter(
@@ -29,7 +27,7 @@ class EnumTypeConverter(
   }
 
   init {
-    if (!enumClass.isSubclassOf(Enumerable::class)) {
+    if (Enumerable::class.java.isAssignableFrom(enumClass.java)) {
       logger.warn("Enum '$enumClass' should inherit from ${Enumerable::class}.")
     }
   }
@@ -87,22 +85,20 @@ class EnumTypeConverter(
     enumConstants: Array<out Enum<*>>,
     parameterName: String
   ): Enum<*> {
-    // To obtain the value of parameter, we have to find a property that is connected with this parameter.
-    @Suppress("UNCHECKED_CAST")
-    val parameterProperty = enumClass
-      .declaredMemberProperties
-      .find { it.name == parameterName }
-    requireNotNull(parameterProperty) { "Cannot find a property for $parameterName parameter" }
+    val filed = enumClass.java.getDeclaredField(parameterName)
+    requireNotNull(filed) { "Cannot find a property for $parameterName parameter" }
 
-    val parameterType = parameterProperty.returnType.classifier
+    filed.isAccessible = true
+
+    val parameterType = filed.type
     val jsUnwrapValue = if (jsValue is Dynamic) {
-      if (parameterType == String::class) {
+      if (parameterType == String::class.java) {
         jsValue.asString()
       } else {
         jsValue.asInt()
       }
     } else {
-      if (parameterType == String::class) {
+      if (parameterType == String::class.java) {
         jsValue as String
       } else {
         if (jsValue is Double) {
@@ -115,7 +111,7 @@ class EnumTypeConverter(
 
     return requireNotNull(
       enumConstants.find {
-        parameterProperty.get(it) == jsUnwrapValue
+        filed.get(it) == jsUnwrapValue
       }
     ) { "Couldn't convert '$jsValue' to ${enumClass.simpleName} where $parameterName is the enum parameter" }
   }

package/android/src/main/java/expo/modules/kotlin/types/MapTypeConverter.kt

@@ -10,14 +10,13 @@ import expo.modules.kotlin.exception.exceptionDecorator
 import expo.modules.kotlin.jni.ExpectedType
 import expo.modules.kotlin.recycle
 import kotlin.reflect.KType
-import kotlin.reflect.typeOf
 
 class MapTypeConverter(
   converterProvider: TypeConverterProvider,
   private val mapType: KType
 ) : DynamicAwareTypeConverters<Map<*, *>>(mapType.isMarkedNullable) {
   init {
-    require(mapType.arguments.first().type == typeOf<String>()) {
+    require(mapType.arguments.first().type?.classifier == String::class) {
       "The map key type should be String, but received ${mapType.arguments.first()}."
     }
   }

package/android/src/main/java/expo/modules/kotlin/types/TypeConverterProvider.kt

@@ -44,7 +44,6 @@ import java.net.URL
 import java.nio.file.Path
 import kotlin.reflect.KClass
 import kotlin.reflect.KType
-import kotlin.reflect.full.isSubclassOf
 import kotlin.reflect.typeOf
 
 interface TypeConverterProvider {
@@ -92,28 +91,25 @@ object TypeConverterProviderImpl : TypeConverterProvider {
     }
 
     val kClass = type.classifier as? KClass<*> ?: throw MissingTypeConverter(type)
+    val jClass = kClass.java
 
-    if (kClass.java.isArray) {
+    if (jClass.isArray || Array::class.java.isAssignableFrom(jClass)) {
       return ArrayTypeConverter(this, type)
     }
 
-    if (kClass.isSubclassOf(List::class)) {
+    if (List::class.java.isAssignableFrom(jClass)) {
       return ListTypeConverter(this, type)
     }
 
-    if (kClass.isSubclassOf(Map::class)) {
+    if (Map::class.java.isAssignableFrom(jClass)) {
       return MapTypeConverter(this, type)
     }
 
-    if (kClass.isSubclassOf(Pair::class)) {
+    if (Pair::class.java.isAssignableFrom(jClass)) {
       return PairTypeConverter(this, type)
     }
 
-    if (kClass.isSubclassOf(Array::class)) {
-      return ArrayTypeConverter(this, type)
-    }
-
-    if (kClass.java.isEnum) {
+    if (jClass.isEnum) {
       @Suppress("UNCHECKED_CAST")
       return EnumTypeConverter(kClass as KClass<Enum<*>>, type.isMarkedNullable)
     }
@@ -123,36 +119,36 @@ object TypeConverterProviderImpl : TypeConverterProvider {
       return cachedConverter
     }
 
-    if (kClass.isSubclassOf(Record::class)) {
+    if (Record::class.java.isAssignableFrom(jClass)) {
       val converter = RecordTypeConverter<Record>(this, type)
       cachedRecordConverters[kClass] = converter
       return converter
     }
 
-    if (kClass.isSubclassOf(View::class)) {
+    if (View::class.java.isAssignableFrom(jClass)) {
       return ViewTypeConverter<View>(type)
     }
 
-    if (kClass.isSubclassOf(SharedObject::class)) {
+    if (SharedObject::class.java.isAssignableFrom(jClass)) {
       return SharedObjectTypeConverter<SharedObject>(type)
     }
 
-    if (kClass.isSubclassOf(JavaScriptFunction::class)) {
+    if (JavaScriptFunction::class.java.isAssignableFrom(jClass)) {
       return JavaScriptFunctionTypeConverter<Any>(type)
     }
 
-    return handelEither(type, kClass)
+    return handelEither(type, jClass)
       ?: handelCustomConverter(type, kClass)
       ?: throw MissingTypeConverter(type)
   }
 
   @OptIn(EitherType::class)
-  private fun handelEither(type: KType, kClass: KClass<*>): TypeConverter<*>? {
-    if (kClass.isSubclassOf(Either::class)) {
-      if (kClass.isSubclassOf(EitherOfFour::class)) {
+  private fun handelEither(type: KType, jClass: Class<*>): TypeConverter<*>? {
+    if (Either::class.java.isAssignableFrom(jClass)) {
+      if (EitherOfFour::class.java.isAssignableFrom(jClass)) {
         return EitherOfFourTypeConverter<Any, Any, Any, Any>(this, type)
       }
-      if (kClass.isSubclassOf(EitherOfThree::class)) {
+      if (EitherOfThree::class.java.isAssignableFrom(jClass)) {
         return EitherOfThreeTypeConverter<Any, Any, Any>(this, type)
       }
       return EitherTypeConverter<Any, Any>(this, type)

package/android/src/main/java/expo/modules/kotlin/viewevent/ViewEvent.kt

@@ -4,22 +4,21 @@ import android.view.View
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.WritableMap
 import expo.modules.adapters.react.NativeModulesProxy
-import expo.modules.kotlin.modules.Module
+import expo.modules.core.utilities.ifNull
+import expo.modules.kotlin.logger
 import expo.modules.kotlin.types.JSTypeConverter
 import expo.modules.kotlin.types.putGeneric
-import kotlin.reflect.KType
 
 fun interface ViewEventCallback<T> {
   operator fun invoke(arg: T)
 }
 
-class ViewEvent<T>(
+open class ViewEvent<T>(
   private val name: String,
-  private val type: KType,
   private val view: View,
   private val coalescingKey: CoalescingKey<T>?
 ) : ViewEventCallback<T> {
-  internal lateinit var module: Module
+  private var isValidated = false
 
   override operator fun invoke(arg: T) {
     val reactContext = view.context as ReactContext
@@ -29,6 +28,24 @@ class ViewEvent<T>(
       ?: return
     val appContext = nativeModulesProxy.kotlinInteropModuleRegistry.appContext
 
+    if (!isValidated) {
+      val holder = appContext.registry.getModuleHolder(view::class.java).ifNull {
+        logger.warn("⚠️ Cannot get module holder for ${view::class.java}")
+        return
+      }
+      val callbacks = holder.definition.viewManagerDefinition?.callbacksDefinition.ifNull {
+        logger.warn("⚠️ Cannot get callbacks for ${holder.module::class.java}")
+        return
+      }
+
+      if (!callbacks.names.any { it == name }) {
+        logger.warn("⚠️ Event $name wasn't exported from ${holder.module::class.java}")
+        return
+      }
+
+      isValidated = true
+    }
+
     appContext
       .callbackInvoker
       ?.emit(

package/android/src/main/java/expo/modules/kotlin/viewevent/ViewEventDelegate.kt

@@ -5,27 +5,19 @@ package expo.modules.kotlin.viewevent
 import android.view.View
 import java.lang.ref.WeakReference
 import kotlin.reflect.KProperty
-import kotlin.reflect.KType
-import kotlin.reflect.typeOf
 
 typealias CoalescingKey<T> = (event: T) -> Short
 
 class ViewEventDelegate<T>(
-  private val type: KType,
   view: View,
   private val coalescingKey: CoalescingKey<T>?
 ) {
   private val viewHolder = WeakReference(view)
-  internal var isValidated = false
 
   operator fun getValue(thisRef: View, property: KProperty<*>): ViewEventCallback<T> {
-    if (!isValidated) {
-      throw IllegalStateException("You have to export '${property.name}' property as a event in the `View` component")
-    }
-
     val view = viewHolder.get()
       ?: throw IllegalStateException("Can't send the '${property.name}' event from the view that is deallocated")
-    return ViewEvent(property.name, type, view, coalescingKey)
+    return ViewEvent(property.name, view, coalescingKey)
   }
 }
 
@@ -36,11 +28,11 @@ class ViewEventDelegate<T>(
  */
 @Suppress("FunctionName")
 inline fun <reified T> View.EventDispatcher(noinline coalescingKey: CoalescingKey<T>? = null): ViewEventDelegate<T> {
-  return ViewEventDelegate(typeOf<T>(), this, coalescingKey)
+  return ViewEventDelegate(this, coalescingKey)
 }
 
 @JvmName("MapEventDispatcher")
 @Suppress("FunctionName")
 fun View.EventDispatcher(coalescingKey: CoalescingKey<Map<String, Any>>? = null): ViewEventDelegate<Map<String, Any>> {
-  return ViewEventDelegate(typeOf<Map<String, Any>>(), this, coalescingKey)
+  return ViewEventDelegate(this, coalescingKey)
 }

package/android/src/main/java/expo/modules/kotlin/views/ViewDefinitionBuilder.kt

@@ -287,41 +287,37 @@ class ViewDefinitionBuilder<T : View>(
   ) = AsyncFunctionBuilder(name).also { functionBuilders[name] = it }
 
   private fun createViewFactory(): (Context, AppContext) -> View = viewFactory@{ context: Context, appContext: AppContext ->
-    val primaryConstructor = requireNotNull(getPrimaryConstructor()) { "$viewClass doesn't have a primary constructor" }
-    val args = primaryConstructor.parameters
-
-    if (args.isEmpty()) {
-      throw IllegalStateException("Android view has to have a constructor with at least one argument.")
-    }
-
-    val firstArgType = args.first().type
-    if (Context::class != firstArgType.classifier) {
-      throw IllegalStateException("The type of the first constructor argument has to be `android.content.Context`.")
+    val fullConstructor = try {
+      // Try to use constructor with two arguments
+      viewClass.java.getConstructor(Context::class.java, AppContext::class.java)
+    } catch (e: NoSuchMethodException) {
+      null
     }
 
-    // Backward compatibility
-    if (args.size == 1) {
+    fullConstructor?.let {
       return@viewFactory try {
-        primaryConstructor.call(context)
+        it.newInstance(context, appContext)
       } catch (e: Throwable) {
         handleFailureDuringViewCreation(context, appContext, e)
       }
     }
 
-    val secondArgType = args[1].type
-    if (AppContext::class != secondArgType.classifier) {
-      throw IllegalStateException("The type of the second constructor argument has to be `expo.modules.kotlin.AppContext`.")
+    val contextConstructor = try {
+      // Try to use constructor that use Android's context
+      viewClass.java.getConstructor(Context::class.java)
+    } catch (e: NoSuchMethodException) {
+      null
     }
 
-    if (args.size != 2) {
-      throw IllegalStateException("Android view has more constructor arguments than expected.")
+    contextConstructor?.let {
+      return@viewFactory try {
+        it.newInstance(context)
+      } catch (e: Throwable) {
+        handleFailureDuringViewCreation(context, appContext, e)
+      }
     }
 
-    return@viewFactory try {
-      primaryConstructor.call(context, appContext)
-    } catch (e: Throwable) {
-      handleFailureDuringViewCreation(context, appContext, e)
-    }
+    throw IllegalStateException("Didn't find a correct constructor for $viewClass")
   }
 
   private fun handleFailureDuringViewCreation(context: Context, appContext: AppContext, e: Throwable): View {

package/android/src/main/java/expo/modules/kotlin/views/ViewManagerWrapperDelegate.kt

@@ -4,16 +4,12 @@ import android.content.Context
 import android.view.View
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.common.MapBuilder
-import expo.modules.core.utilities.ifNull
 import expo.modules.kotlin.ModuleHolder
 import expo.modules.kotlin.events.normalizeEventName
 import expo.modules.kotlin.exception.OnViewDidUpdatePropsException
 import expo.modules.kotlin.exception.exceptionDecorator
 import expo.modules.kotlin.exception.toCodedException
 import expo.modules.kotlin.logger
-import expo.modules.kotlin.viewevent.ViewEventDelegate
-import kotlin.reflect.full.declaredMemberProperties
-import kotlin.reflect.jvm.isAccessible
 
 class ViewManagerWrapperDelegate(internal var moduleHolder: ModuleHolder) {
   private val definition: ViewManagerDefinition
@@ -31,9 +27,6 @@ class ViewManagerWrapperDelegate(internal var moduleHolder: ModuleHolder) {
   fun createView(context: Context): View {
     return definition
       .createView(context, moduleHolder.module.appContext)
-      .also {
-        configureView(it)
-      }
   }
 
   fun onViewDidUpdateProps(view: View) {
@@ -126,33 +119,4 @@ class ViewManagerWrapperDelegate(internal var moduleHolder: ModuleHolder) {
       }
     return builder.build()
   }
-
-  private fun configureView(view: View) {
-    val callbacks = definition.callbacksDefinition?.names ?: return
-
-    val kClass = view.javaClass.kotlin
-    val propertiesMap = kClass
-      .declaredMemberProperties
-      .associateBy { it.name }
-
-    callbacks.forEach {
-      val property = propertiesMap[it].ifNull {
-        logger.warn("⚠️ Property `$it` does not exist in ${kClass.simpleName}")
-        return@forEach
-      }
-      property.isAccessible = true
-
-      val delegate = property.getDelegate(view).ifNull {
-        logger.warn("⚠️ Property delegate for `$it` in ${kClass.simpleName} does not exist")
-        return@forEach
-      }
-
-      val viewDelegate = (delegate as? ViewEventDelegate<*>).ifNull {
-        logger.warn("⚠️ Property delegate for `$it` cannot be cased to `ViewCallbackDelegate`")
-        return@forEach
-      }
-
-      viewDelegate.isValidated = true
-    }
-  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "1.5.11",
+  "version": "1.5.13",
   "description": "The core of Expo Modules architecture",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -42,5 +42,5 @@
     "@testing-library/react-hooks": "^7.0.1",
     "expo-module-scripts": "^3.0.0"
   },
-  "gitHead": "7a1079dcba56e0bb7504210049b6195b64f13834"
+  "gitHead": "25af32e83a26dc8027223b61bf7459ba93310ba3"
 }