Winify – Diff between revs 48 and 50

Subversion Repositories:

?pathlinks?

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

 ï»¿using System;
 using System.Drawing;
 using System.IO;
+using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Net.Security;
+using System.Security.Authentication;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using Serilog;
 using Servers;
 using WebSocketSharp;
+using WebSocketSharp.Net;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel;
 using Configuration = Configuration.Configuration;
 using ErrorEventArgs = WebSocketSharp.ErrorEventArgs;
+using NetworkCredential = System.Net.NetworkCredential;
 namespace Winify.Gotify
+{
     public class GotifyConnection : IDisposable
         public GotifyConnection(Server server, global::Configuration.Configuration configuration) : this()
+        {
             _server = server;
             _configuration = configuration;
+            var httpClientHandler = new HttpClientHandler()
+            {
+                SslProtocols = SslProtocols.Tls12
+            };
             var httpClientHandler = new HttpClientHandler();
             _httpClient = new HttpClient(httpClientHandler);
             if (_configuration.IgnoreSelfSignedCertificates)
+            {
                 httpClientHandler.ServerCertificateCustomValidationCallback =
                     (httpRequestMessage, cert, cetChain, policyErrors) => true;
+            }
+            if (_configuration.Proxy.Enable)
+            {
+                httpClientHandler.Proxy = new WebProxy(_configuration.Proxy.Url, false, new string[] { },
+                    new NetworkCredential(_configuration.Proxy.Username, _configuration.Proxy.Password));
+            }
             _httpClient = new HttpClient(httpClientHandler);
             if (!string.IsNullOrEmpty(_server.Username) && !string.IsNullOrEmpty(_server.Password))
+            {
+        }
         private void Connect()
+        {
+            _webSocketSharp = new WebSocket(_webSocketsUri.AbsoluteUri);
+            _webSocketSharp.SslConfiguration = new ClientSslConfiguration(_webSocketsUri.Host,
+                new X509CertificateCollection(new X509Certificate[] { }), SslProtocols.Tls12, false);
+            if (_configuration.Proxy.Enable)
+            {
+                _webSocketSharp.SetProxy(_configuration.Proxy.Url, _configuration.Proxy.Username, _configuration.Proxy.Password);
+            }
             _webSocketSharp = new WebSocket(_webSocketsUri.AbsoluteUri);
             if (!string.IsNullOrEmpty(_server.Username) && !string.IsNullOrEmpty(_server.Password))
+            {
                 _webSocketSharp.SetCredentials(_server.Username, _server.Password, true);
             _webSocketSharp.OnMessage += WebSocketSharp_OnMessage;
             _webSocketSharp.OnError += WebSocketSharp_OnError;
             _webSocketSharp.OnOpen += WebSocketSharp_OnOpen;
+            _webSocketSharp.OnClose += WebSocketSharp_OnClose;
+            _webSocketSharp.Log.Output = (data, s) =>
+            {
+                var a = s;
-            _webSocketSharp.OnClose += WebSocketSharp_OnClose;
+            };
             _webSocketSharp.ConnectAsync();
+        }