Winify – Diff between revs 3 and 12

Subversion Repositories:

?pathlinks?

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

 ï»¿using System;
 using System.Diagnostics;
 using System.Drawing;
 using System.IO;
-using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Net.WebSockets;
 using System.Text;
 using System.Threading;
         #endregion
         #region Public Methods
-        public void Start(string username, string password, string host, string port)
+        public void Start(string username, string password, string url)
+        {
-            if (!Uri.TryCreate($"ws://{host}:{port}/stream", UriKind.RelativeOrAbsolute, out var webSocketsUri))
+            if (!Uri.TryCreate(url, UriKind.Absolute, out var httpUri))
+            {
-            {
+                return;
-                return;
+            }
-            }
+            // Build the web sockets URI.
-            if (!Uri.TryCreate($"http://{host}:{port}/", UriKind.RelativeOrAbsolute, out var httpUri))
+            var webSocketsUriBuilder = new UriBuilder(httpUri);
             webSocketsUriBuilder.Scheme = "ws";
-                return;
-            }
-            _cancellationTokenSource = new CancellationTokenSource();
-            _cancellationToken = _cancellationTokenSource.Token;
+            webSocketsUriBuilder.Path = $"{webSocketsUriBuilder.Path}/stream";
-            var httpClientHandler = new HttpClientHandler
-            {
-                AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate
-            };
+            var webSocketsUri = webSocketsUriBuilder.Uri;
-            _httpClient = new HttpClient(httpClientHandler)
+            _cancellationTokenSource = new CancellationTokenSource();
             _cancellationToken = _cancellationTokenSource.Token;
                 BaseAddress = httpUri
-            };
+            _httpClient = new HttpClient();
             var auth = Convert.ToBase64String(Encoding.Default.GetBytes($"{username}:{password}"));
         #endregion
+        #region Private Methods
         #region Private Methods
         private async Task Run(Uri webSocketsUri, Uri httpUri, string username, string password,
-        private async Task Run(Uri uri, string username, string password, CancellationToken cancellationToken)
+                               CancellationToken cancellationToken)
+        {
             try
+                    {
                         _webSocketClient = new ClientWebSocket();
                         var auth = Convert.ToBase64String(Encoding.Default.GetBytes($"{username}:{password}"));
                         _webSocketClient.Options.SetRequestHeader("Authorization", $"Basic {auth}");
-                        await _webSocketClient.ConnectAsync(uri, cancellationToken);
+                        await _webSocketClient.ConnectAsync(webSocketsUri, cancellationToken);
                         do
                             if (gotifyNotification == null)
+                            {
                                 continue;
+                            }
+                            if (!Uri.TryCreate($"{httpUri}/application", UriKind.Absolute, out var applicationUri))
+                            {
+                                continue;
+                            }
-                            var applications = await _httpClient.GetStringAsync("application");
+                            var applications = await _httpClient.GetStringAsync(applicationUri);
                             var gotifyApplications = JsonConvert.DeserializeObject<GotifyApplication[]>(applications);
                             if (gotifyApplications == null)
                                 if (application.Id != gotifyNotification.AppId)
+                                {
                                     continue;
+                                }
+                                if (!Uri.TryCreate($"{httpUri}/{application.Image}", UriKind.Absolute,
+                                    out var applicationImageUri))
+                                {
+                                    continue;
+                                }
-                                var imageBytes = await _httpClient.GetByteArrayAsync(application.Image);
+                                var imageBytes = await _httpClient.GetByteArrayAsync(applicationImageUri);
                                 if (imageBytes == null || imageBytes.Length == 0)
+                                {
                                     continue;
+                                }
-                                using (var memoryStream = new MemoryStream(imageBytes))
-                                {
-                                    var image = Image.FromStream(memoryStream);
+                                using (var memoryStream = new MemoryStream(imageBytes))
+                                {
-                                    if (GotifyNotification != null)
                                     var image = Image.FromStream(memoryStream);
                                         GotifyNotification.Invoke(this,
-                                            new GotifyNotificationEventArgs(gotifyNotification, image));
+                                    GotifyNotification?.Invoke(this,
                         } while (!cancellationToken.IsCancellationRequested);
                         await _webSocketClient.CloseAsync(WebSocketCloseStatus.NormalClosure, string.Empty,
                             CancellationToken.None);
                     }
-                    catch (WebSocketException)
+                    catch (Exception ex) when (ex is WebSocketException || ex is HttpRequestException)
+                    {
+                        Debug.WriteLine($"Unable to connect to gotify server: {ex.Message}");
                         // Reconnect
                         if (_webSocketClient != null)
+                        {
                             _webSocketClient.Abort();