react-native-windows 0.66.17 → 0.66.20

package/CHANGELOG.json

@@ -2,7 +2,58 @@
   "name": "react-native-windows",
   "entries": [
     {
-      "date": "Mon, 25 Apr 2022 15:09:26 GMT",
+      "date": "Fri, 27 May 2022 16:26:16 GMT",
+      "tag": "react-native-windows_v0.66.20",
+      "version": "0.66.20",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Fix RuntimeOptions for RNW Desktop",
+            "author": "vmorozov@microsoft.com",
+            "commit": "927b021179ee739610d6ddc81624f30adb4a2d7b",
+            "package": "react-native-windows"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 24 May 2022 21:08:55 GMT",
+      "tag": "react-native-windows_v0.66.19",
+      "version": "0.66.19",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Implement Blob module (#9352)",
+            "author": "julio@rochsquadron.net",
+            "commit": "4b1eb4196ab7be2e266da754637a00a252f3745f",
+            "package": "react-native-windows"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 02 May 2022 15:10:52 GMT",
+      "tag": "react-native-windows_v0.66.18",
+      "version": "0.66.18",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Fix clang-check errors in NativeModules.h",
+            "author": "53799235+ZihanChen-MSFT@users.noreply.github.com",
+            "commit": "94d54d33e317332fa9145129d228a8e323f9b948",
+            "package": "react-native-windows"
+          },
+          {
+            "comment": "Handle abrupt WebSocket connection interruption (#9829)",
+            "author": "julio.rocha@microsoft.com",
+            "commit": "e2571e1d39d3fef4d4ad328a1662ab7f30fec633",
+            "package": "react-native-windows"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 25 Apr 2022 15:09:39 GMT",
       "tag": "react-native-windows_v0.66.17",
       "version": "0.66.17",
       "comments": {

package/CHANGELOG.md

@@ -1,18 +1,43 @@
 # Change Log - react-native-windows
 
-This log was last generated on Mon, 25 Apr 2022 15:09:26 GMT and should not be manually modified.
+This log was last generated on Fri, 27 May 2022 16:26:16 GMT and should not be manually modified.
 
 <!-- Start content -->
 
-## 0.66.17
+## 0.66.20
 
-Mon, 25 Apr 2022 15:09:26 GMT
+Fri, 27 May 2022 16:26:16 GMT
 
 ### Patches
 
-- Fix JSI for Node-API and update V8 to 0.65.11 (vmorozov@microsoft.com)
-- Fix Sequential DispatchQueue deadlock on shutdown (vmorozov@microsoft.com)
+- Fix RuntimeOptions for RNW Desktop (vmorozov@microsoft.com)
 
+## 0.66.19
+
+Tue, 24 May 2022 21:08:55 GMT
+
+### Patches
+
+- Implement Blob module (#9352) (julio@rochsquadron.net)
+
+## 0.66.18
+
+Mon, 02 May 2022 15:10:52 GMT
+
+### Patches
+
+- Fix clang-check errors in NativeModules.h (53799235+ZihanChen-MSFT@users.noreply.github.com)
+- Handle abrupt WebSocket connection interruption (#9829) (julio.rocha@microsoft.com)
+
+## 0.66.17
+
+Mon, 25 Apr 2022 15:09:39 GMT
+
+### Patches
+
+- Fix JSI for Node-API and update V8 to 0.65.11 (vmorozov@microsoft.com)
+- Fix Sequential DispatchQueue deadlock on shutdown (vmorozov@microsoft.com)
+
 ## 0.66.16
 
 Mon, 04 Apr 2022 15:13:07 GMT

package/Chakra/ChakraHelpers.cpp

@@ -3,7 +3,6 @@
 
 #include "pch.h"
 
-#include <RuntimeOptions.h>
 #include "ChakraHelpers.h"
 #include "ChakraUtils.h"
 #include "ChakraValue.h"

package/Libraries/Network/RCTNetworkingWinShared.js

@@ -61,6 +61,11 @@ type RCTNetworkingEventDefinitions = $ReadOnly<{
   ],
 }>;
 
+let _requestId = 1;
+function generateRequestId(): number {
+  return _requestId++;
+}
+
 const RCTNetworking = {
   addListener<K: $Keys<RCTNetworkingEventDefinitions>>(
     eventType: K,
@@ -82,11 +87,13 @@ const RCTNetworking = {
     callback: (requestId: number) => void,
     withCredentials: boolean,
   ) {
+    const requestId = generateRequestId();
     const body = convertRequestBody(data);
     RCTNetworkingNative.sendRequest(
       {
         method,
         url,
+        requestId,
         data: {...body, trackingName},
         headers,
         responseType,

package/Microsoft.ReactNative/Base/CoreNativeModules.cpp

@@ -14,7 +14,6 @@
 #include <Modules/ImageViewManagerModule.h>
 #include <Modules/LinkingManagerModule.h>
 #include <Modules/NativeUIManager.h>
-#include <Modules/NetworkingModule.h>
 #include <Modules/PaperUIManagerModule.h>
 #include <Threading/MessageQueueThreadFactory.h>
 
@@ -51,8 +50,8 @@ std::vector<facebook::react::NativeModuleDescription> GetCoreModules(
   std::vector<facebook::react::NativeModuleDescription> modules;
 
   modules.emplace_back(
-      Microsoft::React::NetworkingModule::Name,
-      []() { return std::make_unique<Microsoft::React::NetworkingModule>(); },
+      "Networking",
+      [props = context->Properties()]() { return Microsoft::React::CreateHttpModule(props); },
       jsMessageQueue);
 
   modules.emplace_back(

package/Microsoft.ReactNative/Modules/CreateModules.cpp

@@ -2,10 +2,10 @@
 // Licensed under the MIT License.
 
 #include <CreateModules.h>
+#include <Networking/WinRTWebSocketResource.h>
 #include <QuirkSettings.h>
 #include <React.h>
 #include <ReactPropertyBag.h>
-#include <WinRTWebSocketResource.h>
 
 // React Native
 #include <cxxreact/CxxModule.h>
@@ -17,11 +17,11 @@ using winrt::Microsoft::ReactNative::ReactPropertyBag;
 using winrt::Microsoft::ReactNative::ReactPropertyId;
 using winrt::Microsoft::ReactNative::implementation::QuirkSettings;
 
-namespace Microsoft::React {
+namespace Microsoft::React::Networking {
 
 std::shared_ptr<IWebSocketResource> IWebSocketResource::Make() {
   std::vector<winrt::Windows::Security::Cryptography::Certificates::ChainValidationResult> certExceptions;
   return std::make_shared<WinRTWebSocketResource>(std::move(certExceptions));
 }
 
-} // namespace Microsoft::React
+} // namespace Microsoft::React::Networking

package/Microsoft.ReactNative.Cxx/NativeModules.h

@@ -1011,7 +1011,7 @@ template <class TModule, int I, class TMethodSpec>
 struct ReactMethodVerifier {
   static constexpr bool Verify() noexcept {
     ReactMethodVerifier verifier{};
-    ReactMemberInfoIterator<TModule>{}.GetMemberInfo<I>(verifier);
+    ReactMemberInfoIterator<TModule>{}.template GetMemberInfo<I>(verifier);
     return verifier.m_result;
   }
 
@@ -1029,7 +1029,7 @@ template <class TModule, int I, class TMethodSpec>
 struct ReactSyncMethodVerifier {
   static constexpr bool Verify() noexcept {
     ReactSyncMethodVerifier verifier{};
-    ReactMemberInfoIterator<TModule>{}.GetMemberInfo<I>(verifier);
+    ReactMemberInfoIterator<TModule>{}.template GetMemberInfo<I>(verifier);
     return verifier.m_result;
   }
 

package/Scripts/OfficeReact.Win32.nuspec

@@ -50,13 +50,13 @@
     <file src="$nugetroot$\inc\Shared\IReactRootView.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\IRedBoxHandler.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\IUIManager.h" target="inc"/>
-    <file src="$nugetroot$\inc\Shared\IWebSocketResource.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\JSBigAbiString.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\LayoutAnimation.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\Logging.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\MemoryMappedBuffer.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\Modules\I18nModule.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\NativeModuleProvider.h" target="inc"/>
+    <file src="$nugetroot$\inc\Shared\Networking\IWebSocketResource.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\RuntimeOptions.h" target="inc"/>
     <file src="$nugetroot$\inc\ReactWin32\ShadowNode.h" target="inc"/>
     <file src="$nugetroot$\inc\Shared\Tracing.h" target="inc"/>

package/Shared/BaseScriptStoreImpl.cpp

@@ -6,7 +6,7 @@
 #include "BaseScriptStoreImpl.h"
 #include "MemoryMappedBuffer.h"
 
-#include <RuntimeOptions.h>
+#include <CppRuntimeOptions.h>
 
 // C++/WinRT
 #include <winrt/base.h>

package/Shared/CppRuntimeOptions.h

@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include <string>
+
+namespace Microsoft::React {
+
+/// <summary>
+/// Sets a global boolean value identified by an arbitrary string.
+/// </summary>
+/// <param name="name">Global key</param>
+void __cdecl SetRuntimeOptionBool(std::string &&name, bool value) noexcept;
+
+/// <summary>
+/// Sets a global signed integer value identified by an arbitrary string.
+/// </summary>
+/// <param name="name">Global boolean key</param>
+void __cdecl SetRuntimeOptionInt(std::string &&name, std::int32_t value) noexcept;
+
+/// <summary>
+/// Sets a global string value identified by an arbitrary string.
+/// </summary>
+/// <param name="name">Global string key</param>
+/// <param name="value">String value to store</param>
+void __cdecl SetRuntimeOptionString(std::string &&name, std::string &&value) noexcept;
+
+/// <summary>
+/// Retrieves a global boolean value for the given key.
+/// </summary>
+/// <param name="name">Global boolean key</param>
+/// <returns>Value stored for the given key, or false if the entry doesn't exist (default)</returns>
+const bool __cdecl GetRuntimeOptionBool(const std::string &name) noexcept;
+
+/// <summary>
+/// Retrieves a global boolean value for the given key.
+/// </summary>
+/// <param name="name">Global key</param>
+/// <returns>Value stored for the given key, or 0 if the entry doesn't exist (default)</returns>
+const std::int32_t __cdecl GetRuntimeOptionInt(const std::string &name) noexcept;
+
+/// <summary>
+/// Retrieves a global string value for the given key.
+/// </summary>
+/// <param name="name">Global key</param>
+/// <returns>Value stored for the given key, or an empty string if the entry doesn't exist (default)</returns>
+const std::string __cdecl GetRuntimeOptionString(const std::string &name) noexcept;
+
+} // namespace Microsoft::React

package/Shared/CreateModules.h

@@ -3,9 +3,14 @@
 
 #pragma once
 
+// React Native
 #include <cxxreact/CxxModule.h>
 #include <smartPtr/cntPtr.h>
 
+// Windows API
+#include <winrt/Windows.Foundation.h>
+
+// Standard Library
 #include <memory>
 
 // Forward declarations. Desktop projects can not access <React.h>
@@ -32,6 +37,20 @@ extern std::unique_ptr<facebook::xplat::module::CxxModule> CreateAsyncStorageMod
 
 namespace Microsoft::React {
 
-extern std::unique_ptr<facebook::xplat::module::CxxModule> CreateWebSocketModule() noexcept;
+extern const char *GetHttpModuleName() noexcept;
+extern std::unique_ptr<facebook::xplat::module::CxxModule> CreateHttpModule(
+    winrt::Windows::Foundation::IInspectable const &inspectableProperties) noexcept;
+
+extern const char *GetWebSocketModuleName() noexcept;
+extern std::unique_ptr<facebook::xplat::module::CxxModule> CreateWebSocketModule(
+    winrt::Windows::Foundation::IInspectable const &inspectableProperties) noexcept;
+
+extern const char *GetBlobModuleName() noexcept;
+extern std::unique_ptr<facebook::xplat::module::CxxModule> CreateBlobModule(
+    winrt::Windows::Foundation::IInspectable const &inspectableProperties) noexcept;
+
+extern const char *GetFileReaderModuleName() noexcept;
+extern std::unique_ptr<facebook::xplat::module::CxxModule> CreateFileReaderModule(
+    winrt::Windows::Foundation::IInspectable const &inspectableProperties) noexcept;
 
 } // namespace Microsoft::React

package/Shared/InspectorPackagerConnection.cpp

@@ -196,7 +196,8 @@ InspectorPackagerConnection::InspectorPackagerConnection(
 winrt::fire_and_forget InspectorPackagerConnection::disconnectAsync() {
   co_await winrt::resume_background();
   std::string reason("Explicit close");
-  m_packagerWebSocketConnection->Close(Microsoft::React::WinRTWebSocketResource::CloseCode::GoingAway, reason);
+  m_packagerWebSocketConnection->Close(
+      Microsoft::React::Networking::WinRTWebSocketResource::CloseCode::GoingAway, reason);
   co_return;
 }
 
@@ -204,9 +205,10 @@ winrt::fire_and_forget InspectorPackagerConnection::connectAsync() {
   co_await winrt::resume_background();
 
   std::vector<winrt::Windows::Security::Cryptography::Certificates::ChainValidationResult> certExceptions;
-  m_packagerWebSocketConnection = std::make_shared<Microsoft::React::WinRTWebSocketResource>(std::move(certExceptions));
+  m_packagerWebSocketConnection =
+      std::make_shared<Microsoft::React::Networking::WinRTWebSocketResource>(std::move(certExceptions));
 
-  m_packagerWebSocketConnection->SetOnError([](const Microsoft::React::IWebSocketResource::Error &err) {
+  m_packagerWebSocketConnection->SetOnError([](const Microsoft::React::Networking::IWebSocketResource::Error &err) {
     facebook::react::tracing::error(err.Message.c_str());
   });
 
@@ -267,8 +269,8 @@ winrt::fire_and_forget InspectorPackagerConnection::connectAsync() {
         }
       });
 
-  Microsoft::React::IWebSocketResource::Protocols protocols;
-  Microsoft::React::IWebSocketResource::Options options;
+  Microsoft::React::Networking::IWebSocketResource::Protocols protocols;
+  Microsoft::React::Networking::IWebSocketResource::Options options;
   m_packagerWebSocketConnection->Connect(std::string{m_url}, protocols, options);
 
   co_return;

package/Shared/InspectorPackagerConnection.h

@@ -4,7 +4,7 @@
 #pragma once
 
 #include <InspectorProxy.h>
-#include <WinRTWebSocketResource.h>
+#include <Networking/WinRTWebSocketResource.h>
 #include <jsinspector/InspectorInterfaces.h>
 
 namespace Microsoft::ReactNative {
@@ -42,7 +42,7 @@ class InspectorPackagerConnection final : public std::enable_shared_from_this<In
   void sendMessageToVM(int64_t pageId, std::string &&message);
 
   std::unordered_map<int64_t, std::unique_ptr<facebook::react::ILocalConnection>> m_localConnections;
-  std::shared_ptr<Microsoft::React::WinRTWebSocketResource> m_packagerWebSocketConnection;
+  std::shared_ptr<Microsoft::React::Networking::WinRTWebSocketResource> m_packagerWebSocketConnection;
   std::shared_ptr<IBundleStatusProvider> m_bundleStatusProvider;
   std::string m_url;
 };

package/Shared/JSI/ChakraApi.cpp

@@ -3,7 +3,6 @@
 
 #include "ChakraApi.h"
 
-#include <RuntimeOptions.h>
 #include <sstream>
 #include <utility>
 #include "Unicode.h"

package/Shared/JSI/ChakraRuntime.cpp

@@ -4,7 +4,6 @@
 #include "ChakraRuntime.h"
 #include "ChakraRuntimeFactory.h"
 
-#include <RuntimeOptions.h>
 #include "Unicode.h"
 #include "Utilities.h"