From 905cb9412c681e11161398d150e86910d3862acc Mon Sep 17 00:00:00 2001 From: Jimmy Date: Wed, 22 Sep 2021 21:38:03 +1200 Subject: [PATCH] On start or server select open new websocket rather than reloading --- frontend/src/main.js | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/frontend/src/main.js b/frontend/src/main.js index cd470e4..aff8a5c 100644 --- a/frontend/src/main.js +++ b/frontend/src/main.js @@ -62,8 +62,17 @@ function main() { serverselect.addEventListener("click", (event) => { console.log(serverselect.value); window.location.hash = serverselect.value; + server = serverselect.value; socket.close(); - location.reload(); + try { + socket = new WebSocket(`wss://${host}/server/${server}/logs?token=${token}`); + const attachAddon = new AttachAddon(socket); + term.loadAddon(attachAddon); + } catch(err) { + alert("You are not allowed to use this server"); + return; + } + //location.reload(); }) window.onbeforeunload = function() { @@ -90,7 +99,15 @@ function main() { return } socket.close(); - location.reload(); + try { + socket = new WebSocket(`wss://${host}/server/${server}/logs?token=${token}`); + const attachAddon = new AttachAddon(socket); + term.loadAddon(attachAddon); + } catch(err) { + alert("You are not allowed to use this server"); + return; + } + //location.reload(); } catch(err) { console.error(`Error: ${err}`); }