Lab7

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "nuget"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/sonarcloud.yml

@@ -37,6 +37,8 @@ on:
 
 permissions:
   pull-requests: read # allows SonarCloud to decorate PRs with analysis results
+  contents: read
+
 
 jobs:
   sonar-check:
@@ -56,8 +58,8 @@ jobs:
           dotnet tool install --global dotnet-sonarscanner
           echo "$env:USERPROFILE\.dotnet\tools" >> $env:GITHUB_PATH
           dotnet sonarscanner begin `
-          /k:"ppanchen_NetSdrClient" `
-          /o:"ppanchen" `
+          /k:"slavik22_ReengineeringCourse" `
+          /o:"slavik22" `
           /d:sonar.token="${{ secrets.SONAR_TOKEN }}" `
           /d:sonar.cs.opencover.reportsPaths="**/coverage.xml" `
           /d:sonar.cpd.cs.minimumTokens=40 `
@@ -70,13 +72,13 @@ jobs:
         run: dotnet restore NetSdrClient.sln
       - name: Build
         run: dotnet build NetSdrClient.sln -c Release --no-restore
-      #- name: Tests with coverage (OpenCover)
-      #  run: |
-      #    dotnet test NetSdrClientAppTests/NetSdrClientAppTests.csproj -c Release --no-build `
-      #      /p:CollectCoverage=true `
-      #      /p:CoverletOutput=TestResults/coverage.xml `
-      #      /p:CoverletOutputFormat=opencover
-      #  shell: pwsh
+      - name: Tests with coverage (OpenCover)
+        run: |
+          dotnet test NetSdrClientAppTests/NetSdrClientAppTests.csproj -c Release --no-build `
+            /p:CollectCoverage=true `
+            /p:CoverletOutput=TestResults/coverage.xml `
+            /p:CoverletOutputFormat=opencover
+        shell: pwsh
       # 3) END: SonarScanner
       - name: SonarScanner End
         run: dotnet sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"

EchoTcpServer/EchoServer.cs

@@ -0,0 +1,71 @@
+using EchoTcpServer.Networking;
+
+namespace EchoTcpServer;
+
+public class EchoServer
+{
+    private readonly ITcpListener _listener;
+    private readonly Action<string> _log;
+    private CancellationTokenSource _cts = new();
+
+    public EchoServer(ITcpListener listener, Action<string>? log = null)
+    {
+        _listener = listener;
+        _log = log ?? Console.WriteLine;
+    }
+
+    public async Task StartAsync()
+    {
+        _listener.Start();
+        _log("Server started.");
+
+        while (!_cts.Token.IsCancellationRequested)
+        {
+            try
+            {
+                var stream = await _listener.AcceptClientStreamAsync();
+                _log("Client connected.");
+                _ = Task.Run(() => HandleClientAsync(stream, _cts.Token));
+            }
+            catch (ObjectDisposedException)
+            {
+                break;
+            }
+        }
+
+        _log("Server shutdown.");
+    }
+
+    public async Task HandleClientAsync(Stream stream, CancellationToken token)
+    {
+        using (stream)
+        {
+            try
+            {
+                byte[] buffer = new byte[8192];
+                int bytesRead;
+
+                while (!token.IsCancellationRequested
+                    && (bytesRead = await stream.ReadAsync(buffer, 0, buffer.Length, token)) > 0)
+                {
+                    await stream.WriteAsync(buffer, 0, bytesRead, token);
+                    _log($"Echoed {bytesRead} bytes.");
+                }
+            }
+            catch (Exception ex) when (ex is not OperationCanceledException)
+            {
+                _log($"Error: {ex.Message}");
+            }
+        }
+
+        _log("Client disconnected.");
+    }
+
+    public void Stop()
+    {
+        _cts.Cancel();
+        _listener.Stop();
+        _cts.Dispose();
+        _log("Server stopped.");
+    }
+}

EchoTcpServer/EchoServer.csproj

@@ -5,6 +5,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <RootNamespace>EchoTcpServer</RootNamespace>
   </PropertyGroup>
 
 </Project>

EchoTcpServer/Networking/ITcpListener.cs

@@ -0,0 +1,8 @@
+namespace EchoTcpServer.Networking;
+
+public interface ITcpListener
+{
+    void Start();
+    void Stop();
+    Task<Stream> AcceptClientStreamAsync();
+}

EchoTcpServer/Networking/TcpListenerWrapper.cs

@@ -0,0 +1,23 @@
+using System.Net;
+using System.Net.Sockets;
+
+namespace EchoTcpServer.Networking;
+
+public class TcpListenerWrapper : ITcpListener
+{
+    private readonly TcpListener _listener;
+
+    public TcpListenerWrapper(int port)
+    {
+        _listener = new TcpListener(IPAddress.Any, port);
+    }
+
+    public void Start() => _listener.Start();
+    public void Stop() => _listener.Stop();
+
+    public async Task<Stream> AcceptClientStreamAsync()
+    {
+        var client = await _listener.AcceptTcpClientAsync();
+        return client.GetStream();
+    }
+}

EchoTcpServer/Program.cs

@@ -1,173 +1,16 @@
-using System;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
+using EchoTcpServer;
+using EchoTcpServer.Networking;
 
-/// <summary>
-/// This program was designed for test purposes only
-/// Not for a review
-/// </summary>
-public class EchoServer
-{
-    private readonly int _port;
-    private TcpListener _listener;
-    private CancellationTokenSource _cancellationTokenSource;
+var server = new EchoServer(new TcpListenerWrapper(5000));
+_ = Task.Run(() => server.StartAsync());
 
+using var sender = new UdpTimedSender("127.0.0.1", 60000);
+Console.WriteLine("Press any key to stop sending...");
+sender.StartSending(5000);
 
-    public EchoServer(int port)
-    {
-        _port = port;
-        _cancellationTokenSource = new CancellationTokenSource();
-    }
+Console.WriteLine("Press 'q' to quit...");
+while (Console.ReadKey(intercept: true).Key != ConsoleKey.Q) { }
 
-    public async Task StartAsync()
-    {
-        _listener = new TcpListener(IPAddress.Any, _port);
-        _listener.Start();
-        Console.WriteLine($"Server started on port {_port}.");
-
-        while (!_cancellationTokenSource.Token.IsCancellationRequested)
-        {
-            try
-            {
-                TcpClient client = await _listener.AcceptTcpClientAsync();
-                Console.WriteLine("Client connected.");
-
-                _ = Task.Run(() => HandleClientAsync(client, _cancellationTokenSource.Token));
-            }
-            catch (ObjectDisposedException)
-            {
-                // Listener has been closed
-                break;
-            }
-        }
-
-        Console.WriteLine("Server shutdown.");
-    }
-
-    private async Task HandleClientAsync(TcpClient client, CancellationToken token)
-    {
-        using (NetworkStream stream = client.GetStream())
-        {
-            try
-            {
-                byte[] buffer = new byte[8192];
-                int bytesRead;
-
-                while (!token.IsCancellationRequested && (bytesRead = await stream.ReadAsync(buffer, 0, buffer.Length, token)) > 0)
-                {
-                    // Echo back the received message
-                    await stream.WriteAsync(buffer, 0, bytesRead, token);
-                    Console.WriteLine($"Echoed {bytesRead} bytes to the client.");
-                }
-            }
-            catch (Exception ex) when (!(ex is OperationCanceledException))
-            {
-                Console.WriteLine($"Error: {ex.Message}");
-            }
-            finally
-            {
-                client.Close();
-                Console.WriteLine("Client disconnected.");
-            }
-        }
-    }
-
-    public void Stop()
-    {
-        _cancellationTokenSource.Cancel();
-        _listener.Stop();
-        _cancellationTokenSource.Dispose();
-        Console.WriteLine("Server stopped.");
-    }
-
-    public static async Task Main(string[] args)
-    {
-        EchoServer server = new EchoServer(5000);
-
-        // Start the server in a separate task
-        _ = Task.Run(() => server.StartAsync());
-
-        string host = "127.0.0.1"; // Target IP
-        int port = 60000;          // Target Port
-        int intervalMilliseconds = 5000; // Send every 3 seconds
-
-        using (var sender = new UdpTimedSender(host, port))
-        {
-            Console.WriteLine("Press any key to stop sending...");
-            sender.StartSending(intervalMilliseconds);
-
-            Console.WriteLine("Press 'q' to quit...");
-            while (Console.ReadKey(intercept: true).Key != ConsoleKey.Q)
-            {
-                // Just wait until 'q' is pressed
-            }
-
-            sender.StopSending();
-            server.Stop();
-            Console.WriteLine("Sender stopped.");
-        }
-    }
-}
-
-
-public class UdpTimedSender : IDisposable
-{
-    private readonly string _host;
-    private readonly int _port;
-    private readonly UdpClient _udpClient;
-    private Timer _timer;
-
-    public UdpTimedSender(string host, int port)
-    {
-        _host = host;
-        _port = port;
-        _udpClient = new UdpClient();
-    }
-
-    public void StartSending(int intervalMilliseconds)
-    {
-        if (_timer != null)
-            throw new InvalidOperationException("Sender is already running.");
-
-        _timer = new Timer(SendMessageCallback, null, 0, intervalMilliseconds);
-    }
-
-    ushort i = 0;
-
-    private void SendMessageCallback(object state)
-    {
-        try
-        {
-            //dummy data
-            Random rnd = new Random();
-            byte[] samples = new byte[1024];
-            rnd.NextBytes(samples);
-            i++;
-
-            byte[] msg = (new byte[] { 0x04, 0x84 }).Concat(BitConverter.GetBytes(i)).Concat(samples).ToArray();
-            var endpoint = new IPEndPoint(IPAddress.Parse(_host), _port);
-
-            _udpClient.Send(msg, msg.Length, endpoint);
-            Console.WriteLine($"Message sent to {_host}:{_port} ");
-        }
-        catch (Exception ex)
-        {
-            Console.WriteLine($"Error sending message: {ex.Message}");
-        }
-    }
-
-    public void StopSending()
-    {
-        _timer?.Dispose();
-        _timer = null;
-    }
-
-    public void Dispose()
-    {
-        StopSending();
-        _udpClient.Dispose();
-    }
-}
+sender.StopSending();
+server.Stop();
+Console.WriteLine("Sender stopped.");