diff --git a/Dockerfile b/Dockerfile index 8c50073..33ff0b7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -53,12 +53,14 @@ WORKDIR /src # DorkNet.Models project ref, so its csproj needs to be present too. COPY DorkNet.Server/DorkNet.Server.csproj DorkNet.Server/ COPY DorkNet.Models/DorkNet.Models.csproj DorkNet.Models/ +COPY DorkNet.Contracts/DorkNet.Contracts.csproj DorkNet.Contracts/ RUN dotnet restore DorkNet.Server/DorkNet.Server.csproj # Now copy the rest of the .NET source, then drop the prebuilt admin # SPA into wwwroot/admin so the publish step ships it as static content. COPY DorkNet.Server/ DorkNet.Server/ COPY DorkNet.Models/ DorkNet.Models/ +COPY DorkNet.Contracts/ DorkNet.Contracts/ COPY --from=admin-ui /wwwroot/admin/ DorkNet.Server/wwwroot/admin/ COPY --from=site /wwwroot/site/ DorkNet.Server/wwwroot/site/ diff --git a/DorkNet.ClientMod/Mod.cs b/DorkNet.ClientMod/Mod.cs index 94dccbc..93c1ac5 100644 --- a/DorkNet.ClientMod/Mod.cs +++ b/DorkNet.ClientMod/Mod.cs @@ -610,17 +610,7 @@ public class Mod : MelonMod { try { - // Compute the UserData path ourselves rather than calling - // MelonLoader.MelonUtils.UserDataDirectory (which is renamed - // to MelonEnvironment.UserDataDirectory in newer 0.6.x builds - // and shifts again in 0.7.x). Anchoring off the mod DLL's - // location keeps this stable across versions: the DLL lives - // in /Mods/, so two dirname()'s reach the game root, - // then MelonLoader/UserData/ is right next to it. - var modDll = Assembly.GetExecutingAssembly().Location; - var modsDir = Path.GetDirectoryName(modDll) ?? string.Empty; - var gameDir = Path.GetDirectoryName(modsDir) ?? string.Empty; - var userData = Path.Combine(gameDir, "MelonLoader", "UserData"); + var userData = ResolveUserDataDirectory(); Directory.CreateDirectory(userData); DiagnosticsLogPath = Path.Combine(userData, "dorknet-diagnostics.log"); var path = Path.Combine(userData, "dorknet-clientmod.json"); @@ -631,21 +621,21 @@ public class Mod : MelonMod } var doc = JsonDocument.Parse(File.ReadAllText(path)); var r = doc.RootElement; - if (r.TryGetProperty("ServerHost", out var v)) Cfg.ServerHost = v.GetString() ?? Cfg.ServerHost; - if (r.TryGetProperty("PhotonAppId", out v)) Cfg.PhotonAppId = v.GetString() ?? Cfg.PhotonAppId; - if (r.TryGetProperty("PhotonVoiceAppId", out v)) Cfg.PhotonVoiceAppId = v.GetString() ?? Cfg.PhotonVoiceAppId; - if (r.TryGetProperty("PhotonCloudRegion", out v)) Cfg.PhotonCloudRegion = v.GetString() ?? Cfg.PhotonCloudRegion; - if (r.TryGetProperty("EnableTlsTrustBypass", out v)) Cfg.EnableTlsTrustBypass = v.GetBoolean(); - if (r.TryGetProperty("TraceRegistrationDialog", out v)) Cfg.TraceRegistrationDialog = v.GetBoolean(); - if (r.TryGetProperty("EnableDebugConsole", out v)) Cfg.EnableDebugConsole = v.GetBoolean(); - if (r.TryGetProperty("DebugConsoleToggleKey", out v)) Cfg.DebugConsoleToggleKey = v.GetString() ?? Cfg.DebugConsoleToggleKey; - if (r.TryGetProperty("DesktopScreenShareFps", out v)) Cfg.DesktopScreenShareFps = (float)v.GetDouble(); - if (r.TryGetProperty("DesktopScreenShareRaisePhotonRate", out v)) Cfg.DesktopScreenShareRaisePhotonRate = v.GetBoolean(); - if (r.TryGetProperty("DesktopScreenShareResolution", out v)) Cfg.DesktopScreenShareResolution = v.GetInt32(); - if (r.TryGetProperty("DesktopScreenShareQuality", out v)) Cfg.DesktopScreenShareQuality = v.GetInt32(); - if (r.TryGetProperty("DiagnoseDevMenu", out v)) Cfg.DiagnoseDevMenu = v.GetBoolean(); - if (r.TryGetProperty("QuestMaxTeamSize", out v)) Cfg.QuestMaxTeamSize = v.GetInt32(); - if (r.TryGetProperty("QuestMaxTeamSizeRooms", out v) && v.ValueKind == JsonValueKind.Array) + if (TryGetConfigValue(r, "ServerHost", out var v)) Cfg.ServerHost = v.GetString() ?? Cfg.ServerHost; + if (TryGetConfigValue(r, "PhotonAppId", out v)) Cfg.PhotonAppId = v.GetString() ?? Cfg.PhotonAppId; + if (TryGetConfigValue(r, "PhotonVoiceAppId", out v)) Cfg.PhotonVoiceAppId = v.GetString() ?? Cfg.PhotonVoiceAppId; + if (TryGetConfigValue(r, "PhotonCloudRegion", out v)) Cfg.PhotonCloudRegion = v.GetString() ?? Cfg.PhotonCloudRegion; + if (TryGetConfigValue(r, "EnableTlsTrustBypass", out v)) Cfg.EnableTlsTrustBypass = v.GetBoolean(); + if (TryGetConfigValue(r, "TraceRegistrationDialog", out v)) Cfg.TraceRegistrationDialog = v.GetBoolean(); + if (TryGetConfigValue(r, "EnableDebugConsole", out v)) Cfg.EnableDebugConsole = v.GetBoolean(); + if (TryGetConfigValue(r, "DebugConsoleToggleKey", out v)) Cfg.DebugConsoleToggleKey = v.GetString() ?? Cfg.DebugConsoleToggleKey; + if (TryGetConfigValue(r, "DesktopScreenShareFps", out v)) Cfg.DesktopScreenShareFps = (float)v.GetDouble(); + if (TryGetConfigValue(r, "DesktopScreenShareRaisePhotonRate", out v)) Cfg.DesktopScreenShareRaisePhotonRate = v.GetBoolean(); + if (TryGetConfigValue(r, "DesktopScreenShareResolution", out v)) Cfg.DesktopScreenShareResolution = v.GetInt32(); + if (TryGetConfigValue(r, "DesktopScreenShareQuality", out v)) Cfg.DesktopScreenShareQuality = v.GetInt32(); + if (TryGetConfigValue(r, "DiagnoseDevMenu", out v)) Cfg.DiagnoseDevMenu = v.GetBoolean(); + if (TryGetConfigValue(r, "QuestMaxTeamSize", out v)) Cfg.QuestMaxTeamSize = v.GetInt32(); + if (TryGetConfigValue(r, "QuestMaxTeamSizeRooms", out v) && v.ValueKind == JsonValueKind.Array) { var rooms = new List(); foreach (var e in v.EnumerateArray()) @@ -653,8 +643,8 @@ public class Mod : MelonMod rooms.Add(e.GetString()!); Cfg.QuestMaxTeamSizeRooms = rooms.ToArray(); // explicit (incl. empty = none) } - if (r.TryGetProperty("EnableDevWatchButton", out v)) Cfg.EnableDevWatchButton = v.GetBoolean(); - if (r.TryGetProperty("DevCommands", out v) && v.ValueKind == JsonValueKind.Array) + if (TryGetConfigValue(r, "EnableDevWatchButton", out v)) Cfg.EnableDevWatchButton = v.GetBoolean(); + if (TryGetConfigValue(r, "DevCommands", out v) && v.ValueKind == JsonValueKind.Array) { var list = new List(); foreach (var e in v.EnumerateArray()) @@ -666,7 +656,7 @@ public class Mod : MelonMod } // "InjectAuthValues" key in the template is now ignored — // see attic/AuthValuesInjector.cs.attic. - Log.Msg($"[config] loaded: ServerHost={Cfg.ServerHost}, PhotonAppId={(string.IsNullOrEmpty(Cfg.PhotonAppId) ? "" : "")}, " + + Log.Msg($"[config] loaded from {path}: ServerHost={Cfg.ServerHost}, PhotonAppId={(string.IsNullOrEmpty(Cfg.PhotonAppId) ? "" : "")}, " + $"EnableTlsTrustBypass={Cfg.EnableTlsTrustBypass}"); } catch (Exception ex) @@ -675,6 +665,44 @@ public class Mod : MelonMod } } + private static string ResolveUserDataDirectory() + { + foreach (var typeName in new[] + { + "MelonLoader.MelonEnvironment, MelonLoader", + "MelonLoader.MelonUtils, MelonLoader", + }) + { + var type = Type.GetType(typeName); + var prop = type?.GetProperty("UserDataDirectory", BindingFlags.Public | BindingFlags.Static); + if (prop?.GetValue(null) is string value && !string.IsNullOrWhiteSpace(value)) + return value; + } + + var modDll = Assembly.GetExecutingAssembly().Location; + var modsDir = Path.GetDirectoryName(modDll) ?? string.Empty; + var gameDir = Path.GetDirectoryName(modsDir) ?? AppContext.BaseDirectory; + return Path.Combine(gameDir, "MelonLoader", "UserData"); + } + + private static bool TryGetConfigValue(JsonElement root, string name, out JsonElement value) + { + if (root.ValueKind == JsonValueKind.Object) + { + foreach (var prop in root.EnumerateObject()) + { + if (string.Equals(prop.Name, name, StringComparison.OrdinalIgnoreCase)) + { + value = prop.Value; + return true; + } + } + } + + value = default; + return false; + } + // ── Patch dispatch helpers ──────────────────────────────────────── private bool TryPatch(string label, Type target, string methodName, Type[]? args, string? prefix = null, string? postfix = null, diff --git a/DorkNet.Contracts/DorkNetRouteOwnership.cs b/DorkNet.Contracts/DorkNetRouteOwnership.cs index b23474b..9242884 100644 --- a/DorkNet.Contracts/DorkNetRouteOwnership.cs +++ b/DorkNet.Contracts/DorkNetRouteOwnership.cs @@ -164,6 +164,15 @@ public static class DorkNetRouteOwnership public static IReadOnlyList RouteGroups => ServiceRouteGroups; + public static IReadOnlyList PublicSubdomains => + ServiceRouteGroups + .SelectMany(group => group.HostSubdomains) + .Append(AdminHost) + .Append("feed") + .Distinct(StringComparer.OrdinalIgnoreCase) + .Order(StringComparer.OrdinalIgnoreCase) + .ToArray(); + public static bool IsInfrastructurePath(string path) { return path.Equals("/healthz", StringComparison.OrdinalIgnoreCase) diff --git a/DorkNet.Gateway/Program.cs b/DorkNet.Gateway/Program.cs index d4b24f1..8344956 100644 --- a/DorkNet.Gateway/Program.cs +++ b/DorkNet.Gateway/Program.cs @@ -26,6 +26,20 @@ var app = builder.Build(); app.MapDorkNetServiceDefaults(); +var publicHosts = BuildPublicHosts(apexDomain); +app.Use(async (ctx, next) => +{ + if (DorkNetRouteOwnership.IsInfrastructurePath(ctx.Request.Path.Value ?? "/") + || IsAllowedPublicHost(ctx.Request.Host.Host, publicHosts)) + { + await next(); + return; + } + + ctx.Response.StatusCode = StatusCodes.Status404NotFound; + await ctx.Response.WriteAsync("Unknown DorkNet host."); +}); + app.MapGet("/internal/services", (IOptions options) => Results.Ok(options.Value.Endpoints())); app.MapGet("/internal/routes", () => @@ -190,6 +204,33 @@ static string[] WebBrowserHosts(string apexDomain) return [apexDomain, SubdomainHost("www", apexDomain)]; } +static HashSet BuildPublicHosts(string apexDomain) +{ + var hosts = new HashSet(StringComparer.OrdinalIgnoreCase) + { + apexDomain, + "localhost", + "127.0.0.1", + }; + + foreach (var subdomain in DorkNetRouteOwnership.PublicSubdomains) + { + hosts.Add(SubdomainHost(subdomain, apexDomain)); + } + + return hosts; +} + +static bool IsAllowedPublicHost(string? host, HashSet publicHosts) +{ + if (string.IsNullOrWhiteSpace(host)) + { + return true; + } + + return publicHosts.Contains(host.Split(':', 2)[0].Trim()); +} + static void AddHostRoute( List routes, ref int order, diff --git a/DorkNet.Server/Controllers/API/Config/V1/ServiceUrlsController.cs b/DorkNet.Server/Controllers/API/Config/V1/ServiceUrlsController.cs index fe6b770..b43f0b6 100644 --- a/DorkNet.Server/Controllers/API/Config/V1/ServiceUrlsController.cs +++ b/DorkNet.Server/Controllers/API/Config/V1/ServiceUrlsController.cs @@ -15,5 +15,5 @@ public class ServiceUrlsController(DomainConfig domain) : ControllerBase { [HttpGet("services")] public ActionResult> Get() - => Ok(ConfigService.BuildServiceUrlMap(domain.Apex)); + => Ok(ConfigService.BuildServiceUrlMap(domain)); } diff --git a/DorkNet.Server/Controllers/API/Notification/V2/NotificationController.cs b/DorkNet.Server/Controllers/API/Notification/V2/NotificationController.cs index c605673..61f8b57 100644 --- a/DorkNet.Server/Controllers/API/Notification/V2/NotificationController.cs +++ b/DorkNet.Server/Controllers/API/Notification/V2/NotificationController.cs @@ -16,7 +16,7 @@ public class NotificationController(DomainConfig domain) : ControllerBase public IActionResult Connect() => StatusCode(StatusCodes.Status410Gone, new { error = "use_signalr_hub", - hint = $"connect to {domain.Sub("notify")}/hub/v1 instead", + hint = $"connect to {domain.Url("notify", "/hub/v1")} instead", }); /// GET api/notification/hub/v1 — returns the @@ -27,7 +27,7 @@ public class NotificationController(DomainConfig domain) : ControllerBase [HttpGet("/api/notification/hub/v1")] public IActionResult HubInfo() => Ok(new { - Url = $"https://{domain.Sub("notify")}/hub/v1", + Url = domain.Url("notify", "/hub/v1"), Protocol = "signalr", Version = 1, }); diff --git a/DorkNet.Server/Controllers/Ns/NsController.cs b/DorkNet.Server/Controllers/Ns/NsController.cs index 2712a54..32c250e 100644 --- a/DorkNet.Server/Controllers/Ns/NsController.cs +++ b/DorkNet.Server/Controllers/Ns/NsController.cs @@ -37,13 +37,13 @@ public class NsController : ControllerBase // code: locker)" in BootSequence. [HttpGet("/", Order = -1000)] public ActionResult> Root() => - Ok(ConfigService.BuildServiceUrlMap(_domain.Apex)); + Ok(ConfigService.BuildServiceUrlMap(_domain)); // Some builds fetch /v1 or /v1/services directly [HttpGet("/v1")] [HttpGet("/v1/services")] public ActionResult> Services() => - Ok(ConfigService.BuildServiceUrlMap(_domain.Apex)); + Ok(ConfigService.BuildServiceUrlMap(_domain)); // Ping / health used by the client keep-alive loop [HttpGet("/v1/ping")] diff --git a/DorkNet.Server/Data/LegacyUpgrades.cs b/DorkNet.Server/Data/LegacyUpgrades.cs index 55f0c17..be11fb0 100644 --- a/DorkNet.Server/Data/LegacyUpgrades.cs +++ b/DorkNet.Server/Data/LegacyUpgrades.cs @@ -180,8 +180,13 @@ public static class LegacyUpgrades // either no-op (Crescendo now exists) or the only writer. for (var attempt = 1; attempt <= 2; attempt++) { - var crescendoExists = await db.Rooms.AnyAsync(r => r.Name == "Crescendo", ct); - var bloodMoon = await db.Rooms.FirstOrDefaultAsync(r => r.Name == "BloodMoon", ct); + var renameCandidates = await db.Rooms + .Where(r => r.Name.ToLower() == "bloodmoon" || r.Name.ToLower() == "crescendo") + .ToListAsync(ct); + var crescendoExists = renameCandidates.Any(r => + string.Equals(r.Name, "Crescendo", StringComparison.OrdinalIgnoreCase)); + var bloodMoon = renameCandidates.FirstOrDefault(r => + string.Equals(r.Name, "BloodMoon", StringComparison.OrdinalIgnoreCase)); if (bloodMoon is null && crescendoExists) { @@ -217,15 +222,15 @@ public static class LegacyUpgrades { // Both exist — the rename ran on a different row at // some point, and the original BloodMoon row is now - // a stale duplicate. Park it under CrescendoLegacy - // and hide from browse so /goto/name/... still + // a stale duplicate. Park it under a unique legacy + // name and hide from browse so /goto/name/... still // resolves Crescendo to the right row. - bloodMoon.Name = "CrescendoLegacy"; + bloodMoon.Name = await PickUniqueRoomNameAsync(db, "CrescendoLegacy", bloodMoon.Id, ct); bloodMoon.HiddenFromBrowse = true; await db.SaveChangesAsync(ct); logger.LogInformation( - "[legacy-upgrade] RenameBloodMoonToCrescendo: applied — Rooms.Id={Id} parked as CrescendoLegacy (Crescendo already existed on a different row)", - bloodMoon.Id); + "[legacy-upgrade] RenameBloodMoonToCrescendo: applied — Rooms.Id={Id} parked as {Name} (Crescendo already existed on a different row)", + bloodMoon.Id, bloodMoon.Name); return; } } @@ -241,4 +246,22 @@ public static class LegacyUpgrades } } } + + private static async Task PickUniqueRoomNameAsync( + DorkNetDbContext db, string preferred, long currentRoomId, CancellationToken ct) + { + var taken = await db.Rooms + .Where(r => r.Id != currentRoomId && r.Name.ToLower().StartsWith(preferred.ToLower())) + .Select(r => r.Name) + .ToListAsync(ct); + + if (!taken.Any(n => string.Equals(n, preferred, StringComparison.OrdinalIgnoreCase))) + return preferred; + + var suffix = 2; + while (taken.Any(n => string.Equals(n, $"{preferred}{suffix}", StringComparison.OrdinalIgnoreCase))) + suffix++; + + return $"{preferred}{suffix}"; + } } diff --git a/DorkNet.Server/DorkNet.Server.csproj b/DorkNet.Server/DorkNet.Server.csproj index f1b8c07..f37f54a 100644 --- a/DorkNet.Server/DorkNet.Server.csproj +++ b/DorkNet.Server/DorkNet.Server.csproj @@ -73,6 +73,7 @@ +