[FA-misc] Initial MassTransit implementation seems to work

Reviewed-on: #61

FictionArchive.Service.AuthenticationService/Controllers/AuthenticationWebhookController.cs

@@ -1,36 +0,0 @@
-using FictionArchive.Service.AuthenticationService.Models.Requests;
-using FictionArchive.Service.AuthenticationService.Models.IntegrationEvents;
-using FictionArchive.Service.Shared.Services.EventBus;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-
-namespace FictionArchive.Service.AuthenticationService.Controllers
-{
-    [Route("api/[controller]")]
-    [ApiController]
-    public class AuthenticationWebhookController : ControllerBase
-    {
-        private readonly IEventBus _eventBus;
-
-        public AuthenticationWebhookController(IEventBus eventBus)
-        {
-            _eventBus = eventBus;
-        }
-
-        [HttpPost(nameof(UserRegistered))]
-        public async Task<ActionResult> UserRegistered([FromBody] UserRegisteredWebhookPayload payload)
-        {
-            var authUserAddedEvent = new AuthUserAddedEvent
-            {
-                OAuthProviderId = payload.OAuthProviderId,
-                InviterOAuthProviderId = payload.InviterOAuthProviderId,
-                EventUserEmail = payload.EventUserEmail,
-                EventUserUsername = payload.EventUserUsername
-            };
-
-            await _eventBus.Publish(authUserAddedEvent);
-
-            return Ok();
-        }
-    }
-}

FictionArchive.Service.AuthenticationService/Dockerfile

@@ -1,23 +0,0 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
-USER $APP_UID
-WORKDIR /app
-EXPOSE 8080
-EXPOSE 8081
-
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
-ARG BUILD_CONFIGURATION=Release
-WORKDIR /src
-COPY ["FictionArchive.Service.AuthenticationService/FictionArchive.Service.AuthenticationService.csproj", "FictionArchive.Service.AuthenticationService/"]
-RUN dotnet restore "FictionArchive.Service.AuthenticationService/FictionArchive.Service.AuthenticationService.csproj"
-COPY . .
-WORKDIR "/src/FictionArchive.Service.AuthenticationService"
-RUN dotnet build "./FictionArchive.Service.AuthenticationService.csproj" -c $BUILD_CONFIGURATION -o /app/build
-
-FROM build AS publish
-ARG BUILD_CONFIGURATION=Release
-RUN dotnet publish "./FictionArchive.Service.AuthenticationService.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "FictionArchive.Service.AuthenticationService.dll"]

FictionArchive.Service.AuthenticationService/FictionArchive.Service.AuthenticationService.csproj

@@ -1,29 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <Nullable>enable</Nullable>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.7" />
-        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2"/>
-    </ItemGroup>
-
-    <ItemGroup>
-      <Content Include="..\.dockerignore">
-        <Link>.dockerignore</Link>
-      </Content>
-    </ItemGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\FictionArchive.Service.Shared\FictionArchive.Service.Shared.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <Folder Include="Controllers\" />
-    </ItemGroup>
-
-</Project>

FictionArchive.Service.AuthenticationService/FictionArchive.Service.AuthenticationService.http

@@ -1,6 +0,0 @@
-@FictionArchive.Service.AuthenticationService_HostAddress = http://localhost:5091
-
-GET {{FictionArchive.Service.AuthenticationService_HostAddress}}/weatherforecast/
-Accept: application/json
-
-###

FictionArchive.Service.AuthenticationService/Models/IntegrationEvents/AuthUserAddedEvent.cs

@@ -1,16 +0,0 @@
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.AuthenticationService.Models.IntegrationEvents;
-
-public class AuthUserAddedEvent : IIntegrationEvent
-{
-    public string OAuthProviderId { get; set; }
-    
-    public string InviterOAuthProviderId { get; set; }
-
-    // The email of the user that created the event
-    public string EventUserEmail { get; set; }
-
-    // The username of the user that created the event
-    public string EventUserUsername { get; set; }
-}

FictionArchive.Service.AuthenticationService/Models/Requests/UserRegisteredWebhookPayload.cs

@@ -1,17 +0,0 @@
-namespace FictionArchive.Service.AuthenticationService.Models.Requests;
-
-public class UserRegisteredWebhookPayload
-{
-    // The body of the notification message
-    public string Body { get; set; }
-    
-    public string OAuthProviderId { get; set; }
-    
-    public string InviterOAuthProviderId { get; set; }
-
-    // The email of the user that created the event
-    public string EventUserEmail { get; set; }
-
-    // The username of the user that created the event
-    public string EventUserUsername { get; set; }
-}

FictionArchive.Service.AuthenticationService/Program.cs

@@ -1,49 +0,0 @@
-using FictionArchive.Service.Shared;
-using FictionArchive.Service.Shared.Services.EventBus.Implementations;
-
-namespace FictionArchive.Service.AuthenticationService;
-
-public class Program
-{
-    public static void Main(string[] args)
-    {
-        var builder = WebApplication.CreateBuilder(args);
-
-        // Add services to the container.
-
-        builder.Services.AddControllers();
-        // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
-        builder.Services.AddEndpointsApiExplorer();
-        builder.Services.AddSwaggerGen();
-
-        #region Event Bus
-
-        builder.Services.AddRabbitMQ(opt =>
-        {
-            builder.Configuration.GetSection("RabbitMQ").Bind(opt);
-        });
-        
-        #endregion
-
-        builder.Services.AddHealthChecks();
-        
-        var app = builder.Build();
-
-        // Configure the HTTP request pipeline.
-        if (app.Environment.IsDevelopment())
-        {
-            app.UseSwagger();
-            app.UseSwaggerUI();
-        }
-
-        app.UseHttpsRedirection();
-
-        app.MapHealthChecks("/healthz");
-        
-        app.UseAuthorization();
-        
-        app.MapControllers();
-
-        app.Run();
-    }
-}

FictionArchive.Service.AuthenticationService/Properties/launchSettings.json

@@ -1,41 +0,0 @@
-{
-  "$schema": "http://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:23522",
-      "sslPort": 44397
-    }
-  },
-  "profiles": {
-    "http": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:5091",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "https": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "applicationUrl": "https://localhost:7223;http://localhost:5091",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}

FictionArchive.Service.AuthenticationService/appsettings.Development.json

@@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}

FictionArchive.Service.AuthenticationService/appsettings.json

@@ -1,13 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "RabbitMQ": {
-    "ConnectionString": "amqp://localhost",
-    "ClientIdentifier": "AuthenticationService"
-  },
-  "AllowedHosts": "*"
-}

FictionArchive.Service.FileService/Consumers/FileUploadRequestCreatedConsumer.cs

@@ -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));
+    }
+}

FictionArchive.Service.FileService/Contracts/FileUploadRequestStatusUpdate.cs

@@ -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;

FictionArchive.Service.FileService/Models/IntegrationEvents/FileUploadRequestCreatedEvent.cs

@@ -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; }
-}

FictionArchive.Service.FileService/Models/IntegrationEvents/FileUploadRequestStatusUpdateEvent.cs

@@ -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
-}

FictionArchive.Service.FileService/Program.cs

@@ -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,13 +22,14 @@ public class Program
 
         builder.Services.AddHealthChecks();
         
-        #region Event Bus
+        #region MassTransit
 
-        builder.Services.AddRabbitMQ(opt =>
+        builder.Services.AddFictionArchiveMassTransit(
+            builder.Configuration,
+            x =>
             {
-            builder.Configuration.GetSection("RabbitMQ").Bind(opt);
-        })
-        .Subscribe<FileUploadRequestCreatedEvent, FileUploadRequestCreatedEventHandler>();
+                x.AddConsumer<FileUploadRequestCreatedConsumer>();
+            });
 
         #endregion
         

FictionArchive.Service.FileService/Services/EventHandlers/FileUploadRequestCreatedEventHandler.cs

@@ -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
-        });
-    }
-}

FictionArchive.Service.FileService/appsettings.json

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

FictionArchive.Service.NovelService.Tests/NovelUpdateServiceTests.cs

@@ -1,5 +1,4 @@
 using FictionArchive.Common.Enums;
-using FictionArchive.Service.FileService.IntegrationEvents;
 using FictionArchive.Service.NovelService.Models.Configuration;
 using FictionArchive.Service.NovelService.Models.Enums;
 using FictionArchive.Service.NovelService.Models.Images;
@@ -8,9 +7,10 @@ using FictionArchive.Service.NovelService.Models.Novels;
 using FictionArchive.Service.NovelService.Models.SourceAdapters;
 using FictionArchive.Service.NovelService.Services;
 using FictionArchive.Service.NovelService.Services.SourceAdapters;
-using FictionArchive.Service.Shared.Services.EventBus;
+using FictionArchive.Service.Shared.Contracts.Events;
 using FluentAssertions;
 using HtmlAgilityPack;
+using MassTransit;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
@@ -72,7 +72,7 @@ public class NovelUpdateServiceTests
     private static NovelUpdateService CreateService(
         NovelServiceDbContext dbContext,
         ISourceAdapter adapter,
-        IEventBus eventBus,
+        IPublishEndpoint publishEndpoint,
         string pendingImageUrl = "https://pending/placeholder.jpg")
     {
         var options = Options.Create(new NovelUpdateServiceConfiguration
@@ -80,7 +80,7 @@ public class NovelUpdateServiceTests
             PendingImageUrl = pendingImageUrl
         });
 
-        return new NovelUpdateService(dbContext, NullLogger<NovelUpdateService>.Instance, new[] { adapter }, eventBus, options);
+        return new NovelUpdateService(dbContext, NullLogger<NovelUpdateService>.Instance, new[] { adapter }, publishEndpoint, options);
     }
 
     [Fact]
@@ -102,13 +102,13 @@ public class NovelUpdateServiceTests
             ImageData = new List<ImageData> { image1, image2 }
         }));
 
-        var publishedEvents = new List<FileUploadRequestCreatedEvent>();
-        var eventBus = Substitute.For<IEventBus>();
-        eventBus.Publish(Arg.Do<FileUploadRequestCreatedEvent>(publishedEvents.Add)).Returns(Task.CompletedTask);
-        eventBus.Publish(Arg.Any<object>(), Arg.Any<string>()).Returns(Task.CompletedTask);
+        var publishedEvents = new List<IFileUploadRequestCreated>();
+        var publishEndpoint = Substitute.For<IPublishEndpoint>();
+        publishEndpoint.Publish(Arg.Do<IFileUploadRequestCreated>(e => publishedEvents.Add(e)), Arg.Any<CancellationToken>())
+            .Returns(Task.CompletedTask);
 
         var pendingImageUrl = "https://pending/placeholder.jpg";
-        var service = CreateService(dbContext, adapter, eventBus, pendingImageUrl);
+        var service = CreateService(dbContext, adapter, publishEndpoint, pendingImageUrl);
 
         var updatedChapter = await service.PullChapterContents(novel.Id, volume.Id, chapter.Order);
 
@@ -151,11 +151,9 @@ public class NovelUpdateServiceTests
             ImageData = new List<ImageData> { image }
         }));
 
-        var eventBus = Substitute.For<IEventBus>();
-        eventBus.Publish(Arg.Any<FileUploadRequestCreatedEvent>()).Returns(Task.CompletedTask);
-        eventBus.Publish(Arg.Any<object>(), Arg.Any<string>()).Returns(Task.CompletedTask);
+        var publishEndpoint = Substitute.For<IPublishEndpoint>();
 
-        var service = CreateService(dbContext, adapter, eventBus);
+        var service = CreateService(dbContext, adapter, publishEndpoint);
 
         var updatedChapter = await service.PullChapterContents(novel.Id, volume.Id, chapter.Order);
 
@@ -186,8 +184,8 @@ public class NovelUpdateServiceTests
         await dbContext.SaveChangesAsync();
 
         var adapter = Substitute.For<ISourceAdapter>();
-        var eventBus = Substitute.For<IEventBus>();
-        var service = CreateService(dbContext, adapter, eventBus);
+        var publishEndpoint = Substitute.For<IPublishEndpoint>();
+        var service = CreateService(dbContext, adapter, publishEndpoint);
 
         var newUrl = "https://cdn.example.com/uploaded/cover.jpg";
 
@@ -228,8 +226,8 @@ public class NovelUpdateServiceTests
         await dbContext.SaveChangesAsync();
 
         var adapter = Substitute.For<ISourceAdapter>();
-        var eventBus = Substitute.For<IEventBus>();
-        var service = CreateService(dbContext, adapter, eventBus, pendingUrl);
+        var publishEndpoint = Substitute.For<IPublishEndpoint>();
+        var service = CreateService(dbContext, adapter, publishEndpoint, pendingUrl);
 
         var newUrl = "https://cdn.example.com/uploaded/image.jpg";
 
@@ -277,8 +275,8 @@ public class NovelUpdateServiceTests
         await dbContext.SaveChangesAsync();
 
         var adapter = Substitute.For<ISourceAdapter>();
-        var eventBus = Substitute.For<IEventBus>();
-        var service = CreateService(dbContext, adapter, eventBus, pendingUrl);
+        var publishEndpoint = Substitute.For<IPublishEndpoint>();
+        var service = CreateService(dbContext, adapter, publishEndpoint, pendingUrl);
 
         var newUrl = "https://cdn.example.com/uploaded/img1.jpg";
 

FictionArchive.Service.NovelService/Consumers/ChapterPullRequestedConsumer.cs

@@ -0,0 +1,26 @@
+using FictionArchive.Service.NovelService.Services;
+using FictionArchive.Service.Shared.Contracts.Events;
+using MassTransit;
+using Microsoft.Extensions.Logging;
+
+namespace FictionArchive.Service.NovelService.Consumers;
+
+public class ChapterPullRequestedConsumer : IConsumer<IChapterPullRequested>
+{
+    private readonly ILogger<ChapterPullRequestedConsumer> _logger;
+    private readonly NovelUpdateService _novelUpdateService;
+
+    public ChapterPullRequestedConsumer(
+        ILogger<ChapterPullRequestedConsumer> logger,
+        NovelUpdateService novelUpdateService)
+    {
+        _logger = logger;
+        _novelUpdateService = novelUpdateService;
+    }
+
+    public async Task Consume(ConsumeContext<IChapterPullRequested> context)
+    {
+        var message = context.Message;
+        await _novelUpdateService.PullChapterContents(message.NovelId, message.VolumeId, message.ChapterOrder);
+    }
+}

FictionArchive.Service.NovelService/Consumers/FileUploadRequestStatusUpdateConsumer.cs

@@ -0,0 +1,47 @@
+using FictionArchive.Common.Enums;
+using FictionArchive.Service.NovelService.Services;
+using FictionArchive.Service.Shared.Contracts.Events;
+using MassTransit;
+using Microsoft.Extensions.Logging;
+
+namespace FictionArchive.Service.NovelService.Consumers;
+
+public class FileUploadRequestStatusUpdateConsumer : IConsumer<IFileUploadRequestStatusUpdate>
+{
+    private readonly ILogger<FileUploadRequestStatusUpdateConsumer> _logger;
+    private readonly NovelServiceDbContext _dbContext;
+    private readonly NovelUpdateService _novelUpdateService;
+
+    public FileUploadRequestStatusUpdateConsumer(
+        ILogger<FileUploadRequestStatusUpdateConsumer> logger,
+        NovelServiceDbContext dbContext,
+        NovelUpdateService novelUpdateService)
+    {
+        _logger = logger;
+        _dbContext = dbContext;
+        _novelUpdateService = novelUpdateService;
+    }
+
+    public async Task Consume(ConsumeContext<IFileUploadRequestStatusUpdate> context)
+    {
+        var message = context.Message;
+
+        var image = await _dbContext.Images.FindAsync(message.RequestId);
+        if (image == null)
+        {
+            // Not a request we care about.
+            return;
+        }
+
+        if (message.Status == RequestStatus.Failed)
+        {
+            _logger.LogError("Image upload failed for image with id {imageId}", image.Id);
+            return;
+        }
+        else if (message.Status == RequestStatus.Success)
+        {
+            _logger.LogInformation("Image upload succeeded for image with id {imageId}", image.Id);
+            await _novelUpdateService.UpdateImage(image.Id, message.FileAccessUrl);
+        }
+    }
+}

FictionArchive.Service.NovelService/Consumers/NovelUpdateRequestedConsumer.cs

@@ -0,0 +1,26 @@
+using FictionArchive.Service.NovelService.Services;
+using FictionArchive.Service.Shared.Contracts.Events;
+using MassTransit;
+using Microsoft.Extensions.Logging;
+
+namespace FictionArchive.Service.NovelService.Consumers;
+
+public class NovelUpdateRequestedConsumer : IConsumer<INovelUpdateRequested>
+{
+    private readonly ILogger<NovelUpdateRequestedConsumer> _logger;
+    private readonly NovelUpdateService _novelUpdateService;
+
+    public NovelUpdateRequestedConsumer(
+        ILogger<NovelUpdateRequestedConsumer> logger,
+        NovelUpdateService novelUpdateService)
+    {
+        _logger = logger;
+        _novelUpdateService = novelUpdateService;
+    }
+
+    public async Task Consume(ConsumeContext<INovelUpdateRequested> context)
+    {
+        var message = context.Message;
+        await _novelUpdateService.ImportNovel(message.NovelUrl);
+    }
+}

FictionArchive.Service.NovelService/Consumers/TranslationRequestCompletedConsumer.cs

@@ -0,0 +1,48 @@
+using FictionArchive.Service.NovelService.Models.Localization;
+using FictionArchive.Service.NovelService.Services;
+using FictionArchive.Service.Shared.Contracts.Events;
+using MassTransit;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+
+namespace FictionArchive.Service.NovelService.Consumers;
+
+public class TranslationRequestCompletedConsumer : IConsumer<ITranslationRequestCompleted>
+{
+    private readonly ILogger<TranslationRequestCompletedConsumer> _logger;
+    private readonly NovelServiceDbContext _dbContext;
+
+    public TranslationRequestCompletedConsumer(
+        ILogger<TranslationRequestCompletedConsumer> logger,
+        NovelServiceDbContext dbContext)
+    {
+        _logger = logger;
+        _dbContext = dbContext;
+    }
+
+    public async Task Consume(ConsumeContext<ITranslationRequestCompleted> context)
+    {
+        var message = context.Message;
+
+        var localizationRequest = await _dbContext.LocalizationRequests
+            .Include(r => r.KeyRequestedForTranslation)
+            .ThenInclude(lk => lk.Texts)
+            .FirstOrDefaultAsync(lk => lk.Id == message.TranslationRequestId);
+
+        if (localizationRequest == null)
+        {
+            // Not one of our requests, discard it
+            return;
+        }
+
+        localizationRequest.KeyRequestedForTranslation.Texts.Add(new LocalizationText
+        {
+            Language = localizationRequest.TranslateTo,
+            Text = message.TranslatedText,
+            TranslationEngine = localizationRequest.Engine
+        });
+
+        _dbContext.LocalizationRequests.Remove(localizationRequest);
+        await _dbContext.SaveChangesAsync();
+    }
+}

FictionArchive.Service.NovelService/Contracts/ChapterCreated.cs

@@ -0,0 +1,11 @@
+using FictionArchive.Service.Shared.Contracts.Events;
+
+namespace FictionArchive.Service.NovelService.Contracts;
+
+public record ChapterCreated(
+    uint ChapterId,
+    uint NovelId,
+    uint VolumeId,
+    uint VolumeOrder,
+    uint ChapterOrder,
+    string ChapterTitle) : IChapterCreated;

FictionArchive.Service.NovelService/Contracts/ChapterPullRequested.cs

@@ -0,0 +1,8 @@
+using FictionArchive.Service.Shared.Contracts.Events;
+
+namespace FictionArchive.Service.NovelService.Contracts;
+
+public record ChapterPullRequested(
+    uint NovelId,
+    uint VolumeId,
+    uint ChapterOrder) : IChapterPullRequested;

FictionArchive.Service.NovelService/Contracts/FileUploadRequestCreated.cs

@@ -0,0 +1,8 @@
+using FictionArchive.Service.Shared.Contracts.Events;
+
+namespace FictionArchive.Service.NovelService.Contracts;
+
+public record FileUploadRequestCreated(
+    Guid RequestId,
+    string FilePath,
+    byte[] FileData) : IFileUploadRequestCreated;

FictionArchive.Service.NovelService/Contracts/NovelCreated.cs

@@ -0,0 +1,11 @@
+using FictionArchive.Common.Enums;
+using FictionArchive.Service.Shared.Contracts.Events;
+
+namespace FictionArchive.Service.NovelService.Contracts;
+
+public record NovelCreated(
+    uint NovelId,
+    string Title,
+    Language OriginalLanguage,
+    string Source,
+    string AuthorName) : INovelCreated;

FictionArchive.Service.NovelService/Contracts/NovelUpdateRequested.cs

@@ -0,0 +1,6 @@
+using FictionArchive.Service.Shared.Contracts.Events;
+
+namespace FictionArchive.Service.NovelService.Contracts;
+
+public record NovelUpdateRequested(
+    string NovelUrl) : INovelUpdateRequested;

FictionArchive.Service.NovelService/Contracts/TranslationRequestCreated.cs

@@ -0,0 +1,11 @@
+using FictionArchive.Common.Enums;
+using FictionArchive.Service.Shared.Contracts.Events;
+
+namespace FictionArchive.Service.NovelService.Contracts;
+
+public record TranslationRequestCreated(
+    Guid TranslationRequestId,
+    Language From,
+    Language To,
+    string Body,
+    string TranslationEngineKey) : ITranslationRequestCreated;

FictionArchive.Service.NovelService/GraphQL/Mutation.cs

@@ -1,11 +1,10 @@
+using FictionArchive.Service.NovelService.Contracts;
 using FictionArchive.Service.NovelService.Models.Enums;
-using FictionArchive.Service.NovelService.Models.IntegrationEvents;
 using FictionArchive.Service.NovelService.Models.Localization;
 using FictionArchive.Service.NovelService.Models.Novels;
 using FictionArchive.Service.NovelService.Models.SourceAdapters;
 using FictionArchive.Service.NovelService.Services;
 using FictionArchive.Service.NovelService.Services.SourceAdapters;
-using FictionArchive.Service.Shared.Services.EventBus;
 using HotChocolate.Authorization;
 using HotChocolate.Types;
 using Microsoft.EntityFrameworkCore;
@@ -15,13 +14,13 @@ namespace FictionArchive.Service.NovelService.GraphQL;
 public class Mutation
 {
     [Authorize]
-    public async Task<NovelUpdateRequestedEvent> ImportNovel(string novelUrl, NovelUpdateService service)
+    public async Task<NovelUpdateRequested> ImportNovel(string novelUrl, NovelUpdateService service)
     {
         return await service.QueueNovelImport(novelUrl);
     }
 
     [Authorize]
-    public async Task<ChapterPullRequestedEvent> FetchChapterContents(
+    public async Task<ChapterPullRequested> FetchChapterContents(
         uint novelId,
         uint volumeId,
         uint chapterOrder,

FictionArchive.Service.NovelService/Models/IntegrationEvents/ChapterCreatedEvent.cs

@@ -1,13 +0,0 @@
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.NovelService.Models.IntegrationEvents;
-
-public class ChapterCreatedEvent : IIntegrationEvent
-{
-    public required uint ChapterId { get; init; }
-    public required uint NovelId { get; init; }
-    public required uint VolumeId { get; init; }
-    public required int VolumeOrder { get; init; }
-    public required uint ChapterOrder { get; init; }
-    public required string ChapterTitle { get; init; }
-}

FictionArchive.Service.NovelService/Models/IntegrationEvents/ChapterPullRequestedEvent.cs

@@ -1,10 +0,0 @@
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.NovelService.Models.IntegrationEvents;
-
-public class ChapterPullRequestedEvent : IIntegrationEvent
-{
-    public uint NovelId { get; set; }
-    public uint VolumeId { get; set; }
-    public uint ChapterOrder { get; set; }
-}

FictionArchive.Service.NovelService/Models/IntegrationEvents/FileUploadRequestCreatedEvent.cs

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

FictionArchive.Service.NovelService/Models/IntegrationEvents/FileUploadRequestStatusUpdateEvent.cs

@@ -1,22 +0,0 @@
-using FictionArchive.Common.Enums;
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.NovelService.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
-}

FictionArchive.Service.NovelService/Models/IntegrationEvents/NovelCreatedEvent.cs

@@ -1,13 +0,0 @@
-using FictionArchive.Common.Enums;
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.NovelService.Models.IntegrationEvents;
-
-public class NovelCreatedEvent : IIntegrationEvent
-{
-    public required uint NovelId { get; init; }
-    public required string Title { get; init; }
-    public required Language OriginalLanguage { get; init; }
-    public required string Source { get; init; }
-    public required string AuthorName { get; init; }
-}

FictionArchive.Service.NovelService/Models/IntegrationEvents/NovelUpdateRequestedEvent.cs

@@ -1,8 +0,0 @@
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.NovelService.Models.IntegrationEvents;
-
-public class NovelUpdateRequestedEvent : IIntegrationEvent
-{
-    public string NovelUrl { get; set; }
-}

FictionArchive.Service.NovelService/Models/IntegrationEvents/TranslationRequestCompletedEvent.cs

@@ -1,17 +0,0 @@
-using FictionArchive.Common.Enums;
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.NovelService.Models.IntegrationEvents;
-
-public class TranslationRequestCompletedEvent : IIntegrationEvent
-{
-    /// <summary>
-    /// Maps this event back to a triggering request.
-    /// </summary>
-    public Guid? TranslationRequestId { get; set; }
-    
-    /// <summary>
-    /// The resulting text.
-    /// </summary>
-    public string? TranslatedText { get; set; }
-}

FictionArchive.Service.NovelService/Models/IntegrationEvents/TranslationRequestCreatedEvent.cs

@@ -1,13 +0,0 @@
-using FictionArchive.Common.Enums;
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.NovelService.Models.IntegrationEvents;
-
-public class TranslationRequestCreatedEvent : IIntegrationEvent
-{
-    public Guid TranslationRequestId { get; set; }
-    public Language From { get; set; }
-    public Language To { get; set; }
-    public string Body { get; set; }
-    public string TranslationEngineKey { get; set; }
-}

FictionArchive.Service.NovelService/Program.cs

@@ -1,14 +1,12 @@
 using FictionArchive.Common.Extensions;
+using FictionArchive.Service.NovelService.Consumers;
 using FictionArchive.Service.NovelService.GraphQL;
 using FictionArchive.Service.NovelService.Models.Configuration;
-using FictionArchive.Service.NovelService.Models.IntegrationEvents;
 using FictionArchive.Service.NovelService.Services;
-using FictionArchive.Service.NovelService.Services.EventHandlers;
 using FictionArchive.Service.NovelService.Services.SourceAdapters;
 using FictionArchive.Service.NovelService.Services.SourceAdapters.Novelpia;
 using FictionArchive.Service.Shared;
 using FictionArchive.Service.Shared.Extensions;
-using FictionArchive.Service.Shared.Services.EventBus.Implementations;
 using FictionArchive.Service.Shared.Services.GraphQL;
 using Microsoft.EntityFrameworkCore;
 
@@ -25,18 +23,19 @@ public class Program
         
         builder.Services.AddMemoryCache();
         
-        #region Event Bus
+        #region MassTransit
 
         if (!isSchemaExport)
         {
-            builder.Services.AddRabbitMQ(opt =>
+            builder.Services.AddFictionArchiveMassTransit(
+                builder.Configuration,
+                x =>
                 {
-                builder.Configuration.GetSection("RabbitMQ").Bind(opt);
-            })
-                .Subscribe<TranslationRequestCompletedEvent, TranslationRequestCompletedEventHandler>()
-                .Subscribe<NovelUpdateRequestedEvent, NovelUpdateRequestedEventHandler>()
-                .Subscribe<ChapterPullRequestedEvent, ChapterPullRequestedEventHandler>()
-                .Subscribe<FileUploadRequestStatusUpdateEvent, FileUploadRequestStatusUpdateEventHandler>();
+                    x.AddConsumer<TranslationRequestCompletedConsumer>();
+                    x.AddConsumer<FileUploadRequestStatusUpdateConsumer>();
+                    x.AddConsumer<NovelUpdateRequestedConsumer>();
+                    x.AddConsumer<ChapterPullRequestedConsumer>();
+                });
         }
 
         #endregion

FictionArchive.Service.NovelService/Services/EventHandlers/ChapterPullRequestedEventHandler.cs

@@ -1,19 +0,0 @@
-using FictionArchive.Service.NovelService.Models.IntegrationEvents;
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.NovelService.Services.EventHandlers;
-
-public class ChapterPullRequestedEventHandler : IIntegrationEventHandler<ChapterPullRequestedEvent>
-{
-    private readonly NovelUpdateService _novelUpdateService;
-
-    public ChapterPullRequestedEventHandler(NovelUpdateService novelUpdateService)
-    {
-        _novelUpdateService = novelUpdateService;
-    }
-
-    public async Task Handle(ChapterPullRequestedEvent @event)
-    {
-        await _novelUpdateService.PullChapterContents(@event.NovelId, @event.VolumeId, @event.ChapterOrder);
-    }
-}

FictionArchive.Service.NovelService/Services/EventHandlers/FileUploadRequestStatusUpdateEventHandler.cs

@@ -1,39 +0,0 @@
-using FictionArchive.Common.Enums;
-using FictionArchive.Service.NovelService.Models.IntegrationEvents;
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.NovelService.Services.EventHandlers;
-
-public class FileUploadRequestStatusUpdateEventHandler : IIntegrationEventHandler<FileUploadRequestStatusUpdateEvent>
-{
-    private readonly ILogger<FileUploadRequestStatusUpdateEventHandler> _logger;
-    private readonly NovelServiceDbContext _context;
-    private readonly NovelUpdateService _novelUpdateService;
-
-    public FileUploadRequestStatusUpdateEventHandler(ILogger<FileUploadRequestStatusUpdateEventHandler> logger, NovelServiceDbContext context, NovelUpdateService novelUpdateService)
-    {
-        _logger = logger;
-        _context = context;
-        _novelUpdateService = novelUpdateService;
-    }
-
-    public async Task Handle(FileUploadRequestStatusUpdateEvent @event)
-    {
-        var image = await _context.Images.FindAsync(@event.RequestId);
-        if (image == null)
-        {
-            // Not a request we care about.
-            return;
-        }
-        if (@event.Status == RequestStatus.Failed)
-        {
-            _logger.LogError("Image upload failed for image with id {imageId}", image.Id);
-            return;
-        }
-        else if (@event.Status == RequestStatus.Success)
-        {
-            _logger.LogInformation("Image upload succeeded for image with id {imageId}", image.Id);
-            await _novelUpdateService.UpdateImage(image.Id, @event.FileAccessUrl);
-        }
-    }
-}

FictionArchive.Service.NovelService/Services/EventHandlers/NovelUpdateRequestedEventHandler.cs

@@ -1,23 +0,0 @@
-using FictionArchive.Service.NovelService.Models.IntegrationEvents;
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.NovelService.Services.EventHandlers;
-
-public class NovelUpdateRequestedEventHandler : IIntegrationEventHandler<NovelUpdateRequestedEvent>
-{
-    private readonly ILogger<NovelUpdateRequestedEventHandler> _logger;
-    private readonly IEventBus _eventBus;
-    private readonly NovelUpdateService _novelUpdateService;
-
-    public NovelUpdateRequestedEventHandler(ILogger<NovelUpdateRequestedEventHandler> logger, IEventBus eventBus, NovelUpdateService novelUpdateService)
-    {
-        _logger = logger;
-        _eventBus = eventBus;
-        _novelUpdateService = novelUpdateService;
-    }
-
-    public async Task Handle(NovelUpdateRequestedEvent @event)
-    {
-        await _novelUpdateService.ImportNovel(@event.NovelUrl);
-    }
-}

FictionArchive.Service.NovelService/Services/EventHandlers/TranslationRequestCompletedEventHandler.cs

@@ -1,39 +0,0 @@
-using FictionArchive.Service.NovelService.Models.IntegrationEvents;
-using FictionArchive.Service.NovelService.Models.Localization;
-using FictionArchive.Service.Shared.Services.EventBus;
-using Microsoft.EntityFrameworkCore;
-
-namespace FictionArchive.Service.NovelService.Services.EventHandlers;
-
-public class TranslationRequestCompletedEventHandler : IIntegrationEventHandler<TranslationRequestCompletedEvent>
-{
-    private readonly ILogger<TranslationRequestCompletedEventHandler> _logger;
-    private readonly NovelServiceDbContext _dbContext;
-
-    public TranslationRequestCompletedEventHandler(ILogger<TranslationRequestCompletedEventHandler> logger, NovelServiceDbContext dbContext)
-    {
-        _logger = logger;
-        _dbContext = dbContext;
-    }
-
-    public async Task Handle(TranslationRequestCompletedEvent @event)
-    {
-        var localizationRequest = await _dbContext.LocalizationRequests.Include(r => r.KeyRequestedForTranslation)
-            .ThenInclude(lk => lk.Texts)
-            .FirstOrDefaultAsync(lk => lk.Id == @event.TranslationRequestId);
-        if (localizationRequest == null)
-        {
-            // Not one of our requests, discard it
-            return;
-        }
-        
-        localizationRequest.KeyRequestedForTranslation.Texts.Add(new LocalizationText()
-        {
-            Language = localizationRequest.TranslateTo,
-            Text = @event.TranslatedText,
-            TranslationEngine = localizationRequest.Engine
-        });
-        _dbContext.LocalizationRequests.Remove(localizationRequest);
-        await _dbContext.SaveChangesAsync();
-    }
-}

FictionArchive.Service.NovelService/Services/NovelUpdateService.cs

@@ -1,15 +1,15 @@
 using FictionArchive.Common.Enums;
-using FictionArchive.Service.FileService.IntegrationEvents;
+using FictionArchive.Service.NovelService.Contracts;
 using FictionArchive.Service.NovelService.Models.Configuration;
 using FictionArchive.Service.NovelService.Models.Enums;
 using FictionArchive.Service.NovelService.Models.Images;
-using FictionArchive.Service.NovelService.Models.IntegrationEvents;
 using FictionArchive.Service.NovelService.Models.Localization;
 using FictionArchive.Service.NovelService.Models.Novels;
 using FictionArchive.Service.NovelService.Models.SourceAdapters;
 using FictionArchive.Service.NovelService.Services.SourceAdapters;
-using FictionArchive.Service.Shared.Services.EventBus;
+using FictionArchive.Service.Shared.Contracts.Events;
 using HtmlAgilityPack;
+using MassTransit;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 
@@ -20,15 +20,15 @@ public class NovelUpdateService
     private readonly NovelServiceDbContext _dbContext;
     private readonly ILogger<NovelUpdateService> _logger;
     private readonly IEnumerable<ISourceAdapter> _sourceAdapters;
-    private readonly IEventBus _eventBus;
+    private readonly IPublishEndpoint _publishEndpoint;
     private readonly NovelUpdateServiceConfiguration _novelUpdateServiceConfiguration;
 
-    public NovelUpdateService(NovelServiceDbContext dbContext, ILogger<NovelUpdateService> logger, IEnumerable<ISourceAdapter> sourceAdapters, IEventBus eventBus, IOptions<NovelUpdateServiceConfiguration> novelUpdateServiceConfiguration)
+    public NovelUpdateService(NovelServiceDbContext dbContext, ILogger<NovelUpdateService> logger, IEnumerable<ISourceAdapter> sourceAdapters, IPublishEndpoint publishEndpoint, IOptions<NovelUpdateServiceConfiguration> novelUpdateServiceConfiguration)
     {
         _dbContext = dbContext;
         _logger = logger;
         _sourceAdapters = sourceAdapters;
-        _eventBus = eventBus;
+        _publishEndpoint = publishEndpoint;
         _novelUpdateServiceConfiguration = novelUpdateServiceConfiguration.Value;
     }
 
@@ -335,7 +335,8 @@ public class NovelUpdateService
             .ThenInclude(volume => volume.Chapters)
             .ThenInclude(chapter => chapter.Body)
             .ThenInclude(localizationKey => localizationKey.Texts)
-            .Include(n => n.CoverImage)
+            .Include(n => n.CoverImage).Include(novel => novel.Volumes).ThenInclude(volume => volume.Chapters)
+            .ThenInclude(chapter => chapter.Name)
             .FirstOrDefaultAsync(n =>
                 n.ExternalId == metadata.ExternalId &&
                 n.Source.Key == metadata.SourceDescriptor.Key);
@@ -393,14 +394,12 @@ public class NovelUpdateService
         // Publish novel created event for new novels
         if (existingNovel == null)
         {
-            await _eventBus.Publish(new NovelCreatedEvent
-            {
-                NovelId = novel.Id,
-                Title = novel.Name.Texts.First(t => t.Language == novel.RawLanguage).Text,
-                OriginalLanguage = novel.RawLanguage,
-                Source = novel.Source.Key,
-                AuthorName = novel.Author.Name.Texts.First(t => t.Language == novel.RawLanguage).Text
-            });
+            await _publishEndpoint.Publish<INovelCreated>(new NovelCreated(
+                novel.Id,
+                novel.Name.Texts.First(t => t.Language == novel.RawLanguage).Text,
+                novel.RawLanguage,
+                novel.Source.Key,
+                novel.Author.Name.Texts.First(t => t.Language == novel.RawLanguage).Text));
         }
 
         // Publish chapter created events for new chapters
@@ -408,27 +407,23 @@ public class NovelUpdateService
         {
             foreach (var chapter in volume.Chapters.Where(c => !existingChapterIds.Contains(c.Id)))
             {
-                await _eventBus.Publish(new ChapterCreatedEvent
-                {
-                    ChapterId = chapter.Id,
-                    NovelId = novel.Id,
-                    VolumeId = volume.Id,
-                    VolumeOrder = volume.Order,
-                    ChapterOrder = chapter.Order,
-                    ChapterTitle = chapter.Name.Texts.First(t => t.Language == novel.RawLanguage).Text
-                });
+                await _publishEndpoint.Publish<IChapterCreated>(new ChapterCreated(
+                    chapter.Id,
+                    novel.Id,
+                    volume.Id,
+                    (uint)volume.Order,
+                    chapter.Order,
+                    chapter.Name.Texts.First(t => t.Language == novel.RawLanguage).Text));
             }
         }
 
         // Publish cover image event if needed
         if (shouldPublishCoverEvent && novel.CoverImage != null && metadata.CoverImage != null)
         {
-            await _eventBus.Publish(new FileUploadRequestCreatedEvent
-            {
-                RequestId = novel.CoverImage.Id,
-                FileData = metadata.CoverImage.Data,
-                FilePath = $"Novels/{novel.Id}/Images/cover.jpg"
-            });
+            await _publishEndpoint.Publish<IFileUploadRequestCreated>(new FileUploadRequestCreated(
+                novel.CoverImage.Id,
+                $"Novels/{novel.Id}/Images/cover.jpg",
+                metadata.CoverImage.Data));
         }
 
         // Publish chapter pull events for chapters without body content
@@ -440,12 +435,10 @@ public class NovelUpdateService
 
             foreach (var chapter in chaptersNeedingPull)
             {
-                await _eventBus.Publish(new ChapterPullRequestedEvent
-                {
-                    NovelId = novel.Id,
-                    VolumeId = volume.Id,
-                    ChapterOrder = chapter.Order
-                });
+                await _publishEndpoint.Publish<IChapterPullRequested>(new ChapterPullRequested(
+                    novel.Id,
+                    volume.Id,
+                    chapter.Order));
             }
         }
 
@@ -518,12 +511,10 @@ public class NovelUpdateService
         foreach (var image in chapter.Images)
         {
             var data = rawChapter.ImageData.FirstOrDefault(img => img.Url == image.OriginalPath);
-            await _eventBus.Publish(new FileUploadRequestCreatedEvent()
-            {
-                FileData = data.Data,
-                FilePath = $"{novel.Id}/Images/Chapter-{chapter.Id}/{imgCount++}.jpg",
-                RequestId = image.Id
-            });
+            await _publishEndpoint.Publish<IFileUploadRequestCreated>(new FileUploadRequestCreated(
+                image.Id,
+                $"Novels/{novel.Id}/Images/Chapter-{chapter.Id}/{imgCount++}.jpg",
+                data.Data));
         }
 
         return chapter;
@@ -557,25 +548,17 @@ public class NovelUpdateService
         await _dbContext.SaveChangesAsync();
     }
 
-    public async Task<NovelUpdateRequestedEvent> QueueNovelImport(string novelUrl)
+    public async Task<NovelUpdateRequested> QueueNovelImport(string novelUrl)
     {
-        var importNovelRequestEvent = new NovelUpdateRequestedEvent()
-        {
-            NovelUrl = novelUrl
-        };
-        await _eventBus.Publish(importNovelRequestEvent);
+        var importNovelRequestEvent = new NovelUpdateRequested(novelUrl);
+        await _publishEndpoint.Publish<INovelUpdateRequested>(importNovelRequestEvent);
         return importNovelRequestEvent;
     }
 
-    public async Task<ChapterPullRequestedEvent> QueueChapterPull(uint novelId, uint volumeId, uint chapterOrder)
+    public async Task<ChapterPullRequested> QueueChapterPull(uint novelId, uint volumeId, uint chapterOrder)
     {
-        var chapterPullEvent = new ChapterPullRequestedEvent()
-        {
-            NovelId = novelId,
-            VolumeId = volumeId,
-            ChapterOrder = chapterOrder
-        };
-        await _eventBus.Publish(chapterPullEvent);
+        var chapterPullEvent = new ChapterPullRequested(novelId, volumeId, chapterOrder);
+        await _publishEndpoint.Publish<IChapterPullRequested>(chapterPullEvent);
         return chapterPullEvent;
     }
 

FictionArchive.Service.NovelService/appsettings.json

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

FictionArchive.Service.SchedulerService/Models/JobTemplates/EventJobTemplate.cs

@@ -1,4 +1,4 @@
-using FictionArchive.Service.Shared.Services.EventBus;
+using MassTransit;
 using Newtonsoft.Json;
 using Quartz;
 
@@ -6,15 +6,15 @@ namespace FictionArchive.Service.SchedulerService.Models.JobTemplates;
 
 public class EventJobTemplate : IJob
 {
-    private readonly IEventBus _eventBus;
+    private readonly IBus _bus;
     private readonly ILogger<EventJobTemplate> _logger;
 
     public const string EventTypeParameter = "RoutingKey";
     public const string EventDataParameter = "MessageData";
 
-    public EventJobTemplate(IEventBus eventBus, ILogger<EventJobTemplate> logger)
+    public EventJobTemplate(IBus bus, ILogger<EventJobTemplate> logger)
     {
-        _eventBus = eventBus;
+        _bus = bus;
         _logger = logger;
     }
 
@@ -25,7 +25,7 @@ public class EventJobTemplate : IJob
             var eventData = context.MergedJobDataMap.GetString(EventDataParameter);
             var eventType = context.MergedJobDataMap.GetString(EventTypeParameter);
             var eventObject = JsonConvert.DeserializeObject(eventData);
-            await _eventBus.Publish(eventObject, eventType);
+            await _bus.Publish(eventObject);
         }
         catch (Exception ex)
         {

FictionArchive.Service.SchedulerService/Program.cs

@@ -2,7 +2,6 @@ using FictionArchive.Service.SchedulerService.GraphQL;
 using FictionArchive.Service.SchedulerService.Services;
 using FictionArchive.Service.Shared;
 using FictionArchive.Service.Shared.Extensions;
-using FictionArchive.Service.Shared.Services.EventBus.Implementations;
 using Quartz;
 using Quartz.Impl.AdoJobStore;
 
@@ -38,10 +37,7 @@ public class Program
 
         if (!isSchemaExport)
         {
-            builder.Services.AddRabbitMQ(opt =>
-            {
-                builder.Configuration.GetSection("RabbitMQ").Bind(opt);
-            });
+            builder.Services.AddFictionArchiveMassTransit(builder.Configuration);
         }
 
         #endregion

FictionArchive.Service.SchedulerService/Services/JobManagerService.cs

@@ -1,7 +1,6 @@
 using System.Data;
 using FictionArchive.Service.SchedulerService.Models;
 using FictionArchive.Service.SchedulerService.Models.JobTemplates;
-using FictionArchive.Service.Shared.Services.EventBus;
 using Quartz;
 using Quartz.Impl.Matchers;
 

FictionArchive.Service.SchedulerService/appsettings.json

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

FictionArchive.Service.Shared/Contracts/Events/IChapterCreated.cs

@@ -0,0 +1,11 @@
+namespace FictionArchive.Service.Shared.Contracts.Events;
+
+public interface IChapterCreated
+{
+    uint ChapterId { get; }
+    uint NovelId { get; }
+    uint VolumeId { get; }
+    uint VolumeOrder { get; }
+    uint ChapterOrder { get; }
+    string ChapterTitle { get; }
+}

FictionArchive.Service.Shared/Contracts/Events/IChapterPullRequested.cs

@@ -0,0 +1,8 @@
+namespace FictionArchive.Service.Shared.Contracts.Events;
+
+public interface IChapterPullRequested
+{
+    uint NovelId { get; }
+    uint VolumeId { get; }
+    uint ChapterOrder { get; }
+}

FictionArchive.Service.Shared/Contracts/Events/IFileUploadRequestCreated.cs

@@ -0,0 +1,8 @@
+namespace FictionArchive.Service.Shared.Contracts.Events;
+
+public interface IFileUploadRequestCreated
+{
+    Guid RequestId { get; }
+    string FilePath { get; }
+    byte[] FileData { get; }
+}

FictionArchive.Service.Shared/Contracts/Events/IFileUploadRequestStatusUpdate.cs

@@ -0,0 +1,11 @@
+using FictionArchive.Common.Enums;
+
+namespace FictionArchive.Service.Shared.Contracts.Events;
+
+public interface IFileUploadRequestStatusUpdate
+{
+    Guid RequestId { get; }
+    RequestStatus Status { get; }
+    string? FileAccessUrl { get; }
+    string? ErrorMessage { get; }
+}

FictionArchive.Service.Shared/Contracts/Events/INovelCreated.cs

@@ -0,0 +1,12 @@
+using FictionArchive.Common.Enums;
+
+namespace FictionArchive.Service.Shared.Contracts.Events;
+
+public interface INovelCreated
+{
+    uint NovelId { get; }
+    string Title { get; }
+    Language OriginalLanguage { get; }
+    string Source { get; }
+    string AuthorName { get; }
+}

FictionArchive.Service.Shared/Contracts/Events/INovelUpdateRequested.cs

@@ -0,0 +1,6 @@
+namespace FictionArchive.Service.Shared.Contracts.Events;
+
+public interface INovelUpdateRequested
+{
+    string NovelUrl { get; }
+}

FictionArchive.Service.Shared/Contracts/Events/ITranslationRequestCompleted.cs

@@ -0,0 +1,7 @@
+namespace FictionArchive.Service.Shared.Contracts.Events;
+
+public interface ITranslationRequestCompleted
+{
+    Guid? TranslationRequestId { get; }
+    string? TranslatedText { get; }
+}

FictionArchive.Service.Shared/Contracts/Events/ITranslationRequestCreated.cs

@@ -0,0 +1,12 @@
+using FictionArchive.Common.Enums;
+
+namespace FictionArchive.Service.Shared.Contracts.Events;
+
+public interface ITranslationRequestCreated
+{
+    Guid TranslationRequestId { get; }
+    Language From { get; }
+    Language To { get; }
+    string Body { get; }
+    string TranslationEngineKey { get; }
+}

FictionArchive.Service.Shared/Contracts/Events/IUserInvited.cs

@@ -0,0 +1,12 @@
+namespace FictionArchive.Service.Shared.Contracts.Events;
+
+public interface IUserInvited
+{
+    string InvitedUserId { get; }
+    string InvitedUsername { get; }
+    string InvitedEmail { get; }
+    string InvitedOAuthProviderId { get; }
+    string InviterId { get; }
+    string InviterUsername { get; }
+    string InviterOAuthProviderId { get; }
+}

FictionArchive.Service.Shared/Extensions/MassTransitExtensions.cs

@@ -0,0 +1,118 @@
+using System.Text.RegularExpressions;
+using FictionArchive.Service.Shared.Services.Filters;
+using MassTransit;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace FictionArchive.Service.Shared.Extensions;
+
+public static class MassTransitExtensions
+{
+    public static IServiceCollection AddFictionArchiveMassTransit(
+        this IServiceCollection services,
+        IConfiguration configuration,
+        Action<IBusRegistrationConfigurator>? configureConsumers = null)
+    {
+        services.AddMassTransit(x =>
+        {
+            configureConsumers?.Invoke(x);
+
+            x.UsingRabbitMq((context, cfg) =>
+            {
+                var (host, username, password) = ParseRabbitMqConfiguration(configuration);
+
+                cfg.Host(host, h =>
+                {
+                    h.Username(username);
+                    h.Password(password);
+                });
+
+                cfg.UseMessageRetry(r => r.Exponential(
+                    retryLimit: 5,
+                    minInterval: TimeSpan.FromSeconds(1),
+                    maxInterval: TimeSpan.FromMinutes(1),
+                    intervalDelta: TimeSpan.FromSeconds(2)));
+
+                cfg.UseConsumeFilter(typeof(LoggingConsumeFilter<>), context);
+
+                // Process one message at a time per consumer (matches old EventBus behavior)
+                cfg.PrefetchCount = 1;
+
+                cfg.ConfigureEndpoints(context);
+            });
+        });
+
+        return services;
+    }
+
+    /// <summary>
+    /// Parses RabbitMQ configuration from either ConnectionString format or separate Host/Username/Password keys.
+    /// ConnectionString format: amqp://[username:password@]host[:port]
+    /// </summary>
+    private static (string Host, string Username, string Password) ParseRabbitMqConfiguration(IConfiguration configuration)
+    {
+        var connectionString = configuration["RabbitMQ:ConnectionString"];
+
+        if (!string.IsNullOrEmpty(connectionString))
+        {
+            return ParseConnectionString(connectionString);
+        }
+
+        // Fallback to separate configuration keys
+        var host = configuration["RabbitMQ:Host"] ?? "localhost";
+        var username = configuration["RabbitMQ:Username"] ?? "guest";
+        var password = configuration["RabbitMQ:Password"] ?? "guest";
+
+        return (host, username, password);
+    }
+
+    /// <summary>
+    /// Parses an AMQP connection string into host, username, and password components.
+    /// Supports formats:
+    /// - amqp://host
+    /// - amqp://host:port
+    /// - amqp://username:password@host
+    /// - amqp://username:password@host:port
+    /// </summary>
+    private static (string Host, string Username, string Password) ParseConnectionString(string connectionString)
+    {
+        var username = "guest";
+        var password = "guest";
+        var host = "localhost";
+
+        // Try to parse as URI first
+        if (Uri.TryCreate(connectionString, UriKind.Absolute, out var uri))
+        {
+            host = uri.Host;
+
+            if (!string.IsNullOrEmpty(uri.UserInfo))
+            {
+                var userInfoParts = uri.UserInfo.Split(':', 2);
+                username = Uri.UnescapeDataString(userInfoParts[0]);
+                if (userInfoParts.Length > 1)
+                {
+                    password = Uri.UnescapeDataString(userInfoParts[1]);
+                }
+            }
+        }
+        else
+        {
+            // Fallback regex parsing for edge cases
+            var match = Regex.Match(connectionString, @"amqp://(?:([^:]+):([^@]+)@)?([^:/]+)");
+            if (match.Success)
+            {
+                if (match.Groups[1].Success && match.Groups[2].Success)
+                {
+                    username = match.Groups[1].Value;
+                    password = match.Groups[2].Value;
+                }
+                if (match.Groups[3].Success)
+                {
+                    host = match.Groups[3].Value;
+                }
+            }
+        }
+
+        return (host, username, password);
+    }
+}

FictionArchive.Service.Shared/FictionArchive.Service.Shared.csproj

@@ -31,7 +31,7 @@
         <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
         <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime" Version="9.0.4" />
         <PackageReference Include="Polly" Version="8.6.5" />
-        <PackageReference Include="RabbitMQ.Client" Version="7.2.0" />
+        <PackageReference Include="MassTransit.RabbitMQ" Version="8.*" />
         <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.11" />
     </ItemGroup>
     

FictionArchive.Service.Shared/Services/EventBus/EventBusBuilder.cs

@@ -1,25 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-
-namespace FictionArchive.Service.Shared.Services.EventBus;
-
-public class EventBusBuilder<TEventBus> where TEventBus : class, IEventBus
-{
-    private readonly IServiceCollection _services;
-    private readonly SubscriptionManager _subscriptionManager;
-
-    public EventBusBuilder(IServiceCollection services)
-    {
-        _services = services;
-        _services.AddSingleton<IEventBus, TEventBus>();
-        
-        _subscriptionManager = new SubscriptionManager();
-        _services.AddSingleton<SubscriptionManager>(_subscriptionManager);
-    }
-
-    public EventBusBuilder<TEventBus> Subscribe<TEvent, TEventHandler>() where TEvent : IIntegrationEvent where TEventHandler : class, IIntegrationEventHandler<TEvent>
-    {
-        _services.AddKeyedTransient<IIntegrationEventHandler, TEventHandler>(typeof(TEvent).Name);
-        _subscriptionManager.RegisterSubscription<TEvent>();
-        return this;
-    }
-}

FictionArchive.Service.Shared/Services/EventBus/EventBusExtensions.cs

@@ -1,12 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-
-namespace FictionArchive.Service.Shared.Services.EventBus;
-
-public static class EventBusExtensions
-{
-    public static EventBusBuilder<TEventBus> AddEventBus<TEventBus>(this IServiceCollection services)
-        where TEventBus : class, IEventBus
-    {
-        return new EventBusBuilder<TEventBus>(services);
-    }
-}

FictionArchive.Service.Shared/Services/EventBus/IEventBus.cs

@@ -1,7 +0,0 @@
-namespace FictionArchive.Service.Shared.Services.EventBus;
-
-public interface IEventBus
-{
-    Task Publish<TEvent>(TEvent integrationEvent) where TEvent : IIntegrationEvent;
-    Task Publish(object integrationEvent, string eventType);
-}

FictionArchive.Service.Shared/Services/EventBus/IIntegrationEvent.cs

@@ -1,7 +0,0 @@
-using NodaTime;
-
-namespace FictionArchive.Service.Shared.Services.EventBus;
-
-public interface IIntegrationEvent
-{
-}

FictionArchive.Service.Shared/Services/EventBus/IIntegrationEventHandler.cs

@@ -1,12 +0,0 @@
-namespace FictionArchive.Service.Shared.Services.EventBus;
-
-public interface IIntegrationEventHandler<in TEvent> : IIntegrationEventHandler where TEvent : IIntegrationEvent
-{
-    Task Handle(TEvent @event);
-    Task IIntegrationEventHandler.Handle(IIntegrationEvent @event) => Handle((TEvent)@event);
-}
-
-public interface IIntegrationEventHandler
-{
-    Task Handle(IIntegrationEvent @event);
-}

FictionArchive.Service.Shared/Services/EventBus/Implementations/RabbitMQConnectionProvider.cs

@@ -1,35 +0,0 @@
-using RabbitMQ.Client;
-
-namespace FictionArchive.Service.Shared.Services.EventBus.Implementations;
-
-public class RabbitMQConnectionProvider
-{
-    private readonly IConnectionFactory _connectionFactory;
-
-    private IConnection Connection { get; set; }
-    private IChannel DefaultChannel { get; set; }
-
-    public RabbitMQConnectionProvider(IConnectionFactory connectionFactory)
-    {
-        _connectionFactory = connectionFactory;
-    }
-
-    public async Task<IConnection> GetConnectionAsync()
-    {
-        if (Connection == null)
-        {
-            Connection = await _connectionFactory.CreateConnectionAsync();
-        }
-
-        return Connection;
-    }
-    
-    public async Task<IChannel> GetDefaultChannelAsync()
-    {
-        if (DefaultChannel == null)
-        {
-            DefaultChannel = await (await GetConnectionAsync()).CreateChannelAsync();
-        }
-        return DefaultChannel;
-    }
-}

FictionArchive.Service.Shared/Services/EventBus/Implementations/RabbitMQEventBus.cs

@@ -1,137 +0,0 @@
-using System.Text;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using Newtonsoft.Json;
-using NodaTime;
-using NodaTime.Serialization.JsonNet;
-using RabbitMQ.Client;
-using RabbitMQ.Client.Events;
-
-namespace FictionArchive.Service.Shared.Services.EventBus.Implementations;
-
-public class RabbitMQEventBus : IEventBus, IHostedService
-{
-    private readonly IServiceScopeFactory _serviceScopeFactory;
-    private readonly RabbitMQConnectionProvider _connectionProvider;
-    private readonly RabbitMQOptions _options;
-    private readonly SubscriptionManager _subscriptionManager;
-    private readonly ILogger<RabbitMQEventBus> _logger;
-    
-    private readonly JsonSerializerSettings _jsonSerializerSettings;
-
-    private const string ExchangeName = "fiction-archive-event-bus";
-    private const string CreatedAtHeader = "X-Created-At";
-    private const string EventIdHeader = "X-Event-Id";
-
-    public RabbitMQEventBus(IServiceScopeFactory serviceScopeFactory, RabbitMQConnectionProvider connectionProvider, IOptions<RabbitMQOptions> options, SubscriptionManager subscriptionManager, ILogger<RabbitMQEventBus> logger)
-    {
-        _serviceScopeFactory = serviceScopeFactory;
-        _connectionProvider = connectionProvider;
-        _subscriptionManager = subscriptionManager;
-        _logger = logger;
-        _options = options.Value;
-        _jsonSerializerSettings = new JsonSerializerSettings().ConfigureForNodaTime(DateTimeZoneProviders.Tzdb);
-    }
-
-    public async Task Publish<TEvent>(TEvent integrationEvent) where TEvent : IIntegrationEvent
-    {
-        var routingKey = typeof(TEvent).Name;
-        
-        await Publish(integrationEvent, routingKey);
-    }
-
-    public async Task Publish(object integrationEvent, string eventType)
-    {
-        var channel = await _connectionProvider.GetDefaultChannelAsync();
-        var body = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(integrationEvent));
-        
-        // headers
-        var props = new BasicProperties();
-        props.Headers = new Dictionary<string, object?>()
-        {
-            { CreatedAtHeader, Instant.FromDateTimeUtc(DateTime.UtcNow).ToString() },
-            { EventIdHeader, Guid.NewGuid().ToString() }
-        };
-        
-        await channel.BasicPublishAsync(ExchangeName, eventType, true, props, body);
-        _logger.LogInformation("Published event {EventName}", eventType);
-    }
-
-    public async Task StartAsync(CancellationToken cancellationToken)
-    {
-        _ = Task.Factory.StartNew(async () =>
-        {
-            try
-            {
-                var channel = await _connectionProvider.GetDefaultChannelAsync();
-                await channel.ExchangeDeclareAsync(ExchangeName, ExchangeType.Direct,
-                    cancellationToken: cancellationToken);
-
-                await channel.BasicQosAsync(prefetchSize: 0, prefetchCount: 1, global: false, cancellationToken: cancellationToken);
-                await channel.QueueDeclareAsync(_options.ClientIdentifier, true, false, false,
-                    cancellationToken: cancellationToken);
-                var consumer = new AsyncEventingBasicConsumer(channel);
-                consumer.ReceivedAsync += (sender, @event) =>
-                {
-                    return OnReceivedEvent(sender, @event, channel);
-                };
-                
-                await channel.BasicConsumeAsync(_options.ClientIdentifier, false, consumer, cancellationToken: cancellationToken);
-                
-                foreach (var subscription in _subscriptionManager.Subscriptions)
-                {
-                    await channel.QueueBindAsync(_options.ClientIdentifier, ExchangeName, subscription.Key,
-                        cancellationToken: cancellationToken);
-                    _logger.LogInformation("Subscribed to {SubscriptionKey}", subscription.Key);
-                }
-
-                _logger.LogInformation("RabbitMQ EventBus started.");
-            }
-            catch (Exception e)
-            {
-                _logger.LogError(e, "An error occurred while starting the RabbitMQ EventBus");
-            }
-        }, cancellationToken);
-    }
-
-    public Task StopAsync(CancellationToken cancellationToken)
-    {
-        return Task.CompletedTask;
-    }
-    
-    private async Task OnReceivedEvent(object sender, BasicDeliverEventArgs @event, IChannel channel)
-    {
-        var eventName = @event.RoutingKey;
-        _logger.LogInformation("Received event {EventName}", eventName);
-        try
-        {
-            if (!_subscriptionManager.Subscriptions.ContainsKey(eventName))
-            {
-                _logger.LogWarning("Received event without subscription entry.");
-                return;
-            }
-            
-            var eventBody = Encoding.UTF8.GetString(@event.Body.Span);
-            var eventObject = JsonConvert.DeserializeObject(eventBody, _subscriptionManager.Subscriptions[eventName], _jsonSerializerSettings) as IIntegrationEvent;
-            
-            using var scope = _serviceScopeFactory.CreateScope();
-
-            foreach (var service in scope.ServiceProvider.GetKeyedServices<IIntegrationEventHandler>(eventName))
-            {
-                await service.Handle(eventObject);
-            }
-            _logger.LogInformation("Finished handling event with name {EventName}", eventName);
-        }
-        catch (Exception e)
-        {
-            _logger.LogError(e, "An error occurred while handling an event.");
-        }
-        finally
-        {
-            await channel.BasicAckAsync(@event.DeliveryTag, false);
-        }
-
-    }
-}

FictionArchive.Service.Shared/Services/EventBus/Implementations/RabbitMQExtensions.cs

@@ -1,24 +0,0 @@
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
-using RabbitMQ.Client;
-
-namespace FictionArchive.Service.Shared.Services.EventBus.Implementations;
-
-public static class RabbitMQExtensions
-{
-    public static EventBusBuilder<RabbitMQEventBus> AddRabbitMQ(this IServiceCollection services, Action<RabbitMQOptions> configure)
-    {
-        services.Configure(configure);
-        services.AddSingleton<IConnectionFactory, ConnectionFactory>(provider =>
-        {
-            var options = provider.GetService<IOptions<RabbitMQOptions>>();
-            ConnectionFactory factory = new ConnectionFactory();
-            factory.Uri = new Uri(options.Value.ConnectionString);
-            return factory;
-        });
-        services.AddSingleton<RabbitMQConnectionProvider>();
-        services.AddHostedService<RabbitMQEventBus>();
-        return services.AddEventBus<RabbitMQEventBus>();
-    }
-}

FictionArchive.Service.Shared/Services/EventBus/Implementations/RabbitMQOptions.cs

@@ -1,7 +0,0 @@
-namespace FictionArchive.Service.Shared.Services.EventBus.Implementations;
-
-public class RabbitMQOptions
-{
-    public string ConnectionString { get; set; }
-    public string ClientIdentifier { get; set; }
-}

FictionArchive.Service.Shared/Services/EventBus/SubscriptionManager.cs

@@ -1,11 +0,0 @@
-namespace FictionArchive.Service.Shared.Services.EventBus;
-
-public class SubscriptionManager
-{
-    public Dictionary<string, Type> Subscriptions { get; } = new Dictionary<string, Type>();
-
-    public void RegisterSubscription<TEvent>()
-    {
-        Subscriptions.Add(typeof(TEvent).Name, typeof(TEvent));
-    }
-}

FictionArchive.Service.Shared/Services/Filters/LoggingConsumeFilter.cs

@@ -0,0 +1,33 @@
+using MassTransit;
+using Microsoft.Extensions.Logging;
+
+namespace FictionArchive.Service.Shared.Services.Filters;
+
+public class LoggingConsumeFilter<T> : IFilter<ConsumeContext<T>> where T : class
+{
+    private readonly ILogger<LoggingConsumeFilter<T>> _logger;
+
+    public LoggingConsumeFilter(ILogger<LoggingConsumeFilter<T>> logger)
+    {
+        _logger = logger;
+    }
+
+    public async Task Send(ConsumeContext<T> context, IPipe<ConsumeContext<T>> next)
+    {
+        try
+        {
+            await next.Send(context);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex,
+                "Message {MessageType} failed after all retries. MessageId: {MessageId}, ConversationId: {ConversationId}",
+                typeof(T).Name,
+                context.MessageId,
+                context.ConversationId);
+            throw;
+        }
+    }
+
+    public void Probe(ProbeContext context) => context.CreateFilterScope("logging");
+}

FictionArchive.Service.TranslationService/Consumers/TranslationRequestCreatedConsumer.cs

@@ -0,0 +1,53 @@
+using FictionArchive.Service.Shared.Contracts.Events;
+using FictionArchive.Service.TranslationService.Contracts;
+using FictionArchive.Service.TranslationService.Models.Enums;
+using FictionArchive.Service.TranslationService.Services;
+using MassTransit;
+using Microsoft.Extensions.Logging;
+
+namespace FictionArchive.Service.TranslationService.Consumers;
+
+public class TranslationRequestCreatedConsumer : IConsumer<ITranslationRequestCreated>
+{
+    private readonly ILogger<TranslationRequestCreatedConsumer> _logger;
+    private readonly TranslationEngineService _translationEngineService;
+    private readonly IPublishEndpoint _publishEndpoint;
+
+    public TranslationRequestCreatedConsumer(
+        ILogger<TranslationRequestCreatedConsumer> logger,
+        TranslationEngineService translationEngineService,
+        IPublishEndpoint publishEndpoint)
+    {
+        _logger = logger;
+        _translationEngineService = translationEngineService;
+        _publishEndpoint = publishEndpoint;
+    }
+
+    public async Task Consume(ConsumeContext<ITranslationRequestCreated> context)
+    {
+        var message = context.Message;
+
+        _logger.LogInformation("Processing translation request {TranslationRequestId}", message.TranslationRequestId);
+
+        var result = await _translationEngineService.Translate(
+            message.From,
+            message.To,
+            message.Body,
+            message.TranslationEngineKey);
+
+        if (result.Status == TranslationRequestStatus.Success)
+        {
+            await _publishEndpoint.Publish<ITranslationRequestCompleted>(
+                new TranslationRequestCompleted(
+                    TranslationRequestId: message.TranslationRequestId,
+                    TranslatedText: result.TranslatedText));
+
+            _logger.LogInformation("Translation completed for request {TranslationRequestId}", message.TranslationRequestId);
+        }
+        else
+        {
+            _logger.LogError("Translation failed for request {TranslationRequestId}", message.TranslationRequestId);
+            throw new InvalidOperationException($"Translation failed for request {message.TranslationRequestId}");
+        }
+    }
+}

FictionArchive.Service.TranslationService/Contracts/TranslationRequestCompleted.cs

@@ -0,0 +1,7 @@
+using FictionArchive.Service.Shared.Contracts.Events;
+
+namespace FictionArchive.Service.TranslationService.Contracts;
+
+public record TranslationRequestCompleted(
+    Guid? TranslationRequestId,
+    string? TranslatedText) : ITranslationRequestCompleted;

FictionArchive.Service.TranslationService/Models/IntegrationEvents/TranslationRequestCompletedEvent.cs

@@ -1,18 +0,0 @@
-using FictionArchive.Common.Enums;
-using FictionArchive.Service.Shared.Services.EventBus;
-using FictionArchive.Service.TranslationService.Models.Enums;
-
-namespace FictionArchive.Service.TranslationService.Models.IntegrationEvents;
-
-public class TranslationRequestCompletedEvent : IIntegrationEvent
-{
-    /// <summary>
-    /// Maps this event back to a triggering request.
-    /// </summary>
-    public Guid? TranslationRequestId { get; set; }
-    
-    /// <summary>
-    /// The resulting text.
-    /// </summary>
-    public string? TranslatedText { get; set; }
-}

FictionArchive.Service.TranslationService/Models/IntegrationEvents/TranslationRequestCreatedEvent.cs

@@ -1,13 +0,0 @@
-using FictionArchive.Common.Enums;
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.TranslationService.Models.IntegrationEvents;
-
-public class TranslationRequestCreatedEvent : IIntegrationEvent
-{
-    public Guid TranslationRequestId { get; set; }
-    public Language From { get; set; }
-    public Language To { get; set; }
-    public string Body { get; set; }
-    public string TranslationEngineKey { get; set; }
-}

FictionArchive.Service.TranslationService/Program.cs

@@ -2,16 +2,13 @@ using DeepL;
 using FictionArchive.Common.Extensions;
 using FictionArchive.Service.Shared;
 using FictionArchive.Service.Shared.Extensions;
-using FictionArchive.Service.Shared.Services.EventBus.Implementations;
 using FictionArchive.Service.Shared.Services.GraphQL;
+using FictionArchive.Service.TranslationService.Consumers;
 using FictionArchive.Service.TranslationService.GraphQL;
-using FictionArchive.Service.TranslationService.Models.IntegrationEvents;
 using FictionArchive.Service.TranslationService.Services;
 using FictionArchive.Service.TranslationService.Services.Database;
-using FictionArchive.Service.TranslationService.Services.EventHandlers;
 using FictionArchive.Service.TranslationService.Services.TranslationEngines;
 using FictionArchive.Service.TranslationService.Services.TranslationEngines.DeepLTranslate;
-using RabbitMQ.Client;
 
 namespace FictionArchive.Service.TranslationService;
 
@@ -26,15 +23,16 @@ public class Program
 
         builder.Services.AddHealthChecks();
         
-        #region Event Bus
+        #region MassTransit
 
         if (!isSchemaExport)
         {
-            builder.Services.AddRabbitMQ(opt =>
+            builder.Services.AddFictionArchiveMassTransit(
+                builder.Configuration,
+                x =>
                 {
-                builder.Configuration.GetSection("RabbitMQ").Bind(opt);
-            })
-            .Subscribe<TranslationRequestCreatedEvent, TranslationRequestCreatedEventHandler>();
+                    x.AddConsumer<TranslationRequestCreatedConsumer>();
+                });
         }
 
         #endregion

FictionArchive.Service.TranslationService/Services/EventHandlers/TranslationRequestCreatedEventHandler.cs

@@ -1,31 +0,0 @@
-using FictionArchive.Service.Shared.Services.EventBus;
-using FictionArchive.Service.TranslationService.Models.Enums;
-using FictionArchive.Service.TranslationService.Models.IntegrationEvents;
-
-namespace FictionArchive.Service.TranslationService.Services.EventHandlers;
-
-public class TranslationRequestCreatedEventHandler : IIntegrationEventHandler<TranslationRequestCreatedEvent>
-{
-    private readonly ILogger<TranslationRequestCreatedEventHandler> _logger;
-    private readonly TranslationEngineService _translationEngineService;
-    private readonly IEventBus _eventBus;
-
-    public TranslationRequestCreatedEventHandler(ILogger<TranslationRequestCreatedEventHandler> logger, TranslationEngineService translationEngineService)
-    {
-        _logger = logger;
-        _translationEngineService = translationEngineService;
-    }
-
-    public async Task Handle(TranslationRequestCreatedEvent @event)
-    {
-        var result = await _translationEngineService.Translate(@event.From, @event.To, @event.Body, @event.TranslationEngineKey);
-        if (result.Status == TranslationRequestStatus.Success)
-        {
-            await _eventBus.Publish(new TranslationRequestCompletedEvent()
-            {
-                TranslatedText = result.TranslatedText,
-                TranslationRequestId = @event.TranslationRequestId,
-            });
-        }
-    }
-}

FictionArchive.Service.TranslationService/Services/TranslationEngineService.cs

@@ -1,28 +1,21 @@
-using System.Text;
 using FictionArchive.Common.Enums;
-using FictionArchive.Service.Shared.Services.EventBus;
-using FictionArchive.Service.Shared.Services.EventBus.Implementations;
 using FictionArchive.Service.TranslationService.Models;
 using FictionArchive.Service.TranslationService.Models.Database;
 using FictionArchive.Service.TranslationService.Models.Enums;
-using FictionArchive.Service.TranslationService.Models.IntegrationEvents;
 using FictionArchive.Service.TranslationService.Services.Database;
 using FictionArchive.Service.TranslationService.Services.TranslationEngines;
-using RabbitMQ.Client;
 
 namespace FictionArchive.Service.TranslationService.Services;
 
 public class TranslationEngineService
 {
     private readonly IEnumerable<ITranslationEngine> _translationEngines;
-    private readonly IEventBus _eventBus;
     private readonly TranslationServiceDbContext _dbContext;
 
-    public TranslationEngineService(IEnumerable<ITranslationEngine> translationEngines, TranslationServiceDbContext dbContext, IEventBus eventBus)
+    public TranslationEngineService(IEnumerable<ITranslationEngine> translationEngines, TranslationServiceDbContext dbContext)
     {
         _translationEngines = translationEngines;
         _dbContext = dbContext;
-        _eventBus = eventBus;
     }
 
     public async Task<TranslationResult> Translate(Language from, Language to, string text, string translationEngineKey)

FictionArchive.Service.TranslationService/appsettings.json

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

FictionArchive.Service.UserNovelDataService/Consumers/ChapterCreatedConsumer.cs

@@ -1,53 +1,56 @@
-using FictionArchive.Service.Shared.Services.EventBus;
+using FictionArchive.Service.Shared.Contracts.Events;
 using FictionArchive.Service.UserNovelDataService.Models.Database;
-using FictionArchive.Service.UserNovelDataService.Models.IntegrationEvents;
+using FictionArchive.Service.UserNovelDataService.Services;
+using MassTransit;
 using Microsoft.EntityFrameworkCore;
 
-namespace FictionArchive.Service.UserNovelDataService.Services.EventHandlers;
+namespace FictionArchive.Service.UserNovelDataService.Consumers;
 
-public class ChapterCreatedEventHandler : IIntegrationEventHandler<ChapterCreatedEvent>
+public class ChapterCreatedConsumer : IConsumer<IChapterCreated>
 {
+    private readonly ILogger<ChapterCreatedConsumer> _logger;
     private readonly UserNovelDataServiceDbContext _dbContext;
-    private readonly ILogger<ChapterCreatedEventHandler> _logger;
 
-    public ChapterCreatedEventHandler(
-        UserNovelDataServiceDbContext dbContext,
-        ILogger<ChapterCreatedEventHandler> logger)
+    public ChapterCreatedConsumer(
+        ILogger<ChapterCreatedConsumer> logger,
+        UserNovelDataServiceDbContext dbContext)
     {
-        _dbContext = dbContext;
         _logger = logger;
+        _dbContext = dbContext;
     }
 
-    public async Task Handle(ChapterCreatedEvent @event)
+    public async Task Consume(ConsumeContext<IChapterCreated> context)
     {
+        var message = context.Message;
+
         // Ensure novel exists
-        var novelExists = await _dbContext.Novels.AnyAsync(n => n.Id == @event.NovelId);
+        var novelExists = await _dbContext.Novels.AnyAsync(n => n.Id == message.NovelId);
         if (!novelExists)
         {
-            var novel = new Novel { Id = @event.NovelId };
+            var novel = new Novel { Id = message.NovelId };
             _dbContext.Novels.Add(novel);
         }
 
         // Ensure volume exists
-        var volumeExists = await _dbContext.Volumes.AnyAsync(v => v.Id == @event.VolumeId);
+        var volumeExists = await _dbContext.Volumes.AnyAsync(v => v.Id == message.VolumeId);
         if (!volumeExists)
         {
-            var volume = new Volume { Id = @event.VolumeId };
+            var volume = new Volume { Id = message.VolumeId };
             _dbContext.Volumes.Add(volume);
         }
 
         // Create chapter if not exists
-        var chapterExists = await _dbContext.Chapters.AnyAsync(c => c.Id == @event.ChapterId);
+        var chapterExists = await _dbContext.Chapters.AnyAsync(c => c.Id == message.ChapterId);
         if (chapterExists)
         {
-            _logger.LogDebug("Chapter {ChapterId} already exists, skipping", @event.ChapterId);
+            _logger.LogDebug("Chapter {ChapterId} already exists, skipping", message.ChapterId);
             return;
         }
 
-        var chapter = new Chapter { Id = @event.ChapterId };
+        var chapter = new Chapter { Id = message.ChapterId };
         _dbContext.Chapters.Add(chapter);
         await _dbContext.SaveChangesAsync();
 
-        _logger.LogInformation("Created chapter stub for {ChapterId} in novel {NovelId}", @event.ChapterId, @event.NovelId);
+        _logger.LogInformation("Created chapter stub for {ChapterId} in novel {NovelId}", message.ChapterId, message.NovelId);
     }
 }

FictionArchive.Service.UserNovelDataService/Consumers/NovelCreatedConsumer.cs

@@ -0,0 +1,39 @@
+using FictionArchive.Service.Shared.Contracts.Events;
+using FictionArchive.Service.UserNovelDataService.Models.Database;
+using FictionArchive.Service.UserNovelDataService.Services;
+using MassTransit;
+using Microsoft.EntityFrameworkCore;
+
+namespace FictionArchive.Service.UserNovelDataService.Consumers;
+
+public class NovelCreatedConsumer : IConsumer<INovelCreated>
+{
+    private readonly ILogger<NovelCreatedConsumer> _logger;
+    private readonly UserNovelDataServiceDbContext _dbContext;
+
+    public NovelCreatedConsumer(
+        ILogger<NovelCreatedConsumer> logger,
+        UserNovelDataServiceDbContext dbContext)
+    {
+        _logger = logger;
+        _dbContext = dbContext;
+    }
+
+    public async Task Consume(ConsumeContext<INovelCreated> context)
+    {
+        var message = context.Message;
+
+        var exists = await _dbContext.Novels.AnyAsync(n => n.Id == message.NovelId);
+        if (exists)
+        {
+            _logger.LogDebug("Novel {NovelId} already exists, skipping", message.NovelId);
+            return;
+        }
+
+        var novel = new Novel { Id = message.NovelId };
+        _dbContext.Novels.Add(novel);
+        await _dbContext.SaveChangesAsync();
+
+        _logger.LogInformation("Created novel stub for {NovelId}", message.NovelId);
+    }
+}

FictionArchive.Service.UserNovelDataService/Consumers/UserInvitedConsumer.cs

@@ -0,0 +1,44 @@
+using FictionArchive.Service.Shared.Contracts.Events;
+using FictionArchive.Service.UserNovelDataService.Models.Database;
+using FictionArchive.Service.UserNovelDataService.Services;
+using MassTransit;
+using Microsoft.EntityFrameworkCore;
+
+namespace FictionArchive.Service.UserNovelDataService.Consumers;
+
+public class UserInvitedConsumer : IConsumer<IUserInvited>
+{
+    private readonly ILogger<UserInvitedConsumer> _logger;
+    private readonly UserNovelDataServiceDbContext _dbContext;
+
+    public UserInvitedConsumer(
+        ILogger<UserInvitedConsumer> logger,
+        UserNovelDataServiceDbContext dbContext)
+    {
+        _logger = logger;
+        _dbContext = dbContext;
+    }
+
+    public async Task Consume(ConsumeContext<IUserInvited> context)
+    {
+        var message = context.Message;
+
+        var userId = Guid.Parse(message.InvitedUserId);
+        var exists = await _dbContext.Users.AnyAsync(u => u.Id == userId);
+        if (exists)
+        {
+            _logger.LogDebug("User {UserId} already exists, skipping", message.InvitedUserId);
+            return;
+        }
+
+        var user = new User
+        {
+            Id = userId,
+            OAuthProviderId = message.InvitedOAuthProviderId
+        };
+        _dbContext.Users.Add(user);
+        await _dbContext.SaveChangesAsync();
+
+        _logger.LogInformation("Created user stub for {UserId}", message.InvitedUserId);
+    }
+}

FictionArchive.Service.UserNovelDataService/Models/IntegrationEvents/ChapterCreatedEvent.cs

@@ -1,13 +0,0 @@
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.UserNovelDataService.Models.IntegrationEvents;
-
-public class ChapterCreatedEvent : IIntegrationEvent
-{
-    public required uint ChapterId { get; init; }
-    public required uint NovelId { get; init; }
-    public required uint VolumeId { get; init; }
-    public required int VolumeOrder { get; init; }
-    public required uint ChapterOrder { get; init; }
-    public required string ChapterTitle { get; init; }
-}

FictionArchive.Service.UserNovelDataService/Models/IntegrationEvents/NovelCreatedEvent.cs

@@ -1,13 +0,0 @@
-using FictionArchive.Common.Enums;
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.UserNovelDataService.Models.IntegrationEvents;
-
-public class NovelCreatedEvent : IIntegrationEvent
-{
-    public required uint NovelId { get; init; }
-    public required string Title { get; init; }
-    public required Language OriginalLanguage { get; init; }
-    public required string Source { get; init; }
-    public required string AuthorName { get; init; }
-}

FictionArchive.Service.UserNovelDataService/Models/IntegrationEvents/UserInvitedEvent.cs

@@ -1,15 +0,0 @@
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.UserNovelDataService.Models.IntegrationEvents;
-
-public class UserInvitedEvent : IIntegrationEvent
-{
-    public Guid InvitedUserId { get; set; }
-    public required string InvitedUsername { get; set; }
-    public required string InvitedEmail { get; set; }
-    public required string InvitedOAuthProviderId { get; set; }
-
-    public Guid InviterId { get; set; }
-    public required string InviterUsername { get; set; }
-    public required string InviterOAuthProviderId { get; set; }
-}

FictionArchive.Service.UserNovelDataService/Program.cs

@@ -1,11 +1,9 @@
 using FictionArchive.Common.Extensions;
 using FictionArchive.Service.Shared;
 using FictionArchive.Service.Shared.Extensions;
-using FictionArchive.Service.Shared.Services.EventBus.Implementations;
+using FictionArchive.Service.UserNovelDataService.Consumers;
 using FictionArchive.Service.UserNovelDataService.GraphQL;
-using FictionArchive.Service.UserNovelDataService.Models.IntegrationEvents;
 using FictionArchive.Service.UserNovelDataService.Services;
-using FictionArchive.Service.UserNovelDataService.Services.EventHandlers;
 
 namespace FictionArchive.Service.UserNovelDataService;
 
@@ -22,17 +20,18 @@ public class Program
         builder.Services.AddMemoryCache();
         builder.Services.AddHealthChecks();
         
-        #region Event Bus
+        #region MassTransit
 
         if (!isSchemaExport)
         {
-            builder.Services.AddRabbitMQ(opt =>
+            builder.Services.AddFictionArchiveMassTransit(
+                builder.Configuration,
+                x =>
                 {
-                builder.Configuration.GetSection("RabbitMQ").Bind(opt);
-            })
-                .Subscribe<NovelCreatedEvent, NovelCreatedEventHandler>()
-                .Subscribe<ChapterCreatedEvent, ChapterCreatedEventHandler>()
-                .Subscribe<UserInvitedEvent, UserInvitedEventHandler>();
+                    x.AddConsumer<NovelCreatedConsumer>();
+                    x.AddConsumer<ChapterCreatedConsumer>();
+                    x.AddConsumer<UserInvitedConsumer>();
+                });
         }
 
         #endregion

FictionArchive.Service.UserNovelDataService/Services/EventHandlers/NovelCreatedEventHandler.cs

@@ -1,36 +0,0 @@
-using FictionArchive.Service.Shared.Services.EventBus;
-using FictionArchive.Service.UserNovelDataService.Models.Database;
-using FictionArchive.Service.UserNovelDataService.Models.IntegrationEvents;
-using Microsoft.EntityFrameworkCore;
-
-namespace FictionArchive.Service.UserNovelDataService.Services.EventHandlers;
-
-public class NovelCreatedEventHandler : IIntegrationEventHandler<NovelCreatedEvent>
-{
-    private readonly UserNovelDataServiceDbContext _dbContext;
-    private readonly ILogger<NovelCreatedEventHandler> _logger;
-
-    public NovelCreatedEventHandler(
-        UserNovelDataServiceDbContext dbContext,
-        ILogger<NovelCreatedEventHandler> logger)
-    {
-        _dbContext = dbContext;
-        _logger = logger;
-    }
-
-    public async Task Handle(NovelCreatedEvent @event)
-    {
-        var exists = await _dbContext.Novels.AnyAsync(n => n.Id == @event.NovelId);
-        if (exists)
-        {
-            _logger.LogDebug("Novel {NovelId} already exists, skipping", @event.NovelId);
-            return;
-        }
-
-        var novel = new Novel { Id = @event.NovelId };
-        _dbContext.Novels.Add(novel);
-        await _dbContext.SaveChangesAsync();
-
-        _logger.LogInformation("Created novel stub for {NovelId}", @event.NovelId);
-    }
-}

FictionArchive.Service.UserNovelDataService/Services/EventHandlers/UserInvitedEventHandler.cs

@@ -1,40 +0,0 @@
-using FictionArchive.Service.Shared.Services.EventBus;
-using FictionArchive.Service.UserNovelDataService.Models.Database;
-using FictionArchive.Service.UserNovelDataService.Models.IntegrationEvents;
-using Microsoft.EntityFrameworkCore;
-
-namespace FictionArchive.Service.UserNovelDataService.Services.EventHandlers;
-
-public class UserInvitedEventHandler : IIntegrationEventHandler<UserInvitedEvent>
-{
-    private readonly UserNovelDataServiceDbContext _dbContext;
-    private readonly ILogger<UserInvitedEventHandler> _logger;
-
-    public UserInvitedEventHandler(
-        UserNovelDataServiceDbContext dbContext,
-        ILogger<UserInvitedEventHandler> logger)
-    {
-        _dbContext = dbContext;
-        _logger = logger;
-    }
-
-    public async Task Handle(UserInvitedEvent @event)
-    {
-        var exists = await _dbContext.Users.AnyAsync(u => u.Id == @event.InvitedUserId);
-        if (exists)
-        {
-            _logger.LogDebug("User {UserId} already exists, skipping", @event.InvitedUserId);
-            return;
-        }
-
-        var user = new User
-        {
-            Id = @event.InvitedUserId,
-            OAuthProviderId = @event.InvitedOAuthProviderId
-        };
-        _dbContext.Users.Add(user);
-        await _dbContext.SaveChangesAsync();
-
-        _logger.LogInformation("Created user stub for {UserId}", @event.InvitedUserId);
-    }
-}

FictionArchive.Service.UserNovelDataService/appsettings.json

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

FictionArchive.Service.UserService.Tests/UserManagementServiceTests.cs

@@ -1,9 +1,9 @@
-using FictionArchive.Service.Shared.Services.EventBus;
 using FictionArchive.Service.UserService.Models.Database;
 using FictionArchive.Service.UserService.Services;
 using FictionArchive.Service.UserService.Services.AuthenticationClient;
 using FictionArchive.Service.UserService.Services.AuthenticationClient.Authentik;
 using FluentAssertions;
+using MassTransit;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging.Abstractions;
 using NSubstitute;
@@ -27,13 +27,13 @@ public class UserManagementServiceTests
     private static UserManagementService CreateService(
         UserServiceDbContext dbContext,
         IAuthenticationServiceClient authClient,
-        IEventBus? eventBus = null)
+        IPublishEndpoint? publishEndpoint = null)
     {
         return new UserManagementService(
             dbContext,
             NullLogger<UserManagementService>.Instance,
             authClient,
-            eventBus ?? Substitute.For<IEventBus>());
+            publishEndpoint ?? Substitute.For<IPublishEndpoint>());
     }
 
     private static User CreateTestUser(string username, string email, int availableInvites = 5)

FictionArchive.Service.UserService/Contracts/UserInvited.cs

@@ -0,0 +1,12 @@
+using FictionArchive.Service.Shared.Contracts.Events;
+
+namespace FictionArchive.Service.UserService.Contracts;
+
+public record UserInvited(
+    string InvitedUserId,
+    string InvitedUsername,
+    string InvitedEmail,
+    string InvitedOAuthProviderId,
+    string InviterId,
+    string InviterUsername,
+    string InviterOAuthProviderId) : IUserInvited;

FictionArchive.Service.UserService/Models/IntegrationEvents/UserInvitedEvent.cs

@@ -1,17 +0,0 @@
-using FictionArchive.Service.Shared.Services.EventBus;
-
-namespace FictionArchive.Service.UserService.Models.IntegrationEvents;
-
-public class UserInvitedEvent : IIntegrationEvent
-{
-    // Invited user info
-    public Guid InvitedUserId { get; set; }
-    public required string InvitedUsername { get; set; }
-    public required string InvitedEmail { get; set; }
-    public required string InvitedOAuthProviderId { get; set; }
-
-    // Inviter info
-    public Guid InviterId { get; set; }
-    public required string InviterUsername { get; set; }
-    public required string InviterOAuthProviderId { get; set; }
-}

FictionArchive.Service.UserService/Program.cs

@@ -2,7 +2,6 @@ using System.Net.Http.Headers;
 using FictionArchive.Common.Extensions;
 using FictionArchive.Service.Shared;
 using FictionArchive.Service.Shared.Extensions;
-using FictionArchive.Service.Shared.Services.EventBus.Implementations;
 using FictionArchive.Service.UserService.GraphQL;
 using FictionArchive.Service.UserService.Services;
 using FictionArchive.Service.UserService.Services.AuthenticationClient;
@@ -19,15 +18,9 @@ public class Program
         var builder = WebApplication.CreateBuilder(args);
         builder.AddLocalAppsettings();
 
-        #region Event Bus
+        #region MassTransit
 
-        if (!isSchemaExport)
-        {
-            builder.Services.AddRabbitMQ(opt =>
-            {
-                builder.Configuration.GetSection("RabbitMQ").Bind(opt);
-            });
-        }
+        builder.Services.AddFictionArchiveMassTransit(builder.Configuration);
 
         #endregion
 

FictionArchive.Service.UserService/Services/UserManagementService.cs

@@ -1,7 +1,8 @@
-using FictionArchive.Service.Shared.Services.EventBus;
+using FictionArchive.Service.Shared.Contracts.Events;
+using FictionArchive.Service.UserService.Contracts;
 using FictionArchive.Service.UserService.Models.Database;
-using FictionArchive.Service.UserService.Models.IntegrationEvents;
 using FictionArchive.Service.UserService.Services.AuthenticationClient;
+using MassTransit;
 using Microsoft.EntityFrameworkCore;
 
 namespace FictionArchive.Service.UserService.Services;
@@ -11,18 +12,18 @@ public class UserManagementService
     private readonly ILogger<UserManagementService> _logger;
     private readonly UserServiceDbContext _dbContext;
     private readonly IAuthenticationServiceClient _authClient;
-    private readonly IEventBus _eventBus;
+    private readonly IPublishEndpoint _publishEndpoint;
 
     public UserManagementService(
         UserServiceDbContext dbContext,
         ILogger<UserManagementService> logger,
         IAuthenticationServiceClient authClient,
-        IEventBus eventBus)
+        IPublishEndpoint publishEndpoint)
     {
         _dbContext = dbContext;
         _logger = logger;
         _authClient = authClient;
-        _eventBus = eventBus;
+        _publishEndpoint = publishEndpoint;
     }
 
     /// <summary>
@@ -99,16 +100,14 @@ public class UserManagementService
 
         await _dbContext.SaveChangesAsync();
 
-        await _eventBus.Publish(new UserInvitedEvent
-        {
-            InvitedUserId = newUser.Id,
-            InvitedUsername = newUser.Username,
-            InvitedEmail = newUser.Email,
-            InvitedOAuthProviderId = newUser.OAuthProviderId,
-            InviterId = inviter.Id,
-            InviterUsername = inviter.Username,
-            InviterOAuthProviderId = inviter.OAuthProviderId
-        });
+        await _publishEndpoint.Publish<IUserInvited>(new UserInvited(
+            InvitedUserId: newUser.Id.ToString(),
+            InvitedUsername: newUser.Username,
+            InvitedEmail: newUser.Email,
+            InvitedOAuthProviderId: newUser.OAuthProviderId,
+            InviterId: inviter.Id.ToString(),
+            InviterUsername: inviter.Username,
+            InviterOAuthProviderId: inviter.OAuthProviderId));
 
         _logger.LogInformation(
             "User {Username} was successfully invited by {InviterId}. New user id: {NewUserId}",

FictionArchive.Service.UserService/appsettings.json

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

fictionarchive-web-astro/package-lock.json

@@ -8,6 +8,7 @@
       "name": "fictionarchive-web-astro",
       "version": "0.0.1",
       "dependencies": {
+        "@astrojs/check": "^0.9.6",
         "@astrojs/node": "^9.5.1",
         "@astrojs/svelte": "^7.2.2",
         "@tailwindcss/vite": "^4.1.17",
@@ -142,6 +143,24 @@
       "integrity": "sha512-n8GuYSrI9bF7FFZ/SjhwevlHc8xaVlb/7HmHelnc/PZXBD2ZR49NnN9sMMuDdEGPeeRQ5d0hqlSlEpgCX3Wl0Q==",
       "license": "MIT"
     },
+    "node_modules/@astrojs/check": {
+      "version": "0.9.6",
+      "resolved": "https://registry.npmjs.org/@astrojs/check/-/check-0.9.6.tgz",
+      "integrity": "sha512-jlaEu5SxvSgmfGIFfNgcn5/f+29H61NJzEMfAZ82Xopr4XBchXB1GVlcJsE+elUlsYSbXlptZLX+JMG3b/wZEA==",
+      "license": "MIT",
+      "dependencies": {
+        "@astrojs/language-server": "^2.16.1",
+        "chokidar": "^4.0.1",
+        "kleur": "^4.1.5",
+        "yargs": "^17.7.2"
+      },
+      "bin": {
+        "astro-check": "bin/astro-check.js"
+      },
+      "peerDependencies": {
+        "typescript": "^5.0.0"
+      }
+    },
     "node_modules/@astrojs/compiler": {
       "version": "2.13.0",
       "resolved": "https://registry.npmjs.org/@astrojs/compiler/-/compiler-2.13.0.tgz",
@@ -155,6 +174,47 @@
       "integrity": "sha512-vreGnYSSKhAjFJCWAwe/CNhONvoc5lokxtRoZims+0wa3KbHBdPHSSthJsKxPd8d/aic6lWKpRTYGY/hsgK6EA==",
       "license": "MIT"
     },
+    "node_modules/@astrojs/language-server": {
+      "version": "2.16.3",
+      "resolved": "https://registry.npmjs.org/@astrojs/language-server/-/language-server-2.16.3.tgz",
+      "integrity": "sha512-yO5K7RYCMXUfeDlnU6UnmtnoXzpuQc0yhlaCNZ67k1C/MiwwwvMZz+LGa+H35c49w5QBfvtr4w4Zcf5PcH8uYA==",
+      "license": "MIT",
+      "dependencies": {
+        "@astrojs/compiler": "^2.13.0",
+        "@astrojs/yaml2ts": "^0.2.2",
+        "@jridgewell/sourcemap-codec": "^1.5.5",
+        "@volar/kit": "~2.4.27",
+        "@volar/language-core": "~2.4.27",
+        "@volar/language-server": "~2.4.27",
+        "@volar/language-service": "~2.4.27",
+        "muggle-string": "^0.4.1",
+        "tinyglobby": "^0.2.15",
+        "volar-service-css": "0.0.68",
+        "volar-service-emmet": "0.0.68",
+        "volar-service-html": "0.0.68",
+        "volar-service-prettier": "0.0.68",
+        "volar-service-typescript": "0.0.68",
+        "volar-service-typescript-twoslash-queries": "0.0.68",
+        "volar-service-yaml": "0.0.68",
+        "vscode-html-languageservice": "^5.6.1",
+        "vscode-uri": "^3.1.0"
+      },
+      "bin": {
+        "astro-ls": "bin/nodeServer.js"
+      },
+      "peerDependencies": {
+        "prettier": "^3.0.0",
+        "prettier-plugin-astro": ">=0.11.0"
+      },
+      "peerDependenciesMeta": {
+        "prettier": {
+          "optional": true
+        },
+        "prettier-plugin-astro": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@astrojs/markdown-remark": {
       "version": "6.3.9",
       "resolved": "https://registry.npmjs.org/@astrojs/markdown-remark/-/markdown-remark-6.3.9.tgz",
@@ -247,6 +307,15 @@
         "node": "18.20.8 || ^20.3.0 || >=22.0.0"
       }
     },
+    "node_modules/@astrojs/yaml2ts": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/@astrojs/yaml2ts/-/yaml2ts-0.2.2.tgz",
+      "integrity": "sha512-GOfvSr5Nqy2z5XiwqTouBBpy5FyI6DEe+/g/Mk5am9SjILN1S5fOEvYK0GuWHg98yS/dobP4m8qyqw/URW35fQ==",
+      "license": "MIT",
+      "dependencies": {
+        "yaml": "^2.5.0"
+      }
+    },
     "node_modules/@babel/code-frame": {
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
@@ -666,6 +735,61 @@
         "node": ">=18"
       }
     },
+    "node_modules/@emmetio/abbreviation": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/@emmetio/abbreviation/-/abbreviation-2.3.3.tgz",
+      "integrity": "sha512-mgv58UrU3rh4YgbE/TzgLQwJ3pFsHHhCLqY20aJq+9comytTXUDNGG/SMtSeMJdkpxgXSXunBGLD8Boka3JyVA==",
+      "license": "MIT",
+      "dependencies": {
+        "@emmetio/scanner": "^1.0.4"
+      }
+    },
+    "node_modules/@emmetio/css-abbreviation": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/@emmetio/css-abbreviation/-/css-abbreviation-2.1.8.tgz",
+      "integrity": "sha512-s9yjhJ6saOO/uk1V74eifykk2CBYi01STTK3WlXWGOepyKa23ymJ053+DNQjpFcy1ingpaO7AxCcwLvHFY9tuw==",
+      "license": "MIT",
+      "dependencies": {
+        "@emmetio/scanner": "^1.0.4"
+      }
+    },
+    "node_modules/@emmetio/css-parser": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@emmetio/css-parser/-/css-parser-0.4.1.tgz",
+      "integrity": "sha512-2bC6m0MV/voF4CTZiAbG5MWKbq5EBmDPKu9Sb7s7nVcEzNQlrZP6mFFFlIaISM8X6514H9shWMme1fCm8cWAfQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@emmetio/stream-reader": "^2.2.0",
+        "@emmetio/stream-reader-utils": "^0.1.0"
+      }
+    },
+    "node_modules/@emmetio/html-matcher": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@emmetio/html-matcher/-/html-matcher-1.3.0.tgz",
+      "integrity": "sha512-NTbsvppE5eVyBMuyGfVu2CRrLvo7J4YHb6t9sBFLyY03WYhXET37qA4zOYUjBWFCRHO7pS1B9khERtY0f5JXPQ==",
+      "license": "ISC",
+      "dependencies": {
+        "@emmetio/scanner": "^1.0.0"
+      }
+    },
+    "node_modules/@emmetio/scanner": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@emmetio/scanner/-/scanner-1.0.4.tgz",
+      "integrity": "sha512-IqRuJtQff7YHHBk4G8YZ45uB9BaAGcwQeVzgj/zj8/UdOhtQpEIupUhSk8dys6spFIWVZVeK20CzGEnqR5SbqA==",
+      "license": "MIT"
+    },
+    "node_modules/@emmetio/stream-reader": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@emmetio/stream-reader/-/stream-reader-2.2.0.tgz",
+      "integrity": "sha512-fXVXEyFA5Yv3M3n8sUGT7+fvecGrZP4k6FnWWMSZVQf69kAq0LLpaBQLGcPR30m3zMmKYhECP4k/ZkzvhEW5kw==",
+      "license": "MIT"
+    },
+    "node_modules/@emmetio/stream-reader-utils": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@emmetio/stream-reader-utils/-/stream-reader-utils-0.1.0.tgz",
+      "integrity": "sha512-ZsZ2I9Vzso3Ho/pjZFsmmZ++FWeEd/txqybHTm4OgaZzdS8V9V/YYWQwg5TC38Z7uLWUV1vavpLLbjJtKubR1A==",
+      "license": "MIT"
+    },
     "node_modules/@emnapi/runtime": {
       "version": "1.7.1",
       "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.7.1.tgz",
@@ -4332,6 +4456,96 @@
         "svelte": "^3.0.0 || ^4.0.0 || ^5.0.0"
       }
     },
+    "node_modules/@volar/kit": {
+      "version": "2.4.27",
+      "resolved": "https://registry.npmjs.org/@volar/kit/-/kit-2.4.27.tgz",
+      "integrity": "sha512-ilZoQDMLzqmSsImJRWx4YiZ4FcvvPrPnFVmL6hSsIWB6Bn3qc7k88J9yP32dagrs5Y8EXIlvvD/mAFaiuEOACQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@volar/language-service": "2.4.27",
+        "@volar/typescript": "2.4.27",
+        "typesafe-path": "^0.2.2",
+        "vscode-languageserver-textdocument": "^1.0.11",
+        "vscode-uri": "^3.0.8"
+      },
+      "peerDependencies": {
+        "typescript": "*"
+      }
+    },
+    "node_modules/@volar/language-core": {
+      "version": "2.4.27",
+      "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.27.tgz",
+      "integrity": "sha512-DjmjBWZ4tJKxfNC1F6HyYERNHPYS7L7OPFyCrestykNdUZMFYzI9WTyvwPcaNaHlrEUwESHYsfEw3isInncZxQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@volar/source-map": "2.4.27"
+      }
+    },
+    "node_modules/@volar/language-server": {
+      "version": "2.4.27",
+      "resolved": "https://registry.npmjs.org/@volar/language-server/-/language-server-2.4.27.tgz",
+      "integrity": "sha512-SymGNkErcHg8GjiG65iQN8sLkhqu1pwKhFySmxeBuYq5xFYagKBW36eiNITXQTdvT0tutI1GXcXdq/FdE/IyjA==",
+      "license": "MIT",
+      "dependencies": {
+        "@volar/language-core": "2.4.27",
+        "@volar/language-service": "2.4.27",
+        "@volar/typescript": "2.4.27",
+        "path-browserify": "^1.0.1",
+        "request-light": "^0.7.0",
+        "vscode-languageserver": "^9.0.1",
+        "vscode-languageserver-protocol": "^3.17.5",
+        "vscode-languageserver-textdocument": "^1.0.11",
+        "vscode-uri": "^3.0.8"
+      }
+    },
+    "node_modules/@volar/language-service": {
+      "version": "2.4.27",
+      "resolved": "https://registry.npmjs.org/@volar/language-service/-/language-service-2.4.27.tgz",
+      "integrity": "sha512-SxKZ8yLhpWa7Y5e/RDxtNfm7j7xsXp/uf2urijXEffRNpPSmVdfzQrFFy5d7l8PNpZy+bHg+yakmqBPjQN+MOw==",
+      "license": "MIT",
+      "dependencies": {
+        "@volar/language-core": "2.4.27",
+        "vscode-languageserver-protocol": "^3.17.5",
+        "vscode-languageserver-textdocument": "^1.0.11",
+        "vscode-uri": "^3.0.8"
+      }
+    },
+    "node_modules/@volar/source-map": {
+      "version": "2.4.27",
+      "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.27.tgz",
+      "integrity": "sha512-ynlcBReMgOZj2i6po+qVswtDUeeBRCTgDurjMGShbm8WYZgJ0PA4RmtebBJ0BCYol1qPv3GQF6jK7C9qoVc7lg==",
+      "license": "MIT"
+    },
+    "node_modules/@volar/typescript": {
+      "version": "2.4.27",
+      "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.27.tgz",
+      "integrity": "sha512-eWaYCcl/uAPInSK2Lze6IqVWaBu/itVqR5InXcHXFyles4zO++Mglt3oxdgj75BDcv1Knr9Y93nowS8U3wqhxg==",
+      "license": "MIT",
+      "dependencies": {
+        "@volar/language-core": "2.4.27",
+        "path-browserify": "^1.0.1",
+        "vscode-uri": "^3.0.8"
+      }
+    },
+    "node_modules/@vscode/emmet-helper": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/@vscode/emmet-helper/-/emmet-helper-2.11.0.tgz",
+      "integrity": "sha512-QLxjQR3imPZPQltfbWRnHU6JecWTF1QSWhx3GAKQpslx7y3Dp6sIIXhKjiUJ/BR9FX8PVthjr9PD6pNwOJfAzw==",
+      "license": "MIT",
+      "dependencies": {
+        "emmet": "^2.4.3",
+        "jsonc-parser": "^2.3.0",
+        "vscode-languageserver-textdocument": "^1.0.1",
+        "vscode-languageserver-types": "^3.15.1",
+        "vscode-uri": "^3.0.8"
+      }
+    },
+    "node_modules/@vscode/l10n": {
+      "version": "0.0.18",
+      "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.18.tgz",
+      "integrity": "sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ==",
+      "license": "MIT"
+    },
     "node_modules/@whatwg-node/disposablestack": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/@whatwg-node/disposablestack/-/disposablestack-0.0.6.tgz",
@@ -4529,7 +4743,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
@@ -5345,7 +5558,6 @@
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
       "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "string-width": "^4.2.0",
@@ -5360,7 +5572,6 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
       "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -5370,14 +5581,12 @@
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/cliui/node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -5387,7 +5596,6 @@
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
@@ -5402,7 +5610,6 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1"
@@ -5415,7 +5622,6 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
@@ -5451,7 +5657,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
@@ -5464,7 +5669,6 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/colorette": {
@@ -6119,6 +6323,22 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/emmet": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/emmet/-/emmet-2.4.11.tgz",
+      "integrity": "sha512-23QPJB3moh/U9sT4rQzGgeyyGIrcM+GH5uVYg2C6wZIxAIJq7Ng3QLT79tl8FUwDXhyq9SusfknOrofAKqvgyQ==",
+      "license": "MIT",
+      "workspaces": [
+        "./packages/scanner",
+        "./packages/abbreviation",
+        "./packages/css-abbreviation",
+        "./"
+      ],
+      "dependencies": {
+        "@emmetio/abbreviation": "^2.3.3",
+        "@emmetio/css-abbreviation": "^2.1.8"
+      }
+    },
     "node_modules/emoji-regex": {
       "version": "10.6.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz",
@@ -6243,7 +6463,6 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
       "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -6656,6 +6875,22 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/fast-uri": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz",
+      "integrity": "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fastify"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fastify"
+        }
+      ],
+      "license": "BSD-3-Clause"
+    },
     "node_modules/fastq": {
       "version": "1.19.1",
       "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
@@ -6890,7 +7125,6 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true,
       "license": "ISC",
       "engines": {
         "node": "6.* || 8.* || >= 10.*"
@@ -8145,6 +8379,12 @@
         "node": ">=6"
       }
     },
+    "node_modules/jsonc-parser": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.1.tgz",
+      "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==",
+      "license": "MIT"
+    },
     "node_modules/jwt-decode": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-4.0.0.tgz",
@@ -8535,7 +8775,6 @@
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/lodash.merge": {
@@ -9641,6 +9880,12 @@
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "license": "MIT"
     },
+    "node_modules/muggle-string": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/muggle-string/-/muggle-string-0.4.1.tgz",
+      "integrity": "sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==",
+      "license": "MIT"
+    },
     "node_modules/mute-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-2.0.0.tgz",
@@ -10082,6 +10327,12 @@
         "tslib": "^2.0.3"
       }
     },
+    "node_modules/path-browserify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
+      "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
+      "license": "MIT"
+    },
     "node_modules/path-case": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/path-case/-/path-case-3.0.4.tgz",
@@ -10317,6 +10568,22 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/prettier": {
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.1.tgz",
+      "integrity": "sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==",
+      "license": "MIT",
+      "peer": true,
+      "bin": {
+        "prettier": "bin/prettier.cjs"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
     "node_modules/prismjs": {
       "version": "1.30.0",
       "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.30.0.tgz",
@@ -10628,11 +10895,16 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/request-light": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.7.0.tgz",
+      "integrity": "sha512-lMbBMrDoxgsyO+yB3sDcrDuX85yYt7sS8BfQd11jtbW/z5ZWgLZRcEGLsLoYw7I0WSUGQBs8CC8ScIxkTX1+6Q==",
+      "license": "MIT"
+    },
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
       "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -11721,6 +11993,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/typesafe-path": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/typesafe-path/-/typesafe-path-0.2.2.tgz",
+      "integrity": "sha512-OJabfkAg1WLZSqJAJ0Z6Sdt3utnbzr/jh+NAHoyWHJe8CMSy79Gm085094M9nvTPy22KzTVn5Zq5mbapCI/hPA==",
+      "license": "MIT"
+    },
     "node_modules/typescript": {
       "version": "5.9.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
@@ -11735,6 +12013,27 @@
         "node": ">=14.17"
       }
     },
+    "node_modules/typescript-auto-import-cache": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/typescript-auto-import-cache/-/typescript-auto-import-cache-0.3.6.tgz",
+      "integrity": "sha512-RpuHXrknHdVdK7wv/8ug3Fr0WNsNi5l5aB8MYYuXhq2UH5lnEB1htJ1smhtD5VeCsGr2p8mUDtd83LCQDFVgjQ==",
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^7.3.8"
+      }
+    },
+    "node_modules/typescript-auto-import-cache/node_modules/semver": {
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/typescript-eslint": {
       "version": "8.48.0",
       "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.48.0.tgz",
@@ -12319,6 +12618,255 @@
         }
       }
     },
+    "node_modules/volar-service-css": {
+      "version": "0.0.68",
+      "resolved": "https://registry.npmjs.org/volar-service-css/-/volar-service-css-0.0.68.tgz",
+      "integrity": "sha512-lJSMh6f3QzZ1tdLOZOzovLX0xzAadPhx8EKwraDLPxBndLCYfoTvnNuiFFV8FARrpAlW5C0WkH+TstPaCxr00Q==",
+      "license": "MIT",
+      "dependencies": {
+        "vscode-css-languageservice": "^6.3.0",
+        "vscode-languageserver-textdocument": "^1.0.11",
+        "vscode-uri": "^3.0.8"
+      },
+      "peerDependencies": {
+        "@volar/language-service": "~2.4.0"
+      },
+      "peerDependenciesMeta": {
+        "@volar/language-service": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/volar-service-emmet": {
+      "version": "0.0.68",
+      "resolved": "https://registry.npmjs.org/volar-service-emmet/-/volar-service-emmet-0.0.68.tgz",
+      "integrity": "sha512-nHvixrRQ83EzkQ4G/jFxu9Y4eSsXS/X2cltEPDM+K9qZmIv+Ey1w0tg1+6caSe8TU5Hgw4oSTwNMf/6cQb3LzQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@emmetio/css-parser": "^0.4.1",
+        "@emmetio/html-matcher": "^1.3.0",
+        "@vscode/emmet-helper": "^2.9.3",
+        "vscode-uri": "^3.0.8"
+      },
+      "peerDependencies": {
+        "@volar/language-service": "~2.4.0"
+      },
+      "peerDependenciesMeta": {
+        "@volar/language-service": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/volar-service-html": {
+      "version": "0.0.68",
+      "resolved": "https://registry.npmjs.org/volar-service-html/-/volar-service-html-0.0.68.tgz",
+      "integrity": "sha512-fru9gsLJxy33xAltXOh4TEdi312HP80hpuKhpYQD4O5hDnkNPEBdcQkpB+gcX0oK0VxRv1UOzcGQEUzWCVHLfA==",
+      "license": "MIT",
+      "dependencies": {
+        "vscode-html-languageservice": "^5.3.0",
+        "vscode-languageserver-textdocument": "^1.0.11",
+        "vscode-uri": "^3.0.8"
+      },
+      "peerDependencies": {
+        "@volar/language-service": "~2.4.0"
+      },
+      "peerDependenciesMeta": {
+        "@volar/language-service": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/volar-service-prettier": {
+      "version": "0.0.68",
+      "resolved": "https://registry.npmjs.org/volar-service-prettier/-/volar-service-prettier-0.0.68.tgz",
+      "integrity": "sha512-grUmWHkHlebMOd6V8vXs2eNQUw/bJGJMjekh/EPf/p2ZNTK0Uyz7hoBRngcvGfJHMsSXZH8w/dZTForIW/4ihw==",
+      "license": "MIT",
+      "dependencies": {
+        "vscode-uri": "^3.0.8"
+      },
+      "peerDependencies": {
+        "@volar/language-service": "~2.4.0",
+        "prettier": "^2.2 || ^3.0"
+      },
+      "peerDependenciesMeta": {
+        "@volar/language-service": {
+          "optional": true
+        },
+        "prettier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/volar-service-typescript": {
+      "version": "0.0.68",
+      "resolved": "https://registry.npmjs.org/volar-service-typescript/-/volar-service-typescript-0.0.68.tgz",
+      "integrity": "sha512-z7B/7CnJ0+TWWFp/gh2r5/QwMObHNDiQiv4C9pTBNI2Wxuwymd4bjEORzrJ/hJ5Yd5+OzeYK+nFCKevoGEEeKw==",
+      "license": "MIT",
+      "dependencies": {
+        "path-browserify": "^1.0.1",
+        "semver": "^7.6.2",
+        "typescript-auto-import-cache": "^0.3.5",
+        "vscode-languageserver-textdocument": "^1.0.11",
+        "vscode-nls": "^5.2.0",
+        "vscode-uri": "^3.0.8"
+      },
+      "peerDependencies": {
+        "@volar/language-service": "~2.4.0"
+      },
+      "peerDependenciesMeta": {
+        "@volar/language-service": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/volar-service-typescript-twoslash-queries": {
+      "version": "0.0.68",
+      "resolved": "https://registry.npmjs.org/volar-service-typescript-twoslash-queries/-/volar-service-typescript-twoslash-queries-0.0.68.tgz",
+      "integrity": "sha512-NugzXcM0iwuZFLCJg47vI93su5YhTIweQuLmZxvz5ZPTaman16JCvmDZexx2rd5T/75SNuvvZmrTOTNYUsfe5w==",
+      "license": "MIT",
+      "dependencies": {
+        "vscode-uri": "^3.0.8"
+      },
+      "peerDependencies": {
+        "@volar/language-service": "~2.4.0"
+      },
+      "peerDependenciesMeta": {
+        "@volar/language-service": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/volar-service-typescript/node_modules/semver": {
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/volar-service-yaml": {
+      "version": "0.0.68",
+      "resolved": "https://registry.npmjs.org/volar-service-yaml/-/volar-service-yaml-0.0.68.tgz",
+      "integrity": "sha512-84XgE02LV0OvTcwfqhcSwVg4of3MLNUWPMArO6Aj8YXqyEVnPu8xTEMY2btKSq37mVAPuaEVASI4e3ptObmqcA==",
+      "license": "MIT",
+      "dependencies": {
+        "vscode-uri": "^3.0.8",
+        "yaml-language-server": "~1.19.2"
+      },
+      "peerDependencies": {
+        "@volar/language-service": "~2.4.0"
+      },
+      "peerDependenciesMeta": {
+        "@volar/language-service": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vscode-css-languageservice": {
+      "version": "6.3.9",
+      "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.9.tgz",
+      "integrity": "sha512-1tLWfp+TDM5ZuVWht3jmaY5y7O6aZmpeXLoHl5bv1QtRsRKt4xYGRMmdJa5Pqx/FTkgRbsna9R+Gn2xE+evVuA==",
+      "license": "MIT",
+      "dependencies": {
+        "@vscode/l10n": "^0.0.18",
+        "vscode-languageserver-textdocument": "^1.0.12",
+        "vscode-languageserver-types": "3.17.5",
+        "vscode-uri": "^3.1.0"
+      }
+    },
+    "node_modules/vscode-html-languageservice": {
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.6.1.tgz",
+      "integrity": "sha512-5Mrqy5CLfFZUgkyhNZLA1Ye5g12Cb/v6VM7SxUzZUaRKWMDz4md+y26PrfRTSU0/eQAl3XpO9m2og+GGtDMuaA==",
+      "license": "MIT",
+      "dependencies": {
+        "@vscode/l10n": "^0.0.18",
+        "vscode-languageserver-textdocument": "^1.0.12",
+        "vscode-languageserver-types": "^3.17.5",
+        "vscode-uri": "^3.1.0"
+      }
+    },
+    "node_modules/vscode-json-languageservice": {
+      "version": "4.1.8",
+      "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.1.8.tgz",
+      "integrity": "sha512-0vSpg6Xd9hfV+eZAaYN63xVVMOTmJ4GgHxXnkLCh+9RsQBkWKIghzLhW2B9ebfG+LQQg8uLtsQ2aUKjTgE+QOg==",
+      "license": "MIT",
+      "dependencies": {
+        "jsonc-parser": "^3.0.0",
+        "vscode-languageserver-textdocument": "^1.0.1",
+        "vscode-languageserver-types": "^3.16.0",
+        "vscode-nls": "^5.0.0",
+        "vscode-uri": "^3.0.2"
+      },
+      "engines": {
+        "npm": ">=7.0.0"
+      }
+    },
+    "node_modules/vscode-json-languageservice/node_modules/jsonc-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
+      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
+      "license": "MIT"
+    },
+    "node_modules/vscode-jsonrpc": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz",
+      "integrity": "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/vscode-languageserver": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-9.0.1.tgz",
+      "integrity": "sha512-woByF3PDpkHFUreUa7Hos7+pUWdeWMXRd26+ZX2A8cFx6v/JPTtd4/uN0/jB6XQHYaOlHbio03NTHCqrgG5n7g==",
+      "license": "MIT",
+      "dependencies": {
+        "vscode-languageserver-protocol": "3.17.5"
+      },
+      "bin": {
+        "installServerIntoExtension": "bin/installServerIntoExtension"
+      }
+    },
+    "node_modules/vscode-languageserver-protocol": {
+      "version": "3.17.5",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz",
+      "integrity": "sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==",
+      "license": "MIT",
+      "dependencies": {
+        "vscode-jsonrpc": "8.2.0",
+        "vscode-languageserver-types": "3.17.5"
+      }
+    },
+    "node_modules/vscode-languageserver-textdocument": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz",
+      "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==",
+      "license": "MIT"
+    },
+    "node_modules/vscode-languageserver-types": {
+      "version": "3.17.5",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz",
+      "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==",
+      "license": "MIT"
+    },
+    "node_modules/vscode-nls": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-5.2.0.tgz",
+      "integrity": "sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==",
+      "license": "MIT"
+    },
+    "node_modules/vscode-uri": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz",
+      "integrity": "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==",
+      "license": "MIT"
+    },
     "node_modules/w3c-xmlserializer": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz",
@@ -12575,7 +13123,6 @@
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
       "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "dev": true,
       "license": "ISC",
       "engines": {
         "node": ">=10"
@@ -12592,7 +13139,6 @@
       "version": "2.8.2",
       "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.2.tgz",
       "integrity": "sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==",
-      "devOptional": true,
       "license": "ISC",
       "peer": true,
       "bin": {
@@ -12605,11 +13151,88 @@
         "url": "https://github.com/sponsors/eemeli"
       }
     },
+    "node_modules/yaml-language-server": {
+      "version": "1.19.2",
+      "resolved": "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-1.19.2.tgz",
+      "integrity": "sha512-9F3myNmJzUN/679jycdMxqtydPSDRAarSj3wPiF7pchEPnO9Dg07Oc+gIYLqXR4L+g+FSEVXXv2+mr54StLFOg==",
+      "license": "MIT",
+      "dependencies": {
+        "@vscode/l10n": "^0.0.18",
+        "ajv": "^8.17.1",
+        "ajv-draft-04": "^1.0.0",
+        "lodash": "4.17.21",
+        "prettier": "^3.5.0",
+        "request-light": "^0.5.7",
+        "vscode-json-languageservice": "4.1.8",
+        "vscode-languageserver": "^9.0.0",
+        "vscode-languageserver-textdocument": "^1.0.1",
+        "vscode-languageserver-types": "^3.16.0",
+        "vscode-uri": "^3.0.2",
+        "yaml": "2.7.1"
+      },
+      "bin": {
+        "yaml-language-server": "bin/yaml-language-server"
+      }
+    },
+    "node_modules/yaml-language-server/node_modules/ajv": {
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/yaml-language-server/node_modules/ajv-draft-04": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/ajv-draft-04/-/ajv-draft-04-1.0.0.tgz",
+      "integrity": "sha512-mv00Te6nmYbRp5DCwclxtt7yV/joXJPGS7nM+97GdxvuttCOfgI3K4U25zboyeX0O+myI8ERluxQe5wljMmVIw==",
+      "license": "MIT",
+      "peerDependencies": {
+        "ajv": "^8.5.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/yaml-language-server/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "license": "MIT"
+    },
+    "node_modules/yaml-language-server/node_modules/request-light": {
+      "version": "0.5.8",
+      "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.5.8.tgz",
+      "integrity": "sha512-3Zjgh+8b5fhRJBQZoy+zbVKpAQGLyka0MPgW3zruTF4dFFJ8Fqcfu9YsAvi/rvdcaTeWG3MkbZv4WKxAn/84Lg==",
+      "license": "MIT"
+    },
+    "node_modules/yaml-language-server/node_modules/yaml": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.1.tgz",
+      "integrity": "sha512-10ULxpnOCQXxJvBgxsn9ptjq6uviG/htZKk9veJGhlqn3w/DxQ631zFF+nlQXLwmImeS5amR2dl2U8sg6U9jsQ==",
+      "license": "ISC",
+      "bin": {
+        "yaml": "bin.mjs"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
     "node_modules/yargs": {
       "version": "17.7.2",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
       "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "cliui": "^8.0.1",
@@ -12637,7 +13260,6 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
       "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -12647,14 +13269,12 @@
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/yargs/node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -12664,7 +13284,6 @@
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
@@ -12679,7 +13298,6 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1"

fictionarchive-web-astro/package.json

@@ -3,7 +3,7 @@
   "type": "module",
   "version": "0.0.1",
   "scripts": {
-    "dev": "astro dev",
+    "dev": "node --env-file=.env node_modules/astro/astro.js dev",
     "build": "astro build",
     "preview": "astro preview",
     "astro": "astro",
@@ -12,6 +12,7 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
+    "@astrojs/check": "^0.9.6",
     "@astrojs/node": "^9.5.1",
     "@astrojs/svelte": "^7.2.2",
     "@tailwindcss/vite": "^4.1.17",

fictionarchive-web-astro/src/lib/components/AddToReadingListButton.svelte

@@ -75,13 +75,12 @@
 			if (result.data) {
 				readingLists = result.data.readingLists;
 				// Build the set of list IDs that contain this novel
-				const inLists = new SvelteSet<number>();
+				novelInLists.clear();
 				for (const list of readingLists) {
 					if (list.items.some((item) => item.novelId === novelId)) {
-						inLists.add(list.id);
+						novelInLists.add(list.id);
 					}
 				}
-				novelInLists = inLists;
 			}
 		} catch (e) {
 			error = e instanceof Error ? e.message : 'Failed to load reading lists';
@@ -92,7 +91,7 @@
 
 	async function toggleNovelInList(listId: number) {
 		const isInList = novelInLists.has(listId);
-		loadingListIds = new SvelteSet([...loadingListIds, listId]);
+		loadingListIds.add(listId);
 
 		try {
 			if (isInList) {
@@ -115,7 +114,7 @@
 
 				if (result.data?.removeFromReadingList?.readingListPayload?.success) {
 					// Update local state
-					novelInLists = new SvelteSet([...novelInLists].filter((id) => id !== listId));
+					novelInLists.delete(listId);
 					// Update item count in list
 					readingLists = readingLists.map((list) =>
 						list.id === listId
@@ -143,7 +142,7 @@
 
 				if (result.data?.addToReadingList?.readingListPayload?.success) {
 					// Update local state
-					novelInLists = new SvelteSet([...novelInLists, listId]);
+					novelInLists.add(listId);
 					// Update item count in list
 					readingLists = readingLists.map((list) =>
 						list.id === listId
@@ -159,7 +158,7 @@
 		} catch (e) {
 			error = e instanceof Error ? e.message : 'An error occurred';
 		} finally {
-			loadingListIds = new SvelteSet([...loadingListIds].filter((id) => id !== listId));
+			loadingListIds.delete(listId);
 		}
 	}
 
@@ -218,7 +217,7 @@
 					items: [{ novelId, order: 0, addedTime: new Date().toISOString() }]
 				};
 				readingLists = [...readingLists, fullNewList];
-				novelInLists = new SvelteSet([...novelInLists, newList.id]);
+				novelInLists.add(newList.id);
 
 				// Reset quick-create form
 				showQuickCreate = false;

fictionarchive-web-astro/src/lib/components/ChapterReaderPage.svelte

@@ -19,14 +19,24 @@
 		novelId?: string;
 		volumeOrder?: string;
 		chapterNumber?: string;
+		initialChapter?: ChapterData | null;
+		initialAuthFailed?: boolean;
+		initialError?: string | null;
 	}
 
-	let { novelId, volumeOrder, chapterNumber }: Props = $props();
+	let {
+		novelId,
+		volumeOrder,
+		chapterNumber,
+		initialChapter = null,
+		initialAuthFailed = false,
+		initialError = null
+	}: Props = $props();
 
-	// State
-	let chapter: ChapterData | null = $state(null);
-	let fetching = $state(true);
-	let error: string | null = $state(null);
+	// State - initialize from server data if available
+	let chapter: ChapterData | null = $state(initialChapter);
+	let fetching = $state(!initialChapter && !initialError && !initialAuthFailed);
+	let error: string | null = $state(initialError);
 	let scrollProgress = $state(0);
 
 	// Bookmark state
@@ -123,8 +133,15 @@
 		bookmarkDescription = newDescription ?? null;
 	}
 
-	onMount(() => {
-		fetchChapter();
+	onMount(async () => {
+		if (initialAuthFailed || (!initialChapter && !initialError)) {
+			// Fetch client-side: either auth recovery or fallback
+			await fetchChapter();
+		} else if (chapter) {
+			// Server provided data, just fetch bookmarks
+			await fetchBookmarks();
+		}
+
 		window.addEventListener('scroll', handleScroll, { passive: true });
 		window.addEventListener('keydown', handleKeydown);
 	});

fictionarchive-web-astro/src/lib/graphql/__generated__/graphql.ts

@@ -80,7 +80,7 @@ export type ChapterDtoFilterInput = {
   url?: InputMaybe<StringOperationFilterInput>;
 };
 
-export type ChapterPullRequestedEvent = {
+export type ChapterPullRequested = {
   chapterOrder: Scalars['UnsignedInt']['output'];
   novelId: Scalars['UnsignedInt']['output'];
   volumeId: Scalars['UnsignedInt']['output'];
@@ -168,7 +168,7 @@ export type FetchChapterContentsInput = {
 };
 
 export type FetchChapterContentsPayload = {
-  chapterPullRequestedEvent: Maybe<ChapterPullRequestedEvent>;
+  chapterPullRequested: Maybe<ChapterPullRequested>;
 };
 
 export type FormatError = Error & {
@@ -203,7 +203,7 @@ export type ImportNovelInput = {
 };
 
 export type ImportNovelPayload = {
-  novelUpdateRequestedEvent: Maybe<NovelUpdateRequestedEvent>;
+  novelUpdateRequested: Maybe<NovelUpdateRequested>;
 };
 
 export type InstantFilterInput = {
@@ -499,7 +499,7 @@ export type NovelTagDtoFilterInput = {
   tagType?: InputMaybe<TagTypeOperationFilterInput>;
 };
 
-export type NovelUpdateRequestedEvent = {
+export type NovelUpdateRequested = {
   novelUrl: Scalars['String']['output'];
 };
 
@@ -1010,7 +1010,7 @@ export type ImportNovelMutationVariables = Exact<{
 }>;
 
 
-export type ImportNovelMutation = { importNovel: { novelUpdateRequestedEvent: { novelUrl: string } | null } };
+export type ImportNovelMutation = { importNovel: { novelUpdateRequested: { novelUrl: string } | null } };
 
 export type InviteUserMutationVariables = Exact<{
   input: InviteUserInput;
@@ -1114,7 +1114,7 @@ export const AddToReadingListDocument = {"kind":"Document","definitions":[{"kind
 export const CreateReadingListDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateReadingList"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CreateReadingListInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createReadingList"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"readingListPayload"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"success"}},{"kind":"Field","name":{"kind":"Name","value":"readingList"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"itemCount"}},{"kind":"Field","name":{"kind":"Name","value":"createdTime"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"errors"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Error"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"message"}}]}}]}}]}}]}}]} as unknown as DocumentNode<CreateReadingListMutation, CreateReadingListMutationVariables>;
 export const DeleteNovelDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteNovel"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"DeleteNovelInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteNovel"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"boolean"}},{"kind":"Field","name":{"kind":"Name","value":"errors"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Error"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"message"}}]}}]}}]}}]}}]} as unknown as DocumentNode<DeleteNovelMutation, DeleteNovelMutationVariables>;
 export const DeleteReadingListDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteReadingList"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"DeleteReadingListInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteReadingList"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"success"}},{"kind":"Field","name":{"kind":"Name","value":"errors"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Error"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"message"}}]}}]}}]}}]}}]} as unknown as DocumentNode<DeleteReadingListMutation, DeleteReadingListMutationVariables>;
-export const ImportNovelDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"ImportNovel"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ImportNovelInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"importNovel"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"novelUpdateRequestedEvent"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"novelUrl"}}]}}]}}]}}]} as unknown as DocumentNode<ImportNovelMutation, ImportNovelMutationVariables>;
+export const ImportNovelDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"ImportNovel"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ImportNovelInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"importNovel"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"novelUpdateRequested"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"novelUrl"}}]}}]}}]}}]} as unknown as DocumentNode<ImportNovelMutation, ImportNovelMutationVariables>;
 export const InviteUserDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"InviteUser"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"InviteUserInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"inviteUser"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"userDto"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"username"}},{"kind":"Field","name":{"kind":"Name","value":"email"}}]}},{"kind":"Field","name":{"kind":"Name","value":"errors"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"InvalidOperationError"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"message"}}]}}]}}]}}]}}]} as unknown as DocumentNode<InviteUserMutation, InviteUserMutationVariables>;
 export const RemoveBookmarkDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"RemoveBookmark"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"RemoveBookmarkInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"removeBookmark"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"bookmarkPayload"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"success"}}]}},{"kind":"Field","name":{"kind":"Name","value":"errors"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Error"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"message"}}]}}]}}]}}]}}]} as unknown as DocumentNode<RemoveBookmarkMutation, RemoveBookmarkMutationVariables>;
 export const RemoveFromReadingListDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"RemoveFromReadingList"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"RemoveFromReadingListInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"removeFromReadingList"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"readingListPayload"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"success"}},{"kind":"Field","name":{"kind":"Name","value":"readingList"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"itemCount"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"errors"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"Error"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"message"}}]}}]}}]}}]}}]} as unknown as DocumentNode<RemoveFromReadingListMutation, RemoveFromReadingListMutationVariables>;

fictionarchive-web-astro/src/lib/graphql/mutations/importNovel.graphql

@@ -1,6 +1,6 @@
 mutation ImportNovel($input: ImportNovelInput!) {
   importNovel(input: $input) {
-    novelUpdateRequestedEvent {
+    novelUpdateRequested {
       novelUrl
     }
   }