expo-modules-core 1.11.13 → 1.12.1

package/android/src/main/cpp/MethodMetadata.h

@@ -20,12 +20,12 @@ namespace jsi = facebook::jsi;
 namespace react = facebook::react;
 
 namespace expo {
-class JSIInteropModuleRegistry;
+class JSIContext;
 
 /**
  * A class that holds information about the exported function.
  */
-class MethodMetadata {
+class MethodMetadata : public std::enable_shared_from_this<MethodMetadata> {
 public:
   /**
    * Function name
@@ -69,12 +69,10 @@ public:
    * Transforms metadata to a jsi::Function.
    *
    * @param runtime
-   * @param moduleRegistry
    * @return shared ptr to the jsi::Function that wrapped the underlying Kotlin's function.
    */
   std::shared_ptr<jsi::Function> toJSFunction(
-    jsi::Runtime &runtime,
-    JSIInteropModuleRegistry *moduleRegistry
+    jsi::Runtime &runtime
   );
 
   /**
@@ -82,7 +80,6 @@ public:
    */
   jsi::Value callSync(
     jsi::Runtime &rt,
-    JSIInteropModuleRegistry *moduleRegistry,
     const jsi::Value &thisValue,
     const jsi::Value *args,
     size_t count
@@ -91,7 +88,6 @@ public:
   jni::local_ref<jobject> callJNISync(
     JNIEnv *env,
     jsi::Runtime &rt,
-    JSIInteropModuleRegistry *moduleRegistry,
     const jsi::Value &thisValue,
     const jsi::Value *args,
     size_t count
@@ -111,18 +107,16 @@ private:
    */
   std::shared_ptr<jsi::Function> body = nullptr;
 
-  jsi::Function toSyncFunction(jsi::Runtime &runtime, JSIInteropModuleRegistry *moduleRegistry);
+  jsi::Function toSyncFunction(jsi::Runtime &runtime);
 
-  jsi::Function toAsyncFunction(jsi::Runtime &runtime, JSIInteropModuleRegistry *moduleRegistry);
+  jsi::Function toAsyncFunction(jsi::Runtime &runtime);
 
   jsi::Function createPromiseBody(
     jsi::Runtime &runtime,
-    JSIInteropModuleRegistry *moduleRegistry,
     jobjectArray globalArgs
   );
 
   jobjectArray convertJSIArgsToJNI(
-    JSIInteropModuleRegistry *moduleRegistry,
     JNIEnv *env,
     jsi::Runtime &rt,
     const jsi::Value &thisValue,

package/android/src/main/cpp/WeakRuntimeHolder.cpp

@@ -1,6 +1,6 @@
 #include "WeakRuntimeHolder.h"
 #include "JavaScriptRuntime.h"
-#include "JSIInteropModuleRegistry.h"
+#include "JSIContext.h"
 
 namespace expo {
 WeakRuntimeHolder::WeakRuntimeHolder(std::weak_ptr<JavaScriptRuntime> runtime)
@@ -16,9 +16,9 @@ void WeakRuntimeHolder::ensureRuntimeIsValid() {
   assert((!expired()) && "JS Runtime was used after deallocation");
 }
 
-JSIInteropModuleRegistry *WeakRuntimeHolder::getModuleRegistry() {
+JSIContext *WeakRuntimeHolder::getJSIContext() {
   auto runtime = lock();
   assert((runtime != nullptr) && "JS Runtime was used after deallocation");
-  return runtime->getModuleRegistry();
+  return expo::getJSIContext(runtime->get());
 }
 } // namespace expo

package/android/src/main/cpp/WeakRuntimeHolder.h

@@ -12,7 +12,7 @@ namespace jsi = facebook::jsi;
 
 class JavaScriptRuntime;
 
-class JSIInteropModuleRegistry;
+class JSIContext;
 
 /**
  * A convenient class to access underlying jni::Runtime and hold a weak reference to expo::JavaScriptRuntime.
@@ -33,7 +33,7 @@ public:
    */
   jsi::Runtime &getJSRuntime();
 
-  JSIInteropModuleRegistry *getModuleRegistry();
+  JSIContext *getJSIContext();
 
   void ensureRuntimeIsValid();
 };

package/android/src/main/cpp/types/AnyType.cpp

@@ -2,7 +2,7 @@
 
 #include "AnyType.h"
 #include "FrontendConverterProvider.h"
-#include "../JSIInteropModuleRegistry.h"
+#include "../JSIContext.h"
 
 namespace expo {
 AnyType::AnyType(

package/android/src/main/cpp/types/AnyType.h

@@ -10,7 +10,7 @@
 namespace jni = facebook::jni;
 
 namespace expo {
-class JSIInteropModuleRegistry;
+class JSIContext;
 
 /**
  * Holds information about the expected Kotlin type.

package/android/src/main/cpp/types/FrontendConverter.cpp

@@ -6,7 +6,7 @@
 #include "../JavaReferencesCache.h"
 #include "../Exceptions.h"
 #include "../JavaScriptTypedArray.h"
-#include "../JSIInteropModuleRegistry.h"
+#include "../JSIContext.h"
 #include "../JavaScriptObject.h"
 #include "../JavaScriptValue.h"
 #include "../JavaScriptFunction.h"
@@ -27,7 +27,6 @@ namespace expo {
 jobject IntegerFrontendConverter::convert(
   jsi::Runtime &rt,
   JNIEnv *env,
-  JSIInteropModuleRegistry *moduleRegistry,
   const jsi::Value &value
 ) const {
   auto &integerClass = JavaReferencesCache::instance()
@@ -44,7 +43,6 @@ bool IntegerFrontendConverter::canConvert(jsi::Runtime &rt, const jsi::Value &va
 jobject LongFrontendConverter::convert(
   jsi::Runtime &rt,
   JNIEnv *env,
-  JSIInteropModuleRegistry *moduleRegistry,
   const jsi::Value &value
 ) const {
   auto &longClass = JavaReferencesCache::instance()
@@ -61,7 +59,6 @@ bool LongFrontendConverter::canConvert(jsi::Runtime &rt, const jsi::Value &value
 jobject FloatFrontendConverter::convert(
   jsi::Runtime &rt,
   JNIEnv *env,
-  JSIInteropModuleRegistry *moduleRegistry,
   const jsi::Value &value
 ) const {
   auto &floatClass = JavaReferencesCache::instance()
@@ -78,7 +75,6 @@ bool FloatFrontendConverter::canConvert(jsi::Runtime &rt, const jsi::Value &valu
 jobject BooleanFrontendConverter::convert(
   jsi::Runtime &rt,
   JNIEnv *env,
-  JSIInteropModuleRegistry *moduleRegistry,
   const jsi::Value &value
 ) const {
   auto &booleanClass = JavaReferencesCache::instance()
@@ -94,7 +90,6 @@ bool BooleanFrontendConverter::canConvert(jsi::Runtime &rt, const jsi::Value &va
 jobject DoubleFrontendConverter::convert(
   jsi::Runtime &rt,
   JNIEnv *env,
-  JSIInteropModuleRegistry *moduleRegistry,
   const jsi::Value &value
 ) const {
   auto &doubleClass = JavaReferencesCache::instance()
@@ -110,7 +105,6 @@ bool DoubleFrontendConverter::canConvert(jsi::Runtime &rt, const jsi::Value &val
 jobject StringFrontendConverter::convert(
   jsi::Runtime &rt,
   JNIEnv *env,
-  JSIInteropModuleRegistry *moduleRegistry,
   const jsi::Value &value
 ) const {
   return env->NewStringUTF(value.asString(rt).utf8(rt).c_str());
@@ -123,7 +117,6 @@ bool StringFrontendConverter::canConvert(jsi::Runtime &rt, const jsi::Value &val
 jobject ReadableNativeArrayFrontendConverter::convert(
   jsi::Runtime &rt,
   JNIEnv *env,
-  JSIInteropModuleRegistry *moduleRegistry,
   const jsi::Value &value
 ) const {
   auto dynamic = jsi::dynamicFromValue(rt, value);
@@ -140,7 +133,6 @@ bool ReadableNativeArrayFrontendConverter::canConvert(
 jobject ReadableNativeMapArrayFrontendConverter::convert(
   jsi::Runtime &rt,
   JNIEnv *env,
-  JSIInteropModuleRegistry *moduleRegistry,
   const jsi::Value &value
 ) const {
   auto dynamic = jsi::dynamicFromValue(rt, value);
@@ -156,7 +148,6 @@ bool ReadableNativeMapArrayFrontendConverter::canConvert(
 jobject ByteArrayFrontendConverter::convert(
   jsi::Runtime &rt,
   JNIEnv *env,
-  JSIInteropModuleRegistry *moduleRegistry,
   const jsi::Value &value
 ) const {
   auto typedArray = TypedArray(rt, value.asObject(rt));
@@ -183,12 +174,12 @@ bool ByteArrayFrontendConverter::canConvert(
 jobject TypedArrayFrontendConverter::convert(
   jsi::Runtime &rt,
   JNIEnv *env,
-  JSIInteropModuleRegistry *moduleRegistry,
   const jsi::Value &value
 ) const {
+  JSIContext *jsiContext = getJSIContext(rt);
   return JavaScriptTypedArray::newInstance(
-    moduleRegistry,
-    moduleRegistry->runtimeHolder->weak_from_this(),
+    jsiContext,
+    jsiContext->runtimeHolder->weak_from_this(),
     std::make_shared<jsi::Object>(value.asObject(rt))
   ).release();
 }
@@ -203,12 +194,12 @@ bool TypedArrayFrontendConverter::canConvert(
 jobject JavaScriptValueFrontendConverter::convert(
   jsi::Runtime &rt,
   JNIEnv *env,
-  JSIInteropModuleRegistry *moduleRegistry,
   const jsi::Value &value
 ) const {
+  JSIContext *jsiContext = getJSIContext(rt);
   return JavaScriptValue::newInstance(
-    moduleRegistry,
-    moduleRegistry->runtimeHolder->weak_from_this(),
+    jsiContext,
+    jsiContext->runtimeHolder->weak_from_this(),
     // TODO(@lukmccall): make sure that copy here is necessary
     std::make_shared<jsi::Value>(jsi::Value(rt, value))
   ).release();
@@ -221,12 +212,12 @@ bool JavaScriptValueFrontendConverter::canConvert(jsi::Runtime &rt, const jsi::V
 jobject JavaScriptObjectFrontendConverter::convert(
   jsi::Runtime &rt,
   JNIEnv *env,
-  JSIInteropModuleRegistry *moduleRegistry,
   const jsi::Value &value
 ) const {
+  JSIContext *jsiContext = getJSIContext(rt);
   return JavaScriptObject::newInstance(
-    moduleRegistry,
-    moduleRegistry->runtimeHolder->weak_from_this(),
+    jsiContext,
+    jsiContext->runtimeHolder->weak_from_this(),
     std::make_shared<jsi::Object>(value.asObject(rt))
   ).release();
 }
@@ -241,12 +232,12 @@ bool JavaScriptObjectFrontendConverter::canConvert(
 jobject JavaScriptFunctionFrontendConverter::convert(
   jsi::Runtime &rt,
   JNIEnv *env,
-  JSIInteropModuleRegistry *moduleRegistry,
   const jsi::Value &value
 ) const {
+  JSIContext *jsiContext = getJSIContext(rt);
   return JavaScriptFunction::newInstance(
-    moduleRegistry,
-    moduleRegistry->runtimeHolder->weak_from_this(),
+    jsiContext,
+    jsiContext->runtimeHolder->weak_from_this(),
     std::make_shared<jsi::Function>(value.asObject(rt).asFunction(rt))
   ).release();
 }
@@ -261,7 +252,6 @@ bool JavaScriptFunctionFrontendConverter::canConvert(
 jobject UnknownFrontendConverter::convert(
   jsi::Runtime &rt,
   JNIEnv *env,
-  JSIInteropModuleRegistry *moduleRegistry,
   const jsi::Value &value
 ) const {
   auto stringRepresentation = value.toString(rt).utf8(rt);
@@ -297,12 +287,11 @@ bool PolyFrontendConverter::canConvert(
 jobject PolyFrontendConverter::convert(
   jsi::Runtime &rt,
   JNIEnv *env,
-  JSIInteropModuleRegistry *moduleRegistry,
   const jsi::Value &value
 ) const {
   for (auto &converter: converters) {
     if (converter->canConvert(rt, value)) {
-      return converter->convert(rt, env, moduleRegistry, value);
+      return converter->convert(rt, env, value);
     }
   }
   // That shouldn't happen.
@@ -345,7 +334,6 @@ jobject createPrimitiveArray(
 jobject PrimitiveArrayFrontendConverter::convert(
   jsi::Runtime &rt,
   JNIEnv *env,
-  JSIInteropModuleRegistry *moduleRegistry,
   const jsi::Value &value
 ) const {
   auto jsArray = value.asObject(rt).asArray(rt);
@@ -394,7 +382,7 @@ jobject PrimitiveArrayFrontendConverter::convert(
   );
   for (size_t i = 0; i < size; i++) {
     auto convertedElement = parameterConverter->convert(
-      rt, env, moduleRegistry, jsArray.getValueAtIndex(rt, i)
+      rt, env, jsArray.getValueAtIndex(rt, i)
     );
     env->SetObjectArrayElement(result, i, convertedElement);
     env->DeleteLocalRef(convertedElement);
@@ -417,7 +405,6 @@ ListFrontendConverter::ListFrontendConverter(
 jobject ListFrontendConverter::convert(
   jsi::Runtime &rt,
   JNIEnv *env,
-  JSIInteropModuleRegistry *moduleRegistry,
   const jsi::Value &value
 ) const {
   auto jsArray = value.asObject(rt).asArray(rt);
@@ -434,7 +421,7 @@ jobject ListFrontendConverter::convert(
     }
 
     auto convertedElement = parameterConverter->convert(
-      rt, env, moduleRegistry, jsValue
+      rt, env, jsValue
     );
     arrayList->add(convertedElement);
     env->DeleteLocalRef(convertedElement);
@@ -458,7 +445,6 @@ MapFrontendConverter::MapFrontendConverter(
 jobject MapFrontendConverter::convert(
   jsi::Runtime &rt,
   JNIEnv *env,
-  JSIInteropModuleRegistry *moduleRegistry,
   const jsi::Value &value
 ) const {
   auto jsObject = value.asObject(rt);
@@ -479,7 +465,7 @@ jobject MapFrontendConverter::convert(
     }
 
     auto convertedValue = valueConverter->convert(
-      rt, env, moduleRegistry, jsValue
+      rt, env, jsValue
     );
 
     map->put(convertedKey, convertedValue);
@@ -498,9 +484,11 @@ bool MapFrontendConverter::canConvert(
   return value.isObject();
 }
 
-jobject ViewTagFrontendConverter::convert(jsi::Runtime &rt, JNIEnv *env,
-                                          JSIInteropModuleRegistry *moduleRegistry,
-                                          const jsi::Value &value) const {
+jobject ViewTagFrontendConverter::convert(
+  jsi::Runtime &rt,
+  JNIEnv *env,
+  const jsi::Value &value
+) const {
   auto nativeTag = value.asObject(rt).getProperty(rt, "nativeTag");
   if (nativeTag.isNull()) {
     return nullptr;
@@ -517,9 +505,11 @@ bool ViewTagFrontendConverter::canConvert(jsi::Runtime &rt, const jsi::Value &va
   return value.isObject() && value.getObject(rt).hasProperty(rt, "nativeTag");
 }
 
-jobject SharedObjectIdConverter::convert(jsi::Runtime &rt, JNIEnv *env,
-                                         JSIInteropModuleRegistry *moduleRegistry,
-                                         const jsi::Value &value) const {
+jobject SharedObjectIdConverter::convert(
+  jsi::Runtime &rt,
+  JNIEnv *env,
+  const jsi::Value &value
+) const {
   auto objectId = value.asObject(rt).getProperty(rt, "__expo_shared_object_id__");
   if (objectId.isNull()) {
     return nullptr;
@@ -539,7 +529,6 @@ bool SharedObjectIdConverter::canConvert(jsi::Runtime &rt, const jsi::Value &val
 jobject AnyFrontendConvert::convert(
   jsi::Runtime &rt,
   JNIEnv *env,
-  JSIInteropModuleRegistry *moduleRegistry,
   const jsi::Value &value
 ) const {
   if (value.isUndefined() || value.isNull()) {
@@ -547,15 +536,15 @@ jobject AnyFrontendConvert::convert(
   }
 
   if (booleanConverter.canConvert(rt, value)) {
-    return booleanConverter.convert(rt, env, moduleRegistry, value);
+    return booleanConverter.convert(rt, env, value);
   }
 
   if (doubleConverter.canConvert(rt, value)) {
-    return doubleConverter.convert(rt, env, moduleRegistry, value);
+    return doubleConverter.convert(rt, env, value);
   }
 
   if (stringConverter.canConvert(rt, value)) {
-    return stringConverter.convert(rt, env, moduleRegistry, value);
+    return stringConverter.convert(rt, env, value);
   }
 
   if (!value.isObject()) {
@@ -573,7 +562,7 @@ jobject AnyFrontendConvert::convert(
       auto jsValue = jsArray.getValueAtIndex(rt, i);
 
       auto convertedElement = this->convert(
-        rt, env, moduleRegistry, jsValue
+        rt, env, jsValue
       );
       arrayList->add(convertedElement);
       env->DeleteLocalRef(convertedElement);
@@ -593,7 +582,7 @@ jobject AnyFrontendConvert::convert(
 
     auto convertedKey = env->NewStringUTF(key.utf8(rt).c_str());
     auto convertedValue = this->convert(
-      rt, env, moduleRegistry, jsValue
+      rt, env, jsValue
     );
 
     map->put(convertedKey, convertedValue);

package/android/src/main/cpp/types/FrontendConverter.h

@@ -11,7 +11,7 @@ namespace jni = facebook::jni;
 namespace jsi = facebook::jsi;
 
 namespace expo {
-class JSIInteropModuleRegistry;
+class JSIContext;
 class SingleType;
 
 /**
@@ -35,7 +35,6 @@ public:
   virtual jobject convert(
     jsi::Runtime &rt,
     JNIEnv *env,
-    JSIInteropModuleRegistry *moduleRegistry,
     const jsi::Value &value
   ) const = 0;
 };
@@ -48,7 +47,6 @@ public:
   jobject convert(
     jsi::Runtime &rt,
     JNIEnv *env,
-    JSIInteropModuleRegistry *moduleRegistry,
     const jsi::Value &value
   ) const override;
 
@@ -63,7 +61,6 @@ public:
   jobject convert(
     jsi::Runtime &rt,
     JNIEnv *env,
-    JSIInteropModuleRegistry *moduleRegistry,
     const jsi::Value &value
   ) const override;
 
@@ -78,7 +75,6 @@ public:
   jobject convert(
     jsi::Runtime &rt,
     JNIEnv *env,
-    JSIInteropModuleRegistry *moduleRegistry,
     const jsi::Value &value
   ) const override;
 
@@ -93,7 +89,6 @@ public:
   jobject convert(
     jsi::Runtime &rt,
     JNIEnv *env,
-    JSIInteropModuleRegistry *moduleRegistry,
     const jsi::Value &value
   ) const override;
 
@@ -108,7 +103,6 @@ public:
   jobject convert(
     jsi::Runtime &rt,
     JNIEnv *env,
-    JSIInteropModuleRegistry *moduleRegistry,
     const jsi::Value &value
   ) const override;
 
@@ -123,7 +117,6 @@ public:
   jobject convert(
     jsi::Runtime &rt,
     JNIEnv *env,
-    JSIInteropModuleRegistry *moduleRegistry,
     const jsi::Value &value
   ) const override;
 
@@ -138,7 +131,6 @@ public:
   jobject convert(
     jsi::Runtime &rt,
     JNIEnv *env,
-    JSIInteropModuleRegistry *moduleRegistry,
     const jsi::Value &value
   ) const override;
 
@@ -153,7 +145,6 @@ public:
   jobject convert(
     jsi::Runtime &rt,
     JNIEnv *env,
-    JSIInteropModuleRegistry *moduleRegistry,
     const jsi::Value &value
   ) const override;
 
@@ -168,7 +159,6 @@ public:
   jobject convert(
     jsi::Runtime &rt,
     JNIEnv *env,
-    JSIInteropModuleRegistry *moduleRegistry,
     const jsi::Value &value
   ) const override;
 
@@ -183,7 +173,6 @@ public:
   jobject convert(
     jsi::Runtime &rt,
     JNIEnv *env,
-    JSIInteropModuleRegistry *moduleRegistry,
     const jsi::Value &value
   ) const override;
 
@@ -198,7 +187,6 @@ public:
   jobject convert(
     jsi::Runtime &rt,
     JNIEnv *env,
-    JSIInteropModuleRegistry *moduleRegistry,
     const jsi::Value &value
   ) const override;
 
@@ -213,7 +201,6 @@ public:
   jobject convert(
     jsi::Runtime &rt,
     JNIEnv *env,
-    JSIInteropModuleRegistry *moduleRegistry,
     const jsi::Value &value
   ) const override;
 
@@ -228,7 +215,6 @@ public:
   jobject convert(
     jsi::Runtime &rt,
     JNIEnv *env,
-    JSIInteropModuleRegistry *moduleRegistry,
     const jsi::Value &value
   ) const override;
 
@@ -243,7 +229,6 @@ public:
   jobject convert(
     jsi::Runtime &rt,
     JNIEnv *env,
-    JSIInteropModuleRegistry *moduleRegistry,
     const jsi::Value &value
   ) const override;
 
@@ -258,7 +243,6 @@ public:
   jobject convert(
     jsi::Runtime &rt,
     JNIEnv *env,
-    JSIInteropModuleRegistry *moduleRegistry,
     const jsi::Value &value
   ) const override;
 
@@ -275,7 +259,6 @@ public:
   jobject convert(
     jsi::Runtime &rt,
     JNIEnv *env,
-    JSIInteropModuleRegistry *moduleRegistry,
     const jsi::Value &value
   ) const override;
 
@@ -297,7 +280,6 @@ public:
   jobject convert(
     jsi::Runtime &rt,
     JNIEnv *env,
-    JSIInteropModuleRegistry *moduleRegistry,
     const jsi::Value &value
   ) const override;
 
@@ -317,7 +299,6 @@ public:
   jobject convert(
     jsi::Runtime &rt,
     JNIEnv *env,
-    JSIInteropModuleRegistry *moduleRegistry,
     const jsi::Value &value
   ) const override;
 
@@ -350,7 +331,6 @@ public:
   jobject convert(
     jsi::Runtime &rt,
     JNIEnv *env,
-    JSIInteropModuleRegistry *moduleRegistry,
     const jsi::Value &value
   ) const override;
 
@@ -374,7 +354,6 @@ public:
   jobject convert(
     jsi::Runtime &rt,
     JNIEnv *env,
-    JSIInteropModuleRegistry *moduleRegistry,
     const jsi::Value &value
   ) const override;
 
@@ -394,7 +373,6 @@ public:
   jobject convert(
     jsi::Runtime &rt,
     JNIEnv *env,
-    JSIInteropModuleRegistry *moduleRegistry,
     const jsi::Value &value
   ) const override;
 

package/android/src/main/cpp/types/JNIToJSIConverter.cpp

@@ -11,7 +11,7 @@
 
 namespace react = facebook::react;
 
-namespace {
+namespace expo {
 
 // This value should be synced with the value in **FollyDynamicExtensionConverter.kt**
 constexpr char DYNAMIC_EXTENSION_PREFIX[] = "__expo_dynamic_extension__#";
@@ -47,12 +47,7 @@ std::optional<jsi::Value> convertStringToFollyDynamicIfNeeded(jsi::Runtime &rt,
   return std::nullopt;
 }
 
-} // namespace
-
-namespace expo {
-
 jsi::Value convert(
-  JSIInteropModuleRegistry *moduleRegistry,
   JNIEnv *env,
   jsi::Runtime &rt,
   jni::local_ref<jobject> value
@@ -113,7 +108,6 @@ jsi::Value convert(
   if (env->IsInstanceOf(unpackedValue, JavaScriptModuleObject::javaClassStatic().get())) {
     auto anonymousObject = jni::static_ref_cast<JavaScriptModuleObject::javaobject>(value)
       ->cthis();
-    anonymousObject->jsiInteropModuleRegistry = moduleRegistry;
     auto jsiObject = anonymousObject->getJSIObject(rt);
 
     jni::global_ref<jobject> globalRef = jni::make_global(value);
@@ -134,12 +128,13 @@ jsi::Value convert(
       "expo/modules/kotlin/sharedobjects/SharedObject").clazz
   )) {
     auto jsObject = std::make_shared<jsi::Object>(jsi::Object(rt));
+    JSIContext *jsiContext = getJSIContext(rt);
     auto jsObjectRef = JavaScriptObject::newInstance(
-      moduleRegistry,
-      moduleRegistry->runtimeHolder,
+      jsiContext,
+      jsiContext->runtimeHolder,
       jsObject
     );
-    moduleRegistry->registerSharedObject(jni::make_local(unpackedValue), jsObjectRef);
+    jsiContext->registerSharedObject(jni::make_local(unpackedValue), jsObjectRef);
     return jsi::Value(rt, *jsObject);
   }
   if (env->IsInstanceOf(

package/android/src/main/cpp/types/JNIToJSIConverter.h

@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "../JSIInteropModuleRegistry.h"
+#include "../JSIContext.h"
 
 #include <fbjni/fbjni.h>
 #include <jsi/jsi.h>
@@ -14,12 +14,16 @@ namespace jsi = facebook::jsi;
 namespace expo {
 
 jsi::Value convert(
-  JSIInteropModuleRegistry *moduleRegistry,
   JNIEnv *env,
   jsi::Runtime &rt,
   jni::local_ref<jobject> value
 );
 
+/**
+ * Convert a string with FollyDynamicExtensionConverter support.
+ */
+std::optional<jsi::Value> convertStringToFollyDynamicIfNeeded(jsi::Runtime &rt, const std::string& string);
+
 /**
  * Decorate jsi::Value with FollyDynamicExtensionConverter support.
  */

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

@@ -5,6 +5,7 @@ import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ViewManager;
 
+import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -18,6 +19,7 @@ import expo.modules.core.interfaces.InternalModule;
 import expo.modules.core.interfaces.Package;
 import expo.modules.kotlin.AppContext;
 import expo.modules.kotlin.CoreLoggerKt;
+import expo.modules.kotlin.ExpoBridgeModule;
 import expo.modules.kotlin.KotlinInteropModuleRegistry;
 import expo.modules.kotlin.ModulesProvider;
 import expo.modules.kotlin.views.ViewWrapperDelegateHolder;
@@ -95,6 +97,7 @@ public class ModuleRegistryAdapter implements ReactPackage {
       nativeModulesList.addAll(reactPackage.createNativeModules(reactContext));
     }
 
+    nativeModulesList.add(new ExpoBridgeModule(reactContext, new WeakReference<>(nativeModulesProxy)));
     return nativeModulesList;
   }