Use FiberExecutionEventArgs with ISubscriber.

Author: tosh-coding

src/AsyncFiberWorks/Channels/Channel.cs

@@ -29,15 +29,10 @@ public IDisposable Subscribe(IExecutionContext executionContext, Action<T> recei
         /// <param name="executionContext">The execution context of the message receive handler.</param>
         /// <param name="receive">Subscriber.</param>
         /// <returns>Unsubscriber.</returns>
-        public IDisposable Subscribe(IAsyncExecutionContext executionContext, Func<T, Task<Action>> receive)
+        public IDisposable Subscribe(IAsyncExecutionContext executionContext, Action<FiberExecutionEventArgs, T> receive)
         {
-            return this._channel.AddHandler((msg) =>
-            {
-                executionContext.Enqueue((e) =>
-                {
-                    e.PauseWhileRunning(async () => await receive.Invoke(msg));
-                });
-            });
+            return this._channel.AddHandler(
+                (msg) => executionContext.Enqueue((e) => receive(e, msg)));
         }
 
         /// <summary>

src/AsyncFiberWorks/Channels/ISubscriber.cs

@@ -24,6 +24,6 @@ public interface ISubscriber<T>
         /// <param name="executionContext">The execution context of the message receive handler.</param>
         /// <param name="receive">Subscriber.</param>
         /// <returns>Unsubscriber.</returns>
-        IDisposable Subscribe(IAsyncExecutionContext executionContext, Func<T, Task<Action>> receive);
+        IDisposable Subscribe(IAsyncExecutionContext executionContext, Action<FiberExecutionEventArgs, T> receive);
     }
 }

src/AsyncFiberWorksTests/ChannelTests.cs

@@ -142,14 +142,17 @@ public void AsyncHandler()
 
             foreach (var node in nodeList)
             {
-                channel.Subscribe(node.Fiber, async (msg) =>
+                channel.Subscribe(node.Fiber, (e, msg) =>
                 {
-                    if (msg > 0)
+                    e.PauseWhileRunning(async () =>
                     {
-                        await Task.Delay(msg).ConfigureAwait(false);
-                    }
-                    node.ReceivedMessages.Add(msg);
-                    return () => { };
+                        if (msg > 0)
+                        {
+                            await Task.Delay(msg).ConfigureAwait(false);
+                        }
+                        node.ReceivedMessages.Add(msg);
+                        return () => { };
+                    });
                 });
             }
 

src/AsyncFiberWorksTests/Examples/BasicExamples.cs

@@ -23,7 +23,7 @@ public void PubSubWithPool()
 
                 var reset = new AutoResetEvent(false);
                 var subscriptionFiber = subscriptions.BeginSubscription();
-                var subscriptionChannel = channel.Subscribe(fiber, delegate { reset.Set(); });
+                var subscriptionChannel = channel.Subscribe(fiber, (msg) => reset.Set());
                 subscriptionFiber.AppendDisposable(subscriptionChannel);
                 channel.Publish("hello");
 
@@ -41,7 +41,7 @@ public void PubSubWithDedicatedThread()
 
                 var reset = new AutoResetEvent(false);
                 var subscriptionFiber = subscriptions.BeginSubscription();
-                var subscriptionChannel = channel.Subscribe(fiber, delegate { reset.Set(); });
+                var subscriptionChannel = channel.Subscribe(fiber, (msg) => reset.Set());
                 subscriptionFiber.AppendDisposable(subscriptionChannel);
                 channel.Publish("hello");