feat: config files are TOML instead of JSON

Author: RobynLlama

ThirdPartyLicenses/LICENSE-Tomlyn

@@ -0,0 +1,23 @@
+Copyright (c) 2019-2022, Alexandre Mutel
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification
+, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

src/SharpWebserver/Config/ClientBlockList.cs

@@ -1,10 +1,8 @@
 using System.Collections.Generic;
-using System.Text.Json.Serialization;
 
 namespace SharpWebserver.Config;
 
 public class ClientBlockList
 {
-  [JsonInclude]
-  public List<string> BlockList = [];
+  public List<string> BlockList { get; set; } = [];
 }

src/SharpWebserver/Config/ConfigManager.cs

@@ -1,11 +1,16 @@
 using System.IO;
-using System.Text.Json;
+using Tomlyn;
 
 namespace SharpWebserver;
 
 public static class ConfigManager
 {
-  public static T? LoadConfig<T>(string fileName) where T : class
+  public static readonly TomlModelOptions Options = new()
+  {
+    ConvertPropertyName = x => x,
+  };
+
+  public static T? LoadConfig<T>(string fileName) where T : class, new()
   {
     var path = Path.Combine(ListenServer.ConfigDir, fileName);
     var config = new FileInfo(path);
@@ -19,18 +24,23 @@ public static class ConfigManager
       using (var reader = config.OpenText())
       {
         string objectData = reader.ReadToEnd();
-        var thing = JsonSerializer.Deserialize<T>(objectData);
 
-        if (thing is not null)
+        try
         {
-          Logger.LogTrace("Finished loading config from disk");
-          return thing;
+          var thing = Toml.ToModel<T>(objectData, options: Options);
+          if (thing is not null)
+          {
+            Logger.LogTrace("Finished loading config from disk");
+            return thing;
+          }
+        }
+        catch
+        {
+          Logger.LogError("Unable to parse data as generic type T", [
+            ("Size", objectData.Length),
+            ("Type", typeof(T))
+          ]);
         }
-
-        Logger.LogError("Unable to parse data as generic type T", [
-          ("Size", objectData.Length),
-          ("Type", typeof(T))
-        ]);
       }
     }
 
@@ -42,9 +52,9 @@ public static void SaveConfig(string fileName, object configObject)
     var path = Path.Combine(ListenServer.ConfigDir, fileName);
     var configFile = new FileInfo(path);
 
-    using (var writer = configFile.OpenWrite())
+    using (var writer = new StreamWriter(new FileStream(configFile.FullName, FileMode.Truncate)))
     {
-      JsonSerializer.Serialize(writer, configObject);
+      writer.Write(Toml.FromModel(configObject, options: Options));
       Logger.LogInfo($"Wrote out {fileName}");
     }
   }

src/SharpWebserver/Config/SharpConfig.cs

@@ -1,12 +1,7 @@
-using System.Text.Json.Serialization;
-
 namespace SharpWebserver.Config;
 
 public class SharpConfig
 {
-  [JsonInclude]
-  public bool SafeMode;
-  [JsonInclude]
-  public int PortNumber = 80;
-
+  public bool SafeMode { get; set; } = false;
+  public int PortNumber { get; set; } = 80;
 }

src/SharpWebserver/SharpWebserver.csproj

@@ -19,6 +19,7 @@
 
   <ItemGroup>
     <PackageReference Include="CS-Script" Version="4.8.27" />
+    <PackageReference Include="Tomlyn" Version="0.18.0" />
   </ItemGroup>
 
 </Project>