Created TelnetServerLibrary project and moved files into it.

DiskCrasher · DiskCrasher · commit 5f277768ac2f · 2021-02-15T19:30:10.000-08:00
Created interfaces.
diff --git a/TelnetServer.sln b/TelnetServer.sln
@@ -12,6 +12,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		TelnetServer\README.md = TelnetServer\README.md
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TelnetServerLibrary", "TelnetServerLibrary\TelnetServerLibrary.csproj", "{AA4894D1-2A50-4327-85E9-4737E3B782F6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -22,6 +24,10 @@ Global
 		{05317095-0AD5-4EB4-8967-42FA558E74D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{05317095-0AD5-4EB4-8967-42FA558E74D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{05317095-0AD5-4EB4-8967-42FA558E74D1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA4894D1-2A50-4327-85E9-4737E3B782F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA4894D1-2A50-4327-85E9-4737E3B782F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AA4894D1-2A50-4327-85E9-4737E3B782F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AA4894D1-2A50-4327-85E9-4737E3B782F6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/TelnetServer/Program.cs b/TelnetServer/Program.cs
@@ -1,12 +1,13 @@
 using System;
 using System.Net;
-
+using TelnetServerLibrary;
+using TelnetServerLibrary.Models;
 
 namespace TelnetServer
 {
     public class Program
     {
-        private static readonly Server s_server = new Server(IPAddress.Any);
+        private static readonly ITelnetServer s_server = new Server(IPAddress.Any);
 
         static void Main(string[] args)
         {
@@ -17,62 +18,72 @@ static void Main(string[] args)
 
             s_server.Start();
 
-            Console.WriteLine($"SERVER STARTED ON: {DateTime.Now} (IP {IPAddress.Any})");
+            Console.WriteLine($"SERVER STARTED AT: {DateTime.Now} (IP {IPAddress.Any})");
+            Console.WriteLine("Type 'Q' to quit or 'B' to broadcast a message.");
 
-            char read = Console.ReadKey(true).KeyChar;
+            ConsoleKey read = ConsoleKey.NoName;
 
             do
             {
-                if (read.Equals('b'))
+                if (read == ConsoleKey.B)
+                {
+                    Console.WriteLine("Enter broadcast message:");
                     s_server.SendMessageToAll(Console.ReadLine());
-            } while ((read = Console.ReadKey(true).KeyChar) != 'q');
+                }
+            } while ((read = Console.ReadKey(true).Key) != ConsoleKey.Q);
 
+            Console.WriteLine($"SERVER STOPPED AT {DateTime.Now}");
             s_server.Stop();
             s_server.Dispose();
         }
 
-        private static void ClientConnected(Client client)
+        private static void ClientConnected(object sender, IClientModel client)
         {
             Console.WriteLine("CONNECTED: " + client);
-            s_server.SendMessageToClient(client, $"Telnet Server{Environment.NewLine}Login: ");
+            s_server.SendMessageToClient(client, $"Telnet Server{Server.CRLF}Login: ");
         }
 
-        private static void ClientDisconnected(Client client) => Console.WriteLine("DISCONNECTED: " + client);
+        private static void ClientDisconnected(object sender, IClientModel client) => Console.WriteLine("DISCONNECTED: " + client);
 
-        private static void ConnectionBlocked(IPEndPoint? endPoint) =>
+        private static void ConnectionBlocked(object sender, IPEndPoint? endPoint) =>
             Console.WriteLine(string.Format($"BLOCKED: {endPoint?.Address}:{endPoint?.Port} at {DateTime.Now}"));
 
-        private static void MessageReceived(Client client, string message)
+        private static void MessageReceived(object sender, MessageReceivedEventArgs args)
         {
-            if (client.CurrentStatus != CLIENT_STATUS.LOGGED_IN)
+            if (args.ClientInstance.CurrentStatus != CLIENT_STATUS.LOGGED_IN)
             {
-                HandleLogin(client, message);
+                HandleLogin(args.ClientInstance, args.ReceivedData);
                 return;
             }
 
-            Console.WriteLine("MESSAGE: " + message);
+            Console.WriteLine("MESSAGE: " + args.ReceivedData);
 
-            if (message.Equals("kickmyass") || message.Equals("logout") || message.Equals("exit"))
-            {
-                s_server.SendMessageToClient(client, Environment.NewLine + Server.CURSOR);
-                s_server.KickClient(client);
-            }
-            else if (message.Equals("clear"))
+            switch (args.ReceivedData)
             {
-                s_server.ClearClientScreen(client);
-                s_server.SendMessageToClient(client, Server.CURSOR);
+                case "q":
+                case "quit":
+                case "lo":
+                case "logout":
+                case "exit":
+                    s_server.KickClient(args.ClientInstance);
+                    break;
+                case "clear":
+                    s_server.ClearClientScreen(args.ClientInstance);
+                    s_server.SendMessageToClient(args.ClientInstance, Server.CURSOR);
+                    break;
+                default:
+                    s_server.SendMessageToClient(args.ClientInstance, Server.CRLF + Server.CURSOR);
+                    break;
             }
-            else
-                s_server.SendMessageToClient(client, Environment.NewLine + Server.CURSOR);
         }
 
-        private static void HandleLogin(Client client, string message)
+        private static void HandleLogin(IClientModel client, string message)
         {
             if (client.CurrentStatus == CLIENT_STATUS.GUEST)
             {
                 if (message.Equals("root"))
                 {
-                    s_server.SendMessageToClient(client, Environment.NewLine + "Password: ");
+                    s_server.SendMessageToClient(client, Server.CRLF + "Password: ");
                     client.CurrentStatus = CLIENT_STATUS.AUTHENTICATING;
                 }
                 else
@@ -83,7 +94,8 @@ private static void HandleLogin(Client client, string message)
                 if (message.Equals("r00t"))
                 {
                     s_server.ClearClientScreen(client);
-                    s_server.SendMessageToClient(client, $"Successfully authenticated.{Environment.NewLine}{Server.CURSOR}");
+                    s_server.SendMessageToClient(client, $"Successfully authenticated. There are {s_server.ConnectionCount - 1} other users online.");
+                    s_server.SendMessageToClient(client, Server.CRLF + Server.CURSOR);
                     client.CurrentStatus = CLIENT_STATUS.LOGGED_IN;
                 }
                 else
diff --git a/TelnetServer/TelnetServer.csproj b/TelnetServer/TelnetServer.csproj
@@ -6,4 +6,8 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\TelnetServerLibrary\TelnetServerLibrary.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/TelnetServerLibrary/ITelnetServer.cs b/TelnetServerLibrary/ITelnetServer.cs
@@ -0,0 +1,34 @@
+﻿#nullable enable
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+using TelnetServerLibrary.Models;
+
+namespace TelnetServerLibrary
+{
+    public sealed class MessageReceivedEventArgs : EventArgs
+    {
+        public IClientModel ClientInstance { get; set; }
+        public string ReceivedData { get; set; }
+    }
+
+    public interface ITelnetServer : IDisposable
+    {
+        event EventHandler<IClientModel> ClientConnected;
+        event EventHandler<IClientModel> ClientDisconnected;
+        event EventHandler<IPEndPoint> ConnectionBlocked;
+        event EventHandler<MessageReceivedEventArgs> MessageReceived;
+
+        bool AcceptConnections { get; }
+        int ConnectionCount { get; }
+        void ClearClientScreen(IClientModel client);
+        void KickClient(IClientModel client);
+        void SendMessageToAll(string? message);
+        void SendMessageToClient(IClientModel client, string? message);
+        void Start();
+        void Stop();
+    }
+}
diff --git a/TelnetServerLibrary/Models/ClientModel.cs b/TelnetServerLibrary/Models/ClientModel.cs
@@ -1,49 +1,40 @@
+#nullable enable
 using System;
 using System.Net;
+using TelnetServerLibrary.Models;
 
 
-namespace TelnetServer
+namespace TelnetServerLibrary
 {
-    public enum CLIENT_STATUS
-    {
-        /// <summary>
-        /// Unauthenticated client.
-        /// </summary>
-        GUEST = 0,
-        /// <summary>
-        /// Client is authenticating.
-        /// </summary>
-        AUTHENTICATING = 1,
-        /// <summary>
-        /// Client is logged in.
-        /// </summary>
-        LOGGED_IN = 2
-    }
-
-    public class Client
+    internal sealed class ClientModel : IClientModel
     {
         #region Class fields
         /// <summary>
         /// Client's identifier.
         /// </summary>
-        internal uint ClientID { get; set; }
+        public uint ClientID { get; private set; }
 
         /// <summary>
         /// Connection datetime.
         /// </summary>
-        private readonly DateTime m_connectedAt;
+        internal DateTime ConnectTime { get; private set; }
+
+        /// <summary>
+        /// Last time client had activity.
+        /// </summary>
+        internal DateTime LastActivity { get; private set; }
         #endregion
 
         /// <summary>
-        /// Initialize a new instance of the <see cref="Client"/> class.
+        /// Initialize a new instance of the <see cref="ClientModel"/> class.
         /// </summary>
         /// <param name="clientId">The client's identifier.</param>
         /// <param name="remoteAddress">The remote address.</param>
-        public Client(uint clientId, IPEndPoint remoteAddress)
+        internal ClientModel(uint clientId, IPEndPoint remoteAddress)
         {
             ClientID = clientId;
             RemoteAddress = remoteAddress;
-            m_connectedAt = DateTime.Now;
+            ConnectTime = DateTime.Now;
             CurrentStatus = CLIENT_STATUS.GUEST;
             ReceivedData = string.Empty;
         }
@@ -58,28 +49,36 @@ public Client(uint clientId, IPEndPoint remoteAddress)
         /// Get or set the client's current status.
         /// </summary>
         /// <returns>The client's status.</returns>
-        public CLIENT_STATUS CurrentStatus { get; internal set; }
+        public CLIENT_STATUS CurrentStatus { get; set; }
 
         /// <summary>
         /// Get or set the client's last received data.
         /// </summary>
-        public string ReceivedData { get; internal set; } = string.Empty;
+        internal string ReceivedData { get; set; } = string.Empty;
 
         /// <summary>
         /// Append a string to the client's last received data.
         /// </summary>
         /// <param name="dataToAppend">The data to append.</param>
-        public void AppendReceivedData(string dataToAppend) => ReceivedData += dataToAppend;
+        internal void AppendReceivedData(string dataToAppend)
+        {
+            ReceivedData += dataToAppend;
+            LastActivity = DateTime.Now;
+        }
 
         /// <summary>
         /// Remove the last character from the client's last received data.
         /// </summary>
-        public void RemoveLastCharacterReceived() => ReceivedData = ReceivedData[0..^1];
+        internal void RemoveLastCharacterReceived()
+        {
+            ReceivedData = ReceivedData[0..^1];
+            LastActivity = DateTime.Now;
+        }
 
         public override string ToString()
         {
             string ip = string.Format($"{RemoteAddress.Address}:{RemoteAddress.Port}");
-            string res = string.Format($"Client #{ClientID} (From: {ip}, Status: {CurrentStatus}, Connected at: {m_connectedAt})");
+            string res = string.Format($"Client #{ClientID} (From: {ip}, Status: {CurrentStatus}, Connected at: {ConnectTime})");
             return res;
         }
     }
diff --git a/TelnetServerLibrary/Models/IClientModel.cs b/TelnetServerLibrary/Models/IClientModel.cs
@@ -0,0 +1,31 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Text;
+
+namespace TelnetServerLibrary.Models
+{
+    public enum CLIENT_STATUS
+    {
+        /// <summary>
+        /// Unauthenticated client.
+        /// </summary>
+        GUEST = 0,
+        /// <summary>
+        /// Client is authenticating.
+        /// </summary>
+        AUTHENTICATING = 1,
+        /// <summary>
+        /// Client is logged in.
+        /// </summary>
+        LOGGED_IN = 2
+    }
+
+    public interface IClientModel
+    {
+        uint ClientID { get; }
+        IPEndPoint RemoteAddress { get; }
+        CLIENT_STATUS CurrentStatus { get; set; }
+        string ToString();
+    }
+}
diff --git a/TelnetServerLibrary/Server.cs b/TelnetServerLibrary/Server.cs
diff --git a/TelnetServerLibrary/TelnetServerLibrary.csproj b/TelnetServerLibrary/TelnetServerLibrary.csproj
