react-native-windows 0.71.24 → 0.71.26

package/Shared/Networking/DefaultBlobResource.cpp

@@ -0,0 +1,328 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#include "DefaultBlobResource.h"
+
+#include <Modules/IHttpModuleProxy.h>
+#include <Modules/IWebSocketModuleProxy.h>
+
+// Boost Libraries
+#include <boost/uuid/uuid_io.hpp>
+
+// Windows API
+#include <winrt/Windows.Security.Cryptography.h>
+
+using std::scoped_lock;
+using std::shared_ptr;
+using std::string;
+using std::vector;
+using std::weak_ptr;
+using winrt::array_view;
+using winrt::Windows::Security::Cryptography::CryptographicBuffer;
+
+namespace msrn = winrt::Microsoft::ReactNative;
+
+namespace {
+
+constexpr Microsoft::React::Networking::IBlobResource::BlobFieldNames
+    blobKeys{"blob", "blobId", "offset", "size", "type", "data"};
+
+} // namespace
+
+namespace Microsoft::React::Networking {
+
+#pragma region DefaultBlobResource
+
+DefaultBlobResource::DefaultBlobResource(
+    shared_ptr<MemoryBlobPersistor> blobPersistor,
+    shared_ptr<BlobWebSocketModuleContentHandler> contentHandler,
+    shared_ptr<BlobModuleRequestBodyHandler> requestBodyHandler,
+    shared_ptr<BlobModuleResponseHandler> responseHandler,
+    msrn::ReactPropertyBag propertyBag)
+    : m_blobPersistor{blobPersistor},
+      m_contentHandler{contentHandler},
+      m_requestBodyHandler{requestBodyHandler},
+      m_responseHandler{responseHandler},
+      m_propertyBag{propertyBag} {}
+
+#pragma region IBlobResource
+
+/*static*/ const IBlobResource::BlobFieldNames &IBlobResource::FieldNames() noexcept {
+  return blobKeys;
+}
+
+/*static*/ shared_ptr<IBlobResource> IBlobResource::Make(
+    winrt::Windows::Foundation::IInspectable const &inspectableProperties) {
+  using namespace msrn;
+
+  auto propBag = ReactPropertyBag{inspectableProperties.try_as<IReactPropertyBag>()};
+
+  auto blobPersistor = std::make_shared<MemoryBlobPersistor>();
+  auto contentHandler = std::make_shared<BlobWebSocketModuleContentHandler>(blobPersistor);
+  auto requestBodyHanlder = std::make_shared<BlobModuleRequestBodyHandler>(blobPersistor);
+  auto responseHandler = std::make_shared<BlobModuleResponseHandler>(blobPersistor);
+
+  auto contentHandlerPropId =
+      ReactPropertyId<ReactNonAbiValue<weak_ptr<IWebSocketModuleContentHandler>>>{L"BlobModule.ContentHandler"};
+  propBag.Set(contentHandlerPropId, weak_ptr<IWebSocketModuleContentHandler>{contentHandler});
+
+  auto blobPersistorPropId = ReactPropertyId<ReactNonAbiValue<weak_ptr<IBlobPersistor>>>{L"Blob.Persistor"};
+  ;
+  propBag.Set(blobPersistorPropId, weak_ptr<IBlobPersistor>{blobPersistor});
+
+  auto result = std::make_shared<DefaultBlobResource>(
+      blobPersistor, contentHandler, requestBodyHanlder, responseHandler, propBag);
+
+  return result;
+}
+
+void DefaultBlobResource::SendOverSocket(string &&blobId, int64_t offset, int64_t size, int64_t socketId) noexcept
+/*override*/ {
+  auto propId =
+      msrn::ReactPropertyId<msrn::ReactNonAbiValue<weak_ptr<IWebSocketModuleProxy>>>{L"WebSocketModule.Proxy"};
+  shared_ptr<IWebSocketModuleProxy> wsProxy;
+  if (auto prop = m_propertyBag.Get(propId)) {
+    wsProxy = prop.Value().lock();
+  }
+  if (!wsProxy) {
+    return;
+  }
+
+  array_view<uint8_t const> data;
+  try {
+    data = m_blobPersistor->ResolveMessage(std::move(blobId), offset, size);
+  } catch (const std::exception &e) {
+    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);
+}
+
+void DefaultBlobResource::CreateFromParts(msrn::JSValueArray &&parts, string &&blobId) noexcept /*override*/ {
+  vector<uint8_t> buffer{};
+
+  for (const auto &partItem : parts) {
+    auto &part = partItem.AsObject();
+    auto type = part.at(blobKeys.Type).AsString();
+    if (blobKeys.Blob == type) {
+      auto &blob = part.at(blobKeys.Data).AsObject();
+      array_view<uint8_t const> bufferPart;
+      try {
+        bufferPart = m_blobPersistor->ResolveMessage(
+            blob.at(blobKeys.BlobId).AsString(), blob.at(blobKeys.Offset).AsInt64(), blob.at(blobKeys.Size).AsInt64());
+      } catch (const std::exception &e) {
+        return m_callbacks.OnError(e.what());
+      }
+
+      buffer.reserve(buffer.size() + bufferPart.size());
+      buffer.insert(buffer.end(), bufferPart.begin(), bufferPart.end());
+    } else if ("string" == type) {
+      auto data = part.at(blobKeys.Data).AsString();
+
+      buffer.reserve(buffer.size() + data.size());
+      buffer.insert(buffer.end(), data.begin(), data.end());
+    } else {
+      return m_callbacks.OnError("Invalid type for blob: " + type);
+    }
+  }
+
+  m_blobPersistor->StoreMessage(std::move(buffer), std::move(blobId));
+}
+
+void DefaultBlobResource::Release(string &&blobId) noexcept /*override*/ {
+  m_blobPersistor->RemoveMessage(std::move(blobId));
+}
+
+void DefaultBlobResource::AddNetworkingHandler() noexcept /*override*/ {
+  auto propId = msrn::ReactPropertyId<msrn::ReactNonAbiValue<weak_ptr<IHttpModuleProxy>>>{L"HttpModule.Proxy"};
+
+  if (auto prop = m_propertyBag.Get(propId)) {
+    if (auto httpHandler = prop.Value().lock()) {
+      httpHandler->AddRequestBodyHandler(m_requestBodyHandler);
+      httpHandler->AddResponseHandler(m_responseHandler);
+    }
+  } else {
+    // #11439 - The absence of HttpModule.Proxy may be caused by a module initialization race condition.
+    // Best-effort approach to set up the request/response handlers by exposing this interface to dependents
+    // (i.e. IHttpResource).
+    auto propId = msrn::ReactPropertyId<msrn::ReactNonAbiValue<weak_ptr<IBlobResource>>>{L"Blob.Resource"};
+    m_propertyBag.Set(propId, weak_ptr<IBlobResource>(shared_from_this()));
+  }
+}
+
+void DefaultBlobResource::AddWebSocketHandler(int64_t id) noexcept /*override*/ {
+  m_contentHandler->Register(id);
+}
+
+void DefaultBlobResource::RemoveWebSocketHandler(int64_t id) noexcept /*override*/ {
+  m_contentHandler->Unregister(id);
+}
+
+IBlobResource::BlobCallbacks &DefaultBlobResource::Callbacks() noexcept /*override*/ {
+  return m_callbacks;
+}
+
+#pragma endregion IBlobResource
+
+#pragma endregion DefaultBlobResource
+
+#pragma region MemoryBlobPersistor
+
+#pragma region IBlobPersistor
+
+array_view<uint8_t const> MemoryBlobPersistor::ResolveMessage(string &&blobId, int64_t offset, int64_t size) {
+  if (size < 1)
+    return {};
+
+  scoped_lock lock{m_mutex};
+
+  auto dataItr = m_blobs.find(std::move(blobId));
+  // Not found.
+  if (dataItr == m_blobs.cend())
+    throw std::invalid_argument("Blob object not found");
+
+  auto &bytes = (*dataItr).second;
+  auto endBound = static_cast<size_t>(offset + size);
+  // Out of bounds.
+  if (endBound > bytes.size() || offset >= static_cast<int64_t>(bytes.size()) || offset < 0)
+    throw std::out_of_range("Offset or size out of range");
+
+  return array_view<uint8_t const>(bytes.data() + offset, bytes.data() + endBound);
+}
+
+void MemoryBlobPersistor::RemoveMessage(string &&blobId) noexcept {
+  scoped_lock lock{m_mutex};
+
+  m_blobs.erase(std::move(blobId));
+}
+
+void MemoryBlobPersistor::StoreMessage(vector<uint8_t> &&message, string &&blobId) noexcept {
+  scoped_lock lock{m_mutex};
+
+  m_blobs.insert_or_assign(std::move(blobId), std::move(message));
+}
+
+string MemoryBlobPersistor::StoreMessage(vector<uint8_t> &&message) noexcept {
+  auto blobId = boost::uuids::to_string(m_guidGenerator());
+
+  scoped_lock lock{m_mutex};
+  m_blobs.insert_or_assign(blobId, std::move(message));
+
+  return blobId;
+}
+
+#pragma endregion IBlobPersistor
+
+#pragma endregion MemoryBlobPersistor
+
+#pragma region BlobWebSocketModuleContentHandler
+
+BlobWebSocketModuleContentHandler::BlobWebSocketModuleContentHandler(shared_ptr<IBlobPersistor> blobPersistor) noexcept
+    : m_blobPersistor{blobPersistor} {}
+
+#pragma region IWebSocketModuleContentHandler
+
+void BlobWebSocketModuleContentHandler::ProcessMessage(
+    string &&message,
+    msrn::JSValueObject &params) noexcept /*override*/
+{
+  params[blobKeys.Data] = std::move(message);
+}
+
+void BlobWebSocketModuleContentHandler::ProcessMessage(
+    vector<uint8_t> &&message,
+    msrn::JSValueObject &params) noexcept /*override*/
+{
+  auto blob = msrn::JSValueObject{
+      {blobKeys.Offset, 0},
+      {blobKeys.Size, message.size()},
+      {blobKeys.BlobId, m_blobPersistor->StoreMessage(std::move(message))}};
+
+  params[blobKeys.Data] = std::move(blob);
+  params[blobKeys.Type] = blobKeys.Blob;
+}
+
+#pragma endregion IWebSocketModuleContentHandler
+
+void BlobWebSocketModuleContentHandler::Register(int64_t socketID) noexcept {
+  scoped_lock lock{m_mutex};
+  m_socketIds.insert(socketID);
+}
+
+void BlobWebSocketModuleContentHandler::Unregister(int64_t socketID) noexcept {
+  scoped_lock lock{m_mutex};
+
+  auto itr = m_socketIds.find(socketID);
+  if (itr != m_socketIds.end())
+    m_socketIds.erase(itr);
+}
+
+#pragma endregion BlobWebSocketModuleContentHandler
+
+#pragma region BlobModuleRequestBodyHandler
+
+BlobModuleRequestBodyHandler::BlobModuleRequestBodyHandler(shared_ptr<IBlobPersistor> blobPersistor) noexcept
+    : m_blobPersistor{blobPersistor} {}
+
+#pragma region IRequestBodyHandler
+
+bool BlobModuleRequestBodyHandler::Supports(msrn::JSValueObject &data) /*override*/ {
+  auto itr = data.find(blobKeys.Blob);
+
+  return itr != data.cend() && !(*itr).second.AsString().empty();
+}
+
+msrn::JSValueObject BlobModuleRequestBodyHandler::ToRequestBody(
+    msrn::JSValueObject &data,
+    string &contentType) /*override*/ {
+  auto type = contentType;
+  auto itr = data.find(blobKeys.Type);
+  if (itr != data.cend() && !(*itr).second.AsString().empty()) {
+    type = (*itr).second.AsString();
+  }
+  if (type.empty()) {
+    type = "application/octet-stream";
+  }
+
+  auto &blob = data[blobKeys.Blob].AsObject();
+  auto blobId = blob[blobKeys.BlobId].AsString();
+  auto bytes = m_blobPersistor->ResolveMessage(
+      std::move(blobId), blob[blobKeys.Offset].AsInt64(), blob[blobKeys.Size].AsInt64());
+
+  return {
+      {blobKeys.Type, type},
+      {blobKeys.Size, bytes.size()},
+      {"bytes", msrn::JSValueArray(bytes.cbegin(), bytes.cend())}};
+}
+
+#pragma endregion IRequestBodyHandler
+
+#pragma endregion BlobModuleRequestBodyHandler
+
+#pragma region BlobModuleResponseHandler
+
+BlobModuleResponseHandler::BlobModuleResponseHandler(shared_ptr<IBlobPersistor> blobPersistor) noexcept
+    : m_blobPersistor{blobPersistor} {}
+
+#pragma region IResponseHandler
+
+bool BlobModuleResponseHandler::Supports(string &responseType) /*override*/ {
+  return blobKeys.Blob == responseType;
+}
+
+msrn::JSValueObject BlobModuleResponseHandler::ToResponseData(vector<uint8_t> &&content) /*override*/ {
+  return {
+      {blobKeys.Offset, 0},
+      {blobKeys.Size, content.size()},
+      {blobKeys.BlobId, m_blobPersistor->StoreMessage(std::move(content))}};
+}
+
+#pragma endregion IResponseHandler
+
+#pragma endregion BlobModuleResponseHandler
+
+} // namespace Microsoft::React::Networking

package/Shared/Networking/DefaultBlobResource.h

@@ -0,0 +1,133 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include "IBlobResource.h"
+
+#include <IBlobPersistor.h>
+#include <Modules/IRequestBodyHandler.h>
+#include <Modules/IResponseHandler.h>
+#include <Modules/IWebSocketModuleContentHandler.h>
+
+// React Native Windows
+#include <ReactPropertyBag.h>
+
+// Boost Libraries
+#include <boost/uuid/uuid_generators.hpp>
+
+// Standard Library
+#include <mutex>
+#include <unordered_set>
+
+namespace Microsoft::React::Networking {
+
+class MemoryBlobPersistor final : public IBlobPersistor {
+  std::unordered_map<std::string, std::vector<uint8_t>> m_blobs;
+  std::mutex m_mutex;
+  boost::uuids::random_generator m_guidGenerator;
+
+ public:
+#pragma region IBlobPersistor
+
+  winrt::array_view<uint8_t const> ResolveMessage(std::string &&blobId, int64_t offset, int64_t size) override;
+
+  void RemoveMessage(std::string &&blobId) noexcept override;
+
+  void StoreMessage(std::vector<uint8_t> &&message, std::string &&blobId) noexcept override;
+
+  std::string StoreMessage(std::vector<uint8_t> &&message) noexcept override;
+
+#pragma endregion IBlobPersistor
+};
+
+class BlobWebSocketModuleContentHandler final : public IWebSocketModuleContentHandler {
+  std::unordered_set<int64_t> m_socketIds;
+  std::mutex m_mutex;
+  std::shared_ptr<IBlobPersistor> m_blobPersistor;
+
+ public:
+  BlobWebSocketModuleContentHandler(std::shared_ptr<IBlobPersistor> blobPersistor) noexcept;
+
+#pragma region IWebSocketModuleContentHandler
+
+  void ProcessMessage(std::string &&message, winrt::Microsoft::ReactNative::JSValueObject &params) noexcept override;
+
+  void ProcessMessage(std::vector<uint8_t> &&message, winrt::Microsoft::ReactNative::JSValueObject &params) noexcept
+      override;
+
+#pragma endregion IWebSocketModuleContentHandler
+
+  void Register(int64_t socketID) noexcept;
+
+  void Unregister(int64_t socketID) noexcept;
+};
+
+class BlobModuleRequestBodyHandler final : public IRequestBodyHandler {
+  std::shared_ptr<IBlobPersistor> m_blobPersistor;
+
+ public:
+  BlobModuleRequestBodyHandler(std::shared_ptr<IBlobPersistor> blobPersistor) noexcept;
+
+#pragma region IRequestBodyHandler
+
+  bool Supports(winrt::Microsoft::ReactNative::JSValueObject &data) override;
+
+  winrt::Microsoft::ReactNative::JSValueObject ToRequestBody(
+      winrt::Microsoft::ReactNative::JSValueObject &data,
+      std::string &contentType) override;
+
+#pragma endregion IRequestBodyHandler
+};
+
+class BlobModuleResponseHandler final : public IResponseHandler {
+  std::shared_ptr<IBlobPersistor> m_blobPersistor;
+
+ public:
+  BlobModuleResponseHandler(std::shared_ptr<IBlobPersistor> blobPersistor) noexcept;
+
+#pragma region IResponseHandler
+
+  bool Supports(std::string &responseType) override;
+
+  winrt::Microsoft::ReactNative::JSValueObject ToResponseData(std::vector<uint8_t> &&content) override;
+
+#pragma endregion IResponseHandler
+};
+
+class DefaultBlobResource : public IBlobResource, public std::enable_shared_from_this<DefaultBlobResource> {
+  std::shared_ptr<MemoryBlobPersistor> m_blobPersistor;
+  std::shared_ptr<BlobWebSocketModuleContentHandler> m_contentHandler;
+  std::shared_ptr<BlobModuleRequestBodyHandler> m_requestBodyHandler;
+  std::shared_ptr<BlobModuleResponseHandler> m_responseHandler;
+  winrt::Microsoft::ReactNative::ReactPropertyBag m_propertyBag;
+  BlobCallbacks m_callbacks;
+
+ public:
+  DefaultBlobResource(
+      std::shared_ptr<MemoryBlobPersistor> blobPersistor,
+      std::shared_ptr<BlobWebSocketModuleContentHandler> contentHandler,
+      std::shared_ptr<BlobModuleRequestBodyHandler> requestBodyHandler,
+      std::shared_ptr<BlobModuleResponseHandler> responseHandler,
+      winrt::Microsoft::ReactNative::ReactPropertyBag propertyBag);
+
+#pragma region IBlobResource
+
+  void SendOverSocket(std::string &&blobId, int64_t offset, int64_t size, int64_t socketId) noexcept override;
+
+  void CreateFromParts(winrt::Microsoft::ReactNative::JSValueArray &&parts, std::string &&blobId) noexcept override;
+
+  void Release(std::string &&blobId) noexcept override;
+
+  void AddNetworkingHandler() noexcept override;
+
+  void AddWebSocketHandler(int64_t id) noexcept override;
+
+  void RemoveWebSocketHandler(int64_t id) noexcept override;
+
+  BlobCallbacks &Callbacks() noexcept override;
+
+#pragma endregion IBlobResource
+};
+
+} // namespace Microsoft::React::Networking

package/Shared/Networking/IBlobResource.h

@@ -0,0 +1,56 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include <IBlobPersistor.h>
+
+// React Native Windows
+#include <JSValue.h>
+
+// Windows API
+#include <winrt/Windows.Foundation.h>
+
+// Standard Library
+#include <functional>
+#include <memory>
+#include <string>
+
+namespace Microsoft::React::Networking {
+
+struct IBlobResource {
+  struct BlobCallbacks {
+    std::function<void(std::string &&errorText)> OnError;
+  };
+
+  struct BlobFieldNames {
+    const char *Blob;
+    const char *BlobId;
+    const char *Offset;
+    const char *Size;
+    const char *Type;
+    const char *Data;
+  };
+
+  static std::shared_ptr<IBlobResource> Make(winrt::Windows::Foundation::IInspectable const &inspectableProperties);
+
+  static const BlobFieldNames &FieldNames() noexcept;
+
+  virtual ~IBlobResource() noexcept {}
+
+  virtual void SendOverSocket(std::string &&blobId, int64_t offset, int64_t size, int64_t socketId) noexcept = 0;
+
+  virtual void CreateFromParts(winrt::Microsoft::ReactNative::JSValueArray &&parts, std::string &&blobId) noexcept = 0;
+
+  virtual void Release(std::string &&blobId) noexcept = 0;
+
+  virtual void AddNetworkingHandler() noexcept = 0;
+
+  virtual void AddWebSocketHandler(int64_t id) noexcept = 0;
+
+  virtual void RemoveWebSocketHandler(int64_t id) noexcept = 0;
+
+  virtual BlobCallbacks &Callbacks() noexcept = 0;
+};
+
+} // namespace Microsoft::React::Networking

package/Shared/Networking/IHttpResource.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
-// Folly
-#include <folly/dynamic.h>
+// React Native Windows
+#include <JSValue.h>
 
 // Windows API
 #include <winrt/Windows.Foundation.h>
@@ -20,7 +20,6 @@ namespace Microsoft::React::Networking {
 struct IHttpResource {
   typedef std::unordered_map<std::string, std::string> Headers;
 
-  // TODO: Implement Form data
   struct BodyData {
     enum class Type : size_t { Empty, String, Base64, Uri, Form } Type = Type::Empty;
     std::string Data;
@@ -81,7 +80,7 @@ struct IHttpResource {
       std::string &&url,
       int64_t requestId,
       Headers &&headers,
-      folly::dynamic &&data,
+      winrt::Microsoft::ReactNative::JSValueObject &&data,
       std::string &&responseType,
       bool useIncrementalUpdates,
       int64_t timeout,
@@ -146,7 +145,9 @@ struct IHttpResource {
   ///   Structured response content payload (i.e. Blob data)
   ///   </param>
   /// </param>
-  virtual void SetOnData(std::function<void(int64_t requestId, folly::dynamic &&responseData)> &&handler) noexcept = 0;
+  virtual void SetOnData(
+      std::function<void(int64_t requestId, winrt::Microsoft::ReactNative::JSValueObject &&responseData)>
+          &&handler) noexcept = 0;
 
   /// <summary>
   /// Sets a function to be invoked when a response content increment has been received.