podchat-browser 12.2.1-snapshot.2 → 12.3.1

package/examples/index.html

@@ -28,7 +28,7 @@
     <!--<script type="text/javascript" src="podchat-browser.min.js"></script>-->
 
     <script type="text/javascript">
-        // Developement
+        // Development
         var PodChat = window.POD.Chat;
         var env = 'main'; // main | sandbox | integration
 
@@ -963,13 +963,15 @@
          * Listen to File Upload Events
          */
         chatAgent.on("fileUploadEvents", function (event) {
-            console.log(event);
+            console.log("[fileUploadEvents]", event);
         });
 
         /**
          * Listen to Contact Events
          */
         chatAgent.on("contactEvents", function (event) {
+            console.log("[contactEvents]", event);
+
             if (event.type == 'CONTACTS_SYNCED') {
                 console.log('Core contacts have been successfully synced with chat server.');
             }
@@ -980,7 +982,7 @@
          */
         chatAgent.on("threadEvents", function (event) {
             var type = event.type;
-            console.log(event);
+            console.log("[threadEvents]", event);
 
             switch (type) {
                 case "THREAD_LAST_ACTIVITY_TIME":
@@ -1029,7 +1031,7 @@
             var type = event.type,
                 message = event.result.message;
 
-            console.log(event);
+            console.log("[messageEvents]", event);
 
             switch (type) {
                 case "MESSAGE_NEW":
@@ -1071,7 +1073,7 @@
          */
         chatAgent.on("systemEvents", function (event) {
             var type = event.type;
-            console.log(event);
+            console.log("[systemEvents]", event);
 
             switch (type) {
                 case "IS_TYPING":
@@ -1088,7 +1090,7 @@
          */
         chatAgent.on('userEvents', function (event) {
             var type = event.type;
-            console.log(event);
+            console.log("[userEvents]", event);
 
             switch (type) {
                 case 'CHAT_PROFILE_UPDATED':
@@ -1105,7 +1107,7 @@
          */
         chatAgent.on('callEvents', function (event) {
             var type = event.type;
-            console.log(event);
+            console.log("[callEvents]", event);
 
             // if (type === 'CALL_ERROR')
             // debugger;
@@ -1927,6 +1929,7 @@ Thread: <input type="text" id="threadInput" autocomplete="on" width="500">
         <label for="apList">User Id</label>
         <input type="text" name="adminThreadParticipantUserId" id="adminThreadParticipantUserId" placeholder="UserId">
         <button type="button" name="button" id="adminThreadParticipantBtn">Make admin</button>
+        <button type="button" name="button" id="removeAdminThreadParticipantBtn">Remove admin</button>
     </fieldset>
 </form>
 
@@ -3268,6 +3271,37 @@ Thread: <input type="text" id="threadInput" autocomplete="on" width="500">
             console.log("[HTML][chatAgent.setAdmin][result]", result);
         })
     });
+
+    document.getElementById("removeAdminThreadParticipantBtn").addEventListener("click", function (event){
+        event.preventDefault();
+        var userId = document.getElementById("adminThreadParticipantUserId").value;
+        var threadId = document.getElementById("adminThreadParticipantThreadId").value;
+        var rolesList = [
+            'post_channel_message',
+            'edit_message_of_others',
+            'delete_message_of_others',
+            'add_new_user',
+            'remove_user',
+            'thread_admin',
+            'add_rule_to_user',
+            'remove_role_from_user',
+            'edit_thread',
+            'read_thread',
+            'ownership'
+        ];
+        console.log("roles list: ", rolesList)
+        chatAgent.removeAdmin({
+            threadId: threadId,
+            admins: [{
+                userId: userId,
+                roles: rolesList
+            }],
+        }, function (result) {
+            console.log("[HTML][chatAgent.removeAdmin][result]", result);
+        })
+    });
+
+
 </script>
 
 </html>

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "podchat-browser",
-  "version": "12.2.1-snapshot.2",
+  "version": "12.3.1",
   "description": "Javascript SDK to use POD's Chat Service - Browser Only",
   "main": "./src/chat.js",
   "scripts": {
     "test": "mocha --reporter spec --exit",
-    "bundle": "browserify browser-bundling.js -o ./dist/podchat-12.2.1.js",
+    "bundle": "browserify browser-bundling.js -o ./dist/podchat-12.3.1.js",
     "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.1"
+    "version:release": "npm version 12.3.1"
   },
   "repository": {
     "type": "git",

package/src/call.module.js

@@ -14,8 +14,6 @@
             WebrtcAdapter = window.adapter;
         }
 
-
-
         var Utility = params.Utility,
             currentModuleInstance = this,
             Sentry = params.Sentry,
@@ -197,12 +195,14 @@
             callMetaDataTypes = {
                 POORCONNECTION: 1,
                 POORCONNECTIONRESOLVED: 2,
-                CUSTOMUSERMETADATA: 3
+                CUSTOMUSERMETADATA: 3,
+                SCREENSHAREMETADATA: 4
             },
             screenShareState = {
                 started: false,
                 imOwner: false
             },
+            screenShareInfo = new ScreenShareStateClass(),
             callClientType = {
                 WEB: 1,
                 ANDROID: 2,
@@ -230,6 +230,58 @@
                 ? params.asyncLogging.consoleLogging
                 : false;
 
+        function ScreenShareStateClass() {
+            var config = {
+                ownerId: 0,
+                imOwner: false,
+                isStarted: false,
+                width: callVideoMinWidth,
+                hight: callVideoMinHeight
+            }
+
+            return {
+                setOwner: function (ownerId) {
+                    config.ownerId = +ownerId;
+                },
+                setIsStarted: function (isStarted) {
+                    config.isStarted = isStarted;
+                },
+                isStarted: function () {
+                    return config.isStarted;
+                },
+                iAmOwner: function () {
+                    return config.ownerId === chatMessaging.userInfo.id
+                },
+                setWidth: function (width) {
+                    config.width = width;
+                },
+                setHeight: function (height) {
+                    config.height = height;
+                },
+                getWidth: function (width) {
+                    return config.width;
+                },
+                getHeight: function (height) {
+                    return config.height;
+                },
+                getOwner: function () {
+                    return config.ownerId
+                },
+                setDimension: function (dimension) {
+                    if(dimension
+                        && dimension.width && +dimension.width > 0
+                        && dimension.height  && +dimension.height > 0
+                    ) {
+                        screenShareInfo.setHeight(dimension.height);
+                        screenShareInfo.setWidth(dimension.width);
+                    } else {
+                        screenShareInfo.setHeight(callVideoMinHeight);
+                        screenShareInfo.setWidth(callVideoMinWidth);
+                    }
+                }
+            }
+        }
+
         var init = function () {
 
             },
@@ -500,6 +552,9 @@
                         callStateController.setupCallParticipant(params.selfData);
                     }
 
+                    screenShareInfo.setOwner(params.screenShareOwner);
+                    screenShareInfo.setIsStarted(!!params.screenShareOwner);
+
                     if(params.clientsList && params.clientsList.length) {
                         for(var i in params.clientsList) {
                             if(params.clientsList[i].userId !== chatMessaging.userInfo.id)
@@ -570,7 +625,7 @@
                 startCall: function (params) {
                     var callController = this;
                     for(var i in callUsers) {
-                        if(i === 'screenShare')
+                        if(i === 'screenShare' && !screenShareInfo.isStarted())
                             continue;
 
                         if(callUsers[i].video) {
@@ -617,7 +672,7 @@
                     };
                     obj.topicMetaData = {};
                     obj.peers = {};
-                    if(screenShareState.imOwner) {
+                    if(screenShareInfo.iAmOwner()) {
                         obj.direction = 'send';
                     } else {
                         obj.direction = 'receive'
@@ -632,7 +687,10 @@
                         isConnectionPoor: false
                     };
                     callUsers['screenShare'] = obj;
-                    this.generateHTMLElements('screenShare')
+                    if(screenShareInfo.isStarted())
+                        this.appendUserToCallDiv('screenShare', this.generateHTMLElements('screenShare'));
+                    else
+                        this.generateHTMLElements('screenShare')
                 },
                 appendUserToCallDiv: function (userId) {
                     if(!callDivId) {
@@ -1179,9 +1237,9 @@
                     }
                 },
                 removeScreenShareFromCall: function (topic) {
-                    var callController = this,
-                        screenShare = callUsers["screenShare"];
-                    if(screenShare.peers[screenShare.videoTopicName]) {
+                    var screenShare = callUsers["screenShare"];
+
+                    if(screenShare && screenShare.peers[screenShare.videoTopicName]) {
                         callStateController.removeStreamFromWebRTC('screenShare', screenShare.videoTopicName)
                         callStateController.removeTopic('screenShare', screenShare.videoTopicName);
                         chatEvents.fireEvent('callEvents', {
@@ -1639,8 +1697,59 @@
                             content: jMessage.content
                         });
                         break;
+                    case callMetaDataTypes.SCREENSHAREMETADATA:
+                        screenShareInfo.setWidth(jMessage.content.dimension.width);
+                        screenShareInfo.setHeight(jMessage.content.dimension.height);
+                        applyScreenShareSizeToElement();
+                        chatEvents.fireEvent("callEvents", {
+                            type: 'SCREENSHARE_METADATA',
+                            userId: jMessage.userid,
+                            content: jMessage.content
+                        });
+                        break;
                 }
 
+            },
+
+            applyScreenShareSizeToElement = function () {
+                var videoElement = callUsers['screenShare'].htmlElements[callUsers['screenShare'].videoTopicName];
+                let videoTrack = videoElement.srcObject.getTracks()[0];
+
+                if (navigator && !!navigator.userAgent.match(/firefox/gi)) {
+                    videoTrack.enable = false;
+                    let newWidth = callVideoMinWidth - (Math.ceil(Math.random() * 50) + 20);
+                    let newHeight = callVideoMinHeight - (Math.ceil(Math.random() * 50) + 20);
+
+                    videoTrack.applyConstraints({
+                        advanced: [
+                            {
+                                width: screenShareInfo.getWidth(),
+                                height: screenShareInfo.getHeight()
+                            },
+                            {
+                                aspectRatio: 1.333
+                            }
+                        ]
+                    }).then((res) => {
+                        videoTrack.enabled = true;
+                        setTimeout(() => {
+                            videoTrack.applyConstraints({
+                                "width": screenShareInfo.getWidth(),
+                                "height": screenShareInfo.getHeight()
+                            });
+                        }, 500);
+                    }).catch(e => consoleLogging && console.log(e));
+                } else {
+                    videoTrack.applyConstraints({
+                        "width": screenShareInfo.getWidth() - (Math.ceil(Math.random() * 5) + 5)
+                    }).then((res) => {
+                        setTimeout(function () {
+                            videoTrack.applyConstraints({
+                                "width": screenShareInfo.getWidth()
+                            });
+                        }, 500);
+                    }).catch(e => consoleLogging && console.log(e));
+                }
             }
 
 
@@ -1680,8 +1789,9 @@
                     }
                     if(callUsers && callUsers['screenShare']
                         && callUsers['screenShare'].video
-                        && screenShareState.started
-                        && screenShareState.imOwner) {
+                        && screenShareInfo.isStarted()
+                        && screenShareInfo.iAmOwner()
+                    ) {
                         restartMediaOnKeyFrame('screenShare', [2000,4000,8000,12000]);
                     }
                     break;
@@ -1882,7 +1992,9 @@
                             turnAddress: messageContent.chatDataDto.turnAddress,
                             internalTurnAddress: messageContent.chatDataDto.internalTurnAddress,
                             selfData: messageContent.clientDTO,
-                            clientsList: messageContent.otherClientDtoList
+                            clientsList: messageContent.otherClientDtoList,
+                            screenShareOwner: +messageContent.chatDataDto.screenShareUser,
+                            recordingOwner: +messageContent.chatDataDto.recordingUser
                         }, function (callDivs) {
                             chatEvents.fireEvent('callEvents', {
                                 type: 'CALL_DIVS',
@@ -2022,6 +2134,8 @@
                     if (!!messageContent[0].userId) {
                         //callStateController.removeFromCallUI(messageContent[0].sendTopic)
                         callStateController.removeParticipant(messageContent[0].userId);
+                        if(screenShareInfo.getOwner() === messageContent[0].userId)
+                            callStateController.removeScreenShareFromCall()
                     }
 
                     //If I'm the only call participant, stop the call
@@ -2084,8 +2198,19 @@
                     }
                     if(callUsers && callUsers['screenShare']
                         && callUsers['screenShare'].video
-                        && screenShareState.started
-                        && screenShareState.imOwner) {
+                        && screenShareInfo.isStarted()
+                        && screenShareInfo.iAmOwner()
+                    ) {
+                        sendCallMetaData({
+                            id: callMetaDataTypes.SCREENSHAREMETADATA,
+                            userid: chatMessaging.userInfo.id,
+                            content: {
+                                dimension: {
+                                    width: screenShareInfo.getWidth(),
+                                    height: screenShareInfo.getHeight()
+                                }
+                            }
+                        });
                         restartMediaOnKeyFrame('screenShare', [2000, 4000, 8000, 12000, 16000, 24000]);
                     }
 
@@ -2339,16 +2464,17 @@
                     if(!callRequestController.callEstablishedInMySide)
                         return;
 
-                    screenShareState.started = true;
-                    if(messageContent.screenOwner.id === chatMessaging.userInfo.id) {
-                        screenShareState.imOwner = true;
+                    screenShareInfo.setIsStarted(true);
+                    screenShareInfo.setOwner(messageContent.screenOwner.id);
+                    /*if(messageContent.screenOwner.id === chatMessaging.userInfo.id) {
+                        screenShareInfo.setIAmOwner(true);
                     } else {
-                        screenShareState.imOwner = false;
-                    }
+                        screenShareInfo.setIAmOwner(false);
+                    }*/
 
                     if (chatMessaging.messagesCallbacks[uniqueId]) {
                         chatMessaging.messagesCallbacks[uniqueId](Utility.createReturnData(false, '', 0, messageContent, contentCount));
-                    } else if(!screenShareState.imOwner) {
+                    } else if(!screenShareInfo.iAmOwner()) {
                         callStateController.addScreenShareToCall("receive", false)
                     }
 
@@ -2363,12 +2489,12 @@
                  * Type 124   End Screen Share
                  */
                 case chatMessageVOTypes.END_SCREEN_SHARE:
-                    screenShareState.imOwner = false;
-                    screenShareState.started = false;
+                    // screenShareInfo.setIAmOwner(false);
+                    screenShareInfo.setIsStarted(false);
 
                     if (chatMessaging.messagesCallbacks[uniqueId]) {
                         chatMessaging.messagesCallbacks[uniqueId](Utility.createReturnData(false, '', 0, messageContent, contentCount));
-                    } else if (!screenShareState.imOwner) {
+                    } else if (!screenShareInfo.iAmOwner()) {
                        consoleLogging && console.log("[SDK][END_SCREEN_SHARE], im not owner of screen");
                        callStateController.removeScreenShareFromCall();
                     }
@@ -2477,6 +2603,13 @@
                     }
                 }
 
+                if(params.threadInfo
+                    && (params.threadInfo.metadata
+                        || params.threadInfo.uniqueName)
+                ) {
+                    content.createCallThreadRequest = params.threadInfo
+                }
+
                 startCallData.content = JSON.stringify(content);
             } else {
                 chatEvents.fireEvent('error', {
@@ -2545,6 +2678,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 {
                 chatEvents.fireEvent('error', {
@@ -2644,6 +2786,11 @@
                 }
 
                 acceptCallData.content = JSON.stringify(content);
+
+                if(params.joinCall) {
+                    callRequestController.callRequestReceived = true;
+                    currentCallId = params.callId;
+                }
             } else {
                 chatEvents.fireEvent('error', {
                     code: 999,
@@ -2810,10 +2957,27 @@
                     consoleLogging && console.log("[sdk][startScreenShare][onResult]: ", result);
                     if(!result.hasError) {
                         var direction = 'send', shareScreen = true;
-                        if(screenShareState.started && !screenShareState.imOwner) {
+
+                        if(screenShareInfo.isStarted() && !screenShareInfo.iAmOwner()){
                             direction = 'receive';
                             shareScreen = false;
                         }
+
+                        if(screenShareInfo.isStarted() && screenShareInfo.iAmOwner()) {
+                            screenShareInfo.setWidth(callVideoMinWidth);
+                            screenShareInfo.setHeight(callVideoMinHeight);
+                            sendCallMetaData({
+                                id: callMetaDataTypes.SCREENSHAREMETADATA,
+                                userid: chatMessaging.userInfo.id,
+                                content: {
+                                    dimension: {
+                                        width: screenShareInfo.getWidth(),
+                                        height: screenShareInfo.getHeight()
+                                    }
+                                }
+                            });
+                        }
+
                         callStateController.addScreenShareToCall(direction, shareScreen);
                     }
                     callback && callback(result);
@@ -2847,7 +3011,7 @@
                 return;
             }
 
-            if(!screenShareState.imOwner) {
+            if(!screenShareInfo.iAmOwner()) {
                 chatEvents.fireEvent('error', {
                     code: 999,
                     message: 'You can not end others screen sharing!'
@@ -2868,6 +3032,34 @@
             });
         };
 
+        this.resizeScreenShare = function (params, callback) {
+            var result = {}
+            if(screenShareInfo.isStarted() && screenShareInfo.iAmOwner()) {
+                screenShareInfo.setWidth(params.width);
+                screenShareInfo.setHeight(params.height);
+
+                applyScreenShareSizeToElement()
+
+                sendCallMetaData({
+                    id: callMetaDataTypes.SCREENSHAREMETADATA,
+                    userid: chatMessaging.userInfo.id,
+                    content: {
+                        dimension: {
+                            width: screenShareInfo.getWidth(),
+                            height: screenShareInfo.getHeight()
+                        }
+                    }
+                })
+
+                result.hasError = false;
+            } else {
+                result.hasError = true;
+                result.errorMessage = 'You can not apply size to others ScreenShare or ScreenShare is not started'
+            }
+
+            callback && callback(result);
+        };
+
         this.getCallsList = function (params, callback) {
             var getCallListData = {
                 chatMessageVOType: chatMessageVOTypes.GET_CALLS,

package/src/chat.js

@@ -13919,6 +13919,8 @@
 
         this.startScreenShare = callModule.startScreenShare;
 
+        this.resizeScreenShare = callModule.resizeScreenShare
+
         this.endScreenShare = callModule.endScreenShare;
 
         this.getCallsList = callModule.getCallsList;