Goodbye now returns a task

Author: darkl

src/net45/WampSharp/WAMP2/V2/Api/Client/IWampChannel.cs

@@ -31,6 +31,7 @@ public interface IWampChannel
         /// </summary>
         /// <param name="reason">The close reason.</param>
         /// <param name="details">The close details.</param>
-        void Close(string reason, GoodbyeDetails details);
+        /// <returns>A task that completes upon a GOODBYE message from the router.</returns>
+        Task<GoodbyeMessage> Close(string reason, GoodbyeDetails details);
     }
 }

src/net45/WampSharp/WAMP2/V2/Api/GoodbyeMessage.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Runtime.Serialization;
+
+namespace WampSharp.V2.Core.Contracts
+{
+    [DataContract]
+    [Serializable]
+    public class GoodbyeMessage
+    {
+        public string Reason { get; internal set; }
+        public GoodbyeDetails Details { get; internal set; }
+    }
+}

src/net45/WampSharp/WAMP2/V2/Client/Session/IWampSessionClientExtended.cs

@@ -14,6 +14,8 @@ internal interface IWampSessionClientExtended :
 
         Task OpenTask { get; }
 
+        Task<GoodbyeMessage> CloseTask { get; }
+
         void Close(string reason, GoodbyeDetails details);
 
         void OnConnectionOpen();

src/net45/WampSharp/WAMP2/V2/Client/Session/WampSessionClient.cs

@@ -16,8 +16,8 @@ public class WampSessionClient<TMessage> : IWampSessionClientExtended,
         private static readonly AuthenticateExtraData EmptyAuthenticateDetails = new AuthenticateExtraData();
         private readonly IWampServerProxy mServerProxy;
         private TaskCompletionSource<bool> mOpenTask = new TaskCompletionSource<bool>();
+        private TaskCompletionSource<GoodbyeMessage> mCloseTask = new TaskCompletionSource<GoodbyeMessage>();
         private readonly IWampFormatter<TMessage> mFormatter;
-        private readonly object mLock = new object();
         private bool mGoodbyeSent;
 		private readonly IWampClientAuthenticator mAuthenticator;
         private HelloDetails mSentDetails;
@@ -115,6 +115,11 @@ public void Goodbye(GoodbyeDetails details, string reason)
                 {
                     mServerProxy.Goodbye(new GoodbyeDetails(), WampErrors.GoodbyeAndOut);
                 }
+                else
+                {
+                    GoodbyeMessage message = new GoodbyeMessage(){Details = details, Reason = reason};
+                    mCloseTask.SetResult(message);
+                }
             }
 
             TrySetCloseEventArgs(SessionCloseType.Goodbye, details, reason);
@@ -126,10 +131,11 @@ private void RaiseConnectionBroken()
 
             WampSessionCloseEventArgs closeEventArgs = mCloseEventArgs;
 
-            SetOpenTaskErrorIfNeeded(new WampConnectionBrokenException(mCloseEventArgs));
+            SetTasksErrorsIfNeeded(new WampConnectionBrokenException(mCloseEventArgs));
 
             Interlocked.CompareExchange(ref mIsConnected, 0, 1);
             mOpenTask = new TaskCompletionSource<bool>();
+            mCloseTask = new TaskCompletionSource<GoodbyeMessage>();
             mCloseEventArgs = null;
 
             OnConnectionBroken(closeEventArgs);
@@ -154,6 +160,8 @@ private void TrySetCloseEventArgs(SessionCloseType sessionCloseType,
 
         public Task OpenTask => mOpenTask.Task;
 
+        public Task<GoodbyeMessage> CloseTask => mCloseTask.Task;
+
         public void Close(string reason, GoodbyeDetails details)
         {
             reason = reason ?? WampErrors.CloseNormal;
@@ -191,19 +199,15 @@ public void OnConnectionClosed()
 
         public void OnConnectionError(Exception exception)
         {
-            SetOpenTaskErrorIfNeeded(exception);
+            SetTasksErrorsIfNeeded(exception);
 
             OnConnectionError(new WampConnectionErrorEventArgs(exception));
         }
 
-        private void SetOpenTaskErrorIfNeeded(Exception exception)
+        private void SetTasksErrorsIfNeeded(Exception exception)
         {
-            TaskCompletionSource<bool> openTask = mOpenTask;
-
-            if (openTask != null)
-            {
-                openTask.TrySetException(exception);
-            }
+            mOpenTask?.TrySetException(exception);
+            mCloseTask?.TrySetException(exception);
         }
 
         public event EventHandler<WampSessionCreatedEventArgs> ConnectionEstablished;

src/net45/WampSharp/WAMP2/V2/Client/WampChannel.cs

@@ -71,9 +71,11 @@ public void Close()
             }
         }
 
-        public void Close(string reason, GoodbyeDetails details)
+        public Task<GoodbyeMessage> Close(string reason, GoodbyeDetails details)
         {
+            Task<GoodbyeMessage> task = mClient.CloseTask;
             mClient.Close(reason, details);
+            return task;
         }
     }
 }

src/net45/WampSharp/WAMP2/V2/Client/WampClient.cs

@@ -57,6 +57,8 @@ public WampClient(IWampRealmProxyFactory<TMessage> realmFactory)
 
         public Task OpenTask => SessionClient.OpenTask;
 
+        public Task<GoodbyeMessage> CloseTask => SessionClient.CloseTask;
+
         public void Challenge(string authMethod, ChallengeDetails extra)
         {
             SessionClient.Challenge(authMethod, extra);