react-native-tvos 0.69.8-2 → 0.71.7-0rc0

package/ReactCommon/cxxreact/tests/jsarg_helpers.cpp

@@ -12,9 +12,8 @@
 #include <gtest/gtest.h>
 #include <algorithm>
 
-using namespace std;
-using namespace folly;
 using namespace facebook::xplat;
+using dynamic = folly::dynamic;
 
 #define EXPECT_JSAE(statement, exstr)                                         \
   do {                                                                        \
@@ -30,10 +29,10 @@ TEST(JsArgumentHelpersTest, args) {
   const bool aBool = true;
   const int64_t anInt = 17;
   const double aDouble = 3.14;
-  const string aString = "word";
+  const std::string aString = "word";
   const dynamic anArray = dynamic::array("a", "b", "c");
   const dynamic anObject = dynamic::object("k1", "v1")("k2", "v2");
-  const string aNumericString = to<string>(anInt);
+  const std::string aNumericString = folly::to<std::string>(anInt);
 
   folly::dynamic args = dynamic::array(
       aBool, anInt, aDouble, aString, anArray, anObject, aNumericString);

package/ReactCommon/cxxreact/tests/jsbigstring.cpp

@@ -12,7 +12,6 @@
 #include <folly/File.h>
 #include <gtest/gtest.h>
 
-using namespace facebook;
 using namespace facebook::react;
 
 namespace {
@@ -62,45 +61,3 @@ TEST(JSBigFileString, MapPartTest) {
     EXPECT_EQ(needle[i], bigStr.c_str()[i]);
   }
 }
-
-TEST(JSBigFileString, RemapTest) {
-  static const uint8_t kRemapMagic[] = {
-      0xc6, 0x1f, 0xbc, 0x03, 0xc1, 0x03, 0x19, 0x1f, 0xa1, 0xd0, 0xeb, 0x73};
-  std::string data(std::begin(kRemapMagic), std::end(kRemapMagic));
-  auto app = [&data](uint16_t v) {
-    data.append(reinterpret_cast<char *>(&v), sizeof(v));
-  };
-  size_t pageSizeLog2 = 16;
-  app(pageSizeLog2);
-  size_t pageSize = 1 << pageSizeLog2;
-  app(1); // header pages
-  app(2); // num mappings
-  // file page 0 -> memory page 1
-  app(1); // memory page
-  app(1); // num pages
-  // file page 1 -> memory page 0
-  app(0); // memory page
-  app(1); // num pages
-  while (data.size() < pageSize) {
-    app(0);
-  }
-  while (data.size() < pageSize * 2) {
-    app(0x1111);
-  }
-  while (data.size() < pageSize * 3) {
-    app(0x2222);
-  }
-
-  int fd = tempFileFromString(data);
-  JSBigFileString bigStr{fd, data.size()};
-
-  EXPECT_EQ(pageSize * 2, bigStr.size());
-  auto remapped = bigStr.c_str();
-  size_t i = 0;
-  for (; i < pageSize; ++i) {
-    EXPECT_EQ(0x22, remapped[i]);
-  }
-  for (; i < pageSize * 2; ++i) {
-    EXPECT_EQ(0x11, remapped[i]);
-  }
-}

package/ReactCommon/cxxreact/tests/main.cpp

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include <folly/init/Init.h>
+#include <gtest/gtest.h>
+
+int main(int argc, char **argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  folly::init(&argc, &argv);
+  return RUN_ALL_TESTS();
+}

package/ReactCommon/cxxreact/tests/methodcall.cpp

@@ -13,9 +13,8 @@
 #include <gtest/gtest.h>
 #pragma GCC diagnostic pop
 
-using namespace facebook;
 using namespace facebook::react;
-using namespace folly;
+using dynamic = folly::dynamic;
 
 TEST(parseMethodCalls, SingleReturnCallNoArgs) {
   auto jsText = "[[7],[3],[[]]]";

package/ReactCommon/hermes/React-hermes.podspec

@@ -5,6 +5,10 @@
 
 require "json"
 
+# Whether Hermes is built for Release or Debug is determined by the PRODUCTION envvar.
+build_type = ENV['PRODUCTION'] == "1" ? :release : :debug
+
+# package.json
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "package.json")))
 version = package['version']
 
@@ -17,15 +21,15 @@ else
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2021.06.28.00-v2'
+folly_version = '2021.07.22.00'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|
   s.name                   = "React-hermes"
   s.version                = version
-  s.summary                = "-"  # TODO
+  s.summary                = "Hermes engine for React Native"
   s.homepage               = "https://reactnative.dev/"
-  s.license                = package["license"]
+  s.license                = package['license']
   s.author                 = "Facebook, Inc. and its affiliates"
   s.platforms              = { :osx => "10.14", :ios => "12.4" }
   s.source                 = source
@@ -36,12 +40,10 @@ Pod::Spec.new do |s|
   s.public_header_files    = "executor/HermesExecutorFactory.h"
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
   s.pod_target_xcconfig    = {
-                               "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/..\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/libevent/include\"",
-                               "GCC_PREPROCESSOR_DEFINITIONS" => "HERMES_ENABLE_DEBUGGER=1",
-                             }
+                               "HEADER_SEARCH_PATHS" => "\"${PODS_ROOT}/hermes-engine/destroot/include\" \"$(PODS_TARGET_SRCROOT)/..\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/libevent/include\""
+                             }.merge!(build_type == :debug ? { "GCC_PREPROCESSOR_DEFINITIONS" => "HERMES_ENABLE_DEBUGGER=1" } : {})
   s.header_dir             = "reacthermes"
   s.dependency "React-cxxreact", version
-  s.dependency "React-jsi", version
   s.dependency "React-jsiexecutor", version
   s.dependency "React-jsinspector", version
   s.dependency "React-perflogger", version
@@ -50,4 +52,5 @@ Pod::Spec.new do |s|
   s.dependency "glog"
   s.dependency "RCT-Folly/Futures", folly_version
   s.dependency "hermes-engine"
+  s.dependency "React-jsi"
 end

package/ReactCommon/hermes/executor/CMakeLists.txt

@@ -8,21 +8,22 @@ set(CMAKE_VERBOSE_MAKEFILE on)
 
 file(GLOB_RECURSE hermes_executor_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(
-        hermes-executor-common
+        hermes_executor_common
         STATIC
         ${hermes_executor_SRC}
 )
-target_include_directories(hermes-executor-common PUBLIC .)
-target_link_libraries(hermes-executor-common
+target_include_directories(hermes_executor_common PUBLIC .)
+target_link_libraries(hermes_executor_common
         jsireact
         hermes-engine::libhermes
         jsi
-        debug hermes-inspector
+        debug
+        hermes_inspector
 )
 
 if(${CMAKE_BUILD_TYPE} MATCHES Debug)
         target_compile_options(
-                hermes-executor-common
+                hermes_executor_common
                 PRIVATE
                 -DHERMES_ENABLE_DEBUGGER=1
         )

package/ReactCommon/hermes/executor/HermesExecutorFactory.cpp

@@ -41,23 +41,16 @@ class HermesExecutorRuntimeAdapter
     : public facebook::hermes::inspector::RuntimeAdapter {
  public:
   HermesExecutorRuntimeAdapter(
-      std::shared_ptr<Runtime> runtime,
-      HermesRuntime &hermesRuntime,
+      std::shared_ptr<HermesRuntime> runtime,
       std::shared_ptr<MessageQueueThread> thread)
-      : runtime_(runtime),
-        hermesRuntime_(hermesRuntime),
-        thread_(std::move(thread)) {}
+      : runtime_(runtime), thread_(std::move(thread)) {}
 
   virtual ~HermesExecutorRuntimeAdapter() = default;
 
-  jsi::Runtime &getRuntime() override {
+  HermesRuntime &getRuntime() override {
     return *runtime_;
   }
 
-  debugger::Debugger &getDebugger() override {
-    return hermesRuntime_.getDebugger();
-  }
-
   void tickleJs() override {
     // The queue will ensure that runtime_ is still valid when this
     // gets invoked.
@@ -69,8 +62,7 @@ class HermesExecutorRuntimeAdapter
   }
 
  private:
-  std::shared_ptr<Runtime> runtime_;
-  HermesRuntime &hermesRuntime_;
+  std::shared_ptr<HermesRuntime> runtime_;
 
   std::shared_ptr<MessageQueueThread> thread_;
 };
@@ -155,23 +147,28 @@ class DecoratedRuntime : public jsi::WithRuntimeDecorator<ReentrancyCheck> {
   DecoratedRuntime(
       std::unique_ptr<Runtime> runtime,
       HermesRuntime &hermesRuntime,
-      std::shared_ptr<MessageQueueThread> jsQueue)
+      std::shared_ptr<MessageQueueThread> jsQueue,
+      bool enableDebugger,
+      const std::string &debuggerName)
       : jsi::WithRuntimeDecorator<ReentrancyCheck>(*runtime, reentrancyCheck_),
-        runtime_(std::move(runtime)),
-        hermesRuntime_(hermesRuntime) {
+        runtime_(std::move(runtime)) {
 #ifdef HERMES_ENABLE_DEBUGGER
-    auto adapter = std::make_unique<HermesExecutorRuntimeAdapter>(
-        runtime_, hermesRuntime_, jsQueue);
-    facebook::hermes::inspector::chrome::enableDebugging(
-        std::move(adapter), "Hermes React Native");
-#else
-    (void)hermesRuntime_;
+    enableDebugger_ = enableDebugger;
+    if (enableDebugger_) {
+      std::shared_ptr<HermesRuntime> rt(runtime_, &hermesRuntime);
+      auto adapter =
+          std::make_unique<HermesExecutorRuntimeAdapter>(rt, jsQueue);
+      debugToken_ = facebook::hermes::inspector::chrome::enableDebugging(
+          std::move(adapter), debuggerName);
+    }
 #endif
   }
 
   ~DecoratedRuntime() {
 #ifdef HERMES_ENABLE_DEBUGGER
-    facebook::hermes::inspector::chrome::disableDebugging(hermesRuntime_);
+    if (enableDebugger_) {
+      facebook::hermes::inspector::chrome::disableDebugging(debugToken_);
+    }
 #endif
   }
 
@@ -185,11 +182,22 @@ class DecoratedRuntime : public jsi::WithRuntimeDecorator<ReentrancyCheck> {
 
   std::shared_ptr<Runtime> runtime_;
   ReentrancyCheck reentrancyCheck_;
-  HermesRuntime &hermesRuntime_;
+#ifdef HERMES_ENABLE_DEBUGGER
+  bool enableDebugger_;
+  facebook::hermes::inspector::chrome::DebugSessionToken debugToken_;
+#endif
 };
 
 } // namespace
 
+void HermesExecutorFactory::setEnableDebugger(bool enableDebugger) {
+  enableDebugger_ = enableDebugger;
+}
+
+void HermesExecutorFactory::setDebuggerName(const std::string &debuggerName) {
+  debuggerName_ = debuggerName;
+}
+
 std::unique_ptr<JSExecutor> HermesExecutorFactory::createJSExecutor(
     std::shared_ptr<ExecutorDelegate> delegate,
     std::shared_ptr<MessageQueueThread> jsQueue) {
@@ -197,7 +205,11 @@ std::unique_ptr<JSExecutor> HermesExecutorFactory::createJSExecutor(
       makeHermesRuntimeSystraced(runtimeConfig_);
   HermesRuntime &hermesRuntimeRef = *hermesRuntime;
   auto decoratedRuntime = std::make_shared<DecoratedRuntime>(
-      std::move(hermesRuntime), hermesRuntimeRef, jsQueue);
+      std::move(hermesRuntime),
+      hermesRuntimeRef,
+      jsQueue,
+      enableDebugger_,
+      debuggerName_);
 
   // So what do we have now?
   // DecoratedRuntime -> HermesRuntime

package/ReactCommon/hermes/executor/HermesExecutorFactory.h

@@ -28,6 +28,10 @@ class HermesExecutorFactory : public JSExecutorFactory {
     assert(timeoutInvoker_ && "Should not have empty timeoutInvoker");
   }
 
+  void setEnableDebugger(bool enableDebugger);
+
+  void setDebuggerName(const std::string &debuggerName);
+
   std::unique_ptr<JSExecutor> createJSExecutor(
       std::shared_ptr<ExecutorDelegate> delegate,
       std::shared_ptr<MessageQueueThread> jsQueue) override;
@@ -38,6 +42,8 @@ class HermesExecutorFactory : public JSExecutorFactory {
   JSIExecutor::RuntimeInstaller runtimeInstaller_;
   JSIScopedTimeoutInvoker timeoutInvoker_;
   ::hermes::vm::RuntimeConfig runtimeConfig_;
+  bool enableDebugger_ = true;
+  std::string debuggerName_ = "Hermes React Native";
 };
 
 class HermesExecutor : public JSIExecutor {

package/ReactCommon/hermes/inspector/BUCK

@@ -2,7 +2,7 @@ load("@fbsource//tools/build_defs:fb_xplat_cxx_binary.bzl", "fb_xplat_cxx_binary
 load("@fbsource//tools/build_defs:fb_xplat_cxx_library.bzl", "fb_xplat_cxx_library")
 load("@fbsource//tools/build_defs:fb_xplat_cxx_test.bzl", "fb_xplat_cxx_test")
 load("@fbsource//tools/build_defs:platform_defs.bzl", "ANDROID", "APPLE", "CXX", "FBCODE", "WINDOWS")
-load("@fbsource//tools/build_defs/oss:rn_defs.bzl", "react_native_xplat_target")
+load("@fbsource//tools/build_defs/oss:rn_defs.bzl", "get_hermes_shared_library_preprocessor_flags", "react_native_xplat_target")
 load("@fbsource//xplat/hermes/defs:hermes.bzl", "hermes_build_mode", "hermes_optimize_flag")
 
 CFLAGS_BY_MODE = {
@@ -26,7 +26,6 @@ CFLAGS_BY_MODE = {
 }
 
 CHROME_EXPORTED_HEADERS = [
-    "chrome/AutoAttachUtils.h",
     "chrome/Connection.h",
     "chrome/ConnectionDemux.h",
     "chrome/MessageConverters.h",
@@ -49,7 +48,7 @@ fb_xplat_cxx_library(
     exported_headers = CHROME_EXPORTED_HEADERS,
     compiler_flags = CFLAGS_BY_MODE[hermes_build_mode()],
     fbobjc_header_path_prefix = "hermes/inspector/chrome",
-    labels = ["supermodule:xplat/default/public.hermes"],
+    labels = [],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX, FBCODE, WINDOWS),
     tests = [":chrome-tests"],
@@ -117,7 +116,7 @@ fb_xplat_cxx_library(
         "//fbandroid/libraries/fbjni:fbjni",
     ],
     fbobjc_header_path_prefix = "hermes/inspector/detail",
-    labels = ["supermodule:xplat/default/public.hermes"],
+    labels = [],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX, FBCODE, WINDOWS),
     tests = [":detail-tests"],
@@ -191,8 +190,9 @@ fb_xplat_cxx_library(
     exported_headers = INSPECTOR_EXPORTED_HEADERS,
     compiler_flags = CFLAGS_BY_MODE[hermes_build_mode()],
     cxx_tests = [":inspector-tests"],
+    exported_preprocessor_flags = get_hermes_shared_library_preprocessor_flags(),
     fbobjc_header_path_prefix = "hermes/inspector",
-    labels = ["supermodule:xplat/default/public.hermes"],
+    labels = [],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX, FBCODE, WINDOWS),
     visibility = [

package/ReactCommon/hermes/inspector/CMakeLists.txt

@@ -8,20 +8,20 @@ set(CMAKE_VERBOSE_MAKEFILE on)
 
 file(GLOB hermesinspector_SRC CONFIGURE_DEPENDS *.cpp detail/*.cpp chrome/*.cpp)
 
-add_library(hermes-inspector
+add_library(hermes_inspector
         STATIC
         ${hermesinspector_SRC})
 
 target_compile_options(
-        hermes-inspector
+        hermes_inspector
         PRIVATE
         -DHERMES_ENABLE_DEBUGGER=1
         -DHERMES_INSPECTOR_FOLLY_KLUDGE=1
         -fexceptions
 )
 
-target_include_directories(hermes-inspector PUBLIC ${REACT_COMMON_DIR})
-target_link_libraries(hermes-inspector
+target_include_directories(hermes_inspector PUBLIC ${REACT_COMMON_DIR})
+target_link_libraries(hermes_inspector
         jsinspector
         fb
         fbjni

package/ReactCommon/hermes/inspector/Inspector.cpp

@@ -108,7 +108,7 @@ Inspector::Inspector(
     InspectorObserver &observer,
     bool pauseOnFirstStatement)
     : adapter_(adapter),
-      debugger_(adapter->getDebugger()),
+      debugger_(adapter->getRuntime().getDebugger()),
       observer_(observer),
       executor_(std::make_unique<detail::SerialExecutor>("hermes-inspector")) {
   // TODO (t26491391): make tickleJs a real Hermes runtime API

package/ReactCommon/hermes/inspector/RuntimeAdapter.cpp

@@ -16,20 +16,15 @@ RuntimeAdapter::~RuntimeAdapter() = default;
 void RuntimeAdapter::tickleJs() {}
 
 SharedRuntimeAdapter::SharedRuntimeAdapter(
-    std::shared_ptr<jsi::Runtime> runtime,
-    debugger::Debugger &debugger)
-    : runtime_(std::move(runtime)), debugger_(debugger) {}
+    std::shared_ptr<HermesRuntime> runtime)
+    : runtime_(std::move(runtime)) {}
 
 SharedRuntimeAdapter::~SharedRuntimeAdapter() = default;
 
-jsi::Runtime &SharedRuntimeAdapter::getRuntime() {
+HermesRuntime &SharedRuntimeAdapter::getRuntime() {
   return *runtime_;
 }
 
-debugger::Debugger &SharedRuntimeAdapter::getDebugger() {
-  return debugger_;
-}
-
 } // namespace inspector
 } // namespace hermes
 } // namespace facebook

package/ReactCommon/hermes/inspector/RuntimeAdapter.h

@@ -37,8 +37,7 @@ class INSPECTOR_EXPORT RuntimeAdapter {
   virtual ~RuntimeAdapter() = 0;
 
   /// getRuntime should return the runtime encapsulated by this adapter.
-  virtual jsi::Runtime &getRuntime() = 0;
-  virtual debugger::Debugger &getDebugger() = 0;
+  virtual HermesRuntime &getRuntime() = 0;
 
   /// tickleJs is a method that subclasses can choose to override to make the
   /// inspector more responsive. If overridden, it should call the "__tickleJs"
@@ -63,17 +62,13 @@ class INSPECTOR_EXPORT RuntimeAdapter {
  */
 class INSPECTOR_EXPORT SharedRuntimeAdapter : public RuntimeAdapter {
  public:
-  SharedRuntimeAdapter(
-      std::shared_ptr<jsi::Runtime> runtime,
-      debugger::Debugger &debugger);
-  virtual ~SharedRuntimeAdapter();
+  SharedRuntimeAdapter(std::shared_ptr<HermesRuntime> runtime);
+  ~SharedRuntimeAdapter() override;
 
-  jsi::Runtime &getRuntime() override;
-  debugger::Debugger &getDebugger() override;
+  HermesRuntime &getRuntime() override;
 
  private:
-  std::shared_ptr<jsi::Runtime> runtime_;
-  debugger::Debugger &debugger_;
+  std::shared_ptr<HermesRuntime> runtime_;
 };
 
 } // namespace inspector

package/ReactCommon/hermes/inspector/chrome/Connection.cpp

@@ -40,6 +40,7 @@ namespace m = ::facebook::hermes::inspector::chrome::message;
 static const char *const kVirtualBreakpointPrefix = "virtualbreakpoint-";
 static const char *const kBeforeScriptWithSourceMapExecution =
     "beforeScriptWithSourceMapExecution";
+static const char *const kUserEnteredScriptPrefix = "userScript";
 
 /*
  * Connection::Impl
@@ -54,7 +55,7 @@ class Connection::Impl : public inspector::InspectorObserver,
       bool waitForDebugger);
   ~Impl();
 
-  jsi::Runtime &getRuntime();
+  HermesRuntime &getRuntime();
   std::string getTitle() const;
 
   bool connect(std::unique_ptr<IRemoteConnection> remoteConn);
@@ -104,9 +105,11 @@ class Connection::Impl : public inspector::InspectorObserver,
   void handle(const m::profiler::StartRequest &req) override;
   void handle(const m::profiler::StopRequest &req) override;
   void handle(const m::runtime::CallFunctionOnRequest &req) override;
+  void handle(const m::runtime::CompileScriptRequest &req) override;
   void handle(const m::runtime::EvaluateRequest &req) override;
   void handle(const m::runtime::GetHeapUsageRequest &req) override;
   void handle(const m::runtime::GetPropertiesRequest &req) override;
+  void handle(const m::runtime::GlobalLexicalScopeNamesRequest &req) override;
   void handle(const m::runtime::RunIfWaitingForDebuggerRequest &req) override;
 
  private:
@@ -159,6 +162,10 @@ class Connection::Impl : public inspector::InspectorObserver,
   std::mutex parsedScriptsMutex_;
   std::vector<std::string> parsedScripts_;
 
+  // preparedScripts_ stores user-entered scripts that have been prepared for
+  // execution, and may be invoked by a later command.
+  std::vector<std::shared_ptr<const jsi::PreparedJavaScript>> preparedScripts_;
+
   // Some events are represented as a mode in Hermes but a breakpoint in CDP,
   // e.g. "beforeScriptExecution" and "beforeScriptWithSourceMapExecution".
   // Keep track of these separately. The caller should lock the
@@ -202,7 +209,7 @@ Connection::Impl::Impl(
 
 Connection::Impl::~Impl() = default;
 
-jsi::Runtime &Connection::Impl::getRuntime() {
+HermesRuntime &Connection::Impl::getRuntime() {
   return runtimeAdapter_->getRuntime();
 }
 
@@ -383,8 +390,7 @@ void Connection::Impl::onScriptParsed(
   m::debugger::ScriptParsedNotification note;
   note.scriptId = folly::to<std::string>(info.fileId);
   note.url = info.fileName;
-  // TODO(jpporto): fix test cases sending invalid context id.
-  // note.executionContextId = kHermesExecutionContextId;
+  note.executionContextId = kHermesExecutionContextId;
 
   if (!info.sourceMappingUrl.empty()) {
     note.sourceMapURL = info.sourceMappingUrl;
@@ -729,14 +735,6 @@ void Connection::Impl::handle(
 }
 
 void Connection::Impl::handle(const m::profiler::StartRequest &req) {
-  auto *hermesRT = dynamic_cast<HermesRuntime *>(&getRuntime());
-
-  if (!hermesRT) {
-    sendResponseToClientViaExecutor(m::makeErrorResponse(
-        req.id, m::ErrorCode::ServerError, "Unhandled Runtime kind."));
-    return;
-  }
-
   runInExecutor(req.id, [this, id = req.id]() {
     HermesRuntime::enableSamplingProfiler();
     sendResponseToClient(m::makeOkResponse(id));
@@ -744,13 +742,7 @@ void Connection::Impl::handle(const m::profiler::StartRequest &req) {
 }
 
 void Connection::Impl::handle(const m::profiler::StopRequest &req) {
-  auto *hermesRT = dynamic_cast<HermesRuntime *>(&getRuntime());
-
-  if (!hermesRT) {
-    sendResponseToClientViaExecutor(m::makeErrorResponse(
-        req.id, m::ErrorCode::ServerError, "Unhandled Runtime kind."));
-    return;
-  }
+  HermesRuntime *hermesRT = &getRuntime();
 
   runInExecutor(req.id, [this, id = req.id, hermesRT]() {
     HermesRuntime::disableSamplingProfiler();
@@ -1091,6 +1083,42 @@ void Connection::Impl::handle(const m::runtime::CallFunctionOnRequest &req) {
       .thenError<std::exception>(sendErrorToClient(req.id));
 }
 
+void Connection::Impl::handle(const m::runtime::CompileScriptRequest &req) {
+  auto resp = std::make_shared<m::runtime::CompileScriptResponse>();
+  resp->id = req.id;
+
+  inspector_
+      ->executeIfEnabled(
+          "Runtime.compileScriptRequest",
+          [this, req, resp](const debugger::ProgramState &state) {
+            if (req.executionContextId.hasValue() &&
+                req.executionContextId.value() != kHermesExecutionContextId) {
+              throw std::invalid_argument("Invalid execution context");
+            }
+
+            auto source = std::make_shared<jsi::StringBuffer>(req.expression);
+            std::shared_ptr<const jsi::PreparedJavaScript> preparedScript;
+            try {
+              preparedScript =
+                  getRuntime().prepareJavaScript(source, req.sourceURL);
+            } catch (const facebook::jsi::JSIException &err) {
+              resp->exceptionDetails = m::runtime::ExceptionDetails();
+              resp->exceptionDetails->text = err.what();
+              return;
+            }
+
+            if (req.persistScript) {
+              auto scriptId = folly::to<std::string>(
+                  kUserEnteredScriptPrefix, preparedScripts_.size());
+              preparedScripts_.push_back(std::move(preparedScript));
+              resp->scriptId = scriptId;
+            }
+          })
+      .via(executor_.get())
+      .thenValue([this, resp](auto &&) { sendResponseToClient(*resp); })
+      .thenError<std::exception>(sendErrorToClient(req.id));
+}
+
 void Connection::Impl::handle(const m::runtime::EvaluateRequest &req) {
   auto remoteObjPtr = std::make_shared<m::runtime::RemoteObject>();
 
@@ -1445,6 +1473,45 @@ void Connection::Impl::handle(const m::runtime::GetPropertiesRequest &req) {
       .thenError<std::exception>(sendErrorToClient(req.id));
 }
 
+void Connection::Impl::handle(
+    const m::runtime::GlobalLexicalScopeNamesRequest &req) {
+  auto resp = std::make_shared<m::runtime::GlobalLexicalScopeNamesResponse>();
+  resp->id = req.id;
+
+  inspector_
+      ->executeIfEnabled(
+          "Runtime.globalLexicalScopeNames",
+          [req, resp](const debugger::ProgramState &state) {
+            if (req.executionContextId.hasValue() &&
+                req.executionContextId.value() != kHermesExecutionContextId) {
+              throw std::invalid_argument("Invalid execution context");
+            }
+
+            const debugger::LexicalInfo &lexicalInfo = state.getLexicalInfo(0);
+            debugger::ScopeDepth scopeCount = lexicalInfo.getScopesCount();
+            if (scopeCount == 0) {
+              return;
+            }
+
+            const debugger::ScopeDepth globalScopeIndex = scopeCount - 1;
+            uint32_t variableCount =
+                lexicalInfo.getVariablesCountInScope(globalScopeIndex);
+            resp->names.reserve(variableCount);
+            for (uint32_t i = 0; i < variableCount; i++) {
+              debugger::String name =
+                  state.getVariableInfo(0, globalScopeIndex, i).name;
+              // The global scope has some entries prefixed with '?', which are
+              // not valid identifiers.
+              if (!name.empty() && name.front() != '?') {
+                resp->names.push_back(name);
+              }
+            }
+          })
+      .via(executor_.get())
+      .thenValue([this, resp](auto &&) { sendResponseToClient(*resp); })
+      .thenError<std::exception>(sendErrorToClient(req.id));
+}
+
 void Connection::Impl::handle(
     const m::runtime::RunIfWaitingForDebuggerRequest &req) {
   if (inspector_->isAwaitingDebuggerOnStart()) {
@@ -1533,7 +1600,7 @@ Connection::Connection(
 
 Connection::~Connection() = default;
 
-jsi::Runtime &Connection::getRuntime() {
+HermesRuntime &Connection::getRuntime() {
   return impl_->getRuntime();
 }
 

package/ReactCommon/hermes/inspector/chrome/Connection.h

@@ -35,7 +35,7 @@ class INSPECTOR_EXPORT Connection {
   ~Connection();
 
   /// getRuntime returns the underlying runtime being debugged.
-  jsi::Runtime &getRuntime();
+  HermesRuntime &getRuntime();
 
   /// getTitle returns the name of the friendly name of the runtime that's shown
   /// to users in Nuclide.