ReSharper code cleanup

Author: justcoding121

.github/docfx.json

@@ -3,8 +3,8 @@
     {
       "src": [
         {
-	 "files": [ "Titanium.Web.Proxy.Docs.sln"],
-         "src": "../src/"
+          "files": ["Titanium.Web.Proxy.Docs.sln"],
+          "src": "../src/"
         }
       ],
       "dest": "obj/api"
@@ -13,17 +13,17 @@
   "build": {
     "content": [
       {
-        "files": [ "**/*.yml" ],
+        "files": ["**/*.yml"],
         "src": "obj/api",
         "dest": "api"
       },
       {
-         "files": [ "*.md" ]
+        "files": ["*.md"]
       }
     ],
     "resource": [
       {
-        "files": [ ""]
+        "files": [""]
       }
     ],
     "overwrite": "specs/*.md",
@@ -32,6 +32,6 @@
       "_enableSearch": true
     },
     "dest": "../docs",
-    "xrefService": [ "https://xref.docs.microsoft.com/query?uid={uid}" ]
+    "xrefService": ["https://xref.docs.microsoft.com/query?uid={uid}"]
   }
-}
+}

examples/Titanium.Web.Proxy.Examples.Basic/App.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <configuration>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
-  </startup>
+	<startup>
+		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+	</startup>
 </configuration>

examples/Titanium.Web.Proxy.Examples.Basic/Helpers/ConsoleHelper.cs

@@ -28,23 +28,19 @@ internal static bool DisableQuickEditMode()
             var consoleHandle = GetStdHandle(StdInputHandle);
 
             // get current console mode
-            if (!GetConsoleMode(consoleHandle, out uint consoleMode))
-            {
+            if (!GetConsoleMode(consoleHandle, out var consoleMode))
                 // ERROR: Unable to get console mode.
                 return false;
-            }
 
             // Clear the quick edit bit in the mode flags
             consoleMode &= ~EnableQuickEdit;
 
             // set the new mode
             if (!SetConsoleMode(consoleHandle, consoleMode))
-            {
                 // ERROR: Unable to set console mode
                 return false;
-            }
 
             return true;
         }
     }
-}
+}

examples/Titanium.Web.Proxy.Examples.Basic/Program.cs

@@ -10,12 +10,9 @@ public class Program
 
         public static void Main(string[] args)
         {
-
             if (RunTime.IsWindows)
-            {
                 // fix console hang due to QuickEdit mode
                 ConsoleHelper.DisableQuickEditMode();
-            }
 
             // Start proxy controller
             controller.StartProxy();
@@ -27,4 +24,4 @@ public static void Main(string[] args)
             controller.Stop();
         }
     }
-}
+}

examples/Titanium.Web.Proxy.Examples.Basic/ProxyEventArgsBaseExtensions.cs

@@ -6,12 +6,9 @@ public static class ProxyEventArgsBaseExtensions
     {
         public static SampleClientState GetState(this ProxyEventArgsBase args)
         {
-            if (args.ClientUserData == null)
-            {
-                args.ClientUserData = new SampleClientState();
-            }
+            if (args.ClientUserData == null) args.ClientUserData = new SampleClientState();
 
             return (SampleClientState)args.ClientUserData;
         }
     }
-}
+}

examples/Titanium.Web.Proxy.Examples.Basic/ProxyTestController.cs

@@ -1,12 +1,12 @@
 using System;
 using System.Collections.Concurrent;
+using System.IO;
 using System.Linq;
 using System.Net;
 using System.Net.Security;
 using System.Threading;
 using System.Threading.Tasks;
 using Titanium.Web.Proxy.EventArguments;
-using Titanium.Web.Proxy.Examples.Basic.Helpers;
 using Titanium.Web.Proxy.Exceptions;
 using Titanium.Web.Proxy.Helpers;
 using Titanium.Web.Proxy.Http;
@@ -18,13 +18,14 @@ namespace Titanium.Web.Proxy.Examples.Basic
     public class ProxyTestController : IDisposable
     {
         private readonly ProxyServer proxyServer;
-        private ExplicitProxyEndPoint explicitEndPoint;
 
-        private CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();
-        private CancellationToken CancellationToken => cancellationTokenSource.Token;
-        private ConcurrentQueue<Tuple<ConsoleColor?, string>> consoleMessageQueue
+        private readonly CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();
+
+        private readonly ConcurrentQueue<Tuple<ConsoleColor?, string>> consoleMessageQueue
             = new ConcurrentQueue<Tuple<ConsoleColor?, string>>();
 
+        private ExplicitProxyEndPoint explicitEndPoint;
+
         public ProxyTestController()
         {
             Task.Run(() => ListenToConsole());
@@ -42,13 +43,9 @@ public ProxyTestController()
             proxyServer.ExceptionFunc = async exception =>
             {
                 if (exception is ProxyHttpException phex)
-                {
                     WriteToConsole(exception.Message + ": " + phex.InnerException?.Message, ConsoleColor.Red);
-                }
                 else
-                {
                     WriteToConsole(exception.Message, ConsoleColor.Red);
-                }
             };
 
             proxyServer.TcpTimeWaitSeconds = 10;
@@ -74,6 +71,14 @@ public ProxyTestController()
             //proxyServer.CertificateManager.RootCertificate = new X509Certificate2("myCert.pfx", string.Empty, X509KeyStorageFlags.Exportable);
         }
 
+        private CancellationToken CancellationToken => cancellationTokenSource.Token;
+
+        public void Dispose()
+        {
+            cancellationTokenSource.Dispose();
+            proxyServer.Dispose();
+        }
+
         public void StartProxy()
         {
             proxyServer.BeforeRequest += OnRequest;
@@ -127,18 +132,13 @@ public void StartProxy()
             //proxyServer.AddEndPoint(socksEndPoint);
 
             foreach (var endPoint in proxyServer.ProxyEndPoints)
-            {
                 Console.WriteLine("Listening on '{0}' endpoint at Ip {1} and port: {2} ", endPoint.GetType().Name,
                     endPoint.IpAddress, endPoint.Port);
-            }
 
             // Only explicit proxies can be set as system proxy!
             //proxyServer.SetAsSystemHttpProxy(explicitEndPoint);
             //proxyServer.SetAsSystemHttpsProxy(explicitEndPoint);
-            if (RunTime.IsWindows)
-            {
-                proxyServer.SetAsSystemProxy(explicitEndPoint, ProxyProtocolType.AllHttp);
-            }
+            if (RunTime.IsWindows) proxyServer.SetAsSystemProxy(explicitEndPoint, ProxyProtocolType.AllHttp);
         }
 
         public void Stop()
@@ -191,23 +191,19 @@ private async Task<IExternalProxy> OnCustomUpStreamProxyFailureFunc(SessionEvent
 
         private async Task OnBeforeTunnelConnectRequest(object sender, TunnelConnectSessionEventArgs e)
         {
-            string hostname = e.HttpClient.Request.RequestUri.Host;
+            var hostname = e.HttpClient.Request.RequestUri.Host;
             e.GetState().PipelineInfo.AppendLine(nameof(OnBeforeTunnelConnectRequest) + ":" + hostname);
             WriteToConsole("Tunnel to: " + hostname);
 
             var clientLocalIp = e.ClientLocalEndPoint.Address;
             if (!clientLocalIp.Equals(IPAddress.Loopback) && !clientLocalIp.Equals(IPAddress.IPv6Loopback))
-            {
                 e.HttpClient.UpStreamEndPoint = new IPEndPoint(clientLocalIp, 0);
-            }
 
             if (hostname.Contains("dropbox.com"))
-            {
                 // Exclude Https addresses you don't want to proxy
                 // Useful for clients that use certificate pinning
                 // for example dropbox.com
                 e.DecryptSsl = false;
-            }
         }
 
         private void WebSocket_DataSent(object sender, DataEventArgs e)
@@ -231,20 +227,18 @@ private void WebSocketDataSentReceived(SessionEventArgs args, DataEventArgs e, b
                 if (frame.OpCode == WebsocketOpCode.Binary)
                 {
                     var data = frame.Data.ToArray();
-                    string str = string.Join(",", data.ToArray().Select(x => x.ToString("X2")));
+                    var str = string.Join(",", data.ToArray().Select(x => x.ToString("X2")));
                     WriteToConsole(str, color);
                 }
 
-                if (frame.OpCode == WebsocketOpCode.Text)
-                {
-                    WriteToConsole(frame.GetText(), color);
-                }
+                if (frame.OpCode == WebsocketOpCode.Text) WriteToConsole(frame.GetText(), color);
             }
         }
 
         private Task OnBeforeTunnelConnectResponse(object sender, TunnelConnectSessionEventArgs e)
         {
-            e.GetState().PipelineInfo.AppendLine(nameof(OnBeforeTunnelConnectResponse) + ":" + e.HttpClient.Request.RequestUri);
+            e.GetState().PipelineInfo
+                .AppendLine(nameof(OnBeforeTunnelConnectResponse) + ":" + e.HttpClient.Request.RequestUri);
 
             return Task.CompletedTask;
         }
@@ -256,14 +250,10 @@ private async Task OnRequest(object sender, SessionEventArgs e)
 
             var clientLocalIp = e.ClientLocalEndPoint.Address;
             if (!clientLocalIp.Equals(IPAddress.Loopback) && !clientLocalIp.Equals(IPAddress.IPv6Loopback))
-            {
                 e.HttpClient.UpStreamEndPoint = new IPEndPoint(clientLocalIp, 0);
-            }
 
             if (e.HttpClient.Request.Url.Contains("yahoo.com"))
-            {
                 e.CustomUpStreamProxy = new ExternalProxy("localhost", 8888);
-            }
 
             WriteToConsole("Active Client Connections:" + ((ProxyServer)sender).ClientConnectionCount);
             WriteToConsole(e.HttpClient.Request.Url);
@@ -310,10 +300,7 @@ private async Task MultipartRequestPartSent(object sender, MultipartRequestPartS
 
             var session = (SessionEventArgs)sender;
             WriteToConsole("Multipart form data headers:");
-            foreach (var header in e.Headers)
-            {
-                WriteToConsole(header.ToString());
-            }
+            foreach (var header in e.Headers) WriteToConsole(header.ToString());
         }
 
         private async Task OnResponse(object sender, SessionEventArgs e)
@@ -328,7 +315,7 @@ private async Task OnResponse(object sender, SessionEventArgs e)
 
             WriteToConsole("Active Server Connections:" + ((ProxyServer)sender).ServerConnectionCount);
 
-            string ext = System.IO.Path.GetExtension(e.HttpClient.Request.RequestUri.AbsolutePath);
+            var ext = Path.GetExtension(e.HttpClient.Request.RequestUri.AbsolutePath);
 
             // access user data set in request to do something with it
             //var userData = e.HttpClient.UserData as CustomUserData;
@@ -385,10 +372,7 @@ public Task OnCertificateValidation(object sender, CertificateValidationEventArg
             e.GetState().PipelineInfo.AppendLine(nameof(OnCertificateValidation));
 
             // set IsValid to true/false based on Certificate Errors
-            if (e.SslPolicyErrors == SslPolicyErrors.None)
-            {
-                e.IsValid = true;
-            }
+            if (e.SslPolicyErrors == SslPolicyErrors.None) e.IsValid = true;
 
             return Task.CompletedTask;
         }
@@ -423,7 +407,7 @@ private async Task ListenToConsole()
 
                     if (consoleColor.HasValue)
                     {
-                        ConsoleColor existing = Console.ForegroundColor;
+                        var existing = Console.ForegroundColor;
                         Console.ForegroundColor = consoleColor.Value;
                         Console.WriteLine(message);
                         Console.ForegroundColor = existing;
@@ -439,12 +423,6 @@ private async Task ListenToConsole()
             }
         }
 
-        public void Dispose()
-        {
-            cancellationTokenSource.Dispose();
-            proxyServer.Dispose();
-        }
-
         ///// <summary>
         ///// User data object as defined by user.
         ///// User data can be set to each SessionEventArgs.HttpClient.UserData property
@@ -456,4 +434,4 @@ public void Dispose()
         //    public string RequestBodyString { get; set; }
         //}
     }
-}
+}

examples/Titanium.Web.Proxy.Examples.Basic/SampleClientState.cs

@@ -6,4 +6,4 @@ public class SampleClientState
     {
         public StringBuilder PipelineInfo { get; } = new StringBuilder();
     }
-}
+}