conco/FictionArchive
1
0
Fork 0
Code Issues 13 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

[FA-misc] Initial MassTransit implementation seems to work

Browse Source
This commit is contained in:
gamer147
2026-01-26 17:08:13 -05:00
parent e7435435c1
commit 579e05b853
96 changed files with 845 additions and 1229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
FictionArchive.Service.FileService/Consumers/FileUploadRequestCreatedConsumer.cs Normal file
View File

@@ -0,0 +1,74 @@
using Amazon.S3;
using Amazon.S3.Model;
using FictionArchive.Common.Enums;
using FictionArchive.Service.FileService.Contracts;
using FictionArchive.Service.FileService.Models;
using FictionArchive.Service.Shared.Contracts.Events;
using MassTransit;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
namespace FictionArchive.Service.FileService.Consumers;
public class FileUploadRequestCreatedConsumer : IConsumer<IFileUploadRequestCreated>
{
private readonly ILogger<FileUploadRequestCreatedConsumer> _logger;
private readonly AmazonS3Client _amazonS3Client;
private readonly IPublishEndpoint _publishEndpoint;
private readonly S3Configuration _s3Configuration;
private readonly ProxyConfiguration _proxyConfiguration;
public FileUploadRequestCreatedConsumer(
ILogger<FileUploadRequestCreatedConsumer> logger,
AmazonS3Client amazonS3Client,
IPublishEndpoint publishEndpoint,
IOptions<S3Configuration> s3Configuration,
IOptions<ProxyConfiguration> proxyConfiguration)
{
_logger = logger;
_amazonS3Client = amazonS3Client;
_publishEndpoint = publishEndpoint;
_s3Configuration = s3Configuration.Value;
_proxyConfiguration = proxyConfiguration.Value;
}
public async Task Consume(ConsumeContext<IFileUploadRequestCreated> context)
{
var message = context.Message;
var putObjectRequest = new PutObjectRequest
{
BucketName = _s3Configuration.Bucket,
Key = message.FilePath
};
using var memoryStream = new MemoryStream(message.FileData);
putObjectRequest.InputStream = memoryStream;
var s3Response = await _amazonS3Client.PutObjectAsync(putObjectRequest);
if (s3Response.HttpStatusCode != System.Net.HttpStatusCode.OK)
{
_logger.LogError("Failed to upload file {FilePath} to S3", message.FilePath);
await _publishEndpoint.Publish<IFileUploadRequestStatusUpdate>(
new FileUploadRequestStatusUpdate(
RequestId: message.RequestId,
Status: RequestStatus.Failed,
FileAccessUrl: null,
ErrorMessage: "An error occurred while uploading file to S3."));
return;
}
var fileAccessUrl = _proxyConfiguration.BaseUrl + "/" + message.FilePath;
_logger.LogInformation("Successfully uploaded file {FilePath} to S3", message.FilePath);
await _publishEndpoint.Publish<IFileUploadRequestStatusUpdate>(
new FileUploadRequestStatusUpdate(
RequestId: message.RequestId,
Status: RequestStatus.Success,
FileAccessUrl: fileAccessUrl,
ErrorMessage: null));
}
}

10
FictionArchive.Service.FileService/Contracts/FileUploadRequestStatusUpdate.cs Normal file
View File

@@ -0,0 +1,10 @@
using FictionArchive.Common.Enums;
using FictionArchive.Service.Shared.Contracts.Events;
namespace FictionArchive.Service.FileService.Contracts;
public record FileUploadRequestStatusUpdate(
Guid RequestId,
RequestStatus Status,
string? FileAccessUrl,
string? ErrorMessage) : IFileUploadRequestStatusUpdate;

10
FictionArchive.Service.FileService/Models/IntegrationEvents/FileUploadRequestCreatedEvent.cs
View File

@@ -1,10 +0,0 @@
using FictionArchive.Service.Shared.Services.EventBus;
namespace FictionArchive.Service.FileService.Models.IntegrationEvents;
public class FileUploadRequestCreatedEvent : IIntegrationEvent
{
public Guid RequestId { get; set; }
public string FilePath { get; set; }
public byte[] FileData { get; set; }
}

22
FictionArchive.Service.FileService/Models/IntegrationEvents/FileUploadRequestStatusUpdateEvent.cs
View File

@@ -1,22 +0,0 @@
using FictionArchive.Common.Enums;
using FictionArchive.Service.Shared.Services.EventBus;
namespace FictionArchive.Service.FileService.Models.IntegrationEvents;
public class FileUploadRequestStatusUpdateEvent : IIntegrationEvent
{
public Guid RequestId { get; set; }
public RequestStatus Status { get; set; }
#region Success
public string? FileAccessUrl { get; set; }
#endregion
#region Failure
public string? ErrorMessage { get; set; }
#endregion
}

19
FictionArchive.Service.FileService/Program.cs
View File

@@ -1,11 +1,9 @@
using Amazon.Runtime;
using Amazon.S3;
using FictionArchive.Common.Extensions;
using FictionArchive.Service.FileService.Consumers;
using FictionArchive.Service.FileService.Models;
using FictionArchive.Service.FileService.Models.IntegrationEvents;
using FictionArchive.Service.FileService.Services.EventHandlers;
using FictionArchive.Service.Shared.Extensions;
using FictionArchive.Service.Shared.Services.EventBus.Implementations;
using Microsoft.Extensions.Options;
namespace FictionArchive.Service.FileService;
@@ -24,14 +22,15 @@ public class Program
builder.Services.AddHealthChecks();
#region Event Bus
#region MassTransit
builder.Services.AddFictionArchiveMassTransit(
builder.Configuration,
x =>
{
x.AddConsumer<FileUploadRequestCreatedConsumer>();
});
builder.Services.AddRabbitMQ(opt =>
{
builder.Configuration.GetSection("RabbitMQ").Bind(opt);
})
.Subscribe<FileUploadRequestCreatedEvent, FileUploadRequestCreatedEventHandler>();
#endregion
// Add authentication with cookie support

58
FictionArchive.Service.FileService/Services/EventHandlers/FileUploadRequestCreatedEventHandler.cs
View File

@@ -1,58 +0,0 @@
using Amazon.S3;
using Amazon.S3.Model;
using FictionArchive.Common.Enums;
using FictionArchive.Service.FileService.Models;
using FictionArchive.Service.FileService.Models.IntegrationEvents;
using FictionArchive.Service.Shared.Services.EventBus;
using Microsoft.Extensions.Options;
namespace FictionArchive.Service.FileService.Services.EventHandlers;
public class FileUploadRequestCreatedEventHandler : IIntegrationEventHandler<FileUploadRequestCreatedEvent>
{
private readonly ILogger<FileUploadRequestCreatedEventHandler> _logger;
private readonly AmazonS3Client _amazonS3Client;
private readonly IEventBus _eventBus;
private readonly S3Configuration _s3Configuration;
private readonly ProxyConfiguration _proxyConfiguration;
public FileUploadRequestCreatedEventHandler(ILogger<FileUploadRequestCreatedEventHandler> logger, AmazonS3Client amazonS3Client, IEventBus eventBus, IOptions<S3Configuration> s3Configuration, IOptions<ProxyConfiguration> proxyConfiguration)
{
_logger = logger;
_amazonS3Client = amazonS3Client;
_eventBus = eventBus;
_proxyConfiguration = proxyConfiguration.Value;
_s3Configuration = s3Configuration.Value;
}
public async Task Handle(FileUploadRequestCreatedEvent @event)
{
var putObjectRequest = new PutObjectRequest();
putObjectRequest.BucketName = _s3Configuration.Bucket;
putObjectRequest.Key = @event.FilePath;
putObjectRequest.UseChunkEncoding = false; // Needed to avoid an error with Garage
using MemoryStream memoryStream = new MemoryStream(@event.FileData);
putObjectRequest.InputStream = memoryStream;
var s3Response = await _amazonS3Client.PutObjectAsync(putObjectRequest);
if (s3Response.HttpStatusCode != System.Net.HttpStatusCode.OK)
{
_logger.LogError("An error occurred while uploading file to S3. Response code: {responsecode}", s3Response.HttpStatusCode);
await _eventBus.Publish(new FileUploadRequestStatusUpdateEvent()
{
RequestId = @event.RequestId,
Status = RequestStatus.Failed,
ErrorMessage = "An error occurred while uploading file to S3."
});
return;
}
await _eventBus.Publish(new FileUploadRequestStatusUpdateEvent()
{
Status = RequestStatus.Success,
RequestId = @event.RequestId,
FileAccessUrl = _proxyConfiguration.BaseUrl + "/" + @event.FilePath
});
}
}

3
FictionArchive.Service.FileService/appsettings.json
View File

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