react-native-windows 0.80.1 → 0.81.0-preview.1

package/Shared/Modules/BlobModule.cpp

@@ -8,12 +8,6 @@
 #include <Modules/CxxModuleUtilities.h>
 #include "BlobCollector.h"
 
-// React Native
-#include <cxxreact/JsArgumentHelpers.h>
-
-using namespace facebook::xplat;
-
-using folly::dynamic;
 using Microsoft::React::Networking::IBlobResource;
 using std::string;
 using std::vector;
@@ -22,7 +16,6 @@ using winrt::Windows::Foundation::IInspectable;
 namespace msrn = winrt::Microsoft::ReactNative;
 
 namespace {
-constexpr char s_moduleName[] = "BlobModule";
 constexpr wchar_t s_moduleNameW[] = L"BlobModule";
 
 const auto &blobKeys = IBlobResource::FieldNames();
@@ -95,89 +88,6 @@ void BlobTurboModule::Release(string &&blobId) noexcept {
 
 #pragma endregion BlobTurboModule
 
-#pragma region BlobModule
-
-BlobModule::BlobModule(winrt::Windows::Foundation::IInspectable const &inspectableProperties) noexcept
-    : m_resource{IBlobResource::Make(inspectableProperties)} {}
-
-#pragma region CxxModule
-
-string BlobModule::getName() {
-  return s_moduleName;
-}
-
-std::map<string, dynamic> BlobModule::getConstants() {
-  return {{"BLOB_URI_SCHEME", blobKeys.Blob}, {"BLOB_URI_HOST", {}}};
-}
-
-vector<module::CxxModule::Method> BlobModule::getMethods() {
-  // See CxxNativeModule::lazyInit()
-  m_resource->Callbacks().OnError = [weakInstance = getInstance()](string &&errorText) {
-    Modules::SendEvent(weakInstance, "blobFailed", std::move(errorText));
-  };
-
-  return {
-      {"addNetworkingHandler", [resource = m_resource](dynamic /*args*/) { resource->AddNetworkingHandler(); }},
-
-      {"addWebSocketHandler",
-       [resource = m_resource](dynamic args) {
-         auto id = jsArgAsInt(args, 0);
-
-         resource->AddWebSocketHandler(id);
-       }},
-
-      {"removeWebSocketHandler",
-       [resource = m_resource](dynamic args) {
-         auto id = jsArgAsInt(args, 0);
-
-         resource->RemoveWebSocketHandler(id);
-       }},
-
-      {"sendOverSocket",
-       [resource = m_resource](dynamic args) {
-         auto blob = jsArgAsObject(args, 0);
-         auto blobId = blob[blobKeys.BlobId].getString();
-         auto offset = blob[blobKeys.Offset].getInt();
-         auto size = blob[blobKeys.Size].getInt();
-         auto socketId = jsArgAsInt(args, 1);
-
-         resource->SendOverSocket(std::move(blobId), offset, size, socketId);
-       }},
-
-      {"createFromParts",
-       [resource = m_resource](dynamic args) {
-         auto dynamicParts = jsArgAsArray(args, 0); // Array<Object>
-         auto parts = Modules::ToJSValue(dynamicParts);
-         auto blobId = jsArgAsString(args, 1);
-
-         resource->CreateFromParts(parts.MoveArray(), std::move(blobId));
-       }},
-
-      {"release",
-       [resource = m_resource](dynamic args) // blobId: string
-       {
-         auto blobId = jsArgAsString(args, 0);
-
-         resource->Release(std::move(blobId));
-       }}};
-}
-
-#pragma endregion CxxModule
-
-#pragma endregion BlobModule
-
-/*extern*/ const char *GetBlobModuleName() noexcept {
-  return s_moduleName;
-}
-
-/*extern*/ std::unique_ptr<facebook::xplat::module::CxxModule> CreateBlobModule(
-    IInspectable const &inspectableProperties) noexcept {
-  if (auto properties = inspectableProperties.try_as<msrn::IReactPropertyBag>())
-    return std::make_unique<BlobModule>(properties);
-
-  return nullptr;
-}
-
 /*extern*/ const wchar_t *GetBlobTurboModuleName() noexcept {
   return s_moduleNameW;
 }

package/Shared/Modules/BlobModule.h

@@ -7,9 +7,6 @@
 
 #include <Networking/IBlobResource.h>
 
-// React Native
-#include <cxxreact/CxxModule.h>
-
 // Windows API
 #include <winrt/base.h>
 
@@ -53,41 +50,4 @@ struct BlobTurboModule {
   std::shared_ptr<Networking::IBlobResource> m_resource;
 };
 
-class BlobModule : public facebook::xplat::module::CxxModule {
-  std::shared_ptr<Networking::IBlobResource> m_resource;
-
- public:
-  enum class MethodId {
-    AddNetworkingHandler = 0,
-    AddWebSocketHandler = 1,
-    RemoveWebSocketHandler = 2,
-    SendOverSocket = 3,
-    CreateFromParts = 4,
-    Release = 5,
-    SIZE = 6
-  };
-
-  BlobModule(winrt::Windows::Foundation::IInspectable const &inspectableProperties) noexcept;
-
-#pragma region CxxModule
-
-  /// <summary>
-  /// <see cref="facebook::xplat::module::CxxModule::getName" />
-  /// </summary>
-  std::string getName() override;
-
-  /// <summary>
-  /// <see cref="facebook::xplat::module::CxxModule::getConstants" />
-  /// </summary>
-  std::map<std::string, folly::dynamic> getConstants() override;
-
-  /// <summary>
-  /// <see cref="facebook::xplat::module::CxxModule::getMethods" />
-  /// </summary>
-  /// <remarks>See See react-native/Libraries/WebSocket/WebSocket.js</remarks>
-  std::vector<Method> getMethods() override;
-
-#pragma endregion CxxModule
-};
-
 } // namespace Microsoft::React

package/Shared/Modules/FileReaderModule.cpp

@@ -7,23 +7,16 @@
 #include <ReactPropertyBag.h>
 #include "Networking/NetworkPropertyIds.h"
 
-// React Native
-#include <cxxreact/JsArgumentHelpers.h>
-
 // Windows API
 #include <winrt/Windows.Foundation.h>
 
-using namespace facebook::xplat;
-
 namespace msrn = winrt::Microsoft::ReactNative;
 
-using folly::dynamic;
 using std::string;
 using std::weak_ptr;
 using winrt::Windows::Foundation::IInspectable;
 
 namespace {
-constexpr char s_moduleName[] = "FileReaderModule";
 constexpr wchar_t s_moduleNameW[] = L"FileReaderModule";
 
 msrn::ReactModuleProvider s_moduleProvider = msrn::MakeTurboModuleProvider<Microsoft::React::FileReaderTurboModule>();
@@ -31,86 +24,6 @@ msrn::ReactModuleProvider s_moduleProvider = msrn::MakeTurboModuleProvider<Micro
 
 namespace Microsoft::React {
 
-#pragma region FileReaderModule
-
-FileReaderModule::FileReaderModule(weak_ptr<IBlobPersistor> weakBlobPersistor) noexcept
-    : m_resource{IFileReaderResource::Make(weakBlobPersistor)} {}
-
-FileReaderModule::~FileReaderModule() noexcept /*override*/
-{}
-
-#pragma region CxxModule
-
-string FileReaderModule::getName() {
-  return s_moduleName;
-}
-
-std::map<string, dynamic> FileReaderModule::getConstants() {
-  return {};
-}
-
-std::vector<module::CxxModule::Method> FileReaderModule::getMethods() {
-  return {
-      {///
-       /// <param name="args">
-       /// Array of arguments passed from the JavaScript layer.
-       /// [0]  - dynamic blob object { blobId, offset, size[, type] }
-       /// </param>
-       ///
-       "readAsDataURL",
-       [resource = m_resource](dynamic args, Callback resolve, Callback reject) {
-         auto blob = jsArgAsObject(args, 0);
-
-         auto blobId = blob["blobId"].asString();
-         auto offset = blob["offset"].asInt();
-         auto size = blob["size"].asInt();
-
-         auto typeItr = blob.find("type");
-         string type{};
-         if (typeItr == blob.items().end()) {
-           type = "application/octet-stream";
-         } else {
-           type = (*typeItr).second.asString();
-         }
-
-         resource->ReadAsDataUrl(
-             std::move(blobId),
-             offset,
-             size,
-             std::move(type),
-             [&resolve](string &&message) { resolve({std::move(message)}); },
-             [&reject](string &&message) { reject({std::move(message)}); });
-       }},
-      {///
-       /// <param name="args">
-       /// Array of arguments passed from the JavaScript layer.
-       /// [0]  - dynamic blob object { blobId, offset, size }
-       /// [1]  - string encoding
-       /// </param>
-       ///
-       "readAsText",
-       [resource = m_resource](dynamic args, Callback resolve, Callback reject) {
-         auto blob = jsArgAsObject(args, 0);
-         auto encoding = jsArgAsString(args, 1); // Default: "UTF-8"
-
-         auto blobId = blob["blobId"].asString();
-         auto offset = blob["offset"].asInt();
-         auto size = blob["size"].asInt();
-
-         resource->ReadAsText(
-             std::move(blobId),
-             offset,
-             size,
-             std::move(encoding),
-             [&resolve](string &&message) { resolve({std::move(message)}); },
-             [&reject](string &&message) { reject({std::move(message)}); });
-       }}};
-}
-
-#pragma endregion CxxModule
-
-#pragma endregion FileReaderModule
-
 #pragma region FileReaderTurboModule
 
 void FileReaderTurboModule::Initialize(msrn::ReactContext const &reactContext) noexcept {
@@ -189,23 +102,6 @@ void FileReaderTurboModule::ReadAsText(
 
 #pragma endregion FileReaderTurboModule
 
-/*extern*/ const char *GetFileReaderModuleName() noexcept {
-  return s_moduleName;
-}
-
-/*extern*/ std::unique_ptr<module::CxxModule> CreateFileReaderModule(
-    IInspectable const &inspectableProperties) noexcept {
-  auto propBag = msrn::ReactPropertyBag{inspectableProperties.try_as<msrn::IReactPropertyBag>()};
-
-  if (auto prop = propBag.Get(BlobModulePersistorPropertyId())) {
-    auto weakBlobPersistor = prop.Value();
-
-    return std::make_unique<FileReaderModule>(weakBlobPersistor);
-  }
-
-  return nullptr;
-}
-
 /*extern*/ const wchar_t *GetFileReaderTurboModuleName() noexcept {
   return s_moduleNameW;
 }

package/Shared/Modules/FileReaderModule.h

@@ -9,12 +9,6 @@
 #include <NativeModules.h>
 #include "IBlobPersistor.h"
 
-// React Native
-#include <cxxreact/CxxModule.h>
-
-// Folly
-#include <folly/dynamic.h>
-
 // Standard Library
 #include <map>
 #include <memory>
@@ -23,38 +17,6 @@
 
 namespace Microsoft::React {
 
-class FileReaderModule : public facebook::xplat::module::CxxModule {
- public:
-  enum class MethodId { ReadAsDataURL = 0, ReadAsText = 1, SIZE = 2 };
-
-  FileReaderModule(std::weak_ptr<IBlobPersistor> weakBlobPersistor) noexcept;
-
-  ~FileReaderModule() noexcept override;
-
-#pragma region CxxModule
-
-  /// <summary>
-  /// <see cref="facebook::xplat::module::CxxModule::getName" />
-  /// </summary>
-  std::string getName() override;
-
-  /// <summary>
-  /// <see cref="facebook::xplat::module::CxxModule::getConstants" />
-  /// </summary>
-  std::map<std::string, folly::dynamic> getConstants() override;
-
-  /// <summary>
-  /// <see cref="facebook::xplat::module::CxxModule::getMethods" />
-  /// </summary>
-  /// <remarks>See See react-native/Libraries/WebSocket/WebSocket.js</remarks>
-  std::vector<Method> getMethods() override;
-
-#pragma endregion CxxModule
-
- private:
-  std::shared_ptr<IFileReaderResource> m_resource;
-};
-
 REACT_MODULE(FileReaderTurboModule, L"FileReaderModule")
 struct FileReaderTurboModule {
   using ModuleSpec = ReactNativeSpecs::FileReaderModuleSpec;

package/Shared/Modules/HttpModule.cpp

@@ -9,11 +9,6 @@
 #include <Modules/CxxModuleUtilities.h>
 #include <ReactPropertyBag.h>
 
-// React Native
-#include <cxxreact/Instance.h>
-#include <cxxreact/JsArgumentHelpers.h>
-
-using facebook::react::Instance;
 using folly::dynamic;
 using std::function;
 using std::shared_ptr;
@@ -32,7 +27,6 @@ namespace {
 using Microsoft::React::Modules::SendEvent;
 using Microsoft::React::Networking::IHttpResource;
 
-constexpr char s_moduleName[] = "Networking";
 constexpr wchar_t s_moduleNameW[] = L"Networking";
 
 // React event names
@@ -52,66 +46,6 @@ constexpr wchar_t receivedDataW[] = L"didReceiveNetworkData";
 
 msrn::ReactModuleProvider s_moduleProvider = msrn::MakeTurboModuleProvider<Microsoft::React::HttpTurboModule>();
 
-static void SetUpHttpResource(
-    shared_ptr<IHttpResource> resource,
-    weak_ptr<Instance> weakReactInstance,
-    IInspectable &inspectableProperties) {
-  resource->SetOnRequestSuccess([weakReactInstance](int64_t requestId) {
-    auto args = dynamic::array(requestId);
-
-    SendEvent(weakReactInstance, completedResponse, std::move(args));
-  });
-
-  resource->SetOnResponse([weakReactInstance](int64_t requestId, IHttpResource::Response &&response) {
-    dynamic headers = dynamic::object();
-    for (auto &header : response.Headers) {
-      headers[header.first] = header.second;
-    }
-
-    // TODO: Test response content.
-    dynamic args = dynamic::array(requestId, response.StatusCode, headers, response.Url);
-
-    SendEvent(weakReactInstance, receivedResponse, std::move(args));
-  });
-
-  resource->SetOnData([weakReactInstance](int64_t requestId, string &&responseData) {
-    SendEvent(weakReactInstance, receivedData, dynamic::array(requestId, std::move(responseData)));
-  });
-
-  // Explicitly declaring function type to avoid type inference ambiguity.
-  function<void(int64_t, msrn::JSValueObject &&)> onDataDynamic =
-      [weakReactInstance](int64_t requestId, msrn::JSValueObject &&responseData) {
-        auto responseDynamic = Microsoft::React::Modules::ToDynamic(msrn::JSValue{std::move(responseData)});
-        SendEvent(weakReactInstance, receivedData, dynamic::array(requestId, std::move(responseDynamic)));
-      };
-  resource->SetOnData(std::move(onDataDynamic));
-
-  resource->SetOnIncrementalData(
-      [weakReactInstance](int64_t requestId, string &&responseData, int64_t progress, int64_t total) {
-        SendEvent(
-            weakReactInstance,
-            receivedIncrementalData,
-            dynamic::array(requestId, std::move(responseData), progress, total));
-      });
-
-  resource->SetOnDataProgress([weakReactInstance](int64_t requestId, int64_t progress, int64_t total) {
-    SendEvent(weakReactInstance, receivedDataProgress, dynamic::array(requestId, progress, total));
-  });
-
-  resource->SetOnResponseComplete([weakReactInstance](int64_t requestId) {
-    SendEvent(weakReactInstance, completedResponse, dynamic::array(requestId));
-  });
-
-  resource->SetOnError([weakReactInstance](int64_t requestId, string &&message, bool isTimeout) {
-    dynamic args = dynamic::array(requestId, std::move(message));
-    if (isTimeout) {
-      args.push_back(true);
-    }
-
-    SendEvent(weakReactInstance, completedResponse, std::move(args));
-  });
-}
-
 } // namespace
 
 namespace Microsoft::React {
@@ -212,112 +146,6 @@ void HttpTurboModule::RemoveListeners(double count) noexcept { /*NOOP*/
 
 #pragma endregion HttpTurboModule
 
-#pragma region HttpModule
-
-HttpModule::HttpModule(IInspectable const &inspectableProperties) noexcept
-    : m_holder{std::make_shared<ModuleHolder>()},
-      m_inspectableProperties{inspectableProperties},
-      m_resource{IHttpResource::Make(inspectableProperties)} {
-  m_holder->Module = this;
-}
-
-HttpModule::~HttpModule() noexcept /*override*/ {
-  m_holder->Module = nullptr;
-}
-
-#pragma region CxxModule
-
-string HttpModule::getName() /*override*/ {
-  return s_moduleName;
-}
-
-std::map<string, dynamic> HttpModule::getConstants() {
-  return {};
-}
-
-// clang-format off
-std::vector<facebook::xplat::module::CxxModule::Method> HttpModule::getMethods() {
-  // See CxxNativeModule::lazyInit()
-  SetUpHttpResource(m_resource, getInstance(), m_inspectableProperties);
-
-  return
-  {
-    {
-      "sendRequest",
-      [weakHolder = weak_ptr<ModuleHolder>(m_holder)](dynamic args, Callback cxxCallback)
-      {
-        auto holder = weakHolder.lock();
-        if (!holder) {
-          return;
-        }
-
-        holder->Module->m_requestId++;
-
-        auto params = facebook::xplat::jsArgAsObject(args, 0);
-        IHttpResource::Headers headers;
-        for (auto& header : params["headers"].items()) {
-          headers.emplace(header.first.getString(), header.second.getString());
-        }
-
-        holder->Module->m_resource->SendRequest(
-          params["method"].asString(),
-          params["url"].asString(),
-          holder->Module->m_requestId,
-          std::move(headers),
-          Modules::ToJSValue(params["data"]).MoveObject(),
-          params["responseType"].asString(),
-          params["incrementalUpdates"].asBool(),
-          static_cast<int64_t>(params["timeout"].asDouble()),
-          params["withCredentials"].asBool(),
-          [cxxCallback = std::move(cxxCallback)](int64_t requestId) {
-            cxxCallback({requestId});
-          }
-        );
-      }
-    },
-    {
-      "abortRequest",
-      [weakHolder = weak_ptr<ModuleHolder>(m_holder)](dynamic args)
-      {
-        auto holder = weakHolder.lock();
-        if (!holder)
-        {
-          return;
-        }
-
-        holder->Module->m_resource->AbortRequest(facebook::xplat::jsArgAsInt(args, 0));
-      }
-    },
-    {
-      "clearCookies",
-      [weakHolder = weak_ptr<ModuleHolder>(m_holder)](dynamic args)
-      {
-        auto holder = weakHolder.lock();
-        if (!holder)
-        {
-          return;
-        }
-
-        holder->Module->m_resource->ClearCookies();
-      }
-    }
-  };
-}
-// clang-format on
-
-#pragma endregion CxxModule
-
-#pragma endregion HttpModule
-
-/*extern*/ const char *GetHttpModuleName() noexcept {
-  return s_moduleName;
-}
-
-/*extern*/ std::unique_ptr<facebook::xplat::module::CxxModule> CreateHttpModule(
-    IInspectable const &inspectableProperties) noexcept {
-  return std::make_unique<HttpModule>(inspectableProperties);
-}
-
 /*extern*/ const wchar_t *GetHttpTurboModuleName() noexcept {
   return s_moduleNameW;
 }

package/Shared/Modules/HttpModule.h

@@ -7,9 +7,6 @@
 #include <NativeModules.h>
 #include <Networking/IHttpResource.h>
 
-// React Native
-#include <cxxreact/CxxModule.h>
-
 // Windows API
 #include <winrt/Windows.Foundation.h>
 
@@ -45,48 +42,4 @@ struct HttpTurboModule {
   int64_t m_requestId{0};
 };
 
-///
-/// Realizes <c>NativeModules</c> projection.
-/// <remarks>See src\Libraries\Network\RCTNetworking.windows.js</remarks>
-///
-class HttpModule : public facebook::xplat::module::CxxModule {
- public:
-  enum MethodId { SendRequest = 0, AbortRequest = 1, ClearCookies = 2, LAST = ClearCookies };
-
-  HttpModule(winrt::Windows::Foundation::IInspectable const &inspectableProperties) noexcept;
-
-  ~HttpModule() noexcept override;
-
-#pragma region CxxModule
-
-  /// <summary>
-  /// <see cref="facebook::xplat::module::CxxModule::getName" />
-  /// </summary>
-  std::string getName() override;
-
-  /// <summary>
-  /// <see cref="facebook::xplat::module::CxxModule::getConstants" />
-  /// </summary>
-  std::map<std::string, folly::dynamic> getConstants() override;
-
-  /// <summary>
-  /// <see cref="facebook::xplat::module::CxxModule::getMethods" />
-  /// </summary>
-  /// <remarks>See See react-native/Libraries/WebSocket/WebSocket.js</remarks>
-  std::vector<Method> getMethods() override;
-
-#pragma endregion CxxModule
-
- private:
-  struct ModuleHolder {
-    HttpModule *Module{nullptr};
-  };
-
-  std::shared_ptr<Networking::IHttpResource> m_resource;
-  std::shared_ptr<ModuleHolder> m_holder;
-  int64_t m_requestId{0};
-
-  // Property bag high level reference.
-  winrt::Windows::Foundation::IInspectable m_inspectableProperties;
-};
 } // namespace Microsoft::React