Improve device discovery service and add page

src/Elektrifikatsiya/Elektrifikatsiya/Database/DeviceManagementDatabaseContext.cs

@@ -1,14 +0,0 @@
-using Elektrifikatsiya.Models;
-using Microsoft.EntityFrameworkCore;
-
-namespace Elektrifikatsiya.Database
-{
-    public class DeviceManagmentDatabaseContext : DbContext
-    {
-        public DbSet<Device> Devices { get; set; }
-
-        public DeviceManagmentDatabaseContext(DbContextOptions<DeviceManagmentDatabaseContext> options) : base(options)
-        {
-        }
-    }
-}

src/Elektrifikatsiya/Elektrifikatsiya/Database/MainDatabaseContext.cs

@@ -4,11 +4,12 @@ using Microsoft.EntityFrameworkCore;
 
 namespace Elektrifikatsiya.Database;
 
-public class UserDatabaseContext : DbContext
+public class MainDatabaseContext : DbContext
 {
-    public UserDatabaseContext(DbContextOptions<UserDatabaseContext> dbContextOptions) : base(dbContextOptions)
+    public MainDatabaseContext(DbContextOptions<MainDatabaseContext> dbContextOptions) : base(dbContextOptions)
     {
     }
 
     public DbSet<User> Users { get; set; }
+    public DbSet<Device> Devices { get; set; }
 }

src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor

@@ -5,11 +5,13 @@
 @using Elektrifikatsiya.Services
 @using Elektrifikatsiya.Services.Implementations
 @using Elektrifikatsiya.Utilities
+@using FluentResults;
 @inject IVersionProvider VersionProvider
 @inject IDeviceManagmentService DeviceManagmentService
 @inject IAuthenticationService AuthenticationService
+@inject IMessageService MessageService
 
-<Div >
+<Div>
     <Row Style="height:50%; width:100%" Padding="Padding.Is3.OnDesktop.Is0">
         <Row Style="height:90%; width:100%">
             <Column ColumnSize="ColumnSize.Is4.OnDesktop.Is1"></Column>
@@ -23,7 +25,7 @@
                         Add a plug via wifi
                     </BarBrand>
                 </Bar>
-<ListView  Class="w-100"
+                <ListView Class="w-100"
                           TItem="IPAddress"
                           Data="@ipAddresses"
                           TextField="@((_)=>(""))"
@@ -42,7 +44,7 @@
                                     </Row>
                                 </Column>
                                 <Column ColumnSize="ColumnSize.Is4.Is2.WithOffset">
-							<Button Position="Position.Absolute.Top.Is50.Start.Is50.Translate.Middle" Color="Color.Dark" Clicked="@(async () => await DeviceManagmentService.RegisterDevice(context.Item,(await AuthenticationService.GetUserAsync()).ValueOrDefault))" Outline>
+                                    <Button Position="Position.Absolute.Top.Is50.Start.Is50.Translate.Middle" Color="Color.Dark" Clicked="@(()=>RegisterDevice(context.Item))" Outline>
                                         <BarIcon IconName="IconName.Add" />
                                     </Button>
                                 </Column>
@@ -71,13 +73,21 @@
                 <ListGroup Style="width:100%; border-radius: 0px 0px">
                     <ListGroupItem Color="Color.Default">
                         <Form>
+                            <Validation @ref="ipValidation" Validator="ValidateIPv4">
                                 <Field Horizontal>
                                     <FieldBody ColumnSize="ColumnSize.Is12">
-									<TextEdit Placeholder="Enter the Device IP here" />
+                                        <TextEdit @bind-Text="ipText" Placeholder="Enter the Device IP here">
+                                            <Feedback>
+                                                <ValidationNone>Please enter a ip address.</ValidationNone>
+                                                <ValidationSuccess>Ip address is valid.</ValidationSuccess>
+                                                <ValidationError>Ip address is not valid!</ValidationError>
+                                            </Feedback>
+                                        </TextEdit>
                                         <br>
-									<Button style="background-color:#1a237e; color:white" Type="ButtonType.Submit" PreventDefaultOnSubmit>CONNECT</Button>
+                                        <Button style="background-color:#1a237e; color:white" Type="ButtonType.Submit" Disabled="ipValidation?.Status != ValidationStatus.Success" Clicked="@(async (_)=> await RegisterDevice(IPAddress.Parse(ipText!)))" PreventDefaultOnSubmit>CONNECT</Button>
                                     </FieldBody>
                                 </Field>
+                            </Validation>
                         </Form>
                     </ListGroupItem>
                 </ListGroup>
@@ -90,13 +100,55 @@
 @code {
     List<IPAddress> ipAddresses = new List<IPAddress>();
 
+    Validation? ipValidation;
+
+    string ipText = null!;
+
     protected override void OnInitialized()
     {
-		ipAddresses.AddRange(MdnsDiscovery.GetChachedDevices());
+        MdnsDiscovery.OnDeviceFound += async ipAddress =>
-		MdnsDiscovery.OnDeviceFound += address =>
         {
-			ipAddresses.Add(address);
+            if (!ipAddresses.Contains(ipAddress))
-			InvokeAsync(StateHasChanged);
+            {
+                ipAddresses.Add(ipAddress);
+                await InvokeAsync(StateHasChanged);
+            }
         };
+
+        MdnsDiscovery.FetchChachedDevices();
+    }
+
+    private async Task RegisterDevice(IPAddress ipAddress)
+    {
+        Result<Device> result = await DeviceManagmentService.RegisterDevice(ipAddress, (await AuthenticationService.GetUserAsync()).ValueOrDefault);
+
+        if (result.IsSuccess)
+        {
+            await MessageService.Success("Device added!");
+        }
+        else
+        {
+            await MessageService.Error(string.Join(',', result.Errors.Select(e => e.Message)), "Adding device failed!");
+        }
+    }
+
+    public void ValidateIPv4(ValidatorEventArgs e)
+    {
+        string? input = Convert.ToString(e.Value);
+
+        if (string.IsNullOrWhiteSpace(input))
+        {
+            e.Status = ValidationStatus.None;
+            return;
+        }
+
+        string[] splitValues = input.Split('.');
+        if (splitValues.Length != 4)
+        {
+            e.Status = ValidationStatus.Error;
+            return;
+        }
+
+        e.Status = splitValues.All(r => byte.TryParse(r, out _)) ? ValidationStatus.Success : ValidationStatus.Error;
     }
 }

src/Elektrifikatsiya/Elektrifikatsiya/Program.cs

@@ -4,7 +4,6 @@ using Blazorise.Icons.Material;
 using Blazorise.Material;
 
 using Elektrifikatsiya.Database;
-using Elektrifikatsiya.Models;
 using Elektrifikatsiya.Services;
 using Elektrifikatsiya.Services.Implementations;
 
@@ -22,8 +21,7 @@ builder.Services.AddTransient<IDeviceManagmentService, DeviceManagmentService>()
 builder.Services.AddScoped<IAuthenticationService, AuthenticationService>();
 builder.Services.AddScoped<IAuthorizationService, AuthorizationService>();
 builder.Services.AddScoped<ICookieService, CookieService>();
-builder.Services.AddDbContext<UserDatabaseContext>(options => options.UseSqlite("Data Source=./UserDatabase.sqlite"));
+builder.Services.AddDbContext<MainDatabaseContext>(options => options.UseSqlite("Data Source=./MainDatabase.sqlite"));
-builder.Services.AddDbContext<DeviceManagmentDatabaseContext>((options) => options.UseSqlite("Data Source=./DeviceManagement.sqlite"));
 builder.Services.AddBootstrapProviders();
 builder.Services.AddHttpClient<IDeviceManagmentService, DeviceManagmentService>();
 builder.Services.AddBlazorise(options =>
@@ -53,10 +51,7 @@ app.MapFallbackToPage("/_Host");
 app.MapControllers();
 
 IServiceScope serviceScope = app.Services.GetRequiredService<IServiceScopeFactory>().CreateScope();
-serviceScope.ServiceProvider.GetRequiredService<UserDatabaseContext>().Database.EnsureCreated();
+serviceScope.ServiceProvider.GetRequiredService<MainDatabaseContext>().Database.EnsureCreated();
-
-AsyncServiceScope scope = app.Services.CreateAsyncScope();
-scope.ServiceProvider.GetRequiredService<DeviceManagmentDatabaseContext>().Database.EnsureCreated();
 
 app.Run();
 

src/Elektrifikatsiya/Elektrifikatsiya/Services/Implementations/AuthenticationService.cs

@@ -12,13 +12,13 @@ namespace Elektrifikatsiya.Services.Implementations;
 
 public class AuthenticationService : IAuthenticationService
 {
-    private readonly UserDatabaseContext userDatabaseContext;
+    private readonly MainDatabaseContext mainDatabaseContext;
     private readonly IHttpContextAccessor httpContextAccessor;
     private readonly ICookieService cookieService;
 
-    public AuthenticationService(UserDatabaseContext userDatabaseContext, IHttpContextAccessor httpContextAccessor, ICookieService cookieService)
+    public AuthenticationService(MainDatabaseContext mainDatabaseContext, IHttpContextAccessor httpContextAccessor, ICookieService cookieService)
     {
-        this.userDatabaseContext = userDatabaseContext;
+        this.mainDatabaseContext = mainDatabaseContext;
         this.httpContextAccessor = httpContextAccessor;
         this.cookieService = cookieService;
     }
@@ -32,8 +32,8 @@ public class AuthenticationService : IAuthenticationService
             return getUserResult.ToResult();
         }
 
-        _ = userDatabaseContext.Users.Remove(getUserResult.Value);
+        _ = mainDatabaseContext.Users.Remove(getUserResult.Value);
-        return (await Result.Try(() => userDatabaseContext.SaveChangesAsync())).ToResult();
+        return (await Result.Try(() => mainDatabaseContext.SaveChangesAsync())).ToResult();
     }
 
     public async Task<Result<User>> GetUserAsync()
@@ -45,7 +45,7 @@ public class AuthenticationService : IAuthenticationService
             return Result.Fail("Token is not valid!");
         }
 
-        User? user = await userDatabaseContext.Users.FirstOrDefaultAsync(u => u.SessionToken == token);
+        User? user = await mainDatabaseContext.Users.FirstOrDefaultAsync(u => u.SessionToken == token);
 
         if (user is null || DateTime.UtcNow - user.LastLoginDate > TimeSpan.FromDays(7))
         {
@@ -62,7 +62,7 @@ public class AuthenticationService : IAuthenticationService
 
     public async Task<Result> LoginUserAsync(string name, string password)
     {
-        User? user = await userDatabaseContext.Users.FirstOrDefaultAsync(u => u.Name.Equals(name, StringComparison.InvariantCultureIgnoreCase));
+        User? user = await mainDatabaseContext.Users.FirstOrDefaultAsync(u => u.Name.Equals(name, StringComparison.InvariantCultureIgnoreCase));
 
         if (user is null)
         {
@@ -79,7 +79,7 @@ public class AuthenticationService : IAuthenticationService
         user.LastLoginDate = DateTime.UtcNow;
         user.SessionToken = newToken;
 
-        _ = await userDatabaseContext.SaveChangesAsync();
+        _ = await mainDatabaseContext.SaveChangesAsync();
 
         await cookieService.WriteCookieAsync("token", newToken, 7);
 
@@ -97,7 +97,7 @@ public class AuthenticationService : IAuthenticationService
             return Result.Ok();
         }
 
-        User? user = await userDatabaseContext.Users.FirstOrDefaultAsync(u => u.SessionToken == token);
+        User? user = await mainDatabaseContext.Users.FirstOrDefaultAsync(u => u.SessionToken == token);
 
         if (user is null)
         {
@@ -106,7 +106,7 @@ public class AuthenticationService : IAuthenticationService
 
         user.SessionToken = null;
 
-        _ = await userDatabaseContext.SaveChangesAsync();
+        _ = await mainDatabaseContext.SaveChangesAsync();
 
         return Result.Ok();
     }
@@ -121,14 +121,14 @@ public class AuthenticationService : IAuthenticationService
         }
 
         User user = new User(name, BC.HashPassword(password), role);
-        _ = userDatabaseContext.Users.Add(user);
+        _ = mainDatabaseContext.Users.Add(user);
 
-        return (await Result.Try(() => userDatabaseContext.SaveChangesAsync())).ToResult();
+        return (await Result.Try(() => mainDatabaseContext.SaveChangesAsync())).ToResult();
     }
 
     public Task<Result<bool>> UserExistsAsync(string name)
     {
         return Result.Try(() =>
-            userDatabaseContext.Users.AnyAsync(u => u.Name.Equals(name, StringComparison.InvariantCultureIgnoreCase)));
+            mainDatabaseContext.Users.AnyAsync(u => u.Name.Equals(name, StringComparison.InvariantCultureIgnoreCase)));
     }
 }

src/Elektrifikatsiya/Elektrifikatsiya/Services/Implementations/DeviceManagmentService.cs

@@ -81,7 +81,7 @@ public class DeviceManagmentService : IDeviceManagmentService
     public async Task<Result<Device>> RegisterDevice(IPAddress ip, User user, string? name = null, string room = "default")
     {
         using IServiceScope scope = serviceScopeFactory.CreateScope();
-		DeviceManagmentDatabaseContext deviceManagmentDatabaseContext = scope.ServiceProvider.GetRequiredService<DeviceManagmentDatabaseContext>();
+        MainDatabaseContext mainDatabaseContext = scope.ServiceProvider.GetRequiredService<MainDatabaseContext>();
 
         ShellyResponse? shellyResponse = null;
 
@@ -108,8 +108,8 @@ public class DeviceManagmentService : IDeviceManagmentService
 
         Device device = new Device(mac, name ?? mac, ip, user, room);
 
-		_ = deviceManagmentDatabaseContext.Add(device);
+        _ = mainDatabaseContext.Add(device);
-		Result saveDatabaseChangesResult = await Result.Try(Task () => deviceManagmentDatabaseContext.SaveChangesAsync());
+        Result saveDatabaseChangesResult = await Result.Try(Task () => mainDatabaseContext.SaveChangesAsync());
 
         if (saveDatabaseChangesResult.IsFailed)
         {
@@ -122,7 +122,7 @@ public class DeviceManagmentService : IDeviceManagmentService
     public async Task<Result> UnregisterDevice(string macAdress)
     {
         using IServiceScope scope = serviceScopeFactory.CreateScope();
-		DeviceManagmentDatabaseContext deviceManagmentDatabaseContext = scope.ServiceProvider.GetRequiredService<DeviceManagmentDatabaseContext>();
+        MainDatabaseContext mainDatabaseContext = scope.ServiceProvider.GetRequiredService<MainDatabaseContext>();
 
         Result<Device> getDeviceResult = GetDevice(macAdress);
 
@@ -138,15 +138,15 @@ public class DeviceManagmentService : IDeviceManagmentService
             return untrackDeviceResult;
         }
 
-		_ = deviceManagmentDatabaseContext.Remove(getDeviceResult.Value);
+        _ = mainDatabaseContext.Remove(getDeviceResult.Value);
 
-		return await Result.Try(Task () => deviceManagmentDatabaseContext.SaveChangesAsync());
+        return await Result.Try(Task () => mainDatabaseContext.SaveChangesAsync());
     }
 
     public async Task<Result> UpdateDevice(Device device)
     {
         using IServiceScope scope = serviceScopeFactory.CreateScope();
-		DeviceManagmentDatabaseContext deviceManagmentDatabaseContext = scope.ServiceProvider.GetRequiredService<DeviceManagmentDatabaseContext>();
+        MainDatabaseContext mainDatabaseContext = scope.ServiceProvider.GetRequiredService<MainDatabaseContext>();
 
         Result result = deviceStatusService.UpdateDeviceStatus(device);
 
@@ -155,8 +155,8 @@ public class DeviceManagmentService : IDeviceManagmentService
             return result;
         }
 
-		_ = deviceManagmentDatabaseContext.Update(device);
+        _ = mainDatabaseContext.Update(device);
 
-		return await Result.Try(Task () => deviceManagmentDatabaseContext.SaveChangesAsync());
+        return await Result.Try(Task () => mainDatabaseContext.SaveChangesAsync());
     }
 }

src/Elektrifikatsiya/Elektrifikatsiya/Services/Implementations/UpdateService.cs

@@ -1,8 +1,9 @@
 using Elektrifikatsiya.Database;
 using Elektrifikatsiya.Models;
+
 using FluentResults;
+
 using Microsoft.EntityFrameworkCore;
-using System.Threading.Tasks;
 
 namespace Elektrifikatsiya.Services.Implementations;
 
@@ -23,21 +24,21 @@ public class UpdateService : IHostedService, IDisposable
     public async Task StartAsync(CancellationToken cancellationToken)
     {
         IServiceScope serviceScope = serviceScopeFactory.CreateScope();
-		DeviceManagmentDatabaseContext deviceManagmentDatabaseContext = serviceScope.ServiceProvider.GetRequiredService<DeviceManagmentDatabaseContext>();
+        MainDatabaseContext mainDatabaseContext = serviceScope.ServiceProvider.GetRequiredService<MainDatabaseContext>();
 
         logger.LogInformation("Starting update service...");
 
-        foreach (Device device in await deviceManagmentDatabaseContext.Devices.AsNoTracking().ToListAsync(cancellationToken))
+        foreach (Device device in await mainDatabaseContext.Devices.AsNoTracking().ToListAsync(cancellationToken))
         {
             _ = deviceStatusService.TrackDevice(device);
         }
 
-        timer = new Timer(async (_) => await Update(), null, TimeSpan.Zero, TimeSpan.FromSeconds(15));
+        timer = new Timer((_) => Update(), null, TimeSpan.Zero, TimeSpan.FromSeconds(15));
 
         logger.LogInformation("Update service started.");
     }
 
-    private async Task Update()
+    private void Update()
     {
         Result<List<Device>> getDeviceStatusResult = deviceStatusService.GetDevices();
 
@@ -46,7 +47,7 @@ public class UpdateService : IHostedService, IDisposable
             logger.LogError("Updating devices failed!");
         }
 
-        foreach(Device device in getDeviceStatusResult.Value)
+        foreach (Device device in getDeviceStatusResult.Value)
         {
             //TODO: Some update magic
         }

src/Elektrifikatsiya/Elektrifikatsiya/Utilities/MdnsDiscovery.cs

@@ -1,4 +1,8 @@
-using System.Net;
+using Elektrifikatsiya.Models;
+
+using Microsoft.Extensions.Caching.Memory;
+
+using System.Net;
 
 using Tmds.MDns;
 
@@ -9,17 +13,56 @@ public static class MdnsDiscovery
     public static event Action<IPAddress> OnDeviceFound = null!;
 
     private static readonly ServiceBrowser serviceBrowser = new ServiceBrowser();
+    private static readonly HttpClient client = new();
+    private static readonly MemoryCache memoryCache = new MemoryCache(new MemoryCacheOptions());
 
     static MdnsDiscovery()
     {
         serviceBrowser.StartBrowse("_http._tcp");
-        serviceBrowser.ServiceAdded += (_, eventArgs) => OnDeviceFound?.Invoke(eventArgs.Announcement.Addresses.First());
+        serviceBrowser.ServiceAdded += async (_, eventArgs) => await AddDevice(eventArgs.Announcement);
-        serviceBrowser.ServiceChanged += (_, eventArgs) => OnDeviceFound?.Invoke(eventArgs.Announcement.Addresses.First());
+        serviceBrowser.ServiceChanged += async (_, eventArgs) => await AddDevice(eventArgs.Announcement);
-        serviceBrowser.ServiceRemoved += (_, eventArgs) => OnDeviceFound?.Invoke(eventArgs.Announcement.Addresses.First());
+        serviceBrowser.ServiceRemoved += async (_, eventArgs) => await AddDevice(eventArgs.Announcement);
     }
 
-    public static IEnumerable<IPAddress> GetChachedDevices()
+    public static void FetchChachedDevices()
     {
-        return serviceBrowser.Services.Select(s => s.Addresses.First());
+        serviceBrowser.Services.ToList().ForEach(async d => await AddDevice(d));
+    }
+
+    private static async Task AddDevice(ServiceAnnouncement announcement)
+    {
+        IPAddress ipAddress = announcement.Addresses.First();
+
+        if (!memoryCache.TryGetValue(ipAddress.ToString(), out bool isShellyDevice))
+        {
+            isShellyDevice = await IsShellyDevice(ipAddress);
+            _ = memoryCache.Set(ipAddress.ToString(), isShellyDevice, TimeSpan.FromHours(1));
+        }
+
+        if (isShellyDevice)
+        {
+            OnDeviceFound?.Invoke(ipAddress);
+        }
+    }
+
+    private static async Task<bool> IsShellyDevice(IPAddress ipAddress)
+    {
+        ShellyResponse? shellyResponse;
+
+        try
+        {
+            shellyResponse = await client.GetFromJsonAsync<ShellyResponse>($"http://{ipAddress}/shelly");
+        }
+        catch (HttpRequestException)
+        {
+            return false;
+        }
+
+        if (shellyResponse is null || shellyResponse.Type != "SHPLG-S")
+        {
+            return false;
+        }
+
+        return true;
     }
 }