bug fix: server restart not working

Author: tabarra

README.md

@@ -41,12 +41,12 @@ $ node src/main.js server.json
 ```
 
 **Note:** To configure your Discord bot, follow these two guides:  [Setting up a bot application](https://discordjs.guide/preparations/setting-up-a-bot-application.html) and [Adding your bot to servers](https://discordjs.guide/preparations/adding-your-bot-to-servers.html).  
-**Note2:** To run multiple servers with the same base and FXAdmin installation, just duplicate your config.json and change the ports. Two instances of FXAdmin cannot be running in the same web server port.
+**Note2:** To run multiple servers with the same base and FXAdmin installation, just duplicate your `server.json` and change the ports. Two instances of FXAdmin cannot be running in the same web server port.
 
 
 ## Troubleshooting
 - If you are getting `Wrong password!` when executing an action, make sure you have your admins file configured correctly. If there is anything wrong with the file you should get an error when starting FXAdmin.
-- If you are getting `Server error: timeout of 1000ms exceeded` it means the fxserver is offline, start it in the web panel.
+- If you are getting `[FXAdmin:Monitor] Server error: ` of timeout or connection refused, it means the fxserver is offline, start it in the web panel.
 - If you are having trouble starting the fxserver via fxadmin, run `node src/config-tester.js server.json` and see which test is failing.
 - If you run into problems when executing `npm install`, try `npm i node-gyp` or `npm i --global --production windows-build-tools` if you are on windows.  
 

src/components/fxRunner.js

@@ -11,63 +11,94 @@ module.exports = class FXRunner {
         this.config = config;
         this.fxChild = null;
         this.fxChildStatus = null;
+        this.spawnVariables = null;
         this.outData = '';
         this.enableBuffer = false;
-        if(config.autostart) this.spawnServer();
+        this.setupVariables();
+
+        //The setTimeout is not strictly necessary, but it's nice to have other errors in the top before fxserver starts.
+        if(config.autostart){
+            setTimeout(() => {
+                this.spawnServer();
+            }, 1000);
+        }
     }
 
-    
+
     //================================================================
     /**
-     * Spawns the FXServer and sets up all the event handlers
+     * Setup the spawn variables
      */
-    async spawnServer(){
-        if(this.fxChild !== null) return false;
-        cleanTerminal();
+    setupVariables(){
         let onesyncFlag = (this.config.onesync)? '+set onesync_enabled 1' : '';
-        let spawnShell = null;
-        let spawnCmdArgs = null;
         if(this.config.isLinux){
-            spawnShell = '/bin/bash';
-            spawnCmdArgs = [`${this.config.buildPath}/run.sh`, `${onesyncFlag} +exec ${this.config.cfgPath}`];
+            this.spawnVariables = {
+                shell: '/bin/bash',
+                cmdArgs: [`${this.config.buildPath}/run.sh`, `${onesyncFlag} +exec ${this.config.cfgPath}`]
+            };
         }else{
-            spawnShell = 'cmd.exe';
-            spawnCmdArgs = ['/c', `${this.config.buildPath}/run.cmd ${onesyncFlag} +exec ${this.config.cfgPath}`];
+            this.spawnVariables = {
+                shell: 'cmd.exe',
+                cmdArgs: ['/c', `${this.config.buildPath}/run.cmd ${onesyncFlag} +exec ${this.config.cfgPath}`]
+            };
+        }
+
+    }//Final xxxx()
+
+    
+    //================================================================
+    /**
+     * Spawns the FXServer and sets up all the event handlers
+     */
+    async spawnServer(){
+        //Sanity Check
+        if(
+            this.spawnVariables == null || 
+            typeof this.spawnVariables.shell == 'undefined' || 
+            typeof this.spawnVariables.cmdArgs == 'undefined'
+        ){
+            logError('this.spawnVariables is not set.', context);
+            return false;
+        }
+        if(this.fxChild !== null){
+            logError('this.fxChild is not null.', context);
+            return false;
         }
 
+        //Starting server
         try {
             this.fxChild = spawn(
-                spawnShell, 
-                spawnCmdArgs,
+                this.spawnVariables.shell, 
+                this.spawnVariables.cmdArgs,
                 {cwd: this.config.basePath}
             );
+            logOk(`::Server started with PID ${this.fxChild.pid}!`, context);
         } catch (error) {
             logError('Failed to start FXServer with the following error:');
             dir(error);
             process.exit(0);
         }
 
-        logOk(`::Server started with PID ${this.fxChild.pid}!`, context);
+        //Pipping stdin and stdout
         this.fxChild.stdout.pipe(process.stdout);
         process.stdin.pipe(this.fxChild.stdin);
 
+        //Setting up event handlers
         this.fxChild.on('close', function (code, signal) {
-            console.log('close: ' + `code ${code} and signal ${signal}`);
+            logWarn('close: ' + `code ${code} and signal ${signal}`, context);
         });
         this.fxChild.on('disconnect', function () {
-            console.log('disconnect');
+            logWarn('fxChild disconnect event', context);
         });
         this.fxChild.on('error', function (err) {
-            console.log('error ', err);
+            logWarn('fxChild error event:', context);
+            dir(err)
         });
         this.fxChild.on('exit', function (code, signal) {
-            logError('this.fxChild process exited with ' + `code ${code} and signal ${signal}`, context);
-            // console.log("==========================");
-            // console.log(JSON.stringify(this.fxChild));
-            // console.log("==========================");    
+            logWarn('fxChild process exited with ' + `code ${code} and signal ${signal}`, context);
         });
         this.fxChild.stderr.on('data', (data) => {
-            console.error(`==============================================:\n${data}\n==============================================`);
+            logWarn(`========:\n${data}\n========`, context);
         });
         this.fxChild.stdout.on('data', (data) => {
             if(this.enableBuffer) this.outData += data;
@@ -93,9 +124,11 @@ module.exports = class FXRunner {
     killServer(){
         try {
             this.fxChild.kill();
+            this.fxChild = null;
             return true;
         } catch (error) {
-            logWarn("Couldn't kill the server. Perhaps What Is Dead May Never Die.")
+            logWarn("Couldn't kill the server. Perhaps What Is Dead May Never Die.");
+            this.fxChild = null;
             return false;
         }
     }

src/components/monitor.js

@@ -68,7 +68,7 @@ module.exports = class Monitor {
             players = res.data;
             if(!Array.isArray(players)) throw new Error("not array")
         } catch (error) {
-            logError(`Server error: ${error.message}`, context);
+            logWarn(`Server error: ${error.message}`, context);
             this.statusServer = {
                 online: false,
                 ping: false,

version.json

@@ -1,4 +1,4 @@
 {
-    "version": "0.5.0",
-    "changelog": "Linux support, Config tester."
+    "version": "0.5.1",
+    "changelog": "Linux support, Config tester. Bug fix: server restart"
 }