Fix pagination logic

Author: GreemDev

src/Server/Helpers/Http/Client/IHttpClientProxy.cs

@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Net;
+using Gommon;
 
 namespace Ryujinx.Systems.Update.Server.Helpers.Http;
 
@@ -14,10 +15,13 @@ public interface IHttpClientProxy
     /// <returns></returns>
     /// <remarks>Do no call. Use an overload.</remarks>
     protected Task<HttpResponseMessage> SendAsync(string actualCaller, HttpRequestMessage request, HttpCompletionOption? option = null, CancellationToken? token = null);
-
+    
     public Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, HttpCompletionOption? option = null,
         CancellationToken? token = null)
         => SendAsync(nameof(SendAsync), request, option, token);
+    
+    public PaginatedEndpoint<T> Paginate<T>(Func<PaginatedEndpoint<T>.BuilderApi, PaginatedEndpoint<T>.BuilderApi> builder) 
+        => PaginatedEndpoint<T>.Builder(this).Into(builder);
 
     #region Convenience overloads for SendAsync
 

src/Server/Helpers/Http/Endpoint/PaginatedEndpoint.cs

@@ -34,7 +34,7 @@ private PaginatedEndpoint(IHttpClientProxy client,
         if (returned.TryGetFirst(predicate, out var matched))
             return matched;
 
-        if (!response.Headers.GetValues("x-total-pages").ToString().TryParse<int>(out var pageCount) || pageCount > 1)
+        if ((response.Headers.GetValues("x-total-pages").FirstOrDefault()?.TryParse<int>(out var pageCount) ?? false) && pageCount > 1)
         {
             currentPage++;
             do
@@ -74,7 +74,7 @@ private PaginatedEndpoint(IHttpClientProxy client,
         if (returned.Length > 0)
             return returned[0];
 
-        if (!response.Headers.GetValues("x-total-pages").ToString().TryParse<int>(out var pageCount) || pageCount > 1)
+        if ((response.Headers.GetValues("x-total-pages").FirstOrDefault()?.TryParse<int>(out var pageCount) ?? false) && pageCount > 1)
         {
             currentPage++;
             do
@@ -112,7 +112,7 @@ private PaginatedEndpoint(IHttpClientProxy client,
 
         IEnumerable<T> accumulated = await _parsePage(response.Content);
 
-        if (!response.Headers.GetValues("x-total-pages").ToString().TryParse<int>(out var pageCount) || pageCount > 1)
+        if ((response.Headers.GetValues("x-total-pages").FirstOrDefault()?.TryParse<int>(out var pageCount) ?? false) && pageCount > 1)
         {
             currentPage++;
             do
@@ -147,8 +147,8 @@ private PaginatedEndpoint(IHttpClientProxy client,
         }
 
         IEnumerable<T> accumulated = await _parsePage(response.Content);
-
-        if (!response.Headers.GetValues("x-total-pages").ToString().TryParse<int>(out var pageCount) || pageCount > 1)
+        
+        if ((response.Headers.GetValues("x-total-pages").FirstOrDefault()?.TryParse<int>(out var pageCount) ?? false) && pageCount > 1)
         {
             currentPage++;
             do

src/Server/Services/GitLab/GitLabService.cs

@@ -1,5 +1,4 @@
-using System.Net.Http.Headers;
-using System.Text.Json;
+using System.Text.Json;
 using System.Text.Json.Serialization.Metadata;
 using NGitLab;
 using Ryujinx.Systems.Update.Server.Helpers.Http;
@@ -10,7 +9,7 @@ public class GitLabService
 {
     private static readonly GitLabReleaseJsonResponseSerializerContext ReleaseSerializerContext =
         new();
-    
+
     private readonly IHttpClientProxy _http;
     public GitLabClient Client { get; }
 
@@ -19,15 +18,16 @@ public class GitLabService
     public GitLabService(IConfiguration config, ILogger<GitLabService> logger, DefaultHttpClientProxy httpClient)
     {
         _logger = logger;
-        
+
         var gitlabSection = config.GetSection("GitLab");
-        
+
         if (!gitlabSection.Exists())
-            throw new Exception($"The '{gitlabSection.Key}' section does not exist in your appsettings.json. You need to provide an 'Endpoint', 'AccessToken', and optionally 'RefreshIntervalMinutes' values.");
+            throw new Exception(
+                $"The '{gitlabSection.Key}' section does not exist in your appsettings.json. You need to provide an 'Endpoint', 'AccessToken', and optionally 'RefreshIntervalMinutes' values.");
 
         var host = gitlabSection.GetValue<string>("Endpoint")!.TrimEnd('/');
         var accessToken = gitlabSection.GetValue<string>("AccessToken");
-        
+
         Client = new GitLabClient(host, accessToken);
         _http = httpClient;
     }
@@ -41,8 +41,8 @@ public GitLabService(IConfiguration config, ILogger<GitLabService> logger, Defau
 
         return JsonSerializer.Deserialize(contentString, typeInfo);
     }
-    
-    public Task<GitLabReleaseJsonResponse?> GetLatestReleaseAsync(long projectId) 
+
+    public Task<GitLabReleaseJsonResponse?> GetLatestReleaseAsync(long projectId)
         => GetReleaseAsync(projectId, "permalink/latest");
 
     public async Task<GitLabReleaseJsonResponse?> GetReleaseAsync(long projectId, string tagName) =>
@@ -51,9 +51,14 @@ await _http.GetAsync($"api/v4/projects/{projectId}/releases/{tagName}"),
             ReleaseSerializerContext.GitLabReleaseJsonResponse
         );
 
-    public PaginatedEndpoint<GitLabReleaseJsonResponse> GetReleasesAsync(long projectId)
-        => PaginatedEndpoint<GitLabReleaseJsonResponse>.Builder(_http)
+    public PaginatedEndpoint<GitLabReleaseJsonResponse> PageReleases(long projectId)
+        => _http.Paginate<GitLabReleaseJsonResponse>(builder => builder
             .WithBaseUrl($"api/v4/projects/{projectId}/releases")
+            .WithPerPageCount(100)
             .WithJsonContentParser(ReleaseSerializerContext.IEnumerableGitLabReleaseJsonResponse)
-            .WithQueryStringParameters(QueryParams.Sort("desc"), QueryParams.OrderBy("created_at"));
+            .WithQueryStringParameters(
+                QueryParams.Sort("desc"),
+                QueryParams.OrderBy("created_at")
+            )
+        );
 }

src/Server/Services/GitLab/VersionCache.cs

@@ -128,7 +128,7 @@ public async Task RefreshAsync()
 
         var sw = Stopwatch.StartNew();
 
-        var releases = await _gl.GetReleasesAsync(_cachedProject.Value.Id)
+        var releases = await _gl.PageReleases(_cachedProject.Value.Id)
             .GetAllAsync(onNonSuccess:
                 code => _logger.LogError(
                     "One of the pagination requests to get all releases returned a non-success status code: {code}",