@vgroup/dialbox 0.2.80 → 0.2.82

package/fesm2020/vgroup-dialbox.mjs

@@ -1647,23 +1647,27 @@ class IncomeingCallSocketService {
     }
     connect() {
         // Replace with your WebSocket URL
-        this.socket = new WebSocket(`${environment.websocketUrl}incoming/call`);
+        this.socket = new WebSocket(`${environment.websocketUrl}incoming/call?userId=${localStorage.getItem('userId')}&authKey=${localStorage.getItem('ext_token')}`);
         this.socket.onopen = () => {
             console.log("WebSocket connected");
             // Authenticate (if needed)
-            const authMessage = {
-                userId: localStorage.getItem('userId'),
-                authKey: localStorage.getItem('ext_token')
-            };
+            const authMessage = { "incomingCall": {
+                    "userId": localStorage.getItem('userId')
+                } };
+            // {
+            //   userId: localStorage.getItem('userId'),
+            //   authKey: localStorage.getItem('ext_token')
+            // };
             this.socket?.send(JSON.stringify(authMessage));
         };
         this.socket.onmessage = (msg) => {
+            console.log("WS RAW:", msg.data);
             try {
                 const data = JSON.parse(msg.data);
                 this.eventSubject.next(data);
             }
             catch (e) {
-                console.error("Invalid WS message", msg);
+                console.error("WS PARSE ERROR:", msg.data);
             }
         };
         this.socket.onerror = (err) => {
@@ -2080,6 +2084,7 @@ class CallProgressComponent {
         if (changes['callData']) {
             if (changes['callData'].currentValue?.isIncomingCall) {
                 this.incomingCallDiv = true;
+                this.call['callInfo'] = { ...this.callData };
                 this.cdr.detectChanges();
             }
             else if (changes['callData'].currentValue?.displayNum || changes['callData'].currentValue?.from) {
@@ -2179,7 +2184,7 @@ class CallProgressComponent {
                             conferenceId: this.conferenceId
                         });
                         this.callData = { ...this.callData, participantId: this.addRes?.participantId };
-                        this.call['callInfo'] = this.callData;
+                        this.call['callInfo'] = { ...this.callData };
                         console.log('Initial participantId:', this.addRes?.participantId);
                     }
                     catch (e) {
@@ -2449,7 +2454,7 @@ class CallProgressComponent {
                 hold: true
             });
             // Put current call on hold
-            this.heldCall = this.call;
+            this.heldCall = { ...this.call };
             this.isCallOnHold = true;
             this.heldCall.mute(true);
             // Close contacts panel and show ring animation
@@ -2466,6 +2471,7 @@ class CallProgressComponent {
                 name: contactName || phoneNumber,
                 img: contact?.img || 'assets/images/user.jpg'
             };
+            this.call['callInfo'] = { ...this.callData };
             this.cdr.detectChanges();
             // Get the conference ID from the current call or use the stored one
             const conferenceId = this.conferenceId;
@@ -3069,50 +3075,50 @@ 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.listen().subscribe((incomingCallData) => {
-            console.log("WS Event Received:", incomingCallData);
-            console.log("WS Event Received:", incomingCallData.data);
-            if (incomingCallData.type === "/incoming/call") {
-                if (incomingCallData) {
-                    if (this.autoOpenOnIncoming && this._isDialpadHidden) {
-                        this._isDialpadHidden = false;
-                    }
-                    if (this.isCallInProgress) {
-                        this.newIncomingCalls.push(incomingCallData);
-                        console.log('325', incomingCallData);
-                        this.getUserInformation(incomingCallData);
-                    }
-                    else {
-                        incomingCallData['isFirstCall'] = true;
-                        console.log('dd1');
-                        this.isCallInProgress = true;
-                        this.isDialpadHidden = false;
-                        this.callData.phone = incomingCallData.parameters['From'];
-                        console.log('dd2');
-                        this.getUserInformation(incomingCallData);
-                        this.callData.name = incomingCallData.customParameters.get('name');
-                        this.callData.img = incomingCallData.customParameters.get('image') || 'assets/images/user.jpg';
-                        this.callData.isIncomingCall = true;
+        try {
+            this.incomeingCallSocketService.connect();
+            this.incomeingCallSocketService.listen().subscribe((incomingCallData) => {
+                console.log("WS Event Received:", incomingCallData);
+                console.log("WS Event Received:", incomingCallData.data);
+                if (incomingCallData.type === "/incoming/call") {
+                    if (incomingCallData) {
+                        if (this.autoOpenOnIncoming && this._isDialpadHidden) {
+                            this._isDialpadHidden = false;
+                        }
+                        if (this.isCallInProgress) {
+                            this.newIncomingCalls.push(incomingCallData);
+                            console.log('325', incomingCallData);
+                            this.getUserInformation(incomingCallData);
+                        }
+                        else {
+                            incomingCallData['isFirstCall'] = true;
+                            console.log('dd1');
+                            this.isCallInProgress = true;
+                            this.isDialpadHidden = false;
+                            this.callData.phone = incomingCallData.parameters['From'];
+                            console.log('dd2');
+                            this.getUserInformation(incomingCallData);
+                            this.callData.name = incomingCallData.customParameters.get('name');
+                            this.callData.img = incomingCallData.customParameters.get('image') || 'assets/images/user.jpg';
+                            this.callData.isIncomingCall = true;
+                        }
+                        incomingCallData.on('cancel', () => {
+                            this.incomingCallsList = this.incomingCallsList.filter((item) => item.parameters['CallSid'] !== incomingCallData.parameters['CallSid']);
+                            // if(this.incomingCallsList.length == 0){
+                            //   console.log('dd3')
+                            //   this.isCallInProgress = false;
+                            // }
+                        });
+                        incomingCallData.on('disconnect', () => {
+                            this.incomingCallsList = this.incomingCallsList.filter((item) => item.parameters['CallSid'] !== incomingCallData.parameters['CallSid']);
+                            // if(this.incomingCallsList.length == 0){
+                            //   console.log('dd4')
+                            //   this.isCallInProgress = false;
+                            // }
+                        });
                     }
-                    incomingCallData.on('cancel', () => {
-                        this.incomingCallsList = this.incomingCallsList.filter((item) => item.parameters['CallSid'] !== incomingCallData.parameters['CallSid']);
-                        // if(this.incomingCallsList.length == 0){
-                        //   console.log('dd3')
-                        //   this.isCallInProgress = false;
-                        // }
-                    });
-                    incomingCallData.on('disconnect', () => {
-                        this.incomingCallsList = this.incomingCallsList.filter((item) => item.parameters['CallSid'] !== incomingCallData.parameters['CallSid']);
-                        // if(this.incomingCallsList.length == 0){
-                        //   console.log('dd4')
-                        //   this.isCallInProgress = false;
-                        // }
-                    });
                 }
-            }
-        });
-        try {
+            });
             this.token = localStorage.getItem('ext_token') || '';
             //this.isCallInProgress = true;
             this.getContactList();