fix

Author: clansty

MaiChartManager/Controllers/Mod/ModConfigService.cs

@@ -69,7 +69,7 @@ public async Task<IConfig> GetCurrentAquaMaiConfig(bool forceDefault = false, bo
     {
         var dllPath = await GetAquaMaiDllPath(ct);
 
-        var binary = File.ReadAllBytes(dllPath);
+        var binary = await File.ReadAllBytesAsync(dllPath, ct);
         if (!skipSignatureCheck)
         {
             var sigResult = AquaMaiSignatureV2.VerifySignature(binary);
@@ -85,7 +85,7 @@ public async Task<IConfig> GetCurrentAquaMaiConfig(bool forceDefault = false, bo
         {
             try
             {
-                var view = configInterface.CreateConfigView(File.ReadAllText(ModPaths.AquaMaiConfigPath));
+                var view = configInterface.CreateConfigView(await File.ReadAllTextAsync(ModPaths.AquaMaiConfigPath, ct));
                 var migrationManager = configInterface.GetConfigMigrationManager();
 
                 if (migrationManager.GetVersion(view) != migrationManager.LatestVersion)
@@ -96,7 +96,6 @@ public async Task<IConfig> GetCurrentAquaMaiConfig(bool forceDefault = false, bo
 
                 var parser = configInterface.GetConfigParser();
                 parser.Parse(config, view);
-                StaticSettings.UpdateAssetPathsFromAquaMaiConfig(config);
             }
             catch (Exception ex)
             {

MaiChartManager/Controllers/Mod/MuModController.cs

@@ -20,13 +20,12 @@ public MuModConfigDto GetMuModConfig()
     [HttpPut]
     public async Task<EnsureCacheResultDto> SetMuModChannelAndEnsureCache([FromBody] SetChannelDto req)
     {
-        if (req.Channel != "slow" && req.Channel != "fast")
-        {
-            throw new ArgumentException("Channel must be 'slow' or 'fast'", nameof(req));
-        }
-
         try
         {
+            if (req.Channel != "slow" && req.Channel != "fast")
+            {
+                return new EnsureCacheResultDto(false, null, "Channel must be 'slow' or 'fast'");
+            }
             muModService.WriteChannel(req.Channel);
             var result = await muModService.EnsureCache(CancellationToken.None);
             return new EnsureCacheResultDto(result.Success, result.Version, result.Error);

MaiChartManager/Controllers/Mod/MuModService.cs

@@ -5,7 +5,7 @@
 
 namespace MaiChartManager.Controllers.Mod;
 
-public class MuModService(ILogger<MuModService> logger)
+public class MuModService(ILogger<MuModService> logger, IHttpClientFactory httpClientFactory)
 {
     private const string CosVersionApiUrl = "https://munet-version-config-1251600285.cos.ap-shanghai.myqcloud.com/aquamai.json";
     private const string CfVersionApiUrl = "https://aquamai-version-config.mumur.net/api/config";
@@ -268,12 +268,9 @@ private static IEnumerable<string> BuildDownloadUrls(VersionInfoModel info, Vers
         }
     }
 
-    private static async Task<VersionInfoModel[]> FetchVersionInfosAsync(string url, CancellationToken ct)
+    private async Task<VersionInfoModel[]> FetchVersionInfosAsync(string url, CancellationToken ct)
     {
-        using var client = new HttpClient
-        {
-            Timeout = TimeSpan.FromSeconds(15)
-        };
+        using var client = httpClientFactory.CreateClient();
 
         var json = await client.GetStringAsync(url, ct);
         var result = JsonSerializer.Deserialize<VersionInfoModel[]>(json, new JsonSerializerOptions
@@ -284,12 +281,9 @@ private static async Task<VersionInfoModel[]> FetchVersionInfosAsync(string url,
         return result ?? [];
     }
 
-    private static async Task<byte[]> DownloadFromUrlsAsync(IReadOnlyList<string> urls, CancellationToken ct)
+    private async Task<byte[]> DownloadFromUrlsAsync(IReadOnlyList<string> urls, CancellationToken ct)
     {
-        using var client = new HttpClient
-        {
-            Timeout = TimeSpan.FromSeconds(15)
-        };
+        using var client = httpClientFactory.CreateClient();
 
         Exception? lastError = null;
         foreach (var url in urls)

MaiChartManager/ServerManager.cs

@@ -114,6 +114,7 @@ public static void StartApp(bool export, Action<string>? onStart = null)
             });
 
         builder.Services
+            .AddHttpClient()
             .AddSingleton<StaticSettings>()
             .AddSingleton<MaidataImportService>()
             .AddSingleton<MuModService>()