diff --git a/Program.cs b/Program.cs index 41156f1..1a52bd7 100644 --- a/Program.cs +++ b/Program.cs @@ -84,6 +84,7 @@ builder.Services.AddSingleton(); builder.Services.AddSingleton(); builder.Services.AddSingleton(); builder.Services.AddSingleton(); +builder.Services.AddHttpClient(); // For CDN file hash computation // Health checks builder.Services.AddHealthChecks() diff --git a/Services/Admin/Pages/Assets/Index.cshtml b/Services/Admin/Pages/Assets/Index.cshtml index f2abd00..1822bfa 100644 --- a/Services/Admin/Pages/Assets/Index.cshtml +++ b/Services/Admin/Pages/Assets/Index.cshtml @@ -12,6 +12,15 @@

CDN Assets

Browse MinIO bucket and manage tracked assets

+
+ @Html.AntiForgeryToken() + +
@@ -22,8 +31,19 @@ Tracked Assets (@Model.TrackedCount) + @if (Model.Tab == "edit") + { + Edit Asset + } + @if (!string.IsNullOrEmpty(Model.Message)) + { +
+ @Model.Message +
+ } + @if (Model.Tab == "browse") { @if (!Model.CdnConfigured) @@ -37,16 +57,14 @@
MINIO_ENDPOINT=assets.aeternalisgames.com
 MINIO_ACCESS_KEY=your-access-key
 MINIO_SECRET_KEY=your-secret-key
-MINIO_BUCKET=downloads
-MINIO_USE_SSL=true
-

Or configure in appsettings.json under "MinIO" section.

+MINIO_BUCKET=downloads } else { - +
-
+
@foreach (var folder in Model.AvailableFolders) @@ -59,8 +77,22 @@ MINIO_USE_SSL=true
+ +
+ + +
+ +
+ + @if (!string.IsNullOrEmpty(Model.Filter)) + { + Clear + } +
+ -
+
root @{ var parts = Model.Prefix?.Split('/', StringSplitOptions.RemoveEmptyEntries) ?? Array.Empty(); @@ -101,13 +133,19 @@ MINIO_USE_SSL=true
-

Files in @(string.IsNullOrEmpty(Model.Prefix) ? "root" : Model.Prefix)

-

@Model.Files.Count files. Click to copy path, + to register.

+

+ Files in @(string.IsNullOrEmpty(Model.Prefix) ? "root" : Model.Prefix) + @if (!string.IsNullOrEmpty(Model.Filter)) + { + filtered by "@Model.Filter" + } +

+

@Model.FilteredFileCount files total. Click to copy path, + to register.

- @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 + + } + else + { + + + + + + }
}
-
- - - @if (Model.BrowseTotalPages > 1) - { -
-

- Showing @((Model.BrowsePage - 1) * Model.BrowsePageSize + 1)-@Math.Min(Model.BrowsePage * Model.BrowsePageSize, Model.AllFiles.Count) of @Model.AllFiles.Count files -

-
- @if (Model.BrowsePage > 1) - { - ← Prev - } - @Model.BrowsePage / @Model.BrowseTotalPages - @if (Model.BrowsePage < Model.BrowseTotalPages) - { - Next → - } + + + @if (Model.BrowseTotalPages > 1) + { +
+

+ Page @Model.BrowsePage of @Model.BrowseTotalPages (@Model.FilteredFileCount files) +

+
+ @if (Model.BrowsePage > 1) + { + First + ← Prev + } + + @if (Model.BrowsePage < Model.BrowseTotalPages) + { + Next → + Last + } +
-
- } + } +
} else if (!Model.Subfolders.Any()) { @@ -197,11 +252,108 @@ MINIO_USE_SSL=true -

This folder is empty.

+

+ @if (!string.IsNullOrEmpty(Model.Filter)) + { + No files matching "@Model.Filter" + } + else + { + This folder is empty. + } +

} } } + else if (Model.Tab == "edit" && Model.EditingAsset != null) + { + +
+

Edit Asset

+ +
+ @Html.AntiForgeryToken() + + +
+ + +
+ +
+ + +
+ +
+
+ + +
+
+ + +
+
+ +
+
+ + +
+
+ + +
+
+ +
+ + +
+ +
+ + +
+ +
+ + Cancel +
+ + @Html.AntiForgeryToken() + + + +
+ + + + @if (Model.EditingAsset.AssetType == ClientAssetType.Texture) + { +
+

Preview

+
+ Preview +
+
+ } +
+ } else { @@ -247,62 +399,67 @@ MINIO_USE_SSL=true
- -
- @foreach (var asset in Model.Assets) - { -
-
- @if (asset.AssetType == ClientAssetType.Texture) - { - @asset.FilePath - } - else - { -
- - - -

@asset.AssetType

-
- } -
-
-

@System.IO.Path.GetFileName(asset.FilePath)

-
+ +
+ + + + + + + + + + + + + + @foreach (var asset in Model.Assets) + { + + + + + + + + + + } - -
- -
- @Html.AntiForgeryToken() - - - -
- - } - - @if (!Model.Assets.Any()) - { -
-

No tracked assets found.

-
- } + @if (!Model.Assets.Any()) + { + + + + } + +
PreviewPathTypeVersionSizeReqActions
+ @if (asset.AssetType == ClientAssetType.Texture) + { + + } + else + { +
+ @asset.AssetType.ToString().Substring(0, 3) +
+ } +
+

@asset.FilePath

+

@asset.FileHash.Substring(0, 8)...

+
@asset.AssetTypev@asset.Version@FormatSize(asset.FileSize) + @if (asset.IsRequired) + { + ✓ + } + + Edit +
No tracked assets found.
- + @if (Model.TrackedTotalPages > 1) {
@@ -314,6 +471,12 @@ MINIO_USE_SSL=true { ← Prev } + @if (Model.TrackedPage < Model.TrackedTotalPages) { Next → @@ -324,11 +487,13 @@ MINIO_USE_SSL=true }
-@if (!string.IsNullOrEmpty(Model.Message)) -{ -
- @Model.Message -
+@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 { diff --git a/Services/Admin/Pages/Assets/Index.cshtml.cs b/Services/Admin/Pages/Assets/Index.cshtml.cs index 15f4e5c..7b1ff94 100644 --- a/Services/Admin/Pages/Assets/Index.cshtml.cs +++ b/Services/Admin/Pages/Assets/Index.cshtml.cs @@ -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 AllFiles { get; set; } = new(); public List 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 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 { $"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 OnPostRegisterAssetAsync(string filePath, ClientAssetType assetType, long fileSize, string? returnPrefix) + public async Task 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 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 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 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(); } } diff --git a/Services/Admin/Pages/Mobs/Edit.cshtml b/Services/Admin/Pages/Mobs/Edit.cshtml index 42f773d..a543560 100644 --- a/Services/Admin/Pages/Mobs/Edit.cshtml +++ b/Services/Admin/Pages/Mobs/Edit.cshtml @@ -176,54 +176,67 @@
-
-

Damage Resistances

-

Negative = weakness (takes more damage), Positive = resistance, 1.0 = immune

+
+
+

Damage Resistances

+

Negative % = weakness, Positive % = resistance, 100% = immune

+
-
- @foreach (var dt in Enum.GetValues()) + +
+ @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"; -
- -
+
+ +
- + oninput="this.nextElementSibling.value = Math.round(this.value * 100)" /> +
+ + % +
-

- @if (currentValue < 0) - { - +@((-currentValue * 100).ToString("0"))% damage taken - } - else if (currentValue > 0 && currentValue < 1) - { - -@((currentValue * 100).ToString("0"))% damage taken - } - else if (currentValue >= 1) - { - Immune - } - else - { - Normal damage - } -

+
}
+ + @if (!Model.Resistances.Any()) + { +

No resistances configured. Add one below.

+ } + + +
+ + + + % + +
@@ -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 = ` +
+ +
+ +
+ + % +
+
+ +
+ `; + + document.getElementById('resistancesList').insertAdjacentHTML('beforeend', html); + + // Reset inputs + typeSelect.value = ''; + customInput.value = ''; + customInput.classList.add('hidden'); + valueInput.value = '50'; + } } diff --git a/Services/Admin/Pages/Mobs/Edit.cshtml.cs b/Services/Admin/Pages/Mobs/Edit.cshtml.cs index 6d1a784..0f09295 100644 --- a/Services/Admin/Pages/Mobs/Edit.cshtml.cs +++ b/Services/Admin/Pages/Mobs/Edit.cshtml.cs @@ -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 Resistances + { + get + { + try + { + return JsonSerializer.Deserialize>(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>(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(); - 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); diff --git a/appsettings.json b/appsettings.json index a9f2ac2..f049d2d 100644 --- a/appsettings.json +++ b/appsettings.json @@ -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