iOS: Make RCTPackagerConnection instance of RCTDevSettings and use bundle config (#54258)

Summary:


## Summary

It associates `RCTPackagerConnection` (previously singleton) with the `RCTDevSettings` instance, which has access to the `RCTBundleManager`, which contains the specified configuration object. The connection is now established in the `RCTDevSettings initialize`  method, called after the bundle manager is set by invoking the new `startWithBundleManager` method on the `RCTPackagerConnection`.

## Changelog:
[IOS][CHANGED] - Make `RCTPackagerConnection` instance of the `RCTDevSettings` and use bundle config.

Differential Revision: D85247267

Author: coado

packages/react-native/React/CoreModules/RCTDevSettings.h

@@ -11,6 +11,8 @@
 #import <React/RCTEventEmitter.h>
 #import <React/RCTInitializing.h>
 
+@class RCTPackagerConnection;
+
 @protocol RCTPackagerClientMethod;
 
 /**
@@ -85,6 +87,8 @@
  */
 @property (nonatomic, assign) BOOL isPerfMonitorShown;
 
+@property (nonatomic, readonly) RCTPackagerConnection *packagerConnection;
+
 /**
  * Toggle the element inspector.
  */

packages/react-native/React/CoreModules/RCTDevSettings.mm

@@ -32,9 +32,12 @@
 
 static NSString *const kRCTDevSettingsUserDefaultsKey = @"RCTDevMenu";
 
+#if RCT_DEV_MENU
+#import <React/RCTPackagerConnection.h>
+#endif
+
 #if RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION
 #import <React/RCTPackagerClient.h>
-#import <React/RCTPackagerConnection.h>
 #endif
 
 #if RCT_ENABLE_INSPECTOR
@@ -145,6 +148,9 @@ - (instancetype)init
   };
   RCTDevSettingsUserDefaultsDataSource *dataSource =
       [[RCTDevSettingsUserDefaultsDataSource alloc] initWithDefaultValues:defaultValues];
+#if RCT_DEV
+  _packagerConnection = [RCTPackagerConnection new];
+#endif
   _isShakeGestureEnabled = true;
   return [self initWithDataSource:dataSource];
 }
@@ -178,18 +184,27 @@ - (instancetype)initWithDataSource:(id<RCTDevSettingsDataSource>)dataSource
 
 - (void)initialize
 {
+#if RCT_DEV
+  [_packagerConnection startWithBundleManager:_bundleManager];
+#endif
+
 #if RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION
   if (numInitializedModules++ == 0) {
-    reloadToken = [[RCTPackagerConnection sharedPackagerConnection]
+    reloadToken = [_packagerConnection
         addNotificationHandler:^(id params) {
           RCTTriggerReloadCommandListeners(@"Global hotkey");
         }
                          queue:dispatch_get_main_queue()
                      forMethod:@"reload"];
 #if RCT_DEV_MENU
-    devMenuToken = [[RCTPackagerConnection sharedPackagerConnection]
+    __weak __typeof(self) weakSelf = self;
+    devMenuToken = [_packagerConnection
         addNotificationHandler:^(id params) {
-          [[self.moduleRegistry moduleForName:"DevMenu"] show];
+          __typeof(self) strongSelf = weakSelf;
+          if (strongSelf == nullptr) {
+            return;
+          }
+          [[strongSelf.moduleRegistry moduleForName:"DevMenu"] show];
         }
                          queue:dispatch_get_main_queue()
                      forMethod:@"devMenu"];
@@ -240,9 +255,9 @@ - (void)invalidate
   [super invalidate];
 #if RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION
   if (--numInitializedModules == 0) {
-    [[RCTPackagerConnection sharedPackagerConnection] removeHandler:reloadToken];
+    [_packagerConnection removeHandler:reloadToken];
 #if RCT_DEV_MENU
-    [[RCTPackagerConnection sharedPackagerConnection] removeHandler:devMenuToken];
+    [_packagerConnection removeHandler:devMenuToken];
 #endif
   }
 #endif
@@ -425,7 +440,7 @@ - (void)setExecutorClass:(Class)executorClass
 - (void)addHandler:(id<RCTPackagerClientMethod>)handler forPackagerMethod:(NSString *)name
 {
 #if RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION
-  [[RCTPackagerConnection sharedPackagerConnection] addHandler:handler forMethod:name];
+  [_packagerConnection addHandler:handler forMethod:name];
 #endif
 }
 

packages/react-native/React/DevSupport/RCTPackagerConnection.h

@@ -7,6 +7,7 @@
 
 #import <Foundation/Foundation.h>
 
+#import <React/RCTBundleManager.h>
 #import <React/RCTDefines.h>
 
 #if RCT_DEV
@@ -24,8 +25,6 @@ typedef void (^RCTConnectedHandler)(void);
 /** Encapsulates singleton connection to React Native packager. */
 @interface RCTPackagerConnection : NSObject
 
-+ (instancetype)sharedPackagerConnection;
-
 /**
  * Registers a handler for a notification broadcast from the packager. An
  * example is "reload" - an instruction to reload from the packager.
@@ -62,6 +61,9 @@ typedef void (^RCTConnectedHandler)(void);
 /** Reconnect with given packager server, if packagerServerHostPort has changed. */
 - (void)reconnect:(NSString *)packagerServerHostPort;
 
+/** starts packager connection with configuration from the bundle manager */
+- (void)startWithBundleManager:(RCTBundleManager *)bundleManager;
+
 /**
  * Historically no distinction was made between notification and request
  * handlers. If you use this method, it will be registered as *both* a

packages/react-native/React/DevSupport/RCTPackagerConnection.mm

@@ -13,6 +13,7 @@
 
 #import <React/RCTAssert.h>
 #import <React/RCTBridge.h>
+#import <React/RCTBundleManager.h>
 #import <React/RCTBundleURLProvider.h>
 #import <React/RCTConstants.h>
 #import <React/RCTConvert.h>
@@ -50,43 +51,13 @@ @implementation RCTPackagerConnection {
   std::vector<Registration<RCTNotificationHandler>> _notificationRegistrations;
   std::vector<Registration<RCTRequestHandler>> _requestRegistrations;
   std::vector<Registration<RCTConnectedHandler>> _connectedRegistrations;
-}
-
-+ (instancetype)sharedPackagerConnection
-{
-  static RCTPackagerConnection *connection;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    connection = [RCTPackagerConnection new];
-  });
-  return connection;
+  RCTBundleManager *_bundleManager;
 }
 
 - (instancetype)init
 {
   if (self = [super init]) {
     _nextToken = 1; // Prevent randomly erasing a handler if you pass a bogus 0 token
-    _serverHostPortForSocket = [[RCTBundleURLProvider sharedSettings] packagerServerHostPort];
-    _serverSchemeForSocket = [[RCTBundleURLProvider sharedSettings] packagerScheme];
-    _socket = socketForLocation(_serverHostPortForSocket, _serverSchemeForSocket);
-    _socket.delegate = self;
-    [_socket start];
-
-    RCTPackagerConnection *const __weak weakSelf = self;
-    _bundleURLChangeObserver =
-        [[NSNotificationCenter defaultCenter] addObserverForName:RCTBundleURLProviderUpdatedNotification
-                                                          object:nil
-                                                           queue:[NSOperationQueue mainQueue]
-                                                      usingBlock:^(NSNotification *_Nonnull __unused note) {
-                                                        [weakSelf bundleURLSettingsChanged];
-                                                      }];
-    _reloadWithPotentiallyNewURLObserver =
-        [[NSNotificationCenter defaultCenter] addObserverForName:RCTTriggerReloadCommandNotification
-                                                          object:nil
-                                                           queue:[NSOperationQueue mainQueue]
-                                                      usingBlock:^(NSNotification *_Nonnull __unused note) {
-                                                        [weakSelf bundleURLSettingsChanged];
-                                                      }];
   }
   return self;
 }
@@ -119,6 +90,32 @@ - (instancetype)init
   return [[RCTReconnectingWebSocket alloc] initWithURL:components.URL queue:queue];
 }
 
+- (void)startWithBundleManager:(RCTBundleManager *)bundleManager
+{
+  _serverHostPortForSocket = [bundleManager.bundleConfig getPackagerServerHost];
+  _serverSchemeForSocket = [bundleManager.bundleConfig getPackagerServerScheme];
+  _socket = socketForLocation(_serverHostPortForSocket, _serverSchemeForSocket);
+  _socket.delegate = self;
+  [_socket start];
+  _bundleManager = bundleManager;
+
+  RCTPackagerConnection *const __weak weakSelf = self;
+  _bundleURLChangeObserver =
+      [[NSNotificationCenter defaultCenter] addObserverForName:RCTBundleURLProviderUpdatedNotification
+                                                        object:nil
+                                                         queue:[NSOperationQueue mainQueue]
+                                                    usingBlock:^(NSNotification *_Nonnull __unused note) {
+                                                      [weakSelf bundleURLSettingsChanged];
+                                                    }];
+  _reloadWithPotentiallyNewURLObserver =
+      [[NSNotificationCenter defaultCenter] addObserverForName:RCTTriggerReloadCommandNotification
+                                                        object:nil
+                                                         queue:[NSOperationQueue mainQueue]
+                                                    usingBlock:^(NSNotification *_Nonnull __unused note) {
+                                                      [weakSelf bundleURLSettingsChanged];
+                                                    }];
+}
+
 - (void)stop
 {
   std::lock_guard<std::mutex> l(_mutex);
@@ -144,7 +141,7 @@ - (void)reconnect:(NSString *)packagerServerHostPort
     return; // already stopped
   }
 
-  NSString *const serverScheme = [[RCTBundleURLProvider sharedSettings] packagerScheme];
+  NSString *const serverScheme = [_bundleManager.bundleConfig getPackagerServerScheme];
   if ([packagerServerHostPort isEqual:_serverHostPortForSocket] && [serverScheme isEqual:_serverSchemeForSocket]) {
     return; // unchanged
   }
@@ -161,7 +158,7 @@ - (void)reconnect:(NSString *)packagerServerHostPort
 - (void)bundleURLSettingsChanged
 {
   // Will only reconnect if `packagerServerHostPort` has actually changed
-  [self reconnect:[[RCTBundleURLProvider sharedSettings] packagerServerHostPort]];
+  [self reconnect:[_bundleManager.bundleConfig getPackagerServerHost]];
 }
 
 - (RCTHandlerToken)addNotificationHandler:(RCTNotificationHandler)handler

packages/react-native/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTHost.mm

@@ -196,7 +196,9 @@ - (instancetype)initWithBundleURLProvider:(RCTHostBundleURLProvider)provider
         return nil;
       }
 
-      return strongSelf->_bundleURL;
+      return [strongSelf->_bundleManager.bundleConfig getBundleURL:^NSURL * {
+        return strongSelf->_bundleURL;
+      }];
     };
 
     auto bundleURLSetter = ^(NSURL *bundleURL_) {
@@ -209,7 +211,9 @@ - (instancetype)initWithBundleURLProvider:(RCTHostBundleURLProvider)provider
         return nil;
       }
 
-      return strongSelf->_bundleURLProvider();
+      return [strongSelf->_bundleManager.bundleConfig getBundleURL:^NSURL * {
+        return strongSelf->_bundleURLProvider();
+      }];
     };
 
     [_bundleManager setBridgelessBundleURLGetter:bundleURLGetter

packages/react-native/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTInstance.mm

@@ -535,7 +535,11 @@ - (void)_loadJSBundle:(NSURL *)sourceURL
   {
     id<RCTDevLoadingViewProtocol> loadingView =
         (id<RCTDevLoadingViewProtocol>)[_turboModuleManager moduleForName:"DevLoadingView"];
-    [loadingView showWithURL:sourceURL];
+    // When the bundleFilePath is set in the RCTBundleConfiguration the Metro connection
+    // shouldn't be suggested/required.
+    if (_bridgeModuleDecorator.bundleManager.bundleConfig.bundleFilePath == nullptr) {
+      [loadingView showWithURL:sourceURL];
+    }
   }
 #endif