Adds device parameter to InspectorPackagerConnection URL

In preparation for unblocking Fusebox in react-native-windows, this change adds a stable device ID, which is a hash of the publisher device ID from Windows APIs and the bundle ID.

Author: rozele

vnext/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp

@@ -611,7 +611,7 @@ void ReactInstanceWin::InitializeBridgeless() noexcept {
 
               if (devSettings->useDirectDebugger) {
                 ::Microsoft::ReactNative::GetSharedDevManager()->EnsureHermesInspector(
-                    devSettings->sourceBundleHost, devSettings->sourceBundlePort);
+                    devSettings->sourceBundleHost, devSettings->sourceBundlePort, DebugBundlePath());
               }
 
               m_jsiRuntimeHolder = std::make_shared<Microsoft::ReactNative::HermesRuntimeHolder>(

vnext/Shared/DevServerHelper.h

@@ -76,12 +76,14 @@ class DevServerHelper {
       const std::string &packagerHost,
       const uint16_t packagerPort,
       const std::string &deviceName,
-      const std::string &packageName) {
+      const std::string &packageName,
+      const std::string &deviceId) {
     return string_format(
         InspectorDeviceUrlFormat,
         GetDeviceLocalHost(packagerHost, packagerPort).c_str(),
         deviceName.c_str(),
-        packageName.c_str());
+        packageName.c_str(),
+        deviceId.c_str());
   }
 
   static constexpr const char DefaultPackagerHost[] = "localhost";
@@ -105,7 +107,7 @@ class DevServerHelper {
   static constexpr const char PackagerConnectionUrlFormat[] = "ws://%s/message";
   static constexpr const char PackagerStatusUrlFormat[] = "http://%s/status";
   static constexpr const char PackagerOpenStackFrameUrlFormat[] = "https://%s/open-stack-frame";
-  static constexpr const char InspectorDeviceUrlFormat[] = "ws://%s/inspector/device?name=%s&app=%s";
+  static constexpr const char InspectorDeviceUrlFormat[] = "ws://%s/inspector/device?name=%s&app=%s&device=%s";
 
   static constexpr const char PackagerOkStatus[] = "packager-status:running";
   const int LongPollFailureDelayMs = 5000;

vnext/Shared/DevSupportManager.cpp

@@ -16,7 +16,10 @@
 
 #include <Utils/CppWinrtLessExceptions.h>
 #include <winrt/Windows.Foundation.h>
+#include <winrt/Windows.Security.Cryptography.Core.h>
+#include <winrt/Windows.Security.Cryptography.h>
 #include <winrt/Windows.Storage.Streams.h>
+#include <winrt/Windows.System.Profile.h>
 #include <winrt/Windows.Web.Http.Filters.h>
 #include <winrt/Windows.Web.Http.Headers.h>
 #include <winrt/Windows.Web.Http.h>
@@ -171,6 +174,19 @@ bool IsIgnorablePollHResult(HRESULT hr) {
   return hr == WININET_E_INVALID_SERVER_RESPONSE;
 }
 
+std::string GetDeviceId(const std::string &bundleName) {
+  const auto hash = winrt::Windows::Security::Cryptography::Core::HashAlgorithmProvider::OpenAlgorithm(
+                        winrt::Windows::Security::Cryptography::Core::HashAlgorithmNames::Sha256())
+                        .CreateHash();
+  hash.Append(winrt::Windows::System::Profile::SystemIdentification::GetSystemIdForPublisher().Id());
+  const auto bundleId = winrt::Windows::Security::Cryptography::CryptographicBuffer::ConvertStringToBinary(
+      winrt::to_hstring(bundleName), winrt::Windows::Security::Cryptography::BinaryStringEncoding::Utf16BE);
+  hash.Append(bundleId);
+  const auto hashBuffer = hash.GetValueAndReset();
+  const auto hashString = winrt::Windows::Security::Cryptography::CryptographicBuffer::EncodeToHexString(hashBuffer);
+  return winrt::to_string(hashString);
+}
+
 std::future<winrt::Windows::Web::Http::HttpStatusCode> PollForLiveReload(const std::string &url) {
   winrt::Windows::Web::Http::HttpClient httpClient;
   winrt::Windows::Foundation::Uri uri(Microsoft::Common::Unicode::Utf8ToUtf16(url));
@@ -240,9 +256,10 @@ void DevSupportManager::StopPollingLiveReload() {
 
 void DevSupportManager::EnsureHermesInspector(
     [[maybe_unused]] const std::string &packagerHost,
-    [[maybe_unused]] const uint16_t packagerPort) noexcept {
+    [[maybe_unused]] const uint16_t packagerPort,
+    [[maybe_unused]] const std::string &jsBundleName) noexcept {
   static std::once_flag once;
-  std::call_once(once, [this, &packagerHost, packagerPort]() {
+  std::call_once(once, [this, &packagerHost, packagerPort, &jsBundleName]() {
     // TODO: should we use the bundleAppId as the app param if available?
     std::string packageName("RNW");
     wchar_t fullName[PACKAGE_FULL_NAME_MAX_LENGTH]{};
@@ -258,8 +275,10 @@ void DevSupportManager::EnsureHermesInspector(
       deviceName = winrt::to_string(hostNames.First().Current().DisplayName());
     }
 
+    const auto deviceId = GetDeviceId(jsBundleName);
     m_inspectorPackagerConnection = std::make_shared<InspectorPackagerConnection>(
-        facebook::react::DevServerHelper::get_InspectorDeviceUrl(packagerHost, packagerPort, deviceName, packageName),
+        facebook::react::DevServerHelper::get_InspectorDeviceUrl(
+            packagerHost, packagerPort, deviceName, packageName, deviceId),
         m_BundleStatusProvider);
     m_inspectorPackagerConnection->connectAsync();
   });

vnext/Shared/DevSupportManager.h

@@ -49,7 +49,10 @@ class DevSupportManager final : public facebook::react::IDevSupportManager {
       std::function<void()> onChangeCallback) override;
   virtual void StopPollingLiveReload() override;
 
-  virtual void EnsureHermesInspector(const std::string &packagerHost, const uint16_t packagerPort) noexcept override;
+  virtual void EnsureHermesInspector(
+      const std::string &packagerHost,
+      const uint16_t packagerPort,
+      const std::string &jsBundleName) noexcept override;
   virtual void UpdateBundleStatus(bool isLastDownloadSuccess, int64_t updateTimestamp) noexcept override;
 
  private:

vnext/Shared/IDevSupportManager.h

@@ -24,7 +24,10 @@ struct IDevSupportManager {
       std::function<void()> onChangeCallback) = 0;
   virtual void StopPollingLiveReload() = 0;
 
-  virtual void EnsureHermesInspector(const std::string &packagerHost, const uint16_t packagerPort) noexcept = 0;
+  virtual void EnsureHermesInspector(
+      const std::string &packagerHost,
+      const uint16_t packagerPort,
+      const std::string &bundleName) noexcept = 0;
   virtual void UpdateBundleStatus(bool isLastDownloadSuccess, int64_t updateTimestamp) noexcept = 0;
 };
 

vnext/Shared/OInstance.cpp

@@ -73,6 +73,20 @@ using namespace Microsoft::JSI;
 using std::make_shared;
 using winrt::Microsoft::ReactNative::ReactPropertyBagHelper;
 
+namespace facebook::react {
+bool shouldStartHermesInspector(DevSettings &devSettings) {
+  bool isHermes =
+      ((devSettings.jsiEngineOverride == JSIEngineOverride::Hermes) ||
+       (devSettings.jsiEngineOverride == JSIEngineOverride::Default && devSettings.jsiRuntimeHolder &&
+        devSettings.jsiRuntimeHolder->getRuntimeType() == facebook::react::JSIEngineOverride::Hermes));
+
+  if (isHermes && devSettings.useDirectDebugger && !devSettings.useWebDebugger)
+    return true;
+  else
+    return false;
+}
+} // namespace facebook::react
+
 namespace Microsoft::ReactNative {
 
 // Note: Based on
@@ -105,10 +119,15 @@ void LoadRemoteUrlScript(
   hermesBytecodeVersion = ::hermes::hbc::BYTECODE_VERSION;
 #endif
 
+  const auto bundlePath = devSettings->debugBundlePath.empty() ? jsBundleRelativePath : devSettings->debugBundlePath;
+  if (facebook::react::shouldStartHermesInspector(*devSettings)) {
+    devManager->EnsureHermesInspector(devSettings->sourceBundleHost, devSettings->sourceBundlePort, bundlePath);
+  }
+
   auto [jsBundleString, success] = GetJavaScriptFromServer(
       devSettings->sourceBundleHost,
       devSettings->sourceBundlePort,
-      devSettings->debugBundlePath.empty() ? jsBundleRelativePath : devSettings->debugBundlePath,
+      bundlePath,
       devSettings->platformName,
       devSettings->bundleAppId,
       devSettings->devBundle,
@@ -329,20 +348,6 @@ void InstanceImpl::SetInError() noexcept {
   m_isInError = true;
 }
 
-namespace {
-bool shouldStartHermesInspector(DevSettings &devSettings) {
-  bool isHermes =
-      ((devSettings.jsiEngineOverride == JSIEngineOverride::Hermes) ||
-       (devSettings.jsiEngineOverride == JSIEngineOverride::Default && devSettings.jsiRuntimeHolder &&
-        devSettings.jsiRuntimeHolder->getRuntimeType() == facebook::react::JSIEngineOverride::Hermes));
-
-  if (isHermes && devSettings.useDirectDebugger && !devSettings.useWebDebugger)
-    return true;
-  else
-    return false;
-}
-} // namespace
-
 InstanceImpl::InstanceImpl(
     std::shared_ptr<Instance> &&instance,
     std::string &&jsBundleBasePath,
@@ -373,10 +378,6 @@ InstanceImpl::InstanceImpl(
   facebook::react::tracing::initializeETW();
 #endif
 
-  if (shouldStartHermesInspector(*m_devSettings)) {
-    m_devManager->EnsureHermesInspector(m_devSettings->sourceBundleHost, m_devSettings->sourceBundlePort);
-  }
-
   // Default (common) NativeModules
   auto modules = GetDefaultNativeModules(nativeQueue);