@vgroup/dialbox 0.0.52 → 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
+                }
             });
         }
     }
@@ -1545,7 +1574,6 @@ class IncomingCallComponent {
                 if (call) {
                     this.twilioCallData = call;
                     this.twilioAuthId = call.customParameters.get('twilioAuthId');
-                    this.newIncomingCallsList.push(call);
                     if (!call.parameters) {
                         call.parameters = {};
                     }
@@ -2137,7 +2165,7 @@ class DialboxComponent {
         this.ipService = ipService;
         this.extensionService = extensionService;
         this.router = router;
-        this.isDialpadHidden = false;
+        this.isDialpadHidden = true;
         this.closeDialpadEvent = new EventEmitter();
         this.callInitiated = new EventEmitter();
         this.endCallEvent = new EventEmitter();
@@ -2183,14 +2211,22 @@ class DialboxComponent {
         this.subscriptions = new Subscription();
         this.shakeDedicatedBtn = false;
         this.isSmartDialCall = false;
+        this.isTwilioInitialized = false;
         this.isMinimised = false;
+        // Subscribe to incoming calls
+        this.subscriptions.add(this.twilioService.currentCall.subscribe(call => {
+            if (call) {
+                this.handleIncomingCall(call);
+            }
+        }));
     }
     ngOnInit() {
         try {
             this.token = localStorage.getItem('ext_token') || '';
-            //this.isCallInProgress = true; 
+            this.initializeTwilio();
             this.getContactList();
             this.getUserCallSetting();
+            // Subscribe to dial number events
             const sub1 = this.twilioService.dialNumberFromOtherModule.subscribe((contact) => {
                 if (contact.number) {
                     this.isSmartDialCall = false;
@@ -2309,12 +2345,56 @@ class DialboxComponent {
         this.registerDragElement();
     }
     ngOnChanges(changes) {
-        if (changes['isDialpadHidden'] && !this.isDialpadHidden) {
-            this.getContactList();
-            this.getUserCallSetting();
-            setTimeout(() => {
-                this.dialInputElement.nativeElement.focus();
-            }, 0);
+        if (changes['isDialpadHidden']) {
+            if (!changes['isDialpadHidden'].firstChange && !this.isDialpadHidden) {
+                // Re-initialize Twilio when dialpad becomes visible
+                this.initializeTwilio();
+            }
+            if (!this.isDialpadHidden) {
+                this.getContactList();
+                this.getUserCallSetting();
+                setTimeout(() => {
+                    if (this.dialInputElement?.nativeElement) {
+                        this.dialInputElement.nativeElement.focus();
+                    }
+                }, 0);
+            }
+        }
+    }
+    initializeTwilio() {
+        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 {
+            if (!call)
+                return;
+            this.incomingCallInitiated.emit();
+            this.newIncomingCallData = call;
+            // Add to incoming calls list if not already present
+            const existingCall = this.incomingCallsList.find((c) => c.parameters.CallSid === call.parameters.CallSid);
+            if (!existingCall) {
+                this.incomingCallsList.unshift(call);
+                this.incomingCallsNewInfoEvent.emit(this.incomingCallsList);
+            }
+            // Show the dialpad if it's hidden
+            if (this.isDialpadHidden) {
+                this.isDialpadHidden = false;
+            }
+        }
+        catch (error) {
+            console.error('Error handling incoming call:', error);
         }
     }
     registerDragElement() {
@@ -3042,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) {