Allow using persistent subscription client (#354)

Author: alexeyzimarev

.editorconfig

@@ -122,6 +122,8 @@ dotnet_style_parentheses_in_relational_binary_operators = never_if_unnecessary:n
 dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
 dotnet_style_predefined_type_for_member_access = true:suggestion
 dotnet_style_require_accessibility_modifiers = never:suggestion
+object_creation_when_type_evident = target_typed
+object_creation_when_type_not_evident = target_typed
 
 resharper_max_attribute_length_for_same_line = 80
 resharper_nested_ternary_style = expanded

src/Core/src/Eventuous.Subscriptions/EventSubscription.cs

@@ -27,7 +27,7 @@ public abstract class EventSubscription<T> : IMessageSubscription, IAsyncDisposa
     internal  ConsumePipe             Pipe            { get; }
     protected ILoggerFactory?         LoggerFactory   { get; }
     protected LogContext              Log             { get; }
-    protected CancellationTokenSource Stopping        { get; } = new();
+    protected CancellationTokenSource Stopping        { get; set; } = new();
 
     protected ulong Sequence;
 
@@ -47,11 +47,13 @@ protected EventSubscription(T options, ConsumePipe consumePipe, ILoggerFactory?
     public string SubscriptionId => Options.SubscriptionId;
 
     public async ValueTask Subscribe(OnSubscribed onSubscribed, OnDropped onDropped, CancellationToken cancellationToken) {
-        var cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, Stopping.Token);
+        if (IsRunning) return;
+
+        Stopping = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
 
         _onSubscribed = onSubscribed;
         _onDropped    = onDropped;
-        await Subscribe(cts.Token).NoContext();
+        await Subscribe(Stopping.Token).NoContext();
         IsRunning = true;
         Log.SubscriptionStarted();
         onSubscribed(Options.SubscriptionId);
@@ -64,6 +66,7 @@ public async ValueTask Unsubscribe(OnUnsubscribed onUnsubscribed, CancellationTo
         onUnsubscribed(Options.SubscriptionId);
         await Finalize(cancellationToken);
         Sequence = 0;
+        Stopping.Dispose();
     }
 
     protected virtual ValueTask Finalize(CancellationToken cancellationToken) => default;

src/Core/src/Eventuous.Subscriptions/Registrations/SubscriptionRegistrationExtensions.cs

@@ -33,12 +33,7 @@ Action<SubscriptionBuilder<T, TOptions>> configureSubscription
             .AddSubscriptionBuilder(builder)
             .AddSingleton(sp => GetBuilder(sp).ResolveSubscription(sp))
             .AddSingleton<IHostedService, SubscriptionHostedService>(
-                sp =>
-                    new SubscriptionHostedService(
-                        GetBuilder(sp).ResolveSubscription(sp),
-                        sp.GetService<ISubscriptionHealth>(),
-                        sp.GetService<ILoggerFactory>()
-                    )
+                sp => new(GetBuilder(sp).ResolveSubscription(sp), sp.GetService<ISubscriptionHealth>(), sp.GetService<ILoggerFactory>())
             );
 
         SubscriptionBuilder<T, TOptions> GetBuilder(IServiceProvider sp) => sp.GetSubscriptionBuilder<T, TOptions>(subscriptionId);

src/Core/test/Eventuous.Tests.Application/Eventuous.Tests.Application.csproj

@@ -4,6 +4,6 @@
         <IncludeSutApp>true</IncludeSutApp>
     </PropertyGroup>
     <ItemGroup>
-      <ProjectReference Include="..\..\..\Testing\src\Eventuous.Testing\Eventuous.Testing.csproj" />
+      <ProjectReference Include="$(SrcRoot)\Testing\src\Eventuous.Testing\Eventuous.Testing.csproj" />
     </ItemGroup>
 </Project>

src/Core/test/Eventuous.Tests.Persistence.Base/Eventuous.Tests.Persistence.Base.csproj

@@ -10,4 +10,7 @@
     <PackageReference Include="NodaTime.Serialization.SystemTextJson" />
     <PackageReference Include="Testcontainers" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(RepoRoot)\test\Eventuous.TestHelpers\Eventuous.TestHelpers.csproj" />
+  </ItemGroup>
 </Project>

src/Core/test/Eventuous.Tests.Persistence.Base/Fixtures/StoreFixtureBase.cs

@@ -1,15 +1,13 @@
 // Copyright (C) Ubiquitous AS.All rights reserved
 // Licensed under the Apache License, Version 2.0.
 
-using System.Text.Json;
 using System.Text.RegularExpressions;
 using Bogus;
 using DotNet.Testcontainers.Containers;
+using Eventuous.TestHelpers;
 using MicroElements.AutoFixture.NodaTime;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using NodaTime;
-using NodaTime.Serialization.SystemTextJson;
 
 namespace Eventuous.Tests.Persistence.Base.Fixtures;
 
@@ -24,8 +22,7 @@ public abstract class StoreFixtureBase {
 }
 
 public abstract partial class StoreFixtureBase<TContainer> : StoreFixtureBase, IAsyncLifetime where TContainer : DockerContainer {
-    IEventSerializer Serializer { get; } =
-        new DefaultEventSerializer(new JsonSerializerOptions(JsonSerializerDefaults.Web).ConfigureForNodaTime(DateTimeZoneProviders.Tzdb));
+    IEventSerializer Serializer { get; } = new DefaultEventSerializer(TestPrimitives.DefaultOptions);
 
     public virtual async Task InitializeAsync() {
         Container = CreateContainer();
@@ -80,7 +77,7 @@ public virtual async Task DisposeAsync() {
 
     protected virtual void GetDependencies(IServiceProvider provider) { }
 
-    protected TContainer Container { get; private set; } = null!;
+    public TContainer Container { get; private set; } = null!;
 
     bool _disposed;
 

src/Core/test/Eventuous.Tests.Subscriptions.Base/SubscribeToStream.cs

@@ -68,7 +68,7 @@ public async Task ShouldUseExistingCheckpoint() {
 
         await fixture.CheckpointStore.GetLastCheckpoint(fixture.SubscriptionId, default);
         Logger.ConfigureIfNull(fixture.SubscriptionId, fixture.LoggerFactory);
-        await fixture.CheckpointStore.StoreCheckpoint(new Checkpoint(fixture.SubscriptionId, 9), true, default);
+        await fixture.CheckpointStore.StoreCheckpoint(new(fixture.SubscriptionId, 9), true, default);
 
         await fixture.StartSubscription();
         await Task.Delay(TimeSpan.FromSeconds(1));
@@ -88,7 +88,7 @@ async Task<List<BookingImported>> GenerateAndProduceEvents(int count) {
             .ToList();
 
         var events       = commands.Select(ToEvent).ToList();
-        var streamEvents = events.Select(x => new StreamEvent(Guid.NewGuid(), x, new Metadata(), "", 0));
+        var streamEvents = events.Select(x => new StreamEvent(Guid.NewGuid(), x, new(), "", 0));
         await fixture.EventStore.AppendEvents(streamName, ExpectedStreamVersion.Any, streamEvents.ToArray(), default);
 
         return events;

src/EventStore/src/Eventuous.EventStore/Subscriptions/AllPersistentSubscription.cs

@@ -26,6 +26,21 @@ public AllPersistentSubscription(
         )
         : base(eventStoreClient, options, consumePipe, loggerFactory) { }
 
+    /// <summary>
+    /// Persistent subscription for EventStoreDB, for $all stream
+    /// </summary>
+    /// <param name="eventStoreClient">EventStoreDB persistent subscription client instance</param>
+    /// <param name="options">Persistent subscription options</param>
+    /// <param name="consumePipe">Consume pipe, usually provided by the builder</param>
+    /// <param name="loggerFactory">Optional logger factory</param>
+    public AllPersistentSubscription(
+            EventStorePersistentSubscriptionsClient eventStoreClient,
+            AllPersistentSubscriptionOptions        options,
+            ConsumePipe                             consumePipe,
+            ILoggerFactory?                         loggerFactory
+        )
+        : base(eventStoreClient, options, consumePipe, loggerFactory) { }
+
     /// <summary>
     /// Creates EventStoreDB persistent subscription service for a given stream
     /// </summary>

src/EventStore/src/Eventuous.EventStore/Subscriptions/EventStoreCatchUpSubscriptionBase.cs

@@ -43,9 +43,9 @@ protected EventStoreCatchUpSubscriptionBase(
     /// <param name="cancellationToken"></param>
     protected override async ValueTask Unsubscribe(CancellationToken cancellationToken) {
         try {
+            Subscription?.Dispose();
             Stopping.Cancel(false);
             await Task.Delay(100, cancellationToken);
-            Subscription?.Dispose();
         } catch (Exception) {
             // Nothing to see here
         }

src/EventStore/src/Eventuous.EventStore/Subscriptions/EventStoreExtensions.cs

@@ -6,8 +6,8 @@
 namespace Eventuous.EventStore.Subscriptions; 
 
 static class EventStoreExtensions {
-    public static EventStoreClientSettings GetSettings(this EventStoreClient client) {
-        var prop = typeof(EventStoreClient).GetProperty("Settings", BindingFlags.NonPublic | BindingFlags.Instance);
+    public static EventStoreClientSettings GetSettings(this EventStoreClientBase client) {
+        var prop = typeof(EventStoreClientBase).GetProperty("Settings", BindingFlags.NonPublic | BindingFlags.Instance);
 
         var getter = prop!.GetGetMethod(true);
         return (EventStoreClientSettings) getter!.Invoke(client, null)!;