Merge pull request #250 from ServerMod/dank-input

Update input system and minor logging changes

Author: Dankrushen

MultiAdmin/Config/MultiAdminConfig.cs

@@ -54,6 +54,10 @@ public class MultiAdminConfig : InheritableConfigRegister
 			new ConfigEntry<bool>("use_new_input_system", true,
 				"Use New Input System", "Whether to use the new input system, if false, the original input system will be used");
 
+		public ConfigEntry<bool> HideInput { get; } =
+			new ConfigEntry<bool>("hide_input", false,
+				"Hide Console Input", "Whether to hide console input, if true, typed input will not be printed");
+
 		public ConfigEntry<uint> Port { get; } =
 			new ConfigEntry<uint>("port", 7777,
 				"Game Port", "The port for the server to use");
@@ -98,10 +102,18 @@ public class MultiAdminConfig : InheritableConfigRegister
 			new ConfigEntry<decimal>("restart_low_memory", 400,
 				"Restart Low Memory", "Restart if the game's remaining memory falls below this value in megabytes");
 
+		public ConfigEntry<uint> RestartLowMemoryTicks { get; } =
+			new ConfigEntry<uint>("restart_low_memory_ticks", 10,
+				"Restart Low Memory Ticks", "The number of ticks the memory can be over the limit before restarting");
+
 		public ConfigEntry<decimal> RestartLowMemoryRoundEnd { get; } =
 			new ConfigEntry<decimal>("restart_low_memory_roundend", 450,
 				"Restart Low Memory Round-End", "Restart at the end of the round if the game's remaining memory falls below this value in megabytes");
 
+		public ConfigEntry<uint> RestartLowMemoryRoundEndTicks { get; } =
+			new ConfigEntry<uint>("restart_low_memory_roundend_ticks", 10,
+				"Restart Low Memory Round-End Ticks", "The number of ticks the memory can be over the limit before restarting at the end of the round");
+
 		public ConfigEntry<bool> RandomInputColors { get; } =
 			new ConfigEntry<bool>("random_input_colors", false,
 				"Random Input Colors", "Randomize the new input system's colors every time a message is input");
@@ -142,6 +154,10 @@ public class MultiAdminConfig : InheritableConfigRegister
 			new ConfigEntry<int>("server_start_retry_delay", 10000,
 				"Server Start Retry Delay", "The time in milliseconds to wait before trying to start the server again after crashing");
 
+		public ConfigEntry<int> MultiAdminTickDelay { get; } =
+			new ConfigEntry<int>("multiadmin_tick_delay", 1000,
+				"MultiAdmin Tick Delay", "The time in milliseconds between MultiAdmin ticks (any features that update over time)");
+
 		public ConfigEntry<string> ServersFolder { get; } =
 			new ConfigEntry<string>("servers_folder", "servers",
 				"Servers Folder", "The location of the `servers` folder for MultiAdmin to load multiple server configurations from");

MultiAdmin/Features/ConfigGenerator.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.IO;
-using System.Text;
 using MultiAdmin.Config;
 using MultiAdmin.Config.ConfigHandler;
 using MultiAdmin.Features.Attributes;

MultiAdmin/Features/MemoryChecker.cs

@@ -13,8 +13,8 @@ internal class MemoryChecker : Feature, IEventTick, IEventRoundEnd
 		private uint tickCount;
 		private uint tickCountSoft;
 
-		private const uint MaxTicks = 10;
-		private const uint MaxTicksSoft = 10;
+		private uint maxTicks = 10;
+		private uint maxTicksSoft = 10;
 
 		private bool restart;
 
@@ -82,7 +82,7 @@ public void OnTick()
 		{
 			if (LowBytes < 0 && LowBytesSoft < 0 || MaxBytes < 0) return;
 
-			if (tickCount < MaxTicks && LowBytes >= 0 && MemoryLeftBytes <= LowBytes)
+			if (tickCount < maxTicks && LowBytes >= 0 && MemoryLeftBytes <= LowBytes)
 			{
 				Server.Write(
 					$"Warning: Program is running low on memory ({decimal.Round(MemoryLeftMb, OutputPrecision)} MB left), the server will restart if it continues",
@@ -94,7 +94,7 @@ public void OnTick()
 				tickCount = 0;
 			}
 
-			if (!restart && tickCountSoft < MaxTicksSoft && LowBytesSoft >= 0 && MemoryLeftBytes <= LowBytesSoft)
+			if (!restart && tickCountSoft < maxTicksSoft && LowBytesSoft >= 0 && MemoryLeftBytes <= LowBytesSoft)
 			{
 				Server.Write(
 					$"Warning: Program is running low on memory ({decimal.Round(MemoryLeftMb, OutputPrecision)} MB left), the server will restart at the end of the round if it continues",
@@ -108,14 +108,14 @@ public void OnTick()
 
 			if (Server.Status == ServerStatus.Restarting) return;
 
-			if (tickCount >= MaxTicks)
+			if (tickCount >= maxTicks)
 			{
 				Server.Write("Restarting due to low memory...", ConsoleColor.Red);
 				Server.RestartServer();
 
 				restart = false;
 			}
-			else if (!restart && tickCountSoft >= MaxTicksSoft)
+			else if (!restart && tickCountSoft >= maxTicksSoft)
 			{
 				Server.Write("Server will restart at the end of the round due to low memory");
 
@@ -143,6 +143,9 @@ public override string GetFeatureName()
 
 		public override void OnConfigReload()
 		{
+			maxTicks = Server.ServerConfig.RestartLowMemoryTicks.Value;
+			maxTicksSoft = Server.ServerConfig.RestartLowMemoryRoundEndTicks.Value;
+
 			LowMb = Server.ServerConfig.RestartLowMemory.Value;
 			LowMbSoft = Server.ServerConfig.RestartLowMemoryRoundEnd.Value;
 			MaxMb = Server.ServerConfig.MaxMemory.Value;

MultiAdmin/Program.cs

@@ -15,7 +15,7 @@ namespace MultiAdmin
 {
 	public static class Program
 	{
-		public const string MaVersion = "3.3.1.2";
+		public const string MaVersion = "3.4.0.0";
 		public const string RecommendedMonoVersion = "5.18";
 
 		private static readonly List<Server> InstantiatedServers = new List<Server>();
@@ -27,6 +27,8 @@ public static class Program
 			? Utils.GetFullPathSafe(Path.Combine(MaDebugLogDir, $"{Utils.DateTime}_MA_{MaVersion}_debug_log.txt"))
 			: null;
 
+		private static StreamWriter debugLogStream = null;
+
 		private static uint? portArg;
 		public static readonly string[] Args = Environment.GetCommandLineArgs();
 
@@ -78,8 +80,8 @@ public static void Write(string message, ConsoleColor color = ConsoleColor.DarkY
 			{
 				if (Headless) return;
 
-				new ColoredMessage(Utils.TimeStampMessage(message), color).WriteLine(
-					MultiAdminConfig.GlobalConfig?.UseNewInputSystem?.Value ?? false);
+				new ColoredMessage(Utils.TimeStampMessage(message), color).WriteLine((!MultiAdminConfig.GlobalConfig?.HideInput?.Value ?? false) &&
+					(MultiAdminConfig.GlobalConfig?.UseNewInputSystem?.Value ?? false));
 			}
 		}
 
@@ -109,14 +111,18 @@ public static void LogDebug(string tag, string message)
 					if ((!MultiAdminConfig.GlobalConfig?.DebugLog?.Value ?? true) ||
 					    string.IsNullOrEmpty(MaDebugLogFile) || tag == null || !IsDebugLogTagAllowed(tag)) return;
 
-					Directory.CreateDirectory(MaDebugLogDir);
-
-					using (StreamWriter sw = File.AppendText(MaDebugLogFile))
+					// Assign debug log stream as needed
+					if (debugLogStream == null)
 					{
-						message = Utils.TimeStampMessage($"[{tag}] {message}");
-						sw.Write(message);
-						if (!message.EndsWith(Environment.NewLine)) sw.WriteLine();
+						Directory.CreateDirectory(MaDebugLogDir);
+						debugLogStream = File.AppendText(MaDebugLogFile);
 					}
+
+					message = Utils.TimeStampMessage($"[{tag}] {message}");
+					debugLogStream.Write(message);
+					if (!message.EndsWith(Environment.NewLine)) debugLogStream.WriteLine();
+
+					debugLogStream.Flush();
 				}
 				catch (Exception e)
 				{
@@ -157,15 +163,15 @@ private static void OnExit(object sender, EventArgs e)
 							server.StopServer();
 
 							// Wait for server to exit
-							int timeToWait = Math.Max(MultiAdminConfig.GlobalConfig.SafeShutdownCheckDelay.Value, 0);
+							int timeToWait = Math.Max(server.ServerConfig.SafeShutdownCheckDelay.Value, 0);
 							int timeWaited = 0;
 
 							while (server.IsGameProcessRunning)
 							{
 								Thread.Sleep(timeToWait);
 								timeWaited += timeToWait;
 
-								if (timeWaited >= MultiAdminConfig.GlobalConfig.SafeShutdownTimeout.Value)
+								if (timeWaited >= server.ServerConfig.SafeShutdownTimeout.Value)
 								{
 									Write(
 										string.IsNullOrEmpty(server.serverId)
@@ -183,12 +189,10 @@ private static void OnExit(object sender, EventArgs e)
 					}
 				}
 
-				exited = true;
+				debugLogStream?.Close();
+				debugLogStream = null;
 
-				// For some reason Mono hangs on this, but it works perfectly without it,
-				// but on Windows it doesn't close immediately unless this is here
-				if (Utils.IsWindows)
-					Environment.Exit(0);
+				exited = true;
 			}
 		}
 

MultiAdmin/Server.cs

@@ -4,8 +4,8 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
 using MultiAdmin.Config;
 using MultiAdmin.ConsoleTools;
 using MultiAdmin.Features.Attributes;
@@ -150,7 +150,6 @@ private set
 				{
 					MaLogFile = string.IsNullOrEmpty(LogDirFile) ? null : string.Format(LogDirFile, "MA");
 					ScpLogFile = string.IsNullOrEmpty(LogDirFile) ? null : string.Format(LogDirFile, "SCP");
-					ModLogFile = string.IsNullOrEmpty(LogDirFile) ? null : string.Format(LogDirFile, "MODERATOR");
 				}
 			}
 		}
@@ -164,7 +163,8 @@ private set
 		public string LogDirFile { get; private set; }
 		public string MaLogFile { get; private set; }
 		public string ScpLogFile { get; private set; }
-		public string ModLogFile { get; private set; }
+
+		private StreamWriter maLogStream;
 
 		public Process GameProcess { get; private set; }
 
@@ -190,17 +190,20 @@ public bool IsGameProcessRunning
 
 		private void MainLoop()
 		{
+			// Creates and starts a timer
 			Stopwatch timer = new Stopwatch();
+			timer.Restart();
+
 			while (IsGameProcessRunning)
 			{
-				timer.Restart();
-
 				foreach (IEventTick tickEvent in tick) tickEvent.OnTick();
 
 				timer.Stop();
 
-				// Wait 1 second per tick (calculating how long the tick took and compensating)
-				Thread.Sleep(Math.Max(1000 - timer.Elapsed.Milliseconds, 0));
+				// Wait the delay per tick (calculating how long the tick took and compensating)
+				Thread.Sleep(Math.Max(ServerConfig.MultiAdminTickDelay.Value - timer.Elapsed.Milliseconds, 0));
+
+				timer.Restart();
 
 				if (Status == ServerStatus.Restarting && CheckRestartTimeout)
 				{
@@ -291,6 +294,11 @@ public void StartServer(bool restartOnCrash = true)
 
 				try
 				{
+					// Set up logging
+					maLogStream?.Close();
+					Directory.CreateDirectory(logDir);
+					maLogStream = File.AppendText(MaLogFile);
+
 					#region Startup Info Printing & Logging
 
 					WriteConfigInformation();
@@ -380,15 +388,18 @@ public void StartServer(bool restartOnCrash = true)
 
 					Write($"Starting server with the following parameters:\n{scpslExe} {startInfo.Arguments}");
 
+					// Reset the supported mod features
+					supportedModFeatures = ModFeatures.None;
+
 					ForEachHandler<IEventServerPreStart>(eventPreStart => eventPreStart.OnServerPreStart());
 
 					// Start the input reader
-					Thread inputHandlerThread = null;
+					CancellationTokenSource inputHandlerCancellation = new CancellationTokenSource();
+					Task inputHandler = null;
 
 					if (!Program.Headless)
 					{
-						inputHandlerThread = new Thread(() => InputHandler.Write(this));
-						inputHandlerThread.Start();
+						inputHandler = Task.Run(() => InputHandler.Write(this, inputHandlerCancellation.Token), inputHandlerCancellation.Token);
 					}
 
 					// Start the output reader
@@ -437,9 +448,19 @@ public void StartServer(bool restartOnCrash = true)
 						GameProcess = null;
 
 						// Stop the input handler if it's running
-						if (inputHandlerThread != null && inputHandlerThread.IsAlive)
+						if (inputHandler != null)
 						{
-							inputHandlerThread.Abort();
+							inputHandlerCancellation.Cancel();
+							try
+							{
+								inputHandler.Wait();
+							}
+							catch (Exception)
+							{
+								// Task was cancelled or disposed, this is fine since we're waiting for that
+							}
+							inputHandler.Dispose();
+							inputHandlerCancellation.Dispose();
 						}
 
 						consoleSocket.Disconnect();
@@ -487,6 +508,10 @@ public void StartServer(bool restartOnCrash = true)
 					}
 				}
 			} while (shouldRestart);
+
+			// Finish server instance
+			maLogStream?.Close();
+			maLogStream = null;
 		}
 
 		public void SetStopStatus(bool killGame = false)
@@ -625,10 +650,10 @@ public void Write(ColoredMessage[] messages, ConsoleColor? timeStampColor = null
 
 				ColoredMessage[] timeStampedMessage = Utils.TimeStampMessage(messages, timeStampColor);
 
-				timeStampedMessage.WriteLine(ServerConfig.UseNewInputSystem.Value);
+				timeStampedMessage.WriteLine(!ServerConfig.HideInput.Value && ServerConfig.UseNewInputSystem.Value);
 
-				if (ServerConfig.UseNewInputSystem.Value)
-					InputHandler.WriteInputAndSetCursor();
+				if (!ServerConfig.HideInput.Value && ServerConfig.UseNewInputSystem.Value)
+					InputHandler.WriteInputAndSetCursor(ServerConfig);
 			}
 		}
 
@@ -657,14 +682,10 @@ public void Log(string message)
 
 				try
 				{
-					Directory.CreateDirectory(logDir);
-
-					using (StreamWriter sw = File.AppendText(MaLogFile))
-					{
-						message = Utils.TimeStampMessage(message);
-						sw.Write(message);
-						if (!message.EndsWith(Environment.NewLine)) sw.WriteLine();
-					}
+					message = Utils.TimeStampMessage(message);
+					maLogStream.Write(message);
+					if (!message.EndsWith(Environment.NewLine)) maLogStream.WriteLine();
+					maLogStream.Flush();
 				}
 				catch (Exception e)
 				{