@vgroup/dialbox 0.0.56 → 0.0.57

package/fesm2020/vgroup-dialbox.mjs

@@ -1317,28 +1317,30 @@ class TwilioService {
         this.triggerSMSReload = new BehaviorSubject(false);
         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();
-            }
-        }
+        this.initializeTwilioDevice();
     }
     initializeTwilioDevice() {
-        if (this.initializationInProgress || !this.token)
+        if (this.initializationInProgress || this.isInitialized)
             return;
         this.initializationInProgress = true;
         this.extensionService.getIncomingCallToken().subscribe({
             next: (data) => {
                 if (data?.token) {
-                    this.setupDevice(data.token);
+                    this.incomingCallToken = data.token;
+                    localStorage.setItem('in-token', data.token);
+                    // Clean up existing device if any
+                    if (this.device) {
+                        this.device.destroy();
+                    }
+                    // Initialize new device
+                    this.device = new Device(data.token, {
+                        allowIncomingWhileBusy: true,
+                        closeProtection: true
+                    });
+                    this.setupDeviceEventListeners();
+                    this.device.register();
                     this.isInitialized = true;
+                    this.initializationInProgress = false;
                 }
             },
             error: (error) => {
@@ -1349,21 +1351,13 @@ class TwilioService {
             }
         });
     }
-    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
+    setupDeviceEventListeners() {
+        if (!this.device)
+            return;
+        // Clean up existing listeners
+        this.device.removeAllListeners();
         this.device.on('registered', () => {
             console.log('Twilio Device registered successfully');
-            this.initializationInProgress = false;
         });
         this.device.on('incoming', (call) => {
             console.log('Incoming call received');
@@ -1374,7 +1368,6 @@ 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);
         });
@@ -1384,11 +1377,15 @@ class TwilioService {
             // Attempt to re-register
             this.initializeTwilioDevice();
         });
-        this.device.register();
     }
-    //     //call.accept();
-    //   });
-    // }
+    onIncomingCall() {
+        if (this.device) {
+            this.device.on('incoming', (call) => {
+                console.log('Incoming call:', call);
+                // call.accept();
+            });
+        }
+    }
     saveContact(payload) {
         const httpOptions = { headers: new HttpHeaders({ 'Content-Type': 'application/json', 'Auth-Key': "Bearer " + localStorage.getItem('ext_token') }) };
         return this.http.post(environment.apiUrl + '/utilities/phonebook/add/contacts/manually', payload, httpOptions);
@@ -2173,16 +2170,6 @@ 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;
@@ -2190,7 +2177,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();
@@ -2236,38 +2223,70 @@ class DialboxComponent {
         this.subscriptions = new Subscription();
         this.shakeDedicatedBtn = false;
         this.isSmartDialCall = false;
-        this.isInitialized = false;
         this.isMinimised = false;
-        // 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');
+        if (!this.twilioService || !this.token) {
             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.isCallInProgress = true;
-                this._isDialpadHidden = false; // Show dialpad on incoming call
+        this.setupIncomingCallSubscription();
+    }
+    setupIncomingCallSubscription() {
+        this.subscriptions.add(this.twilioService.currentCall.subscribe(incomingCallData => {
+            if (incomingCallData) {
+                if (this.isCallInProgress) {
+                    this.newIncomingCalls.push(incomingCallData);
+                    this.getUserInformation(incomingCallData);
+                }
+                else {
+                    this.handleNewIncomingCall(incomingCallData);
+                }
             }
-        });
-        this.subscriptions.add(callSub);
+        }));
+    }
+    handleNewIncomingCall(call) {
+        this.isCallInProgress = true;
+        this.isDialpadHidden = false; // Show the dialpad when there's an incoming call
+        this.callData = {
+            phone: call.parameters['From'],
+            displayNum: call.parameters['From'],
+            dial: true,
+            name: call.customParameters?.get('name') || 'Unknown',
+            img: call.customParameters?.get('image') || 'assets/images/user.jpg',
+            isIncomingCall: true,
+            extNum: ''
+        };
+        call.on('cancel', () => this.handleCallEnd(call));
+        call.on('disconnect', () => this.handleCallEnd(call));
+        this.incomingCallInitiated.emit();
+    }
+    handleCallEnd(call) {
+        this.incomingCallsList = this.incomingCallsList.filter((item) => item.parameters.CallSid !== call.parameters['CallSid']);
+        if (this.incomingCallsList.length === 0) {
+            this.isCallInProgress = false;
+            this.resetCallData();
+        }
+    }
+    resetCallData() {
+        this.callData = {
+            phone: '',
+            displayNum: '',
+            dial: false,
+            name: '',
+            img: 'assets/images/user.jpg',
+            isIncomingCall: false,
+            extNum: ''
+        };
     }
     ngOnInit() {
         try {
+            this.token = localStorage.getItem('ext_token') || '';
+            this.initializeTwilio();
+            this.getUserCallSetting();
+            this.getContactList();
             this.getContactList();
             this.getUserCallSetting();
-            // Subscribe to dial number events
             const sub1 = this.twilioService.dialNumberFromOtherModule.subscribe((contact) => {
                 if (contact.number) {
                     this.isSmartDialCall = false;
@@ -2386,12 +2405,15 @@ 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 (!this.isDialpadHidden) {
+                // Focus the input when dialpad becomes visible
+                setTimeout(() => {
+                    if (this.dialInputElement?.nativeElement) {
+                        this.dialInputElement.nativeElement.focus();
+                    }
+                }, 0);
+            }
         }
     }
     registerDragElement() {
@@ -3124,10 +3146,6 @@ class DialboxComponent {
             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();