podchat-browser 11.4.3 → 12.1.0

package/examples/index.html

@@ -30,7 +30,7 @@
     <script type="text/javascript">
         // Developement
         var PodChat = window.POD.Chat;
-        var env = 'main'; // main | sandbox | integration
+        var env = 'sandbox'; // main | sandbox | integration
 
         var params = {
             appId: new Date().getTime(),
@@ -1906,6 +1906,22 @@ Thread: <input type="text" id="threadInput" autocomplete="on" width="500">
 <hr>
 <br>
 
+<form>
+    <fieldset>
+        <legend>Admin thread participant</legend>
+        <label for="apThread">Thread Id</label>
+        <input type="text" name="adminThreadParticipantThreadId" id="adminThreadParticipantThreadId" >
+        <br>
+        <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>
+    </fieldset>
+</form>
+
+<br>
+<hr>
+<br>
+
 <form>
     <fieldset>
         <legend>Send Text Message</legend>
@@ -3165,7 +3181,36 @@ Thread: <input type="text" id="threadInput" autocomplete="on" width="500">
             threadId: Number(threadId),
             messageIds: messageIds instanceof Array ? messageIds : [ messageIds ],
         }, {})
-    })
+    });
+
+    document.getElementById("adminThreadParticipantBtn").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.setAdmin({
+            threadId: threadId,
+            admins: [{
+                userId: userId,
+                roles: rolesList
+            }],
+        }, function (result) {
+            console.log("[HTML][chatAgent.setAdmin][result]", result);
+        })
+    });
 </script>
 
 </html>

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "podchat-browser",
-  "version": "11.4.3",
+  "version": "12.1.0",
   "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-11.4.3.js",
+    "bundle": "browserify browser-bundling.js -o ./dist/podchat-12.1.0.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 11.4.3"
+    "version:release": "npm version 12.1.0"
   },
   "repository": {
     "type": "git",

package/src/call.module.js

@@ -107,6 +107,7 @@
                 TERMINATE_CALL: 96,
                 MUTE_CALL_PARTICIPANT: 97,
                 UNMUTE_CALL_PARTICIPANT: 98,
+                CANCEL_GROUP_CALL: 99,  //TODO: not implemented
                 LOGOUT: 100,
                 LOCATION_PING: 101,
                 CLOSE_THREAD: 102,
@@ -189,6 +190,7 @@
                 : 180,
             currentCallParams = {},
             currentCallId = null,
+            newCallId = null,
             shouldReconnectCallTimeout = null,
             callTopics = {},
             callMetaDataTypes = {
@@ -825,8 +827,17 @@
                         options[(direction === 'send' ? 'localVideo' : 'remoteVideo')] = callUsers[userId].htmlElements[topic];
 
                         if(direction === 'send' && mediaType === 'video' && shareScreen) {
-                            navigator.mediaDevices.getDisplayMedia().then(function (result) {
-                                options.videoStream = result;
+                            navigator.mediaDevices.getDisplayMedia().then(function (stream) {
+                                stream.getVideoTracks()[0].addEventListener("ended", function (event) { // Click on browser UI stop sharing button
+                                    //callStateController.removeScreenShareFromCall()
+                                    if(callUsers['screenShare'] && callUsers['screenShare'].peers[topic]){
+                                        //console.log('event screenShare', currentCallId);
+                                        currentModuleInstance.endScreenShare({
+                                            callId: currentCallId
+                                        });
+                                    }
+                                })
+                                options.videoStream = stream;
                                 options.sendSource = 'screen';
                                 // options[(direction === 'send' ? 'localVideo' : 'remoteVideo')] = uiRemoteMedias[topic];
                                 resolve(options);
@@ -1201,7 +1212,9 @@
                 },
                 removeAllCallParticipants: function () {
                     var removeAllUsersPromise = new Promise(function (resolve, reject) {
+                        var index = 0;
                         for (var i in callUsers) {
+                            index++;
                             var user = callUsers[i];
                             if (user) {
                                 if(user.videoTopicName && user.peers[user.videoTopicName]) {
@@ -1228,7 +1241,8 @@
                                         callUsers[i] = null;
                                     }
 
-                                    resolve()
+                                    if(index === Object.keys(callUsers).length)
+                                        resolve();
                                 }, 200);
                             }
                         }
@@ -1857,7 +1871,10 @@
                             result: messageContent
                         });
 
-                        currentCallId = messageContent.callId;
+                        if(!currentCallId)
+                            currentCallId = messageContent.callId;
+                        else
+                            newCallId = messageContent.callId;
                     } else {
                         chatEvents.fireEvent('callEvents', {
                             type: 'PARTNER_RECEIVED_YOUR_CALL',
@@ -1950,10 +1967,11 @@
 
                     chatEvents.fireEvent('callEvents', {
                         type: 'CALL_ENDED',
-                        result: messageContent
+                        callId: threadId
                     });
 
-                    callStop();
+                    if(threadId === currentCallId)
+                        callStop();
 
                     break;
 
@@ -2188,17 +2206,6 @@
                                     messageContent[i].sendTopic,
                                     'mute'
                                 );
-                                /*if(callUsers[messageContent[i].userId]) {
-                                    callUsers[messageContent[i].userId].mute = false;
-                                    callUsers[messageContent[i].userId].audioTopicName = 'Vo-' + 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.audioTopicName, 'audio', 'receive');
-
-                                    })
-                                }*/
                             }
                         }
                     }
@@ -2236,7 +2243,12 @@
                         result: messageContent
                     });
 
-                    currentCallId = messageContent.callId;
+                    if(!currentCallId)
+                        currentCallId = messageContent.callId;
+                    else
+                        newCallId = messageContent.callId;
+
+                    //currentCallId = messageContent.callId;
 
                     break;
 

package/src/chat.js

@@ -1,4 +1,4 @@
-'use strict';
+'use strict';
 
 (function () {
     /*
@@ -13608,12 +13608,11 @@
                 var str = ''
                     , universalBOM = "\uFEFF";
 
-                console.log(result);
-                str += "تاریخ " + ',';
-                str += " ساعت " + ',';
-                str += "نام فرستنده" + ',';
-                str += "نام کاربری فرستنده" + ',';
-                str += "متن پیام" + ',';
+                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 < result.length; i++) {