Dungeon Fixes
This commit is contained in:
@@ -53,6 +53,32 @@ public partial class DungeonHandler
|
||||
|
||||
return _dungeons.TryRemove(dungeonId, out _);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Force archive a dungeon (admin action). Fails if players are inside.
|
||||
/// </summary>
|
||||
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);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Get summary statistics for admin dashboard
|
||||
|
||||
-42
@@ -114,30 +114,8 @@ builder.Services.AddHttpClient(); // For CDN file hash computation
|
||||
builder.Services.AddHealthChecks()
|
||||
.AddCheck<DatabaseHealthCheck>("mysql", tags: new[] { "ready" });
|
||||
|
||||
|
||||
|
||||
//var app = builder.Build();
|
||||
|
||||
//// DEBUG: Log registered handlers
|
||||
//var router = app.Services.GetRequiredService<MessageRouter>();
|
||||
//var handlers = app.Services.GetServices<IClientMessageHandler>();
|
||||
//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<MatchManager>();
|
||||
// app.Logger.LogInformation("MatchManager resolved OK");
|
||||
//}
|
||||
//catch (Exception ex)
|
||||
//{
|
||||
// app.Logger.LogError(ex, "Failed to resolve MatchManager");
|
||||
//}
|
||||
|
||||
//try
|
||||
//{
|
||||
// var gameHandler = app.Services.GetRequiredService<GameHandler>();
|
||||
// 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<IClientMessageHandler>().ToList();
|
||||
app.Logger.LogInformation("IClientMessageHandler count: {Count}", handlers.Count);
|
||||
foreach (var h in handlers)
|
||||
|
||||
@@ -186,6 +186,13 @@
|
||||
</svg>
|
||||
View
|
||||
</a>
|
||||
<form method="post" asp-page-handler="Archive" onsubmit="return confirm('Archive this dungeon now? It will be removed from active list.')">
|
||||
@Html.AntiForgeryToken()
|
||||
<input type="hidden" name="id" value="@dungeon.Id" />
|
||||
<button type="submit" class="btn btn-sm btn-secondary" disabled="@(dungeon.PlayerCount > 0)" title="@(dungeon.PlayerCount > 0 ? "Players must leave before archiving." : "Archive dungeon")">
|
||||
Archive
|
||||
</button>
|
||||
</form>
|
||||
<form method="post" asp-page-handler="Delete" onsubmit="return confirm('Delete this dungeon? All players will be removed.')">
|
||||
@Html.AntiForgeryToken()
|
||||
<input type="hidden" name="id" value="@dungeon.Id" />
|
||||
@@ -209,6 +216,55 @@
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
|
||||
<!-- Archived Dungeons -->
|
||||
<div class="space-y-4">
|
||||
<h2 class="text-xl font-semibold text-white">
|
||||
Archived Dungeons (@Model.ArchivedDungeons.Count)
|
||||
<span class="text-sm font-normal text-gray-500">(persisted in DB)</span>
|
||||
</h2>
|
||||
|
||||
@if (Model.ArchivedDungeons.Count > 0)
|
||||
{
|
||||
<div class="card p-4 overflow-x-auto">
|
||||
<table class="w-full text-sm">
|
||||
<thead class="text-gray-400 text-xs uppercase">
|
||||
<tr>
|
||||
<th class="text-left py-2">Id</th>
|
||||
<th class="text-left py-2">Tier</th>
|
||||
<th class="text-left py-2">Bracket</th>
|
||||
<th class="text-left py-2">Creator</th>
|
||||
<th class="text-left py-2">Created</th>
|
||||
<th class="text-left py-2">Last Activity</th>
|
||||
<th class="text-left py-2">Persisted</th>
|
||||
<th class="text-left py-2">Boss</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody class="text-gray-300">
|
||||
@foreach (var dungeon in Model.ArchivedDungeons)
|
||||
{
|
||||
<tr class="border-t border-gray-800">
|
||||
<td class="py-2 font-mono">@dungeon.Id.ToString()[..8]...</td>
|
||||
<td class="py-2">T@dungeon.Tier</td>
|
||||
<td class="py-2">@dungeon.LevelBracketMin-@dungeon.LevelBracketMax</td>
|
||||
<td class="py-2">@dungeon.CreatorName</td>
|
||||
<td class="py-2">@dungeon.CreatedAt.ToString("u")</td>
|
||||
<td class="py-2">@dungeon.LastActivity.ToString("u")</td>
|
||||
<td class="py-2">@(dungeon.PersistedAt?.ToString("u") ?? "-")</td>
|
||||
<td class="py-2">@(dungeon.BossKilled ? "Yes" : "No")</td>
|
||||
</tr>
|
||||
}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="card p-6 text-center text-gray-500">
|
||||
<p>No archived dungeons found.</p>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@section Scripts {
|
||||
|
||||
@@ -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<DungeonSummary> Dungeons { get; set; } = new();
|
||||
public List<ArchivedDungeonSummary> 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<DungeonPersistence>()
|
||||
.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<IActionResult> 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; }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user