react-native-windows 0.82.3 → 0.83.0-preview.1

package/ReactCommon/TEMP_UntilReactCommonUpdate/jsiexecutor/jsireact/JSIExecutor.cpp

@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+
 #if _MSC_VER
 #pragma warning(push)
 #pragma warning(disable : 4996) // deprecated APIs
@@ -29,7 +30,7 @@ using namespace facebook::jsi;
 
 namespace facebook::react {
 
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 class JSIExecutor::NativeModuleProxy : public jsi::HostObject {
  public:
@@ -49,7 +50,10 @@ class JSIExecutor::NativeModuleProxy : public jsi::HostObject {
     return nativeModules->getModule(rt, name);
   }
 
-  void set(Runtime&, const PropNameID&, const Value&) override {
+  void set(
+      Runtime& /*unused*/,
+      const PropNameID& /*name*/,
+      const Value& /*value*/) override {
     throw std::runtime_error(
         "Unable to put on NativeModules: Operation unsupported");
   }
@@ -75,8 +79,9 @@ JSIExecutor::JSIExecutor(
     RuntimeInstaller runtimeInstaller)
     : runtime_(runtime),
       delegate_(delegate),
-      nativeModules_(std::make_shared<JSINativeModules>(
-          delegate ? delegate->getModuleRegistry() : nullptr)),
+      nativeModules_(
+          std::make_shared<JSINativeModules>(
+              delegate ? delegate->getModuleRegistry() : nullptr)),
       moduleRegistry_(delegate ? delegate->getModuleRegistry() : nullptr),
       scopedTimeoutInvoker_(scopedTimeoutInvoker),
       runtimeInstaller_(runtimeInstaller) {
@@ -269,8 +274,9 @@ void JSIExecutor::invokeCallback(
     ret = invokeCallbackAndReturnFlushedQueue_->call(
         *runtime_, callbackId, valueFromDynamic(*runtime_, arguments));
   } catch (...) {
-    std::throw_with_nested(std::runtime_error(
-        "Error invoking callback " + std::to_string(callbackId)));
+    std::throw_with_nested(
+        std::runtime_error(
+            "Error invoking callback " + std::to_string(callbackId)));
   }
 
   callNativeModules(ret, true);
@@ -527,7 +533,7 @@ Value JSIExecutor::globalEvalWithSourceUrl(const Value* args, size_t count) {
       std::make_unique<StringBuffer>(std::move(code)), url);
 }
 
-#else // RCT_FIT_RM_OLD_RUNTIME
+#else // RCT_REMOVE_LEGACY_ARCH
 
 JSIExecutor::JSIExecutor(
     std::shared_ptr<jsi::Runtime> runtime,
@@ -574,7 +580,7 @@ void JSIExecutor::handleMemoryPressure(int pressureLevel) {}
 
 void JSIExecutor::flush() {}
 
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH
 
 void bindNativeLogger(Runtime& runtime, Logger logger) {
   runtime.global().setProperty(
@@ -617,6 +623,7 @@ void bindNativePerformanceNow(Runtime& runtime) {
 }
 
 } // namespace facebook::react
+
 #if _MSC_VER
 #pragma warning(pop)
 #endif

package/ReactCommon/TEMP_UntilReactCommonUpdate/jsiexecutor/jsireact/JSINativeModules.cpp

@@ -5,13 +5,14 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+
 #if _MSC_VER
 #pragma warning(push)
 #pragma warning(disable : 4996) // deprecated APIs
 #endif
 #include "jsireact/JSINativeModules.h"
 
-#ifndef RCT_FIT_RM_OLD_RUNTIME
+#ifndef RCT_REMOVE_LEGACY_ARCH
 
 #include <reactperflogger/BridgeNativeModulePerfLogger.h>
 
@@ -115,7 +116,8 @@ std::optional<Object> JSINativeModules::createModule(
 
 } // namespace facebook::react
 
-#endif // RCT_FIT_RM_OLD_RUNTIME
+#endif // RCT_REMOVE_LEGACY_ARCH
+
 #if _MSC_VER
 #pragma warning(pop)
 #endif

package/ReactCommon/TEMP_UntilReactCommonUpdate/jsinspector-modern/NetworkIOAgent.cpp

@@ -11,7 +11,7 @@
 #include "Base64.h"
 #include "Utf8.h"
 
-#include <jsinspector-modern/network/NetworkReporter.h>
+#include <jsinspector-modern/network/NetworkHandler.h>
 
 #include <sstream>
 #include <tuple>
@@ -140,8 +140,10 @@ class Stream : public NetworkRequestListener,
     // called with it.
     if (initCb_) {
       auto cb = std::move(initCb_);
-      (*cb)(
-          InitStreamResult{httpStatusCode, headers, this->shared_from_this()});
+      (*cb)(InitStreamResult{
+          .httpStatusCode = httpStatusCode,
+          .headers = headers,
+          .stream = this->shared_from_this()});
     }
   }
 
@@ -275,21 +277,21 @@ bool NetworkIOAgent::handleRequest(
   }
 
   if (InspectorFlags::getInstance().getNetworkInspectionEnabled()) {
-    auto& networkReporter = NetworkReporter::getInstance();
+    auto& networkHandler = NetworkHandler::getInstance();
 
     // @cdp Network.enable support is experimental.
     if (req.method == "Network.enable") {
-      networkReporter.setFrontendChannel(frontendChannel_);
-      networkReporter.enableDebugging();
-      frontendChannel_(cdp::jsonResult(req.id));
-      return true;
+      networkHandler.setFrontendChannel(frontendChannel_);
+      networkHandler.enable();
+      // NOTE: Domain enable/disable responses are sent by HostAgent.
+      return false;
     }
 
     // @cdp Network.disable support is experimental.
     if (req.method == "Network.disable") {
-      networkReporter.disableDebugging();
-      frontendChannel_(cdp::jsonResult(req.id));
-      return true;
+      networkHandler.disable();
+      // NOTE: Domain enable/disable responses are sent by HostAgent.
+      return false;
     }
 
     // @cdp Network.getResponseBody support is experimental.
@@ -310,17 +312,19 @@ void NetworkIOAgent::handleLoadNetworkResource(
   LoadNetworkResourceRequest params;
 
   if (!req.params.isObject()) {
-    frontendChannel_(cdp::jsonError(
-        req.id,
-        cdp::ErrorCode::InvalidParams,
-        "Invalid params: not an object."));
+    frontendChannel_(
+        cdp::jsonError(
+            req.id,
+            cdp::ErrorCode::InvalidParams,
+            "Invalid params: not an object."));
     return;
   }
   if ((req.params.count("url") == 0u) || !req.params.at("url").isString()) {
-    frontendChannel_(cdp::jsonError(
-        requestId,
-        cdp::ErrorCode::InvalidParams,
-        "Invalid params: url is missing or not a string."));
+    frontendChannel_(
+        cdp::jsonError(
+            requestId,
+            cdp::ErrorCode::InvalidParams,
+            "Invalid params: url is missing or not a string."));
     return;
   } else {
     params.url = req.params.at("url").asString();
@@ -393,18 +397,20 @@ void NetworkIOAgent::handleLoadNetworkResource(
 void NetworkIOAgent::handleIoRead(const cdp::PreparsedRequest& req) {
   long long requestId = req.id;
   if (!req.params.isObject()) {
-    frontendChannel_(cdp::jsonError(
-        requestId,
-        cdp::ErrorCode::InvalidParams,
-        "Invalid params: not an object."));
+    frontendChannel_(
+        cdp::jsonError(
+            requestId,
+            cdp::ErrorCode::InvalidParams,
+            "Invalid params: not an object."));
     return;
   }
   if ((req.params.count("handle") == 0u) ||
       !req.params.at("handle").isString()) {
-    frontendChannel_(cdp::jsonError(
-        requestId,
-        cdp::ErrorCode::InvalidParams,
-        "Invalid params: handle is missing or not a string."));
+    frontendChannel_(
+        cdp::jsonError(
+            requestId,
+            cdp::ErrorCode::InvalidParams,
+            "Invalid params: handle is missing or not a string."));
     return;
   }
   std::optional<int64_t> size = std::nullopt;
@@ -412,10 +418,11 @@ void NetworkIOAgent::handleIoRead(const cdp::PreparsedRequest& req) {
     size = req.params.at("size").asInt();
 
     if (size > MAX_BYTES_PER_READ) {
-      frontendChannel_(cdp::jsonError(
-          requestId,
-          cdp::ErrorCode::InvalidParams,
-          "Invalid params: size cannot be greater than 10MB."));
+      frontendChannel_(
+          cdp::jsonError(
+              requestId,
+              cdp::ErrorCode::InvalidParams,
+              "Invalid params: size cannot be greater than 10MB."));
       return;
     }
   }
@@ -423,10 +430,11 @@ void NetworkIOAgent::handleIoRead(const cdp::PreparsedRequest& req) {
   auto streamId = req.params.at("handle").asString();
   auto it = streams_->find(streamId);
   if (it == streams_->end()) {
-    frontendChannel_(cdp::jsonError(
-        requestId,
-        cdp::ErrorCode::InternalError,
-        "Stream not found with handle " + streamId));
+    frontendChannel_(
+        cdp::jsonError(
+            requestId,
+            cdp::ErrorCode::InternalError,
+            "Stream not found with handle " + streamId));
     return;
   } else {
     it->second->read(
@@ -438,8 +446,9 @@ void NetworkIOAgent::handleIoRead(const cdp::PreparsedRequest& req) {
           if (auto* error = std::get_if<IOReadError>(&resultOrError)) {
             // NB: Chrome DevTools calls IO.close after a read error, so any
             // continuing download or retained data is cleaned up at that point.
-            frontendChannel(cdp::jsonError(
-                requestId, cdp::ErrorCode::InternalError, *error));
+            frontendChannel(
+                cdp::jsonError(
+                    requestId, cdp::ErrorCode::InternalError, *error));
           } else if (auto* result = std::get_if<IOReadResult>(&resultOrError)) {
             frontendChannel(cdp::jsonResult(requestId, result->toDynamic()));
           } else {
@@ -453,28 +462,31 @@ void NetworkIOAgent::handleIoRead(const cdp::PreparsedRequest& req) {
 void NetworkIOAgent::handleIoClose(const cdp::PreparsedRequest& req) {
   long long requestId = req.id;
   if (!req.params.isObject()) {
-    frontendChannel_(cdp::jsonError(
-        requestId,
-        cdp::ErrorCode::InvalidParams,
-        "Invalid params: not an object."));
+    frontendChannel_(
+        cdp::jsonError(
+            requestId,
+            cdp::ErrorCode::InvalidParams,
+            "Invalid params: not an object."));
     return;
   }
   if ((req.params.count("handle") == 0u) ||
       !req.params.at("handle").isString()) {
-    frontendChannel_(cdp::jsonError(
-        requestId,
-        cdp::ErrorCode::InvalidParams,
-        "Invalid params: handle is missing or not a string."));
+    frontendChannel_(
+        cdp::jsonError(
+            requestId,
+            cdp::ErrorCode::InvalidParams,
+            "Invalid params: handle is missing or not a string."));
     return;
   }
   auto streamId = req.params.at("handle").asString();
 
   auto it = streams_->find(streamId);
   if (it == streams_->end()) {
-    frontendChannel_(cdp::jsonError(
-        requestId,
-        cdp::ErrorCode::InternalError,
-        "Stream not found: " + streamId));
+    frontendChannel_(
+        cdp::jsonError(
+            requestId,
+            cdp::ErrorCode::InternalError,
+            "Stream not found: " + streamId));
   } else {
     it->second->cancel();
     streams_->erase(it->first);
@@ -485,39 +497,43 @@ void NetworkIOAgent::handleIoClose(const cdp::PreparsedRequest& req) {
 void NetworkIOAgent::handleGetResponseBody(const cdp::PreparsedRequest& req) {
   long long requestId = req.id;
   if (!req.params.isObject()) {
-    frontendChannel_(cdp::jsonError(
-        requestId,
-        cdp::ErrorCode::InvalidParams,
-        "Invalid params: not an object."));
+    frontendChannel_(
+        cdp::jsonError(
+            requestId,
+            cdp::ErrorCode::InvalidParams,
+            "Invalid params: not an object."));
     return;
   }
   if ((req.params.count("requestId") == 0u) ||
       !req.params.at("requestId").isString()) {
-    frontendChannel_(cdp::jsonError(
-        requestId,
-        cdp::ErrorCode::InvalidParams,
-        "Invalid params: requestId is missing or not a string."));
+    frontendChannel_(
+        cdp::jsonError(
+            requestId,
+            cdp::ErrorCode::InvalidParams,
+            "Invalid params: requestId is missing or not a string."));
     return;
   }
 
-  auto& networkReporter = NetworkReporter::getInstance();
+  auto& networkHandler = NetworkHandler::getInstance();
 
-  if (!networkReporter.isDebuggingEnabled()) {
-    frontendChannel_(cdp::jsonError(
-        requestId,
-        cdp::ErrorCode::InvalidRequest,
-        "Invalid request: The \"Network\" domain is not enabled."));
+  if (!networkHandler.isEnabled()) {
+    frontendChannel_(
+        cdp::jsonError(
+            requestId,
+            cdp::ErrorCode::InvalidRequest,
+            "Invalid request: The \"Network\" domain is not enabled."));
     return;
   }
 
   auto storedResponse =
-      networkReporter.getResponseBody(req.params.at("requestId").asString());
+      networkHandler.getResponseBody(req.params.at("requestId").asString());
 
   if (!storedResponse) {
-    frontendChannel_(cdp::jsonError(
-        requestId,
-        cdp::ErrorCode::InternalError,
-        "Internal error: Could not retrieve response body for the given requestId."));
+    frontendChannel_(
+        cdp::jsonError(
+            requestId,
+            cdp::ErrorCode::InternalError,
+            "Internal error: Could not retrieve response body for the given requestId."));
     return;
   }
 

package/ReactCommon/TEMP_UntilReactCommonUpdate/jsinspector-modern/NetworkIOAgent.h

@@ -40,11 +40,12 @@ struct ReadStreamParams {
 
 struct NetworkResource {
   bool success{};
-  std::optional<std::string> stream;
-  std::optional<uint32_t> httpStatusCode;
-  std::optional<std::string> netErrorName;
-  std::optional<Headers> headers;
-  folly::dynamic toDynamic() const {
+  std::optional<std::string> stream{};
+  std::optional<uint32_t> httpStatusCode{};
+  std::optional<std::string> netErrorName{};
+  std::optional<Headers> headers{};
+  folly::dynamic toDynamic() const
+  {
     auto dynamicResource = folly::dynamic::object("success", success);
 
     if (success) { // stream IFF successful
@@ -65,7 +66,7 @@ struct NetworkResource {
 
     if (headers) { // Guaranteed if successful
       auto dynamicHeaders = folly::dynamic::object();
-      for (const auto& pair : *headers) {
+      for (const auto &pair : *headers) {
         dynamicHeaders(pair.first, pair.second);
       }
       dynamicResource("headers", std::move(dynamicHeaders));
@@ -80,7 +81,8 @@ struct IOReadResult {
   std::string data;
   bool eof;
   bool base64Encoded;
-  folly::dynamic toDynamic() const {
+  folly::dynamic toDynamic() const
+  {
     auto obj = folly::dynamic::object("data", data);
     obj("eof", eof);
     obj("base64Encoded", base64Encoded);
@@ -91,7 +93,8 @@ struct IOReadResult {
 struct GetResponseBodyResult {
   std::string body;
   bool base64Encoded;
-  folly::dynamic toDynamic() const {
+  folly::dynamic toDynamic() const
+  {
     folly::dynamic params = folly::dynamic::object;
     params["body"] = body;
     params["base64Encoded"] = base64Encoded;
@@ -106,11 +109,10 @@ struct GetResponseBodyResult {
 class NetworkRequestListener {
  public:
   NetworkRequestListener() = default;
-  NetworkRequestListener(const NetworkRequestListener&) = delete;
-  NetworkRequestListener& operator=(const NetworkRequestListener&) = delete;
-  NetworkRequestListener(NetworkRequestListener&&) noexcept = default;
-  NetworkRequestListener& operator=(NetworkRequestListener&&) noexcept =
-      default;
+  NetworkRequestListener(const NetworkRequestListener &) = delete;
+  NetworkRequestListener &operator=(const NetworkRequestListener &) = delete;
+  NetworkRequestListener(NetworkRequestListener &&) noexcept = default;
+  NetworkRequestListener &operator=(NetworkRequestListener &&) noexcept = default;
   virtual ~NetworkRequestListener() = default;
 
   /**
@@ -120,7 +122,7 @@ class NetworkRequestListener {
    * \param httpStatusCode The HTTP status code received.
    * \param headers Response headers as an unordered_map.
    */
-  virtual void onHeaders(uint32_t httpStatusCode, const Headers& headers) = 0;
+  virtual void onHeaders(uint32_t httpStatusCode, const Headers &headers) = 0;
 
   /**
    * To be called by the delegate on receipt of data chunks.
@@ -137,7 +139,7 @@ class NetworkRequestListener {
    * were not yet received), or as a CDP error in response to a subsequent
    * `IO.read`.
    */
-  virtual void onError(const std::string& message) = 0;
+  virtual void onError(const std::string &message) = 0;
 
   /**
    * To be called by the delegate on successful completion of the request.
@@ -163,12 +165,10 @@ class NetworkRequestListener {
 class LoadNetworkResourceDelegate {
  public:
   LoadNetworkResourceDelegate() = default;
-  LoadNetworkResourceDelegate(const LoadNetworkResourceDelegate&) = delete;
-  LoadNetworkResourceDelegate& operator=(const LoadNetworkResourceDelegate&) =
-      delete;
-  LoadNetworkResourceDelegate(LoadNetworkResourceDelegate&&) noexcept = delete;
-  LoadNetworkResourceDelegate& operator=(
-      LoadNetworkResourceDelegate&&) noexcept = delete;
+  LoadNetworkResourceDelegate(const LoadNetworkResourceDelegate &) = delete;
+  LoadNetworkResourceDelegate &operator=(const LoadNetworkResourceDelegate &) = delete;
+  LoadNetworkResourceDelegate(LoadNetworkResourceDelegate &&) noexcept = delete;
+  LoadNetworkResourceDelegate &operator=(LoadNetworkResourceDelegate &&) noexcept = delete;
   virtual ~LoadNetworkResourceDelegate() = default;
 
   /**
@@ -185,7 +185,7 @@ class LoadNetworkResourceDelegate {
    * called to abort any in-flight network operation that is no longer needed.
    */
   virtual void loadNetworkResource(
-      [[maybe_unused]] const LoadNetworkResourceRequest& params,
+      [[maybe_unused]] const LoadNetworkResourceRequest &params,
       [[maybe_unused]] ScopedExecutor<NetworkRequestListener> executor) = 0;
 };
 
@@ -207,18 +207,16 @@ class NetworkIOAgent {
    * processing incoming data or other events from network operations.
    */
   NetworkIOAgent(FrontendChannel frontendChannel, VoidExecutor executor)
-      : frontendChannel_(frontendChannel),
-        executor_(executor),
-        streams_(std::make_shared<StreamsMap>()) {}
+      : frontendChannel_(frontendChannel), executor_(executor), streams_(std::make_shared<StreamsMap>())
+  {
+  }
 
   /**
    * Handle a CDP request. The response will be sent over the provided
    * \c FrontendChannel synchronously or asynchronously.
    * \param req The parsed request.
    */
-  bool handleRequest(
-      const cdp::PreparsedRequest& req,
-      LoadNetworkResourceDelegate& delegate);
+  bool handleRequest(const cdp::PreparsedRequest &req, LoadNetworkResourceDelegate &delegate);
 
  private:
   /**
@@ -255,26 +253,24 @@ class NetworkIOAgent {
    * Does not catch exceptions thrown by the delegate (such as
    * NotImplementedException).
    */
-  void handleLoadNetworkResource(
-      const cdp::PreparsedRequest& req,
-      LoadNetworkResourceDelegate& delegate);
+  void handleLoadNetworkResource(const cdp::PreparsedRequest &req, LoadNetworkResourceDelegate &delegate);
 
   /**
    * Handle an IO.read CDP request. Emit a chunk of data from the stream, once
    * enough has been downloaded, or report an error.
    */
-  void handleIoRead(const cdp::PreparsedRequest& req);
+  void handleIoRead(const cdp::PreparsedRequest &req);
 
   /**
    * Handle an IO.close CDP request. Safely aborts any in-flight request.
    * Reports CDP ok if the stream is found, or a CDP error if not.
    */
-  void handleIoClose(const cdp::PreparsedRequest& req);
+  void handleIoClose(const cdp::PreparsedRequest &req);
 
   /**
    * Handle a Network.getResponseBody CDP request.
    */
-  void handleGetResponseBody(const cdp::PreparsedRequest& req);
+  void handleGetResponseBody(const cdp::PreparsedRequest &req);
 };
 
-} // namespace facebook::react::jsinspector_modern
+} // namespace facebook::react::jsinspector_modern

package/ReactCommon/TEMP_UntilReactCommonUpdate/jsinspector-modern/Utf8.h

@@ -19,7 +19,8 @@ namespace facebook::react::jsinspector_modern {
  *
  * \param buffer Buffer to operate on - will be resized if necessary.
  */
-inline void truncateToValidUTF8(std::vector<char>& buffer) {
+inline void truncateToValidUTF8(std::vector<char> &buffer)
+{
   const auto length = buffer.size();
   // Ensure we don't cut a UTF-8 code point in the middle by removing any
   // trailing bytes representing an incomplete UTF-8 code point.
@@ -31,8 +32,7 @@ inline void truncateToValidUTF8(std::vector<char>& buffer) {
     size_t continuationBytes = 0; // [Windows #13587]
     // Find the first byte of the UTF-8 code point (topmost bits 11) and count
     // the number of continuation bytes following it.
-    while ((buffer[length - continuationBytes - 1] & 0b11000000) !=
-           0b11000000) {
+    while ((buffer[length - continuationBytes - 1] & 0b11000000) != 0b11000000) {
       continuationBytes++;
       if (continuationBytes > 3 || continuationBytes >= length - 1) {
         throw std::runtime_error("Invalid UTF-8 sequence");
@@ -46,8 +46,7 @@ inline void truncateToValidUTF8(std::vector<char>& buffer) {
     // by a 0.
     char mask = static_cast<char>(0b11111000 << (3 - continuationBytes));
     char expectedBitsAfterMask = static_cast<char>(mask << 1);
-    if (continuationBytes == 0 ||
-        (firstByteOfSequence & mask) != expectedBitsAfterMask) {
+    if (continuationBytes == 0 || (firstByteOfSequence & mask) != expectedBitsAfterMask) {
       // Remove the trailing continuation bytes, if any, and the first byte.
       buffer.resize(length - (continuationBytes + 1));
     }

package/ReactCommon/TEMP_UntilReactCommonUpdate/jsinspector-modern/network/HttpUtils.cpp

@@ -146,7 +146,8 @@ std::string httpReasonPhrase(uint16_t status) {
   return "<Unknown>";
 }
 
-std::string mimeTypeFromHeaders(const Headers& headers) {
+std::string mimeTypeFromHeaders(
+    const std::map<std::string, std::string>& headers) {
   std::string mimeType = "application/octet-stream";
 
   for (const auto& [name, value] : headers) {