added exception event for tcp server.

Author: seayxu

build/version.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup Condition="'$(AssemblyName)'=='GodSharp.Socket'">
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>2019.1.0.0-preview3</Version>
-    <FileVersion>2019.1.0.0-preview3</FileVersion>
+    <Version>2019.1.0.0-preview4</Version>
+    <FileVersion>2019.1.0.0-preview4</FileVersion>
   </PropertyGroup>
 </Project>

samples/GodSharp.Socket.TcpServerSample/Program.cs

@@ -38,6 +38,10 @@ static void Main(string[] args)
                 OnException = (c) =>
                 {
                     Console.WriteLine($"{c.RemoteEndPoint} exception:{c.Exception.StackTrace.ToString()}.");
+                },
+                OnServerException= (c) =>
+                {
+                    Console.WriteLine($"{c.LocalEndPoint} exception:{c.Exception.StackTrace.ToString()}.");
                 }
             };
 
@@ -49,6 +53,8 @@ static void Main(string[] args)
 
             server.Stop();
             Console.WriteLine("GodSharp.Socket.TcpServer Stopped!");
+
+            Console.ReadLine();
         }
     }
 }

src/GodSharp.Socket/Abstractions/Components/ITcpServer.cs

@@ -10,5 +10,7 @@ public interface ITcpServer : INetBase<ITcpConnection>, IDisposable
         Socket Instance { get; }
 
         IDictionary<string, ITcpConnection> Connections { get; }
+
+        SocketEventHandler<NetServerEventArgs> OnServerException { get; set; }
     }
-}
+}

src/GodSharp.Socket/Abstractions/Events/NetEventArgs.cs

@@ -99,6 +99,14 @@ public class NetServerEventArgs : NetEventArgs
         /// </value>
         public ITcpServer TcpServer { get; internal set; }
 
+        /// <summary>
+        /// Gets or sets the connection.
+        /// </summary>
+        /// <value>
+        /// The connection.
+        /// </value>
+        public ITcpConnection Connection { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="NetServerEventArgs"/> class.
         /// </summary>
@@ -111,10 +119,12 @@ public NetServerEventArgs()
         /// </summary>
         /// <param name="tcpServer">The TCP server.</param>
         /// <param name="localEndPoint">The local end point.</param>
-        public NetServerEventArgs(ITcpServer tcpServer, IPEndPoint localEndPoint)
+        /// <param name="connection">The connection.</param>
+        public NetServerEventArgs(ITcpServer tcpServer, IPEndPoint localEndPoint = null, ITcpConnection connection = null)
         {
             if (tcpServer != null) TcpServer = tcpServer;
             if (localEndPoint != null) LocalEndPoint = localEndPoint;
+            if (connection != null) Connection = connection;
         }
     }
 }

src/GodSharp.Socket/Abstractions/Listeners/NetListener.cs

@@ -48,7 +48,7 @@ public void Stop()
             Exception exception = null;
             try
             {
-                Connection?.Instance.Disconnect(true);
+                Connection?.Instance.Disconnect(false);
                 Connection?.Instance.Close();
             }
             catch (Exception ex)

src/GodSharp.Socket/Tcp/TcpServer.cs

@@ -10,6 +10,8 @@ namespace GodSharp.Sockets
 {
     public sealed class TcpServer :NetBase<ITcpConnection, NetServerEventArgs>, ITcpServer, IDisposable
     {
+        private readonly object ConnectionsLock = new object();
+
         private bool stopping = false;
 
         private bool running;
@@ -18,9 +20,11 @@ public sealed class TcpServer :NetBase<ITcpConnection, NetServerEventArgs>, ITcp
         public Socket Instance { get; private set; }
 
         public IPEndPoint LocalEndPoint { get; private set; }
-
+        
         public IDictionary<string, ITcpConnection> Connections { get; private set; } = new Dictionary<string, ITcpConnection>();
 
+        public SocketEventHandler<NetServerEventArgs> OnServerException { get; set; }
+
         public TcpServer(TcpServerOptions options) => OnConstructing(options);
 
         public TcpServer(int port = 7788, string host = null, int backlog = int.MaxValue, AddressFamily family = AddressFamily.InterNetwork, string name = null, int id = 0)
@@ -33,6 +37,7 @@ public TcpServer(int port = 7788, string host = null, int backlog = int.MaxValue
             }
             catch (Exception ex)
             {
+                OnServerException?.Invoke(new NetServerEventArgs(this, LocalEndPoint) { Exception = ex });
                 throw ex;
             }
         }
@@ -78,6 +83,7 @@ private void OnConstructing(TcpServerOptions options)
             }
             catch (Exception ex)
             {
+                OnServerException?.Invoke(new NetServerEventArgs(this, LocalEndPoint) { Exception = ex });
                 throw ex;
             }
         }
@@ -96,7 +102,7 @@ public override void Start()
             }
             catch (Exception ex)
             {
-                throw ex;
+                OnServerException?.Invoke(new NetServerEventArgs(this, LocalEndPoint) { Exception = ex });
             }
         }
 
@@ -112,7 +118,7 @@ public override void Stop()
             }
             catch (Exception ex)
             {
-                throw ex;
+                OnServerException?.Invoke(new NetServerEventArgs(this, LocalEndPoint) { Exception = ex });
             }
             finally
             {
@@ -121,7 +127,7 @@ public override void Stop()
 
             running = false;
             stopping = false;
-            
+
             OnStopped?.Invoke(new NetServerEventArgs(this, LocalEndPoint));
         }
 
@@ -133,12 +139,23 @@ protected override void OnDisconnectedHandler(NetClientEventArgs<ITcpConnection>
 
         private void BeginAccept()
         {
-            Instance.BeginAccept(AcceptCallback, null);
+            try
+            {
+                Instance.BeginAccept(AcceptCallback, null);
+            }
+            catch (Exception ex)
+            {
+                OnServerException?.Invoke(new NetServerEventArgs(this, LocalEndPoint) { Exception = ex });
+
+                Stop();
+            }
         }
 
         private void AcceptCallback(IAsyncResult result)
         {
-            bool error = false;
+            bool accept = false;
+            ITcpConnection connection = null;
+
             try
             {
                 if (!Running || stopping) return;
@@ -148,35 +165,38 @@ private void AcceptCallback(IAsyncResult result)
                 if (stopping) return;
 
                 BeginAccept();
+                accept = true;
 
-                ITcpConnection connection = new TcpConnection(socket) { OnConnected = OnConnectedHandler, OnReceived = OnReceivedHandler, OnDisconnected = OnDisconnectedHandler, OnException = OnExceptionHandler };
+                connection = new TcpConnection(socket) { OnConnected = OnConnectedHandler, OnReceived = OnReceivedHandler, OnDisconnected = OnDisconnectedHandler, OnException = OnExceptionHandler };
                 connection.Start();
 
                 RemoveListener(connection.Key);
 
-                Connections.Add(connection.Key, connection);
+                lock (ConnectionsLock)
+                {
+                    Connections.Add(connection.Key, connection);
+                }
 
                 OnConnected?.Invoke(new NetClientEventArgs<ITcpConnection>(connection));
             }
-            catch (SocketException ex)
-            {
-                error = true;
-                throw ex;
-            }
             catch (Exception ex)
             {
-                error = true;
-                throw ex;
+                OnServerException?.Invoke(new NetServerEventArgs(this, LocalEndPoint, connection) { Exception = ex });
             }
             finally
             {
-                if (error) Stop();
+                if (Running && !accept && !stopping) BeginAccept();
             }
         }
 
         private void RemoveListener(string key)
         {
-            bool existed = Connections?.ContainsKey(key) == true;
+            bool existed = false;
+
+            lock (ConnectionsLock)
+            {
+                existed = Connections?.ContainsKey(key) == true;
+            }
 
             try
             {
@@ -188,11 +208,17 @@ private void RemoveListener(string key)
             }
             catch (Exception ex)
             {
-                Console.WriteLine(ex.Message);
+                OnServerException?.Invoke(new NetServerEventArgs(this, LocalEndPoint) { Exception = ex });
             }
             finally
             {
-                if (existed) Connections?.Remove(key);
+                if (existed)
+                {
+                    lock (ConnectionsLock)
+                    {
+                        Connections?.Remove(key);
+                    }
+                }
             }
         }
 

src/GodSharp.Socket/Tcp/TcpServerOptions.cs

@@ -16,6 +16,8 @@ public class TcpServerOptions : NetOptions<ITcpConnection>
 
         public SocketEventHandler<NetServerEventArgs> OnStopped { get; set; }
 
+        public SocketEventHandler<NetServerEventArgs> OnServerException { get; set; }
+
         public TcpServerOptions()
         {
         }