react-native 0.70.4 → 0.71.0-rc.0

package/ReactCommon/cxxreact/JSBundleType.h

@@ -36,16 +36,19 @@ enum struct ScriptTag {
  * bytes from a bundle in a way that gives access to that information.
  */
 FOLLY_PACK_PUSH
+
+struct FOLLY_PACK_ATTR Magic32 {
+  uint32_t value;
+  uint32_t reserved_;
+};
+
 struct FOLLY_PACK_ATTR BundleHeader {
   BundleHeader() {
     std::memset(this, 0, sizeof(BundleHeader));
   }
 
   union {
-    struct {
-      uint32_t value;
-      uint32_t reserved_;
-    } magic32;
+    Magic32 magic32;
     uint64_t magic64;
   };
   uint32_t version;

package/ReactCommon/cxxreact/JSExecutor.h

@@ -128,8 +128,7 @@ class RN_EXPORT JSExecutor {
    */
   virtual std::string getDescription() = 0;
 
-  virtual void handleMemoryPressure(__attribute__((unused)) int pressureLevel) {
-  }
+  virtual void handleMemoryPressure([[maybe_unused]] int pressureLevel) {}
 
   virtual void destroy() {}
   virtual ~JSExecutor() {}

package/ReactCommon/cxxreact/NativeToJsBridge.cpp

@@ -52,7 +52,7 @@ class JsToNativeBridge : public react::ExecutorDelegate {
   }
 
   void callNativeModules(
-      __attribute__((unused)) JSExecutor &executor,
+      [[maybe_unused]] JSExecutor &executor,
       folly::dynamic &&calls,
       bool isEndOfBatch) override {
     CHECK(m_registry || calls.empty())
@@ -85,7 +85,7 @@ class JsToNativeBridge : public react::ExecutorDelegate {
   }
 
   MethodCallResult callSerializableNativeHook(
-      __attribute__((unused)) JSExecutor &executor,
+      [[maybe_unused]] JSExecutor &executor,
       unsigned int moduleId,
       unsigned int methodId,
       folly::dynamic &&args) override {

package/ReactCommon/cxxreact/React-cxxreact.podspec

@@ -28,7 +28,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "12.4", :tvos => "12.4" }
+  s.platforms              = { :ios => "12.4" }
   s.source                 = source
   s.source_files           = "*.{cpp,h}"
   s.exclude_files          = "SampleCxxModule.*"

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -16,9 +16,9 @@ namespace facebook::react {
 
 constexpr struct {
   int32_t Major = 0;
-  int32_t Minor = 70;
-  int32_t Patch = 4;
-  std::string_view Prerelease = "";
+  int32_t Minor = 71;
+  int32_t Patch = 0;
+  std::string_view Prerelease = "rc.0";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/ReactCommon/cxxreact/SampleCxxModule.cpp

@@ -163,7 +163,7 @@ void SampleCxxModule::save(folly::dynamic args) {
   sample_->save(std::move(m));
 }
 
-void SampleCxxModule::load(__unused folly::dynamic args, Callback cb) {
+void SampleCxxModule::load([[maybe_unused]] folly::dynamic args, Callback cb) {
   dynamic d = dynamic::object;
   for (const auto &p : sample_->load()) {
     d.insert(p.first, p.second);

package/ReactCommon/cxxreact/SystraceSection.h

@@ -14,6 +14,16 @@
 namespace facebook {
 namespace react {
 
+/**
+ * Allow providing an fbsystrace implementation that can short-circuit out
+ * quickly and can throttle too frequent events so we can get useful traces even
+ * if rendering etc. is spinning. For throttling we'll need file/line info so we
+ * use a macro.
+ */
+#if defined(WITH_LOOM_TRACE)
+#define SystraceSection                                         \
+  static constexpr const char systraceSectionFile[] = __FILE__; \
+  fbsystrace::FbSystraceSection<systraceSectionFile, __LINE__>
 /**
  * This is a convenience class to avoid lots of verbose profiling
  * #ifdefs.  If WITH_FBSYSTRACE is not defined, the optimizer will
@@ -23,7 +33,7 @@ namespace react {
  * different values in different files, there is no inconsistency in the sizes
  * of defined symbols.
  */
-#ifdef WITH_FBSYSTRACE
+#elif defined(WITH_FBSYSTRACE)
 struct ConcreteSystraceSection {
  public:
   template <typename... ConvertsToStringPiece>

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']
 
@@ -23,9 +27,9 @@ 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,11 @@ 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-jsidynamic", version
   s.dependency "React-jsiexecutor", version
   s.dependency "React-jsinspector", version
   s.dependency "React-perflogger", version

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_;
 };
@@ -159,25 +151,23 @@ class DecoratedRuntime : public jsi::WithRuntimeDecorator<ReentrancyCheck> {
       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
     enableDebugger_ = enableDebugger;
     if (enableDebugger_) {
-      auto adapter = std::make_unique<HermesExecutorRuntimeAdapter>(
-          runtime_, hermesRuntime_, jsQueue);
-      facebook::hermes::inspector::chrome::enableDebugging(
+      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);
     }
-#else
-    (void)hermesRuntime_;
 #endif
   }
 
   ~DecoratedRuntime() {
 #ifdef HERMES_ENABLE_DEBUGGER
     if (enableDebugger_) {
-      facebook::hermes::inspector::chrome::disableDebugging(*runtime_);
+      facebook::hermes::inspector::chrome::disableDebugging(debugToken_);
     }
 #endif
   }
@@ -192,9 +182,9 @@ 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
 };
 

package/ReactCommon/hermes/inspector/BUCK

@@ -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,11 +190,11 @@ 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),
-    preprocessor_flags = get_hermes_shared_library_preprocessor_flags(),
     visibility = [
         "PUBLIC",
     ],

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);
+  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.

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

@@ -6,7 +6,6 @@
  */
 
 #include "ConnectionDemux.h"
-#include "AutoAttachUtils.h"
 #include "Connection.h"
 
 #include <jsinspector/InspectorInterfaces.h>
@@ -63,7 +62,7 @@ ConnectionDemux::ConnectionDemux(facebook::react::IInspector &inspector)
 
 ConnectionDemux::~ConnectionDemux() = default;
 
-int ConnectionDemux::enableDebugging(
+DebugSessionToken ConnectionDemux::enableDebugging(
     std::unique_ptr<RuntimeAdapter> adapter,
     const std::string &title) {
   std::lock_guard<std::mutex> lock(mutex_);
@@ -85,30 +84,18 @@ int ConnectionDemux::enableDebugging(
     removePage(pageId);
   }
 
-  // TODO(hypuk): Provide real app and device names.
   auto waitForDebugger =
-      (inspectedContexts_->find(title) != inspectedContexts_->end()) ||
-      isNetworkInspected(title, "app_name", "device_name");
-
+      (inspectedContexts_->find(title) != inspectedContexts_->end());
   return addPage(
       std::make_shared<Connection>(std::move(adapter), title, waitForDebugger));
 }
 
-void ConnectionDemux::disableDebugging(jsi::Runtime &runtime) {
+void ConnectionDemux::disableDebugging(DebugSessionToken session) {
   std::lock_guard<std::mutex> lock(mutex_);
-
-  for (auto &it : conns_) {
-    int pageId = it.first;
-    auto &conn = it.second;
-
-    if (&(conn->getRuntime()) == &runtime) {
-      removePage(pageId);
-
-      // must break here. removePage mutates conns_, so range-for iterator is
-      // now invalid.
-      break;
-    }
+  if (conns_.find(session) == conns_.end()) {
+    return;
   }
+  removePage(session);
 }
 
 int ConnectionDemux::addPage(std::shared_ptr<Connection> conn) {
@@ -132,6 +119,8 @@ void ConnectionDemux::removePage(int pageId) {
   globalInspector_.removePage(pageId);
 
   auto conn = conns_.at(pageId);
+  std::string title = conn->getTitle();
+  inspectedContexts_->erase(title);
   conn->disconnect();
   conns_.erase(pageId);
 }

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

@@ -16,6 +16,7 @@
 #include <hermes/hermes.h>
 #include <hermes/inspector/RuntimeAdapter.h>
 #include <hermes/inspector/chrome/Connection.h>
+#include <hermes/inspector/chrome/Registration.h>
 #include <jsinspector/InspectorInterfaces.h>
 
 namespace facebook {
@@ -36,10 +37,10 @@ class ConnectionDemux {
   ConnectionDemux(const ConnectionDemux &) = delete;
   ConnectionDemux &operator=(const ConnectionDemux &) = delete;
 
-  int enableDebugging(
+  DebugSessionToken enableDebugging(
       std::unique_ptr<RuntimeAdapter> adapter,
       const std::string &title);
-  void disableDebugging(jsi::Runtime &runtime);
+  void disableDebugging(DebugSessionToken session);
 
  private:
   int addPage(std::shared_ptr<Connection> conn);

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

@@ -211,6 +211,16 @@ m::runtime::RemoteObject m::runtime::makeRemoteObject(
   } else if (value.isString()) {
     result.type = "string";
     result.value = value.getString(runtime).utf8(runtime);
+  } else if (value.isSymbol()) {
+    result.type = "symbol";
+    auto sym = value.getSymbol(runtime);
+    result.description = sym.toString(runtime);
+    result.objectId =
+        objTable.addValue(jsi::Value(std::move(sym)), objectGroup);
+  } else if (value.isBigInt()) {
+    auto strRepresentation =
+        value.getBigInt(runtime).toString(runtime).utf8(runtime) + 'n';
+    result.description = result.unserializableValue = strRepresentation;
   } else if (value.isObject()) {
     jsi::Object obj = value.getObject(runtime);