@vgroup/dialbox 0.0.84 → 0.0.85

package/fesm2020/vgroup-dialbox.mjs

@@ -2,7 +2,7 @@ import * as i0 from '@angular/core';
 import { Injectable, EventEmitter, Component, Input, Output, ViewChild, Inject, NgModule } from '@angular/core';
 import swal from 'sweetalert2';
 import { AsYouType } from 'libphonenumber-js';
-import { throwError, BehaviorSubject, of, interval, Subscription } from 'rxjs';
+import { throwError, BehaviorSubject, of, Subscription, filter, interval } from 'rxjs';
 import * as i1 from '@angular/common/http';
 import { HttpHeaders, HttpParams, HttpClientModule } from '@angular/common/http';
 import { catchError, switchMap, map, tap, shareReplay } from 'rxjs/operators';
@@ -1389,6 +1389,9 @@ class TwilioService {
         this.triggerSMSReload = new BehaviorSubject(false);
         this.tokenInitialized = false;
         this.tokenInitialization$ = null;
+        this.lastCallSid = null;
+        this.lastCallTime = 0;
+        this.CALL_DEBOUNCE_MS = 1000; // 1 second debounce
         this.initializeToken();
     }
     initializeToken() {
@@ -1429,6 +1432,15 @@ class TwilioService {
         });
         this.device.register();
         this.device.on('incoming', (call) => {
+            const callSid = call.parameters?.['CallSid'];
+            const now = Date.now();
+            // Skip if this is a duplicate call within the debounce window
+            if (callSid && callSid === this.lastCallSid && (now - this.lastCallTime) < this.CALL_DEBOUNCE_MS) {
+                console.log('Skipping duplicate call:', callSid);
+                return;
+            }
+            this.lastCallSid = callSid;
+            this.lastCallTime = now;
             this.currentCall.next(call);
             this.callType.next('INCOMING');
             this.currentCallState.next('incoming');
@@ -1568,43 +1580,63 @@ class IncomingCallComponent {
         this.closeIncomingCallDiv = new EventEmitter();
         this.incomingCallsNewList = new EventEmitter();
         this.selectedIncomingCallInfo = new EventEmitter();
+        this.subscription = new Subscription();
+        this.callHandled = new Set(); // Track handled calls by CallSid
     }
     ngOnInit() {
-        // this.twilioService.currentCall.subscribe((call: any) => {
-        //   if (call) {
-        //     this.twilioCallData = call;
-        //     this.notificationSerivce.showNotification(call);
-        //     // Handle the call UI
-        //   }
-        // });
         try {
-            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);
-                    });
-                }
-            });
+            // Only handle the call if we have incomingCallData
+            if (this.incomingCallData) {
+                this.handleIncomingCall(this.incomingCallData);
+            }
+            // Subscribe to new calls
+            this.subscription.add(this.twilioService.currentCall.pipe(
+            // Filter out duplicate calls that we've already handled
+            filter((call) => {
+                if (!call)
+                    return false;
+                const callSid = call.parameters['CallSid'];
+                return callSid && !this.callHandled.has(callSid);
+            })).subscribe(call => {
+                this.handleIncomingCall(call);
+            }));
         }
         catch (e) {
-            console.log(e);
+            console.error('Error in incoming call handling:', e);
         }
     }
+    handleIncomingCall(call) {
+        if (!call)
+            return;
+        const callSid = call.parameters?.CallSid;
+        if (!callSid || this.callHandled.has(callSid)) {
+            return; // Skip if no CallSid or already handled
+        }
+        this.callHandled.add(callSid);
+        this.twilioCallData = call;
+        this.twilioAuthId = call.customParameters?.get('twilioAuthId');
+        if (!call.parameters) {
+            call.parameters = {};
+        }
+        // Send IP for the incoming call
+        this.sendIPforIncomingCall(this.twilioAuthId, '');
+        // Setup call event handlers
+        const handleCallEnd = () => {
+            if (callSid) {
+                this.callHandled.delete(callSid);
+                if (this.newIncomingCallsList) {
+                    this.newIncomingCallsList = this.newIncomingCallsList.filter((item) => item.parameters?.CallSid !== callSid);
+                }
+            }
+            this.rejectCallFromList(call);
+        };
+        call.on('cancel', handleCallEnd);
+        call.on('disconnect', handleCallEnd);
+    }
+    ngOnDestroy() {
+        this.subscription.unsubscribe();
+        this.callHandled.clear();
+    }
     acceptCallFromList(data) {
         data.accept();
         // data.parameters['isCallConnected'] = true;