Code cleanup

API/Controller/Admin/OnlineDevicesController.cs

@@ -2,7 +2,7 @@
 using Microsoft.EntityFrameworkCore;
 using OpenShock.Common.Models;
 using OpenShock.Common.Redis;
-using OpenShock.ServicesCommon.Utils;
+using OpenShock.Common.Utils;
 using Semver;
 using System.Text.Json.Serialization;
 using OpenShock.Common.JsonSerialization;

API/Controller/Device/AssignLCG.cs

@@ -1,11 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
 using OpenShock.API.Models.Response;
 using OpenShock.Common.Utils;
-using OpenShock.ServicesCommon.Geo;
-using System.Net;
-using System.Text;
 using OpenShock.ServicesCommon.Errors;
 using OpenShock.ServicesCommon.Problems;
+using OpenShock.ServicesCommon.Services.LCGNodeProvisioner;
+using System.Net;
 
 namespace OpenShock.API.Controller.Device;
 
@@ -19,51 +18,35 @@ public sealed partial class DeviceController
     [HttpGet("assignLCG")]
     [ProducesSuccess<LcgNodeResponse>]
     [ProducesProblem(HttpStatusCode.ServiceUnavailable, "NoLcgNodesAvailable")]
-    public async Task<IActionResult> GetLiveControlGateway([FromServices] IGeoLocation geoLocation,
+    public async Task<IActionResult> GetLiveControlGateway([FromServices] ILCGNodeProvisioner geoLocation,
         [FromServices] IWebHostEnvironment env)
     {
-        var messageBuilder = new StringBuilder();
-        var countryCode = CountryCodeMapper.CountryInfo.Alpha2CountryCode.DefaultAlphaCode;
+        var countryCode = CountryCodeMapper.Alpha2CountryCode.UnknownCountryCode;
         if (HttpContext.Request.Headers.TryGetValue("CF-IPCountry", out var countryHeader) &&
             !string.IsNullOrEmpty(countryHeader))
         {
             var countryHeaderString = countryHeader.ToString();
-            if (CountryCodeMapper.CountryInfo.Alpha2CountryCode.TryParseAndValidate(countryHeaderString, out var code))
+            if (CountryCodeMapper.Alpha2CountryCode.TryParseAndValidate(countryHeaderString, out var code))
             {
                 countryCode = code;
             }
             else
             {
                 _logger.LogWarning("Country alpha2 code could not be parsed [{CountryHeader}]", countryHeaderString);
-                messageBuilder.AppendLine("Invalid alpha2 country code, default country used.");
             }
         }
         else
         {
             _logger.LogWarning("CF-IPCountry header could not be parsed");
-            messageBuilder.AppendLine("No CF-IPCountry header found, default country used.");
-        }
-
-        if (CountryCodeMapper.CountryCodeToCountryInfo.TryGetValue(countryCode, out var country))
-        {
-            if (_logger.IsEnabled(LogLevel.Debug))
-                _logger.LogDebug("Client country identified as [{@CountryInfo}]", country);
         }
-        else
-        {
-            country = CountryCodeMapper.DefaultCountry;
-            _logger.LogWarning("Country not found in mapping [{Alpha2Code}]", countryCode);
-            messageBuilder.AppendLine("Country not found in mapping, default country used.");
-        }
-
-        var closestNode = await geoLocation.GetClosestNode(country, env.EnvironmentName);
 
+        var closestNode = await geoLocation.GetOptimalNode(countryCode, env.EnvironmentName);
         if (closestNode == null) return Problem(AssignLcgError.NoLcgNodesAvailable);
 
         return RespondSuccess(new LcgNodeResponse
         {
             Fqdn = closestNode.Fqdn,
             Country = closestNode.Country
-        }, messageBuilder.ToString());
+        });
     }
 }

API/Controller/Public/GetStats.cs

@@ -29,7 +29,7 @@ public async Task<BaseResponse<StatsResponse>> GetOnlineDevicesStatistics(
     }
 }
 
-public class StatsResponse
+public sealed class StatsResponse
 {
     public required int DevicesOnline { get; set; }
 }

API/Controller/Public/PublicShareController.cs

@@ -4,9 +4,9 @@
 using OpenShock.API.Models.Response;
 using OpenShock.API.Utils;
 using OpenShock.Common.Models;
+using OpenShock.Common.Utils;
 using OpenShock.ServicesCommon.Errors;
 using OpenShock.ServicesCommon.Problems;
-using OpenShock.ServicesCommon.Utils;
 
 namespace OpenShock.API.Controller.Public;
 

API/Controller/Shockers/ControlLogController.cs

@@ -5,9 +5,9 @@
 using Microsoft.EntityFrameworkCore;
 using OpenShock.API.Models.Response;
 using OpenShock.Common.Models;
+using OpenShock.Common.Utils;
 using OpenShock.ServicesCommon.Errors;
 using OpenShock.ServicesCommon.Problems;
-using OpenShock.ServicesCommon.Utils;
 
 namespace OpenShock.API.Controller.Shockers;
 

API/Controller/Shockers/ControlShockerController.cs

@@ -3,13 +3,13 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.SignalR;
 using OpenShock.Common.Models;
+using OpenShock.Common.Utils;
 using OpenShock.ServicesCommon.Authentication.Attributes;
 using OpenShock.ServicesCommon.DeviceControl;
 using OpenShock.ServicesCommon.Errors;
 using OpenShock.ServicesCommon.Hubs;
 using OpenShock.ServicesCommon.Problems;
 using OpenShock.ServicesCommon.Services.RedisPubSub;
-using OpenShock.ServicesCommon.Utils;
 
 namespace OpenShock.API.Controller.Shockers;
 

API/Controller/Shockers/ShareShockerController.cs

@@ -6,11 +6,11 @@
 using OpenShock.API.Services;
 using OpenShock.Common.Models;
 using OpenShock.Common.OpenShockDb;
-using OpenShock.ServicesCommon.Utils;
 using System.Net;
 using OpenShock.ServicesCommon.Authentication.Attributes;
 using OpenShock.ServicesCommon.Errors;
 using OpenShock.ServicesCommon.Problems;
+using OpenShock.Common.Utils;
 
 namespace OpenShock.API.Controller.Shockers;
 
@@ -85,7 +85,7 @@ public async Task<IActionResult> ShockerShareCodeList([FromRoute] Guid shockerId
         return RespondSuccess(shares);
     }
 
-    public class ShareCodeInfo
+    public sealed class ShareCodeInfo
     {
         public required Guid Id { get; set; }
         public required DateTime CreatedOn { get; set; }

API/Controller/Shockers/SharedShockersController.cs

@@ -3,12 +3,12 @@
 using Microsoft.EntityFrameworkCore;
 using OpenShock.API.Models.Response;
 using OpenShock.Common.Models;
+using OpenShock.Common.Utils;
 using OpenShock.ServicesCommon.Problems;
-using OpenShock.ServicesCommon.Utils;
 
 namespace OpenShock.API.Controller.Shockers;
 
-public partial class ShockerController
+public sealed partial class ShockerController
 {
     /// <summary>
     /// List all shockers shared with the authenticated user.

API/Models/Response/DeviceSelfResponse.cs

@@ -1,6 +1,6 @@
 namespace OpenShock.API.Models.Response;
 
-public class DeviceSelfResponse
+public sealed class DeviceSelfResponse
 {
     public required Guid Id { get; set; }
     public required string Name { get; set; }

API/Models/Response/LcgNodeResponse.cs

@@ -1,6 +1,6 @@
 namespace OpenShock.API.Models.Response;
 
-public class LcgNodeResponse
+public sealed class LcgNodeResponse
 {
     public required string Fqdn { get; set; }
     public required string Country { get; set; }

API/Models/Response/LogEntry.cs

@@ -2,7 +2,7 @@
 
 namespace OpenShock.API.Models.Response;
 
-public class LogEntry
+public sealed class LogEntry
 {
     public required Guid Id { get; set; }
 

API/Models/Response/OwnerShockerResponse.cs

@@ -2,18 +2,18 @@
 
 namespace OpenShock.API.Models.Response;
 
-public class OwnerShockerResponse : GenericIni
+public sealed class OwnerShockerResponse : GenericIni
 {
     public IList<SharedDevice> Devices { get; set; } = new List<SharedDevice>();
 
-    public class SharedDevice
+    public sealed class SharedDevice
     {
         public required Guid Id { get; set; }
         public required string Name { get; set; }
         // ReSharper disable once CollectionNeverQueried.Global
         public IList<SharedShocker> Shockers { get; set; } = new List<SharedShocker>();
 
-        public class SharedShocker
+        public sealed class SharedShocker
         {
             public required Guid Id { get; set; }
             public required string Name { get; set; }

API/Models/Response/PublicShareLinkResponse.cs

@@ -2,7 +2,7 @@
 
 namespace OpenShock.API.Models.Response;
 
-public class PublicShareLinkResponse
+public sealed class PublicShareLinkResponse
 {
     public required Guid Id { get; set; }
     public required string Name { get; set; }

API/Models/Response/ResponseDeviceWithShockers.cs

@@ -1,6 +1,6 @@
 namespace OpenShock.API.Models.Response;
 
-public class ResponseDeviceWithShockers : ResponseDevice
+public sealed class ResponseDeviceWithShockers : ResponseDevice
 {
     public required IEnumerable<ShockerResponse> Shockers { get; set; }
 }

API/Models/Response/ResponseDeviceWithToken.cs

@@ -1,6 +1,6 @@
 namespace OpenShock.API.Models.Response;
 
-public class ResponseDeviceWithToken : ResponseDevice
+public sealed class ResponseDeviceWithToken : ResponseDevice
 {
     public required string? Token { get; set; }
 }

API/Models/Response/ShareInfo.cs

@@ -2,7 +2,7 @@
 
 namespace OpenShock.API.Models.Response;
 
-public class ShareInfo
+public sealed class ShareInfo
 {
     public required GenericIni SharedWith { get; set; }
     public required DateTime CreatedOn { get; set; }

API/Models/Response/ShareLinkDevice.cs

@@ -1,6 +1,6 @@
 namespace OpenShock.API.Models.Response;
 
-public class ShareLinkDevice
+public sealed class ShareLinkDevice
 {
     public required Guid Id { get; set; }
     public required string Name { get; set; }

API/Models/Response/ShareLinkResponse.cs

@@ -2,7 +2,7 @@
 
 namespace OpenShock.API.Models.Response;
 
-public class ShareLinkResponse
+public sealed class ShareLinkResponse
 {
     public required Guid Id { get; set; }
     public required string Name { get; set; }

API/Models/Response/ShareLinkShocker.cs

@@ -2,7 +2,7 @@
 
 namespace OpenShock.API.Models.Response;
 
-public class ShareLinkShocker
+public sealed class ShareLinkShocker
 {
     public required Guid Id { get; set; }
     public required string Name { get; set; }

API/Models/Response/ShockerLimits.cs

@@ -3,7 +3,7 @@
 
 namespace OpenShock.API.Models.Response;
 
-public class ShockerLimits
+public sealed class ShockerLimits
 {
     [Range(Constants.MinControlIntensity, Constants.MaxControlIntensity)]
     public required byte? Intensity { get; set; }

API/Models/Response/ShockerPermissions.cs

@@ -1,6 +1,6 @@
 namespace OpenShock.API.Models.Response;
 
-public class ShockerPermissions
+public sealed class ShockerPermissions
 {
     public required bool Vibrate { get; set; }
     public required bool Sound { get; set; }

API/Models/Response/ShockerWithDevice.cs

@@ -1,6 +1,6 @@
 namespace OpenShock.API.Models.Response;
 
-public class ShockerWithDevice : ShockerResponse
+public sealed class ShockerWithDevice : ShockerResponse
 {
     public required Guid Device { get; set; }
 }

API/Realtime/RedisSubscriberService.cs

@@ -18,7 +18,7 @@ namespace OpenShock.API.Realtime;
 /// <summary>
 /// Redis subscription service, which handles listening to pub sub on redis
 /// </summary>
-public class RedisSubscriberService : IHostedService, IAsyncDisposable
+public sealed class RedisSubscriberService : IHostedService, IAsyncDisposable
 {
     private readonly IHubContext<UserHub, IUserHub> _hubContext;
     private readonly IDbContextFactory<OpenShockContext> _dbContextFactory;

API/Services/Account/IAccountService.cs

@@ -65,6 +65,6 @@ public interface IAccountService
     public Task<OneOf<Success, NotFound, SecretInvalid>> PasswordResetComplete(Guid passwordResetId, string secret, string newPassword);
 }
 
-public struct AccountWithEmailOrUsernameExists;
-public struct TooManyPasswordResets;
-public struct SecretInvalid;
+public readonly struct AccountWithEmailOrUsernameExists;
+public readonly struct TooManyPasswordResets;
+public readonly struct SecretInvalid;

API/Services/Account/LoginContext.cs

@@ -1,7 +1,3 @@
 namespace OpenShock.API.Services.Account;
 
-public struct LoginContext
-{
-    public required string UserAgent { get; init; }
-    public required string Ip { get; init; }
-}
+public readonly record struct LoginContext(string UserAgent, string Ip);

API/Services/DeviceUpdateService.cs

@@ -6,7 +6,7 @@
 
 namespace OpenShock.API.Services;
 
-public class DeviceUpdateService : IDeviceUpdateService
+public sealed class DeviceUpdateService : IDeviceUpdateService
 {
     private readonly IRedisPubService _redisPubService;
     private readonly IHubContext<UserHub, IUserHub> _hubContext;

API/Services/Email/Mailjet/Mail/MailsWrap.cs

@@ -1,6 +1,6 @@
 namespace OpenShock.API.Services.Email.Mailjet.Mail;
 
-public class MailsWrap
+public sealed class MailsWrap
 {
     public required IEnumerable<Mail.MailBase> Messages { get; set; }
 }

API/Services/Email/Mailjet/Mail/TemplateMail.cs

@@ -1,6 +1,6 @@
 namespace OpenShock.API.Services.Email.Mailjet.Mail;
 
-public class TemplateMail : MailBase
+public sealed class TemplateMail : MailBase
 {
     public bool TemplateLanguage { get; set; } = true;
     public required ulong TemplateId { get; set; }

API/Startup.cs

@@ -28,11 +28,11 @@
 using OpenShock.ServicesCommon.Authentication.Services;
 using OpenShock.ServicesCommon.DataAnnotations;
 using OpenShock.ServicesCommon.ExceptionHandle;
-using OpenShock.ServicesCommon.Geo;
 using OpenShock.ServicesCommon.Hubs;
 using OpenShock.ServicesCommon.Problems;
 using OpenShock.ServicesCommon.Services.BatchUpdate;
 using OpenShock.ServicesCommon.Services.Device;
+using OpenShock.ServicesCommon.Services.LCGNodeProvisioner;
 using OpenShock.ServicesCommon.Services.Ota;
 using OpenShock.ServicesCommon.Services.RedisPubSub;
 using OpenShock.ServicesCommon.Services.Turnstile;
@@ -47,7 +47,7 @@
 
 namespace OpenShock.API;
 
-public class Startup
+public sealed class Startup
 {
     private readonly ForwardedHeadersOptions _forwardedSettings = new()
     {
@@ -129,7 +129,7 @@ public void ConfigureServices(IServiceCollection services)
         services.AddScoped<IClientAuthService<Device>, ClientAuthService<Device>>();
         services.AddScoped<ITokenReferenceService<ApiToken>, TokenReferenceService<ApiToken>>();
 
-        services.AddSingleton<IGeoLocation, GeoLocation>();
+        services.AddSingleton<ILCGNodeProvisioner, LCGNodeProvisioner>();
 
 
         services.AddSingleton(x =>

API/Utils/OneWayPolymorphicJsonConverter.cs

@@ -3,7 +3,7 @@
 
 namespace OpenShock.API.Utils;
 
-public class OneWayPolymorphicJsonConverter<T> : JsonConverter<T>
+public sealed class OneWayPolymorphicJsonConverter<T> : JsonConverter<T>
 {
     public override bool CanConvert(Type typeToConvert)
     {