scmall cleanup

Author: LoneWandererProductions

Communication/FileTransfer.cs

@@ -16,6 +16,9 @@
 
 namespace Communication
 {
+    /// <summary>
+    /// Helper class for file transfers, including downloading files from URLs and saving them to disk.
+    /// </summary>
     internal static class FileTransfer
     {
         /// <summary>

Communication/Listener.cs

@@ -11,6 +11,7 @@
 using System.Net.Sockets;
 using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
 
 namespace Communication
 {
@@ -48,32 +49,36 @@ public Listener(int port)
         ///     Starts the listening.
         /// </summary>
         /// <param name="cancellationToken">The cancellation token.</param>
-        public void StartListening(CancellationToken cancellationToken)
+        public async Task StartListeningAsync(CancellationToken cancellationToken)
         {
             _isRunning = true;
             _tcpListener.Start();
             Console.WriteLine(ComResource.MessageListening, _port);
-            while (_isRunning)
+
+            try
             {
-                if (cancellationToken.IsCancellationRequested)
+                // We use the CancellationToken to stop the loop gracefully
+                while (!cancellationToken.IsCancellationRequested && _isRunning)
                 {
-                    StopListening();
-                    return;
-                }
+                    // This blocks asynchronously: 0% CPU usage while waiting
+                    using var client = await _tcpListener.AcceptTcpClientAsync(cancellationToken);
 
-                try
-                {
-                    if (_tcpListener.Pending()) // Non-blocking accept
-                    {
-                        var client = _tcpListener.AcceptTcpClient();
-                        ThreadPool.QueueUserWorkItem(HandleClient, client);
-                    }
-                }
-                catch (Exception ex)
-                {
-                    Console.WriteLine(ComResource.ErrorAcceptingCommunication, ex.Message);
+                    // Fire and forget the handler so we can accept the next client immediately
+                    _ = HandleClientAsync(client);
                 }
             }
+            catch (OperationCanceledException)
+            {
+                // Normal exit when token is cancelled
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine(ComResource.ErrorAcceptingCommunication, ex.Message);
+            }
+            finally
+            {
+                StopListening();
+            }
         }
 
         /// <summary>
@@ -90,17 +95,26 @@ public void StopListening()
         ///     Handles the client.
         /// </summary>
         /// <param name="obj">The object.</param>
-        private static void HandleClient(object obj)
+        private static async Task HandleClientAsync(TcpClient client)
         {
-            var client = (TcpClient)obj;
-            var stream = client.GetStream();
-            // Respond with a simple message (acting as the "ping response")
-            const string response = ComResource.AnswerMessage;
-            var buffer = Encoding.ASCII.GetBytes(response);
-            stream.Write(buffer, 0, buffer.Length);
-            // Close the connection
-            client.Close();
-            Console.WriteLine(ComResource.MessageAnswer);
+            try
+            {
+                using (client) // Ensures the client is closed
+                using (var stream = client.GetStream()) // Ensures the stream is closed
+                {
+                    byte[] buffer = Encoding.ASCII.GetBytes(ComResource.AnswerMessage);
+
+                    // Use Async write
+                    await stream.WriteAsync(buffer, 0, buffer.Length);
+                    await stream.FlushAsync();
+
+                    Console.WriteLine(ComResource.MessageAnswer);
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine("Error handling client: " + ex.Message);
+            }
         }
     }
 }

CommunicationTests/Communication.cs

@@ -30,12 +30,19 @@ public class Communication
         public async Task CommunicationsAsync()
         {
             var communication = new NetCom();
-            _ = await communication.SaveFile(_path, "https://www.google.de/");
-            var path = Path.Combine(Directory.GetCurrentDirectory(), nameof(Communication), "www.google.de");
+            // Use a URL that actually ends in a filename
+            string url = "https://www.google.de/favicon.ico";
+            string targetFolder = Path.Combine(Directory.GetCurrentDirectory(), "TestDownloads");
 
-            Assert.IsTrue(File.Exists(path), "File not found");
+            bool success = await communication.SaveFile(targetFolder, url);
 
-            File.Delete(path);
+            // The helper logic will extract "favicon.ico"
+            var expectedPath = Path.Combine(targetFolder, "favicon.ico");
+
+            Assert.IsTrue(success, "Download failed");
+            Assert.IsTrue(File.Exists(expectedPath), $"File not found at {expectedPath}");
+
+            if (File.Exists(expectedPath)) File.Delete(expectedPath);
         }
 
         /// <summary>
@@ -50,7 +57,7 @@ public async Task ListenerShouldRespondWithPongWhenPinged()
             var cancellationTokenSource = new CancellationTokenSource();
 
             // Start the listener in a separate task to simulate real-world usage
-            var listenerTask = Task.Run(() => listener.StartListening(cancellationTokenSource.Token),
+            var listenerTask = Task.Run(() => listener.StartListeningAsync(cancellationTokenSource.Token),
                 cancellationTokenSource.Token);
 
             // Wait for a brief moment to ensure the server is up and listening