NuGet v3.0.17, minor fixes and small refactor

jchristn · Dec 23, 2024 · 3f12d8a · 3f12d8a
1 parent 2a26a5c
commit 3f12d8a
Show file tree

Hide file tree

Showing 24 changed files with 972 additions and 179 deletions.
diff --git a/src/ClientTest/Client.cs b/src/ClientTest/Client.cs
@@ -1,10 +1,10 @@
-using SuperSimpleTcp;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace ClientTest
+namespace ClientTest
 {
+    using SuperSimpleTcp;
+    using System;
+    using System.Collections.Generic;
+    using System.Text;
+
     class Program
     {
         static string _ServerIp;

diff --git a/src/ClientTest/ClientTest.csproj b/src/ClientTest/ClientTest.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.1;net461;net48;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net461;net48;net6.0;net8.0</TargetFrameworks>
     <AssemblyName>Client</AssemblyName>
   </PropertyGroup>
 

diff --git a/src/ServerTest/Server.cs b/src/ServerTest/Server.cs
@@ -1,11 +1,11 @@
-using SuperSimpleTcp;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace ServerTest
+namespace ServerTest
 {
+    using SuperSimpleTcp;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Text;
+
     class Program
     {
         static string _ListenerIp;

diff --git a/src/ServerTest/ServerTest.csproj b/src/ServerTest/ServerTest.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.1;net461;net48;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net461;net48;net6.0;net8.0</TargetFrameworks>
     <AssemblyName>Server</AssemblyName>
   </PropertyGroup>
 

diff --git a/src/SuperSimpleTcp.UnitTest/IntegrationTest.cs b/src/SuperSimpleTcp.UnitTest/IntegrationTest.cs
@@ -1,11 +1,13 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace SuperSimpleTcp.UnitTest
 {
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    using System.Diagnostics;
+    using System.Linq;
+    using System.Text;
+    using System.Threading.Tasks;
+
+    using DataReceivedEventArgs = SuperSimpleTcp.DataReceivedEventArgs;
+
     [TestClass]
     public class IntegrationTest
     {

diff --git a/src/SuperSimpleTcp.UnitTest/ServerSettingsTest.cs b/src/SuperSimpleTcp.UnitTest/ServerSettingsTest.cs
@@ -1,11 +1,11 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace SuperSimpleTcp.UnitTest
+namespace SuperSimpleTcp.UnitTest
 {
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading;
+    using System.Threading.Tasks;
+
     [TestClass]
     public class ServerSettingsTest
     {

diff --git a/src/SuperSimpleTcp.UnitTest/ServerTest.cs b/src/SuperSimpleTcp.UnitTest/ServerTest.cs
@@ -1,9 +1,9 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System;
-using System.Threading.Tasks;
-
 namespace SuperSimpleTcp.UnitTest
 {
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    using System;
+    using System.Threading.Tasks;
+
     [TestClass]
     public class ServerTest
     {

diff --git a/src/SuperSimpleTcp.UnitTest/StringHelper.cs b/src/SuperSimpleTcp.UnitTest/StringHelper.cs
@@ -1,8 +1,8 @@
-using System;
-using System.Linq;
-
-namespace SuperSimpleTcp.UnitTest
+namespace SuperSimpleTcp.UnitTest
 {
+    using System;
+    using System.Linq;
+
     internal static class StringHelper
     {
         private static Random _random = new Random();

diff --git a/src/SuperSimpleTcp.UnitTest/TestCertificateHelper.cs b/src/SuperSimpleTcp.UnitTest/TestCertificateHelper.cs
@@ -1,7 +1,7 @@
-using System.IO;
-
-namespace SuperSimpleTcp.UnitTest
+namespace SuperSimpleTcp.UnitTest
 {
+    using System.IO;
+
     public static class TestCertificateHelper
     {
         public static void CreateCertificate(string certificateFilePath)

diff --git a/src/SuperSimpleTcp/ClientMetadata.cs b/src/SuperSimpleTcp/ClientMetadata.cs
@@ -1,10 +1,10 @@
-using System;
-using System.Net.Security;
-using System.Net.Sockets;
-using System.Threading;
-
-namespace SuperSimpleTcp
+namespace SuperSimpleTcp
 {
+    using System;
+    using System.Net.Security;
+    using System.Net.Sockets;
+    using System.Threading;
+
     internal class ClientMetadata : IDisposable
     {
         #region Public-Members

diff --git a/src/SuperSimpleTcp/Common.cs b/src/SuperSimpleTcp/Common.cs
@@ -1,7 +1,7 @@
-using System;
-
-namespace SuperSimpleTcp
+namespace SuperSimpleTcp
 {
+    using System;
+
     internal static class Common
     { 
         internal static void ParseIpPort(string ipPort, out string ip, out int port) 

diff --git a/src/SuperSimpleTcp/ConnectionEventArgs.cs b/src/SuperSimpleTcp/ConnectionEventArgs.cs
@@ -1,7 +1,7 @@
-using System;
-
-namespace SuperSimpleTcp
+namespace SuperSimpleTcp
 {
+    using System;
+
     /// <summary>
     /// Arguments for connection events.
     /// </summary>

diff --git a/src/SuperSimpleTcp/DataReceivedEventArgs.cs b/src/SuperSimpleTcp/DataReceivedEventArgs.cs
@@ -1,7 +1,7 @@
-using System;
-
-namespace SuperSimpleTcp
+namespace SuperSimpleTcp
 {
+    using System;
+
     /// <summary>
     /// Arguments for data received from connected endpoints.
     /// </summary>

diff --git a/src/SuperSimpleTcp/DataSentEventArgs.cs b/src/SuperSimpleTcp/DataSentEventArgs.cs
@@ -1,7 +1,7 @@
-using System;
-
-namespace SuperSimpleTcp
+namespace SuperSimpleTcp
 {
+    using System;
+
     /// <summary>
     /// Arguments for data sent to a connected endpoint.
     /// </summary>

diff --git a/src/SuperSimpleTcp/SimpleTcpClient.cs b/src/SuperSimpleTcp/SimpleTcpClient.cs
@@ -1,19 +1,19 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Net.NetworkInformation;
-using System.Net.Security;
-using System.Net.Sockets;
-using System.Runtime.InteropServices;
-using System.Security.Authentication;
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace SuperSimpleTcp
+namespace SuperSimpleTcp
 {
+    using System;
+    using System.IO;
+    using System.Linq;
+    using System.Net;
+    using System.Net.NetworkInformation;
+    using System.Net.Security;
+    using System.Net.Sockets;
+    using System.Runtime.InteropServices;
+    using System.Security.Authentication;
+    using System.Security.Cryptography.X509Certificates;
+    using System.Text;
+    using System.Threading;
+    using System.Threading.Tasks;
+
     /// <summary>
     /// SimpleTcp client with SSL support.  
     /// Set the Connected, Disconnected, and DataReceived events.  
@@ -1178,18 +1178,29 @@ private async Task IdleServerMonitor()
         {
             while (!_token.IsCancellationRequested)
             {
-                await Task.Delay(_settings.IdleServerEvaluationIntervalMs, _token).ConfigureAwait(false);
+                try
+                {
+                    await Task.Delay(_settings.IdleServerEvaluationIntervalMs, _token).ConfigureAwait(false);
 
-                if (_settings.IdleServerTimeoutMs == 0) continue;
+                    if (_settings.IdleServerTimeoutMs == 0) continue;
 
-                DateTime timeoutTime = _lastActivity.AddMilliseconds(_settings.IdleServerTimeoutMs);
+                    DateTime timeoutTime = _lastActivity.AddMilliseconds(_settings.IdleServerTimeoutMs);
 
-                if (DateTime.Now > timeoutTime)
+                    if (DateTime.Now > timeoutTime)
+                    {
+                        Logger?.Invoke($"{_header}disconnecting from {ServerIpPort} due to timeout");
+                        _isConnected = false;
+                        _isTimeout = true;
+                        _tokenSource.Cancel(); // DataReceiver will fire events including dispose
+                    }
+                }
+                catch (TaskCanceledException)
+                {
+                    break;
+                }
+                catch (OperationCanceledException)
                 {
-                    Logger?.Invoke($"{_header}disconnecting from {ServerIpPort} due to timeout");
-                    _isConnected = false;
-                    _isTimeout = true;
-                    _tokenSource.Cancel(); // DataReceiver will fire events including dispose
+                    break;
                 }
             }
         }
@@ -1198,16 +1209,27 @@ private async Task ConnectedMonitor()
         {
             while (!_token.IsCancellationRequested)
             {
-                await Task.Delay(_settings.ConnectionLostEvaluationIntervalMs, _token).ConfigureAwait(false);
+                try
+                {
+                    await Task.Delay(_settings.ConnectionLostEvaluationIntervalMs, _token).ConfigureAwait(false);
 
-                if (!_isConnected)
-                    continue; //Just monitor connected clients
+                    if (!_isConnected)
+                        continue; //Just monitor connected clients
 
-                if (!PollSocket())
+                    if (!PollSocket())
+                    {
+                        Logger?.Invoke($"{_header}disconnecting from {ServerIpPort} due to connection lost");
+                        _isConnected = false;
+                        _tokenSource.Cancel(); // DataReceiver will fire events including dispose
+                    }
+                }
+                catch (TaskCanceledException)
                 {
-                    Logger?.Invoke($"{_header}disconnecting from {ServerIpPort} due to connection lost");
-                    _isConnected = false;
-                    _tokenSource.Cancel(); // DataReceiver will fire events including dispose
+                    break;
+                }
+                catch (OperationCanceledException)
+                {
+                    break;
                 }
             }
         }

diff --git a/src/SuperSimpleTcp/SimpleTcpClientEvents.cs b/src/SuperSimpleTcp/SimpleTcpClientEvents.cs
@@ -1,7 +1,7 @@
-using System;
-
-namespace SuperSimpleTcp
+namespace SuperSimpleTcp
 {
+    using System;
+
     /// <summary>
     /// SimpleTcp client events.
     /// </summary>

diff --git a/src/SuperSimpleTcp/SimpleTcpClientSettings.cs b/src/SuperSimpleTcp/SimpleTcpClientSettings.cs
@@ -1,9 +1,9 @@
-using System;
-using System.Net;
-using System.Net.Security;
-
-namespace SuperSimpleTcp
+namespace SuperSimpleTcp
 {
+    using System;
+    using System.Net;
+    using System.Net.Security;
+
     /// <summary>
     /// SimpleTcp client settings.
     /// </summary>

diff --git a/src/SuperSimpleTcp/SimpleTcpKeepaliveSettings.cs b/src/SuperSimpleTcp/SimpleTcpKeepaliveSettings.cs
@@ -1,7 +1,7 @@
-using System;
-
-namespace SuperSimpleTcp
+namespace SuperSimpleTcp
 {
+    using System;
+
     /// <summary>
     /// SimpleTcp keepalive settings.
     /// Keepalive probes are sent after an idle period defined by TcpKeepAliveTime (seconds).

diff --git a/src/SuperSimpleTcp/SimpleTcpServer.cs b/src/SuperSimpleTcp/SimpleTcpServer.cs
@@ -1,22 +1,22 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Net.NetworkInformation;
-using System.Net.Security;
-using System.Net.Sockets;
-using System.Runtime.InteropServices;
-using System.Security.Authentication;
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace SuperSimpleTcp
+namespace SuperSimpleTcp
 {
-     /// <summary>
+    using System;
+    using System.Collections.Concurrent;
+    using System.Collections.Generic;
+    using System.IO;
+    using System.Linq;
+    using System.Net;
+    using System.Net.NetworkInformation;
+    using System.Net.Security;
+    using System.Net.Sockets;
+    using System.Runtime.InteropServices;
+    using System.Security.Authentication;
+    using System.Security.Cryptography.X509Certificates;
+    using System.Text;
+    using System.Threading;
+    using System.Threading.Tasks;
+
+    /// <summary>
     /// SimpleTcp server with SSL support.  
     /// Set the ClientConnected, ClientDisconnected, and DataReceived events.  
     /// Once set, use Start() to begin listening for connections.
@@ -476,9 +476,8 @@ public Task StartAsync()
         /// </summary>
         public void Stop()
         {
-            if (!_isListening) throw new InvalidOperationException("SimpleTcpServer is not running.");
-
             _isListening = false;
+
             _listener.Stop();
             _listenerTokenSource.Cancel();
             _acceptConnections.Wait();

diff --git a/src/SuperSimpleTcp/SimpleTcpServerEvents.cs b/src/SuperSimpleTcp/SimpleTcpServerEvents.cs
@@ -1,7 +1,7 @@
-using System;
-
-namespace SuperSimpleTcp
+namespace SuperSimpleTcp
 {
+    using System;
+
     /// <summary>
     /// SimpleTcp server events.
     /// </summary>