feat: added optional default audio session creation

Author: greenfrvr

packages/react-native-callingx/ios/AudioSessionManager.h

@@ -0,0 +1,12 @@
+#import <Foundation/Foundation.h>
+#import <AVFoundation/AVAudioSession.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface AudioSessionManager : NSObject
+
++ (void)createAudioSessionIfNeeded;
+
+@end
+
+NS_ASSUME_NONNULL_END

packages/react-native-callingx/ios/AudioSessionManager.mm

@@ -0,0 +1,50 @@
+#import "AudioSessionManager.h"
+#import "Settings.h"
+#import <AVFoundation/AVAudioSession.h>
+
+@implementation AudioSessionManager
+
++ (void)createAudioSessionIfNeeded {
+  BOOL autoConfigureAudioSession = [Settings getAutoConfigureAudioSession];
+  if (!autoConfigureAudioSession) {
+#ifdef DEBUG
+  NSLog(@"[Callingx][createAudioSessionIfNeeded] Auto-configuration disabled, user handles audio session");
+#endif
+    return;
+  }
+
+#ifdef DEBUG
+  NSLog(@"[Callingx][createAudioSessionIfNeeded] Activating audio session");
+#endif
+
+  NSUInteger categoryOptions = AVAudioSessionCategoryOptionAllowBluetooth |
+                               AVAudioSessionCategoryOptionAllowBluetoothA2DP;
+  NSString *mode = AVAudioSessionModeDefault;
+
+  NSDictionary *settings = [Settings getSettings];
+  if (settings && settings[@"audioSession"]) {
+    if (settings[@"audioSession"][@"categoryOptions"]) {
+      categoryOptions = [settings[@"audioSession"][@"categoryOptions"] integerValue];
+    }
+
+    if (settings[@"audioSession"][@"mode"]) {
+      mode = settings[@"audioSession"][@"mode"];
+    }
+  }
+
+  AVAudioSession *audioSession = [AVAudioSession sharedInstance];
+  [audioSession setCategory:AVAudioSessionCategoryPlayAndRecord
+                withOptions:categoryOptions
+                      error:nil];
+
+  [audioSession setMode:mode error:nil];
+
+  double sampleRate = 44100.0;
+  [audioSession setPreferredSampleRate:sampleRate error:nil];
+
+  NSTimeInterval bufferDuration = .005;
+  [audioSession setPreferredIOBufferDuration:bufferDuration error:nil];
+  [audioSession setActive:TRUE error:nil];
+}
+
+@end

packages/react-native-callingx/ios/Callingx.mm

@@ -6,6 +6,7 @@
 #import <CallKit/CallKit.h>
 #import "UUIDStorage.h"
 #import "Settings.h"
+#import "AudioSessionManager.h"
 
 #ifdef DEBUG
 static int const OUTGOING_CALL_WAKEUP_DELAY = 10;
@@ -364,42 +365,6 @@ - (void)dealloc {
 //  }
 //}
 
-
-- (void)configureAudioSession {
-#ifdef DEBUG
-  NSLog(@"[Callingx][configureAudioSession] Activating audio session");
-#endif
-
-  NSUInteger categoryOptions = AVAudioSessionCategoryOptionAllowBluetooth |
-                               AVAudioSessionCategoryOptionAllowBluetoothA2DP;
-  NSString *mode = AVAudioSessionModeDefault;
-
-  NSDictionary *settings = [Settings getSettings];
-  if (settings && settings[@"audioSession"]) {
-    if (settings[@"audioSession"][@"categoryOptions"]) {
-      categoryOptions = [settings[@"audioSession"][@"categoryOptions"] integerValue];
-    }
-
-    if (settings[@"audioSession"][@"mode"]) {
-      mode = settings[@"audioSession"][@"mode"];
-    }
-  }
-
-  AVAudioSession *audioSession = [AVAudioSession sharedInstance];
-  [audioSession setCategory:AVAudioSessionCategoryPlayAndRecord
-                withOptions:categoryOptions
-                      error:nil];
-
-  [audioSession setMode:mode error:nil];
-
-  double sampleRate = 44100.0;
-  [audioSession setPreferredSampleRate:sampleRate error:nil];
-
-  NSTimeInterval bufferDuration = .005;
-  [audioSession setPreferredIOBufferDuration:bufferDuration error:nil];
-  [audioSession setActive:TRUE error:nil];
-}
-
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params {
   return std::make_shared<facebook::react::NativeCallingxSpecJSI>(params);
@@ -499,7 +464,8 @@ - (void)setupiOS:(JS::NativeCallingx::SpecSetupiOSOptions &)options {
     @"handleType" : options.handleType(),
     @"ringtoneSound" : options.sound(),
     @"imageName" : options.imageName(),
-    @"includesCallsInRecents" : @(options.callsHistory())
+    @"includesCallsInRecents" : @(options.callsHistory()),
+    @"autoConfigureAudioSession" : @(options.setupAudioSession())
   };
 
   _version = [[[NSProcessInfo alloc] init] operatingSystemVersion];
@@ -814,7 +780,7 @@ - (void)provider:(CXProvider *)provider
     return;
   }
   // do this first, audio sessions are flakey
-  [self configureAudioSession];
+  [AudioSessionManager createAudioSessionIfNeeded];
   // tell the JS to actually make the call
   [self sendEventWithNameWrapper:CallingxDidReceiveStartCallAction
                             body:@{
@@ -850,7 +816,7 @@ - (void)provider:(CXProvider *)provider
     return;
   }
 
-  [self configureAudioSession];
+  [AudioSessionManager createAudioSessionIfNeeded];
   [self sendEventWithNameWrapper:CallingxPerformAnswerCallAction
                             body:@{
                               @"callId" : callId
@@ -961,7 +927,6 @@ - (void)provider:(CXProvider *)provider
                     object:nil
                   userInfo:userInfo];
 
-  [self configureAudioSession];
   [self sendEventWithNameWrapper:CallingxDidActivateAudioSession body:nil];
 }
 

packages/react-native-callingx/ios/Settings.h

@@ -7,6 +7,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (NSDictionary *)getSettings;
 + (void)setSettings:(NSDictionary *)options;
++ (BOOL)getAutoConfigureAudioSession;
 + (CXProviderConfiguration *)getProviderConfiguration:(NSDictionary *)settings;
 + (NSSet *)getSupportedHandleTypes:(id)handleType;
 + (CXHandleType)getHandleType:(NSString *)handleType;

packages/react-native-callingx/ios/Settings.mm

@@ -17,6 +17,14 @@ + (void)setSettings:(NSDictionary *)options {
   [[NSUserDefaults standardUserDefaults] synchronize];
 }
 
++ (BOOL)getAutoConfigureAudioSession {
+  NSDictionary *settings = [Settings getSettings];
+  if (settings && settings[@"autoConfigureAudioSession"]) {
+    return [settings[@"autoConfigureAudioSession"] boolValue];
+  }
+  return NO;
+}
+
 + (CXProviderConfiguration *)getProviderConfiguration:(NSDictionary *)settings {
 #ifdef DEBUG
   NSLog(@"[Settings][getProviderConfiguration]");

packages/react-native-callingx/src/spec/NativeCallingx.ts

@@ -12,6 +12,7 @@ export interface Spec extends TurboModule {
     sound: string | null;
     imageName: string | null;
     callsHistory: boolean;
+    setupAudioSession: boolean;
   }): void;
 
   setupAndroid(options: {

packages/react-native-callingx/src/types.ts

@@ -69,6 +69,7 @@ export type iOSOptions = {
   sound?: string | null;
   imageName?: string | null;
   callsHistory?: boolean;
+  setupAudioSession?: boolean;
 };
 
 export type AndroidOptions = {
@@ -113,7 +114,9 @@ export type EventName =
   | 'didToggleHoldCallAction'
   | 'didChangeAudioRoute'
   | 'didReceiveStartCallAction'
-  | 'didPerformSetMutedCallAction';
+  | 'didPerformSetMutedCallAction'
+  | 'didActivateAudioSession'
+  | 'didDeactivateAudioSession';
 
 export type EventParams = {
   answerCall: {
@@ -141,6 +144,8 @@ export type EventParams = {
   didReceiveStartCallAction: {
     callId: string;
   };
+  didActivateAudioSession: undefined;
+  didDeactivateAudioSession: undefined;
 };
 
 export type EndCallReason =

packages/react-native-callingx/src/utils/constants.ts

@@ -15,6 +15,7 @@ export const defaultiOSOptions: Required<iOSOptions> = {
   sound: null,
   imageName: null,
   callsHistory: false,
+  setupAudioSession: true,
 };
 
 export const defaultAndroidOptions: Required<AndroidOptions> = {

packages/react-native-sdk/src/utils/push/setupCallingExpEvents.ts

@@ -26,11 +26,19 @@ export function setupCallingExpEvents(pushConfig: NonNullable<PushConfig>) {
 
   const { remove: removeAnswerCall } = callingx.addEventListener(
     'answerCall',
-    callingExpAcceptCall,
+    onAcceptCall,
   );
   const { remove: removeEndCall } = callingx.addEventListener(
     'endCall',
-    callingExpRejectCall(pushConfig),
+    onEndCall(pushConfig),
+  );
+  const { remove: removeDidActivateAudioSession } = callingx.addEventListener(
+    'didActivateAudioSession',
+    onDidActivateAudioSession,
+  );
+  const { remove: removeDidDeactivateAudioSession } = callingx.addEventListener(
+    'didDeactivateAudioSession',
+    onDidDeactivateAudioSession,
   );
 
   //TODO: need to find cases where delayed events can appear
@@ -51,10 +59,12 @@ export function setupCallingExpEvents(pushConfig: NonNullable<PushConfig>) {
   setPushLogoutCallback(async () => {
     removeAnswerCall();
     removeEndCall();
+    removeDidActivateAudioSession();
+    removeDidDeactivateAudioSession();
   });
 }
 
-const callingExpAcceptCall = ({ callId: call_cid }: { callId: string }) => {
+const onAcceptCall = ({ callId: call_cid }: { callId: string }) => {
   videoLoggerSystem
     .getLogger('callingExpAcceptCall')
     .debug(`callingExpAcceptCall event callId: ${call_cid}`);
@@ -72,7 +82,7 @@ const callingExpAcceptCall = ({ callId: call_cid }: { callId: string }) => {
   pushAcceptedIncomingCallCId$.next(call_cid);
 };
 
-const callingExpRejectCall =
+const onEndCall =
   (pushConfig: PushConfig) =>
   async ({ callId: call_cid }: { callId: string }) => {
     getCallingxLibIfAvailable()?.log(
@@ -98,3 +108,11 @@ const callingExpRejectCall =
       .debug(`ending call with call_cid: ${call_cid}`);
     await processCallFromPushInBackground(pushConfig, call_cid, 'decline');
   };
+
+const onDidActivateAudioSession = () => {
+  //TODO: start audio session here
+};
+
+const onDidDeactivateAudioSession = () => {
+  //TODO: end audio session here
+};