Migrate to pomelo MySQL provider

Sunrise.API/Controllers/BeatmapController.cs

@@ -207,7 +207,7 @@ public async Task<IActionResult> GetHypedBeatmapSets(
 
         var (beatmapSetIdsWithHypeCount, totalCount) = await database.Beatmaps.Hypes.GetHypedBeatmaps(new QueryOptions(true, new Pagination(page, limit)), ct);
 
-        var result = beatmapSetIdsWithHypeCount.Select(async g =>
+        var resultTasks = beatmapSetIdsWithHypeCount.Select(async g =>
         {
             var (beatmapSetId, hypeCount) = g;
 
@@ -216,7 +216,9 @@ public async Task<IActionResult> GetHypedBeatmapSets(
                 return null;
 
             return new HypedBeatmapSetResponse(sessions, beatmapSetResult.Value, hypeCount);
-        }).Select(task => task.Result).Where(x => x != null).Select(x => x!).ToList();
+        });
+
+        var result = (await Task.WhenAll(resultTasks)).Where(x => x != null).Select(x => x!).ToList();
 
         return Ok(new HypedBeatmapSetsResponse(result, totalCount));
     }

Sunrise.API/Controllers/UserController.cs

@@ -408,7 +408,7 @@ public async Task<IActionResult> GetUserMostPlayedMaps([Range(1, int.MaxValue)]
 
         var (beatmapsIds, totalIdsCount) = await database.Scores.GetUserMostPlayedBeatmapIds(id, mode, new QueryOptions(true, new Pagination(page, limit)), ct);
 
-        var parsedBeatmaps = beatmapsIds.Select(async pair =>
+        var parsedBeatmapsTasks = beatmapsIds.Select(async pair =>
         {
             var bId = pair.Key;
             var count = pair.Value;
@@ -419,10 +419,12 @@ public async Task<IActionResult> GetUserMostPlayedMaps([Range(1, int.MaxValue)]
 
             var beatmapSet = beatmapSetResult.Value;
 
-            var beatmap = beatmapSet?.Beatmaps.FirstOrDefault(b => b.Id == bId);
+            var beatmap = beatmapSet?.Beatmaps?.FirstOrDefault(b => b.Id == bId);
 
             return beatmap == null ? null : new MostPlayedBeatmapResponse(sessions, beatmap, count, beatmapSet);
-        }).Select(task => task.Result).Where(x => x != null).Select(x => x!).ToList();
+        });
+
+        var parsedBeatmaps = (await Task.WhenAll(parsedBeatmapsTasks)).Where(x => x != null).Select(x => x!).ToList();
 
         return Ok(new MostPlayedResponse(parsedBeatmaps, totalIdsCount));
     }
@@ -451,7 +453,7 @@ public async Task<IActionResult> GetUserFavourites([Range(1, int.MaxValue)] int
 
         var (favourites, favouritesCount) = await database.Users.Favourites.GetUserFavouriteBeatmapIds(id, new QueryOptions(true, new Pagination(page, limit)), ct);
 
-        var parsedFavourites = favourites.Select(async setId =>
+        var parsedFavouritesTasks = favourites.Select(async setId =>
         {
             var beatmapSetResult = await beatmapService.GetBeatmapSet(session, setId, ct: ct);
             if (beatmapSetResult.IsFailure)
@@ -460,7 +462,9 @@ public async Task<IActionResult> GetUserFavourites([Range(1, int.MaxValue)] int
             var beatmapSet = beatmapSetResult.Value;
 
             return beatmapSet == null ? null : new BeatmapSetResponse(sessions, beatmapSet);
-        }).Select(task => task.Result).Where(x => x != null).Select(x => x!).ToList();
+        });
+
+        var parsedFavourites = (await Task.WhenAll(parsedFavouritesTasks)).Where(x => x != null).Select(x => x!).ToList();
 
         return Ok(new BeatmapSetsResponse(parsedFavourites, favouritesCount));
     }
@@ -912,7 +916,7 @@ public async Task<IActionResult> SetUserAvatar([Range(1, int.MaxValue)] int id)
 
         var ip = RegionService.GetUserIpAddress(Request);
 
-        if (Request.HasFormContentType == false)
+        if (!Request.HasFormContentType)
             return Problem(title: ApiErrorResponse.Title.UnableToChangeAvatar, detail: ApiErrorResponse.Detail.InvalidContentType, statusCode: StatusCodes.Status400BadRequest);
 
         if (Request.Form.Files.Count == 0)
@@ -931,7 +935,7 @@ public async Task<IActionResult> SetAvatar()
         var user = HttpContext.GetCurrentUserOrThrow();
         var ip = RegionService.GetUserIpAddress(Request);
 
-        if (Request.HasFormContentType == false)
+        if (!Request.HasFormContentType)
             return Problem(title: ApiErrorResponse.Title.UnableToChangeAvatar, detail: ApiErrorResponse.Detail.InvalidContentType, statusCode: StatusCodes.Status400BadRequest);
 
         if (Request.Form.Files.Count == 0)
@@ -955,7 +959,7 @@ public async Task<IActionResult> SetUserBanner([Range(1, int.MaxValue)] int id)
 
         var ip = RegionService.GetUserIpAddress(Request);
 
-        if (Request.HasFormContentType == false)
+        if (!Request.HasFormContentType)
             return Problem(title: ApiErrorResponse.Title.UnableToChangeBanner, detail: ApiErrorResponse.Detail.InvalidContentType, statusCode: StatusCodes.Status400BadRequest);
 
         if (Request.Form.Files.Count == 0)
@@ -974,7 +978,7 @@ public async Task<IActionResult> SetBanner()
         var user = HttpContext.GetCurrentUserOrThrow();
         var ip = RegionService.GetUserIpAddress(Request);
 
-        if (Request.HasFormContentType == false)
+        if (!Request.HasFormContentType)
             return Problem(title: ApiErrorResponse.Title.UnableToChangeBanner, detail: ApiErrorResponse.Detail.InvalidContentType, statusCode: StatusCodes.Status400BadRequest);
 
         if (Request.Form.Files.Count == 0)

Sunrise.Server/Bootstrap.cs

@@ -2,6 +2,7 @@
 using System.Security.Authentication;
 using System.Transactions;
 using EFCoreSecondLevelCacheInterceptor;
+using EntityFrameworkCore.Locking.MySql;
 using Hangfire;
 using Hangfire.MySql;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
@@ -350,7 +351,10 @@ public static void AddSunriseDbContextPool(this WebApplicationBuilder builder)
                 .AddInterceptors(new SlowQueryLoggerInterceptor());
 
             optionsBuilder
-                .UseMySQL(Configuration.DatabaseConnectionString);
+                .UseLocking();
+
+            optionsBuilder
+                .UseMySql(Configuration.DatabaseConnectionString, ServerVersion.AutoDetect(Configuration.DatabaseConnectionString));
         });
     }
 
@@ -525,15 +529,15 @@ public static string GetEnvFilename()
         };
     }
 
-    public static void ApplyDatabaseBootstrapping(this WebApplication app)
+    public static async Task ApplyDatabaseBootstrapping(this WebApplication app)
     {
         using var scope = app.Services.GetRequiredService<IServiceScopeFactory>().CreateScope();
         var database = scope.ServiceProvider.GetRequiredService<DatabaseService>();
 
         if (!Configuration.IsTestingEnv)
             database.DbContext.Database.Migrate();
 
-        DatabaseSeeder.UseAsyncSeeding(database.DbContext).Wait();
+        await DatabaseSeeder.UseAsyncSeeding(database.DbContext);
     }
 
     public static void UseStaticBackgrounds(this WebApplication app)
@@ -607,7 +611,7 @@ public static void Setup(this WebApplication app)
         Configuration.Initialize();
     }
 
-    private class LazilyResolved<T> : Lazy<T>
+    private class LazilyResolved<T> : Lazy<T> where T : notnull
     {
         public LazilyResolved(IServiceProvider serviceProvider)
             : base(serviceProvider.GetRequiredService<T>)

Sunrise.Server/Commands/ChatCommands/HelpCommand.cs

@@ -9,13 +9,11 @@ namespace Sunrise.Server.Commands.ChatCommands;
 [ChatCommand("help")]
 public class HelpCommand : IChatCommand
 {
-    public Task Handle(Session session, ChatChannel? channel, string[]? args)
+    public async Task Handle(Session session, ChatChannel? channel, string[]? args)
     {
         var message = $"Available commands: {Configuration.BotPrefix}" + string.Join($", {Configuration.BotPrefix}",
-            ChatCommandRepository.GetAvailableCommands(session));
+            await ChatCommandRepository.GetAvailableCommands(session));
 
         ChatCommandRepository.SendMessage(session, message);
-
-        return Task.CompletedTask;
     }
 }

Sunrise.Server/Controllers/ScoreController.cs

@@ -37,10 +37,11 @@ public async Task<IActionResult> Submit(
         var clientHash = ServerParsers.ParseRijndaelString(osuVersion, iv, clientHashEncoded);
         var username = scoreSerialized.Split(':')[1].Trim();
 
-        if (!sessions.TryGetSession(username, passhash, out var session) || session == null)
+        var session = await sessions.TryGetSessionAsync(username, passhash);
+
+        if (session == null)
         {
             Log.Error("Failed to authenticate score submission for user {Username}. Invalid session.", username);
-
             return Ok("error: pass");
         }
 
@@ -75,7 +76,8 @@ public async Task<IActionResult> GetScores(
         if (fromEditor == "1" || leaderboardVersion != "4")
             return Ok("error: pass");
 
-        if (!sessions.TryGetSession(username, passhash, out var session) || session == null)
+        var session = await sessions.TryGetSessionAsync(username, passhash);
+        if (session == null)
             return Ok("error: pass");
 
         var result =
@@ -86,9 +88,15 @@ public async Task<IActionResult> GetScores(
 
     [HttpGet(RequestType.OsuGetReplay)]
     public async Task<IActionResult> GetReplay(
+        [FromQuery(Name = "u")] string username,
+        [FromQuery(Name = "h")] string passhash,
         [FromQuery(Name = "c")] int scoreId, CancellationToken ct = default
     )
     {
+        var session = await sessions.TryGetSessionAsync(username, passhash);
+        if (session == null)
+            return Ok("error: pass");
+
         var getReplayResult = await assetBanchoService.GetOsuReplayBytes(scoreId, ct);
         if (getReplayResult.IsFailure)
             return Ok("error: no-replay");

Sunrise.Server/Middlewares/Middleware.cs

@@ -169,7 +169,7 @@ private async Task SetCurrentUserFromRequestIfPossible(HttpContext context)
 
                 if (user.AccountStatus == UserAccountStatus.Disabled)
                 {
-                    database.Users.Moderation.EnableUser(user.Id).Wait();
+                    await database.Users.Moderation.EnableUser(user.Id);
                     // TODO: Send message from bot about account being enabled
                 }
             }

Sunrise.Server/Program.cs

@@ -46,7 +46,7 @@
 app.UseHealthChecks("/health");
 app.UseScalarApiReference();
 
-app.ApplyDatabaseBootstrapping();
+await app.ApplyDatabaseBootstrapping();
 app.UseStaticBackgrounds();
 
 app.UseExceptionHandler();
@@ -63,14 +63,14 @@
 {
     using var scope = app.Services.CreateScope();
     var database = scope.ServiceProvider.GetRequiredService<DatabaseService>();
-    database.FlushAndUpdateRedisCache(false).Wait();
+    await database.FlushAndUpdateRedisCache(false);
 }
 
 var sessions = app.Services.GetRequiredService<SessionRepository>();
-sessions.AddBotToSession().Wait();
-RecurringJobs.RefreshServerBotAccount(CancellationToken.None).Wait();
+await sessions.AddBotToSession();
+await RecurringJobs.RefreshServerBotAccount(CancellationToken.None);
 
-app.Run();
+await app.RunAsync();
 
 namespace Sunrise.Server
 {

Sunrise.Server/Repositories/ChatCommandRepository.cs

@@ -52,7 +52,7 @@ public static async Task HandleCommand(BanchoChatMessage message, Session sessio
                 return;
             case null:
             {
-                var possibleCommands = GetAvailableCommands(session)
+                var possibleCommands = (await GetAvailableCommands(session))
                     .Where(x => x.Contains(command))
                     .ToArray();
 
@@ -94,12 +94,12 @@ public static async Task HandleCommand(BanchoChatMessage message, Session sessio
         await handler.Handle(session, channel, args);
     }
 
-    public static string[] GetAvailableCommands(Session session)
+    public static async Task<string[]> GetAvailableCommands(Session session)
     {
         using var scope = ServicesProviderHolder.CreateScope();
         var database = scope.ServiceProvider.GetRequiredService<DatabaseService>();
 
-        var sessionUser = database.Users.GetUser(session.UserId).Result;
+        var sessionUser = await database.Users.GetUser(session.UserId);
         if (sessionUser == null)
             return [];
 

Sunrise.Shared/Application/RecurringJobs.cs

@@ -67,7 +67,7 @@
                     ct: ct);
 
                 var usersSnapshots = await database.Users.Stats.Snapshots.GetUsersAllStatsSnapshot(usersStats.Select(us => us.UserId).ToList(), i, ct);
                 var (usersGlobalRanks, usersCountryRanks) = await database.Users.Stats.Ranks.GetUsersRanks(usersStats.Select(us => us.User).ToList(), i, ct);
 
                 Parallel.ForEach(
                     usersSnapshots,
@@ -308,7 +308,7 @@
             ct);
 
         if (await Task.WhenAny(backupDatabaseTask, Task.Delay(60_000, ct)) == backupDatabaseTask)
-            return backupDatabaseTask.Result;
+            return await backupDatabaseTask;
 
         return Result.Failure<string>("Database backup operation timed out");
     }

Sunrise.Shared/Application/SunriseMetrics.cs

@@ -183,7 +183,17 @@ public class SunriseMetrics
 
     public SunriseMetrics()
     {
-        _ = RefreshDatabaseMetricsAsync();
+        _ = Task.Run(async () =>
+        {
+            try
+            {
+                await RefreshDatabaseMetricsAsync();
+            }
+            catch (Exception ex)
+            {
+                Log.Warning(ex, "Failed to refresh database metrics during startup.");
+            }
+        });
 
         RecurringJob.AddOrUpdate("Fetch database metrics", () => RefreshDatabaseMetricsAsync(), "*/1 * * * *");
     }