podchat 12.2.0 → 12.5.0

package/changelog.md

@@ -3,6 +3,39 @@
 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
+- Added global typeCode and typeCodeOwnerId
+- Added SWITCH_TO_GROUP_CALL_REQUEST , RECORD_CALL_STARTED , fixed GET_CALLS_TO_JOIN
+- Added callId to event type: CALL_STARTED
+- Removed contentCount from hasNext calculation in getThreads and getHistory
+
+
+## [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
+### Added
+- callId in END CALL events
+
+### Changed
+- idType as string in invitees list for startCall and startGroupCall
+
+### Fixed
+- fixed errors on newMessageHandler
 
 
 ## [11.4.0] - 11-12-2021

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "podchat",
-  "version": "12.2.0",
+  "version": "12.5.0",
   "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.2.0"
+    "version:release": "npm version 12.5.0"
   },
   "repository": {
     "type": "git",

package/src/chat.js

@@ -61,11 +61,13 @@
         var Utility = new ChatUtility();
 
         var asyncClient,
+            currentModuleInstance = this,
             peerId,
             oldPeerId,
             userInfo,
             token = params.token,
             generalTypeCode = params.typeCode || 'default',
+            typeCodeOwnerId = params.typeCodeOwnerId || null,
             mapApiKey = params.mapApiKey || '8b77db18704aa646ee5aaea13e7370f4f88b9e8c',
             deviceId,
             isNode = Utility.isNode(),
@@ -195,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 = {
@@ -374,6 +380,7 @@
             },
             currentCallParams = {},
             currentCallId = null,
+            newCallId = null,
             callClientType = {
                 WEB: 1,
                 ANDROID: 2,
@@ -390,8 +397,8 @@
             callStopQueue = {
                 callStarted: false,
             },
-            callRequestTimeout = (typeof params.callRequestTimeout === 'number' && params.callRequestTimeout >= 0) ? params.callRequestTimeout : 10000;
-
+            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            *
@@ -1519,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) {
@@ -1822,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
@@ -3166,6 +3181,19 @@
                             result: messageContent
                         });
 
+                        if (messageContent.callId > 0) {
+                            if(!currentCallId ) {
+                                currentCallId = messageContent.callId;
+                            }
+                            else
+                                newCallId = messageContent.callId;
+                        } else {
+                            fireEvent('callEvents', {
+                                type: 'PARTNER_RECEIVED_YOUR_CALL',
+                                result: messageContent
+                            });
+                        }
+
                         currentCallId = messageContent.callId;
 
                         break;
@@ -3213,6 +3241,11 @@
                                 type: 'RECEIVE_CALL',
                                 result: messageContent
                             });
+                            if(!currentCallId ) {
+                                currentCallId = messageContent.callId;
+                            }
+                            else
+                                newCallId = messageContent.callId;
                         } else {
                             fireEvent('callEvents', {
                                 type: 'PARTNER_RECEIVED_YOUR_CALL',
@@ -3220,7 +3253,7 @@
                             });
                         }
 
-                        currentCallId = messageContent.callId;
+                        // currentCallId = messageContent.callId;
 
                         break;
 
@@ -3241,6 +3274,7 @@
                             messagesCallbacks[uniqueId](Utility.createReturnData(false, '', 0, messageContent, contentCount));
                         }
 
+                        messageContent.callId = threadId;
                         fireEvent('callEvents', {
                             type: 'CALL_STARTED',
                             result: messageContent
@@ -3326,12 +3360,19 @@
                             messagesCallbacks[uniqueId](Utility.createReturnData(false, '', 0, messageContent, contentCount));
                         }
 
+                        if (messageContent.callId > 0) {
+                            if(!currentCallId )
+                                currentCallId = messageContent.callId;
+                            else
+                                newCallId = messageContent.callId;
+                        }
+
                         fireEvent('callEvents', {
                             type: 'RECEIVE_CALL',
                             result: messageContent
                         });
 
-                        currentCallId = messageContent.callId;
+                        // currentCallId = messageContent.callId;
 
                         break;
 
@@ -3460,8 +3501,12 @@
                             type: 'CALL_SESSION_CREATED',
                             result: messageContent
                         });
+                        if(!currentCallId)
+                            currentCallId = messageContent.callId;
+                        else
+                            newCallId = messageContent.callId;
 
-                        currentCallId = messageContent.callId;
+                        // currentCallId = messageContent.callId;
 
                         break;
 
@@ -3568,6 +3613,42 @@
 
                         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 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
                      */
@@ -4932,7 +5013,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;
@@ -6216,8 +6297,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
                                     };
 
@@ -8181,7 +8261,8 @@
                     }
                 }
                 for (var id in eventCallbacks[eventName]) {
-                    eventCallbacks[eventName][id](param);
+                    if(eventCallbacks[eventName] && eventCallbacks[eventName][id])
+                        eventCallbacks[eventName][id](param);
                 }
             },
 
@@ -12439,6 +12520,13 @@
                     }
                 }
 
+                if(params.threadInfo
+                    && (params.threadInfo.metadata
+                        || params.threadInfo.uniqueName)
+                ) {
+                    content.createCallThreadRequest = params.threadInfo
+                }
+
                 startCallData.content = JSON.stringify(content);
             } else {
                 fireEvent('error', {
@@ -12451,6 +12539,23 @@
             callRequestController.callRequestReceived = true;
             callRequestController.callEstablishedInMySide = true;
 
+            if(callNoAnswerTimeout) {
+                //TODO: Remove timeout when call ends fast
+                setTimeout( function(metaData) {
+                    //Reject the call if participant didn't answer
+                    if(!callStopQueue.callStarted ) {
+                        fireEvent("callEvents", {
+                            type: "CALL_NO_ANSWER_TIMEOUT",
+                            message: "Call request timed out, Participant(s) didn't answer",
+                        });
+
+                        metaData.callInstance.rejectCall({
+                            callId: currentCallId
+                        });
+                    }
+                }, callNoAnswerTimeout, {callInstance: currentModuleInstance});
+            }
+
             return sendMessage(startCallData, {
                 onResult: function (result) {
                     callback && callback(result);
@@ -12507,6 +12612,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', {
@@ -12595,6 +12709,11 @@
                 }
 
                 acceptCallData.content = JSON.stringify(content);
+
+                if(params.joinCall) {
+                    callRequestController.callRequestReceived = true;
+                    currentCallId = params.callId;
+                }
             } else {
                 fireEvent('error', {
                     code: 999,
@@ -12686,6 +12805,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;
                 }
@@ -12710,6 +12833,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"
-    }
-}