Merge pull request #100 from HttpRafa/master

Added TPS

Author: mesacarlos

.gitignore

@@ -68,4 +68,7 @@ local.properties
 # Scala IDE specific (Scala & Java development for Eclipse)
 .cache-main
 .scala_dependencies
-.worksheet
+.worksheet
+
+#idea
+.idea

client/index.html

@@ -79,8 +79,8 @@ <h1 class="mt-5" id="home_header">Select a server from the menu</h1>
 			<div class="container" id="serverContainer" style="display: none;">
 				<h1 class="mt-4" id="serverTitle"></h1>
 
-				<div class="row p-3">
-					<div class="col-sm-3 mb-2">
+				<div class="row p-2">
+					<div class="col-sm-3">
 						<div class="card">
 							<div class="card-body">
 								<h5 class="card-title" id="players_online">Players Online</h5>
@@ -91,7 +91,7 @@ <h5 class="card-title" id="players_online">Players Online</h5>
 							</div>
 						</div>
 					</div>
-					<div class="col-sm-3 mb-2">
+					<div class="col-sm-3">
 						<div class="card">
 							<div class="card-body">
 								<h5 class="card-title" id="cpu_title">CPU</h5>
@@ -102,7 +102,7 @@ <h5 class="card-title" id="cpu_title">CPU</h5>
 							</div>
 						</div>
 					</div>
-					<div class="col-sm-3 mb-2">
+					<div class="col-sm-3">
 						<div class="card">
 							<div class="card-body">
 								<h5 class="card-title" id="ram_title">RAM</h5>
@@ -113,19 +113,32 @@ <h5 class="card-title" id="ram_title">RAM</h5>
 							</div>
 						</div>
 					</div>
-					<div class="col-sm-3 mb-2">
+					<div class="col-sm-3">
 						<div class="card">
 							<div class="card-body">
-								<p class="card-text">
-									<span id="user_title">Logged as</span>
-									<span id="loggedUsernameLabel">Unknown</span>
-									(<span id="loggedUserTypeLabel">Unknown</span>)
-								</p>
-								<button type="button" class="btn btn-danger btn-sm" id="deleteServerButton">Delete server</button>
+								<h5 class="card-title" id="tps_title">TPS</h5>
+								<p class="card-text"><span id="tps">0</span> Ticks / <span id="maxTps">0</span> Ticks</p>
+								<div class="progress flat-progressbar">
+									<div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" style="width: 0%;" id="TpsProgressBar"></div>
+								</div>
 							</div>
 						</div>
 					</div>
 				</div>
+				<div class="row p-2 mb-2">
+					<div class="col-sm-9">
+						<div class="card">
+							<div class="card-body">
+								<span id="user_title">Logged as</span>&nbsp;<span id="loggedUsernameLabel">Unknown</span>&nbsp;(<span id="loggedUserTypeLabel">Unknown</span>)
+							</div>
+						</div>
+					</div>
+					<div class="col-sm-3">
+						<div class="card">
+							<button type="button" class="btn btn-danger btn-sm" id="deleteServerButton">Delete server</button>
+						</div>
+					</div>
+				</div>
 
 				<div class="card mb-2">
 					<div class="card-body overflow-auto text-light bg-dark console" id="consoleTextArea"></div>

client/scripts/WebConsole.js

@@ -5,14 +5,14 @@
 */
 
 /**
-* Global variables
-*/
-var persistenceManager = new WebConsolePersistenceManager();
-var connectionManager = new WebConsoleManager();
-var lang;
-var autoPasswordCompleted = false; //When true, saved password was used. If a 401 is received, then saved password is not correct
-var statusCommandsInterval = -1;
-var commandHistoryIndex = -1; //Saves current command history index. -1 when not browsing history.
+ * Global variables
+ */
+const persistenceManager = new WebConsolePersistenceManager();
+const connectionManager = new WebConsoleManager();
+let lang;
+let autoPasswordCompleted = false; //When true, saved password was used. If a 401 is received, then saved password is not correct
+let statusCommandsInterval = -1;
+let commandHistoryIndex = -1; //Saves current command history index. -1 when not browsing history.
 
 /**
  * Load list of servers in file servers.json
@@ -61,10 +61,10 @@ function openServer(serverName){
 	connectionManager.loadConnection(serverName);
 
 	//Load saved messages
-	var i;
-	var messages = connectionManager.activeConnection.messages;
+	let i;
+	const messages = connectionManager.activeConnection.messages;
 	for(i = 0; i < messages.length; i++){
-		if(messages[i].status != 401){
+		if(messages[i].status !== 401){
 			onWebSocketsMessage(messages[i]);
 		}
 	}
@@ -88,7 +88,7 @@ function onWebSocketsMessage(message){
 			$("#loggedUserTypeLabel").text(message.as);
 
 			//Disable command bar if user is viewer
-			if(message.as.toLowerCase() == "viewer"){
+			if(message.as.toLowerCase() === "viewer"){
 				$("#commandInput").prop("disabled", true);
 				$("#sendCommandButton").prop("disabled", true);
 			}
@@ -106,7 +106,7 @@ function onWebSocketsMessage(message){
 			break;
 		case 401:
 			//Waiting for login. Show password modal or retrieve password
-			var savedPwd = persistenceManager.getServer(connectionManager.activeConnection.serverName).serverPassword;
+			const savedPwd = persistenceManager.getServer(connectionManager.activeConnection.serverName).serverPassword;
 			if(typeof savedPwd !== "undefined" && !autoPasswordCompleted){
 				connectionManager.sendPassword(savedPwd);
 				autoPasswordCompleted = true;
@@ -127,13 +127,17 @@ function onWebSocketsMessage(message){
 			//RAM Usage
 			writeRamInfo(message.free, message.used, message.max);
 			break;
+		case 1003:
+			//Server TPS
+			writeTpsInfo(message.tps, 20);
+			break;
 		default:
 			console.log('Unknown server response:');
 	}
 	console.log(message);
 
 	//Add interval for Players, CPU and RAM info, if not set
-	if(statusCommandsInterval == -1 && message.status !== 401){
+	if(statusCommandsInterval === -1 && message.status !== 401){
 		statusCommandsInterval = setInterval(function(){
 			connectionManager.askForInfo();
 		}, 2500);
@@ -144,8 +148,8 @@ function onWebSocketsMessage(message){
 * Write to console
 */
 function writeToWebConsole(msg, time){
-	var isScrolledDown = document.getElementById("consoleTextArea").scrollHeight - document.getElementById("consoleTextArea").scrollTop - 40 == $("#consoleTextArea").height();
-	
+	const isScrolledDown = document.getElementById("consoleTextArea").scrollHeight - document.getElementById("consoleTextArea").scrollTop - 40 === $("#consoleTextArea").height();
+
 	//Write to div, replacing < to &lt; (to avoid XSS) and replacing new line to br.
 	msg = msg.replace(/</g, "&lt;");
 	msg = msg.replace(/(?:\r\n|\r|\n)/g, "<br>");
@@ -209,7 +213,7 @@ function writeToWebConsole(msg, time){
 	$("#consoleTextArea").append(msg + "<br>");
 
 	if(isScrolledDown){
-		var textarea = document.getElementById('consoleTextArea');
+		const textarea = document.getElementById('consoleTextArea');
 		textarea.scrollTop = textarea.scrollHeight;
 	}
 }
@@ -220,8 +224,8 @@ function writeToWebConsole(msg, time){
 function writePlayerInfo(connected, maximum){
 	$("#connectedPlayers").text(connected);
 	$("#maxPlayers").text(maximum);
-	
-	var percent = (connected/maximum)*100;
+
+	const percent = (connected / maximum) * 100;
 	$("#playerProgressBar").width(percent + "%");
 }
 
@@ -240,16 +244,30 @@ function writeCpuInfo(usage){
 function writeRamInfo(free, used, total){
 	$("#usedRam").text(used);
 	$("#totalRam").text(total);
-	
-	var percent = (used/total)*100;
+
+	const percent = (used / total) * 100;
 	$("#RamProgressBar").width(percent + "%");
 }
 
+/**
+ * Fill TPS info card
+ */
+function writeTpsInfo(tps, max){
+	if(tps > 20) {
+		tps = 20;
+	}
+	$("#tps").text(tps);
+	$("#maxTps").text(max);
+
+	const percent = (tps / max) * 100;
+	$("#TpsProgressBar").width(percent + "%");
+}
+
 /**
 * Called from WebConsoleConnector only.
 */
 function closedConnection(serverName){
-	if(connectionManager.activeConnection.serverName == serverName){
+	if(connectionManager.activeConnection.serverName === serverName){
 		//Disable command input and button
 		$("#commandInput").prop("disabled", true);
 		$("#sendCommandButton").prop("disabled", true);
@@ -288,13 +306,13 @@ function updateServerList(){
 	$('.servermenuitem').remove();
 
 	//Add all servers
-	var servers = persistenceManager.getAllServers();
-	for(var i = 0; i < servers.length; i++){
+	const servers = persistenceManager.getAllServers();
+	for(let i = 0; i < servers.length; i++){
 		$('#ServerListDropDown').append('<a class="dropdown-item servermenuitem" href="#" onclick="openServer(\'' + servers[i].serverName + '\')">' + servers[i].serverName.replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"").replace(/"/g,"") + '</a>');
 	}
 
 	//Show a "no servers" message when no servers are added
-	if(servers.length == 0){
+	if(servers.length === 0){
 		$('#ServerListDropDown').append('<a class="dropdown-item servermenuitem disabled" href="#" id="noServersAdded">No servers added</a>');
 	}
 }

client/scripts/WebConsoleManager.js

@@ -97,6 +97,11 @@ class WebConsoleManager {
 			command: "RAMUSAGE",
 			token: this.activeConnection.token,
 		});
+
+		this.activeConnection.sendToServer({
+			command: "TPS",
+			token: this.activeConnection.token,
+		});
 	}
 
 	/**

phrases.properties

@@ -34,6 +34,9 @@ players-message = Connected {0} players for a maximum of {1}
 # RamUsageCommand.java
 ram-usage-message = {0} free, {1} used, {2} maximum memory
 
+# TpsCommand.java
+tps-message = {0} ticks from {1}
+
 # WebConsoleCommand.java
 webconsole-version = WebConsole version {0}.
 webconsole-no-connections = There are no logged in WebConsole connections now.

phrases_cs.properties

@@ -34,6 +34,9 @@ players-message = Je připojeno {0} hráčů z maxima {1}
 # RamUsageCommand.java
 ram-usage-message = {0} volné, {1} použité, {2} maximální paměti
 
+# TpsCommand.java
+tps-message = {0} ticks from {1}
+
 # WebConsoleCommand.java
 webconsole-version = WebConsole verze {0}.
 webconsole-no-connections = Nejsou žádné WebConsole připojení.

phrases_de.properties

@@ -34,6 +34,9 @@ players-message = {0} von {1} Spieler sind verbunden.
 # RamUsageCommand.java
 ram-usage-message = {0} frei, {1} benutzt, {2} maximal
 
+# TpsCommand.java
+tps-message = {0} ticks von {1}
+
 # WebConsoleCommand.java
 webconsole-version = Die WebConsole Version ist {0}.
 webconsole-no-connections = Aktuell ist niemand mit der WebConsole verbunden

phrases_en.properties

@@ -34,6 +34,9 @@ players-message = Connected {0} players for a maximum of {1}
 # RamUsageCommand.java
 ram-usage-message = {0} free, {1} used, {2} maximum memory
 
+# TpsCommand.java
+tps-message = {0} ticks from {1}
+
 # WebConsoleCommand.java
 webconsole-version = WebConsole version {0}.
 webconsole-no-connections = There are no logged in WebConsole connections now.

phrases_es.properties

@@ -34,6 +34,9 @@ players-message = Actualmente conectados {0} jugadores de un máximo de {1}
 # RamUsageCommand.java
 ram-usage-message = Memoria: {0} libre, {1} usada, {2} maxima
 
+# TpsCommand.java
+tps-message = {0} ticks from {1}
+
 # WebConsoleCommand.java
 webconsole-version = WebConsole version {0}.
 webconsole-no-connections = No hay ninguna conexión activa a WebConsole en este momento.

phrases_fr.properties

@@ -34,6 +34,9 @@ players-message = Joueurs {0} connectés pour un maximum de {1}
 # RamUsageCommand.java
 ram-usage-message = {0} gratuit, {1} utilisé, {2} mémoire maximale
 
+# TpsCommand.java
+tps-message = {0} ticks from {1}
+
 # WebConsoleCommand.java
 webconsole-version = version WebConsole {0}.
 webconsole-no-connections = Aucune connexion WebConsole n'est connectée maintenant.