Wire up Fusebox InspectorPackagerConnection

Using the same inspector thread initialized in ReactNativeHost, this
change wires up the InspectorPackagerConnectionDelegate to use when
initializatng the InspectorPackagerConnection from ReactCommon and
conditionally sets it for Hermes direct debugging when the appropriate
feature flag is set.

Author: rozele

vnext/ReactCommon/ReactCommon.vcxproj

@@ -111,6 +111,7 @@
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\jsiexecutor\jsireact\JSINativeModules.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\InspectorFlags.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\InspectorInterfaces.h" />
+    <ClInclude Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\InspectorPackagerConnection.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\logger\react_native_log.h" />
     <ClInclude Include="$(YogaDir)\yoga\YGEnums.h" />
     <ClInclude Include="$(YogaDir)\yoga\YGMacros.h" />
@@ -134,6 +135,7 @@
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsiexecutor\jsireact\JSINativeModules.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\InspectorFlags.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\InspectorInterfaces.cpp" />
+    <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\InspectorPackagerConnection.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\logger\react_native_log.cpp" />
     <CLCompile Include="$(ReactNativeDir)\ReactCommon\reactperflogger\reactperflogger\BridgeNativeModulePerfLogger.cpp" />
     <ClCompile Include="$(YogaDir)\yoga\YGConfig.cpp" />

vnext/Shared/DevSupportManager.cpp

@@ -9,12 +9,14 @@
 #include <Shared/DevSettings.h>
 
 #include <Executors/WebSocketJSExecutor.h>
+#include "FuseboxInspectorPackagerConnectionDelegate.h"
 #include "PackagerConnection.h"
 
 #include "Unicode.h"
 #include "Utilities.h"
 
 #include <Utils/CppWinrtLessExceptions.h>
+#include <jsinspector-modern/InspectorFlags.h>
 #include <winrt/Windows.Foundation.h>
 #include <winrt/Windows.Security.Cryptography.Core.h>
 #include <winrt/Windows.Security.Cryptography.h>
@@ -273,12 +275,10 @@ void DevSupportManager::EnsureHermesInspector(
     [[maybe_unused]] const uint16_t packagerPort,
     [[maybe_unused]] const std::string &bundleAppId) noexcept {
   static std::once_flag once;
-  std::call_once(once, [this, &packagerHost, packagerPort, &jsBundleName]() {
-    // TODO: should we use the bundleAppId as the app param if available?
-
+  std::call_once(once, [this, &packagerHost, packagerPort, &bundleAppId]() {
     std::string packageName{bundleAppId};
-    if (packageName == "") {
-      std::string packageName("RNW");
+    if (packageName.empty()) {
+      packageName = "RNW";
       wchar_t fullName[PACKAGE_FULL_NAME_MAX_LENGTH]{};
       UINT32 size = ARRAYSIZE(fullName);
       if (SUCCEEDED(GetCurrentPackageFullName(&size, fullName))) {
@@ -294,11 +294,20 @@ void DevSupportManager::EnsureHermesInspector(
     }
 
     const auto deviceId = GetDeviceId(packageName);
-    m_inspectorPackagerConnection = std::make_shared<InspectorPackagerConnection>(
-        facebook::react::DevServerHelper::get_InspectorDeviceUrl(
-            packagerHost, packagerPort, deviceName, packageName, deviceId),
-        m_BundleStatusProvider);
-    m_inspectorPackagerConnection->connectAsync();
+    auto inspectorUrl = facebook::react::DevServerHelper::get_InspectorDeviceUrl(
+        packagerHost, packagerPort, deviceName, packageName, deviceId);
+    auto &inspectorFlags = jsinspector_modern::InspectorFlags::getInstance();
+    if (inspectorFlags.getEnableCxxInspectorPackagerConnection()) {
+      m_fuseboxInspectorPackagerConnection = std::make_unique<jsinspector_modern::InspectorPackagerConnection>(
+          inspectorUrl,
+          packageName,
+          std::make_unique<Microsoft::ReactNative::FuseboxInspectorPackagerConnectionDelegate>());
+      m_fuseboxInspectorPackagerConnection->connect();
+    } else {
+      m_inspectorPackagerConnection =
+          std::make_shared<InspectorPackagerConnection>(std::move(inspectorUrl), m_BundleStatusProvider);
+      m_inspectorPackagerConnection->connectAsync();
+    }
   });
 }
 

vnext/Shared/DevSupportManager.h

@@ -15,6 +15,7 @@
 #include <string>
 
 #include <InspectorPackagerConnection.h>
+#include <jsinspector-modern/InspectorPackagerConnection.h>
 
 namespace facebook {
 namespace react {
@@ -59,6 +60,8 @@ class DevSupportManager final : public facebook::react::IDevSupportManager {
   std::atomic_bool m_cancellation_token;
 
   std::shared_ptr<InspectorPackagerConnection> m_inspectorPackagerConnection;
+  std::unique_ptr<facebook::react::jsinspector_modern::InspectorPackagerConnection>
+      m_fuseboxInspectorPackagerConnection;
 
   struct BundleStatusProvider : public InspectorPackagerConnection::IBundleStatusProvider {
     virtual InspectorPackagerConnection::BundleStatus getBundleStatus() {

vnext/Shared/IDevSupportManager.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <cxxreact/JSExecutor.h>
+#include <dispatchQueue/dispatchQueue.h>
 #include <functional>
 #include <memory>
 #include <string>