Removing connection relaying; client auto-reconnect; auto-object disp…

…osition on connection close.

.gitignore

@@ -41,3 +41,4 @@ bld/
 
 
 
+/legacy-materials

Deploy/Nuget/Build.cmd

@@ -3,8 +3,8 @@
 :: timeout /T 5
 
 :: settings
-set nugetPath=%cd%\..\.nuget
-set version=0.5.0
+set nugetPath=%cd%\..\..\.nuget
+set version=0.5.1
 set output=%cd%\bin
 
 :: Create output directory

README.md

@@ -33,7 +33,7 @@ There is only one relevant method: **Bind** for binding object/interface onto co
 
 ## Sample
 
-To scratch the surface... *(RPC in both directions, connection relaying, multi-service, .NET clients)*
+To scratch the surface... *(RPC in both directions, multi-service, .NET clients)*
 
 **Server**
  ``` csharp

Samples/ServerClientSample/Client/Program.cs

@@ -42,7 +42,7 @@ static void Main(string[] args)
             })
             .Wait(0);
 
-            Console.Write("Running: '{0}'. Press [Enter] to exit.", nameof(TestClient));
+            Console.Write("Running: '{0}'. Press [Enter] to exit.\n", nameof(TestClient));
             Console.ReadLine();
             cts.Cancel();
         }

Source/WebsocketRPC/ClientServer/Client.cs

@@ -42,10 +42,37 @@ public static class Client
         /// <param name="token">Cancellation token.</param>
         /// <param name="onConnection">Action executed when connection is established.</param>
         /// <param name="setOptions">Websocket option set method.</param>
+        /// <param name="reconnectOnError">True to reconnect on error, false otherwise.</param>
+        /// <param name="secondsBetweenReconnect">The number of seconds between two reconnect attempts.</param>
         /// <returns>Client task.</returns>
-        public static async Task ConnectAsync(string uri, CancellationToken token, Action<Connection> onConnection, Action<ClientWebSocketOptions> setOptions = null)
+        /// <exception cref="Exception">Socket connection exception thrown in case when <paramref name="secondsBetweenReconnect"/> is set to false.</exception>
+        public static async Task ConnectAsync(string uri, CancellationToken token, Action<Connection> onConnection, Action<ClientWebSocketOptions> setOptions = null, 
+                                              bool reconnectOnError = true, int secondsBetweenReconnect = 0)
+        {
+            var isClosedSuccessfully = true;
+
+            do
+            {
+                try
+                {
+                    isClosedSuccessfully = await connectAsync(uri, token, onConnection, setOptions);
+                }
+                catch (Exception ex)
+                {
+                    isClosedSuccessfully = false;
+                    if (!reconnectOnError) throw ex;
+                }
+
+                if (!isClosedSuccessfully && reconnectOnError)
+                    await Task.Delay(TimeSpan.FromSeconds(secondsBetweenReconnect));
+            }
+            while (!isClosedSuccessfully && reconnectOnError);
+        }
+
+        static async Task<bool> connectAsync(string uri, CancellationToken token, Action<Connection> onConnection, Action<ClientWebSocketOptions> setOptions = null)
         {
             ClientWebSocket webSocket = null;
+            var isClosedSuccessfully = true;
 
             try
             {
@@ -68,8 +95,11 @@ public static async Task ConnectAsync(string uri, CancellationToken token, Actio
             }
             finally
             {
+                isClosedSuccessfully = webSocket.State != WebSocketState.Aborted;
                 webSocket?.Dispose();
             }
+
+            return isClosedSuccessfully;
         }
     }
 }

Source/WebsocketRPC/ClientServer/Connection.cs

@@ -178,6 +178,7 @@ internal static async Task ListenReceiveAsync(Connection connection, Cancellatio
                 {
                     while (ex.InnerException != null) ex = ex.InnerException;
                     connection.OnError?.Invoke(ex);
+                    //socket will be aborted -> no need to close manually
                 }
             }
         }

Source/WebsocketRPC/ConnectionBinders/LocalBinder.cs

@@ -23,6 +23,7 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 #endregion
 
+using System;
 using static WebsocketRPC.RPCSettings;
 
 namespace WebsocketRPC
@@ -48,6 +49,11 @@ public LocalBinder(Connection connection, TObj obj)
                 var result = await lInvoker.InvokeAsync(Object, msg);
                 await Connection.SendAsync(result.ToJson(), Encoding);
             };
+
+            Connection.OnClose += () =>
+            {
+                (Object as IDisposable)?.Dispose();
+            };
         }
 
         public TObj Object { get; private set; }