@vgroup/dialbox 0.7.91 → 0.7.92

package/fesm2020/vgroup-dialbox.mjs

@@ -1650,6 +1650,11 @@ class TwilioService {
         };
         this.currentDeviceErrorHandler = onDeviceError;
         device.on('error', onDeviceError);
+        device.on('disconnect', () => {
+            console.log('Twilio Device disconnected');
+            this.isShowIncomingCall = false;
+            this.scheduleDeviceRecovery();
+        });
         const onDeviceUnregistered = () => {
             // Stale event from a device we've already intentionally replaced — ignore.
             if (this.device !== device)
@@ -2635,7 +2640,7 @@ class CallProgressComponent {
                 if (!this.currentConferenceCall?.conferenceId && this.currentCall?.conferenceId) {
                     this.timer = this.getTimeDifference(this.currentCall?.joinedAt);
                 }
-                if (this.selectedUserInfo?.participantId) {
+                if (this.selectedUserInfo?.id) {
                     let selectedUser = this.currentCallList.find((item) => item?.id == this.selectedUserInfo?.id);
                     if (selectedUser && (selectedUser?.conferenceId == this.currentConferenceCall?.conferenceId || this.isClickExpand)) {
                         selectedUser.IsUserInfoShow = true;
@@ -3418,7 +3423,7 @@ class CallProgressComponent {
         if (!this.C2ConfoList[userInfo?.participantId] && !this.C2ConfoList[userInfo?.businessParticipantId]) {
             this.extensionService.getUserInformation(participantID).subscribe({
                 next: (resInfo) => {
-                    let index = this.currentCallList.findIndex((item) => item?.participantId == userInfo?.id);
+                    let index = this.currentCallList.findIndex((item) => item?.participantId == participantID);
                     this.currentCallList[index] = this.mapUserInfo(this.currentCallList[index], resInfo?.c2cInformation);
                     this.selectedUserInfo = this.currentCallList[index];
                     this.C2ConfoList[participantID] = this.currentCallList[index];
@@ -4874,6 +4879,7 @@ class DialboxComponent {
                 incomingCallData = incomingCallData?.length > 0
                     ? incomingCallData.filter((item) => item.participants?.length > 0)
                     : [];
+                console.log('244', incomingCallData);
                 // All conferenceIds received from socket this tick
                 const socketConferenceIds = incomingCallData.map((c) => c.conferenceId);
                 incomingCallData.forEach((callInfo) => {
@@ -4901,11 +4907,14 @@ class DialboxComponent {
                         }
                     }
                 });
+                console.log('incomingCallsList 275', this.incomingCallsList);
                 // Remove active-call entries whose conferenceId is no longer in the socket
                 // but keep incoming-call notifications (they are managed by notificationCallList expiry)
                 this.incomingCallsList = this.incomingCallsList.filter((res) => socketConferenceIds.includes(res.conferenceId) || res.direction === 'incoming-call');
+                console.log('incomingCallsList 281', this.incomingCallsList);
                 // Remove expired notification entries
                 this.notificationCallList = this.notificationCallList.filter((res) => res.endTime >= new Date().getTime());
+                console.log('notificationCallList 286', this.notificationCallList, this.incomingCallsList);
                 // Merge notificationCallList ONCE (not inside forEach). A pending incoming-call
                 // notification is identified by its OWN participantId — never by conferenceId —
                 // because it can legitimately share the conferenceId of a conference we are already
@@ -4914,8 +4923,10 @@ class DialboxComponent {
                 const existingNotificationParticipantIds = new Set(this.incomingCallsList
                     .filter((r) => r?._isNotification)
                     .map((r) => r?.participantId));
+                console.log('existingNotificationParticipantIds 296', existingNotificationParticipantIds);
                 const notificationsToAdd = this.notificationCallList.filter((n) => !existingNotificationParticipantIds.has(n?.participantId));
                 this.incomingCallsList = [...this.incomingCallsList, ...notificationsToAdd];
+                console.log('incomingCallsList 305', this.incomingCallsList, notificationsToAdd);
                 // Final deduplication. Active conference entries are keyed by conferenceId (socket data
                 // wins — last write wins). Pending incoming-call notifications are keyed in a SEPARATE
                 // namespace by participantId, so a notification and an active conference that share the
@@ -4927,11 +4938,13 @@ class DialboxComponent {
                         : `conf:${item?.conferenceId}`;
                     seen.set(key, item);
                 }
+                console.log('incomingCallsList 320', this.incomingCallsList, Array.from(seen.values()));
                 let finalList = Array.from(seen.values());
                 // Remove any notification entry if an active conference with the same conferenceId already exists
                 // added for 7472 bug
                 const activeConferenceIds = new Set(finalList.filter((item) => !item._isNotification).map((item) => item.conferenceId));
                 finalList = finalList.filter((item) => !(item._isNotification && activeConferenceIds.has(item.conferenceId)));
+                console.log('incomingCallsList 33=0', this.incomingCallsList, finalList);
                 this.incomingCallsList = finalList;
                 if (this.incomingCallsList?.length && incomingCallData?.length) {
                     this.isCallInProgress = true;
@@ -4959,9 +4972,9 @@ class DialboxComponent {
                         }, 2000);
                     }
                 }
-                if (!this.incomingCallsList?.length && !this.twilioService.acceptedCallList?.length) {
+                if (!this.incomingCallsList?.length) {
                     setTimeout(() => {
-                        if (!this.incomingCallsList?.length && !this.twilioService.acceptedCallList?.length) {
+                        if (!this.incomingCallsList?.length) {
                             this.isCallInProgress = false;
                             this.twilioService.device?.disconnectAll();
                             this.twilioService.spareDevice?.disconnectAll();
@@ -5166,10 +5179,10 @@ class DialboxComponent {
                     this.incomingCallsList.splice(incomingCallIndex, 1);
                     this.incomeingCallSocketService.pause();
                     this.cdk.detectChanges();
-                    if (!this.incomingCallsList?.length) {
-                        console.log('407');
-                        this.isCallInProgress = false;
-                    }
+                    // if (!this.incomingCallsList?.length) {
+                    //   console.log('407');
+                    //   this.isCallInProgress = false;
+                    // }
                 }
                 if (this.connectingIncomingCallId == snapshot?.data?.data?.recordId || this.connectingIncomingCallId == snapshot?.data?.data?.participantId && snapshot?.data?.data?.status != "accepted") {
                     // swal("Error", 'Internal Server Error', "error");