Some improvements based on Zap's fork

darkl · darkl · commit 62faafef5bcf · 2025-08-26T14:26:59.000-04:00
diff --git a/src/netstandard/Default/WampSharp.NewtonsoftJson/Newtonsoft/JTokenMessageParser.cs b/src/netstandard/Default/WampSharp.NewtonsoftJson/Newtonsoft/JTokenMessageParser.cs
@@ -39,13 +39,13 @@ public WampMessage<JToken> Parse(string text)
 
         public string Format(WampMessage<object> message)
         {
-            StringWriter writer = new StringWriter();
-            JsonTextWriter jsonWriter = new JsonTextWriter(writer);
+            using StringWriter writer = new StringWriter();
+            using JsonTextWriter jsonWriter = new JsonTextWriter(writer);
             jsonWriter.Formatting = Formatting.None;
             object[] array = mMessageFormatter.Format(message);
             mSerializer.Serialize(jsonWriter, array);
             string result = writer.ToString();
-            
+
             mLogger.DebugFormat("Formatted message {JsonMessage}", result);
             return result;
         }
@@ -59,17 +59,15 @@ public WampMessage<JToken> Parse(Stream stream)
         {
             try
             {
-                using (JsonReader reader = new JsonTextReader(new StreamReader(stream)) {CloseInput = false})
-                {
-                    JToken parsed = JToken.ReadFrom(reader);
-
-                    if (mLogger.IsDebugEnabled())
-                    {
-                        mLogger.DebugFormat("Trying to parse message {JsonMessage}", parsed.ToString(Formatting.None));
-                    }
+                using JsonReader reader = new JsonTextReader(new StreamReader(stream)) {CloseInput = false};
+                JToken parsed = JToken.ReadFrom(reader);
 
-                    return mMessageFormatter.Parse(parsed);
+                if (mLogger.IsDebugEnabled())
+                {
+                    mLogger.DebugFormat("Trying to parse message {JsonMessage}", parsed.ToString(Formatting.None));
                 }
+
+                return mMessageFormatter.Parse(parsed);
             }
             catch (Exception ex)
             {
diff --git a/src/netstandard/Extensions/WampSharp.Owin/Owin/OwinWebSocketTransport.cs b/src/netstandard/Extensions/WampSharp.Owin/Owin/OwinWebSocketTransport.cs
@@ -27,7 +27,7 @@ public OwinWebSocketTransport
                  base(authenticatorFactory)
         {
             mHandler = this.EmptyHandler;
-            app.Use(HttpHandler);
+            AppBuilderUseExtensions.Use(app, HttpHandler);
             mMaxFrameSize = maxFrameSize;
         }
 
diff --git a/src/netstandard/Extensions/WampSharp.WebSockets/WebSockets/WebSocketWrapperConnection.cs b/src/netstandard/Extensions/WampSharp.WebSockets/WebSockets/WebSocketWrapperConnection.cs
@@ -92,13 +92,13 @@ private ArraySegment<byte> GetMessageInBytes(WampMessage<object> message)
 
         protected abstract WebSocketMessageType WebSocketMessageType { get; }
 
-        protected async void InnerConnect()
+        protected void InnerConnect()
         {
-            bool connected = await TryConnect();
+            bool connected = Task.Run(TryConnect, mCancellationToken).ConfigureAwait(false).GetAwaiter().GetResult();
 
             if (connected)
             {
-                await Task.Run(this.RunAsync, mCancellationToken).ConfigureAwait(false);
+                Task.Run(RunAsync, mCancellationToken);
             }
         }
 
@@ -138,7 +138,7 @@ data is very small.
                 // Buffer for received bits.
                 ArraySegment<byte> receivedDataBuffer = new ArraySegment<byte>(new byte[maxMessageSize]);
 
-                MemoryStream memoryStream = new MemoryStream();
+                using MemoryStream memoryStream = new MemoryStream();
 
                 // Checks WebSocket state.
                 while (IsConnected && !mCancellationToken.IsCancellationRequested)
diff --git a/src/netstandard/Tests/WampSharp.Tests.Wampv2/Client/Callee/InvocationCalleeeTest.cs b/src/netstandard/Tests/WampSharp.Tests.Wampv2/Client/Callee/InvocationCalleeeTest.cs
@@ -129,7 +129,7 @@ public override void Act()
             IWampChannel channel =
                 playground.GetChannel(mDealer, "realm1", mBinding);
 
-            channel.Open();
+            channel.Open().Wait();
 
             Task register = 
                 channel.RealmProxy.RpcCatalog.Register(mOperation, new RegisterOptions());
diff --git a/src/netstandard/Tests/WampSharp.Tests.Wampv2/Client/Caller/CallerTest.cs b/src/netstandard/Tests/WampSharp.Tests.Wampv2/Client/Caller/CallerTest.cs
@@ -95,7 +95,7 @@ public override void Act()
             IWampChannel channel =
                 playground.GetChannel(mServerMock, "realm1", mBinding);
 
-            channel.Open();
+            channel.Open().Wait();
 
             mCallAction(channel.RealmProxy.RpcCatalog, mCallbackMock);
         }
diff --git a/src/netstandard/Tests/WampSharp.Tests.Wampv2/Integration/AuthenticationClientTests.cs b/src/netstandard/Tests/WampSharp.Tests.Wampv2/Integration/AuthenticationClientTests.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Runtime.Serialization;
+using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
 using NUnit.Framework;
 using WampSharp.Binding;
@@ -25,7 +26,7 @@ public void AuthenticatorSendsDetailsToHello()
                 new CustomAuthenticator
                 {
                     AuthenticationId = "peter",
-                    AuthenticationMethods = new string[] {"ticket"}
+                    AuthenticationMethods = new string[] { "ticket" }
                 };
 
             HelloMock mock = new HelloMock();
@@ -41,6 +42,7 @@ public void AuthenticatorSendsDetailsToHello()
 
             channel.Open();
 
+            mock.HelloCalled.Task.Wait();
             IDictionary<string, ISerializedValue> deserializedDetails =
                 mock.Details.OriginalValue.Deserialize<IDictionary<string, ISerializedValue>>
                     ();
@@ -84,8 +86,9 @@ public void AuthenticatorGetsChallengeMessage()
 
             channel.Open();
 
+            authenticator.Authenticated.Task.Wait();
             Assert.That(authenticator.AuthMethod, Is.EqualTo("ticket"));
-            
+
             Assert.That(authenticator.Extra.OriginalValue.Deserialize<MyChallengeDetails>(),
                 Is.EqualTo(myChallengeDetails));
         }
@@ -101,13 +104,13 @@ public void AuthenticatorAuthenticateResultCallsAuthenticate()
                     {
                         return new AuthenticationResponse()
                         {
-                            Extra = new MyAuthenticateExtraData() {Secret1 = 3},
+                            Extra = new MyAuthenticateExtraData() { Secret1 = 3 },
                             Signature = "secretsignature"
                         };
                     })
                 {
                     AuthenticationId = "peter",
-                    AuthenticationMethods = new string[] {"ticket"}
+                    AuthenticationMethods = new string[] { "ticket" }
                 };
 
             AuthenticateMock mock = new AuthenticateMock("ticket");
@@ -123,10 +126,11 @@ public void AuthenticatorAuthenticateResultCallsAuthenticate()
 
             channel.Open();
 
+            mock.Authenticated.Task.Wait();
             Assert.That(mock.Signature,
                 Is.EqualTo("secretsignature"));
 
-            IDictionary<string, ISerializedValue> deserializedExtra = 
+            IDictionary<string, ISerializedValue> deserializedExtra =
                 mock.Extra.OriginalValue.Deserialize<IDictionary<string, ISerializedValue>>();
 
             Assert.That(deserializedExtra["secret1"].Deserialize<int>(),
@@ -166,7 +170,7 @@ public void AuthenticatorAuthenticateExceptionCallsAbort()
                         jsonBinding,
                         authenticator);
 
-            channel.Open();
+            Assert.ThrowsAsync<WampAuthenticationException>(channel.Open);
 
             Assert.That(mock.Reason,
                 Is.EqualTo("some reason"));
@@ -194,7 +198,7 @@ public override bool Equals(object obj)
                 if (ReferenceEquals(null, obj)) return false;
                 if (ReferenceEquals(this, obj)) return true;
                 if (obj.GetType() != this.GetType()) return false;
-                return Equals((MyAbortDetails) obj);
+                return Equals((MyAbortDetails)obj);
             }
 
             public override int GetHashCode()
@@ -221,6 +225,7 @@ public override void Abort(IWampSessionClient client, AbortDetails details, stri
 
         private class AuthenticateMock : ChallengeMock
         {
+            public TaskCompletionSource<int> Authenticated { get; } = new TaskCompletionSource<int>();
             public string Signature { get; private set; }
             public AuthenticateExtraData Extra { get; private set; }
 
@@ -232,6 +237,7 @@ public override void Authenticate(IWampSessionClient client, string signature, A
             {
                 Extra = extra;
                 Signature = signature;
+                Authenticated.SetResult(1);
             }
         }
 
@@ -262,12 +268,14 @@ private class HelloMock : HelloMock<JToken>
 
         private class HelloMock<TMessage> : MockServer<TMessage>
         {
+            public TaskCompletionSource<int> HelloCalled { get; } = new TaskCompletionSource<int>();
 
             public HelloDetails Details { get; private set; }
 
             public override void Hello(IWampSessionClient client, string realm, HelloDetails details)
             {
                 Details = details;
+                HelloCalled.SetResult(0);
             }
         }
 
@@ -392,8 +400,9 @@ public void Unsubscribe(IWampSubscriber subscriber, long requestId, long subscri
         private class CustomAuthenticator : IWampClientAuthenticator
         {
             private readonly Func<string, ChallengeDetails, AuthenticationResponse> mAuthenticate;
+            public TaskCompletionSource<int> Authenticated { get; } = new TaskCompletionSource<int>();
 
-            public CustomAuthenticator() : 
+            public CustomAuthenticator() :
                 this((authMethod, extra) => new AuthenticationResponse())
             {
             }
@@ -407,6 +416,7 @@ public AuthenticationResponse Authenticate(string authmethod, ChallengeDetails e
             {
                 Extra = extra;
                 AuthMethod = authmethod;
+                Authenticated.SetResult(0);
                 return mAuthenticate(authmethod, extra);
             }
 
@@ -435,7 +445,7 @@ public override bool Equals(object obj)
                 if (ReferenceEquals(null, obj)) return false;
                 if (ReferenceEquals(this, obj)) return true;
                 if (obj.GetType() != this.GetType()) return false;
-                return Equals((MyChallengeDetails) obj);
+                return Equals((MyChallengeDetails)obj);
             }
 
             public override int GetHashCode()
diff --git a/src/netstandard/Tests/WampSharp.Tests.Wampv2/Integration/CallerDealerTests.cs b/src/netstandard/Tests/WampSharp.Tests.Wampv2/Integration/CallerDealerTests.cs
@@ -102,6 +102,7 @@ public async Task ErrorsService(int number, object[] arguments, string errorUri)
             }
             else
             {
+                await Task.WhenAny(result);
                 AggregateException exception = result.Exception;
                 Exception actualException = exception.InnerException;
                 Assert.That(actualException, Is.TypeOf<WampException>());
diff --git a/src/netstandard/WampSharp/Core/Utilities/TaskExtensions.cs b/src/netstandard/WampSharp/Core/Utilities/TaskExtensions.cs
@@ -136,7 +136,7 @@ private static Task<TResult> ContinueWithSafe<TTask, TResult>(this TTask task, F
                 throw new ArgumentNullException(nameof(transform));
             }
 
-            TaskCompletionSource<TResult> taskResult = new TaskCompletionSource<TResult>();
+            TaskCompletionSource<TResult> taskResult = new TaskCompletionSource<TResult>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             task.ContinueWith(_ =>
             {
diff --git a/src/netstandard/WampSharp/WAMP2/V2/Api/CalleeProxy/Callbacks/Async/AsyncOperationCallback.cs b/src/netstandard/WampSharp/WAMP2/V2/Api/CalleeProxy/Callbacks/Async/AsyncOperationCallback.cs
@@ -10,7 +10,7 @@ namespace WampSharp.V2.CalleeProxy
 {
     internal class AsyncOperationCallback<TResult> : IWampRawRpcOperationClientCallback
     {
-        private readonly TaskCompletionSource<TResult> mTask = new TaskCompletionSource<TResult>();
+        private readonly TaskCompletionSource<TResult> mTask = new TaskCompletionSource<TResult>(TaskCreationOptions.RunContinuationsAsynchronously);
         private readonly IOperationResultExtractor<TResult> mResultExtractor;
 
         public AsyncOperationCallback(IOperationResultExtractor<TResult> resultExtractor)
diff --git a/src/netstandard/WampSharp/WAMP2/V2/Api/CalleeProxy/Callbacks/Sync/SyncCallbackBase.cs b/src/netstandard/WampSharp/WAMP2/V2/Api/CalleeProxy/Callbacks/Sync/SyncCallbackBase.cs
@@ -8,7 +8,7 @@
 
 namespace WampSharp.V2.CalleeProxy
 {
-    internal abstract class SyncCallbackBase : IWampRawRpcOperationClientCallback
+    internal abstract class SyncCallbackBase : IWampRawRpcOperationClientCallback, IDisposable
     {
         private readonly ManualResetEvent mWaitHandle = new ManualResetEvent(false);
 
@@ -58,5 +58,10 @@ public void SetException(Exception exception)
             Exception = exception;
             mWaitHandle.Set();
         }
+
+        public void Dispose()
+        {
+            mWaitHandle?.Dispose();
+        }
     }
 }
diff --git a/src/netstandard/WampSharp/WAMP2/V2/Api/CalleeProxy/Callbacks/WampCalleeProxyInvocationHandler.cs b/src/netstandard/WampSharp/WAMP2/V2/Api/CalleeProxy/Callbacks/WampCalleeProxyInvocationHandler.cs
@@ -14,7 +14,7 @@ public T Invoke<T>(ICalleeProxyInterceptor interceptor, MethodInfo method, IOper
         {
             Type unwrapped = TaskExtensions.UnwrapReturnType(method.ReturnType);
 
-            SyncCallback<T> callback = InnerInvokeSync<T>(interceptor, method, extractor, arguments, unwrapped);
+            using SyncCallback<T> callback = InnerInvokeSync<T>(interceptor, method, extractor, arguments, unwrapped);
 
             WaitForResult(callback);
 
@@ -80,9 +80,16 @@ protected virtual void WaitForResult<T>(SyncCallback<T> callback)
             callback.Wait(Timeout.Infinite);
         }
 
-        protected virtual Task<T> AwaitForResult<T>(AsyncOperationCallback<T> asyncOperationCallback, CancellationTokenRegistration registration)
+        protected virtual async Task<T> AwaitForResult<T>(AsyncOperationCallback<T> asyncOperationCallback, CancellationTokenRegistration registration)
         {
-            return asyncOperationCallback.Task;
+            try
+            {
+                return await asyncOperationCallback.Task.ConfigureAwait(false);
+            }
+            finally
+            {
+                registration.Dispose();
+            }
         }
     }
 }
diff --git a/src/netstandard/WampSharp/WAMP2/V2/Api/CalleeProxy/ClientInvocationHandler.cs b/src/netstandard/WampSharp/WAMP2/V2/Api/CalleeProxy/ClientInvocationHandler.cs
@@ -10,7 +10,7 @@
 
 namespace WampSharp.V2.CalleeProxy
 {
-    internal class ClientInvocationHandler : WampCalleeProxyInvocationHandler
+    internal class ClientInvocationHandler : WampCalleeProxyInvocationHandler, IDisposable
     {
         #region Data Members
 
@@ -19,7 +19,7 @@ internal class ClientInvocationHandler : WampCalleeProxyInvocationHandler
 
         private TaskCompletionSource<Exception> mDisconnectionTaskCompletionSource;
 
-        private ManualResetEvent mDisconnectionWaitHandle;
+        private readonly ManualResetEvent mDisconnectionWaitHandle;
 
         private Exception mDisconnectionException;
         private readonly CallOptions mEmptyOptions = new CallOptions();
@@ -34,7 +34,7 @@ public ClientInvocationHandler(IWampRpcOperationCatalogProxy catalogProxy,
             mCatalogProxy = catalogProxy;
             mMonitor = monitor;
 
-            mDisconnectionTaskCompletionSource = new TaskCompletionSource<Exception>();
+            mDisconnectionTaskCompletionSource = new TaskCompletionSource<Exception>(TaskCreationOptions.RunContinuationsAsynchronously);
             mDisconnectionWaitHandle = new ManualResetEvent(false);
 
             mMonitor.ConnectionError += OnConnectionError;
@@ -56,8 +56,8 @@ private void OnConnectionBroken(object sender, WampSessionCloseEventArgs e)
             Exception exception = new WampConnectionBrokenException(e);
             SetException(exception);
 
-            mDisconnectionTaskCompletionSource = new TaskCompletionSource<Exception>();
-            mDisconnectionWaitHandle = new ManualResetEvent(false);
+            mDisconnectionTaskCompletionSource = new TaskCompletionSource<Exception>(TaskCreationOptions.RunContinuationsAsynchronously);
+            mDisconnectionWaitHandle.Reset();
         }
 
         private void OnConnectionError(object sender, WampConnectionErrorEventArgs e)
@@ -127,7 +127,13 @@ protected override IWampCancellableInvocationProxy Invoke(ICalleeProxyIntercepto
                                         procedureUri,
                                         arguments);
         }
-
-#endregion
+        public void Dispose()
+        {
+            mMonitor.ConnectionError -= OnConnectionError;
+            mMonitor.ConnectionBroken -= OnConnectionBroken;
+            mDisconnectionWaitHandle?.Dispose();
+        }
+        
+        #endregion
     }
 }
diff --git a/src/netstandard/WampSharp/WAMP2/V2/Api/Server/ServiceRealm/ServiceHostedRealmContainer.cs b/src/netstandard/WampSharp/WAMP2/V2/Api/Server/ServiceRealm/ServiceHostedRealmContainer.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Concurrent;
 using System.Reactive.Concurrency;
+using System.Threading.Tasks;
 using WampSharp.V2.Realm;
 
 namespace WampSharp.V2
@@ -32,7 +33,8 @@ private IWampHostedRealm BuildRealm(string name)
             
             channel.RealmProxy.Monitor.ConnectionEstablished += connectionEstablished;
 
-            channel.Open();
+            // TODO: Check this
+            Task.Run(channel.Open).ConfigureAwait(false).GetAwaiter().GetResult();
 
             channel.RealmProxy.Monitor.ConnectionEstablished -= connectionEstablished;
 
diff --git a/src/netstandard/WampSharp/WAMP2/V2/Client/PubSub/WampSubscriber.cs b/src/netstandard/WampSharp/WAMP2/V2/Client/PubSub/WampSubscriber.cs
@@ -61,7 +61,7 @@ public Task<IAsyncDisposable> Subscribe(IWampRawTopicClientSubscriber subscriber
 
         private Task Unsubscribe(Subscription subscription)
         {
-            TaskCompletionSource<bool> completionSource = new TaskCompletionSource<bool>();
+            TaskCompletionSource<bool> completionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
             Task result = completionSource.Task;
 
             lock (mLock)
diff --git a/src/netstandard/WampSharp/WAMP2/V2/Client/WampChannel.cs b/src/netstandard/WampSharp/WAMP2/V2/Client/WampChannel.cs
diff --git a/src/netstandard/WampSharp/WAMP2/V2/Client/WampPendingRequestBase.cs b/src/netstandard/WampSharp/WAMP2/V2/Client/WampPendingRequestBase.cs
diff --git a/src/netstandard/WampSharp/WAMP2/V2/Core/Contracts/Error/WampErrors.cs b/src/netstandard/WampSharp/WAMP2/V2/Core/Contracts/Error/WampErrors.cs
diff --git a/src/netstandard/WampSharp/WAMP2/V2/Realm/Binded/WampGoodbyeExtensions.cs b/src/netstandard/WampSharp/WAMP2/V2/Realm/Binded/WampGoodbyeExtensions.cs
diff --git a/src/netstandard/WampSharp/WAMP2/V2/Testament/WampTestamentService.cs b/src/netstandard/WampSharp/WAMP2/V2/Testament/WampTestamentService.cs

Original file line number	Diff line number	Diff line change
`@@ -39,13 +39,13 @@ public WampMessage<JToken> Parse(string text)`
`39`	`39`
`40`	`40`	`public string Format(WampMessage<object> message)`
`41`	`41`	`{`
`42`		`- StringWriter writer = new StringWriter();`
`43`		`- JsonTextWriter jsonWriter = new JsonTextWriter(writer);`
	`42`	`+ using StringWriter writer = new StringWriter();`
	`43`	`+ using JsonTextWriter jsonWriter = new JsonTextWriter(writer);`
`44`	`44`	`jsonWriter.Formatting = Formatting.None;`
`45`	`45`	`object[] array = mMessageFormatter.Format(message);`
`46`	`46`	`mSerializer.Serialize(jsonWriter, array);`
`47`	`47`	`string result = writer.ToString();`
`48`		`-`
	`48`	`+`
`49`	`49`	`mLogger.DebugFormat("Formatted message {JsonMessage}", result);`
`50`	`50`	`return result;`
`51`	`51`	`}`
`@@ -59,17 +59,15 @@ public WampMessage<JToken> Parse(Stream stream)`
`59`	`59`	`{`
`60`	`60`	`try`
`61`	`61`	`{`
`62`		`- using (JsonReader reader = new JsonTextReader(new StreamReader(stream)) {CloseInput = false})`
`63`		`- {`
`64`		`- JToken parsed = JToken.ReadFrom(reader);`
`65`		`-`
`66`		`- if (mLogger.IsDebugEnabled())`
`67`		`- {`
`68`		`- mLogger.DebugFormat("Trying to parse message {JsonMessage}", parsed.ToString(Formatting.None));`
`69`		`- }`
	`62`	`+ using JsonReader reader = new JsonTextReader(new StreamReader(stream)) {CloseInput = false};`
	`63`	`+ JToken parsed = JToken.ReadFrom(reader);`
`70`	`64`
`71`		`- return mMessageFormatter.Parse(parsed);`
	`65`	`+ if (mLogger.IsDebugEnabled())`
	`66`	`+ {`
	`67`	`+ mLogger.DebugFormat("Trying to parse message {JsonMessage}", parsed.ToString(Formatting.None));`
`72`	`68`	`}`
	`69`	`+`
	`70`	`+ return mMessageFormatter.Parse(parsed);`
`73`	`71`	`}`
`74`	`72`	`catch (Exception ex)`
`75`	`73`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public OwinWebSocketTransport`
`27`	`27`	`base(authenticatorFactory)`
`28`	`28`	`{`
`29`	`29`	`mHandler = this.EmptyHandler;`
`30`		`- app.Use(HttpHandler);`
	`30`	`+ AppBuilderUseExtensions.Use(app, HttpHandler);`
`31`	`31`	`mMaxFrameSize = maxFrameSize;`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -92,13 +92,13 @@ private ArraySegment<byte> GetMessageInBytes(WampMessage<object> message)`
`92`	`92`
`93`	`93`	`protected abstract WebSocketMessageType WebSocketMessageType { get; }`
`94`	`94`
`95`		`- protected async void InnerConnect()`
	`95`	`+ protected void InnerConnect()`
`96`	`96`	`{`
`97`		`- bool connected = await TryConnect();`
	`97`	`+ bool connected = Task.Run(TryConnect, mCancellationToken).ConfigureAwait(false).GetAwaiter().GetResult();`
`98`	`98`
`99`	`99`	`if (connected)`
`100`	`100`	`{`
`101`		`- await Task.Run(this.RunAsync, mCancellationToken).ConfigureAwait(false);`
	`101`	`+ Task.Run(RunAsync, mCancellationToken);`
`102`	`102`	`}`
`103`	`103`	`}`
`104`	`104`
`@@ -138,7 +138,7 @@ data is very small.`
`138`	`138`	`// Buffer for received bits.`
`139`	`139`	`ArraySegment<byte> receivedDataBuffer = new ArraySegment<byte>(new byte[maxMessageSize]);`
`140`	`140`
`141`		`- MemoryStream memoryStream = new MemoryStream();`
	`141`	`+ using MemoryStream memoryStream = new MemoryStream();`
`142`	`142`
`143`	`143`	`// Checks WebSocket state.`
`144`	`144`	`while (IsConnected && !mCancellationToken.IsCancellationRequested)`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public override void Act()`
`95`	`95`	`IWampChannel channel =`
`96`	`96`	`playground.GetChannel(mServerMock, "realm1", mBinding);`
`97`	`97`
`98`		`- channel.Open();`
	`98`	`+ channel.Open().Wait();`
`99`	`99`
`100`	`100`	`mCallAction(channel.RealmProxy.RpcCatalog, mCallbackMock);`
`101`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,7 @@ public async Task ErrorsService(int number, object[] arguments, string errorUri)`
`102`	`102`	`}`
`103`	`103`	`else`
`104`	`104`	`{`
	`105`	`+ await Task.WhenAny(result);`
`105`	`106`	`AggregateException exception = result.Exception;`
`106`	`107`	`Exception actualException = exception.InnerException;`
`107`	`108`	`Assert.That(actualException, Is.TypeOf<WampException>());`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ private static Task<TResult> ContinueWithSafe<TTask, TResult>(this TTask task, F`
`136`	`136`	`throw new ArgumentNullException(nameof(transform));`
`137`	`137`	`}`
`138`	`138`
`139`		`- TaskCompletionSource<TResult> taskResult = new TaskCompletionSource<TResult>();`
	`139`	`+ TaskCompletionSource<TResult> taskResult = new TaskCompletionSource<TResult>(TaskCreationOptions.RunContinuationsAsynchronously);`
`140`	`140`
`141`	`141`	`task.ContinueWith(_ =>`
`142`	`142`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace WampSharp.V2.CalleeProxy`
`10`	`10`	`{`
`11`	`11`	`internal class AsyncOperationCallback<TResult> : IWampRawRpcOperationClientCallback`
`12`	`12`	`{`
`13`		`- private readonly TaskCompletionSource<TResult> mTask = new TaskCompletionSource<TResult>();`
	`13`	`+ private readonly TaskCompletionSource<TResult> mTask = new TaskCompletionSource<TResult>(TaskCreationOptions.RunContinuationsAsynchronously);`
`14`	`14`	`private readonly IOperationResultExtractor<TResult> mResultExtractor;`
`15`	`15`
`16`	`16`	`public AsyncOperationCallback(IOperationResultExtractor<TResult> resultExtractor)`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`namespace WampSharp.V2.CalleeProxy`
`10`	`10`	`{`
`11`		`- internal abstract class SyncCallbackBase : IWampRawRpcOperationClientCallback`
	`11`	`+ internal abstract class SyncCallbackBase : IWampRawRpcOperationClientCallback, IDisposable`
`12`	`12`	`{`
`13`	`13`	`private readonly ManualResetEvent mWaitHandle = new ManualResetEvent(false);`
`14`	`14`
`@@ -58,5 +58,10 @@ public void SetException(Exception exception)`
`58`	`58`	`Exception = exception;`
`59`	`59`	`mWaitHandle.Set();`
`60`	`60`	`}`
	`61`	`+`
	`62`	`+ public void Dispose()`
	`63`	`+ {`
	`64`	`+ mWaitHandle?.Dispose();`
	`65`	`+ }`
`61`	`66`	`}`
`62`	`67`	`}`