podchat 11.4.0 → 12.4.0

package/changelog.md

@@ -3,10 +3,53 @@
 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.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
 
-## [Unreleased]
 
--   Search in threads metadata
+## [11.4.0] - 11-12-2021
+### Added
+
+- method: startCall
+- method: startGroupCall
+- method: endCall
+- method: terminateCall
+- method: rejectCall
+- method: muteCallParticipants
+- method: unMuteCallParticipants
+- method: turnOnVideoCall
+- method: turnOffVideoCall
+- method: getCallParticipants
+- method: addCallParticipants
+- method: removeCallParticipants
+- method: getCallsList
+- event: callEvents.CALL_STARTED_ELSEWHERE
+- event: callEvents.RECEIVE_CALL
+- event: callEvents.CALL_SESSION_CREATED
+- event: callEvents.ACCEPT_CALL
+- event: callEvents.REJECT_CALL
+- event: callEvents.PARTNER_RECEIVED_YOUR_CALL
+- event: callEvents.CALL_SESSION_CREATED
+- event: callEvents.CALL_STARTED
+- event: callEvents.CALL_ENDED
+- event: callEvents.CALL_PARTICIPANT_JOINED
+- event: callEvents.CALL_PARTICIPANT_LEFT
+- event: callEvents.CALL_PARTICIPANT_MUTE
+- event: callEvents.CALL_PARTICIPANT_UNMUTE
+- event: callEvents.TURN_ON_VIDEO_CALL
+- event: callEvents.TURN_OFF_VIDEO_CALL
+- event: callEvents.CALL_ERROR
 
 
 ## [11.3.0] - 27-11-2021

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "podchat",
-  "version": "11.4.0",
+  "version": "12.4.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 11.3.0"
+    "version:release": "npm version 12.4.0"
   },
   "repository": {
     "type": "git",

package/src/chat.js

@@ -61,6 +61,7 @@
         var Utility = new ChatUtility();
 
         var asyncClient,
+            currentModuleInstance = this,
             peerId,
             oldPeerId,
             userInfo,
@@ -195,6 +196,7 @@
                 DESTINATED_RECORD_CALL: 126,
                 ASSISTANT_CALL_STARTED: 127,
                 ASSISTANT_CALL_ENDED: 128,
+                GET_CALLS_TO_JOIN: 129,
                 EXPORT_CHAT: 152,
 
                 ERROR: 999
@@ -374,6 +376,7 @@
             },
             currentCallParams = {},
             currentCallId = null,
+            newCallId = null,
             callClientType = {
                 WEB: 1,
                 ANDROID: 2,
@@ -390,7 +393,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;
 
 
         /*******************************************************
@@ -2727,45 +2731,17 @@
                      * Type 31    Thread Last Seen Updated
                      */
                     case chatMessageVOTypes.LAST_SEEN_UPDATED:
-                        if (fullResponseObject) {
-                            getThreads({
-                                threadIds: [messageContent.id]
-                            }, function (threadsResult) {
-                                var threads = threadsResult.result.threads;
+                        var threadObject = messageContent;
+                        threadObject.unreadCount = (messageContent.unreadCount) ? messageContent.unreadCount : 0;
 
-                                if (!threadsResult.cache) {
-                                    fireEvent('threadEvents', {
-                                        type: 'THREAD_UNREAD_COUNT_UPDATED',
-                                        result: {
-                                            thread: threads[0],
-                                            unreadCount: messageContent.unreadCount
-                                        }
-                                    });
-
-                                    fireEvent('threadEvents', {
-                                        type: 'THREAD_LAST_ACTIVITY_TIME',
-                                        result: {
-                                            thread: threads[0]
-                                        }
-                                    });
-                                }
-                            });
-                        } else {
-                            fireEvent('threadEvents', {
-                                type: 'THREAD_UNREAD_COUNT_UPDATED',
-                                result: {
-                                    thread: threadId,
-                                    unreadCount: messageContent.unreadCount
-                                }
-                            });
+                        fireEvent('threadEvents', {
+                            type: 'THREAD_UNREAD_COUNT_UPDATED',
+                            result: {
+                                thread: (fullResponseObject ? threadObject : messageContent.id),
+                                unreadCount: (messageContent.unreadCount) ? messageContent.unreadCount : 0
+                            }
+                        });
 
-                            fireEvent('threadEvents', {
-                                type: 'THREAD_LAST_ACTIVITY_TIME',
-                                result: {
-                                    thread: threadId
-                                }
-                            });
-                        }
 
                         break;
 
@@ -3194,6 +3170,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;
@@ -3241,6 +3230,11 @@
                                 type: 'RECEIVE_CALL',
                                 result: messageContent
                             });
+                            if(!currentCallId ) {
+                                currentCallId = messageContent.callId;
+                            }
+                            else
+                                newCallId = messageContent.callId;
                         } else {
                             fireEvent('callEvents', {
                                 type: 'PARTNER_RECEIVED_YOUR_CALL',
@@ -3248,7 +3242,7 @@
                             });
                         }
 
-                        currentCallId = messageContent.callId;
+                        // currentCallId = messageContent.callId;
 
                         break;
 
@@ -3313,7 +3307,7 @@
 
                        fireEvent('callEvents', {
                             type: 'CALL_ENDED',
-                            result: messageContent
+                            callId: threadId
                         });
 
                         callStop();
@@ -3354,12 +3348,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;
 
@@ -3488,8 +3489,12 @@
                             type: 'CALL_SESSION_CREATED',
                             result: messageContent
                         });
+                        if(!currentCallId)
+                            currentCallId = messageContent.callId;
+                        else
+                            newCallId = messageContent.callId;
 
-                        currentCallId = messageContent.callId;
+                        // currentCallId = messageContent.callId;
 
                         break;
 
@@ -3574,10 +3579,6 @@
                      * Tells the assistant that a call started
                      */
                     case chatMessageVOTypes.ASSISTANT_CALL_STARTED:
-                        /*if (messagesCallbacks[uniqueId]) {
-                            messagesCallbacks[uniqueId](Utility.createReturnData(false, '', 0, messageContent, contentCount));
-                        }*/
-
                         fireEvent('callEvents', {
                             type: 'ASSISTANT_CALL_STARTED',
                             result: {
@@ -3593,12 +3594,9 @@
                      * Tells the assistant that a call ended
                      */
                     case chatMessageVOTypes.ASSISTANT_CALL_ENDED:
-                       /* if (messagesCallbacks[uniqueId]) {
-                            messagesCallbacks[uniqueId](Utility.createReturnData(false, '', 0, messageContent, contentCount));
-                        }*/
-
                         fireEvent('callEvents', {
-                            type: 'ASSISTANT_CALL_ENDED'
+                            type: 'ASSISTANT_CALL_ENDED',
+                            callId: threadId
                         });
 
                         break;
@@ -3796,43 +3794,30 @@
                     }
                 });
 
-                if (fullResponseObject) {
-                    getThreads({
-                        threadIds: [threadId]
-                    }, function (threadsResult) {
-                        var threads = threadsResult.result.threads;
+                var threadObject = message.conversation;
+                var lastMessageVoCopy = Object.assign({}, message);
+                lastMessageVoCopy.conversation && delete lastMessageVoCopy.conversation;
 
-                        fireEvent('threadEvents', {
-                            type: 'THREAD_UNREAD_COUNT_UPDATED',
-                            result: {
-                                thread: threads[0],
-                                unreadCount: threads[0].unreadCount
-                            }
-                        });
+                threadObject.lastParticipantImage = (!!message.participant && message.participant.hasOwnProperty('image')) ? message.participant.image : '';
+                threadObject.lastMessageVO = lastMessageVoCopy;
+                threadObject.lastParticipantName = (!!message.participant && message.participant.hasOwnProperty('name')) ? message.participant.name : '';
+                threadObject.lastMessage = (message.hasOwnProperty('message')) ? message.message : '';
 
-                        fireEvent('threadEvents', {
-                            type: 'THREAD_LAST_ACTIVITY_TIME',
-                            result: {
-                                thread: threads[0]
-                            }
-                        });
-                    });
-                } else {
-                    fireEvent('threadEvents', {
-                        type: 'THREAD_LAST_ACTIVITY_TIME',
-                        result: {
-                            thread: threadId
-                        }
-                    });
 
-                    fireEvent('threadEvents', {
-                        type: 'THREAD_UNREAD_COUNT_UPDATED',
-                        result: {
-                            thread: messageContent.id,
-                            unreadCount: messageContent.conversation.unreadCount
-                        }
-                    });
-                }
+                fireEvent('threadEvents', {
+                    type: 'THREAD_UNREAD_COUNT_UPDATED',
+                    result: {
+                        thread: (fullResponseObject ? threadObject : messageContent.id),
+                        unreadCount: (threadObject.unreadCount) ? threadObject.unreadCount : 0
+                    }
+                });
+
+                fireEvent('threadEvents', {
+                    type: 'THREAD_LAST_ACTIVITY_TIME',
+                    result: {
+                        thread: (fullResponseObject ? threadObject : messageContent.id),
+                    }
+                });
 
                 /**
                  * Update waitQ and remove sent messages from it
@@ -8229,7 +8214,8 @@
                     }
                 }
                 for (var id in eventCallbacks[eventName]) {
-                    eventCallbacks[eventName][id](param);
+                    if(eventCallbacks[eventName] && eventCallbacks[eventName][id])
+                        eventCallbacks[eventName][id](param);
                 }
             },
 
@@ -9181,7 +9167,7 @@
                     callRequestController.callRequestReceived = false;
                     currentCallParams = {};
                     currentCallId = null;
-                },
+            },
 
             /**
              * Reformat Call Participants
@@ -12469,7 +12455,15 @@
                     content.threadId = +params.threadId;
                 } else {
                     if (Array.isArray(params.invitees)) {
-                        content.invitees = params.invitees;
+                        content.invitees = [];//params.invitees;
+                        for (var i = 0; i < params.invitees.length; i++) {
+                            var tempInvitee = params.invitees[i];
+
+                            if (tempInvitee && typeof tempInvitee.idType === "string") {
+                                tempInvitee.idType = inviteeVOidTypes[tempInvitee.idType];
+                                content.invitees.push(tempInvitee);
+                            }
+                        }
                     } else {
                         fireEvent('error', {
                             code: 999,
@@ -12479,6 +12473,13 @@
                     }
                 }
 
+                if(params.threadInfo
+                    && (params.threadInfo.metadata
+                        || params.threadInfo.uniqueName)
+                ) {
+                    content.createCallThreadRequest = params.threadInfo
+                }
+
                 startCallData.content = JSON.stringify(content);
             } else {
                 fireEvent('error', {
@@ -12491,6 +12492,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);
@@ -12529,8 +12547,15 @@
                     content.threadId = +params.threadId;
                 } else {
                     if (Array.isArray(params.invitees)) {
-                        content.invitees = params.invitees;
+                        content.invitees = [];//params.invitees;
+                        for (var i = 0; i < params.invitees.length; i++) {
+                            var tempInvitee = params.invitees[i];
 
+                            if (tempInvitee && typeof tempInvitee.idType === "string") {
+                                tempInvitee.idType = inviteeVOidTypes[tempInvitee.idType];
+                                content.invitees.push(tempInvitee);
+                            }
+                        }
                     } else {
                         fireEvent('error', {
                             code: 999,
@@ -12540,6 +12565,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', {
@@ -12628,6 +12662,11 @@
                 }
 
                 acceptCallData.content = JSON.stringify(content);
+
+                if(params.joinCall) {
+                    callRequestController.callRequestReceived = true;
+                    currentCallId = params.callId;
+                }
             } else {
                 fireEvent('error', {
                     code: 999,
@@ -12719,6 +12758,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;
                 }
@@ -12743,6 +12786,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,