@vgroup/dialbox 0.7.96 → 0.7.98

package/fesm2020/vgroup-dialbox.mjs

@@ -2511,6 +2511,10 @@ class CallProgressComponent {
                             this.showContactsPanel = false;
                             // No call in progress: reset the incoming-mute switch back to default (off).
                             this.twilioService.setIncomingMuted(false);
+                            // Call has fully ended: close the minimized bar too, otherwise its
+                            // mic/end-call buttons keep showing for a call that no longer exists.
+                            this.isMinimised = false;
+                            this.minimiseEvent.emit(false);
                             // this.isUnholdConferenceCall = false;
                             this.currentCallList = [];
                             this.currentCall = {};
@@ -2708,6 +2712,10 @@ class CallProgressComponent {
                     this.isConferenceCallHold = false;
                     // No call in progress: reset the incoming-mute switch back to default (off).
                     this.twilioService.setIncomingMuted(false);
+                    // Call has fully ended: close the minimized bar too, otherwise its
+                    // mic/end-call buttons keep showing for a call that no longer exists.
+                    this.isMinimised = false;
+                    this.minimiseEvent.emit(false);
                     this.stopTimer();
                     this.cdr.detectChanges();
                 }
@@ -2747,13 +2755,13 @@ class CallProgressComponent {
                 && resData?.client && resData?.direction == 'outgoing-call') || (this.deviceNumberList.includes(resData?.to) && resData?.direction == 'incoming-call' && !resData?.businessNumber && resData?.host) && resData?.isLeft));
             this.showRingAnimation = true;
             // 1️⃣ Get new token for same conference
-            const tokenData = rejoinParticipentInfo?.hostToken || await this.getOutgoingCallToken(callInfo?.conferenceId);
+            const tokenData = rejoinParticipentInfo?.hostToken;
             // 2️⃣ Reconnect device
             const options = {
                 codecPreferences: ['opus', 'pcmu'],
                 closeProtection: true,
             };
-            this.device = new Device(tokenData.token.value, options);
+            this.device = new Device(tokenData, options);
             this.call = await this.device.connect({
                 params: {
                     From: rejoinParticipentInfo.from,
@@ -3533,6 +3541,20 @@ class CallProgressComponent {
                 callToAccept.on('reject', () => {
                     handleTwilioConnectFailure('Call could not be connected.');
                 });
+                // Registered immediately (not after the accept() -> setIncomingCallStatus BE
+                // round-trip below) so a far-end hangup landing in that window can't race past
+                // this listener. If it did, acceptedCallList would stay non-empty forever, which
+                // permanently blocks teardownSpareDevicesIfIdle(), the idle device.disconnectAll()
+                // reset in dialbox.component.ts, and twilioService's self-recovery guards.
+                const acceptedSid = callToAccept.parameters?.CallSid;
+                callToAccept.on('disconnect', () => {
+                    if (acceptedSid) {
+                        this.acceptedCallList = this.acceptedCallList.filter(c => c.callSid !== acceptedSid);
+                        this.twilioService.acceptedCallList = this.twilioService.acceptedCallList.filter((c) => c.parameters?.CallSid !== acceptedSid);
+                        this.twilioService.releaseConcurrentCallDevice(acceptedSid);
+                    }
+                    this.twilioService.teardownSpareDevicesIfIdle();
+                });
                 callToAccept.on('accept', () => {
                     console.log('call accepted sucessfully !!!!!!!');
                     if (isTwilioConnectSettled)
@@ -3565,15 +3587,6 @@ class CallProgressComponent {
                             this.twilioService.isConnectingIncomingCallId.next('');
                             this.incomeingCallSocketService.pause();
                             this.twilioService.onConcurrentCallAccepted(callToAccept);
-                            const acceptedSid = callToAccept.parameters?.CallSid;
-                            callToAccept.on('disconnect', () => {
-                                if (acceptedSid) {
-                                    this.acceptedCallList = this.acceptedCallList.filter(c => c.callSid !== acceptedSid);
-                                    this.twilioService.acceptedCallList = this.twilioService.acceptedCallList.filter((c) => c.parameters?.CallSid !== acceptedSid);
-                                    this.twilioService.releaseConcurrentCallDevice(acceptedSid);
-                                }
-                                this.twilioService.teardownSpareDevicesIfIdle();
-                            });
                             this.cdr.detectChanges();
                         }
                         else {
@@ -4875,13 +4888,13 @@ class DialboxComponent {
                 }
                 // Filter out conferences with no participants
                 incomingCallData = incomingCallData?.length > 0
-                    ? incomingCallData.filter((item) => item.participants?.length > 0 && item.callSource == 'Dialpad')
+                    ? incomingCallData.filter((item) => item.participants?.length > 0)
                     : [];
                 // All conferenceIds received from socket this tick
                 const socketConferenceIds = incomingCallData.map((c) => c.conferenceId);
                 incomingCallData.forEach((callInfo) => {
                     // Check if WE are an active participant in this conference
-                    const ourNumber = callInfo?.participants.find((resData) => ((this.deviceNumberList.includes(resData?.from) && resData?.direction == 'outgoing-call' && resData?.client) ||
+                    const ourNumber = callInfo?.participants.find((resData) => ((this.deviceNumberList.includes(resData?.from) && resData?.direction == 'outgoing-call' && resData?.client && (resData?.host && callInfo.callSource == 'Dialpad' || !resData?.host)) ||
                         (this.deviceNumberList.includes(resData?.to) && resData?.direction == 'incoming-call' && resData?.client)) && !resData?.isLeft);
                     // Match the ACTIVE conference entry only — never a pending incoming-call
                     // notification, which can share this conferenceId but must not be overwritten