react-native-windows 0.72.28 → 0.72.30

package/Common/Common.vcxproj

@@ -64,7 +64,7 @@
       string literals. It prevents code like
         wchar_t* str = L"hello";
       from compiling. -->
-      <AdditionalOptions>%(AdditionalOptions) /Zc:strictStrings</AdditionalOptions>
+      <AdditionalOptions>%(AdditionalOptions) /Zc:strictStrings /await</AdditionalOptions>
     </ClCompile>
     <Link>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
@@ -78,12 +78,17 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="Unicode.cpp" />
+    <ClCompile Include="Utilities.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Unicode.h" />
     <ClInclude Include="Utilities.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ItemGroup>
+    <PackageReference Include="boost" Version="1.76.0.0" />
+    <PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" PrivateAssets="all" />
+  </ItemGroup>
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
   <Target Name="Deploy" />

package/Common/Common.vcxproj.filters

@@ -12,6 +12,9 @@
     <ClCompile Include="Unicode.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="Utilities.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Unicode.h">

package/Common/Utilities.cpp

@@ -0,0 +1,59 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#include "Utilities.h"
+
+// Boost Library
+#include <boost/archive/iterators/base64_from_binary.hpp>
+#include <boost/archive/iterators/binary_from_base64.hpp>
+#include <boost/archive/iterators/ostream_iterator.hpp>
+#include <boost/archive/iterators/transform_width.hpp>
+
+// Windows API
+#include <winrt/Windows.Security.Cryptography.h>
+
+// Standard Library
+#include <sstream>
+
+using std::string;
+using std::string_view;
+using std::wstring_view;
+using winrt::array_view;
+
+using winrt::Windows::Security::Cryptography::BinaryStringEncoding;
+using winrt::Windows::Security::Cryptography::CryptographicBuffer;
+
+namespace Microsoft::React::Utilities {
+
+string DecodeBase64(string_view base64) noexcept {
+  typedef array_view<char const> av_t;
+  auto bytes = av_t(base64.data(), static_cast<av_t::size_type>(base64.size()));
+
+  using namespace boost::archive::iterators;
+  typedef transform_width<binary_from_base64<const char *>, 8, 6> decode_base64;
+  std::ostringstream oss;
+  std::copy(decode_base64(bytes.cbegin()), decode_base64(bytes.cend()), ostream_iterator<char>(oss));
+
+  return oss.str();
+}
+
+// https://www.boost.org/doc/libs/1_76_0/libs/serialization/doc/dataflow.html
+string EncodeBase64(string_view text) noexcept {
+  typedef array_view<char const> av_t;
+  auto bytes = av_t(text.data(), static_cast<av_t::size_type>(text.size()));
+
+  using namespace boost::archive::iterators;
+  typedef base64_from_binary<transform_width<const char *, 6, 8>> encode_base64;
+  std::ostringstream oss;
+  std::copy(encode_base64(bytes.cbegin()), encode_base64(bytes.cend()), ostream_iterator<char>(oss));
+
+  // https://unix.stackexchange.com/questions/631501
+  auto padLength = (4 - (oss.tellp() % 4)) % 4;
+  for (auto i = 0; i < padLength; ++i) {
+    oss << '=';
+  }
+
+  return oss.str();
+}
+
+} // namespace Microsoft::React::Utilities

package/Common/utilities.h

@@ -2,6 +2,9 @@
 // Licensed under the MIT License.
 
 #pragma once
+
+// Standard Library
+#include <string>
 #include <type_traits>
 #include <utility>
 
@@ -37,3 +40,11 @@ constexpr std::size_t ArraySize(T (&)[N]) noexcept {
 }
 
 } // namespace Microsoft::Common::Utilities
+
+namespace Microsoft::React::Utilities {
+
+std::string DecodeBase64(std::string_view text) noexcept;
+
+std::string EncodeBase64(std::string_view text) noexcept;
+
+} // namespace Microsoft::React::Utilities

package/Mso/src/dispatchQueue/uiScheduler_winrt.cpp

@@ -278,7 +278,9 @@ void UISchedulerWinRT::Shutdown() noexcept {
 
 void UISchedulerWinRT::AwaitTermination() noexcept {
   Shutdown();
-  m_terminationEvent.Wait();
+  if (m_threadId != std::this_thread::get_id()) {
+    m_terminationEvent.Wait();
+  }
 }
 
 /*static*/ DispatchQueue UISchedulerWinRT::GetOrCreateUIThreadQueue() noexcept {
@@ -343,7 +345,7 @@ void UISchedulerWinRT::CleanupContext::CheckTermination() noexcept {
 }
 
 //=============================================================================
-// DispatchQueueStatic::MakeCurrentThreadUIScheduler implementation
+// DispatchQueueStatic::GetCurrentUIThreadQueue implementation
 //=============================================================================
 
 DispatchQueue DispatchQueueStatic::GetCurrentUIThreadQueue() noexcept {

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.72.28</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.72.30</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>72</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>28</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>30</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>f86fbc6b24778fe44f26c4b1b6352c76aacdab00</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>26ed970fceeb6617477a575238c746aadf4a6a12</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/Shared/BaseFileReaderResource.cpp

@@ -3,10 +3,7 @@
 
 #include "BaseFileReaderResource.h"
 
-// Boost Library
-#include <boost/archive/iterators/base64_from_binary.hpp>
-#include <boost/archive/iterators/ostream_iterator.hpp>
-#include <boost/archive/iterators/transform_width.hpp>
+#include <utilities.h>
 
 // Windows API
 #include <winrt/base.h>
@@ -73,18 +70,9 @@ void BaseFileReaderResource::ReadAsDataUrl(
   result += type;
   result += ";base64,";
 
-  // https://www.boost.org/doc/libs/1_76_0/libs/serialization/doc/dataflow.html
-  using namespace boost::archive::iterators;
-  typedef base64_from_binary<transform_width<const char *, 6, 8>> encode_base64;
-  std::ostringstream oss;
-  std::copy(encode_base64(bytes.cbegin()), encode_base64(bytes.cend()), ostream_iterator<char>(oss));
-  result += oss.str();
-
-  // https://unix.stackexchange.com/questions/631501
-  auto padLength = 4 - (oss.tellp() % 4);
-  for (auto i = 0; i < padLength; ++i) {
-    result += '=';
-  }
+  auto chars = reinterpret_cast<const char *>(bytes.data());
+  auto view = std::string_view(chars, bytes.size());
+  result += Utilities::EncodeBase64(view);
 
   resolver(std::move(result));
 }

package/Shared/Modules/FileReaderModule.cpp

@@ -5,12 +5,6 @@
 
 #include <CreateModules.h>
 #include <ReactPropertyBag.h>
-#include <sstream>
-
-// Boost Library
-#include <boost/archive/iterators/base64_from_binary.hpp>
-#include <boost/archive/iterators/ostream_iterator.hpp>
-#include <boost/archive/iterators/transform_width.hpp>
 
 // React Native
 #include <cxxreact/JsArgumentHelpers.h>

package/Shared/Networking/DefaultBlobResource.cpp

@@ -5,6 +5,7 @@
 
 #include <Modules/IHttpModuleProxy.h>
 #include <Modules/IWebSocketModuleProxy.h>
+#include <utilities.h>
 
 // Boost Libraries
 #include <boost/uuid/uuid_io.hpp>
@@ -95,11 +96,9 @@ void DefaultBlobResource::SendOverSocket(string &&blobId, int64_t offset, int64_
     return m_callbacks.OnError(e.what());
   }
 
-  auto buffer = CryptographicBuffer::CreateFromByteArray(data);
-  auto base64Hstring = CryptographicBuffer::EncodeToBase64String(std::move(buffer));
-  auto base64String = winrt::to_string(base64Hstring);
-
-  wsProxy->SendBinary(std::move(base64String), socketId);
+  auto chars = reinterpret_cast<const char *>(data.data());
+  auto view = std::string_view(chars, data.size());
+  wsProxy->SendBinary(Utilities::EncodeBase64(view), socketId);
 }
 
 void DefaultBlobResource::CreateFromParts(msrn::JSValueArray &&parts, string &&blobId) noexcept /*override*/ {

package/Shared/Networking/WinRTWebSocketResource.cpp

@@ -7,6 +7,9 @@
 #include <Utils/CppWinrtLessExceptions.h>
 #include <Utils/WinRTConversions.h>
 
+// Boost Libraries
+#include <boost/algorithm/string.hpp>
+
 // MSO
 #include <dispatchQueue/dispatchQueue.h>
 
@@ -16,9 +19,6 @@
 #include <winrt/Windows.Foundation.Collections.h>
 #include <winrt/Windows.Security.Cryptography.h>
 
-// Standard Library
-#include <sstream>
-
 using Microsoft::Common::Utilities::CheckedReinterpretCast;
 
 using std::function;
@@ -352,8 +352,12 @@ void WinRTWebSocketResource::Connect(string &&url, const Protocols &protocols, c
 
   m_readyState = ReadyState::Connecting;
 
+  bool hasOriginHeader = false;
   for (const auto &header : options) {
     m_socket.SetRequestHeader(header.first, winrt::to_hstring(header.second));
+    if (boost::iequals(header.first, L"Origin")) {
+      hasOriginHeader = true;
+    }
   }
 
   winrt::Windows::Foundation::Collections::IVector<winrt::hstring> supportedProtocols =
@@ -362,11 +366,26 @@ void WinRTWebSocketResource::Connect(string &&url, const Protocols &protocols, c
     supportedProtocols.Append(winrt::to_hstring(protocol));
   }
 
-  m_connectRequested = true;
-
   Uri uri{nullptr};
   try {
     uri = Uri{winrt::to_hstring(url)};
+
+    // #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";
+      }
+
+      auto origin = winrt::hstring{scheme + L"://" + host + L":" + winrt::to_hstring(port)};
+      m_socket.SetRequestHeader(L"Origin", std::move(origin));
+    }
+
   } catch (hresult_error const &e) {
     if (m_errorHandler) {
       m_errorHandler({Utilities::HResultToString(e), ErrorType::Connection});
@@ -380,6 +399,8 @@ void WinRTWebSocketResource::Connect(string &&url, const Protocols &protocols, c
     return;
   }
 
+  m_connectRequested = true;
+
   PerformConnect(std::move(uri));
 }
 

package/Shared/Shared.vcxitems.filters

@@ -271,8 +271,6 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)Networking\DefaultBlobResource.cpp">
       <Filter>Source Files\Networking</Filter>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\platform\react\renderer\components\view\HostPlatformViewProps.cpp" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\platform\react\renderer\components\view\HostPlatformViewEventEmitter.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)Modules\BlobCollector.cpp">
       <Filter>Source Files\Modules</Filter>
     </ClCompile>

package/package.json

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