LAB1

.github/workflows/sonarcloud.yml

@@ -56,8 +56,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:"Starenkiyy_NetSdrClient" `
+          /o:"starenkiyy" `
           /d:sonar.token="${{ secrets.SONAR_TOKEN }}" `
           /d:sonar.cs.opencover.reportsPaths="**/coverage.xml" `
           /d:sonar.cpd.cs.minimumTokens=40 `
@@ -70,13 +70,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/Program.cs

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

NetSdrClientApp/NetSdrClient.cs

@@ -1,21 +1,21 @@
 using NetSdrClientApp.Messages;
 using NetSdrClientApp.Networking;
 using System;
-using System.Collections.Generic;
+//using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Channels;
+//using System.Text;
+//using System.Threading;
+//using System.Threading.Channels;
 using System.Threading.Tasks;
 using static NetSdrClientApp.Messages.NetSdrMessageHelper;
-using static System.Runtime.InteropServices.JavaScript.JSType;
+//using static System.Runtime.InteropServices.JavaScript.JSType;
 
 namespace NetSdrClientApp
 {
     public class NetSdrClient
     {
-        private ITcpClient _tcpClient;
-        private IUdpClient _udpClient;
+        private readonly ITcpClient _tcpClient;
+        private readonly IUdpClient _udpClient;
 
         public bool IQStarted { get; set; }
 
@@ -131,9 +131,9 @@ private void _udpClient_MessageReceived(object? sender, byte[] e)
             }
         }
 
-        private TaskCompletionSource<byte[]> responseTaskSource;
+        private TaskCompletionSource<byte[]>? responseTaskSource;
 
-        private async Task<byte[]> SendTcpRequest(byte[] msg)
+        private async Task<byte[]?> SendTcpRequest(byte[] msg)
         {
             if (!_tcpClient.Connected)
             {

NetSdrClientApp/Networking/IUdpClient.cs

@@ -1,10 +1,17 @@
-
-public interface IUdpClient
+using System;
+using System.Threading.Tasks;
+
+
+namespace NetSdrClientApp.Networking
 {
-    event EventHandler<byte[]>? MessageReceived;
+    public interface IUdpClient
+    {
+        event EventHandler<byte[]>? MessageReceived;
 
-    Task StartListeningAsync();
+        Task StartListeningAsync();
 
-    void StopListening();
-    void Exit();
+        void StopListening();
+
+        void Exit();
+    }
 }