Zzz – Diff between revs 1 and 5

Subversion Repositories:

?pathlinks?

Rev 1 – Details – Blame – Last modification – View Log

 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using MQTTnet;
 using MQTTnet.Client;
-using MQTTnet.Client.Connecting;
-using MQTTnet.Client.Disconnecting;
-using MQTTnet.Client.Options;
+using MQTTnet.Packets;
-using MQTTnet.Client.Receiving;
-using MQTTnet.Client.Subscribing;
 using Newtonsoft.Json;
 using Serilog;
 using Zzz.Action;
 using Zzz.Properties;
 using Zzz.State;
         #endregion
         #region Private Delegates, Events, Enums, Properties, Indexers and Fields
-        private IMqttClientOptions _iMqttClient;
+        private MqttClientOptions _iMqttClient;
                 var payload = JsonConvert.SerializeObject(new ZzzAction(action));
                 using (var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes(payload)))
+                {
-                    message.Payload = memoryStream.ToArray();
+                    message.PayloadSegment = new ArraySegment<byte>(memoryStream.ToArray());
                     message.Topic = _configuration.MqttTopic;
+        {
             _mqttCancellationTokenSource = new CancellationTokenSource();
             _mqttCancellationToken = _mqttCancellationTokenSource.Token;
             _mqttClient = new MqttFactory().CreateMqttClient();
-            _mqttClient.DisconnectedHandler = new MqttClientDisconnectedHandlerDelegate(MqttClientDisconnectedHandler);
+            _mqttClient.DisconnectedAsync += _mqttClient_DisconnectedAsync;
-            _mqttClient.ConnectedHandler = new MqttClientConnectedHandlerDelegate(MqttClientConnectedHandler);
-            _mqttClient.ApplicationMessageReceivedHandler =
+            _mqttClient.ConnectedAsync += _mqttClient_ConnectedAsync;
-                new MqttApplicationMessageReceivedHandlerDelegate(MqttApplicationMessageReceivedHandler);
+            _mqttClient.ApplicationMessageReceivedAsync += _mqttClient_ApplicationMessageReceivedAsync;
             _iMqttClient = BuildMqttClient(_configuration.MqttServer, (int) _configuration.MqttPort,
+            {
                 Log.Information(exception, "MQTT connection has been cancelled.");
+            }
+        }
-        public async Task Stop()
-        {
-            if (_mqttCancellationTokenSource != null)
-            {
-                _mqttCancellationTokenSource.Cancel();
-                if (_mqttClient != null && _mqttClient.IsConnected)
-                {
-                    await _mqttClient.DisconnectAsync();
-                    MqttDisconnected?.Invoke(this, EventArgs.Empty);
-                    _mqttClient?.Dispose();
-                    _mqttClient = null;
-                }
-                _mqttCancellationTokenSource = null;
-            }
-        }
-        #endregion
-        #region Private Methods
-        public async Task Restart()
-        {
-            if (!_configuration.MqttEnable)
-            {
-                await Stop();
-                return;
-            }
-            await Stop().ContinueWith(async _ => await Start());
-        }
-        private void MqttApplicationMessageReceivedHandler(MqttApplicationMessageReceivedEventArgs arg)
+        private async Task _mqttClient_ApplicationMessageReceivedAsync(MqttApplicationMessageReceivedEventArgs arg)
+        {
             // Do not bother with MQTT clients that do not set a client ID.
             if (string.IsNullOrEmpty(arg.ClientId))
+            {
                 return;
             }
-            var payload = Encoding.UTF8.GetString(arg.ApplicationMessage.Payload);
+            var payload = Encoding.UTF8.GetString(arg.ApplicationMessage.PayloadSegment.Array ?? Array.Empty<byte>());
             switch (zzzTrigger)
+            {
                 case "ACTION":
                     try
+                    {
-                        var message = (ZzzAction) JsonConvert.DeserializeObject(payload, typeof(ZzzAction));
+                        var message = (ZzzAction)JsonConvert.DeserializeObject(payload, typeof(ZzzAction));
                         if (message == null)
+                        {
                             throw new ArgumentException("Invalid action received from MQTT broker.");
                     break;
                 case "STATE":
                     try
                     {
-                        var message = (ZzzState) JsonConvert.DeserializeObject(payload, typeof(ZzzState));
+                        var message = (ZzzState)JsonConvert.DeserializeObject(payload, typeof(ZzzState));
                         if (message == null)
+                        {
                     break;
+            }
         }
-        private async Task MqttClientConnectedHandler(MqttClientConnectedEventArgs args)
+        private async Task _mqttClient_ConnectedAsync(MqttClientConnectedEventArgs arg)
+        {
             if (!_configuration.MqttEnable)
+            {
+            {
                 MqttConnectionFailed?.Invoke(this, EventArgs.Empty);
+            }
+        }
-        private async Task MqttClientDisconnectedHandler(MqttClientDisconnectedEventArgs args)
+        private async Task _mqttClient_DisconnectedAsync(MqttClientDisconnectedEventArgs arg)
+        {
             if (!_configuration.MqttEnable)
+            {
                 return;
+            {
                 Log.Warning(ex, "Disconnected from MQTT server.");
+            }
+        }
+        public async Task Stop()
+        {
+            if (_mqttCancellationTokenSource != null)
+            {
+                _mqttCancellationTokenSource.Cancel();
+                if (_mqttClient != null && _mqttClient.IsConnected)
+                {
+                    await _mqttClient.DisconnectAsync();
+                    MqttDisconnected?.Invoke(this, EventArgs.Empty);
+                    _mqttClient?.Dispose();
+                    _mqttClient = null;
+                }
+                _mqttCancellationTokenSource = null;
+            }
+        }
+        #endregion
+        #region Private Methods
+        public async Task Restart()
+        {
+            if (!_configuration.MqttEnable)
+            {
+                await Stop();
+                return;
+            }
+            await Stop().ContinueWith(async _ => await Start());
+        }
-        private static IMqttClientOptions BuildMqttClient(string server, int port, string username, string password)
+        private static MqttClientOptions BuildMqttClient(string server, int port, string username, string password)
+        {
             return new MqttClientOptionsBuilder()
-                .WithCommunicationTimeout(TimeSpan.FromMinutes(1))
+                .WithTimeout(TimeSpan.FromMinutes(1))
                 .WithTcpServer(server, port)
                 .WithCredentials(username, password)
                 .Build();