Test queue

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

@@ -0,0 +1,48 @@
+using System.Collections.Concurrent;
+using ImageMagick;
+
+namespace bytefy.image;
+
+public class ConversionTask
+{
+    public byte[] ImageData { get; set; }
+    public MagickFormat Format { get; set; }
+}
+
+public class ConversionQueueService : BackgroundService
+{
+    private readonly ConcurrentQueue<(ConversionTask Task, TaskCompletionSource<(byte[], string)> CompletionSource)> _queue = new();
+
+    public void QueueConversion(ConversionTask task, TaskCompletionSource<(byte[], string)> completionSource)
+    {
+        _queue.Enqueue((task, completionSource));
+    }
+
+    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+    {
+        while (!stoppingToken.IsCancellationRequested)
+        {
+            if (_queue.TryDequeue(out var item))
+            {
+                var result = await ProcessConversionAsync(item.Task);
+                item.CompletionSource.SetResult(result);
+            }
+            else
+            {
+                await Task.Delay(50, stoppingToken); // Shorten the delay to check the queue more frequently
+            }
+        }
+    }
+
+    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;
+
+        var mimeType = MimeTypes.MimeTypeMap.GetMimeType($"image/{task.Format.ToString().ToLower()}");
+        return Task.FromResult((resultStream.ToArray(), mimeType));
+    }
+}

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

@@ -1,42 +1,44 @@
+using bytefy.image;
 using ImageMagick;
 using Microsoft.AspNetCore.Antiforgery;
 
 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>());
+
 var app = builder.Build();
 
 app.UseAntiforgery();
 
+var conversionQueue = app.Services.GetRequiredService<ConversionQueueService>();
+
 app.MapPost("/convert/{format}", async (IFormFile image, string format) =>
 {
-    try
+    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
     {
-        if (!Enum.TryParse(format, true, out MagickFormat magickFormat) || magickFormat == MagickFormat.Unknown)
+        ImageData = memoryStream.ToArray(),
-            return Results.BadRequest("Invalid format");
+        Format = magickFormat
+    };
 
-        if (image == null || image.Length == 0)
+    var tcs = new TaskCompletionSource<(byte[], string)>();
-            return Results.BadRequest("No image provided");
+    conversionQueue.QueueConversion(conversionTask, tcs);
 
-        if (image.Length > 20 * 1024 * 1024)
+    var (imageData, mimeType) = await tcs.Task;
-            throw new Exception("Image size too large");
 
-        using var memoryStream = new MemoryStream();
+    return Results.File(new MemoryStream(imageData), mimeType, $"{Path.GetFileNameWithoutExtension(image.FileName)}.{magickFormat.ToString().ToLower()}");
-        await image.CopyToAsync(memoryStream);
-        var magickImage = new MagickImage(memoryStream.ToArray());
-        magickImage.Format = magickFormat;
-        
-        var resultStream = new MemoryStream();
-        magickImage.Write(resultStream);
-        resultStream.Position = 0;
-
-        var mimeType = MimeTypes.MimeTypeMap.GetMimeType($"image/{magickFormat.ToString().ToLower()}");
-        var fileName = Path.GetFileNameWithoutExtension(image.FileName);
-
-        return Results.File(resultStream, mimeType, fileDownloadName: $"{fileName}.{magickFormat.ToString().ToLower()}");
-    }
-    catch (NotSupportedException) {
-        return Results.BadRequest();
-    }
 });
 
 app.MapGet("/antiforgery/token", (IAntiforgery forgeryService, HttpContext context) =>
@@ -46,4 +48,12 @@ app.MapGet("/antiforgery/token", (IAntiforgery forgeryService, HttpContext conte
     return TypedResults.Content(xsrfToken, "text/plain");
 });
 
-app.Run();
+app.MapGet("/formats", () =>
+{
+    var formats = Enum.GetNames<MagickFormat>().ToList();
+    
+    formats.Remove("Unknown");
+    return Results.Ok(formats);
+});
+
+app.Run();

services/bytefy.image/bytefy.image/bytefy.image.csproj

@@ -5,7 +5,7 @@
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <InvariantGlobalization>true</InvariantGlobalization>
-        <PublishAot>true</PublishAot>
+        <PublishAot>false</PublishAot>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     </PropertyGroup>
 

tools/src/app/app.routes.ts

@@ -1,10 +1,10 @@
 import { Routes } from '@angular/router';
-import { AsciiToTextComponent } from '../tools/ascii-to-text/ascii-to-text.component';
+import { AsciiToTextComponent } from '../tools/client-side/ascii-to-text/ascii-to-text.component';
-import { GuidComponent } from '../tools/guid/guid.component';
+import { GuidComponent } from '../tools/client-side/guid/guid.component';
-import { Base64ConverterComponent } from '../tools/base64-converter/base64-converter.component';
+import { Base64ConverterComponent } from '../tools/client-side/base64-converter/base64-converter.component';
-import { JwtToJsonComponent } from '../tools/jwt-to-json/jwt-to-json.component';
+import { JwtToJsonComponent } from '../tools/client-side/jwt-to-json/jwt-to-json.component';
-import { TextToCronComponent } from '../tools/text-to-cron/text-to-cron.component';
+import { TextToCronComponent } from '../tools/client-side/text-to-cron/text-to-cron.component';
-import { DdsToPngComponent } from '../tools/dds-to-png/dds-to-png.component';
+import { DdsToPngComponent } from '../tools/client-side/dds-to-png/dds-to-png.component';
 
 export const routes: Routes = [
   {

tools/src/tools/client-side/ascii-to-text/ascii-to-text.component.ts

@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { DualTextareaComponent } from '../../app/shared/dual-textarea/dual-textarea.component';
+import { DualTextareaComponent } from '../../../app/shared/dual-textarea/dual-textarea.component';
 
 @Component({
   selector: 'app-ascii-to-text',

tools/src/tools/client-side/base64-converter/base64-converter.component.ts

@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { DualTextareaComponent } from '../../app/shared/dual-textarea/dual-textarea.component';
+import { DualTextareaComponent } from '../../../app/shared/dual-textarea/dual-textarea.component';
 
 @Component({
   selector: 'app-base64-converter',

tools/src/tools/client-side/dds-to-png/dds-to-png.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { FileConverterComponent } from '../../app/shared/upload/file-converter.component';
+import { FileConverterComponent } from '../../../app/shared/upload/file-converter.component';
 import { DdsToPngService } from './dds-to-png.service';
 
 interface ProcessedFile {

tools/src/tools/client-side/jwt-to-json/jwt-to-json.component.ts

@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { DualTextareaComponent } from '../../app/shared/dual-textarea/dual-textarea.component';
+import { DualTextareaComponent } from '../../../app/shared/dual-textarea/dual-textarea.component';
 
 @Component({
   selector: 'app-jwt-to-json',

tools/src/tools/client-side/text-to-cron/text-to-cron.component.ts

@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { DualTextareaComponent } from '../../app/shared/dual-textarea/dual-textarea.component';
+import { DualTextareaComponent } from '../../../app/shared/dual-textarea/dual-textarea.component';
 
 @Component({
   selector: 'app-text-to-cron',

tools/src/tools/server-side/image-converter/iamge-converter.service.ts

@@ -0,0 +1,31 @@
+import { Injectable } from '@angular/core';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { Observable, tap } from 'rxjs';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ImageService {
+  private baseUrl = 'http://localhost:1337'; // replace with your API base URL
+
+  constructor(private http: HttpClient) { }
+
+  convertImage(image: File, format: string): Observable<any> {
+    const formData = new FormData();
+    formData.append('image', image);
+
+    let imgToken = localStorage.getItem('imgToken');
+
+    const headers = new HttpHeaders({
+      '2311d8d8-607d-4747-8939-1bde65643254': imgToken!
+    });
+
+    return this.http.post(`${this.baseUrl}/convert/${format}`, formData, { headers });
+  }
+
+  seteAntiforgeryToken(): void {    
+    this.http.get<string>(`${this.baseUrl}/antiforgery/token`, { responseType: 'text' as 'json' }).pipe(
+        tap(token => localStorage.setItem('imgToken', token))
+    )
+  }
+}

tools/src/tools/server-side/image-converter/image-converter.component.html

@@ -0,0 +1,3 @@
+<p>
+  image-converter works!
+</p>

tools/src/tools/server-side/image-converter/image-converter.component.spec.ts

@@ -0,0 +1,28 @@
+/* tslint:disable:no-unused-variable */
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { DebugElement } from '@angular/core';
+
+import { ImageConverterComponent } from './image-converter.component';
+
+describe('ImageConverterComponent', () => {
+  let component: ImageConverterComponent;
+  let fixture: ComponentFixture<ImageConverterComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ImageConverterComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ImageConverterComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

tools/src/tools/server-side/image-converter/image-converter.component.ts

@@ -0,0 +1,10 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-image-converter',
+  templateUrl: 'image-converter.component.html',
+  styleUrls: ['image-converter.component.scss']
+})
+export class ImageConverterComponent {
+
+}