WingMan – Diff between revs 5 and 6

Subversion Repositories:

?pathlinks?

Rev 5 – Go to most recent revision – Details – Blame – Last modification – View Log

 ï»¿using System;
 using System.Net;
+using System.Threading;
 using System.Threading.Tasks;
 using MQTTnet;
 using MQTTnet.Client;
 using MQTTnet.Extensions.ManagedClient;
 using MQTTnet.Server;
 namespace WingMan.Communication
+{
     public class MQTTCommunication
     {
-        public MQTTCommunication(IPAddress ipAddress, int port, string nick) :this()
+        public MQTTCommunication(TaskScheduler taskScheduler)
         {
-            IPAddress = ipAddress;
-            Port = port;
+            TaskScheduler = taskScheduler;
-            Nick = nick;
-        }
-        public MQTTCommunication()
+            CancellationTokenSource = new CancellationTokenSource();
             Client = new MqttFactory().CreateManagedMqttClient();
+            Server = new MqttFactory().CreateMqttServer();
+        }
             Server = new MqttFactory().CreateMqttServer();
         private TaskScheduler TaskScheduler { get; set; }
         private IPAddress IPAddress { get; set; }
+        private int Port { get; set; }
-        private int Port { get; set; }
+        private CancellationTokenSource CancellationTokenSource { get; set; }
             Client.Disconnected -= ClientOnDisconnected;
             Client.ConnectingFailed -= ClientOnConnectingFailed;
             Client.ApplicationMessageReceived -= ClientOnApplicationMessageReceived;
+        }
-        private void ClientOnApplicationMessageReceived(object sender, MqttApplicationMessageReceivedEventArgs e)
+        private async void ClientOnApplicationMessageReceived(object sender, MqttApplicationMessageReceivedEventArgs e)
         {
+            await Task.Delay(0).ContinueWith(_ => OnMessageReceived?.Invoke(sender, e),
-            OnMessageReceived?.Invoke(sender, e);
+                CancellationTokenSource.Token, TaskContinuationOptions.None, TaskScheduler);
         }
-        private void ClientOnConnectingFailed(object sender, MqttManagedProcessFailedEventArgs e)
+        private async void ClientOnConnectingFailed(object sender, MqttManagedProcessFailedEventArgs e)
+        {
             await Task.Delay(0).ContinueWith(_ => OnClientConnectionFailed?.Invoke(sender, e),
-            OnClientConnectionFailed?.Invoke(sender, e);
+                CancellationTokenSource.Token, TaskContinuationOptions.None, TaskScheduler).ConfigureAwait(false);
+        }
+        private async void ClientOnDisconnected(object sender, MqttClientDisconnectedEventArgs e)
         private void ClientOnDisconnected(object sender, MqttClientDisconnectedEventArgs e)
-        {
+            await Task.Delay(0).ContinueWith(_ => OnClientDisconnected?.Invoke(sender, e),
-            OnClientDisconnected?.Invoke(sender, e);
+                CancellationTokenSource.Token, TaskContinuationOptions.None, TaskScheduler).ConfigureAwait(false);
         }
         private async void ClientOnConnected(object sender, MqttClientConnectedEventArgs e)
         private void ClientOnConnected(object sender, MqttClientConnectedEventArgs e)
             await Task.Delay(0).ContinueWith(_ => OnClientConnected?.Invoke(sender, e),
-            OnClientConnected?.Invoke(sender, e);
+                CancellationTokenSource.Token, TaskContinuationOptions.None, TaskScheduler).ConfigureAwait(false);
             Server.ClientSubscribedTopic -= ServerOnClientSubscribedTopic;
             Server.ClientUnsubscribedTopic -= ServerOnClientUnsubscribedTopic;
             Server.ApplicationMessageReceived -= ServerOnApplicationMessageReceived;
+        }
-        private void ServerOnApplicationMessageReceived(object sender, MqttApplicationMessageReceivedEventArgs e)
+        private async void ServerOnApplicationMessageReceived(object sender, MqttApplicationMessageReceivedEventArgs e)
         {
+            await Task.Delay(0).ContinueWith(_ => OnMessageReceived?.Invoke(sender, e),
-            OnMessageReceived?.Invoke(sender, e);
+                CancellationTokenSource.Token, TaskContinuationOptions.None, TaskScheduler).ConfigureAwait(false);
         }
-        private void ServerOnClientUnsubscribedTopic(object sender, MqttClientUnsubscribedTopicEventArgs e)
+        private async void ServerOnClientUnsubscribedTopic(object sender, MqttClientUnsubscribedTopicEventArgs e)
+        {
             await Task.Delay(0).ContinueWith(_ => OnClientUnsubscribed?.Invoke(sender, e),
-            OnClientUnsubscribed?.Invoke(sender, e);
+                CancellationTokenSource.Token, TaskContinuationOptions.None, TaskScheduler).ConfigureAwait(false);
+        }
+        private async void ServerOnClientSubscribedTopic(object sender, MqttClientSubscribedTopicEventArgs e)
         private void ServerOnClientSubscribedTopic(object sender, MqttClientSubscribedTopicEventArgs e)
-        {
+            await Task.Delay(0).ContinueWith(_ => OnClientSubscribed?.Invoke(sender, e),
-            OnClientSubscribed?.Invoke(sender, e);
+                CancellationTokenSource.Token, TaskContinuationOptions.None, TaskScheduler).ConfigureAwait(false);
         }
         private async void ServerOnClientDisconnected(object sender, MQTTnet.Server.MqttClientDisconnectedEventArgs e)
-        private void ServerOnClientDisconnected(object sender, MQTTnet.Server.MqttClientDisconnectedEventArgs e)
+        {
             await Task.Delay(0).ContinueWith(_ => OnServerClientDisconnected?.Invoke(sender, e),
-            OnServerClientDisconnected?.Invoke(sender, e);
+                CancellationTokenSource.Token, TaskContinuationOptions.None, TaskScheduler).ConfigureAwait(false);
+        }
         private async void ServerOnClientConnected(object sender, MQTTnet.Server.MqttClientConnectedEventArgs e)
         private void ServerOnClientConnected(object sender, MQTTnet.Server.MqttClientConnectedEventArgs e)
             await Task.Delay(0).ContinueWith(_ => OnServerClientConnected?.Invoke(sender, e),