Extracted all TODO static values to configuration parameters

MoonlightServers.Daemon/Abstractions/Server.Create.cs

@@ -21,6 +21,7 @@ public partial class Server
         var dockerClient = ServiceProvider.GetRequiredService<DockerClient>();
 
         var parameters = Configuration.ToRuntimeCreateParameters(
+            appConfiguration: AppConfiguration,
             hostPath: RuntimeVolumePath,
             containerName: RuntimeContainerName
         );

MoonlightServers.Daemon/Abstractions/Server.Destroy.cs

@@ -1,4 +1,5 @@
 using Docker.DotNet;
+using MoonlightServers.Daemon.Configuration;
 
 namespace MoonlightServers.Daemon.Abstractions;
 
@@ -19,12 +20,11 @@ public partial class Server
             if (container.State.Running)
             {
                 // Stop container when running
-                
                 await LogToConsole("Stopping container");
 
                 await dockerClient.Containers.StopContainerAsync(container.ID, new()
                 {
-                    WaitBeforeKillSeconds = 30 // TODO: Config
+                    WaitBeforeKillSeconds = (uint)AppConfiguration.Server.WaitBeforeKillSeconds
                 });
             }
 

MoonlightServers.Daemon/Abstractions/Server.Installation.cs

@@ -50,6 +50,7 @@ public partial class Server
 
             // Creating container configuration
             var parameters = Configuration.ToInstallationCreateParameters(
+                appConfiguration: AppConfiguration,
                 RuntimeVolumePath,
                 InstallationVolumePath,
                 InstallationContainerName,

MoonlightServers.Daemon/Abstractions/Server.cs

@@ -1,5 +1,6 @@
 using Docker.DotNet.Models;
 using Microsoft.AspNetCore.SignalR;
+using MoonlightServers.Daemon.Configuration;
 using MoonlightServers.Daemon.Enums;
 using MoonlightServers.Daemon.Http.Hubs;
 using MoonlightServers.Daemon.Models;
@@ -36,20 +37,23 @@ public partial class Server
     private StateMachine<ServerState, ServerTrigger> StateMachine;
     private ServerConfiguration Configuration;
     private CancellationTokenSource Cancellation;
+    private AppConfiguration AppConfiguration;
 
     public Server(
         ILogger logger,
         IServiceProvider serviceProvider,
         ServerConfiguration configuration,
-        IHubContext<ServerWebSocketHub> webSocketHub
+        IHubContext<ServerWebSocketHub> webSocketHub,
+        AppConfiguration appConfiguration
     )
     {
         Logger = logger;
         ServiceProvider = serviceProvider;
         Configuration = configuration;
         WebSocketHub = webSocketHub;
+        AppConfiguration = appConfiguration;
 
-        Console = new();
+        Console = new(AppConfiguration.Server.ConsoleMessageCacheLimit);
         Cancellation = new();
 
         RuntimeContainerName = $"moonlight-runtime-{Configuration.Id}";

MoonlightServers.Daemon/Configuration/AppConfiguration.cs

@@ -9,6 +9,7 @@ public class AppConfiguration
     public SecurityData Security { get; set; } = new();
     public RemoteData Remote { get; set; } = new();
     public FilesData Files { get; set; } = new();
+    public ServerData Server { get; set; } = new();
     
     public class RemoteData
     {
@@ -45,6 +46,15 @@ public class AppConfiguration
     
     public class FilesData
     {
-        public int UploadLimit { get; set; } = 500;
+        public int UploadSizeLimit { get; set; } = 1024 * 2;
+        public int UploadChunkSize { get; set; } = 20;
+    }
+    
+    public class ServerData
+    {
+        public int WaitBeforeKillSeconds { get; set; } = 30;
+        public int TmpFsSize { get; set; } = 100;
+        public float MemoryOverheadMultiplier { get; set; } = 0.05f;
+        public int ConsoleMessageCacheLimit { get; set; } = 250;
     }
 }

MoonlightServers.Daemon/Extensions/ServerConfigurationExtensions.cs

@@ -1,6 +1,7 @@
 using Docker.DotNet.Models;
 using Mono.Unix.Native;
 using MoonCore.Helpers;
+using MoonlightServers.Daemon.Configuration;
 using MoonlightServers.Daemon.Models.Cache;
 using MoonlightServers.DaemonShared.PanelSide.Http.Responses;
 
@@ -31,10 +32,14 @@ public static class ServerConfigurationExtensions
         };
     }
 
-    public static CreateContainerParameters ToRuntimeCreateParameters(this ServerConfiguration configuration,
+    public static CreateContainerParameters ToRuntimeCreateParameters(
-        string hostPath, string containerName)
+        this ServerConfiguration configuration,
+        AppConfiguration appConfiguration,
+        string hostPath,
+        string containerName
+    )
     {
-        var parameters = configuration.ToSharedCreateParameters();
+        var parameters = configuration.ToSharedCreateParameters(appConfiguration);
 
         #region Security
 
@@ -150,6 +155,7 @@ public static class ServerConfigurationExtensions
 
     public static CreateContainerParameters ToInstallationCreateParameters(
         this ServerConfiguration configuration,
+        AppConfiguration appConfiguration,
         string runtimeHostPath,
         string installationHostPath,
         string containerName,
@@ -157,7 +163,7 @@ public static class ServerConfigurationExtensions
         string installShell
     )
     {
-        var parameters = configuration.ToSharedCreateParameters();
+        var parameters = configuration.ToSharedCreateParameters(appConfiguration);
 
         // - Name
         parameters.Name = containerName;
@@ -212,7 +218,8 @@ public static class ServerConfigurationExtensions
         return parameters;
     }
 
-    private static CreateContainerParameters ToSharedCreateParameters(this ServerConfiguration configuration)
+    private static CreateContainerParameters ToSharedCreateParameters(this ServerConfiguration configuration,
+        AppConfiguration appConfiguration)
     {
         var parameters = new CreateContainerParameters()
         {
@@ -242,7 +249,7 @@ public static class ServerConfigurationExtensions
         var memoryLimit = configuration.Memory;
 
         // The overhead multiplier gives the container a little bit more memory to prevent crashes
-        var memoryOverhead = memoryLimit + (memoryLimit * 0.05f); // TODO: Config
+        var memoryOverhead = memoryLimit + (memoryLimit * appConfiguration.Server.MemoryOverheadMultiplier);
 
         long swapLimit = -1;
 
@@ -287,7 +294,7 @@ public static class ServerConfigurationExtensions
 
         parameters.HostConfig.Tmpfs = new Dictionary<string, string>()
         {
-            { "/tmp", $"rw,exec,nosuid,size=100M" } // TODO: Config
+            { "/tmp", $"rw,exec,nosuid,size={appConfiguration.Server.TmpFsSize}M" }
         };
 
         #endregion

MoonlightServers.Daemon/Http/Controllers/Servers/UploadController.cs

@@ -16,8 +16,6 @@ public class UploadController : Controller
     private readonly AppConfiguration Configuration;
     private readonly ServerService ServerService;
 
-    private readonly long ChunkSize = ByteConverter.FromMegaBytes(20).Bytes; // TODO config
-
     public UploadController(
         ServerService serverService,
         AppConfiguration configuration
@@ -29,11 +27,14 @@ public class UploadController : Controller
 
     [HttpPost]
     public async Task Upload(
-        [FromQuery] long totalSize, // TODO: Add limit in config
+        [FromQuery] long totalSize,
         [FromQuery] int chunkId,
         [FromQuery] string path
     )
     {
+        var chunkSize = ByteConverter.FromMegaBytes(Configuration.Files.UploadChunkSize).Bytes;
+        var uploadLimit = ByteConverter.FromMegaBytes(Configuration.Files.UploadSizeLimit).Bytes;
+        
         #region File validation
 
         if (Request.Form.Files.Count != 1)
@@ -41,7 +42,7 @@ public class UploadController : Controller
 
         var file = Request.Form.Files[0];
         
-        if (file.Length > ChunkSize)
+        if (file.Length > chunkSize)
             throw new HttpApiException("The provided data exceeds the chunk size limit", 400);
 
         #endregion
@@ -50,13 +51,16 @@ public class UploadController : Controller
 
         #region Chunk calculation and validation
         
-        var chunks = totalSize / ChunkSize;
+        if(totalSize > uploadLimit)
-        chunks += totalSize % ChunkSize > 0 ? 1 : 0;
+            throw new HttpApiException("Invalid upload request: Exceeding upload limit", 400);
+
+        var chunks = totalSize / chunkSize;
+        chunks += totalSize % chunkSize > 0 ? 1 : 0;
 
         if (chunkId > chunks)
             throw new HttpApiException("Invalid chunk id: Out of bounds", 400);
         
-        var positionToSkipTo = ChunkSize * chunkId;
+        var positionToSkipTo = chunkSize * chunkId;
 
         #endregion
 

MoonlightServers.Daemon/Models/ServerConsole.cs

@@ -2,12 +2,17 @@ namespace MoonlightServers.Daemon.Models;
 
 public class ServerConsole
 {
-    public event Func<string, Task> OnOutput;
+    public event Func<string, Task>? OnOutput;
-    public event Func<string, Task> OnInput;
+    public event Func<string, Task>? OnInput;
 
     public string[] Messages => GetMessages();
     private readonly Queue<string> MessageCache = new();
-    private const int MaxMessagesInCache = 250; //TODO: Config
+    private int MaxMessagesInCache;
+
+    public ServerConsole(int maxMessagesInCache)
+    {
+        MaxMessagesInCache = maxMessagesInCache;
+    }
 
     public async Task WriteToOutput(string content)
     {

MoonlightServers.Daemon/Services/ServerService.cs

@@ -5,6 +5,7 @@ using MoonCore.Attributes;
 using MoonCore.Exceptions;
 using MoonCore.Models;
 using MoonlightServers.Daemon.Abstractions;
+using MoonlightServers.Daemon.Configuration;
 using MoonlightServers.Daemon.Enums;
 using MoonlightServers.Daemon.Extensions;
 using MoonlightServers.Daemon.Http.Hubs;
@@ -22,6 +23,7 @@ public class ServerService : IHostedLifecycleService
     private readonly IServiceProvider ServiceProvider;
     private readonly ILoggerFactory LoggerFactory;
     private readonly IHubContext<ServerWebSocketHub> WebSocketHub;
+    private readonly AppConfiguration Configuration;
     private CancellationTokenSource Cancellation = new();
     private bool IsInitialized = false;
 
@@ -30,7 +32,8 @@ public class ServerService : IHostedLifecycleService
         ILogger<ServerService> logger,
         IServiceProvider serviceProvider,
         ILoggerFactory loggerFactory,
-        IHubContext<ServerWebSocketHub> webSocketHub
+        IHubContext<ServerWebSocketHub> webSocketHub,
+        AppConfiguration configuration
     )
     {
         RemoteService = remoteService;
@@ -38,6 +41,7 @@ public class ServerService : IHostedLifecycleService
         ServiceProvider = serviceProvider;
         LoggerFactory = loggerFactory;
         WebSocketHub = webSocketHub;
+        Configuration = configuration;
     }
 
     public async Task Initialize() //TODO: Add initialize call from panel
@@ -196,7 +200,8 @@ public class ServerService : IHostedLifecycleService
             LoggerFactory.CreateLogger($"Server {serverConfiguration.Id}"),
             ServiceProvider,
             serverConfiguration,
-            WebSocketHub
+            WebSocketHub,
+            Configuration
         );
 
         await server.Initialize(existingContainers);