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

use managedMqtt client to better handle reconnecting #16

Browse Source
pull/34/head
sleevezipper 4 years ago
parent 46b391aed2
commit ea82113451
5 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File

33
hass-workstation-service/Communication/MQTT/MqttPublisher.cs
Unescape View File

@ -14,6 +14,7 @@ using MQTTnet.Adapter;
using MQTTnet.Client;
using MQTTnet.Client.Options;
using MQTTnet.Exceptions;
using MQTTnet.Extensions.ManagedClient;
using Serilog;
namespace hass_workstation_service.Communication
@ -21,11 +22,12 @@ namespace hass_workstation_service.Communication
public class MqttPublisher
{
private readonly IMqttClient _mqttClient;
private readonly IManagedMqttClient _mqttClient;
private readonly ILogger<MqttPublisher> _logger;
private readonly IConfigurationService _configurationService;
private string _mqttClientMessage { get; set; }
public DateTime LastConfigAnnounce { get; private set; }
public DateTime LastAvailabilityAnnounce { get; private set; }
public DeviceConfigModel DeviceConfigModel { get; private set; }
public ICollection<AbstractCommand> Subscribers { get; private set; }
public bool IsConnected
@ -57,12 +59,11 @@ namespace hass_workstation_service.Communication
_configurationService.MqqtConfigChangedHandler = this.ReplaceMqttClient;
var factory = new MqttFactory();
this._mqttClient = factory.CreateMqttClient();
this._mqttClient = factory.CreateManagedMqttClient();
if (options != null)
{
options.WillMessage.Topic = $"homeassistant/sensor/{this.DeviceConfigModel.Name}/availability";
this._mqttClient.ConnectAsync(options);
this._mqttClient.StartAsync(options);
this._mqttClientMessage = "Connecting...";
}
else
@ -76,23 +77,10 @@ namespace hass_workstation_service.Communication
this._mqttClient.UseApplicationMessageReceivedHandler(e => this.HandleMessageReceived(e.ApplicationMessage));
// configure what happens on disconnect
this._mqttClient.UseDisconnectedHandler(async e =>
this._mqttClient.UseDisconnectedHandler(e =>
{
this._mqttClientMessage = e.ReasonCode.ToString();
if (e.ReasonCode != MQTTnet.Client.Disconnecting.MqttClientDisconnectReason.NormalDisconnection)
{
_logger.LogWarning("Disconnected from server");
await Task.Delay(TimeSpan.FromSeconds(5));
try
{
await this._mqttClient.ConnectAsync(options, CancellationToken.None);
}
catch (Exception ex)
{
_logger.LogError(ex, "Reconnecting failed");
}
}
});
}
@ -130,13 +118,13 @@ namespace hass_workstation_service.Communication
}
}
public async void ReplaceMqttClient(IMqttClientOptions options)
public async void ReplaceMqttClient(IManagedMqttClientOptions options)
{
this._logger.LogInformation($"Replacing Mqtt client with new config");
await _mqttClient.DisconnectAsync();
await _mqttClient.StopAsync();
try
{
await _mqttClient.ConnectAsync(options);
await _mqttClient.StartAsync(options);
}
catch (MqttConnectingFailedException ex)
{
@ -165,6 +153,7 @@ namespace hass_workstation_service.Communication
.WithPayload(offline ? "offline" : "online")
.Build()
);
this.LastAvailabilityAnnounce = DateTime.UtcNow;
}
else
{
@ -176,7 +165,7 @@ namespace hass_workstation_service.Communication
{
if (this._mqttClient.IsConnected)
{
await this._mqttClient.DisconnectAsync();
await this._mqttClient.InternalClient.DisconnectAsync();
}
else
{

7
hass-workstation-service/Data/ConfigurationService.cs
Unescape View File

@ -17,6 +17,7 @@ using Microsoft.Win32;
using MQTTnet;
using MQTTnet.Client;
using MQTTnet.Client.Options;
using MQTTnet.Extensions.ManagedClient;
using Serilog;
namespace hass_workstation_service.Data
@ -25,7 +26,7 @@ namespace hass_workstation_service.Data
{
public ICollection<AbstractSensor> ConfiguredSensors { get; private set; }
public ICollection<AbstractCommand> ConfiguredCommands { get; private set; }
public Action<IMqttClientOptions> MqqtConfigChangedHandler { get; set; }
public Action<IManagedMqttClientOptions> MqqtConfigChangedHandler { get; set; }
private readonly DeviceConfigModel _deviceConfigModel;
private bool BrokerSettingsFileLocked { get; set; }
@ -181,7 +182,7 @@ namespace hass_workstation_service.Data
}
}
public async Task<IMqttClientOptions> GetMqttClientOptionsAsync()
public async Task<IManagedMqttClientOptions> GetMqttClientOptionsAsync()
{
ConfiguredMqttBroker configuredBroker = await ReadMqttSettingsAsync();
if (configuredBroker != null && configuredBroker.Host != null)
@ -202,7 +203,7 @@ namespace hass_workstation_service.Data
.WithPayload("offline")
.Build())
.Build();
return mqttClientOptions;
return new ManagedMqttClientOptionsBuilder().WithClientOptions(mqttClientOptions).Build();
}
else
{

5
hass-workstation-service/Data/IConfigurationService.cs
Unescape View File

@ -3,6 +3,7 @@ using hass_workstation_service.Communication.InterProcesCommunication.Models;
using hass_workstation_service.Domain.Commands;
using hass_workstation_service.Domain.Sensors;
using MQTTnet.Client.Options;
using MQTTnet.Extensions.ManagedClient;
using System;
using System.Collections.Generic;
using System.Security;
@ -13,13 +14,13 @@ namespace hass_workstation_service.Data
public interface IConfigurationService
{
ICollection<AbstractSensor> ConfiguredSensors { get; }
Action<IMqttClientOptions> MqqtConfigChangedHandler { get; set; }
Action<IManagedMqttClientOptions> MqqtConfigChangedHandler { get; set; }
ICollection<AbstractCommand> ConfiguredCommands { get; }
void AddConfiguredCommand(AbstractCommand command);
void AddConfiguredSensor(AbstractSensor sensor);
void AddConfiguredSensors(List<AbstractSensor> sensors);
Task<IMqttClientOptions> GetMqttClientOptionsAsync();
Task<IManagedMqttClientOptions> GetMqttClientOptionsAsync();
void ReadSensorSettings(MqttPublisher publisher);
void WriteMqttBrokerSettingsAsync(MqttSettings settings);
void WriteSensorSettingsAsync();

9
hass-workstation-service/Worker.cs
Unescape View File

@ -56,6 +56,12 @@ namespace hass_workstation_service
{
_logger.LogDebug("Worker running at: {time}", DateTimeOffset.Now);
// announce autodiscovery every 30 seconds
if (_mqttPublisher.LastAvailabilityAnnounce < DateTime.UtcNow.AddSeconds(-10))
{
_mqttPublisher.AnnounceAvailability("sensor");
}
foreach (AbstractSensor sensor in sensors)
{
try
@ -91,7 +97,6 @@ namespace hass_workstation_service
{
command.PublishAutoDiscoveryConfigAsync();
}
_mqttPublisher.AnnounceAvailability("sensor");
}
await Task.Delay(1000, stoppingToken);
}
@ -100,7 +105,7 @@ namespace hass_workstation_service
public override async Task StopAsync(CancellationToken stoppingToken)
{
_mqttPublisher.AnnounceAvailability("sensor", true);
_mqttPublisher.AnnounceAvailability("sensor", true);
await _mqttPublisher.DisconnectAsync();
}

1
hass-workstation-service/hass-workstation-service.csproj
Unescape View File

@ -49,6 +49,7 @@
<PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageReference Include="MQTTnet" Version="3.0.13" />
<PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="3.0.13" />
<PackageReference Include="Serilog.Extensions.Logging.File" Version="2.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
<PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />

Write Preview
Loading…
Cancel
Save