@stream-io/react-native-callingx 0.1.0-beta.7 → 0.1.1-beta.0

package/ios/CallingxImpl.swift

@@ -30,7 +30,7 @@ import stream_react_native_webrtc
     // MARK: - Shared State
     @objc public static var sharedProvider: CXProvider?
     @objc public static var uuidStorage: UUIDStorage?
-    @objc public static weak var sharedInstance: CallingxImpl?
+    @objc public static var sharedInstance: CallingxImpl?
     /// Events stored before the module instance exists (e.g. VoIP from killed state). Drained in getInitialEvents().
     private static var delayedEvents: [[String: Any]] = []
     
@@ -42,6 +42,21 @@ import stream_react_native_webrtc
     
     private var canSendEvents: Bool = false
     private var isSetup: Bool = false
+
+    // Pending CXActions awaiting JS fulfillment
+    private var pendingAnswerActions: [String: (action: CXAnswerCallAction, enqueuedAt: DispatchTime)] = [:]
+    private var pendingEndActions: [String: (action: CXEndCallAction, enqueuedAt: DispatchTime)] = [:]
+    private let pendingActionsQueue = DispatchQueue(label: "io.getstream.callingx.pendingActions")
+    // a large timeout to accomodate for cold start + metro server load time
+    private let pendingActionTimeoutSeconds = 30
+
+    @objc public static func getSharedInstance() -> CallingxImpl {
+        if sharedInstance == nil {
+            sharedInstance = CallingxImpl()
+        }
+
+        return sharedInstance!
+    }
     
     // MARK: - Initialization
     @objc public override init() {
@@ -58,7 +73,14 @@ import stream_react_native_webrtc
         )
         
         CallingxImpl.sharedInstance = self
-        CallingxImpl.initializeIfNeeded()
+
+        if CallingxImpl.uuidStorage == nil {
+            CallingxImpl.uuidStorage = UUIDStorage()
+        }
+        
+        if CallingxImpl.sharedProvider == nil {
+            CallingxImpl.sharedProvider = CXProvider(configuration: Settings.getProviderConfiguration())
+        }
         
         callKeepProvider = CallingxImpl.sharedProvider
         callKeepProvider?.setDelegate(nil, queue: nil)
@@ -77,13 +99,7 @@ import stream_react_native_webrtc
     
     // MARK: - Class Methods
     @objc public static func initializeIfNeeded() {
-        if uuidStorage == nil {
-            uuidStorage = UUIDStorage()
-        }
-        
-        if sharedProvider == nil {
-            sharedProvider = CXProvider(configuration: Settings.getProviderConfiguration())
-        }
+        _ = getSharedInstance() // ensures the shared instance is created and CXProvider delegate is set        
     }
     
     @objc public static func reportNewIncomingCall(
@@ -107,7 +123,7 @@ import stream_react_native_webrtc
         
         if storage.containsCid(callId) {
             #if DEBUG
-            print("[Callingx][reportNewIncomingCall] callId already exists")
+            NSLog("%@","[Callingx][reportNewIncomingCall] callId already exists")
             #endif
             completion?()
             resolve?(true)
@@ -127,7 +143,7 @@ import stream_react_native_webrtc
         
         sharedProvider?.reportNewIncomingCall(with: uuid, update: callUpdate) { error in
             #if DEBUG
-            print("[Callingx][reportNewIncomingCall] callId = \(callId), error = \(String(describing: error))")
+            NSLog("%@","[Callingx][reportNewIncomingCall] callId = \(callId), error = \(String(describing: error))")
             #endif
             
             let errorCode = error != nil ? CallingxImpl.getIncomingCallErrorCode(error!) : ""
@@ -146,21 +162,13 @@ import stream_react_native_webrtc
                 "payload": payload ?? ""
             ]
             
-            if let instance = sharedInstance {
-                instance.sendEvent(CallingxEvents.didDisplayIncomingCall, body: body)
-            } else {
-                let dictionary: [String: Any] = [
-                    "eventName": CallingxEvents.didDisplayIncomingCall,
-                    "params": body
-                ]
-                DispatchQueue.main.async {
-                    CallingxImpl.delayedEvents.append(dictionary)
-                }
+            if let instance = CallingxImpl.sharedInstance {
+              instance.sendEvent(CallingxEvents.didDisplayIncomingCall, body: body)
             }
-            
+        
             if error == nil {
                 #if DEBUG
-                print("[Callingx][reportNewIncomingCall] success callId = \(callId)")
+                NSLog("%@","[Callingx][reportNewIncomingCall] success callId = \(callId)")
                 #endif
                 resolve?(true)
             } else {
@@ -204,12 +212,12 @@ import stream_react_native_webrtc
     
     @objc public static func endCall(_ callId: String, reason: Int) {
         #if DEBUG
-        print("[Callingx][endCall] callId = \(callId) reason = \(reason)")
+        NSLog("%@","[Callingx][endCall] callId = \(callId) reason = \(reason)")
         #endif
         
         guard let call = uuidStorage?.getCall(forCid: callId) else {
             #if DEBUG
-            print("[Callingx][endCall] callId not found")
+            NSLog("%@","[Callingx][endCall] callId not found")
             #endif
             return
         }
@@ -242,7 +250,7 @@ import stream_react_native_webrtc
     // MARK: - Instance Methods
     @objc public func requestTransaction(_ transaction: CXTransaction) {
         #if DEBUG
-        print("[Callingx][requestTransaction] transaction = \(transaction)")
+        NSLog("%@","[Callingx][requestTransaction] transaction = \(transaction)")
         #endif
         
         if callKeepCallController == nil {
@@ -252,7 +260,7 @@ import stream_react_native_webrtc
         callKeepCallController?.request(transaction) { [weak self] error in
             if let error = error {
                 #if DEBUG
-                print("[Callingx][requestTransaction] Error requesting transaction (\(transaction.actions)): (\(error))")
+                NSLog("%@","[Callingx][requestTransaction] Error requesting transaction (\(transaction.actions)): (\(error))")
                 #endif
 
                 // Reset per-call action-source flags for all actions in the failed transaction
@@ -264,7 +272,7 @@ import stream_react_native_webrtc
                 }
             } else {
                 #if DEBUG
-                print("[Callingx][requestTransaction] Requested transaction successfully")
+                NSLog("%@","[Callingx][requestTransaction] Requested transaction successfully")
                 #endif
                 
                 if let startCallAction = transaction.actions.first as? CXStartCallAction {
@@ -285,7 +293,7 @@ import stream_react_native_webrtc
     
     @objc public func sendEvent(_ name: String, body: [String: Any]?) {
         #if DEBUG
-        print("[Callingx] sendEventWithNameWrapper: \(name)")
+        NSLog("%@","[Callingx] sendEventWithNameWrapper: \(name)")
         #endif
         
         let sendEventAction = {
@@ -299,7 +307,7 @@ import stream_react_native_webrtc
             } else {
                 CallingxImpl.delayedEvents.append(dictionary)
                 #if DEBUG
-                print("[Callingx] delayedEvents: \(CallingxImpl.delayedEvents)")
+                NSLog("%@","[Callingx] delayedEvents: \(CallingxImpl.delayedEvents)")
                 #endif
             }
         }
@@ -334,11 +342,21 @@ import stream_react_native_webrtc
         
         Settings.setSettings(options)
         
-        CallingxImpl.initializeIfNeeded()
-        
-        callKeepProvider = CallingxImpl.sharedProvider
-        callKeepProvider?.setDelegate(self, queue: nil)
-        
+        // This is mostly needed for very first setup, as we need to override the default
+        // provider configuration which is set in the constructor.
+        // IMPORTANT: We override CXProvider instance only if there is no registered call, otherwise we may lose corrsponding call state/events from CallKit
+        if !CallingxImpl.hasRegisteredCall() {
+            let oldProvider = CallingxImpl.sharedProvider
+            let newProvider = CXProvider(configuration: Settings.getProviderConfiguration())
+            newProvider.setDelegate(self, queue: nil)
+            
+            CallingxImpl.sharedProvider = newProvider
+            callKeepProvider = newProvider
+            
+            oldProvider?.setDelegate(nil, queue: nil)
+            oldProvider?.invalidate()
+        }
+
         isSetup = true
     }
     
@@ -346,7 +364,7 @@ import stream_react_native_webrtc
         var events: [[String: Any]] = []
         let action = {
             #if DEBUG
-            print("[Callingx][getInitialEvents] delayedEvents = \(CallingxImpl.delayedEvents)")
+            NSLog("%@","[Callingx][getInitialEvents] delayedEvents = \(CallingxImpl.delayedEvents)")
             #endif
             
             events = CallingxImpl.delayedEvents
@@ -368,12 +386,12 @@ import stream_react_native_webrtc
     // MARK: - Call Management
     @objc public func answerIncomingCall(_ callId: String) -> Bool {
         #if DEBUG
-        print("[Callingx][answerIncomingCall] callId = \(callId)")
+        NSLog("%@","[Callingx][answerIncomingCall] callId = \(callId)")
         #endif
-        
+
         guard let call = CallingxImpl.uuidStorage?.getCall(forCid: callId) else {
             #if DEBUG
-            print("[Callingx][answerIncomingCall] callId not found")
+            NSLog("%@","[Callingx][answerIncomingCall] callId not found")
             #endif
             return false
         }
@@ -381,7 +399,7 @@ import stream_react_native_webrtc
         // Guard: already answered or ended — prevent duplicate CXAnswerCallAction transactions
         if call.isAnswered || call.hasEnded {
             #if DEBUG
-            print("[Callingx][answerIncomingCall] callId already answered/ended, skipping")
+            NSLog("%@","[Callingx][answerIncomingCall] callId already answered/ended, skipping")
             #endif
             return true
         }
@@ -430,7 +448,7 @@ import stream_react_native_webrtc
                 DispatchQueue.main.asyncAfter(deadline: popTime) { [weak self] in
                     guard let self = self, !self.isSetup else { return }
                     #if DEBUG
-                    print("[Callingx] Displayed a call without a reachable app, ending the call: \(callId)")
+                    NSLog("%@","[Callingx] Displayed a call without a reachable app, ending the call: \(callId)")
                     #endif
                     CallingxImpl.endCall(callId, reason: CXCallEndedReason.failed.rawValue)
                 }
@@ -440,12 +458,12 @@ import stream_react_native_webrtc
     
     @objc public func endCall(_ callId: String) -> Bool {
         #if DEBUG
-        print("[Callingx][endCall] callId = \(callId)")
+        NSLog("%@","[Callingx][endCall] callId = \(callId)")
         #endif
         
         guard let call = CallingxImpl.uuidStorage?.getCall(forCid: callId) else {
             #if DEBUG
-            print("[Callingx][endCall] callId not found")
+            NSLog("%@","[Callingx][endCall] callId not found")
             #endif
             return false
         }
@@ -453,7 +471,7 @@ import stream_react_native_webrtc
         // Guard: already ended — prevent duplicate CXEndCallAction transactions
         if call.hasEnded {
             #if DEBUG
-            print("[Callingx][endCall] callId already ended, skipping")
+            NSLog("%@","[Callingx][endCall] callId already ended, skipping")
             #endif
             return true
         }
@@ -471,7 +489,7 @@ import stream_react_native_webrtc
     @objc public func isCallTracked(_ callId: String) -> Bool {
         guard let uuid = CallingxImpl.uuidStorage?.getUUID(forCid: callId) else {
             #if DEBUG
-            print("[Callingx][isCallTracked] callId not found")
+            NSLog("%@","[Callingx][isCallTracked] callId not found")
             #endif
             return false
         }
@@ -487,12 +505,12 @@ import stream_react_native_webrtc
     
     @objc public func setCurrentCallActive(_ callId: String) -> Bool {
         #if DEBUG
-        print("[Callingx][setCurrentCallActive] callId = \(callId)")
+        NSLog("%@","[Callingx][setCurrentCallActive] callId = \(callId)")
         #endif
       
         guard let call = CallingxImpl.uuidStorage?.getCall(forCid: callId) else {
             #if DEBUG
-            print("[Callingx][setCurrentCallActive] callId not found")
+            NSLog("%@","[Callingx][setCurrentCallActive] callId not found")
             #endif
             return false
         }
@@ -507,12 +525,12 @@ import stream_react_native_webrtc
     
     @objc public func setMutedCall(_ callId: String, isMuted: Bool) -> Bool {
         #if DEBUG
-        print("[Callingx][setMutedCall] muted = \(isMuted)")
+        NSLog("%@","[Callingx][setMutedCall] muted = \(isMuted)")
         #endif
         
         guard let call = CallingxImpl.uuidStorage?.getCall(forCid: callId) else {
             #if DEBUG
-            print("[Callingx][setMutedCall] callId not found")
+            NSLog("%@","[Callingx][setMutedCall] callId not found")
             #endif
             return false
         }
@@ -528,12 +546,12 @@ import stream_react_native_webrtc
     
     @objc public func setOnHoldCall(_ callId: String, isOnHold: Bool) -> Bool {
         #if DEBUG
-        print("[Callingx][setOnHold] uuidString = \(callId), shouldHold = \(isOnHold)")
+        NSLog("%@","[Callingx][setOnHold] uuidString = \(callId), shouldHold = \(isOnHold)")
         #endif
         
         guard let uuid = CallingxImpl.uuidStorage?.getUUID(forCid: callId) else {
             #if DEBUG
-            print("[Callingx][setOnHoldCall] callId not found")
+            NSLog("%@","[Callingx][setOnHoldCall] callId not found")
             #endif
             return false
         }
@@ -553,14 +571,14 @@ import stream_react_native_webrtc
         hasVideo: Bool
     ) {
         #if DEBUG
-        print("[Callingx][startCall] uuidString = \(callId), phoneNumber = \(phoneNumber)")
+        NSLog("%@","[Callingx][startCall] uuidString = \(callId), phoneNumber = \(phoneNumber)")
         #endif
         
         guard let storage = CallingxImpl.uuidStorage else { return }
       
         if (storage.containsCid(callId)) {
           #if DEBUG
-          print("[Callingx][startCall] Call \(callId) is already registered")
+          NSLog("%@","[Callingx][startCall] Call \(callId) is already registered")
           #endif
           return
         }
@@ -584,12 +602,12 @@ import stream_react_native_webrtc
         callerName: String
     ) -> Bool {
         #if DEBUG
-        print("[Callingx][updateDisplay] uuidString = \(callId) displayName = \(callerName) uri = \(phoneNumber)")
+        NSLog("%@","[Callingx][updateDisplay] uuidString = \(callId) displayName = \(callerName) uri = \(phoneNumber)")
         #endif
         
         guard let uuid = CallingxImpl.uuidStorage?.getUUID(forCid: callId) else {
             #if DEBUG
-            print("[Callingx][updateDisplay] callId not found")
+            NSLog("%@","[Callingx][updateDisplay] callId not found")
             #endif
             return false
         }
@@ -608,12 +626,12 @@ import stream_react_native_webrtc
     // MARK: - CXProviderDelegate
     public func provider(_ provider: CXProvider, perform action: CXStartCallAction) {
         #if DEBUG
-        print("[Callingx][CXProviderDelegate][provider:performStartCallAction]")
+        NSLog("%@","[Callingx][CXProviderDelegate][provider:performStartCallAction]")
         #endif
         
         guard let call = CallingxImpl.uuidStorage?.getCallByUUID(action.callUUID) else {
             #if DEBUG
-            print("[Callingx][CXProviderDelegate][provider:performStartCallAction] callId not found")
+            NSLog("%@","[Callingx][CXProviderDelegate][provider:performStartCallAction] callId not found")
             #endif
             action.fail()
             return
@@ -637,14 +655,14 @@ import stream_react_native_webrtc
     public func provider(_ provider: CXProvider, perform action: CXAnswerCallAction) {
         guard let call = CallingxImpl.uuidStorage?.getCallByUUID(action.callUUID) else {
             #if DEBUG
-            print("[Callingx][CXProviderDelegate][provider:performAnswerCallAction] callId not found")
+            NSLog("%@","[Callingx][CXProviderDelegate][provider:performAnswerCallAction] callId not found")
             #endif
             action.fail()
             return
         }
         
         #if DEBUG
-        print("[Callingx][CXProviderDelegate][provider:performAnswerCallAction] isSelfAnswered: \(call.isSelfAnswered)")
+        NSLog("%@","[Callingx][CXProviderDelegate][provider:performAnswerCallAction] isSelfAnswered: \(call.isSelfAnswered)")
         #endif
         
         getAudioDeviceModule()?.reset()
@@ -658,46 +676,85 @@ import stream_react_native_webrtc
         
         call.resetSelfAnswered()
         call.markConnected() // incoming: call is now connected
-        // TODO: Use action.fulfill(withDateConnected: call.connectedAt ?? Date()) instead of bare
-        // action.fulfill() to give CallKit more accurate call duration tracking in the system call log.
-        // to be done with pending action fulfillment
-        action.fulfill()
+
+        if source == "app" {
+            // App initiated this answer — no need to wait for JS, fulfill immediately
+            action.fulfill()
+        } else {
+            // System initiated — defer fulfillment until JS reports back via fulfillAnswerCallAction
+            let cid = call.cid
+            pendingActionsQueue.sync {
+                self.pendingAnswerActions[cid] = (action: action, enqueuedAt: DispatchTime.now())
+            }
+            // Safety timer: auto-fail if JS never responds.
+            // Answer timeout = call never connected
+            let timeout = DispatchTime.now() + DispatchTimeInterval.seconds(pendingActionTimeoutSeconds)
+            pendingActionsQueue.asyncAfter(deadline: timeout) { [weak self] in
+                if let pending = self?.pendingAnswerActions.removeValue(forKey: cid) {
+                    #if DEBUG
+                    NSLog("%@","[Callingx][CXProviderDelegate][provider:performAnswerCallAction] answer timeout for callId: \(cid)")
+                    #endif
+                    pending.action.fail()
+                }
+            }
+        }
     }
-    
+
     public func provider(_ provider: CXProvider, perform action: CXEndCallAction) {
         guard let call = CallingxImpl.uuidStorage?.getCallByUUID(action.callUUID) else {
             #if DEBUG
-            print("[Callingx][CXProviderDelegate][provider:performEndCallAction] callId not found")
+            NSLog("%@","[Callingx][CXProviderDelegate][provider:performEndCallAction] callId not found")
             #endif
-            action.fail()
+            // End actions represent explicit user intent to close call UI.
+            // Fulfill stale/duplicate end actions to avoid "Call Failed" UX.
+            action.fulfill()
             return
         }
-        
+
         #if DEBUG
-        print("[Callingx][CXProviderDelegate][provider:performEndCallAction] isSelfEnded: \(call.isSelfEnded)")
+        NSLog("%@","[Callingx][CXProviderDelegate][provider:performEndCallAction] isSelfEnded: \(call.isSelfEnded)")
         #endif
-        
+
         let source = call.isSelfEnded ? "app" : "sys"
         sendEvent(CallingxEvents.performEndCallAction, body: [
             "callId": call.cid,
             "source": source
         ])
-        
+
         call.resetSelfEnded()
         call.markEnded()
         CallingxImpl.uuidStorage?.removeCid(call.cid)
-        
-        action.fulfill()
+
+        if source == "app" {
+            // App initiated this end — no need to wait for JS, fulfill immediately
+            action.fulfill()
+        } else {
+            // System initiated — defer fulfillment until JS reports back via fulfillEndCallAction
+            let cid = call.cid
+            pendingActionsQueue.sync {
+                self.pendingEndActions[cid] = (action: action, enqueuedAt: DispatchTime.now())
+            }
+            // Safety timer: auto-fulfill if JS never responds.
+            let timeout = DispatchTime.now() + DispatchTimeInterval.seconds(pendingActionTimeoutSeconds)
+            pendingActionsQueue.asyncAfter(deadline: timeout) { [weak self] in
+                if let pending = self?.pendingEndActions.removeValue(forKey: cid) {
+                    #if DEBUG
+                    NSLog("%@","[Callingx][CXProviderDelegate][provider:performEndCallAction] end timeout for callId: \(cid)")
+                    #endif
+                    pending.action.fulfill()
+                }
+            }
+        }
     }
     
     public func provider(_ provider: CXProvider, perform action: CXSetHeldCallAction) {
         #if DEBUG
-        print("[Callingx][CXProviderDelegate][provider:performSetHeldCallAction]")
+        NSLog("%@","[Callingx][CXProviderDelegate][provider:performSetHeldCallAction]")
         #endif
         
         guard let callId = CallingxImpl.uuidStorage?.getCid(forUUID: action.callUUID) else {
             #if DEBUG
-            print("[Callingx][CXProviderDelegate][provider:performSetHeldCallAction] callId not found")
+            NSLog("%@","[Callingx][CXProviderDelegate][provider:performSetHeldCallAction] callId not found")
             #endif
             action.fail()
             return
@@ -714,7 +771,7 @@ import stream_react_native_webrtc
     public func provider(_ provider: CXProvider, perform action: CXSetMutedCallAction) {
         guard let call = CallingxImpl.uuidStorage?.getCallByUUID(action.callUUID) else {
             #if DEBUG
-            print("[Callingx][CXProviderDelegate][provider:performSetMutedCallAction] callId not found")
+            NSLog("%@","[Callingx][CXProviderDelegate][provider:performSetMutedCallAction] callId not found")
             #endif
             action.fail()
             return
@@ -724,7 +781,7 @@ import stream_react_native_webrtc
         call.resetSelfMuted()
         
         #if DEBUG
-        print("[Callingx][CXProviderDelegate][provider:performSetMutedCallAction] \(action.isMuted) isAppInitiated: \(isAppInitiated)")
+        NSLog("%@","[Callingx][CXProviderDelegate][provider:performSetMutedCallAction] \(action.isMuted) isAppInitiated: \(isAppInitiated)")
         #endif
         
         // Only send the event to JS when the mute was initiated by the system
@@ -743,12 +800,12 @@ import stream_react_native_webrtc
   
     public func provider(_ provider: CXProvider, perform action: CXPlayDTMFCallAction) {
         #if DEBUG
-        print("[Callingx][CXProviderDelegate][provider:performPlayDTMFCallAction]")
+        NSLog("%@","[Callingx][CXProviderDelegate][provider:performPlayDTMFCallAction]")
         #endif
         
         guard let callId = CallingxImpl.uuidStorage?.getCid(forUUID: action.callUUID) else {
             #if DEBUG
-            print("[Callingx][CXProviderDelegate][provider:performPlayDTMFCallAction] callId not found")
+            NSLog("%@","[Callingx][CXProviderDelegate][provider:performPlayDTMFCallAction] callId not found")
             #endif
             action.fail()
             return
@@ -764,7 +821,7 @@ import stream_react_native_webrtc
     
     public func provider(_ provider: CXProvider, didActivate audioSession: AVAudioSession) {
         #if DEBUG
-        print("[Callingx][CXProviderDelegate][provider:didActivateAudioSession] category=\(audioSession.category) mode=\(audioSession.mode)")
+        NSLog("%@","[Callingx][CXProviderDelegate][provider:didActivateAudioSession] category=\(audioSession.category) mode=\(audioSession.mode)")
         #endif
 
         // When CallKit activates the AVAudioSession, inform WebRTC as well.
@@ -780,7 +837,7 @@ import stream_react_native_webrtc
     
     public func provider(_ provider: CXProvider, didDeactivate audioSession: AVAudioSession) {
         #if DEBUG
-        print("[Callingx][CXProviderDelegate][provider:didDeactivateAudioSession] category=\(audioSession.category) mode=\(audioSession.mode)")
+        NSLog("%@","[Callingx][CXProviderDelegate][provider:didDeactivateAudioSession] category=\(audioSession.category) mode=\(audioSession.mode)")
         #endif
 
         // When CallKit deactivates the AVAudioSession, inform WebRTC as well.
@@ -796,24 +853,97 @@ import stream_react_native_webrtc
     }
   
     public func provider(_ provider: CXProvider, timedOutPerforming action: CXAction) {
+        // note: in practice we should never be getting this callback as we already have a pending timeout set.
+        // in our tests callkit timesout and exectutes this method in approximately 60 seconds.
         #if DEBUG
-        print("[Callingx][CXProviderDelegate][provider:timedOutPerformingAction]")
+        NSLog("%@","[Callingx][CXProviderDelegate][provider:timedOutPerformingAction]")
         #endif
+
+        guard let callAction = action as? CXCallAction else {
+            return
+        }
+
+        pendingActionsQueue.sync {
+            // cid mapping as soon as end is initiated, so cleanup by matching callUUID.
+            if let answerEntry = pendingAnswerActions.first(where: { $0.value.action.callUUID == callAction.callUUID }) {
+                pendingAnswerActions.removeValue(forKey: answerEntry.key)
+                let elapsedMs = elapsedMilliseconds(since: answerEntry.value.enqueuedAt)
+                #if DEBUG
+                NSLog("%@","[Callingx][CXProviderDelegate][provider:timedOutPerformingAction] removed pending answer action for callId: \(answerEntry.key), elapsedMs=\(elapsedMs)")
+                #endif
+            }
+
+            if let endEntry = pendingEndActions.first(where: { $0.value.action.callUUID == callAction.callUUID }) {
+                pendingEndActions.removeValue(forKey: endEntry.key)
+                let elapsedMs = elapsedMilliseconds(since: endEntry.value.enqueuedAt)
+                #if DEBUG
+                NSLog("%@","[Callingx][CXProviderDelegate][provider:timedOutPerformingAction] removed pending end action for callId: \(endEntry.key), elapsedMs=\(elapsedMs)")
+                #endif
+            }
+        }
     }
   
     public func providerDidReset(_ provider: CXProvider) {
         #if DEBUG
-        print("[Callingx][providerDidReset]")
+        NSLog("%@","[Callingx][providerDidReset]")
         #endif
 
+        // Clear any pending actions to prevent memory leaks.
+        // After a provider reset, all pending CXActions are invalid.
+        pendingActionsQueue.sync {
+            pendingAnswerActions.removeAll()
+            pendingEndActions.removeAll()
+        }
+
         sendEvent(CallingxEvents.providerReset, body: nil)
     }
     
+    // MARK: - Pending Action Fulfillment
+
+    @objc public func fulfillAnswerCallAction(_ callId: String, didFail: Bool) {
+        pendingActionsQueue.sync { [weak self] in
+            guard let pending = self?.pendingAnswerActions.removeValue(forKey: callId) else {
+                #if DEBUG
+                NSLog("%@","[Callingx][fulfillAnswerCallAction] action not found for callId: \(callId)")
+                #endif
+                return
+            }
+            let elapsedMs = elapsedMilliseconds(since: pending.enqueuedAt)
+            #if DEBUG
+            NSLog("%@","[Callingx][fulfillAnswerCallAction] callId: \(callId), didFail: \(didFail), elapsedMs=\(elapsedMs)")
+            #endif
+            if didFail { pending.action.fail() } else { pending.action.fulfill() }
+        }
+    }
+
+    @objc public func fulfillEndCallAction(_ callId: String, didFail: Bool) {
+        pendingActionsQueue.sync { [weak self] in
+            guard let pending = self?.pendingEndActions.removeValue(forKey: callId) else {
+                #if DEBUG
+                NSLog("%@","[Callingx][fulfillEndCallAction] action not found for callId: \(callId)")
+                #endif
+                return
+            }
+            let elapsedMs = elapsedMilliseconds(since: pending.enqueuedAt)
+            #if DEBUG
+            NSLog("%@","[Callingx][fulfillEndCallAction] callId: \(callId), didFail: \(didFail), elapsedMs=\(elapsedMs)")
+            #endif
+            if didFail { pending.action.fail() } else { pending.action.fulfill() }
+        }
+    }
+
     // MARK: - Helper Methods
+    private func elapsedMilliseconds(since start: DispatchTime) -> Int {
+        let nowNs = DispatchTime.now().uptimeNanoseconds
+        let startNs = start.uptimeNanoseconds
+        guard nowNs >= startNs else { return 0 }
+        return Int((nowNs - startNs) / 1_000_000)
+    }
+
     private func getAudioDeviceModule() -> AudioDeviceModule? {
         guard let adm = webRTCModule?.audioDeviceModule else {
             #if DEBUG
-            print("[Callingx] WebRTCModule is not available. Ensure it was injected from the TurboModule host.")
+            NSLog("%@","[Callingx] WebRTCModule is not available. Ensure it was injected from the TurboModule host.")
             #endif
             return nil
         }

package/ios/Settings.swift

@@ -11,7 +11,7 @@ import UIKit
 
     public static func setSettings(_ options: [String: Any]?) {
         #if DEBUG
-        print("[Settings][setSettings] options = \(String(describing: options))")
+        NSLog("%@","[Settings][setSettings] options = \(String(describing: options))")
         #endif
 
         var settings: [String: Any] = getSettings()
@@ -39,7 +39,7 @@ import UIKit
 
     public static func getProviderConfiguration() -> CXProviderConfiguration {
         #if DEBUG
-        print("[Settings][getProviderConfiguration]")
+        NSLog("%@","[Settings][getProviderConfiguration]")
         #endif
       
         let settings = getSettings()