chore(ios): use bridge from react native factory

Author: Calinteodor

ios/app/src/AppDelegate.swift

@@ -27,16 +27,20 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             builder.setFeatureFlag("ios.recording.enabled", withBoolean: true)
         }
 
-        jitsiMeet.application(application, didFinishLaunchingWithOptions: launchOptions ?? [:])
+        let vc = ViewController()
+        self.window?.rootViewController = vc
+        
+        jitsiMeet.application(application,
+                            didFinishLaunchingWithOptions: launchOptions ?? [:],
+                            moduleName: "App",
+                              in: self.window!)
 
         if self.appContainsRealServiceInfoPlist() {
             print("Enabling Firebase")
             FirebaseApp.configure()
             Crashlytics.crashlytics().setCrashlyticsCollectionEnabled(!jitsiMeet.isCrashReportingDisabled())
         }
 
-        let vc = ViewController()
-        self.window?.rootViewController = vc
         jitsiMeet.showSplashScreen()
 
         self.window?.makeKeyAndVisible()

ios/sdk/src/JitsiMeet.h

@@ -19,6 +19,9 @@
 
 #import <JitsiMeetSDK/JitsiMeetConferenceOptions.h>
 
+@class RCTReactNativeFactory;
+@protocol RCTDependencyProvider;
+
 // Matches RTCLoggingSeverity from RTCLogging.h
 typedef NS_ENUM(NSInteger, WebRTCLoggingSeverity) {
   WebRTCLoggingSeverityVerbose,
@@ -64,14 +67,26 @@ typedef NS_ENUM(NSInteger, WebRTCLoggingSeverity) {
  */
 @property (nonatomic, assign) WebRTCLoggingSeverity webRtcLoggingSeverity;
 
+/**
+ * React Native factory instance for managing React Native lifecycle.
+ */
+@property (nonatomic, strong, nullable) RCTReactNativeFactory *reactNativeFactory;
+
+/**
+ * Dependency provider for React Native modules and components.
+ */
+@property (nonatomic, strong, nullable) id<RCTDependencyProvider> dependencyProvider;
+
 #pragma mark - This class is a singleton
 
 + (instancetype _Nonnull)sharedInstance;
 
 #pragma mark - Methods that the App delegate must call
 
 -             (BOOL)application:(UIApplication *_Nonnull)application
-  didFinishLaunchingWithOptions:(NSDictionary *_Nonnull)launchOptions;
+  didFinishLaunchingWithOptions:(NSDictionary *_Nonnull)launchOptions
+                     moduleName:(NSString *_Nonnull)moduleName
+                       inWindow:(UIWindow *_Nonnull)window;
 
 -    (BOOL)application:(UIApplication *_Nonnull)application
   continueUserActivity:(NSUserActivity *_Nonnull)userActivity

ios/sdk/src/JitsiMeet.m

@@ -21,19 +21,40 @@
 #import "JitsiMeet+Private.h"
 #import "JitsiMeetConferenceOptions+Private.h"
 #import "JitsiMeetView+Private.h"
-#import "RCTBridgeWrapper.h"
 #import "ReactUtils.h"
 #import "ScheenshareEventEmiter.h"
 
 #import <react-native-webrtc/WebRTCModuleOptions.h>
+#import <RCTReactNativeFactory.h>
+#import <RCTDefaultReactNativeFactoryDelegate.h>
+#import <ReactAppDependencyProvider/RCTAppDependencyProvider.h>
+#import <React/RCTBundleURLProvider.h>
 
 #if !defined(JITSI_MEET_SDK_LITE)
 #import <RNGoogleSignin/RNGoogleSignin.h>
 #import "Dropbox.h"
 #endif
 
+@interface JMReactNativeFactoryDelegate : RCTDefaultReactNativeFactoryDelegate
+@end
+
+@implementation JMReactNativeFactoryDelegate
+
+- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge {
+    return [self bundleURL];
+}
+
+- (NSURL *_Nullable)bundleURL {
+#if DEBUG
+    return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
+#else
+    return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
+#endif
+}
+
+@end
+
 @implementation JitsiMeet {
-    RCTBridgeWrapper *_bridgeWrapper;
     NSDictionary *_launchOptions;
     ScheenshareEventEmiter *_screenshareEventEmiter;
 }
@@ -56,6 +77,11 @@ - (instancetype)init {
         // Initialize WebRTC options.
         self.rtcAudioDevice = nil;
         self.webRtcLoggingSeverity = WebRTCLoggingSeverityNone;
+        
+        JMReactNativeFactoryDelegate *delegate = [[JMReactNativeFactoryDelegate alloc] init];
+        delegate.dependencyProvider = [[RCTAppDependencyProvider alloc] init];
+        self.reactNativeFactory = [[RCTReactNativeFactory alloc] initWithDelegate:delegate];
+        self.dependencyProvider = delegate.dependencyProvider;
 
         // Initialize the listener for handling start/stop screensharing notifications.
         _screenshareEventEmiter = [[ScheenshareEventEmiter alloc] init];
@@ -73,9 +99,17 @@ - (instancetype)init {
 #pragma mark - Methods that the App delegate must call
 
 -             (BOOL)application:(UIApplication *)application
-  didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+  didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+                     moduleName:(NSString *)moduleName
+                       inWindow:(UIWindow *)window {
 
     _launchOptions = [launchOptions copy];
+    
+    // Start React Native with new architecture
+    [self.reactNativeFactory startReactNativeWithModuleName:moduleName
+                                                   inWindow:window
+                                          initialProperties:nil
+                                              launchOptions:launchOptions];
 
 #if !defined(JITSI_MEET_SDK_LITE)
     [Dropbox setAppKey];
@@ -132,22 +166,17 @@ - (UIInterfaceOrientationMask)application:(UIApplication *)application supported
 #pragma mark - Utility methods
 
 - (void)instantiateReactNativeBridge {
-    if (_bridgeWrapper != nil) {
-        return;
-    };
-
     // Initialize WebRTC options.
     WebRTCModuleOptions *options = [WebRTCModuleOptions sharedInstance];
     options.audioDevice = _rtcAudioDevice;
     options.loggingSeverity = (RTCLoggingSeverity)_webRtcLoggingSeverity;
 
-    // Initialize the one and only bridge for interfacing with React Native.
-    _bridgeWrapper = [[RCTBridgeWrapper alloc] init];
+
 }
 
 - (void)destroyReactNativeBridge {
-    [_bridgeWrapper invalidate];
-    _bridgeWrapper = nil;
+    [self.reactNativeFactory.bridge invalidate];
+    self.reactNativeFactory = nil;
 }
 
 - (JitsiMeetConferenceOptions *)getInitialConferenceOptions {
@@ -260,11 +289,14 @@ - (NSDictionary *)getDefaultProps {
 - (RCTBridge *)getReactBridge {
     // Initialize bridge lazily.
     [self instantiateReactNativeBridge];
-    return _bridgeWrapper.bridge;
+    
+    // Get bridge from the new architecture factory
+    return self.reactNativeFactory.bridge;
 }
 
 - (ExternalAPI *)getExternalAPI {
-    return [_bridgeWrapper.bridge moduleForClass:ExternalAPI.class];
+    RCTBridge *bridge = [self getReactBridge];
+    return [bridge moduleForClass:ExternalAPI.class];
 }
 
 @end