@vgroup/dialbox 0.0.53 → 0.0.54

package/fesm2020/vgroup-dialbox.mjs

@@ -1317,25 +1317,54 @@ class TwilioService {
         this.triggerSMSReload = new BehaviorSubject(false);
         this.initializeTwilioDevice();
     }
+    setupDeviceListeners() {
+        if (!this.device)
+            return;
+        // Remove any existing listeners first
+        this.device.off('incoming');
+        this.device.off('error');
+        this.device.off('registered');
+        this.device.off('unregistered');
+        // Set up new listeners
+        this.device.on('registered', () => {
+            console.log('Twilio Device registered');
+        });
+        this.device.on('incoming', (call) => {
+            console.log('Incoming call received');
+            this.currentCall.next(call);
+            this.callType.next('INCOMING');
+            this.currentCallState.next('incoming');
+        });
+        this.device.on('error', (error) => {
+            console.error('Twilio Device Error:', error);
+        });
+    }
     initializeTwilioDevice() {
+        if (this.device) {
+            // If device already exists, just re-register
+            this.device.register();
+            return;
+        }
         if (this.token) {
-            this.extensionService.getIncomingCallToken().subscribe((data) => {
-                this.incomingCallToken = data.token;
-                localStorage.setItem('in-token', data.token);
-                this.device = new Device(this.incomingCallToken, {
-                    allowIncomingWhileBusy: true,
-                    // Add any other necessary options
-                });
-                this.device.register();
-                this.device.on('incoming', (call) => {
-                    this.currentCall.next(call);
-                    this.callType.next('INCOMING');
-                    this.currentCallState.next('incoming');
-                });
-                this.device.on('error', (error) => {
-                    console.error('Twilio Device Error:', error);
-                    // Add error handling and reconnection logic
-                });
+            this.extensionService.getIncomingCallToken().subscribe({
+                next: (data) => {
+                    this.incomingCallToken = data.token;
+                    localStorage.setItem('in-token', data.token);
+                    // Destroy existing device if any
+                    if (this.device) {
+                        this.device.destroy();
+                    }
+                    this.device = new Device(this.incomingCallToken, {
+                        allowIncomingWhileBusy: true,
+                        closeProtection: true
+                    });
+                    this.setupDeviceListeners();
+                    this.device.register();
+                },
+                error: (error) => {
+                    console.error('Error getting Twilio token:', error);
+                    // Add retry logic here if needed
+                }
             });
         }
     }
@@ -2336,7 +2365,16 @@ class DialboxComponent {
         if (this.isTwilioInitialized || !this.token)
             return;
         this.isTwilioInitialized = true;
+        // Clear any existing device first
+        if (this.twilioService.device) {
+            this.twilioService.device.destroy();
+            this.twilioService.device = null;
+        }
+        // Initialize new device
         this.twilioService.initializeTwilioDevice();
+        // Reset the current call state
+        this.twilioService.currentCall.next(null);
+        this.twilioService.currentCallState.next('none');
     }
     handleIncomingCall(call) {
         try {
@@ -3084,19 +3122,22 @@ class DialboxComponent {
     }
     ngOnDestroy() {
         try {
-            console.log('Cleaning up C2cDialpadComponent');
-            // Unsubscribe from all subscriptions
-            if (this.subscriptions) {
-                this.subscriptions.unsubscribe();
-            }
-            // End any active call
-            if (this.isCallInProgress) {
-                this.endCall();
-            }
             // Clear any timeouts or intervals if they exist
             if (this.toastTimeout) {
                 clearTimeout(this.toastTimeout);
             }
+            // Unsubscribe from all subscriptions
+            this.subscriptions.unsubscribe();
+            // Clean up Twilio device if it exists
+            if (this.twilioService.device) {
+                try {
+                    this.twilioService.device.destroy();
+                    this.twilioService.device = null;
+                }
+                catch (error) {
+                    console.error('Error cleaning up Twilio device:', error);
+                }
+            }
             console.log('C2cDialpadComponent cleanup complete');
         }
         catch (error) {