init caches using queue, gate using filters

goatcorp · Apr 15, 2024 · 02a842f · 02a842f
1 parent f6dd251
commit 02a842f
Show file tree

Hide file tree

Showing 11 changed files with 134 additions and 12 deletions.
diff --git a/XLWebServices/Controllers/Dalamud/AssetController.cs b/XLWebServices/Controllers/Dalamud/AssetController.cs
@@ -5,6 +5,7 @@ namespace XLWebServices.Controllers;
 
 [ApiController]
 [Route("Dalamud/Asset/[action]")]
+[TypeFilter(typeof(AssetCacheService.AssetCacheAvailabilityFilter), IsReusable = true)]
 public class AssetController : ControllerBase
 {
     private readonly FallibleService<AssetCacheService> assetCache;

diff --git a/XLWebServices/Controllers/Dalamud/ReleaseController.cs b/XLWebServices/Controllers/Dalamud/ReleaseController.cs
@@ -10,6 +10,7 @@ namespace XLWebServices.Controllers;
 [ApiController]
 [EnableCors("GithubAccess")]
 [Route("Dalamud/Release/[action]")]
+[TypeFilter(typeof(DalamudReleaseDataService.DalamudReleaseDataAvailabilityFilter), IsReusable = true)]
 public class ReleaseController : ControllerBase
 {
     private readonly FallibleService<DalamudReleaseDataService> releaseCache;

diff --git a/XLWebServices/Controllers/GitHubProxyController.cs b/XLWebServices/Controllers/GitHubProxyController.cs
@@ -8,6 +8,7 @@ namespace XLWebServices.Controllers;
 
 [ApiController]
 [Route("Proxy/[action]")]
+[TypeFilter(typeof(LauncherReleaseDataService.LauncherReleaseDataAvailabilityFilter), IsReusable = true)]
 public class GitHubProxyController: ControllerBase
 {
     private readonly ILogger<GitHubProxyController> _logger;

diff --git a/XLWebServices/Controllers/LauncherController.cs b/XLWebServices/Controllers/LauncherController.cs
@@ -7,6 +7,7 @@ namespace XLWebServices.Controllers;
 
 [ApiController]
 [Route("Launcher/[action]")]
+[TypeFilter(typeof(LauncherReleaseDataService.LauncherReleaseDataAvailabilityFilter), IsReusable = true)]
 public class LauncherController : ControllerBase
 {
     private readonly ILogger<GitHubProxyController> _logger;

diff --git a/XLWebServices/Controllers/PlogonController.cs b/XLWebServices/Controllers/PlogonController.cs
@@ -91,6 +91,9 @@ public class StagedPluginInfo
     [HttpPost]
     public async Task<IActionResult> CommitStagedPlugins()
     {
+        if (_data.HasFailed || !_data.Get()!.HasInitialData)
+            return StatusCode(500, "Precondition failed");
+
         if (!CheckAuthHeader())
             return Unauthorized();
 

diff --git a/XLWebServices/Controllers/PluginController.cs b/XLWebServices/Controllers/PluginController.cs
@@ -1,6 +1,7 @@
 using System.Text.Json;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.EntityFrameworkCore;
 using Prometheus;
 using XLWebServices.Data;
@@ -13,6 +14,8 @@ namespace XLWebServices.Controllers;
 [ApiController]
 [EnableCors("GithubAccess")]
 [Route("[controller]/[action]")]
+[TypeFilter(typeof(PluginDataService.PluginDataAvailabilityFilter), IsReusable = true)]
+[TypeFilter(typeof(DalamudReleaseDataService.DalamudReleaseDataAvailabilityFilter), IsReusable = true)]
 public class PluginController : ControllerBase
 {
     private readonly ILogger<PluginController> logger;

diff --git a/XLWebServices/Program.cs b/XLWebServices/Program.cs
@@ -108,17 +108,36 @@
 }
 
 app.Services.GetRequiredService<GitHubService>();
+var queue = app.Services.GetRequiredService<IBackgroundTaskQueue>();
 
-var acs = app.Services.GetRequiredService<FallibleService<AssetCacheService>>();
-await acs.RunFallibleAsync(s => s.ClearCache());
-
-var drs = app.Services.GetRequiredService<FallibleService<DalamudReleaseDataService>>();
-await drs.RunFallibleAsync(s => s.ClearCache());
+_ = Task.Run(async () =>
+{
+    await queue.QueueBackgroundWorkItemAsync(async (_, _) =>
+    {
+        var rds = app.Services.GetRequiredService<FallibleService<LauncherReleaseDataService>>();
+        await rds.RunFallibleAsync(s => s.ClearCache());
+    });
+    
+    await queue.QueueBackgroundWorkItemAsync(async (_, _) =>
+    {
+        var acs = app.Services.GetRequiredService<FallibleService<AssetCacheService>>();
+        await acs.RunFallibleAsync(s => s.ClearCache());
+    });
 
-var pds = app.Services.GetRequiredService<FallibleService<PluginDataService>>();
-await pds.RunFallibleAsync(s => s.ClearCache());
+    await queue.QueueBackgroundWorkItemAsync(async (_, _) =>
+    {
+        var drs = app.Services.GetRequiredService<FallibleService<DalamudReleaseDataService>>();
+        await drs.RunFallibleAsync(s => s.ClearCache());
+    });
 
-var rds = app.Services.GetRequiredService<FallibleService<LauncherReleaseDataService>>();
-await rds.RunFallibleAsync(s => s.ClearCache());
+    await queue.QueueBackgroundWorkItemAsync(async (_, _) =>
+    {
+        var pds = app.Services.GetRequiredService<FallibleService<PluginDataService>>();
+        await pds.RunFallibleAsync(s => s.ClearCache());
+        await pds.RunFallibleAsync(s => s.PostProcessD17Masters());
+    });
+    
+    logger.LogInformation("Queued cache clear jobs");
+});
 
 app.Run();
diff --git a/XLWebServices/Services/AssetCacheService.cs b/XLWebServices/Services/AssetCacheService.cs
@@ -1,12 +1,32 @@
-using System.Net.Http.Headers;
-using Newtonsoft.Json;
-using Octokit;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
 using JsonSerializer = System.Text.Json.JsonSerializer;
 
 namespace XLWebServices.Services;
 
 public class AssetCacheService
 {
+    public class AssetCacheAvailabilityFilter : IAsyncActionFilter
+    {
+        private readonly FallibleService<AssetCacheService> _assetCache;
+
+        public AssetCacheAvailabilityFilter(FallibleService<AssetCacheService> assetCache)
+        {
+            _assetCache = assetCache;
+        }
+
+        public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
+        {
+            if (_assetCache.HasFailed || _assetCache.Get()?.Assets == null)
+            {
+                context.Result = new StatusCodeResult(503);
+                return;
+            }
+
+            await next();
+        }
+    }
+
     private readonly IConfiguration config;
     private readonly FileCacheService cache;
     private readonly GitHubService github;

diff --git a/XLWebServices/Services/DalamudReleaseDataService.cs b/XLWebServices/Services/DalamudReleaseDataService.cs
@@ -2,6 +2,8 @@
 using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
 using Octokit;
 using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;
@@ -10,6 +12,27 @@ namespace XLWebServices.Services;
 
 public class DalamudReleaseDataService
 {
+    public class DalamudReleaseDataAvailabilityFilter : IAsyncActionFilter
+    {
+        private readonly FallibleService<DalamudReleaseDataService> _dalamudReleaseData;
+
+        public DalamudReleaseDataAvailabilityFilter(FallibleService<DalamudReleaseDataService> dalamudReleaseData)
+        {
+            _dalamudReleaseData = dalamudReleaseData;
+        }
+
+        public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
+        {
+            if (_dalamudReleaseData.HasFailed || _dalamudReleaseData.Get()?.DalamudVersions == null)
+            {
+                context.Result = new StatusCodeResult(503);
+                return;
+            }
+
+            await next();
+        }
+    }
+
     private readonly IConfiguration config;
     private readonly FileCacheService cache;
     private readonly ILogger<DalamudReleaseDataService> logger;

diff --git a/XLWebServices/Services/LauncherReleaseDataService.cs b/XLWebServices/Services/LauncherReleaseDataService.cs
@@ -1,13 +1,36 @@
 using System.Diagnostics;
 using System.Text.RegularExpressions;
 using LibGit2Sharp;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
 using Octokit;
 using Repository = LibGit2Sharp.Repository;
 
 namespace XLWebServices.Services;
 
 public class LauncherReleaseDataService
 {
+    public class LauncherReleaseDataAvailabilityFilter : IAsyncActionFilter
+    {
+        private readonly FallibleService<LauncherReleaseDataService> _launcherReleaseData;
+
+        public LauncherReleaseDataAvailabilityFilter(FallibleService<LauncherReleaseDataService> launcherReleaseData)
+        {
+            _launcherReleaseData = launcherReleaseData;
+        }
+
+        public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
+        {
+            if (_launcherReleaseData.HasFailed || this._launcherReleaseData.Get()?.CachedReleasesList == null)
+            {
+                context.Result = new StatusCodeResult(503);
+                return;
+            }
+
+            await next();
+        }
+    }
+
     private readonly ILogger<LauncherReleaseDataService> _logger;
     private readonly GitHubService _github;
     private readonly IConfiguration _configuration;

diff --git a/XLWebServices/Services/PluginData/PluginDataService.cs b/XLWebServices/Services/PluginData/PluginDataService.cs
@@ -1,5 +1,7 @@
 using System.Diagnostics;
 using System.Text.Json;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
 using Octokit;
 using Tomlyn;
 using XLWebServices.Data;
@@ -9,6 +11,27 @@ namespace XLWebServices.Services.PluginData;
 
 public class PluginDataService
 {
+    public class PluginDataAvailabilityFilter : IAsyncActionFilter
+    {
+        private readonly FallibleService<PluginDataService> _pluginData;
+
+        public PluginDataAvailabilityFilter(FallibleService<PluginDataService> pluginData)
+        {
+            _pluginData = pluginData;
+        }
+
+        public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
+        {
+            if (_pluginData.HasFailed || !_pluginData.Get()!.HasInitialData)
+            {
+                context.Result = new StatusCodeResult(503);
+                return;
+            }
+
+            await next();
+        }
+    }
+
     private readonly ILogger<PluginDataService> _logger;
     private readonly GitHubService _github;
     private readonly IConfiguration _configuration;
@@ -28,6 +51,8 @@ public class PluginDataService
 
     public DateTime LastUpdate { get; private set; }
 
+    public bool HasInitialData { get; private set; } = false;
+
     public PluginDataService(
         ILogger<PluginDataService> logger,
         GitHubService github,
@@ -116,6 +141,8 @@ public async Task PostProcessD17Masters()
 
             plugin.Changelog = version?.Changelog;
         }
+
+        HasInitialData = true;
     }
 
     private async Task<(Dictionary<string, List<PluginManifest>> Manifests, string Sha)> ClearCacheD17(List<PluginManifest> pluginMaster)