v1.0.2

-Fixed bug where server thinks connection is open when unexpectedly closing the websocket connection (by closing or refreshing a webpage with a websocket client on chrome for example).

Author: Eldin Zenderink

SimpleWebsocketServer.sln

@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27428.2005
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleWebsocketServer", "SimpleWebsocketServer\SimpleWebsocketServer.csproj", "{AF7A3511-2D27-4BED-B81F-304C508D016B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleWebsocketServer", "SimpleWebsocketServer\SimpleWebsocketServer.csproj", "{AF7A3511-2D27-4BED-B81F-304C508D016B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebsocketServerTest", "WebsocketServerTest\WebsocketServerTest.csproj", "{D964861E-249F-42CA-802C-7D02A7872DBC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebSocketServerTestNET", "WebSocketServerTestNET\WebSocketServerTestNET.csproj", "{8CE88C69-3E35-4617-A2BD-B4F66244FCA0}"
 	ProjectSection(ProjectDependencies) = postProject
 		{AF7A3511-2D27-4BED-B81F-304C508D016B} = {AF7A3511-2D27-4BED-B81F-304C508D016B}
 	EndProjectSection
@@ -20,10 +20,10 @@ Global
 		{AF7A3511-2D27-4BED-B81F-304C508D016B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AF7A3511-2D27-4BED-B81F-304C508D016B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AF7A3511-2D27-4BED-B81F-304C508D016B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D964861E-249F-42CA-802C-7D02A7872DBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D964861E-249F-42CA-802C-7D02A7872DBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D964861E-249F-42CA-802C-7D02A7872DBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D964861E-249F-42CA-802C-7D02A7872DBC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8CE88C69-3E35-4617-A2BD-B4F66244FCA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8CE88C69-3E35-4617-A2BD-B4F66244FCA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8CE88C69-3E35-4617-A2BD-B4F66244FCA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8CE88C69-3E35-4617-A2BD-B4F66244FCA0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

SimpleWebsocketServer/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = "SimpleWebSocketServer Library"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = v1.0.0
+PROJECT_NUMBER         = v1.0.1
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -58,7 +58,7 @@ PROJECT_LOGO           =
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = "G:\Github Desktop\SimpleWebSocketServer\SimpleWebsocketServer\Docs"
+OUTPUT_DIRECTORY       = ../../SimpleWebSocketServerLocal/Docs
 
 # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
 # directories (in 2 levels) under the output directory of each output format and
@@ -790,7 +790,7 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = "G:\Github Desktop\SimpleWebSocketServer\SimpleWebsocketServer\SimpleWebsocketServer"
+INPUT                  = "G:\Github Desktop\SimpleWebSocketServer\SimpleWebsocketServer"
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -1271,7 +1271,7 @@ HTML_DYNAMIC_MENUS     = YES
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_DYNAMIC_SECTIONS  = NO
+HTML_DYNAMIC_SECTIONS  = YES
 
 # With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
 # shown in the various tree structured indices initially; the user can expand
@@ -1497,7 +1497,7 @@ DISABLE_INDEX          = NO
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-GENERATE_TREEVIEW      = NO
+GENERATE_TREEVIEW      = YES
 
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
@@ -1685,7 +1685,7 @@ EXTRA_SEARCH_MAPPINGS  =
 # If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
 # The default value is: YES.
 
-GENERATE_LATEX         = YES
+GENERATE_LATEX         = NO
 
 # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
 # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of

SimpleWebsocketServer/SimpleWebsocketServer.cs

@@ -63,9 +63,9 @@ public async Task StartServerAsync()
         /// <summary>
         /// Starts running the server async.
         /// </summary>
-        public void StartServer()
+        public  void StartServer()
         {
-            Task.Run(async()=> await _WebSocketHttpServer.RunServer());
+           Task.Run(async() => await _WebSocketHttpServer.RunServer());
         }
 
         /// <summary>

SimpleWebsocketServer/WebsocketHandler.cs

@@ -113,13 +113,21 @@ public async void StartConnection(TcpClient client,  string clientId, string bas
         public async Task<bool> StopClient(string clientId)
         {
             bool succes = false;
+            WebSocketClientInfo key = null;
             foreach (var connection in _ListWithConnections)
             {
                 if (connection.Key.clientId == clientId)
                 {
                     succes = await connection.Value.StopServerAsync();
+                    key = connection.Key;
+                    break;
                 }
             }
+            if (succes)
+            {
+                _ListWithConnections.Remove(key);
+            }
+
             return succes;
         }
 
@@ -132,14 +140,22 @@ public async Task<bool> StopClient(string clientId)
         public async Task<bool> StopClient(string clientId, string reason)
         {
             bool succes = false;
+            WebSocketClientInfo key = null;
             foreach (var connection in _ListWithConnections)
             {
                 if (connection.Key.clientId == clientId)
                 {
                     succes = await connection.Value.StopServerAsync(reason);
+                    key = connection.Key;
+                    break;
                 }
             }
 
+            if (succes)
+            {
+                _ListWithConnections.Remove(key);
+            }
+
             return succes;
         }
 
@@ -152,7 +168,12 @@ public async Task<bool> StopAll()
             bool succes = false;
             foreach (var connection in _ListWithConnections)
             {
-                 succes = await connection.Value.StopServerAsync();
+                succes = await connection.Value.StopServerAsync();
+            }
+
+            if (succes)
+            {
+                _ListWithConnections.Clear();
             }
 
             return succes;
@@ -171,6 +192,10 @@ public async Task<bool> StopAll(string reason)
                 succes = await connection.Value.StopServerAsync();
             }
 
+            if (succes)
+            {
+                _ListWithConnections.Clear();
+            }
             return succes;
         }
 
@@ -216,6 +241,28 @@ public async Task<bool> SendMessage(WebSocketMessageContainer message)
         /// <param name="arg">Arguments containing event arguments.</param>
         public void OnWebsocketEvent(object sender, WebSocketEventArg arg)
         {
+
+            if (arg.isClosed)
+            {
+                WebSocketClientInfo key = null;
+                bool found = false;
+
+                foreach (var connection in _ListWithConnections)
+                {
+                    if (connection.Key.clientId == arg.clientId)
+                    {
+                        key = connection.Key;
+                        found = true;
+                        break;
+                    }
+                }
+                if (found)
+                {
+                    _ListWithConnections.Remove(key);
+                }
+            }
+           
+
             WebsocketEvent?.Invoke(this, arg);
         }
     }