Stefan-5422/-T5-Elektrifikatsiya
1
0
Fork 0
mirror of https://github.com/Stefan-5422/-T5-Elektrifikatsiya.git synced 2026-09-04 00:45:58 +02:00
Code Issues 2 Packages Projects Releases Wiki Activity

Merge pull request #36 from Stefan-5422/feature-DeviceRegistration

Browse Source 
Feature device registration
This commit is contained in:
Stefan
2023-03-08 10:00:16 +01:00
committed by GitHub
parent b4a54fc269 db787a1ef3
commit 5608416d10
10 changed files with 229 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Elektrifikatsiya/Elektrifikatsiya/Models/Device.cs
+2
View File
@@ -34,4 +34,6 @@ public class Device
User = user;
Room = room;
}
private Device(){}
}
src/Elektrifikatsiya/Elektrifikatsiya/Pages/AddPlug.razor
+45 -24
View File
@@ -1,7 +1,14 @@
@page "/addplug"
@using Blazorise.Components;
@using Elektrifikatsiya.Models;
@using System.Net
@using Elektrifikatsiya.Services
@using Elektrifikatsiya.Services.Implementations
@using Elektrifikatsiya.Utilities
@inject IVersionProvider VersionProvider
@inject IDeviceManagmentService DeviceManagmentService
@inject IAuthenticationService AuthenticationService
<Div >
<Row Style="height:50%; width:100%" Padding="Padding.Is3.OnDesktop.Is0">
<Row Style="height:90%; width:100%">
@@ -16,32 +23,36 @@
Add a plug via wifi
</BarBrand>
</Bar>
<ListView Class="w-100"
TItem="Device"
Data="@plugs"
TextField="@((_)=>(""))"
ValueField="@((_)=>(""))"
Mode="ListGroupMode.Static"
Style="border-radius: 0px 0px">
<ItemTemplate>
<ListGroupItem>
<ListView Class="w-100"
TItem="IPAddress"
Data="@ipAddresses"
TextField="@((_)=>(""))"
ValueField="@((_)=>(""))"
Mode="ListGroupMode.Static">
<ItemTemplate>
<ListGroupItem>
<Row>
<Column ColumnSize="ColumnSize.Is6">
<Row>
<Column ColumnSize="ColumnSize.Is7">
<Row Width="Width.Is100">
<Column>
<Small>IP: @context.Item.Address</Small>
</Column>
</Row>
</Column>
<Column ColumnSize="ColumnSize.Is4.Is1.WithOffset">
<Button Position="Position.Absolute.Top.Is50.Start.Is50.Translate.Middle" Color="Color.Dark" Outline>
<BarIcon IconName="IconName.Add" />
</Button>
<Column >
<Heading Size="HeadingSize.Is6" Margin="Margin.Is1.FromBottom">@context.Item</Heading>
</Column>
</Row>
</ListGroupItem>
</ItemTemplate>
</ListView>
<Row Width="Width.Is100">
<Column>
<Small>IP: @context.Item</Small>
</Column>
</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>
<BarIcon IconName="IconName.Add" />
</Button>
</Column>
</Row>
</ListGroupItem>
</ItemTemplate>
</ListView>
</Column>
</Row>
</Row>
@@ -80,5 +91,15 @@
</Div>
@code {
List<Device> plugs = new List<Device>() { new Device("Placeholder", "Plug", System.Net.IPAddress.Broadcast, 60, "Oldin", "4AHINF"), new Device("Placeholder", "Plug", System.Net.IPAddress.Broadcast, 60, "Oldin", "4AHINF"), new Device("Placeholder", "Plug", System.Net.IPAddress.Broadcast, 60, "Oldin", "4AHINF") };
List<IPAddress> ipAddresses = new List<IPAddress>();
protected override void OnInitialized()
{
ipAddresses.AddRange(MdnsDiscovery.GetChachedDevices());
MdnsDiscovery.OnDeviceFound += address =>
{
ipAddresses.Add(address);
InvokeAsync(StateHasChanged);
};
}
}
src/Elektrifikatsiya/Elektrifikatsiya/Pages/Dashboard.razor
+2 -2
View File
@@ -1,6 +1,7 @@
@page "/"
@using Blazorise.Components;
@using Elektrifikatsiya.Models;
@using System.Net
@inject IVersionProvider VersionProvider
<Row Padding="Padding.Is3">
@@ -90,8 +91,7 @@
//TODO: insert new event here if plug produces one
List<Event> events = new List<Event>() { new Event("Placeholder", "Placeholder", DateTime.Now), new Event("Placeholder", "Placeholder", DateTime.Now), new Event("Placeholder", "Placeholder", DateTime.Now) };
//TODO: insert new Device here if user adds one
List<Device> plugs = new List<Device>() { new Device("Placeholder", "Plug", System.Net.IPAddress.Broadcast, 60, "Oldin", "4AHINF"), new Device("Placeholder", "Plug", System.Net.IPAddress.Broadcast, 60, "Oldin", "4AHINF"), new Device("Placeholder", "Plug", System.Net.IPAddress.Broadcast, 60, "Oldin", "4AHINF") };
List<Device> plugs = new List<Device>() { new Device("ffff:ffff:ffff:ffff", "Huso", IPAddress.Broadcast, new User("Joe", "qiowruioewjfopa", Role.Admin), "Raum"), new Device("ffff:ffff:ffff:ffff", "Huso", IPAddress.Broadcast, new User("Joe", "qiowruioewjfopa", Role.Admin), "Raum"), new Device("ffff:ffff:ffff:ffff", "Huso", IPAddress.Broadcast, new User("Joe", "qiowruioewjfopa", Role.Admin), "Raum"), };
//code for graph
LineChart<double> lineChart;
src/Elektrifikatsiya/Elektrifikatsiya/Program.cs
+14 -9
View File
@@ -4,6 +4,7 @@ using Blazorise.Icons.Material;
using Blazorise.Material;
using Elektrifikatsiya.Database;
using Elektrifikatsiya.Models;
using Elektrifikatsiya.Services;
using Elektrifikatsiya.Services.Implementations;
@@ -14,15 +15,20 @@ WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
// Add services to the container.
builder.Services.AddRazorPages();
builder.Services.AddServerSideBlazor();
builder.Services.AddHttpContextAccessor();
builder.Services.AddHostedService<UpdateService>();
builder.Services.AddSingleton<IDeviceStatusService, DeviceStatusService>();
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<DeviceManagmentDatabaseContext>((options) => options.UseSqlite("Data Source=./DeviceManagement.sqlite"));
builder.Services.AddBootstrapProviders();
builder.Services.AddHttpClient<IDeviceManagmentService, DeviceManagmentService>();
builder.Services.AddBlazorise(options =>
{
options.Immediate = true;
options.Immediate = true;
});
AddBlazorise(builder.Services);
@@ -32,9 +38,9 @@ WebApplication app = builder.Build();
// Configure the HTTP request pipeline.
if (!app.Environment.IsDevelopment())
{
_ = app.UseExceptionHandler("/Error");
// The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
_ = app.UseHsts();
_ = app.UseExceptionHandler("/Error");
// The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
_ = app.UseHsts();
}
app.UseHttpsRedirection();
@@ -44,12 +50,11 @@ app.UseStaticFiles();
app.UseRouting();
app.MapBlazorHub();
app.MapFallbackToPage("/_Host");
app.MapControllers();
IServiceScope serviceScope = app.Services.GetRequiredService<IServiceScopeFactory>().CreateScope();
serviceScope.ServiceProvider.GetRequiredService<UserDatabaseContext>().Database.EnsureCreated();
app.MapControllers();
AsyncServiceScope scope = app.Services.CreateAsyncScope();
scope.ServiceProvider.GetRequiredService<DeviceManagmentDatabaseContext>().Database.EnsureCreated();
@@ -57,7 +62,7 @@ app.Run();
void AddBlazorise(IServiceCollection services)
{
_ = services.AddBlazorise();
_ = services.AddMaterialProviders();
_ = services.AddMaterialIcons();
_ = services.AddBlazorise();
_ = services.AddMaterialProviders();
_ = services.AddMaterialIcons();
}
src/Elektrifikatsiya/Elektrifikatsiya/Properties/launchSettings.json
+1 -1
View File
@@ -7,7 +7,7 @@
"ASPNETCORE_ENVIRONMENT": "Development"
},
"dotnetRunMessages": true,
"applicationUrl": "https://localhost:7297;http://localhost:5255"
"applicationUrl": "https://localhost:56656;http://localhost:5255"
},
"IIS Express": {
"commandName": "IISExpress",
src/Elektrifikatsiya/Elektrifikatsiya/Services/IDeviceManagmentService.cs
+4 -2
View File
@@ -8,9 +8,9 @@ namespace Elektrifikatsiya.Services;
public interface IDeviceManagmentService
{
public Task<Result<Device>> Register(IPAddress ip, User user, string? name = null, string room = "default");
public Task<Result<Device>> RegisterDevice(IPAddress ip, User user, string? name = null, string room = "default");
public Task<Result> Unregister(string macAdress);
public Task<Result> UnregisterDevice(string macAdress);
public Result<Device> GetDevice(string macAdress);
@@ -19,4 +19,6 @@ public interface IDeviceManagmentService
public Result<List<Device>> GetDevicesInRoom(string room);
public Result<List<Device>> GetDevicesOfUser(int userId);
public Task<Result> UpdateDevice(Device device);
}
src/Elektrifikatsiya/Elektrifikatsiya/Services/Implementations/DeviceManagmentService.cs
+120 -83
View File
@@ -10,116 +10,153 @@ namespace Elektrifikatsiya.Services.Implementations;
public class DeviceManagmentService : IDeviceManagmentService
{
private readonly DeviceManagmentDatabaseContext deviceManagmentDatabaseContext;
private readonly IDeviceStatusService deviceStatusService;
private readonly HttpClient httpClient;
private readonly IServiceScopeFactory serviceScopeFactory;
private readonly IDeviceStatusService deviceStatusService;
private readonly ILogger<DeviceManagmentService> logger;
private readonly HttpClient httpClient;
public DeviceManagmentService(DeviceManagmentDatabaseContext deviceManagmentDatabaseContext, IDeviceStatusService deviceStatusService, HttpClient httpClient)
{
this.deviceManagmentDatabaseContext = deviceManagmentDatabaseContext;
this.deviceStatusService = deviceStatusService;
this.httpClient = httpClient;
}
public DeviceManagmentService(IServiceScopeFactory serviceScopeFactory, IDeviceStatusService deviceStatusService, ILogger<DeviceManagmentService> logger, HttpClient httpClient)
{
this.serviceScopeFactory = serviceScopeFactory;
this.deviceStatusService = deviceStatusService;
this.logger = logger;
this.httpClient = httpClient;
}
public Result<Device> GetDevice(string macAdress)
{
Result<List<Device>> getDevicesResult = deviceStatusService.GetDevices();
public Result<Device> GetDevice(string macAdress)
{
Result<List<Device>> getDevicesResult = deviceStatusService.GetDevices();
if (getDevicesResult.IsFailed)
{
return getDevicesResult.ToResult();
}
if (getDevicesResult.IsFailed)
{
return getDevicesResult.ToResult();
}
Device? device = getDevicesResult.Value.FirstOrDefault(d => d.MacAddress == macAdress);
Device? device = getDevicesResult.Value.FirstOrDefault(d => d.MacAddress == macAdress);
if (device is null)
{
return Result.Fail("Device does not exist!");
}
if (device is null)
{
return Result.Fail("Device does not exist!");
}
return device;
}
return device;
}
public Result<List<Device>> GetDevices()
{
Result<List<Device>> getDevicesResult = deviceStatusService.GetDevices();
public Result<List<Device>> GetDevices()
{
Result<List<Device>> getDevicesResult = deviceStatusService.GetDevices();
if (getDevicesResult.IsFailed)
{
return getDevicesResult.ToResult();
}
if (getDevicesResult.IsFailed)
{
return getDevicesResult.ToResult();
}
return getDevicesResult.Value.ToList();
}
return getDevicesResult.Value.ToList();
}
public Result<List<Device>> GetDevicesInRoom(string room)
{
Result<List<Device>> getDevicesResult = deviceStatusService.GetDevices();
public Result<List<Device>> GetDevicesInRoom(string room)
{
Result<List<Device>> getDevicesResult = deviceStatusService.GetDevices();
if (getDevicesResult.IsFailed)
{
return getDevicesResult.ToResult();
}
if (getDevicesResult.IsFailed)
{
return getDevicesResult.ToResult();
}
return getDevicesResult.Value.Where(d => d.Room == room).ToList();
}
return getDevicesResult.Value.Where(d => d.Room == room).ToList();
}
public Result<List<Device>> GetDevicesOfUser(int userId)
{
Result<List<Device>> getDevicesResult = deviceStatusService.GetDevices();
public Result<List<Device>> GetDevicesOfUser(int userId)
{
Result<List<Device>> getDevicesResult = deviceStatusService.GetDevices();
if (getDevicesResult.IsFailed)
{
return getDevicesResult.ToResult();
}
if (getDevicesResult.IsFailed)
{
return getDevicesResult.ToResult();
}
return getDevicesResult.Value.Where(d => d.User.Id == userId).ToList();
}
return getDevicesResult.Value.Where(d => d.User.Id == userId).ToList();
}
public async Task<Result<Device>> Register(IPAddress ip, User user, string? name = null, string room = "default")
{
ShellyResponse? shellyResponse = await httpClient.GetFromJsonAsync<ShellyResponse>($"{ip}/shelly");
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>();
if(shellyResponse is null || shellyResponse.Type != "SHPLG-S")
{
return Result.Fail("Device is not a \"SHPLG-S\" or not reachable!");
}
ShellyResponse? shellyResponse = null;
string mac = shellyResponse.Mac;
try
{
shellyResponse = await httpClient.GetFromJsonAsync<ShellyResponse>($"http://{ip}/shelly");
}
catch (Exception ex)
{
logger.LogError("HTTP request failed! {message}", ex.Message);
}
if(PhysicalAddress.TryParse(mac, out _))
{
return Result.Fail("Invalid mac address!");
}
if (shellyResponse is null || shellyResponse.Type != "SHPLG-S")
{
return Result.Fail("Device is not reachable or not a \"SHPLG-S\"!");
}
Device device = new Device(mac, name ?? mac, ip, user, room);
string mac = shellyResponse.Mac;
deviceManagmentDatabaseContext.Add(device);
Result saveDatabaseChangesResult = await Result.Try(async Task () => await deviceManagmentDatabaseContext.SaveChangesAsync());
if (!PhysicalAddress.TryParse(mac, out _))
{
return Result.Fail("Invalid mac address!");
}
Result trackDeviceResult = deviceStatusService.TrackDevice(device);
Device device = new Device(mac, name ?? mac, ip, user, room);
return Result.Merge(saveDatabaseChangesResult, trackDeviceResult).ToResult(device);
}
_ = deviceManagmentDatabaseContext.Add(device);
Result saveDatabaseChangesResult = await Result.Try(Task () => deviceManagmentDatabaseContext.SaveChangesAsync());
public async Task<Result> Unregister(string macAdress)
{
Result<Device> getDeviceResult = GetDevice(macAdress);
if (saveDatabaseChangesResult.IsFailed)
{
return saveDatabaseChangesResult;
}
if (getDeviceResult.IsFailed)
{
return getDeviceResult.ToResult();
}
return deviceStatusService.TrackDevice(device);
}
Result untrackDeviceResult = deviceStatusService.UntrackDevice(macAdress);
public async Task<Result> UnregisterDevice(string macAdress)
{
using IServiceScope scope = serviceScopeFactory.CreateScope();
DeviceManagmentDatabaseContext deviceManagmentDatabaseContext = scope.ServiceProvider.GetRequiredService<DeviceManagmentDatabaseContext>();
if (untrackDeviceResult.IsFailed)
{
return untrackDeviceResult;
}
Result<Device> getDeviceResult = GetDevice(macAdress);
deviceManagmentDatabaseContext.Remove(getDeviceResult.Value);
if (getDeviceResult.IsFailed)
{
return getDeviceResult.ToResult();
}
return await Result.Try(async Task () => await deviceManagmentDatabaseContext.SaveChangesAsync());
}
Result untrackDeviceResult = deviceStatusService.UntrackDevice(macAdress);
if (untrackDeviceResult.IsFailed)
{
return untrackDeviceResult;
}
_ = deviceManagmentDatabaseContext.Remove(getDeviceResult.Value);
return await Result.Try(Task () => deviceManagmentDatabaseContext.SaveChangesAsync());
}
public async Task<Result> UpdateDevice(Device device)
{
using IServiceScope scope = serviceScopeFactory.CreateScope();
DeviceManagmentDatabaseContext deviceManagmentDatabaseContext = scope.ServiceProvider.GetRequiredService<DeviceManagmentDatabaseContext>();
Result result = deviceStatusService.UpdateDeviceStatus(device);
if (result.IsFailed)
{
return result;
}
_ = deviceManagmentDatabaseContext.Update(device);
return await Result.Try(Task () => deviceManagmentDatabaseContext.SaveChangesAsync());
}
}
src/Elektrifikatsiya/Elektrifikatsiya/Services/Implementations/DeviceStatusService.cs
+8 -1
View File
@@ -6,10 +6,15 @@ namespace Elektrifikatsiya.Services.Implementations;
public class DeviceStatusService : IDeviceStatusService
{
public event EventHandler<DeviceStatusChagedEventArgs>? OnDeviceStatusChanged;
private readonly ILogger<DeviceStatusService> logger;
public event EventHandler<DeviceStatusChagedEventArgs>? OnDeviceStatusChanged;
private readonly Dictionary<string, Device> devices = new();
public DeviceStatusService(ILogger<DeviceStatusService> logger)
{
this.logger = logger;
}
public Result<List<Device>> GetDevices()
{
return devices.Values.ToList();
@@ -41,6 +46,8 @@ public class DeviceStatusService : IDeviceStatusService
return Result.Fail("Device already tracked!");
}
logger.LogInformation("Tracking new Device {device}", device.IpAddress);
devices[device.MacAddress] = device;
return Result.Ok();
src/Elektrifikatsiya/Elektrifikatsiya/Services/Implementations/UpdateService.cs
+7 -4
View File
@@ -10,19 +10,22 @@ public class UpdateService : IHostedService, IDisposable
{
private readonly ILogger<UpdateService> logger;
private readonly IDeviceStatusService deviceStatusService;
private readonly DeviceManagmentDatabaseContext deviceManagmentDatabaseContext;
private readonly IServiceScopeFactory serviceScopeFactory;
private Timer? timer = null;
public UpdateService(ILogger<UpdateService> logger, IDeviceStatusService deviceStatusService, DeviceManagmentDatabaseContext deviceManagmentDatabaseContext)
public UpdateService(ILogger<UpdateService> logger, IDeviceStatusService deviceStatusService, IServiceScopeFactory serviceScopeFactory)
{
this.logger = logger;
this.deviceStatusService = deviceStatusService;
this.deviceManagmentDatabaseContext = deviceManagmentDatabaseContext;
this.serviceScopeFactory = serviceScopeFactory;
}
public async Task StartAsync(CancellationToken cancellationToken)
{
logger.LogInformation("Starting update service...");
IServiceScope serviceScope = serviceScopeFactory.CreateScope();
DeviceManagmentDatabaseContext deviceManagmentDatabaseContext = serviceScope.ServiceProvider.GetRequiredService<DeviceManagmentDatabaseContext>();
logger.LogInformation("Starting update service...");
foreach (Device device in await deviceManagmentDatabaseContext.Devices.AsNoTracking().ToListAsync(cancellationToken))
{
src/Elektrifikatsiya/Elektrifikatsiya/Utilities/MdnsDiscovery.cs
+25
View File
@@ -0,0 +1,25 @@
using System.Net;
using Tmds.MDns;
namespace Elektrifikatsiya.Utilities;
public static class MdnsDiscovery
{
public static event Action<IPAddress> OnDeviceFound = null!;
private static readonly ServiceBrowser serviceBrowser = new ServiceBrowser();
static MdnsDiscovery()
{
serviceBrowser.StartBrowse("_http._tcp");
serviceBrowser.ServiceAdded += (_, eventArgs) => OnDeviceFound?.Invoke(eventArgs.Announcement.Addresses.First());
serviceBrowser.ServiceChanged += (_, eventArgs) => OnDeviceFound?.Invoke(eventArgs.Announcement.Addresses.First());
serviceBrowser.ServiceRemoved += (_, eventArgs) => OnDeviceFound?.Invoke(eventArgs.Announcement.Addresses.First());
}
public static IEnumerable<IPAddress> GetChachedDevices()
{
return serviceBrowser.Services.Select(s => s.Addresses.First());
}
}