@cometchat/calls-sdk-react-native 5.0.0 → 5.0.2-beta.1

package/ios/Audio/CometChatAudioSession.h

@@ -20,7 +20,35 @@
 
 @interface CometChatAudioSession : NSObject
 
+/**
+ * Enables or disables manual audio session management, for use with CallKit.
+ *
+ * When enabled, WebRTC no longer activates the audio session on its own:
+ * audio stays disabled (`isAudioEnabled == NO`) until the system activates
+ * the audio session and `activateWithAudioSession:` is called from
+ * `CXProviderDelegate`'s `provider:didActivateAudioSession:`.
+ *
+ * Enable this before reporting the call to CallKit (before requesting the
+ * `CXStartCallAction`/`CXAnswerCallAction`), and disable it when the call
+ * ends so that non-CallKit calls keep working.
+ */
++ (void)setUseManualAudio:(BOOL)useManualAudio;
+
+/**
+ * Whether manual audio session management is currently enabled.
+ */
++ (BOOL)useManualAudio;
+
+/**
+ * Call from `CXProviderDelegate`'s `provider:didActivateAudioSession:`.
+ * Hands the CallKit-activated session over to WebRTC and enables audio.
+ */
 + (void)activateWithAudioSession:(AVAudioSession *)session;
+
+/**
+ * Call from `CXProviderDelegate`'s `provider:didDeactivateAudioSession:`.
+ * Disables audio and notifies WebRTC that the session was deactivated.
+ */
 + (void)deactivateWithAudioSession:(AVAudioSession *)session;
 
 @end

package/ios/Audio/CometChatAudioSession.m

@@ -24,12 +24,37 @@
     return [RTCAudioSession sharedInstance];
 }
 
++ (void)setUseManualAudio:(BOOL)useManualAudio {
+    RTCAudioSession *rtcAudioSession = self.rtcAudioSession;
+    rtcAudioSession.useManualAudio = useManualAudio;
+    // Audio stays disabled until the session is activated by the system
+    // and handed over via activateWithAudioSession:.
+    rtcAudioSession.isAudioEnabled = NO;
+}
+
++ (BOOL)useManualAudio {
+    return self.rtcAudioSession.useManualAudio;
+}
+
 + (void)activateWithAudioSession:(AVAudioSession *)session {
-    [self.rtcAudioSession audioSessionDidActivate:session];
+    RTCAudioSession *rtcAudioSession = self.rtcAudioSession;
+    // In manual audio mode WebRTC no longer configures the session itself,
+    // so apply its configuration to the CallKit-activated session here.
+    // It must be WebRTC's own configuration object: configuring the session
+    // any other way (or anywhere earlier, e.g. before requesting the
+    // CXStartCallAction) desyncs the CallKit UI's audio route button.
+    RTCAudioSessionConfiguration *config = [RTCAudioSessionConfiguration webRTCConfiguration];
+    [rtcAudioSession lockForConfiguration];
+    [rtcAudioSession setConfiguration:config error:nil];
+    [rtcAudioSession unlockForConfiguration];
+    [rtcAudioSession audioSessionDidActivate:session];
+    rtcAudioSession.isAudioEnabled = YES;
 }
 
 + (void)deactivateWithAudioSession:(AVAudioSession *)session {
-    [self.rtcAudioSession audioSessionDidDeactivate:session];
+    RTCAudioSession *rtcAudioSession = self.rtcAudioSession;
+    rtcAudioSession.isAudioEnabled = NO;
+    [rtcAudioSession audioSessionDidDeactivate:session];
 }
 
 @end

package/ios/Modules/AudioMode.m

@@ -95,14 +95,25 @@ RCT_EXPORT_MODULE();
 
         audioCallConfig = [[RTCAudioSessionConfiguration alloc] init];
         audioCallConfig.category = AVAudioSessionCategoryPlayAndRecord;
-        audioCallConfig.categoryOptions = AVAudioSessionCategoryOptionAllowBluetooth | AVAudioSessionCategoryOptionDefaultToSpeaker;
+        audioCallConfig.categoryOptions = AVAudioSessionCategoryOptionAllowBluetooth | AVAudioSessionCategoryOptionAllowBluetoothA2DP;
         audioCallConfig.mode = AVAudioSessionModeVoiceChat;
 
         videoCallConfig = [[RTCAudioSessionConfiguration alloc] init];
         videoCallConfig.category = AVAudioSessionCategoryPlayAndRecord;
-        videoCallConfig.categoryOptions = AVAudioSessionCategoryOptionAllowBluetooth;
+        videoCallConfig.categoryOptions = AVAudioSessionCategoryOptionAllowBluetooth | AVAudioSessionCategoryOptionAllowBluetoothA2DP;
         videoCallConfig.mode = AVAudioSessionModeVideoChat;
 
+        // Keep WebRTC's own configuration in sync with the audio-call
+        // profile. WebRTC (re)applies this object whenever it configures the
+        // session internally, and CometChatAudioSession applies it on CallKit
+        // activation; if it drifted from the configs above, every internal
+        // reconfiguration would change the category options on a live
+        // session and desync the CallKit UI's audio route button.
+        RTCAudioSessionConfiguration *webRTCConfig = [RTCAudioSessionConfiguration webRTCConfiguration];
+        webRTCConfig.category = AVAudioSessionCategoryPlayAndRecord;
+        webRTCConfig.categoryOptions = AVAudioSessionCategoryOptionAllowBluetooth | AVAudioSessionCategoryOptionAllowBluetoothA2DP;
+        webRTCConfig.mode = AVAudioSessionModeVoiceChat;
+
         // Manually routing audio to the earpiece doesn't quite work unless one disables BT (weird, I know).
         earpieceConfig = [[RTCAudioSessionConfiguration alloc] init];
         earpieceConfig.category = AVAudioSessionCategoryPlayAndRecord;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cometchat/calls-sdk-react-native",
-  "version": "5.0.0",
+  "version": "5.0.2-beta.1",
   "description": "CometChat Calls SDK for React Native provides voice and video calling capabilities for React Native applications.",
   "private": false,
   "main": "dist/index.js",