@vgroup/dialbox 0.0.54 → 0.0.56

package/fesm2020/vgroup-dialbox.mjs

@@ -1315,19 +1315,55 @@ class TwilioService {
         this.isAvailableNumber = new BehaviorSubject(false);
         this.callerIdList = new BehaviorSubject([]);
         this.triggerSMSReload = new BehaviorSubject(false);
-        this.initializeTwilioDevice();
+        this.isInitialized = false;
+        this.initializationInProgress = false;
+        // Initialize when token is available
+        if (this.token) {
+            this.initializeTwilioDevice();
+        }
+        else {
+            // If token is not available, try to get it from localStorage
+            const token = localStorage.getItem('ext_token');
+            if (token) {
+                this.token = token;
+                this.initializeTwilioDevice();
+            }
+        }
     }
-    setupDeviceListeners() {
-        if (!this.device)
+    initializeTwilioDevice() {
+        if (this.initializationInProgress || !this.token)
             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.initializationInProgress = true;
+        this.extensionService.getIncomingCallToken().subscribe({
+            next: (data) => {
+                if (data?.token) {
+                    this.setupDevice(data.token);
+                    this.isInitialized = true;
+                }
+            },
+            error: (error) => {
+                console.error('Error initializing Twilio:', error);
+                this.initializationInProgress = false;
+                // Retry after delay
+                setTimeout(() => this.initializeTwilioDevice(), 5000);
+            }
+        });
+    }
+    setupDevice(token) {
+        // Clean up existing device if any
+        if (this.device) {
+            this.device.destroy();
+        }
+        this.incomingCallToken = token;
+        localStorage.setItem('in-token', token);
+        this.device = new Device(token, {
+            allowIncomingWhileBusy: true,
+            closeProtection: true
+        });
+        // Set up event listeners
         this.device.on('registered', () => {
-            console.log('Twilio Device registered');
+            console.log('Twilio Device registered successfully');
+            this.initializationInProgress = false;
         });
         this.device.on('incoming', (call) => {
             console.log('Incoming call received');
@@ -1337,40 +1373,19 @@ class TwilioService {
         });
         this.device.on('error', (error) => {
             console.error('Twilio Device Error:', error);
+            this.isInitialized = false;
+            this.initializationInProgress = false;
+            // Attempt to reinitialize after error
+            setTimeout(() => this.initializeTwilioDevice(), 5000);
         });
+        this.device.on('unregistered', () => {
+            console.log('Twilio Device unregistered');
+            this.isInitialized = false;
+            // Attempt to re-register
+            this.initializeTwilioDevice();
+        });
+        this.device.register();
     }
-    initializeTwilioDevice() {
-        if (this.device) {
-            // If device already exists, just re-register
-            this.device.register();
-            return;
-        }
-        if (this.token) {
-            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
-                }
-            });
-        }
-    }
-    // onIncomingCall(){
-    //   this.device.on('incoming', (call:any) => {
-    //     console.log(call);
     //     //call.accept();
     //   });
     // }
@@ -2158,6 +2173,16 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.10", ngImpo
             }] } });
 
 class DialboxComponent {
+    set isDialpadHidden(value) {
+        this._isDialpadHidden = value;
+        if (!value) {
+            // When dialpad becomes visible, ensure Twilio is initialized
+            this.initializeTwilio();
+        }
+    }
+    get isDialpadHidden() {
+        return this._isDialpadHidden;
+    }
     constructor(twilioService, extService, dialog, ipService, extensionService, router) {
         this.twilioService = twilioService;
         this.extService = extService;
@@ -2165,7 +2190,7 @@ class DialboxComponent {
         this.ipService = ipService;
         this.extensionService = extensionService;
         this.router = router;
-        this.isDialpadHidden = true;
+        this._isDialpadHidden = true;
         this.closeDialpadEvent = new EventEmitter();
         this.callInitiated = new EventEmitter();
         this.endCallEvent = new EventEmitter();
@@ -2211,19 +2236,35 @@ class DialboxComponent {
         this.subscriptions = new Subscription();
         this.shakeDedicatedBtn = false;
         this.isSmartDialCall = false;
-        this.isTwilioInitialized = false;
+        this.isInitialized = false;
         this.isMinimised = false;
-        // Subscribe to incoming calls
-        this.subscriptions.add(this.twilioService.currentCall.subscribe(call => {
+        // Initialize if dialpad is visible by default
+        if (!this.isDialpadHidden) {
+            this.initializeTwilio();
+        }
+    }
+    initializeTwilio() {
+        if (this.isInitialized)
+            return;
+        this.token = localStorage.getItem('ext_token') || '';
+        if (!this.token) {
+            console.error('No authentication token found');
+            return;
+        }
+        this.isInitialized = true;
+        // Initialize Twilio service
+        this.twilioService.initializeTwilioDevice();
+        // Subscribe to incoming calls to show dialpad when call comes in
+        const callSub = this.twilioService.currentCall.subscribe(call => {
             if (call) {
-                this.handleIncomingCall(call);
+                this.isCallInProgress = true;
+                this._isDialpadHidden = false; // Show dialpad on incoming call
             }
-        }));
+        });
+        this.subscriptions.add(callSub);
     }
     ngOnInit() {
         try {
-            this.token = localStorage.getItem('ext_token') || '';
-            this.initializeTwilio();
             this.getContactList();
             this.getUserCallSetting();
             // Subscribe to dial number events
@@ -2345,56 +2386,12 @@ class DialboxComponent {
         this.registerDragElement();
     }
     ngOnChanges(changes) {
-        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);
+        if (changes['isDialpadHidden'] && !this.isDialpadHidden) {
+            this.getContactList();
+            this.getUserCallSetting();
+            setTimeout(() => {
+                this.dialInputElement.nativeElement.focus();
+            }, 0);
         }
     }
     registerDragElement() {
@@ -3122,22 +3119,23 @@ class DialboxComponent {
     }
     ngOnDestroy() {
         try {
+            console.log('Cleaning up C2cDialpadComponent');
+            // Unsubscribe from all subscriptions
+            if (this.subscriptions) {
+                this.subscriptions.unsubscribe();
+            }
+            // Clean up Twilio device when component is destroyed
+            if (this.twilioService['device']) {
+                this.twilioService['device'].destroy();
+            }
+            // 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) {