expo-modules-core 0.7.0 → 0.9.1

package/CHANGELOG.md

@@ -10,6 +10,48 @@
 
 ### 💡 Others
 
+## 0.9.1 — 2022-05-05
+
+### 🐛 Bug fixes
+
+- Fix modules have not been deallocated during the application reload on iOS. ([#17285](https://github.com/expo/expo/pull/17285) by [@lukmccall](https://github.com/lukmccall))
+
+## 0.9.0 — 2022-04-21
+
+### ⚠️ Notices
+
+- Renamed all definition components to start with the uppercase letter. The old names will be removed in the next minor release. ([#17153](https://github.com/expo/expo/pull/17153) by [@lukmccall](https://github.com/lukmccall), [#17098](https://github.com/expo/expo/pull/17098) by [@tsapeta](https://github.com/tsapeta))
+
+### 🎉 New features
+
+- Add `ReactNativeHostHandler.getUseDeveloperSupport()` to allow `expo-dev-launcher` to override this value at runtime. ([#17069](https://github.com/expo/expo/pull/17069) by [@esamelson](https://github.com/esamelson))
+
+## 0.8.0 — 2022-04-18
+
+### 🛠 Breaking changes
+
+- Remove backward compatible workaround and drop react-native 0.64 support. ([#16446](https://github.com/expo/expo/pull/16446) by [@kudo](https://github.com/kudo))
+
+### ⚠️ Notices
+
+- Deprecated current behavior of `function` module definition component in favor of `asyncFunction` to emphasize that it's being executed asynchronously in JavaScript. In the future release `function` will become synchronous. ([#16630](https://github.com/expo/expo/pull/16630) by [@tsapeta](https://github.com/tsapeta), [#16656](https://github.com/expo/expo/pull/16656) by [@lukmccall](https://github.com/lukmccall))
+- On Android bump `compileSdkVersion` to `31`, `targetSdkVersion` to `31` and `Java` version to `11`. ([#16941](https://github.com/expo/expo/pull/16941) by [@bbarthec](https://github.com/bbarthec))
+
+### 🎉 New features
+
+- Add `getDevSupportManagerFactory` support to `ReactNativeHostHandler`. ([#16434](https://github.com/expo/expo/pull/16434) by [@lukmccall](https://github.com/lukmccall))
+- Add support for automatic setup of `expo-dev-client` on Android. ([#16441](https://github.com/expo/expo/pull/16441) by [@esamelson](https://github.com/esamelson))
+- Stopped relying on deprecated `ViewPropTypes` from React Native. ([#16207](https://github.com/expo/expo/pull/16207) by [@tsapeta](https://github.com/tsapeta))
+- Added Android `ReactNativeHostHandler.getJavaScriptExecutorFactory()` for a module to override the `JavaScriptExecutorFactory`. ([#17005](https://github.com/expo/expo/pull/17005) by [@kudo](https://github.com/kudo))
+
+### 🐛 Bug fixes
+
+- Fix the `Fatal error: Expo modules provider must implement "ModulesProviderProtocol"` runtime error in XCTest targets and SwiftUI Preview. ([#16733](https://github.com/expo/expo/pull/16733) by [@kudo](https://github.com/kudo))
+
+### 💡 Others
+
+- Removed the opt-in feature to use the turbo module implementation of `NativeModulesProxy` in favor of another solution introduced in [#15847](https://github.com/expo/expo/pull/15847). ([#16825](https://github.com/expo/expo/pull/16825) by [@tsapeta](https://github.com/tsapeta))
+
 ## 0.7.0 — 2022-01-26
 
 ### 🎉 New features
@@ -29,6 +71,13 @@
 
 - It's no longer possible to directly call methods from the `ModuleDefinition` in the `ViewManagers` on Android. ([#15741](https://github.com/expo/expo/pull/15741) by [@lukmccall](https://github.com/lukmccall))
 - Fix compatibility with react-native 0.66. ([#15914](https://github.com/expo/expo/pull/15914) by [@kudo](https://github.com/kudo))
+- Fix `Plugin with id 'maven' not found` build error from Android Gradle 7. ([#16080](https://github.com/expo/expo/pull/16080) by [@kudo](https://github.com/kudo))
+
+## 0.6.5 — 2022-02-01
+
+### 🐛 Bug fixes
+
+- Fix `Plugin with id 'maven' not found` build error from Android Gradle 7. ([#16080](https://github.com/expo/expo/pull/16080) by [@kudo](https://github.com/kudo))
 
 ## 0.6.4 — 2022-01-05
 

package/README.md

@@ -4,7 +4,7 @@ The core of Expo Modules architecture.
 
 # Installation in managed Expo projects
 
-For [managed](https://docs.expo.io/versions/latest/introduction/managed-vs-bare/) Expo projects, please follow the installation instructions in the [API documentation for the latest stable release](#api-documentation). If you follow the link and there is no documentation available then this library is not yet usable within managed projects — it is likely to be included in an upcoming Expo SDK release.
+For [managed](https://docs.expo.dev/versions/latest/introduction/managed-vs-bare/) Expo projects, please follow the installation instructions in the [API documentation for the latest stable release](#api-documentation). If you follow the link and there is no documentation available then this library is not yet usable within managed projects — it is likely to be included in an upcoming Expo SDK release.
 
 # Installation in bare React Native projects
 

package/android/ExpoModulesCorePlugin.gradle

@@ -0,0 +1,15 @@
+class KotlinExpoModulesCorePlugin implements Plugin<Project> {
+  void apply(Project project) {
+    project.buildscript {
+      project.ext.kotlinVersion = {
+        project.rootProject.ext.has("kotlinVersion")
+            ? project.rootProject.ext.get("kotlinVersion")
+            : "1.6.10"
+      }
+    }
+  }
+}
+
+ext.applyKotlinExpoModulesCorePlugin = {
+  apply plugin: KotlinExpoModulesCorePlugin
+}

package/android/build.gradle

@@ -1,71 +1,85 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '0.7.0'
+version = '0.9.1'
 
 buildscript {
+  def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
+  if (expoModulesCorePlugin.exists()) {
+    apply from: expoModulesCorePlugin
+    applyKotlinExpoModulesCorePlugin()
+  }
+
   // Simple helper that allows the root project to override versions declared by this library.
   ext.safeExtGet = { prop, fallback ->
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
   }
 
+  // Ensures backward compatibility
+  ext.getKotlinVersion = {
+    if (ext.has("kotlinVersion")) {
+      ext.kotlinVersion()
+    } else {
+      ext.safeExtGet("kotlinVersion", "1.6.10")
+    }
+  }
+
   repositories {
     mavenCentral()
   }
 
   dependencies {
-    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', '1.6.10')}")
+    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${getKotlinVersion()}")
   }
 }
 
-//Upload android library to maven with javadoc and android sources
-configurations {
-  deployerJars
-}
-
-//Creating sources with comments
+// Creating sources with comments
 task androidSourcesJar(type: Jar) {
   classifier = 'sources'
   from android.sourceSets.main.java.srcDirs
 }
 
-//Put the androidSources and javadoc to the artifacts
-artifacts {
-  archives androidSourcesJar
-}
-
-uploadArchives {
-  repositories {
-    mavenDeployer {
-      configuration = configurations.deployerJars
-      repository(url: mavenLocal().url)
+afterEvaluate {
+  publishing {
+    publications {
+      release(MavenPublication) {
+        from components.release
+        // Add additional sourcesJar to artifacts
+        artifact(androidSourcesJar)
+      }
+    }
+    repositories {
+      maven {
+        url = mavenLocal().url
+      }
     }
   }
 }
 
 android {
-  compileSdkVersion safeExtGet("compileSdkVersion", 30)
+  compileSdkVersion safeExtGet("compileSdkVersion", 31)
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_11
+    targetCompatibility JavaVersion.VERSION_11
+  }
+
+  kotlinOptions {
+    jvmTarget = JavaVersion.VERSION_11.majorVersion
   }
 
   defaultConfig {
     minSdkVersion safeExtGet("minSdkVersion", 21)
-    targetSdkVersion safeExtGet("targetSdkVersion", 30)
+    targetSdkVersion safeExtGet("targetSdkVersion", 31)
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "0.7.0"
+    versionName "0.9.1"
   }
   lintOptions {
     abortOnError false
   }
-  kotlinOptions {
-    jvmTarget = JavaVersion.VERSION_1_8
-  }
 
   testOptions {
     unitTests.all {
@@ -81,12 +95,10 @@ android {
 }
 
 dependencies {
-  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${safeExtGet('kotlinVersion', '1.6.10')}"
-  implementation "org.jetbrains.kotlin:kotlin-reflect:${safeExtGet('kotlinVersion', '1.6.10')}"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
+  implementation "org.jetbrains.kotlin:kotlin-reflect:${getKotlinVersion()}"
   implementation 'androidx.annotation:annotation:1.2.0'
-
-  // used only in `expo.modules.core.errors.ModuleDestroyedException` for API export
-  compileOnly("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3")
+  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0"
 
   //noinspection GradleDynamicVersion
   implementation 'com.facebook.react:react-native:+'
@@ -95,6 +107,8 @@ dependencies {
   testImplementation 'junit:junit:4.13.1'
   testImplementation 'io.mockk:mockk:1.10.6'
   testImplementation "com.google.truth:truth:1.1.2"
+  testImplementation "org.robolectric:robolectric:4.5.1"
+  testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0"
 }
 
 /**

package/android/src/main/java/expo/modules/adapters/react/NativeModulesProxy.java

@@ -36,7 +36,7 @@ import javax.annotation.Nullable;
  */
 public class NativeModulesProxy extends ReactContextBaseJavaModule {
   private final static String NAME = "NativeUnimoduleProxy";
-  private final static String VIEW_MANAGERS_NAMES_KEY = "viewManagersNames";
+  private final static String VIEW_MANAGERS_METADATA_KEY = "viewManagersMetadata";
   private final static String MODULES_CONSTANTS_KEY = "modulesConstants";
   private final static String EXPORTED_METHODS_KEY = "exportedMethods";
 
@@ -97,7 +97,7 @@ public class NativeModulesProxy extends ReactContextBaseJavaModule {
 
     Map<String, Object> modulesConstants = new HashMap<>(exportedModules.size());
     Map<String, Object> exportedMethodsMap = new HashMap<>(exportedModules.size());
-    List<String> viewManagersNames = new ArrayList<>(viewManagers.size());
+    Map<String, Object> viewManagersMetadata = new HashMap<>(viewManagers.size());
 
     for (ExportedModule exportedModule : exportedModules) {
       String moduleName = exportedModule.getName();
@@ -116,15 +116,15 @@ public class NativeModulesProxy extends ReactContextBaseJavaModule {
     }));
 
     for (ViewManager viewManager : viewManagers) {
-      viewManagersNames.add(viewManager.getName());
+      viewManagersMetadata.put(viewManager.getName(), viewManager.getMetadata());
     }
 
-    viewManagersNames.addAll(mKotlinInteropModuleRegistry.exportedViewManagersNames());
+    viewManagersMetadata.putAll(mKotlinInteropModuleRegistry.viewManagersMetadata());
 
     Map<String, Object> constants = new HashMap<>(3);
     constants.put(MODULES_CONSTANTS_KEY, modulesConstants);
     constants.put(EXPORTED_METHODS_KEY, exportedMethodsMap);
-    constants.put(VIEW_MANAGERS_NAMES_KEY, viewManagersNames);
+    constants.put(VIEW_MANAGERS_METADATA_KEY, viewManagersMetadata);
     return constants;
   }
 

package/android/src/main/java/expo/modules/adapters/react/services/UIManagerModuleWrapper.java

@@ -6,6 +6,7 @@ import android.util.Log;
 import android.view.View;
 
 import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.turbomodule.core.CallInvokerHolderImpl;
 import com.facebook.react.uimanager.IllegalViewOperationException;
 import com.facebook.react.uimanager.NativeViewHierarchyManager;
 import com.facebook.react.uimanager.UIManagerModule;
@@ -115,6 +116,14 @@ public class UIManagerModuleWrapper implements
     }
   }
 
+  public void runOnNativeModulesQueueThread(Runnable runnable) {
+    if (mReactContext.isOnNativeModulesQueueThread()) {
+      runnable.run();
+    } else {
+      mReactContext.runOnNativeModulesQueueThread(runnable);
+    }
+  }
+
 
   @Override
   public void registerLifecycleEventListener(final LifecycleEventListener listener) {
@@ -188,6 +197,10 @@ public class UIManagerModuleWrapper implements
     return mReactContext.getJavaScriptContextHolder().get();
   }
 
+  public CallInvokerHolderImpl getJSCallInvokerHolder() {
+    return (CallInvokerHolderImpl) mReactContext.getCatalystInstance().getJSCallInvokerHolder();
+  }
+
   @Override
   public Activity getCurrentActivity() {
     return getContext().getCurrentActivity();

package/android/src/main/java/expo/modules/core/ViewManager.java

@@ -50,6 +50,15 @@ public abstract class ViewManager<V extends View> implements RegistryLifecycleLi
     // by default do nothing
   }
 
+  /**
+   * Returns a map of view manager's metadata that will be exposed to JavaScript.
+   */
+  public Map<String, Object> getMetadata() {
+    Map<String, Object> metadata = new HashMap<>();
+    metadata.put("propsNames", getPropSetters().keySet().toArray());
+    return metadata;
+  }
+
   /**
    * Returns a map of { propName => propInfo } so that platform adapter knows value of what class
    * does the propsetter expect.

package/android/src/main/java/expo/modules/core/interfaces/JavaScriptContextProvider.java

@@ -1,5 +1,9 @@
 package expo.modules.core.interfaces;
 
+import com.facebook.react.turbomodule.core.CallInvokerHolderImpl;
+
 public interface JavaScriptContextProvider {
   long getJavaScriptContextRef();
+
+  CallInvokerHolderImpl getJSCallInvokerHolder();
 }

package/android/src/main/java/expo/modules/core/interfaces/ReactActivityHandler.java

@@ -1,12 +1,17 @@
 package expo.modules.core.interfaces;
 
 import android.app.Activity;
+import android.view.KeyEvent;
+import android.view.ViewGroup;
+
+import com.facebook.react.ReactActivity;
+import com.facebook.react.ReactActivityDelegate;
 import com.facebook.react.ReactRootView;
 
 import androidx.annotation.Nullable;
 
 /**
- * A handler API for modules to override default ReactActivity behaviors.
+ * A handler API for modules to override default ReactActivityDelegate behaviors.
  * Used by {@link ReactActivityDelegateWrapper}
  */
 public interface ReactActivityHandler {
@@ -18,4 +23,35 @@ public interface ReactActivityHandler {
   default ReactRootView createReactRootView(Activity activity) {
     return null;
   }
+
+  /**
+   * Gives modules a chance to create a ViewGroup that is used as a container for the ReactRootView,
+   * which is added as a child to the container if non-null.
+   * @return a ViewGroup to be used as a container, or null if no container is needed
+   */
+  @Nullable
+  default ViewGroup createReactRootViewContainer(Activity activity) {
+    return null;
+  }
+
+  /**
+   * Gives modules a chance to respond to `onKeyUp` events. Every listener will receive this
+   * callback, but the delegate will not receive the event unless if any of the listeners consume it
+   * (i.e. return `true` from this method).
+   * `ReactActivityDelegateWrapper.onKeyUp` will return `true` if any module returns `true`.
+   *
+   * @return true if this module wants to return `true` from `ReactActivityDelegateWrapper.onKeyUp`
+   */
+  default boolean onKeyUp(int keyCode, KeyEvent event) {
+    return false;
+  }
+
+  /**
+   * Gives modules a chance to override the wrapped ReactActivityDelegate instance.
+   * @return a new ReactActivityDelegate instance, or null if not to override
+   */
+  @Nullable
+  default ReactActivityDelegate onDidCreateReactActivityDelegate(ReactActivity activity, ReactActivityDelegate delegate) {
+    return null;
+  }
 }

package/android/src/main/java/expo/modules/core/interfaces/ReactNativeHostHandler.java

@@ -2,6 +2,7 @@ package expo.modules.core.interfaces;
 
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.bridge.JavaScriptContextHolder;
+import com.facebook.react.bridge.JavaScriptExecutorFactory;
 import com.facebook.react.bridge.ReactApplicationContext;
 
 import androidx.annotation.Nullable;
@@ -42,6 +43,35 @@ public interface ReactNativeHostHandler {
     return null;
   }
 
+  /**
+   * Give modules a chance to override the value for useDeveloperSupport,
+   * e.g. for expo-dev-launcher
+   *
+   * @return value for useDeveloperSupport, or null if not to override
+   */
+  @Nullable
+  default Boolean getUseDeveloperSupport() {
+    return null;
+  }
+
+  /**
+   * Given chance for modules to override react dev support manager factory.
+   * e.g. for expo-dev-client
+   *
+   * Note: we can't specify the type here, because the `DevSupportManagerFactory`
+   * doesn't exist in the React Native 0.66 or below.
+   *
+   * @return custom DevSupportManagerFactory, or null if not to override
+   */
+  @Nullable
+  default Object getDevSupportManagerFactory() { return null; }
+
+  /**
+   * Given chance for modules to override the javascript executor factory.
+   */
+  @Nullable
+  default JavaScriptExecutorFactory getJavaScriptExecutorFactory() { return null; }
+
   //region event listeners
 
   /**

package/android/src/main/java/expo/modules/core/interfaces/services/UIManager.java

@@ -28,6 +28,8 @@ public interface UIManager {
 
   void runOnClientCodeQueueThread(Runnable runnable);
 
+  void runOnNativeModulesQueueThread(Runnable runnable);
+
   void registerLifecycleEventListener(LifecycleEventListener listener);
 
   void unregisterLifecycleEventListener(LifecycleEventListener listener);

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

@@ -5,7 +5,6 @@ import android.content.Context
 import android.content.Intent
 import com.facebook.react.bridge.ReactApplicationContext
 import expo.modules.core.interfaces.ActivityProvider
-import expo.modules.core.interfaces.services.EventEmitter
 import expo.modules.interfaces.barcodescanner.BarCodeScannerInterface
 import expo.modules.interfaces.camera.CameraViewInterface
 import expo.modules.interfaces.constants.ConstantsInterface
@@ -16,8 +15,10 @@ import expo.modules.interfaces.permissions.Permissions
 import expo.modules.interfaces.sensors.SensorServiceInterface
 import expo.modules.interfaces.taskManager.TaskManagerInterface
 import expo.modules.kotlin.defaultmodules.ErrorManagerModule
+import expo.modules.kotlin.events.EventEmitter
 import expo.modules.kotlin.events.EventName
 import expo.modules.kotlin.events.KEventEmitterWrapper
+import expo.modules.kotlin.events.KModuleEventEmitterWrapper
 import expo.modules.kotlin.events.OnActivityResultPayload
 import expo.modules.kotlin.modules.Module
 import java.lang.ref.WeakReference
@@ -123,17 +124,23 @@ class AppContext(
    * Provides access to the event emitter
    */
   fun eventEmitter(module: Module): EventEmitter? {
-    val legacyEventEmitter = legacyModule<EventEmitter>() ?: return null
-    return KEventEmitterWrapper(
+    val legacyEventEmitter = legacyModule<expo.modules.core.interfaces.services.EventEmitter>()
+      ?: return null
+    return KModuleEventEmitterWrapper(
       requireNotNull(registry.getModuleHolder(module)) {
         "Cannot create an event emitter for the module that isn't present in the module registry."
       },
-      legacyEventEmitter
+      legacyEventEmitter,
+      reactContextHolder
     )
   }
 
   internal val callbackInvoker: EventEmitter?
-    get() = legacyModule()
+    get() {
+      val legacyEventEmitter = legacyModule<expo.modules.core.interfaces.services.EventEmitter>()
+        ?: return null
+      return KEventEmitterWrapper(legacyEventEmitter, reactContextHolder)
+    }
 
   internal val errorManager: ErrorManagerModule?
     get() = registry.getModule()
@@ -141,6 +148,7 @@ class AppContext(
   fun onDestroy() {
     reactContextHolder.get()?.removeLifecycleEventListener(reactLifecycleDelegate)
     registry.post(EventName.MODULE_DESTROY)
+    registry.cleanUp()
   }
 
   fun onHostResume() {

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

@@ -1,9 +1,6 @@
 package expo.modules.kotlin
 
-import android.os.Bundle
-import com.facebook.react.bridge.Arguments
-import expo.modules.kotlin.records.Record
-import expo.modules.kotlin.records.toJSMap
+import expo.modules.kotlin.types.JSTypeConverter
 
 class KPromiseWrapper(
   private val bridgePromise: com.facebook.react.bridge.Promise
@@ -12,15 +9,7 @@ class KPromiseWrapper(
   @Suppress("UNCHECKED_CAST")
   override fun resolve(value: Any?) {
     bridgePromise.resolve(
-      when (value) {
-        is Unit -> null
-        is Bundle -> Arguments.fromBundle(value)
-        is List<*> -> Arguments.fromList(value)
-        is Array<*> -> Arguments.fromArray(value)
-        is Map<*, *> -> Arguments.makeNativeMap(value as Map<String, Any?>) // TODO(@lukmccall): add more sophisticated conversion method
-        is Record -> value.toJSMap()
-        else -> value
-      }
+      JSTypeConverter.convertToJSValue(value)
     )
   }
 

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

@@ -75,6 +75,17 @@ class KotlinInteropModuleRegistry(
       }
   }
 
+  fun viewManagersMetadata(): Map<String, Map<String, Any>> {
+    return registry
+      .filter { it.definition.viewManagerDefinition != null }
+      .map { holder ->
+        holder.name to mapOf(
+          "propsNames" to (holder.definition.viewManagerDefinition?.propsNames ?: emptyList())
+        )
+      }
+      .toMap()
+  }
+
   fun extractViewManagersDelegateHolders(viewManagers: List<ViewManager<*, *>>): List<ViewWrapperDelegateHolder> =
     viewManagers.filterIsInstance<ViewWrapperDelegateHolder>()
 
@@ -96,11 +107,6 @@ class KotlinInteropModuleRegistry(
       }
   }
 
-  fun exportedViewManagersNames(): List<String> =
-    registry
-      .filter { it.definition.viewManagerDefinition != null }
-      .map { it.definition.name }
-
   fun onDestroy() {
     appContext.onDestroy()
   }

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

@@ -20,7 +20,7 @@ class ModuleHolder(val module: Module) {
     val method = definition.methods[methodName]
       ?: throw MethodNotFoundException()
 
-    method.call(args, promise)
+    method.call(this, args, promise)
   }
 
   fun post(eventName: EventName) {
@@ -39,4 +39,8 @@ class ModuleHolder(val module: Module) {
     val listener = definition.eventListeners[eventName] ?: return
     (listener as? EventListenerWithSenderAndPayload<Sender, Payload>)?.call(sender, payload)
   }
+
+  fun cleanUp() {
+    module.cleanUp()
+  }
 }

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

@@ -2,6 +2,10 @@ package expo.modules.kotlin
 
 import expo.modules.kotlin.events.EventName
 import expo.modules.kotlin.modules.Module
+import kotlinx.coroutines.CoroutineName
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
 import java.lang.ref.WeakReference
 
 class ModuleRegistry(
@@ -13,6 +17,13 @@ class ModuleRegistry(
   fun register(module: Module) {
     val holder = ModuleHolder(module)
     module._appContext = requireNotNull(appContext.get()) { "Cannot create a module for invalid app context." }
+    module.coroutineScopeDelegate = lazy {
+      CoroutineScope(
+        Dispatchers.Default +
+          SupervisorJob() +
+          CoroutineName(holder.definition.name)
+      )
+    }
     holder.post(EventName.MODULE_CREATE)
     registry[holder.name] = holder
   }
@@ -58,4 +69,10 @@ class ModuleRegistry(
   }
 
   override fun iterator(): Iterator<ModuleHolder> = registry.values.iterator()
+
+  fun cleanUp() {
+    forEach {
+      it.cleanUp()
+    }
+  }
 }

package/android/src/main/java/expo/modules/kotlin/callbacks/ViewCallback.kt

@@ -1,10 +1,12 @@
 package expo.modules.kotlin.callbacks
 
-import android.os.Bundle
 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.kotlin.types.JSTypeConverter
+import expo.modules.kotlin.types.putGeneric
 import kotlin.reflect.KType
 
 class ViewCallback<T>(
@@ -22,7 +24,16 @@ class ViewCallback<T>(
       ?: return
     val appContext = nativeModulesProxy.kotlinInteropModuleRegistry.appContext
 
-    // TODO(@lukmccall): handles other types
-    appContext.callbackInvoker?.emit(view.id, name, arg as Bundle)
+    appContext.callbackInvoker?.emit(view.id, name, convertEventBody(arg))
+  }
+
+  private fun convertEventBody(arg: T): WritableMap? {
+    return when (val converted = JSTypeConverter.convertToJSValue(arg)) {
+      is Unit, null -> null
+      is WritableMap -> converted
+      else -> JSTypeConverter.DefaultContainerProvider.createMap().apply {
+        putGeneric("payload", converted)
+      }
+    }
   }
 }

package/android/src/main/java/expo/modules/kotlin/events/EventEmitter.kt

@@ -0,0 +1,13 @@
+package expo.modules.kotlin.events
+
+import com.facebook.react.bridge.WritableMap
+import expo.modules.kotlin.records.Record
+
+// We want to decorate a legacy event emitter interface to support advanced conversion between types in events.
+// For instance, users will be able to create `Callback<Record>` that will be converted to the `WritableMap`.
+interface EventEmitter : expo.modules.core.interfaces.services.EventEmitter {
+  fun emit(eventName: String, eventBody: WritableMap?)
+  fun emit(eventName: String, eventBody: Record?)
+  fun emit(eventName: String, eventBody: Map<*, *>?)
+  fun emit(viewId: Int, eventName: String, eventBody: WritableMap?)
+}