From bb90dc1c01c662a91b0e4c1ba42a327b53827cc2 Mon Sep 17 00:00:00 2001 From: JustArchi Date: Sun, 6 Mar 2016 23:32:17 +0100 Subject: [PATCH] Bugfixes --- .gitignore | 1 + ArchiSteamFarm/ArchiWebHandler.cs | 2 +- ArchiSteamFarm/WCF.cs | 2 +- ArchiSteamFarm/WebBrowser.cs | 12 ++++++------ ArchiSteamFarm/config/ASF.json | 14 ++++++++++++++ 5 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 ArchiSteamFarm/config/ASF.json diff --git a/.gitignore b/.gitignore index 7cf4a78ee..2e1cd3458 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ # Ignore all config files, apart from ones we want to include ArchiSteamFarm/config/* +!ArchiSteamFarm/config/ASF.json !ArchiSteamFarm/config/example.json !ArchiSteamFarm/config/minimal.json diff --git a/ArchiSteamFarm/ArchiWebHandler.cs b/ArchiSteamFarm/ArchiWebHandler.cs index 526bf2972..4a28a5d4c 100644 --- a/ArchiSteamFarm/ArchiWebHandler.cs +++ b/ArchiSteamFarm/ArchiWebHandler.cs @@ -34,7 +34,7 @@ using System.Threading.Tasks; namespace ArchiSteamFarm { internal sealed class ArchiWebHandler { - private static int Timeout; + private static int Timeout = 30 * 1000; private readonly Bot Bot; private readonly Dictionary Cookie = new Dictionary(4); diff --git a/ArchiSteamFarm/WCF.cs b/ArchiSteamFarm/WCF.cs index dd2c360de..e2823addf 100644 --- a/ArchiSteamFarm/WCF.cs +++ b/ArchiSteamFarm/WCF.cs @@ -35,7 +35,7 @@ namespace ArchiSteamFarm { internal sealed class WCF : IWCF { - private static string URL = "http://localhost:1242/ASF"; // 1242 = 1024 + A(65) + S(83) + F(70) + private static string URL = "http://localhost:1242/ASF"; private ServiceHost ServiceHost; private Client Client; diff --git a/ArchiSteamFarm/WebBrowser.cs b/ArchiSteamFarm/WebBrowser.cs index 993966955..3fcf52841 100644 --- a/ArchiSteamFarm/WebBrowser.cs +++ b/ArchiSteamFarm/WebBrowser.cs @@ -38,14 +38,14 @@ namespace ArchiSteamFarm { internal const byte MaxRetries = 5; // Defines maximum number of retries, UrlRequest() does not handle retry by itself (it's app responsibility) private static readonly string DefaultUserAgent = "ArchiSteamFarm/" + Program.Version; - private static HttpClient HttpClient; + private static readonly HttpClient HttpClient = new HttpClient(new HttpClientHandler { + UseCookies = false + }) { + Timeout = TimeSpan.FromSeconds(30) + }; internal static void Init() { - HttpClient = new HttpClient(new HttpClientHandler { - UseCookies = false - }) { - Timeout = TimeSpan.FromSeconds(Program.GlobalConfig.HttpTimeout) - }; + HttpClient.Timeout = TimeSpan.FromSeconds(Program.GlobalConfig.HttpTimeout); // Most web services expect that UserAgent is set, so we declare it globally // Any request can override that on as-needed basis (see: RequestOptions.FakeUserAgent) diff --git a/ArchiSteamFarm/config/ASF.json b/ArchiSteamFarm/config/ASF.json new file mode 100644 index 000000000..3c5652522 --- /dev/null +++ b/ArchiSteamFarm/config/ASF.json @@ -0,0 +1,14 @@ +{ + "AutoUpdates": true, + "UpdateChannel": 1, + "HttpTimeout": 30, + "RequestLimiterDelay": 7, + "WCFHostname": "localhost", + "WCFPort": 1242, + "Blacklist": [ + 303700, + 335590, + 368020, + 425280 + ] +} \ No newline at end of file