From 5e54c6628c518368852cd8efcf04ad24463e5145 Mon Sep 17 00:00:00 2001 From: LiveOrDevTrying Date: Wed, 6 Mar 2024 11:58:20 -0800 Subject: [PATCH] Change params to interface to handle constructor of type bytes --- Tcp.NET.Client/Handlers/TcpClientHandler.cs | 4 ++-- Tcp.NET.Client/Handlers/TcpClientHandlerBase.cs | 2 +- Tcp.NET.Client/Models/ParamsTcpClientBytes.cs | 2 +- Tcp.NET.Client/TcpNETClient.cs | 4 ++-- Tcp.NET.Server/Handlers/TcpHandlerServer.cs | 6 +++--- Tcp.NET.Server/Handlers/TcpHandlerServerAuth.cs | 6 +++--- Tcp.NET.Server/Handlers/TcpHandlerServerAuthBase.cs | 2 +- Tcp.NET.Server/Handlers/TcpHandlerServerBase.cs | 2 +- Tcp.NET.Server/Models/IParamsTcpServerAuth.cs | 7 +++++++ Tcp.NET.Server/Models/ParamsTcpServerAuth.cs | 2 +- Tcp.NET.Server/Models/ParamsTcpServerAuthBytes.cs | 4 ++-- Tcp.NET.Server/TcpNETServer.cs | 6 +++--- Tcp.NET.Server/TcpNETServerAuth.cs | 6 +++--- Tcp.NET.Server/TcpNETServerAuthBase.cs | 2 +- Tcp.NET.Server/TcpNETServerBase.cs | 2 +- 15 files changed, 32 insertions(+), 25 deletions(-) create mode 100644 Tcp.NET.Server/Models/IParamsTcpServerAuth.cs diff --git a/Tcp.NET.Client/Handlers/TcpClientHandler.cs b/Tcp.NET.Client/Handlers/TcpClientHandler.cs index e4d4795..ca9d7b0 100644 --- a/Tcp.NET.Client/Handlers/TcpClientHandler.cs +++ b/Tcp.NET.Client/Handlers/TcpClientHandler.cs @@ -10,10 +10,10 @@ public class TcpClientHandler : TcpConnectionClientEventArgs, TcpMessageClientEventArgs, TcpErrorClientEventArgs, - ParamsTcpClient, + IParamsTcpClient, ConnectionTcp> { - public TcpClientHandler(ParamsTcpClient parameters) : base(parameters) + public TcpClientHandler(IParamsTcpClient parameters) : base(parameters) { } diff --git a/Tcp.NET.Client/Handlers/TcpClientHandlerBase.cs b/Tcp.NET.Client/Handlers/TcpClientHandlerBase.cs index 4e72ceb..7efcc83 100644 --- a/Tcp.NET.Client/Handlers/TcpClientHandlerBase.cs +++ b/Tcp.NET.Client/Handlers/TcpClientHandlerBase.cs @@ -20,7 +20,7 @@ public abstract class TcpClientHandlerBase : where T : TcpConnectionEventArgs where U : TcpMessageEventArgs where V : TcpErrorEventArgs - where W : ParamsTcpClient + where W : IParamsTcpClient where Y : ConnectionTcp { public TcpClientHandlerBase(W parameters) : base(parameters) diff --git a/Tcp.NET.Client/Models/ParamsTcpClientBytes.cs b/Tcp.NET.Client/Models/ParamsTcpClientBytes.cs index e670197..8ace0a1 100644 --- a/Tcp.NET.Client/Models/ParamsTcpClientBytes.cs +++ b/Tcp.NET.Client/Models/ParamsTcpClientBytes.cs @@ -19,7 +19,7 @@ public class ParamsTcpClientBytes : IParamsTcpClient 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) + public ParamsTcpClientBytes(string host, int port, byte[] endOfLineBytes, byte[] token = null, bool isSSL = true, bool onlyEmitBytes = false, bool usePingPong = true, byte[] pingBytes = null, byte[] pongBytes = null, bool useDisconnectBytes = true, byte[] disconnectBytes = null) { if (string.IsNullOrWhiteSpace(host)) { diff --git a/Tcp.NET.Client/TcpNETClient.cs b/Tcp.NET.Client/TcpNETClient.cs index d37546c..44bcec8 100644 --- a/Tcp.NET.Client/TcpNETClient.cs +++ b/Tcp.NET.Client/TcpNETClient.cs @@ -11,12 +11,12 @@ public class TcpNETClient : TcpConnectionClientEventArgs, TcpMessageClientEventArgs, TcpErrorClientEventArgs, - ParamsTcpClient, + IParamsTcpClient, TcpClientHandler, ConnectionTcp>, ITcpNETClient { - public TcpNETClient(ParamsTcpClient parameters) : base(parameters) + public TcpNETClient(IParamsTcpClient parameters) : base(parameters) { } diff --git a/Tcp.NET.Server/Handlers/TcpHandlerServer.cs b/Tcp.NET.Server/Handlers/TcpHandlerServer.cs index 48ab0b1..c7700b4 100644 --- a/Tcp.NET.Server/Handlers/TcpHandlerServer.cs +++ b/Tcp.NET.Server/Handlers/TcpHandlerServer.cs @@ -11,13 +11,13 @@ public class TcpHandlerServer : TcpConnectionServerEventArgs, TcpMessageServerEventArgs, TcpErrorServerEventArgs, - ParamsTcpServer, + IParamsTcpServer, ConnectionTcpServer> { - public TcpHandlerServer(ParamsTcpServer parameters) : base(parameters) + public TcpHandlerServer(IParamsTcpServer parameters) : base(parameters) { } - public TcpHandlerServer(ParamsTcpServer parameters, byte[] certificate, string certificatePassword) : base(parameters, certificate, certificatePassword) + public TcpHandlerServer(IParamsTcpServer parameters, byte[] certificate, string certificatePassword) : base(parameters, certificate, certificatePassword) { } diff --git a/Tcp.NET.Server/Handlers/TcpHandlerServerAuth.cs b/Tcp.NET.Server/Handlers/TcpHandlerServerAuth.cs index 21b774f..edb34db 100644 --- a/Tcp.NET.Server/Handlers/TcpHandlerServerAuth.cs +++ b/Tcp.NET.Server/Handlers/TcpHandlerServerAuth.cs @@ -13,15 +13,15 @@ public class TcpHandlerServerAuth : TcpConnectionServerAuthEventArgs, TcpMessageServerAuthEventArgs, TcpErrorServerAuthEventArgs, - ParamsTcpServerAuth, + IParamsTcpServerAuth, TcpAuthorizeEventArgs, IdentityTcpServer, T> { - public TcpHandlerServerAuth(ParamsTcpServerAuth parameters) : base(parameters) + public TcpHandlerServerAuth(IParamsTcpServerAuth parameters) : base(parameters) { } - public TcpHandlerServerAuth(ParamsTcpServerAuth parameters, byte[] certificate, string certificatePassword) : base(parameters, certificate, certificatePassword) + public TcpHandlerServerAuth(IParamsTcpServerAuth parameters, byte[] certificate, string certificatePassword) : base(parameters, certificate, certificatePassword) { } diff --git a/Tcp.NET.Server/Handlers/TcpHandlerServerAuthBase.cs b/Tcp.NET.Server/Handlers/TcpHandlerServerAuthBase.cs index 589c3e8..5728500 100644 --- a/Tcp.NET.Server/Handlers/TcpHandlerServerAuthBase.cs +++ b/Tcp.NET.Server/Handlers/TcpHandlerServerAuthBase.cs @@ -17,7 +17,7 @@ public abstract class TcpHandlerServerAuthBase : where T : TcpConnectionServerAuthBaseEventArgs where U : TcpMessageServerAuthBaseEventArgs where V : TcpErrorServerAuthBaseEventArgs - where W : ParamsTcpServerAuth + where W : IParamsTcpServerAuth where X : TcpAuthorizeBaseEventArgs where Z : IdentityTcpServer { diff --git a/Tcp.NET.Server/Handlers/TcpHandlerServerBase.cs b/Tcp.NET.Server/Handlers/TcpHandlerServerBase.cs index bc889f6..6fa47c5 100644 --- a/Tcp.NET.Server/Handlers/TcpHandlerServerBase.cs +++ b/Tcp.NET.Server/Handlers/TcpHandlerServerBase.cs @@ -23,7 +23,7 @@ public abstract class TcpHandlerServerBase : where T : TcpConnectionServerBaseEventArgs where U : TcpMessageServerBaseEventArgs where V : TcpErrorServerBaseEventArgs - where W : ParamsTcpServer + where W : IParamsTcpServer where Z : ConnectionTcpServer { protected TcpListener _server; diff --git a/Tcp.NET.Server/Models/IParamsTcpServerAuth.cs b/Tcp.NET.Server/Models/IParamsTcpServerAuth.cs new file mode 100644 index 0000000..d0dd4f8 --- /dev/null +++ b/Tcp.NET.Server/Models/IParamsTcpServerAuth.cs @@ -0,0 +1,7 @@ +namespace Tcp.NET.Server.Models +{ + public interface IParamsTcpServerAuth : IParamsTcpServer + { + string ConnectionUnauthorizedString { get; } + } +} \ No newline at end of file diff --git a/Tcp.NET.Server/Models/ParamsTcpServerAuth.cs b/Tcp.NET.Server/Models/ParamsTcpServerAuth.cs index 556b2e1..173ed19 100644 --- a/Tcp.NET.Server/Models/ParamsTcpServerAuth.cs +++ b/Tcp.NET.Server/Models/ParamsTcpServerAuth.cs @@ -2,7 +2,7 @@ namespace Tcp.NET.Server.Models { - public class ParamsTcpServerAuth : ParamsTcpServer + public class ParamsTcpServerAuth : ParamsTcpServer, IParamsTcpServerAuth { public string ConnectionUnauthorizedString { get; protected set; } diff --git a/Tcp.NET.Server/Models/ParamsTcpServerAuthBytes.cs b/Tcp.NET.Server/Models/ParamsTcpServerAuthBytes.cs index 9abb3ee..a3ecff0 100644 --- a/Tcp.NET.Server/Models/ParamsTcpServerAuthBytes.cs +++ b/Tcp.NET.Server/Models/ParamsTcpServerAuthBytes.cs @@ -2,7 +2,7 @@ namespace Tcp.NET.Server.Models { - public class ParamsTcpServerAuthBytes : ParamsTcpServerBytes + public class ParamsTcpServerAuthBytes : ParamsTcpServerBytes, IParamsTcpServerAuth { public string ConnectionUnauthorizedString { get; protected set; } @@ -10,7 +10,7 @@ public ParamsTcpServerAuthBytes(int port, byte[] endOfLineBytes, string connecti { if (onlyEmitBytes && !string.IsNullOrWhiteSpace(connectionUnauthorizedString)) { - throw new ArgumentException("onlyEmitBytes can not be true is a connectionUnauthorizedString is specified"); + throw new ArgumentException("onlyEmitBytes can not be true if a connectionUnauthorizedString is specified"); } ConnectionUnauthorizedString = connectionUnauthorizedString; diff --git a/Tcp.NET.Server/TcpNETServer.cs b/Tcp.NET.Server/TcpNETServer.cs index 78c27c5..0b9166b 100644 --- a/Tcp.NET.Server/TcpNETServer.cs +++ b/Tcp.NET.Server/TcpNETServer.cs @@ -10,17 +10,17 @@ public class TcpNETServer : TcpConnectionServerEventArgs, TcpMessageServerEventArgs, TcpErrorServerEventArgs, - ParamsTcpServer, + IParamsTcpServer, TcpHandlerServer, TcpConnectionManager, ConnectionTcpServer>, ITcpNETServer { - public TcpNETServer(ParamsTcpServer parameters) : base(parameters) + public TcpNETServer(IParamsTcpServer parameters) : base(parameters) { } - public TcpNETServer(ParamsTcpServer parameters, + public TcpNETServer(IParamsTcpServer parameters, byte[] certificate, string certificatePassword) : base(parameters, certificate, certificatePassword) { diff --git a/Tcp.NET.Server/TcpNETServerAuth.cs b/Tcp.NET.Server/TcpNETServerAuth.cs index 3b3cbff..97c52ff 100644 --- a/Tcp.NET.Server/TcpNETServerAuth.cs +++ b/Tcp.NET.Server/TcpNETServerAuth.cs @@ -13,7 +13,7 @@ public class TcpNETServerAuth : TcpConnectionServerAuthEventArgs, TcpMessageServerAuthEventArgs, TcpErrorServerAuthEventArgs, - ParamsTcpServerAuth, + IParamsTcpServerAuth, TcpHandlerServerAuth, TcpConnectionManagerAuth, IdentityTcpServer, @@ -21,11 +21,11 @@ public class TcpNETServerAuth : TcpAuthorizeEventArgs>, ITcpNETServerAuth { - public TcpNETServerAuth(ParamsTcpServerAuth parameters, + public TcpNETServerAuth(IParamsTcpServerAuth parameters, IUserService userService) : base(parameters, userService) { } - public TcpNETServerAuth(ParamsTcpServerAuth parameters, + public TcpNETServerAuth(IParamsTcpServerAuth parameters, IUserService userService, byte[] certificate, string certificatePassword) : base(parameters, userService, certificate, certificatePassword) diff --git a/Tcp.NET.Server/TcpNETServerAuthBase.cs b/Tcp.NET.Server/TcpNETServerAuthBase.cs index 7cbec6e..3e4da6a 100644 --- a/Tcp.NET.Server/TcpNETServerAuthBase.cs +++ b/Tcp.NET.Server/TcpNETServerAuthBase.cs @@ -15,7 +15,7 @@ public abstract class TcpNETServerAuthBase : where T : TcpConnectionServerAuthBaseEventArgs where U : TcpMessageServerAuthBaseEventArgs where V : TcpErrorServerAuthBaseEventArgs - where W : ParamsTcpServerAuth + where W : IParamsTcpServerAuth where X : TcpHandlerServerAuthBase where Y : ConnectionManagerAuth where Z : IdentityTcpServer diff --git a/Tcp.NET.Server/TcpNETServerBase.cs b/Tcp.NET.Server/TcpNETServerBase.cs index d8619a7..1617b6e 100644 --- a/Tcp.NET.Server/TcpNETServerBase.cs +++ b/Tcp.NET.Server/TcpNETServerBase.cs @@ -19,7 +19,7 @@ public abstract class TcpNETServerBase : where T : TcpConnectionServerBaseEventArgs where U : TcpMessageServerBaseEventArgs where V : TcpErrorServerBaseEventArgs - where W : ParamsTcpServer + where W : IParamsTcpServer where X : TcpHandlerServerBase where Y : ConnectionManager where Z : ConnectionTcpServer