Merge RCTPackagerClient into RCTPackagerConnection

Reviewed By: mmmulani

Differential Revision: D4988204

fbshipit-source-id: 78e0df5268bfc11e4e0edf8e60494e55022cd9f2

React/Modules/RCTDevSettings.mm

@@ -141,6 +141,8 @@ RCT_EXPORT_MODULE()
 {
   if (self = [super init]) {
     _dataSource = dataSource;
+    [self _configurePackagerConnection];
+
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(jsLoaded:)
                                                  name:RCTJavaScriptDidLoadNotification
@@ -149,7 +151,6 @@ RCT_EXPORT_MODULE()
     // Delay setup until after Bridge init
     dispatch_async(dispatch_get_main_queue(), ^{
       [self _synchronizeAllSettings];
-      [self _configurePackagerConnection];
     });
   }
   return self;
@@ -385,6 +386,20 @@ RCT_EXPORT_METHOD(toggleElementInspector)
   }
 }
 
+#if ENABLE_PACKAGER_CONNECTION
+
+- (void)addHandler:(id<RCTPackagerClientMethod>)handler forPackagerMethod:(NSString *)name
+{
+  RCTAssert(_packagerConnection, @"Expected packager connection");
+  [_packagerConnection addHandler:handler forMethod:name];
+}
+
+#elif RCT_DEV
+
+- (void)addHandler:(id<RCTPackagerClientMethod>)handler forPackagerMethod:(NSString *)name {}
+
+#endif
+
 #pragma mark - Internal
 
 - (void)_configurePackagerConnection
@@ -395,7 +410,6 @@ RCT_EXPORT_METHOD(toggleElementInspector)
   }
 
   _packagerConnection = [[RCTPackagerConnection alloc] initWithBridge:_bridge];
-  [_packagerConnection connect];
 #endif
 }