feat: async?

Author: RobynLlama

src/SharpWebserver/Program.cs

@@ -43,7 +43,7 @@ You should have received a copy of the GNU General Public License
   
   """;
 
-  static void Main(string[] args)
+  static async Task Main(string[] args)
   {
 
     /*
@@ -65,8 +65,7 @@ static void Main(string[] args)
     Console.WriteLine(LICENSE);
 
     //Setup connected clients
-    List<ConnectedClient> clients = [];
-    List<ConnectedClient> reapedClients = [];
+    Dictionary<uint, ConnectedClient> clients = [];
 
     var ver = typeof(ListenServer).Assembly.GetName().Version;
 
@@ -123,15 +122,17 @@ static void Main(string[] args)
         ("Status", "Waiting for connections")
       ]);
 
-      static ConnectedClient? TryAcceptClient(TcpClient client)
+      void TryAcceptClientCallback(IAsyncResult ar)
       {
+        var client = listener.EndAcceptTcpClient(ar);
+
         if (client.Client.RemoteEndPoint is not EndPoint remote || remote.AddressFamily != AddressFamily.InterNetwork)
         {
           Logger.LogWarning("Refusing a client with bad or unsupported IP information");
           var response = Utilities.GenerateResponse(421u, "Misdirected Request", "<h1>Misdirected Request</h1><p>Unable to service your device's IP configuration</p>", "text/html", true);
           client.GetStream().Write(response, 0, response.Length);
           client.Close();
-          return null;
+          return;
         }
 
         if (!Utilities.SecurityPolicy.AllowClient(remote))
@@ -140,12 +141,15 @@ static void Main(string[] args)
           var response = Utilities.GenerateResponse(403u, "Client Forbidden", "<h1>Client Forbidden</h1><p>Access denied, your client details have been logged</p>", "text/html");
           client.GetStream().Write(response, 0, response.Length);
           client.Close();
-          return null;
+          return;
         }
 
-        return new(client, remote);
+        var newClient = new ConnectedClient(client, remote);
+        clients.TryAdd(newClient.ClientID, newClient);
       }
 
+      listener.BeginAcceptTcpClient(TryAcceptClientCallback, listener);
+
       #region Main Loop
 
       while (true)
@@ -156,36 +160,30 @@ static void Main(string[] args)
           break;
         }
 
-        //Check for pending requests
-        if (listener.Pending())
-        {
-          //Logger.LogTrace("Client connected");
-          if (TryAcceptClient(listener.AcceptTcpClient()) is ConnectedClient accepted)
-          {
-            clients.Add(accepted);
-          }
-        }
+        var ClientTasks = new List<Task>();
 
         //Handle all requests from all clients
-        foreach (var client in clients)
-        {
-          if (!client.CheckIn())
-          {
-            reapedClients.Add(client);
-          }
-        }
-
-        foreach (var client in reapedClients)
+        foreach (var client in clients.Values)
         {
-          Console.WriteLine($"Reaping a client: {client.ClientID}");
-          clients.Remove(client);
+          ClientTasks.Add(Task.Run(client.CheckIn).ContinueWith(ClientTaskEnded, client));
         }
 
-        reapedClients.Clear();
+        await Task.Delay(10);
       }
-
       #endregion
 
+      void ClientTaskEnded(Task<bool> task, object? state)
+      {
+        if (task.Result || state is not ConnectedClient client)
+          return;
+
+        Logger.LogInfo("Reaping a client", [
+          ("ClientID", client.ClientID)
+        ]);
+
+        clients.Remove(client.ClientID);
+      }
+
     }
     catch (SocketException ex)
     {
@@ -238,5 +236,4 @@ static void Main(string[] args)
   EndProgram:
     Logger.LogInfo("Goodbye!");
   }
-
 }