@flashphoner/websdk 2.0.232 → 2.0.234

package/docTemplate/README.md

@@ -1,4 +1,4 @@
-Web SDK - 2.0.232
+Web SDK - 2.0.234
 
 [Download builds](https://docs.flashphoner.com/display/WEBSDK2EN/Web+SDK+release+notes)
 

package/examples/demo/streaming/console/console.html

@@ -14,6 +14,7 @@
         <script type="text/javascript" src="../../dependencies/bootstrap/js/bootstrap.min.js"></script>
         <script type="text/javascript" src="../../dependencies/js/utils.js"></script>
         <script type="text/javascript" src="../../../../flashphoner-rest-api.js"></script>
+        <script type="text/javascript" src="../../../../flashphoner.js"></script>
         <script type="text/javascript" charset="utf8" src="jquery.dataTables.js"></script>
         <script type="text/javascript" src="console.js"></script>
     </head>
@@ -38,6 +39,7 @@
                                 <th>MEM</th>
                                 <th>TH</th>
                                 <th>CONN</th>
+                                <th>WS</th>
                                 <th>IN</th>
                                 <th>OUT</th>
                             </tr>
@@ -49,10 +51,13 @@
             <hr>
             <div id="nodeControls" class="row vdivide hidden">
                 <div class="col-sm-2">
+                    <button id="wsSessionsBatchModalBtn" data-toggle='modal' data-target='#wsSessionsBatchModal' type="button" class="btn btn-default btn-success btn-block">Create sessions</button>
+                    <hr>
                     <button id="pullStreamModalBtn" data-toggle='modal' data-target='#pullModal' type="button" class="btn btn-default btn-success btn-block">Pull stream</button>
                     <button id="pullRtspStreamModalBtn" data-toggle='modal' data-target='#pullRtspModal' type="button" class="btn btn-default btn-success btn-block">Pull RTSP stream</button>
                     <hr>
                     <button id="pullStreamBatchModalBtn" data-toggle='modal' data-target='#pullStreamBatchModal' type="button" class="btn btn-default btn-success btn-block">Pull streams</button>
+                    <button id="pushStreamBatchModalBtn" data-toggle='modal' data-target='#pushStreamBatchModal' type="button" class="btn btn-default btn-success btn-block">Push streams</button>
                     <button id="registerBatchModalBtn" data-toggle='modal' data-target='#registerBatchModal' type="button" class="btn btn-default btn-success btn-block">Register</button>
                     <button id="unregisterBatchModalBtn" data-toggle='modal' data-target='#unregisterBatchModal' type="button" class="btn btn-default btn-success btn-block">Unregister</button>
                     <button id="callBatchModalBtn" data-toggle='modal' data-target='#callBatchModal' type="button" class="btn btn-default btn-success btn-block">Call</button>
@@ -200,7 +205,7 @@
                                     </select>
                                 </div>
                                 <div class="form-group">
-                                    <label for="pullStreamBatchNodes"><span class="glyphicon glyphicon-play-circle"></span> Proto pull</label>
+                                    <label for="pullStreamBatchProto"><span class="glyphicon glyphicon-play-circle"></span> Proto pull</label>
                                     <select class="custom-select" id="pullStreamBatchProto">
                                         <option value="ws" selected>WebRTC</option>
                                         <option value="rtmp">RTMP</option>
@@ -227,6 +232,75 @@
                     </div>
                 </div>
             </div>
+            <div id="pushStreamBatchModal" class="modal fade" role="dialog">
+                <div class="modal-dialog">
+                    <div class="modal-content">
+                        <div class="modal-header">
+                            <button type="button" class="close" data-dismiss="modal">&times;</button>
+                            <h4>Push Streams</h4>
+                        </div>
+                        <div class="modal-body">
+                            <form action="" id="pushStreamBatchForm">
+                                <div class="form-group">
+                                    <label for="pushStreamBatchNodes"><span class="glyphicon glyphicon-globe"></span> Choose node</label>
+                                    <select class="custom-select" id="pushStreamBatchNodes">
+                                    </select>
+                                </div>
+                                <div class="form-group">
+                                    <label for="pushStreamBatchProto"><span class="glyphicon glyphicon-play-circle"></span> Proto push</label>
+                                    <select class="custom-select" id="pushStreamBatchProto">
+                                        <option value="ws" selected>WebRTC</option>
+                                        <option value="rtmp">RTMP</option>
+                                    </select>
+                                </div>
+                                <div class="form-group">
+                                    <label for="pushBatchLocalName"><span class="glyphicon glyphicon-play-circle"></span> Local stream name</label>
+                                    <input type="text" class="form-control" id="pushBatchLocalName" placeholder="my_local_stream">
+                                </div>
+                                <div class="form-group">
+                                    <label for="pushBatchRemoteName"><span class="glyphicon glyphicon-play-circle"></span> Remote stream name</label>
+                                    <input type="text" class="form-control" id="pushBatchRemoteName" placeholder="my_remote_stream">
+                                </div>
+                                <div class="form-group">
+                                    <label for="pushBatchQty"><span class="glyphicon glyphicon-plus"></span> Qty</label>
+                                    <input type="text" class="form-control" id="pushBatchQty" placeholder="1">
+                                </div>
+                                <button id="pushBatchStream" type="button" class="btn btn-default btn-success btn-block"><span class="glyphicon glyphicon-off"></span> Push</button>
+                            </form>
+                        </div>
+                        <div class="modal-footer">
+                            <button type="button" class="btn btn-default pull-left" data-dismiss="modal"><span class="glyphicon glyphicon-remove"></span> Cancel</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div id="wsSessionsBatchModal" class="modal fade" role="dialog">
+                <div class="modal-dialog">
+                    <div class="modal-content">
+                        <div class="modal-header">
+                            <button type="button" class="close" data-dismiss="modal">&times;</button>
+                            <h4>Create sessions to the node</h4>
+                        </div>
+                        <div class="modal-body">
+                            <form action="" id="wsSessionsBatchForm">
+                                <div class="form-group">
+                                    <label for="wsSessionsBatchNodes"><span class="glyphicon glyphicon-globe"></span> Choose node</label>
+                                    <select class="custom-select" id="wsSessionsBatchNodes">
+                                    </select>
+                                </div>
+                                <div class="form-group">
+                                    <label for="wsSessionsBatchQty"><span class="glyphicon glyphicon-plus"></span> Qty</label>
+                                    <input type="text" class="form-control" id="wsSessionsBatchQty" placeholder="1">
+                                </div>
+                                <button id="wsSessionsBatchConnect" type="button" class="btn btn-default btn-success btn-block"><span class="glyphicon glyphicon-off"></span> Connect</button>
+                            </form>
+                        </div>
+                        <div class="modal-footer">
+                            <button type="button" class="btn btn-default pull-left" data-dismiss="modal"><span class="glyphicon glyphicon-remove"></span> Cancel</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
             <div id="registerBatchModal" class="modal fade" role="dialog">
                 <div class="modal-dialog">
                     <div class="modal-content">

package/examples/demo/streaming/console/console.js

@@ -1,17 +1,17 @@
 
-var REFRESH_NODE_STATE_INTERVAL = 5000;
-var REFRESH_NODE_STATE_FAILED_INTERVAL = 10000;
-var REFRESH_NODE_DETAILS = 2000;
-var STRESS_TEST_INTERVAL = 1000;
-var STRESS_TEST_FAILED_INTERVAL = STRESS_TEST_INTERVAL * 2;
-var NODE_STATE = {
+const REFRESH_NODE_STATE_INTERVAL = 5000;
+const REFRESH_NODE_STATE_FAILED_INTERVAL = 10000;
+const REFRESH_NODE_DETAILS = 2000;
+const STRESS_TEST_INTERVAL = 1000;
+const STRESS_TEST_FAILED_INTERVAL = STRESS_TEST_INTERVAL * 2;
+const NODE_STATE = {
     NEW: "new",
     ALIVE: "alive",
     ACTIVE: "active",
     DEACTIVATE: "deactivate",
     FAILED: "failed"
 };
-var NODE_DETAILS_TYPE = {
+const NODE_DETAILS_TYPE = {
     ALL: "all",
     PULLED: "pulled",
     RTSP: "rtsp",
@@ -19,7 +19,7 @@ var NODE_DETAILS_TYPE = {
     TESTS: "tests"
 };
 
-var STRESS_TESTS = {
+const STRESS_TESTS = {
     REGISTER: { running: false},
     CALL: { running: false},
     PLAY_STREAM: { running: false},
@@ -28,7 +28,11 @@ var STRESS_TESTS = {
 
 var nodes = {};
 
+const SESSION_STATUS = Flashphoner.constants.SESSION_STATUS;
+
 $(function() {
+    Flashphoner.init();
+
     $("#addNodeFormSubmit").on("click", function(e){
         var ip = $("#nodeIp").val();
         if (ip && ip.length > 0) {
@@ -67,9 +71,21 @@ $(function() {
     $('#pullStreamBatchModal').on('show.bs.modal', function(e) {
         populateNodes($("#pullStreamBatchNodes"));
     });
+    $('#pushStreamBatchModal').on('show.bs.modal', function(e) {
+        populateNodes($("#pushStreamBatchNodes"));
+    });
     $("#pullBatchStream").on("click", function(e){
         pullStreamBatch();
     });
+    $("#pushBatchStream").on("click", function(e){
+        pushStreamBatch();
+    });
+    $('#wsSessionsBatchModal').on('show.bs.modal', function(e) {
+        populateNodes($("#wsSessionsBatchNodes"));
+    });
+    $("#wsSessionsBatchConnect").on("click", function(e){
+        wsSessionsBatch();
+    });
     $('#registerBatchModal').on('show.bs.modal', function(e) {
         populateNodes($("#registerBatchNodes"));
     });
@@ -157,6 +173,7 @@ function createNode(id, ip) {
     api.ip = nodeIp;
     api.port = port;
     api.tests = [];
+    api.wsSessions = {};
     let state = NODE_STATE.NEW;
     let pollState = function(){
         api.stat.poll().then(function(stat){
@@ -274,6 +291,17 @@ function createNode(id, ip) {
         const json = await result.json();
         return json;
     }
+    api.createWsSession = function(wsUrl) {
+        Flashphoner.createSession({urlServer: wsUrl}).on(SESSION_STATUS.ESTABLISHED, function (session) {
+            api.wsSessions[session.id()] = session;
+        }).on(SESSION_STATUS.DISCONNECTED, function (session) {
+            console.log("Session with " + wsUrl + " (id: " + session.id() + ") disconnected");
+            delete api.wsSessions[session.id()];
+        }).on(SESSION_STATUS.FAILED, function (session) {
+            console.log("Session with " + wsUrl + " (id: " + session.id() + ") failed");
+            delete api.wsSessions[session.id()];
+        });
+    }
     return api;
 }
 
@@ -323,6 +351,7 @@ function updateNodeState(id, state) {
                     "<td id='"+id+"-state-mem'>"+(mem)+"</td>" +
                     "<td id='"+id+"-state-threads'>"+state.core.core_threads+"</td>" +
                     "<td id='"+id+"-state-conn'>"+state.connection.connections+"</td>" +
+                    "<td id='"+id+"-state-ws'>"+state.connection.connections_websocket+"</td>" +
                     "<td id='"+id+"-state-in'>"+(streamsIn)+"</td>" +
                     "<td id='"+id+"-state-out'>"+(streamsOut)+"</td>" +
                     "</tr>";
@@ -333,6 +362,7 @@ function updateNodeState(id, state) {
             $("#"+id+"-state-mem").text(mem);
             $("#"+id+"-state-threads").text(state.core.core_threads);
             $("#"+id+"-state-conn").text(state.connection.connections);
+            $("#"+id+"-state-ws").text(state.connection.connections_websocket);
             $("#"+id+"-state-in").text(streamsIn);
             $("#"+id+"-state-out").text(streamsOut);
         }
@@ -456,6 +486,25 @@ function pullRTSPStream() {
     $("#pullRtspModal").modal('hide');
 }
 
+function wsSessionsBatch() {
+    if (!$("#wsSessionsBatchNodes").val()) {
+        $('#warningModal').modal();
+        return false;
+    }
+    var node = getActiveNode();
+    var remote = getWebsocketUrl($("#wsSessionsBatchNodes").val()) + "/";
+    var qty = parseInt($("#wsSessionsBatchQty").val());
+    var interval = setInterval(function(){
+        if (qty > 0) {
+            node.createWsSession(remote);
+            qty--;
+        } else {
+            clearInterval(interval);
+        }
+    }, 200);
+    $("#wsSessionsBatchModal").modal('hide');
+}
+
 //pullBatchStream
 
 function pullStreamBatch() {
@@ -485,6 +534,37 @@ function pullStreamBatch() {
     $("#pullStreamBatchModal").modal('hide');
 }
 
+function pushStreamBatch() {
+    if (!$("#pushStreamBatchNodes").val()) {
+        $('#warningModal').modal();
+        return false;
+    }
+    var node = getActiveNode();
+    var proto = $("#pushStreamBatchProto").val();
+    var localName = $("#pushBatchLocalName").val();
+    var remoteName = $("#pushBatchRemoteName").val();
+    var remote;
+    if (proto == "ws") {
+        remote = getWebsocketUrl($("#pushStreamBatchNodes").val()) + "/";
+    } else {
+        remote = "rtmp://" + $("#pushStreamBatchNodes").val() + ":1935/live/";
+    }
+    var qty = parseInt($("#pushBatchQty").val());
+    var interval = setInterval(function(){
+        if (qty > 0) {
+            if (proto == "ws") {
+                node.pull.push(remote, localName, remoteName + qty).catch(function (e) {console.log(e)});
+            } else {
+                node.push.push(localName, remote + remoteName + qty, true);
+            }
+            qty--;
+        } else {
+            clearInterval(interval);
+        }
+    }, 200);
+    $("#pushStreamBatchModal").modal('hide');
+}
+
 function registerBatch() {
     if (!$("#registerBatchNodes").val()) {
         $('#warningModal').modal();