From a7beef5fe2a83f2a3f406d4241daed2419522235 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Herv=C3=A1s=20Rodao?= <danielhervasrodao@gmail.com>
Date: Mon, 28 Jun 2021 09:45:56 +0200
Subject: [PATCH] novnc webrtc

---
 utils/stream/rtcstream.js |  1 +
 vnc.html                  | 42 +++++++++++++++++++++++----------------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/utils/stream/rtcstream.js b/utils/stream/rtcstream.js
index bfe529ce..2f2b6171 100644
--- a/utils/stream/rtcstream.js
+++ b/utils/stream/rtcstream.js
@@ -51,6 +51,7 @@ async function startLocalStream(){
     // Obtener el stream del usuario
     if(!canvas){
         console.log('[NOVNC] Error: no CANVAS');
+        users = false;
         return
     }
     stream = canvas.captureStream();
diff --git a/vnc.html b/vnc.html
index 6af0d398..abcbaa7f 100644
--- a/vnc.html
+++ b/vnc.html
@@ -328,6 +328,8 @@
     <script>
         const localVideo = document.querySelector('#localVideo');
         var stream_set = false;
+        let room_name;
+        let users = false;
 
         var canvas = document.querySelector('#noVNC_container canvas');
         // Buscar el canvas 
@@ -343,39 +345,32 @@
                     stream_set = true;
                 }
             }
-        },500);
+        },1000);
 
-
-        /////// Control de streamws
+        // Creo la sala
+        room_name = Date.now()+Math.round(Math.random()*10000);
+        console.log('[NOVNC] room name: ', room_name);
         // Creo WS de stream
         const streamws = new WebSocket(
                     'ws://' +
                     '127.0.0.1:8000' +
                     '/ws/stream/' +
-                    'd' +
+                    room_name +
                     '/'
                 );
         console.log('[NOVNC] WebSocket streamws creado');
-
-        window.addEventListener('message', function(e){
-            console.log('[NOVNC] mensaje: ', e.data);
-            if(e.data === 'start'){
-                console.log('Empezar el stream');
-                // Comprobar usuarios
-                checkUsers();
-            }
-        });
-
-        ///// Esto va en ws_stream.js
+        // HAndler ws
         streamws.onmessage = function(e){
             let message_data = JSON.parse(event.data);
             console.log('[NOVNC] streamws: ', message_data);
             if(message_data['type'] == 'checkusers'){
                 if(message_data['users']){
                     console.log('[NOVNC] usuarios correctos');
+                    users = true;
                     startLocalStream();
                 }else{
                     console.log('[NOVNC] usuarios incorrectos');
+                    users = false;
                 }
             }else if(message_data['type'] == 'candidate'){
                 console.log('[NOVNC] Candidate received');
@@ -391,8 +386,21 @@
                 window.location.pathname = '/';
             }
         }
-        
-        ////////
+
+        window.addEventListener('message', function(e){
+            console.log('[NOVNC] mensaje: ', e.data);
+            if(e.data === 'start'){
+                console.log('Empezar el stream');
+                // Envío la sala del stream al padre
+                parent.postMessage(JSON.stringify({'stream':room_name}),'*');
+                // Comprobar usuarios
+                setInterval(function(){
+                    if(!users){
+                        checkUsers();
+                    }
+                },2000);
+            }
+        });
 
         // window.onload = function(){
         //     parent.postMessage(canvas, '*');