Cleaned up diagnose system. Fixed smaller inconsistencies

Moonlight.ApiServer/Services/DiagnoseService.cs

@@ -1,6 +1,7 @@
 using Moonlight.ApiServer.Interfaces;
 using System.IO.Compression;
 using MoonCore.Attributes;
+using MoonCore.Exceptions;
 using Moonlight.Shared.Http.Responses.Admin.Sys;
 
 namespace Moonlight.ApiServer.Services;
@@ -9,13 +10,18 @@ namespace Moonlight.ApiServer.Services;
 public class DiagnoseService
 {
     private readonly IEnumerable<IDiagnoseProvider> DiagnoseProviders;
+    private readonly ILogger<DiagnoseService> Logger;
 
-    public DiagnoseService(IEnumerable<IDiagnoseProvider> diagnoseProviders)
+    public DiagnoseService(
+        IEnumerable<IDiagnoseProvider> diagnoseProviders,
+        ILogger<DiagnoseService> logger
+    )
     {
         DiagnoseProviders = diagnoseProviders;
+        Logger = logger;
     }
 
-    public async Task<DiagnoseProvideResponse[]> GetAvailable()
+    public Task<DiagnoseProvideResponse[]> GetProviders()
     {
         var availableProviders = new List<DiagnoseProvideResponse>();
 
@@ -26,55 +32,64 @@ public class DiagnoseService
             var type = diagnoseProvider.GetType().FullName;
 
             // The type name is null if the type is a generic type, unlikely, but still could happen
-            if (type != null)
-                availableProviders.Add(new DiagnoseProvideResponse()
-                {
-                    Name = name,
-                    Type = type
-                });
+            if (type == null)
+                continue;
+
+            availableProviders.Add(new DiagnoseProvideResponse()
+            {
+                Name = name,
+                Type = type
+            });
         }
 
-        return availableProviders.ToArray();
+        return Task.FromResult(
+            availableProviders.ToArray()
+        );
     }
 
-    public async Task GenerateDiagnose(Stream outputStream, string[]? requestedProviders)
+    public async Task<MemoryStream> GenerateDiagnose(string[] requestedProviders)
     {
         IDiagnoseProvider[] providers;
-        
-        if (requestedProviders != null && requestedProviders.Length > 0)
+
+        if (requestedProviders.Length == 0)
+            providers = DiagnoseProviders.ToArray();
+        else
         {
-            var requesteDiagnoseProviders = new List<IDiagnoseProvider>();
+            var foundProviders = new List<IDiagnoseProvider>();
 
             foreach (var requestedProvider in requestedProviders)
             {
                 var provider = DiagnoseProviders.FirstOrDefault(x => x.GetType().FullName == requestedProvider);
 
-                if (provider != null)
-                    requesteDiagnoseProviders.Add(provider);
+                if (provider == null)
+                    continue;
+
+                foundProviders.Add(provider);
             }
 
-            providers = requesteDiagnoseProviders.ToArray();
-        }
-        else
-        {
-            providers = DiagnoseProviders.ToArray();
+            providers = foundProviders.ToArray();
         }
 
         try
         {
-            using (var zip = new ZipArchive(outputStream, ZipArchiveMode.Create, leaveOpen: true))
-            {
-                foreach (var provider in providers)
-                {
-                    await provider.ModifyZipArchive(zip);
-                }
-            }
+            var outputStream = new MemoryStream();
+            var zipArchive = new ZipArchive(outputStream, ZipArchiveMode.Create, leaveOpen: true);
 
-            outputStream.Seek(0, SeekOrigin.Begin);
+            foreach (var provider in providers)
+            {
+                await provider.ModifyZipArchive(zipArchive);
+            }
+            
+            zipArchive.Dispose();
+
+            outputStream.Position = 0;
+            return outputStream;
         }
-        catch (Exception ex)
+        catch (Exception e)
         {
-            throw new Exception($"An unknown error occured while building the Diagnose: {ex.Message}");
+            Logger.LogError("An unhandled error occured while generated the diagnose file: {e}", e);
+
+            throw new HttpApiException("An unhandled error occured while generating the diagnose file", 500);
         }
     }
 }