@stream-io/video-react-native-sdk 1.29.0-beta.1 → 1.29.0

package/expo-config-plugin/dist/withAppDelegate.js

@@ -9,7 +9,7 @@ const addNewLinesToAppDelegateObjc_1 = __importDefault(require("./common/addNewL
 const addToSwiftBridgingHeaderFile_1 = require("./common/addToSwiftBridgingHeaderFile");
 const withAppDelegate = (configuration, props) => {
     return (0, config_plugins_1.withAppDelegate)(configuration, (config) => {
-        if (!props?.ringing &&
+        if (!props?.ringingPushNotifications &&
             !props?.iOSEnableMultitaskingCameraAccess &&
             !props?.addNoiseCancellation) {
             // quit early if no change is necessary
@@ -21,12 +21,19 @@ const withAppDelegate = (configuration, props) => {
                     config.modResults.contents = (0, codeMod_1.addObjcImports)(config.modResults.contents, ['"NoiseCancellationManagerObjc.h"']);
                 }
                 config.modResults.contents = addDidFinishLaunchingWithOptionsObjc(config.modResults.contents, props.iOSEnableMultitaskingCameraAccess, props.addNoiseCancellation);
-                if (props?.ringing) {
-                    config.modResults.contents = (0, codeMod_1.addObjcImports)(config.modResults.contents, ['<PushKit/PushKit.h>', '"StreamVideoReactNative.h"']);
+                if (props?.ringingPushNotifications) {
+                    config.modResults.contents = (0, codeMod_1.addObjcImports)(config.modResults.contents, [
+                        '"RNCallKeep.h"',
+                        '<PushKit/PushKit.h>',
+                        '"RNVoipPushNotificationManager.h"',
+                        '"StreamVideoReactNative.h"',
+                        '<WebRTC/RTCAudioSession.h>',
+                    ]);
                     config.modResults.contents =
-                        addDidFinishLaunchingWithOptionsRingingObjc(config.modResults.contents);
+                        addDidFinishLaunchingWithOptionsRingingObjc(config.modResults.contents, props.ringingPushNotifications);
                     config.modResults.contents = addDidUpdatePushCredentialsObjc(config.modResults.contents);
                     config.modResults.contents = addDidReceiveIncomingPushCallbackObjc(config.modResults.contents);
+                    config.modResults.contents = addAudioSessionMethodsObjc(config.modResults.contents);
                 }
                 return config;
             }
@@ -36,7 +43,7 @@ const withAppDelegate = (configuration, props) => {
         }
         else {
             try {
-                if (props?.ringing) {
+                if (props?.ringingPushNotifications) {
                     // make it public class AppDelegate: ExpoAppDelegate, PKPushRegistryDelegate {
                     const regex = /(class\s+AppDelegate[^{]*)(\s*\{)/;
                     config.modResults.contents = config.modResults.contents.replace(regex, (match, declarationPart, openBrace) => {
@@ -69,12 +76,13 @@ const withAppDelegate = (configuration, props) => {
                     config.modResults.contents = (0, codeMod_1.addSwiftImports)(config.modResults.contents, ['stream_io_noise_cancellation_react_native']);
                 }
                 config.modResults.contents = addDidFinishLaunchingWithOptionsSwift(config.modResults.contents, props.iOSEnableMultitaskingCameraAccess, props.addNoiseCancellation);
-                if (props?.ringing) {
-                    config.modResults.contents = (0, codeMod_1.addSwiftImports)(config.modResults.contents, ['PushKit', 'stream_video_react_native']);
+                if (props?.ringingPushNotifications) {
+                    config.modResults.contents = (0, codeMod_1.addSwiftImports)(config.modResults.contents, ['RNCallKeep', 'PushKit', 'RNVoipPushNotification']);
                     config.modResults.contents =
-                        addDidFinishLaunchingWithOptionsRingingSwift(config.modResults.contents);
+                        addDidFinishLaunchingWithOptionsRingingSwift(config.modResults.contents, props.ringingPushNotifications);
                     config.modResults.contents = addDidUpdatePushCredentialsSwift(config.modResults.contents);
                     config.modResults.contents = addDidReceiveIncomingPushCallbackSwift(config.modResults.contents);
+                    config.modResults.contents = addAudioSessionMethodsSwift(config.modResults.contents);
                 }
                 return config;
             }
@@ -119,26 +127,55 @@ function addDidFinishLaunchingWithOptionsObjc(contents, iOSEnableMultitaskingCam
     }
     return contents;
 }
-function addDidFinishLaunchingWithOptionsRingingSwift(contents) {
+function addDidFinishLaunchingWithOptionsRingingSwift(contents, ringingPushNotifications) {
     const functionSelector = 'application(_:didFinishLaunchingWithOptions:)';
+    const supportsVideoString = ringingPushNotifications.disableVideoIos
+        ? 'false'
+        : 'true';
+    const includesCallsInRecents = ringingPushNotifications.includesCallsInRecentsIos ? 'false' : 'true';
+    const setupCallKeep = `  let localizedAppName = Bundle.main.localizedInfoDictionary?["CFBundleDisplayName"] as? String
+    let appName = Bundle.main.infoDictionary?["CFBundleDisplayName"] as? String
+    RNCallKeep.setup([
+      "appName": localizedAppName != nil ? localizedAppName! : appName as Any,
+      "supportsVideo": ${supportsVideoString},
+      "includesCallsInRecents": ${includesCallsInRecents},
+    ])`;
+    if (!contents.includes('RNCallKeep.setup')) {
+        contents = (0, codeMod_1.insertContentsInsideSwiftFunctionBlock)(contents, functionSelector, setupCallKeep, { position: 'head' });
+    }
     // call the setup of voip push notification
-    const voipSetupMethod = 'StreamVideoReactNative.voipRegistration()';
+    const voipSetupMethod = 'RNVoipPushNotificationManager.voipRegistration()';
     if (!contents.includes(voipSetupMethod)) {
         contents = (0, codeMod_1.insertContentsInsideSwiftFunctionBlock)(contents, functionSelector, '  ' /* indentation */ + voipSetupMethod, { position: 'head' });
     }
     return contents;
 }
-function addDidFinishLaunchingWithOptionsRingingObjc(contents) {
+function addDidFinishLaunchingWithOptionsRingingObjc(contents, ringingPushNotifications) {
     const functionSelector = 'application:didFinishLaunchingWithOptions:';
+    // call the setup RNCallKeep
+    const supportsVideoString = ringingPushNotifications.disableVideoIos
+        ? '@NO'
+        : '@YES';
+    const includesCallsInRecents = ringingPushNotifications.includesCallsInRecentsIos ? '@YES' : '@NO';
+    const setupCallKeep = `NSString *localizedAppName = [[[NSBundle mainBundle] localizedInfoDictionary] objectForKey:@"CFBundleDisplayName"];
+  NSString *appName = [[[NSBundle mainBundle] infoDictionary]objectForKey :@"CFBundleDisplayName"];
+  [RNCallKeep setup:@{
+    @"appName": localizedAppName != nil ? localizedAppName : appName,
+    @"supportsVideo": ${supportsVideoString},
+    @"includesCallsInRecents": ${includesCallsInRecents},
+  }];`;
+    if (!contents.includes('[RNCallKeep setup:@')) {
+        contents = (0, codeMod_1.insertContentsInsideObjcFunctionBlock)(contents, functionSelector, setupCallKeep, { position: 'head' });
+    }
     // call the setup of voip push notification
-    const voipSetupMethod = '[StreamVideoReactNative voipRegistration];';
+    const voipSetupMethod = '[RNVoipPushNotificationManager voipRegistration];';
     if (!contents.includes(voipSetupMethod)) {
         contents = (0, codeMod_1.insertContentsInsideObjcFunctionBlock)(contents, functionSelector, voipSetupMethod, { position: 'head' });
     }
     return contents;
 }
 function addDidUpdatePushCredentialsSwift(contents) {
-    const updatedPushCredentialsMethod = 'StreamVideoReactNative.didUpdate(credentials, forType: type.rawValue)';
+    const updatedPushCredentialsMethod = 'RNVoipPushNotificationManager.didUpdate(credentials, forType: type.rawValue)';
     if (!contents.includes(updatedPushCredentialsMethod)) {
         const functionSelector = 'pushRegistry(_:didUpdate:for:)';
         const codeblock = (0, codeMod_1.findSwiftFunctionCodeBlock)(contents, functionSelector);
@@ -160,7 +197,7 @@ function addDidUpdatePushCredentialsSwift(contents) {
     return contents;
 }
 function addDidUpdatePushCredentialsObjc(contents) {
-    const updatedPushCredentialsMethod = '[StreamVideoReactNative didUpdatePushCredentials:credentials forType: (NSString *) type];';
+    const updatedPushCredentialsMethod = '[RNVoipPushNotificationManager didUpdatePushCredentials:credentials forType:(NSString *)type];';
     if (!contents.includes(updatedPushCredentialsMethod)) {
         const functionSelector = 'pushRegistry:didUpdatePushCredentials:forType:';
         const codeblock = (0, codeMod_1.findObjcFunctionCodeBlock)(contents, functionSelector);
@@ -177,10 +214,112 @@ function addDidUpdatePushCredentialsObjc(contents) {
     }
     return contents;
 }
+function addAudioSessionMethodsSwift(contents) {
+    const audioSessionDidActivateMethod = 'RTCAudioSession.sharedInstance().audioSessionDidActivate(AVAudioSession.sharedInstance())';
+    if (!contents.includes(audioSessionDidActivateMethod)) {
+        const functionSelector = 'provider(_:didActivate:)';
+        if (!contents.includes('didActivateAudioSession')) {
+            contents = (0, codeMod_1.insertContentsInsideSwiftClassBlock)(contents, 'class AppDelegate', `
+  func provider(_ provider: CXProvider, didActivateAudioSession audioSession: AVAudioSession) {
+    ${audioSessionDidActivateMethod}
+  }
+    `, { position: 'tail' });
+        }
+        else {
+            contents = (0, codeMod_1.insertContentsInsideSwiftFunctionBlock)(contents, functionSelector, audioSessionDidActivateMethod, { position: 'tail' });
+        }
+    }
+    const audioSessionDidDeactivateMethod = 'RTCAudioSession.sharedInstance().audioSessionDidDeactivate(AVAudioSession.sharedInstance())';
+    if (!contents.includes(audioSessionDidDeactivateMethod)) {
+        const functionSelector = 'provider(_:didDeactivate:)';
+        if (!contents.includes('didDeactivateAudioSession')) {
+            contents = (0, codeMod_1.insertContentsInsideSwiftClassBlock)(contents, 'class AppDelegate', `
+  func provider(_ provider: CXProvider, didDeactivateAudioSession audioSession: AVAudioSession) {
+    ${audioSessionDidDeactivateMethod}
+  }
+    `, { position: 'tail' });
+        }
+        else {
+            contents = (0, codeMod_1.insertContentsInsideSwiftFunctionBlock)(contents, functionSelector, audioSessionDidDeactivateMethod, { position: 'tail' });
+        }
+    }
+    return contents;
+}
+function addAudioSessionMethodsObjc(contents) {
+    const audioSessionDidActivateMethod = '[[RTCAudioSession sharedInstance] audioSessionDidActivate:[AVAudioSession sharedInstance]];';
+    if (!contents.includes(audioSessionDidActivateMethod)) {
+        const functionSelector = 'provider:didActivateAudioSession:audioSession:';
+        const codeblock = (0, codeMod_1.findObjcFunctionCodeBlock)(contents, functionSelector);
+        if (!codeblock) {
+            contents = (0, addNewLinesToAppDelegateObjc_1.default)(contents, [
+                '- (void) provider:(CXProvider *) provider didActivateAudioSession:(AVAudioSession *) audioSession {',
+                '  ' /* indentation */ + audioSessionDidActivateMethod,
+                '}',
+            ]);
+        }
+        else {
+            contents = (0, codeMod_1.insertContentsInsideObjcFunctionBlock)(contents, functionSelector, audioSessionDidActivateMethod, { position: 'tail' });
+        }
+    }
+    const audioSessionDidDeactivateMethod = '[[RTCAudioSession sharedInstance] audioSessionDidDeactivate:[AVAudioSession sharedInstance]];';
+    if (!contents.includes(audioSessionDidDeactivateMethod)) {
+        const functionSelector = 'provider:didDeactivateAudioSession:audioSession:';
+        const codeblock = (0, codeMod_1.findObjcFunctionCodeBlock)(contents, functionSelector);
+        if (!codeblock) {
+            contents = (0, addNewLinesToAppDelegateObjc_1.default)(contents, [
+                '- (void) provider:(CXProvider *) provider didDeactivateAudioSession:(AVAudioSession *) audioSession {',
+                '  ' /* indentation */ + audioSessionDidDeactivateMethod,
+                '}',
+            ]);
+        }
+        else {
+            contents = (0, codeMod_1.insertContentsInsideObjcFunctionBlock)(contents, functionSelector, audioSessionDidDeactivateMethod, { position: 'tail' });
+        }
+    }
+    return contents;
+}
 function addDidReceiveIncomingPushCallbackSwift(contents) {
     const onIncomingPush = `
-    StreamVideoReactNative.didReceiveIncomingPush(payload, forType: type.rawValue, completionHandler: completion)`;
-    if (!contents.includes('StreamVideoReactNative.didReceiveIncomingPush')) {
+    guard let stream = payload.dictionaryPayload["stream"] as? [String: Any],
+          let createdCallerName = stream["created_by_display_name"] as? String,
+          let cid = stream["call_cid"] as? String else {
+      completion()
+      return
+    }
+
+    // Check if user is busy BEFORE registering the call
+    let shouldReject = StreamVideoReactNative.shouldRejectCallWhenBusy()
+    let hasAnyActiveCall = StreamVideoReactNative.hasAnyActiveCall()
+        
+    if shouldReject && hasAnyActiveCall {
+        // Complete the VoIP notification without showing CallKit UI
+        completion()
+        return
+    }
+    
+    let uuid = UUID().uuidString
+    let videoIncluded = stream["video"] as? String
+    let hasVideo = videoIncluded == "false" ? false : true
+    
+    StreamVideoReactNative.registerIncomingCall(cid, uuid: uuid)
+    
+    RNVoipPushNotificationManager.addCompletionHandler(uuid, completionHandler: completion)
+    
+    RNVoipPushNotificationManager.didReceiveIncomingPush(with: payload, forType: type.rawValue)
+    
+    RNCallKeep.reportNewIncomingCall(uuid,
+                                     handle: createdCallerName,
+                                     handleType: "generic",
+                                     hasVideo: hasVideo,
+                                     localizedCallerName: createdCallerName,
+                                     supportsHolding: false,
+                                     supportsDTMF: false,
+                                     supportsGrouping: false,
+                                     supportsUngrouping: false,
+                                     fromPushKit: true,
+                                     payload: stream,
+                                     withCompletionHandler: nil)`;
+    if (!contents.includes('RNVoipPushNotificationManager.didReceiveIncomingPush')) {
         const functionSelector = 'pushRegistry(_:didReceiveIncomingPushWith:for:completion:)';
         const codeblock = (0, codeMod_1.findSwiftFunctionCodeBlock)(contents, functionSelector);
         if (!codeblock) {
@@ -203,10 +342,49 @@ function addDidReceiveIncomingPushCallbackSwift(contents) {
 }
 function addDidReceiveIncomingPushCallbackObjc(contents) {
     const onIncomingPush = `
-  // process the payload and display the incoming call notification
-  [StreamVideoReactNative didReceiveIncomingPush:payload forType: (NSString *)type completionHandler:completion];
+  // process the payload and store it in the native module's cache
+  NSDictionary *stream = payload.dictionaryPayload[@"stream"];
+  NSString *uuid = [[NSUUID UUID] UUIDString];
+  NSString *createdCallerName = stream[@"created_by_display_name"];
+  NSString *cid = stream[@"call_cid"];
+  
+  // Check if user is busy BEFORE registering the call
+  BOOL shouldReject = [StreamVideoReactNative shouldRejectCallWhenBusy];
+  BOOL hasAnyActiveCall = [StreamVideoReactNative hasAnyActiveCall];
+  
+  if (shouldReject && hasAnyActiveCall) {
+      // Complete the VoIP notification without showing CallKit UI
+      completion();
+      return;
+  }
+  
+  NSString *videoIncluded = stream[@"video"];
+  BOOL hasVideo = [videoIncluded isEqualToString:@"false"] ? NO : YES;
+
+  // store the call cid and uuid in the native module's cache
+  [StreamVideoReactNative registerIncomingCall:cid uuid:uuid];
+
+  // set the completion handler - this one is called by the JS SDK
+  [RNVoipPushNotificationManager addCompletionHandler:uuid completionHandler:completion];
+
+  // send event to JS - the JS SDK will handle the rest and call the 'completionHandler'
+  [RNVoipPushNotificationManager didReceiveIncomingPushWithPayload:payload forType:(NSString *)type];
+
+  // display the incoming call notification
+  [RNCallKeep reportNewIncomingCall: uuid
+                             handle: createdCallerName
+                         handleType: @"generic"
+                           hasVideo: hasVideo
+                localizedCallerName: createdCallerName
+                    supportsHolding: NO
+                       supportsDTMF: NO
+                   supportsGrouping: NO
+                 supportsUngrouping: NO
+                        fromPushKit: YES
+                            payload: stream
+              withCompletionHandler: nil];
 `;
-    if (!contents.includes('[StreamVideoReactNative didReceiveIncomingPush')) {
+    if (!contents.includes('[RNVoipPushNotificationManager didReceiveIncomingPushWithPayload')) {
         const functionSelector = 'pushRegistry:didReceiveIncomingPushWithPayload:forType:withCompletionHandler:';
         const codeblock = (0, codeMod_1.findObjcFunctionCodeBlock)(contents, functionSelector);
         if (!codeblock) {

package/expo-config-plugin/dist/withMainActivity.js

@@ -23,7 +23,7 @@ const withStreamVideoReactNativeSDKMainActivity = (configuration, props) => {
         if (props?.enableScreenshare) {
             config.modResults.contents = addInsideOnCreateScreenshare(config.modResults.contents, isMainActivityJava);
         }
-        if (props?.ringing) {
+        if (props?.ringingPushNotifications?.showWhenLockedAndroid) {
             config.modResults.contents = addInsideOnCreateLockscreen(config.modResults.contents, isMainActivityJava);
         }
         return config;

package/expo-config-plugin/dist/withiOSInfoPlist.js

@@ -12,7 +12,7 @@ const withStreamVideoReactNativeSDKiOSInfoPList = (configuration, props) => {
             }
         }
         addBackgroundMode('audio');
-        if (props?.ringing) {
+        if (props?.ringingPushNotifications) {
             addBackgroundMode('voip');
             addBackgroundMode('fetch');
             addBackgroundMode('processing');
@@ -20,7 +20,8 @@ const withStreamVideoReactNativeSDKiOSInfoPList = (configuration, props) => {
                 '$(PRODUCT_BUNDLE_IDENTIFIER)',
             ];
         }
-        if (props?.enableNonRingingPushNotifications || props?.ringing) {
+        if (props?.enableNonRingingPushNotifications ||
+            props?.ringingPushNotifications) {
             addBackgroundMode('remote-notification');
         }
         return config;

package/ios/StreamInCallManager.m

@@ -23,8 +23,6 @@ RCT_EXTERN_METHOD(setMicrophoneMute:(BOOL)enable)
 
 RCT_EXTERN_METHOD(logAudioState)
 
-RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(getAudioStateLog)
-
 RCT_EXTERN_METHOD(muteAudioOutput)
 
 RCT_EXTERN_METHOD(unmuteAudioOutput)

package/ios/StreamInCallManager.swift

@@ -132,7 +132,6 @@ class StreamInCallManager: RCTEventEmitter {
             rtcConfig.category = intendedCategory.rawValue
             rtcConfig.mode = intendedMode.rawValue
             rtcConfig.categoryOptions = intendedOptions
-            // This ensures WebRTC's internal state stays consistent during interruptions/route changes
             RTCAudioSessionConfiguration.setWebRTC(rtcConfig)
             
             let session = RTCAudioSession.sharedInstance()
@@ -142,9 +141,6 @@ class StreamInCallManager: RCTEventEmitter {
             }
             do {
                 try session.setCategory(intendedCategory, mode: intendedMode, options: intendedOptions)
-                // Apply sample rate and IO buffer duration from WebRTC's config
-                try session.setPreferredSampleRate(rtcConfig.sampleRate)
-                try session.setPreferredIOBufferDuration(rtcConfig.ioBufferDuration)
                 if (wasRecording) {
                     try adm.setRecording(wasRecording)
                 }
@@ -270,11 +266,6 @@ class StreamInCallManager: RCTEventEmitter {
 
     @objc
     func logAudioState() {
-        log(getAudioStateLog())
-    }
-    
-    @objc(getAudioStateLog)
-    func getAudioStateLog() -> String {
         let session = AVAudioSession.sharedInstance()
         let adm = getAudioDeviceModule()
         
@@ -287,7 +278,7 @@ class StreamInCallManager: RCTEventEmitter {
 
         let rtcAVSession = rtcSession.session
         let logString = """
-        AVAudioSession State:
+        Audio State:
           Category: \(session.category.rawValue)
           Mode: \(session.mode.rawValue)
           Output Port: \(session.currentRoute.outputs.first?.portName ?? "N/A")
@@ -295,16 +286,10 @@ class StreamInCallManager: RCTEventEmitter {
           Category Options: \(session.categoryOptions)
           InputNumberOfChannels: \(session.inputNumberOfChannels)
           OutputNumberOfChannels: \(session.outputNumberOfChannels)
-
-        AudioDeviceModule State:
-          IsPlaying: \(adm.isPlaying)
-          IsRecording: \(adm.isRecording)
-          IsVoiceProcessingAGCEnabled: \(adm.isVoiceProcessingAGCEnabled)
-          IsVoiceProcessingBypassed: \(adm.isVoiceProcessingBypassed)
-          IsVoiceProcessingEnabled: \(adm.isVoiceProcessingEnabled)
-          IsStereoPlayoutEnabled: \(adm.isStereoPlayoutEnabled)
+          AdmIsPlaying: \(adm.isPlaying)
+          AdmIsRecording: \(adm.isRecording)
         
-        RTCAudioSession State:
+        RTC Audio State:
           Wrapped Category: \(rtcAVSession.category.rawValue)
           Wrapped Mode: \(rtcAVSession.mode.rawValue)
           Wrapped Output Port: \(rtcAVSession.currentRoute.outputs.first?.portName ?? "N/A")
@@ -315,7 +300,7 @@ class StreamInCallManager: RCTEventEmitter {
           IsActive: \(rtcSession.isActive)
           ActivationCount: \(rtcSession.activationCount)
         """
-        return logString
+        log(logString)
     }
 
     @objc(muteAudioOutput)

package/ios/StreamVideoReactNative.h

@@ -1,19 +1,16 @@
 #import <React/RCTEventEmitter.h>
 #import <React/RCTBridge.h>
-#import <PushKit/PushKit.h>
 
 @interface StreamVideoReactNative : RCTEventEmitter <RCTBridgeModule>
 
 - (void)screenShareEventReceived:(NSString *)event;
 
-+ (void)setup DEPRECATED_MSG_ATTRIBUTE("No need to use setup() anymore");
-
-+ (BOOL)hasAnyActiveCall;
++ (void)registerIncomingCall:(NSString *)cid uuid:(NSString *)uuid;
 
-+ (void)voipRegistration;
++ (void)setup DEPRECATED_MSG_ATTRIBUTE("No need to use setup() anymore");
 
-+ (void)didUpdatePushCredentials:(PKPushCredentials *)credentials forType:(NSString *)type;
++ (BOOL)shouldRejectCallWhenBusy;
 
-+ (void)didReceiveIncomingPush:(PKPushPayload *)payload forType:(NSString *)type completionHandler: (void (^_Nullable)(void)) completion;
++ (BOOL)hasAnyActiveCall;
 
 @end