Make raw endpoints future-proof

src/Helldivers-2-API/Controllers/ArrowHeadController.cs

@@ -1,5 +1,4 @@
-using Helldivers.Core.Contracts;
-using Helldivers.Core.Contracts.Collections;
+using Helldivers.Core.Storage.ArrowHead;
 using Helldivers.Models.ArrowHead;
 using Microsoft.AspNetCore.Mvc;
 
@@ -14,66 +13,66 @@ public static class ArrowHeadController
     /// Returns the currently active war season ID.
     /// </summary>
     [ProducesResponseType<WarId>(StatusCodes.Status200OK)]
-    public static async Task<IResult> WarId(HttpContext context, IStore<WarId> store)
+    public static async Task<IResult> WarId(HttpContext context, ArrowHeadStore store)
     {
-        var result = await store.Get(context.RequestAborted);
+        var warId = await store.GetWarId(context.RequestAborted);
 
-        return Results.Ok(result);
+        return Results.Bytes(warId, contentType: "application/json");
     }
 
     /// <summary>
     /// Get a snapshot of the current war status.
     /// </summary>
     [ProducesResponseType<WarStatus>(StatusCodes.Status200OK)]
-    public static async Task<IResult> Status(HttpContext context, IStore<WarStatus> store)
+    public static async Task<IResult> Status(HttpContext context, ArrowHeadStore store)
     {
-        var status = await store.Get(context.RequestAborted);
+        var status = await store.GetWarStatus(context.RequestAborted);
 
-        return Results.Ok(status);
+        return Results.Bytes(status, contentType: "application/json");
     }
 
     /// <summary>
     /// Gets the current war info.
     /// </summary>
     [ProducesResponseType<WarInfo>(StatusCodes.Status200OK)]
-    public static async Task<IResult> WarInfo(HttpContext context, IStore<WarInfo> store)
+    public static async Task<IResult> WarInfo(HttpContext context, ArrowHeadStore store)
     {
-        var info = await store.Get(context.RequestAborted);
+        var info = await store.GetWarInfo(context.RequestAborted);
 
-        return Results.Ok(info);
+        return Results.Bytes(info, contentType: "application/json");
     }
 
     /// <summary>
     /// Gets the current war info.
     /// </summary>
     [ProducesResponseType<WarSummary>(StatusCodes.Status200OK)]
-    public static async Task<IResult> Summary(HttpContext context, IStore<WarSummary> store)
+    public static async Task<IResult> Summary(HttpContext context, ArrowHeadStore store)
     {
-        var summary = await store.Get(context.RequestAborted);
+        var summary = await store.GetWarSummary(context.RequestAborted);
 
-        return Results.Ok(summary);
+        return Results.Bytes(summary, contentType: "application/json");
     }
 
     /// <summary>
     /// Retrieves a list of news messages from Super Earth.
     /// </summary>
     [ProducesResponseType<List<NewsFeedItem>>(StatusCodes.Status200OK)]
-    public static async Task<IResult> NewsFeed(HttpContext context, IStore<NewsFeedItem, int> store)
+    public static async Task<IResult> NewsFeed(HttpContext context, ArrowHeadStore store)
     {
-        var items = await store.AllAsync(context.RequestAborted);
+        var items = await store.GetNewsFeeds(context.RequestAborted);
 
-        return Results.Ok(items);
+        return Results.Bytes(items, contentType: "application/json");
     }
 
     /// <summary>
     /// Retrieves a list of currently active assignments (like Major Orders).
     /// </summary>
     [ProducesResponseType<List<Assignment>>(StatusCodes.Status200OK)]
     [ProducesResponseType(StatusCodes.Status503ServiceUnavailable)]
-    public static async Task<IResult> Assignments(HttpContext context, IStore<Assignment, int> store)
+    public static async Task<IResult> Assignments(HttpContext context, ArrowHeadStore store)
     {
-        var assignments = await store.AllAsync(context.RequestAborted);
+        var assignments = await store.GetAssignments(context.RequestAborted);
 
-        return Results.Ok(assignments);
+        return Results.Bytes(assignments, contentType: "application/json");
     }
 }

src/Helldivers-2-API/appsettings.json

@@ -10,7 +10,7 @@
   "AllowedHosts": "*",
   "Helldivers": {
     "Synchronization": {
-      "IntervalSeconds": 300,
+      "IntervalSeconds": 20,
       "DefaultLanguage": "en-US",
       "Languages": [
         "en-US",

src/Helldivers-2-API/wwwroot/Helldivers-2-API.json

@@ -15,7 +15,7 @@
         },
         {
           "url": "/",
-          "description": "The dotnet helldivers server"
+          "description": "The development server"
         }
       ],
       "get": {
@@ -46,7 +46,7 @@
         },
         {
           "url": "/",
-          "description": "The dotnet helldivers server"
+          "description": "The development server"
         }
       ],
       "get": {
@@ -77,7 +77,7 @@
         },
         {
           "url": "/",
-          "description": "The dotnet helldivers server"
+          "description": "The development server"
         }
       ],
       "get": {
@@ -108,7 +108,7 @@
         },
         {
           "url": "/",
-          "description": "The dotnet helldivers server"
+          "description": "The development server"
         }
       ],
       "get": {
@@ -139,7 +139,7 @@
         },
         {
           "url": "/",
-          "description": "The dotnet helldivers server"
+          "description": "The development server"
         }
       ],
       "get": {
@@ -173,7 +173,7 @@
         },
         {
           "url": "/",
-          "description": "The dotnet helldivers server"
+          "description": "The development server"
         }
       ],
       "get": {
@@ -210,7 +210,7 @@
         },
         {
           "url": "/",
-          "description": "The dotnet helldivers server"
+          "description": "The development server"
         }
       ],
       "get": {
@@ -241,7 +241,7 @@
         },
         {
           "url": "/",
-          "description": "The dotnet helldivers server"
+          "description": "The development server"
         }
       ],
       "get": {
@@ -275,7 +275,7 @@
         },
         {
           "url": "/",
-          "description": "The dotnet helldivers server"
+          "description": "The development server"
         }
       ],
       "get": {
@@ -318,7 +318,7 @@
         },
         {
           "url": "/",
-          "description": "The dotnet helldivers server"
+          "description": "The development server"
         }
       ],
       "get": {
@@ -352,7 +352,7 @@
         },
         {
           "url": "/",
-          "description": "The dotnet helldivers server"
+          "description": "The development server"
         }
       ],
       "get": {
@@ -395,7 +395,7 @@
         },
         {
           "url": "/",
-          "description": "The dotnet helldivers server"
+          "description": "The development server"
         }
       ],
       "get": {
@@ -429,7 +429,7 @@
         },
         {
           "url": "/",
-          "description": "The dotnet helldivers server"
+          "description": "The development server"
         }
       ],
       "get": {
@@ -472,7 +472,7 @@
         },
         {
           "url": "/",
-          "description": "The dotnet helldivers server"
+          "description": "The development server"
         }
       ],
       "get": {
@@ -506,7 +506,7 @@
         },
         {
           "url": "/",
-          "description": "The dotnet helldivers server"
+          "description": "The development server"
         }
       ],
       "get": {
@@ -549,7 +549,7 @@
         },
         {
           "url": "/",
-          "description": "The dotnet helldivers server"
+          "description": "The development server"
         }
       ],
       "get": {
@@ -583,7 +583,7 @@
         },
         {
           "url": "/",
-          "description": "The dotnet helldivers server"
+          "description": "The development server"
         }
       ],
       "get": {
@@ -618,7 +618,7 @@
         },
         {
           "url": "/",
-          "description": "The dotnet helldivers server"
+          "description": "The development server"
         }
       ],
       "get": {
@@ -1801,4 +1801,4 @@
       }
     }
   }
-}
+}

src/Helldivers-2-API/wwwroot/Helldivers-2-API_arrowhead.json

@@ -869,4 +869,4 @@
       }
     }
   }
-}
+}

src/Helldivers-2-Core/Extensions/ServiceCollectionExtensions.cs

@@ -6,7 +6,6 @@
 using Helldivers.Core.Storage.ArrowHead;
 using Helldivers.Core.Storage.Steam;
 using Helldivers.Core.Storage.V1;
-using Helldivers.Models.ArrowHead;
 using Helldivers.Models.V1;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -35,20 +34,8 @@ public static IServiceCollection AddHelldivers(this IServiceCollection services)
     /// </summary>
     public static IServiceCollection AddArrowHeadStores(this IServiceCollection services)
     {
-        // Register facade for all stores below
-        services.AddSingleton<ArrowHeadFacade>();
-
         // Register all stores
-        services.AddSingleton<IStore<WarInfo>, WarInfoStore>();
-        services.AddSingleton<WarStatusStore>();
-        services.AddSingleton<IStore<WarStatus>>(provider => provider.GetRequiredService<WarStatusStore>());
-        services.AddSingleton<IStore<WarSummary>, WarSummaryStore>();
-        services.AddSingleton<Storage.ArrowHead.AssignmentStore>();
-        services.AddSingleton<IStore<Models.ArrowHead.Assignment, int>>(provider =>
-            provider.GetRequiredService<Storage.ArrowHead.AssignmentStore>());
-        services.AddSingleton<NewsFeedStore>();
-        services.AddSingleton<IStore<NewsFeedItem, int>>(provider => provider.GetRequiredService<NewsFeedStore>());
-        services.AddSingleton<IStore<WarId>, WarIdStore>();
+        services.AddSingleton<ArrowHeadStore>();
 
         return services;
     }

src/Helldivers-2-Core/Localization/CultureDictionary.cs

@@ -6,7 +6,7 @@ namespace Helldivers.Core.Localization;
 /// Specialized version of <see cref="Dictionary{TKey,TValue}" /> that intelligently maps <see cref="CultureInfo" /> as
 /// keys (eg, if "en-UK" does not exist but "en-US" it'll match).
 /// </summary>
-public class CultureDictionary<T> where T : class
+public class CultureDictionary<T>
 {
     private readonly Dictionary<CultureInfo, T> _items;