@vgroup/dialbox 0.1.28 → 0.1.30

package/fesm2020/vgroup-dialbox.mjs

@@ -1399,6 +1399,7 @@ class TwilioService {
             this.incomingCallToken = data.token;
             localStorage.setItem('in-token', data.token);
             this.tokenInitialized = true;
+            console.log('dfdfdsfdsfds');
             this.initializeDevice();
         }), catchError(error => {
             console.error('Error initializing Twilio token:', error);
@@ -1415,50 +1416,9 @@ class TwilioService {
             this.initializeToken().subscribe();
         }
     }
-    // private initializeDevice() {
-    //   if (this.device) {
-    //     this.device.destroy();
-    //   }
-    //   if (!this.incomingCallToken) {
-    //     console.error('No Twilio token available');
-    //     return;
-    //   }
-    //   this.device = new Device(this.incomingCallToken, { 
-    //     allowIncomingWhileBusy: true,
-    //     closeProtection: true
-    //   });
-    //   console.log("device created")
-    //   this.device.register();
-    //   this.device.on('incoming', (call: Call) => {
-    //     console.log("incoming call",call)
-    //     this.currentCall.next(call);
-    //     this.callType.next('INCOMING');
-    //     this.currentCallState.next('incoming');
-    //     this.notificationSerivce.showNotification(call);
-    //   });
-    //   this.device.on('error', (error: any) => {
-    //     console.error('Twilio Device Error:', error);
-    //     // Reset initialization state on error to allow retry
-    //     this.tokenInitialized = false;
-    //   });
-    //   this.device.on('registered', () => {
-    //     console.log('Twilio Device registered successfully');
-    //   });
-    //   this.device.on('unregistered', () => {
-    //     console.log('Twilio Device unregistered');
-    //     this.tokenInitialized = false;
-    //   });
-    // }
-    // onIncomingCall(){
-    //   this.device.on('incoming', (call:any) => {
-    //     console.log(call);
-    //     //call.accept();
-    //   });
-    // }
     initializeDevice() {
         if (this.device) {
             this.device.destroy();
-            this.device = null;
         }
         if (!this.incomingCallToken) {
             console.error('No Twilio token available');
@@ -1468,18 +1428,18 @@ class TwilioService {
             allowIncomingWhileBusy: true,
             closeProtection: true
         });
+        console.log("device created");
         this.device.register();
-        // Remove previous handlers to avoid duplicates
-        this.device.removeAllListeners('incoming');
         this.device.on('incoming', (call) => {
             console.log("incoming call", call);
-            this.currentCall.next(call); // ✅ fires only once per real call
+            this.currentCall.next(call);
             this.callType.next('INCOMING');
             this.currentCallState.next('incoming');
             this.notificationSerivce.showNotification(call);
         });
         this.device.on('error', (error) => {
             console.error('Twilio Device Error:', error);
+            // Reset initialization state on error to allow retry
             this.tokenInitialized = false;
         });
         this.device.on('registered', () => {
@@ -1490,6 +1450,12 @@ class TwilioService {
             this.tokenInitialized = false;
         });
     }
+    // onIncomingCall(){
+    //   this.device.on('incoming', (call:any) => {
+    //     console.log(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);
@@ -2512,7 +2478,7 @@ class DialboxComponent {
         console.log('366---', data);
         this.extensionService.getUserInformation(data['twilioAuthId']).subscribe(response => {
             incomingCallData['userInfo'] = response;
-            const alreadyExists = this.incomingCallsList.some((call) => call.parameters?.CallSid === incomingCallData.parameters?.CallSid);
+            const alreadyExists = this.incomingCallsList.some((call) => call.parameters?.From === incomingCallData.parameters?.From || call.parameters?.CallSid === incomingCallData.parameters?.CallSid);
             if (!alreadyExists) {
                 this.incomingCallsList.push(incomingCallData);
             }
@@ -2558,9 +2524,11 @@ class DialboxComponent {
                     if (this.incomingCallsList.length == 0) {
                         this.isCallInProgress = false;
                     }
+                    this.incomingCallData.disconnect();
                 });
                 this.incomingCallData.on('disconnect', () => {
                     this.incomingCallsList = this.incomingCallsList.filter((item) => item.parameters['CallSid'] !== this.incomingCallData.parameters['CallSid']);
+                    this.incomingCallData.disconnect();
                     if (this.incomingCallsList.length == 0) {
                         this.isCallInProgress = false;
                     }