Merge branch 'develop'

Author: intoinside

RetroNet-BBS/Pages/Welcome.cs

@@ -0,0 +1,22 @@
+namespace RetroNet_BBS.Pages
+{
+    public class Pages
+    {
+        private const string Welcome = "<red>" +
+            "000  0000 0000 000   00  0  0 0000 0000\r" +
+            "0  0 0     0   0  0 0  0 00 0 0     0\r" +
+            "0  0 0     0   0  0 0  0 00 0 0     0\r" +
+            "000  000   0   000  0  0 0 00 000   0\r" +
+            "00   0     0   00   0  0 0 00 0     0\r" +
+            "0 0  0     0   0 0  0  0 0  0 0     0\r" +
+            "0  0 0000  0   0  0  00  0  0 0000  0\r\r\r" +
+            "<yellow>Welcome to RetroNET!\r\r" +
+            "<green>Current date is: {0}\r" +
+            "Online users: {1}\r";
+
+        public static string ShowWelcome(int onlineUsers)
+        {
+            return string.Format(Welcome, DateTime.Now.ToString(), onlineUsers);
+        }
+    }
+}

RetroNet-BBS/Server/Server.cs

@@ -2,57 +2,95 @@
 using System.Net;
 using System.Text;
 using RetroNet_BBS.Encoders;
+using RetroNet_BBS.Pages;
 
 namespace RetroNet_BBS.Server
 {
     public class Server
     {
-        private TcpListener Listener;
+        private TcpListener listener;
         private readonly string IpAddress;
         private readonly int Port;
 
+        private int clientConnectedCount;
+
         public Server(string host)
         {
             IpAddress = "192.168.1.2";
             Port = 8502;
         }
 
+        /// <summary>
+        /// Creates a new server instance and starts listening for incoming connections.
+        /// </summary>
+        /// <returns></returns>
+        /// <exception cref="InvalidOperationException"></exception>
         public async Task Start()
         {
-            // Abort operation if server is already running
-            if (Listener != null)
+            if (listener != null)
             {
                 throw new InvalidOperationException("Server is already running!");
             }
 
             IPAddress localAddr = IPAddress.Parse(IpAddress);
-            Listener = new TcpListener(localAddr, Port);
-            Listener.Start();
+            listener = new TcpListener(localAddr, Port);
+            listener.Start();
+
+            clientConnectedCount = 0;
 
             OnMessageReceived("Server started. Waiting for a connection...");
 
             while (true)
             {
-                // Handle new client connection
-                TcpClient client = await Listener.AcceptTcpClientAsync();
-                OnMessageReceived($"Connected! Client IP: {client.Client.RemoteEndPoint}");
-                _ = HandleClientAsync(client);
+                try
+                {
+                    while (true)
+                    {
+                        Accept(await listener.AcceptTcpClientAsync());
+                    }
+                }
+                finally
+                {
+                    listener.Stop();
+                }
             }
         }
 
+        /// <summary>
+        /// Accepts a new client connection and starts a new task to handle the client.
+        /// </summary>
+        /// <param name="client"></param>
+        /// <returns></returns>
+        private async Task Accept(TcpClient client)
+        {
+            clientConnectedCount++;
+
+            await Task.Yield();
+            await HandleClientAsync(client);
+        }
+
         public void Stop()
         {
-            Listener?.Stop();
-            Listener = null;
+            listener.Stop();
+            listener = null;
         }
 
+        /// <summary>
+        /// Handle a single connection
+        /// </summary>
+        /// <param name="client">Client handled</param>
+        /// <returns>Task</returns>
         private async Task HandleClientAsync(TcpClient client)
         {
             NetworkStream stream = client.GetStream();
 
             byte[] buffer = new byte[1024];
             StringBuilder messageBuilder = new StringBuilder();
 
+            byte[] response = new Petscii(Pages.Pages.ShowWelcome(clientConnectedCount)).FromAscii();
+
+            await stream.WriteAsync(response, 0, response.Length);
+
             // Receive data in a loop until the client disconnects
             while (true)
             {
@@ -61,6 +99,8 @@ private async Task HandleClientAsync(TcpClient client)
                 if (bytesRead == 0)
                 {
                     OnMessageReceived($"Client {client.Client.RemoteEndPoint} disconnected.");
+
+                    clientConnectedCount--;
                     break; // Client disconnected
                 }
 
@@ -74,12 +114,6 @@ private async Task HandleClientAsync(TcpClient client)
                     // Raise the MessageReceived event
                     OnMessageReceived($"{client.Client.RemoteEndPoint}: {receivedMessage}");
 
-                    var encoder = new Petscii("<yellow>Hello <red><revon>world!<revoff>");
-
-                    byte[] response = encoder.FromAscii();
-
-                    await stream.WriteAsync(response, 0, response.Length);
-
                     messageBuilder.Clear();
                 }
             }