Wire HostTarget through to instance initialization

This change wires the HostTarget created in ReactNativeHost through to the instance initialization step for bridge and bridgeless architectures.

Author: rozele

vnext/Microsoft.ReactNative/ReactHost/React.h

@@ -8,6 +8,7 @@
 #include <unordered_set>
 #include <vector>
 
+#include "FuseboxHostTargetSettings.h"
 #include "JSBundle.h"
 #include "RedBoxHandler.h"
 #include "dispatchQueue/dispatchQueue.h"
@@ -343,6 +344,9 @@ struct ReactOptions {
   //! The callback is called when IReactInstance is destroyed and must not be used anymore.
   //! It is called from the native queue.
   OnReactInstanceDestroyedCallback OnInstanceDestroyed;
+
+  //! The HostTarget instance and its corresponding thread for callbacks
+  Microsoft::ReactNative::FuseboxHostTargetSettings HostTargetSettings;
 };
 
 //! IReactHost manages a ReactNative instance.

vnext/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp

@@ -291,6 +291,12 @@ ReactInstanceWin::ReactInstanceWin(
 }
 
 ReactInstanceWin::~ReactInstanceWin() noexcept {
+#ifdef USE_FABRIC
+  if (m_bridgelessReactInstance) {
+    m_bridgelessReactInstance->unregisterFromInspector();
+  }
+#endif
+
   std::scoped_lock lock{s_registryMutex};
   auto it = std::find(s_instanceRegistry.begin(), s_instanceRegistry.end(), this);
   if (it != s_instanceRegistry.end()) {
@@ -527,6 +533,8 @@ std::shared_ptr<facebook::react::DevSettings> ReactInstanceWin::CreateDevSetting
 
   devSettings->useRuntimeScheduler = useRuntimeScheduler;
 
+  devSettings->hostTargetSettings = m_options.HostTargetSettings;
+
   return devSettings;
 }
 
@@ -619,7 +627,11 @@ void ReactInstanceWin::InitializeBridgeless() noexcept {
               auto jsRuntime = std::make_unique<Microsoft::ReactNative::HermesJSRuntime>(m_jsiRuntimeHolder);
               jsRuntime->getRuntime();
               m_bridgelessReactInstance = std::make_unique<facebook::react::ReactInstance>(
-                  std::move(jsRuntime), m_jsMessageThread.Load(), timerManager, jsErrorHandlingFunc);
+                  std::move(jsRuntime),
+                  m_jsMessageThread.Load(),
+                  timerManager,
+                  jsErrorHandlingFunc,
+                  m_options.HostTargetSettings.Instance);
 
               auto bufferedRuntimeExecutor = m_bridgelessReactInstance->getBufferedRuntimeExecutor();
               timerManager->setRuntimeExecutor(bufferedRuntimeExecutor);

vnext/Microsoft.ReactNative/ReactNativeHost.cpp

@@ -261,6 +261,7 @@ IAsyncAction ReactNativeHost::ReloadInstance() noexcept {
   }
 
   reactOptions.Identity = jsBundleFile;
+  reactOptions.HostTargetSettings = {m_inspectorThread, m_inspectorTarget.get()};
   return make<Mso::AsyncActionFutureAdapter>(m_reactHost->ReloadInstanceWithOptions(std::move(reactOptions)));
 }
 

vnext/Shared/DevSettings.h

@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include "FuseboxHostTargetSettings.h"
 #include "JSI/JSExecutorFactoryDelegate.h"
 #include "Logging.h"
 
@@ -114,6 +115,9 @@ struct DevSettings {
 
   // Enable concurrent mode by installing runtimeScheduler
   bool useRuntimeScheduler{false};
+
+  //! The HostTarget instance and its corresponding thread for callbacks
+  Microsoft::ReactNative::FuseboxHostTargetSettings hostTargetSettings{};
 };
 
 } // namespace react

vnext/Shared/FuseboxHostTargetSettings.h

@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+namespace Mso {
+struct DispatchQueue;
+} // namespace Mso
+
+namespace facebook::react::jsinspector_modern {
+class HostTarget;
+} // namespace facebook::react::jsinspector_modern
+
+namespace Microsoft::ReactNative {
+
+struct FuseboxHostTargetSettings {
+  std::shared_ptr<Mso::DispatchQueue> InspectorThread;
+
+  // Do not use shared or weak pointers to ensure host has full control
+  // over the lifecycle of the HostTarget.
+  facebook::react::jsinspector_modern::HostTarget *Instance;
+};
+
+} // namespace Microsoft::ReactNative

vnext/Shared/OInstance.cpp

@@ -485,7 +485,8 @@ InstanceImpl::InstanceImpl(
     }
   }
 
-  m_innerInstance->initializeBridge(std::move(callback), jsef, m_jsThread, m_moduleRegistry);
+  m_innerInstance->initializeBridge(
+      std::move(callback), jsef, m_jsThread, m_moduleRegistry, m_devSettings->hostTargetSettings.Instance);
 
   // For RuntimeScheduler to work properly, we need to install TurboModuleManager with RuntimeSchedulerCallbackInvoker.
   // To be able to do that, we need to be able to call m_innerInstance->getRuntimeExecutor(), which we can only do after
@@ -588,6 +589,7 @@ void InstanceImpl::loadBundleInternal(std::string &&jsBundleRelativePath, bool s
 }
 
 InstanceImpl::~InstanceImpl() {
+  m_innerInstance->unregisterFromInspector();
   if (shouldStartHermesInspector(*m_devSettings) && m_devSettings->jsiRuntimeHolder) {
     m_devSettings->jsiRuntimeHolder->teardown();
   }

vnext/Shared/Shared.vcxitems

@@ -412,6 +412,7 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)CxxMessageQueue.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)DevServerHelper.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)DevSettings.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)FuseboxHostTargetSettings.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)Executors\WebSocketJSExecutor.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)HermesRuntimeHolder.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)InspectorPackagerConnection.h" />

vnext/Shared/Shared.vcxitems.filters

@@ -507,6 +507,9 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)DevSettings.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="$(MSBuildThisFileDirectory)FuseboxHostTargetSettings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)IDevSupportManager.h">
       <Filter>Header Files</Filter>
     </ClInclude>