react-native-windows 0.72.14 → 0.72.16

package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp

@@ -567,6 +567,9 @@ void ReactInstanceWin::Initialize() noexcept {
             auto omitNetCxxPropName = ReactPropertyBagHelper::GetName(nullptr, L"OmitNetworkingCxxModules");
             auto omitNetCxxPropValue = m_options.Properties.Get(omitNetCxxPropName);
             devSettings->omitNetworkingCxxModules = winrt::unbox_value_or(omitNetCxxPropValue, false);
+            auto useWebSocketTurboModulePropName = ReactPropertyBagHelper::GetName(nullptr, L"UseWebSocketTurboModule");
+            auto useWebSocketTurboModulePropValue = m_options.Properties.Get(useWebSocketTurboModulePropName);
+            devSettings->useWebSocketTurboModule = winrt::unbox_value_or(useWebSocketTurboModulePropValue, false);
             auto bundleRootPath = devSettings->bundleRootPath;
             auto instanceWrapper = facebook::react::CreateReactInstance(
                 std::shared_ptr<facebook::react::Instance>(strongThis->m_instance.Load()),

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.72.14</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.72.16</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>72</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>14</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>16</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>9cf08d5f6bc6d07b1490a6ead29994a7e14ad1ef</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>36fc7ba40eb0f163dc83c652f808195fbc4b25c0</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/Shared/DevSettings.h

@@ -102,6 +102,9 @@ struct DevSettings {
 
   // Transitory. Used to indicate whether or not to load networking types in the default Cxx module registry.
   bool omitNetworkingCxxModules{false};
+
+  // OC:8368383 - Memory leak under investigation.
+  bool useWebSocketTurboModule{false};
 };
 
 } // namespace react

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/OInstance.cpp

@@ -556,14 +556,18 @@ std::vector<std::unique_ptr<NativeModule>> InstanceImpl::GetDefaultNativeModules
   // If this code is enabled, we will have unused module instances.
   // Also, MSRN has a different property bag mechanism incompatible with this method's transitionalProps variable.
 #if (defined(_MSC_VER) && !defined(WINRT))
-  // Applications using the Windows ABI feature should loade the networking TurboModule variants instead.
-  if (!m_devSettings->omitNetworkingCxxModules) {
+
+  // OC:8368383 - Memory leak under investigation.
+  if (!m_devSettings->useWebSocketTurboModule) {
     modules.push_back(std::make_unique<CxxNativeModule>(
         m_innerInstance,
         Microsoft::React::GetWebSocketModuleName(),
         [transitionalProps]() { return Microsoft::React::CreateWebSocketModule(transitionalProps); },
         nativeQueue));
+  }
 
+  // Applications using the Windows ABI feature should loade the networking TurboModule variants instead.
+  if (!m_devSettings->omitNetworkingCxxModules) {
     // Use in case the host app provides its a non-Blob-compatilbe HTTP module.
     if (!Microsoft::React::GetRuntimeOptionBool("Blob.DisableModule")) {
       modules.push_back(std::make_unique<CxxNativeModule>(

package/Shared/Shared.vcxitems

@@ -167,6 +167,7 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)LayoutAnimation.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)Logging.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)MemoryMappedBuffer.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)Modules\BlobCollector.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)Modules\BlobModule.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)Modules\CxxModuleUtilities.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)Modules\ExceptionsManagerModule.cpp" />
@@ -301,6 +302,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

@@ -270,6 +270,11 @@
     <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>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source Files">
@@ -741,6 +746,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.72.14",
+  "version": "0.72.16",
   "license": "MIT",
   "repository": {
     "type": "git",