feat: add webAllowRestart parameter

vincss · Nov 26, 2023 · aa509c0 · aa509c0
1 parent 9764466
commit aa509c0
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -88,6 +88,7 @@ via [Unofficial pterodactyl-installer](https://github.com/vilhelmprytz/pterodact
 | `webStopOnStart`            | Stop the web-server when minecraft starts                                                                                                                                                                                                | false                                           |
 | `webServeDynmap`            | true or an absolute path to enable it, by default it will serve './plugins/dynmap/web/'. You can specify an absolute path to serve instead or an url to redirect to. [How use with dynamp](./wiki/Use-internal-SSS-WebServer-for-dynmap) | false                                           |
 | `webSubPath`                | Set the path to the Web-GUI if serving from behind a reverse proxy                                                                                                                                                                       | ""                                              |
+| `webAllowRestart`                | Add a button in the web-ui to restart the minecraft server proxy                                                                                                                                                                       | false                                              |
 | `startMinecraft`            | Start the Minecraft Server (false to disable)                                                                                                                                                                                            | true                                            |
 | `minecraftCommand`          | The command used to start the server                                                                                                                                                                                                     | "java -jar paper.jar nogui"                     |
 | `preventStop`               | Prevent the user to stop the server (trought web-server or cli).                                                                                                                                                                         | false                                           |
@@ -151,6 +152,8 @@ Give a ⭐️ if you like the project!
 [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://paypal.me/vincss)
 
 ## 📜 ChangeLog
+- 1.8.0 - 1.20.1 :
+  - add webAllowRestart parameter
 - 1.7.1 - 1.20.1 :
   - Run mcsleeperstarter as a non-root user within the docker container
 - 1.7.0 - 1.20.1 :

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mcsleepingserverstarter",
-  "version": "1.7.1",
+  "version": "1.8.0",
   "description": "Sleeps until someone connects",
   "main": "build/sleepingServerStarter.js",
   "bin": "build/sleepingServerStarter.js",

diff --git a/sleepingSettings.yml b/sleepingSettings.yml
@@ -10,9 +10,9 @@ serverOnlineMode: true # like in the server.properties, to check the licence of
 maxPlayers: 20
 
 webPort: 8080 # 0 to disable web hosting, on a positive number a web page it will serve
-webStopOnStart: true
+# webStopOnStart: true 
 # webServeDynmap: true # true or false to enable, by default it will serve ./plugins/dynmap/web/. You can specify an absolute path to serve instead or an url to redirect to.
-webAllowRestart: true
+# webAllowRestart: true
 
 startMinecraft: true # false to disable
 minecraftCommand: "java -jar paper.jar nogui" # or paper.jar or whatever flavor you like
@@ -21,7 +21,7 @@ minecraftCommand: "java -jar paper.jar nogui" # or paper.jar or whatever flavor
 
 # discordWebhookUrl: "https://discord.com/api/webhooks/REPLACE_ME"
 
-# blackListedAddress: ["149.102.143.151", "132.145.71.44", "193.35.18.165"]
+# blackListedAddress: ["149.102.143.151", "132.145.71.44", "45.128.232.206", "193.35.18."]
 # whiteListedNames: ["vincss"]
 
 # Use a custom icon 64x64 png converted using https://www.base64-image.de/

diff --git a/src/sleepingContainer.ts b/src/sleepingContainer.ts
@@ -24,6 +24,7 @@ export class SleepingContainer implements ISleepingServer {
   discord?: SleepingDiscord;
 
   isClosing = false;
+  restartAsked?: boolean = false;
 
   constructor(callBack: (settings: Settings) => void) {
     this.logger = getLogger();
@@ -33,7 +34,7 @@ export class SleepingContainer implements ISleepingServer {
 
   init = async (isThisTheBeginning = false) => {
     if (isThisTheBeginning || this.settings.webStopOnStart) {
-      if (this.settings.webPort > 0) {
+      if (this.settings.webPort) {
         this.webServer = new SleepingWeb(
           this.settings,
           this.playerConnectionCallBack,
@@ -69,7 +70,7 @@ export class SleepingContainer implements ISleepingServer {
       `----------- [v${version}] Starting Minecraft : ${this.settings.minecraftCommand} ----------- `
     );
 
-    if (this.settings.webPort > 0 && !this.settings.webStopOnStart) {
+    if (this.settings.webPort && !this.settings.webStopOnStart) {
       const cmdArgs = this.settings.minecraftCommand.split(" ");
       const exec = cmdArgs.splice(0, 1)[0];
 
@@ -96,14 +97,15 @@ export class SleepingContainer implements ISleepingServer {
     }
   };
 
-  killMinecraft = () => {
+  killMinecraft = (restartAsked?:boolean) => {
     if (this.settings.preventStop) {
       this.logger.info(`[Container] killMinecraft: preventStop is set.`);
       return;
     }
 
     if (platform() !== "win32") {
       this.mcProcess?.kill();
+      this.restartAsked = restartAsked;      
     } else {
       this.logger.info(
         `[Container] Not killing server:${platform()}, signals are not working well on Windows`
@@ -164,11 +166,22 @@ export class SleepingContainer implements ISleepingServer {
             MC_TIMEOUT / 1000
           } secs)...`
         );
+
         setTimeout(async () => {
+
+          if(this.restartAsked) {
+            this.restartAsked = false;
+            this.logger.info(
+              `[Container] Restart asked. Launching MC...`
+            );            
+            this.startMinecraft(onMcClosed);
+            return;
+          }
+
           this.reloadSettings();
           this.logger.info("[Container] ...Too late !...");
           await this.init();
-        }, MC_TIMEOUT); // restart server
+        }, MC_TIMEOUT); // restart sss server
       };
 
       this.startMinecraft(onMcClosed);

diff --git a/src/sleepingSettings.ts b/src/sleepingSettings.ts
@@ -14,8 +14,8 @@ export type Settings = {
   maxPlayers: number;
   loginMessage: string;
   serverOnlineMode: boolean;
-  webPort: number;
-  webStopOnStart: boolean;
+  webPort?: number;
+  webStopOnStart?: boolean;
   webServeDynmap?: boolean | string;
   webSubPath?: string;
   webAllowRestart?: boolean;
@@ -42,9 +42,6 @@ export const DefaultSettings: Settings = {
   loginMessage: "...Waking server up, come back in a minute...",
   serverOnlineMode: true,
 
-  webPort: 0, // 0 to disable web hosting
-  webStopOnStart: false,
-
   startMinecraft: true, // false to disable
   minecraftCommand: "java -jar paper.jar nogui",
   version: false,

diff --git a/src/sleepingWeb.ts b/src/sleepingWeb.ts
@@ -134,7 +134,7 @@ export class SleepingWeb implements ISleepingServer {
         )} Restart server`
       );
 
-      this.sleepingContainer.killMinecraft();
+      this.sleepingContainer.killMinecraft(true);
     })
 
     this.app.get(`${this.webPath}/status`, async (req, res) => {