@qusaieilouti99/call-manager 0.1.79 → 0.1.80

package/CallManager.podspec

@@ -20,6 +20,11 @@ Pod::Spec.new do |s|
     "cpp/**/*.{hpp,cpp}",
   ]
 
+   s.pod_target_xcconfig = {
+     # C++ compiler flags, mainly for folly.
+     "GCC_PREPROCESSOR_DEFINITIONS" => "$(inherited) FOLLY_NO_CONFIG FOLLY_CFG_NO_COROUTINES"
+   }
+
   s.dependency 'React-jsi'
   s.dependency 'React-callinvoker'
 

package/ios/AudioManager.swift

@@ -7,16 +7,16 @@ protocol AudioManagerDelegate: AnyObject {
     func audioManager(_ manager: AudioManager, didChangeDevices routeInfo: AudioRoutesInfo)
 }
 
-class AudioManager: NSObject {
+class AudioManager {
     private let logger = Logger(subsystem: "com.qusaieilouti99.callmanager", category: "AudioManager")
     private weak var delegate: AudioManagerDelegate?
     private var audioSession: AVAudioSession
     private var lastRouteInfo: AudioRoutesInfo?
+    private var notificationObservers: [NSObjectProtocol] = []
 
     init(delegate: AudioManagerDelegate) {
         self.delegate = delegate
         self.audioSession = AVAudioSession.sharedInstance()
-        super.init()
 
         logger.info("🔊 AudioManager initializing...")
         setupNotifications()
@@ -25,31 +25,36 @@ class AudioManager: NSObject {
 
     deinit {
         logger.info("🔊 AudioManager deinitializing...")
-        NotificationCenter.default.removeObserver(self)
+        for observer in notificationObservers {
+            NotificationCenter.default.removeObserver(observer)
+        }
+        notificationObservers.removeAll()
     }
 
-    // MARK: - Setup
     private func setupNotifications() {
         logger.info("🔊 Setting up audio session notifications...")
 
-        NotificationCenter.default.addObserver(
-            self,
-            selector: #selector(audioRouteChanged),
-            name: AVAudioSession.routeChangeNotification,
-            object: nil
-        )
-
-        NotificationCenter.default.addObserver(
-            self,
-            selector: #selector(audioSessionInterrupted),
-            name: AVAudioSession.interruptionNotification,
-            object: nil
-        )
+        let routeChangeObserver = NotificationCenter.default.addObserver(
+            forName: AVAudioSession.routeChangeNotification,
+            object: nil,
+            queue: nil
+        ) { [weak self] notification in
+            self?.handleAudioRouteChanged(notification: notification)
+        }
+        notificationObservers.append(routeChangeObserver)
+
+        let interruptionObserver = NotificationCenter.default.addObserver(
+            forName: AVAudioSession.interruptionNotification,
+            object: nil,
+            queue: nil
+        ) { [weak self] notification in
+            self?.handleAudioSessionInterrupted(notification: notification)
+        }
+        notificationObservers.append(interruptionObserver)
 
         logger.info("🔊 ✅ Audio session notifications setup completed")
     }
 
-    // MARK: - Public Methods
     func configureForIncomingCall() {
         logger.info("🔊 Configuring audio session for incoming call...")
 
@@ -103,7 +108,6 @@ class AudioManager: NSObject {
         logger.debug("🔊 Current route inputs: \(currentRoute.inputs.map { $0.portType.rawValue })")
         logger.debug("🔊 Current route outputs: \(currentRoute.outputs.map { $0.portType.rawValue })")
 
-        // Check for available inputs/outputs
         if let availableInputs = audioSession.availableInputs {
             logger.debug("🔊 Available inputs: \(availableInputs.map { $0.portType.rawValue })")
 
@@ -126,7 +130,6 @@ class AudioManager: NSObject {
             }
         }
 
-        // Determine current route
         let currentRouteString = getCurrentAudioRoute()
 
         let routeInfo = AudioRoutesInfo(devices: devices, currentRoute: currentRouteString)
@@ -153,11 +156,9 @@ class AudioManager: NSObject {
             case "Bluetooth":
                 logger.debug("🔊 Setting to Bluetooth (system managed)...")
                 try audioSession.overrideOutputAudioPort(.none)
-                // Bluetooth routing is handled automatically by the system
             case "Headset":
                 logger.debug("🔊 Setting to Headset (system managed)...")
                 try audioSession.overrideOutputAudioPort(.none)
-                // Headset routing is handled automatically by the system
             default:
                 logger.warning("🔊 ⚠️ Unknown audio route: \(route)")
                 return
@@ -176,8 +177,6 @@ class AudioManager: NSObject {
 
     func setMuted(_ muted: Bool) {
         logger.info("🔊 Mute state changed to: \(muted)")
-        // Note: Muting is typically handled by CallKit automatically
-        // This is here for consistency with Android implementation
     }
 
     func cleanup() {
@@ -191,7 +190,6 @@ class AudioManager: NSObject {
         }
     }
 
-    // MARK: - Private Methods
     private func getCurrentAudioRoute() -> String {
         let currentRoute = audioSession.currentRoute
 
@@ -214,23 +212,22 @@ class AudioManager: NSObject {
         }
 
         logger.debug("🔊 No specific route found, defaulting to Earpiece")
-        return "Earpiece" // Default fallback
+        return "Earpiece"
     }
 
     private func notifyRouteChange() {
         logger.debug("🔊 Notifying delegate about route change...")
         let routeInfo = getAudioDevices()
-        delegate?.audioManager(self, didChangeRoute: routeInfo)
+        self.delegate?.audioManager(self, didChangeRoute: routeInfo)
     }
 
     private func notifyDeviceChange() {
         logger.debug("🔊 Notifying delegate about device change...")
         let routeInfo = getAudioDevices()
-        delegate?.audioManager(self, didChangeDevices: routeInfo)
+        self.delegate?.audioManager(self, didChangeDevices: routeInfo)
     }
 
-    // MARK: - Notification Handlers
-    @objc private func audioRouteChanged(notification: Notification) {
+    private func handleAudioRouteChanged(notification: Notification) {
         logger.info("🔊 Audio route changed notification received")
 
         guard let userInfo = notification.userInfo,
@@ -255,7 +252,7 @@ class AudioManager: NSObject {
         }
     }
 
-    @objc private func audioSessionInterrupted(notification: Notification) {
+    private func handleAudioSessionInterrupted(notification: Notification) {
         logger.info("🔊 Audio session interrupted notification received")
 
         guard let userInfo = notification.userInfo,
@@ -274,7 +271,6 @@ class AudioManager: NSObject {
                 let options = AVAudioSession.InterruptionOptions(rawValue: optionsValue)
                 if options.contains(.shouldResume) {
                     logger.info("🔊 Should resume audio session")
-                    // Audio session will be reactivated by CallKit
                 }
             }
         @unknown default:

package/ios/CallEngine.swift

@@ -5,35 +5,28 @@ import UserNotifications
 import UIKit
 import OSLog
 
-@objc public class CallEngine: NSObject {
+public class CallEngine {
     static let shared = CallEngine()
 
-    // MARK: - Constants
     private let logger = Logger(subsystem: "com.qusaieilouti99.callmanager", category: "CallEngine")
     private let defaultTimeout: TimeInterval = 60.0
 
-    // MARK: - Core Components
     private var callKitManager: CallKitManager?
     private var audioManager: AudioManager?
 
-    // MARK: - State Management
     private var activeCalls: [String: CallInfo] = [:]
     private var callMetadata: [String: String] = [:]
     private var currentCallId: String?
     private var canMakeMultipleCalls: Bool = false
 
-    // MARK: - Event System
     private var eventHandler: ((CallEventType, String) -> Void)?
     private var cachedEvents: [(CallEventType, String)] = []
 
-    // MARK: - Internal Call End Listeners (for UI components)
     private var callEndListeners: [(String) -> Void] = []
 
-    // MARK: - Initialization
     private var isInitialized: Bool = false
 
-    private override init() {
-        super.init()
+    private init() {
         logger.info("🚀 CallEngine singleton created")
     }
 
@@ -52,7 +45,6 @@ import OSLog
         logger.info("🚀 ✅ CallEngine initialized successfully")
     }
 
-    // MARK: - Public API
     public func setCanMakeMultipleCalls(_ allow: Bool) {
         canMakeMultipleCalls = allow
         logger.info("🚀 canMakeMultipleCalls set to: \(allow)")
@@ -60,7 +52,7 @@ import OSLog
 
     public func getCurrentCallState() -> String {
         logger.debug("🚀 Getting current call state...")
-        let callsArray = activeCalls.values.map { $0.toJSONObject() }
+        let callsArray = self.activeCalls.values.map { $0.toJSONObject() }
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: callsArray, options: [])
             let result = String(data: jsonData, encoding: .utf8) ?? "[]"
@@ -72,7 +64,6 @@ import OSLog
         }
     }
 
-    // MARK: - Incoming Call Management
     public func reportIncomingCall(
         callId: String,
         callType: String,
@@ -83,29 +74,26 @@ import OSLog
         logger.info("📞 Reporting incoming call: callId=\(callId), type=\(callType), name=\(displayName)")
 
         if let metadata = metadata {
-            callMetadata[callId] = metadata
+            self.callMetadata[callId] = metadata
             logger.info("📞 Metadata stored for call \(callId)")
         }
 
-        // Check for call collision
-        if let incomingCall = activeCalls.values.first(where: { $0.state == .incoming }),
+        if let incomingCall = self.activeCalls.values.first(where: { $0.state == .incoming }),
            incomingCall.callId != callId {
             logger.warning("📞 ⚠️ Incoming call collision detected. Auto-rejecting new call: \(callId)")
             rejectIncomingCallCollision(callId: callId, reason: "Another call is already incoming")
             return
         }
 
-        // Check for active call when multiple calls not allowed
-        if let activeCall = activeCalls.values.first(where: { $0.state == .active || $0.state == .held }),
+        if let activeCall = self.activeCalls.values.first(where: { $0.state == .active || $0.state == .held }),
            !canMakeMultipleCalls {
             logger.warning("📞 ⚠️ Active call exists when receiving incoming call. Auto-rejecting: \(callId)")
             rejectIncomingCallCollision(callId: callId, reason: "Another call is already active")
             return
         }
 
-        // Hold existing active calls if multiple calls not allowed
         if !canMakeMultipleCalls {
-            for call in activeCalls.values where call.state == .active {
+            for call in self.activeCalls.values where call.state == .active {
                 logger.info("📞 Holding existing active call: \(call.callId)")
                 holdCallInternal(callId: call.callId, heldBySystem: false)
             }
@@ -119,22 +107,22 @@ import OSLog
             state: .incoming
         )
 
-        activeCalls[callId] = callInfo
-        currentCallId = callId
-        logger.info("📞 Call added to active calls. Total: \(activeCalls.count)")
+        self.activeCalls[callId] = callInfo
+        self.currentCallId = callId
+        logger.info("📞 Call added to active calls. Total: \(self.activeCalls.count)")
 
-        callKitManager?.reportIncomingCall(callInfo: callInfo) { [weak self] error in
+        self.callKitManager?.reportIncomingCall(callInfo: callInfo) { [weak self] error in
+            guard let self = self else { return }
             if let error = error {
-                self?.logger.error("📞 ❌ Failed to report incoming call: \(error.localizedDescription)")
-                self?.endCallInternal(callId: callId)
+                self.logger.error("📞 ❌ Failed to report incoming call: \(error.localizedDescription)")
+                self.endCallInternal(callId: callId)
             } else {
-                self?.logger.info("📞 ✅ Successfully reported incoming call for \(callId)")
-                self?.audioManager?.configureForIncomingCall()
+                self.logger.info("📞 ✅ Successfully reported incoming call for \(callId)")
+                self.audioManager?.configureForIncomingCall()
             }
         }
     }
 
-    // MARK: - Outgoing Call Management
     public func startOutgoingCall(
         callId: String,
         callType: String,
@@ -144,7 +132,7 @@ import OSLog
         logger.info("📞 Starting outgoing call: callId=\(callId), type=\(callType), target=\(targetName)")
 
         if let metadata = metadata {
-            callMetadata[callId] = metadata
+            self.callMetadata[callId] = metadata
             logger.info("📞 Metadata stored for call \(callId)")
         }
 
@@ -157,9 +145,8 @@ import OSLog
             return
         }
 
-        // Hold existing active calls if multiple calls not allowed
         if !canMakeMultipleCalls {
-            for call in activeCalls.values where call.state == .active {
+            for call in self.activeCalls.values where call.state == .active {
                 logger.info("📞 Holding existing active call: \(call.callId)")
                 holdCallInternal(callId: call.callId, heldBySystem: false)
             }
@@ -173,17 +160,18 @@ import OSLog
             state: .dialing
         )
 
-        activeCalls[callId] = callInfo
-        currentCallId = callId
-        logger.info("📞 Call added to active calls. Total: \(activeCalls.count)")
+        self.activeCalls[callId] = callInfo
+        self.currentCallId = callId
+        logger.info("📞 Call added to active calls. Total: \(self.activeCalls.count)")
 
-        callKitManager?.startOutgoingCall(callInfo: callInfo) { [weak self] error in
+        self.callKitManager?.startOutgoingCall(callInfo: callInfo) { [weak self] error in
+            guard let self = self else { return }
             if let error = error {
-                self?.logger.error("📞 ❌ Failed to start outgoing call: \(error.localizedDescription)")
-                self?.endCallInternal(callId: callId)
+                self.logger.error("📞 ❌ Failed to start outgoing call: \(error.localizedDescription)")
+                self.endCallInternal(callId: callId)
             } else {
-                self?.logger.info("📞 ✅ Successfully started outgoing call for \(callId)")
-                self?.audioManager?.configureForOutgoingCall(isVideo: callType == "Video")
+                self.logger.info("📞 ✅ Successfully started outgoing call for \(callId)")
+                self.audioManager?.configureForOutgoingCall(isVideo: callType == "Video")
             }
         }
     }
@@ -197,18 +185,17 @@ import OSLog
         logger.info("📞 Starting call (direct active): callId=\(callId), type=\(callType), target=\(targetName)")
 
         if let metadata = metadata {
-            callMetadata[callId] = metadata
+            self.callMetadata[callId] = metadata
             logger.info("📞 Metadata stored for call \(callId)")
         }
 
-        if activeCalls.keys.contains(callId) {
+        if self.activeCalls.keys.contains(callId) {
             logger.warning("📞 ⚠️ Call \(callId) already exists, cannot start again")
             return
         }
 
-        // Hold existing active calls if multiple calls not allowed
         if !canMakeMultipleCalls {
-            for call in activeCalls.values where call.state == .active {
+            for call in self.activeCalls.values where call.state == .active {
                 logger.info("📞 Holding existing active call: \(call.callId)")
                 holdCallInternal(callId: call.callId, heldBySystem: false)
             }
@@ -222,17 +209,16 @@ import OSLog
             state: .active
         )
 
-        activeCalls[callId] = callInfo
-        currentCallId = callId
-        logger.info("📞 Call added as ACTIVE. Total: \(activeCalls.count)")
+        self.activeCalls[callId] = callInfo
+        self.currentCallId = callId
+        logger.info("📞 Call added as ACTIVE. Total: \(self.activeCalls.count)")
 
-        audioManager?.configureForActiveCall(isVideo: callType == "Video")
+        self.audioManager?.configureForActiveCall(isVideo: callType == "Video")
         emitOutgoingCallAnsweredWithMetadata(callId: callId)
 
         logger.info("📞 ✅ Call \(callId) started as ACTIVE")
     }
 
-    // MARK: - Call Answer Management
     public func callAnsweredFromJS(callId: String) {
         logger.info("📞 Remote party answered: \(callId)")
         coreCallAnswered(callId: callId, isLocalAnswer: false)
@@ -246,23 +232,22 @@ import OSLog
     private func coreCallAnswered(callId: String, isLocalAnswer: Bool) {
         logger.info("📞 Core call answered: callId=\(callId), isLocalAnswer=\(isLocalAnswer)")
 
-        guard var callInfo = activeCalls[callId] else {
+        guard var callInfo = self.activeCalls[callId] else {
             logger.warning("📞 ⚠️ Cannot answer call \(callId) - not found in active calls")
             return
         }
 
         let previousState = callInfo.state
         callInfo.updateState(.active)
-        activeCalls[callId] = callInfo
-        currentCallId = callId
+        self.activeCalls[callId] = callInfo
+        self.currentCallId = callId
 
-        logger.info("📞 Call state updated: \(previousState.rawValue) → \(CallState.active.rawValue)")
+        logger.info("📞 Call state updated: \(previousState.stringValue) → \(CallState.active.stringValue)")
 
-        audioManager?.configureForActiveCall(isVideo: callInfo.callType == "Video")
+        self.audioManager?.configureForActiveCall(isVideo: callInfo.callType == "Video")
 
-        // Hold other active calls if multiple calls not allowed
         if !canMakeMultipleCalls {
-            for call in activeCalls.values where call.callId != callId && call.state == .active {
+            for call in self.activeCalls.values where call.callId != callId && call.state == .active {
                 logger.info("📞 Holding other active call: \(call.callId)")
                 holdCallInternal(callId: call.callId, heldBySystem: false)
             }
@@ -277,11 +262,10 @@ import OSLog
         logger.info("📞 ✅ Call \(callId) successfully answered")
     }
 
-    // MARK: - Call Control Methods
     public func setOnHold(callId: String, onHold: Bool) {
         logger.info("📞 Setting hold state: callId=\(callId), onHold=\(onHold)")
 
-        guard let callInfo = activeCalls[callId] else {
+        guard let callInfo = self.activeCalls[callId] else {
             logger.warning("📞 ⚠️ Cannot set hold state for call \(callId) - not found")
             return
         }
@@ -291,23 +275,23 @@ import OSLog
         } else if !onHold && callInfo.state == .held {
             unholdCallInternal(callId: callId, resumedBySystem: false)
         } else {
-            logger.warning("📞 ⚠️ Invalid hold operation: call \(callId) is in state \(callInfo.state.rawValue)")
+            logger.warning("📞 ⚠️ Invalid hold operation: call \(callId) is in state \(callInfo.state.stringValue)")
         }
     }
 
     private func holdCallInternal(callId: String, heldBySystem: Bool) {
         logger.info("📞 Holding call internally: callId=\(callId), heldBySystem=\(heldBySystem)")
 
-        guard var callInfo = activeCalls[callId], callInfo.state == .active else {
+        guard var callInfo = self.activeCalls[callId], callInfo.state == .active else {
             logger.warning("📞 ⚠️ Cannot hold call \(callId) - not in active state")
             return
         }
 
         callInfo.updateState(.held)
         callInfo.wasHeldBySystem = heldBySystem
-        activeCalls[callId] = callInfo
+        self.activeCalls[callId] = callInfo
 
-        callKitManager?.setCallOnHold(callId: callId, onHold: true)
+        self.callKitManager?.setCallOnHold(callId: callId, onHold: true)
         emitEvent(.callHeld, data: ["callId": callId])
 
         logger.info("📞 ✅ Call \(callId) held successfully")
@@ -320,16 +304,16 @@ import OSLog
     private func unholdCallInternal(callId: String, resumedBySystem: Bool) {
         logger.info("📞 Unholding call internally: callId=\(callId), resumedBySystem=\(resumedBySystem)")
 
-        guard var callInfo = activeCalls[callId], callInfo.state == .held else {
+        guard var callInfo = self.activeCalls[callId], callInfo.state == .held else {
             logger.warning("📞 ⚠️ Cannot unhold call \(callId) - not in held state")
             return
         }
 
         callInfo.updateState(.active)
         callInfo.wasHeldBySystem = false
-        activeCalls[callId] = callInfo
+        self.activeCalls[callId] = callInfo
 
-        callKitManager?.setCallOnHold(callId: callId, onHold: false)
+        self.callKitManager?.setCallOnHold(callId: callId, onHold: false)
         emitEvent(.callUnheld, data: ["callId": callId])
 
         logger.info("📞 ✅ Call \(callId) unheld successfully")
@@ -338,73 +322,70 @@ import OSLog
     public func setMuted(callId: String, muted: Bool) {
         logger.info("📞 Setting mute state: callId=\(callId), muted=\(muted)")
 
-        guard activeCalls[callId] != nil else {
+        guard self.activeCalls[callId] != nil else {
             logger.warning("📞 ⚠️ Cannot set mute state for call \(callId) - not found")
             return
         }
 
-        audioManager?.setMuted(muted)
+        self.audioManager?.setMuted(muted)
         let eventType: CallEventType = muted ? .callMuted : .callUnmuted
         emitEvent(eventType, data: ["callId": callId])
         logger.info("📞 ✅ Call \(callId) mute state changed to: \(muted)")
     }
 
-    // MARK: - Call End Management
     public func endCall(callId: String) {
         logger.info("📞 Ending call: \(callId)")
         endCallInternal(callId: callId)
     }
 
     public func endAllCalls() {
-        logger.info("📞 Ending all calls. Current active calls: \(activeCalls.count)")
+        logger.info("📞 Ending all calls. Current active calls: \(self.activeCalls.count)")
 
-        let callIds = Array(activeCalls.keys)
+        let callIds = Array(self.activeCalls.keys)
         for callId in callIds {
             logger.info("📞 Ending call: \(callId)")
             endCallInternal(callId: callId)
         }
 
-        activeCalls.removeAll()
-        callMetadata.removeAll()
-        currentCallId = nil
+        self.activeCalls.removeAll()
+        self.callMetadata.removeAll()
+        self.currentCallId = nil
 
-        audioManager?.cleanup()
+        self.audioManager?.cleanup()
         logger.info("📞 ✅ All calls ended and cleanup completed")
     }
 
     private func endCallInternal(callId: String) {
         logger.info("📞 Ending call internally: \(callId)")
 
-        guard var callInfo = activeCalls[callId] else {
+        guard var callInfo = self.activeCalls[callId] else {
             logger.warning("📞 ⚠️ Call \(callId) not found in active calls")
             return
         }
 
-        let metadata = callMetadata.removeValue(forKey: callId)
+        let metadata = self.callMetadata.removeValue(forKey: callId)
         callInfo.updateState(.ended)
-        activeCalls.removeValue(forKey: callId)
+        self.activeCalls.removeValue(forKey: callId)
 
-        if currentCallId == callId {
-            currentCallId = activeCalls.values.first { $0.state != .ended }?.callId
-            logger.info("📞 Current call ID updated to: \(currentCallId ?? "nil")")
+        if self.currentCallId == callId {
+            self.currentCallId = self.activeCalls.values.first { $0.state != .ended }?.callId
+            logger.info("📞 Current call ID updated to: \(self.currentCallId ?? "nil")")
         }
 
-        callKitManager?.endCall(callId: callId)
+        self.callKitManager?.endCall(callId: callId)
 
-        if activeCalls.isEmpty {
+        if self.activeCalls.isEmpty {
             logger.info("📞 No more active calls, cleaning up audio")
-            audioManager?.cleanup()
+            self.audioManager?.cleanup()
         }
 
-        // Notify internal call end listeners (like CallActivity equivalent)
-        logger.info("📞 Notifying \(callEndListeners.count) internal call end listeners")
-        for listener in callEndListeners {
+        logger.info("📞 Notifying \(self.callEndListeners.count) internal call end listeners")
+        for listener in self.callEndListeners {
             DispatchQueue.main.async {
                 listener(callId)
             }
         }
 
-        // Emit end event with metadata
         var eventData: [String: Any] = ["callId": callId]
         if let metadata = metadata {
             eventData["metadata"] = metadata
@@ -412,50 +393,47 @@ import OSLog
         }
         emitEvent(.callEnded, data: eventData)
 
-        logger.info("📞 ✅ Call \(callId) ended successfully. Remaining calls: \(activeCalls.count)")
+        logger.info("📞 ✅ Call \(callId) ended successfully. Remaining calls: \(self.activeCalls.count)")
     }
 
-    // MARK: - Display Information Update
     public func updateDisplayCallInformation(callId: String, callerName: String) {
         logger.info("📲 Updating display info: callId=\(callId), callerName=\(callerName)")
 
-        guard var callInfo = activeCalls[callId] else {
+        guard var callInfo = self.activeCalls[callId] else {
             logger.warning("📲 ⚠️ Cannot update display info for call \(callId) - not found")
             return
         }
 
         callInfo.updateDisplayName(callerName)
-        activeCalls[callId] = callInfo
+        self.activeCalls[callId] = callInfo
 
-        callKitManager?.updateCall(callId: callId, displayName: callerName)
+        self.callKitManager?.updateCall(callId: callId, displayName: callerName)
         logger.info("📲 ✅ Display info updated successfully")
     }
 
-    // MARK: - Audio Management
     public func getAudioDevices() -> AudioRoutesInfo {
         logger.debug("🔊 Getting audio devices...")
-        let result = audioManager?.getAudioDevices() ?? AudioRoutesInfo(devices: [], currentRoute: "Unknown")
+        let result = self.audioManager?.getAudioDevices() ?? AudioRoutesInfo(devices: [], currentRoute: "Unknown")
         logger.debug("🔊 Audio devices result: \(result.devices), current: \(result.currentRoute)")
         return result
     }
 
     public func setAudioRoute(_ route: String) {
         logger.info("🔊 Setting audio route: \(route)")
-        audioManager?.setAudioRoute(route)
+        self.audioManager?.setAudioRoute(route)
     }
 
-    // MARK: - Event System
     public func setEventHandler(_ handler: ((CallEventType, String) -> Void)?) {
         logger.info("📡 Setting event handler. Handler present: \(handler != nil)")
-        eventHandler = handler
+        self.eventHandler = handler
 
-        if let handler = handler, !cachedEvents.isEmpty {
-            logger.info("📡 Emitting \(cachedEvents.count) cached events")
-            for (type, data) in cachedEvents {
+        if let handler = handler, !self.cachedEvents.isEmpty {
+            logger.info("📡 Emitting \(self.cachedEvents.count) cached events")
+            for (type, data) in self.cachedEvents {
                 logger.debug("📡 Emitting cached event: \(type)")
                 handler(type, data)
             }
-            cachedEvents.removeAll()
+            self.cachedEvents.removeAll()
             logger.info("📡 ✅ All cached events emitted and cleared")
         }
     }
@@ -468,43 +446,41 @@ import OSLog
             let jsonData = try JSONSerialization.data(withJSONObject: data, options: [])
             let dataString = String(data: jsonData, encoding: .utf8) ?? "{}"
 
-            if let eventHandler = eventHandler {
+            if let eventHandler = self.eventHandler {
                 logger.debug("📡 Calling event handler with data: \(dataString)")
                 eventHandler(type, dataString)
             } else {
                 logger.info("📡 No event handler, caching event: \(type)")
-                cachedEvents.append((type, dataString))
+                self.cachedEvents.append((type, dataString))
             }
         } catch {
             logger.error("📡 ❌ Failed to serialize event data: \(error.localizedDescription)")
         }
     }
 
-    // MARK: - Internal Call End Listeners (for UI cleanup)
     internal func registerCallEndListener(_ listener: @escaping (String) -> Void) {
-        callEndListeners.append(listener)
-        logger.info("🔗 Internal call end listener registered. Total: \(callEndListeners.count)")
+        self.callEndListeners.append(listener)
+        logger.info("🔗 Internal call end listener registered. Total: \(self.callEndListeners.count)")
     }
 
     internal func unregisterCallEndListener() {
-        callEndListeners.removeAll()
+        self.callEndListeners.removeAll()
         logger.info("🔗 All internal call end listeners unregistered")
     }
 
-    // MARK: - Utility Methods
     public func getActiveCalls() -> [CallInfo] {
-        let calls = Array(activeCalls.values)
+        let calls = Array(self.activeCalls.values)
         logger.debug("📊 Getting active calls. Count: \(calls.count)")
         return calls
     }
 
     public func getCurrentCallId() -> String? {
-        logger.debug("📊 Current call ID: \(currentCallId ?? "nil")")
-        return currentCallId
+        logger.debug("📊 Current call ID: \(self.currentCallId ?? "nil")")
+        return self.currentCallId
     }
 
     public func isCallActive() -> Bool {
-        let hasActiveCalls = activeCalls.values.contains { call in
+        let hasActiveCalls = self.activeCalls.values.contains { call in
             call.state == .active || call.state == .incoming || call.state == .dialing || call.state == .held
         }
         logger.debug("📊 Is call active: \(hasActiveCalls)")
@@ -512,7 +488,7 @@ import OSLog
     }
 
     private func validateOutgoingCallRequest() -> Bool {
-        let hasConflictingCalls = activeCalls.values.contains { call in
+        let hasConflictingCalls = self.activeCalls.values.contains { call in
             call.state == .incoming || call.state == .active
         }
         let isValid = !hasConflictingCalls
@@ -522,7 +498,7 @@ import OSLog
 
     private func rejectIncomingCallCollision(callId: String, reason: String) {
         logger.warning("📞 ⚠️ Rejecting call collision: \(callId), reason: \(reason)")
-        callMetadata.removeValue(forKey: callId)
+        self.callMetadata.removeValue(forKey: callId)
         emitEvent(.callRejected, data: [
             "callId": callId,
             "reason": reason
@@ -532,12 +508,12 @@ import OSLog
     private func emitCallAnsweredWithMetadata(callId: String) {
         logger.info("📡 Emitting call answered event with metadata: \(callId)")
 
-        guard let callInfo = activeCalls[callId] else {
+        guard let callInfo = self.activeCalls[callId] else {
             logger.warning("📡 ⚠️ Cannot emit call answered - call not found: \(callId)")
             return
         }
 
-        let metadata = callMetadata[callId]
+        let metadata = self.callMetadata[callId]
 
         var eventData: [String: Any] = [
             "callId": callId,
@@ -560,12 +536,12 @@ import OSLog
     private func emitOutgoingCallAnsweredWithMetadata(callId: String) {
         logger.info("📡 Emitting outgoing call answered event with metadata: \(callId)")
 
-        guard let callInfo = activeCalls[callId] else {
+        guard let callInfo = self.activeCalls[callId] else {
             logger.warning("📡 ⚠️ Cannot emit outgoing call answered - call not found: \(callId)")
             return
         }
 
-        let metadata = callMetadata[callId]
+        let metadata = self.callMetadata[callId]
 
         var eventData: [String: Any] = [
             "callId": callId,
@@ -586,7 +562,6 @@ import OSLog
     }
 }
 
-// MARK: - CallKitManagerDelegate
 extension CallEngine: CallKitManagerDelegate {
     func callKitManager(_ manager: CallKitManager, didAnswerCall callId: String) {
         logger.info("📲 CallKit delegate: answer call \(callId)")
@@ -613,7 +588,6 @@ extension CallEngine: CallKitManagerDelegate {
     }
 }
 
-// MARK: - AudioManagerDelegate
 extension CallEngine: AudioManagerDelegate {
     func audioManager(_ manager: AudioManager, didChangeRoute routeInfo: AudioRoutesInfo) {
         logger.info("🔊 Audio manager delegate: route changed to \(routeInfo.currentRoute)")

package/ios/CallInfo.swift

@@ -23,13 +23,13 @@ public struct CallInfo {
         self.wasHeldBySystem = false
         self.isManuallySilenced = false
 
-        Self.logger.info("📱 CallInfo created: callId=\(callId), type=\(callType), name=\(displayName), state=\(state.rawValue)")
+        Self.logger.info("📱 CallInfo created: callId=\(callId), type=\(callType), name=\(displayName), state=\(state.stringValue)")
     }
 
     mutating func updateState(_ newState: CallState) {
         let oldState = self.state
         self.state = newState
-        Self.logger.info("📱 CallInfo state changed: callId=\(callId), \(oldState.rawValue) → \(newState.rawValue)")
+        Self.logger.info("📱 CallInfo state changed: callId=\(callId), \(oldState.stringValue) → \(newState.stringValue)")
     }
 
     mutating func updateDisplayName(_ newName: String) {
@@ -43,7 +43,7 @@ public struct CallInfo {
             "callId": callId,
             "callType": callType,
             "displayName": displayName,
-            "state": state.rawValue,
+            "state": state.stringValue,
             "timestamp": timestamp,
             "wasHeldBySystem": wasHeldBySystem
         ]
@@ -63,4 +63,8 @@ public enum CallState: String, CaseIterable {
     case active = "ACTIVE"
     case held = "HELD"
     case ended = "ENDED"
+
+    var stringValue: String {
+        return self.rawValue
+    }
 }

package/ios/CallKitManager.swift

@@ -9,7 +9,7 @@ protocol CallKitManagerDelegate: AnyObject {
     func callKitManager(_ manager: CallKitManager, didSetMuted callId: String, muted: Bool)
 }
 
-class CallKitManager: NSObject {
+class CallKitManager {
     private let logger = Logger(subsystem: "com.qusaieilouti99.callmanager", category: "CallKitManager")
     private let provider: CXProvider
     private let callController = CXCallController()
@@ -30,7 +30,6 @@ class CallKitManager: NSObject {
         configuration.supportedHandleTypes = [.phoneNumber, .generic]
         configuration.includesCallsInRecents = true
 
-        // Audio configuration
         if let ringtonePath = Bundle.main.path(forResource: "ringtone", ofType: "caf") {
             configuration.ringtoneSoundURL = URL(fileURLWithPath: ringtonePath)
             logger.info("📲 Custom ringtone configured")
@@ -39,14 +38,10 @@ class CallKitManager: NSObject {
         }
 
         provider = CXProvider(configuration: configuration)
-
-        super.init()
-
-        provider.setDelegate(self, queue: nil)
+        provider.setDelegate(CallKitProviderDelegate(manager: self), queue: nil)
         logger.info("📲 ✅ CallKitManager initialized successfully")
     }
 
-    // MARK: - Public Methods
     func reportIncomingCall(callInfo: CallInfo, completion: @escaping (Error?) -> Void) {
         logger.info("📲 Reporting incoming call: \(callInfo.callId)")
 
@@ -68,15 +63,16 @@ class CallKitManager: NSObject {
 
         logger.info("📲 Call update configured: name=\(callInfo.displayName), hasVideo=\(update.hasVideo)")
 
-        activeCallIds.insert(callInfo.callId)
-        logger.info("📲 Added to active calls. Total active: \(activeCallIds.count)")
+        self.activeCallIds.insert(callInfo.callId)
+        logger.info("📲 Added to active calls. Total active: \(self.activeCallIds.count)")
 
         provider.reportNewIncomingCall(with: callUUID, update: update) { [weak self] error in
+            guard let self = self else { return }
             if let error = error {
-                self?.logger.error("📲 ❌ Failed to report incoming call: \(error.localizedDescription)")
-                self?.activeCallIds.remove(callInfo.callId)
+                self.logger.error("📲 ❌ Failed to report incoming call: \(error.localizedDescription)")
+                self.activeCallIds.remove(callInfo.callId)
             } else {
-                self?.logger.info("📲 ✅ Successfully reported incoming call: \(callInfo.callId)")
+                self.logger.info("📲 ✅ Successfully reported incoming call: \(callInfo.callId)")
             }
             completion(error)
         }
@@ -100,15 +96,16 @@ class CallKitManager: NSObject {
 
         let transaction = CXTransaction(action: startCallAction)
 
-        activeCallIds.insert(callInfo.callId)
-        logger.info("📲 Added to active calls. Total active: \(activeCallIds.count)")
+        self.activeCallIds.insert(callInfo.callId)
+        logger.info("📲 Added to active calls. Total active: \(self.activeCallIds.count)")
 
         callController.request(transaction) { [weak self] error in
+            guard let self = self else { return }
             if let error = error {
-                self?.logger.error("📲 ❌ Failed to start outgoing call: \(error.localizedDescription)")
-                self?.activeCallIds.remove(callInfo.callId)
+                self.logger.error("📲 ❌ Failed to start outgoing call: \(error.localizedDescription)")
+                self.activeCallIds.remove(callInfo.callId)
             } else {
-                self?.logger.info("📲 ✅ Successfully started outgoing call: \(callInfo.callId)")
+                self.logger.info("📲 ✅ Successfully started outgoing call: \(callInfo.callId)")
             }
             completion(error)
         }
@@ -118,7 +115,7 @@ class CallKitManager: NSObject {
         logger.info("📲 Ending call: \(callId)")
 
         guard let callUUID = UUID(uuidString: callId),
-              activeCallIds.contains(callId) else {
+              self.activeCallIds.contains(callId) else {
             logger.warning("📲 ⚠️ Cannot end call \(callId) - not found or invalid UUID")
             return
         }
@@ -127,11 +124,12 @@ class CallKitManager: NSObject {
         let transaction = CXTransaction(action: endCallAction)
 
         callController.request(transaction) { [weak self] error in
+            guard let self = self else { return }
             if let error = error {
-                self?.logger.error("📲 ❌ Failed to end call: \(error.localizedDescription)")
+                self.logger.error("📲 ❌ Failed to end call: \(error.localizedDescription)")
             } else {
-                self?.logger.info("📲 ✅ Successfully ended call: \(callId)")
-                self?.activeCallIds.remove(callId)
+                self.logger.info("📲 ✅ Successfully ended call: \(callId)")
+                self.activeCallIds.remove(callId)
             }
         }
     }
@@ -140,7 +138,7 @@ class CallKitManager: NSObject {
         logger.info("📲 Setting call \(callId) hold state to: \(onHold)")
 
         guard let callUUID = UUID(uuidString: callId),
-              activeCallIds.contains(callId) else {
+              self.activeCallIds.contains(callId) else {
             logger.warning("📲 ⚠️ Cannot set hold for call \(callId) - not found or invalid UUID")
             return
         }
@@ -149,10 +147,11 @@ class CallKitManager: NSObject {
         let transaction = CXTransaction(action: holdAction)
 
         callController.request(transaction) { [weak self] error in
+            guard let self = self else { return }
             if let error = error {
-                self?.logger.error("📲 ❌ Failed to set call on hold: \(error.localizedDescription)")
+                self.logger.error("📲 ❌ Failed to set call on hold: \(error.localizedDescription)")
             } else {
-                self?.logger.info("📲 ✅ Successfully set call \(callId) hold state to: \(onHold)")
+                self.logger.info("📲 ✅ Successfully set call \(callId) hold state to: \(onHold)")
             }
         }
     }
@@ -161,7 +160,7 @@ class CallKitManager: NSObject {
         logger.info("📲 Updating call \(callId) display name to: \(displayName)")
 
         guard let callUUID = UUID(uuidString: callId),
-              activeCallIds.contains(callId) else {
+              self.activeCallIds.contains(callId) else {
             logger.warning("📲 ⚠️ Cannot update call \(callId) - not found or invalid UUID")
             return
         }
@@ -173,66 +172,97 @@ class CallKitManager: NSObject {
         provider.reportCall(with: callUUID, updated: update)
         logger.info("📲 ✅ Updated call \(callId) display name to: \(displayName)")
     }
+
+    fileprivate func handleProviderReset() {
+        logger.info("📲 🔄 Provider did reset - clearing all active calls")
+        self.activeCallIds.removeAll()
+    }
+
+    fileprivate func handleAnswerCall(callId: String) {
+        logger.info("📲 📞 Provider perform answer call action")
+        logger.info("📲 Answering call: \(callId)")
+        self.delegate?.callKitManager(self, didAnswerCall: callId)
+    }
+
+    fileprivate func handleEndCall(callId: String) {
+        logger.info("📲 📞 Provider perform end call action")
+        logger.info("📲 Ending call: \(callId)")
+        self.activeCallIds.remove(callId)
+        self.delegate?.callKitManager(self, didEndCall: callId)
+    }
+
+    fileprivate func handleSetHeld(callId: String, onHold: Bool) {
+        logger.info("📲 📞 Provider perform set held call action: \(onHold)")
+        logger.info("📲 Setting call \(callId) hold state to: \(onHold)")
+        self.delegate?.callKitManager(self, didSetHeld: callId, onHold: onHold)
+    }
+
+    fileprivate func handleSetMuted(callId: String, muted: Bool) {
+        logger.info("📲 📞 Provider perform set muted call action: \(muted)")
+        logger.info("📲 Setting call \(callId) mute state to: \(muted)")
+        self.delegate?.callKitManager(self, didSetMuted: callId, muted: muted)
+    }
+
+    fileprivate func handleStartCall() {
+        logger.info("📲 📞 Provider perform start call action")
+        logger.info("📲 ✅ Start call action fulfilled")
+    }
+
+    fileprivate func handleAudioSessionActivated() {
+        logger.info("📲 🔊 Provider did activate audio session")
+    }
+
+    fileprivate func handleAudioSessionDeactivated() {
+        logger.info("📲 🔊 Provider did deactivate audio session")
+    }
 }
 
-// MARK: - CXProviderDelegate
-extension CallKitManager: CXProviderDelegate {
+private class CallKitProviderDelegate: NSObject, CXProviderDelegate {
+    private weak var manager: CallKitManager?
+
+    init(manager: CallKitManager) {
+        self.manager = manager
+        super.init()
+    }
+
     func providerDidReset(_ provider: CXProvider) {
-        logger.info("📲 🔄 Provider did reset - clearing all active calls")
-        activeCallIds.removeAll()
+        manager?.handleProviderReset()
     }
 
     func provider(_ provider: CXProvider, perform action: CXAnswerCallAction) {
-        logger.info("📲 📞 Provider perform answer call action")
         let callId = action.callUUID.uuidString
-        logger.info("📲 Answering call: \(callId)")
-        delegate?.callKitManager(self, didAnswerCall: callId)
+        manager?.handleAnswerCall(callId: callId)
         action.fulfill()
-        logger.info("📲 ✅ Answer action fulfilled")
     }
 
     func provider(_ provider: CXProvider, perform action: CXEndCallAction) {
-        logger.info("📲 📞 Provider perform end call action")
         let callId = action.callUUID.uuidString
-        logger.info("📲 Ending call: \(callId)")
-        activeCallIds.remove(callId)
-        delegate?.callKitManager(self, didEndCall: callId)
+        manager?.handleEndCall(callId: callId)
         action.fulfill()
-        logger.info("📲 ✅ End call action fulfilled")
     }
 
     func provider(_ provider: CXProvider, perform action: CXSetHeldCallAction) {
-        logger.info("📲 📞 Provider perform set held call action: \(action.isOnHold)")
         let callId = action.callUUID.uuidString
-        logger.info("📲 Setting call \(callId) hold state to: \(action.isOnHold)")
-        delegate?.callKitManager(self, didSetHeld: callId, onHold: action.isOnHold)
+        manager?.handleSetHeld(callId: callId, onHold: action.isOnHold)
         action.fulfill()
-        logger.info("📲 ✅ Set held action fulfilled")
     }
 
     func provider(_ provider: CXProvider, perform action: CXSetMutedCallAction) {
-        logger.info("📲 📞 Provider perform set muted call action: \(action.isMuted)")
         let callId = action.callUUID.uuidString
-        logger.info("📲 Setting call \(callId) mute state to: \(action.isMuted)")
-        delegate?.callKitManager(self, didSetMuted: callId, muted: action.isMuted)
+        manager?.handleSetMuted(callId: callId, muted: action.isMuted)
         action.fulfill()
-        logger.info("📲 ✅ Set muted action fulfilled")
     }
 
     func provider(_ provider: CXProvider, perform action: CXStartCallAction) {
-        logger.info("📲 📞 Provider perform start call action")
-        logger.info("📲 Starting outgoing call with handle: \(action.handle.value)")
+        manager?.handleStartCall()
         action.fulfill()
-        logger.info("📲 ✅ Start call action fulfilled")
     }
 
     func provider(_ provider: CXProvider, didActivate audioSession: AVAudioSession) {
-        logger.info("📲 🔊 Provider did activate audio session")
-        logger.info("📲 Audio session category: \(audioSession.category.rawValue)")
-        logger.info("📲 Audio session mode: \(audioSession.mode.rawValue)")
+        manager?.handleAudioSessionActivated()
     }
 
     func provider(_ provider: CXProvider, didDeactivate audioSession: AVAudioSession) {
-        logger.info("📲 🔊 Provider did deactivate audio session")
+        manager?.handleAudioSessionDeactivated()
     }
 }

package/ios/CallManager.swift

@@ -17,7 +17,6 @@ public class CallManager: HybridCallManagerSpec {
         CallEngine.shared.initialize()
     }
 
-    // MARK: - HybridCallManagerSpec Implementation
     public func endCall(callId: String) throws {
         logger.info("🎯📞 endCall requested for callId: \(callId)")
         ensureInitialized()
@@ -35,7 +34,6 @@ public class CallManager: HybridCallManagerSpec {
     public func silenceRingtone() throws {
         logger.info("🎯🔇 silenceRingtone requested")
         ensureInitialized()
-        // Ringtone silencing is handled by CallKit automatically in iOS
         logger.info("🎯🔇 ✅ silenceRingtone completed (handled by CallKit)")
     }
 
@@ -57,7 +55,6 @@ public class CallManager: HybridCallManagerSpec {
     public func keepScreenAwake(keepAwake: Bool) throws {
         logger.info("🎯💡 keepScreenAwake requested: \(keepAwake)")
         ensureInitialized()
-        // Screen wake management is handled by CallKit automatically
         logger.info("🎯💡 ✅ keepScreenAwake completed (handled by CallKit)")
     }
 
@@ -65,17 +62,17 @@ public class CallManager: HybridCallManagerSpec {
         logger.info("🎯📡 addListener called")
         ensureInitialized()
 
-        CallEngine.shared.setEventHandler { eventType, payload in
-            self.logger.debug("🎯📡 Event emitted: \(eventType), payload length: \(payload.count)")
+        CallEngine.shared.setEventHandler { [weak self] eventType, payload in
+            self?.logger.debug("🎯📡 Event emitted: \(eventType), payload length: \(payload.count)")
             listener(eventType, payload)
         }
 
         logger.info("🎯📡 ✅ Event handler registered")
 
-        return {
-            self.logger.info("🎯📡 Removing event handler...")
+        return { [weak self] in
+            self?.logger.info("🎯📡 Removing event handler...")
             CallEngine.shared.setEventHandler(nil)
-            self.logger.info("🎯📡 ✅ Event handler removed")
+            self?.logger.info("🎯📡 ✅ Event handler removed")
         }
     }
 
@@ -131,17 +128,17 @@ public class CallManager: HybridCallManagerSpec {
         logger.info("🎯🔑 registerVoIPTokenListener called")
         ensureInitialized()
 
-        VoIPTokenManager.shared.registerTokenListener { token in
-            self.logger.info("🎯🔑 VoIP token received, length: \(token.count)")
+        VoIPTokenManager.shared.registerTokenListener { [weak self] token in
+            self?.logger.info("🎯🔑 VoIP token received, length: \(token.count)")
             listener(token)
         }
 
         logger.info("🎯🔑 ✅ VoIP token listener registered")
 
-        return {
-            self.logger.info("🎯🔑 Removing VoIP token listener...")
+        return { [weak self] in
+            self?.logger.info("🎯🔑 Removing VoIP token listener...")
             VoIPTokenManager.shared.unregisterTokenListener()
-            self.logger.info("🎯🔑 ✅ VoIP token listener removed")
+            self?.logger.info("🎯🔑 ✅ VoIP token listener removed")
         }
     }
 }

package/ios/VoIPTokenManager.swift

@@ -2,7 +2,7 @@ import Foundation
 import PushKit
 import OSLog
 
-class VoIPTokenManager: NSObject {
+class VoIPTokenManager {
     static let shared = VoIPTokenManager()
 
     private let logger = Logger(subsystem: "com.qusaieilouti99.callmanager", category: "VoIPTokenManager")
@@ -10,8 +10,7 @@ class VoIPTokenManager: NSObject {
     private var tokenListener: ((String) -> Void)?
     private var cachedToken: String?
 
-    private override init() {
-        super.init()
+    private init() {
         logger.info("🔑 VoIPTokenManager initializing...")
         setupPushKit()
     }
@@ -19,17 +18,16 @@ class VoIPTokenManager: NSObject {
     private func setupPushKit() {
         logger.info("🔑 Setting up PushKit registry...")
         pushRegistry = PKPushRegistry(queue: DispatchQueue.main)
-        pushRegistry?.delegate = self
+        pushRegistry?.delegate = VoIPPushDelegate(manager: self)
         pushRegistry?.desiredPushTypes = [.voIP]
         logger.info("🔑 PushKit registry setup completed successfully")
     }
 
     func registerTokenListener(_ listener: @escaping (String) -> Void) {
         logger.info("🔑 Registering VoIP token listener...")
-        tokenListener = listener
+        self.tokenListener = listener
 
-        // If we have a cached token, immediately return it
-        if let cachedToken = cachedToken {
+        if let cachedToken = self.cachedToken {
             logger.info("🔑 Returning cached VoIP token: \(cachedToken.prefix(10))...")
             listener(cachedToken)
         } else {
@@ -39,7 +37,54 @@ class VoIPTokenManager: NSObject {
 
     func unregisterTokenListener() {
         logger.info("🔑 Unregistering VoIP token listener")
-        tokenListener = nil
+        self.tokenListener = nil
+    }
+
+    fileprivate func handleTokenUpdate(deviceToken: String) {
+        logger.info("🔑 ✅ VoIP Device Token received: \(deviceToken.prefix(10))...\(deviceToken.suffix(10))")
+
+        self.cachedToken = deviceToken
+        logger.info("🔑 Token cached successfully")
+
+        if let tokenListener = self.tokenListener {
+            logger.info("🔑 Calling token listener with new token")
+            tokenListener(deviceToken)
+        } else {
+            logger.info("🔑 No token listener registered, token will be returned when listener is added")
+        }
+    }
+
+    fileprivate func handleIncomingPush(payload: [String: Any]) {
+        logger.info("🔔 Received VoIP push notification")
+        logger.debug("🔔 Full payload: \(payload)")
+
+        if let notificationType = payload["type"] as? String {
+            logger.info("🔔 Notification type: \(notificationType)")
+            switch notificationType {
+            case "Call":
+                logger.info("🔔 Processing incoming call notification...")
+                handleIncomingCall(payload: payload)
+            case "EndCall":
+                logger.info("🔔 Processing end call notification...")
+                handleEndCall(payload: payload)
+            default:
+                logger.warning("🔔 ⚠️ Unknown VoIP notification type: \(notificationType)")
+            }
+        } else {
+            logger.info("🔔 No type specified, assuming incoming call...")
+            handleIncomingCall(payload: payload)
+        }
+
+        logger.info("🔔 ✅ VoIP push notification processing completed")
+    }
+
+    fileprivate func handleTokenInvalidation() {
+        logger.warning("🔑 ⚠️ VoIP push token invalidated")
+        self.cachedToken = nil
+        if let tokenListener = self.tokenListener {
+            logger.info("🔑 Notifying listener about token invalidation")
+            tokenListener("")
+        }
     }
 
     private func handleIncomingCall(payload: [String: Any]) {
@@ -98,61 +143,25 @@ class VoIPTokenManager: NSObject {
     }
 }
 
-// MARK: - PKPushRegistryDelegate
-extension VoIPTokenManager: PKPushRegistryDelegate {
-    func pushRegistry(_ registry: PKPushRegistry, didUpdate pushCredentials: PKPushCredentials, for type: PKPushType) {
-        logger.info("🔑 VoIP push credentials updated for type: \(type)")
+private class VoIPPushDelegate: NSObject, PKPushRegistryDelegate {
+    private weak var manager: VoIPTokenManager?
 
-        let deviceToken = pushCredentials.token.map { String(format: "%02.2hhx", $0) }.joined()
-        logger.info("🔑 ✅ VoIP Device Token received: \(deviceToken.prefix(10))...\(deviceToken.suffix(10))")
-
-        // Cache the token
-        cachedToken = deviceToken
-        logger.info("🔑 Token cached successfully")
+    init(manager: VoIPTokenManager) {
+        self.manager = manager
+        super.init()
+    }
 
-        // Notify the listener about the new token
-        if let tokenListener = tokenListener {
-            logger.info("🔑 Calling token listener with new token")
-            tokenListener(deviceToken)
-        } else {
-            logger.info("🔑 No token listener registered, token will be returned when listener is added")
-        }
+    func pushRegistry(_ registry: PKPushRegistry, didUpdate pushCredentials: PKPushCredentials, for type: PKPushType) {
+        let deviceToken = pushCredentials.token.map { String(format: "%02.2hhx", $0) }.joined()
+        manager?.handleTokenUpdate(deviceToken: deviceToken)
     }
 
     func pushRegistry(_ registry: PKPushRegistry, didReceiveIncomingPushWith payload: PKPushPayload, for type: PKPushType, completion: @escaping () -> Void) {
-        logger.info("🔔 Received VoIP push notification")
-        logger.debug("🔔 Full payload: \(payload.dictionaryPayload)")
-
-        let payloadDict = payload.dictionaryPayload
-
-        // Handle different notification types
-        if let notificationType = payloadDict["type"] as? String {
-            logger.info("🔔 Notification type: \(notificationType)")
-            switch notificationType {
-            case "Call":
-                logger.info("🔔 Processing incoming call notification...")
-                handleIncomingCall(payload: payloadDict)
-            case "EndCall":
-                logger.info("🔔 Processing end call notification...")
-                handleEndCall(payload: payloadDict)
-            default:
-                logger.warning("🔔 ⚠️ Unknown VoIP notification type: \(notificationType)")
-            }
-        } else {
-            logger.info("🔔 No type specified, assuming incoming call...")
-            handleIncomingCall(payload: payloadDict)
-        }
-
-        logger.info("🔔 ✅ VoIP push notification processing completed")
+        manager?.handleIncomingPush(payload: payload.dictionaryPayload)
         completion()
     }
 
     func pushRegistry(_ registry: PKPushRegistry, didInvalidatePushTokenFor type: PKPushType) {
-        logger.warning("🔑 ⚠️ VoIP push token invalidated for type: \(type)")
-        cachedToken = nil
-        if let tokenListener = tokenListener {
-            logger.info("🔑 Notifying listener about token invalidation")
-            tokenListener("")
-        }
+        manager?.handleTokenInvalidation()
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qusaieilouti99/call-manager",
-  "version": "0.1.79",
+  "version": "0.1.80",
   "description": "Call manager",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",