Winify – Diff between revs 80 and 83

Subversion Repositories:

?pathlinks?

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

         private readonly Stopwatch _webSocketsClientPingStopWatch;
         private readonly ScheduledContinuation _webSocketsServerResponseScheduledContinuation;
         private Task _retrievePastMessagesTask;
+        private static JsonSerializer _jsonSerializer;
+        private readonly CancellationToken _programCancellationToken;
+        private CancellationTokenSource _localCancellationTokenSource;
-        private static JsonSerializer _jsonSerializer;
+        private CancellationToken _localCancellationToken;
             _tplWebSocketsBufferBlockTransformLink = _webSocketMessageBufferBlock.LinkTo(webSocketActionBlock,
                 new DataflowLinkOptions { PropagateCompletion = true });
         }
-        public GotifyConnection(Server server, Configuration.Configuration configuration) : this()
+        public GotifyConnection(Server server, Configuration.Configuration configuration, CancellationToken cancellationToken) : this()
+        {
+            _server = server;
-            _server = server;
+            _configuration = configuration;
-            _configuration = configuration;
+            _programCancellationToken = cancellationToken;
             ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
             _webSocketsUri = combinedUri;
+        }
         public void Dispose()
         {
-            if (_cancellationTokenSource != null)
+            if (_localCancellationTokenSource != null)
             {
-                _cancellationTokenSource.Dispose();
+                _localCancellationTokenSource.Dispose();
-                _cancellationTokenSource = null;
+                _localCancellationTokenSource = null;
+            }
             if (_tplWebSocketsBufferBlockTransformLink != null)
         #endregion
+        #region Public Methods
+        public async Task Stop()
+        {
+            _localCancellationTokenSource.Cancel();
+            if (_heartBeatTask != null)
+            {
+                await _heartBeatTask;
+            }
+            if (_retrievePastMessagesTask != null)
+            {
+                await _retrievePastMessagesTask;
+            }
+            if (_webSocketSharp != null)
+            {
+                _webSocketSharp.OnMessage -= WebSocketSharp_OnMessage;
+                _webSocketSharp.OnError -= WebSocketSharp_OnError;
+                _webSocketSharp.OnOpen -= WebSocketSharp_OnOpen;
+                _webSocketSharp.OnClose -= WebSocketSharp_OnClose;
+                _webSocketSharp.Close();
+                _webSocketSharp = null;
+            }
         #region Public Methods
         public void Start()
+        {
             if (_webSocketsUri == null || _httpUri == null)
+            {
+                Log.Error("Could not start connection to server due to unreadable URLs");
-                Log.Error("Could not start connection to server due to unreadable URLs");
+                return;
+            }
-                return;
+            _localCancellationTokenSource = new CancellationTokenSource();
             _localCancellationToken = _localCancellationTokenSource.Token;
-            _cancellationTokenSource = new CancellationTokenSource();
+            _cancellationTokenSource = CancellationTokenSource.CreateLinkedTokenSource(new [] { _programCancellationToken, _localCancellationToken });
+            }
+        }
         private async void WebSocketSharp_OnClose(object sender, CloseEventArgs e)
-        {
-            Log.Information(
+        {
+            Log.Information($"WebSockets connection to server {_webSocketsUri.AbsoluteUri} closed with reason {e.Reason}");
-                $"WebSockets connection to server {_webSocketsUri.AbsoluteUri} closed with reason {e.Reason}");
+            try
+            {
-            await Task.Delay(TimeSpan.FromSeconds(1), _cancellationToken);
+                await Task.Delay(TimeSpan.FromSeconds(1), _programCancellationToken);
+                Log.Information($"Reconnecting to websocket server {_webSocketsUri.AbsoluteUri}");
+                await Stop().ContinueWith(task => Start(), _programCancellationToken);
+            }
             catch (Exception exception)
             Log.Information($"Reconnecting to websocket server {_webSocketsUri.AbsoluteUri}");
                 Log.Error(exception, "Error restarting WebSockets connection on connection closed.");
             await Stop().ContinueWith(task => Start(), CancellationToken.None);
         }
         private void WebSocketSharp_OnOpen(object sender, EventArgs e)
+        {
             Log.Information($"WebSockets connection to server {_webSocketsUri.AbsoluteUri} is now open");
+            _webSocketsServerResponseScheduledContinuation.Schedule(TimeSpan.FromMinutes(1), OnServerNotResponding, _cancellationToken);
+        }
-            _webSocketsServerResponseScheduledContinuation.Schedule(TimeSpan.FromMinutes(1), OnUnresponsiveServer, _cancellationToken);
-        }
+        private async void OnServerNotResponding()
+        {
+            Log.Warning($"Server {_server.Name} has not responded in a long while...");
+            try
+            {
                 await Task.Delay(TimeSpan.FromSeconds(1), _programCancellationToken);
         private async void OnUnresponsiveServer()
                 Log.Information($"Reconnecting to websocket server {_webSocketsUri.AbsoluteUri}");
             Log.Warning($"Server {_server.Name} has not responded in a long while...");
                 await Stop().ContinueWith(task => Start(), _programCancellationToken);
             await Task.Delay(TimeSpan.FromSeconds(1), _cancellationToken);
+            catch (Exception exception)
+            {
+                Log.Error(exception, "Error restarting WebSockets connection on connection closed.");
-            Log.Information($"Reconnecting to websocket server {_webSocketsUri.AbsoluteUri}");
+            }
+        }
+        private async void WebSocketSharp_OnError(object sender, ErrorEventArgs e)
+        {
+            Log.Error(
+                $"Connection to WebSockets server {_webSocketsUri.AbsoluteUri} terminated unexpectedly with message {e.Message}",
-            await Stop().ContinueWith(task => Start(), CancellationToken.None);
+                e.Exception);
             try
         private async void WebSocketSharp_OnError(object sender, ErrorEventArgs e)
                 await Task.Delay(TimeSpan.FromSeconds(1), _programCancellationToken);
             Log.Error(
-                $"Connection to WebSockets server {_webSocketsUri.AbsoluteUri} terminated unexpectedly with message {e.Message}",
+                Log.Information($"Reconnecting to websocket server {_webSocketsUri.AbsoluteUri}");
                 e.Exception);
                 await Stop().ContinueWith(task => Start(), _programCancellationToken);
             await Task.Delay(TimeSpan.FromSeconds(1), _cancellationToken);
             catch (Exception exception)
-            Log.Information($"Reconnecting to websocket server {_webSocketsUri.AbsoluteUri}");
-            await Stop().ContinueWith(task => Start(), CancellationToken.None);
-        }
-        private async void WebSocketSharp_OnMessage(object sender, MessageEventArgs e)
-        {
-            if (e.IsPing)
-            {
-                Log.Information($"Server {_server.Name} sent PING message");
-                _webSocketsServerResponseScheduledContinuation.Schedule(TimeSpan.FromMinutes(1), OnUnresponsiveServer, _cancellationToken);
-                return;
-            }
-            await _webSocketMessageBufferBlock.SendAsync(new GotifyConnectionData(e.RawData, _server), _cancellationToken);
-        }
-        public async Task Stop()
-        {
-            if (_webSocketSharp == null || _cancellationTokenSource == null)
-            {
-                return;
-            }
-            _cancellationTokenSource.Cancel();
-            if (_heartBeatTask != null)
-            {
-                await _heartBeatTask;
-            }
-            if (_retrievePastMessagesTask != null)
-            {
                 await _retrievePastMessagesTask;
                 Log.Error(exception, "Error restarting WebSockets connection on connection closed.");
+            }
                     var delta = _webSocketsClientPingStopWatch.ElapsedMilliseconds;
                     Log.Information($"PING response latency for {_server.Name} is {delta}ms");
-                    _webSocketsServerResponseScheduledContinuation.Schedule(TimeSpan.FromMinutes(1), OnUnresponsiveServer, _cancellationToken);
+                    _webSocketsServerResponseScheduledContinuation.Schedule(TimeSpan.FromMinutes(1), OnServerNotResponding, _cancellationToken);