Proxy support for WebSocket connections

SteamKit2/SteamKit2/Networking/Steam3/WebSocketConnection.cs

@@ -17,9 +17,11 @@ partial class WebSocketConnection : IConnection
         public EndPoint CurrentEndPoint { get; set; }
         public ProtocolTypes ProtocolTypes => ProtocolTypes.WebSocket;
 
-        public void Connect(EndPoint endPoint, int timeout = 5000)
+        public void Connect(EndPoint endPoint, int timeout = 5000) => Connect(endPoint, null, timeout);
+
+        public void Connect(EndPoint endPoint, IWebProxy proxy, int timeout = 5000)
         {
-            var newContext = new WebSocketContext(this, endPoint);
+            var newContext = new WebSocketContext(this, endPoint, proxy);
             var oldContext = Interlocked.Exchange(ref currentContext, newContext);
             if (oldContext != null)
             {

SteamKit2/SteamKit2/Networking/Steam3/WebSocketContext.cs

@@ -14,13 +14,17 @@ partial class WebSocketConnection : IConnection
     {
         class WebSocketContext : IDisposable
         {
-            public WebSocketContext(WebSocketConnection connection, EndPoint endPoint)
+            public WebSocketContext(WebSocketConnection connection, EndPoint endPoint, IWebProxy proxy = null)
             {
                 this.connection = connection;
                 EndPoint = endPoint;
 
                 cts = new CancellationTokenSource();
                 socket = new ClientWebSocket();
+                if (proxy != null) {
+                    socket.Options.Proxy = proxy;
+                }
+
                 hostAndPort = GetHostAndPort(endPoint);
             }
 

SteamKit2/SteamKit2/Steam/CMClient.cs

@@ -147,7 +147,10 @@ public CMClient( SteamConfiguration configuration )
         /// The <see cref="IPEndPoint"/> of the CM server to connect to.
         /// If <c>null</c>, SteamKit will randomly select a CM server from its internal list.
         /// </param>
-        public void Connect( ServerRecord cmServer = null )
+        /// <param name="proxy">
+        /// The proxy server that should be used to connect to CM server (only WebSocketConnection is supported).
+        /// </param>
+        public void Connect( ServerRecord cmServer = null, WebProxy proxy = null )
         {
             lock ( connectionLock )
             {
@@ -193,9 +196,18 @@ public void Connect( ServerRecord cmServer = null )
                     connection.NetMsgReceived += NetMsgReceived;
                     connection.Connected += Connected;
                     connection.Disconnected += Disconnected;
-                    connection.Connect( record.EndPoint, ( int )ConnectionTimeout.TotalMilliseconds );
+
+                    IWebProxy webProxy = proxy ?? Configuration.WebProxy;
+                    if ( ( webProxy != null ) && connection is WebSocketConnection socketConnection)
+                    {
+                        socketConnection.Connect(record.EndPoint, webProxy, (int) ConnectionTimeout.TotalMilliseconds);
+                    }
+                    else
+                    {
+                        connection.Connect(record.EndPoint, (int) ConnectionTimeout.TotalMilliseconds);
+                    }
                 }, TaskContinuationOptions.ExecuteSynchronously ).ContinueWith( t =>
-              {
+                {
                     if ( t.IsFaulted )
                     {
                         DebugLog.WriteLine( nameof( CMClient ), "Unhandled exception when attempting to connect to Steam: {0}", t.Exception );

SteamKit2/SteamKit2/Steam/SteamClient/Configuration/SteamConfiguration.cs

@@ -5,6 +5,7 @@
 
 
 using System;
+using System.Net;
 using System.Net.Http;
 using SteamKit2.Discovery;
 
@@ -103,11 +104,16 @@ internal static SteamConfiguration CreateDefault()
         public Uri WebAPIBaseAddress => state.WebAPIBaseAddress;
 
         /// <summary>
-        /// An  API key to be used for authorized requests.
+        /// An API key to be used for authorized requests.
         /// Keys can be obtained from https://steamcommunity.com/dev or the Steamworks Partner site.
         /// </summary>
         public string WebAPIKey => state.WebAPIKey;
 
+        /// <summary>
+        /// A proxy server to use for WebSocket requests.
+        /// </summary>
+        public IWebProxy WebProxy => state.WebProxy;
+
         /// <summary>
         /// The server list used for this configuration.
         /// If this configuration is used by multiple <see cref="SteamClient"/> instances, they all share the server list.

SteamKit2/SteamKit2/Steam/SteamClient/Configuration/SteamConfigurationBuilder.cs

@@ -5,6 +5,7 @@
 
 
 using System;
+using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using SteamKit2.Discovery;
@@ -39,7 +40,9 @@ public static SteamConfigurationState CreateDefaultState()
 
                 Universe = EUniverse.Public,
 
-                WebAPIBaseAddress = WebAPI.DefaultBaseAddress
+                WebAPIBaseAddress = WebAPI.DefaultBaseAddress,
+
+                WebProxy = null
             };
         }
 
@@ -108,6 +111,12 @@ public ISteamConfigurationBuilder WithWebAPIKey(string webApiKey)
             return this;
         }
 
+        public ISteamConfigurationBuilder WithWebProxy(IWebProxy webProxy)
+        {
+            state.WebProxy = webProxy;
+            return this;
+        }
+
         static HttpClient DefaultHttpClientFactory()
         {
             var client = new HttpClient();

SteamKit2/SteamKit2/Steam/SteamClient/Configuration/SteamConfigurationState.cs

@@ -5,6 +5,7 @@
 
 
 using System;
+using System.Net;
 using SteamKit2.Discovery;
 
 namespace SteamKit2
@@ -20,6 +21,7 @@ struct SteamConfigurationState
         public IServerListProvider ServerListProvider;
         public EUniverse Universe;
         public Uri WebAPIBaseAddress;
+        public IWebProxy WebProxy;
         public string WebAPIKey;
     }
 }