start preparing types for live config editor page on the server

Author: pandinocoder

…ramework.Core/Config/FloodThreshholds.cs …ork.Core/Config/FloodThresholdOptions.csFramework/Intersect.Framework.Core/Config/FloodThreshholds.cs renamed to Framework/Intersect.Framework.Core/Config/FloodThresholdOptions.cs Framework/Intersect.Framework.Core/Config/FloodThreshholds.cs renamed to Framework/Intersect.Framework.Core/Config/FloodThresholdOptions.cs

@@ -1,6 +1,6 @@
 namespace Intersect.Config;
 
-public partial class FloodThreshholds
+public partial class FloodThresholdOptions
 {
     /// <summary>
     /// The largest a single packet should be before it's considered flooding.
@@ -17,19 +17,19 @@ public partial class FloodThreshholds
     /// </summary>
     public int KickAvgPacketPerSec { get; set; } = 30;
 
-    public static FloodThreshholds Editor()
+    public static FloodThresholdOptions Editor()
     {
-        return new FloodThreshholds()
+        return new FloodThresholdOptions()
         {
             MaxPacketSize = int.MaxValue,
             MaxPacketPerSec = int.MaxValue,
             KickAvgPacketPerSec = int.MaxValue
         };
     }
 
-    public static FloodThreshholds NotLoggedIn()
+    public static FloodThresholdOptions NotLoggedIn()
     {
-        return new FloodThreshholds()
+        return new FloodThresholdOptions()
         {
             MaxPacketSize = 10240,
             MaxPacketPerSec = 5,

Framework/Intersect.Framework.Core/Config/InstancingOptions.cs

@@ -1,7 +1,9 @@
 using System.Runtime.Serialization;
+using Intersect.Framework.Annotations;
 
 namespace Intersect.Config;
 
+[RequiresRestart]
 public partial class InstancingOptions
 {
     /// <summary>

Framework/Intersect.Framework.Core/Config/LoggingOptions.cs

@@ -1,13 +1,34 @@
 using Intersect.Framework.Core.Serialization;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
+using Serilog.Core;
+using Serilog.Extensions.Logging;
 
 namespace Intersect.Config;
 
 public partial class LoggingOptions
 {
+    private const LogLevel DefaultLogLevel = LogLevel.Information;
+
+    public static readonly LoggingLevelSwitch LoggingLevelSwitch = new(LevelConvert.ToSerilogLevel(DefaultLogLevel));
+
+    private LogLevel _level = DefaultLogLevel;
+
     [JsonConverter(typeof(SafeStringEnumConverter))]
-    public LogLevel Level { get; set; } = LogLevel.Information;
+    public LogLevel Level
+    {
+        get => _level;
+        set
+        {
+            if (value == _level)
+            {
+                return;
+            }
+
+            _level = value;
+            LoggingLevelSwitch.MinimumLevel = LevelConvert.ToSerilogLevel(_level);
+        }
+    }
 
     /// <summary>
     /// Determines whether chat logs should be written into the logging database

Framework/Intersect.Framework.Core/Config/MapOptions.cs

@@ -1,11 +1,13 @@
 using System.Runtime.Serialization;
+using Intersect.Framework.Annotations;
 using Newtonsoft.Json;
 
 namespace Intersect.Config;
 
 /// <summary>
 ///  Options for the game map.
 /// </summary>
+[RequiresRestart]
 public partial class MapOptions
 {
     public const int DefaultMapWidth = 32;
@@ -29,7 +31,7 @@ public partial class MapOptions
     public bool EnableCrossingDiagonalBlocks { get; set; }
 
     /// <summary>
-    /// Indicates whether or not diagonal movement is enabled for entities within the map.
+    /// Indicates whether diagonal movement is enabled for entities within the map.
     /// </summary>
     public bool EnableDiagonalMovement
     {

Framework/Intersect.Framework.Core/Config/MetricsOptions.cs

@@ -1,3 +1,5 @@
+using Intersect.Framework.Annotations;
+
 namespace Intersect.Config;
 
 /// <summary>
@@ -8,5 +10,6 @@ public partial class MetricsOptions
     /// <summary>
     /// Track game performance metrics
     /// </summary>
+    [RequiresRestart]
     public bool Enable { get; set; } = false;
 }

Framework/Intersect.Framework.Core/Config/NpcOptions.cs

@@ -6,49 +6,48 @@
 public partial class NpcOptions
 {
     /// <summary>
-    /// Configures whether or not Npcs are allowed to reset after moving out of a specified radius when starting to fight another entity.
+    /// If NPCs are allowed to reset after moving out of a specified radius when starting to fight another entity.
     /// </summary>
-    public bool AllowResetRadius = false;
+    public bool AllowResetRadius { get; set; } = false;
 
     /// <summary>
     /// Configures the radius in which an NPC is allowed to move after starting to fight another entity.
     /// </summary>
-    public int ResetRadius = 8;
+    public int ResetRadius { get; set; } = 8;
 
     /// <summary>
-    /// Configures whether or not the NPC is allowed to gain a new reset center point while it is still busy moving to its original reset point.
-    /// NOTE: Can be used to allow the NPCs to be dragged far far away, as it constantly resets the center of its radius!!!
+    /// If the NPC is allowed to gain a new reset center point while it is still busy moving to its original reset point.
+    /// NOTE: Can be used to allow the NPCs to be dragged very far away, as it constantly resets the center of its radius!!!
     /// </summary>
-
-    public bool AllowNewResetLocationBeforeFinish = false;
+    public bool AllowNewResetLocationBeforeFinish { get; set; } = false;
 
     /// <summary>
-    /// Configures whether or not the NPC should completely restore its vitals and statusses once it starts resetting.
+    /// If the NPC should completely restore its vitals and statusses once it starts resetting.
     /// </summary>
-    public bool ResetVitalsAndStatusses = false;
+    public bool ResetVitalsAndStatusses { get; set; } = false;
 
     /// <summary>
-    /// Configures whether or not the NPCs health should continue to reset to full and clear statuses while working its way to the reset location
+    /// If the NPCs health should continue to reset to full and clear statuses while working its way to the reset location
     /// </summary>
-    public bool ContinuouslyResetVitalsAndStatuses = false;
+    public bool ContinuouslyResetVitalsAndStatuses { get; set; } = false;
 
     /// <summary>
     /// If true, a NPC can be attacked while they are resetting. Their new attacker will become a target if they are within the reset radius
     /// </summary>
-    public bool AllowEngagingWhileResetting = false;
+    public bool AllowEngagingWhileResetting { get; set; } = false;
 
     /// <summary>
-    /// Configures whether or not the level of an Npc is shown next to their name.
+    /// If the level of an NPC is shown next to their name.
     /// </summary>
-    public bool ShowLevelByName = false;
+    public bool ShowLevelByName { get; set; } = false;
 
     /// <summary>
-    /// If true, NPCs that are resetting will walkthrough players
+    /// If true, NPCs that are resetting will walk through players
     /// </summary>
-    public bool IntangibleDuringReset = true;
+    public bool IntangibleDuringReset { get; set; } = true;
 
     /// <summary>
     /// If true, NPCs will go to reset state if their combat timer is exceeded
     /// </summary>
-    public bool ResetIfCombatTimerExceeded = true;
+    public bool ResetIfCombatTimerExceeded { get; set; } = true;
 }

Framework/Intersect.Framework.Core/Config/Options.cs

@@ -1,32 +1,61 @@
+using System.ComponentModel;
 using Intersect.Config;
 using Intersect.Config.Guilds;
 using Intersect.Core;
+using Intersect.Framework.Annotations;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 
 namespace Intersect;
 
 public partial class Options
 {
+    #region Constants
+
+    public const string DefaultGameName = "Intersect";
+
+    public const int DefaultServerPort = 5400;
+
+    #endregion
+
+    #region Static Properties
+
+    public static string ResourcesDirectory { get; set; } = "resources";
+
+    public static Options Instance { get; private set; }
+
+    public static Options? PendingChanges { get; private set; }
+
+    public static bool IsLoaded => Instance != null;
+
+    #endregion Static Properties
+
     #region Transient Properties
 
+    [Ignore]
     [JsonIgnore]
     public string OptionsData { get; private set; } = string.Empty;
 
+    [Ignore]
     [JsonIgnore]
     public bool SendingToClient { get; set; } = true;
 
+    [Ignore]
+    public bool SmtpValid { get; private set; }
+
     #endregion Transient Properties
 
     #region Configuration Properties
 
     #region Game Core
 
     [JsonProperty(Order = -100)]
-    public string GameName { get; set; } = DEFAULT_GAME_NAME;
+    [RequiresRestart]
+    public string GameName { get; set; } = DefaultGameName;
 
     [JsonProperty(Order = -100)]
-    public ushort ServerPort { get; set; } = DEFAULT_SERVER_PORT;
+    [RequiresRestart]
+    public ushort ServerPort { get; set; } = DefaultServerPort;
 
     #endregion Game Core
 
@@ -52,12 +81,15 @@ public partial class Options
     #region Network Visibility
 
     [JsonProperty(Order = -91)]
+    [RequiresRestart]
     public bool UPnP { get; set; } = true;
 
     [JsonProperty(Order = -91)]
+    [RequiresRestart]
     public bool OpenPortChecker { get; set; } = true;
 
     [JsonProperty(Order = -91, NullValueHandling = NullValueHandling.Include)]
+    [RequiresRestart]
     public string? PortCheckerUrl { get; set; }
 
     #endregion Network Visibility
@@ -75,44 +107,54 @@ public partial class Options
     #region Database
 
     [JsonProperty(Order = -70)]
+    [RequiresRestart]
     public DatabaseOptions GameDatabase = new();
 
     [JsonProperty(Order = -70)]
+    [RequiresRestart]
     public DatabaseOptions LoggingDatabase = new();
 
     [JsonProperty(Order = -70)]
+    [RequiresRestart]
     public DatabaseOptions PlayerDatabase = new();
 
     #endregion Database
 
     #region Security
 
     [JsonProperty(Order = -60)]
+    [RequiresRestart]
     public SecurityOptions Security = new();
 
     [JsonProperty(Order = -60)]
+    [RequiresRestart]
     public SmtpSettings SmtpSettings = new();
 
     #endregion Security
 
     #region Other Game Properties
 
+    [RequiresRestart]
     public List<string> AnimatedSprites { get; set; } = [];
 
+    [RequiresRestart]
     public PacketOptions Packets = new();
 
     public ChatOptions Chat = new();
 
+    [RequiresRestart]
     public CombatOptions Combat = new();
 
+    [RequiresRestart]
     public EquipmentOptions Equipment = new();
 
+    [RequiresRestart]
     public int EventWatchdogKillThreshold { get; set; } = 5000;
 
     /// <summary>
     /// Passability configuration by map zone
     /// </summary>
-    public Passability Passability { get; } = new();
+    public PassabilityOptions Passability { get; } = new();
 
     public ushort ValidPasswordResetTimeMinutes { get; set; } = 30;
 
@@ -144,12 +186,6 @@ public partial class Options
 
     #endregion Configuration Properties
 
-    public static Options Instance { get; private set; }
-
-    public static bool IsLoaded => Instance != null;
-
-    public bool SmtpValid { get; set; }
-
     public void FixAnimatedSprites()
     {
         for (var i = 0; i < AnimatedSprites.Count; i++)
@@ -158,8 +194,6 @@ public void FixAnimatedSprites()
         }
     }
 
-    public static string ResourcesDirectory { get; set; } = "resources";
-
     public static bool LoadFromDisk()
     {
         Options instance = new();
@@ -265,15 +299,4 @@ public bool ShouldSerializeSecurity()
     {
         return !SendingToClient;
     }
-
-    #region Constants
-
-    // TODO: Clean these up
-    //Values that cannot easily be changed:
-
-    public const string DEFAULT_GAME_NAME = "Intersect";
-
-    public const int DEFAULT_SERVER_PORT = 5400;
-
-    #endregion
 }

Framework/Intersect.Framework.Core/Config/PacketSecurityOptions.cs

@@ -54,26 +54,26 @@ public partial class PacketSecurityOptions
     /// Packet flooding detection thresholds for the game editor. (No Restrictions.)
     /// </summary>
     [JsonProperty("EditorFloodThreshholds")]
-    public FloodThreshholds EditorThreshholds = FloodThreshholds.Editor();
+    public FloodThresholdOptions EditorThreshholds = FloodThresholdOptions.Editor();
 
     /// <summary>
     /// Packet flooding detection thresholds for general players. Pretty strict.
     /// Might need to be adjusted if there is a lot of high paceed actions/movement/combat in your game.
     /// </summary>
     [JsonProperty("PlayerFloodThreshholds")]
-    public FloodThreshholds PlayerThreshholds = new();
+    public FloodThresholdOptions PlayerThreshholds = new();
 
     /// <summary>
     /// Packet flooding detection thresholds for mods/admins. Hopefully you trust these guys.
     /// Limits need to be higher than general players since they can warp quickly around the world with shift click.
     /// </summary>
     [JsonProperty("ModAdminFloodThreshholds")]
-    public FloodThreshholds ModAdminThreshholds = FloodThreshholds.Editor();
+    public FloodThresholdOptions ModAdminThreshholds = FloodThresholdOptions.Editor();
 
     /// <summary>
     /// Packet flooding detection threshholds for all users who are not yet logged in.
     /// </summary>
     [JsonProperty("FloodThreshholds")]
-    public FloodThreshholds Threshholds = FloodThreshholds.NotLoggedIn();
+    public FloodThresholdOptions Threshholds = FloodThresholdOptions.NotLoggedIn();
     #endregion
 }