Merge branch 'goodbyetask' into wampv2

Author: darkl

src/net45/Default/WampSharp.NewtonsoftJson/Newtonsoft/JTokenMessageParser.cs

@@ -62,6 +62,12 @@ public WampMessage<JToken> Parse(Stream stream)
                 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));
+                    }
+
                     return mMessageFormatter.Parse(parsed);
                 }
             }
@@ -80,6 +86,12 @@ public void Format(WampMessage<object> message, Stream stream)
                 object[] array = mMessageFormatter.Format(message);
                 mSerializer.Serialize(textWriter, array);
                 textWriter.Flush();
+
+                if (mLogger.IsDebugEnabled())
+                {
+                    // Call this just for the logs
+                    Format(message);
+                }
             }
         }
     }

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,7 +14,7 @@ internal interface IWampSessionClientExtended :
 
         Task OpenTask { get; }
 
-        void Close(string reason, GoodbyeDetails details);
+        Task<GoodbyeMessage> Close(string reason, GoodbyeDetails details);
 
         void OnConnectionOpen();
         void OnConnectionClosed();

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

@@ -16,8 +16,9 @@ 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;
+        private GoodbyeMessage mGoodbyeMessage;
         private readonly IWampFormatter<TMessage> mFormatter;
-        private readonly object mLock = new object();
         private bool mGoodbyeSent;
 		private readonly IWampClientAuthenticator mAuthenticator;
         private HelloDetails mSentDetails;
@@ -115,6 +116,10 @@ public void Goodbye(GoodbyeDetails details, string reason)
                 {
                     mServerProxy.Goodbye(new GoodbyeDetails(), WampErrors.GoodbyeAndOut);
                 }
+                else
+                {
+                    mGoodbyeMessage = new GoodbyeMessage(){Details = details, Reason = reason};
+                }
             }
 
             TrySetCloseEventArgs(SessionCloseType.Goodbye, details, reason);
@@ -126,11 +131,21 @@ private void RaiseConnectionBroken()
 
             WampSessionCloseEventArgs closeEventArgs = mCloseEventArgs;
 
-            SetOpenTaskErrorIfNeeded(new WampConnectionBrokenException(mCloseEventArgs));
-
             Interlocked.CompareExchange(ref mIsConnected, 0, 1);
+
+            GoodbyeMessage goodbyeMessage = mGoodbyeMessage;
+
+            if (goodbyeMessage != null)
+            {
+                mCloseTask?.SetResult(goodbyeMessage);
+            }
+
+            SetTasksErrorsIfNeeded(new WampConnectionBrokenException(mCloseEventArgs));
+
             mOpenTask = new TaskCompletionSource<bool>();
+            mCloseTask = null;
             mCloseEventArgs = null;
+            mGoodbyeMessage = null;
 
             OnConnectionBroken(closeEventArgs);
         }
@@ -154,13 +169,20 @@ private void TrySetCloseEventArgs(SessionCloseType sessionCloseType,
 
         public Task OpenTask => mOpenTask.Task;
 
-        public void Close(string reason, GoodbyeDetails details)
+        public Task<GoodbyeMessage> Close(string reason, GoodbyeDetails details)
         {
             reason = reason ?? WampErrors.CloseNormal;
             details = details ?? EmptyGoodbyeDetails;
 
+            TaskCompletionSource<GoodbyeMessage> closeTask = 
+                new TaskCompletionSource<GoodbyeMessage>();
+
+            mCloseTask = closeTask;
+
             mGoodbyeSent = true;
             mServerProxy.Goodbye(details, reason);
+
+            return closeTask.Task;
         }
 
         public void OnConnectionOpen()
@@ -191,19 +213,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,9 @@ public void Close()
             }
         }
 
-        public void Close(string reason, GoodbyeDetails details)
+        public Task<GoodbyeMessage> Close(string reason, GoodbyeDetails details)
         {
-            mClient.Close(reason, details);
+            return mClient.Close(reason, details);
         }
     }
 }

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

@@ -79,9 +79,9 @@ public void Goodbye(GoodbyeDetails details, string reason)
 
         public long Session => SessionClient.Session;
 
-        public void Close(string reason, GoodbyeDetails details)
+        public Task<GoodbyeMessage> Close(string reason, GoodbyeDetails details)
         {
-            SessionClient.Close(reason, details);
+            return SessionClient.Close(reason, details);
         }
 
         public void OnConnectionOpen()

src/pcl/WampSharp/WampSharp.csproj

@@ -368,6 +368,9 @@
     <Compile Include="..\..\net45\WampSharp\WAMP2\V2\Api\CalleeProxy\WampIncompatibleCalleeProxyMethodException.cs">
       <Link>WAMP2\V2\Api\CalleeProxy\WampIncompatibleCalleeProxyMethodException.cs</Link>
     </Compile>
+    <Compile Include="..\..\net45\WampSharp\WAMP2\V2\Api\GoodbyeMessage.cs">
+      <Link>WAMP2\V2\Api\GoodbyeMessage.cs</Link>
+    </Compile>
     <Compile Include="..\..\net45\WampSharp\WAMP2\V2\Api\Rx\WampTupleTopicSubject.cs">
       <Link>WAMP2\V2\Api\Rx\WampTupleTopicSubject.cs</Link>
     </Compile>