Winify – Diff between revs 38 and 39

Subversion Repositories:

?pathlinks?

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

         private CancellationTokenSource _cancellationTokenSource;
+        private Task _runTask;
+        private HttpClient _httpClient;
+        private readonly string _auth;
+        private readonly Uri _webSocketsUri;
-        private Task _runTask;
+        private readonly Uri _httpUri;
+        #endregion
+        #region Constructors, Destructors and Finalizers
+        public GotifyConnection()
         #endregion
             _httpClient = new HttpClient();
+        }
+        public GotifyConnection(Server server) : this()
+        {
+            _server = server;
+            _auth = Convert.ToBase64String(Encoding.Default.GetBytes($"{_server.Username}:{_server.Password}"));
+            _httpClient.DefaultRequestHeaders.Authorization =
+                new AuthenticationHeaderValue("Basic", _auth);
+            if (Uri.TryCreate(_server.Url, UriKind.Absolute, out _httpUri))
+            {
+                // Build the web sockets URI.
-        #region Constructors, Destructors and Finalizers
+                var webSocketsUriBuilder = new UriBuilder(_httpUri);
                 webSocketsUriBuilder.Scheme = "ws";
-        public GotifyConnection(Server server)
+                webSocketsUriBuilder.Path = Path.Combine(webSocketsUriBuilder.Path, "stream");
                 _webSocketsUri = webSocketsUriBuilder.Uri;
             _server = server;
+        }
         public void Dispose()
+        {
+            if (_cancellationTokenSource != null)
+            {
                 _cancellationTokenSource.Dispose();
-            if (_cancellationTokenSource != null)
+                _cancellationTokenSource = null;
+            }
                 _cancellationTokenSource.Dispose();
-                _cancellationTokenSource = null;
+            _httpClient.Dispose();
-            }
-        }
-        #endregion
-        #region Public Methods
-        public void Start()
             _httpClient = null;
             if (!Uri.TryCreate(_server.Url, UriKind.Absolute, out var httpUri)) return;
-            // Build the web sockets URI.
+        #endregion
             var webSocketsUriBuilder = new UriBuilder(httpUri);
-            webSocketsUriBuilder.Scheme = "ws";
+        #region Public Methods
+        public void Start()
-            webSocketsUriBuilder.Path = Path.Combine($"{webSocketsUriBuilder.Path}", "stream");
+        {
+            _cancellationTokenSource = new CancellationTokenSource();
-            var webSocketsUri = webSocketsUriBuilder.Uri;
+            _cancellationToken = _cancellationTokenSource.Token;
-            _cancellationTokenSource = new CancellationTokenSource();
+            _runTask = Run(_cancellationToken);
-            _cancellationToken = _cancellationTokenSource.Token;
+        }
             _runTask = Run(webSocketsUri, httpUri, _server.Username, _server.Password, _cancellationToken);
         public void Stop()
+        {
-        public void Stop()
+            if (_cancellationTokenSource != null)
+            {
-            if (_cancellationTokenSource != null) _cancellationTokenSource.Cancel();
+                _cancellationTokenSource.Cancel();
+            }
+        }
         #endregion
-        #region Private Methods
+        #endregion
-        private async Task Run(Uri webSocketsUri, Uri httpUri, string username, string password,
-            CancellationToken cancellationToken)
+        #region Private Methods
-            try
+        private async Task Run(CancellationToken cancellationToken)
+        {
-                do
+            try
+            {
+                do
+                {
-                {
+                    try
+                    {
+                        using (var webSocketClient = new ClientWebSocket())
+                        {
-                    try
+                            webSocketClient.Options.SetRequestHeader("Authorization", $"Basic {_auth}");
                                     continue;
+                                }
                                 gotifyNotification.Server = _server;
+                                if (!Uri.TryCreate(Path.Combine($"{_httpUri}", "application"), UriKind.Absolute,
-                                if (!Uri.TryCreate(Path.Combine($"{httpUri}", "application"), UriKind.Absolute,
+                                        out var applicationUri))
+                                {
-                                        out var applicationUri))
+                                    continue;
-                                    continue;
+                                }
-                                var image = await RetrieveGotifyApplicationImage(gotifyNotification.AppId, httpUri,
+                                var image = await RetrieveGotifyApplicationImage(gotifyNotification.AppId,
-                                    applicationUri, auth, cancellationToken);
+                                    applicationUri, cancellationToken);
+            {
                 Log.Warning(ex, "Failure running connection loop.");
+            }
+        }
-        private static async Task<Image> RetrieveGotifyApplicationImage(int appId, Uri httpUri, Uri applicationUri,
-            string auth,
+        private async Task<Image> RetrieveGotifyApplicationImage(int appId, Uri applicationUri,
             CancellationToken cancellationToken)
-        {
-            using (var httpClient = new HttpClient())
-            {
-                httpClient.DefaultRequestHeaders.Authorization =
-                    new AuthenticationHeaderValue("Basic", auth);
+        {
-                var applicationResponse = await httpClient.GetAsync(applicationUri, cancellationToken);
+            var applicationResponse = await _httpClient.GetAsync(applicationUri, cancellationToken);
-                var applications = await applicationResponse.Content.ReadAsStringAsync();
+            var applications = await applicationResponse.Content.ReadAsStringAsync();
+            var gotifyApplications =
+                JsonConvert.DeserializeObject<GotifyApplication[]>(applications);
-                var gotifyApplications =
+            if (gotifyApplications == null)
+            {
+                return null;
                     JsonConvert.DeserializeObject<GotifyApplication[]>(applications);
+            foreach (var application in gotifyApplications)
-                if (gotifyApplications == null) return null;
+            {
+                if (application.Id != appId)
+                {
-                foreach (var application in gotifyApplications)
+                    continue;
+                }
-                {
-                    if (application.Id != appId) continue;
+                if (!Uri.TryCreate(Path.Combine($"{_httpUri}", $"{application.Image}"), UriKind.Absolute,
+                        out var applicationImageUri))
-                    if (!Uri.TryCreate(Path.Combine($"{httpUri}", $"{application.Image}"), UriKind.Absolute,
+                {
-                            out var applicationImageUri))
+                    continue;
-                        continue;
+                }
                     var imageResponse = await httpClient.GetAsync(applicationImageUri, cancellationToken);
                 var imageResponse = await _httpClient.GetAsync(applicationImageUri, cancellationToken);
                     using (var memoryStream = new MemoryStream())