react-native-windows 0.71.41 → 0.71.43

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.71.41</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.71.43</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>71</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>41</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>43</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>1ea6771bb3652003c202235e97a86e842024d5e1</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>ce7c2173ac7e384b20fc619e653484e621d742e5</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/Shared/Modules/BlobCollector.cpp

@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#include "BlobCollector.h"
+
+using std::string;
+
+namespace Microsoft::React {
+
+using Networking::IBlobResource;
+
+BlobCollector::BlobCollector(string blobId, std::shared_ptr<IBlobResource> resource) noexcept
+    : m_blobId{blobId}, m_weakResource{std::weak_ptr<IBlobResource>(resource)} {}
+
+BlobCollector::~BlobCollector() noexcept {
+  if (auto rc = m_weakResource.lock()) {
+    rc->Release(std::move(m_blobId));
+  }
+}
+
+} // namespace Microsoft::React

package/Shared/Modules/BlobCollector.h

@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include <Networking/IBlobResource.h>
+
+// JSI
+#include <jsi/jsi.h>
+
+namespace Microsoft::React {
+
+class JSI_EXPORT BlobCollector : public facebook::jsi::HostObject {
+  std::string m_blobId;
+  std::weak_ptr<Networking::IBlobResource> m_weakResource;
+
+ public:
+  BlobCollector(std::string blobId, std::shared_ptr<Networking::IBlobResource> resource) noexcept;
+
+  ~BlobCollector() noexcept;
+};
+
+} // namespace Microsoft::React

package/Shared/Modules/BlobModule.cpp

@@ -4,7 +4,9 @@
 #include "BlobModule.h"
 
 #include <CreateModules.h>
+#include <JSI/JsiApiContext.h>
 #include <Modules/CxxModuleUtilities.h>
+#include "BlobCollector.h"
 
 // React Native
 #include <cxxreact/JsArgumentHelpers.h>
@@ -38,6 +40,23 @@ void BlobTurboModule::Initialize(msrn::ReactContext const &reactContext) noexcep
   m_resource->Callbacks().OnError = [&reactContext](string &&errorText) {
     Modules::SendEvent(reactContext, L"blobFailed", {errorText});
   };
+
+  namespace jsi = facebook::jsi;
+  msrn::ExecuteJsi(reactContext, [resource = m_resource](jsi::Runtime &runtime) {
+    runtime.global().setProperty(
+        runtime,
+        "__blobCollectorProvider",
+        jsi::Function::createFromHostFunction(
+            runtime,
+            jsi::PropNameID::forAscii(runtime, "__blobCollectorProvider"),
+            1,
+            [resource](jsi::Runtime &rt, const jsi::Value &thisVal, const jsi::Value *args, size_t count) {
+              auto blobId = args[0].asString(rt).utf8(rt);
+              auto collector = std::make_shared<BlobCollector>(blobId, resource);
+
+              return jsi::Object::createFromHostObject(rt, collector);
+            }));
+  });
 }
 
 ReactNativeSpecs::BlobModuleSpec_Constants BlobTurboModule::GetConstants() noexcept {

package/Shared/Modules/WebSocketModule.cpp

@@ -52,6 +52,9 @@ using Microsoft::React::Networking::IWebSocketResource;
 
 constexpr char s_moduleName[] = "WebSocketModule";
 constexpr wchar_t s_moduleNameW[] = L"WebSocketModule";
+constexpr wchar_t s_proxyNameW[] = L"WebSocketModule.Proxy";
+constexpr wchar_t s_sharedStateNameW[] = L"WebSocketModule.SharedState";
+constexpr wchar_t s_contentHandlerNameW[] = L"BlobModule.ContentHandler";
 
 msrn::ReactModuleProvider s_moduleProvider = msrn::MakeTurboModuleProvider<Microsoft::React::WebSocketTurboModule>();
 
@@ -119,7 +122,7 @@ GetOrCreateWebSocket(int64_t id, string &&url, weak_ptr<WebSocketModule::SharedS
           auto args = msrn::JSValueObject{{"id", id}, {"type", isBinary ? "binary" : "text"}};
           shared_ptr<Microsoft::React::IWebSocketModuleContentHandler> contentHandler;
           auto propId = ReactPropertyId<ReactNonAbiValue<weak_ptr<Microsoft::React::IWebSocketModuleContentHandler>>>{
-              L"BlobModule.ContentHandler"};
+              s_contentHandlerNameW};
           if (auto prop = propBag.Get(propId))
             contentHandler = prop.Value().lock();
 
@@ -171,11 +174,11 @@ WebSocketModule::WebSocketModule(winrt::Windows::Foundation::IInspectable const
 
   auto propBag = ReactPropertyBag{m_sharedState->InspectableProps.try_as<IReactPropertyBag>()};
 
-  auto proxyPropId = ReactPropertyId<ReactNonAbiValue<weak_ptr<IWebSocketModuleProxy>>>{L"WebSocketModule.Proxy"};
+  auto proxyPropId = ReactPropertyId<ReactNonAbiValue<weak_ptr<IWebSocketModuleProxy>>>{s_proxyNameW};
   auto proxy = weak_ptr<IWebSocketModuleProxy>{m_proxy};
   propBag.Set(proxyPropId, std::move(proxy));
 
-  auto statePropId = ReactPropertyId<ReactNonAbiValue<weak_ptr<SharedState>>>{L"WebSocketModule.SharedState"};
+  auto statePropId = ReactPropertyId<ReactNonAbiValue<weak_ptr<SharedState>>>{s_sharedStateNameW};
   auto state = weak_ptr<SharedState>{m_sharedState};
   propBag.Set(statePropId, std::move(state));
 }
@@ -309,10 +312,9 @@ vector<facebook::xplat::module::CxxModule::Method> WebSocketModule::getMethods()
 WebSocketModuleProxy::WebSocketModuleProxy(IInspectable const &inspectableProperties) noexcept
     : m_inspectableProps{inspectableProperties} {}
 
-void WebSocketModuleProxy::SendBinary(std::string &&base64String, int64_t id) noexcept /*override*/ {
+void WebSocketModuleProxy::SendBinary(string &&base64String, int64_t id) noexcept /*override*/ {
   auto propBag = ReactPropertyBag{m_inspectableProps.try_as<IReactPropertyBag>()};
-  auto sharedPropId =
-      ReactPropertyId<ReactNonAbiValue<weak_ptr<WebSocketModule::SharedState>>>{L"WebSocketModule.SharedState"};
+  auto sharedPropId = ReactPropertyId<ReactNonAbiValue<weak_ptr<WebSocketModule::SharedState>>>{s_sharedStateNameW};
   auto state = propBag.Get(sharedPropId).Value();
 
   weak_ptr weakWs = GetOrCreateWebSocket(id, {}, std::move(state));
@@ -353,8 +355,7 @@ shared_ptr<IWebSocketResource> WebSocketTurboModule::CreateResource(int64_t id,
   rc->SetOnMessage([id, context = m_context](size_t length, const string &message, bool isBinary) {
     auto args = msrn::JSValueObject{{"id", id}, {"type", isBinary ? "binary" : "text"}};
     shared_ptr<IWebSocketModuleContentHandler> contentHandler;
-    auto propId =
-        ReactPropertyId<ReactNonAbiValue<weak_ptr<IWebSocketModuleContentHandler>>>{L"BlobModule.ContentHandler"};
+    auto propId = ReactPropertyId<ReactNonAbiValue<weak_ptr<IWebSocketModuleContentHandler>>>{s_contentHandlerNameW};
     auto propBag = context.Properties();
     if (auto prop = propBag.Get(propId))
       contentHandler = prop.Value().lock();
@@ -396,6 +397,11 @@ shared_ptr<IWebSocketResource> WebSocketTurboModule::CreateResource(int64_t id,
 
 void WebSocketTurboModule::Initialize(msrn::ReactContext const &reactContext) noexcept {
   m_context = reactContext.Handle();
+  m_proxy = std::make_shared<WebSocketTurboModuleProxy>(m_resourceMap);
+
+  auto proxyPropId = ReactPropertyId<ReactNonAbiValue<weak_ptr<IWebSocketModuleProxy>>>{s_proxyNameW};
+  auto proxy = weak_ptr<IWebSocketModuleProxy>{m_proxy};
+  m_context.Properties().Set(proxyPropId, std::move(proxy));
 }
 
 void WebSocketTurboModule::Connect(
@@ -487,6 +493,29 @@ void WebSocketTurboModule::RemoveListeners(double /*count*/) noexcept {}
 
 #pragma endregion WebSocketTurboModule
 
+#pragma region WebSocketTurboModuleProxy
+
+WebSocketTurboModuleProxy::WebSocketTurboModuleProxy(
+    std::unordered_map<double, shared_ptr<IWebSocketResource>> &resourceMap) noexcept
+    : m_resourceMap{resourceMap} {}
+
+#pragma endregion WebSocketTurboModuleProxy
+
+void WebSocketTurboModuleProxy::SendBinary(string &&base64String, int64_t id) noexcept /*override*/
+{
+  auto rcItr = m_resourceMap.find(static_cast<double>(id));
+  if (rcItr == m_resourceMap.cend()) {
+    return;
+  }
+
+  weak_ptr<IWebSocketResource> weakRc = (*rcItr).second;
+  if (auto rc = weakRc.lock()) {
+    rc->SendBinary(std::move(base64String));
+  }
+}
+
+#pragma region WebSocketTurboModule
+
 /*extern*/ const char *GetWebSocketModuleName() noexcept {
   return s_moduleName;
 }

package/Shared/Modules/WebSocketTurboModule.h

@@ -10,6 +10,20 @@
 
 namespace Microsoft::React {
 
+class WebSocketTurboModuleProxy final : public IWebSocketModuleProxy {
+  std::unordered_map<double, std::shared_ptr<Networking::IWebSocketResource>> &m_resourceMap;
+
+ public:
+  WebSocketTurboModuleProxy(
+      std::unordered_map<double, std::shared_ptr<Networking::IWebSocketResource>> &resourceMap) noexcept;
+
+#pragma region IWebSocketModuleProxy
+
+  void SendBinary(std::string &&base64String, int64_t id) noexcept override;
+
+#pragma endregion
+};
+
 REACT_MODULE(WebSocketTurboModule, L"WebSocketModule")
 struct WebSocketTurboModule {
   using ModuleSpec = ReactNativeSpecs::WebSocketModuleSpec;
@@ -47,6 +61,11 @@ struct WebSocketTurboModule {
 
   winrt::Microsoft::ReactNative::ReactContext m_context;
   std::unordered_map<double, std::shared_ptr<Networking::IWebSocketResource>> m_resourceMap;
+
+  /// <summary>
+  /// Exposes a subset of the module's methods.
+  /// </summary>
+  std::shared_ptr<IWebSocketModuleProxy> m_proxy;
 };
 
 } // namespace Microsoft::React

package/Shared/Shared.vcxitems

@@ -45,6 +45,7 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)Modules\AsyncStorageModuleWin32.cpp">
       <ExcludedFromBuild Condition="'$(ApplicationType)' == ''">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)Modules\BlobCollector.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)Modules\BlobModule.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)Modules\CxxModuleUtilities.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)Modules\ExceptionsManagerModule.cpp" />
@@ -99,6 +100,7 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)JSI\V8RuntimeHolder.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)JSI\RuntimeHolder.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)JSI\ScriptStore.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)Modules\BlobCollector.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)Modules\BlobModule.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)Modules\CxxModuleUtilities.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)Modules\FileReaderModule.h" />

package/Shared/Shared.vcxitems.filters

@@ -158,6 +158,9 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)JSI\V8RuntimeHolder.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)SafeLoadLibrary.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)V8JSIRuntimeHolder.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)Modules\BlobCollector.cpp">
+      <Filter>Source Files\Modules</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source Files">
@@ -487,6 +490,9 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)JSI\V8RuntimeHolder.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)SafeLoadLibrary.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)V8JSIRuntimeHolder.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)Modules\BlobCollector.h">
+      <Filter>Header Files\Modules</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)tracing\rnw.wprp">

package/package.json

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