@vgroup/dialbox 0.1.24 → 0.1.25

package/fesm2020/vgroup-dialbox.mjs

@@ -1389,6 +1389,8 @@ class TwilioService {
         this.triggerSMSReload = new BehaviorSubject(false);
         this.tokenInitialized = false;
         this.tokenInitialization$ = null;
+        this.devicePromise = null;
+        this.processedCallSids = new Set();
         this.initializeToken();
     }
     initializeToken() {
@@ -1409,45 +1411,70 @@ class TwilioService {
     }
     initializeTwilioDevice() {
         if (this.tokenInitialized && this.incomingCallToken) {
-            this.initializeDevice();
+            this.initializeDevice().catch(err => console.error('Device initialization failed', err));
         }
         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();
         }
-        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;
+        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);
+                    this.currentCall.next(call);
+                    const callEndHandler = () => {
+                        this.processedCallSids.delete(callSid);
+                        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();
         });
+        return this.devicePromise;
     }
     // onIncomingCall(){
     //   this.device.on('incoming', (call:any) => {
@@ -1575,29 +1602,7 @@ class IncomingCallComponent {
         try {
             this.twilioService.currentCall.subscribe(call => {
                 if (call && call.parameters['CallSid']) {
-                    if (!this.newIncomingCallsList) {
-                        this.newIncomingCallsList = [];
-                    }
-                    const callSid = call.parameters['CallSid'];
-                    const existingCall = this.newIncomingCallsList.find((c) => c.parameters['CallSid'] === callSid);
-                    if (!existingCall) {
-                        this.newIncomingCallsList.push(call);
-                        this.incomingCallsNewList.emit(this.newIncomingCallsList);
-                        if (!this.twilioCallData) {
-                            this.twilioCallData = call;
-                            this.twilioAuthId = call.customParameters.get('twilioAuthId');
-                            if (!call.parameters) {
-                                call.parameters = {};
-                            }
-                            this.sendIPforIncomingCall(this.twilioAuthId, '');
-                        }
-                        call.on('cancel', () => {
-                            this.removeCallFromList(callSid);
-                        });
-                        call.on('disconnect', () => {
-                            this.removeCallFromList(callSid);
-                        });
-                    }
+                    this.addCallToList(call);
                 }
             });
         }
@@ -1605,6 +1610,22 @@ class IncomingCallComponent {
             console.log(e);
         }
     }
+    addCallToList(call) {
+        if (!this.newIncomingCallsList) {
+            this.newIncomingCallsList = [];
+        }
+        const callSid = call.parameters['CallSid'];
+        // The service now handles de-duplication, so we just add the call.
+        this.newIncomingCallsList.push(call);
+        this.incomingCallsNewList.emit([...this.newIncomingCallsList]);
+        if (!this.twilioCallData) {
+            this.twilioCallData = call;
+            this.twilioAuthId = call.customParameters.get('twilioAuthId');
+            this.sendIPforIncomingCall(this.twilioAuthId, '');
+        }
+        call.on('cancel', () => this.removeCallFromList(callSid));
+        call.on('disconnect', () => this.removeCallFromList(callSid));
+    }
     acceptCallFromList(data) {
         data.accept();
         // data.parameters['isCallConnected'] = true;