Fix runtime creation

Common/cpp/NativeModules/NativeReanimatedModule.cpp

@@ -58,12 +58,12 @@ std::vector<std::shared_ptr<MutableValue>> extractMutablesFromArray(jsi::Runtime
 
 NativeReanimatedModule::NativeReanimatedModule(std::shared_ptr<CallInvoker> jsInvoker,
                                                std::shared_ptr<Scheduler> scheduler,
-                                               std::unique_ptr<jsi::Runtime> rt,
+                                               std::shared_ptr<jsi::Runtime> rt,
                                                std::shared_ptr<ErrorHandler> errorHandler,
                                                std::function<jsi::Value(jsi::Runtime &, const int, const jsi::String &)> propObtainer,
                                                PlatformDepMethodsHolder platformDepMethodsHolder) :
                                                   NativeReanimatedModuleSpec(jsInvoker),
-                                                  RuntimeManager(std::move(rt), errorHandler, scheduler),
+                                                  RuntimeManager(rt, errorHandler, scheduler),
                                                   mapperRegistry(std::make_shared<MapperRegistry>()),
                                                   eventHandlerRegistry(std::make_shared<EventHandlerRegistry>()),
                                                   requestRender(platformDepMethodsHolder.requestRender),

Common/cpp/headers/NativeModules/NativeReanimatedModule.h

@@ -28,7 +28,7 @@ class NativeReanimatedModule : public NativeReanimatedModuleSpec, public Runtime
 public:
   NativeReanimatedModule(std::shared_ptr<CallInvoker> jsInvoker,
                          std::shared_ptr<Scheduler> scheduler,
-                         std::unique_ptr<jsi::Runtime> rt,
+                         std::shared_ptr<jsi::Runtime> rt,
                          std::shared_ptr<ErrorHandler> errorHandler,
                          std::function<jsi::Value(jsi::Runtime &, const int, const jsi::String &)> propObtainer,
                          PlatformDepMethodsHolder platformDepMethodsHolder);

Common/cpp/headers/SharedItems/RuntimeManager.h

@@ -16,9 +16,9 @@ using namespace facebook;
  */
 class RuntimeManager {
 public:
-  RuntimeManager(std::unique_ptr<jsi::Runtime>&& runtime,
+  RuntimeManager(std::shared_ptr<jsi::Runtime> _runtime,
                  std::shared_ptr<ErrorHandler> errorHandler,
-                 std::shared_ptr<Scheduler> scheduler): runtime(std::move(runtime)), errorHandler(errorHandler), scheduler(scheduler), workletsCache(std::make_unique<WorkletsCache>()) { }
+                 std::shared_ptr<Scheduler> scheduler): runtime(_runtime), errorHandler(errorHandler), scheduler(scheduler), workletsCache(std::make_unique<WorkletsCache>()) { }
 public:
   /**
    Holds the jsi::Function worklet that is responsible for updating values in JS.
@@ -28,7 +28,7 @@ class RuntimeManager {
   /**
    Holds the jsi::Runtime this RuntimeManager is managing.
    */
-  std::unique_ptr<jsi::Runtime> runtime;
+  std::shared_ptr<jsi::Runtime> runtime;
   /**
    Holds the error handler that will be invoked when any kind of error occurs.
    */

Example/android/app/build.gradle

@@ -156,6 +156,7 @@ android {
         pickFirst 'lib/**/libhermes.so'
         pickFirst 'lib/**/libfolly_json.so'
         pickFirst 'lib/**/jscexecutor.so'
+        pickFirst 'lib/**/libhermes-inspector.so'
     }
 }
 

android/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5.1)
 
 set (CMAKE_VERBOSE_MAKEFILE ON)
 set (CMAKE_CXX_STANDARD 14)
-set (CMAKE_CXX_FLAGS "-DFOLLY_NO_CONFIG=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -DFOLLY_HAVE_MEMRCHR=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_MOBILE=1 -DON_ANDROID -DONANDROID -fexceptions -fno-omit-frame-pointer -frtti -Wno-sign-compare")
+set (CMAKE_CXX_FLAGS "-DFOLLY_NO_CONFIG=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -DFOLLY_HAVE_MEMRCHR=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_MOBILE=1 -DON_ANDROID -DONANDROID -fexceptions -fno-omit-frame-pointer -frtti -Wno-sign-compare -DHERMES_ENABLE_DEBUGGER=1")
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE INTERNAL "")
@@ -63,6 +63,8 @@ target_include_directories(
         "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi"
         "${NODE_MODULES_DIR}/react-native/ReactCommon/turbomodule/core"
         "${NODE_MODULES_DIR}/react-native/ReactCommon/turbomodule"
+        "${NODE_MODULES_DIR}/react-native/ReactCommon/runtimeexecutor"
+        "${NODE_MODULES_DIR}/hermes-engine/android/include/"
         "./src/main/Common/cpp/headers/Tools"
         "./src/main/Common/cpp/headers/SpecTools"
         "./src/main/Common/cpp/headers/NativeModules"
@@ -125,6 +127,12 @@ find_library(
         PATHS ${LIBRN_DIR}
         NO_CMAKE_FIND_ROOT_PATH
 )
+find_library(
+        HERMES_INSPECTOR_LIB
+        hermes-inspector
+        PATHS ${LIBRN_DIR}
+        NO_CMAKE_FIND_ROOT_PATH
+)
 # build shared lib
 
 set_target_properties(${PACKAGE_NAME} PROPERTIES LINKER_LANGUAGE CXX)
@@ -136,6 +144,7 @@ if(${FOR_HERMES})
             ${PACKAGE_NAME}
             ${LOG_LIB}
             ${HERMES_LIB}
+            ${HERMES_INSPECTOR_LIB}
             ${GLOG_LIB}
             ${FBJNI_LIB}
             ${FOLLY_JSON_LIB}

android/src/main/cpp/NativeProxy.cpp

@@ -1,17 +1,14 @@
 #include <memory>
 #include <string>
-
-#include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
 #include <react/jni/ReadableNativeArray.h>
 #include <react/jni/ReadableNativeMap.h>
 #include <jsi/JSIDynamic.h>
-
 #include "NativeProxy.h"
 #include "AndroidErrorHandler.h"
 #include "AndroidScheduler.h"
-#include <android/log.h>
 #include "PlatformDepMethodsHolder.h"
+#include <hermes/inspector/RuntimeAdapter.h>
+#include <hermes/inspector/chrome/Registration.h>
 
 namespace reanimated
 {
@@ -31,18 +28,26 @@ NativeProxy::NativeProxy(
 }
 
 JavaScriptExecutorHolder* NativeProxy::_javaScriptExecutor = NULL;
+std::shared_ptr<jsi::Runtime> NativeProxy::_animatedRuntime;
+RuntimeProvider NativeProxy::runtimeProvider;
 
 jni::local_ref<NativeProxy::jhybriddata> NativeProxy::initHybrid(
     jni::alias_ref<jhybridobject> jThis,
     jlong jsContext,
     jni::alias_ref<facebook::react::CallInvokerHolder::javaobject> jsCallInvokerHolder,
     jni::alias_ref<AndroidScheduler::javaobject> androidScheduler,
-    JavaScriptExecutorHolder* javaScriptExecutor)
+    JavaScriptExecutorHolder* javaScriptExecutor,
+    jni::alias_ref<JavaMessageQueueThread::javaobject> messageQueueThread,
+    bool isDebug,
+    int runtimeType)
 {
   auto jsCallInvoker = jsCallInvokerHolder->cthis()->getCallInvoker();
   auto scheduler = androidScheduler->cthis()->getScheduler();
   scheduler->setJSCallInvoker(jsCallInvoker);
   _javaScriptExecutor = javaScriptExecutor;
+
+  _animatedRuntime = runtimeProvider.createRuntime(javaScriptExecutor, messageQueueThread, isDebug, runtimeType);
+
   return makeCxxInstance(jThis, (jsi::Runtime *)jsContext, jsCallInvoker, scheduler);
 }
 
@@ -91,16 +96,7 @@ void NativeProxy::installJSIBindings()
   auto scrollToFunction = [this](int viewTag, double x, double y, bool animated) -> void {
     scrollTo(viewTag, x, y, animated);
   };
-
-  std::shared_ptr<ExecutorDelegate> delegate = std::shared_ptr<ExecutorDelegate>();
-  std::shared_ptr<MessageQueueThread> jsQueue = std::shared_ptr<MessageQueueThread>();
-  factory = _javaScriptExecutor->getExecutorFactory();
-  executor = factory.get()->createJSExecutor(delegate, jsQueue);
-  std::unique_ptr<jsi::Runtime> animatedRuntime;
-  animatedRuntime.reset(static_cast<jsi::Runtime*>(executor.get()->getJavaScriptContext()));
-
   std::shared_ptr<ErrorHandler> errorHandler = std::make_shared<AndroidErrorHandler>(scheduler_);
-
   PlatformDepMethodsHolder platformDepMethodsHolder = {
     requestRender,
     propUpdater,
@@ -111,7 +107,7 @@ void NativeProxy::installJSIBindings()
 
   auto module = std::make_shared<NativeReanimatedModule>(jsCallInvoker_,
                                                          scheduler_,
-                                                         std::move(animatedRuntime),
+                                                         _animatedRuntime,
                                                          errorHandler,
                                                          propObtainer,
                                                          platformDepMethodsHolder);

android/src/main/cpp/RuntimeProvider.cpp

@@ -0,0 +1,42 @@
+#include "RuntimeProvider.h"
+
+#include <hermes/hermes.h>
+
+namespace reanimated
+{
+
+std::shared_ptr<jsi::Runtime> RuntimeProvider::createRuntime(
+  JavaScriptExecutorHolder* javaScriptExecutor,
+  jni::alias_ref<JavaMessageQueueThread::javaobject> messageQueueThread, 
+  bool isDebug, 
+  int runtimeType
+) {
+
+  if(runtimeType == 1) { // JSC, V8
+    std::shared_ptr<ExecutorDelegate> delegate = std::shared_ptr<ExecutorDelegate>();
+    auto jsQueue = std::make_shared<JMessageQueueThread>(messageQueueThread);
+    factory = javaScriptExecutor->getExecutorFactory();
+    executor = factory.get()->createJSExecutor(delegate, jsQueue);
+    std::shared_ptr<jsi::Runtime> runtimeShared;
+    runtimeShared.reset(static_cast<jsi::Runtime*>(executor.get()->getJavaScriptContext()));
+    return runtimeShared;
+  }
+
+  // Hermes
+  std::shared_ptr<jsi::Runtime> runtimeShared;
+  std::unique_ptr<facebook::hermes::HermesRuntime> runtime = facebook::hermes::makeHermesRuntime();
+  if(isDebug) {
+    auto jsQueue = std::make_shared<JMessageQueueThread>(messageQueueThread);
+    SystraceSection s("RuntimeProvider::createRuntime");
+    facebook::hermes::HermesRuntime &hermesRuntimeRef = *runtime;
+    auto adapter = std::make_unique<HermesExecutorRuntimeAdapter>(std::move(runtime), hermesRuntimeRef, jsQueue);
+    runtimeShared = adapter->runtime_;
+    facebook::hermes::inspector::chrome::enableDebugging(std::move(adapter), "Reanimated Runtime");
+  }
+  else {
+    runtimeShared = std::move(runtime);
+  }
+  return runtimeShared; 
+}
+
+}

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

@@ -0,0 +1,50 @@
+#pragma once
+
+#include <memory>
+#include <hermes/hermes.h>
+#include <hermes/inspector/RuntimeAdapter.h>
+#include <hermes/inspector/chrome/Registration.h>
+
+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() = default;
+
+  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_;
+};
+
+}

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

@@ -10,13 +10,19 @@
 #include <react/jni/JavaScriptExecutorHolder.h>
 #include <memory>
 #include <unordered_map>
-
-
 #include "Scheduler.h"
 #include "AndroidScheduler.h"
+#include <cxxreact/MessageQueueThread.h>
+#include <cxxreact/SystraceSection.h>
+#include <hermes/inspector/RuntimeAdapter.h>
+#include <hermes/inspector/chrome/Registration.h>
+#include "RuntimeProvider.h"
+#include "HermesExecutorRuntimeAdapter.h"
 
 namespace reanimated {
 
+class RuntimeProvider;
+
 using namespace facebook;
 
 class AnimationFrameCallback : public HybridClass<AnimationFrameCallback> {
@@ -84,17 +90,20 @@ class NativeProxy : public jni::HybridClass<NativeProxy> {
         jlong jsContext,
         jni::alias_ref<facebook::react::CallInvokerHolder::javaobject> jsCallInvokerHolder,
         jni::alias_ref<AndroidScheduler::javaobject> scheduler,
-        JavaScriptExecutorHolder* javaScriptExecutor);
+        JavaScriptExecutorHolder* javaScriptExecutor,
+        jni::alias_ref<JavaMessageQueueThread::javaobject> messageQueueThread,
+        bool isDebug,
+        int runtimeType);
   static void registerNatives();
   static JavaScriptExecutorHolder* _javaScriptExecutor;
+  static std::shared_ptr<jsi::Runtime> _animatedRuntime;
+  static RuntimeProvider runtimeProvider;
 
 
  private:
   friend HybridBase;
   jni::global_ref<NativeProxy::javaobject> javaPart_;
   jsi::Runtime *runtime_;
-  std::shared_ptr<JSExecutorFactory> factory;
-  std::unique_ptr<JSExecutor> executor;
   std::shared_ptr<facebook::react::CallInvoker> jsCallInvoker_;
   std::shared_ptr<NativeReanimatedModule> _nativeReanimatedModule;
   std::shared_ptr<Scheduler> scheduler_;
@@ -114,7 +123,4 @@ class NativeProxy : public jni::HybridClass<NativeProxy> {
       std::shared_ptr<Scheduler> scheduler);
 };
 
-
-
-
 }

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

@@ -0,0 +1,33 @@
+#pragma once
+
+#include <memory>
+#include <fbjni/fbjni.h>
+#include <jsi/jsi.h>
+#include <cxxreact/NativeToJsBridge.h>
+#include <cxxreact/MessageQueueThread.h>
+#include <cxxreact/SystraceSection.h>
+#include "NativeProxy.h"
+#include <hermes/inspector/RuntimeAdapter.h>
+#include <hermes/inspector/chrome/Registration.h>
+
+namespace reanimated
+{
+
+class RuntimeProvider {
+public:
+  RuntimeProvider() {}
+  ~RuntimeProvider() {}
+
+  std::shared_ptr<JSExecutorFactory> factory;
+  std::unique_ptr<JSExecutor> executor;
+
+  std::shared_ptr<jsi::Runtime> createRuntime(
+    JavaScriptExecutorHolder* javaScriptExecutor,
+    jni::alias_ref<JavaMessageQueueThread::javaobject> messageQueueThread, 
+    bool isDebug, 
+    int runtimeType
+  );
+
+};
+
+}