react-native 0.84.0-nightly-20251106-de5141a3d → 0.84.0-nightly-20251107-f8198f662

package/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.cpp

@@ -17,10 +17,9 @@
 #include <ReactCommon/BindingsInstallerHolder.h>
 #include <ReactCommon/CxxTurboModuleUtils.h>
 #include <ReactCommon/JavaInteropTurboModule.h>
-#include <ReactCommon/TurboCxxModule.h>
 #include <ReactCommon/TurboModuleBinding.h>
 #include <ReactCommon/TurboModulePerfLogger.h>
-#include <react/jni/CxxModuleWrapper.h>
+#include <react/jni/CxxModuleWrapperBase.h>
 
 namespace facebook::react {
 
@@ -208,22 +207,6 @@ std::shared_ptr<TurboModule> TurboModuleManager::getTurboModule(
     return turboModule;
   }
 
-  static auto getTurboLegacyCxxModule =
-      javaPart->getClass()
-          ->getMethod<jni::alias_ref<CxxModuleWrapper::javaobject>(
-              const std::string&)>("getTurboLegacyCxxModule");
-  auto legacyCxxModule = getTurboLegacyCxxModule(javaPart.get(), name);
-  if (legacyCxxModule) {
-    TurboModulePerfLogger::moduleJSRequireEndingStart(moduleName);
-
-    auto turboModule = std::make_shared<react::TurboCxxModule>(
-        legacyCxxModule->cthis()->getModule(), jsCallInvoker_);
-    turboModuleCache_.insert({name, turboModule});
-
-    TurboModulePerfLogger::moduleJSRequireEndingEnd(moduleName);
-    return turboModule;
-  }
-
   return nullptr;
 }
 
@@ -260,23 +243,6 @@ std::shared_ptr<TurboModule> TurboModuleManager::getLegacyModule(
 
   TurboModulePerfLogger::moduleJSRequireBeginningEnd(moduleName);
 
-  static auto getLegacyCxxModule =
-      javaPart->getClass()
-          ->getMethod<jni::alias_ref<CxxModuleWrapper::javaobject>(
-              const std::string&)>("getLegacyCxxModule");
-  auto legacyCxxModule = getLegacyCxxModule(javaPart.get(), name);
-
-  if (legacyCxxModule) {
-    TurboModulePerfLogger::moduleJSRequireEndingStart(moduleName);
-
-    auto turboModule = std::make_shared<react::TurboCxxModule>(
-        legacyCxxModule->cthis()->getModule(), jsCallInvoker_);
-    legacyModuleCache_.insert({name, turboModule});
-
-    TurboModulePerfLogger::moduleJSRequireEndingEnd(moduleName);
-    return turboModule;
-  }
-
   static auto getLegacyJavaModule =
       javaPart->getClass()
           ->getMethod<jni::alias_ref<JNativeModule>(const std::string&)>(

package/ReactCommon/cxxreact/ReactMarker.cpp

@@ -6,7 +6,6 @@
  */
 
 #include "ReactMarker.h"
-#include <cxxreact/JSExecutor.h>
 
 namespace facebook::react::ReactMarker {
 

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -22,7 +22,7 @@ constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 84;
   int32_t Patch = 0;
-  std::string_view Prerelease = "nightly-20251106-de5141a3d";
+  std::string_view Prerelease = "nightly-20251107-f8198f662";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/ReactCommon/jsiexecutor/CMakeLists.txt

@@ -20,7 +20,9 @@ target_link_libraries(jsireact
         reactperflogger
         folly_runtime
         glog
-        jsi)
+        jserrorhandler
+        jsi
+        jsitooling)
 
 target_compile_reactnative_options(jsireact PRIVATE)
 target_compile_options(jsireact PRIVATE -O3)

package/ReactCommon/jsiexecutor/React-jsiexecutor.podspec

@@ -30,7 +30,9 @@ Pod::Spec.new do |s|
   s.header_dir             = "jsireact"
 
   s.dependency "React-cxxreact"
+  s.dependency "React-jserrorhandler"
   s.dependency "React-jsi"
+  s.dependency "React-jsitooling"
   s.dependency "React-perflogger"
   add_dependency(s, "React-debug")
   add_dependency(s, "React-runtimeexecutor", :additional_framework_paths => ["platform/ios"])

package/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp

@@ -576,44 +576,4 @@ void JSIExecutor::flush() {}
 
 #endif // RCT_REMOVE_LEGACY_ARCH
 
-void bindNativeLogger(Runtime& runtime, Logger logger) {
-  runtime.global().setProperty(
-      runtime,
-      "nativeLoggingHook",
-      Function::createFromHostFunction(
-          runtime,
-          PropNameID::forAscii(runtime, "nativeLoggingHook"),
-          2,
-          [logger = std::move(logger)](
-              jsi::Runtime& runtime,
-              const jsi::Value&,
-              const jsi::Value* args,
-              size_t count) {
-            if (count != 2) {
-              throw std::invalid_argument(
-                  "nativeLoggingHook takes 2 arguments");
-            }
-            logger(
-                args[0].asString(runtime).utf8(runtime),
-                static_cast<unsigned int>(args[1].asNumber()));
-            return Value::undefined();
-          }));
-}
-
-void bindNativePerformanceNow(Runtime& runtime) {
-  runtime.global().setProperty(
-      runtime,
-      "nativePerformanceNow",
-      Function::createFromHostFunction(
-          runtime,
-          PropNameID::forAscii(runtime, "nativePerformanceNow"),
-          0,
-          [](jsi::Runtime& runtime,
-             const jsi::Value&,
-             const jsi::Value* args,
-             size_t /*count*/) {
-            return HighResTimeStamp::now().toDOMHighResTimeStamp();
-          }));
-}
-
 } // namespace facebook::react

package/ReactCommon/jsiexecutor/jsireact/JSIExecutor.h

@@ -12,6 +12,7 @@
 #include <cxxreact/RAMBundleRegistry.h>
 #include <jsi/jsi.h>
 #include <jsireact/JSINativeModules.h>
+#include <react/runtime/JSRuntimeBindings.h>
 #include <functional>
 #include <mutex>
 #include <optional>
@@ -127,10 +128,4 @@ class [[deprecated("This API will be removed along with the legacy architecture.
 #endif // RCT_REMOVE_LEGACY_ARCH
 };
 
-using Logger = std::function<void(const std::string &message, unsigned int logLevel)>;
-void bindNativeLogger(jsi::Runtime &runtime, Logger logger);
-
-void bindNativePerformanceNow(jsi::Runtime &runtime);
-
-double performanceNow();
 } // namespace facebook::react

package/ReactCommon/jsinspector-modern/ConsoleTask.cpp

@@ -0,0 +1,27 @@
+/*
+ * 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 "ConsoleTask.h"
+#include "ConsoleTaskOrchestrator.h"
+
+namespace facebook::react::jsinspector_modern {
+
+ConsoleTask::ConsoleTask(std::shared_ptr<ConsoleTaskContext> taskContext)
+    : taskContext_(std::move(taskContext)),
+      orchestrator_(ConsoleTaskOrchestrator::getInstance()) {
+  if (taskContext_) {
+    orchestrator_.startTask(taskContext_->id());
+  }
+}
+
+ConsoleTask::~ConsoleTask() {
+  if (taskContext_) {
+    orchestrator_.finishTask(taskContext_->id());
+  }
+}
+
+} // namespace facebook::react::jsinspector_modern

package/ReactCommon/jsinspector-modern/ConsoleTask.h

@@ -0,0 +1,38 @@
+/*
+ * 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>
+
+namespace facebook::react::jsinspector_modern {
+
+class ConsoleTaskContext;
+class RuntimeTargetDelegate;
+class ConsoleTaskOrchestrator;
+
+class ConsoleTask {
+ public:
+  /**
+   * \param runtimeTargetDelegate The delegate to the corresponding runtime.
+   * \param taskContext The context that tracks the task.
+   */
+  explicit ConsoleTask(std::shared_ptr<ConsoleTaskContext> taskContext);
+  ~ConsoleTask();
+
+  ConsoleTask(const ConsoleTask &) = default;
+  ConsoleTask &operator=(const ConsoleTask &) = delete;
+
+  ConsoleTask(ConsoleTask &&) = default;
+  ConsoleTask &operator=(ConsoleTask &&) = delete;
+
+ private:
+  std::shared_ptr<ConsoleTaskContext> taskContext_;
+  ConsoleTaskOrchestrator &orchestrator_;
+};
+
+} // namespace facebook::react::jsinspector_modern

package/ReactCommon/jsinspector-modern/ConsoleTaskContext.cpp

@@ -0,0 +1,46 @@
+/*
+ * 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 "ConsoleTaskContext.h"
+#include "ConsoleTaskOrchestrator.h"
+#include "RuntimeTarget.h"
+
+namespace facebook::react::jsinspector_modern {
+
+ConsoleTaskContext::ConsoleTaskContext(
+    jsi::Runtime& runtime,
+    RuntimeTargetDelegate& runtimeTargetDelegate,
+    std::string name)
+    : runtimeTargetDelegate_(runtimeTargetDelegate),
+      name_(std::move(name)),
+      orchestrator_(ConsoleTaskOrchestrator::getInstance()) {
+  stackTrace_ = runtimeTargetDelegate_.captureStackTrace(runtime);
+}
+
+ConsoleTaskContext::~ConsoleTaskContext() {
+  orchestrator_.cancelTask(id());
+}
+
+ConsoleTaskId ConsoleTaskContext::id() const {
+  return ConsoleTaskId{(void*)this};
+}
+
+std::optional<folly::dynamic> ConsoleTaskContext::getSerializedStackTrace()
+    const {
+  auto maybeValue = runtimeTargetDelegate_.serializeStackTrace(*stackTrace_);
+  if (maybeValue) {
+    maybeValue.value()["description"] = name_;
+  }
+
+  return maybeValue;
+}
+
+void ConsoleTaskContext::schedule() {
+  orchestrator_.scheduleTask(id(), weak_from_this());
+}
+
+} // namespace facebook::react::jsinspector_modern

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/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