react-native-windows 0.75.13 → 0.75.15

package/Directory.Build.props

@@ -16,8 +16,8 @@
     -->
     <EnableSourceLink Condition="'$(EnableSourceLink)' == ''">false</EnableSourceLink>
     <!-- When bumping the Folly version, be sure to bump the git hash of that version's commit and build Folly.vcxproj (to update its cgmanifest.json) too. -->
-    <FollyVersion>2023.11.06.00</FollyVersion>
-    <FollyCommitHash>d62707bf4dc8c58bcc317260611b8cbe25c7f444</FollyCommitHash>
+    <FollyVersion>2024.01.01.00</FollyVersion>
+    <FollyCommitHash>234d39a36a43106747d10cc19efada72fd810dd3</FollyCommitHash>
     <!-- When bumping the fmt version, be sure to bump the git hash of that version's commit and build fmt.vcxproj (to update its cgmanifest.json) too. -->
     <FmtVersion>10.1.0</FmtVersion>
     <FmtCommitHash>ca2e3685b160617d3d95fcd9e789c4e06ca88</FmtCommitHash>

package/Folly/TEMP_UntilFollyUpdate/json.cpp

@@ -849,6 +849,10 @@ void escapeStringImpl(
       }
       auto prefix = firstEscapableInWord<EnableExtraAsciiEscapes>(word, opts);
       DCHECK_LE(prefix, avail);
+      // [Windows Sometimes prefix is completely wrong (corrupt?), only in Release, causing a later AV (see issue #14394).
+      // Prefix should always be <= avail, capping it here as a workaround, hoping the assert above eventually catches this in Debug.
+      prefix = std::min(prefix, (size_t)avail);
+      // Windows]
       firstEsc += prefix;
       if (prefix < 8) {
         break;

package/Folly/TEMP_UntilFollyUpdate/lang/ToAscii.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,6 @@ struct to_ascii_array {
     return data.data[index];
   }
 };
-
 template <uint64_t Base, typename Alphabet>
 alignas(kIsMobile ? sizeof(size_t) : hardware_constructive_interference_size)
     typename to_ascii_array<Base, Alphabet>::data_type_ const
@@ -94,13 +93,13 @@ extern template to_ascii_table<10, to_ascii_alphabet_upper>::data_type_ const
 extern template to_ascii_table<16, to_ascii_alphabet_upper>::data_type_ const
     to_ascii_table<16, to_ascii_alphabet_upper>::data;
 
-template <uint64_t Base, typename I>
+template <uint64_t Base, typename Int>
 struct to_ascii_powers {
-  static constexpr size_t size_(I v) {
+  static constexpr size_t size_(Int v) {
     return 1 + (v < Base ? 0 : size_(v / Base));
   }
-  static constexpr size_t const size = size_(~I(0));
-  using data_type_ = c_array<I, size>;
+  static constexpr size_t const size = size_(~Int(0));
+  using data_type_ = c_array<Int, size>;
   static constexpr data_type_ data_() {
     data_type_ result{};
     for (size_t i = 0; i < size; ++i) {
@@ -111,12 +110,14 @@ struct to_ascii_powers {
   // @lint-ignore CLANGTIDY
   static data_type_ const data;
 };
-template <uint64_t Base, typename I>
-constexpr size_t const to_ascii_powers<Base, I>::size;
-template <uint64_t Base, typename I>
+#if FOLLY_CPLUSPLUS < 201703L
+template <uint64_t Base, typename Int>
+constexpr size_t const to_ascii_powers<Base, Int>::size;
+#endif
+template <uint64_t Base, typename Int>
 alignas(hardware_constructive_interference_size)
-    typename to_ascii_powers<Base, I>::data_type_ const
-    to_ascii_powers<Base, I>::data = to_ascii_powers<Base, I>::data_();
+    typename to_ascii_powers<Base, Int>::data_type_ const
+    to_ascii_powers<Base, Int>::data = to_ascii_powers<Base, Int>::data_();
 
 extern template to_ascii_powers<8, uint64_t>::data_type_ const
     to_ascii_powers<8, uint64_t>::data;
@@ -151,7 +152,7 @@ template <uint64_t Base>
 FOLLY_ALWAYS_INLINE size_t to_ascii_size_array(uint64_t v) {
   using powers = to_ascii_powers<Base, uint64_t>;
   for (size_t i = 0u; i < powers::size; ++i) {
-    if (FOLLY_LIKELY(v < powers::data.data[i])) {
+    if (FOLLY_UNLIKELY(v < powers::data.data[i])) {
       return i + size_t(i == 0);
     }
   }
@@ -272,6 +273,15 @@ FOLLY_ALWAYS_INLINE size_t to_ascii_with_table(char* out, uint64_t v) {
   return size;
 }
 
+// Assumes that size >= number of digits in v. If >, the result is left-padded
+// with 0s.
+template <uint64_t Base, typename Alphabet>
+FOLLY_ALWAYS_INLINE void to_ascii_with_route(
+    char* outb, size_t size, uint64_t v) {
+  kIsMobile //
+      ? to_ascii_with_array<Base, Alphabet>(outb, size, v)
+      : to_ascii_with_table<Base, Alphabet>(outb, size, v);
+}
 template <uint64_t Base, typename Alphabet>
 FOLLY_ALWAYS_INLINE size_t
 to_ascii_with_route(char* outb, char const* oute, uint64_t v) {
@@ -279,9 +289,7 @@ to_ascii_with_route(char* outb, char const* oute, uint64_t v) {
   if (FOLLY_UNLIKELY(oute < outb || size_t(oute - outb) < size)) {
     return 0;
   }
-  kIsMobile //
-      ? to_ascii_with_array<Base, Alphabet>(outb, size, v)
-      : to_ascii_with_table<Base, Alphabet>(outb, size, v);
+  to_ascii_with_route<Base, Alphabet>(outb, size, v);
   return size;
 }
 template <uint64_t Base, typename Alphabet, size_t N>

package/Folly/TEMP_UntilFollyUpdate/lang/ToAscii.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -61,14 +61,14 @@ using to_ascii_alphabet_upper = to_ascii_alphabet<true>;
 //  In base 10, u64 requires at most 20 bytes, u32 at most 10, u16 at most 5,
 //  and u8 at most 3.
 /*
-template <uint64_t Base, typename I>
+template <uint64_t Base, typename Int>
 FOLLY_INLINE_VARIABLE constexpr size_t to_ascii_size_max =
-  detail::to_ascii_powers<Base, I>::size;
+    detail::to_ascii_powers<Base, Int>::size;
 */
 //  to_ascii_size_max_decimal
 //
 //  An alias to to_ascii_size_max<10>.
-template <typename I>
+template <typename Int>
 FOLLY_INLINE_VARIABLE constexpr size_t to_ascii_size_max_decimal;
 
 template <>
@@ -170,7 +170,7 @@ size_t to_ascii_upper(char (&out)[N], uint64_t v) {
 //
 //  An alias to to_ascii<10, false>.
 //
-//  async-signals-afe
+//  async-signal-safe
 inline size_t to_ascii_decimal(char* outb, char const* oute, uint64_t v) {
   return to_ascii_lower<10>(outb, oute, v);
 }

package/Folly/cgmanifest.json

@@ -6,7 +6,7 @@
                 "Type": "git",
                 "Git": {
                   "RepositoryUrl": "https://github.com/facebook/folly",
-                  "CommitHash": "d62707bf4dc8c58bcc317260611b8cbe25c7f444"
+                  "CommitHash": "234d39a36a43106747d10cc19efada72fd810dd3"
                 }
             },
             "DevelopmentDependency": false

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.75.13</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.75.15</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>75</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>13</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>15</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>77e6fe0edf406a950c45b4e5a9efc6271852bd5a</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>81be93a4099bcd296a9aec9ee1904c9f93bb7fea</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/Shared/Networking/WinRTWebSocketResource.cpp

@@ -21,16 +21,18 @@
 
 using Microsoft::Common::Utilities::CheckedReinterpretCast;
 
+using Mso::DispatchQueue;
+
 using std::function;
 using std::lock_guard;
 using std::mutex;
-using std::size_t;
 using std::string;
 using std::vector;
 
 using winrt::fire_and_forget;
 using winrt::hresult;
 using winrt::hresult_error;
+using winrt::hstring;
 using winrt::resume_background;
 using winrt::resume_on_signal;
 using winrt::Windows::Foundation::IAsyncAction;
@@ -38,6 +40,7 @@ using winrt::Windows::Foundation::Uri;
 using winrt::Windows::Networking::Sockets::IMessageWebSocket;
 using winrt::Windows::Networking::Sockets::IMessageWebSocketMessageReceivedEventArgs;
 using winrt::Windows::Networking::Sockets::IWebSocket;
+using winrt::Windows::Networking::Sockets::IWebSocketClosedEventArgs;
 using winrt::Windows::Networking::Sockets::MessageWebSocket;
 using winrt::Windows::Networking::Sockets::SocketMessageType;
 using winrt::Windows::Networking::Sockets::WebSocketClosedEventArgs;
@@ -54,9 +57,9 @@ namespace {
 ///
 /// Implements an awaiter for Mso::DispatchQueue
 ///
-auto resume_in_queue(const Mso::DispatchQueue &queue) noexcept {
+auto resume_in_queue(const DispatchQueue &queue) noexcept {
   struct awaitable {
-    awaitable(const Mso::DispatchQueue &queue) noexcept : m_queue{queue} {}
+    awaitable(const DispatchQueue &queue) noexcept : m_queue{queue} {}
 
     bool await_ready() const noexcept {
       return false;
@@ -79,10 +82,367 @@ auto resume_in_queue(const Mso::DispatchQueue &queue) noexcept {
   return awaitable{queue};
 } // resume_in_queue
 
+DispatchQueue GetCurrentOrSerialQueue() noexcept {
+  auto queue = DispatchQueue::CurrentQueue();
+  if (!queue)
+    queue = DispatchQueue::MakeSerialQueue();
+
+  return queue;
+}
+
 } // namespace
 
 namespace Microsoft::React::Networking {
 
+#pragma region WinRTWebSocketResource2
+
+WinRTWebSocketResource2::WinRTWebSocketResource2(
+    IMessageWebSocket &&socket,
+    IDataWriter &&writer,
+    vector<ChainValidationResult> &&certExceptions,
+    DispatchQueue callingQueue)
+    : m_socket{std::move(socket)},
+      m_writer(std::move(writer)),
+      m_readyState{ReadyState::Connecting},
+      m_connectPerformed{CreateEvent(/*attributes*/ nullptr, /*manual reset*/ true, /*state*/ false, /*name*/ nullptr)},
+      m_callingQueue{callingQueue} {
+  for (const auto &certException : certExceptions) {
+    m_socket.Control().IgnorableServerCertificateErrors().Append(certException);
+  }
+}
+
+// private
+WinRTWebSocketResource2::WinRTWebSocketResource2(
+    IMessageWebSocket &&socket,
+    vector<ChainValidationResult> &&certExceptions)
+    : WinRTWebSocketResource2(
+          std::move(socket),
+          DataWriter{socket.OutputStream()},
+          std::move(certExceptions),
+          GetCurrentOrSerialQueue()) {}
+
+WinRTWebSocketResource2::WinRTWebSocketResource2(vector<ChainValidationResult> &&certExceptions)
+    : WinRTWebSocketResource2(MessageWebSocket{}, std::move(certExceptions)) {}
+
+WinRTWebSocketResource2::~WinRTWebSocketResource2() noexcept /*override*/
+{}
+
+void WinRTWebSocketResource2::Fail(string &&message, ErrorType type) noexcept {
+  auto self = shared_from_this();
+
+  self->m_backgroundQueue.Post([self, message = std::move(message), type]() {
+    self->m_readyState = ReadyState::Closed;
+    self->m_callingQueue.Post([self, message = std::move(message), type]() {
+      if (self->m_errorHandler) {
+        self->m_errorHandler({std::move(message), type});
+      }
+    });
+  });
+}
+
+void WinRTWebSocketResource2::Fail(hresult &&error, ErrorType type) noexcept {
+  Fail(Utilities::HResultToString(std::move(error)), type);
+}
+
+void WinRTWebSocketResource2::Fail(hresult_error const &error, ErrorType type) noexcept {
+  Fail(Utilities::HResultToString(error), type);
+}
+
+void WinRTWebSocketResource2::OnMessageReceived(
+    IMessageWebSocket const &,
+    IMessageWebSocketMessageReceivedEventArgs const &args) {
+  auto self = shared_from_this();
+  string response;
+
+  IDataReader reader{nullptr};
+  // Use WinRT ABI to avoid throwing exceptions on expected code paths
+  HRESULT hr =
+      reinterpret_cast<ABI::Windows::Networking::Sockets::IMessageWebSocketMessageReceivedEventArgs *>(
+          winrt::get_abi(args))
+          ->GetDataReader(reinterpret_cast<ABI::Windows::Storage::Streams::IDataReader **>(winrt::put_abi(reader)));
+
+  if (FAILED(hr)) {
+    string errorMessage;
+    ErrorType errorType;
+    // See
+    // https://docs.microsoft.com/uwp/api/windows.networking.sockets.messagewebsocketmessagereceivedeventargs.getdatareader?view=winrt-22621#remarks
+    if (hr == WININET_E_CONNECTION_ABORTED) {
+      errorMessage = "[0x80072EFE] Underlying TCP connection suddenly terminated";
+      errorType = ErrorType::Connection;
+      // Note: It is not clear whether all read-related errors should close the socket.
+      Close(CloseCode::BadPayload, std::move(errorMessage));
+    } else {
+      errorMessage = Utilities::HResultToString(hr);
+      errorType = ErrorType::Receive;
+    }
+
+    self->Fail(std::move(errorMessage), errorType);
+
+    return;
+  }
+
+  try {
+    auto len = reader.UnconsumedBufferLength();
+    if (args.MessageType() == SocketMessageType::Utf8) {
+      reader.UnicodeEncoding(UnicodeEncoding::Utf8);
+      vector<uint8_t> data(len);
+      reader.ReadBytes(data);
+
+      response = string(CheckedReinterpretCast<char *>(data.data()), data.size());
+    } else {
+      auto buffer = reader.ReadBuffer(len);
+      auto data = CryptographicBuffer::EncodeToBase64String(buffer);
+
+      response = winrt::to_string(std::wstring_view(data));
+    }
+  } catch (hresult_error const &e) {
+    return self->Fail(e, ErrorType::Receive);
+  }
+
+  // Posting inside try-catch block causes errors.
+  self->m_callingQueue.Post([self, response = std::move(response), messageType = args.MessageType()]() {
+    if (self->m_readHandler) {
+      self->m_readHandler(response.length(), response, messageType == SocketMessageType::Binary);
+    }
+  });
+}
+
+void WinRTWebSocketResource2::OnClosed(IWebSocket const &sender, IWebSocketClosedEventArgs const &args) {
+  auto self = shared_from_this();
+
+  self->m_backgroundQueue.Post([self]() { self->m_readyState = ReadyState::Closed; });
+
+  self->m_callingQueue.Post([self]() {
+    if (self->m_closeHandler) {
+      self->m_closeHandler(self->m_closeCode, self->m_closeReason);
+    }
+  });
+}
+
+fire_and_forget WinRTWebSocketResource2::PerformConnect(Uri &&uri) noexcept {
+  auto self = shared_from_this();
+  auto coUri = std::move(uri);
+
+  co_await resume_in_queue(self->m_backgroundQueue);
+
+  auto async = self->m_socket.ConnectAsync(coUri);
+  co_await lessthrow_await_adapter<IAsyncAction>{async};
+
+  co_await resume_in_queue(self->m_callingQueue);
+
+  auto result = async.ErrorCode();
+
+  try {
+    if (result >= 0) { // Non-failing HRESULT
+      co_await resume_in_queue(self->m_backgroundQueue);
+      self->m_readyState = ReadyState::Open;
+
+      co_await resume_in_queue(self->m_callingQueue);
+      if (self->m_connectHandler) {
+        self->m_connectHandler();
+      }
+    } else {
+      self->Fail(std::move(result), ErrorType::Connection);
+    }
+  } catch (hresult_error const &e) {
+    self->Fail(e, ErrorType::Connection);
+  } catch (std::exception const &e) {
+    self->Fail(e.what(), ErrorType::Connection);
+  }
+
+  SetEvent(self->m_connectPerformed.get());
+}
+
+fire_and_forget WinRTWebSocketResource2::PerformClose() noexcept {
+  auto self = shared_from_this();
+
+  co_await resume_on_signal(self->m_connectPerformed.get());
+
+  co_await resume_in_queue(self->m_backgroundQueue);
+
+  // See https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close
+  co_await self->SendPendingMessages();
+
+  try {
+    self->m_socket.Close(static_cast<uint16_t>(m_closeCode), winrt::to_hstring(m_closeReason));
+    self->m_readyState = ReadyState::Closing;
+  } catch (winrt::hresult_invalid_argument const &e) {
+    Fail(e, ErrorType::Close);
+  } catch (hresult_error const &e) {
+    Fail(e, ErrorType::Close);
+  } catch (const std::exception &e) {
+    Fail(e.what(), ErrorType::Close);
+  }
+}
+
+fire_and_forget WinRTWebSocketResource2::PerformWrite(string &&message, bool isBinary) noexcept {
+  auto self = shared_from_this();
+  string coMessage = std::move(message);
+
+  co_await resume_in_queue(self->m_backgroundQueue); // Ensure writes happen sequentially
+  self->m_outgoingMessages.emplace(std::move(coMessage), isBinary);
+
+  co_await resume_on_signal(self->m_connectPerformed.get());
+
+  co_await resume_in_queue(self->m_backgroundQueue);
+
+  co_await self->SendPendingMessages();
+}
+
+IAsyncAction WinRTWebSocketResource2::SendPendingMessages() noexcept {
+  auto self = shared_from_this();
+
+  while (!self->m_outgoingMessages.empty()) {
+    if (self->m_readyState != ReadyState::Open) {
+      co_return;
+    }
+
+    size_t length = 0;
+    string messageLocal;
+    bool isBinaryLocal;
+    try {
+      std::tie(messageLocal, isBinaryLocal) = self->m_outgoingMessages.front();
+      self->m_outgoingMessages.pop();
+      if (isBinaryLocal) {
+        self->m_socket.Control().MessageType(SocketMessageType::Binary);
+
+        auto buffer = CryptographicBuffer::DecodeFromBase64String(winrt::to_hstring(messageLocal));
+        if (buffer) {
+          length = buffer.Length();
+          self->m_writer.WriteBuffer(buffer);
+        }
+      } else {
+        self->m_socket.Control().MessageType(SocketMessageType::Utf8);
+
+        length = messageLocal.size();
+        winrt::array_view<const uint8_t> view(
+            CheckedReinterpretCast<const uint8_t *>(messageLocal.c_str()),
+            CheckedReinterpretCast<const uint8_t *>(messageLocal.c_str()) + messageLocal.length());
+        self->m_writer.WriteBytes(view);
+      }
+    } catch (hresult_error const &e) { // TODO: Remove after fixing unit tests exceptions.
+      self->Fail(e, ErrorType::Send);
+      co_return;
+    } catch (const std::exception &e) {
+      self->Fail(e.what(), ErrorType::Send);
+      co_return;
+    }
+
+    auto async = self->m_writer.StoreAsync();
+    co_await lessthrow_await_adapter<DataWriterStoreOperation>{async};
+
+    auto result = async.ErrorCode();
+    if (result < 0) {
+      Fail(std::move(result), ErrorType::Send);
+    }
+  }
+}
+
+#pragma region IWebSocketResource
+
+void WinRTWebSocketResource2::Connect(string &&url, const Protocols &protocols, const Options &options) noexcept {
+  // Register MessageReceived BEFORE calling Connect
+  // https://learn.microsoft.com/en-us/uwp/api/windows.networking.sockets.messagewebsocket.messagereceived?view=winrt-22621
+  m_socket.MessageReceived([self = shared_from_this()](
+                               IMessageWebSocket const &sender, IMessageWebSocketMessageReceivedEventArgs const &args) {
+    self->OnMessageReceived(sender, args);
+  });
+
+  m_socket.Closed([self = shared_from_this()](IWebSocket const &sender, IWebSocketClosedEventArgs const &args) {
+    self->OnClosed(sender, args);
+  });
+
+  auto supportedProtocols = m_socket.Control().SupportedProtocols();
+  for (const auto &protocol : protocols) {
+    supportedProtocols.Append(winrt::to_hstring(protocol));
+  }
+
+  Uri uri{nullptr};
+  bool hasOriginHeader{false};
+  try {
+    uri = Uri{winrt::to_hstring(url)};
+
+    for (const auto &header : options) {
+      m_socket.SetRequestHeader(header.first, winrt::to_hstring(header.second));
+      if (boost::iequals(header.first, L"Origin")) {
+        hasOriginHeader = true;
+      }
+    }
+
+    // #12626 - If Origin header is not provided, set to connect endpoint.
+    if (!hasOriginHeader) {
+      auto scheme = uri.SchemeName();
+      auto host = uri.Host();
+      auto port = uri.Port();
+
+      if (scheme == L"ws") {
+        scheme = L"http";
+      } else if (scheme == L"wss") {
+        scheme = L"https";
+      }
+
+      // Only add a port if a port is defined.
+      hstring originPort = port != 0 ? L":" + winrt::to_hstring(port) : L"";
+      auto origin = hstring{scheme + L"://" + host + originPort};
+
+      m_socket.SetRequestHeader(L"Origin", std::move(origin));
+    }
+  } catch (hresult_error const &e) {
+    Fail(e, ErrorType::Connection);
+
+    SetEvent(m_connectPerformed.get());
+
+    return;
+  }
+
+  PerformConnect(std::move(uri));
+}
+
+void WinRTWebSocketResource2::Ping() noexcept {}
+
+void WinRTWebSocketResource2::Send(string &&message) noexcept {
+  PerformWrite(std::move(message), false);
+}
+
+void WinRTWebSocketResource2::SendBinary(string &&base64String) noexcept {
+  PerformWrite(std::move(base64String), true);
+}
+
+void WinRTWebSocketResource2::Close(CloseCode code, const string &reason) noexcept {
+  m_closeCode = code;
+  m_closeReason = reason;
+  PerformClose();
+}
+
+IWebSocketResource::ReadyState WinRTWebSocketResource2::GetReadyState() const noexcept {
+  return m_readyState;
+}
+
+void WinRTWebSocketResource2::SetOnConnect(function<void()> &&handler) noexcept {
+  m_connectHandler = std::move(handler);
+}
+
+void WinRTWebSocketResource2::SetOnPing(function<void()> && /*handler*/) noexcept {}
+
+void WinRTWebSocketResource2::SetOnSend(function<void(size_t)> && /*handler*/) noexcept {}
+
+void WinRTWebSocketResource2::SetOnMessage(function<void(size_t, const string &, bool isBinary)> &&handler) noexcept {
+  m_readHandler = std::move(handler);
+}
+
+void WinRTWebSocketResource2::SetOnClose(function<void(CloseCode, const string &)> &&handler) noexcept {
+  m_closeHandler = std::move(handler);
+}
+
+void WinRTWebSocketResource2::SetOnError(function<void(Error &&)> &&handler) noexcept {
+  m_errorHandler = std::move(handler);
+}
+
+#pragma endregion IWebSocketResource
+
+#pragma endregion WinRTWebSocketResource2
+
+#pragma region Legacy resource
 // private
 WinRTWebSocketResource::WinRTWebSocketResource(
     IMessageWebSocket &&socket,
@@ -331,7 +691,7 @@ void WinRTWebSocketResource::Connect(string &&url, const Protocols &protocols, c
         response = string(CheckedReinterpretCast<char *>(data.data()), data.size());
       } else {
         auto buffer = reader.ReadBuffer(len);
-        winrt::hstring data = CryptographicBuffer::EncodeToBase64String(buffer);
+        hstring data = CryptographicBuffer::EncodeToBase64String(buffer);
 
         response = winrt::to_string(std::wstring_view(data));
       }
@@ -360,7 +720,7 @@ void WinRTWebSocketResource::Connect(string &&url, const Protocols &protocols, c
     }
   }
 
-  winrt::Windows::Foundation::Collections::IVector<winrt::hstring> supportedProtocols =
+  winrt::Windows::Foundation::Collections::IVector<hstring> supportedProtocols =
       m_socket.Control().SupportedProtocols();
   for (const auto &protocol : protocols) {
     supportedProtocols.Append(winrt::to_hstring(protocol));
@@ -382,7 +742,10 @@ void WinRTWebSocketResource::Connect(string &&url, const Protocols &protocols, c
         scheme = L"https";
       }
 
-      auto origin = winrt::hstring{scheme + L"://" + host + L":" + winrt::to_hstring(port)};
+      // Only add a port if a port is defined
+      hstring originPort = port != 0 ? L":" + winrt::to_hstring(port) : L"";
+      auto origin = hstring{scheme + L"://" + host + originPort};
+
       m_socket.SetRequestHeader(L"Origin", std::move(origin));
     }
 
@@ -458,4 +821,6 @@ void WinRTWebSocketResource::SetOnError(function<void(Error &&)> &&handler) noex
 
 #pragma endregion IWebSocketResource
 
+#pragma endregion Legacy resource
+
 } // namespace Microsoft::React::Networking

package/Shared/Networking/WinRTWebSocketResource.h

@@ -16,6 +16,124 @@
 
 namespace Microsoft::React::Networking {
 
+class WinRTWebSocketResource2 : public IWebSocketResource,
+                                public std::enable_shared_from_this<WinRTWebSocketResource2> {
+  winrt::Windows::Networking::Sockets::IMessageWebSocket m_socket;
+
+  ///
+  // Connection attempt performed, either succeeding or failing
+  ///
+  winrt::handle m_connectPerformed;
+
+  ReadyState m_readyState;
+  Mso::DispatchQueue m_callingQueue;
+  Mso::DispatchQueue m_backgroundQueue;
+  std::queue<std::pair<std::string, bool>> m_outgoingMessages;
+  CloseCode m_closeCode{CloseCode::Normal};
+  std::string m_closeReason;
+
+  std::function<void()> m_connectHandler;
+  std::function<void(std::size_t, const std::string &, bool)> m_readHandler;
+  std::function<void(CloseCode, const std::string &)> m_closeHandler;
+  std::function<void(Error &&)> m_errorHandler;
+
+  winrt::Windows::Storage::Streams::IDataWriter m_writer;
+
+  void Fail(std::string &&message, ErrorType type) noexcept;
+  void Fail(winrt::hresult &&e, ErrorType type) noexcept;
+  void Fail(winrt::hresult_error const &e, ErrorType type) noexcept;
+
+  void OnMessageReceived(
+      winrt::Windows::Networking::Sockets::IMessageWebSocket const &,
+      winrt::Windows::Networking::Sockets::IMessageWebSocketMessageReceivedEventArgs const &args);
+
+  void OnClosed(
+      winrt::Windows::Networking::Sockets::IWebSocket const &,
+      winrt::Windows::Networking::Sockets::IWebSocketClosedEventArgs const &args);
+
+  winrt::fire_and_forget PerformConnect(winrt::Windows::Foundation::Uri &&uri) noexcept;
+  winrt::fire_and_forget PerformWrite(std::string &&message, bool isBinary) noexcept;
+  winrt::fire_and_forget PerformClose() noexcept;
+  winrt::Windows::Foundation::IAsyncAction SendPendingMessages() noexcept;
+
+  WinRTWebSocketResource2(
+      winrt::Windows::Networking::Sockets::IMessageWebSocket &&socket,
+      std::vector<winrt::Windows::Security::Cryptography::Certificates::ChainValidationResult> &&certExceptions);
+
+ public:
+  WinRTWebSocketResource2(
+      winrt::Windows::Networking::Sockets::IMessageWebSocket &&socket,
+      winrt::Windows::Storage::Streams::IDataWriter &&writer,
+      std::vector<winrt::Windows::Security::Cryptography::Certificates::ChainValidationResult> &&certExceptions,
+      Mso::DispatchQueue callingQueue);
+
+  WinRTWebSocketResource2(
+      std::vector<winrt::Windows::Security::Cryptography::Certificates::ChainValidationResult> &&certExceptions);
+
+  ~WinRTWebSocketResource2() noexcept override;
+
+#pragma region IWebSocketResource
+
+  /// <summary>
+  /// <see cref="IWebSocketResource::Connect" />
+  /// </summary>
+  void Connect(std::string &&url, const Protocols &protocols, const Options &options) noexcept override;
+
+  /// <summary>
+  /// <see cref="IWebSocketResource::Ping" />
+  /// </summary>
+  void Ping() noexcept override;
+
+  /// <summary>
+  /// <see cref="IWebSocketResource::Send" />
+  /// </summary>
+  void Send(std::string &&message) noexcept override;
+
+  /// <summary>
+  /// <see cref="IWebSocketResource::SendBinary" />
+  /// </summary>
+  void SendBinary(std::string &&base64String) noexcept override;
+
+  /// <summary>
+  /// <see cref="IWebSocketResource::Close" />
+  /// </summary>
+  void Close(CloseCode code, const std::string &reason) noexcept override;
+
+  ReadyState GetReadyState() const noexcept override;
+
+  /// <summary>
+  /// <see cref="IWebSocketResource::SetOnConnect" />
+  /// </summary>
+  void SetOnConnect(std::function<void()> &&handler) noexcept override;
+
+  /// <summary>
+  /// <see cref="IWebSocketResource::SetOnPing" />
+  /// </summary>
+  void SetOnPing(std::function<void()> &&handler) noexcept override;
+
+  /// <summary>
+  /// <see cref="IWebSocketResource::SetOnSend" />
+  /// </summary>
+  void SetOnSend(std::function<void(std::size_t)> &&handler) noexcept override;
+
+  /// <summary>
+  /// <see cref="IWebSocketResource::SetOnMessage" />
+  /// </summary>
+  void SetOnMessage(std::function<void(std::size_t, const std::string &, bool isBinary)> &&handler) noexcept override;
+
+  /// <summary>
+  /// <see cref="IWebSocketResource::SetOnClose" />
+  /// </summary>
+  void SetOnClose(std::function<void(CloseCode, const std::string &)> &&handler) noexcept override;
+
+  /// <summary>
+  /// <see cref="IWebSocketResource::SetOnError" />
+  /// </summary>
+  void SetOnError(std::function<void(Error &&)> &&handler) noexcept override;
+
+#pragma endregion IWebSocketResource
+};
+
 class WinRTWebSocketResource : public IWebSocketResource, public std::enable_shared_from_this<WinRTWebSocketResource> {
   winrt::Windows::Networking::Sockets::IMessageWebSocket m_socket;
   // TODO: Use or remove.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.75.13",
+  "version": "0.75.15",
   "license": "MIT",
   "repository": {
     "type": "git",