CDN fix, Account maangement fix

This commit is contained in:
dingo
2025-12-25 22:16:08 -05:00
parent 958fc01056
commit 439920230a
6 changed files with 526 additions and 164 deletions
+1
View File
@@ -84,6 +84,7 @@ builder.Services.AddSingleton<MessageRouter>();
builder.Services.AddSingleton<IItemService, CachedItemService>();
builder.Services.AddSingleton<IAdminAuthService, AdminAuthService>();
builder.Services.AddSingleton<ICdnBrowserService, MinioCdnBrowserService>();
builder.Services.AddHttpClient(); // For CDN file hash computation
// Health checks
builder.Services.AddHealthChecks()
+254 -89
View File
@@ -12,6 +12,15 @@
<h1 class="text-3xl font-bold text-white">CDN Assets</h1>
<p class="text-gray-400 mt-1">Browse MinIO bucket and manage tracked assets</p>
</div>
<form method="post" asp-page-handler="RefreshCache">
@Html.AntiForgeryToken()
<button type="submit" class="btn btn-secondary flex items-center gap-2">
<svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15"/>
</svg>
Refresh Asset Cache
</button>
</form>
</div>
<!-- Tabs -->
@@ -22,8 +31,19 @@
<a href="/admin/assets?tab=tracked" class="px-4 py-2 @(Model.Tab == "tracked" ? "text-white border-b-2 border-indigo-500" : "text-gray-400 hover:text-white")">
Tracked Assets (@Model.TrackedCount)
</a>
@if (Model.Tab == "edit")
{
<span class="px-4 py-2 text-white border-b-2 border-indigo-500">Edit Asset</span>
}
</div>
@if (!string.IsNullOrEmpty(Model.Message))
{
<div class="p-4 rounded-lg @(Model.IsError ? "bg-red-900/50 border border-red-700 text-red-300" : "bg-green-900/50 border border-green-700 text-green-300")">
@Model.Message
</div>
}
@if (Model.Tab == "browse")
{
@if (!Model.CdnConfigured)
@@ -37,16 +57,14 @@
<pre class="bg-gray-900 p-4 rounded text-left text-sm text-gray-300 max-w-md mx-auto">MINIO_ENDPOINT=assets.aeternalisgames.com
MINIO_ACCESS_KEY=your-access-key
MINIO_SECRET_KEY=your-secret-key
MINIO_BUCKET=downloads
MINIO_USE_SSL=true</pre>
<p class="text-gray-500 text-sm mt-4">Or configure in appsettings.json under "MinIO" section.</p>
MINIO_BUCKET=downloads</pre>
</div>
}
else
{
<!-- Folder Navigation -->
<!-- Folder Navigation + Search -->
<div class="card p-4">
<div class="flex items-center gap-4 mb-4">
<div class="flex flex-wrap items-center gap-4 mb-4">
<label class="label mb-0">Folder:</label>
<div class="flex flex-wrap gap-2">
@foreach (var folder in Model.AvailableFolders)
@@ -59,8 +77,22 @@ MINIO_USE_SSL=true</pre>
</div>
</div>
<!-- Search/Filter -->
<form method="get" class="flex gap-4">
<input type="hidden" name="tab" value="browse" />
<input type="hidden" name="prefix" value="@Model.Prefix" />
<div class="flex-1">
<input type="text" name="filter" value="@Model.Filter" class="input" placeholder="Filter by filename (e.g., ico, sword, skeleton)..." />
</div>
<button type="submit" class="btn btn-secondary">Filter</button>
@if (!string.IsNullOrEmpty(Model.Filter))
{
<a href="/admin/assets?tab=browse&prefix=@Uri.EscapeDataString(Model.Prefix ?? "")" class="btn btn-secondary">Clear</a>
}
</form>
<!-- Breadcrumb -->
<div class="flex items-center gap-1 text-sm">
<div class="flex items-center gap-1 text-sm mt-3">
<a href="/admin/assets?tab=browse&prefix=" class="text-indigo-400 hover:underline">root</a>
@{
var parts = Model.Prefix?.Split('/', StringSplitOptions.RemoveEmptyEntries) ?? Array.Empty<string>();
@@ -101,13 +133,19 @@ MINIO_USE_SSL=true</pre>
<div class="card">
<div class="p-4 border-b border-gray-700 flex items-center justify-between">
<div>
<h2 class="text-lg font-semibold text-white">Files in @(string.IsNullOrEmpty(Model.Prefix) ? "root" : Model.Prefix)</h2>
<p class="text-sm text-gray-500">@Model.Files.Count files. Click to copy path, + to register.</p>
<h2 class="text-lg font-semibold text-white">
Files in @(string.IsNullOrEmpty(Model.Prefix) ? "root" : Model.Prefix)
@if (!string.IsNullOrEmpty(Model.Filter))
{
<span class="text-gray-400 font-normal">filtered by "@Model.Filter"</span>
}
</h2>
<p class="text-sm text-gray-500">@Model.FilteredFileCount files total. Click to copy path, + to register.</p>
</div>
</div>
<div class="p-4">
<div class="grid grid-cols-4 md:grid-cols-6 lg:grid-cols-8 xl:grid-cols-10 gap-3">
@foreach (var file in Model.Files.Where(f => !f.IsDirectory))
@foreach (var file in Model.Files)
{
var isTracked = Model.TrackedPaths.Contains(file.Key);
var isImage = file.Name.EndsWith(".png") || file.Name.EndsWith(".jpg") || file.Name.EndsWith(".webp");
@@ -156,6 +194,8 @@ MINIO_USE_SSL=true</pre>
<input type="hidden" name="assetType" value="@(isImage ? "Texture" : "Data")" />
<input type="hidden" name="fileSize" value="@file.Size" />
<input type="hidden" name="returnPrefix" value="@Model.Prefix" />
<input type="hidden" name="returnFilter" value="@Model.Filter" />
<input type="hidden" name="returnPage" value="@Model.BrowsePage" />
<button type="submit" class="p-1.5 bg-green-700 rounded hover:bg-green-600" title="Register">
<svg class="w-4 h-4 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 4v16m8-8H4"/>
@@ -163,33 +203,48 @@ MINIO_USE_SSL=true</pre>
</button>
</form>
}
else
{
<a href="/admin/assets?tab=edit&path=@Uri.EscapeDataString(file.Key)" class="p-1.5 bg-indigo-700 rounded hover:bg-indigo-600" title="Edit">
<svg class="w-4 h-4 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z"/>
</svg>
</a>
}
</div>
</div>
}
</div>
</div>
</div>
<!-- Browse Pagination -->
@if (Model.BrowseTotalPages > 1)
{
<div class="p-4 border-t border-gray-700 flex items-center justify-between">
<p class="text-sm text-gray-400">
Showing @((Model.BrowsePage - 1) * Model.BrowsePageSize + 1)-@Math.Min(Model.BrowsePage * Model.BrowsePageSize, Model.AllFiles.Count) of @Model.AllFiles.Count files
</p>
<div class="flex items-center gap-2">
@if (Model.BrowsePage > 1)
{
<a href="@Model.GetBrowsePageUrl(Model.BrowsePage - 1)" class="btn btn-secondary">← Prev</a>
}
<span class="text-gray-400 px-2">@Model.BrowsePage / @Model.BrowseTotalPages</span>
@if (Model.BrowsePage < Model.BrowseTotalPages)
{
<a href="@Model.GetBrowsePageUrl(Model.BrowsePage + 1)" class="btn btn-secondary">Next →</a>
}
<!-- Browse Pagination -->
@if (Model.BrowseTotalPages > 1)
{
<div class="p-4 border-t border-gray-700 flex items-center justify-between">
<p class="text-sm text-gray-400">
Page @Model.BrowsePage of @Model.BrowseTotalPages (@Model.FilteredFileCount files)
</p>
<div class="flex items-center gap-2">
@if (Model.BrowsePage > 1)
{
<a href="@Model.GetBrowsePageUrl(1)" class="btn btn-secondary text-xs">First</a>
<a href="@Model.GetBrowsePageUrl(Model.BrowsePage - 1)" class="btn btn-secondary">← Prev</a>
}
<select onchange="window.location.href=this.value" class="input w-24 text-sm">
@for (int i = 1; i <= Math.Min(Model.BrowseTotalPages, 100); i++)
{
<option value="@Model.GetBrowsePageUrl(i)" selected="@(Model.BrowsePage == i)">Page @i</option>
}
</select>
@if (Model.BrowsePage < Model.BrowseTotalPages)
{
<a href="@Model.GetBrowsePageUrl(Model.BrowsePage + 1)" class="btn btn-secondary">Next →</a>
<a href="@Model.GetBrowsePageUrl(Model.BrowseTotalPages)" class="btn btn-secondary text-xs">Last</a>
}
</div>
</div>
</div>
}
}
</div>
}
else if (!Model.Subfolders.Any())
{
@@ -197,11 +252,108 @@ MINIO_USE_SSL=true</pre>
<svg class="w-16 h-16 mx-auto text-gray-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 7v10a2 2 0 002 2h14a2 2 0 002-2V9a2 2 0 00-2-2h-6l-2-2H5a2 2 0 00-2 2z"/>
</svg>
<p class="text-gray-400 mt-4">This folder is empty.</p>
<p class="text-gray-400 mt-4">
@if (!string.IsNullOrEmpty(Model.Filter))
{
<text>No files matching "@Model.Filter"</text>
}
else
{
<text>This folder is empty.</text>
}
</p>
</div>
}
}
}
else if (Model.Tab == "edit" && Model.EditingAsset != null)
{
<!-- Edit Asset -->
<div class="card p-6 max-w-2xl">
<h2 class="text-lg font-semibold text-white mb-4">Edit Asset</h2>
<form method="post" asp-page-handler="UpdateAsset" class="space-y-4">
@Html.AntiForgeryToken()
<input type="hidden" name="assetId" value="@Model.EditingAsset.Id" />
<div>
<label class="label">File Path (read-only)</label>
<input type="text" value="@Model.EditingAsset.FilePath" class="input bg-gray-800" readonly />
</div>
<div>
<label class="label">CDN Path (read-only)</label>
<input type="text" value="@Model.EditingAsset.DownloadPath" class="input bg-gray-800" readonly />
</div>
<div class="grid grid-cols-2 gap-4">
<div>
<label class="label">Asset Type</label>
<select name="assetType" class="input">
@foreach (var t in Enum.GetValues<ClientAssetType>())
{
<option value="@t" selected="@(Model.EditingAsset.AssetType == t)">@t</option>
}
</select>
</div>
<div>
<label class="label">Version</label>
<input type="number" name="version" value="@Model.EditingAsset.Version" class="input" min="1" />
</div>
</div>
<div class="grid grid-cols-2 gap-4">
<div>
<label class="label">File Hash (MD5)</label>
<input type="text" name="fileHash" value="@Model.EditingAsset.FileHash" class="input font-mono text-sm" maxlength="32" />
</div>
<div>
<label class="label">File Size (bytes)</label>
<input type="number" name="fileSize" value="@Model.EditingAsset.FileSize" class="input" min="0" />
</div>
</div>
<div>
<label class="label">Min Client Version</label>
<input type="text" name="minClientVersion" value="@Model.EditingAsset.MinClientVersion" class="input" placeholder="e.g., 1.0.0" maxlength="16" />
</div>
<div class="flex items-center gap-6">
<label class="flex items-center gap-2 cursor-pointer">
<input type="checkbox" name="isRequired" value="true" checked="@Model.EditingAsset.IsRequired" class="w-4 h-4 rounded border-gray-600 bg-gray-800 text-indigo-600" />
<span class="text-gray-300">Required (must download before game starts)</span>
</label>
<label class="flex items-center gap-2 cursor-pointer">
<input type="checkbox" name="isEnabled" value="true" checked="@Model.EditingAsset.IsEnabled" class="w-4 h-4 rounded border-gray-600 bg-gray-800 text-indigo-600" />
<span class="text-gray-300">Enabled</span>
</label>
</div>
<div class="flex items-center gap-4 pt-4">
<button type="submit" class="btn btn-primary">Save Changes</button>
<a href="/admin/assets?tab=tracked" class="btn btn-secondary">Cancel</a>
<div class="flex-1"></div>
<form method="post" asp-page-handler="DeleteAsset" class="inline">
@Html.AntiForgeryToken()
<input type="hidden" name="assetId" value="@Model.EditingAsset.Id" />
<button type="submit" class="btn bg-red-700 hover:bg-red-600 text-white" onclick="return confirm('Delete this asset?')">Delete</button>
</form>
</div>
</form>
<!-- Preview -->
@if (Model.EditingAsset.AssetType == ClientAssetType.Texture)
{
<div class="mt-6 pt-6 border-t border-gray-700">
<h3 class="text-white font-medium mb-3">Preview</h3>
<div class="bg-gray-900 rounded-lg p-4 inline-block">
<img src="@Html.Raw(Model.CdnBaseUrl)/downloads/@Model.EditingAsset.DownloadPath"
alt="Preview" class="max-w-xs max-h-48" />
</div>
</div>
}
</div>
}
else
{
<!-- Tracked Assets Tab -->
@@ -247,62 +399,67 @@ MINIO_USE_SSL=true</pre>
</div>
</div>
<!-- Assets Grid -->
<div class="grid grid-cols-3 md:grid-cols-5 lg:grid-cols-7 xl:grid-cols-9 gap-3">
@foreach (var asset in Model.Assets)
{
<div class="card overflow-hidden group relative">
<div class="aspect-square bg-gray-900 flex items-center justify-center">
@if (asset.AssetType == ClientAssetType.Texture)
{
<img src="@Html.Raw(Model.CdnBaseUrl)/downloads/@asset.DownloadPath"
alt="@asset.FilePath"
class="max-h-full max-w-full object-contain"
loading="lazy" />
}
else
{
<div class="text-gray-600 text-center">
<svg class="w-8 h-8 mx-auto" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"/>
</svg>
<p class="text-xs">@asset.AssetType</p>
</div>
}
</div>
<div class="p-2">
<p class="text-xs text-white truncate" title="@asset.FilePath">@System.IO.Path.GetFileName(asset.FilePath)</p>
</div>
<!-- Assets Table -->
<div class="card overflow-hidden">
<table class="w-full">
<thead class="bg-gray-800">
<tr>
<th class="px-4 py-3 text-left text-xs font-medium text-gray-400 uppercase">Preview</th>
<th class="px-4 py-3 text-left text-xs font-medium text-gray-400 uppercase">Path</th>
<th class="px-4 py-3 text-left text-xs font-medium text-gray-400 uppercase">Type</th>
<th class="px-4 py-3 text-left text-xs font-medium text-gray-400 uppercase">Version</th>
<th class="px-4 py-3 text-left text-xs font-medium text-gray-400 uppercase">Size</th>
<th class="px-4 py-3 text-left text-xs font-medium text-gray-400 uppercase">Req</th>
<th class="px-4 py-3 text-right text-xs font-medium text-gray-400 uppercase">Actions</th>
</tr>
</thead>
<tbody class="divide-y divide-gray-700">
@foreach (var asset in Model.Assets)
{
<tr class="hover:bg-gray-800/50">
<td class="px-4 py-2">
@if (asset.AssetType == ClientAssetType.Texture)
{
<img src="@Html.Raw(Model.CdnBaseUrl)/downloads/@asset.DownloadPath"
class="w-10 h-10 object-contain bg-gray-900 rounded" loading="lazy" />
}
else
{
<div class="w-10 h-10 bg-gray-900 rounded flex items-center justify-center text-gray-500 text-xs">
@asset.AssetType.ToString().Substring(0, 3)
</div>
}
</td>
<td class="px-4 py-2">
<p class="text-white text-sm truncate max-w-xs" title="@asset.FilePath">@asset.FilePath</p>
<p class="text-xs text-gray-500">@asset.FileHash.Substring(0, 8)...</p>
</td>
<td class="px-4 py-2 text-sm text-gray-400">@asset.AssetType</td>
<td class="px-4 py-2 text-sm text-gray-400">v@asset.Version</td>
<td class="px-4 py-2 text-sm text-gray-400">@FormatSize(asset.FileSize)</td>
<td class="px-4 py-2">
@if (asset.IsRequired)
{
<span class="text-green-400">✓</span>
}
</td>
<td class="px-4 py-2 text-right">
<a href="/admin/assets?tab=edit&path=@Uri.EscapeDataString(asset.FilePath)" class="btn btn-secondary text-xs px-2 py-1">Edit</a>
</td>
</tr>
}
<!-- Hover actions -->
<div class="absolute inset-0 bg-black/80 opacity-0 group-hover:opacity-100 transition-opacity flex items-center justify-center gap-2 rounded">
<button onclick="copyPath('@asset.FilePath')" class="p-2 bg-gray-700 rounded hover:bg-gray-600" title="Copy">
<svg class="w-4 h-4 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 16H6a2 2 0 01-2-2V6a2 2 0 012-2h8a2 2 0 012 2v2m-6 12h8a2 2 0 002-2v-8a2 2 0 00-2-2h-8a2 2 0 00-2 2v8a2 2 0 002 2z"/>
</svg>
</button>
<form method="post" asp-page-handler="DeleteAsset" class="inline">
@Html.AntiForgeryToken()
<input type="hidden" name="assetId" value="@asset.Id" />
<button type="submit" class="p-2 bg-red-700 rounded hover:bg-red-600" title="Untrack" onclick="return confirm('Untrack?')">
<svg class="w-4 h-4 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16"/>
</svg>
</button>
</form>
</div>
</div>
}
@if (!Model.Assets.Any())
{
<div class="col-span-full card p-12 text-center">
<p class="text-gray-400">No tracked assets found.</p>
</div>
}
@if (!Model.Assets.Any())
{
<tr>
<td colspan="7" class="px-4 py-8 text-center text-gray-400">No tracked assets found.</td>
</tr>
}
</tbody>
</table>
</div>
<!-- Pagination -->
<!-- Tracked Pagination -->
@if (Model.TrackedTotalPages > 1)
{
<div class="flex items-center justify-between">
@@ -314,6 +471,12 @@ MINIO_USE_SSL=true</pre>
{
<a href="@Model.GetTrackedPageUrl(Model.TrackedPage - 1)" class="btn btn-secondary">← Prev</a>
}
<select onchange="window.location.href=this.value" class="input w-24 text-sm">
@for (int i = 1; i <= Model.TrackedTotalPages; i++)
{
<option value="@Model.GetTrackedPageUrl(i)" selected="@(Model.TrackedPage == i)">Page @i</option>
}
</select>
@if (Model.TrackedPage < Model.TrackedTotalPages)
{
<a href="@Model.GetTrackedPageUrl(Model.TrackedPage + 1)" class="btn btn-secondary">Next →</a>
@@ -324,11 +487,13 @@ MINIO_USE_SSL=true</pre>
}
</div>
@if (!string.IsNullOrEmpty(Model.Message))
{
<div class="fixed bottom-4 right-4 p-4 rounded-lg @(Model.IsError ? "bg-red-900 border border-red-700" : "bg-green-900 border border-green-700") text-white shadow-lg z-50">
@Model.Message
</div>
@functions {
string FormatSize(long bytes)
{
if (bytes < 1024) return $"{bytes} B";
if (bytes < 1024 * 1024) return $"{bytes / 1024.0:F1} KB";
return $"{bytes / (1024.0 * 1024.0):F1} MB";
}
}
@section Scripts {
+132 -23
View File
@@ -3,6 +3,7 @@ using Microsoft.EntityFrameworkCore;
using Server.Data;
using Server.Data.Entities;
using Server.Services;
using System.Net.Http;
using System.Security.Cryptography;
namespace VoidScavengers.Services.Admin.Pages.Assets;
@@ -11,11 +12,13 @@ public class IndexModel : AdminPageModel
{
private readonly GameDbContext _db;
private readonly ICdnBrowserService _cdnService;
private readonly IHttpClientFactory? _httpClientFactory;
public IndexModel(GameDbContext db, ICdnBrowserService cdnService)
public IndexModel(GameDbContext db, ICdnBrowserService cdnService, IHttpClientFactory? httpClientFactory = null)
{
_db = db;
_cdnService = cdnService;
_httpClientFactory = httpClientFactory;
}
// Tab state
@@ -26,12 +29,16 @@ public class IndexModel : AdminPageModel
[FromQuery(Name = "prefix")]
public string? Prefix { get; set; }
public bool CdnConfigured => _cdnService.IsConfigured;
// Browse tab pagination
[FromQuery(Name = "filter")]
public string? Filter { get; set; }
[FromQuery(Name = "bpage")]
public int BrowsePage { get; set; } = 1;
public int BrowsePageSize { get; set; } = 100;
public int BrowseTotalPages => (int)Math.Ceiling(AllFiles.Count / (double)BrowsePageSize);
public int BrowseTotalPages => (int)Math.Ceiling(FilteredFileCount / (double)BrowsePageSize);
public int FilteredFileCount => AllFiles.Count;
public List<CdnFile> AllFiles { get; set; } = new();
public List<CdnFile> Files => AllFiles
.Skip((BrowsePage - 1) * BrowsePageSize)
@@ -48,6 +55,8 @@ public class IndexModel : AdminPageModel
"scenes/mobs/"
};
public bool CdnConfigured => _cdnService.IsConfigured;
// Tracked tab
[FromQuery(Name = "search")]
public string? Search { get; set; }
@@ -63,13 +72,19 @@ public class IndexModel : AdminPageModel
public HashSet<string> TrackedPaths { get; set; } = new();
// Edit tab
[FromQuery(Name = "path")]
public string? EditPath { get; set; }
public ClientAsset? EditingAsset { get; set; }
// Stats
public int TrackedCount { get; set; }
public int TextureCount { get; set; }
public int SceneCount { get; set; }
public int ScriptCount { get; set; }
public int PageSize { get; set; } = 60;
public int PageSize { get; set; } = 50;
public string CdnBaseUrl { get; set; } = "https://assets.aeternalisgames.com";
@@ -80,6 +95,7 @@ public class IndexModel : AdminPageModel
{
var parts = new List<string> { $"tab=browse", $"bpage={page}" };
if (!string.IsNullOrEmpty(Prefix)) parts.Add($"prefix={Uri.EscapeDataString(Prefix)}");
if (!string.IsNullOrEmpty(Filter)) parts.Add($"filter={Uri.EscapeDataString(Filter)}");
return "/admin/assets?" + string.Join("&", parts);
}
@@ -105,7 +121,17 @@ public class IndexModel : AdminPageModel
// Get tracked paths for comparison
TrackedPaths = (await _db.ClientAssets.Select(a => a.FilePath).ToListAsync()).ToHashSet();
if (Tab == "browse" && CdnConfigured)
if (Tab == "edit" && !string.IsNullOrEmpty(EditPath))
{
EditingAsset = await _db.ClientAssets.FirstOrDefaultAsync(a => a.FilePath == EditPath);
if (EditingAsset == null)
{
Tab = "tracked";
Message = "Asset not found.";
IsError = true;
}
}
else if (Tab == "browse" && CdnConfigured)
{
if (BrowsePage < 1) BrowsePage = 1;
@@ -114,7 +140,7 @@ public class IndexModel : AdminPageModel
if (!string.IsNullOrEmpty(Prefix))
Prefix += "/";
// List files from MinIO (increased limit)
// List files from MinIO (high limit for large buckets)
var allItems = await _cdnService.ListFilesAsync(Prefix ?? "", 100000);
// Separate files and folders
@@ -123,11 +149,16 @@ public class IndexModel : AdminPageModel
.Select(f => f.Key)
.OrderBy(f => f)
.ToList();
AllFiles = allItems
.Where(f => !f.IsDirectory)
.OrderBy(f => f.Name)
.ToList();
// Apply filter
var files = allItems.Where(f => !f.IsDirectory);
if (!string.IsNullOrWhiteSpace(Filter))
{
var filterLower = Filter.ToLower();
files = files.Where(f => f.Name.ToLower().Contains(filterLower));
}
AllFiles = files.OrderBy(f => f.Name).ToList();
}
else if (Tab == "tracked")
{
@@ -145,20 +176,26 @@ public class IndexModel : AdminPageModel
TrackedTotalPages = (int)Math.Ceiling(total / (double)PageSize);
Assets = await query
.OrderByDescending(a => a.UpdatedAt)
.OrderBy(a => a.FilePath)
.Skip((TrackedPage - 1) * PageSize)
.Take(PageSize)
.ToListAsync();
}
}
public async Task<IActionResult> OnPostRegisterAssetAsync(string filePath, ClientAssetType assetType, long fileSize, string? returnPrefix)
public async Task<IActionResult> OnPostRegisterAssetAsync(
string filePath,
ClientAssetType assetType,
long fileSize,
string? returnPrefix,
string? returnFilter,
int? returnPage)
{
if (string.IsNullOrWhiteSpace(filePath))
{
Message = "File path is required.";
IsError = true;
return RedirectToPage(new { tab = "browse", prefix = returnPrefix });
return RedirectToPage(new { tab = "browse", prefix = returnPrefix, filter = returnFilter, bpage = returnPage });
}
// Normalize path
@@ -171,19 +208,24 @@ public class IndexModel : AdminPageModel
{
Message = $"Asset already tracked.";
IsError = true;
return RedirectToPage(new { tab = "browse", prefix = returnPrefix });
return RedirectToPage(new { tab = "browse", prefix = returnPrefix, filter = returnFilter, bpage = returnPage });
}
// Try to compute actual hash from CDN
var fileHash = await ComputeFileHashAsync(filePath);
// Create new asset tracking entry
var asset = new ClientAsset
{
FilePath = filePath,
CdnPath = filePath, // Set CdnPath = FilePath
AssetType = assetType,
FileHash = GenerateHash(filePath),
FileHash = fileHash,
FileSize = fileSize,
Version = 1,
IsRequired = false,
IsEnabled = true,
MinClientVersion = "1.0.0",
CreatedAt = DateTime.UtcNow,
UpdatedAt = DateTime.UtcNow
};
@@ -192,7 +234,40 @@ public class IndexModel : AdminPageModel
await _db.SaveChangesAsync();
Message = $"Asset registered.";
return RedirectToPage(new { tab = "browse", prefix = returnPrefix });
return RedirectToPage(new { tab = "browse", prefix = returnPrefix, filter = returnFilter, bpage = returnPage });
}
public async Task<IActionResult> OnPostUpdateAssetAsync(
int assetId,
ClientAssetType assetType,
int version,
string fileHash,
long fileSize,
string? minClientVersion,
bool isRequired,
bool isEnabled)
{
var asset = await _db.ClientAssets.FindAsync(assetId);
if (asset == null)
{
Message = "Asset not found.";
IsError = true;
return RedirectToPage(new { tab = "tracked" });
}
asset.AssetType = assetType;
asset.Version = version;
asset.FileHash = fileHash;
asset.FileSize = fileSize;
asset.MinClientVersion = string.IsNullOrWhiteSpace(minClientVersion) ? null : minClientVersion;
asset.IsRequired = isRequired;
asset.IsEnabled = isEnabled;
asset.UpdatedAt = DateTime.UtcNow;
await _db.SaveChangesAsync();
Message = "Asset updated.";
return RedirectToPage(new { tab = "edit", path = asset.FilePath });
}
public async Task<IActionResult> OnPostDeleteAssetAsync(int assetId)
@@ -202,16 +277,50 @@ public class IndexModel : AdminPageModel
{
_db.ClientAssets.Remove(asset);
await _db.SaveChangesAsync();
Message = $"Asset untracked.";
Message = $"Asset deleted.";
}
return RedirectToPage(new { tab = "tracked" });
}
private string GenerateHash(string input)
public IActionResult OnPostRefreshCache()
{
// Signal that asset cache should be refreshed
// The DungeonHandler queries the database each time, so there's no server-side cache to clear
// But we can bump a version or signal clients
Message = "Asset manifest will be refreshed on next client request. (Database is queried directly)";
return RedirectToPage(new { tab = Tab });
}
private async Task<string> ComputeFileHashAsync(string filePath)
{
// Try to download the file and compute actual MD5 hash
try
{
if (_httpClientFactory != null)
{
var client = _httpClientFactory.CreateClient();
var url = $"{CdnBaseUrl}/downloads/{filePath}";
var response = await client.GetAsync(url);
if (response.IsSuccessStatusCode)
{
var bytes = await response.Content.ReadAsByteArrayAsync();
var md5create = MD5.Create();
var hash = md5create.ComputeHash(bytes);
md5create.Dispose();
return Convert.ToHexString(hash).ToLower();
}
}
}
catch
{
// Fall through to placeholder
}
// Fallback: generate placeholder hash
using var md5 = MD5.Create();
var bytes = System.Text.Encoding.UTF8.GetBytes(input + DateTime.UtcNow.Ticks);
var hash = md5.ComputeHash(bytes);
return Convert.ToHexString(hash).ToLower();
var placeholderBytes = System.Text.Encoding.UTF8.GetBytes(filePath + DateTime.UtcNow.Ticks);
var placeholderHash = md5.ComputeHash(placeholderBytes);
return Convert.ToHexString(placeholderHash).ToLower();
}
}
+115 -38
View File
@@ -176,54 +176,67 @@
<!-- Resistances -->
<div class="card">
<div class="p-4 border-b border-gray-700">
<h2 class="text-lg font-semibold text-white">Damage Resistances</h2>
<p class="text-sm text-gray-400 mt-1">Negative = weakness (takes more damage), Positive = resistance, 1.0 = immune</p>
<div class="p-4 border-b border-gray-700 flex items-center justify-between">
<div>
<h2 class="text-lg font-semibold text-white">Damage Resistances</h2>
<p class="text-sm text-gray-400 mt-1">Negative % = weakness, Positive % = resistance, 100% = immune</p>
</div>
</div>
<div class="p-6">
<div class="grid grid-cols-2 md:grid-cols-4 gap-4">
@foreach (var dt in Enum.GetValues<DamageType>())
<!-- Current Resistances -->
<div id="resistancesList" class="space-y-2 mb-4">
@foreach (var resist in Model.Resistances)
{
var currentValue = Model.GetResistance(dt.ToString().ToLower());
var bgColor = currentValue < 0 ? "bg-red-900/30 border-red-700" :
currentValue > 0 ? "bg-green-900/30 border-green-700" :
var bgColor = resist.Value < 0 ? "bg-red-900/30 border-red-700" :
resist.Value > 0 ? "bg-green-900/30 border-green-700" :
"bg-gray-800 border-gray-700";
<div class="@bgColor border rounded-lg p-3">
<label class="label text-sm mb-1">@dt</label>
<div class="flex items-center gap-2">
<div class="@bgColor border rounded-lg p-3 flex items-center gap-4 resistance-row">
<input type="text" name="resist_name[]" value="@resist.Key" class="input w-40" placeholder="Type name" />
<div class="flex items-center gap-2 flex-1">
<input type="range"
name="resistance_@dt.ToString().ToLower()"
value="@currentValue"
min="-1" max="1" step="0.1"
name="resist_value[]"
value="@resist.Value"
min="-1" max="1" step="0.05"
class="flex-1"
oninput="this.nextElementSibling.value = this.value; updateResistColor(this.parentElement.parentElement, this.value)" />
<input type="number"
value="@currentValue"
min="-1" max="1" step="0.1"
class="input w-20 text-center text-sm"
oninput="this.previousElementSibling.value = this.value; updateResistColor(this.parentElement.parentElement, this.value)" />
oninput="this.nextElementSibling.value = Math.round(this.value * 100)" />
<div class="flex items-center gap-1">
<input type="number"
value="@((resist.Value * 100).ToString("0"))"
min="-100" max="100" step="5"
class="input w-20 text-center text-sm"
oninput="this.parentElement.previousElementSibling.value = this.value / 100" />
<span class="text-gray-400">%</span>
</div>
</div>
<p class="text-xs text-gray-500 mt-1">
@if (currentValue < 0)
{
<span class="text-red-400">+@((-currentValue * 100).ToString("0"))% damage taken</span>
}
else if (currentValue > 0 && currentValue < 1)
{
<span class="text-green-400">-@((currentValue * 100).ToString("0"))% damage taken</span>
}
else if (currentValue >= 1)
{
<span class="text-blue-400">Immune</span>
}
else
{
<span>Normal damage</span>
}
</p>
<button type="button" onclick="this.closest('.resistance-row').remove()" class="p-2 text-red-400 hover:text-red-300">
<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16"/>
</svg>
</button>
</div>
}
</div>
@if (!Model.Resistances.Any())
{
<p class="text-gray-500 text-sm mb-4">No resistances configured. Add one below.</p>
}
<!-- Add New Resistance -->
<div class="flex items-center gap-4 pt-4 border-t border-gray-700">
<select id="newResistType" class="input w-40" onchange="toggleCustomInput(this)">
<option value="">Select type...</option>
@foreach (var dt in Enum.GetValues<DamageType>())
{
<option value="@dt.ToString().ToLower()">@dt</option>
}
<option value="custom">Custom...</option>
</select>
<input type="text" id="newResistCustom" class="input w-40 hidden" placeholder="Custom name" />
<input type="number" id="newResistValue" class="input w-24" value="50" min="-100" max="100" step="5" />
<span class="text-gray-400">%</span>
<button type="button" onclick="addResistance()" class="btn btn-secondary">Add</button>
</div>
</div>
</div>
@@ -383,5 +396,69 @@
document.getElementById('addLootModal').classList.remove('flex');
}
document.addEventListener('keydown', e => { if (e.key === 'Escape') closeAddLootModal(); });
function toggleCustomInput(select) {
const customInput = document.getElementById('newResistCustom');
if (select.value === 'custom') {
customInput.classList.remove('hidden');
customInput.focus();
} else {
customInput.classList.add('hidden');
}
}
function addResistance() {
const typeSelect = document.getElementById('newResistType');
const customInput = document.getElementById('newResistCustom');
const valueInput = document.getElementById('newResistValue');
let name = typeSelect.value === 'custom' ? customInput.value.trim().toLowerCase() : typeSelect.value;
const percent = parseInt(valueInput.value) || 0;
const value = percent / 100;
if (!name) {
alert('Please select or enter a resistance type');
return;
}
const bgColor = value < 0 ? 'bg-red-900/30 border-red-700' :
value > 0 ? 'bg-green-900/30 border-green-700' :
'bg-gray-800 border-gray-700';
const html = `
<div class="${bgColor} border rounded-lg p-3 flex items-center gap-4 resistance-row">
<input type="text" name="resist_name[]" value="${name}" class="input w-40" placeholder="Type name" />
<div class="flex items-center gap-2 flex-1">
<input type="range"
name="resist_value[]"
value="${value}"
min="-1" max="1" step="0.05"
class="flex-1"
oninput="this.nextElementSibling.value = Math.round(this.value * 100)" />
<div class="flex items-center gap-1">
<input type="number"
value="${percent}"
min="-100" max="100" step="5"
class="input w-20 text-center text-sm"
oninput="this.parentElement.previousElementSibling.value = this.value / 100" />
<span class="text-gray-400">%</span>
</div>
</div>
<button type="button" onclick="this.closest('.resistance-row').remove()" class="p-2 text-red-400 hover:text-red-300">
<svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16"/>
</svg>
</button>
</div>
`;
document.getElementById('resistancesList').insertAdjacentHTML('beforeend', html);
// Reset inputs
typeSelect.value = '';
customInput.value = '';
customInput.classList.add('hidden');
valueInput.value = '50';
}
</script>
}
+23 -13
View File
@@ -25,16 +25,24 @@ public class EditModel : AdminPageModel
public string? Message { get; set; }
public bool IsError { get; set; }
// Helper to get resistance value for a damage type
// Helper to get all resistances as dictionary
public Dictionary<string, float> Resistances
{
get
{
try
{
return JsonSerializer.Deserialize<Dictionary<string, float>>(Mob.ResistancesJson ?? "{}") ?? new();
}
catch { return new(); }
}
}
// Helper to get single resistance value for a damage type
public float GetResistance(string damageType)
{
try
{
var resistances = JsonSerializer.Deserialize<Dictionary<string, float>>(Mob.ResistancesJson ?? "{}");
if (resistances != null && resistances.TryGetValue(damageType, out var value))
return value;
}
catch { }
if (Resistances.TryGetValue(damageType, out var value))
return value;
return 0f;
}
@@ -94,14 +102,16 @@ public class EditModel : AdminPageModel
Mob.Description ??= "";
Mob.TintColor ??= "#ffffff";
// Parse resistances from form
// Parse resistances from form (array format)
var resistances = new Dictionary<string, float>();
foreach (var key in Request.Form.Keys.Where(k => k.StartsWith("resistance_")))
var names = Request.Form["resist_name[]"].ToArray();
var values = Request.Form["resist_value[]"].ToArray();
for (int i = 0; i < names.Length && i < values.Length; i++)
{
var damageType = key.Replace("resistance_", "");
if (float.TryParse(Request.Form[key], out var value) && value != 0)
var name = names[i]?.Trim().ToLower();
if (!string.IsNullOrEmpty(name) && float.TryParse(values[i], out var value))
{
resistances[damageType] = value;
resistances[name] = value;
}
}
Mob.ResistancesJson = JsonSerializer.Serialize(resistances);
+1 -1
View File
@@ -7,7 +7,7 @@
},
"AllowedHosts": "*",
"Database": {
"ConnectionString": "",//Server=a2nlmysql45plsk.secureserver.net;Port=3306;Database=Theraborn;User ID=tbadmin;Password=8N10ml9x?;Pooling=true;Minimum Pool Size=0;Maximum Pool Size=50;",
"ConnectionString": "Server=a2nlmysql45plsk.secureserver.net;Port=3306;Database=Theraborn;User ID=tbadmin;Password=8N10ml9x?;Pooling=true;Minimum Pool Size=0;Maximum Pool Size=50;",
"CommandTimeoutSeconds": 30,
"MaxRetryCount": 3,
"RetryBaseDelayMs": 100