HomeAssistant
/
hass-workstation-service
mirror of https://github.com/sleevezipper/hass-workstation-service.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor so we don't need appsettings.json, further configure clickonce

Browse Source
pull/9/head
sleevezipper 4 years ago
parent a3125734ec
commit c91dd25353
8 changed files with 95 additions and 46 deletions
Show Stats Download Patch File Download Diff File

BIN
.vs/hass-workstation-service/v16/.suo
View File

Binary file not shown.

18
Communication/MQTT/MqttPublisher.cs
Unescape View File

@ -3,6 +3,7 @@ using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
using hass_workstation_service.Communication.Util;
using hass_workstation_service.Data;
using Microsoft.Extensions.Logging;
using MQTTnet;
using MQTTnet.Client;
@ -16,31 +17,40 @@ namespace hass_workstation_service.Communication
{
private readonly IMqttClient _mqttClient;
private readonly ILogger<MqttPublisher> _logger;
private readonly ConfigurationService _configurationService;
public DateTime LastConfigAnnounce { get; private set; }
public DeviceConfigModel DeviceConfigModel { get; private set; }
public bool IsConnected
{
get
{
if (this._mqttClient == null)
{
return false;
}
else
{
return this._mqttClient.IsConnected;
}
}
}
public MqttPublisher(
ILogger<MqttPublisher> logger,
IMqttClientOptions options,
DeviceConfigModel deviceConfigModel)
DeviceConfigModel deviceConfigModel,
ConfigurationService configurationService)
{
this._logger = logger;
this.DeviceConfigModel = deviceConfigModel;
this._configurationService = configurationService;
var options = _configurationService.ReadMqttSettings().Result;
var factory = new MqttFactory();
this._mqttClient = factory.CreateMqttClient();
// connect to the broker
var result = this._mqttClient.ConnectAsync(options).Result;
this._mqttClient.ConnectAsync(options);
// configure what happens on disconnect
this._mqttClient.UseDisconnectedHandler(async e =>
{

58
Data/ConfiguredSensorsService.cs → Data/ConfigurationService.cs
Unescape View File

@ -3,30 +3,30 @@ using System.Collections.Generic;
using System.IO;
using System.IO.IsolatedStorage;
using System.Text.Json;
using System.Threading.Tasks;
using hass_workstation_service.Communication;
using hass_workstation_service.Domain.Sensors;
using Microsoft.Extensions.Configuration;
using MQTTnet;
using MQTTnet.Client;
using MQTTnet.Client.Options;
using Serilog;
namespace hass_workstation_service.Data
{
public class ConfiguredSensorsService
public class ConfigurationService
{
public ICollection<AbstractSensor> ConfiguredSensors { get; private set; }
public IConfiguration Configuration { get; private set; }
private readonly MqttPublisher _publisher;
private readonly IsolatedStorageFile _fileStorage;
public ConfiguredSensorsService(MqttPublisher publisher)
public ConfigurationService()
{
this._fileStorage = IsolatedStorageFile.GetUserStoreForApplication();
ConfiguredSensors = new List<AbstractSensor>();
_publisher = publisher;
ReadSettings();
}
public async void ReadSettings()
public async void ReadSensorSettings(MqttPublisher publisher)
{
IsolatedStorageFileStream stream = this._fileStorage.OpenFile("configured-sensors.json", FileMode.OpenOrCreate);
Log.Logger.Information($"reading configured sensors from: {stream.Name}");
@ -35,25 +35,53 @@ namespace hass_workstation_service.Data
{
sensors = await JsonSerializer.DeserializeAsync<List<ConfiguredSensor>>(stream);
}
stream.Close();
foreach (ConfiguredSensor configuredSensor in sensors)
{
AbstractSensor sensor;
#pragma warning disable IDE0066
switch (configuredSensor.Type)
{
case "UserNotificationStateSensor":
sensor = new UserNotificationStateSensor(_publisher, configuredSensor.Name, configuredSensor.Id);
sensor = new UserNotificationStateSensor(publisher, configuredSensor.Name, configuredSensor.Id);
break;
case "DummySensor":
sensor = new DummySensor(_publisher, configuredSensor.Name, configuredSensor.Id);
sensor = new DummySensor(publisher, configuredSensor.Name, configuredSensor.Id);
break;
default:
throw new InvalidOperationException("unsupported sensor type in config");
}
this.ConfiguredSensors.Add(sensor);
}
}
public async Task<IMqttClientOptions> ReadMqttSettings()
{
IsolatedStorageFileStream stream = this._fileStorage.OpenFile("mqttbroker.json", FileMode.OpenOrCreate);
Log.Logger.Information($"reading configured mqttbroker from: {stream.Name}");
ConfiguredMqttBroker configuredBroker = null;
if (stream.Length > 0)
{
configuredBroker = await JsonSerializer.DeserializeAsync<ConfiguredMqttBroker>(stream);
}
stream.Close();
if (configuredBroker != null)
{
var mqttClientOptions = new MqttClientOptionsBuilder()
.WithTcpServer(configuredBroker.Host)
// .WithTls()
.WithCredentials(configuredBroker.Username, configuredBroker.Password.ToString())
.Build();
return mqttClientOptions;
}
else
{
//for now we return defaults until we can actually configure this
return new MqttClientOptionsBuilder()
.WithTcpServer("192.168.2.6")
// .WithTls()
.WithCredentials("tester", "tester")
.Build();
}
}
public async void WriteSettings()
@ -64,7 +92,7 @@ namespace hass_workstation_service.Data
foreach (AbstractSensor sensor in this.ConfiguredSensors)
{
configuredSensorsToSave.Add(new ConfiguredSensor(){Id = sensor.Id, Name = sensor.Name, Type = sensor.GetType().Name});
configuredSensorsToSave.Add(new ConfiguredSensor() { Id = sensor.Id, Name = sensor.Name, Type = sensor.GetType().Name });
}
await JsonSerializer.SerializeAsync(stream, configuredSensorsToSave);
@ -76,5 +104,11 @@ namespace hass_workstation_service.Data
this.ConfiguredSensors.Add(sensor);
WriteSettings();
}
public void AddConfiguredSensors(List<AbstractSensor> sensors)
{
sensors.ForEach((sensor) => this.ConfiguredSensors.Add(sensor));
WriteSettings();
}
}
}

12
Data/ConfiguredMqttBroker.cs
Unescape View File

@ -0,0 +1,12 @@
using System;
using System.Security;
namespace hass_workstation_service.Data
{
public class ConfiguredMqttBroker
{
public string Host { get; set; }
public string Username { get; set; }
public SecureString Password { get; set; }
}
}

17
Program.cs
Unescape View File

@ -75,21 +75,8 @@ namespace hass_workstation_service
public static IHostBuilder CreateHostBuilder(string[] args) =>
Host.CreateDefaultBuilder(args)
.UseSerilog()
.ConfigureAppConfiguration((hostingContext, config) =>
{
config
.SetBasePath(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location))
.AddJsonFile("appsettings.json");
})
.ConfigureServices((hostContext, services) =>
{
IConfiguration configuration = hostContext.Configuration;
IConfigurationSection mqttSection = configuration.GetSection("MqttBroker");
var mqttClientOptions = new MqttClientOptionsBuilder()
.WithTcpServer(mqttSection.GetValue<string>("Host"))
// .WithTls()
.WithCredentials(mqttSection.GetValue<string>("Username"), mqttSection.GetValue<string>("Password"))
.Build();
var deviceConfig = new DeviceConfigModel
{
Name = Environment.MachineName,
@ -98,10 +85,8 @@ namespace hass_workstation_service
Model = Environment.OSVersion.ToString(),
Sw_version = Assembly.GetExecutingAssembly().GetName().Version.ToString()
};
services.AddSingleton(configuration);
services.AddSingleton(deviceConfig);
services.AddSingleton(mqttClientOptions);
services.AddSingleton<ConfiguredSensorsService>();
services.AddSingleton<ConfigurationService>();
services.AddSingleton<MqttPublisher>();
services.AddHostedService<Worker>();
});

13
Properties/PublishProfiles/ClickOnceProfile.pubxml
Unescape View File

@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ApplicationRevision>4</ApplicationRevision>
<ApplicationRevision>11</ApplicationRevision>
<ApplicationVersion>1.0.0.*</ApplicationVersion>
<BootstrapperEnabled>True</BootstrapperEnabled>
<Configuration>Release</Configuration>
@ -22,15 +22,20 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PublishDir>bin\publish\</PublishDir>
<PublishUrl>bin\publish\</PublishUrl>
<PublishProtocol>ClickOnce</PublishProtocol>
<PublishReadyToRun>False</PublishReadyToRun>
<PublishSingleFile>False</PublishSingleFile>
<PublishReadyToRun>True</PublishReadyToRun>
<PublishSingleFile>True</PublishSingleFile>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<SelfContained>False</SelfContained>
<SignatureAlgorithm>sha256RSA</SignatureAlgorithm>
<SignManifests>True</SignManifests>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TrustUrlParameters>False</TrustUrlParameters>
<UpdateEnabled>False</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
</PropertyGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.NetCore.CoreRuntime.3.1.x64">
<Install>true</Install>
<ProductName>.NET Core Runtime 3.1.10 (x64)</ProductName>
</BootstrapperPackage>
</ItemGroup>
</Project>

20
Worker.cs
Unescape View File

@ -15,20 +15,23 @@ namespace hass_workstation_service
public class Worker : BackgroundService
{
private readonly ILogger<Worker> _logger;
private readonly ConfiguredSensorsService _configuredSensorsService;
private readonly ConfigurationService _configurationService;
private readonly MqttPublisher _mqttPublisher;
public Worker(ILogger<Worker> logger,
ConfiguredSensorsService configuredSensorsService,
ConfigurationService configuredSensorsService,
MqttPublisher mqttPublisher)
{
_logger = logger;
this._configuredSensorsService = configuredSensorsService;
this._configurationService = configuredSensorsService;
this._mqttPublisher = mqttPublisher;
}
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{
_configurationService.ReadSensorSettings(_mqttPublisher);
while (!_mqttPublisher.IsConnected)
{
_logger.LogInformation($"Connecting to MQTT broker...");
@ -36,12 +39,11 @@ namespace hass_workstation_service
}
_logger.LogInformation("Connected. Sending auto discovery messages.");
// if there are no configured sensors we add a dummy sensor
if (_configuredSensorsService.ConfiguredSensors.Count == 0)
if (_configurationService.ConfiguredSensors.Count == 0)
{
_configuredSensorsService.AddConfiguredSensor(new DummySensor(_mqttPublisher));
_configuredSensorsService.AddConfiguredSensor(new UserNotificationStateSensor(_mqttPublisher));
_configurationService.AddConfiguredSensors(new List<AbstractSensor>() { new DummySensor(_mqttPublisher), new UserNotificationStateSensor(_mqttPublisher) });
}
foreach (AbstractSensor sensor in _configuredSensorsService.ConfiguredSensors)
foreach (AbstractSensor sensor in _configurationService.ConfiguredSensors)
{
await sensor.PublishAutoDiscoveryConfigAsync();
}
@ -49,14 +51,14 @@ namespace hass_workstation_service
{
_logger.LogDebug("Worker running at: {time}", DateTimeOffset.Now);
foreach (AbstractSensor sensor in _configuredSensorsService.ConfiguredSensors)
foreach (AbstractSensor sensor in _configurationService.ConfiguredSensors)
{
await sensor.PublishStateAsync();
}
// announce autodiscovery every 30 seconds
if (_mqttPublisher.LastConfigAnnounce < DateTime.UtcNow.AddSeconds(-30))
{
foreach (AbstractSensor sensor in _configuredSensorsService.ConfiguredSensors)
foreach (AbstractSensor sensor in _configurationService.ConfiguredSensors)
{
await sensor.PublishAutoDiscoveryConfigAsync();
}

1
hass-workstation-service.csproj
Unescape View File

@ -4,6 +4,7 @@
<TargetFramework>netcoreapp3.1</TargetFramework>
<UserSecretsId>dotnet-hass_workstation_service-C65C2EBE-1977-4C24-AC6B-6921877E1390</UserSecretsId>
<RootNamespace>hass_workstation_service</RootNamespace>
<OutputType>WinExe</OutputType>
</PropertyGroup>
<ItemGroup>

Write Preview
Loading…
Cancel
Save