Finish image converter

services/bytefy.image/bytefy.image/ConversaionQueueService.cs

@@ -36,13 +36,24 @@ public class ConversionQueueService : BackgroundService
 
     private Task<(byte[], string)> ProcessConversionAsync(ConversionTask task)
     {
-        using var magickImage = new MagickImage(task.ImageData);
-        magickImage.Format = task.Format;
-        var resultStream = new MemoryStream();
-        magickImage.Write(resultStream);
-        resultStream.Position = 0;
+        try
+        {
+            using var magickImage = new MagickImage(task.ImageData);
+            magickImage.Format = task.Format;
+            var resultStream = new MemoryStream();
+            magickImage.Write(resultStream);
+            resultStream.Position = 0;
 
-        var mimeType = MimeTypes.MimeTypeMap.GetMimeType($"image/{task.Format.ToString().ToLower()}");
-        return Task.FromResult((resultStream.ToArray(), mimeType));
+            var mimeType = MimeTypes.MimeTypeMap.GetMimeType($"image/{task.Format.ToString().ToLower()}");
+            return Task.FromResult((resultStream.ToArray(), mimeType));
+        }
+        catch (MagickImageErrorException ex)
+        {
+            // Log the error message
+            Console.WriteLine($"Image conversion failed: {ex.Message}");
+
+            // Return a default value or handle the error as appropriate for your application
+            return Task.FromResult<(byte[], string)>((null, null));
+        }
     }
 }

services/bytefy.image/bytefy.image/Program.cs

@@ -6,54 +6,81 @@ var builder = WebApplication.CreateBuilder(args);
 builder.Services.AddAntiforgery(options => options.HeaderName = "2311d8d8-607d-4747-8939-1bde65643254");
 builder.Services.AddSingleton<ConversionQueueService>();
 builder.Services.AddHostedService(provider => provider.GetRequiredService<ConversionQueueService>());
-
+builder.Services.AddCors(options =>
+{
+    options.AddPolicy("AllowSpecificOrigin",
+        builder => builder.WithOrigins("http://localhost:4200")
+            .AllowAnyMethod()
+            .AllowAnyHeader()
+            .AllowCredentials());
+});
 var app = builder.Build();
 
 app.UseAntiforgery();
-
+app.UseCors("AllowSpecificOrigin"); // Use the CORS policy
 var conversionQueue = app.Services.GetRequiredService<ConversionQueueService>();
 
-app.MapPost("/convert/{format}", async (IFormFile image, string format) =>
+app.MapPost("/convert/{format}", async (IFormFile file, string format) =>
 {
-    if (!Enum.TryParse(format, true, out MagickFormat magickFormat) || magickFormat == MagickFormat.Unknown)
-        return Results.BadRequest("Invalid format");
-
-    if (image == null || image.Length == 0)
-        return Results.BadRequest("No image provided");
-
-    if (image.Length > 20 * 1024 * 1024)
-        throw new Exception("Image size too large");
-
-    using var memoryStream = new MemoryStream();
-    await image.CopyToAsync(memoryStream);
-
-    var conversionTask = new ConversionTask
+    try
     {
-        ImageData = memoryStream.ToArray(),
-        Format = magickFormat
-    };
+        if (!Enum.TryParse(format, true, out MagickFormat magickFormat) || magickFormat == MagickFormat.Unknown)
+            return Results.BadRequest("Invalid format");
 
-    var tcs = new TaskCompletionSource<(byte[], string)>();
-    conversionQueue.QueueConversion(conversionTask, tcs);
+        var formatInfo = MagickNET.SupportedFormats.FirstOrDefault(f => f.Format == magickFormat);
+        if (formatInfo == null || !formatInfo.SupportsReading || !formatInfo.SupportsWriting)
+            return Results.BadRequest("Unsupported format");
 
-    var (imageData, mimeType) = await tcs.Task;
+        if (file == null || file.Length == 0)
+            return Results.BadRequest("No image provided");
 
-    return Results.File(new MemoryStream(imageData), mimeType, $"{Path.GetFileNameWithoutExtension(image.FileName)}.{magickFormat.ToString().ToLower()}");
-});
+        if (file.Length > 20 * 1024 * 1024)
+            throw new Exception("Image size too large");
+
+        using var memoryStream = new MemoryStream();
+        await file.CopyToAsync(memoryStream);
+
+        var conversionTask = new ConversionTask
+        {
+            ImageData = memoryStream.ToArray(),
+            Format = magickFormat
+        };
+
+        var tcs = new TaskCompletionSource<(byte[], string)>();
+        conversionQueue.QueueConversion(conversionTask, tcs);
+
+        var (imageData, mimeType) = await tcs.Task;
+    
+        return Results.File(new MemoryStream(imageData), mimeType, $"{Path.GetFileNameWithoutExtension(file.FileName)}.{magickFormat.ToString().ToLower()}");
+    }
+    catch (ImageMagick.MagickImageErrorException e)
+    {
+        Console.WriteLine(e);
+        return Results.BadRequest("Invalid image");
+    }
+}).DisableAntiforgery(); // should get this removed by getting antiforgery working with angular. Doesn't find Cookie.
 
 app.MapGet("/antiforgery/token", (IAntiforgery forgeryService, HttpContext context) =>
 {
     var tokens = forgeryService.GetAndStoreTokens(context);
     var xsrfToken = tokens.RequestToken!;
     return TypedResults.Content(xsrfToken, "text/plain");
-});
+}).DisableAntiforgery();
 
 app.MapGet("/formats", () =>
 {
-    var formats = Enum.GetNames<MagickFormat>().ToList();
-    
-    formats.Remove("Unknown");
+    var formats = MagickNET.SupportedFormats
+        .Where(f => f.SupportsReading && f.SupportsWriting)
+        .Select(f => f.Format.ToString())
+        .ToList();
+
     return Results.Ok(formats);
 });
 
-app.Run();
+app.MapGet("/mimetype/{format}", (string format) =>
+{
+    var mimeType = MimeTypes.MimeTypeMap.GetMimeType($".{format.ToLower()}");
+    return Results.Ok(mimeType);
+});
+
+app.Run();

services/bytefy.image/bytefy.image/appsettings.Development.json

@@ -2,7 +2,8 @@
   "Logging": {
     "LogLevel": {
       "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
+      "Microsoft.AspNetCore": "Warning",
     }
-  }
+  },
+  "AllowedHosts": "*"
 }