diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py index 8ee0de64..5d124d32 100644 --- a/app/classes/shared/helpers.py +++ b/app/classes/shared/helpers.py @@ -12,6 +12,7 @@ import logging import html import zipfile import pathlib +import shutil from datetime import datetime from socket import gethostname @@ -561,5 +562,31 @@ class Helpers: zf.write(os.path.join(root, file), os.path.relpath(os.path.join(root, file), os.path.join(path, '..'))) + @staticmethod + def copy_files(source, dest): + if os.path.isfile(source): + shutil.copyfile(source, dest) + logger.info("Copying jar %s to %s", source, dest) + else: + logger.info("Source jar does not exist.") + + @staticmethod + def download_file(executable_url, jar_path): + try: + r = requests.get(executable_url, timeout=5) + except Exception as ex: + logger.error("Could not download executable: %s", ex) + return False + if r.status_code != 200: + logger.error("Unable to download file from %s", executable_url) + return False + + try: + open(jar_path, "wb").write(r.content) + except Exception as e: + logger.error("Unable to finish executable download. Error: %s", e) + return False + return True + helper = Helpers() diff --git a/app/classes/shared/models.py b/app/classes/shared/models.py index b53c2903..13a37aaa 100644 --- a/app/classes/shared/models.py +++ b/app/classes/shared/models.py @@ -122,6 +122,7 @@ class Servers(BaseModel): auto_start_delay = IntegerField(default=10) crash_detection = BooleanField(default=0) stop_command = CharField(default="stop") + executable_update_url = CharField(default="") server_ip = CharField(default="127.0.0.1") server_port = IntegerField(default=25565) logs_delete_after = IntegerField(default=0) @@ -156,6 +157,7 @@ class Server_Stats(BaseModel): players = CharField(default="") desc = CharField(default="Unable to Connect") version = CharField(default="") + updating = BooleanField(default=False) class Meta: @@ -842,6 +844,15 @@ class db_shortcuts: } return conf + @staticmethod + def set_update(server_id, value): + try: + row = Server_Stats.select().where(Server_Stats.server_id == server_id) + except Exception as ex: + logger.error("Database entry not found. ".format(ex)) + with database.atomic(): + Server_Stats.update(updating=value).where(Server_Stats.server_id == server_id).execute() + @staticmethod def set_backup_config(server_id: int, backup_path: str = None, max_backups: int = None, auto_enabled: bool = True): logger.debug("Updating server {} backup config with {}".format(server_id, locals())) diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py index ab6f6372..3c46e009 100644 --- a/app/classes/shared/server.py +++ b/app/classes/shared/server.py @@ -10,11 +10,13 @@ import threading import schedule import logging.config import zipfile +from threading import Thread from app.classes.shared.helpers import helper from app.classes.shared.console import console from app.classes.shared.models import db_helper, Servers +from app.classes.web.websocket_helper import websocket_helper logger = logging.getLogger(__name__) @@ -42,11 +44,14 @@ class Server: self.settings = None self.updating = False self.server_id = None + self.jar_update_url = None self.name = None self.is_crashed = False self.restart_count = 0 self.crash_watcher_schedule = None self.stats = stats + self.backup_thread = threading.Thread(target=self.a_backup_server, daemon=True, name="backup") + self.is_backingup = False def reload_server_settings(self): server_data = db_helper.get_server_data_by_id(self.server_id) @@ -111,11 +116,16 @@ class Server: def start_server(self): + logger.info("Start command detected. Reloading settings from DB for server {}".format(self.name)) + self.setup_server_run_command() # fail safe in case we try to start something already running if self.check_running(): logger.error("Server is already running - Cancelling Startup") console.error("Server is already running - Cancelling Startup") return False + if self.check_update(): + logger.error("Server is updating. Terminating startup.") + return False logger.info("Launching Server {} with command {}".format(self.name, self.server_command)) console.info("Launching Server {} with command {}".format(self.name, self.server_command)) @@ -127,7 +137,11 @@ class Server: logger.info("Linux Detected") logger.info("Starting server in {p} with command: {c}".format(p=self.server_path, c=self.server_command)) - self.process = pexpect.spawn(self.server_command, cwd=self.server_path, timeout=None, encoding=None) + try: + self.process = pexpect.spawn(self.server_command, cwd=self.server_path, timeout=None, encoding=None) + except Exception as ex: + logger.error("Server {} failed to start with error code: {}".format(self.name, ex)) + return False self.is_crashed = False self.start_time = str(datetime.datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S')) @@ -318,20 +332,50 @@ class Server: console.info("Removing old crash detection watcher thread") schedule.clear(self.name) + def is_backup_running(self): + if self.is_backingup: + return True + else: + return False + def backup_server(self): + backup_thread = threading.Thread(target=self.a_backup_server, daemon=True, name="backup") + logger.info("Starting Backup Thread for server {}.".format(self.settings['server_name'])) + #checks if the backup thread is currently alive for this server + if not self.is_backingup: + try: + backup_thread.start() + except Exception as ex: + logger.error("Failed to start backup: {}".format(ex)) + return False + else: + logger.error("Backup is already being processed for server {}. Canceling backup request".format(self.settings['server_name'])) + return False + logger.info("Backup Thread started for server {}.".format(self.settings['server_name'])) + + def a_backup_server(self): logger.info("Starting server {} (ID {}) backup".format(self.name, self.server_id)) + self.is_backingup = True conf = db_helper.get_backup_config(self.server_id) try: - backup_filename = "{}/{}.zip".format(conf['backup_path'], datetime.datetime.now().strftime('%Y-%m-%d_%H-%M-%S')) + backup_filename = "{}/{}.zip".format(self.settings['backup_path'], datetime.datetime.now().strftime('%Y-%m-%d_%H-%M-%S')) logger.info("Creating backup of server '{}' (ID#{}) at '{}'".format(self.settings['server_name'], self.server_id, backup_filename)) helper.zip_directory(backup_filename, self.server_path) - backup_list = self.list_backups() - if len(self.list_backups()) > conf["max_backups"]: + while len(self.list_backups()) > conf["max_backups"]: + backup_list = self.list_backups() oldfile = backup_list[0] + backup_path = self.settings['backup_path'] + old_file_name = oldfile['path'] + back_old_file = os.path.join(backup_path, old_file_name) logger.info("Removing old backup '{}'".format(oldfile)) - os.remove(oldfile) + os.remove(back_old_file) + self.is_backingup = False + logger.info("Backup of server: {} completed".format(self.name)) + return except: logger.exception("Failed to create backup of server {} (ID {})".format(self.name, self.server_id)) + self.is_backingup = False + return def list_backups(self): conf = db_helper.get_backup_config(self.server_id) @@ -340,3 +384,88 @@ class Server: return [{"path": os.path.relpath(f['path'], start=conf['backup_path']), "size": f["size"]} for f in files] else: return [] + + def jar_update(self): + db_helper.set_update(self.server_id, True) + update_thread = threading.Thread(target=self.a_jar_update, daemon=True, name="exe_update") + update_thread.start() + + def check_update(self): + server_stats = db_helper.get_server_stats_by_id(self.server_id) + if server_stats['updating']: + return True + else: + return False + + def a_jar_update(self): + wasStarted = "-1" + self.backup_server() + #checks if server is running. Calls shutdown if it is running. + if self.check_running(): + wasStarted = True + logger.info("Server with PID {} is running. Sending shutdown command".format(self.PID)) + self.stop_threaded_server() + else: + wasStarted = False + if len(websocket_helper.clients) > 0: + # There are clients + self.check_update() + message = ' UPDATING...' + websocket_helper.broadcast('update_button_status', { + 'isUpdating': self.check_update(), + 'server_id': self.server_id, + 'wasRunning': wasStarted, + 'string': message + }) + backup_dir = os.path.join(self.settings['path'], 'crafty_executable_backups') + #checks if backup directory already exists + if os.path.isdir(backup_dir): + backup_executable = os.path.join(backup_dir, 'old_server.jar') + else: + logger.info("Executable backup directory not found for Server: {}. Creating one.".format(self.name)) + os.mkdir(backup_dir) + backup_executable = os.path.join(backup_dir, 'old_server.jar') + + if os.path.isfile(backup_executable): + #removes old backup + logger.info("Old backup found for server: {}. Removing...".format(self.name)) + os.remove(backup_executable) + logger.info("Old backup removed for server: {}.".format(self.name)) + else: + logger.info("No old backups found for server: {}".format(self.name)) + + current_executable = os.path.join(self.settings['path'], self.settings['executable']) + + #copies to backup dir + helper.copy_files(current_executable, backup_executable) + + #boolean returns true for false for success + downloaded = helper.download_file(self.settings['executable_update_url'], current_executable) + + if downloaded: + while self.is_backingup: + db_helper.set_update(self.server_id, True) + pass + logger.info("Executable updated successfully. Starting Server") + + db_helper.set_update(self.server_id, False) + if len(websocket_helper.clients) > 0: + # There are clients + self.check_update() + websocket_helper.broadcast('notification', "Executable update finished for " + self.name) + time.sleep(3) + websocket_helper.broadcast('update_button_status', { + 'isUpdating': self.check_update(), + 'server_id': self.server_id, + 'wasRunning': wasStarted + }) + websocket_helper.broadcast('notification', "Executable update finished for "+self.name) + + db_helper.add_to_audit_log_raw('Alert', '-1', self.server_id, "Executable update finished for "+self.name, self.settings['server_ip']) + if wasStarted: + self.start_server() + else: + time.sleep(5) + db_helper.set_update(self.server_id, False) + websocket_helper.broadcast('notification', "Executable update failed for " + self.name+". Check log file for details.") + logger.error("Executable download failed.") diff --git a/app/classes/shared/tasks.py b/app/classes/shared/tasks.py index 660af321..15789111 100644 --- a/app/classes/shared/tasks.py +++ b/app/classes/shared/tasks.py @@ -110,6 +110,9 @@ class TasksManager: elif command == "backup_server": svr.backup_server() + elif command == "update_executable": + svr.jar_update() + db_helper.mark_command_complete(c.get('command_id', None)) time.sleep(1) diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py index 98a0b4a1..e5f578d3 100644 --- a/app/classes/web/panel_handler.py +++ b/app/classes/web/panel_handler.py @@ -426,6 +426,7 @@ class PanelHandler(BaseHandler): auto_start_delay = self.get_argument('auto_start_delay', '10') server_ip = self.get_argument('server_ip', None) server_port = self.get_argument('server_port', None) + executable_update_url = self.get_argument('executable_update_url', None) auto_start = int(float(self.get_argument('auto_start', '0'))) crash_detection = int(float(self.get_argument('crash_detection', '0'))) logs_delete_after = int(float(self.get_argument('logs_delete_after', '0'))) @@ -454,6 +455,7 @@ class PanelHandler(BaseHandler): Servers.server_ip: server_ip, Servers.server_port: server_port, Servers.auto_start: auto_start, + Servers.executable_update_url: executable_update_url, Servers.crash_detection: crash_detection, Servers.logs_delete_after: logs_delete_after, }).where(Servers.server_id == server_id).execute() diff --git a/app/frontend/templates/panel/dashboard.html b/app/frontend/templates/panel/dashboard.html index a3ee9085..b6b5bbc4 100644 --- a/app/frontend/templates/panel/dashboard.html +++ b/app/frontend/templates/panel/dashboard.html @@ -123,14 +123,15 @@ - - + {% if server['stats']['running'] %}     + {% elif server['stats']['updating']%} + UPDATING... {% else %} -   -   +   +   {% end %} @@ -281,6 +282,21 @@ $( document ).ready(function() { mem_percent.textContent = hostStats.mem_percent + '%'; }); } + if (webSocket) { + webSocket.on('update_button_status', function (updateButton) { + var id = 'controls'; + var dataId = updateButton.server_id; + var string = updateButton.string + var id = id.concat(updateButton.server_id); + if (updateButton.isUpdating){ + console.log(updateButton.isUpdating) + document.getElementById(id).innerHTML = string; + } + else{ + window.location.reload() + } + }); + } $( ".clone_button" ).click(function() { server_id = $(this).attr("data-id"); diff --git a/app/frontend/templates/panel/server_config.html b/app/frontend/templates/panel/server_config.html index c08639c9..156b3154 100644 --- a/app/frontend/templates/panel/server_config.html +++ b/app/frontend/templates/panel/server_config.html @@ -106,6 +106,11 @@ +
+ + +
+
@@ -159,9 +164,11 @@
{% if data['server_stats']['running'] %} + {{ translate('serverConfig', 'deleteServer') }}
{{ translate('serverConfig', 'stopBeforeDeleting') }} {% else %} + {{ translate('serverConfig', 'deleteServer') }} {% end %} @@ -196,6 +203,28 @@ }); +let server_id = '{{ data['server_stats']['server_id']['server_id'] }}'; + + function send_command (server_id, command){ + + var token = getCookie("_xsrf"); + + $.ajax({ + type: "POST", + headers: {'X-XSRFToken': token}, + url: '/server/command?command=' + command + '&id=' + server_id, + success: function(data){ + console.log("got response:"); + console.log(data); + setTimeout(function(){ location.reload(); }, 10000); + + } + });bootbox.alert({ + backdrop: true, + title: '{% raw translate("serverConfig", "sendingRequest") %}', + message: '
  {% raw translate("serverConfig", "bePatientUpdate") %}
' + }); + } diff --git a/app/frontend/templates/panel/server_term.html b/app/frontend/templates/panel/server_term.html index 196c56da..2e43cdb3 100644 --- a/app/frontend/templates/panel/server_term.html +++ b/app/frontend/templates/panel/server_term.html @@ -83,12 +83,19 @@
- -
+ {% if data['server_stats']['updating']%} +
+ + + +
+ {% else %} +
+ {% end %}
@@ -125,6 +132,18 @@ } }); } + if (webSocket) { + webSocket.on('update_button_status', function (updateButton) { + if (updateButton.isUpdating){ + console.log(updateButton.isUpdating) + document.getElementById('control_buttons').innerHTML = ''; + } + else{ + window.location.reload() + document.getElementById('update_control_buttons').innerHTML = ''; + } + }); + } // Convert running to lower case (example: 'True' converts to 'true') and // then to boolean via JSON.parse() diff --git a/app/translations/en_EN.json b/app/translations/en_EN.json index d22eff97..caeb0d6b 100644 --- a/app/translations/en_EN.json +++ b/app/translations/en_EN.json @@ -125,7 +125,8 @@ "sendCommand": "Send command", "start": "Start", "restart": "Restart", - "stop": "Stop" + "stop": "Stop", + "updating": "Updating..." }, "serverPlayerManagement": { "players": "Players", @@ -199,7 +200,12 @@ "save": "Save", "cancel": "Cancel", "deleteServer": "Delete Server", - "stopBeforeDeleting": "Please stop the server before deleting it" + "stopBeforeDeleting": "Please stop the server before deleting it", + "exeUpdateURLDesc": "Direct Download URL for updates.", + "exeUpdateURL": "Server Executable Update URL", + "update": "Update Executable", + "bePatientUpdate": "Please be patient while we update the server. Download times can vary depending upon your internet speeds.
This screen will refresh in a moment", + "sendingRequest": "Sending your request..." }, "serverConfigHelp": { "title": "Server Config Area",