Pure messaging bump v0.7.0

build/tasks.ps1

@@ -21,7 +21,6 @@ $projects = @(
 
 	"Sa.Partitional.PostgreSql",
 
-  "Sa.Outbox.Support",
 	"Sa.Outbox",
 	"Sa.Outbox.PostgreSql",
 

src/Sa.Configuration.PostgreSql/Sa.Configuration.PostgreSql.csproj

@@ -3,7 +3,7 @@
   <Import Project="../Common.NuGet.Properties.xml" />
 
   <PropertyGroup>
-    <Version>0.6.0</Version>
+    <Version>0.7.0</Version>
     <Description>add a PostgreSQL-based configuration source to IConfiguration</Description>
   </PropertyGroup>
 

src/Sa.Configuration/Sa.Configuration.csproj

@@ -3,7 +3,7 @@
   <Import Project="../Common.NuGet.Properties.xml" />
 
   <PropertyGroup>
-    <Version>0.6.0</Version>
+    <Version>0.7.0</Version>
     <Description>extensions for Configuration</Description>
   </PropertyGroup>
 

src/Sa.Data.PostgreSql/Sa.Data.PostgreSql.csproj

@@ -3,7 +3,7 @@
   <Import Project="../Common.NuGet.Properties.xml" />
 
   <PropertyGroup>
-    <Version>0.6.0</Version>
+    <Version>0.7.0</Version>
     <Description>Simple client for Npqsql</Description>
   </PropertyGroup>
 

src/Sa.Data.S3/Sa.Data.S3.csproj

@@ -3,7 +3,7 @@
 	<Import Project="../Common.NuGet.Properties.xml" />
 
 	<PropertyGroup>
-		<Version>0.6.0</Version>
+		<Version>0.7.0</Version>
 		<Title>Sa.Data.S3</Title>
 		<Description>Simple client for S3 (Sa.Data.S3)</Description>
 		<PackageTags>s3</PackageTags>

src/Sa.HybridFileStorage.FileSystem/Sa.HybridFileStorage.FileSystem.csproj

@@ -3,7 +3,7 @@
   <Import Project="../Common.NuGet.Properties.xml" />
 
   <PropertyGroup>
-    <Version>0.6.0</Version>
+    <Version>0.7.0</Version>
     <Description>File storage management</Description>
   </PropertyGroup>
 

src/Sa.HybridFileStorage.Postgres/Sa.HybridFileStorage.Postgres.csproj

@@ -3,7 +3,7 @@
   <Import Project="../Common.NuGet.Properties.xml" />
 
   <PropertyGroup>
-    <Version>0.6.0</Version>
+    <Version>0.7.0</Version>
     <Description>File storage management in Pg</Description>
   </PropertyGroup>
 

src/Sa.HybridFileStorage.S3/Sa.HybridFileStorage.S3.csproj

@@ -3,7 +3,7 @@
   <Import Project="../Common.NuGet.Properties.xml" />
 
   <PropertyGroup>
-    <Version>0.6.0</Version>
+    <Version>0.7.0</Version>
     <Description>File storage management in S3</Description>
   </PropertyGroup>
 

src/Sa.HybridFileStorage/Sa.HybridFileStorage.csproj

@@ -3,7 +3,7 @@
   <Import Project="../Common.NuGet.Properties.xml" />
 
   <PropertyGroup>
-    <Version>0.6.0</Version>
+    <Version>0.7.0</Version>
     <Description>File storage management</Description>
   </PropertyGroup>
 

src/Sa.Media.FFmpeg/Sa.Media.FFmpeg.csproj

@@ -3,7 +3,7 @@
   <Import Project="../Common.NuGet.Properties.xml" />
 
   <PropertyGroup>
-    <Version>0.6.0</Version>
+    <Version>0.7.0</Version>
     <Description>FFmpeg wrapper</Description>
   </PropertyGroup>
 

src/Sa.Media/Sa.Media.csproj

@@ -3,7 +3,7 @@
   <Import Project="../Common.NuGet.Properties.xml" />
 
   <PropertyGroup>
-    <Version>0.6.0</Version>
+    <Version>0.7.0</Version>
     <Description>Async and memory-efficient WAV file reader for .NET </Description>
   </PropertyGroup>
 

src/Sa.Outbox.PostgreSql/Commands/NpgsqlCommandExtension.cs

@@ -1,5 +1,6 @@
 using Npgsql;
 using Sa.Data.PostgreSql;
+using Sa.Outbox.Delivery;
 using Sa.Outbox.PostgreSql.SqlBuilder;
 
 namespace Sa.Outbox.PostgreSql.Commands;

src/Sa.Outbox.PostgreSql/Configuration/OutboxMessageSerializer.cs

@@ -0,0 +1,18 @@
+using Sa.Outbox.PostgreSql.Serialization;
+using System.Text.Json;
+
+namespace Sa.Outbox.PostgreSql.Configuration;
+
+internal sealed class OutboxMessageSerializer : IOutboxMessageSerializer
+{
+#pragma warning disable IL2026
+#pragma warning disable IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
+    public T? Deserialize<T>(Stream stream) => JsonSerializer.Deserialize<T>(stream);
+
+
+    public void Serialize<T>(Stream stream, T value) => JsonSerializer.Serialize(stream, value);
+#pragma warning restore IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
+#pragma warning restore IL2026 // Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code
+
+    public static OutboxMessageSerializer Instance { get; } = new();
+}

src/Sa.Outbox.PostgreSql/Configuration/PgOutboxConfiguration.cs

@@ -1,5 +1,4 @@
-using System.Collections.Concurrent;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Sa.Data.PostgreSql;
 using Sa.Outbox.PostgreSql.Serialization;
@@ -8,40 +7,15 @@ namespace Sa.Outbox.PostgreSql.Configuration;
 
 internal sealed class PgOutboxConfiguration(IServiceCollection services) : IPgOutboxConfiguration
 {
-    private static readonly ConcurrentDictionary<
-        IServiceCollection, HashSet<Action<IServiceProvider, PgOutboxSettings>>> s_invokers = [];
-
     public IPgOutboxConfiguration WithOutboxSettings(Action<IServiceProvider, PgOutboxSettings>? configure = null)
     {
         if (configure != null)
         {
-            if (s_invokers.TryGetValue(services, out var invokers))
-            {
-                invokers.Add(configure);
-            }
-            else
-            {
-                s_invokers[services] = [configure];
-            }
+            services.AddSingleton(configure);
         }
 
+        RegisterOutboxSettings();
 
-        services.TryAddSingleton<PgOutboxSettings>(sp =>
-        {
-            PgOutboxSettings settings = new();
-
-            if (s_invokers.TryGetValue(services, out var invokers))
-            {
-                foreach (Action<IServiceProvider, PgOutboxSettings> build in invokers)
-                    build.Invoke(sp, settings);
-
-                s_invokers.Remove(services, out _);
-            }
-
-            return settings;
-        });
-
-        AddSettings();
         return this;
     }
 
@@ -53,18 +27,43 @@ public IPgOutboxConfiguration WithDataSource(Action<IPgDataSourceSettingsBuilder
 
     public IPgOutboxConfiguration WithMessageSerializer(Func<IServiceProvider, IOutboxMessageSerializer> messageSerializerFactory)
     {
+        services.RemoveAll<IOutboxMessageSerializer>();
         services.TryAddSingleton<IOutboxMessageSerializer>(messageSerializerFactory);
         return this;
     }
 
     public IPgOutboxConfiguration WithMessageSerializer<TService>(TService instance)
         where TService : class, IOutboxMessageSerializer
     {
+        services.RemoveAll<IOutboxMessageSerializer>();
         services.TryAddSingleton<IOutboxMessageSerializer>(instance);
         return this;
     }
 
-    private void AddSettings()
+    internal IPgOutboxConfiguration WithDefaultSerializer()
+    {
+        services.TryAddSingleton<IOutboxMessageSerializer>(OutboxMessageSerializer.Instance);
+        return this;
+    }
+
+    private void RegisterOutboxSettings()
+    {
+        services.TryAddSingleton<PgOutboxSettings>(sp =>
+        {
+            PgOutboxSettings settings = new();
+
+            var configureActions = sp.GetServices<Action<IServiceProvider, PgOutboxSettings>>();
+
+            foreach (var configureAction in configureActions)
+                configureAction.Invoke(sp, settings);
+
+            return settings;
+        });
+
+        RegisterComponentSettings();
+    }
+
+    private void RegisterComponentSettings()
     {
         services.TryAddSingleton<PgOutboxTableSettings>(sp => sp.GetRequiredService<PgOutboxSettings>().TableSettings);
         services.TryAddSingleton<PgOutboxMigrationSettings>(sp => sp.GetRequiredService<PgOutboxSettings>().MigrationSettings);

src/Sa.Outbox.PostgreSql/Configuration/PgOutboxConsumeSettings.cs

@@ -1,5 +1,6 @@
-using System.Diagnostics.CodeAnalysis;
-using Sa.Extensions;
+using Sa.Extensions;
+using Sa.Outbox.Delivery;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Sa.Outbox.PostgreSql;
 

src/Sa.Outbox.PostgreSql/Configuration/PgOutboxTableSettings.cs

@@ -120,7 +120,7 @@ public string[] All() =>
                 $"{MsgCreatedAt} BIGINT NOT NULL DEFAULT 0",
                 $"{DeliveryId} BIGINT NOT NULL DEFAULT 0",
                 $"{DeliveryAttempt} INT NOT NULL DEFAULT 0",
-                $"{DeliveryStatusCode} INT NOT NULL DEFAULT {(int)Outbox.DeliveryStatusCode.Pending}",
+                $"{DeliveryStatusCode} INT NOT NULL DEFAULT {(int)Outbox.Delivery.DeliveryStatusCode.Pending}",
                 $"{DeliveryStatusMessage} TEXT NOT NULL DEFAULT ''",
                 $"{DeliveryCreatedAt} BIGINT NOT NULL DEFAULT 0",
                 $"{ErrorId} BIGINT NOT NULL DEFAULT 0",
@@ -160,7 +160,7 @@ public sealed class TableFields
             public string[] All() =>
             [
                 $"{DeliveryId} BIGSERIAL NOT NULL",
-                $"{DeliveryStatusCode} INT NOT NULL DEFAULT {(int)Outbox.DeliveryStatusCode.Pending}",
+                $"{DeliveryStatusCode} INT NOT NULL DEFAULT {(int)Outbox.Delivery.DeliveryStatusCode.Pending}",
                 $"{DeliveryStatusMessage} TEXT NOT NULL DEFAULT ''",
                 $"{MsgPayloadId} TEXT NOT NULL DEFAULT ''",
                 $"{TenantId} INT NOT NULL DEFAULT 0",

src/Sa.Outbox.PostgreSql/Configuration/Setup.cs

@@ -8,13 +8,15 @@ public static IServiceCollection AddPgOutboxSettings(
         this IServiceCollection services,
         Action<IPgOutboxConfiguration>? configure = null)
     {
-        var cfg = new PgOutboxConfiguration(services);
-        configure?.Invoke(cfg);
-
-        cfg
+        var configuration = new PgOutboxConfiguration(services)
+            .WithDefaultSerializer()
             .WithOutboxSettings()
             .WithDataSource()
-            ;
+        ;
+
+        configure?.Invoke(configuration);
+
+
 
         return services;
     }

src/Sa.Outbox.PostgreSql/Interceptors/DeliveryJobInterceptor.cs

@@ -1,4 +1,4 @@
-using Sa.Outbox.Job;
+using Sa.Outbox.Delivery.Job;
 using Sa.Partitional.PostgreSql;
 using Sa.Schedule;
 

src/Sa.Outbox.PostgreSql/Interceptors/Setup.cs

@@ -1,6 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
-using Sa.Outbox.Job;
+using Sa.Outbox.Delivery.Job;
 
 namespace Sa.Outbox.PostgreSql.Interceptors;