podchat-browser 11.3.4 → 11.4.3

package/src/call.module.js

@@ -191,6 +191,10 @@
             currentCallId = null,
             shouldReconnectCallTimeout = null,
             callTopics = {},
+            callMetaDataTypes = {
+                POORCONNECTION: 1,
+                POORCONNECTIONRESOLVED: 2
+            },
             screenShareState = {
                 started: false,
                 imOwner: false
@@ -488,172 +492,29 @@
              */
             startCallWebRTCFunctions = function (params, callback) {
                 if (callDivId) {
-                    var callParentDiv,
-                        callVideo = (typeof params.video === 'boolean') ? params.video : true,
+                    var callVideo = (typeof params.video === 'boolean') ? params.video : true,
                         callMute = (typeof params.mute === 'boolean') ? params.mute : false;
-                        //sendingTopic = params.sendingTopic,
-                        //receiveTopic = params.receiveTopic;
+
+                    if(params.selfData) {
+                        callStateController.setupCallParticipant(params.selfData);
+                    }
 
                     if(params.clientsList && params.clientsList.length) {
                         for(var i in params.clientsList) {
-                            callStateController.setupCallParticipant(params.clientsList[i]);
-                            //callStateController.callUsers.push(params.clientsList[i]);
+                            if(params.clientsList[i].userId !== chatMessaging.userInfo.id)
+                                callStateController.setupCallParticipant(params.clientsList[i]);
                         }
                     }
 
                     callStateController.setupScreenSharingObject(params.screenShare);
 
-                    /*callTopics['sendVideoTopic'] = 'Vi-' + sendingTopic;
-                    callTopics['sendAudioTopic'] = 'Vo-' + sendingTopic;
-                    callTopics['screenShare'] = params.screenShare;
-                    //callTopics['receiveVideoTopic'] = 'Vi-' + receiveTopic;
-                    //callTopics['receiveAudioTopic'] = 'Vo-' + receiveTopic;
-                    callTopics['receive'] = [];
-                    callTopics['receive'].push({
-                        "VideoTopic": 'Vi-' + receiveTopic,
-                        "AudioTopic": 'Vo-' + receiveTopic
-                    });*/
-
-                    /*webpeersMetadata[callTopics['sendVideoTopic']] = {
-                        interval: null,
-                        receivedSdpAnswer: false,
-                        connectionQualityInterval: null,
-                        poorConnectionCount: 0,
-                        poorConnectionResolvedCount: 0,
-                        isConnectionPoor: false
-                    };
-                    webpeersMetadata[callTopics['sendAudioTopic']] = {
-                        interval: null,
-                        receivedSdpAnswer: false,
-                        connectionQualityInterval: null,
-                        poorConnectionCount: 0,
-                        poorConnectionResolvedCount: 0,
-                        isConnectionPoor: false
-                    };
-                    webpeersMetadata[callTopics['screenShare']] = {
-                        interval: null,
-                        receivedSdpAnswer: false,
-                        connectionQualityInterval: null,
-                        poorConnectionCount: 0,
-                        poorConnectionResolvedCount: 0,
-                        isConnectionPoor: false
-                    };
-
-                    for(var i in callTopics['receive']) {
-                        webpeersMetadata[callTopics['receive'][i]['VideoTopic']] = {
-                            interval: null,
-                            receivedSdpAnswer: false
-                        };
-                        webpeersMetadata[callTopics['receive'][i]['AudioTopic']] = {
-                            interval: null,
-                            receivedSdpAnswer: false
-                        };
-                    }*/
-
-                    //callParentDiv = document.getElementById(callDivId);
-
-                    /*// Local Video Tag
-                    if (callVideo && !uiRemoteMedias[callTopics['sendVideoTopic']]) {
-                        uiRemoteMedias[callTopics['sendVideoTopic']] = document.createElement('video');
-                        var el = uiRemoteMedias[callTopics['sendVideoTopic']];
-                        el.setAttribute('id', 'uiRemoteVideo-' + callTopics['sendVideoTopic']);
-                        el.setAttribute('class', callVideoTagClassName);
-                        el.setAttribute('playsinline', '');
-                        el.setAttribute('muted', '');
-                        el.setAttribute('width', callVideoMinWidth + 'px');
-                        el.setAttribute('height', callVideoMinHeight + 'px');
-                    }
-
-                    // Local Audio Tag
-                    if (!uiRemoteMedias[callTopics['sendAudioTopic']]) {
-                        uiRemoteMedias[callTopics['sendAudioTopic']] = document.createElement('audio');
-                        var el = uiRemoteMedias[callTopics['sendAudioTopic']];
-                        el.setAttribute('id', 'uiRemoteAudio-' + callTopics['sendAudioTopic']);
-                        el.setAttribute('class', callAudioTagClassName);
-                        el.setAttribute('autoplay', '');
-                        el.setAttribute('muted', '');
-                        el.setAttribute('controls', '');
-                    }
-
-                    for(var i in callTopics['receive']){
-                        // Remote Video Tag
-                        if (callVideo && !uiRemoteMedias[callTopics['receive'][i]['VideoTopic']]) {
-                            uiRemoteMedias[callTopics['receive'][i]['VideoTopic']] = document.createElement('video');
-                            var el = uiRemoteMedias[callTopics['receive'][i]['VideoTopic']];
-                            el.setAttribute('id', 'uiRemoteVideo-' + callTopics['receive'][i]['VideoTopic']);
-                            el.setAttribute('class', callVideoTagClassName);
-                            el.setAttribute('playsinline', '');
-                            el.setAttribute('muted', '');
-                            el.setAttribute('width', callVideoMinWidth + 'px');
-                            el.setAttribute('height', callVideoMinHeight + 'px');
-                        }
-
-                        // Remote Audio Tag
-                        if (!uiRemoteMedias[callTopics['receive'][i]['AudioTopic']]) {
-                            uiRemoteMedias[callTopics['receive'][i]['AudioTopic']] = document.createElement('audio');
-                            var el = uiRemoteMedias[callTopics['receive'][i]['AudioTopic']];
-                            el.setAttribute('id', 'uiRemoteAudio-' + callTopics['receive'][i]['AudioTopic']);
-                            el.setAttribute('class', callAudioTagClassName);
-                            el.setAttribute('autoplay', '');
-                            callMute && el.setAttribute('muted', '');
-                            el.setAttribute('controls', '');
-                        }
-                    }*/
-
                     callback && callback(generateCallUIList());
 
-                    /*for(var i in callTopics['receive']) {
-                        uiRemoteElements.push(uiRemoteMedias[callTopics['receive'][i]['AudioTopic']])
-                        callVideo && uiRemoteElements.push(uiRemoteMedias[callTopics['receive'][i]['VideoTopic']])
-                    }
-
-                    if (callParentDiv) {
-                        callVideo && callParentDiv.appendChild(uiRemoteMedias[callTopics['sendVideoTopic']]);
-                        callParentDiv.appendChild(uiRemoteMedias[callTopics['sendAudioTopic']]);
-                        if(callVideo) {
-                            for(var i in callTopics['receive']) {
-                                callParentDiv.appendChild(uiRemoteMedias[callTopics['receive'][i]['VideoTopic']])
-                            }
-                        }
-                        for(var i in callTopics['receive']) {
-                            callParentDiv.appendChild(uiRemoteMedias[callTopics['receive'][i]['AudioTopic']]);
-                        }
-
-                        callback && callback({
-                            'uiLocalVideo': uiRemoteMedias[callTopics['sendVideoTopic']],
-                            'uiLocalAudio': uiRemoteMedias[callTopics['sendAudioTopic']],
-                            uiRemoteElements: uiRemoteElements
-                            /!*                            'uiRemoteVideo': uiRemoteMedias[callTopics['receiveVideoTopic']],
-                                                        'uiRemoteAudio': uiRemoteMedias[callTopics['receiveAudioTopic']]*!/
-                        });
-                    } else {
-                        callback && callback({
-                            'uiLocalVideo': uiRemoteMedias[callTopics['sendVideoTopic']],
-                            'uiLocalAudio': uiRemoteMedias[callTopics['sendAudioTopic']],
-                            uiRemoteElements: uiRemoteElements
-                            /!*'uiRemoteVideo': uiRemoteMedias[callTopics['receiveVideoTopic']],
-                            'uiRemoteAudio': uiRemoteMedias[callTopics['receiveAudioTopic']]*!/
-                        });
-                    }*/
-
-
                     callStateController.createSessionInChat(Object.assign(params, {
                         callVideo: callVideo,
                         callAudio: !callMute,
                     }));
 
-                    /*sendCallMessage({
-                        id: 'STOPALL'
-                    }, function (result) {*/
-
-                    /*handleCallSocketOpen({
-                        brokerAddress: params.brokerAddress,
-                        turnAddress: params.turnAddress,
-                        callVideo: callVideo,
-                        callAudio: !callMute,
-                    });*/
-
-                    /* });*/
                 } else {
                     consoleLogging && console.log('No Call DIV has been declared!');
                     return;
@@ -868,11 +729,33 @@
                  * @param params
                  * @param direction
                  */
-                removeParticipant: function (user) {
-                    if(user === chatMessaging.userInfo.id) {
-                        //TODO: only remove me
-                        callStop();
+                removeParticipant: function (userId) {
+                    var user = callUsers[userId];
+                    if(!user)
                         return;
+
+                    if(user.videoTopicName && user.peers[user.videoTopicName]) {
+                        clearInterval(callUsers[userId].topicMetaData[user.videoTopicName].interval);
+                        callStateController.removeConnectionQualityInterval(userId, user.videoTopicName);
+                        callStateController.removeStreamFromWebRTC(userId, user.videoTopicName);
+                        callUsers[userId].peers[user.videoTopicName].dispose();
+                        delete callUsers[userId].peers[user.videoTopicName];
+
+                    }
+                    if(user.audioTopicName && user.peers[user.audioTopicName]) {
+                        clearInterval(callUsers[userId].topicMetaData[user.audioTopicName].interval);
+                        callStateController.removeConnectionQualityInterval(userId, user.audioTopicName);
+                        callStateController.removeStreamFromWebRTC(userId, user.audioTopicName);
+
+                        callUsers[userId].peers[user.audioTopicName].dispose();
+                        delete callUsers[userId].peers[user.audioTopicName];
+                    }
+
+                    if(callUsers[userId]){
+                        callUsers[userId].peers = {};
+                        callUsers[userId].topicMetaData = {};
+                        callUsers[userId].htmlElements = {};
+                        callUsers[userId] = null;
                     }
                 },
                 stopParticipantAudio: function (userId) {
@@ -1005,7 +888,8 @@
                                             message: 'Poor connection for a long time',
                                             metadata: {
                                                 elementId: "uiRemoteVideo-" + topic,
-                                                topic: topic
+                                                topic: topic,
+                                                userId: userId
                                             }
                                         });
                                     }
@@ -1025,6 +909,13 @@
                                         userMetadata.isConnectionPoor = true;
                                         userMetadata.poorConnectionCount = 0;
                                         userMetadata.poorConnectionResolvedCount = 0;
+
+                                        sendCallMetaData({
+                                            id: callMetaDataTypes.POORCONNECTION,
+                                            userid: userId,
+                                            title: 'Poor Connection',
+                                            description: topic
+                                        });
                                     } else {
                                         callUsers[userId].topicMetaData[topic].poorConnectionCount++;
                                     }
@@ -1038,9 +929,17 @@
                                             message: 'Poor connection resolved',
                                             metadata: {
                                                 elementId: "uiRemoteVideo-" + topic,
-                                                topic: topic
+                                                topic: topic,
+                                                userId: userId
                                             }
                                         });
+
+                                        sendCallMetaData({
+                                            id: callMetaDataTypes.POORCONNECTIONRESOLVED,
+                                            userid: userId,
+                                            title: 'Poor Connection Resolved',
+                                            description: topic
+                                        });
                                     } else {
                                         userMetadata.poorConnectionResolvedCount++;
                                     }
@@ -1534,14 +1433,14 @@
                             let newHeight = callVideoMinHeight - (Math.ceil(Math.random() * 50) + 20);
 
                             videoTrack.applyConstraints({
-                                width: {
-                                    min: newWidth,
-                                    ideal: 1280
-                                },
-                                height: {
-                                    min: newHeight,
-                                    ideal: 720
-                                },
+                                // width: {
+                                //     min: newWidth,
+                                //     ideal: 1280
+                                // },
+                                // height: {
+                                //     min: newHeight,
+                                //     ideal: 720
+                                // },
                                 advanced: [
                                     {
                                         width: newWidth,
@@ -1725,10 +1624,62 @@
 
             restartMediaOnKeyFrame = function (userId, timeout) {
                 setTimeout(function () {
-                    if(typeof callUsers[userId] !== "undefined" && callUsers[userId])
+                    if(typeof callUsers[userId] !== "undefined" && callUsers[userId] && callUsers[userId].peers[callUsers[userId].videoTopicName])
                         restartMedia(callUsers[userId].videoTopicName);
                 }, timeout);
-            };
+            },
+
+            sendCallMetaData = function (params, callback) {
+                var message =  {
+                    id: params.id,
+                    userid: params.userid,
+                    title: params.title,
+                    description: params.description
+                };
+
+                sendCallMessage({
+                    id: 'SENDMETADATA',
+                    message: JSON.stringify(message),
+                    chatId: currentCallId
+                }, function (res) {
+                    callback && callback(res)
+                });
+            },
+            handleReceivedMetaData = function (jsonMessage) {
+                var id = jsonMessage.id;
+                if(!id || typeof id === "undefined" || jsonMessage.userid == chatMessaging.userInfo.id) {
+                    return;
+                }
+
+                switch (id) {
+                    case callMetaDataTypes.POORCONNECTION:
+                        chatEvents.fireEvent("callEvents", {
+                            type: 'POOR_VIDEO_CONNECTION',
+                            subType: 'SHORT_TIME',
+                            message: 'Poor connection detected',
+                            metadata: {
+                                elementId: "uiRemoteVideo-" + jsonMessage.description,
+                                topic: jsonMessage.description,
+                                userId: jsonMessage.userid
+                            }
+                        });
+                        break;
+                    case callMetaDataTypes.POORCONNECTIONRESOLVED:
+                        chatEvents.fireEvent('callEvents', {
+                            type: 'POOR_VIDEO_CONNECTION_RESOLVED',
+                            message: 'Poor connection resolved',
+                            metadata: {
+                                elementId: "uiRemoteVideo-" + jsonMessage.description,
+                                topic: jsonMessage.description,
+                                userId: jsonMessage.userid
+                            }
+                        });
+                        break;
+                }
+
+            }
+
+
 
         this.updateToken = function (newToken) {
             token = newToken;
@@ -1768,23 +1719,6 @@
                         restartMediaOnKeyFrame('screenShare', 8000);
                         restartMediaOnKeyFrame('screenShare', 12000);
                     }
-
-/*                    setTimeout(function () {
-                        if(typeof callUsers[chatMessaging.userInfo.id] === "undefined" || !callUsers[chatMessaging.userInfo.id])
-                            restartMedia(callUsers[chatMessaging.userInfo.id].videoTopicName);
-                    }, 2000);
-                    setTimeout(function () {
-                        if(typeof callUsers[chatMessaging.userInfo.id] === "undefined" || !callUsers[chatMessaging.userInfo.id])
-                            restartMedia(callUsers[chatMessaging.userInfo.id].videoTopicName);
-                    }, 4000);
-                    setTimeout(function () {
-                        if(typeof callUsers[chatMessaging.userInfo.id] === "undefined" || !callUsers[chatMessaging.userInfo.id])
-                            restartMedia(callUsers[chatMessaging.userInfo.id].videoTopicName);
-                    }, 8000);
-                    setTimeout(function () {
-                        if(typeof callUsers[chatMessaging.userInfo.id] === "undefined" || !callUsers[chatMessaging.userInfo.id])
-                            restartMedia(callUsers[chatMessaging.userInfo.id].videoTopicName);
-                    }, 12000);*/
                     break;
 
                 case 'FREEZED':
@@ -1796,11 +1730,13 @@
                         chatMessaging.messagesCallbacks[uniqueId](jsonMessage);
                     }
                     break;*/
+
                 case 'STOP':
                     if (chatMessaging.messagesCallbacks[uniqueId]) {
                         chatMessaging.messagesCallbacks[uniqueId](jsonMessage);
                     }
                     break;
+
                 case 'CLOSE':
                     if (chatMessaging.messagesCallbacks[uniqueId]) {
                         chatMessaging.messagesCallbacks[uniqueId](jsonMessage);
@@ -1819,6 +1755,14 @@
                     }
                     break;
 
+                case 'RECEIVEMETADATA':
+                    // if (chatMessaging.messagesCallbacks[uniqueId]) {
+                    //     chatMessaging.messagesCallbacks[uniqueId](jsonMessage);
+                    // }
+                    handleReceivedMetaData(JSON.parse(jsonMessage.message));
+
+                    break;
+
                 case 'ERROR':
                     handleError(jsonMessage, params.sendingTopic, params.receiveTopic);
                     break;
@@ -1865,7 +1809,7 @@
                         result: messageContent
                     });
 
-                    currentCallId = messageContent.callId;
+                    //currentCallId = messageContent.callId;
 
                     break;
 
@@ -1912,6 +1856,8 @@
                             type: 'RECEIVE_CALL',
                             result: messageContent
                         });
+
+                        currentCallId = messageContent.callId;
                     } else {
                         chatEvents.fireEvent('callEvents', {
                             type: 'PARTNER_RECEIVED_YOUR_CALL',
@@ -1919,7 +1865,7 @@
                         });
                     }
 
-                    currentCallId = messageContent.callId;
+
 
                     break;
 
@@ -1960,6 +1906,7 @@
                             screenShare: messageContent.chatDataDto.screenShare,
                             brokerAddress: messageContent.chatDataDto.brokerAddressWeb,
                             turnAddress: messageContent.chatDataDto.turnAddress,
+                            selfData: messageContent.clientDTO,
                             clientsList: messageContent.otherClientDtoList
                         }, function (callDivs) {
                             chatEvents.fireEvent('callEvents', {
@@ -2067,10 +2014,10 @@
                  * Type 91    Send Group Call Request
                  */
                 case chatMessageVOTypes.GROUP_CALL_REQUEST:
+                    callRequestController.callRequestReceived = true;
                     callReceived({
                         callId: messageContent.callId
-                    }, function (r) {
-                    });
+                    }, function (r) {});
 
                     if (chatMessaging.messagesCallbacks[uniqueId]) {
                         chatMessaging.messagesCallbacks[uniqueId](Utility.createReturnData(false, '', 0, messageContent, contentCount));
@@ -2081,7 +2028,7 @@
                         result: messageContent
                     });
 
-                    currentCallId = messageContent.callId;
+                    //currentCallId = messageContent.callId;
 
                     break;
 
@@ -2098,9 +2045,16 @@
                         result: messageContent
                     });
 
-                    if (!!messageContent[0].sendTopic) {
-                        //removeFromCallUI(messageContent[0].sendTopic);
-                        callStateController.removeFromCallUI(messageContent[0].sendTopic)
+                    if (!!messageContent[0].userId) {
+                        //callStateController.removeFromCallUI(messageContent[0].sendTopic)
+                        callStateController.removeParticipant(messageContent[0].userId);
+                    }
+
+                    //If I'm the only call participant, stop the call
+                    if(callUsers) {
+                        if(Object.values(callUsers).length < 2) {
+                            callStop()
+                        }
                     }
 
                     break;
@@ -2122,6 +2076,28 @@
                     if (chatMessaging.messagesCallbacks[uniqueId]) {
                         chatMessaging.messagesCallbacks[uniqueId](Utility.createReturnData(false, '', 0, messageContent, contentCount));
                     }
+                    if(Array.isArray(messageContent)) {
+                        for (var i in messageContent) {
+                            var correctedData = {
+                                video: messageContent[i].video,
+                                mute: messageContent[i].mute,
+                                userId: messageContent[i].userId,
+                                topicSend: messageContent[i].sendTopic
+                            }
+                            callStateController.setupCallParticipant(correctedData);
+                            if(correctedData.video) {
+                                callStateController.startParticipantVideo(correctedData.userId);
+                            }
+                            if(!correctedData.mute) {
+                                callStateController.startParticipantAudio(correctedData.userId);
+                            }
+                        }
+                    }
+
+                    chatEvents.fireEvent('callEvents', {
+                        type: 'CALL_DIVS',
+                        result: generateCallUIList()
+                    });
 
                     chatEvents.fireEvent('callEvents', {
                         type: 'CALL_PARTICIPANT_JOINED',
@@ -2179,18 +2155,15 @@
                                     'audioTopicName',
                                     'mute'
                                 )
-                                /*if(callUsers[messageContent[i].userId]) {
-                                    callUsers[messageContent[i].userId].mute = true;
-
-                                    var user = callUsers[messageContent[i].userId];
-                                    clearInterval(callUsers[messageContent[i].userId].topicMetaData[user.audioTopicName].interval)
-                                    callStateController.removeTopic(messageContent[i].userId, user.audioTopicName);
-                                    callStateController.removeStreamFromWebRTC(messageContent[i].userId, user.audioTopicName);
-                                }*/
                             }
                         }
                     }
 
+                    chatEvents.fireEvent('callEvents', {
+                        type: 'CALL_DIVS',
+                        result: generateCallUIList()
+                    });
+
                     chatEvents.fireEvent('callEvents', {
                         type: 'CALL_PARTICIPANT_MUTE',
                         result: messageContent
@@ -2230,6 +2203,11 @@
                         }
                     }
 
+                    chatEvents.fireEvent('callEvents', {
+                        type: 'CALL_DIVS',
+                        result: generateCallUIList()
+                    });
+
                     chatEvents.fireEvent('callEvents', {
                         type: 'CALL_PARTICIPANT_UNMUTE',
                         result: messageContent
@@ -2279,16 +2257,6 @@
                                     messageContent[i].sendTopic,
                                     'video'
                                 );
-                                /*if(callUsers[messageContent[i].userId]) {
-                                    callUsers[messageContent[i].userId].video = true;
-                                    callUsers[messageContent[i].userId].videoTopicName = 'Vi-' + messageContent[i].sendTopic;
-
-                                    var user = callUsers[messageContent[i].userId];
-                                    callStateController.appendUserToCallDiv(messageContent[i].userId, callStateController.generateHTMLElements(messageContent[i].userId));
-                                    setTimeout(function () {
-                                        callStateController.createTopic(messageContent[i].userId, user.videoTopicName, 'video', 'receive');
-                                    })
-                                }*/
                             }
                         }
                     }
@@ -2321,13 +2289,6 @@
                                     'videoTopicName',
                                     'video'
                                 )
-                               /* if(callUsers[messageContent[i].userId]) {
-                                    callUsers[messageContent[i].userId].video = false;
-                                    var user = callUsers[messageContent[i].userId];
-                                    clearInterval(callUsers[messageContent[i].userId].topicMetaData[user.videoTopicName].interval)
-                                    callStateController.removeTopic(messageContent[i].userId, user.videoTopicName);
-                                    callStateController.removeStreamFromWebRTC(messageContent[i].userId, user.videoTopicName);
-                                }*/
                             }
                         }
                     }
@@ -2359,8 +2320,16 @@
                         result: messageContent
                     });
 
-                    //restartMedia(callTopics['sendVideoTopic']);
-                    restartMediaOnKeyFrame(chatMessaging.userInfo.id, 100)
+                    restartMediaOnKeyFrame(chatMessaging.userInfo.id, 4000);
+                    restartMediaOnKeyFrame(chatMessaging.userInfo.id, 8000);
+                    restartMediaOnKeyFrame(chatMessaging.userInfo.id, 12000);
+                    restartMediaOnKeyFrame(chatMessaging.userInfo.id, 25000);
+
+                    restartMediaOnKeyFrame("screenShare", 4000);
+                    restartMediaOnKeyFrame("screenShare", 8000);
+                    restartMediaOnKeyFrame("screenShare", 12000);
+                    restartMediaOnKeyFrame("screenShare", 25000);
+
                     break;
 
                 /**
@@ -2456,8 +2425,16 @@
                         result: messageContent
                     });
 
-                    //restartMedia(callTopics['sendVideoTopic']);
-                    restartMediaOnKeyFrame(chatMessaging.userInfo.id, 100)
+                    restartMediaOnKeyFrame(chatMessaging.userInfo.id, 4000);
+                    restartMediaOnKeyFrame(chatMessaging.userInfo.id, 8000);
+                    restartMediaOnKeyFrame(chatMessaging.userInfo.id, 12000);
+                    restartMediaOnKeyFrame(chatMessaging.userInfo.id, 25000);
+
+                    restartMediaOnKeyFrame("screenShare", 4000);
+                    restartMediaOnKeyFrame("screenShare", 8000);
+                    restartMediaOnKeyFrame("screenShare", 12000);
+                    restartMediaOnKeyFrame("screenShare", 25000);
+
                     break;
             }
         }
@@ -2485,8 +2462,8 @@
 
                 if (params.clientType
                     && typeof params.clientType === 'string'
-                    && callClientTypes[params.clientType.toUpperCase()] > 0) {
-                    content.creatorClientDto.clientType = callClientTypes[params.clientType.toUpperCase()];
+                    && callClientType[params.clientType.toUpperCase()] > 0) {
+                    content.creatorClientDto.clientType = callClientType[params.clientType.toUpperCase()];
                 } else {
                     content.creatorClientDto.clientType = callClientType.WEB;
                 }
@@ -2495,13 +2472,14 @@
                     content.threadId = +params.threadId;
                 } else {
                     if (Array.isArray(params.invitees)) {
-                        content.invitees = [];
-                        for (var i = 0; i < params.invitees.length; i++) {
-                            var tempInvitee = formatDataToMakeInvitee(params.invitees[i]);
-                            if (tempInvitee) {
-                                content.invitees.push(tempInvitee);
-                            }
-                        }
+                        content.invitees = params.invitees;
+
+                        //for (var i = 0; i < params.invitees.length; i++) {
+                            //var tempInvitee = params.invitees[i];
+                            //if (tempInvitee) {
+                                //content.invitees.push(tempInvitee);
+                            //}
+                        //}
                     } else {
                         chatEvents.fireEvent('error', {
                             code: 999,
@@ -2550,8 +2528,8 @@
 
                 content.creatorClientDto.mute = (typeof params.mute === 'boolean') ? params.mute : false;
 
-                if (params.clientType && typeof params.clientType === 'string' && callClientTypes[params.clientType.toUpperCase()] > 0) {
-                    content.creatorClientDto.clientType = callClientTypes[params.clientType.toUpperCase()];
+                if (params.clientType && typeof params.clientType === 'string' && callClientType[params.clientType.toUpperCase()] > 0) {
+                    content.creatorClientDto.clientType = callClientType[params.clientType.toUpperCase()];
                 } else {
                     content.creatorClientDto.clientType = callClientType.WEB;
                 }
@@ -2560,13 +2538,14 @@
                     content.threadId = +params.threadId;
                 } else {
                     if (Array.isArray(params.invitees)) {
-                        content.invitees = [];
-                        for (var i = 0; i < params.invitees.length; i++) {
-                            var tempInvitee = formatDataToMakeInvitee(params.invitees[i]);
-                            if (tempInvitee) {
-                                content.invitees.push(tempInvitee);
-                            }
-                        }
+                        content.invitees = params.invitees;
+
+                        //for (var i = 0; i < params.invitees.length; i++) {
+                        //var tempInvitee = params.invitees[i];
+                        //if (tempInvitee) {
+                        //content.invitees.push(tempInvitee);
+                        //}
+                        //}
                     } else {
                         chatEvents.fireEvent('error', {
                             code: 999,
@@ -2585,6 +2564,10 @@
                 return;
             }
 
+            callRequestController.cameraPaused = (typeof params.cameraPaused === 'boolean') ? params.cameraPaused : false;
+            callRequestController.callRequestReceived = true;
+            callRequestController.callEstablishedInMySide = true;
+
             return chatMessaging.sendMessage(startCallData, {
                 onResult: function (result) {
                     callback && callback(result);
@@ -2656,8 +2639,8 @@
 
                 callRequestController.cameraPaused = (typeof params.cameraPaused === 'boolean') ? params.cameraPaused : callRequestController.cameraPaused;
 
-                if (params.clientType && typeof params.clientType === 'string' && callClientTypes[params.clientType.toUpperCase()] > 0) {
-                    content.clientType = callClientTypes[params.clientType.toUpperCase()];
+                if (params.clientType && typeof params.clientType === 'string' && callClientType[params.clientType.toUpperCase()] > 0) {
+                    content.clientType = callClientType[params.clientType.toUpperCase()];
                 } else {
                     content.clientType = callClientType.WEB;
                 }
@@ -3204,10 +3187,6 @@
                 'audioTopicName',
                 'mute'
             )
-/*
-            callStateController.removeTopic(chatMessaging.userInfo.id, callUsers[chatMessaging.userInfo.id].audioTopicName)
-            callStateController.removeStreamFromWebRTC(chatMessaging.userInfo.id, callUsers[chatMessaging.userInfo.id].audioTopicName)
-*/
 
             return chatMessaging.sendMessage(sendMessageParams, {
                 onResult: function (result) {
@@ -3259,16 +3238,6 @@
                 callUsers[myId].topicSend,
                 'mute'
             );
-            /*if(callUsers[myId]) {
-                callUsers[myId].mute = false;
-                callUsers[myId].audioTopicName = 'Vo-' + callUsers[myId].topicSend;
-
-                var user = callUsers[myId];
-                callStateController.appendUserToCallDiv(myId, callStateController.generateHTMLElements(myId));
-                setTimeout(function () {
-                    callStateController.createTopic(myId, user.audioTopicName, 'audio', 'send');
-                })
-            }*/
 
             return chatMessaging.sendMessage(sendMessageParams, {
                 onResult: function (result) {