Revize 6dab0250

re #9566 Moved magic values into the configuration file.

ld_client/LDClient/Program.cs

@@ -10 +10 @@
 
 internal static class Program {
 
+    private const int MainLoopDelayMs = 30000; 
+
     public static ConfigLoader Config { get; } = new();
     public static ALogger DefaultLogger { get; } = ALogger.Current;
     private static IApiClient? DefaultApiClient { get; set; }
     
     private static readonly InfoFetcher InfoFetcher = new(
-        5,
-        1000,
-        "output.txt"
+        Config.FetchInfoMaxAttempts,
+        Config.FetchInfoAttemptPeriod,
+        Config.T32InfoLocation,
+        Config.F32RemExecutable,
+        Config.F32RemArguments
     );
     
     public static int Main() {
-        var exists = GetProcessesByName(Path.GetFileNameWithoutExtension(GetEntryAssembly()?.Location)).Length > 1;
-        if (exists) {
+        if (GetProcessesByName(Path.GetFileNameWithoutExtension(GetEntryAssembly()?.Location)).Length > 1) {
             DefaultLogger.Error("Another instance of the application is already running");
             return 1;
         }
@@ -43 +46 @@
             DefaultApiClient
         );
         
-        DefaultLogger.Debug("Main -> starting the ApiClient");
         var apiClientThread = new Thread(DefaultApiClient.Run) {
             IsBackground = true
         };
@@ -55 +57 @@
         processThread.Start();
 
         while (true) {
-            Thread.Sleep(10 * 1000);
+            Thread.Sleep(MainLoopDelayMs);
         }
+        
         return 0;
     }
 }

ld_client/LDClient/appsettings.json

@@ -26 +26 @@
     "CacheFileName": "cache"
   },
   "DebuggerDetection": {
+    "F32RemExecutable": "/home/silhavyj/School/KIV-ASWI/aswi2022bug-thugs/ld_client/Mock/t32rem/build/t32rem_mock",
+    "F32RemArguments": "localhost port=20000 VERSION.HARDWARE",
     "T32ProcessName": "ld_mock",
-    "T32InfoLocation": "C:\\app\\tools\\T32\\results\\ldResult.txt",
-    "DetectionPeriod": 5000
+    "T32InfoLocation": "ldResult.txt",
+    "DetectionPeriod": 5000,
+    "FetchInfoMaxAttempts": 5,
+    "FetchInfoAttemptPeriod": 1000
   }
 }

ld_client/LDClient/detection/InfoFetcher.cs

@@ -4 +4 @@
 namespace LDClient.detection {
 
     public class InfoFetcher {
-
-        private const string F32RemExecutable = "/home/silhavyj/School/KIV-ASWI/aswi2022bug-thugs/ld_client/Mock/t32rem/build/t32rem_mock";
-        private const string F32RemArguments = "localhost port=20000 VERSION.HARDWARE";
+        
         private const string UndefinedSerialNumber = "number";
 
-        private readonly int _maxAttempts;
-        private readonly int _waitPeriodMs;
+        private readonly string _f32RemExecutable;
+        private readonly string _f32RemArguments;
+        
+        private readonly uint _maxAttempts;
+        private readonly uint _waitPeriodMs;
         private readonly string _infoFilePath;
 
         public string HeadSerialNumber { get; private set; } = UndefinedSerialNumber;
         public string BodySerialNumber { get; private set; } = UndefinedSerialNumber;
 
-        public InfoFetcher(int maxAttempts, int waitPeriodMs, string infoFilePath) {
+        public InfoFetcher(uint maxAttempts, uint waitPeriodMs, string infoFilePath, string f32RemExecutable, string f32RemArguments) {
             _maxAttempts = maxAttempts;
             _waitPeriodMs = waitPeriodMs;
             _infoFilePath = infoFilePath;
+            _f32RemExecutable = f32RemExecutable;
+            _f32RemArguments = f32RemArguments;
         }
 
         public async Task<bool> FetchDataAsync() {
             Program.DefaultLogger.Info("Fetching data from the debugger.");
-            var success = await SendRetrieveInfoCommandAsync(F32RemExecutable, F32RemArguments);
+            var success = await SendRetrieveInfoCommandAsync(_f32RemExecutable, _f32RemArguments);
             if (!success) {
                 Program.DefaultLogger.Error("Failed to fetch data from the debugger.");
                 return false;
@@ -35 +38 @@
                     Program.DefaultLogger.Info($"Info file has been parsed successfully.");
                     return true;
                 }
-                await Task.Delay(_waitPeriodMs);
+                await Task.Delay((int)_waitPeriodMs);
             }
             Program.DefaultLogger.Error("Failed to parse the into file. It may have not been created.");
             return false;

ld_client/LDClient/detection/ProcessProcessDetection.cs

@@ -1 +1 @@
 using System.Diagnostics;
+using System.Text.Json;
 using LDClient.network;
 using LDClient.network.data;
 
@@ -7 +8 @@
 	 public class ProcessProcessDetection : IProcessDetection {
         
         private const string DatetimeFormat = "yyyy-MM-dd hh:mm:ss";
-        
+
         private readonly string _processName;
         private readonly uint _detectionPeriodMs;
         private bool _processIsActive;
         private bool _failedToRetrieveData;
-        private Payload? _lastlyConnected;
+        private Payload? _lastConnectedPayload;
 
         private readonly InfoFetcher _infoFetcher;
         private readonly IApiClient _apiClient;
@@ -28 +29 @@
         private async Task<bool> RetrieveDataFromDebugger() {
             var success = await _infoFetcher.FetchDataAsync();
             if (success) {
-                _lastlyConnected = await SendDataToServerAsync(_infoFetcher.HeadSerialNumber, _infoFetcher.BodySerialNumber, DatetimeFormat);
+                _lastConnectedPayload = await SendDataToServerAsync(_infoFetcher.HeadSerialNumber, _infoFetcher.BodySerialNumber, DatetimeFormat);
             }
             return success;
         }
-
+        
         private async Task DebuggerDisconnected() {
-            if (_lastlyConnected is not null) {
-                _lastlyConnected.Status = ConnectionStatus.Disconnected;
-                _lastlyConnected.TimeStamp = DateTime.Now.ToString(DatetimeFormat);
-                await _apiClient.SendPayloadAsync(_lastlyConnected);
-                _lastlyConnected = null;
+            if (_lastConnectedPayload is not null) {
+                _lastConnectedPayload.Status = ConnectionStatus.Disconnected;
+                _lastConnectedPayload.TimeStamp = DateTime.Now.ToString(DatetimeFormat);
+                await _apiClient.SendPayloadAsync(_lastConnectedPayload);
+                _lastConnectedPayload = null;
             }
         }
 

ld_client/LDClient/utils/ConfigLoader.cs

@@ -1 @@
-using LDClient.utils.loggers;
+using System.Runtime.InteropServices;
+using LDClient.utils.loggers;
 using Microsoft.Extensions.Configuration;
 
 namespace LDClient.utils {
@@ -15 +16 @@
         public int LogChunkSize { get; private set; }
         public int LogChunkMaxCount { get; private set; }
         public int LogArchiveMaxCount { get; private set; }
-
         public int LogCleanupPeriod { get; private set; }
         public LogVerbosity LogVerbosityType { get; private set; } = LogVerbosity.Full;
         public LogFlow LogFlowType { get; private set; } = LogFlow.Console;
@@ -43 +43 @@
         public string T32ProcessName { get; private set; }
         public uint DetectionPeriod { get; private set; }
         public string T32InfoLocation { get; private set; }
+        public string F32RemExecutable { get; private set; }
+        public string F32RemArguments { get; private set; }
+        public uint FetchInfoMaxAttempts { get; private set;  }
+        public uint FetchInfoAttemptPeriod { get; private set; }
+        
         #endregion
 
         public ConfigLoader() {
@@ -68 +73 @@
                 ApiBaseAddress = network["ApiBaseAddress"];
                 ApiUsbEndPoint = network["ApiLDEndPoint"];
                 ApiPort = uint.Parse(network["ApiPort"]);
-
-
+                
                 var cache = configuration.GetSection(CacheSection);
                 RetryPeriod = uint.Parse(cache["RetryPeriod"]);
                 MaxEntries = uint.Parse(cache["MaxEntries"]);
                 MaxRetries = uint.Parse(cache["MaxRetries"]);
                 CacheFileName = cache["CacheFileName"];
-
-
+                
                 var debugger = configuration.GetSection(DdSection);
                 T32ProcessName = debugger["T32ProcessName"];
                 T32InfoLocation = debugger["T32InfoLocation"];
                 DetectionPeriod = uint.Parse(debugger["DetectionPeriod"]);
+                F32RemExecutable = debugger["F32RemExecutable"];
+                F32RemArguments = debugger["F32RemArguments"];
+                FetchInfoMaxAttempts = uint.Parse(debugger["FetchInfoMaxAttempts"]);
+                FetchInfoAttemptPeriod = uint.Parse(debugger["FetchInfoAttemptPeriod"]);
 
                 Console.WriteLine("Configuration successfully loaded!");
             } catch (FormatException e) {

ld_client/Mock/t32rem/t32rem_mock.cpp

@@ -7 +7 @@
 #include <cstring>
 
 static constexpr int EXPECTED_NUMBER_OF_ARGUMENTS = 4;
-static constexpr const char *OUTPUT_FILE_NAME = "output.txt";
+static constexpr const char *OUTPUT_FILE_NAME = "ldResult.txt";
 static constexpr const char *DEBUGGER_INFO =
         "B::version.hardware\n"
         "PowerDebug USB 3.0 via USB 3.0\n"