mirror of
https://github.com/modernuo/ModernUO
synced 2026-08-11 22:23:06 -04:00
Stacked on #2475 (the `ConfigurePrompts` phase). Base will switch to `main` once #2475 merges. ## What Move the engine's own first-boot prompts — data directories, listeners, server name, expansion + map selection — out of `ServerConfiguration.Load` and into **`ServerConfiguration.ConfigurePrompts()`** (`[CallPriority(0)]`), so **all** first-boot prompting (engine and content) runs through the single `AssemblyHandler.Invoke("ConfigurePrompts")` phase. `Load` now only reads/creates the config file. ## Why it's safe - **Assembly loading uses `AssemblyDirectories` (default `./Assemblies`), not `DataDirectories`** — so assemblies load fine before the now-later data-dir prompt. This is the linchpin that makes the move possible. - **`UOClient.Load()`** (client-file discovery via `Core.FindDataFile`) needs `DataDirectories`, so it moved *with* the data-dir prompt into `ConfigurePrompts`. - **`Core.Expansion`** is now assigned in `ConfigurePrompts` (every non-mocked boot). Nothing between `LoadAssemblies` and that phase reads it — type initializers run lazily on first use, not during `LoadAssemblies`. - **`[CallPriority(0)]`** keeps the engine prompts (including map selection) ahead of content prompts such as the pathfinding pre-bake (priority 50), preserving "after map selection". - `Main.cs` already invokes the phase — **no startup-ordering edit** here. ## Tests `Server.Tests` **708/708**, `UOContent.Tests` **418/418**, build clean. Fixtures are unaffected: they call `Load(true)` (now just reads config) and set expansion/data dirs directly; `ConfigurePrompts` is gated on `m_Mocked`. ## ⚠️ Needs first-boot runtime verification `Main.cs` startup ordering is **not** covered by the fixture-based suite (the fixtures bypass `Main`). Please boot once with a fresh `modernuo.json` to confirm the first-boot prompt sequence (data dirs → … → expansion/maps → pathfinding pre-bake) and that `Core.Expansion` resolves correctly. Docs updated in `dev-docs/server-lifecycle.md`.
337 lines
11 KiB
C#
337 lines
11 KiB
C#
/*************************************************************************
|
|
* ModernUO *
|
|
* Copyright 2019-2026 - ModernUO Development Team *
|
|
* Email: hi@modernuo.com *
|
|
* File: ServerConfiguration.cs *
|
|
* *
|
|
* This program is free software: you can redistribute it and/or modify *
|
|
* it under the terms of the GNU General Public License as published by *
|
|
* the Free Software Foundation, either version 3 of the License, or *
|
|
* (at your option) any later version. *
|
|
* *
|
|
* You should have received a copy of the GNU General Public License *
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
|
|
*************************************************************************/
|
|
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using System.IO;
|
|
using System.Net;
|
|
using Server.Json;
|
|
using Server.Logging;
|
|
|
|
namespace Server;
|
|
|
|
public static class ServerConfiguration
|
|
{
|
|
private static readonly ILogger logger = LogFactory.GetLogger(typeof(ServerConfiguration));
|
|
|
|
private const string _relPath = "Configuration/modernuo.json";
|
|
private static readonly string m_FilePath = Path.Join(Core.BaseDirectory, _relPath);
|
|
|
|
private static ServerSettings _settings;
|
|
private static bool m_Mocked;
|
|
|
|
public static List<string> AssemblyDirectories => _settings.AssemblyDirectories;
|
|
|
|
public static HashSet<string> DataDirectories => _settings.DataDirectories;
|
|
|
|
public static List<IPEndPoint> Listeners => _settings.Listeners;
|
|
|
|
public static string ConfigurationFilePath => _relPath;
|
|
|
|
public static ClientVersion GetSetting(string key, ClientVersion defaultValue) =>
|
|
_settings.Settings.TryGetValue(key, out var value) ? new ClientVersion(value) : defaultValue;
|
|
|
|
public static string GetSetting(string key, string defaultValue) =>
|
|
_settings.Settings.GetValueOrDefault(key, defaultValue);
|
|
|
|
public static int GetSetting(string key, int defaultValue)
|
|
{
|
|
_settings.Settings.TryGetValue(key, out var strValue);
|
|
return int.TryParse(strValue, out var value) ? value : defaultValue;
|
|
}
|
|
|
|
public static long GetSetting(string key, long defaultValue)
|
|
{
|
|
_settings.Settings.TryGetValue(key, out var strValue);
|
|
return long.TryParse(strValue, out var value) ? value : defaultValue;
|
|
}
|
|
|
|
public static bool GetSetting(string key, bool defaultValue)
|
|
{
|
|
_settings.Settings.TryGetValue(key, out var strValue);
|
|
return bool.TryParse(strValue, out var value) ? value : defaultValue;
|
|
}
|
|
|
|
public static TimeSpan GetSetting(string key, TimeSpan defaultValue)
|
|
{
|
|
_settings.Settings.TryGetValue(key, out var strValue);
|
|
return TimeSpan.TryParse(strValue, out var value) ? value : defaultValue;
|
|
}
|
|
|
|
public static T GetSetting<T>(string key, T defaultValue) where T : struct, Enum
|
|
{
|
|
_settings.Settings.TryGetValue(key, out var strValue);
|
|
return Enum.TryParse(strValue, out T value) ? value : defaultValue;
|
|
}
|
|
|
|
public static double GetSetting(string key, double defaultValue)
|
|
{
|
|
_settings.Settings.TryGetValue(key, out var strValue);
|
|
return double.TryParse(strValue, out var value) ? value : defaultValue;
|
|
}
|
|
|
|
public static T? GetSetting<T>(string key) where T : struct, Enum
|
|
{
|
|
if (!_settings.Settings.TryGetValue(key, out var strValue))
|
|
{
|
|
return null;
|
|
}
|
|
|
|
return Enum.TryParse(strValue, out T value) ? value : null;
|
|
}
|
|
|
|
public static string GetOrUpdateSetting(string key, string defaultValue)
|
|
{
|
|
if (_settings.Settings.TryGetValue(key, out var value))
|
|
{
|
|
return value;
|
|
}
|
|
|
|
SetSetting(key, value = defaultValue);
|
|
return value;
|
|
}
|
|
|
|
public static int GetOrUpdateSetting(string key, int defaultValue)
|
|
{
|
|
int value;
|
|
|
|
if (_settings.Settings.TryGetValue(key, out var strValue))
|
|
{
|
|
value = int.TryParse(strValue, out value) ? value : defaultValue;
|
|
}
|
|
else
|
|
{
|
|
SetSetting(key, (value = defaultValue).ToString());
|
|
}
|
|
|
|
return value;
|
|
}
|
|
|
|
public static long GetOrUpdateSetting(string key, long defaultValue)
|
|
{
|
|
long value;
|
|
|
|
if (_settings.Settings.TryGetValue(key, out var strValue))
|
|
{
|
|
value = long.TryParse(strValue, out value) ? value : defaultValue;
|
|
}
|
|
else
|
|
{
|
|
SetSetting(key, (value = defaultValue).ToString());
|
|
}
|
|
|
|
return value;
|
|
}
|
|
|
|
public static bool GetOrUpdateSetting(string key, bool defaultValue)
|
|
{
|
|
bool value;
|
|
|
|
if (_settings.Settings.TryGetValue(key, out var strValue))
|
|
{
|
|
value = bool.TryParse(strValue, out value) ? value : defaultValue;
|
|
}
|
|
else
|
|
{
|
|
SetSetting(key, (value = defaultValue).ToString());
|
|
}
|
|
|
|
return value;
|
|
}
|
|
|
|
public static TimeSpan GetOrUpdateSetting(string key, TimeSpan defaultValue)
|
|
{
|
|
TimeSpan value;
|
|
|
|
if (_settings.Settings.TryGetValue(key, out var strValue))
|
|
{
|
|
value = TimeSpan.TryParse(strValue, out value) ? value : defaultValue;
|
|
}
|
|
else
|
|
{
|
|
SetSetting(key, (value = defaultValue).ToString());
|
|
}
|
|
|
|
return value;
|
|
}
|
|
|
|
public static T GetOrUpdateSetting<T>(string key, T defaultValue) where T : struct, Enum
|
|
{
|
|
T value;
|
|
|
|
if (_settings.Settings.TryGetValue(key, out var strValue))
|
|
{
|
|
value = Enum.TryParse(strValue, out value) ? value : defaultValue;
|
|
}
|
|
else
|
|
{
|
|
SetSetting(key, (value = defaultValue).ToString());
|
|
}
|
|
|
|
return value;
|
|
}
|
|
|
|
public static double GetOrUpdateSetting(string key, double defaultValue)
|
|
{
|
|
double value;
|
|
|
|
if (_settings.Settings.TryGetValue(key, out var strValue))
|
|
{
|
|
value = double.TryParse(strValue, out value) ? value : defaultValue;
|
|
}
|
|
else
|
|
{
|
|
SetSetting(key, (value = defaultValue).ToString());
|
|
}
|
|
|
|
return value;
|
|
}
|
|
|
|
public static void SetSetting(string key, double value) => SetSetting(key, value.ToString());
|
|
|
|
public static void SetSetting(string key, TimeSpan value) => SetSetting(key, value.ToString());
|
|
|
|
public static void SetSetting(string key, int value) => SetSetting(key, value.ToString());
|
|
|
|
public static void SetSetting(string key, long value) => SetSetting(key, value.ToString());
|
|
|
|
public static void SetSetting(string key, bool value) => SetSetting(key, value.ToString());
|
|
|
|
public static void SetSetting<T>(string key, T value) where T : struct, Enum =>
|
|
SetSetting(key, value.ToString());
|
|
|
|
public static void SetSetting(string key, string value)
|
|
{
|
|
_settings.Settings[key] = value;
|
|
Save();
|
|
}
|
|
|
|
// Reads (or creates) the configuration file. The interactive first-boot prompts live in
|
|
// ConfigurePrompts (run later via AssemblyHandler.Invoke("ConfigurePrompts")) so all
|
|
// first-boot prompting — engine and content — shares one phase/wiring. mocked skips prompts
|
|
// entirely (ConfigurePrompts is gated on m_Mocked and isn't invoked by the test fixtures).
|
|
public static void Load(bool mocked = false)
|
|
{
|
|
m_Mocked = mocked;
|
|
|
|
if (File.Exists(m_FilePath))
|
|
{
|
|
logger.Information("Reading server configuration from {Path}...", _relPath);
|
|
_settings = JsonConfig.Deserialize<ServerSettings>(m_FilePath);
|
|
|
|
if (_settings == null)
|
|
{
|
|
logger.Error("Reading server configuration failed");
|
|
throw new FileNotFoundException($"Failed to deserialize {m_FilePath}.");
|
|
}
|
|
|
|
logger.Information("Reading server configuration {Status}", "done");
|
|
}
|
|
else
|
|
{
|
|
_settings = new ServerSettings();
|
|
}
|
|
}
|
|
|
|
// First-boot interactive configuration, discovered + run by AssemblyHandler.Invoke(
|
|
// "ConfigurePrompts") after assemblies load but before Serilog's first log line, so the
|
|
// console prompts are not interleaved with the async console sink (see
|
|
// dev-docs/server-lifecycle.md). CallPriority(0) so the engine's own prompts (data dirs,
|
|
// listeners, server name, expansion + map selection) run before any content ConfigurePrompts
|
|
// that build on them (e.g. map selection before a pathfinding pre-bake prompt). Also resolves
|
|
// Core.Expansion on every non-mocked boot.
|
|
[CallPriority(0)]
|
|
public static void ConfigurePrompts()
|
|
{
|
|
if (m_Mocked)
|
|
{
|
|
return;
|
|
}
|
|
|
|
var updated = false;
|
|
|
|
if (_settings.DataDirectories.Count == 0)
|
|
{
|
|
updated = true;
|
|
foreach (var directory in ServerConfigurationPrompts.GetDataDirectories())
|
|
{
|
|
_settings.DataDirectories.Add(directory);
|
|
}
|
|
}
|
|
|
|
UOClient.Load();
|
|
var cuoClientFiles = UOClient.CuoSettings?.UltimaOnlineDirectory;
|
|
|
|
if (cuoClientFiles != null)
|
|
{
|
|
DataDirectories.Add(cuoClientFiles);
|
|
}
|
|
|
|
if (_settings.Listeners.Count == 0)
|
|
{
|
|
updated = true;
|
|
_settings.Listeners.AddRange(ServerConfigurationPrompts.GetListeners());
|
|
}
|
|
|
|
if (!_settings.Settings.ContainsKey("serverListing.serverName"))
|
|
{
|
|
updated = true;
|
|
_settings.Settings["serverListing.serverName"] = ServerConfigurationPrompts.GetServerName();
|
|
}
|
|
|
|
// We have a known, current expansion, so we can deserialize it from Configuration
|
|
if (!ExpansionInfo.LoadConfiguration(out var currentExpansion))
|
|
{
|
|
currentExpansion = (_settings.Data.Remove("expansion", out var el)
|
|
? el.ToObject<Expansion?>(JsonConfig.DefaultOptions)
|
|
: null) ?? ExpansionConfigurationPrompts.GetExpansion();
|
|
|
|
// We've updated the selected expansion, so choose the maps we want from it, then store and save our selection
|
|
var selectedMaps = ExpansionConfigurationPrompts.GetSelectedMaps(currentExpansion);
|
|
ExpansionInfo.StoreMapSelection(selectedMaps, currentExpansion);
|
|
|
|
updated = true;
|
|
}
|
|
|
|
Core.Expansion = currentExpansion;
|
|
|
|
if (updated)
|
|
{
|
|
Save();
|
|
Console.Write("Server configuration saved to ");
|
|
Utility.PushColor(ConsoleColor.Green);
|
|
Console.WriteLine($"{_relPath}.");
|
|
Utility.PopColor();
|
|
|
|
// Either the expansion.json file has never existed, or it's been deleted, so create it now
|
|
ExpansionInfo.SaveConfiguration();
|
|
|
|
Console.Write("Expansion configuration saved to ");
|
|
Utility.PushColor(ConsoleColor.Green);
|
|
Console.WriteLine($"{ExpansionInfo.ExpansionConfigurationPath}.");
|
|
Utility.PopColor();
|
|
}
|
|
}
|
|
|
|
public static void Save()
|
|
{
|
|
if (m_Mocked)
|
|
{
|
|
return;
|
|
}
|
|
|
|
JsonConfig.Serialize(m_FilePath, _settings);
|
|
}
|
|
}
|