react-native-windows 0.66.16 → 0.66.19

package/CHANGELOG.json

@@ -2,7 +2,64 @@
   "name": "react-native-windows",
   "entries": [
     {
-      "date": "Mon, 04 Apr 2022 15:12:52 GMT",
+      "date": "Tue, 24 May 2022 21:08:42 GMT",
+      "tag": "react-native-windows_v0.66.19",
+      "version": "0.66.19",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Implement Blob module (#9352)",
+            "author": "julio@rochsquadron.net",
+            "commit": "4b1eb4196ab7be2e266da754637a00a252f3745f",
+            "package": "react-native-windows"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 02 May 2022 15:10:52 GMT",
+      "tag": "react-native-windows_v0.66.18",
+      "version": "0.66.18",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Fix clang-check errors in NativeModules.h",
+            "author": "53799235+ZihanChen-MSFT@users.noreply.github.com",
+            "commit": "94d54d33e317332fa9145129d228a8e323f9b948",
+            "package": "react-native-windows"
+          },
+          {
+            "comment": "Handle abrupt WebSocket connection interruption (#9829)",
+            "author": "julio.rocha@microsoft.com",
+            "commit": "e2571e1d39d3fef4d4ad328a1662ab7f30fec633",
+            "package": "react-native-windows"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 25 Apr 2022 15:09:39 GMT",
+      "tag": "react-native-windows_v0.66.17",
+      "version": "0.66.17",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Fix JSI for Node-API and update V8 to 0.65.11",
+            "author": "vmorozov@microsoft.com",
+            "commit": "3e1da9e94cba42c622cf68baecbd57d7e8a6971d",
+            "package": "react-native-windows"
+          },
+          {
+            "comment": "Fix Sequential DispatchQueue deadlock on shutdown",
+            "author": "vmorozov@microsoft.com",
+            "commit": "9ace3b51d407cccf120c2ad0a23c66d12a173a7f",
+            "package": "react-native-windows"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 04 Apr 2022 15:13:07 GMT",
       "tag": "react-native-windows_v0.66.16",
       "version": "0.66.16",
       "comments": {

package/CHANGELOG.md

@@ -1,17 +1,43 @@
 # Change Log - react-native-windows
 
-This log was last generated on Mon, 04 Apr 2022 15:12:52 GMT and should not be manually modified.
+This log was last generated on Tue, 24 May 2022 21:08:42 GMT and should not be manually modified.
 
 <!-- Start content -->
 
-## 0.66.16
+## 0.66.19
 
-Mon, 04 Apr 2022 15:12:52 GMT
+Tue, 24 May 2022 21:08:42 GMT
 
 ### Patches
 
-- MustBeNoExceptVoidFunctor should depend on the template type parameter to avoid being evaluated too early (#9609) (asklar@microsoft.com)
+- Implement Blob module (#9352) (julio@rochsquadron.net)
 
+## 0.66.18
+
+Mon, 02 May 2022 15:10:52 GMT
+
+### Patches
+
+- Fix clang-check errors in NativeModules.h (53799235+ZihanChen-MSFT@users.noreply.github.com)
+- Handle abrupt WebSocket connection interruption (#9829) (julio.rocha@microsoft.com)
+
+## 0.66.17
+
+Mon, 25 Apr 2022 15:09:39 GMT
+
+### Patches
+
+- Fix JSI for Node-API and update V8 to 0.65.11 (vmorozov@microsoft.com)
+- Fix Sequential DispatchQueue deadlock on shutdown (vmorozov@microsoft.com)
+
+## 0.66.16
+
+Mon, 04 Apr 2022 15:13:07 GMT
+
+### Patches
+
+- MustBeNoExceptVoidFunctor should depend on the template type parameter to avoid being evaluated too early (#9609) (asklar@microsoft.com)
+
 ## 0.66.15
 
 Mon, 14 Mar 2022 15:13:42 GMT

package/Chakra/ChakraHelpers.cpp

@@ -3,7 +3,6 @@
 
 #include "pch.h"
 
-#include <RuntimeOptions.h>
 #include "ChakraHelpers.h"
 #include "ChakraUtils.h"
 #include "ChakraValue.h"

package/Libraries/Network/RCTNetworkingWinShared.js

@@ -61,6 +61,11 @@ type RCTNetworkingEventDefinitions = $ReadOnly<{
   ],
 }>;
 
+let _requestId = 1;
+function generateRequestId(): number {
+  return _requestId++;
+}
+
 const RCTNetworking = {
   addListener<K: $Keys<RCTNetworkingEventDefinitions>>(
     eventType: K,
@@ -82,11 +87,13 @@ const RCTNetworking = {
     callback: (requestId: number) => void,
     withCredentials: boolean,
   ) {
+    const requestId = generateRequestId();
     const body = convertRequestBody(data);
     RCTNetworkingNative.sendRequest(
       {
         method,
         url,
+        requestId,
         data: {...body, trackingName},
         headers,
         responseType,

package/Microsoft.ReactNative/Base/CoreNativeModules.cpp

@@ -14,7 +14,6 @@
 #include <Modules/ImageViewManagerModule.h>
 #include <Modules/LinkingManagerModule.h>
 #include <Modules/NativeUIManager.h>
-#include <Modules/NetworkingModule.h>
 #include <Modules/PaperUIManagerModule.h>
 #include <Threading/MessageQueueThreadFactory.h>
 
@@ -51,8 +50,8 @@ std::vector<facebook::react::NativeModuleDescription> GetCoreModules(
   std::vector<facebook::react::NativeModuleDescription> modules;
 
   modules.emplace_back(
-      Microsoft::React::NetworkingModule::Name,
-      []() { return std::make_unique<Microsoft::React::NetworkingModule>(); },
+      "Networking",
+      [props = context->Properties()]() { return Microsoft::React::CreateHttpModule(props); },
       jsMessageQueue);
 
   modules.emplace_back(

package/Microsoft.ReactNative/Modules/CreateModules.cpp

@@ -2,10 +2,10 @@
 // Licensed under the MIT License.
 
 #include <CreateModules.h>
+#include <Networking/WinRTWebSocketResource.h>
 #include <QuirkSettings.h>
 #include <React.h>
 #include <ReactPropertyBag.h>
-#include <WinRTWebSocketResource.h>
 
 // React Native
 #include <cxxreact/CxxModule.h>
@@ -17,11 +17,11 @@ using winrt::Microsoft::ReactNative::ReactPropertyBag;
 using winrt::Microsoft::ReactNative::ReactPropertyId;
 using winrt::Microsoft::ReactNative::implementation::QuirkSettings;
 
-namespace Microsoft::React {
+namespace Microsoft::React::Networking {
 
 std::shared_ptr<IWebSocketResource> IWebSocketResource::Make() {
   std::vector<winrt::Windows::Security::Cryptography::Certificates::ChainValidationResult> certExceptions;
   return std::make_shared<WinRTWebSocketResource>(std::move(certExceptions));
 }
 
-} // namespace Microsoft::React
+} // namespace Microsoft::React::Networking

package/Microsoft.ReactNative/packages.config

@@ -8,5 +8,5 @@
   <package id="Microsoft.Windows.CppWinRT" version="2.0.210312.4" targetFramework="native" />
   <package id="Microsoft.WinUI" version="3.0.0-preview4.210210.4" targetFramework="native" />
   <package id="ReactNative.Hermes.Windows" version="0.9.0-ms.4" targetFramework="native" />
-  <!-- package id="ReactNative.V8Jsi.Windows.UWP" version="0.65.5" targetFramework="native" / -->
+  <!-- package id="ReactNative.V8Jsi.Windows.UWP" version="0.65.11" targetFramework="native" / -->
 </packages>

package/Microsoft.ReactNative.Cxx/JSI/NodeApiJsiRuntime.cpp

@@ -190,7 +190,7 @@ struct NapiJsiRuntime : facebook::jsi::Runtime {
   facebook::jsi::Function createFunctionFromHostFunction(
       const facebook::jsi::PropNameID &name,
       unsigned int paramCount,
-      facebook::jsi::HostFunctionType type) override;
+      facebook::jsi::HostFunctionType func) override;
   facebook::jsi::Value call(
       const facebook::jsi::Function &func,
       const facebook::jsi::Value &jsThis,
@@ -475,7 +475,7 @@ struct NapiJsiRuntime : facebook::jsi::Runtime {
   void SetProperty(napi_value object, napi_value propertyId, napi_value value, napi_property_attributes attrs) const;
   napi_value CreateArray(size_t length) const;
   void SetElement(napi_value array, uint32_t index, napi_value value) const;
-  static napi_value JsiHostFunctionCallback(napi_env env, napi_callback_info info) noexcept;
+  static napi_value __cdecl JsiHostFunctionCallback(napi_env env, napi_callback_info info) noexcept;
   napi_value CreateExternalFunction(napi_value name, int32_t paramCount, napi_callback callback, void *callbackData);
   napi_value CreateExternalObject(void *data, napi_finalize finalizeCallback) const;
   template <typename T>
@@ -1702,7 +1702,7 @@ void NapiJsiRuntime::SetElement(napi_value array, uint32_t index, napi_value val
 }
 
 // The NAPI external function callback used for the JSI host function implementation.
-/*static*/ napi_value NapiJsiRuntime::JsiHostFunctionCallback(napi_env env, napi_callback_info info) noexcept {
+/*static*/ napi_value __cdecl NapiJsiRuntime::JsiHostFunctionCallback(napi_env env, napi_callback_info info) noexcept {
   HostFunctionWrapper *hostFuncWrapper{};
   size_t argc{};
   CHECK_NAPI_ELSE_CRASH(
@@ -1750,15 +1750,11 @@ napi_value NapiJsiRuntime::CreateExternalObject(void *data, napi_finalize finali
 // Wraps up std::unique_ptr as an external object.
 template <typename T>
 napi_value NapiJsiRuntime::CreateExternalObject(unique_ptr<T> &&data) const {
-  napi_value object =
-      CreateExternalObject(data.get(), [](napi_env /*env*/, void *dataToDestroy, void * /*finalizerHint*/) {
-        // We wrap dataToDestroy in a unique_ptr to avoid calling delete explicitly.
-        if (std::is_array<T>::value) {
-          delete[] static_cast<T *>(dataToDestroy);
-        } else {
-          delete static_cast<T *>(dataToDestroy);
-        }
-      });
+  napi_finalize finalize = [](napi_env /*env*/, void *dataToDestroy, void * /*finalizerHint*/) {
+    // We wrap dataToDestroy in a unique_ptr to avoid calling delete explicitly.
+    unique_ptr<T> dataDeleter{static_cast<T *>(dataToDestroy)};
+  };
+  napi_value object = CreateExternalObject(data.get(), finalize);
 
   // We only call data.release() after the CreateExternalObject succeeds.
   // Otherwise, when CreateExternalObject fails and an exception is thrown,
@@ -1807,7 +1803,7 @@ napi_value NapiJsiRuntime::GetHostObjectProxyHandler() {
 // Sets Proxy trap method as a pointer to NapiJsiRuntime instance method.
 template <napi_value (NapiJsiRuntime::*trapMethod)(span<napi_value>), size_t argCount>
 void NapiJsiRuntime::SetProxyTrap(napi_value handler, napi_value propertyName) {
-  auto proxyTrap = [](napi_env env, napi_callback_info info) noexcept {
+  napi_callback proxyTrap = [](napi_env env, napi_callback_info info) noexcept {
     NapiJsiRuntime *runtime{};
     napi_value args[argCount]{};
     size_t actualArgCount{argCount};

package/Microsoft.ReactNative.Cxx/JSI/NodeApiJsiRuntime.h

@@ -2,6 +2,8 @@
 // Licensed under the MIT License.
 
 #pragma once
+#ifndef MICROSOFT_REACTNATIVE_JSI_NODEAPIJSIRUNTIME
+#define MICROSOFT_REACTNATIVE_JSI_NODEAPIJSIRUNTIME
 
 // JSI
 #include <js_native_ext_api.h>
@@ -19,3 +21,5 @@ namespace Microsoft::JSI {
 std::unique_ptr<facebook::jsi::Runtime> __cdecl MakeNodeApiJsiRuntime(napi_env env) noexcept;
 
 } // namespace Microsoft::JSI
+
+#endif // MICROSOFT_REACTNATIVE_JSI_NODEAPIJSIRUNTIME

package/Microsoft.ReactNative.Cxx/NativeModules.h

@@ -1011,7 +1011,7 @@ template <class TModule, int I, class TMethodSpec>
 struct ReactMethodVerifier {
   static constexpr bool Verify() noexcept {
     ReactMethodVerifier verifier{};
-    ReactMemberInfoIterator<TModule>{}.GetMemberInfo<I>(verifier);
+    ReactMemberInfoIterator<TModule>{}.template GetMemberInfo<I>(verifier);
     return verifier.m_result;
   }
 
@@ -1029,7 +1029,7 @@ template <class TModule, int I, class TMethodSpec>
 struct ReactSyncMethodVerifier {
   static constexpr bool Verify() noexcept {
     ReactSyncMethodVerifier verifier{};
-    ReactMemberInfoIterator<TModule>{}.GetMemberInfo<I>(verifier);
+    ReactMemberInfoIterator<TModule>{}.template GetMemberInfo<I>(verifier);
     return verifier.m_result;
   }
 

package/Mso/src/dispatchQueue/threadPoolScheduler_win.cpp

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
+#include <utility>
 #include "dispatchQueue/dispatchQueue.h"
 #include "queueService.h"
 
@@ -29,6 +30,13 @@ struct ThreadPoolSchedulerWin : Mso::UnknownObject<IDispatchQueueScheduler> {
   void Shutdown() noexcept override;
   void AwaitTermination() noexcept override;
 
+ public: // Used by test APIs
+  static void EnableThreadPoolWorkTracking(bool enable) noexcept;
+  static void WaitForThreadPoolWorkCompletion() noexcept;
+
+ private: // Used by test APIs
+  static void TrackThreadPoolWork(const std::shared_ptr<TP_WORK> &work) noexcept;
+
  private:
   struct ThreadAccessGuard {
     ThreadAccessGuard(ThreadPoolSchedulerWin *scheduler) noexcept;
@@ -42,12 +50,29 @@ struct ThreadPoolSchedulerWin : Mso::UnknownObject<IDispatchQueueScheduler> {
   };
 
  private:
-  std::unique_ptr<TP_WORK, ThreadPoolWorkDeleter> m_threadPoolWork;
+  std::shared_ptr<TP_WORK> m_threadPoolWork;
   Mso::WeakPtr<IDispatchQueueService> m_queue;
   const uint32_t m_maxThreads{1};
   std::atomic<uint32_t> m_usedThreads{0};
 
   constexpr static uint32_t MaxConcurrentThreads{64};
+
+ private:
+  static std::mutex s_threadPoolWorkMutex;
+  static bool s_enableThreadPoolWorkTracking;
+  static std::vector<std::shared_ptr<TP_WORK>> s_trackedThreadPoolWork;
+};
+
+// Track the ThreadPoolSchedulerWin instance used by current thread.
+// We use it to avoid a deadlock on queue shutdown.
+struct ThreadPoolSchedulerWinContext {
+  ThreadPoolSchedulerWinContext(ThreadPoolSchedulerWin *scheduler) noexcept;
+  ~ThreadPoolSchedulerWinContext() noexcept;
+  static ThreadPoolSchedulerWin *CurrentScheduler() noexcept;
+
+ private:
+  static thread_local ThreadPoolSchedulerWin *tls_scheduler;
+  ThreadPoolSchedulerWin *m_prevScheduler{nullptr};
 };
 
 //=============================================================================
@@ -64,9 +89,15 @@ void ThreadPoolWorkDeleter::operator()(TP_WORK *tpWork) noexcept {
 // ThreadPoolSchedulerWin implementation
 //=============================================================================
 
+std::mutex ThreadPoolSchedulerWin::s_threadPoolWorkMutex;
+bool ThreadPoolSchedulerWin::s_enableThreadPoolWorkTracking{false};
+std::vector<std::shared_ptr<TP_WORK>> ThreadPoolSchedulerWin::s_trackedThreadPoolWork;
+
 ThreadPoolSchedulerWin::ThreadPoolSchedulerWin(uint32_t maxThreads) noexcept
-    : m_threadPoolWork{::CreateThreadpoolWork(WorkCallback, this, nullptr)},
-      m_maxThreads{maxThreads == 0 ? MaxConcurrentThreads : maxThreads} {}
+    : m_threadPoolWork{::CreateThreadpoolWork(WorkCallback, this, nullptr), ThreadPoolWorkDeleter{}},
+      m_maxThreads{maxThreads == 0 ? MaxConcurrentThreads : maxThreads} {
+  TrackThreadPoolWork(m_threadPoolWork);
+}
 
 ThreadPoolSchedulerWin::~ThreadPoolSchedulerWin() noexcept {
   AwaitTermination();
@@ -78,6 +109,7 @@ ThreadPoolSchedulerWin::~ThreadPoolSchedulerWin() noexcept {
     _Inout_ PTP_WORK /*work*/) {
   // The ThreadPoolSchedulerWin is alive here because m_threadPoolWork must be completed before it is destroyed.
   ThreadPoolSchedulerWin *self = static_cast<ThreadPoolSchedulerWin *>(context);
+  ThreadPoolSchedulerWinContext schedulerContext(self);
 
   if (auto queue = self->m_queue.GetStrongPtr()) {
     auto endTime = std::chrono::steady_clock::now() + 100ms;
@@ -129,7 +161,38 @@ void ThreadPoolSchedulerWin::Shutdown() noexcept {
 }
 
 void ThreadPoolSchedulerWin::AwaitTermination() noexcept {
-  ::WaitForThreadpoolWorkCallbacks(m_threadPoolWork.get(), false);
+  // Avoid deadlock when the dispatch queue and ThreadPoolSchedulerWin are released from inside of a task.
+  if (ThreadPoolSchedulerWinContext::CurrentScheduler() != this) {
+    ::WaitForThreadpoolWorkCallbacks(m_threadPoolWork.get(), false);
+  }
+}
+
+void ThreadPoolSchedulerWin::EnableThreadPoolWorkTracking(bool enable) noexcept {
+  std::vector<std::shared_ptr<TP_WORK>> tpWorkToStopTracking;
+  {
+    std::scoped_lock lock{s_threadPoolWorkMutex};
+    s_enableThreadPoolWorkTracking = enable;
+    // Reset all previously tracked work
+    tpWorkToStopTracking = std::move(s_trackedThreadPoolWork);
+  }
+}
+
+void ThreadPoolSchedulerWin::WaitForThreadPoolWorkCompletion() noexcept {
+  std::vector<std::shared_ptr<TP_WORK>> tpWorkToTrack;
+  {
+    std::scoped_lock lock{s_threadPoolWorkMutex};
+    tpWorkToTrack = std::move(s_trackedThreadPoolWork);
+  }
+  for (std::shared_ptr<TP_WORK> &tpWork : tpWorkToTrack) {
+    ::WaitForThreadpoolWorkCallbacks(tpWork.get(), false);
+  }
+}
+
+void ThreadPoolSchedulerWin::TrackThreadPoolWork(const std::shared_ptr<TP_WORK> &tpWork) noexcept {
+  std::scoped_lock lock{s_threadPoolWorkMutex};
+  if (s_enableThreadPoolWorkTracking) {
+    s_trackedThreadPoolWork.push_back(tpWork);
+  }
 }
 
 //=============================================================================
@@ -151,6 +214,23 @@ ThreadPoolSchedulerWin::ThreadAccessGuard::~ThreadAccessGuard() noexcept {
   return tls_scheduler == scheduler;
 }
 
+//=============================================================================
+// ThreadPoolSchedulerWinContext implementation
+//=============================================================================
+
+thread_local ThreadPoolSchedulerWin *ThreadPoolSchedulerWinContext::tls_scheduler{nullptr};
+
+ThreadPoolSchedulerWinContext::ThreadPoolSchedulerWinContext(ThreadPoolSchedulerWin *scheduler) noexcept
+    : m_prevScheduler(std::exchange(tls_scheduler, scheduler)) {}
+
+ThreadPoolSchedulerWinContext::~ThreadPoolSchedulerWinContext() noexcept {
+  std::exchange(tls_scheduler, m_prevScheduler);
+}
+
+ThreadPoolSchedulerWin *ThreadPoolSchedulerWinContext::CurrentScheduler() noexcept {
+  return tls_scheduler;
+}
+
 //=============================================================================
 // DispatchQueueStatic::MakeThreadPoolScheduler implementation
 //=============================================================================
@@ -160,4 +240,16 @@ ThreadPoolSchedulerWin::ThreadAccessGuard::~ThreadAccessGuard() noexcept {
   return Mso::Make<ThreadPoolSchedulerWin, IDispatchQueueScheduler>(maxThreads);
 }
 
+//=============================================================================
+// Test specific functions
+//=============================================================================
+
+void Test_ThreadPoolSchedulerWin_EnableThreadPoolWorkTracking(bool enable) noexcept {
+  ThreadPoolSchedulerWin::EnableThreadPoolWorkTracking(enable);
+}
+
+void Test_ThreadPoolSchedulerWin_WaitForThreadPoolWorkCompletion() noexcept {
+  ThreadPoolSchedulerWin::WaitForThreadPoolWorkCompletion();
+}
+
 } // namespace Mso

package/PropertySheets/JSEngine.props

@@ -16,7 +16,7 @@
     <EnableDevServerHBCBundles Condition="'$(EnableDevServerHBCBundles)' == ''">false</EnableDevServerHBCBundles>
 
     <UseV8 Condition="'$(UseV8)' == ''">false</UseV8>
-    <V8Version Condition="'$(V8Version)' == ''">0.65.5</V8Version>
+    <V8Version Condition="'$(V8Version)' == ''">0.65.11</V8Version>
     <V8PackageName>ReactNative.V8Jsi.Windows</V8PackageName>
     <V8PackageName Condition="'$(V8AppPlatform)' != 'win32'">$(V8PackageName).UWP</V8PackageName>
     <V8Package>$(SolutionDir)packages\$(V8PackageName).$(V8Version)</V8Package>

package/Scripts/OfficeReact.Win32.nuspec

@@ -50,13 +50,13 @@
     <file src="$nugetroot$\inc\Shared\IReactRootView.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\IRedBoxHandler.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\IUIManager.h" target="inc"/>
-    <file src="$nugetroot$\inc\Shared\IWebSocketResource.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\JSBigAbiString.h" target="inc"/>
     <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\RuntimeOptions.h" target="inc"/>
     <file src="$nugetroot$\inc\ReactWin32\ShadowNode.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\Tracing.h" target="inc"/>

package/Shared/BaseScriptStoreImpl.cpp

@@ -6,7 +6,7 @@
 #include "BaseScriptStoreImpl.h"
 #include "MemoryMappedBuffer.h"
 
-#include <RuntimeOptions.h>
+#include <CppRuntimeOptions.h>
 
 // C++/WinRT
 #include <winrt/base.h>

package/Shared/CppRuntimeOptions.h

@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include <string>
+
+namespace Microsoft::React {
+
+/// <summary>
+/// Sets a global boolean value identified by an arbitrary string.
+/// </summary>
+/// <param name="name">Global key</param>
+void __cdecl SetRuntimeOptionBool(std::string &&name, bool value) noexcept;
+
+/// <summary>
+/// Sets a global signed integer value identified by an arbitrary string.
+/// </summary>
+/// <param name="name">Global boolean key</param>
+void __cdecl SetRuntimeOptionInt(std::string &&name, std::int32_t value) noexcept;
+
+/// <summary>
+/// Sets a global string value identified by an arbitrary string.
+/// </summary>
+/// <param name="name">Global string key</param>
+/// <param name="value">String value to store</param>
+void __cdecl SetRuntimeOptionString(std::string &&name, std::string &&value) noexcept;
+
+/// <summary>
+/// Retrieves a global boolean value for the given key.
+/// </summary>
+/// <param name="name">Global boolean key</param>
+/// <returns>Value stored for the given key, or false if the entry doesn't exist (default)</returns>
+const bool __cdecl GetRuntimeOptionBool(const std::string &name) noexcept;
+
+/// <summary>
+/// Retrieves a global boolean value for the given key.
+/// </summary>
+/// <param name="name">Global key</param>
+/// <returns>Value stored for the given key, or 0 if the entry doesn't exist (default)</returns>
+const std::int32_t __cdecl GetRuntimeOptionInt(const std::string &name) noexcept;
+
+/// <summary>
+/// Retrieves a global string value for the given key.
+/// </summary>
+/// <param name="name">Global key</param>
+/// <returns>Value stored for the given key, or an empty string if the entry doesn't exist (default)</returns>
+const std::string __cdecl GetRuntimeOptionString(const std::string &name) noexcept;
+
+} // namespace Microsoft::React

package/Shared/CreateModules.h

@@ -3,9 +3,14 @@
 
 #pragma once
 
+// React Native
 #include <cxxreact/CxxModule.h>
 #include <smartPtr/cntPtr.h>
 
+// Windows API
+#include <winrt/Windows.Foundation.h>
+
+// Standard Library
 #include <memory>
 
 // Forward declarations. Desktop projects can not access <React.h>
@@ -32,6 +37,20 @@ extern std::unique_ptr<facebook::xplat::module::CxxModule> CreateAsyncStorageMod
 
 namespace Microsoft::React {
 
-extern std::unique_ptr<facebook::xplat::module::CxxModule> CreateWebSocketModule() noexcept;
+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;
 
 } // namespace Microsoft::React

package/Shared/InspectorPackagerConnection.cpp

@@ -196,7 +196,8 @@ InspectorPackagerConnection::InspectorPackagerConnection(
 winrt::fire_and_forget InspectorPackagerConnection::disconnectAsync() {
   co_await winrt::resume_background();
   std::string reason("Explicit close");
-  m_packagerWebSocketConnection->Close(Microsoft::React::WinRTWebSocketResource::CloseCode::GoingAway, reason);
+  m_packagerWebSocketConnection->Close(
+      Microsoft::React::Networking::WinRTWebSocketResource::CloseCode::GoingAway, reason);
   co_return;
 }
 
@@ -204,9 +205,10 @@ winrt::fire_and_forget InspectorPackagerConnection::connectAsync() {
   co_await winrt::resume_background();
 
   std::vector<winrt::Windows::Security::Cryptography::Certificates::ChainValidationResult> certExceptions;
-  m_packagerWebSocketConnection = std::make_shared<Microsoft::React::WinRTWebSocketResource>(std::move(certExceptions));
+  m_packagerWebSocketConnection =
+      std::make_shared<Microsoft::React::Networking::WinRTWebSocketResource>(std::move(certExceptions));
 
-  m_packagerWebSocketConnection->SetOnError([](const Microsoft::React::IWebSocketResource::Error &err) {
+  m_packagerWebSocketConnection->SetOnError([](const Microsoft::React::Networking::IWebSocketResource::Error &err) {
     facebook::react::tracing::error(err.Message.c_str());
   });
 
@@ -267,8 +269,8 @@ winrt::fire_and_forget InspectorPackagerConnection::connectAsync() {
         }
       });
 
-  Microsoft::React::IWebSocketResource::Protocols protocols;
-  Microsoft::React::IWebSocketResource::Options options;
+  Microsoft::React::Networking::IWebSocketResource::Protocols protocols;
+  Microsoft::React::Networking::IWebSocketResource::Options options;
   m_packagerWebSocketConnection->Connect(std::string{m_url}, protocols, options);
 
   co_return;

package/Shared/InspectorPackagerConnection.h

@@ -4,7 +4,7 @@
 #pragma once
 
 #include <InspectorProxy.h>
-#include <WinRTWebSocketResource.h>
+#include <Networking/WinRTWebSocketResource.h>
 #include <jsinspector/InspectorInterfaces.h>
 
 namespace Microsoft::ReactNative {
@@ -42,7 +42,7 @@ class InspectorPackagerConnection final : public std::enable_shared_from_this<In
   void sendMessageToVM(int64_t pageId, std::string &&message);
 
   std::unordered_map<int64_t, std::unique_ptr<facebook::react::ILocalConnection>> m_localConnections;
-  std::shared_ptr<Microsoft::React::WinRTWebSocketResource> m_packagerWebSocketConnection;
+  std::shared_ptr<Microsoft::React::Networking::WinRTWebSocketResource> m_packagerWebSocketConnection;
   std::shared_ptr<IBundleStatusProvider> m_bundleStatusProvider;
   std::string m_url;
 };

package/Shared/JSI/ChakraApi.cpp

@@ -3,7 +3,6 @@
 
 #include "ChakraApi.h"
 
-#include <RuntimeOptions.h>
 #include <sstream>
 #include <utility>
 #include "Unicode.h"

package/Shared/JSI/ChakraRuntime.cpp

@@ -4,7 +4,6 @@
 #include "ChakraRuntime.h"
 #include "ChakraRuntimeFactory.h"
 
-#include <RuntimeOptions.h>
 #include "Unicode.h"
 #include "Utilities.h"
 

package/Shared/JSI/NapiJsiV8RuntimeHolder.h

@@ -22,7 +22,7 @@ class NapiJsiV8RuntimeHolder : public Microsoft::JSI::RuntimeHolderLazyInit {
       std::unique_ptr<facebook::jsi::PreparedScriptStore> &&preparedScriptStore) noexcept;
 
  private:
-  static void ScheduleTaskCallback(
+  static void __cdecl ScheduleTaskCallback(
       napi_env env,
       napi_ext_task_callback taskCb,
       void *taskData,