Working on #342 again

src/netstandard/WampSharp/WAMP2/V2/Client/Rpc/WampCallee.cs

@@ -215,7 +215,15 @@ private void InvocationPattern(long requestId, long registrationId, InvocationDe
 
                     lock (mLock)
                     {
-                        mRegistrationsToInvocations.Add(registrationId, requestId);
+                        if (!invocation.IsInvocationCompleted)
+                        {
+                            mRegistrationsToInvocations.Add(registrationId, requestId);
+                        }
+                    }
+
+                    if (invocation.IsInvocationCompleted)
+                    {
+                        CleanupInvocationData(requestId);
                     }
                 }
             }

src/netstandard/WampSharp/WAMP2/V2/Rpc/Callee/AsyncLocalRpcOperation.cs

@@ -22,11 +22,11 @@ protected override IWampCancellableInvocation InnerInvoke<TMessage>(IWampRawRpcO
         {
             CancellationTokenSourceInvocation result = null;
             CancellationToken token = CancellationToken.None;
+            CancellationTokenSource cancellationTokenSource = null;
 
             if (SupportsCancellation)
             {
-                CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();
-                result = new CancellationTokenSourceInvocation(cancellationTokenSource);
+                cancellationTokenSource = new CancellationTokenSource();
                 token = cancellationTokenSource.Token;
             }
 
@@ -37,7 +37,12 @@ protected override IWampCancellableInvocation InnerInvoke<TMessage>(IWampRawRpcO
                                  arguments,
                                  argumentsKeywords,
                                  token);
-
+
+            if (SupportsCancellation)
+            {
+                result = new CancellationTokenSourceInvocation(task ,cancellationTokenSource);
+            }
+
             return result;
         }
 

src/netstandard/WampSharp/WAMP2/V2/Rpc/Callee/CancellationTokenSourceInvocation.cs

@@ -1,20 +1,26 @@
 using System.Threading;
+using System.Threading.Tasks;
 using WampSharp.V2.Core.Contracts;
 
 namespace WampSharp.V2.Rpc
 {
     internal class CancellationTokenSourceInvocation : IWampCancellableInvocation
     {
+        private readonly Task mTask;
         private readonly CancellationTokenSource mCancellationTokenSource;
 
-        public CancellationTokenSourceInvocation(CancellationTokenSource cancellationTokenSource)
+        public CancellationTokenSourceInvocation(Task task,
+                                                 CancellationTokenSource cancellationTokenSource)
         {
+            mTask = task;
             mCancellationTokenSource = cancellationTokenSource;
         }
 
         public void Cancel(InterruptDetails details)
         {
             mCancellationTokenSource.Cancel();
         }
+
+        public bool IsInvocationCompleted => mTask.IsCompleted;
     }
 }

src/netstandard/WampSharp/WAMP2/V2/Rpc/Dealer/WampCalleeRpcInvocation.cs

@@ -17,5 +17,13 @@ public void Cancel(InterruptDetails details)
         {
             Callee.Interrupt(RequestId, details);
         }
+
+        public bool IsInvocationCompleted
+        {
+            get
+            {
+                return false;
+            }
+        }
     }
 }

src/netstandard/WampSharp/WAMP2/V2/Rpc/Interfaces/IWampCancellableInvocation.cs

@@ -5,5 +5,7 @@ namespace WampSharp.V2.Rpc
     public interface IWampCancellableInvocation
     {
         void Cancel(InterruptDetails details);
+
+        bool IsInvocationCompleted { get; }
     }
 }