@vgroup/dialbox 0.4.151 → 0.4.153

package/fesm2020/vgroup-dialbox.mjs

@@ -728,7 +728,7 @@ class ExtensionService {
         });
         return this.ipAddressService.getIpAddressInfo().pipe(switchMap((ipAddressInfo) => {
             const httpOptions = { headers: headers };
-            payload = { ...payload, ipAddress: ipAddressInfo?.ip, ipCountry: ipAddressInfo?.country };
+            payload = { ...payload, ipAddress: ipAddressInfo?.ip, ipCountry: ipAddressInfo?.address?.country };
             return this.http.post(environment.apiUrl + `/utilities/twilio/incoming/conference/ip`, payload, httpOptions);
         }), catchError((error) => {
             // Properly catch errors
@@ -1622,14 +1622,15 @@ class IncomeingCallSocketService {
     constructor() {
         this.eventSubject = new Subject();
     }
-    connect() {
+    connect(deviceId) {
         // Replace with your WebSocket URL
         this.socket = new WebSocket(`${environment.websocketUrl}incoming/call`);
         this.socket.onopen = () => {
             console.log("WebSocket connected");
             // Authenticate (if needed)
             const authMessage = { "incomingCall": {
-                    "userId": localStorage.getItem('userId')
+                    "userId": localStorage.getItem('userId'),
+                    "deviceId": deviceId
                 } };
             // {
             //   userId: localStorage.getItem('userId'),
@@ -1654,7 +1655,7 @@ class IncomeingCallSocketService {
         };
         this.socket.onclose = () => {
             console.warn("WebSocket disconnected");
-            setTimeout(() => this.connect(), 100); // Auto-reconnect
+            setTimeout(() => this.connect(deviceId), 100); // Auto-reconnect
         };
     }
     createAudioBase() {
@@ -2521,6 +2522,7 @@ class CallProgressComponent {
             // this.call = await this.twilioService.connect('');
             this.twilioService.addIncomingParticipant(data?.id, this.twilioService.conferenceCallInfo.conferenceId).subscribe((res) => {
                 console.log(res, 'bhhhhhhhhhhhhhhhhhhh');
+                this.incomeingCallSocketService.pause();
                 this.isCurrentIncomingCallList.push(data?.id || data?.participantId);
                 data.isAcceptCall = true;
                 // this.currentCall = data;
@@ -2534,6 +2536,7 @@ class CallProgressComponent {
             data.isAcceptCall = true;
             // this.currentCall = data;
             this.setIncomingCallStatus(data);
+            this.incomeingCallSocketService.pause();
         }
         // } else if(data?.status == 'ringing'){
         //   this.twilioService.addIncomingParticipant(data?.id, this.twilioService.conferenceCallInfo.conferenceId).subscribe((data: any) => {
@@ -3577,7 +3580,7 @@ class DialboxComponent {
         // Ensure Twilio is initialized even when dialpad starts hidden,
         // so we can auto-open on incoming calls.
         this.initializeTwilio();
-        this.incomeingCallSocketService.connect();
+        this.incomeingCallSocketService.connect(this.deviceId);
         try {
             this.incomeingCallSocketService.listen().subscribe(async (incomingCallData) => {
                 // const data = JSON.parse(incomingCallData.data);