.github/workflows/codeql-analysis.yml

@@ -1,71 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-name: "CodeQL"
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [master]
-  schedule:
-    - cron: '0 6 * * 6'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        # Override automatic language detection by changing the below list
-        # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
-        language: ['javascript', 'java']
-        # Learn more...
-        # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
-
-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
-    - run: git checkout HEAD^2
-      if: ${{ github.event_name == 'pull_request' }}
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file. 
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1

.gitignore

@@ -69,6 +69,3 @@ local.properties
 .cache-main
 .scala_dependencies
 .worksheet
-
-#idea
-.idea

API_js/WebConsoleAPI.js

@@ -1,103 +0,0 @@
-/**
- WebConsole API for WebConsole
- Used to manage active connections
- https://github.com/mesacarlos
- 2019-2020 Carlos Mesa under MIT License.
-*/
-class WebConsoleAPI {
-	constructor(serverURI){
-		this.activeConnection = new WebConsoleConnector(serverURI);
-		this.activeConnection.subscribe(this.onMsg);
-		this.activeConnection.connect();
-	}
-	
-	/**
-	* Send password to server
-	*/
-	login(pwd){
-		this.activeConnection.sendToServer({
-			command: "LOGIN",
-			params: pwd
-		});
-	}
-	
-	/**
-	* Send console command to server
-	*/
-	sendConsoleCmd(cmd){
-		this.activeConnection.sendToServer({
-			command: "EXEC",
-			token: this.activeConnection.token,
-			params: cmd
-		});
-
-		this.activeConnection.commands.push(cmd);
-	}
-	
-	/**
-	* Asks server for CPU, RAM and players info
-	*/
-	askForInfo(){
-		this.activeConnection.sendToServer({
-			command: "PLAYERS",
-			token: this.activeConnection.token,
-		});
-
-		this.activeConnection.sendToServer({
-			command: "CPUUSAGE",
-			token: this.activeConnection.token,
-		});
-
-		this.activeConnection.sendToServer({
-			command: "RAMUSAGE",
-			token: this.activeConnection.token,
-		});
-	}
-
-	/**
-	* Asks server for full latest.log
-	*/
-	askForLogs(){
-		this.activeConnection.sendToServer({
-			command: "READLOGFILE",
-			token: this.activeConnection.token,
-		});
-	}
-	
-	/**
-	* This function is executed when a message is received from the server
-	*/
-	onMsg(message){
-		//Print JSON to console. You may remove this line:
-		console.log(message);
-		
-		//Type your code inside the switch cases:
-		switch (message.status) {
-			case 10:
-				//Console Output
-				//Info: The weird characters you probably get are the color indicators. Check the link below to learn how the official client parses them
-				//https://github.com/mesacarlos/WebConsole/blob/383b0e3420a948a61c7935ff84f40ff159fbd466/client/scripts/WebConsole.js#L128
-				break;
-			case 200:
-				//LoggedIn
-				break;
-			case 400:
-				//Unknown Command
-				break;
-			case 401:
-				//Waiting for login...
-				break;
-			case 1000:
-				//Connected players info
-				break;
-			case 1001:
-				//Cpu Usage info
-				break;
-			case 1002:
-				//RAM Usage info
-				break;
-			default:
-				console.log('Unknown server response:');
-		}
-	}
-}

API_js/WebConsoleConnector.js

@@ -1,96 +0,0 @@
-/**
- WebConsole Connector for WebConsole
- Used to connect to WebSocketsServer
- https://github.com/mesacarlos
- 2019-2020 Carlos Mesa under MIT License.
-*/
-class WebConsoleConnector {
-	
-	constructor(serverURI) {
-		this.serverURI = serverURI;
-		this.token;
-		this.subscribers = []; //List of functions called when a new message arrive
-		this.messages = []; //All messages retrieved since connection start
-		this.commands = []; //EXEC Commands sent by user to this server
-		this.isLogged = false; //Is logged in with valid pasword or not
-	}
-	
-	/**
-	* Connect to WebSocket
-	*/
-	connect(){
-		var connector = this;
-		this.websocket = new WebSocket(this.serverURI);
-		this.websocket.onopen = function(evt) { connector.onOpen(evt) };
-		this.websocket.onclose = function(evt) { connector.onClose(evt) };
-		this.websocket.onmessage = function(evt) { connector.onMessage(evt) };
-		this.websocket.onerror = function(evt) { connector.onError(evt) };
-	}
-	
-	/**
-	* Internal function
-	*/
-	onOpen(evt){
-		//Event: Connection opened
-	}
-	
-	/**
-	* Internal function
-	*/
-	onClose(evt){
-		console.log("Closed reason: " + evt.reason); //No reason provided (using chrome at least)
-	}
-	
-	/**
-	* Internal function
-	*/
-	onMessage(evt){
-		var obj = JSON.parse(evt.data);
-		
-		//Sucessfully connected? Save token
-		if(obj.status === 200){
-			this.token = obj.token;
-			this.isLogged = true;
-		}
-		
-		this.notify(obj); //Notify all subscribers
-		this.messages.push(obj);
-	}
-	
-	/**
-	* Internal function
-	*/
-	onError(evt){
-		//Error occurred on the connection
-	}
-	
-	/**
-	* Notifies a new message to all subscribers
-	*/
-	notify(obj){
-		this.subscribers.forEach(function(fun) {
-			fun(obj); //Calls function with this object
-		});
-	}
-	
-	/**
-	* Sends a WebSocket command to Server
-	*/
-	sendToServer(message){
-		this.websocket.send(JSON.stringify(message));
-	}
-	
-	/**
-	* Adds a function to subscriber list
-	*/
-	subscribe(func){
-		this.subscribers.push(func);
-	}
-	
-	/**
-	* Unsubscribe all subscribers
-	*/
-	removeSubscribers(){
-		this.subscribers = [];
-	}
-}

API_js/demo.html

@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<script src="WebConsoleAPI.js"></script>
-	<script src="WebConsoleConnector.js"></script>
-</head>
-<body>
-	<h1>API demo</h1>
-	<p>Open your console (F12) and type: var webconsoleapi = new WebConsoleAPI("ws://localhost:8080");</p>
-	<p>Replace ws:// with wss:// if your server have SSL enabled, localhost with your server IP and 8080 with your port.</p>
-	<p>Then call login(pwd) to login, sendConsoleCmd(cmd) to execute a command, etc...</p>
-</body>
-</html>

README.md

@@ -4,18 +4,18 @@
 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/mesacarlos/WebConsole)](https://github.com/mesacarlos/WebConsole/releases/latest)
 ![GitHub All Releases](https://img.shields.io/github/downloads/mesacarlos/WebConsole/total?label=total%20downloads)
 
-WebConsole is a Spigot plugin for Minecraft 1.8-1.18+ that allows you to view your server console and manage your server from anywhere. It creates a WebSocket server in the background used by the web interface to send commands, receive your console log and manage your server.
+WebConsole is a Spigot plugin for Minecraft 1.8-1.16+ that allows you to view your server console and manage your server from anywhere. It creates a WebSocket server in the background used by the web interface to send commands, receive your console log and manage your server.
 
-Don't worry about privacy or security: all data is stored in your browser locally and your PC will connect directly to your minecraft server. No intermediary web servers, just you and your MC server.
+Dont worry about privacy or security: all data is stored in your browser offline and your PC will connect directly to your minecraft server. No intermediary web servers, just you and your MC server.
 
 #### Additional features:
-* Multiuser system and View-only user mode: You can create multiple users and set their role to "Admin" or "Viewer". Users with the role "Viewer" can only read console, CPU and RAM usage. Users with role "Admin" can also run commands on the server. Useful if you want your friends to watch the server console but deny them from typing commands and ruining your server. Also, you can whitelist or blacklist some commands.
+* Multiuser system and View-only user mode: You can create multiple users and set their role to "Admin" or "Viewer". Users with the role "Viewer" can only read console, CPU and RAM usage. Users with role "Admin" can also run commands on the server. Useful if you want your friends to watch the server console but deny them from typing commands and ruining your server.
 * Command history: Use up/down arrow keys to browse the command history, like in the real console.
 * Colors supported, for both Windows and Linux hosts. (Colors are represented different in each platform).
 * Real-time connected players, machine CPU and server RAM usage information.
 * Capable of keeping active connections to more than one server to keep retrieving console log in the background for them all.
-* English, Spanish, Chinese (thanks to Neubulae and OPhantomO), Czech (thanks to Tada), Deutsch (thanks to NoNamePro0), Dutch (thanks to Twockx), French (thanks to pickatchou999), Italian (thanks to AlexZap), Japanese (thanks to kuroneko6423), Korean (thanks to XxPKBxX), Portuguese (thanks to AlexandreMuassab and Connect500BR), Russian (thanks to Stashenko) and Turkish (thanks to acarnd03) supported.
+* English, Spanish, Chinese (thanks to Neubulae and OPhantomO), Czech (thanks to Tada), Deutsch (thanks to NoNamePro0), Dutch (thanks to Twockx), French (thanks to pickatchou999), Italian (thanks to AlexZap), Korean (thanks to XxPKBxX), Portuguese (thanks to AlexandreMuassab and Connect500BR) and Russian (thanks to Stashenko) supported.
-* Free!
+* Free, updated regularly, and many more!
 
 ![Screenshot](https://i.imgur.com/sN1sYju.png)
 
@@ -35,33 +35,26 @@ Don't worry about privacy or security: all data is stored in your browser locall
     language: en  
     passwords:  
        admin:  
-	      user1:  
+	      user1: mySecurePassword  
-            password: mySecurePassword  
-            commandWhitelist:  
-              enabled: true  
-              commandWhitelistActsAsBlacklist: false  
-              whitelist:  
-              - whisper  
-              - gamemode survival  
        viewer: {}  
 
 
 
 A explanation of the `host`, `port`, `language` and `passwords` fields follows:
 
-`host`: Leaving it as 0.0.0.0 will do the trick. If you experience issues , you can change this value to your device IP. If you are in a VPS or dedicated server (or you have a full public IP allocated for your device) type your public IP. If you are at your home (and you don't have a public IP assigned to your device) type your private IP, it is probably something like 192.168.xx.xx.
+`host`: Leaving it as 0.0.0.0 will do the trick. If you experience issues , you can change this value to your device IP. If you are in a VPS or dedicated server (or you have a full public IP allocated for your device) type your public IP. If you are at your home (and you dont have a public IP assigned to your device) type your private IP, it is probably something like 192.168.xx.xx.
 
 `port`: A port where to run this plugin (cannot be the port you are using for Minecraft).
 
-You can modify `language` to view console and command messages in your preferred language. Valid languages are English (`en`), Spanish (`es`), Chinese (`zh`), Czech (`cs`), Deutsch (`de`), Dutch (`nl`), French (`fr`), Italian (`it`), Japanese (`ja`) Korean (`ko`), Polskie (`pl`), Portuguese (`pt`), Russian (`ru`) and Turkish (`tr`). **IMPORTANT: There is a known issue with Microsoft Windows cmd that shows weird characters when using a language different than English. If you are using Windows to host your server, check [this wiki page](https://github.com/mesacarlos/WebConsole/wiki/Show-local-characters-in-Windows-Console) to solve the problem**.
+You can modify `language` to view console and command messages in your preferred language. Valid languages are English (`en`), Spanish (`es`), Chinese (`zh`), Czech (`cs`), Deutsch (`de`), Dutch (`nl`), French (`fr`), Italian (`it`), Korean (`ko`), Portuguese (`pt`) and Russian (`ru`). **IMPORTANT: There is a known issue with Microsoft Windows cmd that shows weird characters when using a language different than English. If you are using Windows to host your server, check [this wiki page](https://github.com/mesacarlos/WebConsole/wiki/Show-local-characters-in-Windows-Console) to solve the problem**.
 
 From version 2.0 you can now create more than one user and set them as admin (Permission for both reading console and executing commands) or viewer (Permission for only reading console and CPU and RAM usage). This is configured using the `passwords` section:
 - By default, a user called user1 with password mySecurePassword is created, please replace or remove it as it is only served as an example.
-- If you want to create a view-only user, remove the `{}` after `viewer: ` and type below a row like `user: password` replacing user with your desired username and password with your password.
+- If you want to create a admin user, type below `admin:` a row like `user: password` replacing user with your desired username and password with your password.
-- You can create as many admins or viewers as needed.
+- You can create as many admins as you want repeating this step.
-- For all your admin users, you can enable a whitelist of commands under the commandWhitelist section of your user.
+- If you want to create a view-only user, remove the `{}` after `viewer: ` and do the same process as for admin users below `viewer: `. You can also create as many viewers as needed.
 
-The rest of the fields are used for SSL configuration. You can learn how to activate SSL [here](https://github.com/mesacarlos/WebConsole/wiki/SSL-Configuration). SSL **is not** required for WebConsole to work, you can still use it without encription, unless you are hosting your client in a HTTPS server, in this case is mandatory to enable SSL in all your servers due to web browsers restrictions.
+The rest of the fields are used for SSL configuration. You can see a tutorial on how to activate SSL [in this link](https://github.com/mesacarlos/WebConsole/wiki/SSL-Configuration). SSL **is not** required for WebConsole to work, you can still use it without encription, unless you are hosting your client in a HTTPS server, in this case is mandatory to enable SSL in all your servers due to web browsers restrictions.
 
 
 ## Using web interface

client/README_AFTER_UPGRADE.txt

@@ -0,0 +1,3 @@
+If you are having issues with client not connecting and throwing random errors after a upgrade,
+please force client reload on your browser by pressing Ctrl+F5 to reload the whole page.
+This issue happens sometimes due to browsers caching JavaScript code.

client/index.html

@@ -54,10 +54,8 @@
 								<a class="dropdown-item" href="#" onclick="setLanguage('fr_FR')">Français</a>
 								<a class="dropdown-item" href="#" onclick="setLanguage('it_IT')">Italiano</a>
 								<a class="dropdown-item" href="#" onclick="setLanguage('pt_BR')">Português</a>
-								<a class="dropdown-item" href="#" onclick="setLanguage('pl_PL')">Polskie</a>
 								<a class="dropdown-item" href="#" onclick="setLanguage('ru_RU')">русский</a>
 								<a class="dropdown-item" href="#" onclick="setLanguage('tr_TR')">Türk</a>
-								<a class="dropdown-item" href="#" onclick="setLanguage('ja_JA')">日本語</a>
 							</div>
 						</li>
 						<li class="nav-item">
@@ -80,8 +78,8 @@
 			<div class="container" id="serverContainer" style="display: none;">
 				<h1 class="mt-4" id="serverTitle"></h1>
 				
-				<div class="row p-2">
+				<div class="row p-3">
-					<div class="col-sm-3">
+					<div class="col-sm-3 mb-2">
 						<div class="card">
 							<div class="card-body">
 								<h5 class="card-title" id="players_online">Players Online</h5>
@@ -92,7 +90,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="col-sm-3">
+					<div class="col-sm-3 mb-2">
 						<div class="card">
 							<div class="card-body">
 								<h5 class="card-title" id="cpu_title">CPU</h5>
@@ -103,7 +101,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="col-sm-3">
+					<div class="col-sm-3 mb-2">
 						<div class="card">
 							<div class="card-body">
 								<h5 class="card-title" id="ram_title">RAM</h5>
@@ -114,32 +112,19 @@
 							</div>
 						</div>
 					</div>
-					<div class="col-sm-3">
+					<div class="col-sm-3 mb-2">
 						<div class="card">
 							<div class="card-body">
-								<h5 class="card-title" id="tps_title">TPS</h5>
+								<p class="card-text">
-								<p class="card-text"><span id="tps">0</span> Ticks / <span id="maxTps">0</span> Ticks</p>
+									<span id="user_title">Logged as</span>
-								<div class="progress flat-progressbar">
+									<span id="loggedUsernameLabel">Unknown</span>
-									<div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" style="width: 0%;" id="TpsProgressBar"></div>
+									(<span id="loggedUserTypeLabel">Unknown</span>)
-								</div>
+								</p>
-							</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>
 				
 				<div class="card mb-2">
 					<div class="card-body overflow-auto text-light bg-dark console" id="consoleTextArea"></div>
@@ -164,7 +149,7 @@
 						</button>
 					</div>
 					<div class="modal-body">
-						<form id="addServerForm">
+						<form>
 							<div class="form-group">
 								<label for="server-name" class="col-form-label" id="addServerModalSvName">Server name:</label>
 								<input type="text" class="form-control" id="server-name" required>
@@ -175,7 +160,7 @@
 							</div>
 							<div class="form-group">
 								<label for="server-port" class="col-form-label" id="addServerModalSvPort">Server port:</label>
-								<input type="number" class="form-control" id="server-port" placeholder="8080" min="1" max="65535" required>
+								<input type="number" class="form-control" id="server-port" placeholder="8080" required>
 							</div>
 							<div class="form-check">
 								<input class="form-check-input" type="checkbox" id="server-ssl">
@@ -186,7 +171,7 @@
 					</div>
 					<div class="modal-footer">
 						<button type="button" class="btn btn-secondary" data-dismiss="modal" id="addServerModalClose">Close</button>
-						<button type="button" class="btn btn-primary" id="saveAndConnectServerButton">Save and connect</button>
+						<button type="button" class="btn btn-primary" data-dismiss="modal" id="saveAndConnectServerButton">Save and connect</button>
 					</div>
 				</div>
 			</div>
@@ -279,7 +264,7 @@
 		<!-- Webpage footer -->
 		<footer class="footer mt-auto py-3">
 			<div class="container">
-				<span class="text-muted">WebConsole v2.4 - <a href="https://github.com/mesacarlos/WebConsole">GitHub</a></span>
+				<span class="text-muted">WebConsole v2.0 (rev. 2) - <a href="https://github.com/mesacarlos/WebConsole">GitHub</a></span>
 			</div>
 		</footer>
 		
@@ -289,15 +274,15 @@
 		<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
 		
 		<!-- WebConsole JS Objects -->
-		<script src="scripts/object/Setting.js?v=2.4.0"></script>
+		<script src="scripts/object/Setting.js?v=2.2"></script>
-		<script src="scripts/object/WSServer.js?v=2.4.0"></script>
+		<script src="scripts/object/WSServer.js?v=2.2"></script>
 
 		<!-- WebConsole JS Scripts -->
-		<script src="scripts/WebConsoleLanguage.js?v=2.4.0"></script>
+		<script src="scripts/WebConsoleLanguage.js?v=2.2"></script>
-		<script src="scripts/WebConsoleConnector.js?v=2.4.0"></script>
+		<script src="scripts/WebConsoleConnector.js?v=2.2"></script>
-		<script src="scripts/WebConsoleManager.js?v=2.4.0"></script>
+		<script src="scripts/WebConsoleManager.js?v=2.2"></script>
-		<script src="scripts/WebConsolePersistenceManager.js?v=2.4.0"></script>
+		<script src="scripts/WebConsolePersistenceManager.js?v=2.2"></script>
-		<script src="scripts/WebConsole.js?v=2.4.0"></script>
+		<script src="scripts/WebConsole.js?v=2.2"></script>
-		<script src="scripts/WebConsoleJqueryHandler.js?v=2.4.0"></script>
+		<script src="scripts/WebConsoleJqueryHandler.js?v=2.2"></script>
 	</body>
 </html>

client/scripts/WebConsole.js

@@ -5,39 +5,14 @@
 */
 
 /**
- * Global variables
+* Global variables
- */
+*/
-const persistenceManager = new WebConsolePersistenceManager();
+var persistenceManager = new WebConsolePersistenceManager();
-const connectionManager = new WebConsoleManager();
+var connectionManager = new WebConsoleManager();
-let lang;
+var lang;
-let autoPasswordCompleted = false; //When true, saved password was used. If a 401 is received, then saved password is not correct
+var autoPasswordCompleted = false; //When true, saved password was used. If a 401 is received, then saved password is not correct
-let statusCommandsInterval = -1;
+var statusCommandsInterval = -1;
-let commandHistoryIndex = -1; //Saves current command history index. -1 when not browsing history.
+var commandHistoryIndex = -1; //Saves current command history index. -1 when not browsing history.
-
-/**
- * Load list of servers in file servers.json
- * and auto update in next request when file is changed
- */
-function readServerList() {
-	let hash = persistenceManager.getSetting('server:hash')
-
-	/**
-	 * Hash code function used for compare version of file servers.json
-	 * https://stackoverflow.com/questions/7616461/generate-a-hash-from-string-in-javascript
-	 */
-	const hashCode = s => s.split('').reduce((a,b)=>{a=((a<<5)-a)+b.charCodeAt(0);return a&a},0);
-
-	fetch('servers.json')
-		.then(res => res.text())
-		.then(json => {
-			if (hash !== hashCode(json)) {
-				persistenceManager.setSetting('server:hash', hashCode(json))
-				JSON.parse(json).forEach(server => persistenceManager.saveServer(server))
-			}
-		})
-		.then(updateServerList)
-		.catch(() => console.info('Ignore load new list in file servers.json.'));
-}
 
 /**
 * Prepare and show server to user
@@ -61,10 +36,10 @@ function openServer(serverName){
 	connectionManager.loadConnection(serverName);
 	
 	//Load saved messages
-	let i;
+	var i;
-	const messages = connectionManager.activeConnection.messages;
+	var 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 +63,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 +81,7 @@ function onWebSocketsMessage(message){
 			break;
 		case 401:
 			//Waiting for login. Show password modal or retrieve password
-			const savedPwd = persistenceManager.getServer(connectionManager.activeConnection.serverName).serverPassword;
+			var savedPwd = persistenceManager.getServer(connectionManager.activeConnection.serverName).serverPassword;
 			if(typeof savedPwd !== "undefined" && !autoPasswordCompleted){
 				connectionManager.sendPassword(savedPwd);
 				autoPasswordCompleted = true;
@@ -127,17 +102,13 @@ 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);
@@ -148,7 +119,7 @@ function onWebSocketsMessage(message){
 * Write to console
 */
 function writeToWebConsole(msg, time){
-	const isScrolledDown = document.getElementById("consoleTextArea").scrollHeight - document.getElementById("consoleTextArea").scrollTop - 40 === $("#consoleTextArea").height();
+	var 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;");
@@ -199,32 +170,6 @@ function writeToWebConsole(msg, time){
 	
 	msg = msg.replace(/§r/g, "</span>");  //&r
 
-	//Color filter for MC 1.18 (Also easy :D)
-	//span may not be closed every time but browsers will do for ourselves
-	msg = msg.replace(/0/g, "<span style='color: #000000;'>"); //&0
-	msg = msg.replace(/1/g, "<span style='color: #0000AA;'>"); //&1
-	msg = msg.replace(/2/g, "<span style='color: #00AA00;'>"); //&2
-	msg = msg.replace(/3/g, "<span style='color: #00AAAA;'>"); //&3
-	msg = msg.replace(/4/g, "<span style='color: #AA0000;'>"); //&4
-	msg = msg.replace(/5/g, "<span style='color: #AA00AA;'>"); //&5
-	msg = msg.replace(/6/g, "<span style='color: #FFAA00;'>"); //&6
-	msg = msg.replace(/7/g, "<span style='color: #AAAAAA;'>"); //&7
-	msg = msg.replace(/8/g, "<span style='color: #555555;'>"); //&8
-	msg = msg.replace(/9/g, "<span style='color: #5555FF;'>"); //&9
-	msg = msg.replace(/a/g, "<span style='color: #55FF55;'>"); //&a
-	msg = msg.replace(/b/g, "<span style='color: #55FFFF;'>"); //&b
-	msg = msg.replace(/c/g, "<span style='color: #FF5555;'>"); //&c
-	msg = msg.replace(/d/g, "<span style='color: #FF55FF;'>"); //&d
-	msg = msg.replace(/e/g, "<span style='color: #FFFF55;'>"); //&e
-	msg = msg.replace(/f/g, "<span style='color: #FFFFFF;'>"); //&f
-	
-	msg = msg.replace(/l/g, "<span style='font-weight:bold;'>"); //&l
-	msg = msg.replace(/m/g, "<span style='text-decoration: line-through;'>"); //&m
-	msg = msg.replace(/n/g, "<span style='text-decoration: underline;'>"); //&n
-	msg = msg.replace(/o/g, "<span style='font-style: italic;'>"); //&o
-	
-	msg = msg.replace(/r/g, "</span>");  //&r
-
 	//Append datetime if enabled
 	if(persistenceManager.getSetting("dateTimePrefix")){
 		if(typeof time !== 'undefined' && time !== null) //if time is present and not null
@@ -239,7 +184,7 @@ function writeToWebConsole(msg, time){
 	$("#consoleTextArea").append(msg + "<br>");
 	
 	if(isScrolledDown){
-		const textarea = document.getElementById('consoleTextArea');
+		var textarea = document.getElementById('consoleTextArea');
 		textarea.scrollTop = textarea.scrollHeight;
 	}
 }
@@ -251,7 +196,7 @@ function writePlayerInfo(connected, maximum){
 	$("#connectedPlayers").text(connected);
 	$("#maxPlayers").text(maximum);
 	
-	const percent = (connected / maximum) * 100;
+	var percent = (connected/maximum)*100;
 	$("#playerProgressBar").width(percent + "%");
 }
 
@@ -271,29 +216,15 @@ function writeRamInfo(free, used, total){
 	$("#usedRam").text(used);
 	$("#totalRam").text(total);
 	
-	const percent = (used / total) * 100;
+	var 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);
@@ -332,13 +263,13 @@ function updateServerList(){
 	$('.servermenuitem').remove();
 	
 	//Add all servers
-	const servers = persistenceManager.getAllServers();
+	var servers = persistenceManager.getAllServers();
-	for(let i = 0; i < servers.length; i++){
+	for(var 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/WebConsoleConnector.js

@@ -9,7 +9,6 @@ class WebConsoleConnector {
 	constructor(serverName, serverURI) {
 		this.serverName = serverName;
 		this.serverURI = serverURI;
-		this.token;
 		this.subscribers = []; //List of functions called when a new message arrive
 		this.messages = []; //All messages retrieved since connection start
 		this.commands = []; //EXEC Commands sent by user to this server
@@ -33,7 +32,7 @@ class WebConsoleConnector {
 	* Internal function
 	*/
 	onOpen(evt){
-		//TODO Check version is correct, and this websocket server is a WebConsole WebSocket
+		//TODO Check que la version es correcta, y que es un WebSocket del plugin y no de otra cosa
 	}
 	
 	/**
@@ -49,11 +48,6 @@ class WebConsoleConnector {
 	*/
 	onMessage(evt){
 		var obj = JSON.parse(evt.data);
-
-
-		if(obj.status === 200) //If is a LoggedIn response, save our token
-			this.token = obj.token;
-		
 		this.notify(obj); //Notify all subscribers
 		this.messages.push(obj);
 	}
@@ -69,7 +63,7 @@ class WebConsoleConnector {
 	* Sends a WebSocket command to Server
 	*/
 	sendToServer(message){
-		this.websocket.send(JSON.stringify(message));
+		this.websocket.send(message);
 	}
 	
 	/**

client/scripts/WebConsoleJqueryHandler.js

@@ -11,7 +11,6 @@ $(document).ready(function() {
 	$("#serverContainer").hide();
 	persistenceManager.initializeSettings();
 	setLanguage(persistenceManager.getLanguage());
-	readServerList();
 	updateServerList();
 
 	//Check SSL host
@@ -35,13 +34,6 @@ $(document).ready(function() {
 * Add server modal button click
 */
 $("#saveAndConnectServerButton").click(function() {
-	//Validate form data
-	var addServerForm = document.getElementById("addServerForm");
-	if(!addServerForm.checkValidity()){
-		addServerForm.classList.add('was-validated');
-		return;
-	}
-	
 	//Save server
 	var name = $("#server-name").val().replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"").replace(/"/g,"");
 	var wcIp = $("#server-ip").val();
@@ -55,10 +47,6 @@ $("#saveAndConnectServerButton").click(function() {
 	}
 	persistenceManager.saveServer(new WSServer(name, uri));
 	
-	//Close modal
-	addServerForm.classList.remove('was-validated');
-	$("#addServerModal").modal('hide');
-
 	//Empty all modal values
 	$("#server-name").val("");
 	$("#server-ip").val("");

client/scripts/WebConsoleLanguage.js

@@ -22,8 +22,8 @@ function setLanguage(locale){
 				"addServerModalSvName": "Server name:",
 				"addServerModalSvIp": "Server IP:",
 				"addServerModalSvPort": "WebConsole port:",
-				"addServerModalSvSsl": "SSL is enabled on the server",
+				"addServerModalSvSsl": "Server is SSL enabled",
-				"addServerModalSslAdvice": "SSL is required for connections made from HTTPS websites",
+				"addServerModalSslAdvice": "SSL is required for HTTPS client connections",
 				"addServerModalClose": "Close",
 				"saveAndConnectServerButton": "Save and connect",
 				"passwordModalLongTitle": "Password required",
@@ -501,88 +501,6 @@ function setLanguage(locale){
 				"sendCommandButton": "Gönder"
 			}
 			break;
-		case "ja_JA": //Credit to kuroneko6423 | https://kuroneko6423.com
-			lang = {
-				"navbarHomeLink": "ホーム",
-				"home_header": "メニューからサーバーを選択",
-				"home_description": "ナビゲーションバーを使って、新しいMinecraftサーバーを追加したり、以前に追加したサーバーに接続したりします。",
-				"serversDropdown": "あなたのサーバー",
-				"add_server": "サーバー追加",
-				"noServersAdded": "追加されたサーバーはありません",
-				"lang_dropdown": "言語",
-				"addServerModalLongTitle": "新規サーバーの追加",
-				"addServerModalSvName": "サーバー名:",
-				"addServerModalSvIp": "サーバーIP:",
-				"addServerModalSvPort": "WebConsoleポート:",
-				"addServerModalSvSsl": "サーバーでSSLが有効になっている",
-				"addServerModalSslAdvice": "HTTPSウェブサイトからの接続にはSSLが必要です。",
-				"addServerModalClose": "閉じる",
-				"saveAndConnectServerButton": "保存と接続",
-				"passwordModalLongTitle": "パスワードが必要です",
-				"passwordModalLabel": "パスワード:",
-				"passwordModalRememberLabel": "パスワードの記憶",
-				"passwordModalCloseButton": "閉じる",
-				"passwordSendButton": "ログイン",
-				"disconnectionModalLongTitle": "切断",
-				"disconnectionModalDescription": "サーバーとの接続が切断されました:",
-				"disconnectionModalsub1": "サーバーが意図的に閉じられました。",
-				"disconnectionModalsub2": "ポートがホスト上で開かれていません。この場合、ポートチェッカーを使ってトラブルシューティングを行い、ファイアウォールやルーターを再確認してください。",
-				"disconnectionModalCloseButton": "閉じる",
-				"disconnectionModalWelcomeScreenButton": "ホームに戻る",
-				"settingsLink": "設定",
-				"settingsModalLongTitle": "WebConsole 設定",
-				"showDateSettingsSwitchLabel": "各コンソールラインに時間を表示",
-				"readLogFileSwitchLabel": "ログイン後にサーバーからフルログファイルを取得する",
-				"settingsModalCloseButton": "了承",
-				"players_online": "プレイヤーオンライン",
-				"cpu_title": "CPU",
-				"ram_title": "RAM",
-				"user_title": "ログインします。",
-				"deleteServerButton": "サーバーを削除",
-				"sendCommandButton": "送信"
-			}
-			break;
-		case "pl_PL": //Credit to gpewojan1
-			lang = {
-				"navbarHomeLink": "Strona główna",
-				"home_header": "Wybierz serwer z menu",
-				"home_description": "Użyj zakładki \"Twoje serwery\", aby dodać nowy serwer Minecraft lub połączyć się do serwera dodanego wcześniej",
-				"serversDropdown": "Twoje serwery",
-				"add_server": "Dodaj Serwer",
-				"noServersAdded": "Nie dodano żadnych serwerów",
-				"lang_dropdown": "Język",
-				"addServerModalLongTitle": "Dodaj nowy serwer",
-				"addServerModalSvName": "Nazwa serwera:",
-				"addServerModalSvIp": "IP Serwera:",
-				"addServerModalSvPort": "Port WebConsole:",
-				"addServerModalSvSsl": "SSL jest włączony na tym serwerze",
-				"addServerModalSslAdvice": "SSL jest wymagany do połączeń ze stronami HTTPS",
-				"addServerModalClose": "Zamknij",
-				"saveAndConnectServerButton": "Zapisz i połącz",
-				"passwordModalLongTitle": "Hasło jest wymagane",
-				"passwordModalLabel": "Hasło:",
-				"passwordModalRememberLabel": "Zapamiętaj hasło",
-				"passwordModalCloseButton": "Zamknij",
-				"passwordSendButton": "Zaloguj się",
-				"disconnectionModalLongTitle": "Rozłączono",
-				"disconnectionModalDescription": "Połączenie z serwerem zostało zerwane. Możliwe powody:",
-				"disconnectionModalsub1": "Serwer został wyłączony intencjonalnie.",
-				"disconnectionModalsub2": "Port nie jest otworzony przez host. W tym przypadku sprawdź, czy port jest otwarty używając port checkera i sprawdź twój firewall oraz router.",
-				"disconnectionModalCloseButton": "Zamknij",
-				"disconnectionModalWelcomeScreenButton": "Strona główna",
-				"settingsLink": "Ustawienia",
-				"settingsModalLongTitle": "Ustawienia WebConsole",
-				"showDateSettingsSwitchLabel": "Pokaż czas na każdej linijce w konsoli",
-				"readLogFileSwitchLabel": "Pokaż pełny log z serwera po zalogowaniu się",
-				"settingsModalCloseButton": "Ok",
-				"players_online": "Gracze Online",
-				"cpu_title": "Zużycie CPU",
-				"ram_title": "Zużycie RAM",
-				"user_title": "Zalogowano jako",
-				"deleteServerButton": "Usuń serwer",
-				"sendCommandButton": "Wyślij"
-			}
-			break;
 		default:
 			console.error("No language set");
 	}

client/scripts/WebConsoleManager.js

@@ -60,22 +60,14 @@ class WebConsoleManager {
 	* Send password to server
 	*/
 	sendPassword(pwd){
-		this.activeConnection.sendToServer({
+		this.activeConnection.sendToServer("LOGIN " + pwd);
-			command: "LOGIN",
-			params: pwd
-		});
 	}
 	
 	/**
 	* Send console command to server
 	*/
 	sendConsoleCmd(cmd){
-		this.activeConnection.sendToServer({
+		this.activeConnection.sendToServer("EXEC " + cmd);
-			command: "EXEC",
-			token: this.activeConnection.token,
-			params: cmd
-		});
-
 		this.activeConnection.commands.push(cmd);
 	}
 	
@@ -83,35 +75,16 @@ class WebConsoleManager {
 	* Asks server for CPU, RAM and players info
 	*/
 	askForInfo(){
-		this.activeConnection.sendToServer({
+		this.activeConnection.sendToServer("PLAYERS");
-			command: "PLAYERS",
+		this.activeConnection.sendToServer("CPUUSAGE");
-			token: this.activeConnection.token,
+		this.activeConnection.sendToServer("RAMUSAGE");
-		});
-
-		this.activeConnection.sendToServer({
-			command: "CPUUSAGE",
-			token: this.activeConnection.token,
-		});
-
-		this.activeConnection.sendToServer({
-			command: "RAMUSAGE",
-			token: this.activeConnection.token,
-		});
-
-		this.activeConnection.sendToServer({
-			command: "TPS",
-			token: this.activeConnection.token,
-		});
 	}
 
 	/**
 	* Asks server for full latest.log
 	*/
 	askForLogs(){
-		this.activeConnection.sendToServer({
+		this.activeConnection.sendToServer("READLOGFILE");
-			command: "READLOGFILE",
-			token: this.activeConnection.token,
-		});
 	}
 	
 }

phrases.properties

@@ -19,7 +19,7 @@ error-disconnected-client = [WebConsole] Attempted to send a message to a discon
 cpu-usage-message = Usage is {0}%
 
 # ExecCommand.java
-no-send-permission-console = [WebConsole] {0} tried to run {1} without permission.
+viewer-error-console = [WebConsole] {0} tried to run {1} without permission.
 cmd-executed-console = [WebConsole] {0} executed "{1}".
 
 # LogInCommand.java
@@ -34,9 +34,6 @@ 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

@@ -19,7 +19,7 @@ error-disconnected-client = [WebConsole] Pokus o odeslání zprávy odpojenému
 cpu-usage-message = Využití je {0}%
 
 # ExecCommand.java
-no-send-permission-console = [WebConsole] {0} se pokusil spustit {1} bez povolení.
+viewer-error-console = [WebConsole] {0} se pokusil spustit {1} bez povolení.
 cmd-executed-console = [WebConsole] {0} spustil "{1}".
 
 # LogInCommand.java
@@ -34,9 +34,6 @@ 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

@@ -19,7 +19,7 @@ error-disconnected-client = [WebConsole] Es wurde versucht, eine Nachricht an ei
 cpu-usage-message = Die CPU Auslastung liegt bei {0}%.
 
 # ExecCommand.java
-no-send-permission-console = [WebConsole] {0} hat versucht, {1} ohne Erlaubnis auszuführen.
+viewer-error-console = [WebConsole] {0} hat versucht, {1} ohne Erlaubnis auszuführen.
 cmd-executed-console = [WebConsole] {0} hat "{1}" ausgeführt.
 
 # LogInCommand.java
@@ -34,9 +34,6 @@ 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

@@ -19,7 +19,7 @@ error-disconnected-client = [WebConsole] Attempted to send a message to a discon
 cpu-usage-message = Usage is {0}%
 
 # ExecCommand.java
-no-send-permission-console = [WebConsole] {0} tried to run {1} without permission.
+viewer-error-console = [WebConsole] {0} tried to run {1} without permission.
 cmd-executed-console = [WebConsole] {0} executed "{1}".
 
 # LogInCommand.java
@@ -34,9 +34,6 @@ 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

@@ -19,7 +19,7 @@ error-disconnected-client = [WebConsole] Se intentó enviar un mensaje a un clie
 cpu-usage-message = En uso {0}%
 
 # ExecCommand.java
-no-send-permission-console = [WebConsole] {0} intentó ejecutar {1} sin permiso.
+viewer-error-console = [WebConsole] {0} intentó ejecutar {1} sin permiso.
 cmd-executed-console = [WebConsole] {0} ejecutó "{1}".
 
 # LogInCommand.java
@@ -34,9 +34,6 @@ 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

@@ -19,7 +19,7 @@ error-disconnected-client = [WebConsole] Vous avez tenté d'envoyer un message
 cpu-usage-message = L'utilisation est {0}%
 
 # ExecCommand.java
-no-send-permission-console = [WebConsole] {0} a tenté d'exécuter {1} sans autorisation.
+viewer-error-console = [WebConsole] {0} a tenté d'exécuter {1} sans autorisation.
 cmd-executed-console = [WebConsole] {0} a exécuté "{1}".
 
 # LogInCommand.java
@@ -34,9 +34,6 @@ 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.

phrases_it.properties

@@ -19,7 +19,7 @@ error-disconnected-client = [WebConsole] Tentativo di inviare un messaggio a un
 cpu-usage-message = L''uso è {0}%
 
 # ExecCommand.java
-no-send-permission-console = [WebConsole] {0} ha provato a eseguire {1} senza autorizzazione.
+viewer-error-console = [WebConsole] {0} ha provato a eseguire {1} senza autorizzazione.
 cmd-executed-console = [WebConsole] {0} eseguito "{1}".
 
 # LogInCommand.java
@@ -34,9 +34,6 @@ players-message = Connessi {0} players su un massimo di {1}
 # RamUsageCommand.java
 ram-usage-message = {0} Libera, {1} Usata, {2} Memoria massima
 
-# TpsCommand.java
-tps-message = {0} ticks from {1}
-
 # WebConsoleCommand.java
 webconsole-version = Versione WebConsole {0}.
 webconsole-no-connections = Non è stata effettuata ancora nessuna connessione tramite WebConsole.

phrases_ja.properties

@@ -1,49 +0,0 @@
-# WebConsole.java
-boot-error = WebSocket Serverの起動時にエラーが発生しました。
-
-# WSServer.java
-connection-resumed-message = 接続されています。既にログイン、接続している方を切断してもう一度接続してみてください。
-connection-resumed-console = [WebConsole] から接続し、セッションを再開しました。 {0}
-connection-login-message = 接続開始、ログイン待ち...
-connection-login-console = [WebConsole] 接続され、ログインを待っています... {0}
-unknown-command-message = 不明、または存在しないコマンドです
-unknown-command-console = [WebConsole] シグナル "{0}" は有効ではないので処理されませんでした。プラグインやウェブインターフェイスは最新のものを使用していますか？
-forbidden-message = Forbidden
-forbidden-console = [WebConsole] {0} は、ログインしていない状態で "{1}" を実行しようとしました！
-closed-connection = [WebConsole] 接続を閉じて、からログアウトしました。 {0}
-error-on-connection = [WebConsole] 接続時にエラーが発生しました。 {0}: {1}
-started-websocket = [WebConsole] WebSocketサーバが正常に起動しました。
-error-disconnected-client = [WebConsole] 切断された WebSocket クライアントにメッセージを送信しようとしました。
-
-# CpuUsageCommand.java
-cpu-usage-message = Usage is {0}%
-
-# ExecCommand.java
-no-send-permission-console = [WebConsole] {0} は勝手に {1} を実行しようとしましたが権限がないためはじかれました。
-cmd-executed-console = [WebConsole] {0} 実行 "{1}".
-
-# LogInCommand.java
-login-sucessful-message = ログイン
-login-sucessful-console = [WebConsole] {0} ログインに成功しました。
-login-failed-message = パスワードが正しくありません、もう一度お試しください。
-login-failed-console = [WebConsole] ログイン時にパスワードが正しくないです。 {0}
-
-# PlayersCommand.java
-players-message = 接続数 |  {0} ,最大接続数 | {1}
-
-# RamUsageCommand.java
-ram-usage-message = {0} 空き, {1} 使用済み, {2} 最大メモリ
-
-# TpsCommand.java
-tps-message = {0} ticks from {1}
-
-# WebConsoleCommand.java
-webconsole-version = WebConsoleのバージョン {0}.
-webconsole-no-connections = 現在、WebConsoleのログイン接続はありません。
-webconsole-active-connections = WebConsoleに接続しました。:
-
-# ReadLogFileCommand.java
-log-read-error = latest.logファイルの読み込みエラーが発生しました
-
-# User.java
-user-tostring = User {0} from {1} as {2}

phrases_ko.properties

@@ -19,7 +19,7 @@ error-disconnected-client = [WebConsole] 연결이 끊긴 WebSocket 클라이언
 cpu-usage-message = 사용량은 {0}%입니다
 
 # ExecCommand.java
-no-send-permission-console = [WebConsole] {0}이(가) {1}을(를) 권한 없이 실행하려고 했습니다.
+viewer-error-console = [WebConsole] {0}이(가) {1}을(를) 권한 없이 실행하려고 했습니다.
 cmd-executed-console = [WebConsole] {0}이(가) "{1}"을(를) 실행하였습니다.
 
 # LogInCommand.java
@@ -34,9 +34,6 @@ players-message = {0}/{1}명의 플레이어를 연결하였습니다
 # RamUsageCommand.java
 ram-usage-message = {0} 여유, {1} 사용, {2} 최대
 
-# TpsCommand.java
-tps-message = {0} ticks from {1}
-
 # WebConsoleCommand.java
 webconsole-version = WebConsole 버전 {0}.
 webconsole-no-connections = 현재 로그인된 사람이 없습니다.

phrases_nl.properties

@@ -19,7 +19,7 @@ error-disconnected-client = [WebConsole] Poging om een bericht te sturen naar ee
 cpu-usage-message = Verbruik is {0}%
 
 # ExecCommand.java
-no-send-permission-console = [WebConsole] {0} heeft geprobeerd {1} uit te voeren zonder toestemming.
+viewer-error-console = [WebConsole] {0} heeft geprobeerd {1} uit te voeren zonder toestemming.
 cmd-executed-console = [WebConsole] {0} voerde "{1}" uit.
 
 # LogInCommand.java
@@ -34,9 +34,6 @@ players-message = {0} spelers verbonden voor een maximum van {1}
 # RamUsageCommand.java
 ram-usage-message = {0} ongebruikt, {1} gebruikt, {2} maximaal geheugen
 
-# TpsCommand.java
-tps-message = {0} ticks from {1}
-
 # WebConsoleCommand.java
 webconsole-version = WebConsole versie {0}.
 webconsole-no-connections = Er zijn nu geen ingelogde Web Console-verbindingen.

phrases_pl.properties

@@ -1,46 +0,0 @@
-# WebConsole.java
-boot-error = Wystąpił błąd podczas włączanie serwera WebSocket.
-
-# WSServer.java
-connection-resumed-message = Połączono i zalogowano! Witaj z powrotem!
-connection-resumed-console = [WebConsole] Połączono i wznowiono sesję z {0}
-connection-login-message = Połączenie rozpoczęte, oczekiwanie na zalogowanie
-connection-login-console = [WebConsole] Połączenie rozpoczęte, oczekiwanie na zalogowanie z {0}
-unknown-command-message = Nieznana komenda
-unknown-command-console = [WebConsole] Sygnał "{0}" nie został przetworzony, ponieważ jest nie poprawny. Czy twój plugin oraz klient są w najnowszej wersji?
-forbidden-message = Brak dostępu
-forbidden-console = [WebConsole] {0} spróbował uruchomić komendę "{1}" bez zalogowania się!
-closed-connection = [WebConsole] Zamknięto połączenie i wylogowano z {0}
-error-on-connection = [WebConsole] Wystąpił błąd na połączeniu {0}: {1}
-started-websocket = [WebConsole] Serwer WebSocket został uruchomiony pomyślnie.
-error-disconnected-client = [WebConsole] Podjęto próbę wysłania wiadomości do rozłączonego klienta WebSocket.
-
-# CpuUsageCommand.java
-cpu-usage-message = Zużycie: {0}%
-
-# ExecCommand.java
-no-send-permission-console = [WebConsole] {0} podjął próbę uruchominia komendy {1} bez poprawnych uprawnień.
-cmd-executed-console = [WebConsole] {0} uruchomił komendę "{1}".
-
-# LogInCommand.java
-login-sucessful-message = Zalogowano
-login-sucessful-console = [WebConsole] {0} pomyślnie się zalogował.
-login-failed-message = Niepoprawne hasło, spróbuj ponownie.
-login-failed-console = [WebConsole] Niepoprawne hasło podczas logowania z {0}
-
-# PlayersCommand.java
-players-message = Połączono {0}/{1} graczy
-
-# RamUsageCommand.java
-ram-usage-message = {0} wolne, {1} w użyciu. Maksymalne zużycie: {2}
-
-# WebConsoleCommand.java
-webconsole-version = Wersja WebConsole: {0}.
-webconsole-no-connections = W tej chwili nikt nie jest połączony do WebConsole.
-webconsole-active-connections = Połączono do WebConsole z:
-
-# ReadLogFileCommand.java
-log-read-error = Wystąpił błąd podczas próby przeczytania pliku latest.log
-
-# User.java
-user-tostring = Użytkownik {0} z {1} jako {2}

phrases_pt.properties

@@ -19,7 +19,7 @@ error-disconnected-client = [WebConsole] Tentativa de enviar uma mensagem para u
 cpu-usage-message = Consumindo {0}%
 
 # ExecCommand.java
-no-send-permission-console = [WebConsole] {0} tentou executar o {1} sem permissão.
+viewer-error-console = [WebConsole] {0} tentou executar o {1} sem permissão.
 cmd-executed-console = [WebConsole] {0} executou "{1}".
 
 # LogInCommand.java
@@ -34,9 +34,6 @@ players-message = Atualmente tem {0} jogador(es) de um total de {1}
 # RamUsageCommand.java
 ram-usage-message = Disponível: {0}, Consumo de RAM: {1} / {2}
 
-# TpsCommand.java
-tps-message = {0} ticks from {1}
-
 # WebConsoleCommand.java
 webconsole-version = WebConsole versão {0}.
 webconsole-no-connections = Atualmente não tem nenhum usuário conectado.

phrases_ru.properties

@@ -19,7 +19,7 @@ error-disconnected-client = [WebConsole] Попытка отправить со
 cpu-usage-message = Использование {0}%
 
 # ExecCommand.java
-no-send-permission-console = [WebConsole] {0} попытался запустить {1} без разрешения.
+viewer-error-console = [WebConsole] {0} попытался запустить {1} без разрешения.
 cmd-executed-console = [WebConsole] {0} выполнил "{1}".
 
 # LogInCommand.java
@@ -34,9 +34,6 @@ players-message = Подключено {0} игроков из максимум
 # RamUsageCommand.java
 ram-usage-message = {0} свободно, {1} используется, {2} макс. памяти
 
-# TpsCommand.java
-tps-message = {0} ticks from {1}
-
 # WebConsoleCommand.java
 webconsole-version = Версия WebConsole {0}.
 webconsole-no-connections = В настоящее время нет подключений к WebConsole.

phrases_tr.properties

@@ -19,7 +19,7 @@ error-disconnected-client = [WebConsole] Bağlantısı kesilmiş bir WebSocket'a
 cpu-usage-message = Şuanki kullanım %{0}
 
 # ExecCommand.java
-no-send-permission-console = [WebConsole] {0}, {1}'ı yetkisiz olarak çalıştırmayı denedi.
+viewer-error-console = [WebConsole] {0}, {1}'ı yetkisiz olarak çalıştırmayı denedi.
 cmd-executed-console = [WebConsole] {0}, "{1}" çalıştırdı.
 
 # LogInCommand.java
@@ -34,9 +34,6 @@ players-message = {0} oyuncu bağlandı, toplam {1} oyuncu bağlanabilir.
 # RamUsageCommand.java
 ram-usage-message = {0} boş, {1} kullanılıyor, {2} maksimum bellek
 
-# TpsCommand.java
-tps-message = {0} ticks from {1}
-
 # WebConsoleCommand.java
 webconsole-version = WebConsole sürümü {0}.
 webconsole-no-connections = Şuanda oturum açılmış WebSocket bağlantısı yok.

phrases_zh.properties

@@ -19,7 +19,7 @@ error-disconnected-client = [WebConsole] 尝试向断开连接的WebSocket客户
 cpu-usage-message = 已使用 {0}%
 
 # ExecCommand.java
-no-send-permission-console = [WebConsole] {0}试图未经许可而运行{1}。
+viewer-error-console = [WebConsole] {0}试图未经许可而运行{1}。
 cmd-executed-console = [網站控制台] {0} 執行 '{1}'.
 
 # LogInCommand.java
@@ -34,9 +34,6 @@ players-message = {0}玩家連接，最多{1}
 # RamUsageCommand.java
 ram-usage-message = 空閒{0} , 已使用{1} , 最大內存{2} 
 
-# TpsCommand.java
-tps-message = {0} ticks from {1}
-
 # WebConsoleCommand.java
 webconsole-version = 網站控制台版本 {0}.
 webconsole-no-connections = 現在沒有連接登錄網站控制台。

plugin.yml

@@ -1,8 +1,8 @@
 name: WebConsole
 main: es.mesacarlos.webconsole.WebConsole
 api-version: 1.13
-version: 2.4
+version: 2.0
-description: WebSocket-based web console
+description: WebSockets-based web console
 author: Carlos Mesa
 commands:
   WebConsole:

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>WebConsole</groupId>
 	<artifactId>WebConsole</artifactId>
-	<version>2.4</version>
+	<version>2.0</version>
 	<build>
 		<sourceDirectory>src</sourceDirectory>
 		<plugins>
@@ -73,12 +73,12 @@
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-api</artifactId>
-			<version>2.17.1</version>
+			<version>2.12.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-core</artifactId>
-			<version>2.17.1</version>
+			<version>2.13.2</version>
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-simple -->
 		<dependency>
@@ -90,7 +90,7 @@
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.8.9</version>
+			<version>2.8.5</version>
 		</dependency>
 	</dependencies>
 </project>

src/es/mesacarlos/webconsole/WebConsole.java

@@ -52,7 +52,7 @@ public class WebConsole extends JavaPlugin {
 		try {
 			server.stop();
 			wsThread = null;
-		} catch (Exception e) {
+		} catch (IOException | InterruptedException e) {
 			e.printStackTrace();
 		}
 	}

src/es/mesacarlos/webconsole/auth/ConnectedUser.java

@@ -8,26 +8,20 @@ import es.mesacarlos.webconsole.util.Internationalization;
 public class ConnectedUser {
 	private String username;
 	private InetSocketAddress socketAddress;
-	private String token;
 	private UserType userType;
 	
-	public ConnectedUser(InetSocketAddress socketAddress, String username, String token, UserType userType) {
+	public ConnectedUser(InetSocketAddress socketAddress, String username, UserType userType) {
 		this.socketAddress = socketAddress;
 		this.username = username;
-		this.token = token;
 		this.userType = userType;
 	}
 	
-	public String getUsername() {
-		return username;
-	}
-	
 	public InetSocketAddress getSocketAddress() {
 		return socketAddress;
 	}
 
-	public String getToken() {
+	public String getUsername() {
-		return token;
+		return username;
 	}
 	
 	public UserType getUserType() {

src/es/mesacarlos/webconsole/auth/LoginManager.java

@@ -28,7 +28,7 @@ public class LoginManager {
 	 * @param address User to logout
 	 */
 	public void logOut(InetSocketAddress address) {
-		for(ConnectedUser user : loggedInUsers.toArray(new ConnectedUser[loggedInUsers.size()]))
+		for(ConnectedUser user : loggedInUsers)
 			if(user.getSocketAddress().equals(address))
 				loggedInUsers.remove(user);
 	}
@@ -46,23 +46,11 @@ public class LoginManager {
 	}
 	
 	/**
-	 * Check if user is logged in. It checks that both the socket adress and the user token corresponds to a logged in user.
+	 * Check if user is logged in
 	 * @param address User to check
 	 * @return true if user is logged in, false otherwise
 	 */
-	public boolean isLoggedIn(InetSocketAddress address, String token) {
+	public boolean isLoggedIn(InetSocketAddress address) {
-		for(ConnectedUser user : loggedInUsers)
-			if(user.getSocketAddress().equals(address) && user.getToken().equals(token))
-				return true;
-		return false;
-	}
-	
-	/**
-	 * Check if an user is logged in from a given socket address
-	 * @param address User to check
-	 * @return true if user is logged in, false otherwise
-	 */
-	public boolean isSocketConnected(InetSocketAddress address) {
 		for(ConnectedUser user : loggedInUsers)
 			if(user.getSocketAddress().equals(address))
 				return true;

src/es/mesacarlos/webconsole/config/ConfigManager.java

@@ -1,7 +1,9 @@
 package es.mesacarlos.webconsole.config;
 
 import java.net.InetSocketAddress;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.ConfigurationSection;
@@ -42,44 +44,11 @@ public class ConfigManager {
 		// Language config
 		config.addDefault("language", "en");
 		
-		//Create passwords section if it does not exist
+		if(config.getConfigurationSection("passwords") == null) {
-		ConfigurationSection passwordsSection = config.getConfigurationSection("passwords");
+			ConfigurationSection passwordsSection = config.createSection("passwords");
-		if(passwordsSection == null) {
+			ConfigurationSection adminPasswordSection = passwordsSection.createSection("admin");
-			passwordsSection = config.createSection("passwords");
+			adminPasswordSection.addDefault("user1", "mySecurePassword");
-		}
+			passwordsSection.createSection("viewer");
-		
-		//Create passwords.admin section if it does not exist
-		ConfigurationSection adminPasswordSection = passwordsSection.getConfigurationSection("admin");
-		if(adminPasswordSection == null) {
-			adminPasswordSection = passwordsSection.createSection("admin");
-			adminPasswordSection.createSection("user1");
-		}
-		
-		//For each admin user, create the password value and the commandWhitelist section if it does not exist
-		Set<String> adminUsersSections = adminPasswordSection.getKeys(false);
-		for (String adminUserSectionName : adminUsersSections) {
-			ConfigurationSection userSection = adminPasswordSection.getConfigurationSection(adminUserSectionName);
-			if(userSection == null) {
-				//If userSection is null, that means that the config file is prior to v2.2. We need to update the file to v2.2 by replacing the "user:password" value to a new section for each user.
-				String userPasswordFromOldConfig = adminPasswordSection.getString(adminUserSectionName);
-				userSection = adminPasswordSection.createSection(adminUserSectionName);
-				userSection.set("password", userPasswordFromOldConfig);
-			}
-			userSection.addDefault("password", "mySecurePassword");
-			
-			ConfigurationSection commandWhitelist = userSection.getConfigurationSection("commandWhitelist");
-			if(commandWhitelist == null) {
-				commandWhitelist = userSection.createSection("commandWhitelist");
-				commandWhitelist.addDefault("enabled", false);
-				commandWhitelist.addDefault("commandWhitelistActsAsBlacklist", false);
-				commandWhitelist.addDefault("whitelist", Arrays.asList("whisper", "gamemode survival"));
-			}
-		}
-		
-		//Create passwords.viewer section if it does not exist
-		ConfigurationSection viewerPasswordSection = passwordsSection.getConfigurationSection("viewer");
-		if(viewerPasswordSection == null) {
-			viewerPasswordSection = passwordsSection.createSection("viewer");
 		}
 		
 		config.options().copyDefaults(true);
@@ -127,19 +96,11 @@ public class ConfigManager {
 	 * @return list of admin users
 	 */
 	private List<UserData> getAdmins() {
-		Set<String> adminConfig = plugin.getConfig().getConfigurationSection("passwords").getConfigurationSection("admin").getKeys(false);
+		Map<String, Object> passwords = plugin.getConfig().getConfigurationSection("passwords").getConfigurationSection("admin").getValues(false);
+		List<UserData> adminUsers = new ArrayList<UserData>();
 		
-		List<UserData> adminUsers = new ArrayList<>();
+		for(Map.Entry<String, Object> entry : passwords.entrySet())
-		
+			adminUsers.add(new UserData(entry.getKey(), entry.getValue().toString(), UserType.ADMIN));
-		for(String username : adminConfig) {
-			adminUsers.add(new UserData(
-					username,
-					plugin.getConfig().getString("passwords.admin." + username + ".password"),
-					UserType.ADMIN,
-					plugin.getConfig().getBoolean("passwords.admin." + username + ".commandWhitelist.enabled"),
-					plugin.getConfig().getBoolean("passwords.admin." + username + ".commandWhitelist.commandWhitelistActsAsBlacklist"),
-					plugin.getConfig().getStringList("passwords.admin." + username + ".commandWhitelist.whitelist")));
-		}
 		
 		return adminUsers;
 	}
@@ -150,10 +111,10 @@ public class ConfigManager {
 	 */
 	private List<UserData> getViewers() {
 		Map<String, Object> passwords = plugin.getConfig().getConfigurationSection("passwords").getConfigurationSection("viewer").getValues(false);
-		List<UserData> viewerUsers = new ArrayList<>();
+		List<UserData> viewerUsers = new ArrayList<UserData>();
 		
 		for(Map.Entry<String, Object> entry : passwords.entrySet())
-			viewerUsers.add(new UserData(entry.getKey(), entry.getValue().toString(), UserType.VIEWER, false, false, new ArrayList<>()));
+			viewerUsers.add(new UserData(entry.getKey(), entry.getValue().toString(), UserType.VIEWER));
 		
 		return viewerUsers;
 	}

src/es/mesacarlos/webconsole/config/UserData.java

@@ -1,23 +1,14 @@
 package es.mesacarlos.webconsole.config;
 
-import java.util.List;
-
 public class UserData {
 	private String username;
 	private String password;
 	private UserType userType;
-	private boolean isWhitelistEnabled;
-	private boolean isWhitelistActsAsBlacklist;
-	private List<String> whitelistedCommands;
 	
-	public UserData(String username, String password, UserType userType,
+	public UserData(String username, String password, UserType userType) {
-					boolean isWhitelistEnabled, boolean isWhitelistActsAsBlacklist, List<String> whitelistedCommands) {
 		this.username = username;
 		this.password = password;
 		this.userType = userType;
-		this.isWhitelistEnabled = isWhitelistEnabled;
-		this.isWhitelistActsAsBlacklist = isWhitelistActsAsBlacklist;
-		this.whitelistedCommands = whitelistedCommands;
 	}
 	
 	public String getUsername() {
@@ -31,16 +22,4 @@ public class UserData {
 	public UserType getUserType() {
 		return userType;
 	}
-
-	public boolean isWhitelistEnabled() {
-		return isWhitelistEnabled;
-	}
-
-	public boolean isWhitelistActsAsBlacklist() {
-		return isWhitelistActsAsBlacklist;
-	}
-
-	public List<String> getWhitelistedCommands() {
-		return whitelistedCommands;
-	}
 }

src/es/mesacarlos/webconsole/util/JsonUtils.java

@@ -1,93 +0,0 @@
-package es.mesacarlos.webconsole.util;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class JsonUtils {
-	/*{
-	  "command": "LOGIN",
-	  "token": "aosduhasiudgasuidgasdgaspid",
-	  "params": ""
-	}*/
-	public final static String COMMAND_PROPERTY = "command";
-	public final static String TOKEN_PROPERTY = "token";
-	public final static String PARAMS_PROPERTY = "params";
-	
-	/**
-	 * Check that a given String is a valid JSON
-	 * @param Json JSON to check
-	 * @return true if it is a valid JSON, false otherwise
-	 */
-	public static boolean isValidJson(String Json) {
-	    Gson gson = new Gson();
-	    try {
-	        gson.fromJson(Json, Object.class);
-	        Object jsonObjType = gson.fromJson(Json, Object.class).getClass();
-	        if(jsonObjType.equals(String.class)){
-	            return false;
-	        }
-	        return true;
-	    } catch (com.google.gson.JsonSyntaxException ex) {
-	        return false;
-	    }
-	}
-	
-	/**
-	 * Check that a given JSON contains some property
-	 * @param JsonString JSON to check
-	 * @param property property to check
-	 * @return true if the JSON string contains that property, false otherwise
-	 */
-	public static boolean containsProperty(String JsonString, String property) {
-		if(!isValidJson(JsonString))
-			return false;
-		
-		JsonParser parser = new JsonParser();
-		JsonObject obj = parser.parse(JsonString).getAsJsonObject();
-		JsonElement elem = obj.get(property);
-		if(elem == null)
-			return false;
-		return true;
-	}
-	
-	/**
-	 * Check that a given JSON contains some property, and its type is a String
-	 * @param JsonString JSON to check
-	 * @param property property to check
-	 * @returntrue if the JSON string contains that property and it is a String, false otherwise
-	 */
-	public static boolean containsStringProperty(String JsonString, String property) {
-		if(!isValidJson(JsonString))
-			return false;
-		
-		JsonParser parser = new JsonParser();
-		JsonObject obj = parser.parse(JsonString).getAsJsonObject();
-		JsonElement elem = obj.get(property);
-		if(elem == null)
-			return false;
-		try {
-			elem.getAsString();
-			return true;
-		}catch(Exception e) {
-			return false;
-		}
-	}
-	
-	/**
-	 * Get a String property from a JSON
-	 * @param JsonString JSON to check
-	 * @param property property to extract from JSON string
-	 * @return the value for that property. If the property is not set, an empty string will be returned
-	 */
-	public static String getStringProperty(String JsonString, String property) {
-		JsonParser parser = new JsonParser();
-		JsonObject obj = parser.parse(JsonString).getAsJsonObject();
-		JsonElement result = obj.get(property);
-		if(result != null)
-			return result.getAsString();
-		return "";
-	}
-	
-}

src/es/mesacarlos/webconsole/websocket/WSServer.java

@@ -13,7 +13,6 @@ import org.java_websocket.server.WebSocketServer;
 import es.mesacarlos.webconsole.auth.LoginManager;
 import es.mesacarlos.webconsole.util.DateTimeUtils;
 import es.mesacarlos.webconsole.util.Internationalization;
-import es.mesacarlos.webconsole.util.JsonUtils;
 import es.mesacarlos.webconsole.websocket.command.WSCommandFactory;
 import es.mesacarlos.webconsole.websocket.command.WSCommand;
 import es.mesacarlos.webconsole.websocket.response.ConsoleOutput;
@@ -23,17 +22,15 @@ import es.mesacarlos.webconsole.websocket.response.LoggedIn;
 import es.mesacarlos.webconsole.websocket.response.UnknownCommand;
 
 public class WSServer extends WebSocketServer {
-
+	private HashMap<String, WSCommand> commands = WSCommandFactory.getCommandsHashMap();
-	private final HashMap<String, WSCommand> commands = WSCommandFactory.getCommandsHashMap();
 
 	public WSServer(InetSocketAddress address) {
 		super(address);
-		setReuseAddr(true);
 	}
 
 	@Override
 	public void onOpen(WebSocket conn, ClientHandshake handshake) {
-		if (LoginManager.getInstance().isSocketConnected(conn.getRemoteSocketAddress())) {
+		if (LoginManager.getInstance().isLoggedIn(conn.getRemoteSocketAddress())) {
 			sendToClient(conn, new LoggedIn(Internationalization.getPhrase("connection-resumed-message")));
 			Bukkit.getLogger().info(Internationalization.getPhrase("connection-resumed-console", conn.getRemoteSocketAddress()));
 		} else {
@@ -44,15 +41,11 @@ public class WSServer extends WebSocketServer {
 
 	@Override
 	public void onMessage(WebSocket conn, String message) {
-		if(!JsonUtils.containsStringProperty(message, "command") //Contains a command
-				|| ( !JsonUtils.containsStringProperty(message, "token") && !JsonUtils.getStringProperty(message, JsonUtils.COMMAND_PROPERTY).equals("LOGIN")) //Contains a token or it is a login command
-			)
-			return;
-		
 		// Get command and params
-		String wsCommand = JsonUtils.getStringProperty(message, JsonUtils.COMMAND_PROPERTY);
+		String wsCommand = message.split(" ")[0];
-		String wsToken = JsonUtils.getStringProperty(message, JsonUtils.TOKEN_PROPERTY);
+		String wsCommandParams = "";
-		String wsCommandParams = JsonUtils.getStringProperty(message, JsonUtils.PARAMS_PROPERTY);
+		if (message.contains(" "))
+			wsCommandParams = message.split(" ", 2)[1];
 
 		// Run command
 		WSCommand cmd = commands.get(wsCommand);
@@ -61,8 +54,8 @@ public class WSServer extends WebSocketServer {
 			// Command does not exist
 			sendToClient(conn, new UnknownCommand(Internationalization.getPhrase("unknown-command-message"), message));
 			Bukkit.getLogger().info(Internationalization.getPhrase("unknown-command-console", message));
-		} else if (!wsCommand.equals("LOGIN")
+		} else if (!LoginManager.getInstance().isLoggedIn(conn.getRemoteSocketAddress())
-				&& !LoginManager.getInstance().isLoggedIn(conn.getRemoteSocketAddress(), wsToken)) {
+				&& !wsCommand.equals("LOGIN")) {
 			// User is not authorised. DO NOTHING, IMPORTANT!
 			sendToClient(conn, new LoginRequired(Internationalization.getPhrase("forbidden-message")));
 			Bukkit.getLogger().warning(Internationalization.getPhrase("forbidden-console", conn.getRemoteSocketAddress(), message));
@@ -93,7 +86,7 @@ public class WSServer extends WebSocketServer {
 	public void onNewConsoleLinePrinted(String line) {
 		Collection<WebSocket> connections = getConnections();
 		for (WebSocket connection : connections) {
-			if (LoginManager.getInstance().isSocketConnected(connection.getRemoteSocketAddress()))
+			if (LoginManager.getInstance().isLoggedIn(connection.getRemoteSocketAddress()))
 				sendToClient(connection, new ConsoleOutput(line, DateTimeUtils.getTimeAsString()));
 		}
 	}
@@ -107,7 +100,6 @@ public class WSServer extends WebSocketServer {
 		try {
 			conn.send(content.toJSON());
 		}catch(WebsocketNotConnectedException e) {
-			LoginManager.getInstance().logOut(conn.getRemoteSocketAddress());
 			Bukkit.getLogger().warning(Internationalization.getPhrase("error-disconnected-client"));
 		}
 		

src/es/mesacarlos/webconsole/websocket/command/ExecCommand.java

@@ -2,8 +2,6 @@ package es.mesacarlos.webconsole.websocket.command;
 
 import java.util.concurrent.ExecutionException;
 
-import es.mesacarlos.webconsole.config.ConfigManager;
-import es.mesacarlos.webconsole.config.UserData;
 import org.bukkit.Bukkit;
 import org.bukkit.command.ConsoleCommandSender;
 import org.java_websocket.WebSocket;
@@ -16,20 +14,13 @@ import es.mesacarlos.webconsole.util.Internationalization;
 import es.mesacarlos.webconsole.websocket.WSServer;
 
 public class ExecCommand implements WSCommand {
-	LoginManager loginManager = LoginManager.getInstance();
 
 	@Override
 	public void execute(WSServer wsServer, WebSocket conn, String command) {
 		ConnectedUser u = LoginManager.getInstance().getUser(conn.getRemoteSocketAddress());
 		if(u == null || u.getUserType() != UserType.ADMIN) {
 			if(u != null)
-				Bukkit.getLogger().warning(Internationalization.getPhrase("no-send-permission-console", u, command));
+				Bukkit.getLogger().warning(Internationalization.getPhrase("viewer-error-console", u, command));
-			return;
-		}
-
-		boolean allowCommand = checkWhitelist(conn, command);
-		if (!allowCommand) {
-			Bukkit.getLogger().warning(Internationalization.getPhrase("no-send-permission-console", u, command));
 			return;
 		}
 		
@@ -46,50 +37,4 @@ public class ExecCommand implements WSCommand {
 
 	}
 
-	private boolean checkWhitelist(WebSocket conn, String command) {
-		for(UserData ud : ConfigManager.getInstance().getAllUsers()) {
-			if (ud.getUsername().equals(loginManager.getUser(conn.getRemoteSocketAddress()).getUsername())) {
-
-				if (!ud.isWhitelistEnabled()) { //Skip whitelist check.
-					return true;
-				}
-
-				String[] splitCommand = command.split(" ");
-
-				for (String whitelistedCommand : ud.getWhitelistedCommands()) {
-					String[] splitWhitelistedCommand = whitelistedCommand.split(" ");
-
-					if(equalsArray(splitCommand, splitWhitelistedCommand)) {
-						//Command matches the whitelist
-						if(ud.isWhitelistActsAsBlacklist())
-							return false; //If acts as blacklist, do not allow command
-						else
-							return true; //If acts as Whitelist, allow command
-					}
-				}
-				
-				//If execution reached this point, then the command is not in the blacklist.
-				if(ud.isWhitelistActsAsBlacklist())
-					return true; //If acts as blacklist, allow command
-				else
-					return false; //If acts as Whitelist, do not allow command
-			}
-		}
-		throw new RuntimeException("No user matched the whitelist check.");
-	}
-	
-	/**
-	 * Check if the user command matches the whitelisted command
-	 * 
-	 * @param splitCommand Command sent by user
-	 * @param splitWhitelistedCommand Command in the whitelist
-	 * @return true if the user command matches the whitelist command
-	 */
-	private boolean equalsArray(String[] splitCommand, String[] splitWhitelistedCommand) {
-		for (int i = 0; i < splitWhitelistedCommand.length; i++)
-			if (!splitCommand[i].equalsIgnoreCase(splitWhitelistedCommand[i])) 
-				return false; //Does not match so far
-		return true; //Matches the command
-	}
-
 }

src/es/mesacarlos/webconsole/websocket/command/LogInCommand.java

@@ -1,7 +1,5 @@
 package es.mesacarlos.webconsole.websocket.command;
 
-import java.util.UUID;
-
 import org.bukkit.Bukkit;
 import org.java_websocket.WebSocket;
 
@@ -19,16 +17,16 @@ public class LogInCommand implements WSCommand {
 	@Override
 	public void execute(WSServer wsServer, WebSocket conn, String password) {
 		// If user is logged in, then return.
-		if (LoginManager.getInstance().isSocketConnected(conn.getRemoteSocketAddress()))
+		if (LoginManager.getInstance().isLoggedIn(conn.getRemoteSocketAddress()))
 			return;
 		
 		//Check if user exists
 		for(UserData ud : ConfigManager.getInstance().getAllUsers()) {
 			if(ud.getPassword().equals(password)) {
-				ConnectedUser user = new ConnectedUser(conn.getRemoteSocketAddress(), ud.getUsername(), UUID.randomUUID().toString(), ud.getUserType());
+				ConnectedUser user = new ConnectedUser(conn.getRemoteSocketAddress(), ud.getUsername(), ud.getUserType());
 				LoginManager.getInstance().logIn(user);
 				
-				wsServer.sendToClient(conn, new LoggedIn(Internationalization.getPhrase("login-sucessful-message"), "LOGIN ********", user.getUsername(), user.getUserType(), user.getToken()));
+				wsServer.sendToClient(conn, new LoggedIn(Internationalization.getPhrase("login-sucessful-message"), "LOGIN ********", user.getUsername(), user.getUserType()));
 				Bukkit.getLogger().info(Internationalization.getPhrase("login-sucessful-console", user.toString()));
 				return;
 			}

src/es/mesacarlos/webconsole/websocket/command/RamUsageCommand.java

@@ -14,7 +14,7 @@ public class RamUsageCommand implements WSCommand {
 		
 		long free = r.freeMemory() / 1024 / 1024;
 		long max = r.maxMemory() / 1024 / 1024;
-		long used = r.totalMemory() / 1024 / 1024 - free;
+		long used = max - free;
 		
 		wsServer.sendToClient(conn,
 			new RamUsage(

src/es/mesacarlos/webconsole/websocket/command/TpsCommand.java

@@ -1,54 +0,0 @@
-package es.mesacarlos.webconsole.websocket.command;
-
-//------------------------------
-//
-// This class was developed by Rafael K.
-// On 1/8/2022 at 10:22 PM
-// In the project WebConsole
-//
-//------------------------------
-
-import es.mesacarlos.webconsole.util.Internationalization;
-import es.mesacarlos.webconsole.websocket.WSServer;
-import es.mesacarlos.webconsole.websocket.response.Tps;
-import org.java_websocket.WebSocket;
-import org.bukkit.Bukkit;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-public class TpsCommand implements WSCommand {
-	private static final String mcVer = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
-
-	@Override
-	public void execute(WSServer wsServer, WebSocket conn, String params) {
-		try {
-			double tps = getTps()[0];
-			wsServer.sendToClient(conn, new Tps(Internationalization.getPhrase("tps-message", tps), tps));
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @return Current server Tps
-	 */
-	public double[] getTps() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException, NoSuchFieldException {
-		try {
-			Class<?> minecraftServerClass = Class.forName("net.minecraft.server." + mcVer + ".MinecraftServer");
-			Method getServerMethod = minecraftServerClass.getDeclaredMethod("getServer");
-			Object serverInstance = getServerMethod.invoke(null);
-			Field recentTpsField = serverInstance.getClass().getField("recentTps");
-			double[] recentTps = (double[]) recentTpsField.get(serverInstance);
-			for (int i = 0; i < recentTps.length; i++) {
-				recentTps[i] = Math.round(recentTps[i]);
-			}
-			return recentTps;
-		} catch (Exception e) {
-			//If an uncaught exception is thrown, maybe it is because this method of getting TPS does not work in the MV version currently running..
-			return new double[] { 0 };
-		}
-	}
-
-}

src/es/mesacarlos/webconsole/websocket/command/WSCommandFactory.java

@@ -11,7 +11,6 @@ public class WSCommandFactory {
 		commands.put("PLAYERS", new PlayersCommand());
 		commands.put("CPUUSAGE", new CpuUsageCommand());
 		commands.put("RAMUSAGE", new RamUsageCommand());
-		commands.put("TPS", new TpsCommand());
 		commands.put("READLOGFILE", new ReadLogFileCommand());
 		return commands;
 	}

src/es/mesacarlos/webconsole/websocket/response/ConsoleOutput.java

@@ -2,10 +2,9 @@ package es.mesacarlos.webconsole.websocket.response;
 
 import com.google.gson.JsonObject;
 
-public class ConsoleOutput implements JSONOutput {
+public class ConsoleOutput implements JSONOutput{
-
+	private String message;
-	private final String message;
+	private String time;
-	private final String time;
 	
 	public ConsoleOutput(String message, String time) {
 		this.message = message;

src/es/mesacarlos/webconsole/websocket/response/CpuUsage.java

@@ -2,10 +2,9 @@ package es.mesacarlos.webconsole.websocket.response;
 
 import com.google.gson.JsonObject;
 
-public class CpuUsage implements JSONOutput {
+public class CpuUsage implements JSONOutput{
-
+	private String message;
-	private final String message;
+	private double usage;
-	private final double usage;
 
 	public CpuUsage(String message, double usage) {
 		this.message = message;

src/es/mesacarlos/webconsole/websocket/response/LoggedIn.java

@@ -4,24 +4,21 @@ import com.google.gson.JsonObject;
 
 import es.mesacarlos.webconsole.config.UserType;
 
-public class LoggedIn implements JSONOutput {
+public class LoggedIn implements JSONOutput{
-
+	private String message;
-	private final String message;
 	private String respondsTo;
 	private String username;
 	private UserType as;
-	private String token;
 	
 	public LoggedIn(String message) {
 		this.message = message;
 	}
 	
-	public LoggedIn(String message, String respondsTo, String username, UserType as, String token) {
+	public LoggedIn(String message, String respondsTo, String username, UserType as) {
 		this.message = message;
 		this.respondsTo = respondsTo;
 		this.username = username;
 		this.as = as;
-		this.token = token;
 	}
 	
 	@Override
@@ -56,10 +53,6 @@ public class LoggedIn implements JSONOutput {
 		}
 	}
 
-	private String getToken() {
-		return token;
-	}
-	
 	@Override
 	public String toJSON() {
 		JsonObject object = new JsonObject();
@@ -68,7 +61,6 @@ public class LoggedIn implements JSONOutput {
 		object.addProperty("respondsTo", getRespondsTo());
 		object.addProperty("username", getUsername());
 		object.addProperty("as", getAs());
-		object.addProperty("token", getToken());
 		object.addProperty("message", getMessage());
 		return object.toString();
 	}

src/es/mesacarlos/webconsole/websocket/response/LoginRequired.java

@@ -2,9 +2,8 @@ package es.mesacarlos.webconsole.websocket.response;
 
 import com.google.gson.JsonObject;
 
-public class LoginRequired implements JSONOutput {
+public class LoginRequired implements JSONOutput{
-
+	private String message;
-	private final String message;
 	
 	public LoginRequired(String message) {
 		this.message = message;

src/es/mesacarlos/webconsole/websocket/response/Players.java

@@ -5,12 +5,11 @@ import java.util.List;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 
-public class Players implements JSONOutput {
+public class Players implements JSONOutput{
-
+	private String message;
-	private final String message;
+	private int connectedPlayers;
-	private final int connectedPlayers;
+	private int maxPlayers;
-	private final int maxPlayers;
+	private List<String> connectedPlayersList;
-	private final List<String> connectedPlayersList;
 	
 	public Players(String message, int connectedPlayers, int maxPlayers, List<String> connectedPlayersList) {
 		this.message = message;

src/es/mesacarlos/webconsole/websocket/response/RamUsage.java

@@ -3,11 +3,10 @@ package es.mesacarlos.webconsole.websocket.response;
 import com.google.gson.JsonObject;
 
 public class RamUsage implements JSONOutput {
-
+	private String message;
-	private final String message;
+	private long free;
-	private final long free;
+	private long used;
-	private final long used;
+	private long max;
-	private final long max;
 
 	public RamUsage(String message, long free, long used, long max) {
 		this.message = message;

src/es/mesacarlos/webconsole/websocket/response/Tps.java

@@ -1,51 +0,0 @@
-package es.mesacarlos.webconsole.websocket.response;
-
-//------------------------------
-//
-// This class was developed by Rafael K.
-// On 1/8/2022 at 10:23 PM
-// In the project WebConsole
-//
-//------------------------------
-
-import com.google.gson.JsonObject;
-
-public class Tps implements JSONOutput {
-
-    private final String message;
-    private final double tps;
-
-    public Tps(String message, double tps) {
-        this.message = message;
-        this.tps = tps;
-    }
-
-    @Override
-    public int getStatusCode() {
-        return 1003;
-    }
-
-    @Override
-    public String getMessage() {
-        return message;
-    }
-
-    /**
-     * Gets current server TPS
-     * @return Global Server TPS
-     */
-    public double getTps() {
-        return tps;
-    }
-
-    @Override
-    public String toJSON() {
-        JsonObject object = new JsonObject();
-        object.addProperty("status", getStatusCode());
-        object.addProperty("statusDescription", "TPS Usage");
-        object.addProperty("tps", getTps());
-        object.addProperty("message", getMessage());
-        return object.toString();
-    }
-
-}

src/es/mesacarlos/webconsole/websocket/response/UnknownCommand.java

@@ -2,10 +2,9 @@ package es.mesacarlos.webconsole.websocket.response;
 
 import com.google.gson.JsonObject;
 
-public class UnknownCommand implements JSONOutput {
+public class UnknownCommand implements JSONOutput{
-
+	private String message;
-	private final String message;
+	private String respondsTo;
-	private final String respondsTo;
 	
 	public UnknownCommand(String message, String respondsTo) {
 		this.message = message;