Merge pull request #16 from Taraman17/dev

Improve update and example webIF
Taraman17 · Oct 28, 2020 · 40016cb · 40016cb
2 parents 06e390d + 032c7c0
commit 40016cb
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 48 deletions.
diff --git a/example/gameserver.php → example/gameserver.htm b/example/gameserver.php → example/gameserver.htm
@@ -2,8 +2,9 @@
 <html>
 <head>
     <title>CS:GO Gameserver</title>
-    <link href="gameserver.css" rel="stylesheet" type="text/css">
+    <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
+    <link href="gameserver.css" rel="stylesheet" type="text/css">
 </head>
 
 <body alink="#000099"
@@ -27,7 +28,7 @@
                    type="button"
                    class="text"
                    value="Update"
-                   onclick="clickButton(this);"/>
+                   onclick="doUpdate(this);"/>
             <input id="buttonStart"
                    type="button"
                    class="text"
@@ -52,13 +53,7 @@ class="text"
         <div id="startMap" class="label clearfix">
             Starten mit:&nbsp;&nbsp;
             <select id="mapAuswahl">
-    <?php
-            // change path here to load the list of maps to start the server with.
-            $maplist = file("/home/csgo/csgo_ds/csgo/maplist.txt", FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
-            foreach($maplist as $value){ // Loop through each element
-                print("            <option value=".$value.">".$value."</option>\n");
-            }
-    ?>
+                <!-- Will be filled by Javascript -->
             </select>
         </div>
     </div>
@@ -109,7 +104,7 @@ class="text"
         <p onclick='movePlayer(event);' command="spec">Move to Spectators</p>
         <p onclick='alert("test");'>Kick from Server</p>
   </div>
-    <script type="text/javascript" src="js/jquery-3.4.1.min.js"></script>
+    <script type="text/javascript" src="js/jquery-3.5.1.min.js"></script>
     <script type="text/javascript" src="js/gameserver.js"></script>
 </body>
 </html>
diff --git a/example/js/gameserver.js b/example/js/gameserver.js
@@ -1,4 +1,4 @@
-var address, mapSelector;
+var address;
 
 function doLogin() {
      window.location.href = `${address}/login`;
@@ -23,9 +23,8 @@ $( document ).ready(() => {
     // Change here if you don't host the webInterfae on the same host as the NodeJS API
     let ip = window.location.hostname;
     address = `https://${ip}:8090`;
-
-    mapSelector = $("#map").html();
 
+    loadMaplist();
     setupPage();
 
     var socket = new WebSocket(`wss://${ip}:8091`);
@@ -45,7 +44,7 @@ $( document ).ready(() => {
             $('#rounds').html(
                 `Rounds: ${serverInfo.maxRounds} / Left: ${serverInfo.maxRounds - (serverInfo.score.T + serverInfo.score.C)}`
             );
-            
+
             $('.playerDiv ul').empty();
             $('.playerDiv').hide(0);
             if (serverInfo.players.length > 0) {
@@ -57,25 +56,23 @@ $( document ).ready(() => {
             }
             if ($('#mapList li').length < 1) {
                 let maplist = data.mapsAvail;
+                $("#mapList").empty();
                 for (map of maplist) {
                     var li = document.createElement("li");
                     li.appendChild(document.createTextNode(map));
                     $("#mapList").append(li);
                 }
-                if ($("#noMaps").length) {
-                    $("#noMaps").remove();
-                }
             }
         } else if (data.type == "updateProgress") {
             $('#popupText').html(`${data.payload.step}: ${data.payload.progress}%`);
             if (data.payload.step == 'Update Successful!') {
                 window.setTimeout( () => {
                     $('.container-popup').css('display', 'none');
-                }, 2000);
+                }, 1500);
             }
         } else if (data.type == "mapchange") {
             if (data.payload.success) {
-                setupPage('mapchange');
+                setupPage();
                 $('.container-popup').css('display', 'none');
             } else {
                 $('#popupText').html(`Mapchange failed!`);
@@ -87,8 +84,19 @@ $( document ).ready(() => {
     }
 });
 
+// Load the maplist for serverstart from maplist.txt
+function loadMaplist() {
+    // The Maplist file can be taken from the csgo folder.
+    $.get('./maplist.txt', (data) => {
+        let lines = data.split(/\r\n|\n/);
+        lines.forEach( (map) => {
+            $("#mapAuswahl").append(`<option value="${map}">${map}</option>`);
+        });
+    });
+}
+
 // Setup the Elements according to server status.
-function setupPage(action) {
+function setupPage() {
     $('#popupCaption').text('Querying Server');
     function loggedIn() {
         return Promise.resolve(sendGet(`${address}/loginStatus`));
@@ -121,7 +129,7 @@ function setupPage(action) {
 }
 
 function setupNotLoggedIn() {
-    $('#power-image').hide()0;
+    $('#power-image').hide(0);
     $('#startMap').hide(0);
     $('#buttonStop').hide(0);
     $('#buttonStart').hide(0);
@@ -132,7 +140,7 @@ function setupNotLoggedIn() {
 }
 function setupServerRunning() {
     $('#power-image').attr('src', 'pic/power-on.png');
-    getCurrentMap();
+    getMaps();
     $('#startMap').hide(0);
     $('#mapList').on( 'click', showPlay);
     $('#mapList').on( 'dblclick', changeMap);
@@ -145,7 +153,6 @@ function setupServerRunning() {
 }
 function setupServerStopped() {
     $('#power-image').attr('src', 'pic/power-off.png');
-    $("#map").html(mapSelector);
     $('#startMap').show(0);
     $('#buttonStart').show(0);
     $('#buttonStop').hide(0);
@@ -156,6 +163,19 @@ function setupServerStopped() {
     $('#mapSelector').hide('fast');
 }
 
+function doUpdate(aButton) {
+    action = aButton.value.toLowerCase();
+    $('#popupCaption').text(`Updating Server`);
+    $('#popupText').text('Moment bitte!');
+    $('.container-popup').css('display', 'flex');
+
+    sendGet(`${address}/control`, `action=update`, ( data ) => {
+        if(!data.success) {
+            alert('command' + action + ' failed!');
+        }
+    });
+}
+
 function clickButton(aButton) {
     action = aButton.value.toLowerCase();
     $('#popupCaption').text(`${action}ing Server`);
@@ -164,7 +184,7 @@ function clickButton(aButton) {
     startMap = document.getElementById('mapAuswahl').value;
 
     sendGet(`${address}/control`, `action=${action}&startmap=${startMap}`, ( data ) => {
-        setupPage(action);
+        setupPage();
         if(!data.success) {
             alert('command' + action + ' failed!');
         }
@@ -194,21 +214,20 @@ function movePlayer(event) {
     });
 }
 
-function getCurrentMap() {
+function getMaps() {
     function getServerInfo() {
         return Promise.resolve(sendGet(`${address}/serverInfo`));
     }
     let serverInfo = getServerInfo();
     serverInfo.then((data) => {
-        $("#map").html(`Current map: ${data.map}`);
+        $("#currentMap").html(`Current map: ${data.map}`);
         maplist = data.mapsAvail;
+        $("#mapList").empty();
         for (map of maplist) {
             var li = document.createElement("li");
             li.appendChild(document.createTextNode(map));
-            // option.value = map;
             $("#mapList").append(li);
         }
-        $("#noMaps").remove();
     }).catch((error) => {
         // do nothing for now
     });
@@ -255,18 +274,3 @@ function restartRound() {
         }, 1000);
     });
 }
-
-// Bot Training functions
-function setBotRules() {
-    sendGet(`${address}/rcon`, `message=mp_autoteambalance 0`);
-    sendGet(`${address}/rcon`, `message=mp_limitteams 0`);
-    sendGet(`${address}/rcon`, `message=bot_difficulty 3`);
-}
-function addBots(team, quantity) {
-    for(let i=0; i < quantity; i++) {
-        setTimeout(sendGet(`${address}/rcon`, `message=bot_add_${team}`), 100);
-    }
-}
-function kickBots() {
-    sendGet(`${address}/rcon`, `message=bot_kick all`);
-}
diff --git a/example/js/jquery-3.4.1.min.js b/example/js/jquery-3.4.1.min.js
diff --git a/example/js/jquery-3.5.1.min.js b/example/js/jquery-3.5.1.min.js
diff --git a/example/maplist.txt b/example/maplist.txt
@@ -0,0 +1,8 @@
+cs_italy
+cs_office
+de_aztec
+de_dust
+de_dust2
+de_inferno
+de_nuke
+de_train
diff --git a/serverControl.js b/serverControl.js
@@ -221,6 +221,7 @@ passport.use(
           // Cut the SteamID64 from the returned User-URI
           let steamID64 = identifier.split('/')[5];
           profile.identifier = steamID64;
+          console.log(`User with steamID ${steamID64} logged in`);
           return done(null, profile);
         });
     }
@@ -275,6 +276,7 @@ app.get('/login/return',
     }
 );
 app.get('/logout', (req, res) => {
+    console.log(`User with steamID ${req.user.identifier} logged out`);
     req.logout();
     res.redirect(cfg.redirectPage);
 });
@@ -354,6 +356,7 @@ app.get("/control", ensureAuthenticated, (req, res) => {
         let updateSuccess = false;
         console.log('Updating Server.');
         let updateProcess = pty.spawn(cfg.updateCommand, cfg.updateArguments);
+
         updateProcess.on('data', (data) => {
             console.log(data);
             if (data.indexOf('Checking for available updates') != -1) {
@@ -379,13 +382,26 @@ app.get("/control", ensureAuthenticated, (req, res) => {
                 state.operationPending = false;
             }
         });
-        updateProcess.once('close', (code) => {
+
+        if (cfg.webSockets) {
             res.writeHeader(200, {"Content-Type": "application/json"});
-            res.write(`{ "success": ${updateSuccess} }`);
+            if (updateProcess) {
+                res.write(`{ "success": true }`);
+            } else {
+                res.write(`{ "success": false }`);
+            }
             res.end();
             updateProcess.removeAllListeners();
             state.operationPending = false;
-        });
+        } else {
+            updateProcess.once('close', (code) => {
+                res.writeHeader(200, {"Content-Type": "application/json"});
+                res.write(`{ "success": ${updateSuccess} }`);
+                res.end();
+                updateProcess.removeAllListeners();
+                state.operationPending = false;
+            });
+        }
 
     // Send Status
     } else if (args.action == "status") {