podchat-browser 11.3.4 → 11.4.1-snapshot.0

package/changelog.md

@@ -4,9 +4,14 @@ All notable changes to this project will be documented here.
 to see complete list of changelog please visit [ChangeLog](https://github.com/masoudmanson/pod-chat/blob/master/changelog.md)
 
 
-## [Unreleased]
+## [11.3.4] - 2021-12-04
 
--   Search in threads metadata
+### Fixed
+- Screenshare reconnect in current call
+- Interval error when peer not fully connected
+
+### Added
+- Sample code of preventing async error when sending multiple file messages
 
 
 ## [4.10.0] - 2019-06-24

package/examples/index.html

@@ -3097,8 +3097,8 @@ Thread: <input type="text" id="threadInput" autocomplete="on" width="500">
             threadId: inp,
             autoStartDownload: true,
             responseType: 'link',
-            wantedCount: 255,
-            stepCount: 100
+            wantedCount: 10000,
+            stepCount: 1000
         }, result => {
             console.log(result);
         })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "podchat-browser",
-  "version": "11.3.4",
+  "version": "11.4.1-snapshot.0",
   "description": "Javascript SDK to use POD's Chat Service - Browser Only",
   "main": "./src/chat.js",
   "scripts": {
@@ -9,7 +9,7 @@
     "publish:snapshot": "npm run version:snapshot && npm publish --tag snapshot",
     "version:snapshot": "npm version prerelease --preid snapshot",
     "publish:release": "npm run version:release && npm publish",
-    "version:release": "npm version 11.3.4"
+    "version:release": "npm version 11.4.0"
   },
   "repository": {
     "type": "git",

package/src/call.module.js

@@ -488,172 +488,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 +725,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) {
@@ -1725,7 +1604,7 @@
 
             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);
             };
@@ -1960,6 +1839,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 +1947,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));
@@ -2098,9 +1978,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 +2009,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 +2088,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 +2136,11 @@
                         }
                     }
 
+                    chatEvents.fireEvent('callEvents', {
+                        type: 'CALL_DIVS',
+                        result: generateCallUIList()
+                    });
+
                     chatEvents.fireEvent('callEvents', {
                         type: 'CALL_PARTICIPANT_UNMUTE',
                         result: messageContent
@@ -2279,16 +2190,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 +2222,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 +2253,15 @@
                         result: messageContent
                     });
 
-                    //restartMedia(callTopics['sendVideoTopic']);
-                    restartMediaOnKeyFrame(chatMessaging.userInfo.id, 100)
+                    restartMediaOnKeyFrame(chatMessaging.userInfo.id, 2000);
+                    restartMediaOnKeyFrame(chatMessaging.userInfo.id, 4000);
+                    restartMediaOnKeyFrame(chatMessaging.userInfo.id, 8000);
+                    restartMediaOnKeyFrame(chatMessaging.userInfo.id, 12000);
+
+                    restartMediaOnKeyFrame("screenShare", 2000);
+                    restartMediaOnKeyFrame("screenShare", 4000);
+                    restartMediaOnKeyFrame("screenShare", 8000);
+                    restartMediaOnKeyFrame("screenShare", 12000);
                     break;
 
                 /**
@@ -2456,8 +2357,15 @@
                         result: messageContent
                     });
 
-                    //restartMedia(callTopics['sendVideoTopic']);
-                    restartMediaOnKeyFrame(chatMessaging.userInfo.id, 100)
+                    restartMediaOnKeyFrame(chatMessaging.userInfo.id, 2000);
+                    restartMediaOnKeyFrame(chatMessaging.userInfo.id, 4000);
+                    restartMediaOnKeyFrame(chatMessaging.userInfo.id, 8000);
+                    restartMediaOnKeyFrame(chatMessaging.userInfo.id, 12000);
+
+                    restartMediaOnKeyFrame("screenShare", 2000);
+                    restartMediaOnKeyFrame("screenShare", 4000);
+                    restartMediaOnKeyFrame("screenShare", 8000);
+                    restartMediaOnKeyFrame("screenShare", 12000);
                     break;
             }
         }
@@ -2485,8 +2393,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 +2403,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 +2459,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 +2469,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 +2495,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 +2570,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;
                 }

package/src/chat.js

@@ -1,4 +1,4 @@
-'use strict';
+'use strict';
 
 (function () {
     /*
@@ -13535,25 +13535,22 @@
 
                                 if(stackArr.length < wantedCount) {
                                     stepCount = wantedCount - stackArr.length < stepCount ? wantedCount - stackArr.length : stepCount;
+                                    //setTimeout(function () {
                                     resolve(requestExportChat(stackArr, wantedCount, stepCount, stackArr.length, sendData));
+                                    //}, 1000)
                                 } else {
                                     resolve(stackArr);
                                 }
                             });
-                            /*returnData.result = result;*/
-                            /*var messageContent = result.result,
-                                messageLength = messageContent.length,
-                                resultData = {
-                                    participants: formatDataToMakeAssistantHistoryList(messageContent),
-                                    contentCount: result.contentCount,
-                                    hasNext: (sendData.content.offset + sendData.content.count < result.contentCount && messageLength > 0),
-                                    nextOffset: sendData.content.offset * 1 + messageLength * 1
-                                };
-
-                            returnData.result = resultData;*/
                         } else {
-                            consoleLogging && console.log("[SDK][exportChat] Problem in one step... . Rerunning the request.", wantedCount, stepCount, stackArr.length, sendData, result);
-                            resolve(requestExportChat(stackArr, wantedCount, stepCount, stackArr.length, sendData))
+                            if(result.errorCode !== 21) {
+                                consoleLogging && console.log("[SDK][exportChat] Problem in one step... . Rerunning the request.", wantedCount, stepCount, stackArr.length, sendData, result);
+                                setTimeout(function () {
+                                    resolve(requestExportChat(stackArr, wantedCount, stepCount, stackArr.length, sendData))
+                                }, 2000)
+                            } else {
+                                reject(result)
+                            }
                         }
                     }
                 });
@@ -13592,9 +13589,10 @@
                 offset = params.offset;
             }
 
-            if (params.messageType && typeof params.messageType.toUpperCase() !== 'undefined' && chatMessageTypes[params.messageType.toUpperCase()] > 0) {
-                sendData.content.messageType = chatMessageTypes[params.messageType.toUpperCase()];
-            }
+            // if (params.messageType && typeof params.messageType.toUpperCase() !== 'undefined' && chatMessageTypes[params.messageType.toUpperCase()] > 0) {
+            //     sendData.content.messageType = chatMessageTypes[params.messageType.toUpperCase()];
+            // }
+            sendData.content.messageType = 1;
 
             if(wantedCount < stepCount)
                 stepCount = wantedCount;
@@ -13607,7 +13605,47 @@
                     responseType = params.responseType !== null ? params.responseType : "blob",
                     autoStartDownload = params.autoStartDownload !== null ? params.autoStartDownload : true
 
-                var blob = new Blob([Utility.convertToCSV(result)], { type: 'text/csv;charset=utf-8;' });
+                var str = ''
+                    , universalBOM = "\uFEFF";
+
+                console.log(result);
+                str += "تاریخ " + ',';
+                str += " ساعت " + ',';
+                str += "نام فرستنده" + ',';
+                str += "نام کاربری فرستنده" + ',';
+                str += "متن پیام" + ',';
+                str += '\r\n';
+                var line = '', radif = 1;
+                for (var i = 0; i < result.length; i++) {
+                    line = '';
+
+                    if(result[i].messageType !== 1) {
+                        continue;
+                    }
+
+                    var sender = '';
+                    if(result[i].participant.contactName) {
+                        sender = result[i].participant.contactName + ',';
+                    } else {
+                        if(result[i].participant.firstName) {
+                            sender = result[i].participant.firstName + ' ';
+                        }
+                        if(result[i].participant.lastName) {
+                            sender += result[i].participant.lastName;
+                        }
+                        sender += ','
+                    }
+
+                    line += new Date(result[i].time).toLocaleDateString('fa-IR') + ',';
+                    line += new Date(result[i].time).toLocaleTimeString('fa-IR') + ',';
+                    line += sender;
+                    line += result[i].participant.username + ',';
+                    line += result[i].message.replaceAll(",", ".").replace(/(\r\n|\n|\r)/gm, " ") + ',';
+
+                    str += line + '\r\n';
+                    radif++;
+                }
+                var blob = new Blob([str], { type: 'text/csv;charset=utf-8;' });
                 chatEvents.fireEvent('threadEvents', {
                     type: 'EXPORT_CHAT',
                     subType: 'DONE',
@@ -13630,7 +13668,7 @@
                         url = URL.createObjectURL(blob);
                     //if (link.download !== undefined) { // feature detection
                         // Browsers that support HTML5 download attribute
-                    link.setAttribute("href", url);
+                    link.setAttribute("href", 'data:text/csv; charset=utf-8,' + encodeURIComponent(universalBOM + str));
                     link.setAttribute("download", exportedFilename);
                     if(autoStartDownload) {
                         link.style.visibility = 'hidden';
@@ -13653,7 +13691,9 @@
                 }
                 //}
                 callback = undefined;
-            });
+            })/*.catch(function (result) {
+                consoleLogging && console.log(result);
+            });*/
         }
 
         this.startCall = callModule.startCall;