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

package/Shared/InspectorPackagerConnection.cpp

@@ -1,232 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-#include "pch.h"
-
-#include <folly/json.h>
-#include <tracing/tracing.h>
-#include "InspectorPackagerConnection.h"
-
-namespace Microsoft::ReactNative {
-
-namespace {
-
-struct InspectorProtocol {
-  static constexpr std::string_view Message_PAGEID = "pageId";
-  static constexpr std::string_view Message_PAYLOAD = "payload";
-
-  static constexpr std::string_view Message_eventName_wrappedEvent = "wrappedEvent";
-  static constexpr std::string_view Message_eventName_getPages = "getPages";
-  static constexpr std::string_view Message_eventName_connect = "connect";
-  static constexpr std::string_view Message_eventName_disconnect = "disconnect";
-
-  static constexpr std::string_view Message_EVENT = "event";
-
-  enum class EventType { GetPages, WrappedEvent, Connect, Disconnect };
-
-  static EventType getEventType(const folly::dynamic &messageFromPackager) {
-    std::string event = messageFromPackager.at(InspectorProtocol::Message_EVENT).getString();
-    if (event == Message_eventName_getPages) {
-      return EventType::GetPages;
-    }
-
-    if (event == Message_eventName_wrappedEvent) {
-      return EventType::WrappedEvent;
-    }
-
-    if (event == Message_eventName_connect) {
-      return EventType::Connect;
-    }
-
-    if (event == Message_eventName_disconnect) {
-      return EventType::Disconnect;
-    }
-
-    assert(false && "Unknown event!");
-    std::abort();
-  }
-
-  static folly::dynamic constructResponseForPackager(EventType eventType, folly::dynamic &&payload) {
-    folly::dynamic response = folly::dynamic::object;
-
-    switch (eventType) {
-      case EventType::GetPages:
-        response[InspectorProtocol::Message_EVENT] = InspectorProtocol::Message_eventName_getPages;
-        break;
-      case EventType::WrappedEvent:
-        response[InspectorProtocol::Message_EVENT] = InspectorProtocol::Message_eventName_wrappedEvent;
-        break;
-      case EventType::Connect:
-        response[InspectorProtocol::Message_EVENT] = InspectorProtocol::Message_eventName_connect;
-        break;
-      case EventType::Disconnect:
-        response[InspectorProtocol::Message_EVENT] = InspectorProtocol::Message_eventName_disconnect;
-        break;
-      default:
-        assert(false && "Unknown event Type.");
-        std::abort();
-    }
-
-    response[InspectorProtocol::Message_PAYLOAD] = std::move(payload);
-    return response;
-  }
-
-  static folly::dynamic constructGetPagesResponsePayloadForPackager(
-      const std::vector<facebook::react::jsinspector_modern::InspectorPage> &pages,
-      InspectorPackagerConnection::BundleStatus bundleStatus) {
-    folly::dynamic payload = folly::dynamic::array;
-    for (const facebook::react::jsinspector_modern::InspectorPage &page : pages) {
-      folly::dynamic pageDyn = folly::dynamic::object;
-      pageDyn["id"] = page.id;
-      pageDyn["title"] = page.description;
-      pageDyn["vm"] = page.vm;
-
-      pageDyn["isLastBundleDownloadSuccess"] = bundleStatus.m_isLastDownloadSuccess;
-      pageDyn["bundleUpdateTimestamp"] = bundleStatus.m_updateTimestamp;
-
-      payload.push_back(pageDyn);
-    }
-    return payload;
-  }
-
-  static folly::dynamic constructVMResponsePayloadForPackager(int32_t pageId, std::string &&messageFromVM) {
-    folly::dynamic payload = folly::dynamic::object;
-    payload[InspectorProtocol::Message_eventName_wrappedEvent] = messageFromVM;
-    payload[InspectorProtocol::Message_PAGEID] = pageId;
-    return payload;
-  }
-
-  static folly::dynamic constructVMResponsePayloadOnDisconnectForPackager(int32_t pageId) {
-    folly::dynamic payload = folly::dynamic::object;
-    payload[InspectorProtocol::Message_PAGEID] = pageId;
-    return payload;
-  }
-};
-
-} // namespace
-
-RemoteConnection::RemoteConnection(int32_t pageId, const InspectorPackagerConnection &packagerConnection)
-    : m_packagerConnection(packagerConnection), m_pageId(pageId) {}
-
-void RemoteConnection::onMessage(std::string message) {
-  folly::dynamic response = InspectorProtocol::constructResponseForPackager(
-      InspectorProtocol::EventType::WrappedEvent,
-      InspectorProtocol::constructVMResponsePayloadForPackager(m_pageId, std::move(message)));
-  std::string responsestr = folly::toJson(response);
-  m_packagerConnection.sendMessageToPackager(std::move(responsestr));
-}
-
-void RemoteConnection::onDisconnect() {
-  folly::dynamic response = InspectorProtocol::constructResponseForPackager(
-      InspectorProtocol::EventType::Disconnect,
-      InspectorProtocol::constructVMResponsePayloadOnDisconnectForPackager(m_pageId));
-
-  std::string responsestr = folly::toJson(response);
-  m_packagerConnection.sendMessageToPackager(std::move(responsestr));
-}
-
-winrt::fire_and_forget InspectorPackagerConnection::sendMessageToPackagerAsync(std::string &&message) const {
-  std::string message_(std::move(message));
-  co_await winrt::resume_background();
-  m_packagerWebSocketConnection->Send(std::move(message_));
-  co_return;
-}
-
-void InspectorPackagerConnection::sendMessageToPackager(std::string &&message) const {
-  sendMessageToPackagerAsync(std::move(message));
-}
-
-void InspectorPackagerConnection::sendMessageToVM(int32_t pageId, std::string &&message) {
-  m_localConnections[pageId]->sendMessage(std::move(message));
-}
-
-InspectorPackagerConnection::InspectorPackagerConnection(
-    std::string &&url,
-    std::shared_ptr<IBundleStatusProvider> bundleStatusProvider)
-    : m_url(std::move(url)), m_bundleStatusProvider(std::move(bundleStatusProvider)) {}
-
-winrt::fire_and_forget InspectorPackagerConnection::disconnectAsync() {
-  co_await winrt::resume_background();
-  std::string reason("Explicit close");
-  m_packagerWebSocketConnection->Close(Microsoft::React::Networking::IWebSocketResource::CloseCode::GoingAway, reason);
-  co_return;
-}
-
-winrt::fire_and_forget InspectorPackagerConnection::connectAsync() {
-  co_await winrt::resume_background();
-
-  m_packagerWebSocketConnection = Microsoft::React::Networking::IWebSocketResource::Make();
-
-  m_packagerWebSocketConnection->SetOnError([](const Microsoft::React::Networking::IWebSocketResource::Error &err) {
-    facebook::react::tracing::error(err.Message.c_str());
-  });
-
-  m_packagerWebSocketConnection->SetOnConnect(
-      []() { facebook::react::tracing::log("Inspector: Websocket connection succeeded."); });
-
-  m_packagerWebSocketConnection->SetOnMessage(
-      [self = shared_from_this()](size_t /*length*/, const std::string &message, bool isBinary) {
-        assert(!isBinary && "We don't expect any binary messages !");
-        folly::dynamic messageDyn = folly::parseJson(message);
-
-        InspectorProtocol::EventType eventType = InspectorProtocol::getEventType(messageDyn);
-        switch (eventType) {
-          case InspectorProtocol::EventType::GetPages: {
-            std::vector<facebook::react::jsinspector_modern::InspectorPage> inspectorPages =
-                facebook::react::jsinspector_modern::getInspectorInstance().getPages();
-            folly::dynamic response = InspectorProtocol::constructResponseForPackager(
-                InspectorProtocol::EventType::GetPages,
-                InspectorProtocol::constructGetPagesResponsePayloadForPackager(
-                    inspectorPages, self->m_bundleStatusProvider->getBundleStatus()));
-
-            std::string responsestr = folly::toJson(response);
-            self->sendMessageToPackager(std::move(responsestr));
-            break;
-          }
-
-          case InspectorProtocol::EventType::WrappedEvent: {
-            folly::dynamic payload = messageDyn[InspectorProtocol::Message_PAYLOAD];
-            int32_t pageId = static_cast<int32_t>(payload[InspectorProtocol::Message_PAGEID].asInt());
-
-            if (self->m_localConnections.find(pageId) == self->m_localConnections.end()) {
-              break;
-            }
-
-            std::string wrappedEvent = payload[InspectorProtocol::Message_eventName_wrappedEvent].getString();
-            self->sendMessageToVM(pageId, std::move(wrappedEvent));
-            break;
-          }
-
-          case InspectorProtocol::EventType::Connect: {
-            folly::dynamic payload = messageDyn[InspectorProtocol::Message_PAYLOAD];
-            int32_t pageId = static_cast<int32_t>(payload[InspectorProtocol::Message_PAGEID].asInt());
-
-            if (self->m_localConnections.find(pageId) != self->m_localConnections.end()) {
-              break;
-            }
-
-            self->m_localConnections[pageId] = facebook::react::jsinspector_modern::getInspectorInstance().connect(
-                pageId, std::make_unique<RemoteConnection>(pageId, *self));
-            break;
-          }
-
-          case InspectorProtocol::EventType::Disconnect: {
-            folly::dynamic payload = messageDyn[InspectorProtocol::Message_PAYLOAD];
-            int32_t pageId = static_cast<int32_t>(payload[InspectorProtocol::Message_PAGEID].asInt());
-            if (self->m_localConnections.find(pageId) != self->m_localConnections.end()) {
-              self->m_localConnections[pageId]->disconnect();
-              self->m_localConnections.erase(pageId);
-            }
-            break;
-          }
-        }
-      });
-
-  Microsoft::React::Networking::IWebSocketResource::Protocols protocols;
-  Microsoft::React::Networking::IWebSocketResource::Options options;
-  m_packagerWebSocketConnection->Connect(std::string{m_url}, protocols, options);
-
-  co_return;
-}
-
-} // namespace Microsoft::ReactNative

package/Shared/InspectorPackagerConnection.h

@@ -1,61 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-#pragma once
-
-#include <Networking/IWebSocketResource.h>
-#include <jsinspector-modern/InspectorInterfaces.h>
-
-namespace Microsoft::ReactNative {
-
-class InspectorPackagerConnection final : public std::enable_shared_from_this<InspectorPackagerConnection> {
- public:
-  winrt::fire_and_forget connectAsync();
-  winrt::fire_and_forget disconnectAsync();
-
-  class BundleStatus {
-   public:
-    bool m_isLastDownloadSuccess;
-    int64_t m_updateTimestamp = -1;
-
-    BundleStatus(bool isLastDownloadSuccess, long updateTimestamp)
-        : m_isLastDownloadSuccess(isLastDownloadSuccess), m_updateTimestamp(updateTimestamp) {}
-    BundleStatus() : m_isLastDownloadSuccess(false), m_updateTimestamp(-1) {}
-  };
-
-  struct IBundleStatusProvider {
-    virtual BundleStatus getBundleStatus() = 0;
-  };
-
-  InspectorPackagerConnection(std::string &&url, std::shared_ptr<IBundleStatusProvider> bundleStatusProvider);
-
- private:
-  friend class RemoteConnection;
-
-  winrt::fire_and_forget sendMessageToPackagerAsync(std::string &&message) const;
-  void sendMessageToPackager(std::string &&message) const;
-
-  // Note:: VM side Inspector processes the messages asynchronously in a sequential executor with dedicated thread.
-  // Hence, we don't bother invoking the inspector asynchronously.
-  void sendMessageToVM(int32_t pageId, std::string &&message);
-
- private:
-  std::unordered_map<int32_t, std::unique_ptr<facebook::react::jsinspector_modern::ILocalConnection>>
-      m_localConnections;
-  std::shared_ptr<Microsoft::React::Networking::IWebSocketResource> m_packagerWebSocketConnection;
-  std::shared_ptr<IBundleStatusProvider> m_bundleStatusProvider;
-  std::string m_url;
-};
-
-class RemoteConnection final : public facebook::react::jsinspector_modern::IRemoteConnection {
- public:
-  RemoteConnection(int32_t pageId, const InspectorPackagerConnection &packagerConnection);
-  void onMessage(std::string message) override;
-  void onDisconnect() override;
-
- private:
-  int32_t m_pageId;
-  const InspectorPackagerConnection &m_packagerConnection;
-};
-
-} // namespace Microsoft::ReactNative

package/Shared/Modules/ExceptionsManagerModule.cpp

@@ -1,209 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-#include "ExceptionsManagerModule.h"
-#include <assert.h>
-#include <cxxreact/JsArgumentHelpers.h>
-#include <sstream>
-
-namespace facebook {
-namespace react {
-
-namespace {
-std::string RetrieveOptionalStringFromMap(const folly::dynamic &map, const std::string &key) noexcept {
-  assert(map.type() == folly::dynamic::OBJECT);
-  auto iterator = map.find(key);
-  if (iterator != map.items().end()) {
-    if (iterator->second.isNull()) {
-      return {};
-    }
-    return iterator->second.asString();
-  }
-  return {};
-}
-
-int RetrieveIntFromMap(const folly::dynamic &map, const std::string &key) noexcept {
-  assert(map.type() == folly::dynamic::OBJECT);
-
-  auto iterator = map.find(key);
-  if (iterator != map.items().end()) {
-    if (iterator->second.isNull()) {
-      return -1;
-    }
-    assert(iterator->second.isNumber());
-    return static_cast<int>(iterator->second.asDouble());
-  }
-  assert(false);
-  return -1;
-}
-
-bool RetrieveOptionalBoolFromMap(const folly::dynamic &map, const std::string &key) noexcept {
-  assert(map.type() == folly::dynamic::OBJECT);
-
-  auto iterator = map.find(key);
-  if (iterator != map.items().end()) {
-    if (iterator->second.isNull()) {
-      return false;
-    }
-    assert(iterator->second.isBool());
-    return iterator->second.asBool();
-  }
-  return false;
-}
-
-Mso::React::ErrorInfo CreateErrorInfo(const folly::dynamic &args) noexcept {
-  // Parameter args is a dynamic array containing 3 objects:
-  // 1. an exception message string.
-  // 2. an array containing stack information.
-  // 3. an exceptionID int.
-  assert(args.isArray());
-  assert(args.size() == 3);
-  assert(args[0].isString());
-  assert(args[1].isArray());
-  assert(args[2].isNumber());
-  assert(facebook::xplat::jsArgAsInt(args, 2) <= std::numeric_limits<uint32_t>::max());
-
-  Mso::React::ErrorInfo errorInfo;
-  errorInfo.Message = facebook::xplat::jsArgAsString(args, 0);
-  errorInfo.Id = static_cast<uint32_t>(facebook::xplat::jsArgAsInt(args, 2));
-
-  folly::dynamic stackAsFolly = facebook::xplat::jsArgAsArray(args, 1);
-
-  // Construct a string containing the stack frame info in the following format:
-  // <method> Line:<Line Number>  Column:<ColumnNumber> <Filename>
-  for (const auto &stackFrame : stackAsFolly) {
-    // Each dynamic object is a map containing information about the stack
-    // frame: method (string), arguments (array), filename(string), line number
-    // (int) and column number (int).
-    assert(stackFrame.isObject());
-    assert(stackFrame.size() >= 4); // 4 in 0.57, 5 in 0.58+ (arguments added)
-
-    errorInfo.Callstack.push_back(Mso::React::ErrorFrameInfo{
-        RetrieveOptionalStringFromMap(stackFrame, "file"),
-        RetrieveOptionalStringFromMap(stackFrame, "methodName"),
-        RetrieveIntFromMap(stackFrame, "lineNumber"),
-        RetrieveIntFromMap(stackFrame, "column"),
-        false});
-  }
-
-  return errorInfo;
-}
-
-Mso::React::ErrorInfo CreateErrorInfo2(const folly::dynamic &args) noexcept {
-  /*
-   Parameter args is an object:
-      message: string,
-      originalMessage: ?string,
-      name: ?string,
-      componentStack: ?string,
-      stack: Array<StackFrame>,
-      id: number,
-      isFatal: boolean,
-      // flowlint-next-line unclear-type:off
-      extraData?: Object,
-  */
-  assert(args.isObject());
-
-  Mso::React::ErrorInfo errorInfo;
-
-  errorInfo.Message = RetrieveOptionalStringFromMap(args, "message");
-  errorInfo.OriginalMessage = RetrieveOptionalStringFromMap(args, "originalMessage");
-  errorInfo.Name = RetrieveOptionalStringFromMap(args, "name");
-  errorInfo.ComponentStack = RetrieveOptionalStringFromMap(args, "componentStack");
-  errorInfo.Id = RetrieveIntFromMap(args, "id");
-
-  auto iterator = args.find("extraData");
-  if (iterator != args.items().end()) {
-    if (iterator->second.isObject()) {
-      errorInfo.ExtraData = iterator->second;
-    }
-  }
-
-  iterator = args.find("stack");
-  if (iterator != args.items().end()) {
-    if (iterator->second.isArray()) {
-      auto stackAsFolly = iterator->second;
-      for (const auto &stackFrame : stackAsFolly) {
-        // Each dynamic object is a map containing information about the stack
-        // frame: method (string), arguments (array), filename(string), line number
-        // (int) and column number (int).
-        assert(stackFrame.isObject());
-        assert(stackFrame.size() >= 4); // 4 in 0.57, 5 in 0.58+ (arguments added)
-
-        errorInfo.Callstack.push_back(Mso::React::ErrorFrameInfo{
-            RetrieveOptionalStringFromMap(stackFrame, "file"),
-            RetrieveOptionalStringFromMap(stackFrame, "methodName"),
-            RetrieveIntFromMap(stackFrame, "lineNumber"),
-            RetrieveIntFromMap(stackFrame, "column"),
-            RetrieveOptionalBoolFromMap(stackFrame, "collapse")});
-      }
-    }
-  }
-
-  return errorInfo;
-}
-
-} // namespace
-
-ExceptionsManagerModule::ExceptionsManagerModule(std::shared_ptr<Mso::React::IRedBoxHandler> redboxHandler)
-    : m_redboxHandler(std::move(redboxHandler)) {}
-
-std::string ExceptionsManagerModule::getName() {
-  return name;
-}
-
-std::map<std::string, folly::dynamic> ExceptionsManagerModule::getConstants() {
-  return std::map<std::string, folly::dynamic>();
-}
-
-std::vector<facebook::xplat::module::CxxModule::Method> ExceptionsManagerModule::getMethods() {
-  auto redboxHandler = m_redboxHandler;
-  return {
-      Method(
-          "reportFatalException",
-          [redboxHandler](folly::dynamic args) noexcept {
-            if (redboxHandler && redboxHandler->isDevSupportEnabled()) {
-              redboxHandler->showNewError(std::move(CreateErrorInfo(args)), Mso::React::ErrorType::JSFatal);
-            }
-            /*
-            // TODO - fatal errors should throw if there is no redbox handler
-            else {
-              throw Exception();
-            } */
-          }),
-
-      Method(
-          "reportSoftException",
-          [redboxHandler](folly::dynamic args) noexcept {
-            if (redboxHandler && redboxHandler->isDevSupportEnabled()) {
-              redboxHandler->showNewError(std::move(CreateErrorInfo(args)), Mso::React::ErrorType::JSSoft);
-            }
-          }),
-
-      Method(
-          "reportException",
-          [redboxHandler](folly::dynamic args) noexcept {
-            if (redboxHandler && redboxHandler->isDevSupportEnabled()) {
-              auto isFatal = RetrieveOptionalBoolFromMap(args[0], "isFatal");
-              redboxHandler->showNewError(
-                  std::move(CreateErrorInfo2(args[0])),
-                  isFatal ? Mso::React::ErrorType::JSFatal : Mso::React::ErrorType::JSSoft);
-            }
-          }),
-
-      Method(
-          "updateExceptionMessage",
-          [redboxHandler](folly::dynamic args) noexcept {
-            if (redboxHandler && redboxHandler->isDevSupportEnabled()) {
-              redboxHandler->updateError(std::move(CreateErrorInfo(args)));
-            }
-          }),
-
-      Method("dismissRedbox", [redboxHandler](folly::dynamic /*args*/) noexcept {
-        if (redboxHandler)
-          redboxHandler->dismissRedbox();
-      })};
-}
-
-} // namespace react
-} // namespace facebook

package/Shared/Modules/ExceptionsManagerModule.h

@@ -1,32 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-#pragma once
-
-#include <DevSettings.h>
-#include <IRedBoxHandler.h>
-#include <cxxreact/CxxModule.h>
-#include <folly/dynamic.h>
-#include <map>
-#include <vector>
-
-namespace facebook {
-namespace react {
-
-class ExceptionsManagerModule : public facebook::xplat::module::CxxModule {
- public:
-  ExceptionsManagerModule(std::shared_ptr<Mso::React::IRedBoxHandler> redboxHandler);
-
-  static constexpr const char *name = "ExceptionsManager";
-
-  // CxxModule
-  std::string getName() override;
-  std::map<std::string, folly::dynamic> getConstants() override;
-  std::vector<Method> getMethods() override;
-
- private:
-  std::shared_ptr<Mso::React::IRedBoxHandler> m_redboxHandler;
-};
-
-} // namespace react
-} // namespace facebook

package/Shared/Modules/I18nModule.cpp

@@ -1,36 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-#include "I18nModule.h"
-#include <cxxreact/JsArgumentHelpers.h>
-
-using namespace facebook::xplat;
-
-namespace react {
-namespace windows {
-
-I18nModule::I18nModule(std::unique_ptr<II18nModule> module) : m_module(std::move(module)) {}
-
-std::string I18nModule::getName() {
-  return "I18nManager";
-}
-
-std::map<std::string, folly::dynamic> I18nModule::getConstants() {
-  return {
-      {"localeIdentifier", folly::dynamic{m_module->getLocaleIdentifier()}},
-      {"isRTL", folly::dynamic{m_module->getIsRTL()}}};
-}
-
-std::vector<facebook::xplat::module::CxxModule::Method> I18nModule::getMethods() {
-  return {
-      Method("allowRTL", [this](folly::dynamic args) { this->m_module->setAllowRTL(jsArgAsBool(args, 0)); }),
-      Method("forceRTL", [this](folly::dynamic args) { this->m_module->setForceRTL(jsArgAsBool(args, 0)); }),
-  };
-}
-
-std::unique_ptr<facebook::xplat::module::CxxModule> createI18nModule(std::unique_ptr<II18nModule> module) {
-  return std::make_unique<I18nModule>(std::move(module));
-}
-
-} // namespace windows
-} // namespace react

package/Shared/Modules/I18nModule.h

@@ -1,28 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-#pragma once
-
-#include <Shared/II18nModule.h>
-#include <cxxreact/CxxModule.h>
-#include <folly/dynamic.h>
-
-namespace react {
-namespace windows {
-
-class I18nModule : public facebook::xplat::module::CxxModule {
- public:
-  I18nModule(std::unique_ptr<II18nModule> module);
-
-  virtual std::string getName() override;
-  virtual std::map<std::string, folly::dynamic> getConstants() override;
-  virtual std::vector<Method> getMethods() override;
-
- private:
-  std::unique_ptr<II18nModule> m_module;
-};
-
-std::unique_ptr<facebook::xplat::module::CxxModule> createI18nModule(std::unique_ptr<II18nModule> module);
-
-} // namespace windows
-} // namespace react