change retry strategy

Author: dj-nitehawk

src/Client/InverterMon.Client.csproj

@@ -14,9 +14,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="AntDesign.Charts" Version="0.3.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.2" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.2" PrivateAssets="all" />
+        <PackageReference Include="AntDesign.Charts" Version="0.3.1" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.5" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.5" PrivateAssets="all" />
     </ItemGroup>
 
     <ItemGroup>

src/InverterMonWindow/InverterMonWindow.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1518.46" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1722.32" />
   </ItemGroup>
 
 </Project>

src/Server/InverterMon.Server.csproj

@@ -28,10 +28,10 @@
     <ItemGroup>
         <PackageReference Include="HidSharp" Version="2.1.0" />
         <PackageReference Include="SerialPortLib" Version="1.1.1" />
-        <PackageReference Include="FastEndpoints" Version="5.7.0" />
-        <PackageReference Include="FastEndpoints.Swagger" Version="5.7.0" />
-        <PackageReference Include="LiteDB" Version="5.0.15" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.2" />
+        <PackageReference Include="FastEndpoints" Version="5.8.1" />
+        <PackageReference Include="FastEndpoints.Swagger" Version="5.8.1" />
+        <PackageReference Include="LiteDB" Version="5.0.16" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.5" />
     </ItemGroup>
 
     <ItemGroup>

src/Server/InverterService/CommandExecutor.cs

@@ -1,4 +1,5 @@
 using HidSharp;
+using System.Diagnostics;
 using System.Text;
 using ICommand = InverterMon.Server.InverterService.Commands.ICommand;
 
@@ -19,8 +20,16 @@ public CommandExecutor(CommandQueue queue, IConfiguration config, ILogger<Comman
 
         log.LogInformation("connecting to the inverter...");
 
-        while (!Connect())
+        var sw = new Stopwatch();
+        sw.Start();
+
+        while (!Connect() && sw.Elapsed.TotalMinutes <= 5)
             Thread.Sleep(10000);
+
+        if (sw.Elapsed.TotalMinutes >= 5)
+        {
+            log.LogInformation("inverter connecting timed out!");
+        }
     }
 
     private bool Connect()
@@ -39,14 +48,17 @@ private bool Connect()
         }
         else
         {
-            log.LogInformation("inverter connected!");
+            log.LogInformation("connected to inverter at: [{adr}]", dev.Device.DevicePath);
             return true;
         }
     }
 
     protected override async Task ExecuteAsync(CancellationToken c)
     {
-        while (!c.IsCancellationRequested)
+        var delay = 0;
+        var timeout = TimeSpan.FromMinutes(5);
+
+        while (!c.IsCancellationRequested && delay <= timeout.TotalMilliseconds)
         {
             var cmd = queue.GetCommand();
             if (cmd is not null)
@@ -55,23 +67,23 @@ protected override async Task ExecuteAsync(CancellationToken c)
                 {
                     await ExecuteCommand(cmd, dev!, c);
                     queue.IsAcceptingCommands = true;
+                    delay = 0;
                     queue.RemoveCommand();
                 }
                 catch (Exception x)
                 {
                     queue.IsAcceptingCommands = false;
-                    log.LogError("command error: {msg}", x.Message);
-                    dev!.Close();
-                    dev.Dispose();
-                    log.LogInformation("exiting...");
-                    Environment.Exit(0);
+                    log.LogError("command execution failed: [{msg}]", x.Message);
+                    await Task.Delay(delay += 1000);
                 }
             }
             else
             {
                 await Task.Delay(500, c);
             }
         }
+
+        log.LogError("command execution halted due to excessive failures!");
     }
 
     private static async Task ExecuteCommand(ICommand command, Stream port, CancellationToken c)

src/Server/appsettings.json

@@ -1,14 +1,15 @@
 {
   "LaunchSettings": {
-    "DeviceAddress": "/dev/hidraw0",
-    "JkBmsAddress": "/dev/ttyUSB0",
+    "DeviceAddress": "/dev/ttyUSB0",
+    "JkBmsAddress": "/dev/ttyUSB1",
     "WebPort": 80,
     "TroubleMode": "no"
   },
   "Logging": {
     "LogLevel": {
       "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
+      "Microsoft.AspNetCore": "Warning",
+      "Microsoft.Hosting.Lifetime": "Error"
     }
   }
-}
+}

src/changelog.md

@@ -1,3 +1,2 @@
 ## changelog
-- add potential support for serial devices (ex: `/dev/ttyUSB*`)
-- add read-only support for troublesome inverters (set `"TroubleMode": "yes"` in `appsettings.json`)
+- improve command execution retry strategy