Preparation work

FabricExample/ios/FabricExample.xcodeproj/project.pbxproj

@@ -562,7 +562,7 @@
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -634,7 +634,7 @@
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

android/CMakeLists.txt

@@ -3,18 +3,18 @@ cmake_minimum_required(VERSION 3.12.0)
 
 set (CMAKE_VERBOSE_MAKEFILE ON)
 set (CMAKE_CXX_STANDARD 17)
-set (DEFAULT_FLAGS "-DFOLLY_NO_CONFIG=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -DFOLLY_HAVE_MEMRCHR=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_MOBILE=1 -DFOLLY_HAVE_RECVMMSG=1 -DFOLLY_HAVE_PTHREAD=1 -DON_ANDROID -DONANDROID -DANDROID -DRNVERSION=${RNVERSION} -fexceptions -fno-omit-frame-pointer -frtti -Wno-sign-compare -std=c++17 -Wall")
+set (DEFAULT_FLAGS "-DFOLLY_NO_CONFIG=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -DFOLLY_HAVE_MEMRCHR=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_MOBILE=1 -DFOLLY_HAVE_RECVMMSG=1 -DFOLLY_HAVE_PTHREAD=1 -DON_ANDROID -DONANDROID -DANDROID -DRNVERSION=${RNVERSION} -DHERMES_ENABLE_DEBUGGER=1 -fexceptions -fno-omit-frame-pointer -frtti -Wno-sign-compare -std=c++17 -Wall")
 if(${IS_NEW_ARCHITECTURE_ENABLED})
     set (ALL_FLAGS "${DEFAULT_FLAGS} -DRCT_NEW_ARCH_ENABLED")
 else()
     set (ALL_FLAGS ${DEFAULT_FLAGS})
 endif()
 set (CMAKE_CXX_FLAGS ${ALL_FLAGS})
 
-if(${NATIVE_DEBUG})
+#if(${NATIVE_DEBUG})
     set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")
-endif()
+#endif()
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE INTERNAL "")
@@ -82,6 +82,37 @@ add_library(
         ${REANIMATED_UI_MANAGER_BINDING_CPP}
 )
 
+# build hermes-inspector
+#[[
+file(
+        GLOB_RECURSE
+        HERMES_INSPECTOR_SOURCES_CPP
+        "${NODE_MODULES_DIR}/react-native/ReactCommon/hermes/inspector/*.cpp"
+)
+add_library(
+        hermes-inspector
+        SHARED
+        ${HERMES_INSPECTOR_SOURCES_CPP}
+)
+target_include_directories(
+        hermes-inspector
+        PUBLIC
+        "${NODE_MODULES_DIR}/react-native/sdks/hermes/API/"
+        "${NODE_MODULES_DIR}/react-native/ReactAndroid/build/third-party-ndk/libevent/include/"
+        "${NODE_MODULES_DIR}/react-native/ReactAndroid/hermes-engine/build/hermes/external/llvh/include/"
+        "${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/jni/first-party/fbjni/headers/"
+        "${NODE_MODULES_DIR}/react-native/ReactCommon/"
+        "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi"
+        "${NODE_MODULES_DIR}/react-native/sdks/hermes/public/"
+        "${NODE_MODULES_DIR}/react-native/sdks/hermes/external/llvh/include/"
+        "${NODE_MODULES_DIR}/react-native/sdks/hermes/external/llvh/utils/unittest/googletest/include/"
+        "${NODE_MODULES_DIR}/react-native/sdks/hermes/external/llvh/utils/unittest/googlemock/include/"
+        "${BUILD_DIR}/third-party-ndk/glog/exported/"
+        "${BUILD_DIR}/third-party-ndk/folly/"
+        "${BUILD_DIR}/third-party-ndk/double-conversion"
+        "${BUILD_DIR}/third-party-ndk/boost/boost_${BOOST_VERSION}"
+)
+]]
 # includes
 
 file (GLOB LIBFBJNI_INCLUDE_DIR ${FBJNI_HEADERS_DIR})
@@ -102,6 +133,7 @@ target_include_directories(
         "${NODE_MODULES_DIR}/react-native/ReactCommon"
         "${NODE_MODULES_DIR}/react-native/ReactCommon/callinvoker"
         "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi"
+        "${NODE_MODULES_DIR}/react-native/ReactCommon/hermes"
         "${NODE_MODULES_DIR}/react-native/ReactCommon/react/renderer/graphics/platform/cxx"
         "${NODE_MODULES_DIR}/react-native/ReactCommon/runtimeexecutor"
         "${NODE_MODULES_DIR}/react-native/ReactCommon/turbomodule/core"
@@ -117,6 +149,7 @@ target_include_directories(
         "${COMMON_SRC_DIR}/cpp/headers/Fabric"
         "${COMMON_SRC_DIR}/cpp/hidden_headers"
         "${SRC_DIR}/main/cpp/headers"
+        "${SRC_DIR}/main/cpp/NativeProxy.cpp"
 )
 
 find_library(
@@ -141,7 +174,28 @@ find_library(
         PATHS ${LIBRN_DIR}
         NO_CMAKE_FIND_ROOT_PATH
 )
+#[[
+find_library(
+        FB_LIB
+        fb
+        PATHS ${LIBRN_DIR}
+        NO_CMAKE_FIND_ROOT_PATH
+)
 
+find_library(
+        JS_INSPECTOR_LIB
+        jsinspector
+        PATHS ${LIBRN_DIR}
+        NO_CMAKE_FIND_ROOT_PATH
+)
+
+find_library(
+        FOLLY_FUTURES_LIB
+        folly_futures
+        PATHS ${LIBRN_DIR}
+        NO_CMAKE_FIND_ROOT_PATH
+)
+]]
 if(${REACT_NATIVE_TARGET_VERSION} LESS 69)
     find_library(
             FOLLY_LIB
@@ -256,9 +310,30 @@ if(${JS_RUNTIME} STREQUAL "hermes")
             PATHS ${HERMES_DIR}
             NO_CMAKE_FIND_ROOT_PATH
     )
+    file (GLOB HERMES_INSPECTOR_DIR "${BUILD_DIR}/third-party-ndk/hermes-inspector/${ANDROID_ABI}")
+    find_library(
+            HERMES_INSPECTOR_LIB
+            hermes-inspector
+            PATHS ${HERMES_INSPECTOR_DIR}
+            NO_CMAKE_FIND_ROOT_PATH
+    )
+#[[
+    target_link_libraries(
+        hermes-inspector
+        ${HERMES_LIB}
+        ${FOLLY_LIB}
+        ${FOLLY_FUTURES_LIB}
+        ${JSI_LIB}
+        ${GLOG_LIB}
+        ${FB_LIB}
+        ${FBJNI_LIB}
+        ${JS_INSPECTOR_LIB}
+    )
+]]
     target_link_libraries(
             ${PACKAGE_NAME}
             ${HERMES_LIB}
+            ${HERMES_INSPECTOR_LIB}
     )
 elseif(${JS_RUNTIME} STREQUAL "v8")
     string(APPEND CMAKE_CXX_FLAGS " -DJS_RUNTIME_V8=1")

android/build.gradle

@@ -457,6 +457,18 @@ task prepareHermes() {
             from "$reactNative/ReactAndroid/src/main/jni/first-party/hermes/Android.mk"
             into "$thirdPartyNdkDir/hermes"
         }
+
+        // Hermes inspector and dependencies
+        copy {
+            include "**/*.so"
+            from "../hermes-inspector"
+            into "../FabricExample/android/app/build/intermediates/merged_native_libs/debug/out/lib"
+        }
+        copy {
+            include "**/*.so"
+            from "../hermes-inspector"
+            into "../FabricExample/android/app/build/intermediates/stripped_native_libs/debug/out/lib"
+        }
     }
 }
 

android/src/fabric/java/com/swmansion/reanimated/NativeProxy.java

@@ -7,6 +7,10 @@
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.ReactApplication;
 import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.queue.MessageQueueThread;
+import com.facebook.react.bridge.queue.QueueThreadExceptionHandler;
+import com.facebook.react.bridge.queue.ReactQueueConfigurationImpl;
+import com.facebook.react.bridge.queue.ReactQueueConfigurationSpec;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableNativeArray;
@@ -144,7 +148,9 @@ private native HybridData initHybrid(
       LayoutAnimations LayoutAnimations,
       FabricUIManager fabricUIManager);
 
-  private native void installJSIBindings(FabricUIManager fabricUIManager);
+  private native void installJSIBindings(
+    FabricUIManager fabricUIManager,
+    MessageQueueThread messageQueueThread);
 
   public native boolean isAnyHandlerWaitingForEvent(String eventName);
 
@@ -270,7 +276,16 @@ public void prepare(LayoutAnimations LayoutAnimations) {
     mNodesManager = mContext.get().getNativeModule(ReanimatedModule.class).getNodesManager();
     FabricUIManager fabricUIManager =
         (FabricUIManager) UIManagerHelper.getUIManager(mContext.get(), UIManagerType.FABRIC);
-    installJSIBindings(fabricUIManager);
+    ReactQueueConfigurationImpl queueHolder = ReactQueueConfigurationImpl.create(
+        ReactQueueConfigurationSpec.createDefault(),
+        new QueueThreadExceptionHandler() {
+          @Override
+          public void handleException(Exception e) {
+            throw new RuntimeException(e);
+          }
+        }
+    );
+    installJSIBindings(fabricUIManager, queueHolder.getUIQueueThread());
     AnimationsManager animationsManager =
         mContext
             .get()

android/src/main/cpp/NativeProxy.cpp

@@ -29,6 +29,11 @@
 #include "ReanimatedUIManagerBinding.h"
 #endif
 
+#if JS_RUNTIME_HERMES
+#include "HermesExecutorRuntimeAdapter.h"
+#include "react/jni/JMessageQueueThread.h"
+#endif
+
 namespace reanimated {
 
 using namespace facebook;
@@ -107,7 +112,8 @@ jni::local_ref<NativeProxy::jhybriddata> NativeProxy::initHybrid(
 void NativeProxy::installJSIBindings(
 #ifdef RCT_NEW_ARCH_ENABLED
     jni::alias_ref<facebook::react::JFabricUIManager::javaobject>
-        fabricUIManager
+        fabricUIManager,
+    jni::alias_ref<JavaMessageQueueThread::javaobject> messageQueueThread
 #endif
     /**/) {
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -203,8 +209,22 @@ void NativeProxy::installJSIBindings(
 #if JS_RUNTIME_HERMES
   auto config =
       ::hermes::vm::RuntimeConfig::Builder().withEnableSampleProfiling(false);
-  std::shared_ptr<jsi::Runtime> animatedRuntime =
+// OLD CODE
+#if false
+    std::shared_ptr<jsi::Runtime> animatedRuntime =
+        facebook::hermes::makeHermesRuntime(config.build());
+  // NEW CODE
+#else
+  std::unique_ptr<facebook::hermes::HermesRuntime> runtime =
       facebook::hermes::makeHermesRuntime(config.build());
+  facebook::hermes::HermesRuntime &hermesRuntimeRef = *runtime;
+  auto jsQueue = std::make_shared<JMessageQueueThread>(messageQueueThread);
+  auto adapter = std::make_unique<HermesExecutorRuntimeAdapter>(
+      std::move(runtime), hermesRuntimeRef, jsQueue);
+  std::shared_ptr<jsi::Runtime> animatedRuntime = adapter->runtime_;
+  facebook::hermes::inspector::chrome::enableDebugging(
+      std::move(adapter), "Reanimated runtime");
+#endif
 #elif JS_RUNTIME_V8
   auto config = std::make_unique<rnv8::V8RuntimeConfig>();
   config->enableInspector = false;

android/src/main/cpp/headers/HermesExecutorRuntimeAdapter.h

@@ -0,0 +1,50 @@
+#pragma once
+
+#include <hermes/hermes.h>
+#include <hermes/inspector/RuntimeAdapter.h>
+#include <hermes/inspector/chrome/Registration.h>
+#include <memory>
+
+namespace reanimated {
+
+using namespace facebook;
+using namespace react;
+
+class HermesExecutorRuntimeAdapter
+    : public facebook::hermes::inspector::RuntimeAdapter {
+ public:
+  HermesExecutorRuntimeAdapter(
+      std::shared_ptr<facebook::jsi::Runtime> runtime,
+      facebook::hermes::HermesRuntime &hermesRuntime,
+      std::shared_ptr<MessageQueueThread> thread)
+      : runtime_(runtime),
+        hermesRuntime_(hermesRuntime),
+        thread_(std::move(thread)) {}
+
+  virtual ~HermesExecutorRuntimeAdapter(){};
+
+  facebook::jsi::Runtime &getRuntime() override {
+    return *runtime_;
+  }
+
+  facebook::hermes::debugger::Debugger &getDebugger() override {
+    return hermesRuntime_.getDebugger();
+  }
+
+  void tickleJs() override {
+    // The queue will ensure that runtime_ is still valid when this
+    // gets invoked.
+    thread_->runOnQueue([&runtime = runtime_]() {
+      auto func =
+          runtime->global().getPropertyAsFunction(*runtime, "__tickleJs");
+      func.call(*runtime);
+    });
+  }
+
+ public:
+  std::shared_ptr<facebook::jsi::Runtime> runtime_;
+  facebook::hermes::HermesRuntime &hermesRuntime_;
+  std::shared_ptr<MessageQueueThread> thread_;
+};
+
+} // namespace reanimated

android/src/main/cpp/headers/NativeProxy.h

@@ -160,7 +160,8 @@ class NativeProxy : public jni::HybridClass<NativeProxy> {
 #endif
 #ifdef RCT_NEW_ARCH_ENABLED
   void installJSIBindings(
-      jni::alias_ref<JFabricUIManager::javaobject> fabricUIManager);
+      jni::alias_ref<JFabricUIManager::javaobject> fabricUIManager,
+      jni::alias_ref<JavaMessageQueueThread::javaobject> messageQueueThread);
   void synchronouslyUpdateUIProps(
       jsi::Runtime &rt,
       Tag viewTag,