react-native 0.84.0-nightly-20251106-de5141a3d → 0.84.0-nightly-20251108-7486a2bc5

package/ReactCommon/jsinspector-modern/ConsoleTaskContext.h

@@ -0,0 +1,102 @@
+/*
+ * 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 "StackTrace.h"
+
+#include <folly/dynamic.h>
+#include <jsi/jsi.h>
+
+#include <cassert>
+#include <functional>
+#include <memory>
+#include <string>
+
+namespace facebook::react::jsinspector_modern {
+
+class ConsoleTaskOrchestrator;
+class RuntimeTargetDelegate;
+
+class ConsoleTaskId {
+ public:
+  ConsoleTaskId() = default;
+  ~ConsoleTaskId() = default;
+
+  ConsoleTaskId(const ConsoleTaskId &) = default;
+  ConsoleTaskId &operator=(const ConsoleTaskId &) = default;
+
+  ConsoleTaskId(ConsoleTaskId &&) = default;
+  ConsoleTaskId &operator=(ConsoleTaskId &&) = default;
+
+  bool operator==(const ConsoleTaskId &) const = default;
+  inline operator bool() const
+  {
+    return (bool)id_;
+  }
+
+  explicit inline operator void *() const
+  {
+    return id_;
+  }
+
+ private:
+  explicit inline ConsoleTaskId(void *id) : id_(id)
+  {
+    assert(id_ != nullptr);
+  }
+
+  void *id_{nullptr};
+
+  friend class ConsoleTaskContext;
+};
+
+class ConsoleTaskContext : public std::enable_shared_from_this<ConsoleTaskContext> {
+ public:
+  ConsoleTaskContext(jsi::Runtime &runtime, RuntimeTargetDelegate &runtimeTargetDelegate, std::string name);
+  ~ConsoleTaskContext();
+
+  // Can't be moved or copied: the address of `ConsoleTaskContext` is used to
+  // identify this task and all corresponding invocations.
+  ConsoleTaskContext(const ConsoleTaskContext &) = delete;
+  ConsoleTaskContext &operator=(const ConsoleTaskContext &) = delete;
+
+  ConsoleTaskContext(ConsoleTaskContext &&) = delete;
+  ConsoleTaskContext &operator=(ConsoleTaskContext &&) = delete;
+
+  /**
+   * Unique identifier that is calculated based on the address of
+   * ConsoleTaskContext.
+   */
+  ConsoleTaskId id() const;
+
+  /**
+   * Returns the serialized stack trace that was captured during the allocation
+   * of ConsoleTaskContext.
+   */
+  std::optional<folly::dynamic> getSerializedStackTrace() const;
+
+  void schedule();
+
+ private:
+  RuntimeTargetDelegate &runtimeTargetDelegate_;
+  std::string name_;
+  ConsoleTaskOrchestrator &orchestrator_;
+  std::unique_ptr<StackTrace> stackTrace_;
+};
+
+} // namespace facebook::react::jsinspector_modern
+
+namespace std {
+template <>
+struct hash<facebook::react::jsinspector_modern::ConsoleTaskId> {
+  size_t operator()(const facebook::react::jsinspector_modern::ConsoleTaskId &id) const
+  {
+    return std::hash<void *>{}(static_cast<void *>(id));
+  }
+};
+} // namespace std

package/ReactCommon/jsinspector-modern/ConsoleTaskOrchestrator.cpp

@@ -0,0 +1,55 @@
+/*
+ * 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 "ConsoleTaskOrchestrator.h"
+
+namespace facebook::react::jsinspector_modern {
+
+/* static */ ConsoleTaskOrchestrator& ConsoleTaskOrchestrator::getInstance() {
+  static ConsoleTaskOrchestrator instance;
+  return instance;
+}
+
+void ConsoleTaskOrchestrator::scheduleTask(
+    ConsoleTaskId taskId,
+    std::weak_ptr<ConsoleTaskContext> taskContext) {
+  std::lock_guard<std::mutex> lock(mutex_);
+  tasks_.emplace(taskId, taskContext);
+}
+
+void ConsoleTaskOrchestrator::cancelTask(ConsoleTaskId id) {
+  std::lock_guard<std::mutex> lock(mutex_);
+  tasks_.erase(id);
+}
+
+void ConsoleTaskOrchestrator::startTask(ConsoleTaskId id) {
+  std::lock_guard<std::mutex> lock(mutex_);
+  stack_.push(id);
+}
+
+void ConsoleTaskOrchestrator::finishTask(ConsoleTaskId id) {
+  std::lock_guard<std::mutex> lock(mutex_);
+  assert(stack_.top() == id);
+
+  stack_.pop();
+}
+
+std::shared_ptr<ConsoleTaskContext> ConsoleTaskOrchestrator::top() const {
+  std::lock_guard<std::mutex> lock(mutex_);
+  if (stack_.empty()) {
+    return nullptr;
+  }
+
+  auto it = tasks_.find(stack_.top());
+  if (it == tasks_.end()) {
+    return nullptr;
+  }
+
+  return it->second.lock();
+}
+
+} // namespace facebook::react::jsinspector_modern

package/ReactCommon/jsinspector-modern/ConsoleTaskOrchestrator.h

@@ -0,0 +1,48 @@
+/*
+ * 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 <memory>
+#include <mutex>
+#include <stack>
+
+#include "ConsoleTaskContext.h"
+
+namespace facebook::react::jsinspector_modern {
+
+class ConsoleTaskOrchestrator {
+ public:
+  static ConsoleTaskOrchestrator &getInstance();
+
+  ~ConsoleTaskOrchestrator() = default;
+
+  ConsoleTaskOrchestrator(const ConsoleTaskOrchestrator &) = delete;
+  ConsoleTaskOrchestrator &operator=(const ConsoleTaskOrchestrator &) = delete;
+
+  ConsoleTaskOrchestrator(ConsoleTaskOrchestrator &&) = delete;
+  ConsoleTaskOrchestrator &operator=(ConsoleTaskOrchestrator &&) = delete;
+
+  void scheduleTask(ConsoleTaskId taskId, std::weak_ptr<ConsoleTaskContext> taskContext);
+  void cancelTask(ConsoleTaskId taskId);
+
+  void startTask(ConsoleTaskId taskId);
+  void finishTask(ConsoleTaskId taskId);
+  std::shared_ptr<ConsoleTaskContext> top() const;
+
+ private:
+  ConsoleTaskOrchestrator() = default;
+
+  std::stack<ConsoleTaskId> stack_;
+  std::unordered_map<ConsoleTaskId, std::weak_ptr<ConsoleTaskContext>> tasks_;
+  /**
+   * Protects the stack_ and tasks_ members.
+   */
+  mutable std::mutex mutex_;
+};
+
+} // namespace facebook::react::jsinspector_modern

package/ReactCommon/jsinspector-modern/HostTarget.h

@@ -17,8 +17,10 @@
 #include "WeakList.h"
 
 #include <optional>
+#include <set>
 #include <string>
 
+#include <jsinspector-modern/tracing/TracingCategory.h>
 #include <jsinspector-modern/tracing/TracingMode.h>
 #include <jsinspector-modern/tracing/TracingState.h>
 
@@ -203,9 +205,11 @@ class HostTargetController final {
    * Starts trace recording for this HostTarget.
    *
    * \param mode In which mode to start the trace recording.
+   * \param enabledCategories The set of categories to enable.
+   *
    * \return false if already tracing, true otherwise.
    */
-  bool startTracing(tracing::Mode mode);
+  bool startTracing(tracing::Mode mode, std::set<tracing::Category> enabledCategories);
 
   /**
    * Stops previously started trace recording.
@@ -292,9 +296,11 @@ class JSINSPECTOR_EXPORT HostTarget : public EnableExecutorFromThis<HostTarget>
    * Starts trace recording for this HostTarget.
    *
    * \param mode In which mode to start the trace recording.
+   * \param enabledCategories The set of categories to enable.
+   *
    * \return false if already tracing, true otherwise.
    */
-  bool startTracing(tracing::Mode mode);
+  bool startTracing(tracing::Mode mode, std::set<tracing::Category> enabledCategories);
 
   /**
    * Stops previously started trace recording.

package/ReactCommon/jsinspector-modern/HostTargetTraceRecording.cpp

@@ -11,9 +11,12 @@
 namespace facebook::react::jsinspector_modern {
 
 HostTargetTraceRecording::HostTargetTraceRecording(
+    HostTarget& hostTarget,
     tracing::Mode tracingMode,
-    HostTarget& hostTarget)
-    : tracingMode_(tracingMode), hostTarget_(hostTarget) {}
+    std::set<tracing::Category> enabledCategories)
+    : hostTarget_(hostTarget),
+      tracingMode_(tracingMode),
+      enabledCategories_(std::move(enabledCategories)) {}
 
 void HostTargetTraceRecording::setTracedInstance(
     InstanceTarget* instanceTarget) {
@@ -32,6 +35,7 @@ void HostTargetTraceRecording::start() {
   state_ = tracing::TraceRecordingState{
       .mode = tracingMode_,
       .startTime = HighResTimeStamp::now(),
+      .enabledCategories = enabledCategories_,
   };
   hostTracingAgent_ = hostTarget_.createTracingAgent(*state_);
 }

package/ReactCommon/jsinspector-modern/HostTargetTraceRecording.h

@@ -12,8 +12,10 @@
 #include "InstanceTarget.h"
 
 #include <jsinspector-modern/tracing/TraceRecordingState.h>
+#include <jsinspector-modern/tracing/TracingCategory.h>
 
 #include <optional>
+#include <set>
 
 namespace facebook::react::jsinspector_modern {
 
@@ -28,7 +30,10 @@ namespace facebook::react::jsinspector_modern {
  */
 class HostTargetTraceRecording {
  public:
-  explicit HostTargetTraceRecording(tracing::Mode tracingMode, HostTarget &hostTarget);
+  explicit HostTargetTraceRecording(
+      HostTarget &hostTarget,
+      tracing::Mode tracingMode,
+      std::set<tracing::Category> enabledCategories);
 
   inline bool isBackgroundInitiated() const
   {
@@ -61,14 +66,14 @@ class HostTargetTraceRecording {
 
  private:
   /**
-   * The mode in which this trace recording was initialized.
+   * The Host for which this Trace Recording is going to happen.
    */
-  tracing::Mode tracingMode_;
+  HostTarget &hostTarget_;
 
   /**
-   * The Host for which this Trace Recording is going to happen.
+   * The mode in which this trace recording was initialized.
    */
-  HostTarget &hostTarget_;
+  tracing::Mode tracingMode_;
 
   /**
    * The state of the current Trace Recording.
@@ -81,6 +86,11 @@ class HostTargetTraceRecording {
    * Only allocated if the recording is enabled.
    */
   std::shared_ptr<HostTracingAgent> hostTracingAgent_;
+
+  /**
+   * The list of categories that are enabled for this recording.
+   */
+  std::set<tracing::Category> enabledCategories_;
 };
 
 } // namespace facebook::react::jsinspector_modern

package/ReactCommon/jsinspector-modern/HostTargetTracing.cpp

@@ -12,8 +12,10 @@
 
 namespace facebook::react::jsinspector_modern {
 
-bool HostTargetController::startTracing(tracing::Mode tracingMode) {
-  return target_.startTracing(tracingMode);
+bool HostTargetController::startTracing(
+    tracing::Mode tracingMode,
+    std::set<tracing::Category> enabledCategories) {
+  return target_.startTracing(tracingMode, std::move(enabledCategories));
 }
 
 tracing::TraceRecordingState HostTargetController::stopTracing() {
@@ -27,7 +29,9 @@ std::shared_ptr<HostTracingAgent> HostTarget::createTracingAgent(
   return agent;
 }
 
-bool HostTarget::startTracing(tracing::Mode tracingMode) {
+bool HostTarget::startTracing(
+    tracing::Mode tracingMode,
+    std::set<tracing::Category> enabledCategories) {
   if (traceRecording_ != nullptr) {
     if (traceRecording_->isBackgroundInitiated() &&
         tracingMode == tracing::Mode::CDP) {
@@ -37,8 +41,8 @@ bool HostTarget::startTracing(tracing::Mode tracingMode) {
     }
   }
 
-  traceRecording_ =
-      std::make_unique<HostTargetTraceRecording>(tracingMode, *this);
+  traceRecording_ = std::make_unique<HostTargetTraceRecording>(
+      *this, tracingMode, std::move(enabledCategories));
   traceRecording_->setTracedInstance(currentInstance_.get());
   traceRecording_->start();
 

package/ReactCommon/jsinspector-modern/RuntimeAgent.cpp

@@ -152,13 +152,14 @@ RuntimeTracingAgent::RuntimeTracingAgent(
     tracing::TraceRecordingState& state,
     RuntimeTargetController& targetController)
     : tracing::TargetTracingAgent(state), targetController_(targetController) {
-  if (state.mode == tracing::Mode::CDP) {
+  if (state.enabledCategories.contains(tracing::Category::JavaScriptSampling)) {
     targetController_.enableSamplingProfiler();
   }
 }
 
 RuntimeTracingAgent::~RuntimeTracingAgent() {
-  if (state_.mode == tracing::Mode::CDP) {
+  if (state_.enabledCategories.contains(
+          tracing::Category::JavaScriptSampling)) {
     targetController_.disableSamplingProfiler();
     auto profile = targetController_.collectSamplingProfile();
 

package/ReactCommon/jsinspector-modern/RuntimeAgent.h

@@ -99,7 +99,7 @@ class RuntimeAgent final {
  * Lifetime of this agent is bound to the lifetime of the Tracing session -
  * HostTargetTraceRecording and to the lifetime of the RuntimeTarget.
  */
-class RuntimeTracingAgent : tracing::TargetTracingAgent {
+class RuntimeTracingAgent : public tracing::TargetTracingAgent {
  public:
   explicit RuntimeTracingAgent(tracing::TraceRecordingState &state, RuntimeTargetController &targetController);
 

package/ReactCommon/jsinspector-modern/RuntimeTarget.cpp

@@ -248,6 +248,18 @@ bool RuntimeTarget::isDomainEnabled(Domain domain) const {
   return threadSafeDomainStatus_[domain];
 }
 
+bool RuntimeTarget::isConsoleCreateTaskEnabled() const {
+  if (isDomainEnabled(Domain::Runtime)) {
+    return true;
+  }
+
+  if (auto tracingAgent = tracingAgent_.lock()) {
+    return tracingAgent->isRunningInBackgroundMode();
+  }
+
+  return false;
+}
+
 RuntimeTargetController::RuntimeTargetController(RuntimeTarget& target)
     : target_(target) {}
 

package/ReactCommon/jsinspector-modern/RuntimeTarget.h

@@ -207,19 +207,6 @@ class JSINSPECTOR_EXPORT RuntimeTarget : public EnableExecutorFromThis<RuntimeTa
    */
   std::shared_ptr<RuntimeTracingAgent> createTracingAgent(tracing::TraceRecordingState &state);
 
-  /**
-   * Start sampling profiler for a particular JavaScript runtime.
-   */
-  void enableSamplingProfiler();
-  /**
-   * Stop sampling profiler for a particular JavaScript runtime.
-   */
-  void disableSamplingProfiler();
-  /**
-   * Return recorded sampling profile for the previous sampling session.
-   */
-  tracing::RuntimeSamplingProfile collectSamplingProfile();
-
  private:
   using Domain = RuntimeTargetController::Domain;
 
@@ -275,6 +262,18 @@ class JSINSPECTOR_EXPORT RuntimeTarget : public EnableExecutorFromThis<RuntimeTa
    * session - HostTargetTraceRecording.
    */
   std::weak_ptr<RuntimeTracingAgent> tracingAgent_;
+  /**
+   * Start sampling profiler for a particular JavaScript runtime.
+   */
+  void enableSamplingProfiler();
+  /**
+   * Stop sampling profiler for a particular JavaScript runtime.
+   */
+  void disableSamplingProfiler();
+  /**
+   * Return recorded sampling profile for the previous sampling session.
+   */
+  tracing::RuntimeSamplingProfile collectSamplingProfile();
 
   /**
    * Adds a function with the given name on the runtime's global object, that
@@ -293,6 +292,10 @@ class JSINSPECTOR_EXPORT RuntimeTarget : public EnableExecutorFromThis<RuntimeTa
    * Install the console API handler.
    */
   void installConsoleHandler();
+  /**
+   * Returns whether console.createTask should actually capture stack traces.
+   */
+  bool isConsoleCreateTaskEnabled() const;
 
   /**
    * Installs __DEBUGGER_SESSION_OBSERVER__ object on the JavaScript's global

package/ReactCommon/jsinspector-modern/RuntimeTargetConsole.cpp

@@ -5,6 +5,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#include "ConsoleTask.h"
+#include "ConsoleTaskContext.h"
+#include "ConsoleTaskOrchestrator.h"
+
 #include <jsinspector-modern/RuntimeTarget.h>
 #include <jsinspector-modern/tracing/PerformanceTracer.h>
 
@@ -477,8 +481,17 @@ void consoleTimeStamp(
   }
 
   if (performanceTracer.isTracing()) {
+    auto taskContext = ConsoleTaskOrchestrator::getInstance().top();
+
     performanceTracer.reportTimeStamp(
-        label, start, end, trackName, trackGroup, color, std::move(detail));
+        label,
+        start,
+        end,
+        trackName,
+        trackGroup,
+        color,
+        std::move(detail),
+        taskContext ? taskContext->getSerializedStackTrace() : nullptr);
   }
 
   if (ReactPerfettoLogger::isTracing()) {
@@ -521,6 +534,71 @@ void installConsoleTimeStamp(
               })));
 }
 
+/**
+ * run method of the task object returned from console.createTask().
+ */
+jsi::Value consoleTaskRun(
+    jsi::Runtime& runtime,
+    const jsi::Value* args,
+    size_t count,
+    std::shared_ptr<ConsoleTaskContext> taskContext) {
+  if (count < 1 || !args[0].isObject()) {
+    throw JSError(runtime, "First argument must be a function");
+  }
+  auto fnObj = args[0].getObject(runtime);
+  if (!fnObj.isFunction(runtime)) {
+    throw JSError(runtime, "First argument must be a function");
+  }
+
+  ConsoleTask consoleTask{taskContext};
+
+  auto fn = fnObj.getFunction(runtime);
+  return fn.call(runtime);
+}
+
+/**
+ * console.createTask. Non-standardized.
+ * https://developer.chrome.com/docs/devtools/console/api#createtask
+ */
+jsi::Value consoleCreateTask(
+    jsi::Runtime& runtime,
+    const jsi::Value* args,
+    size_t count,
+    RuntimeTargetDelegate& runtimeTargetDelegate,
+    bool enabled) {
+  if (count < 1 || !args[0].isString()) {
+    throw JSError(runtime, "First argument must be a non-empty string");
+  }
+  auto name = args[0].asString(runtime).utf8(runtime);
+  if (name.empty()) {
+    throw JSError(runtime, "First argument must be a non-empty string");
+  }
+
+  jsi::Object task{runtime};
+  std::shared_ptr<ConsoleTaskContext> taskContext = nullptr;
+  if (enabled) {
+    taskContext = std::make_shared<ConsoleTaskContext>(
+        runtime, runtimeTargetDelegate, name);
+    taskContext->schedule();
+  }
+
+  task.setProperty(
+      runtime,
+      "run",
+      jsi::Function::createFromHostFunction(
+          runtime,
+          jsi::PropNameID::forAscii(runtime, "run"),
+          0,
+          [taskContext](
+              jsi::Runtime& runtime,
+              const jsi::Value& /*thisVal*/,
+              const jsi::Value* args,
+              size_t count) {
+            return consoleTaskRun(runtime, args, count, taskContext);
+          }));
+  return task;
+}
+
 } // namespace
 
 void RuntimeTarget::installConsoleHandler() {
@@ -624,6 +702,33 @@ void RuntimeTarget::installConsoleHandler() {
      */
     installConsoleTimeStamp(runtime, originalConsole, console);
 
+    /**
+     * console.createTask
+     */
+    console.setProperty(
+        runtime,
+        "createTask",
+        jsi::Function::createFromHostFunction(
+            runtime,
+            jsi::PropNameID::forAscii(runtime, "createTask"),
+            0,
+            [state, selfWeak](
+                jsi::Runtime& runtime,
+                const jsi::Value& /*thisVal*/,
+                const jsi::Value* args,
+                size_t count) {
+              jsi::Value task;
+              tryExecuteSync(selfWeak, [&](auto& self) {
+                task = consoleCreateTask(
+                    runtime,
+                    args,
+                    count,
+                    self.delegate_,
+                    self.isConsoleCreateTaskEnabled());
+              });
+              return task;
+            }));
+
     // Install forwarding console methods.
 #define FORWARDING_CONSOLE_METHOD(name, type) \
   installConsoleMethod(#name, console_##name);

package/ReactCommon/jsinspector-modern/TracingAgent.cpp

@@ -59,8 +59,25 @@ bool TracingAgent::handleRequest(const cdp::PreparsedRequest& req) {
       return true;
     }
 
-    bool didNotHaveAlreadyRunningRecording =
-        hostTargetController_.startTracing(tracing::Mode::CDP);
+    /**
+     * This logic has to be updated with the next upgrade of Chrome
+     * DevTools Frotnend fork.
+     *
+     * At the moment of writing this, our fork uses categories field, which is
+     * marked as depreacted in CDP spec.
+     *
+     * Latest versions of Chrome DevTools in stable channel of Chromium are
+     * already using traceConfig field.
+     */
+    std::set<tracing::Category> enabledCategories;
+    if (req.params.isObject() && req.params.count("categories") != 0 &&
+        req.params["categories"].isString()) {
+      enabledCategories = tracing::parseSerializedTracingCategories(
+          req.params["categories"].getString());
+    }
+
+    bool didNotHaveAlreadyRunningRecording = hostTargetController_.startTracing(
+        tracing::Mode::CDP, std::move(enabledCategories));
     if (!didNotHaveAlreadyRunningRecording) {
       frontendChannel_(
           cdp::jsonError(