Merge pull request #174 from Jubast/master

yevhen · web-flow · commit 158b24e2cee0 · 2021-06-06T09:35:40.000+03:00
Add stream ref middleware
diff --git a/Source/Orleankka/ActorSystem.cs b/Source/Orleankka/ActorSystem.cs
@@ -52,12 +52,14 @@ public abstract class ActorSystem : IActorSystem
         readonly IServiceProvider serviceProvider;
         readonly IGrainFactory grainFactory;
         readonly IActorRefMiddleware actorRefMiddleware;
+        readonly IStreamRefMiddleware streamRefMiddleware;
 
         protected ActorSystem(Assembly[] assemblies, IServiceProvider serviceProvider)
         {
             this.serviceProvider = serviceProvider;
             this.grainFactory = serviceProvider.GetService<IGrainFactory>();
             this.actorRefMiddleware = serviceProvider.GetService<IActorRefMiddleware>() ?? DefaultActorRefMiddleware.Instance;
+            this.streamRefMiddleware = serviceProvider.GetService<IStreamRefMiddleware>() ?? DefaultStreamRefMiddleware.Instance;
 
             Register(assemblies);
         }
@@ -97,7 +99,8 @@ public StreamRef<TItem> StreamOf<TItem>(StreamPath path)
                 throw new ArgumentException("Stream path is empty", nameof(path));
 
             var provider = serviceProvider.GetServiceByName<IStreamProvider>(path.Provider);
-            return new StreamRef<TItem>(path, provider);
+            
+            return new StreamRef<TItem>(path, provider, streamRefMiddleware);
         }
 
         /// <inheritdoc />
diff --git a/Source/Orleankka/Receive.cs b/Source/Orleankka/Receive.cs
@@ -5,4 +5,6 @@
 namespace Orleankka
 {
     public delegate Task<object> Receive(object message);
+
+    public delegate Task Receive<in TMessage>(TMessage message);
 }
diff --git a/Source/Orleankka/StreamRef.cs b/Source/Orleankka/StreamRef.cs
@@ -10,6 +10,8 @@
 using Orleans.Streams;
 using Orleans.Runtime;
 
+using Microsoft.Extensions.DependencyInjection;
+
 namespace Orleankka
 {
     using Utility;
@@ -18,13 +20,20 @@ namespace Orleankka
     [DebuggerDisplay("s->{ToString()}")]
     public class StreamRef<TItem> : IEquatable<StreamRef<TItem>>, IEquatable<StreamPath>
     {
-        [NonSerialized]
-        readonly IStreamProvider provider;
+        [NonSerialized] readonly IStreamProvider provider;
+        [NonSerialized] readonly IStreamRefMiddleware middleware;
 
-        protected internal StreamRef(StreamPath path, IStreamProvider provider = null)
+        protected StreamRef(StreamPath path)
         {
             Path = path;
+        }
+
+        internal StreamRef(StreamPath path, IStreamProvider provider, IStreamRefMiddleware middleware) 
+            : this(path)
+        {
+
             this.provider = provider;
+            this.middleware = middleware;
         }
 
         [NonSerialized]
@@ -88,16 +97,28 @@ public virtual async Task Publish<TMessage>(TMessage message) where TMessage : P
             switch (message)
             {
                 case NextItem<TItem> next:
-                    await Endpoint.OnNextAsync(next.Item, next.Token);
+                    await middleware.Publish(Path, next, async x =>
+                    {
+                        await Endpoint.OnNextAsync(x.Item, x.Token);
+                    });
                     break;
                 case NextItemBatch<TItem> next:
-                    await Endpoint.OnNextBatchAsync(next.Items, next.Token);
+                    await middleware.Publish(Path, next, async x =>
+                    {
+                        await Endpoint.OnNextBatchAsync(x.Items, x.Token);
+                    });
                     break;
                 case NotifyStreamError error:
-                    await Endpoint.OnErrorAsync(error.Exception);
+                    await middleware.Publish(Path, error, async x =>
+                    {
+                        await Endpoint.OnErrorAsync(x.Exception);
+                    });
                     break;
-                case NotifyStreamCompleted _:
-                    await Endpoint.OnCompletedAsync();
+                case NotifyStreamCompleted completed:
+                    await middleware.Publish(Path, completed, async _ =>
+                    {
+                        await Endpoint.OnCompletedAsync();
+                    });
                     break;
                 default:
                     throw new ArgumentOutOfRangeException(nameof(message), $"Unsupported type of publish message: '{message.GetType()}'");
@@ -130,7 +151,7 @@ public virtual async Task<StreamSubscription<TItem>> Subscribe<TOptions>(Func<St
 
             async Task<StreamSubscription<TItem>> Subscribe(SubscribeReceiveItem o)
             {
-                var observer = new Observer(this, callback);
+                var observer = CreateObserver(callback);
                 
                 var predicate = o.Filter != null
                     ? StreamFilter.Internal.Predicate
@@ -142,7 +163,7 @@ async Task<StreamSubscription<TItem>> Subscribe(SubscribeReceiveItem o)
 
             async Task<StreamSubscription<TItem>> SubscribeBatch(SubscribeReceiveBatch o)
             {
-                var observer = new BatchObserver(this, callback);
+                var observer = CreateBatchObserver(callback);
                 var handle = await Endpoint.SubscribeAsync(observer, o.Token);
                 return new StreamSubscription<TItem>(this, handle);
             }
@@ -198,46 +219,66 @@ static object Deserialize(Type t, IDeserializationContext context)
         {
             var reader = context.StreamReader;
             var path = StreamPath.Parse(reader.ReadString());
-            var provider = context.ServiceProvider.GetServiceByName<IStreamProvider>(path.Provider);
-            return new StreamRef<TItem>(path, provider);
+            var system = context.ServiceProvider.GetRequiredService<IActorSystem>();
+            return system.StreamOf<TItem>(path);
         }
 
         #endregion
 
+        internal BatchObserver CreateBatchObserver(Func<StreamMessage, Task> callback)
+        {
+            return new BatchObserver(this, callback, middleware);
+        }
+
+        internal Observer CreateObserver(Func<StreamMessage, Task> callback)
+        {
+            return new Observer(this, callback, middleware);
+        }
+
         internal class BatchObserver : IAsyncBatchObserver<TItem>
         {
             readonly StreamRef<TItem> stream;
             readonly Func<StreamMessage, Task> callback;
+            readonly IStreamRefMiddleware middleware;
 
-            public BatchObserver(StreamRef<TItem> stream, Func<StreamMessage, Task> callback)
+            public BatchObserver(StreamRef<TItem> stream, Func<StreamMessage, Task> callback, IStreamRefMiddleware middleware)
             {
                 this.stream = stream;
                 this.callback = callback;
+                this.middleware = middleware;
             }
 
-            public Task OnNextAsync(IList<SequentialItem<TItem>> items) => 
-                callback(new StreamItemBatch<TItem>(stream, items));
+            public Task OnNextAsync(IList<SequentialItem<TItem>> items) =>
+                middleware.Receive(stream.Path, new StreamItemBatch<TItem>(stream, items), x => callback(x));
+
+            public Task OnCompletedAsync() => 
+                middleware.Receive(stream.Path, new StreamCompleted(stream), x => callback(x));
 
-            public Task OnCompletedAsync() => callback(new StreamCompleted(stream));
-            public Task OnErrorAsync(Exception ex) => callback(new StreamError(stream, ex));
+            public Task OnErrorAsync(Exception ex) => 
+                middleware.Receive(stream.Path, new StreamError(stream, ex), x => callback(x));
         }
 
         internal class Observer : IAsyncObserver<TItem>
         {
             readonly StreamRef<TItem> stream;
             readonly Func<StreamMessage, Task> callback;
+            readonly IStreamRefMiddleware middleware;
 
-            public Observer(StreamRef<TItem> stream, Func<StreamMessage, Task> callback)
+            public Observer(StreamRef<TItem> stream, Func<StreamMessage, Task> callback, IStreamRefMiddleware middleware)
             {
                 this.stream = stream;
                 this.callback = callback;
+                this.middleware = middleware;
             }
 
-            public Task OnNextAsync(TItem item, StreamSequenceToken token = null) => 
-                callback(new StreamItem<TItem>(stream, item, token));
+            public Task OnNextAsync(TItem item, StreamSequenceToken token = null) =>
+                middleware.Receive(stream.Path, new StreamItem<TItem>(stream, item, token), x => callback(x));
+
+            public Task OnCompletedAsync() => 
+                middleware.Receive(stream.Path, new StreamCompleted(stream), x => callback(x));
 
-            public Task OnCompletedAsync() => callback(new StreamCompleted(stream));
-            public Task OnErrorAsync(Exception ex) => callback(new StreamError(stream, ex));
+            public Task OnErrorAsync(Exception ex) => 
+                middleware.Receive(stream.Path, new StreamError(stream, ex), x => callback(x));
         }
     }
 }
diff --git a/Source/Orleankka/StreamRefMiddleware.cs b/Source/Orleankka/StreamRefMiddleware.cs
@@ -0,0 +1,35 @@
+﻿using System.Threading.Tasks;
+
+namespace Orleankka
+{
+    public interface IStreamRefMiddleware
+    {
+        Task Publish<TMessage>(StreamPath path, TMessage message, Receive<TMessage> receiver) where TMessage : PublishMessage;
+        Task Receive<TMessage>(StreamPath path, TMessage message, Receive<TMessage> receiver) where TMessage : StreamMessage;
+    }
+
+    public abstract class StreamRefMiddleware : IStreamRefMiddleware
+    {
+        readonly IStreamRefMiddleware next;
+
+        protected StreamRefMiddleware(IStreamRefMiddleware next = null) =>
+            this.next = next ?? DefaultStreamRefMiddleware.Instance;
+
+        public virtual Task Publish<TMessage>(StreamPath path, TMessage message, Receive<TMessage> receiver) where TMessage : PublishMessage => 
+            next.Publish(path, message, receiver);
+
+        public virtual Task Receive<TMessage>(StreamPath path, TMessage message, Receive<TMessage> receiver) where TMessage : StreamMessage => 
+            next.Receive(path, message, receiver);
+    }
+
+    class DefaultStreamRefMiddleware : IStreamRefMiddleware
+    {
+        public static readonly DefaultStreamRefMiddleware Instance = new DefaultStreamRefMiddleware();
+
+        public Task Publish<TMessage>(StreamPath path, TMessage message, Receive<TMessage> receiver) where TMessage : PublishMessage => 
+            receiver(message);
+
+        public Task Receive<TMessage>(StreamPath path, TMessage message, Receive<TMessage> receiver) where TMessage : StreamMessage => 
+            receiver(message);
+    }
+}
diff --git a/Source/Orleankka/StreamSubscription.cs b/Source/Orleankka/StreamSubscription.cs
@@ -73,13 +73,13 @@ public virtual async Task<StreamSubscription<TItem>> Resume<TOptions>(Func<Strea
 
             async Task<StreamSubscription<TItem>> Resume(ResumeReceiveItem o)
             {
-                var observer = new StreamRef<TItem>.Observer(Stream, callback);
+                var observer = Stream.CreateObserver(callback);
                 return new StreamSubscription<TItem>(Stream, await handle.ResumeAsync(observer, o.Token));
             }
 
             async Task<StreamSubscription<TItem>> ResumeBatch(ResumeReceiveBatch o)
             {
-                var observer = new StreamRef<TItem>.BatchObserver(Stream, callback);
+                var observer = Stream.CreateBatchObserver(callback);
                 return new StreamSubscription<TItem>(Stream, await handle.ResumeAsync(observer, o.Token));
             }
         }
diff --git a/Tests/Orleankka.Tests/Checks/StreamRefFixture.cs b/Tests/Orleankka.Tests/Checks/StreamRefFixture.cs
@@ -10,8 +10,8 @@ public void Equatable_by_path()
         {
             var path = StreamPath.From("sms", "42");
 
-            var ref1 = new StreamRef<string>(path, null);
-            var ref2 = new StreamRef<string>(path, null);
+            var ref1 = new StreamRef<string>(path, null, null);
+            var ref2 = new StreamRef<string>(path, null, null);
             
             Assert.True(ref1 == ref2);
             Assert.True(ref1.Equals(ref2));
diff --git a/Tests/Orleankka.Tests/Features/Intercepting_requests.cs b/Tests/Orleankka.Tests/Features/Intercepting_requests.cs
@@ -125,6 +125,29 @@ public override Task<object> Receive(ActorPath actor, object message, Receive re
             }
         }
 
+        public class TestStreamRefMiddleware : StreamRefMiddleware
+        {
+            public override Task Publish<TMessage>(StreamPath path, TMessage message, Receive<TMessage> receiver)
+            {
+                if (message is NextItem<ItemData> nextItem && nextItem.Item.Text == "StreamRefMiddlewarePublishTest")
+                {
+                    nextItem.Item.Text += " - it works!";
+                }
+
+                return base.Publish(path, message, receiver);
+            }
+
+            public override Task Receive<TMessage>(StreamPath path, TMessage message, Receive<TMessage> receiver)
+            {
+                if (message is StreamItem<ItemData> streamItem && streamItem.Item.Text == "StreamRefMiddlewareSubscribeTest")
+                {
+                    streamItem.Item.Text += " - it works!";
+                }
+
+                return base.Receive(path, message, receiver);
+            }
+        }
+
         [TestFixture]
         [RequiresSilo]
         public class Tests
@@ -177,7 +200,7 @@ public async Task Intercepting_stream_messages()
 
                 await stream.Publish(new ItemData {Text = "foo"});
                 await Task.Delay(TimeSpan.FromMilliseconds(10));
-
+                
                 var received = await actor.Ask(new GetReceivedFromStream());
                 Assert.That(received.Count, Is.EqualTo(1));
                 Assert.That(received[0], Is.EqualTo("foo.intercepted"));
@@ -190,6 +213,36 @@ public async Task Intercepting_actor_ref()
                 var result = await actor.Ask<string>(new CheckRef());
                 Assert.That(result, Is.EqualTo("it works!"));
             }
+
+            [Test]
+            public async Task Intercepting_stream_ref_publish()
+            {
+                var stream = system.StreamOf<ItemData>("sms", "test-stream-ref-publish-interception");
+
+                var received = new List<ItemData>();
+                await stream.Subscribe((item, _) => received.Add(item));
+                
+                await stream.Publish(new ItemData { Text = "StreamRefMiddlewarePublishTest" });
+                await Task.Delay(TimeSpan.FromMilliseconds(10));
+
+                Assert.That(received.Count, Is.EqualTo(1));
+                Assert.That(received[0].Text, Is.EqualTo("StreamRefMiddlewarePublishTest - it works!"));
+            }
+
+            [Test]
+            public async Task Intercepting_stream_ref_subscribe()
+            {
+                var stream = system.StreamOf<ItemData>("sms", "test-stream-ref-subscribe-interception");
+
+                var received = new List<ItemData>();
+                await stream.Subscribe((item, _) => received.Add(item));
+
+                await stream.Publish(new ItemData { Text = "StreamRefMiddlewareSubscribeTest" });
+                await Task.Delay(TimeSpan.FromMilliseconds(10));
+
+                Assert.That(received.Count, Is.EqualTo(1));
+                Assert.That(received[0].Text, Is.EqualTo("StreamRefMiddlewareSubscribeTest - it works!"));
+            }
         }
     }
 }
diff --git a/Tests/Orleankka.Tests/Testing/TestActions.cs b/Tests/Orleankka.Tests/Testing/TestActions.cs
@@ -82,6 +82,7 @@ public override void BeforeTest(ITest test)
 
                     services.AddSingleton<IActorRefMiddleware>(s => new TestActorRefMiddleware());
                     services.AddSingleton<IActorMiddleware>(s => new TestActorMiddleware());
+                    services.AddSingleton<IStreamRefMiddleware>(s => new TestStreamRefMiddleware());
                 })
                 .ConfigureApplicationParts(x => x
                     .AddApplicationPart(GetType().Assembly)

Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,6 @@`
`5`	`5`	`namespace Orleankka`
`6`	`6`	`{`
`7`	`7`	`public delegate Task<object> Receive(object message);`
	`8`	`+`
	`9`	`+ public delegate Task Receive<in TMessage>(TMessage message);`
`8`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,13 +73,13 @@ public virtual async Task<StreamSubscription<TItem>> Resume<TOptions>(Func<Strea`
`73`	`73`
`74`	`74`	`async Task<StreamSubscription<TItem>> Resume(ResumeReceiveItem o)`
`75`	`75`	`{`
`76`		`- var observer = new StreamRef<TItem>.Observer(Stream, callback);`
	`76`	`+ var observer = Stream.CreateObserver(callback);`
`77`	`77`	`return new StreamSubscription<TItem>(Stream, await handle.ResumeAsync(observer, o.Token));`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`async Task<StreamSubscription<TItem>> ResumeBatch(ResumeReceiveBatch o)`
`81`	`81`	`{`
`82`		`- var observer = new StreamRef<TItem>.BatchObserver(Stream, callback);`
	`82`	`+ var observer = Stream.CreateBatchObserver(callback);`
`83`	`83`	`return new StreamSubscription<TItem>(Stream, await handle.ResumeAsync(observer, o.Token));`
`84`	`84`	`}`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ public void Equatable_by_path()`
`10`	`10`	`{`
`11`	`11`	`var path = StreamPath.From("sms", "42");`
`12`	`12`
`13`		`- var ref1 = new StreamRef<string>(path, null);`
`14`		`- var ref2 = new StreamRef<string>(path, null);`
	`13`	`+ var ref1 = new StreamRef<string>(path, null, null);`
	`14`	`+ var ref2 = new StreamRef<string>(path, null, null);`
`15`	`15`
`16`	`16`	`Assert.True(ref1 == ref2);`
`17`	`17`	`Assert.True(ref1.Equals(ref2));`