ESDB client update (#70)

* Moved to the new subscription start
* Added persistent subscription to all
* Fixed the failing stream subscription when it hits a deleted event

Author: alexeyzimarev

src/Core/src/Eventuous.Subscriptions/Context/DelayedAckConsumeContext.cs

@@ -23,10 +23,9 @@ public class DelayedAckConsumeContext : WrappedConsumeContext {
     /// <param name="inner">The original message context</param>
     /// <param name="acknowledge">Function to ACK the message</param>
     /// <param name="fail">Function to NACK the message in case of failure</param>
-    public DelayedAckConsumeContext(IMessageConsumeContext inner, Acknowledge acknowledge, Fail fail)
-        : base(inner) {
+    public DelayedAckConsumeContext(IMessageConsumeContext inner, Acknowledge acknowledge, Fail fail) : base(inner) {
         _acknowledge = acknowledge;
-        _fail   = fail;
+        _fail        = fail;
     }
 
     /// <summary>

src/Core/src/Eventuous/AppService/ApplicationService.cs

@@ -241,6 +241,9 @@ public async Task<Result<TState, TId>> Handle(object command, CancellationToken
             var storeResult = await Store.Store(result, cancellationToken).NoContext();
 
             var changes = result.Changes.Select(x => new Change(x, TypeMap.GetTypeName(x)));
+            
+            Log.CommandHandled(commandType);
+            
             return new OkResult<TState, TId>(result.State, changes, storeResult.GlobalPosition);
         }
         catch (Exception e) {

src/Core/src/Eventuous/Diagnostics/EventuousEventSource.cs

@@ -15,26 +15,27 @@ public class EventuousEventSource : EventSource {
 
     const int CommandHandlerNotFoundId          = 1;
     const int ErrorHandlingCommandId            = 2;
-    const int CommandHandlerAlreadyRegisteredId = 3;
-    const int UnableToStoreAggregateId          = 4;
-    const int UnableToReadAggregateId           = 5;
-    const int UnableToAppendEventsId            = 6;
-    const int TypeNotMappedToNameId             = 7;
-    const int TypeNameNotMappedToTypeId         = 8;
-    const int TypeMapRegisteredId               = 9;
+    const int CommandHandledId                  = 3;
+    const int CommandHandlerAlreadyRegisteredId = 4;
+    const int UnableToStoreAggregateId          = 5;
+    const int UnableToReadAggregateId           = 6;
+    const int UnableToAppendEventsId            = 7;
+    const int TypeNotMappedToNameId             = 8;
+    const int TypeNameNotMappedToTypeId         = 9;
+    const int TypeMapRegisteredId               = 10;
 
     [NonEvent]
     public void CommandHandlerNotFound(Type type) => CommandHandlerNotFound(type.Name);
 
-    [NonEvent]
-    public void CommandHandlerNotFound<T>() => CommandHandlerNotFound(typeof(T).Name);
-
     [NonEvent]
     public void ErrorHandlingCommand(Type type, Exception e) => ErrorHandlingCommand(type.Name, e.ToString());
 
     [NonEvent]
-    public void ErrorHandlingCommand<T>(Exception e) => ErrorHandlingCommand(typeof(T).Name, e.ToString());
-
+    public void CommandHandled(Type commandType) {
+        if (IsEnabled(EventLevel.Verbose, EventKeywords.All))
+            CommandHandled(commandType.Name);
+    }
+    
     [NonEvent]
     public void CommandHandlerAlreadyRegistered<T>() => CommandHandlerAlreadyRegistered(typeof(T).Name);
 
@@ -64,6 +65,9 @@ public void UnableToLoadAggregate<T>(string id, Exception exception) where T : A
     public void ErrorHandlingCommand(string commandType, string exception)
         => WriteEvent(ErrorHandlingCommandId, commandType, exception);
 
+    [Event(CommandHandledId, Message = "Command handled: '{0}'", Level = EventLevel.Verbose)]
+    public void CommandHandled(string commandType) => WriteEvent(CommandHandledId, commandType);
+    
     [Event(
         CommandHandlerAlreadyRegisteredId,
         Message = "Command handler already registered for {0}",

src/Diagnostics/test/Eventuous.Tests.OpenTelemetry/Fixtures/IntegrationFixture.cs

@@ -6,7 +6,7 @@
 
 namespace Eventuous.Tests.OpenTelemetry.Fixtures;
 
-public class IntegrationFixture : IDisposable {
+public class IntegrationFixture : IAsyncDisposable {
     public IEventStore      EventStore     { get; }
     public IAggregateStore  AggregateStore { get; }
     public EventStoreClient Client         { get; }
@@ -30,8 +30,5 @@ public class IntegrationFixture : IDisposable {
         // ActivitySource.AddActivityListener(_listener);
     }
 
-    public void Dispose() {
-        // _listener.Dispose();
-        Client.Dispose();
-    }
+    public ValueTask DisposeAsync() => Client.DisposeAsync();
 }

src/Directory.Build.props

@@ -45,7 +45,7 @@
     </PropertyGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-        <PackageReference Include="IsExternalInit" Version="1.0.1" PrivateAssets="All"/>
+        <PackageReference Include="IsExternalInit" Version="1.0.2" PrivateAssets="All"/>
     </ItemGroup>
 
     <PropertyGroup Condition="'$(IsTestProject)' == 'true'">

src/EventStore/src/Eventuous.EventStore/EsdbEventStore.cs

@@ -271,12 +271,12 @@ CancellationToken     cancellationToken
     ) => TryExecute(
         () => AnyOrNot(
             expectedVersion,
-            () => _client.SoftDeleteAsync(
+            () => _client.DeleteAsync(
                 stream,
                 StreamState.Any,
                 cancellationToken: cancellationToken
             ),
-            () => _client.SoftDeleteAsync(
+            () => _client.DeleteAsync(
                 stream,
                 expectedVersion.AsStreamRevision(),
                 cancellationToken: cancellationToken

src/EventStore/src/Eventuous.EventStore/Eventuous.EventStore.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <ItemGroup>
-        <PackageReference Include="EventStore.Client.Grpc.PersistentSubscriptions" Version="21.2.0" />
-        <PackageReference Include="EventStore.Client.Grpc.Streams" Version="21.2.0" />
+        <PackageReference Include="EventStore.Client.Grpc.PersistentSubscriptions" Version="22.0.0" />
+        <PackageReference Include="EventStore.Client.Grpc.Streams" Version="22.0.0" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="$(CoreRoot)\Eventuous.Producers\Eventuous.Producers.csproj" />
@@ -13,4 +13,7 @@
         <Using Include="Eventuous.Subscriptions" />
         <Using Include="Microsoft.Extensions.Logging" />
     </ItemGroup>
+    <ItemGroup>
+      <None Remove="Eventuous.EventStore.csproj.DotSettings" />
+    </ItemGroup>
 </Project>

src/EventStore/src/Eventuous.EventStore/Eventuous.EventStore.csproj.DotSettings

@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=subscriptions_005Coptions/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

src/EventStore/src/Eventuous.EventStore/Producers/EventStoreProduceOptions.cs

@@ -16,11 +16,8 @@ public record EventStoreProduceOptions {
     /// Maximum number of events appended to a single stream in one batch
     /// </summary>
     public int MaxAppendEventsCount { get; init; } = 500;
-
-    /// <summary>
-    /// Optional function to configure client operation options
-    /// </summary>
-    public Action<EventStoreClientOperationOptions>? ConfigureOperation { get; init; }
 
+    public TimeSpan? Deadline { get; init; }
+
     public static EventStoreProduceOptions Default { get; } = new();
 }

src/EventStore/src/Eventuous.EventStore/Producers/EventStoreProducer.cs

@@ -62,7 +62,8 @@ await _client.AppendToStreamAsync(
                 stream,
                 options.ExpectedState,
                 chunk.Select(CreateMessage),
-                options.ConfigureOperation,
+                null,
+                options.Deadline,
                 options.Credentials,
                 cancellationToken
             ).NoContext();