RTCAudioStore implementation

Author: ipavlidakis

Sources/StreamVideo/Call.swift

@@ -147,6 +147,7 @@ public class Call: @unchecked Sendable, WSEventsSubscriber {
         notify: Bool = false,
         callSettings: CallSettings? = nil
     ) async throws -> JoinCallResponse {
+        let joinSource = await state.joinSource ?? .inApp
         let result: Any? = stateMachine.withLock { currentStage, transitionHandler in
             if
                 currentStage.id == .joined,
@@ -194,6 +195,7 @@ public class Call: @unchecked Sendable, WSEventsSubscriber {
                                 options: options,
                                 ring: ring,
                                 notify: notify,
+                                source: joinSource,
                                 deliverySubject: deliverySubject
                             )
                         )
@@ -1371,8 +1373,8 @@ public class Call: @unchecked Sendable, WSEventsSubscriber {
     /// - Parameter policy: A conforming `AudioSessionPolicy` that defines
     ///   the audio session configuration to be applied.
     /// - Throws: An error if the update fails.
-    public func updateAudioSessionPolicy(_ policy: AudioSessionPolicy) async throws {
-        try await callController.updateAudioSessionPolicy(policy)
+    public func updateAudioSessionPolicy(_ policy: AudioSessionPolicy) async {
+        await callController.updateAudioSessionPolicy(policy)
     }
 
     /// Adds a proximity policy to manage device proximity behavior during the call.
@@ -1473,28 +1475,6 @@ public class Call: @unchecked Sendable, WSEventsSubscriber {
         )
     }
 
-    // MARK: - CallKit
-
-    /// Notifies the `Call` instance that CallKit has activated the system audio
-    /// session.
-    ///
-    /// This method should be called when the system activates the `AVAudioSession`
-    /// as a result of an incoming or outgoing CallKit-managed call. It allows the
-    /// call to update the provided CallKit AVAudioSession based on the internal CallSettings.
-    ///
-    /// - Parameter audioSession: The active `AVAudioSession` instance provided by
-    ///   CallKit.
-    /// - Throws: An error if the call controller fails to handle the activation.
-    internal func callKitActivated(_ audioSession: AVAudioSessionProtocol) async throws {
-        try await callController.callKitActivated(audioSession)
-        didPerform(.didActivateAudioSession)
-    }
-
-    func callKitDeactivated(_ audioSession: AVAudioSessionProtocol) async throws {
-        try await callController.callKitDeactivated(audioSession)
-        didPerform(.didDeactivateAudioSession)
-    }
-
     internal func didPerform(_ action: WebRTCTrace.CallKitAction) {
         Task(disposableBag: disposableBag) { [weak callController] in
             await callController?.didPerform(action)

Sources/StreamVideo/CallKit/CallKitAdapter.swift

@@ -12,6 +12,7 @@ open class CallKitAdapter {
     @Injected(\.callKitPushNotificationAdapter) private var callKitPushNotificationAdapter
     @Injected(\.callKitService) private var callKitService
     @Injected(\.currentDevice) private var currentDevice
+    @Injected(\.audioStore) private var audioStore
 
     private var loggedInStateCancellable: AnyCancellable?
 
@@ -73,6 +74,7 @@ open class CallKitAdapter {
         }
 
         callKitService.streamVideo = streamVideo
+        audioStore.add(CallKitAudioSessionReducer())
 
         guard streamVideo != nil else {
             unregisterForIncomingCalls()

Sources/StreamVideo/CallKit/CallKitService.swift

@@ -15,6 +15,7 @@ open class CallKitService: NSObject, CXProviderDelegate, @unchecked Sendable {
     @Injected(\.callCache) private var callCache
     @Injected(\.uuidFactory) private var uuidFactory
     @Injected(\.currentDevice) private var currentDevice
+    @Injected(\.audioStore) private var audioStore
     private let disposableBag = DisposableBag()
 
     /// Represents a call that is being managed by the service.
@@ -393,20 +394,7 @@ open class CallKitService: NSObject, CXProviderDelegate, @unchecked Sendable {
             subsystems: .callKit
         )
 
-        guard
-            let active,
-            let call = callEntry(for: active)?.call
-        else {
-            return
-        }
-
-        Task {
-            do {
-                try await call.callKitActivated(audioSession)
-            } catch {
-                log.error(error, subsystems: .callKit)
-            }
-        }
+        audioStore.dispatch(.callKit(.activate(audioSession)))
     }
 
     public func provider(
@@ -426,21 +414,7 @@ open class CallKitService: NSObject, CXProviderDelegate, @unchecked Sendable {
             subsystems: .callKit
         )
 
-        guard
-            let active,
-            let call = callEntry(for: active)?.call
-        else {
-            RTCAudioSession.sharedInstance().audioSessionDidActivate(audioSession)
-            return
-        }
-
-        Task {
-            do {
-                try await call.callKitDeactivated(audioSession)
-            } catch {
-                log.error(error, subsystems: .callKit)
-            }
-        }
+        audioStore.dispatch(.callKit(.deactivate(audioSession)))
     }
 
     open func provider(
@@ -475,6 +449,7 @@ open class CallKitService: NSObject, CXProviderDelegate, @unchecked Sendable {
             }
 
             do {
+                callToJoinEntry.call.state.joinSource = .callKit
                 try await callToJoinEntry.call.join(callSettings: callSettings)
                 action.fulfill()
             } catch {

Sources/StreamVideo/CallState.swift

@@ -155,7 +155,9 @@ public class CallState: ObservableObject {
             }
         }
     }
-    
+
+    var joinSource: JoinSource?
+
     private var localCallSettingsUpdate = false
     private var durationCancellable: AnyCancellable?
     private nonisolated let disposableBag = DisposableBag()
@@ -524,3 +526,5 @@ public class CallState: ObservableObject {
         durationCancellable = nil
     }
 }
+
+enum JoinSource { case inApp, callKit }

Sources/StreamVideo/CallStateMachine/Stages/Call+JoiningStage.swift

@@ -122,7 +122,8 @@ extension Call.StateMachine.Stage {
                 callSettings: input.callSettings,
                 options: input.options,
                 ring: input.ring,
-                notify: input.notify
+                notify: input.notify,
+                source: input.source
             )
 
             if let callSettings = input.callSettings {

Sources/StreamVideo/CallStateMachine/Stages/Call+Stage.swift

@@ -30,6 +30,7 @@ extension Call.StateMachine {
                 var options: CreateCallOptions?
                 var ring: Bool
                 var notify: Bool
+                var source: JoinSource
                 var deliverySubject: PassthroughSubject<JoinCallResponse, Error>
 
                 var currentNumberOfRetries = 0

Sources/StreamVideo/Controllers/CallController.swift

@@ -122,7 +122,8 @@ class CallController: @unchecked Sendable {
         callSettings: CallSettings?,
         options: CreateCallOptions? = nil,
         ring: Bool = false,
-        notify: Bool = false
+        notify: Bool = false,
+        source: JoinSource
     ) async throws -> JoinCallResponse {
         joinCallResponseSubject = .init(nil)
 
@@ -131,7 +132,8 @@ class CallController: @unchecked Sendable {
             callSettings: callSettings,
             options: options,
             ring: ring,
-            notify: notify
+            notify: notify,
+            source: source
         )
 
         guard
@@ -479,8 +481,8 @@ class CallController: @unchecked Sendable {
     ///
     /// - Parameter policy: The audio session policy to apply
     /// - Throws: An error if the policy update fails
-    func updateAudioSessionPolicy(_ policy: AudioSessionPolicy) async throws {
-        try await webRTCCoordinator.updateAudioSessionPolicy(policy)
+    func updateAudioSessionPolicy(_ policy: AudioSessionPolicy) async {
+        await webRTCCoordinator.updateAudioSessionPolicy(policy)
     }
 
     /// Sets up observation of WebRTC state changes.
@@ -501,14 +503,6 @@ class CallController: @unchecked Sendable {
             .sink { [weak self] in self?.webRTCClientDidUpdateStage($0) }
     }
 
-    internal func callKitActivated(_ audioSession: AVAudioSessionProtocol) async throws {
-        try await webRTCCoordinator.callKitActivated(audioSession)
-    }
-
-    func callKitDeactivated(_ audioSession: AVAudioSessionProtocol) async throws {
-        try await webRTCCoordinator.callKitDeactivated(audioSession)
-    }
-
     // MARK: - Client Capabilities
 
     func enableClientCapabilities(_ capabilities: Set<ClientCapability>) async {

Sources/StreamVideo/StreamVideo.swift

@@ -16,6 +16,7 @@ public class StreamVideo: ObservableObject, @unchecked Sendable {
 
     @Injected(\.callCache) private var callCache
     @Injected(\.screenProperties) private var screenProperties
+    @Injected(\.audioStore) private var audioStore
 
     private enum DisposableKey: String { case ringEventReceived }
 
@@ -202,31 +203,11 @@ public class StreamVideo: ObservableObject, @unchecked Sendable {
             self?.token = userToken
         }
 
-        let configuration = RTCAudioSessionConfiguration.webRTC()
-        configuration.category = AVAudioSession.Category.playAndRecord.rawValue
-        configuration.mode = AVAudioSession.Mode.videoChat.rawValue
-        configuration.categoryOptions = [.allowBluetooth]
-        RTCAudioSessionConfiguration.setWebRTC(configuration)
-        RTCAudioSession.sharedInstance().lockForConfiguration()
-        try? RTCAudioSession.sharedInstance().setConfiguration(configuration)
-        if #available(iOS 14.5, *) {
-            do {
-                try RTCAudioSession
-                    .sharedInstance()
-                    .session
-                    .setPrefersNoInterruptionsFromSystemAlerts(true)
-                log.debug(
-                    "AudioSession setPrefersNoInterruptionsFromSystemAlerts:\(true) completed.",
-                    subsystems: .audioSession
-                )
-            } catch {
-                log.error(
-                    "AudioSession was unable to setPrefersNoInterruptionsFromSystemAlerts:\(true). \(error)",
-                    subsystems: .audioSession
-                )
-            }
-        }
-        RTCAudioSession.sharedInstance().unlockForConfiguration()
+        audioStore
+            .publisher
+            .log(.debug, subsystems: .audioSession) { "AudioStore state: \($0)" }
+            .sink { _ in }
+            .store(in: disposableBag)
 
         // Warm up
         _ = eventNotificationCenter

Sources/StreamVideo/Utils/AudioSession/AudioRecorder/StreamCallAudioRecorder.swift

@@ -15,7 +15,7 @@ open class StreamCallAudioRecorder: @unchecked Sendable {
     private let processingQueue = OperationQueue(maxConcurrentOperationCount: 1)
 
     @Injected(\.activeCallProvider) private var activeCallProvider
-    @Injected(\.activeCallAudioSession) private var activeCallAudioSession
+    @Injected(\.audioStore) private var audioStore
 
     /// The builder used to create the AVAudioRecorder instance.
     let audioRecorderBuilder: AVAudioRecorderBuilder
@@ -38,7 +38,6 @@ open class StreamCallAudioRecorder: @unchecked Sendable {
 
     @Atomic private(set) var isRecording: Bool = false {
         willSet {
-            activeCallAudioSession?.isRecording = newValue
             _isRecordingSubject.send(newValue)
         }
     }
@@ -194,7 +193,7 @@ open class StreamCallAudioRecorder: @unchecked Sendable {
 
     private func setUpAudioCaptureIfRequired() async throws -> AVAudioRecorder {
         guard
-            await activeCallAudioSession?.requestRecordPermission() == true
+            await audioStore.requestRecordPermission() == true
         else {
             throw ClientError("🎙️Permission denied.")
         }
@@ -219,11 +218,8 @@ open class StreamCallAudioRecorder: @unchecked Sendable {
     }
 
     private func deferSessionActivation() async {
-        guard let activeCallAudioSession else {
-            return
-        }
-        _ = try? await activeCallAudioSession
-            .$category
+        _ = try? await audioStore
+            .publisher(\.category)
             .filter { $0 == .playAndRecord }
             .nextValue(timeout: 1)
     }

Sources/StreamVideo/Utils/AudioSession/AudioSessionConfiguration.swift

@@ -5,8 +5,7 @@
 import AVFoundation
 
 /// Represents the audio session configuration.
-public struct AudioSessionConfiguration: ReflectiveStringConvertible,
-    Equatable {
+public struct AudioSessionConfiguration: ReflectiveStringConvertible, Equatable, Sendable {
     /// The audio session category.
     var category: AVAudioSession.Category
     /// The audio session mode.