podchat 12.3.0 → 12.5.1

package/changelog.md

@@ -3,6 +3,32 @@
 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)
 
+## [12.5.0] - 11-7-2022
+### Added
+- Global typeCode and typeCodeOwnerId
+- event type: SWITCH_TO_GROUP_CALL_REQUEST , RECORD_CALL_STARTED
+- callId to event type: CALL_STARTED
+
+### Changed
+- Removed contentCount from hasNext calculation in getThreads and getHistory
+
+### Fixed
+- Bug in GET_CALLS_TO_JOIN
+
+## [12.4.0] - 24-5-2022
+### Added
+- Parameter: threadInfo in startCall and startGroupCall
+- Parameter: joinCall to acceptCall
+- Parameter: threadId to getCallsList
+- Method: getCallsToJoin
+
+### Fixed
+- error on eventType that has no callback
+
+
+## [12.3.0] - 26-4-2022
+### Added
+- callNoAnswerTimeout to SDK configs
 
 
 ## [12.2.0] - 23-1-2022

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "podchat",
-  "version": "12.3.0",
+  "version": "12.5.1",
   "description": "Javascript SDK to use POD's Chat Service",
   "main": "./src/chat.js",
   "scripts": {
@@ -8,7 +8,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 12.3.0"
+    "version:release": "npm version 12.5.1"
   },
   "repository": {
     "type": "git",

package/src/chat.js

@@ -67,6 +67,7 @@
             userInfo,
             token = params.token,
             generalTypeCode = params.typeCode || 'default',
+            typeCodeOwnerId = params.typeCodeOwnerId || null,
             mapApiKey = params.mapApiKey || '8b77db18704aa646ee5aaea13e7370f4f88b9e8c',
             deviceId,
             isNode = Utility.isNode(),
@@ -196,8 +197,12 @@
                 DESTINATED_RECORD_CALL: 126,
                 ASSISTANT_CALL_STARTED: 127,
                 ASSISTANT_CALL_ENDED: 128,
+                GET_CALLS_TO_JOIN: 129,
                 EXPORT_CHAT: 152,
 
+                SWITCH_TO_GROUP_CALL_REQUEST: 221,
+                RECORD_CALL_STARTED: 222,
+
                 ERROR: 999
             },
             inviteeVOidTypes = {
@@ -395,7 +400,6 @@
             callRequestTimeout = (typeof params.callRequestTimeout === 'number' && params.callRequestTimeout >= 0) ? params.callRequestTimeout : 10000,
             callNoAnswerTimeout = params.callOptions && params.callOptions.callNoAnswerTimeout ? params.callOptions.callNoAnswerTimeout : 0;
 
-
         /*******************************************************
          *            P R I V A T E   M E T H O D S            *
          *******************************************************/
@@ -1522,10 +1526,14 @@
                     tokenIssuer: 1
                 };
 
-                if (params.typeCode) {
-                    messageVO.typeCode = params.typeCode;
-                } else if (generalTypeCode) {
+                if (params.typeCode || generalTypeCode) {
+                    messageVO.typeCode = generalTypeCode;//params.typeCode;
+                }/* else if (generalTypeCode) {
                     messageVO.typeCode = generalTypeCode;
+                }*/
+
+                if(typeCodeOwnerId) {
+                    messageVO.ownerId = typeCodeOwnerId;
                 }
 
                 if (params.messageType) {
@@ -1825,6 +1833,10 @@
              * @return {undefined}
              */
             chatMessageHandler = function (chatMessage) {
+                if(chatMessage.typeCode && chatMessage.typeCode !== generalTypeCode) {
+                    return;
+                }
+
                 var threadId = chatMessage.subjectId,
                     type = chatMessage.type,
                     // TODO Check this again
@@ -3262,6 +3274,7 @@
                             messagesCallbacks[uniqueId](Utility.createReturnData(false, '', 0, messageContent, contentCount));
                         }
 
+                        messageContent.callId = threadId;
                         fireEvent('callEvents', {
                             type: 'CALL_STARTED',
                             result: messageContent
@@ -3600,6 +3613,52 @@
 
                         break;
 
+                    /**
+                     * Type 129   Get Calls To Join
+                     */
+                    case chatMessageVOTypes.GET_CALLS_TO_JOIN:
+                        if (messagesCallbacks[uniqueId]) {
+                            messagesCallbacks[uniqueId](Utility.createReturnData(false, '', 0, messageContent, contentCount));
+                        }
+                        break;
+
+                    /**
+                     * Type 152    Gives us a json to export for user
+                     */
+                    case chatMessageVOTypes.EXPORT_CHAT:
+                        if (messagesCallbacks[uniqueId]) {
+                            messagesCallbacks[uniqueId](Utility.createReturnData(false, '', 0, messageContent, contentCount, uniqueId));
+                        }
+
+                        break;
+
+
+                    /**
+                     * Type 221  Event to tell us p2p call converted to a group call
+                     */
+                    case chatMessageVOTypes.SWITCH_TO_GROUP_CALL_REQUEST:
+                        fireEvent('callEvents', {
+                            type: 'SWITCH_TO_GROUP_CALL',
+                            result: messageContent //contains: isGroup, callId, threadId
+                        });
+
+                        break;
+
+                    /**
+                     * Type 222    Call Recording Started
+                     */
+                    case chatMessageVOTypes.RECORD_CALL_STARTED:
+                        if (messagesCallbacks[uniqueId]) {
+                            messagesCallbacks[uniqueId](Utility.createReturnData(false, '', 0, messageContent, contentCount));
+                        }
+
+                        fireEvent('callEvents', {
+                            type: 'CALL_RECORDING_STARTED',
+                            result: messageContent
+                        });
+
+                        break;
+
                     /**
                      * Type 999   All unknown errors
                      */
@@ -4964,7 +5023,7 @@
                                 resultData = {
                                     threads: [],
                                     contentCount: result.contentCount,
-                                    hasNext: (offset + count < result.contentCount && messageLength > 0),
+                                    hasNext: messageContent && !(messageLength < count),//(offset + count < result.contentCount && messageLength > 0),
                                     nextOffset: offset + messageLength
                                 },
                                 threadData;
@@ -6248,8 +6307,7 @@
                                     var resultData = {
                                         history: history,
                                         contentCount: result.contentCount,
-                                        hasNext: (sendMessageParams.content.offset + sendMessageParams.content.count < result.contentCount &&
-                                            messageLength > 0),
+                                        hasNext: result.result && !(result.result.length < sendMessageParams.content.count),//(sendMessageParams.content.offset + sendMessageParams.content.count < result.contentCount &&messageLength > 0),
                                         nextOffset: sendMessageParams.content.offset + messageLength
                                     };
 
@@ -8213,7 +8271,8 @@
                     }
                 }
                 for (var id in eventCallbacks[eventName]) {
-                    eventCallbacks[eventName][id](param);
+                    if(eventCallbacks[eventName] && eventCallbacks[eventName][id])
+                        eventCallbacks[eventName][id](param);
                 }
             },
 
@@ -10272,6 +10331,193 @@
             });
         };
 
+        function requestExportChat(stackArr, wantedCount, stepCount, offset, sendData) {
+            sendData.content.offset = offset;
+            sendData.content.count = stepCount;
+            return new Promise(function(resolve, reject){
+                return sendMessage(sendData, {
+                    onResult: function (result) {
+
+                        var returnData = {
+                            hasError: result.hasError,
+                            cache: false,
+                            errorMessage: result.errorMessage,
+                            errorCode: result.errorCode
+                        };
+
+                        if (!returnData.hasError) {
+                            for(var i in result.result) {
+                                stackArr.push(result.result[i]);
+                            }
+
+                            consoleLogging && console.log("[SDK][exportChat] a step passed...");
+                            wantedCount = wantedCount > result.contentCount ? result.contentCount : wantedCount;
+                            setTimeout(function () {
+                                fireEvent('threadEvents', {
+                                    type: 'EXPORT_CHAT',
+                                    subType: 'IN_PROGRESS',
+                                    threadId: sendData.subjectId,
+                                    percent: Math.floor((stackArr.length / wantedCount) * 100)
+                                });
+
+                                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);
+                                }
+                            });
+                        } else {
+                            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)
+                            }
+                        }
+                    }
+                });
+            })
+        }
+
+        this.exportChat = function (params, callback) {
+            var stackArr = [], wantedCount = 10000, stepCount = 500, offset = 0;
+            var sendData = {
+                chatMessageVOType: chatMessageVOTypes.EXPORT_CHAT,
+                typeCode: generalTypeCode,//params.typeCode,
+                content: {
+                    offset: +params.offset > 0 ? +params.offset : offset,
+                    count: +params.count > 0 ? +params.count : wantedCount,//config.getHistoryCount,
+                },
+                subjectId: params.threadId
+            };
+
+            if (+params.fromTime > 0 && +params.fromTime < 9999999999999) {
+                sendData.content.fromTime = +params.fromTime;
+            }
+
+            if (+params.toTime > 0 && +params.toTime < 9999999999999) {
+                sendData.content.toTime = +params.toTime;
+            }
+
+            if(+params.wantedCount > 0) {
+                wantedCount = params.wantedCount;
+            }
+
+            if(+params.stepCount > 0) {
+                stepCount = params.stepCount;
+            }
+
+            if(+params.offset > 0) {
+                offset = params.offset;
+            }
+
+            // 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;
+
+            consoleLogging && console.log("[SDK][exportChat] Starting...");
+            requestExportChat(stackArr, wantedCount, stepCount, offset, sendData).then(function (resultArray) {
+                consoleLogging && console.log("[SDK][exportChat] Export done..., Now converting...");
+
+                if(!params.exportPath) {
+                    callback && callback({
+                        hasError: false,
+                        result: resultArray
+                    });
+                    fireEvent('threadEvents', {
+                        type: 'EXPORT_CHAT',
+                        subType: 'DONE',
+                        threadId: sendData.subjectId,
+                        result: resultArray
+                    });
+
+                    return;
+                }
+
+                var str = ''
+                    , universalBOM = "\uFEFF";
+
+                str += "\u{62A}\u{627}\u{631}\u{6CC}\u{62E} " + ','; //tarikh
+                str += " \u{633}\u{627}\u{639}\u{62A} " + ','; //saat
+                str += "\u{646}\u{627}\u{645} \u{641}\u{631}\u{633}\u{62A}\u{646}\u{62F}\u{647}" + ',';//name ferestande
+                str += "\u{646}\u{627}\u{645} \u{6A9}\u{627}\u{631}\u{628}\u{631}\u{6CC} \u{641}\u{631}\u{633}\u{62A}\u{646}\u{62F}\u{647}" + ','; //name karbariye ferestande
+                str += "\u{645}\u{62A}\u{646} \u{67E}\u{6CC}\u{627}\u{645}" + ',';//matne payam
+                str += '\r\n';
+                var line = '', radif = 1;
+                for (var i = 0; i < resultArray.length; i++) {
+                    line = '';
+
+                    if(resultArray[i].messageType !== 1) {
+                        continue;
+                    }
+
+                    var sender = '';
+                    if(resultArray[i].participant.contactName) {
+                        sender = resultArray[i].participant.contactName + ',';
+                    } else {
+                        if(resultArray[i].participant.firstName) {
+                            sender = resultArray[i].participant.firstName + ' ';
+                        }
+                        if(resultArray[i].participant.lastName) {
+                            sender += resultArray[i].participant.lastName;
+                        }
+                        sender += ','
+                    }
+
+                    line += new Date(resultArray[i].time).toLocaleDateString('fa-IR') + ',';
+                    line += new Date(resultArray[i].time).toLocaleTimeString('fa-IR') + ',';
+                    line += sender;
+                    line += resultArray[i].participant.username + ',';
+                    line += '"' + resultArray[i].message.replace(/,/g, "،").replace(/"/g, '”') + '",';
+                    // line += result[i].message.replaceAll(",", ".").replace(/(\r\n|\n|\r)/gm, " ") + ',';
+                    str += line + '\r\n';
+                    radif++;
+                }
+
+
+                FS.writeFile(params.exportPath, universalBOM + str, {encoding: 'utf8'}, function (err) {
+                    if (err){
+                        fireEvent('ERROR', {
+                            code: null,
+                            message: err
+                        });
+                        callback && callback({
+                            hasError: true,
+                            code: null,
+                            message: err
+                        });
+                    }
+
+                    callback && callback({
+                        hasError: false,
+                        result: resultArray,
+                        exportPath: params.exportPath
+                    });
+
+                    fireEvent('threadEvents', {
+                        type: 'EXPORT_CHAT',
+                        subType: 'EXPORTED_TO_DIRECTORY',
+                        threadId: sendData.subjectId,
+                        exportPath: params.exportPath,
+                        result: resultArray
+                    });
+
+
+                });
+
+                callback = undefined;
+            })
+        }
+
         this.getImage = getImage;
 
         this.getFile = getFile;
@@ -12471,6 +12717,13 @@
                     }
                 }
 
+                if(params.threadInfo
+                    && (params.threadInfo.metadata
+                        || params.threadInfo.uniqueName)
+                ) {
+                    content.createCallThreadRequest = params.threadInfo
+                }
+
                 startCallData.content = JSON.stringify(content);
             } else {
                 fireEvent('error', {
@@ -12556,6 +12809,15 @@
                     }
                 }
 
+                if(params.threadInfo
+                    && (params.threadInfo.title
+                        || params.threadInfo.description
+                        || params.threadInfo.metadata
+                        || params.threadInfo.uniqueName)
+                ) {
+                    content.createCallThreadRequest = params.threadInfo
+                }
+
                 startCallData.content = JSON.stringify(content);
             } else {
                 fireEvent('error', {
@@ -12644,6 +12906,11 @@
                 }
 
                 acceptCallData.content = JSON.stringify(content);
+
+                if(params.joinCall) {
+                    callRequestController.callRequestReceived = true;
+                    currentCallId = params.callId;
+                }
             } else {
                 fireEvent('error', {
                     code: 999,
@@ -12735,6 +13002,10 @@
                     content.callIds = params.callIds;
                 }
 
+                if (typeof params.threadId === 'number' && +params.threadId > 0) {
+                    content.threadId = +params.threadId;
+                }
+
                 if (typeof params.contactType === 'string') {
                     content.contactType = params.contactType;
                 }
@@ -12759,6 +13030,62 @@
             });
         };
 
+        this.getCallsToJoin = function (params, callback) {
+            var getCallListData = {
+                chatMessageVOType: chatMessageVOTypes.GET_CALLS_TO_JOIN,
+                pushMsgType: 3,
+                token: token
+            }, content = {};
+
+            if (params) {
+                if (typeof params.count === 'number' && params.count >= 0) {
+                    content.count = +params.count;
+                } else {
+                    content.count = 50;
+                }
+
+                if (typeof params.offset === 'number' && params.offset >= 0) {
+                    content.offset = +params.offset;
+                } else {
+                    content.offset = 0;
+                }
+
+                if (typeof params.creatorSsoId === 'number' && params.creatorSsoId > 0) {
+                    content.creatorSsoId = +params.creatorSsoId;
+                }
+
+                if (typeof params.name === 'string') {
+                    content.name = params.name;
+                }
+
+                if (typeof params.type === 'string' && callTypes.hasOwnProperty(params.type.toUpperCase())) {
+                    content.type = callTypes[params.type.toUpperCase()];
+                }
+
+                if (Array.isArray(params.threadIds)) {
+                    content.threadIds = params.threadIds;
+                }
+
+                if (typeof params.uniqueId === 'string') {
+                    content.uniqueId = params.uniqueId;
+                }
+
+                getCallListData.content = JSON.stringify(content);
+            } else {
+                fireEvent('error', {
+                    code: 999,
+                    message: 'Invalid params'
+                });
+                return;
+            }
+
+            return sendMessage(getCallListData, {
+                onResult: function (result) {
+                    callback && callback(result);
+                }
+            });
+        };
+
         this.getCallParticipants = function (params, callback) {
             var sendMessageParams = {
                 chatMessageVOType: chatMessageVOTypes.ACTIVE_CALL_PARTICIPANTS,

package/config.js

@@ -1,59 +0,0 @@
-var CONFIG = {
-    // token: '1cfce37b60d4421db870e67dcfe407d9', // gameBOT
-    // token: '567179f126d84277b8dced22599e0b82', // takiBOT
-    // token: '1a9d91ccb4d5431b89dd74f7e0bb417b', // talkyBOT
-    // token: 'd10237d19ad24ba089f66bdfe3de9974', // Clasor
-    // token: "b135febd870746f88032df84dfb01c85", // Clasor Test BOT
-    token: 'b45fa3d386f54e34b82d81a11bc27e90',
-
-    // Permenant Integration Tokens
-    // token: "3dd6895c8dc64f93bcd43b58dcc2aab3", // Masoud Amjadi
-    // token: "9c627a9125d04ebf8455bf57bb33d2a9", // Pooria Pahlevani
-    // token: "f6464d4e0f044314b1a668f90287ba26", // Nadia Anvari
-    // token: "99506f7c32c849a9a6e2a954303b81ee", // Farhad Kheirkhah
-    // token: "979aa5de03934c73a5c6c855bd80cb04", // Mahyar Zhiani
-    // token: "a47c9016c8354236abc01395093bed5c", // Ahmad Sajadi
-    // token: "d3114ed2fd2a49b4a0a386e727c9e5fa", // Saba Safavi
-    // token: "872110b9c6944eda9bc98ef2a68dcf50", // Leila Nemati
-
-    // ActiveMQ Connection config
-    // queueHost: "10.56.16.25",
-    // queuePort: "61613",
-    // queueUsername: "root",
-    // queuePassword: "zalzalak",
-    // queueReceive: "queue-in-amjadi-stomp",
-    // queueSend: "queue-out-amjadi-stomp",
-
-    // Neshan Map Api Token
-    mapApiKey: '8b77db18704aa646ee5aaea13e7370f4f88b9e8c',
-
-    // Main Server
-    main: {
-        socketAddress: 'wss://msg.pod.ir/ws',
-        ssoHost: 'https://accounts.pod.ir',
-        platformHost: 'https://api.pod.ir/srv/core',
-        fileServer: 'https://core.pod.ir',
-        podSpaceFileServer: 'https://podspace.podland.ir',
-        serverName: 'chat-server'
-    },
-
-    // Sand Box Server
-    sandbox: {
-        socketAddress: "wss://chat-sandbox.pod.ir/ws",
-        ssoHost: "https://accounts.pod.ir",
-        platformHost: "https://sandbox.pod.ir:8043/srv/basic-platform",
-        fileServer: 'https://core.pod.ir',
-        podSpaceFileServer: 'http://sandbox.podspace.ir:8080',
-        serverName: "chat-server"
-    },
-
-    // Integration Server
-    integration: {
-        socketAddress: "ws://172.16.110.235:8003/ws",
-        ssoHost: "http://172.16.110.76",
-        platformHost: "http://172.16.110.235:8003/srv/bptest-core",
-        fileServer: 'https://core.pod.ir',
-        podSpaceFileServer: 'http://172.16.110.61:8780/podspace',
-        serverName: "chatlocal"
-    }
-}