react-native-windows 0.69.18 → 0.69.20

package/Microsoft.ReactNative/IReactDispatcher.cpp

@@ -124,4 +124,8 @@ void ReactDispatcher::InvokeElsePost(Mso::DispatchTask &&task) const noexcept {
   return jsThreadDispatcherProperty;
 }
 
+/*static*/ IReactDispatcher ReactDispatcher::GetJSDispatcher(IReactPropertyBag const &properties) noexcept {
+  return properties.Get(JSDispatcherProperty()).try_as<IReactDispatcher>();
+}
+
 } // namespace winrt::Microsoft::ReactNative::implementation

package/Microsoft.ReactNative/IReactDispatcher.h

@@ -38,6 +38,7 @@ struct ReactDispatcher : implements<ReactDispatcher, IReactDispatcher, Mso::Reac
   static void SetUIThreadDispatcher(IReactPropertyBag const &properties) noexcept;
 
   static IReactPropertyName JSDispatcherProperty() noexcept;
+  static IReactDispatcher GetJSDispatcher(IReactPropertyBag const &properties) noexcept;
 
   void Post(Mso::DispatchTask &&task) const noexcept override;
   void InvokeElsePost(Mso::DispatchTask &&task) const noexcept override;

package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp

@@ -250,6 +250,7 @@ ReactInstanceWin::ReactInstanceWin(
                                                                onDestroyed = m_options.OnInstanceDestroyed,
                                                                reactContext = m_reactContext]() noexcept {
         whenLoaded.TryCancel(); // It only has an effect if whenLoaded was not set before
+        facebook::react::HermesRuntimeHolder::storeTo(ReactPropertyBag(reactContext->Properties()), nullptr);
         if (onDestroyed) {
           onDestroyed.Get()->Invoke(reactContext);
         }
@@ -463,10 +464,14 @@ void ReactInstanceWin::Initialize() noexcept {
           std::unique_ptr<facebook::jsi::PreparedScriptStore> preparedScriptStore = nullptr;
 
           switch (m_options.JsiEngine()) {
-            case JSIEngine::Hermes:
-              devSettings->jsiRuntimeHolder =
+            case JSIEngine::Hermes: {
+              auto hermesRuntimeHolder =
                   std::make_shared<facebook::react::HermesRuntimeHolder>(devSettings, m_jsMessageThread.Load());
+              facebook::react::HermesRuntimeHolder::storeTo(
+                  ReactPropertyBag(m_reactContext->Properties()), hermesRuntimeHolder);
+              devSettings->jsiRuntimeHolder = hermesRuntimeHolder;
               break;
+            }
             case JSIEngine::V8:
 #if defined(USE_V8)
             {

package/Microsoft.ReactNative/Utils/Helpers.h

@@ -18,7 +18,7 @@ struct ReactId {
 };
 
 template <typename T>
-inline typename T asEnum(winrt::Microsoft::ReactNative::JSValue const &obj) {
+inline T asEnum(winrt::Microsoft::ReactNative::JSValue const &obj) {
   return static_cast<T>(obj.AsInt64());
 }
 

package/Microsoft.ReactNative/Views/DevMenu.cpp

@@ -119,7 +119,7 @@ void DevMenuManager::CreateAndShowUI() noexcept {
 
     std::ostringstream os;
     if (Microsoft::ReactNative::HermesSamplingProfiler::IsStarted()) {
-      os << "Hermes Sampling profiler is running.. !";
+      os << "Hermes Sampling profiler is running!";
     } else {
       os << "Click to start.";
     }
@@ -210,9 +210,9 @@ void DevMenuManager::CreateAndShowUI() noexcept {
           if (auto strongThis = wkThis.lock()) {
             strongThis->Hide();
             if (!Microsoft::ReactNative::HermesSamplingProfiler::IsStarted()) {
-              Microsoft::ReactNative::HermesSamplingProfiler::Start();
+              Microsoft::ReactNative::HermesSamplingProfiler::Start(strongThis->m_context);
             } else {
-              auto traceFilePath = co_await Microsoft::ReactNative::HermesSamplingProfiler::Stop();
+              auto traceFilePath = co_await Microsoft::ReactNative::HermesSamplingProfiler::Stop(strongThis->m_context);
               auto uiDispatcher =
                   React::implementation::ReactDispatcher::GetUIDispatcher(strongThis->m_context->Properties());
               uiDispatcher.Post([traceFilePath]() {

package/Microsoft.ReactNative.Managed/packages.lock.json

@@ -24,11 +24,6 @@
           "Microsoft.SourceLink.Common": "1.0.0"
         }
       },
-      "boost": {
-        "type": "Transitive",
-        "resolved": "1.76.0",
-        "contentHash": "p+w3YvNdXL8Cu9Fzrmexssu0tZbWxuf6ywsQqHjDlKFE5ojXHof1HIyMC3zDLfLnh80dIeFcEUAuR2Asg/XHRA=="
-      },
       "Microsoft.Build.Tasks.Git": {
         "type": "Transitive",
         "resolved": "1.0.0",
@@ -58,41 +53,21 @@
       "Microsoft.NETCore.Platforms": {
         "type": "Transitive",
         "resolved": "2.1.0",
-        "contentHash": "GmkKfoyerqmsHMn7OZj0AKpcBabD+GaafqphvX2Mw406IwiJRy1pKcKqdCfKJfYmkRyJ6+e+RaUylgdJoDa1jQ=="
+        "contentHash": "ok+RPAtESz/9MUXeIEz6Lv5XAGQsaNmEYXMsgVALj4D7kqC8gveKWXWXbufLySR2fWrwZf8smyN5RmHu0e4BHA=="
       },
       "Microsoft.SourceLink.Common": {
         "type": "Transitive",
         "resolved": "1.0.0",
         "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg=="
       },
-      "Microsoft.UI.Xaml": {
-        "type": "Transitive",
-        "resolved": "2.7.0",
-        "contentHash": "dB4im13tfmMgL/V3Ei+3kD2rUF+/lTxAmR4gjJ45l577eljHfdo/KUrxpq/3I1Vp6e5GCDG1evDaEGuDxypLMg=="
-      },
-      "Microsoft.Windows.CppWinRT": {
-        "type": "Transitive",
-        "resolved": "2.0.211028.7",
-        "contentHash": "JBGI0c3WLoU6aYJRy9Qo0MLDQfObEp+d4nrhR95iyzf7+HOgjRunHDp/6eGFREd7xq3OI1mll9ecJrMfzBvlyg=="
-      },
-      "Microsoft.Windows.SDK.BuildTools": {
-        "type": "Transitive",
-        "resolved": "10.0.22000.194",
-        "contentHash": "4L0P3zqut466SIqT3VBeLTNUQTxCBDOrTRymRuROCRJKazcK7ibLz9yAO1nKWRt50ttCj39oAa2Iuz9ZTDmLlg=="
-      },
       "NETStandard.Library": {
         "type": "Transitive",
         "resolved": "2.0.3",
-        "contentHash": "548M6mnBSJWxsIlkQHfbzoYxpiYFXZZSL00p4GHYv8PkiqFBnnT68mW5mGEsA/ch9fDO9GkPgkFQpWiXZN7mAQ==",
+        "contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==",
         "dependencies": {
           "Microsoft.NETCore.Platforms": "1.1.0"
         }
       },
-      "ReactNative.Hermes.Windows": {
-        "type": "Transitive",
-        "resolved": "0.11.0-ms.6",
-        "contentHash": "WAVLsSZBV4p/3hNC3W67su7xu3f/ZMSKxu0ON7g2GaKRbkJmH0Qyif1IlzcJwtvR48kuOdfgPu7Bgtz3AY+gqg=="
-      },
       "runtime.win10-arm.Microsoft.Net.Native.Compiler": {
         "type": "Transitive",
         "resolved": "2.2.7-rel-27913-00",
@@ -160,31 +135,8 @@
         "resolved": "2.2.9",
         "contentHash": "qF6RRZKaflI+LR1YODNyWYjq5YoX8IJ2wx5y8O+AW2xO+1t/Q6Mm+jQ38zJbWnmXbrcOqUYofn7Y3/KC6lTLBQ=="
       },
-      "common": {
-        "type": "Project"
-      },
-      "fmt": {
-        "type": "Project"
-      },
-      "folly": {
-        "type": "Project",
-        "dependencies": {
-          "fmt": "1.0.0"
-        }
-      },
       "microsoft.reactnative": {
-        "type": "Project",
-        "dependencies": {
-          "Common": "1.0.0",
-          "Folly": "1.0.0",
-          "ReactCommon": "1.0.0"
-        }
-      },
-      "reactcommon": {
-        "type": "Project",
-        "dependencies": {
-          "Folly": "1.0.0"
-        }
+        "type": "Project"
       }
     },
     "UAP,Version=v10.0.16299/win10-arm": {
@@ -328,4 +280,4 @@
       }
     }
   }
-}
+}

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,10 +10,10 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.69.18</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.69.20</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>69</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>18</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>20</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
   </PropertyGroup>
 </Project>

package/PropertySheets/JSEngine.props

@@ -8,7 +8,7 @@
     <!-- Enabling this will (1) Include hermes glues in the Microsoft.ReactNative binaries AND (2) Make hermes the default engine -->
     <UseHermes Condition="'$(UseHermes)' == ''">false</UseHermes>
     <!-- This will be true if (1) the client want to use hermes by setting UseHermes to true OR (2) We are building for UWP where dynamic switching is enabled -->
-    <HermesVersion Condition="'$(HermesVersion)' == ''">0.12.1</HermesVersion>
+    <HermesVersion Condition="'$(HermesVersion)' == ''">0.69.1</HermesVersion>
     <HermesPackage Condition="'$(HermesPackage)' == '' And Exists('$(PkgReactNative_Hermes_Windows)')">$(PkgReactNative_Hermes_Windows)</HermesPackage>
     <HermesPackage Condition="'$(HermesPackage)' == ''">$(NuGetPackageRoot)\ReactNative.Hermes.Windows\$(HermesVersion)</HermesPackage>
     <EnableHermesInspectorInReleaseFlavor Condition="'$(EnableHermesInspectorInReleaseFlavor)' == ''">false</EnableHermesInspectorInReleaseFlavor>

package/Shared/HermesRuntimeHolder.cpp

@@ -3,38 +3,40 @@
 
 #include "pch.h"
 
-#include <memory>
-#include <mutex>
+#include "HermesRuntimeHolder.h"
 
 #include <JSI/decorator.h>
+#include <crash/verifyElseCrash.h>
 #include <cxxreact/MessageQueueThread.h>
 #include <cxxreact/SystraceSection.h>
 #include <hermes/hermes.h>
-#include "HermesRuntimeHolder.h"
 #include "HermesShim.h"
 
 #if defined(HERMES_ENABLE_DEBUGGER)
 #include <hermes/inspector/chrome/Registration.h>
 #endif
 
+#include <memory>
+#include <mutex>
+
 using namespace facebook;
 using namespace Microsoft::ReactNative;
 
-namespace facebook {
-namespace react {
+namespace React {
+using namespace winrt::Microsoft::ReactNative;
+}
 
-namespace {
+namespace facebook::react {
 
-std::unique_ptr<facebook::hermes::HermesRuntime> makeHermesRuntimeSystraced(bool enableDefaultCrashHandler) {
-  SystraceSection s("HermesExecutorFactory::makeHermesRuntimeSystraced");
-  if (enableDefaultCrashHandler) {
-    return HermesShim::makeHermesRuntimeWithWER();
-  } else {
-    auto runtimeConfig = ::hermes::vm::RuntimeConfig();
-    return HermesShim::makeHermesRuntime(runtimeConfig);
-  }
+React::ReactPropertyId<React::ReactNonAbiValue<std::shared_ptr<HermesRuntimeHolder>>>
+HermesRuntimeHolderProperty() noexcept {
+  static React::ReactPropertyId<React::ReactNonAbiValue<std::shared_ptr<HermesRuntimeHolder>>> propId{
+      L"ReactNative.HermesRuntimeHolder", L"HermesRuntimeHolder"};
+  return propId;
 }
 
+namespace {
+
 #ifdef HERMES_ENABLE_DEBUGGER
 class HermesExecutorRuntimeAdapter final : public facebook::hermes::inspector::RuntimeAdapter {
  public:
@@ -71,10 +73,19 @@ class HermesExecutorRuntimeAdapter final : public facebook::hermes::inspector::R
 };
 #endif
 
+std::shared_ptr<HermesShim> makeHermesShimSystraced(bool enableDefaultCrashHandler) {
+  SystraceSection s("HermesExecutorFactory::makeHermesRuntimeSystraced");
+  if (enableDefaultCrashHandler) {
+    return HermesShim::makeWithWER();
+  } else {
+    return HermesShim::make();
+  }
+}
+
 } // namespace
 
 void HermesRuntimeHolder::crashHandler(int fileDescriptor) noexcept {
-  HermesShim::hermesCrashHandler(*m_hermesRuntime, fileDescriptor);
+  m_hermesShim->dumpCrashData(fileDescriptor);
 }
 
 void HermesRuntimeHolder::teardown() noexcept {
@@ -90,15 +101,9 @@ facebook::react::JSIEngineOverride HermesRuntimeHolder::getRuntimeType() noexcep
 }
 
 std::shared_ptr<jsi::Runtime> HermesRuntimeHolder::getRuntime() noexcept {
-  std::call_once(m_once_flag, [this]() { initRuntime(); });
-
-  if (!m_hermesRuntime)
-    std::terminate();
-
-  // Make sure that the runtime instance is not consumed from multiple threads.
-  if (m_own_thread_id != std::this_thread::get_id())
-    std::terminate();
-
+  std::call_once(m_onceFlag, [this]() { initRuntime(); });
+  VerifyElseCrash(m_hermesRuntime);
+  VerifyElseCrashSz(m_ownThreadId == std::this_thread::get_id(), "Must be accessed from JS thread.");
   return m_hermesRuntime;
 }
 
@@ -109,11 +114,11 @@ HermesRuntimeHolder::HermesRuntimeHolder(
 
 void HermesRuntimeHolder::initRuntime() noexcept {
   auto devSettings = m_weakDevSettings.lock();
-  if (!devSettings)
-    std::terminate();
+  VerifyElseCrash(devSettings);
 
-  m_hermesRuntime = makeHermesRuntimeSystraced(devSettings->enableDefaultCrashHandler);
-  m_own_thread_id = std::this_thread::get_id();
+  m_hermesShim = makeHermesShimSystraced(devSettings->enableDefaultCrashHandler);
+  m_hermesRuntime = m_hermesShim->getRuntime();
+  m_ownThreadId = std::this_thread::get_id();
 
 #ifdef HERMES_ENABLE_DEBUGGER
   if (devSettings->useDirectDebugger) {
@@ -132,5 +137,23 @@ void HermesRuntimeHolder::initRuntime() noexcept {
   errorPrototype.setProperty(*m_hermesRuntime, "jsEngine", "hermes");
 }
 
-} // namespace react
-} // namespace facebook
+std::shared_ptr<HermesRuntimeHolder> HermesRuntimeHolder::loadFrom(
+    React::ReactPropertyBag const &propertyBag) noexcept {
+  return *(propertyBag.Get(HermesRuntimeHolderProperty()));
+}
+
+void HermesRuntimeHolder::storeTo(
+    React::ReactPropertyBag const &propertyBag,
+    std::shared_ptr<HermesRuntimeHolder> const &holder) noexcept {
+  propertyBag.Set(HermesRuntimeHolderProperty(), holder);
+}
+
+void HermesRuntimeHolder::addToProfiling() const noexcept {
+  m_hermesShim->addToProfiling();
+}
+
+void HermesRuntimeHolder::removeFromProfiling() const noexcept {
+  m_hermesShim->removeFromProfiling();
+}
+
+} // namespace facebook::react

package/Shared/HermesRuntimeHolder.h

@@ -8,37 +8,52 @@
 #include <thread>
 
 #include <DevSettings.h>
+#include <ReactPropertyBag.h>
 
 namespace facebook::hermes {
 class HermesRuntime;
 }
 
-namespace facebook {
-namespace react {
+namespace Microsoft::ReactNative {
+class HermesShim;
+}
+
+namespace facebook::react {
+
+class MessageQueueThread;
 
 class HermesRuntimeHolder : public Microsoft::JSI::RuntimeHolderLazyInit {
- public:
+ public: // RuntimeHolderLazyInit implementation.
   std::shared_ptr<facebook::jsi::Runtime> getRuntime() noexcept override;
   facebook::react::JSIEngineOverride getRuntimeType() noexcept override;
-
   void crashHandler(int fileDescriptor) noexcept override;
-
   void teardown() noexcept override;
 
+ public:
   HermesRuntimeHolder(
       std::shared_ptr<facebook::react::DevSettings> devSettings,
       std::shared_ptr<facebook::react::MessageQueueThread> jsQueue) noexcept;
 
+  static std::shared_ptr<HermesRuntimeHolder> loadFrom(
+      winrt::Microsoft::ReactNative::ReactPropertyBag const &propertyBag) noexcept;
+
+  static void storeTo(
+      winrt::Microsoft::ReactNative::ReactPropertyBag const &propertyBag,
+      std::shared_ptr<HermesRuntimeHolder> const &holder) noexcept;
+
+  void addToProfiling() const noexcept;
+  void removeFromProfiling() const noexcept;
+
  private:
   void initRuntime() noexcept;
-  std::shared_ptr<facebook::hermes::HermesRuntime> m_hermesRuntime;
-
-  std::once_flag m_once_flag;
-  std::thread::id m_own_thread_id;
 
+ private:
+  std::shared_ptr<Microsoft::ReactNative::HermesShim> m_hermesShim;
+  std::shared_ptr<facebook::hermes::HermesRuntime> m_hermesRuntime;
+  std::once_flag m_onceFlag{};
+  std::thread::id m_ownThreadId{};
   std::weak_ptr<facebook::react::DevSettings> m_weakDevSettings;
   std::shared_ptr<facebook::react::MessageQueueThread> m_jsQueue;
 };
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react

package/Shared/HermesSamplingProfiler.cpp

@@ -7,13 +7,46 @@
 #include <chrono>
 #include <future>
 
+#include "HermesRuntimeHolder.h"
 #include "HermesSamplingProfiler.h"
 #include "HermesShim.h"
+#include "IReactDispatcher.h"
+#include "ReactPropertyBag.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 {
   auto hermesDataPath = co_await Microsoft::React::getApplicationDataPath(L"Hermes");
   std::ostringstream os;
@@ -23,18 +56,27 @@ std::future<std::string> getTraceFilePath() noexcept {
   os << hermesDataPath << "\\cpu_" << now << ".cpuprofile";
   co_return os.str();
 }
+
 } // namespace
 
-bool HermesSamplingProfiler::s_isStarted = false;
+std::atomic_bool HermesSamplingProfiler::s_isStarted{false};
 std::string HermesSamplingProfiler::s_lastTraceFilePath;
 
 std::string HermesSamplingProfiler::GetLastTraceFilePath() noexcept {
   return s_lastTraceFilePath;
 }
 
-winrt::fire_and_forget HermesSamplingProfiler::Start() noexcept {
-  if (!s_isStarted) {
-    s_isStarted = true;
+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();
+
     co_await winrt::resume_background();
     HermesShim::enableSamplingProfiler();
   }
@@ -42,20 +84,31 @@ winrt::fire_and_forget HermesSamplingProfiler::Start() noexcept {
   co_return;
 }
 
-std::future<std::string> HermesSamplingProfiler::Stop() noexcept {
-  if (s_isStarted) {
-    s_isStarted = false;
+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());
+
     co_await winrt::resume_background();
     HermesShim::disableSamplingProfiler();
+
     s_lastTraceFilePath = co_await getTraceFilePath();
     HermesShim::dumpSampledTraceToFile(s_lastTraceFilePath);
+
+    co_await resume_in_dispatcher(jsDispatcher);
+    std::shared_ptr<HermesRuntimeHolder> hermesRuntimeHolder = HermesRuntimeHolder::loadFrom(propertyBag);
+    hermesRuntimeHolder->removeFromProfiling();
+
+    co_await winrt::resume_background();
   }
 
   co_return s_lastTraceFilePath;
 }
 
 bool HermesSamplingProfiler::IsStarted() noexcept {
-  return s_isStarted;
+  return s_isStarted.load();
 }
 
 } // namespace Microsoft::ReactNative

package/Shared/HermesSamplingProfiler.h

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

package/Shared/HermesShim.cpp

@@ -4,115 +4,119 @@
 #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 {
+#define DECLARE_SYMBOL(symbol, importedSymbol) \
+  decltype(&importedSymbol) s_##symbol{};      \
+  constexpr const char symbol##Symbol[] = #importedSymbol;
+
+#define INIT_SYMBOL(symbol)                                                                            \
+  s_##symbol = reinterpret_cast<decltype(s_##symbol)>(GetProcAddress(s_hermesModule, symbol##Symbol)); \
+  VerifyElseCrash(s_##symbol);
+
+#define CRASH_ON_ERROR(result) VerifyElseCrash(result == hermes_ok);
+
+namespace Microsoft::ReactNative {
+
+namespace {
+
+DECLARE_SYMBOL(createRuntime, hermes_create_runtime);
+DECLARE_SYMBOL(createRuntimeWithWER, hermes_create_runtime_with_wer);
+DECLARE_SYMBOL(deleteRuntime, hermes_delete_runtime);
+DECLARE_SYMBOL(getNonAbiSafeRuntime, hermes_get_non_abi_safe_runtime);
+DECLARE_SYMBOL(dumpCrashData, hermes_dump_crash_data);
+DECLARE_SYMBOL(samplingProfilerEnable, hermes_sampling_profiler_enable);
+DECLARE_SYMBOL(samplingProfilerDisable, hermes_sampling_profiler_disable);
+DECLARE_SYMBOL(samplingProfilerAdd, hermes_sampling_profiler_add);
+DECLARE_SYMBOL(samplingProfilerRemove, hermes_sampling_profiler_remove);
+DECLARE_SYMBOL(samplingProfilerDumpToFile, hermes_sampling_profiler_dump_to_file);
+
+HMODULE s_hermesModule{};
+std::once_flag s_hermesLoading;
+
+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);
+    INIT_SYMBOL(createRuntime);
+    INIT_SYMBOL(createRuntimeWithWER);
+    INIT_SYMBOL(deleteRuntime);
+    INIT_SYMBOL(getNonAbiSafeRuntime);
+    INIT_SYMBOL(dumpCrashData);
+    INIT_SYMBOL(samplingProfilerEnable);
+    INIT_SYMBOL(samplingProfilerDisable);
+    INIT_SYMBOL(samplingProfilerAdd);
+    INIT_SYMBOL(samplingProfilerRemove);
+    INIT_SYMBOL(samplingProfilerDumpToFile);
+  });
+}
+
+struct RuntimeDeleter {
+  RuntimeDeleter(std::shared_ptr<const HermesShim> &&hermesShimPtr) noexcept
+      : hermesShimPtr_(std::move(hermesShimPtr)) {}
 
-    s_enableSamplingProfiler = reinterpret_cast<decltype(s_enableSamplingProfiler)>(
-        GetProcAddress(s_hermesModule, enableSamlingProfilerSymbol));
-    VerifyElseCrash(s_enableSamplingProfiler);
+  void operator()(facebook::hermes::HermesRuntime * /*runtime*/) {
+    // Do nothing. Instead, we rely on the RuntimeDeleter destructor.
+  }
 
-    s_disableSamplingProfiler = reinterpret_cast<decltype(s_disableSamplingProfiler)>(
-        GetProcAddress(s_hermesModule, disableSamlingProfilerSymbol));
-    VerifyElseCrash(s_disableSamplingProfiler);
+ private:
+  std::shared_ptr<const HermesShim> hermesShimPtr_;
+};
 
-    s_dumpSampledTraceToFile = reinterpret_cast<decltype(s_dumpSampledTraceToFile)>(
-        GetProcAddress(s_hermesModule, dumpSampledTraceToFileSymbol));
-    VerifyElseCrash(s_dumpSampledTraceToFile);
+} // namespace
 
-    s_makeHermesRuntimeWithWER = reinterpret_cast<decltype(s_makeHermesRuntimeWithWER)>(
-        GetProcAddress(s_hermesModule, makeHermesRuntimeWithWERSymbol));
-    VerifyElseCrash(s_makeHermesRuntimeWithWER);
+HermesShim::HermesShim(hermes_runtime runtime) noexcept : runtime_(runtime) {
+  CRASH_ON_ERROR(s_getNonAbiSafeRuntime(runtime_, reinterpret_cast<void **>(&nonAbiSafeRuntime_)));
+}
 
-    s_hermesCrashHandler =
-        reinterpret_cast<decltype(s_hermesCrashHandler)>(GetProcAddress(s_hermesModule, hermesCrashHandlerSymbol));
-    VerifyElseCrash(s_hermesCrashHandler);
-  });
+HermesShim::~HermesShim() {
+  CRASH_ON_ERROR(s_deleteRuntime(runtime_));
 }
 
-std::unique_ptr<facebook::hermes::HermesRuntime> makeHermesRuntime(const hermes::vm::RuntimeConfig &runtimeConfig) {
+/*static*/ std::shared_ptr<HermesShim> HermesShim::make() noexcept {
   EnsureHermesLoaded();
-  return s_makeHermesRuntime(runtimeConfig);
+  hermes_runtime runtime{};
+  CRASH_ON_ERROR(s_createRuntime(&runtime));
+  return std::make_shared<HermesShim>(runtime);
 }
 
-void enableSamplingProfiler() {
+/*static*/
+std::shared_ptr<HermesShim> HermesShim::makeWithWER() noexcept {
   EnsureHermesLoaded();
-  s_enableSamplingProfiler();
+  hermes_runtime runtime{};
+  CRASH_ON_ERROR(s_createRuntimeWithWER(&runtime));
+  return std::make_shared<HermesShim>(runtime);
 }
 
-void disableSamplingProfiler() {
-  EnsureHermesLoaded();
-  s_disableSamplingProfiler();
+std::shared_ptr<facebook::hermes::HermesRuntime> HermesShim::getRuntime() const noexcept {
+  return std::shared_ptr<facebook::hermes::HermesRuntime>(nonAbiSafeRuntime_, RuntimeDeleter(shared_from_this()));
 }
 
-void dumpSampledTraceToFile(const std::string &fileName) {
+void HermesShim::dumpCrashData(int fileDescriptor) const noexcept {
+  CRASH_ON_ERROR(s_dumpCrashData(runtime_, fileDescriptor));
+}
+
+/*static*/ void HermesShim::enableSamplingProfiler() noexcept {
   EnsureHermesLoaded();
-  s_dumpSampledTraceToFile(fileName);
+  CRASH_ON_ERROR(s_samplingProfilerEnable());
 }
 
-std::unique_ptr<facebook::hermes::HermesRuntime> makeHermesRuntimeWithWER() {
+/*static*/ void HermesShim::disableSamplingProfiler() noexcept {
   EnsureHermesLoaded();
-  return s_makeHermesRuntimeWithWER();
+  CRASH_ON_ERROR(s_samplingProfilerDisable());
 }
 
-void hermesCrashHandler(facebook::hermes::HermesRuntime &runtime, int fileDescriptor) {
+/*static*/ void HermesShim::dumpSampledTraceToFile(const std::string &fileName) noexcept {
   EnsureHermesLoaded();
-  s_hermesCrashHandler(runtime, fileDescriptor);
+  CRASH_ON_ERROR(s_samplingProfilerDumpToFile(fileName.c_str()));
+}
+void HermesShim::addToProfiling() const noexcept {
+  CRASH_ON_ERROR(s_samplingProfilerAdd(runtime_));
+}
+
+void HermesShim::removeFromProfiling() const noexcept {
+  CRASH_ON_ERROR(s_samplingProfilerRemove(runtime_));
 }
 
-} // namespace Microsoft::ReactNative::HermesShim
+} // namespace Microsoft::ReactNative

package/Shared/HermesShim.h

@@ -3,19 +3,39 @@
 
 #pragma once
 
-#include <hermes/hermes.h>
+#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 {
+namespace Microsoft::ReactNative {
 
-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);
+class HermesShim : public std::enable_shared_from_this<HermesShim> {
+ public:
+  HermesShim(hermes_runtime runtimeAbiPtr) noexcept;
+  ~HermesShim();
 
-} // namespace Microsoft::ReactNative::HermesShim
+  static std::shared_ptr<HermesShim> make() noexcept;
+  static std::shared_ptr<HermesShim> makeWithWER() noexcept;
+
+  std::shared_ptr<facebook::hermes::HermesRuntime> getRuntime() const noexcept;
+
+  void dumpCrashData(int fileDescriptor) const noexcept;
+
+  static void enableSamplingProfiler() noexcept;
+  static void disableSamplingProfiler() noexcept;
+  static void dumpSampledTraceToFile(const std::string &fileName) noexcept;
+  void addToProfiling() const noexcept;
+  void removeFromProfiling() const noexcept;
+
+  HermesShim(const HermesShim &) = delete;
+  HermesShim &operator=(const HermesShim &) = delete;
+
+ private:
+  // It must be a raw pointer to avoid circular reference.
+  facebook::hermes::HermesRuntime *nonAbiSafeRuntime_{};
+  hermes_runtime runtime_{};
+};
+
+} // namespace Microsoft::ReactNative

package/Shared/JSI/RuntimeHolder.h

@@ -11,7 +11,7 @@ namespace Microsoft::JSI {
 // a. lazily create a JSI Runtime on the first call to getRuntime
 // b. subsequent calls to getRuntime should return the Runtime created in (a)
 
-// Note :: All calls to getRuntime() should happen on the same thread unless you are sure that
+// Note: all calls to getRuntime() should happen on the same thread unless you are sure that
 // the underlying Runtime instance is thread safe.
 
 struct RuntimeHolderLazyInit {
@@ -21,7 +21,7 @@ struct RuntimeHolderLazyInit {
   virtual void teardown() noexcept {};
 
   // You can call this when a crash happens to attempt recording additional data
-  // The fd supplied is a raw file stream an implementation might write JSON to
+  // The fileDescriptor supplied is a raw file stream an implementation might write JSON to.
   virtual void crashHandler(int fileDescriptor) noexcept {};
 };
 

package/Shared/Networking/IWebSocketResource.h

@@ -5,6 +5,7 @@
 
 #include <functional>
 #include <map>
+#include <memory>
 #include <string>
 #include <vector>
 

package/Shared/tracing/tracing.cpp

@@ -377,11 +377,8 @@ void initializeJSHooks(jsi::Runtime &runtime, bool isProfiling) {
 
 void initializeETW() {
   // Register the provider
-  static bool etwInitialized = false;
-  if (!etwInitialized) {
-    TraceLoggingRegister(g_hTraceLoggingProvider);
-    etwInitialized = true;
-  }
+  static std::once_flag etwInitialized;
+  std::call_once(etwInitialized, [] { TraceLoggingRegister(g_hTraceLoggingProvider); });
 }
 
 void log(const char *msg) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.69.18",
+  "version": "0.69.20",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,8 +26,8 @@
     "@react-native-community/cli": "^8.0.0",
     "@react-native-community/cli-platform-android": "^8.0.0",
     "@react-native-community/cli-platform-ios": "^8.0.0",
-    "@react-native-windows/cli": "0.69.5",
-    "@react-native-windows/virtualized-list": "0.69.1",
+    "@react-native-windows/cli": "0.69.7",
+    "@react-native-windows/virtualized-list": "0.69.2",
     "@react-native/assets": "1.0.0",
     "@react-native/normalize-color": "2.0.0",
     "@react-native/polyfills": "2.0.0",
@@ -61,7 +61,7 @@
     "ws": "^6.1.4"
   },
   "devDependencies": {
-    "@react-native-windows/codegen": "0.69.1",
+    "@react-native-windows/codegen": "0.69.2",
     "@rnw-scripts/eslint-config": "1.1.12",
     "@rnw-scripts/jest-out-of-tree-snapshot-resolver": "^1.0.6",
     "@rnw-scripts/metro-dev-config": "0.0.0",