react-native-tvos 0.82.1-0 → 0.83.0-0

package/ReactCommon/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>
@@ -137,8 +137,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()});
     }
   }
 
@@ -272,21 +274,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.
@@ -307,17 +309,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();
@@ -390,18 +394,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;
@@ -409,10 +415,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;
     }
   }
@@ -420,10 +427,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(
@@ -435,8 +443,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 {
@@ -450,28 +459,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);
@@ -482,39 +494,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/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

package/ReactCommon/jsinspector-modern/PerfMonitorV2.cpp

@@ -13,79 +13,17 @@
 
 namespace facebook::react::jsinspector_modern {
 
-namespace {
-
-constexpr uint16_t MIN_DURATION = 200;
-constexpr uint16_t DEFAULT_TTL = 4000;
-constexpr uint16_t BAD_EVENT_TTL = 20000;
-
-InteractionResponsivenessScore getInteractionScore(uint16_t duration) {
-  constexpr uint16_t GOOD_THRESHOLD = 200;
-  constexpr uint16_t NEEDS_IMPROVEMENT_THRESHOLD = 500;
-
-  if (duration < GOOD_THRESHOLD) {
-    return InteractionResponsivenessScore::Good;
-  } else if (duration < NEEDS_IMPROVEMENT_THRESHOLD) {
-    return InteractionResponsivenessScore::NeedsImprovement;
-  } else {
-    return InteractionResponsivenessScore::Poor;
-  }
-}
-
-} // namespace
-
-void PerfMonitorUpdateHandler::handlePerfMetricsUpdate(
+void PerfMonitorUpdateHandler::handlePerfIssueAdded(
     const std::string& message) {
   auto payload = folly::parseJson(message);
 
   if (payload.isObject()) {
-    if (payload["name"] != "__ReactNative__LongTask") {
-      return;
-    }
-
-    auto duration = static_cast<uint16_t>(payload["duration"].asInt());
-
-    if (duration < MIN_DURATION) {
-      return;
-    }
-
-    auto responsivenessScore = getInteractionScore(duration);
-    auto ttl = responsivenessScore == InteractionResponsivenessScore::Poor
-        ? BAD_EVENT_TTL
-        : DEFAULT_TTL;
-
-    LongTaskPayload newEvent{
-        static_cast<uint16_t>(payload["startTime"].asInt()),
-        duration,
-        responsivenessScore,
-        ttl};
-
-    if (shouldOverrideLastEvent(newEvent)) {
-      lastEvent_ = newEvent;
-      delegate_.unstable_onPerfMonitorUpdate(
-          PerfMonitorUpdateRequest{newEvent});
-    }
-  }
-}
-
-bool PerfMonitorUpdateHandler::shouldOverrideLastEvent(
-    const LongTaskPayload& newEvent) {
-  if (!lastEvent_) {
-    return true;
+    delegate_.unstable_onPerfIssueAdded(
+        PerfIssuePayload{
+            .name = payload["name"].asString(),
+            .severity = payload["severity"].asString(),
+        });
   }
-
-  // Override if last event has expired
-  if (HighResTimeStamp::now().toDOMHighResTimeStamp() >
-      lastEvent_->startTime + lastEvent_->ttl) {
-    return true;
-  }
-
-  // Override if same or greater responsiveness score
-  if (newEvent.responsivenessScore >= lastEvent_->responsivenessScore) {
-    return true;
-  }
-
-  return false;
 }
 
 } // namespace facebook::react::jsinspector_modern

package/ReactCommon/jsinspector-modern/PerfMonitorV2.h

@@ -7,32 +7,15 @@
 
 #pragma once
 
-#include <cstdint>
-#include <optional>
 #include <string>
 
 namespace facebook::react::jsinspector_modern {
 
 class HostTargetDelegate;
 
-/**
- * See https://web.dev/articles/inp#good-score.
- */
-enum class InteractionResponsivenessScore : int32_t {
-  Good = 0,
-  NeedsImprovement = 1,
-  Poor = 2
-};
-
-struct LongTaskPayload {
-  uint16_t startTime;
-  uint16_t duration;
-  InteractionResponsivenessScore responsivenessScore;
-  uint16_t ttl;
-};
-
-struct PerfMonitorUpdateRequest {
-  LongTaskPayload activeInteraction;
+struct PerfIssuePayload {
+  std::string name;
+  std::string severity;
 };
 
 /**
@@ -41,19 +24,15 @@ struct PerfMonitorUpdateRequest {
  */
 class PerfMonitorUpdateHandler {
  public:
-  explicit PerfMonitorUpdateHandler(HostTargetDelegate& delegate)
-      : delegate_(delegate) {}
+  explicit PerfMonitorUpdateHandler(HostTargetDelegate &delegate) : delegate_(delegate) {}
 
   /**
-   * Handle a new "__chromium_devtools_metrics_reporter" message.
+   * Handle a new "__react_native_perf_issues_reporter" message.
    */
-  void handlePerfMetricsUpdate(const std::string& message);
+  void handlePerfIssueAdded(const std::string &message);
 
  private:
-  HostTargetDelegate& delegate_;
-  std::optional<LongTaskPayload> lastEvent_;
-
-  bool shouldOverrideLastEvent(const LongTaskPayload& newInteraction);
+  HostTargetDelegate &delegate_;
 };
 
 } // namespace facebook::react::jsinspector_modern

package/ReactCommon/jsinspector-modern/React-jsinspector.podspec

@@ -55,7 +55,7 @@ Pod::Spec.new do |s|
   add_dependency(s, "React-jsinspectortracing", :framework_name => 'jsinspector_moderntracing')
   s.dependency "React-perflogger", version
   add_dependency(s, "React-oscompat")
-
+  add_dependency(s, "React-utils", :additional_framework_paths => ["react/utils/platform/ios"])
   if use_hermes()
     s.dependency "hermes-engine"
   end