Merge branch 'newgeneratorapi'

Author: IntelOrca

src/IntelOrca.Biohazard.BioRand.Common/Extensions/DateTimeExtensions.cs

@@ -0,0 +1,19 @@
+using System;
+
+namespace IntelOrca.Biohazard.BioRand.Common.Extensions
+{
+    internal static class DateTimeExtensions
+    {
+        public static long ToUnixTimeSeconds(this DateTime dt)
+        {
+            var offset = new DateTimeOffset(dt);
+            return offset.ToUnixTimeSeconds();
+        }
+
+        public static DateTime ToDateTime(this long unixTimeSeconds)
+        {
+            var offset = DateTimeOffset.FromUnixTimeSeconds(unixTimeSeconds);
+            return offset.UtcDateTime;
+        }
+    }
+}

src/IntelOrca.Biohazard.BioRand.Common/IntelOrca.Biohazard.BioRand.Common.csproj

@@ -3,7 +3,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <Nullable>enable</Nullable>
     <LangVersion>12.0</LangVersion>
-    <Version>1.2.9</Version>
+    <Version>1.3.0</Version>
     <Title>BioRand Common Library</Title>
     <Authors>Ted John</Authors>
     <Product>$(AssemblyName)</Product>

src/IntelOrca.Biohazard.BioRand.Common/RandomizerAgent.cs

@@ -4,8 +4,10 @@
 using System.Net.Http;
 using System.Text;
 using System.Text.Json;
+using System.Text.Json.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
+using IntelOrca.Biohazard.BioRand.Common.Extensions;
 
 namespace IntelOrca.Biohazard.BioRand
 {
@@ -15,11 +17,9 @@ public class RandomizerAgent : IDisposable
         private const string StatusGenerating = "Generating";
         private const string StatusUploading = "Uploading";
 
+        private static readonly JsonSerializerOptions _options;
+
         private readonly HttpClient _httpClient = new();
-        private readonly JsonSerializerOptions _options = new JsonSerializerOptions()
-        {
-            PropertyNamingPolicy = JsonNamingPolicy.CamelCase
-        };
         private readonly IRandomizerAgentHandler _handler;
         private readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1);
         private DateTime _lastHeartbeatTime;
@@ -38,7 +38,14 @@ public class RandomizerAgent : IDisposable
         public TimeSpan PollTime { get; set; } = TimeSpan.FromSeconds(5);
         public TimeSpan RestartTime { get; set; } = TimeSpan.FromSeconds(5);
 
-        public bool UseMultiPartFormUpload { get; } = true;
+        static RandomizerAgent()
+        {
+            _options = new JsonSerializerOptions()
+            {
+                PropertyNamingPolicy = JsonNamingPolicy.CamelCase
+            };
+            _options.Converters.Add(new UnixDateTimeConverter());
+        }
 
         public RandomizerAgent(string baseUri, string apiKey, int gameId, IRandomizerAgentHandler handler)
         {
@@ -303,26 +310,25 @@ private async Task GenerateRandomizer(QueueResponseItem q)
                 _handler.LogInfo($"Uploading rando {q.Id}...");
                 try
                 {
-                    if (UseMultiPartFormUpload)
+                    foreach (var asset in output.Assets)
                     {
-                        await PostFormAsync<object>("generator/end-form", new Dictionary<string, object>
+                        await PostFormAsync<object>("generator/asset", new Dictionary<string, object>
                         {
                             ["id"] = Id,
                             ["randoId"] = q.Id,
-                            ["pakOutput"] = output.PakOutput,
-                            ["fluffyOutput"] = output.FluffyOutput
+                            ["key"] = asset.Key,
+                            ["title"] = asset.Title,
+                            ["description"] = asset.Description,
+                            ["data"] = asset.Data,
+                            ["data.filename"] = asset.FileName
                         });
                     }
-                    else
+                    await PostAsync<object>("generator/end", new
                     {
-                        await PostAsync<object>("generator/end", new
-                        {
-                            Id,
-                            RandoId = q.Id,
-                            output.PakOutput,
-                            output.FluffyOutput
-                        });
-                    }
+                        Id,
+                        RandoId = q.Id,
+                        output.Instructions
+                    });
                     _handler.LogInfo($"Uploaded rando {q.Id}");
                 }
                 catch (Exception ex)
@@ -368,7 +374,7 @@ private async Task<T> PostFormAsync<T>(string path, Dictionary<string, object> f
             {
                 if (kvp.Value is byte[] b)
                 {
-                    form.Add(new ByteArrayContent(b), kvp.Key, kvp.Key);
+                    form.Add(new ByteArrayContent(b), kvp.Key, (string)formData[$"{kvp.Key}.filename"]);
                 }
                 else
                 {
@@ -402,6 +408,7 @@ public class QueueResponseItem
             public int Id { get; set; }
             public int GameId { get; set; }
             public DateTime Created { get; set; }
+            public string[] UserTags { get; set; } = [];
             public int UserId { get; set; }
             public int Seed { get; set; }
             public int ConfigId { get; set; }
@@ -419,5 +426,18 @@ public class QueueResponseItem
         private class HttpException(HttpStatusCode code) : Exception($"{code} returned from http request")
         {
         }
+
+        private class UnixDateTimeConverter : JsonConverter<DateTime>
+        {
+            public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+            {
+                return reader.GetInt64().ToDateTime();
+            }
+
+            public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options)
+            {
+                writer.WriteNumberValue(value.ToUnixTimeSeconds());
+            }
+        }
     }
 }

src/IntelOrca.Biohazard.BioRand.Common/RandomizerOutput.cs

@@ -1,18 +1,15 @@
 using System.Collections.Generic;
+using System.Collections.Immutable;
 
 namespace IntelOrca.Biohazard.BioRand
 {
-    public class RandomizerOutput
+    public class RandomizerOutput(
+        ImmutableArray<RandomizerOutputAsset> assets,
+        string instructions,
+        Dictionary<string, string> logs)
     {
-        public byte[] PakOutput { get; }
-        public byte[] FluffyOutput { get; }
-        public Dictionary<string, string> Logs { get; }
-
-        public RandomizerOutput(byte[] pakOutput, byte[] fluffyOutput, Dictionary<string, string> logs)
-        {
-            PakOutput = pakOutput;
-            FluffyOutput = fluffyOutput;
-            Logs = logs;
-        }
+        public ImmutableArray<RandomizerOutputAsset> Assets => assets;
+        public string Instructions => instructions;
+        public Dictionary<string, string> Logs => logs;
     }
 }

src/IntelOrca.Biohazard.BioRand.Common/RandomizerOutputAsset.cs

@@ -0,0 +1,16 @@
+namespace IntelOrca.Biohazard.BioRand
+{
+    public sealed class RandomizerOutputAsset(
+        string key,
+        string title,
+        string description,
+        string fileName,
+        byte[] data)
+    {
+        public string Key => key;
+        public string Title => title;
+        public string Description => description;
+        public string FileName => fileName;
+        public byte[] Data => data;
+    }
+}

test/IntelOrca.Biohazard.BioRand.Tests/TestAgent.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using Xunit;
 
@@ -26,9 +25,28 @@ private class Handler : IRandomizer, IRandomizerAgentHandler
             public RandomizerOutput Randomize(RandomizerInput input)
             {
                 return new RandomizerOutput(
-                    new byte[16],
-                    new byte[16],
-                    new Dictionary<string, string>());
+                    [
+                        new RandomizerOutputAsset(
+                            "1-patch",
+                            "Patch",
+                            "Simply drop this file into your RE 4 install folder.",
+                            "biorand-re4r-58252-mod.zip",
+                            new byte[16]),
+                        new RandomizerOutputAsset(
+                            "2-fluffy",
+                            "Fluffy Mod",
+                            "Drop this zip file into Fluffy Mod Manager's mod folder and enable it.",
+                            "biorand-re4r-58252.zip",
+                            new byte[16])
+                    ],
+                    """
+                    <p class="mt-3">What should I do if my game crashes?</p>
+                    <ol class="ml-8 list-decimal text-gray-300">
+                      <li>Reload from last checkpoint and try again.</li>
+                      <li>Alter the enemy sliders slightly or reduce the number temporarily. This will reshuffle the enemies. Reload from last checkpoint and try again.</li> <li>As a last resort, change your seed, and reload from last checkpoint.</li>
+                    </ol>
+                    """,
+                    []);
             }
 
             public Task<bool> CanGenerateAsync(RandomizerAgent.QueueResponseItem queueItem) => Task.FromResult(true);