Bridgeless mode: Attach bridge/bridgeless apis to interop modules (fa…

…cebook#38202)

Summary:
Pull Request resolved: facebook#38202

## Context
Native modules can synthesize these bridge/bridgeless-agnostic abstractions:
- viewRegistry_DEPRECATED
- bundleManager
- callableJSModules
- moduleRegistry

## The Problem
The TurboModule interop layer wasn't attaching these abstractions to legacy modules.

## The Issue
In Bridgeless mode, the React instance attaches these abstractions to **all** modules, by implementing TurboModuleManagerDelegate.

But, the TurboModuleManager creates legacy modules without calling into the TurboModuleManagerDelegate. So, legacy modules never had these abstractions attached.

## The Fix
Move the attachment logic to within TurboModuleManager.

Changelog: [Internal]

Reviewed By: dmytrorykun

Differential Revision: D47074304

fbshipit-source-id: 87408106c00db8011740068ac0bd7dacd6b5ff81

packages/react-native/React/Base/RCTBridge.h

@@ -9,6 +9,7 @@
 
 #import <React/RCTBridgeDelegate.h>
 #import <React/RCTBridgeModule.h>
+#import <React/RCTBridgeModuleDecorator.h>
 #import <React/RCTDefines.h>
 #import <React/RCTFrameUpdate.h>
 #import <React/RCTInvalidating.h>
@@ -149,7 +150,7 @@ RCT_EXTERN void RCTSetTurboModuleCleanupMode(RCTTurboModuleCleanupMode mode);
  * It allows the bridge to attach properties to ObjC modules that give those modules
  * access to Bridge APIs.
  */
-- (void)attachBridgeAPIsToObjCModule:(id<RCTBridgeModule>)module;
+- (RCTBridgeModuleDecorator *)bridgeModuleDecorator;
 
 /**
  * Convenience method for retrieving all modules conforming to a given protocol.

packages/react-native/React/Base/RCTBridge.m

@@ -226,9 +226,9 @@ - (void)setRCTTurboModuleRegistry:(id<RCTTurboModuleRegistry>)turboModuleRegistr
   [self.batchedBridge setRCTTurboModuleRegistry:turboModuleRegistry];
 }
 
-- (void)attachBridgeAPIsToObjCModule:(id<RCTBridgeModule>)module
+- (RCTBridgeModuleDecorator *)bridgeModuleDecorator
 {
-  [self.batchedBridge attachBridgeAPIsToObjCModule:module];
+  return [self.batchedBridge bridgeModuleDecorator];
 }
 
 - (void)didReceiveReloadCommand

packages/react-native/React/CxxBridge/RCTCxxBridge.mm

@@ -245,14 +245,12 @@ - (void)setRCTTurboModuleRegistry:(id<RCTTurboModuleRegistry>)turboModuleRegistr
   [_objCModuleRegistry setTurboModuleRegistry:_turboModuleRegistry];
 }
 
-- (void)attachBridgeAPIsToObjCModule:(id<RCTBridgeModule>)module
-{
-  RCTBridgeModuleDecorator *bridgeModuleDecorator =
-      [[RCTBridgeModuleDecorator alloc] initWithViewRegistry:_viewRegistry_DEPRECATED
-                                              moduleRegistry:_objCModuleRegistry
-                                               bundleManager:_bundleManager
-                                           callableJSModules:_callableJSModules];
-  [bridgeModuleDecorator attachInteropAPIsToModule:module];
+- (RCTBridgeModuleDecorator *)bridgeModuleDecorator
+{
+  return [[RCTBridgeModuleDecorator alloc] initWithViewRegistry:_viewRegistry_DEPRECATED
+                                                 moduleRegistry:_objCModuleRegistry
+                                                  bundleManager:_bundleManager
+                                              callableJSModules:_callableJSModules];
 }
 
 - (std::shared_ptr<MessageQueueThread>)jsMessageThread

packages/react-native/ReactCommon/react/bridgeless/platform/ios/Core/RCTInstance.mm

@@ -224,26 +224,26 @@ - (void)_start
   RuntimeExecutor bufferedRuntimeExecutor = _reactInstance->getBufferedRuntimeExecutor();
   timerManager->setRuntimeExecutor(bufferedRuntimeExecutor);
 
+  RCTBridgeProxy *bridgeProxy = RCTTurboModuleInteropEnabled() && RCTTurboModuleInteropBridgeProxyEnabled()
+      ? [[RCTBridgeProxy alloc]
+            initWithViewRegistry:_bridgeModuleDecorator.viewRegistry_DEPRECATED
+                  moduleRegistry:_bridgeModuleDecorator.moduleRegistry
+                   bundleManager:_bridgeModuleDecorator.bundleManager
+               callableJSModules:_bridgeModuleDecorator.callableJSModules
+              dispatchToJSThread:^(dispatch_block_t block) {
+                __strong __typeof(self) strongSelf = weakSelf;
+                if (strongSelf && strongSelf->_valid) {
+                  strongSelf->_reactInstance->getBufferedRuntimeExecutor()([=](jsi::Runtime &runtime) { block(); });
+                }
+              }]
+      : nil;
+
   // Set up TurboModules
-  _turboModuleManager =
-      [[RCTTurboModuleManager alloc] initWithBridge:nil
-                                           delegate:self
-                                          jsInvoker:std::make_shared<BridgelessJSCallInvoker>(bufferedRuntimeExecutor)];
-
-  if (RCTTurboModuleInteropEnabled() && RCTTurboModuleInteropBridgeProxyEnabled()) {
-    RCTBridgeProxy *bridgeProxy = [[RCTBridgeProxy alloc]
-        initWithViewRegistry:_bridgeModuleDecorator.viewRegistry_DEPRECATED
-              moduleRegistry:_bridgeModuleDecorator.moduleRegistry
-               bundleManager:_bridgeModuleDecorator.bundleManager
-           callableJSModules:_bridgeModuleDecorator.callableJSModules
-          dispatchToJSThread:^(dispatch_block_t block) {
-            __strong __typeof(self) strongSelf = weakSelf;
-            if (strongSelf && strongSelf->_valid) {
-              strongSelf->_reactInstance->getBufferedRuntimeExecutor()([=](jsi::Runtime &runtime) { block(); });
-            }
-          }];
-    [_turboModuleManager setBridgeProxy:bridgeProxy];
-  }
+  _turboModuleManager = [[RCTTurboModuleManager alloc]
+        initWithBridgeProxy:bridgeProxy
+      bridgeModuleDecorator:_bridgeModuleDecorator
+                   delegate:self
+                  jsInvoker:std::make_shared<BridgelessJSCallInvoker>(bufferedRuntimeExecutor)];
 
   // Initialize RCTModuleRegistry so that TurboModules can require other TurboModules.
   [_bridgeModuleDecorator.moduleRegistry setTurboModuleRegistry:_turboModuleManager];
@@ -346,8 +346,6 @@ - (void)_attachBridgelessAPIsToModule:(id<RCTTurboModule>)module
     }
 #endif
   }
-
-  [_bridgeModuleDecorator attachInteropAPIsToModule:(id<RCTBridgeModule>)module];
 }
 
 - (void)_loadJSBundle:(NSURL *)sourceURL

packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.h

@@ -9,6 +9,7 @@
 
 #import <memory>
 
+#import <React/RCTBridgeModuleDecorator.h>
 #import <React/RCTBridgeProxy.h>
 #import <React/RCTDefines.h>
 #import <React/RCTTurboModuleRegistry.h>
@@ -59,16 +60,18 @@ RCT_EXTERN void RCTTurboModuleSetBindingMode(facebook::react::TurboModuleBinding
                       delegate:(id<RCTTurboModuleManagerDelegate>)delegate
                      jsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker;
 
+- (instancetype)initWithBridgeProxy:(RCTBridgeProxy *)bridgeProxy
+              bridgeModuleDecorator:(RCTBridgeModuleDecorator *)bridgeModuleDecorator
+                           delegate:(id<RCTTurboModuleManagerDelegate>)delegate
+                          jsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker;
+
 - (void)installJSBindings:(facebook::jsi::Runtime &)runtime;
 
 /**
  * @deprecated: use installJSBindings instead
  */
 - (void)installJSBindingWithRuntimeExecutor:(facebook::react::RuntimeExecutor &)runtimeExecutor;
 
-// TODO: Should we move this into the initializer?
-- (void)setBridgeProxy:(RCTBridgeProxy *)bridgeProxy;
-
 - (void)invalidate;
 
 @end

packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.mm

@@ -211,16 +211,21 @@ @implementation RCTTurboModuleManager {
   NSDictionary<NSString *, Class> *_legacyEagerlyRegisteredModuleClasses;
 
   RCTBridgeProxy *_bridgeProxy;
+  RCTBridgeModuleDecorator *_bridgeModuleDecorator;
 }
 
 - (instancetype)initWithBridge:(RCTBridge *)bridge
+                   bridgeProxy:(RCTBridgeProxy *)bridgeProxy
+         bridgeModuleDecorator:(RCTBridgeModuleDecorator *)bridgeModuleDecorator
                       delegate:(id<RCTTurboModuleManagerDelegate>)delegate
                      jsInvoker:(std::shared_ptr<CallInvoker>)jsInvoker
 {
   if (self = [super init]) {
     _jsInvoker = std::move(jsInvoker);
     _delegate = delegate;
     _bridge = bridge;
+    _bridgeProxy = bridgeProxy;
+    _bridgeModuleDecorator = bridgeModuleDecorator;
     _invalidating = false;
 
     if (RCTTurboModuleInteropEnabled()) {
@@ -256,9 +261,27 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
   return self;
 }
 
-- (void)setBridgeProxy:(RCTBridgeProxy *)bridgeProxy
+- (instancetype)initWithBridge:(RCTBridge *)bridge
+                      delegate:(id<RCTTurboModuleManagerDelegate>)delegate
+                     jsInvoker:(std::shared_ptr<CallInvoker>)jsInvoker
 {
-  _bridgeProxy = bridgeProxy;
+  return [self initWithBridge:bridge
+                  bridgeProxy:nil
+        bridgeModuleDecorator:[bridge bridgeModuleDecorator]
+                     delegate:delegate
+                    jsInvoker:jsInvoker];
+}
+
+- (instancetype)initWithBridgeProxy:(RCTBridgeProxy *)bridgeProxy
+              bridgeModuleDecorator:(RCTBridgeModuleDecorator *)bridgeModuleDecorator
+                           delegate:(id<RCTTurboModuleManagerDelegate>)delegate
+                          jsInvoker:(std::shared_ptr<CallInvoker>)jsInvoker
+{
+  return [self initWithBridge:nil
+                  bridgeProxy:bridgeProxy
+        bridgeModuleDecorator:bridgeModuleDecorator
+                     delegate:delegate
+                    jsInvoker:jsInvoker];
 }
 
 - (void)notifyAboutTurboModuleSetup:(const char *)name
@@ -720,8 +743,8 @@ - (BOOL)_shouldCreateObjCModule:(Class)moduleClass
   /**
    * Decorate NativeModules with bridgeless-compatible APIs that call into the bridge.
    */
-  if (_bridge) {
-    [_bridge attachBridgeAPIsToObjCModule:module];
+  if (_bridgeModuleDecorator) {
+    [_bridgeModuleDecorator attachInteropAPIsToModule:module];
   }
 
   /**