Reduce default timeout to 10 seconds (#575)

* Reduce default timeout to 10 seconds

* Don't remove the proxy setting when downloading a map

* Specify map download and upload timeouts as 100 seconds

DXMainClient/Domain/Multiplayer/CnCNet/CnCNetPlayerCountTask.cs

@@ -52,11 +52,11 @@ private static int GetCnCNetPlayerCount()
             {
                 // Don't fetch the player count if it is explicitly disabled
                 // For example, the official CnCNet server might be unavailable/unstable in a country with Internet censorship,
-                // which causes lags in the splash screen. In the worst case, say if packets are dropped, it waits until timeouts --- 30 seconds
+                // which causes lags in the splash screen. In the worst case, say if packets are dropped, it waits until timeouts
                 if (string.IsNullOrWhiteSpace(ClientConfiguration.Instance.CnCNetPlayerCountURL))
                     return -1;
 
-                WebClient client = new WebClient();
+                WebClient client = new ExtendedWebClient();
                 Stream data = client.OpenRead(ClientConfiguration.Instance.CnCNetPlayerCountURL);
 
                 string info = string.Empty;

DXMainClient/Domain/Multiplayer/CnCNet/ExtendedWebClient.cs

@@ -8,6 +8,8 @@ namespace DTAClient.Domain.Multiplayer.CnCNet
     /// </summary>
     class ExtendedWebClient : WebClient
     {
+        public ExtendedWebClient() : this(timeout: 10000) { }
+
         public ExtendedWebClient(int timeout)
         {
             this.timeout = timeout;

DXMainClient/Domain/Multiplayer/CnCNet/MapSharer.cs

@@ -36,6 +36,9 @@ public static class MapSharer
 
         private static readonly object locker = new object();
 
+        private const int DOWNLOAD_TIMEOUT = 100000; // In milliseconds
+        private const int UPLOAD_TIMEOUT = 100000; // In milliseconds
+
         /// <summary>
         /// Adds a map into the CnCNet map upload queue.
         /// </summary>
@@ -211,6 +214,7 @@ private static void CopyStream(Stream input, Stream output)
         private static byte[] UploadFiles(string address, List<FileToUpload> files, NameValueCollection values)
         {
             WebRequest request = WebRequest.Create(address);
+            request.Timeout = UPLOAD_TIMEOUT;
             request.Method = "POST";
             string boundary = "---------------------------" + DateTime.Now.Ticks.ToString("x", NumberFormatInfo.InvariantInfo);
             request.ContentType = "multipart/form-data; boundary=" + boundary;
@@ -382,11 +386,8 @@ private static string DownloadMain(string sha1, string myGame, string mapName, o
             destinationFile.Delete();
             newFile.Delete();
 
-            using (TWebClient webClient = new TWebClient())
+            using (WebClient webClient = new ExtendedWebClient(DOWNLOAD_TIMEOUT))
             {
-                // TODO enable proxy support for some users
-                webClient.Proxy = null;
-
                 if (string.IsNullOrWhiteSpace(ClientConfiguration.Instance.CnCNetMapDBDownloadURL))
                 {
                     success = false;
@@ -456,23 +457,5 @@ public FileToUpload()
             public string ContentType { get; set; }
             public Stream Stream { get; set; }
         }
-
-        class TWebClient : WebClient
-        {
-            private int Timeout = 10000;
-
-            public TWebClient()
-            {
-                // TODO enable proxy support for some users
-                this.Proxy = null;
-            }
-
-            protected override WebRequest GetWebRequest(Uri address)
-            {
-                var webRequest = base.GetWebRequest(address);
-                webRequest.Timeout = Timeout;
-                return webRequest;
-            }
-        }
     }
 }

DXMainClient/Domain/Multiplayer/CnCNet/TunnelHandler.cs

@@ -148,7 +148,7 @@ private Task PingCurrentTunnelAsync(bool checkTunnelList = false)
 
         private byte[] GetRawTunnelDataOnline()
         {
-            WebClient client = new WebClient();
+            WebClient client = new ExtendedWebClient();
             return client.DownloadData(MainClientConstants.CNCNET_TUNNEL_LIST_URL);
         }