react-native-windows 0.68.16 → 0.68.17

package/Microsoft.ReactNative/Base/CoreNativeModules.cpp

@@ -19,8 +19,12 @@
 
 namespace Microsoft::ReactNative {
 
+using winrt::Microsoft::ReactNative::ReactPropertyBag;
+
 namespace {
 
+using winrt::Microsoft::ReactNative::ReactPropertyId;
+
 bool HasPackageIdentity() noexcept {
   static const bool hasPackageIdentity = []() noexcept {
     auto packageStatics = winrt::get_activation_factory<winrt::Windows::ApplicationModel::IPackageStatics>(
@@ -35,6 +39,13 @@ bool HasPackageIdentity() noexcept {
   return hasPackageIdentity;
 }
 
+ReactPropertyId<bool> HttpUseMonolithicModuleProperty() noexcept {
+  static ReactPropertyId<bool> propId{
+      L"ReactNative.Http"
+      L"UseMonolithicModule"};
+  return propId;
+}
+
 } // namespace
 
 std::vector<facebook::react::NativeModuleDescription> GetCoreModules(
@@ -50,11 +61,25 @@ std::vector<facebook::react::NativeModuleDescription> GetCoreModules(
       [props = context->Properties()]() { return Microsoft::React::CreateHttpModule(props); },
       jsMessageQueue);
 
+  if (!ReactPropertyBag(context->Properties()).Get(HttpUseMonolithicModuleProperty())) {
+    modules.emplace_back(
+        Microsoft::React::GetBlobModuleName(),
+        [props = context->Properties()]() { return Microsoft::React::CreateBlobModule(props); },
+        batchingUIMessageQueue);
+
+    modules.emplace_back(
+        Microsoft::React::GetFileReaderModuleName(),
+        [props = context->Properties()]() { return Microsoft::React::CreateFileReaderModule(props); },
+        batchingUIMessageQueue);
+  }
+
   modules.emplace_back(
       "Timing",
       [batchingUIMessageQueue]() { return facebook::react::CreateTimingModule(batchingUIMessageQueue); },
       batchingUIMessageQueue);
 
+  // Note: `context` is moved to remove the reference from the current scope.
+  // This should either be the last usage of `context`, or the std::move call should happen later in this method.
   modules.emplace_back(
       NativeAnimatedModule::name,
       [context = std::move(context)]() mutable { return std::make_unique<NativeAnimatedModule>(std::move(context)); },

package/Microsoft.ReactNative/Pch/pch.h

@@ -43,7 +43,6 @@
 #include <winrt/Windows.Storage.Streams.h>
 #include <winrt/Windows.UI.ViewManagement.Core.h>
 #include <winrt/Windows.UI.ViewManagement.h>
-#include <winrt/Windows.Web.Http.Filters.h>
 #include <winrt/Windows.Web.Http.Headers.h>
 
 #include "Base/CxxReactIncludes.h"

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

@@ -24,6 +24,11 @@
           "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",
@@ -60,14 +65,34 @@
         "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": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==",
+        "contentHash": "548M6mnBSJWxsIlkQHfbzoYxpiYFXZZSL00p4GHYv8PkiqFBnnT68mW5mGEsA/ch9fDO9GkPgkFQpWiXZN7mAQ==",
         "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",
@@ -135,8 +160,38 @@
         "resolved": "2.2.9",
         "contentHash": "qF6RRZKaflI+LR1YODNyWYjq5YoX8IJ2wx5y8O+AW2xO+1t/Q6Mm+jQ38zJbWnmXbrcOqUYofn7Y3/KC6lTLBQ=="
       },
-      "microsoft.reactnative": {
+      "common": {
         "type": "Project"
+      },
+      "fmt": {
+        "type": "Project"
+      },
+      "folly": {
+        "type": "Project",
+        "dependencies": {
+          "boost": "1.76.0",
+          "fmt": "1.0.0"
+        }
+      },
+      "microsoft.reactnative": {
+        "type": "Project",
+        "dependencies": {
+          "Common": "1.0.0",
+          "Folly": "1.0.0",
+          "Microsoft.UI.Xaml": "2.7.0",
+          "Microsoft.Windows.CppWinRT": "2.0.211028.7",
+          "Microsoft.Windows.SDK.BuildTools": "10.0.22000.194",
+          "ReactCommon": "1.0.0",
+          "ReactNative.Hermes.Windows": "0.11.0-ms.6",
+          "boost": "1.76.0"
+        }
+      },
+      "reactcommon": {
+        "type": "Project",
+        "dependencies": {
+          "Folly": "1.0.0",
+          "boost": "1.76.0"
+        }
       }
     },
     "UAP,Version=v10.0.16299/win10-arm": {

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,10 +10,10 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.68.16</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.68.17</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>68</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>16</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>17</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
   </PropertyGroup>
 </Project>

package/Shared/Modules/BlobModule.cpp

@@ -139,7 +139,7 @@ vector<module::CxxModule::Method> BlobModule::getMethods() {
          auto size = blob[sizeKey].getInt();
          auto socketID = jsArgAsInt(args, 1);
 
-         winrt::array_view<uint8_t> data;
+         winrt::array_view<uint8_t const> data;
          try {
            data = persistor->ResolveMessage(std::move(blobId), offset, size);
          } catch (const std::exception &e) {
@@ -169,7 +169,7 @@ vector<module::CxxModule::Method> BlobModule::getMethods() {
            auto type = part[typeKey].asString();
            if (blobKey == type) {
              auto blob = part[dataKey];
-             winrt::array_view<uint8_t> bufferPart;
+             winrt::array_view<uint8_t const> bufferPart;
              try {
                bufferPart = persistor->ResolveMessage(
                    blob[blobIdKey].asString(), blob[offsetKey].asInt(), blob[sizeKey].asInt());
@@ -216,7 +216,7 @@ vector<module::CxxModule::Method> BlobModule::getMethods() {
 
 #pragma region IBlobPersistor
 
-winrt::array_view<uint8_t> MemoryBlobPersistor::ResolveMessage(string &&blobId, int64_t offset, int64_t size) {
+winrt::array_view<uint8_t const> MemoryBlobPersistor::ResolveMessage(string &&blobId, int64_t offset, int64_t size) {
   if (size < 1)
     return {};
 
@@ -233,7 +233,7 @@ winrt::array_view<uint8_t> MemoryBlobPersistor::ResolveMessage(string &&blobId,
   if (endBound > bytes.size() || offset >= static_cast<int64_t>(bytes.size()) || offset < 0)
     throw std::out_of_range("Offset or size out of range");
 
-  return winrt::array_view<uint8_t>(bytes.data() + offset, bytes.data() + endBound);
+  return winrt::array_view<uint8_t const>(bytes.data() + offset, bytes.data() + endBound);
 }
 
 void MemoryBlobPersistor::RemoveMessage(string &&blobId) noexcept {

package/Shared/Modules/BlobModule.h

@@ -30,7 +30,7 @@ class MemoryBlobPersistor final : public IBlobPersistor {
  public:
 #pragma region IBlobPersistor
 
-  winrt::array_view<uint8_t> ResolveMessage(std::string &&blobId, int64_t offset, int64_t size) override;
+  winrt::array_view<uint8_t const> ResolveMessage(std::string &&blobId, int64_t offset, int64_t size) override;
 
   void RemoveMessage(std::string &&blobId) noexcept override;
 

package/Shared/Modules/FileReaderModule.cpp

@@ -71,7 +71,7 @@ std::vector<module::CxxModule::Method> FileReaderModule::getMethods() {
          auto offset = blob["offset"].asInt();
          auto size = blob["size"].asInt();
 
-         winrt::array_view<uint8_t> bytes;
+         winrt::array_view<uint8_t const> bytes;
          try {
            bytes = blobPersistor->ResolveMessage(std::move(blobId), offset, size);
          } catch (const std::exception &e) {
@@ -116,7 +116,7 @@ std::vector<module::CxxModule::Method> FileReaderModule::getMethods() {
          auto offset = blob["offset"].asInt();
          auto size = blob["size"].asInt();
 
-         winrt::array_view<uint8_t> bytes;
+         winrt::array_view<uint8_t const> bytes;
          try {
            bytes = blobPersistor->ResolveMessage(std::move(blobId), offset, size);
          } catch (const std::exception &e) {

package/Shared/Modules/HttpModule.cpp

@@ -72,9 +72,11 @@ static void SetUpHttpResource(
   };
   resource->SetOnData(std::move(onDataDynamic));
 
-  resource->SetOnError([weakReactInstance](int64_t requestId, string &&message) {
+  resource->SetOnError([weakReactInstance](int64_t requestId, string &&message, bool isTimeout) {
     dynamic args = dynamic::array(requestId, std::move(message));
-    // TODO: isTimeout errorArgs.push_back(true);
+    if (isTimeout) {
+      args.push_back(true);
+    }
 
     SendEvent(weakReactInstance, completedResponse, std::move(args));
   });
@@ -106,90 +108,90 @@ std::map<string, dynamic> HttpModule::getConstants() {
 }
 
 // clang-format off
-std::vector<facebook::xplat::module::CxxModule::Method> HttpModule::getMethods() {
+  std::vector<facebook::xplat::module::CxxModule::Method> HttpModule::getMethods() {
 
-  return
-  {
+    return
     {
-      "sendRequest",
-      [weakHolder = weak_ptr<ModuleHolder>(m_holder)](dynamic args, Callback cxxCallback)
       {
-        auto holder = weakHolder.lock();
-        if (!holder) {
-          return;
-        }
-
-        auto resource = holder->Module->m_resource;
-        if (!holder->Module->m_isResourceSetup)
+        "sendRequest",
+        [weakHolder = weak_ptr<ModuleHolder>(m_holder)](dynamic args, Callback cxxCallback)
         {
-          SetUpHttpResource(resource, holder->Module->getInstance(), holder->Module->m_inspectableProperties);
-          holder->Module->m_isResourceSetup = true;
-        }
+          auto holder = weakHolder.lock();
+          if (!holder) {
+            return;
+          }
 
-        auto params = facebook::xplat::jsArgAsObject(args, 0);
-        IHttpResource::Headers headers;
-        for (auto& header : params["headers"].items()) {
-          headers.emplace(header.first.getString(), header.second.getString());
-        }
+          auto resource = holder->Module->m_resource;
+          if (!holder->Module->m_isResourceSetup)
+          {
+            SetUpHttpResource(resource, holder->Module->getInstance(), holder->Module->m_inspectableProperties);
+            holder->Module->m_isResourceSetup = true;
+          }
 
-        resource->SendRequest(
-          params["method"].asString(),
-          params["url"].asString(),
-          params["requestId"].asInt(),
-          std::move(headers),
-          std::move(params["data"]),
-          params["responseType"].asString(),
-          params["incrementalUpdates"].asBool(),
-          static_cast<int64_t>(params["timeout"].asDouble()),
-          params["withCredentials"].asBool(),
-          [cxxCallback = std::move(cxxCallback)](int64_t requestId) {
-            cxxCallback({requestId});
+          auto params = facebook::xplat::jsArgAsObject(args, 0);
+          IHttpResource::Headers headers;
+          for (auto& header : params["headers"].items()) {
+            headers.emplace(header.first.getString(), header.second.getString());
           }
-        );
-      }
-    },
-    {
-      "abortRequest",
-      [weakHolder = weak_ptr<ModuleHolder>(m_holder)](dynamic args)
+
+          resource->SendRequest(
+            params["method"].asString(),
+            params["url"].asString(),
+            params["requestId"].asInt(),
+            std::move(headers),
+            std::move(params["data"]),
+            params["responseType"].asString(),
+            params["incrementalUpdates"].asBool(),
+            static_cast<int64_t>(params["timeout"].asDouble()),
+            params["withCredentials"].asBool(),
+            [cxxCallback = std::move(cxxCallback)](int64_t requestId) {
+              cxxCallback({requestId});
+            }
+          );
+        }
+      },
       {
-        auto holder = weakHolder.lock();
-        if (!holder)
+        "abortRequest",
+        [weakHolder = weak_ptr<ModuleHolder>(m_holder)](dynamic args)
         {
-          return;
-        }
+          auto holder = weakHolder.lock();
+          if (!holder)
+          {
+            return;
+          }
 
-        auto resource = holder->Module->m_resource;
-        if (!holder->Module->m_isResourceSetup)
-        {
-          SetUpHttpResource(resource, holder->Module->getInstance(), holder->Module->m_inspectableProperties);
-          holder->Module->m_isResourceSetup = true;
-        }
+          auto resource = holder->Module->m_resource;
+          if (!holder->Module->m_isResourceSetup)
+          {
+            SetUpHttpResource(resource, holder->Module->getInstance(), holder->Module->m_inspectableProperties);
+            holder->Module->m_isResourceSetup = true;
+          }
 
-        resource->AbortRequest(facebook::xplat::jsArgAsInt(args, 0));
-      }
-    },
-    {
-      "clearCookies",
-      [weakHolder = weak_ptr<ModuleHolder>(m_holder)](dynamic args)
+          resource->AbortRequest(facebook::xplat::jsArgAsInt(args, 0));
+        }
+      },
       {
-        auto holder = weakHolder.lock();
-        if (!holder)
+        "clearCookies",
+        [weakHolder = weak_ptr<ModuleHolder>(m_holder)](dynamic args)
         {
-          return;
-        }
+          auto holder = weakHolder.lock();
+          if (!holder)
+          {
+            return;
+          }
 
-        auto resource = holder->Module->m_resource;
-        if (!holder->Module->m_isResourceSetup)
-        {
-          SetUpHttpResource(resource, holder->Module->getInstance(), holder->Module->m_inspectableProperties);
-          holder->Module->m_isResourceSetup = true;
-        }
+          auto resource = holder->Module->m_resource;
+          if (!holder->Module->m_isResourceSetup)
+          {
+            SetUpHttpResource(resource, holder->Module->getInstance(), holder->Module->m_inspectableProperties);
+            holder->Module->m_isResourceSetup = true;
+          }
 
-        resource->ClearCookies();
+          resource->ClearCookies();
+        }
       }
-    }
-  };
-}
+    };
+  }
 // clang-format on
 
 #pragma endregion CxxModule

package/Shared/Modules/IBlobPersistor.h

@@ -18,7 +18,7 @@ struct IBlobPersistor {
   /// When an entry for blobId cannot be found.
   /// </exception>
   ///
-  virtual winrt::array_view<uint8_t> ResolveMessage(std::string &&blobId, int64_t offset, int64_t size) = 0;
+  virtual winrt::array_view<uint8_t const> ResolveMessage(std::string &&blobId, int64_t offset, int64_t size) = 0;
 
   virtual void RemoveMessage(std::string &&blobId) noexcept = 0;
 

package/Shared/Modules/WebSocketModule.cpp

@@ -187,23 +187,23 @@ std::map<string, dynamic> WebSocketModule::getConstants() {
 }
 
 // clang-format off
-std::vector<facebook::xplat::module::CxxModule::Method> WebSocketModule::getMethods()
-{
-  return
+  std::vector<facebook::xplat::module::CxxModule::Method> WebSocketModule::getMethods()
   {
+    return
     {
-      "connect",
-      [weakState = weak_ptr<SharedState>(m_sharedState)](dynamic args) // const string& url, dynamic protocols, dynamic options, int64_t id
       {
-        IWebSocketResource::Protocols protocols;
-        dynamic protocolsDynamic = jsArgAsDynamic(args, 1);
-        if (!protocolsDynamic.empty())
+        "connect",
+        [weakState = weak_ptr<SharedState>(m_sharedState)](dynamic args) // const string& url, dynamic protocols, dynamic options, int64_t id
         {
-          for (const auto& protocol : protocolsDynamic)
+          IWebSocketResource::Protocols protocols;
+          dynamic protocolsDynamic = jsArgAsDynamic(args, 1);
+          if (!protocolsDynamic.empty())
           {
-            protocols.push_back(protocol.getString());
+            for (const auto& protocol : protocolsDynamic)
+            {
+              protocols.push_back(protocol.getString());
+            }
           }
-        }
 
         IWebSocketResource::Options options;
         dynamic optionsDynamic = jsArgAsDynamic(args, 2);
@@ -216,79 +216,79 @@ std::vector<facebook::xplat::module::CxxModule::Method> WebSocketModule::getMeth
           }
         }
 
-        weak_ptr weakWs = GetOrCreateWebSocket(jsArgAsInt(args, 3), jsArgAsString(args, 0), weakState);
-        if (auto sharedWs = weakWs.lock())
-        {
-          sharedWs->Connect(jsArgAsString(args, 0), protocols, options);
-        }
-      }
-    },
-    {
-      "close",
-      [weakState = weak_ptr<SharedState>(m_sharedState)](dynamic args) // [int64_t code, string reason,] int64_t id
-      {
-        // See react-native\Libraries\WebSocket\WebSocket.js:_close
-        if (args.size() == 3) // WebSocketModule.close(statusCode, closeReason, this._socketId);
-        {
-          weak_ptr weakWs = GetOrCreateWebSocket(jsArgAsInt(args, 2), {}, weakState);
+          weak_ptr weakWs = GetOrCreateWebSocket(jsArgAsInt(args, 3), jsArgAsString(args, 0), weakState);
           if (auto sharedWs = weakWs.lock())
           {
-            sharedWs->Close(static_cast<IWebSocketResource::CloseCode>(jsArgAsInt(args, 0)), jsArgAsString(args, 1));
+            sharedWs->Connect(jsArgAsString(args, 0), protocols, options);
           }
         }
-        else if (args.size() == 1) // WebSocketModule.close(this._socketId);
+      },
+      {
+        "close",
+        [weakState = weak_ptr<SharedState>(m_sharedState)](dynamic args) // [int64_t code, string reason,] int64_t id
         {
-          weak_ptr weakWs = GetOrCreateWebSocket(jsArgAsInt(args, 0), {}, weakState);
-          if (auto sharedWs = weakWs.lock())
+          // See react-native\Libraries\WebSocket\WebSocket.js:_close
+          if (args.size() == 3) // WebSocketModule.close(statusCode, closeReason, this._socketId);
           {
-            sharedWs->Close(IWebSocketResource::CloseCode::Normal, {});
+            weak_ptr weakWs = GetOrCreateWebSocket(jsArgAsInt(args, 2), {}, weakState);
+            if (auto sharedWs = weakWs.lock())
+            {
+              sharedWs->Close(static_cast<IWebSocketResource::CloseCode>(jsArgAsInt(args, 0)), jsArgAsString(args, 1));
+            }
           }
-        }
-        else
-        {
-          auto state = weakState.lock();
-          if (state && state->Module) {
-            auto errorObj = dynamic::object("id", -1)("message", "Incorrect number of parameters");
-            SendEvent(state->Module->getInstance(), "websocketFailed", std::move(errorObj));
+          else if (args.size() == 1) // WebSocketModule.close(this._socketId);
+          {
+            weak_ptr weakWs = GetOrCreateWebSocket(jsArgAsInt(args, 0), {}, weakState);
+            if (auto sharedWs = weakWs.lock())
+            {
+              sharedWs->Close(IWebSocketResource::CloseCode::Normal, {});
+            }
+          }
+          else
+          {
+            auto state = weakState.lock();
+            if (state && state->Module) {
+              auto errorObj = dynamic::object("id", -1)("message", "Incorrect number of parameters");
+              SendEvent(state->Module->getInstance(), "websocketFailed", std::move(errorObj));
+            }
           }
         }
-      }
-    },
-    {
-      "send",
-      [weakState = weak_ptr<SharedState>(m_sharedState)](dynamic args) // const string& message, int64_t id
+      },
       {
-        weak_ptr weakWs = GetOrCreateWebSocket(jsArgAsInt(args, 1), {}, weakState);
-        if (auto sharedWs = weakWs.lock())
+        "send",
+        [weakState = weak_ptr<SharedState>(m_sharedState)](dynamic args) // const string& message, int64_t id
         {
-          sharedWs->Send(jsArgAsString(args, 0));
+          weak_ptr weakWs = GetOrCreateWebSocket(jsArgAsInt(args, 1), {}, weakState);
+          if (auto sharedWs = weakWs.lock())
+          {
+            sharedWs->Send(jsArgAsString(args, 0));
+          }
         }
-      }
-    },
-    {
-      "sendBinary",
-      [weakState = weak_ptr<SharedState>(m_sharedState)](dynamic args) // const string& base64String, int64_t id
+      },
       {
-        weak_ptr weakWs = GetOrCreateWebSocket(jsArgAsInt(args, 1), {}, weakState);
-        if (auto sharedWs = weakWs.lock())
+        "sendBinary",
+        [weakState = weak_ptr<SharedState>(m_sharedState)](dynamic args) // const string& base64String, int64_t id
         {
-          sharedWs->SendBinary(jsArgAsString(args, 0));
+          weak_ptr weakWs = GetOrCreateWebSocket(jsArgAsInt(args, 1), {}, weakState);
+          if (auto sharedWs = weakWs.lock())
+          {
+            sharedWs->SendBinary(jsArgAsString(args, 0));
+          }
         }
-      }
-    },
-    {
-      "ping",
-      [weakState = weak_ptr<SharedState>(m_sharedState)](dynamic args) // int64_t id
+      },
       {
-        weak_ptr weakWs = GetOrCreateWebSocket(jsArgAsInt(args, 0), {}, weakState);
-        if (auto sharedWs = weakWs.lock())
+        "ping",
+        [weakState = weak_ptr<SharedState>(m_sharedState)](dynamic args) // int64_t id
         {
-          sharedWs->Ping();
+          weak_ptr weakWs = GetOrCreateWebSocket(jsArgAsInt(args, 0), {}, weakState);
+          if (auto sharedWs = weakWs.lock())
+          {
+            sharedWs->Ping();
+          }
         }
       }
-    }
-  };
-} // getMethods
+    };
+  } // getMethods
 // clang-format on
 
 #pragma endregion WebSocketModule

package/Shared/Networking/IHttpResource.h

@@ -71,6 +71,7 @@ struct IHttpResource {
   /// </param>
   /// <param name="timeout">
   /// Request timeout in miliseconds.
+  /// Note: A value of 0 means no timeout. The resource will await the response indefinitely.
   /// </param>
   /// <param name="withCredentials">
   /// Allow including credentials in request.
@@ -95,7 +96,7 @@ struct IHttpResource {
   virtual void SetOnData(std::function<void(int64_t requestId, std::string &&responseData)> &&handler) noexcept = 0;
   virtual void SetOnData(std::function<void(int64_t requestId, folly::dynamic &&responseData)> &&handler) noexcept = 0;
   virtual void SetOnError(
-      std::function<void(int64_t requestId, std::string &&errorMessage /*, bool isTimeout*/)> &&handler) noexcept = 0;
+      std::function<void(int64_t requestId, std::string &&errorMessage, bool isTimeout)> &&handler) noexcept = 0;
 };
 
 } // namespace Microsoft::React::Networking

package/Shared/Networking/IRedirectEventSource.h

@@ -0,0 +1,18 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include <winrt/Windows.Foundation.h>
+#include <winrt/Windows.Web.Http.h>
+#include <winrt/base.h>
+
+namespace Microsoft::React::Networking {
+
+struct IRedirectEventSource : winrt::implements<IRedirectEventSource, winrt::Windows::Foundation::IInspectable> {
+  virtual bool OnRedirecting(
+      winrt::Windows::Web::Http::HttpRequestMessage const &request,
+      winrt::Windows::Web::Http::HttpResponseMessage const &response) noexcept = 0;
+};
+
+} // namespace Microsoft::React::Networking

package/Shared/Networking/IWinRTHttpRequestFactory.h

@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include <winrt/Windows.Foundation.Collections.h>
+#include <winrt/Windows.Foundation.h>
+#include <winrt/Windows.Web.Http.h>
+
+namespace Microsoft::React::Networking {
+
+struct IWinRTHttpRequestFactory {
+  virtual ~IWinRTHttpRequestFactory() noexcept {}
+
+  virtual winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Web::Http::HttpRequestMessage> CreateRequest(
+      winrt::Windows::Web::Http::HttpMethod &&method,
+      winrt::Windows::Foundation::Uri &&uri,
+      winrt::Windows::Foundation::Collections::IMap<winrt::hstring, winrt::Windows::Foundation::IInspectable>
+          props) noexcept = 0;
+};
+
+} // namespace Microsoft::React::Networking