Merge pull request #78 from Eastrall/feature/netClientConfig

Feature/net client config

samples/SampleClient/MyClient.cs

@@ -13,9 +13,11 @@ internal sealed class MyClient : NetClient
         /// <param name="host"></param>
         /// <param name="port"></param>
         /// <param name="bufferSize"></param>
-        public MyClient(string host, int port, int bufferSize) 
-            : base(host, port, bufferSize)
+        public MyClient(string host, int port, int bufferSize)
         {
+            this.Configuration.Host = host;
+            this.Configuration.Port = port;
+            this.Configuration.BufferSize = bufferSize;
         }
 
         /// <summary>
@@ -33,7 +35,7 @@ public override void HandleMessage(INetPacketStream packet)
         /// </summary>
         protected override void OnConnected()
         {
-            Console.WriteLine("Connected to {0}", this.Socket.RemoteEndPoint.ToString());
+            Console.WriteLine("Connected to {0}", this.Socket.RemoteEndPoint);
         }
 
         /// <summary>

samples/SampleClient/Program.cs

@@ -5,9 +5,9 @@
 
 namespace SampleClient
 {
-    class Program
+    internal class Program
     {
-        static void Main(string[] args)
+        private static void Main()
         {
             var client = new MyClient("127.0.0.1", 4444, 512);
             client.Connect();
@@ -39,7 +39,7 @@ static void Main(string[] args)
                     }
 
                     i++;
-                    Thread.Sleep(5);
+                    Thread.Sleep(50);
                 }
             }
             catch (Exception e)

samples/SampleServer/Program.cs

@@ -2,9 +2,9 @@
 
 namespace SampleServer
 {
-    class Program
+    internal class Program
     {
-        static void Main(string[] args)
+        private static void Main()
         {
             Console.Title = "Ether.Network Server";
 

src/Ether.Network/Client/INetClient.cs

@@ -17,6 +17,11 @@ public interface INetClient : IDisposable
         /// Gets the <see cref="INetClient"/> connected state.
         /// </summary>
         bool IsConnected { get; }
+
+        /// <summary>
+        /// Gets the <see cref="INetClient"/> running state.
+        /// </summary>
+        bool IsRunning { get; }
 
         /// <summary>
         /// Connects to a remote server.

src/Ether.Network/Client/NetClient.cs

@@ -18,10 +18,7 @@ namespace Ether.Network.Client
     public abstract class NetClient : NetUser, INetClient
     {
         private static readonly IPacketProcessor DefaultPacketProcessor = new NetPacketProcessor();
-
-        private readonly IPEndPoint _ipEndPoint;
-        private readonly SocketAsyncEventArgs _socketReceiveArgs;
-        private readonly SocketAsyncEventArgs _socketSendArgs;
+
         private readonly AutoResetEvent _autoConnectEvent;
         private readonly AutoResetEvent _autoSendEvent;
         private readonly BlockingCollection<byte[]> _sendingQueue;
@@ -32,29 +29,31 @@ public abstract class NetClient : NetUser, INetClient
         private readonly CancellationToken _cancelToken;
 
         private bool _isDisposed;
+        private SocketAsyncEventArgs _socketReceiveArgs;
+        private SocketAsyncEventArgs _socketSendArgs;
 
         /// <summary>
         /// Gets the packet processor.
         /// </summary>
         protected virtual IPacketProcessor PacketProcessor => DefaultPacketProcessor;
 
+        /// <inheritdoc />
+        public bool IsConnected => this.Socket != null && this.Socket.Connected;
+
+        /// <inheritdoc />
+        public bool IsRunning { get; private set; }
+
         /// <summary>
-        /// Gets the <see cref="NetClient"/> connected state.
+        /// Gets the <see cref="NetClient"/> configuration.
         /// </summary>
-        public bool IsConnected => this.Socket != null && this.Socket.Connected;
+        protected NetClientConfiguration Configuration { get; }
 
         /// <summary>
         /// Creates a new <see cref="NetClient"/> instance.
         /// </summary>
-        /// <param name="host">Remote host or ip</param>
-        /// <param name="port">Remote port</param>
-        /// <param name="bufferSize">Buffer size</param>
-        protected NetClient(string host, int port, int bufferSize)
+        protected NetClient()
         {
-            this.Socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
-            this._ipEndPoint = NetUtils.CreateIpEndPoint(host, port);
-            this._socketSendArgs = NetUtils.CreateSocketAsync(this.Socket, this.IO_Completed);
-            this._socketReceiveArgs = NetUtils.CreateSocketAsync(this, this.IO_Completed, bufferSize);
+            this.Configuration = new NetClientConfiguration(this);
             this._autoConnectEvent = new AutoResetEvent(false);
             this._autoSendEvent = new AutoResetEvent(false);
             this._sendingQueue = new BlockingCollection<byte[]>();
@@ -68,11 +67,18 @@ protected NetClient(string host, int port, int bufferSize)
         /// <inheritdoc />
         public void Connect()
         {
+            if (this.IsRunning)
+                throw new InvalidOperationException("Client is already running");
+
             if (this.IsConnected)
                 throw new InvalidOperationException("Client is already connected to remote.");
 
-            var connectSocket = NetUtils.CreateSocketAsync(this.Socket, this.IO_Completed);
-            connectSocket.RemoteEndPoint = this._ipEndPoint;
+            this.Socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+            this._socketSendArgs = NetUtils.CreateSocketAsync(this.Socket, this.IO_Completed);
+            this._socketReceiveArgs = NetUtils.CreateSocketAsync(this, this.IO_Completed, this.Configuration.BufferSize);
+
+            SocketAsyncEventArgs connectSocket = NetUtils.CreateSocketAsync(this.Socket, this.IO_Completed);
+            connectSocket.RemoteEndPoint = NetUtils.CreateIpEndPoint(this.Configuration.Host, this.Configuration.Port);
 
             if (this.Socket.ConnectAsync(connectSocket))
                 this._autoConnectEvent.WaitOne();
@@ -85,7 +91,8 @@ public void Connect()
             this._sendingQueueWorker.Start();
             this._receivingQueueWorker.Start();
             this.Token.Socket = this.Socket;
-            this.Token.MessageHandler = data => this._receivingQueue.Add(data);
+            this.Token.MessageHandler = data => this._receivingQueue.Add(data, this._cancelToken);
+            this.IsRunning = true;
 
             if (!this.Socket.ReceiveAsync(this._socketReceiveArgs))
                 this.ProcessReceive(this._socketReceiveArgs);
@@ -100,10 +107,17 @@ public void Disconnect()
                 this.Socket.Close();
 #else
                 this.Socket.Shutdown(SocketShutdown.Both);
-                this.Socket.Dispose();
 #endif
+                this.Socket.Dispose();
+                this.Socket = null;
             }
 
+            this._socketSendArgs?.Dispose();
+            this._socketSendArgs = null;
+            this._socketReceiveArgs?.Dispose();
+            this._socketReceiveArgs = null;
+
+            this.IsRunning = false;
             this._cancelTokenSource.Cancel(false);
             this.OnDisconnected();
         }
@@ -114,7 +128,7 @@ public override void Send(INetPacketStream packet)
             if (!this.IsConnected)
                 throw new SocketException();
 
-            this._sendingQueue.Add(packet.Buffer);
+            this._sendingQueue.Add(packet.Buffer, this._cancelToken);
         }
 
         /// <summary>
@@ -192,7 +206,7 @@ private void ProcessReceiveQueue()
                     {
                         using (INetPacketStream packet = this.PacketProcessor.CreatePacket(packetData))
                             this.HandleMessage(packet);
-                    });
+                    }, this._cancelToken);
                 }
                 catch (Exception e)
                 {
@@ -212,9 +226,8 @@ private void ProcessReceive(SocketAsyncEventArgs e)
             {
                 if (e.BytesTransferred <= 0 || !(e.UserToken is NetUser user))
                     return;
-
-                IAsyncUserToken token = user.Token;
-                SocketAsyncUtils.ReceiveData(e, token, this.PacketProcessor);
+
+                SocketAsyncUtils.ReceiveData(e, user.Token, this.PacketProcessor);
 
                 if (!user.Socket.ReceiveAsync(e))
                     this.ProcessReceive(e);

src/Ether.Network/Client/NetClientConfiguration.cs

@@ -0,0 +1,76 @@
+using System.Net;
+using Ether.Network.Exceptions;
+using Ether.Network.Utils;
+
+namespace Ether.Network.Client
+{
+    /// <summary>
+    /// Provides properties to configure a <see cref="NetClient"/>.
+    /// </summary>
+    public sealed class NetClientConfiguration
+    {
+        private readonly INetClient _client;
+        private int _port;
+        private int _bufferSize;
+        private string _host;
+
+        /// <summary>
+        /// Gets or sets the port.
+        /// </summary>
+        public int Port
+        {
+            get => this._port;
+            set => this.SetValue(ref this._port, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the buffer size.
+        /// </summary>
+        public int BufferSize
+        {
+            get => this._bufferSize;
+            set => this.SetValue(ref this._bufferSize, value);
+        }
+
+        /// <summary>
+        /// Gets or sets the connecting host.
+        /// </summary>
+        public string Host
+        {
+            get => this._host;
+            set => this.SetValue(ref this._host, value);
+        }
+
+        /// <summary>
+        /// Gets the listening address.
+        /// </summary>
+        internal IPAddress Address => NetUtils.GetIpAddress(this._host);
+
+        /// <summary>
+        /// Creates a new <see cref="NetClientConfiguration"/> instance.
+        /// </summary>
+        /// <param name="client"></param>
+        internal NetClientConfiguration(INetClient client)
+        {
+            this._client = client;
+            this._bufferSize = 1024;
+            this._port = 0;
+            this._host = null;
+        }
+
+        /// <summary>
+        /// Set the value of a property passed as reference.
+        /// </summary>
+        /// <typeparam name="T">Type</typeparam>
+        /// <param name="container"></param>
+        /// <param name="value"></param>
+        private void SetValue<T>(ref T container, T value)
+        {
+            if (this._client != null && this._client.IsRunning)
+                throw new EtherConfigurationException("Cannot change configuration once the client is running.");
+
+            if (!Equals(container, value))
+                container = value;
+        }
+    }
+}

src/Ether.Network/Packets/NetPacketStream.cs

@@ -19,19 +19,13 @@ private enum PacketStateType
         private readonly BinaryReader _memoryReader;
         private readonly BinaryWriter _memoryWriter;
 
-        /// <summary>
-        /// Gets the <see cref="NetPacketStream"/> size.
-        /// </summary>
+        /// <inheritdoc />
         public int Size => (int)this.Length;
 
-        /// <summary>
-        /// Gets the <see cref="NetPacketStream"/> buffer.
-        /// </summary>
+        /// <inheritdoc />
         public virtual byte[] Buffer => this.GetInternalBuffer();
 
-        /// <summary>
-        /// Gets the current position of the cursor in the packet stream.
-        /// </summary>
+        /// <inheritdoc />
         public new long Position => base.Position;
 
         /// <summary>
@@ -54,11 +48,7 @@ public NetPacketStream(byte[] buffer)
             this._state = PacketStateType.Read;
         }
 
-        /// <summary>
-        /// Reads a T value from the packet.
-        /// </summary>
-        /// <typeparam name="T">Type of the value</typeparam>
-        /// <returns>The value read and converted to the type.</returns>
+        /// <inheritdoc />
         public virtual T Read<T>()
         {
             if (this._state != PacketStateType.Read)
@@ -72,12 +62,7 @@ public virtual T Read<T>()
             return default(T);
         }
 
-        /// <summary>
-        /// Reads an array of T value from the packet.
-        /// </summary>
-        /// <typeparam name="T">Value type.</typeparam>
-        /// <param name="amount">Amount to read.</param>
-        /// <returns></returns>
+        /// <inheritdoc />
         public virtual T[] Read<T>(int amount)
         {
             if (this._state != PacketStateType.Read)
@@ -97,11 +82,7 @@ public virtual T[] Read<T>(int amount)
             return array;
         }
 
-        /// <summary>
-        /// Writes a T value in the packet.
-        /// </summary>
-        /// <typeparam name="T">Value type.</typeparam>
-        /// <param name="value">Value.</param>
+        /// <inheritdoc />
         public void Write<T>(T value)
         {
             if (this._state != PacketStateType.Write)

src/Ether.Network/Server/NetServer.cs

@@ -306,11 +306,10 @@ private void ProcessReceive(SocketAsyncEventArgs e)
             {
                 if (!(e.UserToken is NetUser connection))
                     return;
+
+                SocketAsyncUtils.ReceiveData(e, connection.Token, this.PacketProcessor);
 
-                IAsyncUserToken token = connection.Token;
-                SocketAsyncUtils.ReceiveData(e, token, this.PacketProcessor);
-
-                if (!token.Socket.ReceiveAsync(e))
+                if (!connection.Socket.ReceiveAsync(e))
                     this.ProcessReceive(e);
             }
             else

src/Ether.Network/Server/NetServerConfiguration.cs

@@ -5,7 +5,7 @@
 namespace Ether.Network.Server
 {
     /// <summary>
-    /// Provide properties to configuration a <see cref="NetServer{T}"/>.
+    /// Provide properties to configure a <see cref="NetServer{T}"/>.
     /// </summary>
     public sealed class NetServerConfiguration
     {

test/Ether.Network.Tests/Contexts/Echo/MyEchoClient.cs

@@ -19,14 +19,16 @@ public ICollection<string> SendedData
             {
                 this._sendedData.Sort(StringComparer.CurrentCulture);
                 return this._sendedData;
-            }    
+            }
         }
 
         public bool ConnectedToServer { get; private set; }
 
-        public MyEchoClient(string host, int port, int bufferSize) 
-            : base(host, port, bufferSize)
+        public MyEchoClient(string host, int port, int bufferSize)
         {
+            this.Configuration.Host = host;
+            this.Configuration.Port = port;
+            this.Configuration.BufferSize = bufferSize;
             this._sendedData = new List<string>();
             this._random = new Random();
         }