Merge branch 'master' into NETCore2.2

# Conflicts: # Tcp.NET.Server/Handlers/TcpHandlerServerBaseTcp.cs
LiveOrDevTrying · May 30, 2023 · 7b20259 · 7b20259
2 parents 38fd1ee + ee0a8cb
commit 7b20259
Show file tree

Hide file tree

Showing 42 changed files with 886 additions and 844 deletions.
diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml
@@ -0,0 +1,10 @@
+name: Check Markdown links
+
+on: push
+
+jobs:
+  markdown-link-check:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - uses: gaurav-nelson/github-action-markdown-link-check@v1
diff --git a/README.md b/README.md
diff --git a/Tcp.NET.Client/Handlers/TcpClientHandler.cs b/Tcp.NET.Client/Handlers/TcpClientHandler.cs
@@ -27,7 +27,8 @@ protected override TcpConnectionClientEventArgs CreateConnectionEventArgs(TcpCon
             return new TcpConnectionClientEventArgs
             {
                 Connection = args.Connection,
-                ConnectionEventType = args.ConnectionEventType
+                ConnectionEventType = args.ConnectionEventType,
+                CancellationToken = args.CancellationToken
             };
         }
 
@@ -37,7 +38,8 @@ protected override TcpErrorClientEventArgs CreateErrorEventArgs(TcpErrorEventArg
             {
                 Connection = args.Connection,
                 Exception = args.Exception,
-                Message = args.Message
+                Message = args.Message,
+                CancellationToken = args.CancellationToken
             };
         }
 
@@ -48,7 +50,8 @@ protected override TcpMessageClientEventArgs CreateMessageEventArgs(TcpMessageEv
                 Bytes = args.Bytes,
                 Connection = args.Connection,
                 Message = args.Message,
-                MessageEventType = args.MessageEventType
+                MessageEventType = args.MessageEventType,
+                CancellationToken = args.CancellationToken
             };
         }
     }

diff --git a/Tcp.NET.Client/Handlers/TcpClientHandlerBase.cs b/Tcp.NET.Client/Handlers/TcpClientHandlerBase.cs
diff --git a/Tcp.NET.Client/ITcpNETClient.cs b/Tcp.NET.Client/ITcpNETClient.cs
@@ -11,5 +11,6 @@ public interface ITcpNETClient :
             TcpErrorClientEventArgs, 
             ConnectionTcp>
     {
+        bool IsRunning { get; }
     }
 }
diff --git a/Tcp.NET.Client/Logo.ico b/Tcp.NET.Client/Logo.ico
diff --git a/Tcp.NET.Client/Logo.png b/Tcp.NET.Client/Logo.png
diff --git a/Tcp.NET.Client/Models/IParamsTcpClient.cs b/Tcp.NET.Client/Models/IParamsTcpClient.cs
@@ -0,0 +1,19 @@
+using PHS.Networking.Models;
+
+namespace Tcp.NET.Client.Models
+{
+    public interface IParamsTcpClient : IParams
+    {
+        byte[] DisconnectBytes { get; }
+        byte[] EndOfLineBytes { get; }
+        string Host { get; }
+        bool IsSSL { get; }
+        bool OnlyEmitBytes { get; }
+        byte[] PingBytes { get; }
+        byte[] PongBytes { get; }
+        int Port { get; }
+        byte[] Token { get; }
+        bool UseDisconnectBytes { get; }
+        bool UsePingPong { get; }
+    }
+}
diff --git a/Tcp.NET.Client/Models/ParamsTcpClient.cs b/Tcp.NET.Client/Models/ParamsTcpClient.cs
@@ -1,12 +1,10 @@
-using PHS.Networking.Models;
-using PHS.Networking.Utilities;
+using PHS.Networking.Utilities;
 using System;
-using System.Linq;
 using System.Text;
 
 namespace Tcp.NET.Client.Models
 {
-    public class ParamsTcpClient : Params
+    public class ParamsTcpClient : IParamsTcpClient
     {
         public string Host { get; protected set; }
         public int Port { get; protected set; }
@@ -63,59 +61,6 @@ public ParamsTcpClient(string host, int port, string endOfLineCharacters, string
                 Token = Encoding.UTF8.GetBytes(token);
             }
 
-            if (UseDisconnectBytes && (DisconnectBytes == null || Statics.ByteArrayEquals(DisconnectBytes, Array.Empty<byte>())))
-            {
-                DisconnectBytes = new byte[] { 3 };
-            }
-        }
-        public ParamsTcpClient(string host, int port, byte[] endOfLineBytes, string token = null, bool isSSL = true, bool onlyEmitBytes = true, bool usePingPong = true, byte[] pingBytes = null, byte[] pongBytes = null, bool useDisconnectBytes = true, byte[] disconnectBytes = null)
-        {
-            if (string.IsNullOrWhiteSpace(host))
-            {
-                throw new ArgumentException("Host is not valid");
-            }
-
-            if (port <= 0)
-            {
-                throw new ArgumentException("Port is not valid");
-            }
-
-            if (endOfLineBytes == null || endOfLineBytes.Length <= 0 || Statics.ByteArrayEquals(endOfLineBytes, Array.Empty<byte>()))
-            {
-                throw new ArgumentException("End of Line Characters are not valid");
-            }
-
-            if (token != null && string.IsNullOrWhiteSpace(token))
-            {
-                throw new ArgumentException("Token is not valid");
-            }
-
-            if (usePingPong && (pingBytes == null || pingBytes.Length <= 0 || Statics.ByteArrayEquals(pingBytes, Array.Empty<byte>())))
-            {
-                pingBytes = Encoding.UTF8.GetBytes("ping");
-            }
-
-            if (usePingPong && (pongBytes == null || pongBytes.Length <= 0 || Statics.ByteArrayEquals(pongBytes, Array.Empty<byte>())))
-            {
-                pongBytes = Encoding.UTF8.GetBytes("pong");
-            }
-
-            Host = host;
-            Port = port;
-            EndOfLineBytes = endOfLineBytes;
-            UsePingPong = usePingPong;
-            PingBytes = pingBytes;
-            PongBytes = pongBytes;
-            IsSSL = isSSL;
-            OnlyEmitBytes = onlyEmitBytes;
-            UseDisconnectBytes = useDisconnectBytes;
-            DisconnectBytes = disconnectBytes;
-
-            if (!string.IsNullOrWhiteSpace(token))
-            {
-                Token = Encoding.UTF8.GetBytes(token);
-            }
-
             if (UseDisconnectBytes && (DisconnectBytes == null || Statics.ByteArrayEquals(DisconnectBytes, Array.Empty<byte>())))
             {
                 DisconnectBytes = new byte[] { 3 };

diff --git a/Tcp.NET.Client/Models/ParamsTcpClientBytes.cs b/Tcp.NET.Client/Models/ParamsTcpClientBytes.cs
@@ -0,0 +1,72 @@
+using PHS.Networking.Utilities;
+using System;
+using System.Linq;
+using System.Text;
+
+namespace Tcp.NET.Client.Models
+{
+    public class ParamsTcpClientBytes : IParamsTcpClient
+    {
+        public string Host { get; protected set; }
+        public int Port { get; protected set; }
+        public byte[] EndOfLineBytes { get; protected set; }
+        public bool UsePingPong { get; protected set; }
+        public byte[] PingBytes { get; protected set; }
+        public byte[] PongBytes { get; protected set; }
+        public bool IsSSL { get; protected set; }
+        public bool OnlyEmitBytes { get; protected set; }
+        public byte[] Token { get; protected set; }
+        public bool UseDisconnectBytes { get; protected set; }
+        public byte[] DisconnectBytes { get; protected set; }
+
+        public ParamsTcpClientBytes(string host, int port, byte[] endOfLineBytes, byte[] token = null, bool isSSL = true, bool onlyEmitBytes = true, bool usePingPong = true, byte[] pingBytes = null, byte[] pongBytes = null, bool useDisconnectBytes = true, byte[] disconnectBytes = null)
+        {
+            if (string.IsNullOrWhiteSpace(host))
+            {
+                throw new ArgumentException("Host is not valid");
+            }
+
+            if (port <= 0)
+            {
+                throw new ArgumentException("Port is not valid");
+            }
+
+            if (endOfLineBytes == null || endOfLineBytes.Length <= 0 || Statics.ByteArrayEquals(endOfLineBytes, Array.Empty<byte>()))
+            {
+                throw new ArgumentException("End of Line Characters are not valid");
+            }
+
+            if (token != null && token.Where(x => x != 0).ToArray().Length <= 0)
+            {
+                throw new ArgumentException("Token is not valid");
+            }
+
+            if (usePingPong && (pingBytes == null || pingBytes.Length <= 0 || Statics.ByteArrayEquals(pingBytes, Array.Empty<byte>())))
+            {
+                pingBytes = Encoding.UTF8.GetBytes("ping");
+            }
+
+            if (usePingPong && (pongBytes == null || pongBytes.Length <= 0 || Statics.ByteArrayEquals(pongBytes, Array.Empty<byte>())))
+            {
+                pongBytes = Encoding.UTF8.GetBytes("pong");
+            }
+
+            Host = host;
+            Port = port;
+            EndOfLineBytes = endOfLineBytes;
+            UsePingPong = usePingPong;
+            PingBytes = pingBytes;
+            PongBytes = pongBytes;
+            IsSSL = isSSL;
+            OnlyEmitBytes = onlyEmitBytes;
+            UseDisconnectBytes = useDisconnectBytes;
+            DisconnectBytes = disconnectBytes;
+            Token = token;
+
+            if (UseDisconnectBytes && (DisconnectBytes == null || Statics.ByteArrayEquals(DisconnectBytes, Array.Empty<byte>())))
+            {
+                DisconnectBytes = new byte[] { 3 };
+            }
+        }
+    }
+}
diff --git a/Tcp.NET.Client/TcpNETClient.cs b/Tcp.NET.Client/TcpNETClient.cs
@@ -1,12 +1,13 @@
-using Tcp.NET.Client.Events.Args;
+using PHS.Networking.Services;
+using Tcp.NET.Client.Events.Args;
 using Tcp.NET.Client.Handlers;
 using Tcp.NET.Client.Models;
 using Tcp.NET.Core.Models;
 
 namespace Tcp.NET.Client
 {
     public class TcpNETClient :
-        TcpNETClientBase<
+        CoreNetworkingClient<
             TcpConnectionClientEventArgs,
             TcpMessageClientEventArgs,
             TcpErrorClientEventArgs,
@@ -23,5 +24,13 @@ protected override TcpClientHandler CreateTcpClientHandler()
         {
             return new TcpClientHandler(_parameters);
         }
+
+        public bool IsRunning
+        {
+            get
+            {
+                return _handler.IsRunning;
+            }
+        }
     }
 }
diff --git a/Tcp.NET.Client/TcpNETClientBase.cs b/Tcp.NET.Client/TcpNETClientBase.cs
diff --git a/Tcp.NET.Core/Logo.ico b/Tcp.NET.Core/Logo.ico
diff --git a/Tcp.NET.Core/Logo.png b/Tcp.NET.Core/Logo.png
diff --git a/Tcp.NET.Core/Models/ConnectionTcp.cs b/Tcp.NET.Core/Models/ConnectionTcp.cs
@@ -1,4 +1,6 @@
 using PHS.Networking.Models;
+using System;
+using System.IO;
 using System.Net.Sockets;
 
 namespace Tcp.NET.Core.Models
@@ -7,5 +9,35 @@ public class ConnectionTcp : IConnection
     {
         public string ConnectionId { get; set; }
         public TcpClient TcpClient { get; set; }
+        public MemoryStream MemoryStream { get; set; }
+        public bool Disposed { get; set; }
+        public bool EndOfLine { get; set; }
+
+        public ConnectionTcp()
+        {
+            MemoryStream = new MemoryStream();
+        }
+
+        public virtual void Dispose()
+        {
+            try
+            {
+                TcpClient?.GetStream().Close();
+            }
+            catch { }
+
+            try
+            {
+                TcpClient?.Dispose();
+            }
+            catch { }
+
+            try
+            {
+                MemoryStream.Close();
+                MemoryStream.Dispose();
+            }
+            catch { }
+        }
     }
 }
diff --git a/Tcp.NET.Server/Events/Args/TcpAuthorizeBaseEventArgs.cs b/Tcp.NET.Server/Events/Args/TcpAuthorizeBaseEventArgs.cs
@@ -1,10 +1,13 @@
 using Tcp.NET.Server.Models;
+using PHS.Core.Events.Args;
 
 namespace Tcp.NET.Server.Events.Args
 {
-    public class TcpAuthorizeBaseEventArgs<Z, A> : AuthorizeBaseEventArgs<Z>
+    public class TcpAuthorizeBaseEventArgs<Z, A> : BaseArgs
         where Z : IdentityTcpServer<A>
     {
+        public Z Connection { get; set; }
+        public string Token { get; set; }
     }
 }