@vgroup/dialbox 0.1.21 → 0.1.22

package/fesm2020/vgroup-dialbox.mjs

@@ -1582,23 +1582,30 @@ class IncomingCallComponent {
         try {
             this.twilioService.currentCall.subscribe(call => {
                 if (call) {
+                    const callSid = call.parameters?.['CallSid'];
+                    if (!callSid)
+                        return;
+                    // Check if this call already exists in the list
+                    const callExists = this.newIncomingCallsList?.some((item) => item.parameters?.['CallSid'] === callSid);
+                    if (callExists) {
+                        console.log('Call already exists in the list:', callSid);
+                        return;
+                    }
                     this.twilioCallData = call;
-                    this.twilioAuthId = call.customParameters.get('twilioAuthId');
+                    this.twilioAuthId = call.customParameters?.get('twilioAuthId');
                     if (!call.parameters) {
                         call.parameters = {};
                     }
+                    // Add call to the list
+                    this.newIncomingCallsList = [...(this.newIncomingCallsList || []), call];
+                    this.incomingCallsNewList.emit(this.newIncomingCallsList);
                     this.sendIPforIncomingCall(this.twilioAuthId, '');
+                    // Set up event handlers for the call
                     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);
+                        this.handleCallEnd(call, callSid);
                     });
                     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);
+                        this.handleCallEnd(call, callSid);
                     });
                 }
             });
@@ -1622,25 +1629,52 @@ class IncomingCallComponent {
             }
         });
     }
+    // Helper method to handle call end events
+    handleCallEnd(call, callSid) {
+        if (!callSid)
+            return;
+        // Remove call from the list
+        if (this.newIncomingCallsList) {
+            this.newIncomingCallsList = this.newIncomingCallsList.filter((item) => item.parameters?.['CallSid'] !== callSid);
+            this.incomingCallsNewList.emit([...this.newIncomingCallsList]);
+            // Close UI if no more calls
+            if (this.newIncomingCallsList.length === 0) {
+                this.closeIncomingCallDiv.emit({ show: 0, call });
+            }
+        }
+    }
     rejectCallFromList(data) {
         if (!data)
             return;
-        if (data.reject)
-            data.reject();
-        if (data.disconnect)
-            data.disconnect();
-        if (data.parameters) {
-            data.parameters['isCallConnected'] = false; // Should be false when rejecting
-        }
-        if (data.customParameters) {
-            this.sendIPforIncomingCall(data.customParameters.get('twilioAuthId'), 'answered');
-        }
-        if (this.newIncomingCallsList && data && data.parameters && 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 });
+        const callSid = data.parameters?.['CallSid'];
+        if (!callSid)
+            return;
+        try {
+            // Try to reject or disconnect the call
+            if (typeof data.reject === 'function') {
+                data.reject();
+            }
+            else if (typeof data.disconnect === 'function') {
+                data.disconnect();
             }
+            // Update call status
+            if (data.parameters) {
+                data.parameters['isCallConnected'] = false;
+            }
+            // Update call status on the server
+            if (data.customParameters) {
+                const twilioAuthId = data.customParameters.get('twilioAuthId');
+                if (twilioAuthId) {
+                    this.sendIPforIncomingCall(twilioAuthId, 'completed');
+                }
+            }
+            // Remove call from the list
+            this.handleCallEnd(data, callSid);
+        }
+        catch (error) {
+            console.error('Error rejecting call:', error);
+            // Make sure to clean up even if there's an error
+            this.handleCallEnd(data, callSid);
         }
     }
     closeIncomingCallWrapper(val) {