diff --git a/Game/Dungeon/DungeonHandlerAdmin.cs b/Game/Dungeon/DungeonHandlerAdmin.cs index 87f0aa7..f42df0c 100644 --- a/Game/Dungeon/DungeonHandlerAdmin.cs +++ b/Game/Dungeon/DungeonHandlerAdmin.cs @@ -53,6 +53,32 @@ public partial class DungeonHandler return _dungeons.TryRemove(dungeonId, out _); } + + /// + /// Force archive a dungeon (admin action). Fails if players are inside. + /// + public async Task<(bool ok, string? error)> ForceArchiveDungeonAsync(Guid dungeonId, CancellationToken ct = default) + { + if (!_dungeons.TryGetValue(dungeonId, out var dungeon)) + return (false, "Dungeon not found."); + + if (dungeon.Simulation.Players.Count > 0) + return (false, "Dungeon has active players."); + + if (dungeon.IsPersisted) + return (false, "Dungeon already archived."); + + if (dungeon.BossKilled) + return (false, "Boss was killed; dungeon is marked for cleanup, not archive."); + + await PersistDungeonAsync(dungeon, ct); + + if (!dungeon.IsPersisted) + return (false, "Failed to archive dungeon. Check server logs for details."); + + _dungeons.TryRemove(dungeonId, out _); + return (true, null); + } /// /// Get summary statistics for admin dashboard diff --git a/Program.cs b/Program.cs index 00b50af..678e1e8 100644 --- a/Program.cs +++ b/Program.cs @@ -114,30 +114,8 @@ builder.Services.AddHttpClient(); // For CDN file hash computation builder.Services.AddHealthChecks() .AddCheck("mysql", tags: new[] { "ready" }); - - -//var app = builder.Build(); - -//// DEBUG: Log registered handlers -//var router = app.Services.GetRequiredService(); -//var handlers = app.Services.GetServices(); -//foreach (var h in handlers) -//{ -// app.Logger.LogInformation("Registered handler: {Type} with opcodes: {OpCodes}", -// h.GetType().Name, -// string.Join(", ", h.SupportedOpCodes)); -//} var app = builder.Build(); -app.Use(async (ctx, next) => -{ - var raw = ctx.Request.Headers.Cookie.ToString(); - if (!string.IsNullOrEmpty(raw)) - app.Logger.LogInformation("RAW Cookie: {Raw}", raw); - - await next(); -}); - var fwdOpts = new ForwardedHeadersOptions { ForwardedHeaders = @@ -190,26 +168,6 @@ catch (Exception ex) app.Logger.LogError(ex, "Failed to resolve IMessageSerializer"); } -//try -//{ -// var matchMgr = app.Services.GetRequiredService(); -// app.Logger.LogInformation("MatchManager resolved OK"); -//} -//catch (Exception ex) -//{ -// app.Logger.LogError(ex, "Failed to resolve MatchManager"); -//} - -//try -//{ -// var gameHandler = app.Services.GetRequiredService(); -// app.Logger.LogInformation("GameHandler resolved OK, opcodes: {Ops}", string.Join(",", gameHandler.SupportedOpCodes)); -//} -//catch (Exception ex) -//{ -// app.Logger.LogError(ex, "Failed to resolve GameHandler"); -//} - var handlers = app.Services.GetServices().ToList(); app.Logger.LogInformation("IClientMessageHandler count: {Count}", handlers.Count); foreach (var h in handlers) diff --git a/Services/Admin/Pages/Dungeons/Index.cshtml b/Services/Admin/Pages/Dungeons/Index.cshtml index b7ca729..3376a4b 100644 --- a/Services/Admin/Pages/Dungeons/Index.cshtml +++ b/Services/Admin/Pages/Dungeons/Index.cshtml @@ -186,6 +186,13 @@ View +
+ @Html.AntiForgeryToken() + + +
@Html.AntiForgeryToken() @@ -209,6 +216,55 @@ } + + +
+

+ Archived Dungeons (@Model.ArchivedDungeons.Count) + (persisted in DB) +

+ + @if (Model.ArchivedDungeons.Count > 0) + { +
+ + + + + + + + + + + + + + + @foreach (var dungeon in Model.ArchivedDungeons) + { + + + + + + + + + + + } + +
IdTierBracketCreatorCreatedLast ActivityPersistedBoss
@dungeon.Id.ToString()[..8]...T@dungeon.Tier@dungeon.LevelBracketMin-@dungeon.LevelBracketMax@dungeon.CreatorName@dungeon.CreatedAt.ToString("u")@dungeon.LastActivity.ToString("u")@(dungeon.PersistedAt?.ToString("u") ?? "-")@(dungeon.BossKilled ? "Yes" : "No")
+
+ } + else + { +
+

No archived dungeons found.

+
+ } +
@section Scripts { diff --git a/Services/Admin/Pages/Dungeons/Index.cshtml.cs b/Services/Admin/Pages/Dungeons/Index.cshtml.cs index 3e86142..1a23da9 100644 --- a/Services/Admin/Pages/Dungeons/Index.cshtml.cs +++ b/Services/Admin/Pages/Dungeons/Index.cshtml.cs @@ -1,4 +1,7 @@ using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using DataServer.Data; +using DataServer.Data.Entities; using GameServer.Dungeon; namespace GameServices.Admin.Pages.Dungeons; @@ -6,13 +9,16 @@ namespace GameServices.Admin.Pages.Dungeons; public class IndexModel : AdminPageModel { private readonly DungeonHandler _dungeonHandler; + private readonly GameDbContext _db; - public IndexModel(DungeonHandler dungeonHandler) + public IndexModel(DungeonHandler dungeonHandler, GameDbContext db) { _dungeonHandler = dungeonHandler; + _db = db; } public List Dungeons { get; set; } = new(); + public List ArchivedDungeons { get; set; } = new(); // Stats public int ActiveCount { get; set; } @@ -25,7 +31,7 @@ public class IndexModel : AdminPageModel public int? TierFilter { get; set; } public int? BracketFilter { get; set; } - public void OnGet(string? status, int? tier, int? bracket) + public async Task OnGetAsync(string? status, int? tier, int? bracket) { StatusFilter = status; TierFilter = tier; @@ -95,6 +101,24 @@ public class IndexModel : AdminPageModel var avgMinutes = completedDungeons.Average(d => (DateTime.UtcNow - d.CreatedAt).TotalMinutes); AverageDuration = avgMinutes.ToString("F1"); } + + ArchivedDungeons = await _db.Set() + .Where(d => !d.IsCleared) + .OrderByDescending(d => d.PersistedAt ?? d.CreatedAt) + .Select(d => new ArchivedDungeonSummary + { + Id = d.Id, + Tier = d.Tier, + Seed = d.Seed, + LevelBracketMin = d.LevelBracketMin, + LevelBracketMax = d.LevelBracketMax, + CreatorName = d.CreatorName, + CreatedAt = d.CreatedAt, + LastActivity = d.LastActivity, + PersistedAt = d.PersistedAt, + BossKilled = d.BossKilled + }) + .ToListAsync(); } public IActionResult OnPostDelete(Guid id) @@ -111,6 +135,21 @@ public class IndexModel : AdminPageModel return RedirectToPage(); } + + public async Task OnPostArchiveAsync(Guid id) + { + var (ok, error) = await _dungeonHandler.ForceArchiveDungeonAsync(id); + if (ok) + { + TempData["Message"] = "Dungeon archived successfully."; + } + else + { + TempData["Error"] = error ?? "Failed to archive dungeon."; + } + + return RedirectToPage(); + } private static string FormatDuration(TimeSpan duration) { @@ -139,3 +178,17 @@ public class DungeonSummary public bool BossKilled { get; set; } public string Duration { get; set; } = ""; } + +public class ArchivedDungeonSummary +{ + public Guid Id { get; set; } + public int Tier { get; set; } + public int Seed { get; set; } + public int LevelBracketMin { get; set; } + public int LevelBracketMax { get; set; } + public string CreatorName { get; set; } = ""; + public DateTime CreatedAt { get; set; } + public DateTime LastActivity { get; set; } + public DateTime? PersistedAt { get; set; } + public bool BossKilled { get; set; } +}