podchat-browser 11.3.3 → 11.3.4

package/examples/index.html

@@ -30,7 +30,7 @@
     <script type="text/javascript">
         // Developement
         var PodChat = window.POD.Chat;
-        var env = 'sandbox'; // main | sandbox | integration
+        var env = 'main'; // main | sandbox | integration
 
         var params = {
             appId: new Date().getTime(),
@@ -1955,10 +1955,10 @@ Thread: <input type="text" id="threadInput" autocomplete="on" width="500">
     <fieldset>
         <legend>Send File Message</legend>
         <label for="sendFileThread">Thread Id</label>
-        <input type="text" name="sendFileThread" id="sendFileThread" value="54436" class="custom-thread-id">
+        <input type="text" name="sendFileThread" id="sendFileThread" value="972967" class="custom-thread-id">
         <br>
         <label for="sendFileUserGroupHash">Thread userGroupHash</label>
-        <input type="text" name="sendFileUserGroupHash" id="sendFileUserGroupHash" value="5GW93QH695O7HC">
+        <input type="text" name="sendFileUserGroupHash" id="sendFileUserGroupHash" value="EY8X3CYDZQ9QBQ">
         <br>
 
         <label for="sendFileMessageType">Message Type</label>
@@ -1979,6 +1979,7 @@ Thread: <input type="text" id="threadInput" autocomplete="on" width="500">
         <label for="sendFileDescription">Description: </label>
         <textarea type="text" name="sendFileDescription" id="sendFileDescription"></textarea>
         <button type="button" name="button" id="sendFileMessage">Send File Message</button>
+        <button type="button" name="button" id="sendMultipleFileMessage">Send Multiple File Message</button>
     </fieldset>
 </form>
 
@@ -2614,6 +2615,63 @@ Thread: <input type="text" id="threadInput" autocomplete="on" width="500">
             // }, 100);
         });
 
+    /**
+     * SEND MULTIPLE FILES
+     */
+    document.getElementById("sendMultipleFileMessage")
+        .addEventListener("click", function (e) {
+            e.preventDefault();
+            var fileInput = document.getElementById("sendFileInput"),
+                image = fileInput.files[0],
+                content = document.getElementById("sendFileDescription").value,
+                thread = document.getElementById("sendFileThread").value,
+                messageType = document.getElementById("sendFileMessageType").value,
+                userGroupHash = document.getElementById("sendFileUserGroupHash").value;
+
+            for(var i =1; i<= 5; i++) {
+                setTimeout(function () {
+                    var instantResult = chatAgent.sendFileMessage({
+                        threadId: thread,
+                        file: image,
+                        content: content,
+                        userGroupHash: userGroupHash,
+                        messageType: messageType,
+                        metadata: {
+                            custom_name: "John Doe"
+                        }
+                    }, {
+                        onResult: function (result) {
+                            if (result.hasError) {
+                                console.log('[examples/html] upload of an item failed', result)
+                            }
+                        },
+                        onSent: function (result) {
+                            console.log(result);
+                            console.log(result.uniqueId + " \t has been Sent!");
+                        },
+                        onDeliver: function (result) {
+                            console.log(result.uniqueId + " \t has been Delivered!");
+                        },
+                        onSeen: function (result) {
+                            console.log(result.uniqueId + " \t has been Seen!");
+                        },
+                        onFileUpload: function (result) {
+                            console.log('File Upload is done', result);
+                        }
+                    });
+                    console.log("Instant sendFile Results", instantResult)
+                }, i * 5000);
+            }
+
+            // console.log("Should cancel file upload after 100ms. (uid = " + instantResult.content.file.uniqueId + ")")
+            // setTimeout(() => {
+            //   chatAgent.cancelFileUpload({
+            //     uniqueId: instantResult.content.file.uniqueId
+            //   }, function() {
+            //     console.log("Upload has been Canceled!");
+            //   });
+            // }, 100);
+        })
 
     /**
      * REPLY FILE MESSAGE

package/package.json

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

package/src/call.module.js

@@ -681,29 +681,6 @@
                 };
             },
 
-            /*handleCallSocketOpen = function (params) {
-                currentCallParams = params;
-
-                sendCallMessage({
-                    id: 'CREATE_SESSION',
-                    brokerAddress: params.brokerAddress,
-                    turnAddress: params.turnAddress.split(',')[0]
-                }, function (res) {
-                    if (res.done === 'TRUE') {
-                        callStopQueue.callStarted = true;
-                        generateAndSendSdpOffers(params, [callTopics['sendVideoTopic'], callTopics['receiveVideoTopic'], callTopics['sendAudioTopic'], callTopics['receiveAudioTopic']]);
-                    } else if (res.done === 'SKIP') {
-                        callStopQueue.callStarted = true;
-                        generateAndSendSdpOffers(params, [callTopics['sendVideoTopic'], callTopics['receiveVideoTopic'], callTopics['sendAudioTopic'], callTopics['receiveAudioTopic']]);
-                    } else {
-                        consoleLogging && console.log('CREATE_SESSION faced a problem', res);
-                        endCall({
-                            callId: currentCallId
-                        });
-                    }
-                });
-            },*/
-
             callStateController = {
                 createSessionInChat: function (params) {
                     currentCallParams = params;
@@ -921,8 +898,8 @@
                 },
                 removeTopic: function (userId, topic) {
                     if(callUsers[userId].peers[topic]) {
-                        callUsers[userId].peers[topic].dispose();
                         this.removeConnectionQualityInterval(userId, topic);
+                        callUsers[userId].peers[topic].dispose();
                         callUsers[userId].peers[topic] = null;
                     }
                 },
@@ -1144,12 +1121,12 @@
                                 errorInfo: user.peers[topic]
                             });
                             // setTimeout(function () {
-                                if(chatMessaging.chatState) {
-                                    callController.shouldReconnectTopic(userId, topic, mediaType, direction);
-                                }
-                            // }, 7000);
 
-                            callController.removeConnectionQualityInterval(userId, topic);
+                            if(chatMessaging.chatState) {
+                                callController.shouldReconnectTopic(userId, topic, mediaType, direction);
+                            }
+                            // }, 7000);
+                            //callController.removeConnectionQualityInterval(userId, topic);
                         }
 
                         if(user.peers[topic].peerConnection.connectionState === 'connected') {
@@ -1187,6 +1164,7 @@
                             });
                             if(chatMessaging.chatState) {
                                 callController.shouldReconnectTopic(userId, topic, mediaType, direction);
+                                //callController.removeConnectionQualityInterval(userId, topic);
                             }
                             // } else {
                             //     setTimeout(function () {
@@ -1226,9 +1204,11 @@
                                 topic: topic
                             }, function (result) {
                                 if (result.done === 'TRUE') {
+                                    clearInterval(callUsers[userId].topicMetaData[topic].interval)
                                     callController.removeTopic(userId, topic);
                                     callController.createTopic(userId, topic, mediaType, direction, userId === 'screenShare');
                                 } else if (result.done === 'SKIP') {
+                                    clearInterval(callUsers[userId].topicMetaData[topic].interval)
                                     callController.removeTopic(userId, topic);
                                     callController.createTopic(userId, topic, mediaType, direction, userId === 'screenShare');
                                     //generateAndSendSdpOffers(currentCallParams, [topicName]);
@@ -1627,6 +1607,12 @@
                     }
                     consoleLogging && console.log("[SDK][handleProcessSdpAnswer]", jsonMessage, jsonMessage.topic)
                     startMedia(callUsers[userId].htmlElements[jsonMessage.topic]);
+                    if(userId === 'screenShare') {
+                        restartMediaOnKeyFrame("screenShare", 2000);
+                        restartMediaOnKeyFrame("screenShare", 4000);
+                        restartMediaOnKeyFrame("screenShare", 8000);
+                        restartMediaOnKeyFrame("screenShare", 12000);
+                    }
                 });
             },
 
@@ -1699,45 +1685,48 @@
                 currentCallId = null;
             },
 
-            removeStreamFromWebRTC = function (RTCStream) {
-                var callParentDiv = document.getElementById(callDivId);
+            /*
+                        removeStreamFromWebRTC = function (RTCStream) {
+                            var callParentDiv = document.getElementById(callDivId);
 
-                if (uiRemoteMedias.hasOwnProperty(RTCStream)) {
-                    const stream = uiRemoteMedias[RTCStream].srcObject;
-                    if (!!stream) {
-                        const tracks = stream.getTracks();
+                            if (uiRemoteMedias.hasOwnProperty(RTCStream)) {
+                                const stream = uiRemoteMedias[RTCStream].srcObject;
+                                if (!!stream) {
+                                    const tracks = stream.getTracks();
 
-                        if (!!tracks) {
-                            tracks.forEach(function (track) {
-                                track.stop();
-                            });
-                        }
+                                    if (!!tracks) {
+                                        tracks.forEach(function (track) {
+                                            track.stop();
+                                        });
+                                    }
 
-                        uiRemoteMedias[RTCStream].srcObject = null;
-                    }
+                                    uiRemoteMedias[RTCStream].srcObject = null;
+                                }
 
-                    uiRemoteMedias[RTCStream].remove();
-                    delete (uiRemoteMedias[RTCStream]);
-                }
-            },
+                                uiRemoteMedias[RTCStream].remove();
+                                delete (uiRemoteMedias[RTCStream]);
+                            }
+                        },
 
-            removeFromCallUI = function (topic) {
-                var videoElement = 'Vi-' + topic;
-                var audioElement = 'Vo-' + topic;
 
-                if (topic.length > 0 && uiRemoteMedias.hasOwnProperty(videoElement)) {
-                    removeStreamFromWebRTC(videoElement);
-                }
+                        removeFromCallUI = function (topic) {
+                            var videoElement = 'Vi-' + topic;
+                            var audioElement = 'Vo-' + topic;
 
-                if (topic.length > 0 && uiRemoteMedias.hasOwnProperty(audioElement)) {
-                    removeStreamFromWebRTC(audioElement);
-                }
-            },
+                            if (topic.length > 0 && uiRemoteMedias.hasOwnProperty(videoElement)) {
+                                removeStreamFromWebRTC(videoElement);
+                            }
+
+                            if (topic.length > 0 && uiRemoteMedias.hasOwnProperty(audioElement)) {
+                                removeStreamFromWebRTC(audioElement);
+                            }
+                        },
+            */
 
             restartMediaOnKeyFrame = function (userId, timeout) {
                 setTimeout(function () {
-                    if(typeof callUsers[chatMessaging.userInfo.id] !== "undefined" && callUsers[chatMessaging.userInfo.id])
-                        restartMedia(callUsers[chatMessaging.userInfo.id].videoTopicName);
+                    if(typeof callUsers[userId] !== "undefined" && callUsers[userId])
+                        restartMedia(callUsers[userId].videoTopicName);
                 }, timeout);
             };
 
@@ -1764,10 +1753,22 @@
                     break;
 
                 case 'GET_KEY_FRAME':
-                    restartMediaOnKeyFrame(chatMessaging.userInfo.id, 2000);
-                    restartMediaOnKeyFrame(chatMessaging.userInfo.id, 4000);
-                    restartMediaOnKeyFrame(chatMessaging.userInfo.id, 8000);
-                    restartMediaOnKeyFrame(chatMessaging.userInfo.id, 12000);
+                    if(callUsers && callUsers[chatMessaging.userInfo.id] && callUsers[chatMessaging.userInfo.id].video) {
+                        restartMediaOnKeyFrame(chatMessaging.userInfo.id, 2000);
+                        restartMediaOnKeyFrame(chatMessaging.userInfo.id, 4000);
+                        restartMediaOnKeyFrame(chatMessaging.userInfo.id, 8000);
+                        restartMediaOnKeyFrame(chatMessaging.userInfo.id, 12000);
+                    }
+                    if(callUsers && callUsers['screenShare']
+                        && callUsers['screenShare'].video
+                        && screenShareState.started
+                        && screenShareState.imOwner) {
+                        restartMediaOnKeyFrame('screenShare', 2000);
+                        restartMediaOnKeyFrame('screenShare', 4000);
+                        restartMediaOnKeyFrame('screenShare', 8000);
+                        restartMediaOnKeyFrame('screenShare', 12000);
+                    }
+
 /*                    setTimeout(function () {
                         if(typeof callUsers[chatMessaging.userInfo.id] === "undefined" || !callUsers[chatMessaging.userInfo.id])
                             restartMedia(callUsers[chatMessaging.userInfo.id].videoTopicName);
@@ -2046,8 +2047,9 @@
                         type: 'CALL_PARTICIPANT_CONNECTED',
                         result: messageContent
                     });
-
-                    restartMedia(callTopics['sendVideoTopic']);
+//callTopics['sendVideoTopic']
+                    //restartMedia(callUsers[chatMessaging.userInfo.id].videoTopicName);
+                    restartMediaOnKeyFrame(chatMessaging.userInfo.id, 100)
 
                     break;
 
@@ -2126,8 +2128,8 @@
                         result: messageContent
                     });
 
-                    restartMedia(callTopics['sendVideoTopic']);
-
+                    //restartMedia(callTopics['sendVideoTopic']);
+                    restartMediaOnKeyFrame(chatMessaging.userInfo.id, 100)
                     break;
 
                 /**
@@ -2357,8 +2359,8 @@
                         result: messageContent
                     });
 
-                    restartMedia(callTopics['sendVideoTopic']);
-
+                    //restartMedia(callTopics['sendVideoTopic']);
+                    restartMediaOnKeyFrame(chatMessaging.userInfo.id, 100)
                     break;
 
                 /**
@@ -2454,8 +2456,8 @@
                         result: messageContent
                     });
 
-                    restartMedia(callTopics['sendVideoTopic']);
-
+                    //restartMedia(callTopics['sendVideoTopic']);
+                    restartMediaOnKeyFrame(chatMessaging.userInfo.id, 100)
                     break;
             }
         }
@@ -2747,7 +2749,8 @@
 
             return chatMessaging.sendMessage(recordCallData, {
                 onResult: function (result) {
-                    restartMedia(callTopics['sendVideoTopic']);
+                    //restartMedia(callTopics['sendVideoTopic']);
+                    restartMediaOnKeyFrame(chatMessaging.userInfo.id, 100)
                     callback && callback(result);
                 }
             });

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"
-    }
-}