@vgroup/dialbox 0.1.27 → 0.1.29

package/fesm2020/vgroup-dialbox.mjs

@@ -1372,8 +1372,6 @@ class TwilioService {
         this.notificationSerivce = notificationSerivce;
         this.openInProgressDialpad = new BehaviorSubject(false);
         this.currentCall = new BehaviorSubject(null);
-        this.incomingCalls = new BehaviorSubject([]);
-        this.incomingCalls$ = this.incomingCalls.asObservable();
         this.currentCallState = new BehaviorSubject('none'); //in-progress, out-progress, none
         this.callType = new BehaviorSubject('NIL');
         this.isIncomingCallPicked = new BehaviorSubject(false); // for both incoming and outgoing
@@ -1391,8 +1389,6 @@ class TwilioService {
         this.triggerSMSReload = new BehaviorSubject(false);
         this.tokenInitialized = false;
         this.tokenInitialization$ = null;
-        this.devicePromise = null;
-        this.processedCallSids = new Set();
         this.initializeToken();
     }
     initializeToken() {
@@ -1403,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);
@@ -1413,78 +1410,45 @@ class TwilioService {
     }
     initializeTwilioDevice() {
         if (this.tokenInitialized && this.incomingCallToken) {
-            this.initializeDevice().catch(err => console.error('Device initialization failed', err));
+            this.initializeDevice();
         }
         else {
             this.initializeToken().subscribe();
         }
     }
     initializeDevice() {
-        if (this.devicePromise) {
-            return this.devicePromise;
-        }
-        const token = this.incomingCallToken;
-        if (!token) {
-            return Promise.reject('No Twilio token available');
-        }
-        // Destroy any existing device before creating a new one
         if (this.device) {
             this.device.destroy();
         }
-        this.devicePromise = new Promise((resolve, reject) => {
-            const device = new Device(token, {
-                allowIncomingWhileBusy: true,
-                closeProtection: true,
-            });
-            const cleanup = () => {
-                device.off('registered', onRegistered);
-                device.off('error', onError);
-                device.off('incoming', onIncoming);
-            };
-            const onRegistered = () => {
-                console.log('Twilio Device registered');
-                this.device = device;
-                cleanup();
-                resolve(device);
-            };
-            const onError = (error) => {
-                console.error('Twilio Device Error:', error);
-                this.devicePromise = null; // Allow retry
-                cleanup();
-                reject(error);
-            };
-            const onIncoming = (call) => {
-                const callSid = call.parameters['CallSid'];
-                if (callSid && !this.processedCallSids.has(callSid)) {
-                    this.processedCallSids.add(callSid);
-                    console.log('New incoming call:', callSid);
-                    const currentCalls = this.incomingCalls.getValue();
-                    this.incomingCalls.next([...currentCalls, call]);
-                    // The original currentCall can still represent the most recent call for single-call contexts
-                    this.currentCall.next(call);
-                    this.callType.next('INCOMING');
-                    this.currentCallState.next('incoming');
-                    this.notificationSerivce.showNotification(call);
-                    const callEndHandler = () => {
-                        this.processedCallSids.delete(callSid);
-                        const currentCalls = this.incomingCalls.getValue().filter(c => c.parameters['CallSid'] !== callSid);
-                        this.incomingCalls.next(currentCalls);
-                        call.off('disconnect', callEndHandler);
-                        call.off('cancel', callEndHandler);
-                    };
-                    call.on('disconnect', callEndHandler);
-                    call.on('cancel', callEndHandler);
-                }
-                else {
-                    console.log('Duplicate incoming call event ignored for CallSid:', callSid);
-                }
-            };
-            device.on('registered', onRegistered);
-            device.on('error', onError);
-            device.on('incoming', onIncoming);
-            device.register();
+        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) => {
+            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) => {
+            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;
         });
-        return this.devicePromise;
     }
     // onIncomingCall(){
     //   this.device.on('incoming', (call:any) => {
@@ -1609,15 +1573,34 @@ class IncomingCallComponent {
         this.selectedIncomingCallInfo = new EventEmitter();
     }
     ngOnInit() {
+        // this.twilioService.currentCall.subscribe((call: any) => {
+        //   if (call) {
+        //     this.twilioCallData = call;
+        //     this.notificationSerivce.showNotification(call);
+        //     // Handle the call UI
+        //   }
+        // });
         try {
-            this.twilioService.incomingCalls$.subscribe(calls => {
-                this.newIncomingCallsList = calls;
-                this.incomingCallsNewList.emit(this.newIncomingCallsList);
-                if (calls.length > 0 && !this.twilioCallData) {
-                    const firstCall = calls[0];
-                    this.twilioCallData = firstCall;
-                    this.twilioAuthId = firstCall.customParameters.get('twilioAuthId');
+            this.twilioService.currentCall.subscribe(call => {
+                if (call) {
+                    this.twilioCallData = call;
+                    this.twilioAuthId = call.customParameters.get('twilioAuthId');
+                    if (!call.parameters) {
+                        call.parameters = {};
+                    }
                     this.sendIPforIncomingCall(this.twilioAuthId, '');
+                    call.on('cancel', () => {
+                        if (this.incomingCallData && this.incomingCallData.parameters && this.incomingCallData.parameters.CallSid) {
+                            this.newIncomingCallsList = this.newIncomingCallsList.filter((item) => item.parameters && item.parameters.CallSid !== this.incomingCallData.parameters.CallSid);
+                        }
+                        this.rejectCallFromList(call);
+                    });
+                    call.on('disconnect', () => {
+                        if (this.incomingCallData && this.incomingCallData.parameters && this.incomingCallData.parameters.CallSid) {
+                            this.newIncomingCallsList = this.newIncomingCallsList.filter((item) => item.parameters && item.parameters.CallSid !== this.incomingCallData.parameters.CallSid);
+                        }
+                        this.rejectCallFromList(call);
+                    });
                 }
             });
         }
@@ -1640,15 +1623,6 @@ class IncomingCallComponent {
             }
         });
     }
-    removeCallFromList(callSid) {
-        if (this.newIncomingCallsList) {
-            this.newIncomingCallsList = this.newIncomingCallsList.filter((c) => c.parameters['CallSid'] !== callSid);
-            this.incomingCallsNewList.emit(this.newIncomingCallsList);
-            if (this.newIncomingCallsList.length === 0) {
-                this.closeIncomingCallDiv.emit({ show: 0, call: null });
-            }
-        }
-    }
     rejectCallFromList(data) {
         if (!data)
             return;
@@ -1663,7 +1637,11 @@ class IncomingCallComponent {
             this.sendIPforIncomingCall(data.customParameters.get('twilioAuthId'), 'answered');
         }
         if (this.newIncomingCallsList && data && data.parameters && data.parameters.CallSid) {
-            this.removeCallFromList(data.parameters.CallSid);
+            this.newIncomingCallsList = this.newIncomingCallsList.filter((item) => item.parameters && item.parameters.CallSid !== data.parameters.CallSid);
+            this.incomingCallsNewList.emit(this.newIncomingCallsList);
+            if (this.newIncomingCallsList.length == 0) {
+                this.closeIncomingCallDiv.emit({ show: 0, call: data });
+            }
         }
     }
     closeIncomingCallWrapper(val) {
@@ -2158,9 +2136,6 @@ class CallProgressComponent {
     incomingCallsNewList(data) {
         this.newIncomingCallsList = data;
         this.incomingCallsNewInfo.emit(this.newIncomingCallsList);
-        if (!data || data.length === 0) {
-            this.incomingCallDiv = false;
-        }
     }
     selectedIncomingCallInfo(data) {
         this.selectedIncomingCall = data;
@@ -2503,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);
             }