saji/OmniLinkBridge
1
0
Fork 0
mirror of https://github.com/excaliburpartners/OmniLinkBridge synced 2024-12-22 18:52:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix controller reconnect issue and async cleanup

Browse source
This commit is contained in:
Ryan Wagoner 2021-12-14 01:13:43 -05:00
parent 2f652f7c8a
commit e7613741d3
2 changed files with 19 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
OmniLinkBridge/Modules/MQTTModule.cs
View file

@ -97,7 +97,7 @@ namespace OmniLinkBridge.Modules
MqttClient.ConnectingFailedHandler = new ConnectingFailedHandlerDelegate((e) => log.Error("Error connecting {reason}", e.Exception.Message)); MqttClient.ConnectingFailedHandler = new ConnectingFailedHandlerDelegate((e) => log.Error("Error connecting {reason}", e.Exception.Message));
MqttClient.DisconnectedHandler = new MqttClientDisconnectedHandlerDelegate((e) => log.Debug("Disconnected")); MqttClient.DisconnectedHandler = new MqttClientDisconnectedHandlerDelegate((e) => log.Debug("Disconnected"));
MqttClient.StartAsync(manoptions); MqttClient.StartAsync(manoptions).Wait();
MqttClient.ApplicationMessageReceivedHandler = new MqttApplicationMessageReceivedHandlerDelegate((e) => MqttClient.ApplicationMessageReceivedHandler = new MqttApplicationMessageReceivedHandlerDelegate((e) =>
MessageProcessor.Process(e.ApplicationMessage.Topic, Encoding.UTF8.GetString(e.ApplicationMessage.Payload))); MessageProcessor.Process(e.ApplicationMessage.Topic, Encoding.UTF8.GetString(e.ApplicationMessage.Payload)));
@ -126,7 +126,7 @@ namespace OmniLinkBridge.Modules
PublishControllerStatus(OFFLINE); PublishControllerStatus(OFFLINE);
MqttClient.StopAsync(); MqttClient.StopAsync().Wait();
} }
public void Shutdown() public void Shutdown()
@ -406,7 +406,7 @@ namespace OmniLinkBridge.Modules
continue; continue;
} }
PublishMessageState(message); PublishMessageStateAsync(message);
PublishAsync(message.ToTopic(Topic.name), message.Name); PublishAsync(message.ToTopic(Topic.name), message.Name);
} }
@ -477,7 +477,7 @@ namespace OmniLinkBridge.Modules
if (!MqttClient.IsConnected) if (!MqttClient.IsConnected)
return; return;
await PublishButtonState(e.Button); await PublishButtonStateAsync(e.Button);
} }
private void OmniLink_OnMessageStatus(object sender, MessageStatusEventArgs e) private void OmniLink_OnMessageStatus(object sender, MessageStatusEventArgs e)
@ -485,7 +485,7 @@ namespace OmniLinkBridge.Modules
if (!MqttClient.IsConnected) if (!MqttClient.IsConnected)
return; return;
PublishMessageState(e.Message); PublishMessageStateAsync(e.Message);
} }
private void OmniLink_OnSystemStatus(object sender, SystemStatusEventArgs e) private void OmniLink_OnSystemStatus(object sender, SystemStatusEventArgs e)
@ -547,7 +547,7 @@ namespace OmniLinkBridge.Modules
PublishAsync(thermostat.ToTopic(Topic.hold_state), thermostat.HoldStatusText().ToLower()); PublishAsync(thermostat.ToTopic(Topic.hold_state), thermostat.HoldStatusText().ToLower());
} }
private async Task PublishButtonState(clsButton button) private async Task PublishButtonStateAsync(clsButton button)
{ {
// Simulate a momentary press // Simulate a momentary press
await PublishAsync(button.ToTopic(Topic.state), "ON"); await PublishAsync(button.ToTopic(Topic.state), "ON");
@ -555,9 +555,9 @@ namespace OmniLinkBridge.Modules
await PublishAsync(button.ToTopic(Topic.state), "OFF"); await PublishAsync(button.ToTopic(Topic.state), "OFF");
} }
private void PublishMessageState(clsMessage message) private Task PublishMessageStateAsync(clsMessage message)
{ {
PublishAsync(message.ToTopic(Topic.state), message.ToState()); return PublishAsync(message.ToTopic(Topic.state), message.ToState());
} }
private Task PublishAsync(string topic, string payload) private Task PublishAsync(string topic, string payload)

72
OmniLinkBridge/Modules/OmniLinkII.cs
View file

@ -95,17 +95,19 @@ namespace OmniLinkBridge.Modules
{ {
retry = DateTime.Now.AddMinutes(1); retry = DateTime.Now.AddMinutes(1);
log.Debug("Controller: {connectionStatus}", "Connect");
Controller.Connection.Connect(HandleConnectStatus, HandleUnsolicitedPackets); Controller.Connection.Connect(HandleConnectStatus, HandleUnsolicitedPackets);
} }
} }
private void Disconnect() private void Disconnect()
{ {
log.Debug("Controller Status: {connectionStatus}", "Disconnecting");
if (Controller.Connection.ConnectionState != enuOmniLinkConnectionState.Offline) if (Controller.Connection.ConnectionState != enuOmniLinkConnectionState.Offline)
{
log.Debug("Controller: {connectionStatus}", "Disconnect");
Controller.Connection.Disconnect(); Controller.Connection.Disconnect();
} }
}
private void HandleConnectStatus(enuOmniLinkCommStatus CS) private void HandleConnectStatus(enuOmniLinkCommStatus CS)
{ {
@ -135,61 +137,8 @@ namespace OmniLinkBridge.Modules
log.Warning("Controller Status: {connectionStatus}", status); log.Warning("Controller Status: {connectionStatus}", status);
break; break;
case enuOmniLinkCommStatus.NoReply:
case enuOmniLinkCommStatus.UnrecognizedReply:
case enuOmniLinkCommStatus.UnsupportedProtocol:
case enuOmniLinkCommStatus.ClientSessionTerminated:
case enuOmniLinkCommStatus.ControllerSessionTerminated:
case enuOmniLinkCommStatus.CannotStartNewSession:
case enuOmniLinkCommStatus.LoginFailed:
case enuOmniLinkCommStatus.UnableToOpenSocket:
case enuOmniLinkCommStatus.UnableToConnect:
case enuOmniLinkCommStatus.SocketClosed:
case enuOmniLinkCommStatus.UnexpectedError:
case enuOmniLinkCommStatus.UnableToCreateSocket:
case enuOmniLinkCommStatus.PermissionDenied:
case enuOmniLinkCommStatus.BadAddress:
case enuOmniLinkCommStatus.InvalidArgument:
case enuOmniLinkCommStatus.TooManyOpenFiles:
case enuOmniLinkCommStatus.ResourceTemporarilyUnavailable:
case enuOmniLinkCommStatus.SocketOperationOnNonSocket:
case enuOmniLinkCommStatus.DestinationAddressRequired:
case enuOmniLinkCommStatus.MessgeTooLong:
case enuOmniLinkCommStatus.WrongProtocolType:
case enuOmniLinkCommStatus.BadProtocolOption:
case enuOmniLinkCommStatus.ProtocolNotSupported:
case enuOmniLinkCommStatus.SocketTypeNotSupported:
case enuOmniLinkCommStatus.OperationNotSupported:
case enuOmniLinkCommStatus.ProtocolFamilyNotSupported:
case enuOmniLinkCommStatus.AddressFamilyNotSupported:
case enuOmniLinkCommStatus.AddressInUse:
case enuOmniLinkCommStatus.AddressNotAvailable:
case enuOmniLinkCommStatus.NetworkIsDown:
case enuOmniLinkCommStatus.NetworkIsUnreachable:
case enuOmniLinkCommStatus.NetworkReset:
case enuOmniLinkCommStatus.ConnectionAborted:
case enuOmniLinkCommStatus.ConnectionResetByPeer:
case enuOmniLinkCommStatus.NoBufferSpaceAvailable:
case enuOmniLinkCommStatus.NotConnected:
case enuOmniLinkCommStatus.CannotSendAfterShutdown:
case enuOmniLinkCommStatus.ConnectionTimedOut:
case enuOmniLinkCommStatus.ConnectionRefused:
case enuOmniLinkCommStatus.HostIsDown:
case enuOmniLinkCommStatus.HostUnreachable:
case enuOmniLinkCommStatus.TooManyProcesses:
case enuOmniLinkCommStatus.NetworkSubsystemIsUnavailable:
case enuOmniLinkCommStatus.UnsupportedVersion:
case enuOmniLinkCommStatus.NotInitialized:
case enuOmniLinkCommStatus.ShutdownInProgress:
case enuOmniLinkCommStatus.ClassTypeNotFound:
case enuOmniLinkCommStatus.HostNotFound:
case enuOmniLinkCommStatus.HostNotFoundTryAgain:
case enuOmniLinkCommStatus.NonRecoverableError:
case enuOmniLinkCommStatus.NoDataOfRequestedType:
log.Error("Controller Status: {connectionStatus}", status);
break;
default: default:
log.Error("Controller Status: {connectionStatus}", status);
break; break;
} }
} }
@ -203,7 +152,7 @@ namespace OmniLinkBridge.Modules
} }
} }
private void HandleIdentifyController(clsOmniLinkMessageQueueItem M, byte[] B, bool Timeout) private async void HandleIdentifyController(clsOmniLinkMessageQueueItem M, byte[] B, bool Timeout)
{ {
if (Timeout) if (Timeout)
return; return;
@ -229,8 +178,7 @@ namespace OmniLinkBridge.Modules
log.Information("Controller is {ControllerModel} firmware {ControllerVersion}", log.Information("Controller is {ControllerModel} firmware {ControllerVersion}",
Controller.GetModelText(), Controller.GetVersionText()); Controller.GetModelText(), Controller.GetVersionText());
_ = Connected(); await ConnectedAsync();
return; return;
} }
@ -239,7 +187,7 @@ namespace OmniLinkBridge.Modules
} }
} }
private async Task Connected() private async Task ConnectedAsync()
{ {
retry = DateTime.MinValue; retry = DateTime.MinValue;
@ -768,7 +716,9 @@ namespace OmniLinkBridge.Modules
foreach (KeyValuePair<ushort, DateTime> tstat in tstats) foreach (KeyValuePair<ushort, DateTime> tstat in tstats)
{ {
// Poll every 4 minutes if no prior update // Poll every 4 minutes if no prior update
if (RoundToMinute(tstat.Value).AddMinutes(4) <= RoundToMinute(DateTime.Now)) if (RoundToMinute(tstat.Value).AddMinutes(4) <= RoundToMinute(DateTime.Now) &&
(Controller.Connection.ConnectionState == enuOmniLinkConnectionState.Online ||
Controller.Connection.ConnectionState == enuOmniLinkConnectionState.OnlineSecure))
{ {
Controller.Connection.Send(new clsOL2MsgRequestExtendedStatus(Controller.Connection, enuObjectType.Thermostat, tstat.Key, tstat.Key), HandleRequestThermostatStatus); Controller.Connection.Send(new clsOL2MsgRequestExtendedStatus(Controller.Connection, enuObjectType.Thermostat, tstat.Key, tstat.Key), HandleRequestThermostatStatus);