react-native-windows 0.71.24 → 0.71.25

package/ReactCommon/ReactCommon.vcxproj

@@ -106,6 +106,7 @@
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\cxxreact\SystraceSection.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\jsiexecutor\jsireact\JSIExecutor.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\jsiexecutor\jsireact\JSINativeModules.h" />
+    <ClInclude Include="$(ReactNativeDir)\ReactCommon\jsinspector\InspectorInterfaces.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\logger\react_native_log.h" />
     <ClInclude Include="$(YogaDir)\yoga\YGEnums.h" />
     <ClInclude Include="$(YogaDir)\yoga\YGMacros.h" />
@@ -127,6 +128,7 @@
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsi\jsi\JSIDynamic.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsiexecutor\jsireact\JSIExecutor.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsiexecutor\jsireact\JSINativeModules.cpp" />
+    <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector\InspectorInterfaces.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\logger\react_native_log.cpp" />
     <CLCompile Include="$(ReactNativeDir)\ReactCommon\reactperflogger\reactperflogger\BridgeNativeModulePerfLogger.cpp" />
     <ClCompile Include="$(YogaDir)\yoga\log.cpp" />
@@ -178,6 +180,52 @@
   <ItemGroup>
     <PackageReference Include="boost" Version="1.76.0.0" />
   </ItemGroup>
+  <PropertyGroup>
+    <NodeApiJsiZipDir>$(NodeApiJsiDir)..\.node-api-jsi-zip</NodeApiJsiZipDir>
+    <NodeApiJsiZipFile>$(NodeApiJsiZipDir)\node-api-jsi-$(NodeApiJsiCommitHash).zip</NodeApiJsiZipFile>
+    <CGManifestFile>$(MSBuildThisFileDirectory)cgmanifest.json</CGManifestFile>
+  </PropertyGroup>
+  <Target Name="DownloadNodeApiJsi" BeforeTargets="PrepareForBuild" Inputs="$(NodeApiJsiZipFile)" Outputs="$(NodeApiJsiZipFile)">
+    <Message Text="Downloading node-api-jsi..." Importance="High" />
+    <DownloadFile
+      SourceUrl="https://github.com/microsoft/node-api-jsi/archive/$(NodeApiJsiCommitHash).zip"
+      DestinationFileName="$(NodeApiJsiZipFile)"
+      DestinationFolder="$(NodeApiJsiZipDir)"
+      Retries="10" />
+  </Target>
+  <Target Name="UnzipNodeApiJsi" BeforeTargets="PrepareForBuild" DependsOnTargets="DownloadNodeApiJsi">
+    <Message Text="Unzipping node-api-jsi to $([MSBuild]::NormalizePath($(NodeApiJsiDir)..))." Importance="High"
+      Condition="!Exists('$(NodeApiJsiDir)src\NodeApiJsiRuntime.h')" />
+    <Unzip
+      Condition="!Exists('$(NodeApiJsiDir)src\NodeApiJsiRuntime.h')"
+      SourceFiles="$(NodeApiJsiZipFile)"
+      DestinationFolder="$([MSBuild]::NormalizePath($(NodeApiJsiDir)..))"
+      OverwriteReadOnlyFiles="true" />
+  </Target>
+  <Target Name="WriteCGManifest" BeforeTargets="PrepareForBuild" DependsOnTargets="DownloadNodeApiJsi" Inputs="$(NodeApiJsiZipFile)" Outputs="$(CGManifestFile)">
+    <PropertyGroup>
+      <CGManifestText>{
+    "$schema": "https://json.schemastore.org/component-detection-manifest.json",
+    "Registrations": [
+        {
+            "Component": {
+                "Type": "git",
+                "Git": {
+                  "RepositoryUrl": "https://github.com/microsoft/node-api-jsi",
+                  "CommitHash": "$(NodeApiJsiCommitHash)"
+                }
+            },
+            "DevelopmentDependency": false
+        }
+    ]
+}</CGManifestText>
+    </PropertyGroup>
+    <Message Text="Generating $(CGManifestFile)." Importance="High" />
+    <WriteLinesToFile
+      File="$(CGManifestFile)"
+      Overwrite="true"
+      Lines="$(CGManifestText)" />
+  </Target>
   <Target Name="EnsureNodeModuleBuildImports" BeforeTargets="PrepareForBuild">
     <Error Condition="!Exists('$(ReactNativeDir)')" Text="This project references code in the node_modules folder that is missing on this computer.  Use `yarn install` to download them." />
     <Error Condition="!Exists('$(YogaDir)')" Text="This project references code in the node_modules folder that is missing on this computer.  Use `yarn install` to download them." />
@@ -187,7 +235,11 @@
   </ItemGroup>
   <Target Name="Deploy" />
   <!-- Reenable this task if we need to temporarily replace any folly files for fixes, while we wait for PRs to land in folly -->
-  <Target Name="ApplyReactCommonTemporaryPatch" BeforeTargets="PrepareForBuild">
+  <Target Name="ApplyReactCommonTemporaryPatch" BeforeTargets="PrepareForBuild" DependsOnTargets="UnzipNodeApiJsi">
+    <ItemGroup>
+      <NodeApiJsiFiles Include="$([MSBuild]::NormalizePath($(NodeApiJsiDir)))\jsi\**\*.*" />
+    </ItemGroup>
+    <Copy DestinationFiles="@(NodeApiJsiFiles->'$(ReactNativeDir)\ReactCommon\jsi\%(RecursiveDir)%(Filename)%(Extension)')" SourceFiles="@(NodeApiJsiFiles)" />
     <Copy DestinationFiles="@(TemporaryReactCommonPatchFiles->'$(ReactNativeDir)\ReactCommon\%(RecursiveDir)%(Filename)%(Extension)')" SourceFiles="@(TemporaryReactCommonPatchFiles)" />
   </Target>
 </Project>

package/ReactCommon/cgmanifest.json

@@ -0,0 +1,15 @@
+{
+    "$schema": "https://json.schemastore.org/component-detection-manifest.json",
+    "Registrations": [
+        {
+            "Component": {
+                "Type": "git",
+                "Git": {
+                  "RepositoryUrl": "https://github.com/microsoft/node-api-jsi",
+                  "CommitHash": "53b897b03c1c7e57c3372acc6234447a44e150d6"
+                }
+            },
+            "DevelopmentDependency": false
+        }
+    ]
+}

package/Scripts/Tfs/Layout-MSRN-Headers.ps1

@@ -15,6 +15,23 @@ Write-Host "Destination root: [$TargetRoot]"
 Write-Host "React Native root: [$ReactNativeRoot]"
 Write-Host "ReactCommon Override root: [$ReactCommonOverrideRoot]"
 
+[xml]$props = gc $PSScriptRoot\..\..\Directory.Build.props
+[string] $NodeApiJsiCommitHash = $props.Project.PropertyGroup.NodeApiJsiCommitHash;
+$NodeApiJsiCommitHash = $NodeApiJsiCommitHash.Trim()
+$NodeApiJsiRoot = "$SourceRoot\node_modules\.node-api-jsi\node-api-jsi-${NodeApiJsiCommitHash}";
+Write-Host "Node-API JSI root: [$NodeApiJsiRoot]"
+
+# Download Node-API JSI if running on a machine which hasn't run native build logic to acquire it
+if (!(Test-Path $NodeApiJsiRoot)) {
+	Write-Host "Downloading Node-API JSI $NodeApiJsiCommitHash"
+	$NodeApiJsiZip = "$SourceRoot\node_modules\.node-api-jsi\node-api-jsi-${NodeApiJsiCommitHash}.zip"
+	$NodeApiJsiDest = "$SourceRoot\node_modules\.node-api-jsi"
+
+	New-Item $NodeApiJsiRoot -ItemType Directory
+	Invoke-RestMethod -Uri "https://github.com/microsoft/node-api-jsi/archive/${NodeApiJsiCommitHash}.zip" -OutFile $NodeApiJsiZip
+	Expand-Archive -LiteralPath $NodeApiJsiZip -DestinationPath $NodeApiJsiDest
+}
+
 md -Force $TargetRoot
 
 $patterns = $Extensions| ForEach-Object {"*.$_"}
@@ -39,6 +56,25 @@ Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\jsi\jsi\jsi.h -Destination $
 Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\jsi\jsi\jsi-inl.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\jsi\
 Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\jsi\jsi\threadsafe.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\jsi\
 
+# Microsoft.ReactNative.CXX project Node-API files
+New-Item $TargetRoot\Microsoft.ReactNative.Cxx\node-api -ItemType Directory -Force
+Copy-Item -Force -Path $NodeApiJsiRoot\node-api\js_native_api.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\node-api\
+Copy-Item -Force -Path $NodeApiJsiRoot\node-api\js_native_api_types.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\node-api\
+Copy-Item -Force -Path $NodeApiJsiRoot\node-api\js_runtime_api.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\node-api\
+
+# Microsoft.ReactNative.CXX project Node-API JSI files
+New-Item $TargetRoot\Microsoft.ReactNative.Cxx\ApiLoaders -ItemType Directory -Force
+Copy-Item -Force -Path $NodeApiJsiRoot\src\ApiLoaders\JSRuntimeApi.cpp -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ApiLoaders\
+Copy-Item -Force -Path $NodeApiJsiRoot\src\ApiLoaders\JSRuntimeApi.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ApiLoaders\
+Copy-Item -Force -Path $NodeApiJsiRoot\src\ApiLoaders\JSRuntimeApi.inc -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ApiLoaders\
+Copy-Item -Force -Path $NodeApiJsiRoot\src\ApiLoaders\NodeApi.cpp -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ApiLoaders\
+Copy-Item -Force -Path $NodeApiJsiRoot\src\ApiLoaders\NodeApi.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ApiLoaders\
+Copy-Item -Force -Path $NodeApiJsiRoot\src\ApiLoaders\NodeApi.inc -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ApiLoaders\
+Copy-Item -Force -Path $NodeApiJsiRoot\src\ApiLoaders\NodeApi_posix.cpp -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ApiLoaders\
+Copy-Item -Force -Path $NodeApiJsiRoot\src\ApiLoaders\NodeApi_win.cpp -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ApiLoaders\
+Copy-Item -Force -Path $NodeApiJsiRoot\src\NodeApiJsiRuntime.cpp -Destination $TargetRoot\Microsoft.ReactNative.Cxx\
+Copy-Item -Force -Path $NodeApiJsiRoot\src\NodeApiJsiRuntime.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\
+
 # Microsoft.ReactNative.CXX project TurboModule files
 New-Item -ItemType Directory -Path $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon -Force
 Copy-Item -Force -Path $ReactNativeRoot\ReactCommon\callinvoker\ReactCommon\CallInvoker.h -Destination $TargetRoot\Microsoft.ReactNative.Cxx\ReactCommon\

package/Shared/BaseFileReaderResource.cpp

@@ -0,0 +1,95 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#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>
+
+// Windows API
+#include <winrt/base.h>
+
+using std::function;
+using std::shared_ptr;
+using std::string;
+
+namespace Microsoft::React {
+
+#pragma region BaseFileReaderResource
+
+BaseFileReaderResource::BaseFileReaderResource(std::weak_ptr<IBlobPersistor> weakBlobPersistor) noexcept
+    : m_weakBlobPersistor{weakBlobPersistor} {}
+
+#pragma region IFileReaderResource
+
+void BaseFileReaderResource::ReadAsText(
+    string &&blobId,
+    int64_t offset,
+    int64_t size,
+    string &&encoding,
+    function<void(string &&)> &&resolver,
+    function<void(string &&)> &&rejecter) noexcept /*override*/ {
+  auto persistor = m_weakBlobPersistor.lock();
+  if (!persistor) {
+    return resolver("Could not find Blob persistor");
+  }
+
+  winrt::array_view<uint8_t const> bytes;
+  try {
+    bytes = persistor->ResolveMessage(std::move(blobId), offset, size);
+  } catch (const std::exception &e) {
+    return rejecter(e.what());
+  }
+
+  // #9982 - Handle non-UTF8 encodings
+  //         See https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/nio/charset/Charset.html
+  auto result = string{bytes.cbegin(), bytes.cend()};
+
+  resolver(std::move(result));
+}
+
+void BaseFileReaderResource::ReadAsDataUrl(
+    string &&blobId,
+    int64_t offset,
+    int64_t size,
+    string &&type,
+    function<void(string &&)> &&resolver,
+    function<void(string &&)> &&rejecter) noexcept /*override*/ {
+  auto persistor = m_weakBlobPersistor.lock();
+  if (!persistor) {
+    return rejecter("Could not find Blob persistor");
+  }
+
+  winrt::array_view<uint8_t const> bytes;
+  try {
+    bytes = persistor->ResolveMessage(std::move(blobId), offset, size);
+  } catch (const std::exception &e) {
+    return rejecter(e.what());
+  }
+
+  auto result = string{"data:"};
+  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();
+
+  resolver(std::move(result));
+}
+
+/*static*/ shared_ptr<IFileReaderResource> IFileReaderResource::Make(
+    std::weak_ptr<IBlobPersistor> weakBlobPersistor) noexcept {
+  return std::make_shared<BaseFileReaderResource>(weakBlobPersistor);
+}
+
+#pragma endregion IFileReaderResource
+
+#pragma endregion BaseFileReaderResource
+
+} // namespace Microsoft::React

package/Shared/BaseFileReaderResource.h

@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include "IFileReaderResource.h"
+
+// Standard Library
+#include <memory>
+
+namespace Microsoft::React {
+
+class BaseFileReaderResource : public IFileReaderResource, public std::enable_shared_from_this<BaseFileReaderResource> {
+ protected:
+  std::weak_ptr<IBlobPersistor> m_weakBlobPersistor;
+
+ public:
+  BaseFileReaderResource(std::weak_ptr<IBlobPersistor> weakBlobPersistor) noexcept;
+
+#pragma region IFileReaderResource
+
+  void ReadAsText(
+      std::string &&blobId,
+      int64_t offset,
+      int64_t size,
+      std::string &&encoding,
+      std::function<void(std::string &&)> &&resolver,
+      std::function<void(std::string &&)> &&rejecter) noexcept override;
+
+  void ReadAsDataUrl(
+      std::string &&blobId,
+      int64_t offset,
+      int64_t size,
+      std::string &&type,
+      std::function<void(std::string &&)> &&resolver,
+      std::function<void(std::string &&)> &&rejecter) noexcept override;
+
+#pragma endregion IFileReaderResource
+};
+
+} // namespace Microsoft::React

package/Shared/CreateModules.h

@@ -5,7 +5,6 @@
 
 // React Native
 #include <cxxreact/CxxModule.h>
-#include <smartPtr/cntPtr.h>
 
 // Windows API
 #include <winrt/Windows.Foundation.h>
@@ -14,12 +13,16 @@
 #include <memory>
 
 // Forward declarations. Desktop projects can not access <React.h>
+namespace winrt::Microsoft::ReactNative {
+struct ReactContext;
+struct ReactModuleProvider;
+} // namespace winrt::Microsoft::ReactNative
+
 namespace Mso::React {
 struct IReactContext;
 }
 
-namespace facebook {
-namespace react {
+namespace facebook::react {
 
 class MessageQueueThread;
 
@@ -29,11 +32,12 @@ class MessageQueueThread;
 extern std::unique_ptr<facebook::xplat::module::CxxModule> CreateTimingModule(
     const std::shared_ptr<facebook::react::MessageQueueThread> &nativeThread) noexcept;
 
-} // namespace react
-} // namespace facebook
+} // namespace facebook::react
 
 namespace Microsoft::React {
 
+#pragma region CxxModules
+
 extern const char *GetHttpModuleName() noexcept;
 extern std::unique_ptr<facebook::xplat::module::CxxModule> CreateHttpModule(
     winrt::Windows::Foundation::IInspectable const &inspectableProperties) noexcept;
@@ -50,4 +54,22 @@ extern const char *GetFileReaderModuleName() noexcept;
 extern std::unique_ptr<facebook::xplat::module::CxxModule> CreateFileReaderModule(
     winrt::Windows::Foundation::IInspectable const &inspectableProperties) noexcept;
 
+#pragma endregion CxxModules
+
+#pragma region TurboModules
+
+extern const wchar_t *GetBlobTurboModuleName() noexcept;
+extern const winrt::Microsoft::ReactNative::ReactModuleProvider &GetBlobModuleProvider() noexcept;
+
+extern const wchar_t *GetHttpTurboModuleName() noexcept;
+extern const winrt::Microsoft::ReactNative::ReactModuleProvider &GetHttpModuleProvider() noexcept;
+
+extern const wchar_t *GetFileReaderTurboModuleName() noexcept;
+extern const winrt::Microsoft::ReactNative::ReactModuleProvider &GetFileReaderModuleProvider() noexcept;
+
+extern const wchar_t *GetWebSocketTurboModuleName() noexcept;
+extern const winrt::Microsoft::ReactNative::ReactModuleProvider &GetWebSocketModuleProvider() noexcept;
+
+#pragma endregion TurboModules
+
 } // namespace Microsoft::React

package/Shared/DevSupportManager.cpp

@@ -21,10 +21,8 @@
 #include <winrt/Windows.Web.Http.Headers.h>
 #include <winrt/Windows.Web.Http.h>
 
-#ifdef HERMES_ENABLE_DEBUGGER
 #include <winrt/Windows.ApplicationModel.Activation.h>
 #include <winrt/Windows.Networking.Connectivity.h>
-#endif
 
 #pragma warning(push)
 #pragma warning(disable : 4068 4251 4101 4804 4309)
@@ -243,7 +241,6 @@ void DevSupportManager::StopPollingLiveReload() {
 void DevSupportManager::EnsureHermesInspector(
     [[maybe_unused]] const std::string &packagerHost,
     [[maybe_unused]] const uint16_t packagerPort) noexcept {
-#ifdef HERMES_ENABLE_DEBUGGER
   static std::once_flag once;
   std::call_once(once, [this, &packagerHost, packagerPort]() {
     // TODO: should we use the bundleAppId as the app param if available?
@@ -266,14 +263,10 @@ void DevSupportManager::EnsureHermesInspector(
         m_BundleStatusProvider);
     m_inspectorPackagerConnection->connectAsync();
   });
-
-#endif
 }
 
-void DevSupportManager::UpdateBundleStatus(bool isLastDownloadSucess, int64_t updateTimestamp) noexcept {
-#ifdef HERMES_ENABLE_DEBUGGER
-  m_BundleStatusProvider->updateBundleStatus(isLastDownloadSucess, updateTimestamp);
-#endif
+void DevSupportManager::UpdateBundleStatus(bool isLastDownloadSuccess, int64_t updateTimestamp) noexcept {
+  m_BundleStatusProvider->updateBundleStatus(isLastDownloadSuccess, updateTimestamp);
 }
 
 std::pair<std::string, bool> GetJavaScriptFromServer(

package/Shared/DevSupportManager.h

@@ -14,9 +14,7 @@
 #include <memory>
 #include <string>
 
-#if defined(HERMES_ENABLE_DEBUGGER)
 #include <InspectorPackagerConnection.h>
-#endif
 
 namespace facebook {
 namespace react {
@@ -57,7 +55,6 @@ class DevSupportManager final : public facebook::react::IDevSupportManager {
  private:
   std::atomic_bool m_cancellation_token;
 
-#if defined(HERMES_ENABLE_DEBUGGER)
   std::shared_ptr<InspectorPackagerConnection> m_inspectorPackagerConnection;
 
   struct BundleStatusProvider : public InspectorPackagerConnection::IBundleStatusProvider {
@@ -65,8 +62,8 @@ class DevSupportManager final : public facebook::react::IDevSupportManager {
       return m_bundleStatus;
     }
 
-    void updateBundleStatus(bool isLastDownloadSucess, int64_t updateTimestamp) {
-      m_bundleStatus.m_isLastDownloadSucess = isLastDownloadSucess;
+    void updateBundleStatus(bool isLastDownloadSuccess, int64_t updateTimestamp) {
+      m_bundleStatus.m_isLastDownloadSuccess = isLastDownloadSuccess;
       m_bundleStatus.m_updateTimestamp = updateTimestamp;
     }
 
@@ -74,7 +71,6 @@ class DevSupportManager final : public facebook::react::IDevSupportManager {
     InspectorPackagerConnection::BundleStatus m_bundleStatus;
   };
   std::shared_ptr<BundleStatusProvider> m_BundleStatusProvider = std::make_shared<BundleStatusProvider>();
-#endif
 };
 
 } // namespace Microsoft::ReactNative