react-native-windows 0.71.25 → 0.71.27

package/Shared/HermesSamplingProfiler.cpp

@@ -3,51 +3,19 @@
 
 #include "pch.h"
 
-#include <hermes/hermes_api.h>
+#include <hermes/hermes.h>
 #include <chrono>
 #include <future>
 
-#include "HermesRuntimeHolder.h"
 #include "HermesSamplingProfiler.h"
-#include "IReactDispatcher.h"
-#include "ReactPropertyBag.h"
+#include "HermesShim.h"
 #include "Utils.h"
 
-using namespace winrt::Microsoft::ReactNative;
-using namespace facebook::react;
-
 namespace Microsoft::ReactNative {
 
 namespace {
-
-// Implements an awaiter for Mso::DispatchQueue
-auto resume_in_dispatcher(const IReactDispatcher &dispatcher) noexcept {
-  struct awaitable {
-    awaitable(const IReactDispatcher &dispatcher) noexcept : dispatcher_(dispatcher) {}
-
-    bool await_ready() const noexcept {
-      return false;
-    }
-
-    void await_resume() const noexcept {}
-
-    void await_suspend(std::experimental::coroutine_handle<> resume) noexcept {
-      callback_ = [context = resume.address()]() noexcept {
-        std::experimental::coroutine_handle<>::from_address(context)();
-      };
-      dispatcher_.Post(std::move(callback_));
-    }
-
-   private:
-    IReactDispatcher dispatcher_;
-    ReactDispatcherCallback callback_;
-  };
-
-  return awaitable{dispatcher};
-}
-
 std::future<std::string> getTraceFilePath() noexcept {
-  std::string hermesDataPath = co_await Microsoft::React::getApplicationDataPath(L"Hermes");
+  auto hermesDataPath = co_await Microsoft::React::getApplicationDataPath(L"Hermes");
   std::ostringstream os;
   auto now = std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::system_clock::now().time_since_epoch())
                  .count();
@@ -55,59 +23,39 @@ std::future<std::string> getTraceFilePath() noexcept {
   os << hermesDataPath << "\\cpu_" << now << ".cpuprofile";
   co_return os.str();
 }
-
 } // namespace
 
-std::atomic_bool HermesSamplingProfiler::s_isStarted{false};
+bool HermesSamplingProfiler::s_isStarted = false;
 std::string HermesSamplingProfiler::s_lastTraceFilePath;
 
 std::string HermesSamplingProfiler::GetLastTraceFilePath() noexcept {
   return s_lastTraceFilePath;
 }
 
-winrt::fire_and_forget HermesSamplingProfiler::Start(
-    Mso::CntPtr<Mso::React::IReactContext> const &reactContext) noexcept {
-  bool expectedIsStarted = false;
-  if (s_isStarted.compare_exchange_strong(expectedIsStarted, true)) {
-    IReactDispatcher jsDispatcher = implementation::ReactDispatcher::GetJSDispatcher(reactContext->Properties());
-    ReactPropertyBag propertyBag = ReactPropertyBag(reactContext->Properties());
-
-    co_await resume_in_dispatcher(jsDispatcher);
-    std::shared_ptr<HermesRuntimeHolder> hermesRuntimeHolder = HermesRuntimeHolder::loadFrom(propertyBag);
-    hermesRuntimeHolder->addToProfiling();
-
+winrt::fire_and_forget HermesSamplingProfiler::Start() noexcept {
+  if (!s_isStarted) {
+    s_isStarted = true;
     co_await winrt::resume_background();
-    HermesRuntimeHolder::enableSamplingProfiler();
+    HermesShim::enableSamplingProfiler();
   }
 
   co_return;
 }
 
-std::future<std::string> HermesSamplingProfiler::Stop(
-    Mso::CntPtr<Mso::React::IReactContext> const &reactContext) noexcept {
-  bool expectedIsStarted = true;
-  if (s_isStarted.compare_exchange_strong(expectedIsStarted, false)) {
-    IReactDispatcher jsDispatcher = implementation::ReactDispatcher::GetJSDispatcher(reactContext->Properties());
-    ReactPropertyBag propertyBag = ReactPropertyBag(reactContext->Properties());
-
+std::future<std::string> HermesSamplingProfiler::Stop() noexcept {
+  if (s_isStarted) {
+    s_isStarted = false;
     co_await winrt::resume_background();
-    HermesRuntimeHolder::disableSamplingProfiler();
-
+    HermesShim::disableSamplingProfiler();
     s_lastTraceFilePath = co_await getTraceFilePath();
-    HermesRuntimeHolder::dumpSampledTraceToFile(s_lastTraceFilePath);
-
-    co_await resume_in_dispatcher(jsDispatcher);
-    std::shared_ptr<HermesRuntimeHolder> hermesRuntimeHolder = HermesRuntimeHolder::loadFrom(propertyBag);
-    hermesRuntimeHolder->removeFromProfiling();
-
-    co_await winrt::resume_background();
+    HermesShim::dumpSampledTraceToFile(s_lastTraceFilePath);
   }
 
   co_return s_lastTraceFilePath;
 }
 
 bool HermesSamplingProfiler::IsStarted() noexcept {
-  return s_isStarted.load();
+  return s_isStarted;
 }
 
 } // namespace Microsoft::ReactNative

package/Shared/HermesSamplingProfiler.h

@@ -3,21 +3,19 @@
 
 #pragma once
 
-#include <ReactHost/React.h>
-#include <atomic>
 #include <string>
 
 namespace Microsoft::ReactNative {
 
 class HermesSamplingProfiler final {
  public:
-  static winrt::fire_and_forget Start(Mso::CntPtr<Mso::React::IReactContext> const &reactContext) noexcept;
-  static std::future<std::string> Stop(Mso::CntPtr<Mso::React::IReactContext> const &reactContext) noexcept;
+  static winrt::fire_and_forget Start() noexcept;
+  static std::future<std::string> Stop() noexcept;
   static std::string GetLastTraceFilePath() noexcept;
   static bool IsStarted() noexcept;
 
  private:
-  static std::atomic_bool s_isStarted;
+  static bool s_isStarted;
   static std::string s_lastTraceFilePath;
 };
 

package/Shared/HermesShim.cpp

@@ -0,0 +1,118 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#include "HermesShim.h"
+#include "Crash.h"
+
+namespace Microsoft::ReactNative::HermesShim {
+
+static HMODULE s_hermesModule{nullptr};
+static decltype(&facebook::hermes::makeHermesRuntime) s_makeHermesRuntime{nullptr};
+static decltype(&facebook::hermes::HermesRuntime::enableSamplingProfiler) s_enableSamplingProfiler{nullptr};
+static decltype(&facebook::hermes::HermesRuntime::disableSamplingProfiler) s_disableSamplingProfiler{nullptr};
+static decltype(&facebook::hermes::HermesRuntime::dumpSampledTraceToFile) s_dumpSampledTraceToFile{nullptr};
+static decltype(&facebook::hermes::makeHermesRuntimeWithWER) s_makeHermesRuntimeWithWER{nullptr};
+static decltype(&facebook::hermes::hermesCrashHandler) s_hermesCrashHandler{nullptr};
+
+#if _M_X64
+constexpr const char *makeHermesRuntimeSymbol =
+    "?makeHermesRuntime@hermes@facebook@@YA?AV?$unique_ptr@VHermesRuntime@hermes@facebook@@U?$default_delete@VHermesRuntime@hermes@facebook@@@std@@@std@@AEBVRuntimeConfig@vm@1@@Z";
+constexpr const char *enableSamlingProfilerSymbol = "?enableSamplingProfiler@HermesRuntime@hermes@facebook@@SAXXZ";
+constexpr const char *disableSamlingProfilerSymbol = "?disableSamplingProfiler@HermesRuntime@hermes@facebook@@SAXXZ";
+constexpr const char *dumpSampledTraceToFileSymbol =
+    "?dumpSampledTraceToFile@HermesRuntime@hermes@facebook@@SAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z";
+constexpr const char *makeHermesRuntimeWithWERSymbol =
+    "?makeHermesRuntimeWithWER@hermes@facebook@@YA?AV?$unique_ptr@VHermesRuntime@hermes@facebook@@U?$default_delete@VHermesRuntime@hermes@facebook@@@std@@@std@@XZ";
+constexpr const char *hermesCrashHandlerSymbol = "?hermesCrashHandler@hermes@facebook@@YAXAEAVHermesRuntime@12@H@Z";
+#endif
+
+#if _M_ARM64
+constexpr const char *makeHermesRuntimeSymbol =
+    "?makeHermesRuntime@hermes@facebook@@YA?AV?$unique_ptr@VHermesRuntime@hermes@facebook@@U?$default_delete@VHermesRuntime@hermes@facebook@@@std@@@std@@AEBVRuntimeConfig@vm@1@@Z";
+constexpr const char *enableSamlingProfilerSymbol = "?enableSamplingProfiler@HermesRuntime@hermes@facebook@@SAXXZ";
+constexpr const char *disableSamlingProfilerSymbol = "?disableSamplingProfiler@HermesRuntime@hermes@facebook@@SAXXZ";
+constexpr const char *dumpSampledTraceToFileSymbol =
+    "?dumpSampledTraceToFile@HermesRuntime@hermes@facebook@@SAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z";
+constexpr const char *makeHermesRuntimeWithWERSymbol =
+    "?makeHermesRuntimeWithWER@hermes@facebook@@YA?AV?$unique_ptr@VHermesRuntime@hermes@facebook@@U?$default_delete@VHermesRuntime@hermes@facebook@@@std@@@std@@XZ";
+constexpr const char *hermesCrashHandlerSymbol = "?hermesCrashHandler@hermes@facebook@@YAXAEAVHermesRuntime@12@H@Z";
+#endif
+
+#if _M_IX86
+constexpr const char *makeHermesRuntimeSymbol =
+    "?makeHermesRuntime@hermes@facebook@@YA?AV?$unique_ptr@VHermesRuntime@hermes@facebook@@U?$default_delete@VHermesRuntime@hermes@facebook@@@std@@@std@@ABVRuntimeConfig@vm@1@@Z";
+constexpr const char *enableSamlingProfilerSymbol = "?enableSamplingProfiler@HermesRuntime@hermes@facebook@@SAXXZ";
+constexpr const char *disableSamlingProfilerSymbol = "?disableSamplingProfiler@HermesRuntime@hermes@facebook@@SAXXZ";
+constexpr const char *dumpSampledTraceToFileSymbol =
+    "?dumpSampledTraceToFile@HermesRuntime@hermes@facebook@@SAXABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z";
+constexpr const char *makeHermesRuntimeWithWERSymbol =
+    "?makeHermesRuntimeWithWER@hermes@facebook@@YA?AV?$unique_ptr@VHermesRuntime@hermes@facebook@@U?$default_delete@VHermesRuntime@hermes@facebook@@@std@@@std@@XZ";
+constexpr const char *hermesCrashHandlerSymbol = "?hermesCrashHandler@hermes@facebook@@YAXAAVHermesRuntime@12@H@Z";
+#endif
+
+static std::once_flag s_hermesLoading;
+
+static void EnsureHermesLoaded() noexcept {
+  std::call_once(s_hermesLoading, []() {
+    VerifyElseCrashSz(!s_hermesModule, "Invalid state: \"hermes.dll\" being loaded again.");
+
+    s_hermesModule = LoadLibrary(L"hermes.dll");
+    VerifyElseCrashSz(s_hermesModule, "Could not load \"hermes.dll\"");
+
+    s_makeHermesRuntime =
+        reinterpret_cast<decltype(s_makeHermesRuntime)>(GetProcAddress(s_hermesModule, makeHermesRuntimeSymbol));
+    VerifyElseCrash(s_makeHermesRuntime);
+
+    s_enableSamplingProfiler = reinterpret_cast<decltype(s_enableSamplingProfiler)>(
+        GetProcAddress(s_hermesModule, enableSamlingProfilerSymbol));
+    VerifyElseCrash(s_enableSamplingProfiler);
+
+    s_disableSamplingProfiler = reinterpret_cast<decltype(s_disableSamplingProfiler)>(
+        GetProcAddress(s_hermesModule, disableSamlingProfilerSymbol));
+    VerifyElseCrash(s_disableSamplingProfiler);
+
+    s_dumpSampledTraceToFile = reinterpret_cast<decltype(s_dumpSampledTraceToFile)>(
+        GetProcAddress(s_hermesModule, dumpSampledTraceToFileSymbol));
+    VerifyElseCrash(s_dumpSampledTraceToFile);
+
+    s_makeHermesRuntimeWithWER = reinterpret_cast<decltype(s_makeHermesRuntimeWithWER)>(
+        GetProcAddress(s_hermesModule, makeHermesRuntimeWithWERSymbol));
+    VerifyElseCrash(s_makeHermesRuntimeWithWER);
+
+    s_hermesCrashHandler =
+        reinterpret_cast<decltype(s_hermesCrashHandler)>(GetProcAddress(s_hermesModule, hermesCrashHandlerSymbol));
+    VerifyElseCrash(s_hermesCrashHandler);
+  });
+}
+
+std::unique_ptr<facebook::hermes::HermesRuntime> makeHermesRuntime(const hermes::vm::RuntimeConfig &runtimeConfig) {
+  EnsureHermesLoaded();
+  return s_makeHermesRuntime(runtimeConfig);
+}
+
+void enableSamplingProfiler() {
+  EnsureHermesLoaded();
+  s_enableSamplingProfiler();
+}
+
+void disableSamplingProfiler() {
+  EnsureHermesLoaded();
+  s_disableSamplingProfiler();
+}
+
+void dumpSampledTraceToFile(const std::string &fileName) {
+  EnsureHermesLoaded();
+  s_dumpSampledTraceToFile(fileName);
+}
+
+std::unique_ptr<facebook::hermes::HermesRuntime> makeHermesRuntimeWithWER() {
+  EnsureHermesLoaded();
+  return s_makeHermesRuntimeWithWER();
+}
+
+void hermesCrashHandler(facebook::hermes::HermesRuntime &runtime, int fileDescriptor) {
+  EnsureHermesLoaded();
+  s_hermesCrashHandler(runtime, fileDescriptor);
+}
+
+} // namespace Microsoft::ReactNative::HermesShim

package/Shared/HermesShim.h

@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include <hermes/hermes_win.h>
+
+//! We do not package hermes.dll for projects that do not require it. We cannot
+//! use pure delay-loading to achieve this, since WACK will detect the
+//! non-present DLL. Functions in this namespace shim to the Hermes DLL via
+//! GetProcAddress.
+namespace Microsoft::ReactNative::HermesShim {
+
+std::unique_ptr<facebook::hermes::HermesRuntime> makeHermesRuntime(const hermes::vm::RuntimeConfig &runtimeConfig);
+void enableSamplingProfiler();
+void disableSamplingProfiler();
+void dumpSampledTraceToFile(const std::string &fileName);
+std::unique_ptr<facebook::hermes::HermesRuntime> makeHermesRuntimeWithWER();
+void hermesCrashHandler(facebook::hermes::HermesRuntime &runtime, int fileDescriptor);
+
+} // namespace Microsoft::ReactNative::HermesShim

package/Shared/InspectorPackagerConnection.cpp

@@ -3,10 +3,18 @@
 
 #include "pch.h"
 
+#ifdef HERMES_ENABLE_DEBUGGER
+
 #include <folly/json.h>
 #include <tracing/tracing.h>
 #include "InspectorPackagerConnection.h"
 
+namespace facebook {
+namespace react {
+IDestructible::~IDestructible() {}
+} // namespace react
+} // namespace facebook
+
 namespace Microsoft::ReactNative {
 
 namespace {
@@ -72,16 +80,35 @@ struct InspectorProtocol {
   }
 
   static folly::dynamic constructGetPagesResponsePayloadForPackager(
-      const std::vector<facebook::react::InspectorPage> &pages,
+      const std::vector<facebook::react::InspectorPage2> &pages,
+      InspectorPackagerConnection::BundleStatus bundleStatus) {
+    folly::dynamic payload = folly::dynamic::array;
+    for (const facebook::react::InspectorPage2 &page : pages) {
+      folly::dynamic pageDyn = folly::dynamic::object;
+      pageDyn["id"] = page.id;
+      pageDyn["title"] = page.title;
+      pageDyn["vm"] = page.vm;
+
+      pageDyn["isLastBundleDownloadSuccess"] = bundleStatus.m_isLastDownloadSucess;
+      pageDyn["bundleUpdateTimestamp"] = bundleStatus.m_updateTimestamp;
+
+      payload.push_back(pageDyn);
+    }
+    return payload;
+  }
+
+  static folly::dynamic constructGetPagesResponsePayloadForPackager(
+      std::unique_ptr<facebook::react::IInspectorPages> pages,
       InspectorPackagerConnection::BundleStatus bundleStatus) {
     folly::dynamic payload = folly::dynamic::array;
-    for (const facebook::react::InspectorPage &page : pages) {
+    for (int p = 0; p < pages->size(); p++) {
+      const facebook::react::InspectorPage2 page = pages->getPage(p);
       folly::dynamic pageDyn = folly::dynamic::object;
       pageDyn["id"] = page.id;
       pageDyn["title"] = page.title;
       pageDyn["vm"] = page.vm;
 
-      pageDyn["isLastBundleDownloadSuccess"] = bundleStatus.m_isLastDownloadSuccess;
+      pageDyn["isLastBundleDownloadSuccess"] = bundleStatus.m_isLastDownloadSucess;
       pageDyn["bundleUpdateTimestamp"] = bundleStatus.m_updateTimestamp;
 
       payload.push_back(pageDyn);
@@ -89,14 +116,14 @@ struct InspectorProtocol {
     return payload;
   }
 
-  static folly::dynamic constructVMResponsePayloadForPackager(int32_t pageId, std::string &&messageFromVM) {
+  static folly::dynamic constructVMResponsePayloadForPackager(int64_t pageId, std::string &&messageFromVM) {
     folly::dynamic payload = folly::dynamic::object;
     payload[InspectorProtocol::Message_eventName_wrappedEvent] = messageFromVM;
     payload[InspectorProtocol::Message_PAGEID] = pageId;
     return payload;
   }
 
-  static folly::dynamic constructVMResponsePayloadOnDisconnectForPackager(int32_t pageId) {
+  static folly::dynamic constructVMResponsePayloadOnDisconnectForPackager(int64_t pageId) {
     folly::dynamic payload = folly::dynamic::object;
     payload[InspectorProtocol::Message_PAGEID] = pageId;
     return payload;
@@ -105,7 +132,7 @@ struct InspectorProtocol {
 
 } // namespace
 
-RemoteConnection::RemoteConnection(int32_t pageId, const InspectorPackagerConnection &packagerConnection)
+RemoteConnection::RemoteConnection(int64_t pageId, const InspectorPackagerConnection &packagerConnection)
     : m_packagerConnection(packagerConnection), m_pageId(pageId) {}
 
 void RemoteConnection::onMessage(std::string message) {
@@ -125,6 +152,26 @@ void RemoteConnection::onDisconnect() {
   m_packagerConnection.sendMessageToPackager(std::move(responsestr));
 }
 
+RemoteConnection2::RemoteConnection2(int64_t pageId, const InspectorPackagerConnection &packagerConnection)
+    : m_packagerConnection(packagerConnection), m_pageId(pageId) {}
+
+void RemoteConnection2::onMessage(std::string message) {
+  folly::dynamic response = InspectorProtocol::constructResponseForPackager(
+      InspectorProtocol::EventType::WrappedEvent,
+      InspectorProtocol::constructVMResponsePayloadForPackager(m_pageId, std::move(message)));
+  std::string responsestr = folly::toJson(response);
+  m_packagerConnection.sendMessageToPackager(std::move(responsestr));
+}
+
+void RemoteConnection2::onDisconnect() {
+  folly::dynamic response = InspectorProtocol::constructResponseForPackager(
+      InspectorProtocol::EventType::Disconnect,
+      InspectorProtocol::constructVMResponsePayloadOnDisconnectForPackager(m_pageId));
+
+  std::string responsestr = folly::toJson(response);
+  m_packagerConnection.sendMessageToPackager(std::move(responsestr));
+}
+
 winrt::fire_and_forget InspectorPackagerConnection::sendMessageToPackagerAsync(std::string &&message) const {
   std::string message_(std::move(message));
   co_await winrt::resume_background();
@@ -136,7 +183,7 @@ void InspectorPackagerConnection::sendMessageToPackager(std::string &&message) c
   sendMessageToPackagerAsync(std::move(message));
 }
 
-void InspectorPackagerConnection::sendMessageToVM(int32_t pageId, std::string &&message) {
+void InspectorPackagerConnection::sendMessageToVM(int64_t pageId, std::string &&message) {
   m_localConnections[pageId]->sendMessage(std::move(message));
 }
 
@@ -167,62 +214,59 @@ winrt::fire_and_forget InspectorPackagerConnection::connectAsync() {
   m_packagerWebSocketConnection->SetOnConnect(
       []() { facebook::react::tracing::log("Inspector: Websocket connection succeeded."); });
 
-  m_packagerWebSocketConnection->SetOnMessage([self = shared_from_this()](
-                                                  size_t /*length*/, const std::string &message, bool isBinary) {
-    assert(!isBinary && "We don't expect any binary messages !");
-    folly::dynamic messageDyn = folly::parseJson(message);
-
-    InspectorProtocol::EventType eventType = InspectorProtocol::getEventType(messageDyn);
-    switch (eventType) {
-      case InspectorProtocol::EventType::GetPages: {
-        std::vector<facebook::react::InspectorPage> inspectorPages = facebook::react::getInspectorInstance().getPages();
-        folly::dynamic response = InspectorProtocol::constructResponseForPackager(
-            InspectorProtocol::EventType::GetPages,
-            InspectorProtocol::constructGetPagesResponsePayloadForPackager(
-                inspectorPages, self->m_bundleStatusProvider->getBundleStatus()));
-
-        std::string responsestr = folly::toJson(response);
-        self->sendMessageToPackager(std::move(responsestr));
-        break;
-      }
-
-      case InspectorProtocol::EventType::WrappedEvent: {
-        folly::dynamic payload = messageDyn[InspectorProtocol::Message_PAYLOAD];
-        int32_t pageId = static_cast<int32_t>(payload[InspectorProtocol::Message_PAGEID].asInt());
-
-        if (self->m_localConnections.find(pageId) == self->m_localConnections.end()) {
-          break;
+  m_packagerWebSocketConnection->SetOnMessage(
+      [self = shared_from_this()](size_t /*length*/, const std::string &message, bool isBinary) {
+        assert(!isBinary && "We don't expect any binary messages !");
+        folly::dynamic messageDyn = folly::parseJson(message);
+
+        InspectorProtocol::EventType eventType = InspectorProtocol::getEventType(messageDyn);
+        switch (eventType) {
+          case InspectorProtocol::EventType::GetPages: {
+            std::unique_ptr<facebook::react::IInspectorPages> inspectorPages = facebook::react::getInspectorPages();
+            folly::dynamic response = InspectorProtocol::constructResponseForPackager(
+                InspectorProtocol::EventType::GetPages,
+                InspectorProtocol::constructGetPagesResponsePayloadForPackager(
+                    std::move(inspectorPages), self->m_bundleStatusProvider->getBundleStatus()));
+
+            std::string responsestr = folly::toJson(response);
+            self->sendMessageToPackager(std::move(responsestr));
+          } break;
+
+          case InspectorProtocol::EventType::WrappedEvent: {
+            folly::dynamic payload = messageDyn[InspectorProtocol::Message_PAYLOAD];
+            int64_t pageId = payload[InspectorProtocol::Message_PAGEID].asInt();
+
+            if (self->m_localConnections.find(pageId) == self->m_localConnections.end()) {
+              break;
+            }
+
+            std::string wrappedEvent = payload[InspectorProtocol::Message_eventName_wrappedEvent].getString();
+            self->sendMessageToVM(pageId, std::move(wrappedEvent));
+          } break;
+
+          case InspectorProtocol::EventType::Connect: {
+            folly::dynamic payload = messageDyn[InspectorProtocol::Message_PAYLOAD];
+            int64_t pageId = payload[InspectorProtocol::Message_PAGEID].asInt();
+
+            if (self->m_localConnections.find(pageId) != self->m_localConnections.end()) {
+              break;
+            }
+
+            self->m_localConnections[pageId] = facebook::react::connectInspectorPage(
+                static_cast<int>(pageId), std::make_unique<RemoteConnection2>(pageId, *self));
+          } break;
+
+          case InspectorProtocol::EventType::Disconnect: {
+            folly::dynamic payload = messageDyn[InspectorProtocol::Message_PAYLOAD];
+            int64_t pageId = payload[InspectorProtocol::Message_PAGEID].asInt();
+            if (self->m_localConnections.find(pageId) != self->m_localConnections.end()) {
+              self->m_localConnections[pageId]->disconnect();
+              self->m_localConnections.erase(pageId);
+            }
+
+          } break;
         }
-
-        std::string wrappedEvent = payload[InspectorProtocol::Message_eventName_wrappedEvent].getString();
-        self->sendMessageToVM(pageId, std::move(wrappedEvent));
-        break;
-      }
-
-      case InspectorProtocol::EventType::Connect: {
-        folly::dynamic payload = messageDyn[InspectorProtocol::Message_PAYLOAD];
-        int32_t pageId = static_cast<int32_t>(payload[InspectorProtocol::Message_PAGEID].asInt());
-
-        if (self->m_localConnections.find(pageId) != self->m_localConnections.end()) {
-          break;
-        }
-
-        self->m_localConnections[pageId] =
-            facebook::react::getInspectorInstance().connect(pageId, std::make_unique<RemoteConnection>(pageId, *self));
-        break;
-      }
-
-      case InspectorProtocol::EventType::Disconnect: {
-        folly::dynamic payload = messageDyn[InspectorProtocol::Message_PAYLOAD];
-        int32_t pageId = static_cast<int32_t>(payload[InspectorProtocol::Message_PAGEID].asInt());
-        if (self->m_localConnections.find(pageId) != self->m_localConnections.end()) {
-          self->m_localConnections[pageId]->disconnect();
-          self->m_localConnections.erase(pageId);
-        }
-        break;
-      }
-    }
-  });
+      });
 
   Microsoft::React::Networking::IWebSocketResource::Protocols protocols;
   Microsoft::React::Networking::IWebSocketResource::Options options;
@@ -232,3 +276,5 @@ winrt::fire_and_forget InspectorPackagerConnection::connectAsync() {
 }
 
 } // namespace Microsoft::ReactNative
+
+#endif

package/Shared/InspectorPackagerConnection.h

@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <InspectorProxy.h>
 #include <Networking/WinRTWebSocketResource.h>
 #include <jsinspector/InspectorInterfaces.h>
 
@@ -15,12 +16,12 @@ class InspectorPackagerConnection final : public std::enable_shared_from_this<In
 
   class BundleStatus {
    public:
-    bool m_isLastDownloadSuccess;
+    bool m_isLastDownloadSucess;
     int64_t m_updateTimestamp = -1;
 
-    BundleStatus(bool isLastDownloadSuccess, long updateTimestamp)
-        : m_isLastDownloadSuccess(isLastDownloadSuccess), m_updateTimestamp(updateTimestamp) {}
-    BundleStatus() : m_isLastDownloadSuccess(false), m_updateTimestamp(-1) {}
+    BundleStatus(bool isLastDownloadSucess, long updateTimestamp)
+        : m_isLastDownloadSucess(isLastDownloadSucess), m_updateTimestamp(updateTimestamp) {}
+    BundleStatus() : m_isLastDownloadSucess(false), m_updateTimestamp(-1) {}
   };
 
   struct IBundleStatusProvider {
@@ -31,16 +32,16 @@ class InspectorPackagerConnection final : public std::enable_shared_from_this<In
 
  private:
   friend class RemoteConnection;
+  friend class RemoteConnection2;
 
   winrt::fire_and_forget sendMessageToPackagerAsync(std::string &&message) const;
   void sendMessageToPackager(std::string &&message) const;
 
   // Note:: VM side Inspector processes the messages asynchronousely in a sequential executor with dedicated thread.
   // Hence, we don't bother invoking the inspector asynchronously.
-  void sendMessageToVM(int32_t pageId, std::string &&message);
+  void sendMessageToVM(int64_t pageId, std::string &&message);
 
- private:
-  std::unordered_map<int32_t, std::unique_ptr<facebook::react::ILocalConnection>> m_localConnections;
+  std::unordered_map<int64_t, std::unique_ptr<facebook::react::ILocalConnection>> m_localConnections;
   std::shared_ptr<Microsoft::React::Networking::WinRTWebSocketResource> m_packagerWebSocketConnection;
   std::shared_ptr<IBundleStatusProvider> m_bundleStatusProvider;
   std::string m_url;
@@ -48,12 +49,23 @@ class InspectorPackagerConnection final : public std::enable_shared_from_this<In
 
 class RemoteConnection final : public facebook::react::IRemoteConnection {
  public:
-  RemoteConnection(int32_t pageId, const InspectorPackagerConnection &packagerConnection);
+  RemoteConnection(int64_t pageId, const InspectorPackagerConnection &packagerConnection);
+  void onMessage(std::string message) override;
+  void onDisconnect() override;
+
+ private:
+  int64_t m_pageId;
+  const InspectorPackagerConnection &m_packagerConnection;
+};
+
+class RemoteConnection2 final : public facebook::react::IRemoteConnection2 {
+ public:
+  RemoteConnection2(int64_t pageId, const InspectorPackagerConnection &packagerConnection);
   void onMessage(std::string message) override;
   void onDisconnect() override;
 
  private:
-  int32_t m_pageId;
+  int64_t m_pageId;
   const InspectorPackagerConnection &m_packagerConnection;
 };