expo-modules-core 1.11.13 → 1.12.1

package/android/src/main/cpp/JavaScriptRuntime.cpp

@@ -4,11 +4,13 @@
 #include "JavaScriptValue.h"
 #include "JavaScriptObject.h"
 #include "Exceptions.h"
-#include "JSIInteropModuleRegistry.h"
+#include "JSIContext.h"
 #include "JSIUtils.h"
 
 #if UNIT_TEST
 
+#include "TestingSyncJSCallInvoker.h"
+
 #if USE_HERMES
 
 #include <hermes/hermes.h>
@@ -27,32 +29,7 @@ namespace jsi = facebook::jsi;
 
 namespace expo {
 
-namespace {
-
-/**
- * Dummy CallInvoker that invokes everything immediately.
- * Used in the test environment to check the async flow.
- */
-class SyncCallInvoker : public react::CallInvoker {
-public:
-  void invokeAsync(std::function<void()> &&func) override {
-    func();
-  }
-
-  void invokeSync(std::function<void()> &&func) override {
-    func();
-  }
-
-  ~SyncCallInvoker() override = default;
-};
-
-} // namespace
-
-JavaScriptRuntime::JavaScriptRuntime(
-  JSIInteropModuleRegistry *jsiInteropModuleRegistry
-)
-  : jsInvoker(std::make_shared<SyncCallInvoker>()),
-    jsiInteropModuleRegistry(jsiInteropModuleRegistry) {
+JavaScriptRuntime::JavaScriptRuntime() {
 #if !UNIT_TEST
   throw std::logic_error(
     "The JavaScriptRuntime constructor is only available when UNIT_TEST is defined.");
@@ -86,6 +63,8 @@ JavaScriptRuntime::JavaScriptRuntime(
   runtime = facebook::jsc::makeJSCRuntime();
 #endif
 
+  jsInvoker = std::make_shared<TestingSyncJSCallInvoker>(runtime);
+
   // By default "global" property isn't set.
   runtime->global().setProperty(
     *runtime,
@@ -111,11 +90,9 @@ JavaScriptRuntime::JavaScriptRuntime(
 }
 
 JavaScriptRuntime::JavaScriptRuntime(
-  JSIInteropModuleRegistry *jsiInteropModuleRegistry,
   jsi::Runtime *runtime,
   std::shared_ptr<react::CallInvoker> jsInvoker
-) : jsInvoker(std::move(jsInvoker)),
-    jsiInteropModuleRegistry(jsiInteropModuleRegistry) {
+) : jsInvoker(std::move(jsInvoker)) {
   // Creating a shared pointer that points to the runtime but doesn't own it, thus doesn't release it.
   // In this code flow, the runtime should be owned by something else like the CatalystInstance.
   // See explanation for constructor (8): https://en.cppreference.com/w/cpp/memory/shared_ptr/shared_ptr
@@ -131,7 +108,7 @@ JavaScriptRuntime::evaluateScript(const std::string &script) {
   auto scriptBuffer = std::make_shared<jsi::StringBuffer>(script);
   try {
     return JavaScriptValue::newInstance(
-      jsiInteropModuleRegistry,
+      getJSIContext(get()),
       weak_from_this(),
       std::make_shared<jsi::Value>(runtime->evaluateJavaScript(scriptBuffer, "<<evaluated>>"))
     );
@@ -154,12 +131,12 @@ JavaScriptRuntime::evaluateScript(const std::string &script) {
 
 jni::local_ref<JavaScriptObject::javaobject> JavaScriptRuntime::global() {
   auto global = std::make_shared<jsi::Object>(runtime->global());
-  return JavaScriptObject::newInstance(jsiInteropModuleRegistry, weak_from_this(), global);
+  return JavaScriptObject::newInstance(getJSIContext(get()), weak_from_this(), global);
 }
 
 jni::local_ref<JavaScriptObject::javaobject> JavaScriptRuntime::createObject() {
   auto newObject = std::make_shared<jsi::Object>(*runtime);
-  return JavaScriptObject::newInstance(jsiInteropModuleRegistry, weak_from_this(), newObject);
+  return JavaScriptObject::newInstance(getJSIContext(get()), weak_from_this(), newObject);
 }
 
 void JavaScriptRuntime::drainJSEventLoop() {
@@ -167,9 +144,13 @@ void JavaScriptRuntime::drainJSEventLoop() {
 }
 
 void JavaScriptRuntime::installMainObject() {
-  auto coreModule = jsiInteropModuleRegistry->getCoreModule();
-  coreModule->cthis()->jsiInteropModuleRegistry = jsiInteropModuleRegistry;
-  mainObject = coreModule->cthis()->getJSIObject(*runtime);
+  auto coreModule = getJSIContext(get())->getCoreModule();
+
+  // As opposed to other modules, the core module is represented by a raw JS object instead of an instance of NativeModule class.
+  mainObject = std::make_shared<jsi::Object>(*runtime);
+
+  // Decorate the core object based on the module definition.
+  coreModule->cthis()->decorate(*runtime, mainObject.get());
 
   auto global = runtime->global();
 
@@ -177,7 +158,7 @@ void JavaScriptRuntime::installMainObject() {
 
   descriptor.setProperty(*runtime, "value", jsi::Value(*runtime, *mainObject));
 
-  common::definePropertyOnJSIObject(
+  common::defineProperty(
     *runtime,
     &global,
     "expo",
@@ -188,8 +169,4 @@ void JavaScriptRuntime::installMainObject() {
 std::shared_ptr<jsi::Object> JavaScriptRuntime::getMainObject() {
   return mainObject;
 }
-
-JSIInteropModuleRegistry *JavaScriptRuntime::getModuleRegistry() {
-  return jsiInteropModuleRegistry;
-}
 } // namespace expo

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

@@ -18,7 +18,7 @@ class JavaScriptValue;
 
 class JavaScriptObject;
 
-class JSIInteropModuleRegistry;
+class JSIContext;
 
 /**
  * A wrapper for the jsi::Runtime.
@@ -35,12 +35,9 @@ public:
    * This flow is mostly intended for tests. The JS call invoker is set to `SyncCallInvoker`.
    * See **JavaScriptRuntime.cpp** for the `SyncCallInvoker` implementation.
    */
-  JavaScriptRuntime(
-    JSIInteropModuleRegistry *jsiInteropModuleRegistry
-  );
+  JavaScriptRuntime();
 
   JavaScriptRuntime(
-    JSIInteropModuleRegistry *jsiInteropModuleRegistry,
     jsi::Runtime *runtime,
     std::shared_ptr<react::CallInvoker> jsInvoker
   );
@@ -80,11 +77,8 @@ public:
 
   std::shared_ptr<jsi::Object> getMainObject();
 
-  JSIInteropModuleRegistry *getModuleRegistry();
-
 private:
   std::shared_ptr<jsi::Runtime> runtime;
   std::shared_ptr<jsi::Object> mainObject;
-  JSIInteropModuleRegistry *jsiInteropModuleRegistry;
 };
 } // namespace expo

package/android/src/main/cpp/JavaScriptTypedArray.cpp

@@ -1,7 +1,7 @@
 #include "JavaScriptTypedArray.h"
 
 #include "JavaScriptRuntime.h"
-#include "JSIInteropModuleRegistry.h"
+#include "JSIContext.h"
 
 namespace expo {
 
@@ -91,7 +91,7 @@ void JavaScriptTypedArray::writeBuffer(
 }
 
 jni::local_ref<JavaScriptTypedArray::javaobject> JavaScriptTypedArray::newInstance(
-  JSIInteropModuleRegistry *jsiInteropModuleRegistry,
+  JSIContext *jSIContext,
   std::weak_ptr<JavaScriptRuntime> runtime,
   std::shared_ptr<jsi::Object> jsObject
 ) {
@@ -99,7 +99,7 @@ jni::local_ref<JavaScriptTypedArray::javaobject> JavaScriptTypedArray::newInstan
     std::move(runtime),
     std::move(jsObject)
   );
-  jsiInteropModuleRegistry->jniDeallocator->addReference(object);
+  jSIContext->jniDeallocator->addReference(object);
   return object;
 }
 }

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

@@ -26,7 +26,7 @@ public:
   static void registerNatives();
 
   static jni::local_ref<JavaScriptTypedArray::javaobject> newInstance(
-    JSIInteropModuleRegistry *jsiInteropModuleRegistry,
+    JSIContext *jSIContext,
     std::weak_ptr<JavaScriptRuntime> runtime,
     std::shared_ptr<jsi::Object> jsObject
   );

package/android/src/main/cpp/JavaScriptValue.cpp

@@ -8,7 +8,7 @@
 #include "JavaScriptFunction.h"
 #include "TypedArray.h"
 #include "Exceptions.h"
-#include "JSIInteropModuleRegistry.h"
+#include "JSIContext.h"
 
 namespace expo {
 void JavaScriptValue::registerNatives() {
@@ -157,7 +157,7 @@ jni::local_ref<JavaScriptObject::javaobject> JavaScriptValue::getObject() {
   auto &jsRuntime = runtimeHolder.getJSRuntime();
   auto jsObject = std::make_shared<jsi::Object>(jsValue->getObject(jsRuntime));
   return JavaScriptObject::newInstance(
-    runtimeHolder.getModuleRegistry(),
+    runtimeHolder.getJSIContext(),
     runtimeHolder,
     jsObject
   );
@@ -168,7 +168,7 @@ jni::local_ref<JavaScriptFunction::javaobject> JavaScriptValue::jniGetFunction()
   auto jsFunction = std::make_shared<jsi::Function>(
     jsValue->getObject(jsRuntime).asFunction(jsRuntime));
   return JavaScriptFunction::newInstance(
-    runtimeHolder.getModuleRegistry(),
+    runtimeHolder.getJSIContext(),
     runtimeHolder,
     jsFunction
   );
@@ -176,7 +176,7 @@ jni::local_ref<JavaScriptFunction::javaobject> JavaScriptValue::jniGetFunction()
 
 jni::local_ref<jni::JArrayClass<JavaScriptValue::javaobject>> JavaScriptValue::getArray() {
   auto &jsRuntime = runtimeHolder.getJSRuntime();
-  auto moduleRegistry = runtimeHolder.getModuleRegistry();
+  auto moduleRegistry = runtimeHolder.getJSIContext();
 
   auto jsArray = jsValue
     ->getObject(jsRuntime)
@@ -210,14 +210,14 @@ jni::local_ref<JavaScriptTypedArray::javaobject> JavaScriptValue::getTypedArray(
   auto &jsRuntime = runtimeHolder.getJSRuntime();
   auto jsObject = std::make_shared<jsi::Object>(jsValue->getObject(jsRuntime));
   return JavaScriptTypedArray::newInstance(
-    runtimeHolder.getModuleRegistry(),
+    runtimeHolder.getJSIContext(),
     runtimeHolder,
     jsObject
   );
 }
 
 jni::local_ref<JavaScriptValue::javaobject> JavaScriptValue::newInstance(
-  JSIInteropModuleRegistry *jsiInteropModuleRegistry,
+  JSIContext *jsiContext,
   std::weak_ptr<JavaScriptRuntime> runtime,
   std::shared_ptr<jsi::Value> jsValue
 ) {
@@ -225,7 +225,7 @@ jni::local_ref<JavaScriptValue::javaobject> JavaScriptValue::newInstance(
     std::move(runtime),
     std::move(jsValue)
   );
-  jsiInteropModuleRegistry->jniDeallocator->addReference(value);
+  jsiContext->jniDeallocator->addReference(value);
   return value;
 }
 } // namespace expo

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

@@ -36,7 +36,7 @@ public:
   static void registerNatives();
 
   static jni::local_ref<JavaScriptValue::javaobject> newInstance(
-    JSIInteropModuleRegistry *jsiInteropModuleRegistry,
+    JSIContext *jsiContext,
     std::weak_ptr<JavaScriptRuntime> runtime,
     std::shared_ptr<jsi::Value> jsValue
   );

package/android/src/main/cpp/JavaScriptWeakObject.cpp

@@ -1,7 +1,7 @@
 // Copyright 2015-present 650 Industries. All rights reserved.
 
 #include "JavaScriptWeakObject.h"
-#include "JSIInteropModuleRegistry.h"
+#include "JSIContext.h"
 
 namespace expo {
 
@@ -23,18 +23,18 @@ jni::local_ref<JavaScriptObject::javaobject> JavaScriptWeakObject::lock() {
   if (!objectPtr) {
     return nullptr;
   }
-  return JavaScriptObject::newInstance(_runtimeHolder.getModuleRegistry(),
+  return JavaScriptObject::newInstance(_runtimeHolder.getJSIContext(),
                                        _runtimeHolder, objectPtr);
 }
 
 jni::local_ref<jni::HybridClass<JavaScriptWeakObject, Destructible>::javaobject>
 JavaScriptWeakObject::newInstance(
-    JSIInteropModuleRegistry *jsiInteropModuleRegistry,
+    JSIContext *jSIContext,
     std::weak_ptr<JavaScriptRuntime> runtime,
     std::shared_ptr<jsi::Object> jsObject) {
   auto weakObject = JavaScriptWeakObject::newObjectCxxArgs(std::move(runtime),
                                                            std::move(jsObject));
-  jsiInteropModuleRegistry->jniDeallocator->addReference(weakObject);
+  jSIContext->jniDeallocator->addReference(weakObject);
   return weakObject;
 }
 

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

@@ -32,7 +32,7 @@ public:
 
   static jni::local_ref<
       jni::HybridClass<JavaScriptWeakObject, Destructible>::javaobject>
-  newInstance(JSIInteropModuleRegistry *jsiInteropModuleRegistry,
+  newInstance(JSIContext *jSIContext,
               std::weak_ptr<JavaScriptRuntime> runtime,
               std::shared_ptr<jsi::Object> jsObject);
 

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

@@ -1,5 +1,5 @@
 #include "MethodMetadata.h"
-#include "JSIInteropModuleRegistry.h"
+#include "JSIContext.h"
 #include "JavaScriptValue.h"
 #include "JavaScriptObject.h"
 #include "JavaScriptTypedArray.h"
@@ -10,6 +10,8 @@
 
 #include <utility>
 #include <functional>
+#include <unistd.h>
+#include <optional>
 
 #include "JSReferencesCache.h"
 
@@ -19,98 +21,25 @@ namespace react = facebook::react;
 
 namespace expo {
 
-// Modified version of the RN implementation
-// https://github.com/facebook/react-native/blob/7dceb9b63c0bfd5b13bf6d26f9530729506e9097/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp#L57
 jni::local_ref<JavaCallback::JavaPart> createJavaCallbackFromJSIFunction(
   jsi::Function &&function,
   jsi::Runtime &rt,
-  JSIInteropModuleRegistry *moduleRegistry,
   bool isRejectCallback = false
 ) {
-  std::shared_ptr<react::CallInvoker> jsInvoker = moduleRegistry->runtimeHolder->jsInvoker;
-  auto weakWrapper = react::CallbackWrapper::createWeak(std::move(function), rt,
-                                                        std::move(jsInvoker));
-
-  // This needs to be a shared_ptr because:
-  // 1. It cannot be unique_ptr. std::function is copyable but unique_ptr is
-  // not.
-  // 2. It cannot be weak_ptr since we need this object to live on.
-  // 3. It cannot be a value, because that would be deleted as soon as this
-  // function returns.
-  auto callbackWrapperOwner =
-    std::make_shared<react::RAIICallbackWrapperDestroyer>(weakWrapper);
-
-  std::function<void(folly::dynamic)> fn =
-    [
-      weakWrapper,
-      callbackWrapperOwner = std::move(callbackWrapperOwner),
-      wrapperWasCalled = false,
-      isRejectCallback
-    ](
-      folly::dynamic responses) mutable {
-      if (wrapperWasCalled) {
-        throw std::runtime_error(
-          "callback 2 arg cannot be called more than once");
-      }
-
-      auto strongWrapper = weakWrapper.lock();
-      if (!strongWrapper) {
-        return;
-      }
+  JSIContext *jsiContext = getJSIContext(rt);
+  std::shared_ptr<react::CallInvoker> jsInvoker = jsiContext->runtimeHolder->jsInvoker;
+
+  std::shared_ptr<JavaCallback::CallbackContext> callbackContext = std::make_shared<JavaCallback::CallbackContext>(
+    rt,
+    std::move(jsInvoker),
+    std::move(function),
+    isRejectCallback
+  );
 
-      strongWrapper->jsInvoker().invokeAsync(
-        [
-          weakWrapper,
-          callbackWrapperOwner = std::move(callbackWrapperOwner),
-          responses = std::move(responses),
-          isRejectCallback
-        ]() mutable {
-          auto strongWrapper2 = weakWrapper.lock();
-          if (!strongWrapper2) {
-            return;
-          }
-
-          jsi::Value arg = jsi::valueFromDynamic(strongWrapper2->runtime(), responses);
-          auto enhancedArg = decorateValueForDynamicExtension(strongWrapper2->runtime(), arg);
-          if (enhancedArg) {
-            arg = std::move(*enhancedArg);
-          }
-          if (!isRejectCallback) {
-            strongWrapper2->callback().call(
-              strongWrapper2->runtime(),
-              (const jsi::Value *) &arg,
-              (size_t) 1
-            );
-          } else {
-            auto &rt = strongWrapper2->runtime();
-            auto jsErrorObject = arg.getObject(rt);
-            auto errorCode = jsErrorObject.getProperty(rt, "code").asString(rt);
-            auto message = jsErrorObject.getProperty(rt, "message").asString(rt);
-
-            auto codedError = makeCodedError(
-              rt,
-              std::move(errorCode),
-              std::move(message)
-            );
-
-            strongWrapper2->callback().call(
-              strongWrapper2->runtime(),
-              (const jsi::Value *) &codedError,
-              (size_t) 1
-            );
-          }
-
-          callbackWrapperOwner.reset();
-        });
-
-      wrapperWasCalled = true;
-    };
-
-  return JavaCallback::newInstance(moduleRegistry, std::move(fn));
+  return JavaCallback::newInstance(jsiContext, std::move(callbackContext));
 }
 
 jobjectArray MethodMetadata::convertJSIArgsToJNI(
-  JSIInteropModuleRegistry *moduleRegistry,
   JNIEnv *env,
   jsi::Runtime &rt,
   const jsi::Value &thisValue,
@@ -157,7 +86,7 @@ jobjectArray MethodMetadata::convertJSIArgsToJNI(
     auto &type = argTypes[argIndex];
 
     if (type->converter->canConvert(rt, arg)) {
-      auto converterValue = type->converter->convert(rt, env, moduleRegistry, arg);
+      auto converterValue = type->converter->convert(rt, env, arg);
       env->SetObjectArrayElement(argumentArray, argIndex, converterValue);
       env->DeleteLocalRef(converterValue);
     } else if (arg.isNull() || arg.isUndefined()) {
@@ -210,14 +139,13 @@ MethodMetadata::MethodMetadata(
 }
 
 std::shared_ptr<jsi::Function> MethodMetadata::toJSFunction(
-  jsi::Runtime &runtime,
-  JSIInteropModuleRegistry *moduleRegistry
+  jsi::Runtime &runtime
 ) {
   if (body == nullptr) {
     if (isAsync) {
-      body = std::make_shared<jsi::Function>(toAsyncFunction(runtime, moduleRegistry));
+      body = std::make_shared<jsi::Function>(toAsyncFunction(runtime));
     } else {
-      body = std::make_shared<jsi::Function>(toSyncFunction(runtime, moduleRegistry));
+      body = std::make_shared<jsi::Function>(toSyncFunction(runtime));
     }
   }
 
@@ -225,23 +153,27 @@ std::shared_ptr<jsi::Function> MethodMetadata::toJSFunction(
 }
 
 jsi::Function MethodMetadata::toSyncFunction(
-  jsi::Runtime &runtime,
-  JSIInteropModuleRegistry *moduleRegistry
+  jsi::Runtime &runtime
 ) {
+  auto weakThis = weak_from_this();
   return jsi::Function::createFromHostFunction(
     runtime,
-    moduleRegistry->jsRegistry->getPropNameID(runtime, name),
+    getJSIContext(runtime)->jsRegistry->getPropNameID(runtime, name),
     argTypes.size(),
-    [this, moduleRegistry](
+    [weakThis = std::move(weakThis)](
       jsi::Runtime &rt,
       const jsi::Value &thisValue,
       const jsi::Value *args,
       size_t count
     ) -> jsi::Value {
       try {
-        return this->callSync(
+        auto thisPtr = weakThis.lock();
+        if (thisPtr == nullptr) {
+          return jsi::Value::undefined();
+        }
+
+        return thisPtr->callSync(
           rt,
-          moduleRegistry,
           thisValue,
           args,
           count
@@ -255,7 +187,6 @@ jsi::Function MethodMetadata::toSyncFunction(
 jni::local_ref<jobject> MethodMetadata::callJNISync(
   JNIEnv *env,
   jsi::Runtime &rt,
-  JSIInteropModuleRegistry *moduleRegistry,
   const jsi::Value &thisValue,
   const jsi::Value *args,
   size_t count
@@ -264,7 +195,7 @@ jni::local_ref<jobject> MethodMetadata::callJNISync(
     return nullptr;
   }
 
-  auto convertedArgs = convertJSIArgsToJNI(moduleRegistry, env, rt, thisValue, args, count);
+  auto convertedArgs = convertJSIArgsToJNI(env, rt, thisValue, args, count);
 
   // Cast in this place is safe, cause we know that this function is promise-less.
   auto syncFunction = jni::static_ref_cast<JNIFunctionBody>(this->jBodyReference);
@@ -278,7 +209,6 @@ jni::local_ref<jobject> MethodMetadata::callJNISync(
 
 jsi::Value MethodMetadata::callSync(
   jsi::Runtime &rt,
-  JSIInteropModuleRegistry *moduleRegistry,
   const jsi::Value &thisValue,
   const jsi::Value *args,
   size_t count
@@ -291,33 +221,30 @@ jsi::Value MethodMetadata::callSync(
   */
   jni::JniLocalScope scope(env, (int) count);
 
-  auto result = this->callJNISync(env, rt, moduleRegistry, thisValue, args, count);
-  return convert(moduleRegistry, env, rt, std::move(result));
+  auto result = this->callJNISync(env, rt, thisValue, args, count);
+  return convert(env, rt, std::move(result));
 }
 
 jsi::Function MethodMetadata::toAsyncFunction(
-  jsi::Runtime &runtime,
-  JSIInteropModuleRegistry *moduleRegistry
+  jsi::Runtime &runtime
 ) {
+  auto weakThis = weak_from_this();
   return jsi::Function::createFromHostFunction(
     runtime,
-    moduleRegistry->jsRegistry->getPropNameID(runtime, name),
+    getJSIContext(runtime)->jsRegistry->getPropNameID(runtime, name),
     argTypes.size(),
-    [this, moduleRegistry](
+    [weakThis = std::move(weakThis)](
       jsi::Runtime &rt,
       const jsi::Value &thisValue,
       const jsi::Value *args,
       size_t count
     ) -> jsi::Value {
-      /**
-       * Halt execution during cleaning phase as modules and js context will be deallocated soon.
-       * The output of this method doesn't matter.
-       * We added that check to prevent the app from crashing when users reload their apps.
-       */
-      if (moduleRegistry->wasDeallocated) {
+      auto thisPtr = weakThis.lock();
+      if (thisPtr == nullptr) {
         return jsi::Value::undefined();
       }
 
+      JSIContext *jsiContext = getJSIContext(rt);
       JNIEnv *env = jni::Environment::current();
 
       /**
@@ -327,19 +254,19 @@ jsi::Function MethodMetadata::toAsyncFunction(
        */
       jni::JniLocalScope scope(env, (int) count);
 
-      auto &Promise = moduleRegistry->jsRegistry->getObject<jsi::Function>(
+      auto &Promise = jsiContext->jsRegistry->getObject<jsi::Function>(
         JSReferencesCache::JSKeys::PROMISE
       );
 
       try {
-        auto convertedArgs = convertJSIArgsToJNI(moduleRegistry, env, rt, thisValue, args, count);
+        auto convertedArgs = thisPtr->convertJSIArgsToJNI(env, rt, thisValue, args, count);
         auto globalConvertedArgs = (jobjectArray) env->NewGlobalRef(convertedArgs);
         env->DeleteLocalRef(convertedArgs);
 
         // Creates a JSI promise
         jsi::Value promise = Promise.callAsConstructor(
           rt,
-          createPromiseBody(rt, moduleRegistry, globalConvertedArgs)
+          thisPtr->createPromiseBody(rt, globalConvertedArgs)
         );
         return promise;
       } catch (jni::JniException &jniException) {
@@ -356,7 +283,7 @@ jsi::Function MethodMetadata::toAsyncFunction(
           rt,
           jsi::Function::createFromHostFunction(
             rt,
-            moduleRegistry->jsRegistry->getPropNameID(rt, "promiseFn"),
+            jsiContext->jsRegistry->getPropNameID(rt, "promiseFn"),
             2,
             [code, message](
               jsi::Runtime &rt,
@@ -390,14 +317,13 @@ jsi::Function MethodMetadata::toAsyncFunction(
 
 jsi::Function MethodMetadata::createPromiseBody(
   jsi::Runtime &runtime,
-  JSIInteropModuleRegistry *moduleRegistry,
   jobjectArray globalArgs
 ) {
   return jsi::Function::createFromHostFunction(
     runtime,
-    moduleRegistry->jsRegistry->getPropNameID(runtime, "promiseFn"),
+    getJSIContext(runtime)->jsRegistry->getPropNameID(runtime, "promiseFn"),
     2,
-    [this, globalArgs, moduleRegistry](
+    [this, globalArgs](
       jsi::Runtime &rt,
       const jsi::Value &thisVal,
       const jsi::Value *promiseConstructorArgs,
@@ -412,14 +338,12 @@ jsi::Function MethodMetadata::createPromiseBody(
 
       jobject resolve = createJavaCallbackFromJSIFunction(
         std::move(resolveJSIFn),
-        rt,
-        moduleRegistry
+        rt
       ).release();
 
       jobject reject = createJavaCallbackFromJSIFunction(
         std::move(rejectJSIFn),
         rt,
-        moduleRegistry,
         true
       ).release();