react-native 0.84.0-nightly-20251109-b7012ba92 → 0.84.0-nightly-20251112-7dcedf1de

package/ReactCommon/jsinspector-modern/HostAgent.cpp

@@ -10,6 +10,7 @@
 
 #ifdef REACT_NATIVE_DEBUGGER_ENABLED
 #include "InspectorFlags.h"
+#include "InspectorInterfaces.h"
 #include "NetworkIOAgent.h"
 #include "SessionState.h"
 #include "TracingAgent.h"
@@ -145,6 +146,19 @@ class HostAgent::Impl final {
     }
     if (InspectorFlags::getInstance().getNetworkInspectionEnabled()) {
       if (req.method == "Network.enable") {
+        auto& inspector = getInspectorInstance();
+        if (inspector.getSystemState().registeredPagesCount > 1) {
+          frontendChannel_(
+              cdp::jsonError(
+                  req.id,
+                  cdp::ErrorCode::InternalError,
+                  "The Network domain is unavailable when multiple React Native hosts are registered."));
+          return {
+              .isFinishedHandlingRequest = true,
+              .shouldSendOKResponse = false,
+          };
+        }
+
         sessionState_.isNetworkDomainEnabled = true;
 
         return {
@@ -216,6 +230,11 @@ class HostAgent::Impl final {
           cdp::jsonNotification(
               "ReactNativeApplication.metadataUpdated",
               createHostMetadataPayload(hostMetadata_)));
+      auto& inspector = getInspectorInstance();
+      bool isSingleHost = inspector.getSystemState().registeredPagesCount <= 1;
+      if (!isSingleHost) {
+        emitSystemStateChanged(isSingleHost);
+      }
 
       auto stashedTraceRecording =
           targetController_.getDelegate()
@@ -374,6 +393,15 @@ class HostAgent::Impl final {
     tracingAgent_.emitExternalTraceRecording(std::move(traceRecording));
   }
 
+  void emitSystemStateChanged(bool isSingleHost) {
+    frontendChannel_(
+        cdp::jsonNotification(
+            "ReactNativeApplication.systemStateChanged",
+            folly::dynamic::object("isSingleHost", isSingleHost)));
+
+    frontendChannel_(cdp::jsonNotification("Network.disable"));
+  }
+
  private:
   enum class FuseboxClientType { Unknown, Fusebox, NonFusebox };
 
@@ -480,6 +508,7 @@ class HostAgent::Impl final {
   }
   void emitExternalTraceRecording(tracing::TraceRecordingState traceRecording) {
   }
+  void emitSystemStateChanged(bool isSingleHost) {}
 };
 
 #endif // REACT_NATIVE_DEBUGGER_ENABLED
@@ -519,6 +548,10 @@ void HostAgent::emitExternalTraceRecording(
   impl_->emitExternalTraceRecording(std::move(traceRecording));
 }
 
+void HostAgent::emitSystemStateChanged(bool isSingleHost) const {
+  impl_->emitSystemStateChanged(isSingleHost);
+}
+
 #pragma mark - Tracing
 
 HostTracingAgent::HostTracingAgent(tracing::TraceRecordingState& state)

package/ReactCommon/jsinspector-modern/HostAgent.h

@@ -79,6 +79,12 @@ class HostAgent final {
    */
   void emitExternalTraceRecording(tracing::TraceRecordingState traceRecording) const;
 
+  /**
+   * Emits a system state changed event when the number of ReactHost instances
+   * changes.
+   */
+  void emitSystemStateChanged(bool isSingleHost) const;
+
  private:
   // We use the private implementation idiom to ensure this class has the same
   // layout regardless of whether REACT_NATIVE_DEBUGGER_ENABLED is defined. The

package/ReactCommon/jsinspector-modern/HostTarget.h

@@ -326,6 +326,11 @@ class JSINSPECTOR_EXPORT HostTarget : public EnableExecutorFromThis<HostTarget>
    */
   void emitTraceRecordingForFirstFuseboxClient(tracing::TraceRecordingState traceRecording) const;
 
+  /**
+   * Emits a system state changed event to all active sessions.
+   */
+  void emitSystemStateChanged(bool isSingleHost) const;
+
  private:
   /**
    * Constructs a new HostTarget.

package/ReactCommon/jsinspector-modern/InspectorFlags.cpp

@@ -17,6 +17,10 @@ InspectorFlags& InspectorFlags::getInstance() {
   return instance;
 }
 
+bool InspectorFlags::getAssertSingleHostState() const {
+  return loadFlagsAndAssertUnchanged().assertSingleHostState;
+}
+
 bool InspectorFlags::getFuseboxEnabled() const {
   if (fuseboxDisabledForTest_) {
     return false;
@@ -48,6 +52,8 @@ void InspectorFlags::dangerouslyDisableFuseboxForTest() {
 const InspectorFlags::Values& InspectorFlags::loadFlagsAndAssertUnchanged()
     const {
   InspectorFlags::Values newValues = {
+      .assertSingleHostState =
+          ReactNativeFeatureFlags::fuseboxAssertSingleHostState(),
       .fuseboxEnabled =
 #if defined(REACT_NATIVE_DEBUGGER_ENABLED)
           true,

package/ReactCommon/jsinspector-modern/InspectorFlags.h

@@ -19,6 +19,12 @@ class InspectorFlags {
  public:
   static InspectorFlags &getInstance();
 
+  /**
+   * Flag determining if the inspector backend should strictly assert that only
+   * a single host is registered.
+   */
+  bool getAssertSingleHostState() const;
+
   /**
    * Flag determining if the modern CDP backend should be enabled.
    */
@@ -54,6 +60,7 @@ class InspectorFlags {
 
  private:
   struct Values {
+    bool assertSingleHostState;
     bool fuseboxEnabled;
     bool isProfilingBuild;
     bool networkInspectionEnabled;

package/ReactCommon/jsinspector-modern/InspectorInterfaces.cpp

@@ -7,6 +7,8 @@
 
 #include "InspectorInterfaces.h"
 
+#include "InspectorFlags.h"
+
 #include <cassert>
 #include <list>
 #include <mutex>
@@ -35,6 +37,14 @@ namespace {
 
 class InspectorImpl : public IInspector {
  public:
+  InspectorImpl() {
+    systemStateListener_ = std::make_shared<SystemStateListener>(systemState_);
+    auto& inspectorFlags = InspectorFlags::getInstance();
+    if (inspectorFlags.getAssertSingleHostState()) {
+      registerPageStatusListener(systemStateListener_);
+    }
+  }
+
   int addPage(
       const std::string& description,
       const std::string& vm,
@@ -50,7 +60,21 @@ class InspectorImpl : public IInspector {
   void registerPageStatusListener(
       std::weak_ptr<IPageStatusListener> listener) override;
 
+  InspectorSystemState getSystemState() const override;
+
  private:
+  class SystemStateListener : public IPageStatusListener {
+   public:
+    explicit SystemStateListener(InspectorSystemState& state) : state_(state) {}
+
+    void onPageAdded(int /*pageId*/) override {
+      state_.registeredPagesCount++;
+    }
+
+   private:
+    InspectorSystemState& state_;
+  };
+
   class Page {
    public:
     Page(
@@ -74,6 +98,8 @@ class InspectorImpl : public IInspector {
   int nextPageId_{1};
   std::map<int, Page> pages_;
   std::list<std::weak_ptr<IPageStatusListener>> listeners_;
+  InspectorSystemState systemState_{0};
+  std::shared_ptr<SystemStateListener> systemStateListener_;
 };
 
 InspectorImpl::Page::Page(
@@ -116,6 +142,12 @@ int InspectorImpl::addPage(
       pageId,
       Page{pageId, description, vm, std::move(connectFunc), capabilities});
 
+  for (const auto& listenerWeak : listeners_) {
+    if (auto listener = listenerWeak.lock()) {
+      listener->onPageAdded(pageId);
+    }
+  }
+
   return pageId;
 }
 
@@ -175,6 +207,11 @@ void InspectorImpl::registerPageStatusListener(
   }
   listeners_.push_back(listener);
 }
+
+InspectorSystemState InspectorImpl::getSystemState() const {
+  std::scoped_lock lock(mutex_);
+  return systemState_;
+}
 } // namespace
 
 IInspector& getInspectorInstance() {

package/ReactCommon/jsinspector-modern/InspectorInterfaces.h

@@ -51,6 +51,11 @@ struct InspectorPageDescription {
 // Alias for backwards compatibility.
 using InspectorPage = InspectorPageDescription;
 
+struct InspectorSystemState {
+  /** The total count of pages registered during the app lifetime. */
+  int registeredPagesCount;
+};
+
 /// IRemoteConnection allows the VM to send debugger messages to the client.
 /// IRemoteConnection's methods are safe to call from any thread *if*
 /// InspectorPackagerConnection.cpp is in use.
@@ -78,7 +83,8 @@ class JSINSPECTOR_EXPORT ILocalConnection : public IDestructible {
 class JSINSPECTOR_EXPORT IPageStatusListener : public IDestructible {
  public:
   virtual ~IPageStatusListener() = 0;
-  virtual void onPageRemoved(int pageId) = 0;
+  virtual void onPageAdded(int /*pageId*/) {}
+  virtual void onPageRemoved(int /*pageId*/) {}
 };
 
 /// IInspector tracks debuggable JavaScript targets (pages).
@@ -127,6 +133,11 @@ class JSINSPECTOR_EXPORT IInspector : public IDestructible {
    * when pages are removed.
    */
   virtual void registerPageStatusListener(std::weak_ptr<IPageStatusListener> listener) = 0;
+
+  /**
+   * Get the current \c InspectorSystemState object.
+   */
+  virtual InspectorSystemState getSystemState() const = 0;
 };
 
 class NotImplementedException : public std::exception {

package/ReactCommon/jsinspector-modern/TracingAgent.cpp

@@ -49,6 +49,17 @@ TracingAgent::~TracingAgent() {
 
 bool TracingAgent::handleRequest(const cdp::PreparsedRequest& req) {
   if (req.method == "Tracing.start") {
+    auto& inspector = getInspectorInstance();
+    if (inspector.getSystemState().registeredPagesCount > 1) {
+      frontendChannel_(
+          cdp::jsonError(
+              req.id,
+              cdp::ErrorCode::InternalError,
+              "The Tracing domain is unavailable when multiple React Native hosts are registered."));
+
+      return true;
+    }
+
     if (sessionState_.isDebuggerDomainEnabled) {
       frontendChannel_(
           cdp::jsonError(

package/ReactCommon/jsitooling/React-jsitooling.podspec

@@ -44,6 +44,10 @@ Pod::Spec.new do |s|
   add_dependency(s, "React-jsinspectortracing", :framework_name => 'jsinspector_moderntracing')
   add_dependency(s, "React-utils", :additional_framework_paths => ["react/utils/platform/ios"])
 
+  if (use_hermes())
+    s.dependency "hermes-engine"
+  end
+
   add_rn_third_party_dependencies(s)
   add_rncore_dependency(s)
 end

package/ReactCommon/react/featureflags/ReactNativeFeatureFlags.cpp

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<1a4d03b0d58e389dc9e9af0adf7afa9f>>
+ * @generated SignedSource<<c4020a265f61714560e6742482cc05ab>>
  */
 
 /**
@@ -142,6 +142,10 @@ bool ReactNativeFeatureFlags::enableImagePrefetchingAndroid() {
   return getAccessor().enableImagePrefetchingAndroid();
 }
 
+bool ReactNativeFeatureFlags::enableImagePrefetchingJNIBatchingAndroid() {
+  return getAccessor().enableImagePrefetchingJNIBatchingAndroid();
+}
+
 bool ReactNativeFeatureFlags::enableImagePrefetchingOnUiThreadAndroid() {
   return getAccessor().enableImagePrefetchingOnUiThreadAndroid();
 }
@@ -254,6 +258,10 @@ bool ReactNativeFeatureFlags::fixMappingOfEventPrioritiesBetweenFabricAndReact()
   return getAccessor().fixMappingOfEventPrioritiesBetweenFabricAndReact();
 }
 
+bool ReactNativeFeatureFlags::fuseboxAssertSingleHostState() {
+  return getAccessor().fuseboxAssertSingleHostState();
+}
+
 bool ReactNativeFeatureFlags::fuseboxEnabledRelease() {
   return getAccessor().fuseboxEnabledRelease();
 }

package/ReactCommon/react/featureflags/ReactNativeFeatureFlags.h

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<62480a82004544f8365f4f0957eb7319>>
+ * @generated SignedSource<<972740252a5ef5f89f739599da789b79>>
  */
 
 /**
@@ -184,6 +184,11 @@ class ReactNativeFeatureFlags {
    */
   RN_EXPORT static bool enableImagePrefetchingAndroid();
 
+  /**
+   * When enabled, Android will build and initiate image prefetch requests on ImageShadowNode::layout and batch them together in a single JNI call
+   */
+  RN_EXPORT static bool enableImagePrefetchingJNIBatchingAndroid();
+
   /**
    * When enabled, Android will initiate image prefetch requested on ImageShadowNode::layout on the UI thread
    */
@@ -324,6 +329,11 @@ class ReactNativeFeatureFlags {
    */
   RN_EXPORT static bool fixMappingOfEventPrioritiesBetweenFabricAndReact();
 
+  /**
+   * Enable system assertion validating that Fusebox is configured with a single host. When set, the CDP backend will dynamically disable features (Perf and Network) in the event that multiple hosts are registered (undefined behaviour), and broadcast this over `ReactNativeApplication.systemStateChanged`.
+   */
+  RN_EXPORT static bool fuseboxAssertSingleHostState();
+
   /**
    * Flag determining if the React Native DevTools (Fusebox) CDP backend should be enabled in release builds. This flag is global and should not be changed across React Host lifetimes.
    */