Add IsLocal and Domain helper columns to ActorEntity for indexed locality queries

Broca.ActivityPub.sln

@@ -31,6 +31,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{07C2787E
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Broca.SampleData", "tools\Broca.SampleData\Broca.SampleData.csproj", "{EA3C5007-B9B1-431F-A44D-409FA8FBB11E}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Broca.ActivityPub.Persistence.MySql", "src\Broca.ActivityPub.Persistence.MySql\Broca.ActivityPub.Persistence.MySql.csproj", "{8370636B-1F27-4F3F-8DFC-3FC8ADB9125F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -173,6 +175,18 @@ Global
 		{EA3C5007-B9B1-431F-A44D-409FA8FBB11E}.Release|x64.Build.0 = Release|Any CPU
 		{EA3C5007-B9B1-431F-A44D-409FA8FBB11E}.Release|x86.ActiveCfg = Release|Any CPU
 		{EA3C5007-B9B1-431F-A44D-409FA8FBB11E}.Release|x86.Build.0 = Release|Any CPU
+		{8370636B-1F27-4F3F-8DFC-3FC8ADB9125F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8370636B-1F27-4F3F-8DFC-3FC8ADB9125F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8370636B-1F27-4F3F-8DFC-3FC8ADB9125F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8370636B-1F27-4F3F-8DFC-3FC8ADB9125F}.Debug|x64.Build.0 = Debug|Any CPU
+		{8370636B-1F27-4F3F-8DFC-3FC8ADB9125F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8370636B-1F27-4F3F-8DFC-3FC8ADB9125F}.Debug|x86.Build.0 = Debug|Any CPU
+		{8370636B-1F27-4F3F-8DFC-3FC8ADB9125F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8370636B-1F27-4F3F-8DFC-3FC8ADB9125F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8370636B-1F27-4F3F-8DFC-3FC8ADB9125F}.Release|x64.ActiveCfg = Release|Any CPU
+		{8370636B-1F27-4F3F-8DFC-3FC8ADB9125F}.Release|x64.Build.0 = Release|Any CPU
+		{8370636B-1F27-4F3F-8DFC-3FC8ADB9125F}.Release|x86.ActiveCfg = Release|Any CPU
+		{8370636B-1F27-4F3F-8DFC-3FC8ADB9125F}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -189,5 +203,6 @@ Global
 		{664ECEF2-8938-4BEA-9D1E-BC3D0C5EC4D0} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
 		{20644776-4EBD-4B61-8007-0A6430BF6CEB} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
 		{EA3C5007-B9B1-431F-A44D-409FA8FBB11E} = {07C2787E-EAC7-C090-1BA3-A61EC2A24D84}
+		{8370636B-1F27-4F3F-8DFC-3FC8ADB9125F} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
 	EndGlobalSection
 EndGlobal

docker-compose.mysql.yml

@@ -0,0 +1,12 @@
+services:
+  broca-api:
+    environment:
+      - Persistence__Driver=MySql
+      - Persistence__ConnectionString=Server=broca-mysql;Database=broca;User=broca;Password=broca_password;
+    depends_on:
+      broca-mysql:
+        condition: service_healthy
+    profiles: []
+
+  broca-mysql:
+    profiles: []

docker-compose.yml

@@ -1,4 +1,26 @@
 services:
+  broca-mysql:
+    image: mysql:9.1
+    container_name: broca-mysql
+    environment:
+      - MYSQL_ROOT_PASSWORD=broca_root
+      - MYSQL_DATABASE=broca
+      - MYSQL_USER=broca
+      - MYSQL_PASSWORD=broca_password
+    volumes:
+      - broca-mysql-data:/var/lib/mysql
+    networks:
+      - broca-network
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "broca", "-pbroca_password"]
+      interval: 10s
+      timeout: 5s
+      retries: 10
+      start_period: 30s
+    restart: unless-stopped
+    profiles:
+      - mysql
+
   broca-api:
     build:
       context: .
@@ -74,6 +96,8 @@ services:
 volumes:
   broca-data:
     driver: local
+  broca-mysql-data:
+    driver: local
 
 networks:
   broca-network:

src/Broca.API/Broca.API.csproj

@@ -13,6 +13,7 @@
     <ProjectReference Include="..\Broca.ActivityPub.Client\Broca.ActivityPub.Client.csproj">
       <ExcludeAssets>contentFiles</ExcludeAssets>
     </ProjectReference>
+    <ProjectReference Include="..\Broca.ActivityPub.Persistence.MySql\Broca.ActivityPub.Persistence.MySql.csproj" />
   </ItemGroup>
 
 </Project>

src/Broca.API/Program.cs

@@ -1,6 +1,7 @@
 using Broca.ActivityPub.Client.Extensions;
 using Broca.ActivityPub.Server.Extensions;
 using Broca.ActivityPub.Persistence.Extensions;
+using Broca.ActivityPub.Persistence.MySql.Extensions;
 using Broca.ActivityPub.Core.Interfaces;
 using Broca.ActivityPub.Server.Services;
 
@@ -22,6 +23,8 @@
 // Configure persistence layer
 if (persistenceDriver.Equals("FileSystem", StringComparison.OrdinalIgnoreCase))
     builder.Services.AddFileSystemPersistence(dataPath);
+else if (persistenceDriver.Equals("MySql", StringComparison.OrdinalIgnoreCase))
+    builder.Services.AddMySqlPersistence(builder.Configuration);
 else
     builder.Services.AddInMemoryPersistence();
 
@@ -45,6 +48,12 @@
 
 var app = builder.Build();
 
+// Apply MySQL migrations on startup
+if (persistenceDriver.Equals("MySql", StringComparison.OrdinalIgnoreCase))
+{
+    await app.Services.MigrateAsync();
+}
+
 // Initialize system actor on startup
 using (var scope = app.Services.CreateScope())
 {

src/Broca.ActivityPub.Persistence.MySql/Broca.ActivityPub.Persistence.MySql.csproj

@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <ProjectReference Include="..\Broca.ActivityPub.Core\Broca.ActivityPub.Core.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="KristofferStrube.ActivityStreams" Version="0.2.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="9.0.0" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>

src/Broca.ActivityPub.Persistence.MySql/BrocaDbContext.cs

@@ -0,0 +1,152 @@
+using Broca.ActivityPub.Core.Models;
+using Broca.ActivityPub.Persistence.MySql.Entities;
+using Microsoft.EntityFrameworkCore;
+
+namespace Broca.ActivityPub.Persistence.MySql;
+
+public class BrocaDbContext : DbContext
+{
+    public BrocaDbContext(DbContextOptions<BrocaDbContext> options) : base(options) { }
+
+    public DbSet<ActorEntity> Actors => Set<ActorEntity>();
+    public DbSet<FollowEntity> Follows => Set<FollowEntity>();
+    public DbSet<CollectionDefinitionEntity> CollectionDefinitions => Set<CollectionDefinitionEntity>();
+    public DbSet<CollectionItemEntity> CollectionItems => Set<CollectionItemEntity>();
+    public DbSet<ActivityEntity> Activities => Set<ActivityEntity>();
+    public DbSet<DeliveryQueueEntity> DeliveryQueue => Set<DeliveryQueueEntity>();
+    public DbSet<BlobEntity> Blobs => Set<BlobEntity>();
+    public DbSet<ActorSyncQueueEntity> ActorSyncQueue => Set<ActorSyncQueueEntity>();
+
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        modelBuilder.Entity<ActorEntity>(e =>
+        {
+            e.ToTable("Actors");
+            e.HasKey(a => a.Username);
+            e.Property(a => a.Username).HasMaxLength(255);
+            e.Property(a => a.ActorId).HasMaxLength(2048);
+            e.Property(a => a.IsLocal).IsRequired();
+            e.Property(a => a.Domain).HasMaxLength(255);
+            e.Property(a => a.ActorJson).HasColumnType("json");
+            e.HasIndex(a => a.ActorId);
+            e.HasIndex(a => a.IsLocal);
+            e.HasIndex(a => a.Domain);
+        });
+
+        modelBuilder.Entity<FollowEntity>(e =>
+        {
+            e.ToTable("Follows");
+            e.HasKey(f => f.Id);
+            e.Property(f => f.Id).ValueGeneratedOnAdd();
+            e.Property(f => f.Username).HasMaxLength(255);
+            e.Property(f => f.ActorId).HasMaxLength(2048);
+            e.Property(f => f.FollowType).HasConversion<int>();
+            e.HasIndex(f => new { f.Username, f.FollowType });
+            e.HasIndex(f => new { f.Username, f.ActorId, f.FollowType }).IsUnique();
+            e.HasOne(f => f.Actor)
+                .WithMany(a => a.Follows)
+                .HasForeignKey(f => f.Username)
+                .OnDelete(DeleteBehavior.Cascade);
+        });
+
+        modelBuilder.Entity<CollectionDefinitionEntity>(e =>
+        {
+            e.ToTable("CollectionDefinitions");
+            e.HasKey(c => new { c.Username, c.CollectionId });
+            e.Property(c => c.Username).HasMaxLength(255);
+            e.Property(c => c.CollectionId).HasMaxLength(255);
+            e.Property(c => c.DefinitionJson).HasColumnType("json");
+            e.HasOne(c => c.Actor)
+                .WithMany(a => a.CollectionDefinitions)
+                .HasForeignKey(c => c.Username)
+                .OnDelete(DeleteBehavior.Cascade);
+        });
+
+        modelBuilder.Entity<CollectionItemEntity>(e =>
+        {
+            e.ToTable("CollectionItems");
+            e.HasKey(c => new { c.Username, c.CollectionId, c.ItemId });
+            e.Property(c => c.Username).HasMaxLength(255);
+            e.Property(c => c.CollectionId).HasMaxLength(255);
+            e.Property(c => c.ItemId).HasMaxLength(2048);
+            e.HasOne(c => c.Actor)
+                .WithMany(a => a.CollectionItems)
+                .HasForeignKey(c => c.Username)
+                .OnDelete(DeleteBehavior.Cascade);
+            e.HasOne(c => c.CollectionDefinition)
+                .WithMany(d => d.Items)
+                .HasForeignKey(c => new { c.Username, c.CollectionId })
+                .OnDelete(DeleteBehavior.Cascade);
+        });
+
+        modelBuilder.Entity<ActivityEntity>(e =>
+        {
+            e.ToTable("Activities");
+            e.HasKey(a => a.Id);
+            e.Property(a => a.Id).ValueGeneratedOnAdd();
+            e.Property(a => a.ActivityId).HasMaxLength(2048);
+            e.Property(a => a.Username).HasMaxLength(255);
+            e.Property(a => a.Box).HasMaxLength(10);
+            e.Property(a => a.ActivityJson).HasColumnType("json");
+            e.Property(a => a.ActivityType).HasMaxLength(255);
+            e.Property(a => a.ObjectId).HasMaxLength(2048);
+            e.Property(a => a.InReplyTo).HasMaxLength(2048);
+            e.HasIndex(a => a.ActivityId).IsUnique();
+            e.HasIndex(a => new { a.Username, a.Box });
+            e.HasIndex(a => a.CreatedAt);
+            e.HasIndex(a => new { a.ActivityType, a.ObjectId });
+            e.HasIndex(a => a.InReplyTo);
+            e.HasOne(a => a.Actor)
+                .WithMany(ac => ac.Activities)
+                .HasForeignKey(a => a.Username)
+                .OnDelete(DeleteBehavior.Cascade);
+        });
+
+        modelBuilder.Entity<DeliveryQueueEntity>(e =>
+        {
+            e.ToTable("DeliveryQueue");
+            e.HasKey(d => d.Id);
+            e.Property(d => d.Id).HasMaxLength(255);
+            e.Property(d => d.ActivityJson).HasColumnType("json");
+            e.Property(d => d.InboxUrl).HasMaxLength(2048);
+            e.Property(d => d.TargetActorId).HasMaxLength(2048);
+            e.Property(d => d.SenderActorId).HasMaxLength(2048);
+            e.Property(d => d.SenderUsername).HasMaxLength(255);
+            e.Property(d => d.LastError).HasMaxLength(4096);
+            e.Property(d => d.Status).HasConversion<int>();
+            e.HasIndex(d => d.Status);
+            e.HasIndex(d => d.NextAttemptAt);
+            e.HasOne(d => d.SenderActor)
+                .WithMany(a => a.OutboundDeliveries)
+                .HasForeignKey(d => d.SenderUsername)
+                .OnDelete(DeleteBehavior.Cascade);
+        });
+
+        modelBuilder.Entity<BlobEntity>(e =>
+        {
+            e.ToTable("Blobs");
+            e.HasKey(b => new { b.Username, b.BlobId });
+            e.Property(b => b.Username).HasMaxLength(255);
+            e.Property(b => b.BlobId).HasMaxLength(255);
+            e.Property(b => b.ContentType).HasMaxLength(255);
+            e.Property(b => b.StorageProvider).HasMaxLength(64);
+            e.Property(b => b.StorageKey).HasMaxLength(2048);
+            e.Property(b => b.Content).HasColumnType("longblob");
+            e.HasIndex(b => b.StorageProvider);
+            e.HasOne(b => b.Actor)
+                .WithMany(a => a.Blobs)
+                .HasForeignKey(b => b.Username)
+                .OnDelete(DeleteBehavior.Cascade);
+        });
+
+        modelBuilder.Entity<ActorSyncQueueEntity>(e =>
+        {
+            e.ToTable("ActorSyncQueue");
+            e.HasKey(a => a.Id);
+            e.Property(a => a.Id).ValueGeneratedOnAdd();
+            e.Property(a => a.ActorId).HasMaxLength(2048);
+            e.HasIndex(a => a.ActorId).IsUnique();
+            e.HasIndex(a => a.EnqueuedAt);
+        });
+    }
+}

src/Broca.ActivityPub.Persistence.MySql/Entities/ActivityEntity.cs

@@ -0,0 +1,16 @@
+namespace Broca.ActivityPub.Persistence.MySql.Entities;
+
+public class ActivityEntity
+{
+    public long Id { get; set; }
+    public string ActivityId { get; set; } = string.Empty;
+    public string Username { get; set; } = string.Empty;
+    public string Box { get; set; } = string.Empty;
+    public string ActivityJson { get; set; } = string.Empty;
+    public string? ActivityType { get; set; }
+    public string? ObjectId { get; set; }
+    public string? InReplyTo { get; set; }
+    public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
+
+    public ActorEntity? Actor { get; set; }
+}

src/Broca.ActivityPub.Persistence.MySql/Entities/ActorEntity.cs

@@ -0,0 +1,19 @@
+namespace Broca.ActivityPub.Persistence.MySql.Entities;
+
+public class ActorEntity
+{
+    public string Username { get; set; } = string.Empty;
+    public string? ActorId { get; set; }
+    public bool IsLocal { get; set; }
+    public string? Domain { get; set; }
+    public string ActorJson { get; set; } = string.Empty;
+    public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
+    public DateTime UpdatedAt { get; set; } = DateTime.UtcNow;
+
+    public ICollection<FollowEntity> Follows { get; set; } = new List<FollowEntity>();
+    public ICollection<ActivityEntity> Activities { get; set; } = new List<ActivityEntity>();
+    public ICollection<CollectionDefinitionEntity> CollectionDefinitions { get; set; } = new List<CollectionDefinitionEntity>();
+    public ICollection<CollectionItemEntity> CollectionItems { get; set; } = new List<CollectionItemEntity>();
+    public ICollection<BlobEntity> Blobs { get; set; } = new List<BlobEntity>();
+    public ICollection<DeliveryQueueEntity> OutboundDeliveries { get; set; } = new List<DeliveryQueueEntity>();
+}

src/Broca.ActivityPub.Persistence.MySql/Entities/ActorSyncQueueEntity.cs

@@ -0,0 +1,8 @@
+namespace Broca.ActivityPub.Persistence.MySql.Entities;
+
+public class ActorSyncQueueEntity
+{
+    public long Id { get; set; }
+    public string ActorId { get; set; } = string.Empty;
+    public DateTime EnqueuedAt { get; set; } = DateTime.UtcNow;
+}

src/Broca.ActivityPub.Persistence.MySql/Entities/BlobEntity.cs

@@ -0,0 +1,14 @@
+namespace Broca.ActivityPub.Persistence.MySql.Entities;
+
+public class BlobEntity
+{
+    public string Username { get; set; } = string.Empty;
+    public string BlobId { get; set; } = string.Empty;
+    public string ContentType { get; set; } = "application/octet-stream";
+    public string StorageProvider { get; set; } = "mysql";
+    public string? StorageKey { get; set; }
+    public byte[]? Content { get; set; }
+    public long? Size { get; set; }
+
+    public ActorEntity? Actor { get; set; }
+}

src/Broca.ActivityPub.Persistence.MySql/Entities/CollectionDefinitionEntity.cs

@@ -0,0 +1,11 @@
+namespace Broca.ActivityPub.Persistence.MySql.Entities;
+
+public class CollectionDefinitionEntity
+{
+    public string Username { get; set; } = string.Empty;
+    public string CollectionId { get; set; } = string.Empty;
+    public string DefinitionJson { get; set; } = string.Empty;
+
+    public ActorEntity? Actor { get; set; }
+    public ICollection<CollectionItemEntity> Items { get; set; } = new List<CollectionItemEntity>();
+}

src/Broca.ActivityPub.Persistence.MySql/Entities/CollectionItemEntity.cs

@@ -0,0 +1,11 @@
+namespace Broca.ActivityPub.Persistence.MySql.Entities;
+
+public class CollectionItemEntity
+{
+    public string Username { get; set; } = string.Empty;
+    public string CollectionId { get; set; } = string.Empty;
+    public string ItemId { get; set; } = string.Empty;
+
+    public ActorEntity? Actor { get; set; }
+    public CollectionDefinitionEntity? CollectionDefinition { get; set; }
+}