react-native-windows 0.80.1 → 0.81.0-preview.4

package/Scripts/Analyze-Crash.ps1

@@ -67,7 +67,28 @@ if ($ExeName) {
 }
 
 Write-Host Analyzing crash dump $DumpFilePath
-& $cdb -z "$DumpFilePath" -c ".lines; !analyze -v; .ecxr; kP; q" > $logfile
+
+# First, do a quick check to see if this is a /GS crash (STATUS_STACK_BUFFER_OVERRUN, 0xc0000409)
+$gsCheckLogfile = "$env:TEMP\gs_check.log"
+& $cdb -z "$DumpFilePath" -c ".lastevent; q" > $gsCheckLogfile 2>&1
+$isGSCrash = $false
+if (Test-Path $gsCheckLogfile) {
+  $content = Get-Content $gsCheckLogfile -Raw
+  if ($content -match "c0000409|STATUS_STACK_BUFFER_OVERRUN") {
+    $isGSCrash = $true
+    Write-Host -ForegroundColor Yellow "`n*** DETECTED /GS STACK BUFFER OVERRUN CRASH (0xc0000409) ***"
+    Write-Host -ForegroundColor Yellow "This is a security-related crash that requires immediate attention.`n"
+  }
+  Remove-Item $gsCheckLogfile -ErrorAction SilentlyContinue
+}
+
+# Run analysis with !gs extension for /GS crashes
+if ($isGSCrash) {
+  Write-Host "Running detailed /GS crash analysis..."
+  & $cdb -z "$DumpFilePath" -c ".lines; !analyze -v; !gs; .ecxr; kP; q" > $logfile
+} else {
+  & $cdb -z "$DumpFilePath" -c ".lines; !analyze -v; .ecxr; kP; q" > $logfile
+}
 
 if ($LASTEXITCODE -ne 0) {
   Write-Output "Failed to analyze the crash dump. Exiting"
@@ -82,10 +103,35 @@ if (!(Test-Path $logfile)) {
   exit 4
 }
 
+# Check for /GS crash indicators in the analysis
+$analysisContent = Get-Content $logfile -Raw
+$gsClassification = "Unknown"
+
+if ($analysisContent -match "GS_POSITIVE") {
+  $gsClassification = "GS_POSITIVE (High-confidence stack buffer overrun)"
+  Write-Host -ForegroundColor Red "`n*** HIGH-CONFIDENCE /GS CRASH DETECTED ***"
+  Write-Host -ForegroundColor Red "Problem Class: GS_POSITIVE"
+  Write-Host -ForegroundColor Red "This is a confirmed stack buffer overrun that MUST be fixed immediately."
+  Write-Host -ForegroundColor Red "Per SDL policy, this must be analyzed and fixed within 60 days.`n"
+} elseif ($analysisContent -match "GS_SUSPECT") {
+  $gsClassification = "GS_SUSPECT (Suspected stack buffer overrun)"
+  Write-Host -ForegroundColor Yellow "`n*** SUSPECTED /GS CRASH DETECTED ***"
+  Write-Host -ForegroundColor Yellow "Problem Class: GS_SUSPECT"
+  Write-Host -ForegroundColor Yellow "This is a suspected stack buffer overrun that should be investigated.`n"
+} elseif ($analysisContent -match "GS_FALSE_POSITIVE") {
+  $gsClassification = "GS_FALSE_POSITIVE (Can be safely ignored)"
+  Write-Host -ForegroundColor Green "`n/GS False Positive Detected"
+  Write-Host -ForegroundColor Green "Problem Class: GS_FALSE_POSITIVE - This can be safely ignored.`n"
+} elseif ($isGSCrash) {
+  Write-Host -ForegroundColor Yellow "`n/GS crash detected but classification not determined."
+  Write-Host -ForegroundColor Yellow "Manual review of the crash dump is recommended.`n"
+}
+
 Get-Content $logfile | & "${env:SystemRoot}\System32\clip.exe"
 
 Write-Host "
 Written analysis to $PWD\$logfile
+/GS Classification: $gsClassification
 
 The contents have been copied to the clipboard.
 If you wish to file a bug, please paste its contents in inside of a <details>...</details> tag.
@@ -93,15 +139,53 @@ You may also upload the file $DumpFilePath and associated .pdb symbol files to y
 
 "
 
+if ($gsClassification -eq "GS_POSITIVE (High-confidence stack buffer overrun)") {
+  Write-Host -ForegroundColor Red @"
+
+===============================================================================
+SDL POLICY REQUIREMENT: HIGH-CONFIDENCE /GS CRASH
+===============================================================================
+Per Microsoft SDL policy, this crash MUST be:
+1. Analyzed and triaged immediately
+2. Fixed within 60 days of being reported to Watson
+3. Reported as a security vulnerability if exploitable
+
+Action Items:
+- Review the !gs analysis output in $logfile
+- Identify the buffer overrun location and root cause
+- File a security bug if this is exploitable
+- Implement and test a fix
+
+For more information, see: https://aka.ms/watson
+===============================================================================
+
+"@
+}
+
+
 Write-Warning "Note: the contents of $logfile, crash dump, and symbol files, might contain personally identifiable information. Please carefully review these contents before sharing them."
 
 start notepad.exe $logfile
 
 function FileIssue {
   # We can't populate the !analyze output because the URL ends up being too long and GitHub rejects it. Following up internally but at least we can prepopulate the <details> tags etc.
-  $title = [uri]::EscapeUriString("[Crash] ENTER TITLE HERE")
+  
+  $issueTitle = "[Crash] ENTER TITLE HERE"
+  $labels = "bug"
+  
+  if ($gsClassification -eq "GS_POSITIVE (High-confidence stack buffer overrun)") {
+    $issueTitle = "[Security] /GS High-Confidence Stack Buffer Overrun"
+    $labels = "bug,security"
+  } elseif ($gsClassification -eq "GS_SUSPECT (Suspected stack buffer overrun)") {
+    $issueTitle = "[Security] /GS Suspected Stack Buffer Overrun"
+    $labels = "bug,security"
+  }
+  
+  $title = [uri]::EscapeUriString($issueTitle)
   $body = [uri]::EscapeUriString("ENTER YOUR ISSUE DESCRIPTION HERE
 
+/GS Classification: $gsClassification
+
 <details>
 
 ``````
@@ -110,7 +194,7 @@ function FileIssue {
 </details>
 ")
 
-  start "https://github.com/$Repo/issues/new?title=$title&body=$body&labels=bug"
+  start "https://github.com/$Repo/issues/new?title=$title&body=$body&labels=$labels"
 }
 
 FileIssue

package/Scripts/OfficeReact.Win32.nuspec

@@ -55,7 +55,6 @@
     <file src="$nugetroot$\inc\Shared\LayoutAnimation.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\Logging.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\MemoryMappedBuffer.h" target="inc"/>
-    <file src="$nugetroot$\inc\Shared\Modules\I18nModule.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\NativeModuleProvider.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\Networking\IWebSocketResource.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\Networking\OriginPolicy.h" target="inc"/>

package/Scripts/Tfs/Layout-MSRN-Headers.ps1

@@ -78,6 +78,8 @@ New-Item $MSRNCxxTargetRoot\node-api -ItemType Directory -Force
 Copy-Item -Force -Path $NodeApiJsiRoot\node-api\js_native_api.h -Destination $MSRNCxxTargetRoot\node-api\
 Copy-Item -Force -Path $NodeApiJsiRoot\node-api\js_native_api_types.h -Destination $MSRNCxxTargetRoot\node-api\
 Copy-Item -Force -Path $NodeApiJsiRoot\node-api\js_runtime_api.h -Destination $MSRNCxxTargetRoot\node-api\
+Copy-Item -Force -Path $NodeApiJsiRoot\node-api\node_api.h -Destination $MSRNCxxTargetRoot\node-api\
+Copy-Item -Force -Path $NodeApiJsiRoot\node-api\node_api_types.h -Destination $MSRNCxxTargetRoot\node-api\
 
 # Microsoft.ReactNative.CXX project Node-API JSI files
 New-Item $MSRNCxxTargetRoot\ApiLoaders -ItemType Directory -Force

package/Scripts/Tfs/Start-TestServers.ps1

@@ -16,7 +16,8 @@ Write-Host "Starting packager"
 
 Set-Location -Path "$PSScriptRoot\..\.."
 
-Start-Process npm	-PassThru `
+$npmCmd = (Get-Command npm.cmd -ErrorAction Stop).Source
+Start-Process $npmCmd	-PassThru `
 				-NoNewWindow `
 				-WorkingDirectory "$PSScriptRoot\..\.." `
 				-ArgumentList "run start" `

package/Scripts/creaternwapp.cmd

@@ -114,11 +114,14 @@ for /f "delims=" %%a in ('npm show react@%R_VERSION% version') do @set R_VERSION
 set RNCLI_TEMPLATE=
 if not "x%RN_VERSION:nightly=%"=="x%RN_VERSION%" (
   @echo creaternwapp.cmd Override @react-native-community/template version
-  set RNCLI_TEMPLATE=--template "@react-native-community/template@^%RN_VERSION:~0,4%.0-"
+  REM Do not change, this makes sure we always get a nightly template when still consuming a nightly RN and NOT a later "stable" template that may have been released
+  REM set RNCLI_TEMPLATE=--template "@react-native-community/template@^%RN_VERSION:~0,4%.0-"
+  REM Windows we need to manually update this with every integration #15124
+  set RNCLI_TEMPLATE=--template "@react-native-community/template@0.81.0-nightly-202565-2f67cec"
 )
 
-@echo creaternwapp.cmd: Creating base RN app project with: npx --yes @react-native-community/cli@latest init %APP_NAME% --version %RN_VERSION% %RNCLI_TEMPLATE% --verbose --skip-install --install-pods false --skip-git-init true
-call npx --yes @react-native-community/cli@latest init %APP_NAME% --version %RN_VERSION% %RNCLI_TEMPLATE% --verbose --skip-install --install-pods false --skip-git-init true
+@echo creaternwapp.cmd: Creating base RN app project with: npx --yes @react-native-community/cli@%RNCLI_VERSION% init %APP_NAME% --version %RN_VERSION% %RNCLI_TEMPLATE% --verbose --skip-install --install-pods false --skip-git-init true
+call npx --yes @react-native-community/cli@%RNCLI_VERSION% init %APP_NAME% --version %RN_VERSION% %RNCLI_TEMPLATE% --verbose --skip-install --install-pods false --skip-git-init true
 
 if %ERRORLEVEL% neq 0 (
   @echo creaternwapp.cmd: Unable to create base RN app project
@@ -131,6 +134,7 @@ if not "x%RN_VERSION:nightly=%"=="x%RN_VERSION%" (
   @echo creaternwapp.cmd Fixing react-native nightly issues
   pwsh.exe -Command "(gc package.json) -replace '""react-native"": ""[^\*]*""', '""react-native"": ""%RN_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
   pwsh.exe -Command "(gc package.json) -replace '""@react-native/(.+-(config|preset))"": "".*""', '""@react-native/$1"": ""%RN_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
+  pwsh.exe -Command "(gc package.json) -replace '""@react-native/new-app-screen"": "".*""', '""@react-native/new-app-screen"": ""%RN_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
   pwsh.exe -Command "(gc package.json) -replace '""@react-native-community/cli((-platform-)?(ios|android))?"": "".*""', '""@react-native-community/cli$1"": ""%RNCLI_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
 )
 
@@ -140,7 +144,7 @@ call yarn install
 @echo creaternwapp.cmd: Creating commit to save current state
 if not exist ".git\" call git init .
 call git add .
-call git commit -m "npx --yes @react-native-community/cli@latest init %APP_NAME% --version %RN_VERSION% %RNCLI_TEMPLATE% --verbose --skip-install --install-pods false --skip-git-init true"
+call git commit -m "npx --yes @react-native-community/cli@%RNCLI_VERSION% init %APP_NAME% --version %RN_VERSION% %RNCLI_TEMPLATE% --verbose --skip-install --install-pods false --skip-git-init true"
 
 if %USE_VERDACCIO% equ 1 (
   @echo creaternwapp.cmd: Setting yarn to use verdaccio at http://localhost:4873
@@ -171,8 +175,8 @@ call yarn install
 call git add .
 call git commit -m "add rnw dependency"
 
-@echo creaternwapp.cmd Running init-windows with: npx --yes @react-native-community/cli@latest init-windows --template %RNW_TEMPLATE_TYPE% --overwrite --logging
-call npx --yes @react-native-community/cli@latest init-windows --template %RNW_TEMPLATE_TYPE% --overwrite --logging
+@echo creaternwapp.cmd Running init-windows with: npx --yes @react-native-community/cli@%RNCLI_VERSION% init-windows --template %RNW_TEMPLATE_TYPE% --overwrite --logging
+call npx --yes @react-native-community/cli@%RNCLI_VERSION% init-windows --template %RNW_TEMPLATE_TYPE% --overwrite --logging
 
 @echo creaternwapp.cmd Done, see new %RNW_TEMPLATE_TYPE% project in %CD% with react@%R_VERSION%, react-native@%RN_VERSION%, and react-native-windows@%RNW_VERSION%
 

package/Scripts/rnw-dependencies.ps1

@@ -1,3 +1,4 @@
+
 # Troubleshoot RNW dependencies
 param(
     [switch]$Install = $false,
@@ -61,8 +62,36 @@ if ($tagsToInclude.Contains('rnwDev')) {
     $tagsToInclude.Add('appDev') | Out-null;
 }
 
+# Detect processor architecture to select appropriate VC Tools component
+$ProcessorArchitecture = $Env:Processor_Architecture
+
+# Getting $Env:Processor_Architecture on arm64 machines will return x86.  So check if the environment
+# variable "ProgramFiles(Arm)" is also set, if it is we know the actual processor architecture is arm64.
+# The value will also be x86 on amd64 machines when running the x86 version of PowerShell.
+if ($ProcessorArchitecture -eq "x86")
+{
+    if ($null -ne ${Env:ProgramFiles(Arm)})
+    {
+        $ProcessorArchitecture = "arm64"
+    }
+    elseif ($null -ne ${Env:ProgramFiles(x86)})
+    {
+        $ProcessorArchitecture = "amd64"
+    }
+}
+
+# Select the appropriate VC Tools component based on processor architecture
+if ($ProcessorArchitecture -eq "arm64")
+{
+    $vcToolsComponent = 'Microsoft.VisualStudio.Component.VC.Tools.ARM64'
+}
+else
+{
+    $vcToolsComponent = 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64'
+}
+
 $vsComponents = @('Microsoft.Component.MSBuild',
-    'Microsoft.VisualStudio.Component.VC.Tools.x86.x64',
+    $vcToolsComponent,
     'Microsoft.VisualStudio.ComponentGroup.UWP.Support',
     'Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core',
     'Microsoft.VisualStudio.Component.Windows10SDK.19041',
@@ -241,7 +270,7 @@ function CheckNode {
         Write-Verbose "Node version found: $nodeVersion";
         $major = $nodeVersion.Major;
         $minor = $nodeVersion.Minor;
-        return ($major -gt 18) -or (($major -eq 18) -and ($minor -ge 18));
+        return ($major -gt 22) -or (($major -eq 22) -and ($minor -ge 14));
     } catch { Write-Debug $_ }
 
     Write-Verbose "Node not found.";
@@ -437,10 +466,10 @@ $requirements = @(
     },
     @{
         Id=[CheckId]::Node;
-        Name = 'Node.js (LTS, >= 18.18)';
+        Name = 'Node.js (LTS, >= 22.0)';
         Tags = @('appDev');
         Valid = { CheckNode; }
-        Install = { WinGetInstall OpenJS.NodeJS.LTS "18.18.0" };
+        Install = { WinGetInstall OpenJS.NodeJS.LTS "22.14.0" };
         HasVerboseOutput = $true;
     },
     @{

package/Shared/CreateModules.h

@@ -3,9 +3,6 @@
 
 #pragma once
 
-// React Native
-#include <cxxreact/CxxModule.h>
-
 // Windows API
 #include <winrt/Windows.Foundation.h>
 
@@ -22,40 +19,8 @@ namespace Mso::React {
 struct IReactContext;
 }
 
-namespace facebook::react {
-
-class MessageQueueThread;
-
-// This method is to create a unique_ptr of native timing module.
-// @param A MessageQueueThread on which this native module lives.
-// @return Native timing module
-extern std::unique_ptr<facebook::xplat::module::CxxModule> CreateTimingModule(
-    const std::shared_ptr<facebook::react::MessageQueueThread> &nativeThread) noexcept;
-
-} // namespace facebook::react
-
 namespace Microsoft::React {
 
-#pragma region CxxModules
-
-extern const char *GetHttpModuleName() noexcept;
-extern std::unique_ptr<facebook::xplat::module::CxxModule> CreateHttpModule(
-    winrt::Windows::Foundation::IInspectable const &inspectableProperties) noexcept;
-
-extern const char *GetWebSocketModuleName() noexcept;
-extern std::unique_ptr<facebook::xplat::module::CxxModule> CreateWebSocketModule(
-    winrt::Windows::Foundation::IInspectable const &inspectableProperties) noexcept;
-
-extern const char *GetBlobModuleName() noexcept;
-extern std::unique_ptr<facebook::xplat::module::CxxModule> CreateBlobModule(
-    winrt::Windows::Foundation::IInspectable const &inspectableProperties) noexcept;
-
-extern const char *GetFileReaderModuleName() noexcept;
-extern std::unique_ptr<facebook::xplat::module::CxxModule> CreateFileReaderModule(
-    winrt::Windows::Foundation::IInspectable const &inspectableProperties) noexcept;
-
-#pragma endregion CxxModules
-
 #pragma region TurboModules
 
 extern const wchar_t *GetBlobTurboModuleName() noexcept;

package/Shared/DevServerHelper.h

@@ -76,12 +76,20 @@ 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 std::string
+  get_OpenDebuggerUrl(const std::string &packagerHost, const uint16_t packagerPort, const std::string &deviceId) {
+    return string_format(
+        OpenDebuggerUrlFormat, GetDeviceLocalHost(packagerHost, packagerPort).c_str(), deviceId.c_str());
   }
 
   static constexpr const char DefaultPackagerHost[] = "localhost";
@@ -105,11 +113,13 @@ 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 OpenDebuggerUrlFormat[] = "http://%s/open-debugger?device=%s";
 
   static constexpr const char PackagerOkStatus[] = "packager-status:running";
   const int LongPollFailureDelayMs = 5000;
 
+  // TODO: [vmoroz]  avoid using vaiadic args for the format and move it to a utility class.
   template <typename... Args>
   static std::string string_format(const char *format, Args... args) {
     size_t size = snprintf(nullptr, 0, format, args...) + 1;

package/Shared/DevSettings.h

@@ -23,6 +23,10 @@ struct RuntimeHolderLazyInit;
 namespace facebook {
 namespace react {
 
+namespace jsinspector_modern {
+class HostTarget;
+} // namespace jsinspector_modern
+
 enum class JSIEngineOverride : int32_t {
   Default = 0, // No JSI, will use the legacy ExecutorFactory
   Chakra = 1, // Use the JSIExecutorFactory with ChakraRuntime
@@ -106,17 +110,14 @@ struct DevSettings {
 
   bool enableDefaultCrashHandler{false};
 
-  // Transitory. Used to indicate whether or not to load networking types in the default Cxx module registry.
-  bool omitNetworkingCxxModules{false};
-
   // OC:8368383 - Memory leak under investigation.
   bool useWebSocketTurboModule{false};
 
   // Enable concurrent mode by installing runtimeScheduler
   bool useRuntimeScheduler{false};
 
-  // If true, then use only Turbo Modules instead of CxxModules.
-  bool useTurboModulesOnly{false};
+  // The HostTarget instance for Fusebox
+  facebook::react::jsinspector_modern::HostTarget *inspectorHostTarget;
 };
 
 } // namespace react

package/Shared/DevSupportManager.cpp

@@ -9,14 +9,19 @@
 #include <Shared/DevSettings.h>
 
 #include <Executors/WebSocketJSExecutor.h>
+#include "Inspector/ReactInspectorPackagerConnectionDelegate.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>
 #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 +176,49 @@ bool IsIgnorablePollHResult(HRESULT hr) {
   return hr == WININET_E_INVALID_SERVER_RESPONSE;
 }
 
+std::string GetDeviceId(const std::string &packageName) {
+  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());
+  winrt::Windows::Storage::Streams::InMemoryRandomAccessStream stream;
+  winrt::Windows::Storage::Streams::DataWriter writer;
+  // If an app ID is provided, we will allow reconnection to DevTools.
+  // Apps must supply a unique app ID to each ReactNativeHost instance settings for this to behave correctly.
+  if (!packageName.empty()) {
+    const auto packageNameBuffer = winrt::Windows::Security::Cryptography::CryptographicBuffer::ConvertStringToBinary(
+        winrt::to_hstring(packageName), winrt::Windows::Security::Cryptography::BinaryStringEncoding::Utf16BE);
+    hash.Append(packageNameBuffer);
+  } else {
+    const auto processId = GetCurrentProcessId();
+    std::vector<uint8_t> processIdBytes(
+        reinterpret_cast<const uint8_t *>(&processId), reinterpret_cast<const uint8_t *>(&processId + 1));
+    winrt::array_view<uint8_t> processIdByteArray(processIdBytes);
+    const auto processIdBuffer =
+        winrt::Windows::Security::Cryptography::CryptographicBuffer::CreateFromByteArray(processIdByteArray);
+    hash.Append(processIdBuffer);
+  }
+  const auto hashBuffer = hash.GetValueAndReset();
+  const auto hashString = winrt::Windows::Security::Cryptography::CryptographicBuffer::EncodeToHexString(hashBuffer);
+  return winrt::to_string(hashString);
+}
+
+std::string GetPackageName(const std::string &bundleAppId) {
+  if (!bundleAppId.empty()) {
+    return bundleAppId;
+  }
+
+  std::string packageName{"RNW"};
+  wchar_t fullName[PACKAGE_FULL_NAME_MAX_LENGTH]{};
+  uint32_t size = ARRAYSIZE(fullName);
+  if (SUCCEEDED(GetCurrentPackageFullName(&size, fullName))) {
+    // we are in an unpackaged app
+    packageName = winrt::to_string(fullName);
+  }
+
+  return packageName;
+}
+
 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));
@@ -238,37 +286,48 @@ void DevSupportManager::StopPollingLiveReload() {
   m_cancellation_token = true;
 }
 
-void DevSupportManager::EnsureHermesInspector(
+// TODO: (vmoroz) Use or delete this function
+void DevSupportManager::OpenDevTools(const std::string &bundleAppId) {
+  winrt::Windows::Web::Http::Filters::HttpBaseProtocolFilter filter;
+  filter.CacheControl().ReadBehavior(winrt::Windows::Web::Http::Filters::HttpCacheReadBehavior::NoCache);
+  winrt::Windows::Web::Http::HttpClient httpClient(filter);
+  // TODO: Use currently configured dev server host
+  winrt::Windows::Foundation::Uri uri(
+      Microsoft::Common::Unicode::Utf8ToUtf16(facebook::react::DevServerHelper::get_OpenDebuggerUrl(
+          std::string{DevServerHelper::DefaultPackagerHost},
+          DevServerHelper::DefaultPackagerPort,
+          GetDeviceId(GetPackageName(bundleAppId)))));
+
+  winrt::Windows::Web::Http::HttpRequestMessage request(winrt::Windows::Web::Http::HttpMethod::Post(), uri);
+  httpClient.SendRequestAsync(request);
+}
+
+void DevSupportManager::EnsureInspectorPackagerConnection(
     [[maybe_unused]] const std::string &packagerHost,
-    [[maybe_unused]] const uint16_t packagerPort) noexcept {
+    [[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]() {
-    // TODO: should we use the bundleAppId as the app param if available?
-    std::string packageName("RNW");
-    wchar_t fullName[PACKAGE_FULL_NAME_MAX_LENGTH]{};
-    UINT32 size = ARRAYSIZE(fullName);
-    if (SUCCEEDED(GetCurrentPackageFullName(&size, fullName))) {
-      // we are in an unpackaged app
-      packageName = winrt::to_string(fullName);
-    }
-
+  std::call_once(once, [this, &packagerHost, packagerPort, &bundleAppId]() {
+    std::string packageName = GetPackageName(bundleAppId);
     std::string deviceName("RNWHost");
     auto hostNames = winrt::Windows::Networking::Connectivity::NetworkInformation::GetHostNames();
     if (hostNames && hostNames.First() && hostNames.First().Current()) {
       deviceName = winrt::to_string(hostNames.First().Current().DisplayName());
     }
 
-    m_inspectorPackagerConnection = std::make_shared<InspectorPackagerConnection>(
-        facebook::react::DevServerHelper::get_InspectorDeviceUrl(packagerHost, packagerPort, deviceName, packageName),
-        m_BundleStatusProvider);
-    m_inspectorPackagerConnection->connectAsync();
+    std::string deviceId = GetDeviceId(packageName);
+    std::string inspectorUrl = facebook::react::DevServerHelper::get_InspectorDeviceUrl(
+        packagerHost, packagerPort, deviceName, packageName, deviceId);
+    jsinspector_modern::InspectorFlags &inspectorFlags = jsinspector_modern::InspectorFlags::getInstance();
+    m_inspectorPackagerConnection = std::make_unique<jsinspector_modern::InspectorPackagerConnection>(
+        inspectorUrl,
+        deviceName,
+        packageName,
+        std::make_unique<Microsoft::ReactNative::ReactInspectorPackagerConnectionDelegate>());
+    m_inspectorPackagerConnection->connect();
   });
 }
 
-void DevSupportManager::UpdateBundleStatus(bool isLastDownloadSuccess, int64_t updateTimestamp) noexcept {
-  m_BundleStatusProvider->updateBundleStatus(isLastDownloadSuccess, updateTimestamp);
-}
-
 std::pair<std::string, bool> GetJavaScriptFromServer(
     const std::string &sourceBundleHost,
     const uint16_t sourceBundlePort,

package/Shared/DevSupportManager.h

@@ -14,7 +14,7 @@
 #include <memory>
 #include <string>
 
-#include <InspectorPackagerConnection.h>
+#include <jsinspector-modern/InspectorPackagerConnection.h>
 
 namespace facebook {
 namespace react {
@@ -48,29 +48,17 @@ class DevSupportManager final : public facebook::react::IDevSupportManager {
       const uint16_t sourceBundlePort,
       std::function<void()> onChangeCallback) override;
   virtual void StopPollingLiveReload() override;
+  virtual void OpenDevTools(const std::string &bundleAppId) override;
 
-  virtual void EnsureHermesInspector(const std::string &packagerHost, const uint16_t packagerPort) noexcept override;
-  virtual void UpdateBundleStatus(bool isLastDownloadSuccess, int64_t updateTimestamp) noexcept override;
+  virtual void EnsureInspectorPackagerConnection(
+      const std::string &packagerHost,
+      const uint16_t packagerPort,
+      const std::string &bundleAppId) noexcept override;
 
  private:
   std::atomic_bool m_cancellation_token;
 
-  std::shared_ptr<InspectorPackagerConnection> m_inspectorPackagerConnection;
-
-  struct BundleStatusProvider : public InspectorPackagerConnection::IBundleStatusProvider {
-    virtual InspectorPackagerConnection::BundleStatus getBundleStatus() {
-      return m_bundleStatus;
-    }
-
-    void updateBundleStatus(bool isLastDownloadSuccess, int64_t updateTimestamp) {
-      m_bundleStatus.m_isLastDownloadSuccess = isLastDownloadSuccess;
-      m_bundleStatus.m_updateTimestamp = updateTimestamp;
-    }
-
-   private:
-    InspectorPackagerConnection::BundleStatus m_bundleStatus;
-  };
-  std::shared_ptr<BundleStatusProvider> m_BundleStatusProvider = std::make_shared<BundleStatusProvider>();
+  std::unique_ptr<facebook::react::jsinspector_modern::InspectorPackagerConnection> m_inspectorPackagerConnection;
 };
 
 } // namespace Microsoft::ReactNative