- write reference extra configuration that includes all values

- split ACExtraConfiguration.cs into different files - add JSON schema generation for extra_cfg.yml (WIP)
compujuckel · Jan 13, 2024 · 0d77c96 · 0d77c96
1 parent 457a329
commit 0d77c96
Show file tree

Hide file tree

Showing 38 changed files with 687 additions and 488 deletions.
diff --git a/AssettoServer/AssettoServer.csproj b/AssettoServer/AssettoServer.csproj
@@ -53,6 +53,7 @@
         <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
         <PackageReference Include="McMaster.NETCore.Plugins" Version="1.4.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+        <PackageReference Include="NJsonSchema" Version="11.0.0" />
         <PackageReference Include="NodaTime" Version="3.1.10" />
         <PackageReference Include="Open.NAT" Version="2.1.0">
             <NoWarn>NU1701</NoWarn>

diff --git a/AssettoServer/ExceptionHelper.cs b/AssettoServer/ExceptionHelper.cs
@@ -80,7 +80,7 @@ public static void PrintExceptionHelp(Exception ex, bool isContentManager, strin
             Console.WriteLine("Press D to join the official Discord server");
             Console.WriteLine("Press any other key to exit");
 
-            if (!ACServer.IsDebugBuild)
+            if (!Program.IsDebugBuild)
             {
                 var key = Console.ReadKey();
                 if (key.Key == ConsoleKey.D)
@@ -97,14 +97,7 @@ public static void PrintExceptionHelp(Exception ex, bool isContentManager, strin
                 }
                 else if (crashReportPath != null && key.Key == ConsoleKey.C)
                 {
-                    if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                    {
-                        Process.Start("explorer.exe", $"/select, \"{crashReportPath}\"");
-                    }
-                    else
-                    {
-                        OpenURL(crashReportPath);
-                    }
+                    Process.Start("explorer.exe", $"/select, \"{crashReportPath}\"");
                 }
             }
 

diff --git a/AssettoServer/Logging.cs b/AssettoServer/Logging.cs
@@ -1,4 +1,4 @@
-using AssettoServer.Server.Configuration;
+using AssettoServer.Server.Configuration.Extra;
 using Serilog;
 using Serilog.Events;
 using Serilog.Sinks.Grafana.Loki;

diff --git a/AssettoServer/Network/ClientMessages/OnlineEventGenerator.cs b/AssettoServer/Network/ClientMessages/OnlineEventGenerator.cs
@@ -154,7 +154,7 @@ internal static OnlineEventInfo ParseClientMessage(Type messageType)
             PacketType = GenerateKey(structure)
         };
 
-        if (ACServer.IsDebugBuild)
+        if (Program.IsDebugBuild)
         {
             Log.Debug("Parsed client message for {Class}, Type {Type:X}, Structure {Structure}",
                 messageType.Name, ret.PacketType, ret.Structure);

diff --git a/AssettoServer/Network/Http/ConfigurationController.cs b/AssettoServer/Network/Http/ConfigurationController.cs
@@ -1,6 +1,7 @@
 using System;
 using AssettoServer.Network.Http.Authentication;
 using AssettoServer.Server.Configuration;
+using AssettoServer.Server.Configuration.Serialization;
 using AssettoServer.Shared.Network.Http.Responses;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

diff --git a/AssettoServer/Network/Http/Startup.cs b/AssettoServer/Network/Http/Startup.cs
@@ -13,6 +13,7 @@
 using AssettoServer.Server.Blacklist;
 using AssettoServer.Server.CMContentProviders;
 using AssettoServer.Server.Configuration;
+using AssettoServer.Server.Configuration.Serialization;
 using AssettoServer.Server.GeoParams;
 using AssettoServer.Server.OpenSlotFilters;
 using AssettoServer.Server.Plugin;

diff --git a/AssettoServer/Network/Tcp/ACTcpClient.cs b/AssettoServer/Network/Tcp/ACTcpClient.cs
@@ -14,6 +14,7 @@
 using AssettoServer.Server;
 using AssettoServer.Server.Blacklist;
 using AssettoServer.Server.Configuration;
+using AssettoServer.Server.Configuration.Extra;
 using AssettoServer.Server.OpenSlotFilters;
 using AssettoServer.Server.Weather;
 using AssettoServer.Shared.Model;

diff --git a/AssettoServer/Network/Udp/UdpPluginServer.cs b/AssettoServer/Network/Udp/UdpPluginServer.cs
@@ -7,6 +7,7 @@
 using AssettoServer.Network.Tcp;
 using AssettoServer.Server;
 using AssettoServer.Server.Configuration;
+using AssettoServer.Server.Configuration.Kunos;
 using AssettoServer.Server.Plugin;
 using AssettoServer.Server.Weather;
 using AssettoServer.Shared.Network.Packets;

diff --git a/AssettoServer/Program.cs b/AssettoServer/Program.cs
@@ -20,6 +20,12 @@ namespace AssettoServer;
 
 internal static class Program
 {
+#if DEBUG
+    public static readonly bool IsDebugBuild = true;
+#else
+    public static readonly bool IsDebugBuild = false;
+#endif
+
     [UsedImplicitly(ImplicitUseKindFlags.Assign, ImplicitUseTargetFlags.WithMembers)]
     private class Options
     {

diff --git a/AssettoServer/Server/ACServer.cs b/AssettoServer/Server/ACServer.cs
@@ -25,12 +25,6 @@ namespace AssettoServer.Server;
 
 public class ACServer : CriticalBackgroundService
 {
-#if DEBUG
-    public const bool IsDebugBuild = true;
-#else
-    public const bool IsDebugBuild = false;
-#endif
-
     private readonly ACServerConfiguration _configuration;
     private readonly SessionManager _sessionManager;
     private readonly EntryCarManager _entryCarManager;

diff --git a/AssettoServer/Server/Ai/AiState.cs b/AssettoServer/Server/Ai/AiState.cs
@@ -4,6 +4,7 @@
 using System.Numerics;
 using AssettoServer.Server.Ai.Splines;
 using AssettoServer.Server.Configuration;
+using AssettoServer.Server.Configuration.Extra;
 using AssettoServer.Server.Weather;
 using AssettoServer.Shared.Model;
 using AssettoServer.Shared.Network.Packets.Outgoing;

diff --git a/AssettoServer/Server/CSPServerScriptProvider.cs b/AssettoServer/Server/CSPServerScriptProvider.cs
@@ -47,7 +47,7 @@ private void AddScriptInternal(Func<IActionResult> script, string? debugFilename
         var data = new IniData();
         var scriptSection = data[$"SCRIPT_{10 + Scripts.Count}-{debugFilename}"];
 
-        if (ACServer.IsDebugBuild && !string.IsNullOrEmpty(debugFilename))
+        if (Program.IsDebugBuild && !string.IsNullOrEmpty(debugFilename))
         {
             Log.Warning("Loading Lua script {File} locally, don't forget to sync changes for release", debugFilename);
             scriptSection["SCRIPT"] = debugFilename;