react-native-tvos 0.76.5-0 → 0.77.0-0

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

@@ -37,7 +37,7 @@ Pod::Spec.new do |s|
   s.header_dir             = 'jsinspector-modern'
   s.compiler_flags         = folly_compiler_flags
   s.pod_target_xcconfig    = {
-                               "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/..\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fmt/include\"",
+                               "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/..\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/fast_float/include\" \"$(PODS_ROOT)/fmt/include\"",
                                "CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
                                "DEFINES_MODULE" => "YES"
   }.merge!(use_frameworks ? {

package/ReactCommon/jsinspector-modern/TracingAgent.cpp

@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "TracingAgent.h"
+
+#include <reactperflogger/fusebox/FuseboxTracer.h>
+
+namespace facebook::react::jsinspector_modern {
+
+bool TracingAgent::handleRequest(const cdp::PreparsedRequest& req) {
+  if (req.method == "Tracing.start") {
+    // @cdp Tracing.start support is experimental.
+    if (FuseboxTracer::getFuseboxTracer().startTracing()) {
+      frontendChannel_(cdp::jsonResult(req.id));
+    } else {
+      frontendChannel_(cdp::jsonError(
+          req.id,
+          cdp::ErrorCode::InternalError,
+          "Tracing session already started"));
+    }
+
+    return true;
+  } else if (req.method == "Tracing.end") {
+    // @cdp Tracing.end support is experimental.
+    bool firstChunk = true;
+    auto id = req.id;
+    bool wasStopped = FuseboxTracer::getFuseboxTracer().stopTracing(
+        [this, firstChunk, id](const folly::dynamic& eventsChunk) {
+          if (firstChunk) {
+            frontendChannel_(cdp::jsonResult(id));
+          }
+          frontendChannel_(cdp::jsonNotification(
+              "Tracing.dataCollected",
+              folly::dynamic::object("value", eventsChunk)));
+        });
+
+    if (!wasStopped) {
+      frontendChannel_(cdp::jsonError(
+          req.id,
+          cdp::ErrorCode::InternalError,
+          "Tracing session not started"));
+    } else {
+      frontendChannel_(cdp::jsonNotification(
+          "Tracing.tracingComplete",
+          folly::dynamic::object("dataLossOccurred", false)));
+    }
+
+    frontendChannel_(cdp::jsonResult(req.id));
+    return true;
+  }
+
+  return false;
+}
+
+} // namespace facebook::react::jsinspector_modern

package/ReactCommon/jsinspector-modern/TracingAgent.h

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include "CdpJson.h"
+#include "InspectorInterfaces.h"
+
+namespace facebook::react::jsinspector_modern {
+
+/**
+ * Provides an agent for handling CDP's Tracing.start, Tracing.stop.
+ */
+class TracingAgent {
+ public:
+  /**
+   * \param frontendChannel A channel used to send responses to the
+   * frontend.
+   */
+  explicit TracingAgent(FrontendChannel frontendChannel)
+      : frontendChannel_(std::move(frontendChannel)) {}
+
+  /**
+   * 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);
+
+ private:
+  /**
+   * A channel used to send responses and events to the frontend.
+   */
+  FrontendChannel frontendChannel_;
+};
+
+} // namespace facebook::react::jsinspector_modern

package/ReactCommon/jsinspector-modern/tests/InspectorPackagerConnectionTest.cpp

@@ -39,6 +39,7 @@ class InspectorPackagerConnectionTestBase : public testing::Test {
   InspectorPackagerConnectionTestBase()
       : packagerConnection_(InspectorPackagerConnection{
             "ws://mock-host:12345",
+            "my-device",
             "my-app",
             packagerConnectionDelegates_.make_unique(asyncExecutor_)}) {
     ON_CALL(*packagerConnectionDelegate(), connectWebSocket(_, _))
@@ -200,14 +201,14 @@ TEST_F(InspectorPackagerConnectionTest, TestGetPages) {
     })");
 
   auto pageId1 = getInspectorInstance().addPage(
-      "mock-title-1",
+      "mock-description-1",
       "mock-vm",
       localConnections_
           .lazily_make_unique<std::unique_ptr<IRemoteConnection>>(),
       {.nativePageReloads = true});
 
   auto pageId2 = getInspectorInstance().addPage(
-      "mock-title-2",
+      "mock-description-2",
       "mock-vm",
       localConnections_
           .lazily_make_unique<std::unique_ptr<IRemoteConnection>>(),
@@ -222,17 +223,23 @@ TEST_F(InspectorPackagerConnectionTest, TestGetPages) {
               "/payload",
               ElementsAreArray(
                   {AllOf(
-                       AtJsonPtr("/app", Eq("my-app")),
-                       AtJsonPtr("/title", Eq("mock-title-1 [C++ connection]")),
                        AtJsonPtr("/id", Eq(std::to_string(pageId1))),
+                       AtJsonPtr("/title", Eq("my-app (my-device)")),
+                       AtJsonPtr(
+                           "/description",
+                           Eq("mock-description-1 [C++ connection]")),
+                       AtJsonPtr("/app", Eq("my-app")),
                        AtJsonPtr("/capabilities/nativePageReloads", Eq(true)),
                        AtJsonPtr(
                            "/capabilities/nativeSourceCodeFetching",
                            Eq(false))),
                    AllOf(
-                       AtJsonPtr("/app", Eq("my-app")),
-                       AtJsonPtr("/title", Eq("mock-title-2 [C++ connection]")),
                        AtJsonPtr("/id", Eq(std::to_string(pageId2))),
+                       AtJsonPtr("/title", Eq("my-app (my-device)")),
+                       AtJsonPtr(
+                           "/description",
+                           Eq("mock-description-2 [C++ connection]")),
+                       AtJsonPtr("/app", Eq("my-app")),
                        AtJsonPtr("/capabilities/nativePageReloads", Eq(true)),
                        AtJsonPtr(
                            "/capabilities/nativeSourceCodeFetching",
@@ -265,7 +272,7 @@ TEST_F(InspectorPackagerConnectionTest, TestSendReceiveEvents) {
 
   packagerConnection_->connect();
   auto pageId = getInspectorInstance().addPage(
-      "mock-title",
+      "mock-description",
       "mock-vm",
       localConnections_
           .lazily_make_unique<std::unique_ptr<IRemoteConnection>>());
@@ -351,7 +358,7 @@ TEST_F(InspectorPackagerConnectionTest, TestSendReceiveEventsToMultiplePages) {
   const int kNumPages = 2;
   for (int i = 0; i < kNumPages; ++i) {
     pageIds.push_back(getInspectorInstance().addPage(
-        "mock-title",
+        "mock-description",
         "mock-vm",
         localConnections_
             .lazily_make_unique<std::unique_ptr<IRemoteConnection>>()));
@@ -429,7 +436,7 @@ TEST_F(InspectorPackagerConnectionTest, TestSendEventToAllConnections) {
 
   packagerConnection_->connect();
   auto pageId = getInspectorInstance().addPage(
-      "mock-title",
+      "mock-description",
       "mock-vm",
       localConnections_
           .lazily_make_unique<std::unique_ptr<IRemoteConnection>>());
@@ -470,7 +477,7 @@ TEST_F(InspectorPackagerConnectionTest, TestConnectThenDisconnect) {
 
   packagerConnection_->connect();
   auto pageId = getInspectorInstance().addPage(
-      "mock-title",
+      "mock-description",
       "mock-vm",
       localConnections_
           .lazily_make_unique<std::unique_ptr<IRemoteConnection>>());
@@ -505,7 +512,7 @@ TEST_F(InspectorPackagerConnectionTest, TestConnectThenCloseSocket) {
 
   packagerConnection_->connect();
   auto pageId = getInspectorInstance().addPage(
-      "mock-title",
+      "mock-description",
       "mock-vm",
       localConnections_
           .lazily_make_unique<std::unique_ptr<IRemoteConnection>>());
@@ -533,7 +540,7 @@ TEST_F(InspectorPackagerConnectionTest, TestConnectThenSocketFailure) {
 
   packagerConnection_->connect();
   auto pageId = getInspectorInstance().addPage(
-      "mock-title",
+      "mock-description",
       "mock-vm",
       localConnections_
           .lazily_make_unique<std::unique_ptr<IRemoteConnection>>());
@@ -563,7 +570,7 @@ TEST_F(
 
   packagerConnection_->connect();
   auto pageId = getInspectorInstance().addPage(
-      "mock-title",
+      "mock-description",
       "mock-vm",
       localConnections_
           .lazily_make_unique<std::unique_ptr<IRemoteConnection>>());
@@ -609,7 +616,7 @@ TEST_F(
 
   packagerConnection_->connect();
   auto pageId = getInspectorInstance().addPage(
-      "mock-title",
+      "mock-description",
       "mock-vm",
       localConnections_
           .lazily_make_unique<std::unique_ptr<IRemoteConnection>>());
@@ -644,7 +651,7 @@ TEST_F(InspectorPackagerConnectionTest, TestMultipleDisconnect) {
 
   packagerConnection_->connect();
   auto pageId = getInspectorInstance().addPage(
-      "mock-title",
+      "mock-description",
       "mock-vm",
       localConnections_
           .lazily_make_unique<std::unique_ptr<IRemoteConnection>>());
@@ -690,7 +697,7 @@ TEST_F(InspectorPackagerConnectionTest, TestDisconnectThenSendEvent) {
 
   packagerConnection_->connect();
   auto pageId = getInspectorInstance().addPage(
-      "mock-title",
+      "mock-description",
       "mock-vm",
       localConnections_
           .lazily_make_unique<std::unique_ptr<IRemoteConnection>>());
@@ -839,17 +846,6 @@ TEST_F(InspectorPackagerConnectionTest, TestReconnectOnSocketErrorWithNoCode) {
   packagerConnection_->closeQuietly();
 }
 
-TEST_F(InspectorPackagerConnectionTest, TestNoReconnectOnConnectionRefused) {
-  // Configure gmock to expect calls in a specific order.
-  InSequence mockCallsMustBeInSequence;
-
-  packagerConnection_->connect();
-  ASSERT_TRUE(webSockets_[0]);
-  webSockets_[0]->getDelegate().didFailWithError(ECONNREFUSED, "Test error");
-  EXPECT_FALSE(webSockets_[0]);
-  EXPECT_FALSE(packagerConnection_->isConnected());
-}
-
 TEST_F(InspectorPackagerConnectionTest, TestUnknownEvent) {
   packagerConnection_->connect();
   ASSERT_TRUE(webSockets_[0]);
@@ -916,7 +912,7 @@ TEST_F(
   packagerConnection_.reset();
 
   auto pageId = getInspectorInstance().addPage(
-      "mock-title",
+      "mock-description",
       "mock-vm",
       localConnections_
           .lazily_make_unique<std::unique_ptr<IRemoteConnection>>());
@@ -970,7 +966,7 @@ TEST_F(InspectorPackagerConnectionTest, TestDestroyConnectionOnPageRemoved) {
   ASSERT_TRUE(webSockets_[0]);
 
   auto pageId = getInspectorInstance().addPage(
-      "mock-title",
+      "mock-description",
       "mock-vm",
       localConnections_
           .lazily_make_unique<std::unique_ptr<IRemoteConnection>>());
@@ -1000,7 +996,7 @@ TEST_F(
 
   packagerConnection_->connect();
   auto pageId = getInspectorInstance().addPage(
-      "mock-title",
+      "mock-description",
       "mock-vm",
       localConnections_
           .lazily_make_unique<std::unique_ptr<IRemoteConnection>>());
@@ -1040,7 +1036,7 @@ TEST_F(
 
   packagerConnection_->connect();
   auto pageId = getInspectorInstance().addPage(
-      "mock-title",
+      "mock-description",
       "mock-vm",
       localConnections_
           .lazily_make_unique<std::unique_ptr<IRemoteConnection>>());
@@ -1122,7 +1118,7 @@ TEST_F(
 
   packagerConnection_->connect();
   auto pageId = getInspectorInstance().addPage(
-      "mock-title",
+      "mock-description",
       "mock-vm",
       localConnections_
           .lazily_make_unique<std::unique_ptr<IRemoteConnection>>());
@@ -1228,7 +1224,7 @@ TEST_F(InspectorPackagerConnectionTest, TestRejectedPageConnection) {
   } mockNextConnectionBehavior;
 
   auto pageId = getInspectorInstance().addPage(
-      "mock-title",
+      "mock-description",
       "mock-vm",
       [&mockNextConnectionBehavior,
        this](auto remoteConnection) -> std::unique_ptr<ILocalConnection> {

package/ReactCommon/jsinspector-modern/tests/JsiIntegrationTest.cpp

@@ -722,6 +722,136 @@ TYPED_TEST(JsiIntegrationHermesTest, FunctionDescriptionIncludesName) {
                              })");
 }
 
+TYPED_TEST(JsiIntegrationHermesTest, ReleaseRemoteObject) {
+  this->connect();
+
+  InSequence s;
+
+  // Create a remote object.
+  auto objectInfo = this->expectMessageFromPage(JsonParsed(AllOf(
+      AtJsonPtr("/id", 1),
+      AtJsonPtr("/result/result/type", "object"),
+      AtJsonPtr("/result/result/objectId", Not(IsEmpty())))));
+  this->toPage_->sendMessage(R"({
+                                 "id": 1,
+                                 "method": "Runtime.evaluate",
+                                 "params": {"expression": "[]"}
+                               })");
+
+  ASSERT_TRUE(objectInfo->has_value());
+  auto objectId = objectInfo->value()["result"]["result"]["objectId"];
+
+  // Ensure we can get the properties of the object.
+  this->expectMessageFromPage(JsonParsed(
+      AllOf(AtJsonPtr("/id", 2), AtJsonPtr("/result/result", SizeIs(Gt(0))))));
+  this->toPage_->sendMessage(sformat(
+      R"({{
+          "id": 2,
+          "method": "Runtime.getProperties",
+          "params": {{"objectId": {}, "ownProperties": true}}
+        }})",
+      folly::toJson(objectId)));
+
+  // Release the object.
+  this->expectMessageFromPage(JsonEq(R"({
+                                         "id": 3,
+                                         "result": {}
+                                       })"));
+  this->toPage_->sendMessage(sformat(
+      R"({{
+          "id": 3,
+          "method": "Runtime.releaseObject",
+          "params": {{"objectId": {}, "ownProperties": true}}
+        }})",
+      folly::toJson(objectId)));
+
+  // Getting properties for a released object results in an error.
+  this->expectMessageFromPage(
+      JsonParsed(AllOf(AtJsonPtr("/id", 4), AtJsonPtr("/error/code", -32000))));
+  this->toPage_->sendMessage(sformat(
+      R"({{
+          "id": 4,
+          "method": "Runtime.getProperties",
+          "params": {{"objectId": {}, "ownProperties": true}}
+        }})",
+      folly::toJson(objectId)));
+
+  // Releasing an already released object is an error.
+  this->expectMessageFromPage(
+      JsonParsed(AllOf(AtJsonPtr("/id", 5), AtJsonPtr("/error/code", -32000))));
+  this->toPage_->sendMessage(sformat(
+      R"({{
+          "id": 5,
+          "method": "Runtime.releaseObject",
+          "params": {{"objectId": {}, "ownProperties": true}}
+        }})",
+      folly::toJson(objectId)));
+}
+
+TYPED_TEST(JsiIntegrationHermesTest, ReleaseRemoteObjectGroup) {
+  this->connect();
+
+  InSequence s;
+
+  // Create a remote object.
+  auto objectInfo = this->expectMessageFromPage(JsonParsed(AllOf(
+      AtJsonPtr("/id", 1),
+      AtJsonPtr("/result/result/type", "object"),
+      AtJsonPtr("/result/result/objectId", Not(IsEmpty())))));
+  this->toPage_->sendMessage(R"({
+                                 "id": 1,
+                                 "method": "Runtime.evaluate",
+                                 "params": {"expression": "[]", "objectGroup": "foo"}
+                               })");
+
+  ASSERT_TRUE(objectInfo->has_value());
+  auto objectId = objectInfo->value()["result"]["result"]["objectId"];
+
+  // Ensure we can get the properties of the object.
+  this->expectMessageFromPage(JsonParsed(
+      AllOf(AtJsonPtr("/id", 2), AtJsonPtr("/result/result", SizeIs(Gt(0))))));
+  this->toPage_->sendMessage(sformat(
+      R"({{
+          "id": 2,
+          "method": "Runtime.getProperties",
+          "params": {{"objectId": {}, "ownProperties": true}}
+        }})",
+      folly::toJson(objectId)));
+
+  // Release the object group containing our object.
+  this->expectMessageFromPage(JsonEq(R"({
+                                         "id": 3,
+                                         "result": {}
+                                       })"));
+  this->toPage_->sendMessage(R"({
+                                 "id": 3,
+                                 "method": "Runtime.releaseObjectGroup",
+                                 "params": {"objectGroup": "foo"}
+                               })");
+
+  // Getting properties for a released object results in an error.
+  this->expectMessageFromPage(
+      JsonParsed(AllOf(AtJsonPtr("/id", 4), AtJsonPtr("/error/code", -32000))));
+  this->toPage_->sendMessage(sformat(
+      R"({{
+          "id": 4,
+          "method": "Runtime.getProperties",
+          "params": {{"objectId": {}, "ownProperties": true}}
+        }})",
+      folly::toJson(objectId)));
+
+  // Releasing an already released object group is a no-op.
+  this->expectMessageFromPage(JsonEq(R"({
+                                         "id": 5,
+                                         "result": {}
+                                       })"));
+  this->toPage_->sendMessage(R"({
+                                 "id": 5,
+                                 "method": "Runtime.releaseObjectGroup",
+                                 "params": {"objectGroup": "foo"}
+                               })");
+}
+
 #pragma endregion // AllHermesVariants
 
 } // namespace facebook::react::jsinspector_modern

package/ReactCommon/jsinspector-modern/tests/ReactInstanceIntegrationTest.cpp

@@ -34,19 +34,10 @@ void ReactInstanceIntegrationTest::SetUp() {
   auto timerManager =
       std::make_shared<react::TimerManager>(std::move(mockRegistry));
 
-  auto onJsError = [](const JsErrorHandler::ParsedError& errorMap) noexcept {
+  auto onJsError = [](jsi::Runtime& /*runtime*/,
+                      const JsErrorHandler::ParsedError& error) noexcept {
     LOG(INFO) << "[jsErrorHandlingFunc called]";
-    LOG(INFO) << "message: " << errorMap.message;
-    LOG(INFO) << "exceptionId: " << std::to_string(errorMap.exceptionId);
-    LOG(INFO) << "isFatal: "
-              << std::to_string(static_cast<int>(errorMap.isFatal));
-    auto frames = errorMap.frames;
-    for (const auto& mapBuffer : frames) {
-      LOG(INFO) << "[Frame]" << std::endl << "\tfile: " << mapBuffer.fileName;
-      LOG(INFO) << "\tmethodName: " << mapBuffer.methodName;
-      LOG(INFO) << "\tlineNumber: " << std::to_string(mapBuffer.lineNumber);
-      LOG(INFO) << "\tcolumn: " << std::to_string(mapBuffer.columnNumber);
-    }
+    LOG(INFO) << error << std::endl;
   };
 
   auto jsRuntimeFactory = std::make_unique<react::HermesInstance>();
@@ -91,7 +82,7 @@ void ReactInstanceIntegrationTest::SetUp() {
     // Under modern CDP, the React host is responsible for adding itself as
     // the root target on startup.
     pageId_ = inspector.addPage(
-        "mock-title",
+        "mock-description",
         "mock-vm",
         [hostTargetIfModernCDP](std::unique_ptr<IRemoteConnection> remote)
             -> std::unique_ptr<ILocalConnection> {

package/ReactCommon/logger/React-logger.podspec

@@ -20,7 +20,8 @@ end
 folly_config = get_folly_config()
 folly_compiler_flags = folly_config[:compiler_flags]
 folly_version = folly_config[:version]
-boost_compiler_flags = '-Wno-documentation'
+boost_config = get_boost_config()
+boost_compiler_flags = boost_config[:compiler_flags] 
 
 Pod::Spec.new do |s|
   s.name                   = "React-logger"

package/ReactCommon/react/bridging/Base.h

@@ -63,8 +63,9 @@ using bridging_t = typename detail::bridging_wrapper<T>::type;
 
 template <typename R, typename T, std::enable_if_t<is_jsi_v<T>, int> = 0>
 auto fromJs(jsi::Runtime& rt, T&& value, const std::shared_ptr<CallInvoker>&)
-    -> decltype(static_cast<R>(convert(rt, std::forward<T>(value)))) {
-  return convert(rt, std::forward<T>(value));
+    -> decltype(static_cast<R>(
+        std::move(convert(rt, std::forward<T>(value))))) {
+  return static_cast<R>(std::move(convert(rt, std::forward<T>(value))));
 }
 
 template <typename R, typename T>
@@ -121,7 +122,7 @@ auto toJs(
 template <typename, typename = jsi::Value, typename = void>
 inline constexpr bool supportsFromJs = false;
 
-template <typename T, typename Arg = jsi::Value>
+template <typename T, typename Arg>
 inline constexpr bool supportsFromJs<
     T,
     Arg,
@@ -130,10 +131,19 @@ inline constexpr bool supportsFromJs<
         std::declval<Arg>(),
         nullptr))>> = true;
 
+template <typename T>
+inline constexpr bool supportsFromJs<
+    T,
+    jsi::Value,
+    std::void_t<decltype(fromJs<T>(
+        std::declval<jsi::Runtime&>(),
+        std::declval<jsi::Value>(),
+        nullptr))>> = true;
+
 template <typename, typename = jsi::Value, typename = void>
 inline constexpr bool supportsToJs = false;
 
-template <typename T, typename Ret = jsi::Value>
+template <typename T, typename Ret>
 inline constexpr bool supportsToJs<
     T,
     Ret,
@@ -148,5 +158,20 @@ inline constexpr bool supportsToJs<
             nullptr)),
         Ret>;
 
+template <typename T>
+inline constexpr bool supportsToJs<
+    T,
+    jsi::Value,
+    std::void_t<decltype(toJs(
+        std::declval<jsi::Runtime&>(),
+        std::declval<T>(),
+        nullptr))>> =
+    std::is_convertible_v<
+        decltype(toJs(
+            std::declval<jsi::Runtime&>(),
+            std::declval<T>(),
+            nullptr)),
+        jsi::Value>;
+
 } // namespace bridging
 } // namespace facebook::react

package/ReactCommon/react/bridging/Convert.h

@@ -158,12 +158,12 @@ auto convert(jsi::Runtime& rt, std::optional<T> value) {
 }
 
 template <typename T, std::enable_if_t<std::is_scalar_v<T>, int> = 0>
-auto convert(jsi::Runtime& rt, T&& value) {
+auto convert(jsi::Runtime& /*rt*/, T&& value) {
   return value;
 }
 
 template <typename T>
-auto convert(jsi::Runtime& rt, Converter<T>&& converter) {
+auto convert(jsi::Runtime& /*rt*/, Converter<T>&& converter) {
   return std::move(converter);
 }
 

package/ReactCommon/react/config/ReactNativeConfig.cpp

@@ -10,9 +10,6 @@
 namespace facebook::react {
 
 bool EmptyReactNativeConfig::getBool(const std::string& param) const {
-  if (param == "react_fabric:enabled_automatic_interop_android") {
-    return true;
-  }
   return false;
 }