Do not crash on bad configs

.gitignore

@@ -4,11 +4,13 @@
 
 # Ignore all config files, apart from ones we want to include
 ArchiSteamFarm/config/*
-!ArchiSteamFarm/config/example.xml
-!ArchiSteamFarm/config/minimal.xml
+!ArchiSteamFarm/config/ASF.json
+!ArchiSteamFarm/config/example.json
+!ArchiSteamFarm/config/minimal.json
 
-# Ignore local debugging log file
+# Ignore local debugging
 ArchiSteamFarm/log.txt
+ArchiSteamFarm/debug/*
 
 #################
 ## Eclipse

ArchiSteamFarm/ArchiHandler.cs

@@ -24,9 +24,11 @@
 
 using SteamKit2;
 using SteamKit2.Internal;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Net;
+using System.Threading.Tasks;
 
 namespace ArchiSteamFarm {
 	internal sealed class ArchiHandler : ClientMsgHandler {
@@ -48,7 +50,11 @@ namespace ArchiSteamFarm {
 					Items = 514
 				}
 
-				internal ENotificationType NotificationType { get; set; }
+				internal readonly ENotificationType NotificationType;
+
+				internal Notification(ENotificationType notificationType) {
+					NotificationType = notificationType;
+				}
 			}
 
 			internal readonly List<Notification> Notifications;
@@ -62,9 +68,7 @@ namespace ArchiSteamFarm {
 
 				Notifications = new List<Notification>(msg.notifications.Count);
 				foreach (var notification in msg.notifications) {
-					Notifications.Add(new Notification {
-						NotificationType = (Notification.ENotificationType) notification.user_notification_type
-					});
+					Notifications.Add(new Notification((Notification.ENotificationType) notification.user_notification_type));
 				}
 			}
 
@@ -75,8 +79,11 @@ namespace ArchiSteamFarm {
 					return;
 				}
 
-				Notifications = new List<Notification>(1);
-				Notifications.Add(new Notification { NotificationType = Notification.ENotificationType.Items });
+				if (msg.count_new_items > 0) {
+					Notifications = new List<Notification>(1) {
+						new Notification(Notification.ENotificationType.Items)
+					};
+				}
 			}
 		}
 
@@ -97,7 +104,7 @@ namespace ArchiSteamFarm {
 		}
 
 		internal sealed class PurchaseResponseCallback : CallbackMsg {
-			internal enum EPurchaseResult {
+			internal enum EPurchaseResult : int {
 				Unknown = -1,
 				OK = 0,
 				AlreadyOwned = 9,
@@ -123,6 +130,10 @@ namespace ArchiSteamFarm {
 				Result = (EResult) msg.eresult;
 				PurchaseResult = (EPurchaseResult) msg.purchase_result_details;
 
+				if (msg.purchase_receipt_info == null) {
+					return;
+				}
+
 				ReceiptInfo = new KeyValue();
 				using (MemoryStream ms = new MemoryStream(msg.purchase_receipt_info)) {
 					if (!ReceiptInfo.TryReadAsBinary(ms)) {
@@ -175,6 +186,27 @@ namespace ArchiSteamFarm {
 			Client.Send(request);
 		}
 
+		internal void PlayGame(string gameName) {
+			if (!Client.IsConnected) {
+				return;
+			}
+
+			var request = new ClientMsgProtobuf<CMsgClientGamesPlayed>(EMsg.ClientGamesPlayed);
+
+			var gamePlayed = new CMsgClientGamesPlayed.GamePlayed();
+			if (!string.IsNullOrEmpty(gameName)) {
+				gamePlayed.game_id = new GameID() {
+					AppType = GameID.GameType.Shortcut,
+					ModID = uint.MaxValue
+				};
+				gamePlayed.game_extra_info = gameName;
+			}
+
+			request.Body.games_played.Add(gamePlayed);
+
+			Client.Send(request);
+		}
+
 		internal void PlayGames(params uint[] gameIDs) {
 			if (!Client.IsConnected) {
 				return;
@@ -195,7 +227,7 @@ namespace ArchiSteamFarm {
 		}
 
 		internal void PlayGames(ICollection<uint> gameIDs) {
-			if (gameIDs == null || gameIDs.Count == 0 || !Client.IsConnected) {
+			if (gameIDs == null || !Client.IsConnected) {
 				return;
 			}
 
@@ -213,7 +245,7 @@ namespace ArchiSteamFarm {
 			Client.Send(request);
 		}
 
-		internal AsyncJob<PurchaseResponseCallback> RedeemKey(string key) {
+		internal async Task<PurchaseResponseCallback> RedeemKey(string key) {
 			if (string.IsNullOrEmpty(key) || !Client.IsConnected) {
 				return null;
 			}
@@ -225,7 +257,12 @@ namespace ArchiSteamFarm {
 			request.Body.key = key;
 
 			Client.Send(request);
-			return new AsyncJob<PurchaseResponseCallback>(Client, request.SourceJobID);
+			try {
+				return await new AsyncJob<PurchaseResponseCallback>(Client, request.SourceJobID);
+			} catch (Exception e) {
+				Logging.LogGenericException(e);
+				return null;
+			}
 		}
 
 		/*

ArchiSteamFarm/ArchiSteamFarm.csproj

@@ -12,6 +12,7 @@
     <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <IsWebBootstrapper>false</IsWebBootstrapper>
+    <TargetFrameworkProfile />
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -26,7 +27,6 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -36,7 +36,7 @@
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <WarningLevel>3</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -64,7 +64,8 @@
     <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>JustArchi.pfx</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup>
     <DelaySign>false</DelaySign>
@@ -100,16 +101,18 @@
     <Compile Include="ArchiHandler.cs" />
     <Compile Include="ArchiWebHandler.cs" />
     <Compile Include="Bot.cs" />
+    <Compile Include="BotConfig.cs" />
+    <Compile Include="GlobalDatabase.cs" />
+    <Compile Include="BotDatabase.cs" />
     <Compile Include="CardsFarmer.cs" />
-    <Compile Include="CMsgClientClanInviteAction.cs" />
+    <Compile Include="CMsgs\CMsgClientClanInviteAction.cs" />
     <Compile Include="Debugging.cs" />
+    <Compile Include="GlobalConfig.cs" />
+    <Compile Include="JSON\GitHub.cs" />
+    <Compile Include="JSON\Steam.cs" />
     <Compile Include="Logging.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SteamItem.cs" />
-    <Compile Include="SteamItemList.cs" />
-    <Compile Include="SteamTradeOffer.cs" />
-    <Compile Include="SteamTradeOfferRequest.cs" />
     <Compile Include="Trading.cs" />
     <Compile Include="Utilities.cs" />
     <Compile Include="WCF.cs" />
@@ -117,7 +120,15 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <None Include="JustArchi.pfx" />
+    <None Include="config\ASF.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="config\example.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="config\minimal.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
@@ -134,12 +145,6 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="cirno.ico" />
-    <Content Include="config\example.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="config\minimal.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\SteamAuth\SteamAuth.csproj">
@@ -147,6 +152,7 @@
       <Name>SteamAuth</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>
@@ -155,15 +161,17 @@
   <PropertyGroup>
     <PostBuildEvent Condition=" '$(OS)' != 'Unix' AND '$(ConfigurationName)' == 'Release' ">
       mkdir "$(TargetDir)out" "$(TargetDir)out\config"
-      copy "$(TargetDir)config\example.xml" "$(TargetDir)out\config"
-      copy "$(TargetDir)config\minimal.xml" "$(TargetDir)out\config"
+      copy "$(TargetDir)config\ASF.json" "$(TargetDir)out\config"
+      copy "$(TargetDir)config\example.json" "$(TargetDir)out\config"
+      copy "$(TargetDir)config\minimal.json" "$(TargetDir)out\config"
       "$(SolutionDir)tools\ILRepack.exe" /ndebug /internalize /parallel /targetplatform:v4 /wildcards /out:"$(TargetDir)out\ASF.exe" "$(TargetDir)$(TargetName).exe" "$(TargetDir)*.dll"
       del "$(TargetDir)out\ASF.exe.config"
     </PostBuildEvent>
     <PostBuildEvent Condition=" '$(OS)' == 'Unix' AND '$(ConfigurationName)' == 'Release' ">
       mkdir -p "$(TargetDir)out" "$(TargetDir)out/config"
-      cp "$(TargetDir)config/example.xml" "$(TargetDir)out/config"
-      cp "$(TargetDir)config/minimal.xml" "$(TargetDir)out/config"
+      cp "$(TargetDir)config/ASF.json" "$(TargetDir)out/config"
+      cp "$(TargetDir)config/example.json" "$(TargetDir)out/config"
+      cp "$(TargetDir)config/minimal.json" "$(TargetDir)out/config"
       mono -O=all "$(SolutionDir)tools/ILRepack.exe" /ndebug /internalize /parallel /targetplatform:v4 /wildcards /out:"$(TargetDir)out/ASF.exe" "$(TargetDir)$(TargetName).exe" "$(TargetDir)*.dll"
       rm "$(TargetDir)out/ASF.exe.config"
     </PostBuildEvent>

ArchiSteamFarm/ArchiWebHandler.cs

@@ -34,20 +34,23 @@ using System.Threading.Tasks;
 
 namespace ArchiSteamFarm {
 	internal sealed class ArchiWebHandler {
-		private const int Timeout = 1000 * WebBrowser.HttpTimeout; // In miliseconds
+		private static int Timeout = 30 * 1000;
 
 		private readonly Bot Bot;
-		private readonly string ApiKey;
-		private readonly Dictionary<string, string> Cookie = new Dictionary<string, string>(3);
+		private readonly Dictionary<string, string> Cookie = new Dictionary<string, string>(4);
 
 		private ulong SteamID;
 
-		internal ArchiWebHandler(Bot bot, string apiKey) {
-			Bot = bot;
+		internal static void Init() {
+			Timeout = Program.GlobalConfig.HttpTimeout * 1000;
+		}
 
-			if (!string.IsNullOrEmpty(apiKey) && !apiKey.Equals("null")) {
-				ApiKey = apiKey;
+		internal ArchiWebHandler(Bot bot) {
+			if (bot == null) {
+				return;
 			}
+
+			Bot = bot;
 		}
 
 		internal async Task<bool> Init(SteamClient steamClient, string webAPIUserNonce, string parentalPin) {
@@ -63,7 +66,7 @@ namespace ArchiSteamFarm {
 			byte[] sessionKey = CryptoHelper.GenerateRandomBlock(32);
 
 			// RSA encrypt it with the public key for the universe we're on
-			byte[] cryptedSessionKey = null;
+			byte[] cryptedSessionKey;
 			using (RSACrypto rsa = new RSACrypto(KeyDictionary.GetPublicKey(steamClient.ConnectedUniverse))) {
 				cryptedSessionKey = rsa.Encrypt(sessionKey);
 			}
@@ -109,6 +112,9 @@ namespace ArchiSteamFarm {
 			Cookie["steamLogin"] = steamLogin;
 			Cookie["steamLoginSecure"] = steamLoginSecure;
 
+			// The below is used for display purposes only
+			Cookie["webTradeEligibility"] = "{\"allowed\":0,\"reason\":0,\"allowed_at_time\":0,\"steamguard_required_days\":0,\"sales_this_year\":0,\"max_sales_per_year\":0,\"forms_requested\":0}";
+
 			await UnlockParentalAccount(parentalPin).ConfigureAwait(false);
 			return true;
 		}
@@ -136,20 +142,20 @@ namespace ArchiSteamFarm {
 			bool? isLoggedIn = await IsLoggedIn().ConfigureAwait(false);
 			if (isLoggedIn.HasValue && !isLoggedIn.Value) {
 				Logging.LogGenericInfo("Reconnecting because our sessionID expired!", Bot.BotName);
-				var restart = Task.Run(async () => await Bot.Restart().ConfigureAwait(false));
+				Task.Run(async () => await Bot.Restart().ConfigureAwait(false)).Forget();
 				return true;
 			}
 
 			return false;
 		}
 
-		internal List<SteamTradeOffer> GetTradeOffers() {
-			if (ApiKey == null) {
+		internal List<Steam.TradeOffer> GetTradeOffers() {
+			if (string.IsNullOrEmpty(Bot.BotConfig.SteamApiKey)) {
 				return null;
 			}
 
 			KeyValue response = null;
-			using (dynamic iEconService = WebAPI.GetInterface("IEconService", ApiKey)) {
+			using (dynamic iEconService = WebAPI.GetInterface("IEconService", Bot.BotConfig.SteamApiKey)) {
 				iEconService.Timeout = Timeout;
 
 				for (byte i = 0; i < WebBrowser.MaxRetries && response == null; i++) {
@@ -170,15 +176,15 @@ namespace ArchiSteamFarm {
 				return null;
 			}
 
-			List<SteamTradeOffer> result = new List<SteamTradeOffer>();
+			List<Steam.TradeOffer> result = new List<Steam.TradeOffer>();
 			foreach (KeyValue trade in response["trade_offers_received"].Children) {
-				SteamTradeOffer tradeOffer = new SteamTradeOffer {
+				Steam.TradeOffer tradeOffer = new Steam.TradeOffer {
 					tradeofferid = trade["tradeofferid"].AsString(),
 					accountid_other = trade["accountid_other"].AsInteger(),
-					trade_offer_state = trade["trade_offer_state"].AsEnum<SteamTradeOffer.ETradeOfferState>()
+					trade_offer_state = trade["trade_offer_state"].AsEnum<Steam.TradeOffer.ETradeOfferState>()
 				};
 				foreach (KeyValue item in trade["items_to_give"].Children) {
-					tradeOffer.items_to_give.Add(new SteamItem {
+					tradeOffer.items_to_give.Add(new Steam.Item {
 						appid = item["appid"].AsString(),
 						contextid = item["contextid"].AsString(),
 						assetid = item["assetid"].AsString(),
@@ -188,7 +194,7 @@ namespace ArchiSteamFarm {
 					});
 				}
 				foreach (KeyValue item in trade["items_to_receive"].Children) {
-					tradeOffer.items_to_receive.Add(new SteamItem {
+					tradeOffer.items_to_receive.Add(new Steam.Item {
 						appid = item["appid"].AsString(),
 						contextid = item["contextid"].AsString(),
 						assetid = item["assetid"].AsString(),
@@ -266,12 +272,12 @@ namespace ArchiSteamFarm {
 		}
 
 		internal bool DeclineTradeOffer(ulong tradeID) {
-			if (tradeID == 0 || ApiKey == null) {
+			if (tradeID == 0 || string.IsNullOrEmpty(Bot.BotConfig.SteamApiKey)) {
 				return false;
 			}
 
 			KeyValue response = null;
-			using (dynamic iEconService = WebAPI.GetInterface("IEconService", ApiKey)) {
+			using (dynamic iEconService = WebAPI.GetInterface("IEconService", Bot.BotConfig.SteamApiKey)) {
 				iEconService.Timeout = Timeout;
 
 				for (byte i = 0; i < WebBrowser.MaxRetries && response == null; i++) {
@@ -295,7 +301,7 @@ namespace ArchiSteamFarm {
 			return true;
 		}
 
-		internal async Task<List<SteamItem>> GetMyTradableInventory() {
+		internal async Task<List<Steam.Item>> GetMyTradableInventory() {
 			JObject jObject = null;
 			for (byte i = 0; i < WebBrowser.MaxRetries && jObject == null; i++) {
 				jObject = await WebBrowser.UrlGetToJObject("https://steamcommunity.com/my/inventory/json/753/6?trading=1", Cookie).ConfigureAwait(false);
@@ -312,10 +318,10 @@ namespace ArchiSteamFarm {
 				return null;
 			}
 
-			List<SteamItem> result = new List<SteamItem>();
+			List<Steam.Item> result = new List<Steam.Item>();
 			foreach (JToken jToken in jTokens) {
 				try {
-					result.Add(JsonConvert.DeserializeObject<SteamItem>(jToken.ToString()));
+					result.Add(JsonConvert.DeserializeObject<Steam.Item>(jToken.ToString()));
 				} catch (Exception e) {
 					Logging.LogGenericException(e, Bot.BotName);
 				}
@@ -324,7 +330,7 @@ namespace ArchiSteamFarm {
 			return result;
 		}
 
-		internal async Task<bool> SendTradeOffer(List<SteamItem> inventory, ulong partnerID, string token = null) {
+		internal async Task<bool> SendTradeOffer(List<Steam.Item> inventory, ulong partnerID, string token = null) {
 			if (inventory == null || inventory.Count == 0 || partnerID == 0) {
 				return false;
 			}
@@ -334,21 +340,21 @@ namespace ArchiSteamFarm {
 				return false;
 			}
 
-			List<SteamTradeOfferRequest> trades = new List<SteamTradeOfferRequest>(1 + inventory.Count / Trading.MaxItemsPerTrade);
+			List<Steam.TradeOfferRequest> trades = new List<Steam.TradeOfferRequest>(1 + inventory.Count / Trading.MaxItemsPerTrade);
 
-			SteamTradeOfferRequest singleTrade = null;
+			Steam.TradeOfferRequest singleTrade = null;
 			for (ushort i = 0; i < inventory.Count; i++) {
 				if (i % Trading.MaxItemsPerTrade == 0) {
 					if (trades.Count >= Trading.MaxTradesPerAccount) {
 						break;
 					}
 
-					singleTrade = new SteamTradeOfferRequest();
+					singleTrade = new Steam.TradeOfferRequest();
 					trades.Add(singleTrade);
 				}
 
-				SteamItem item = inventory[i];
-				singleTrade.me.assets.Add(new SteamItem() {
+				Steam.Item item = inventory[i];
+				singleTrade.me.assets.Add(new Steam.Item() {
 					appid = "753",
 					contextid = "6",
 					amount = item.amount,
@@ -359,14 +365,14 @@ namespace ArchiSteamFarm {
 			string referer = "https://steamcommunity.com/tradeoffer/new";
 			string request = referer + "/send";
 
-			foreach (SteamTradeOfferRequest trade in trades) {
+			foreach (Steam.TradeOfferRequest trade in trades) {
 				Dictionary<string, string> data = new Dictionary<string, string>(6) {
 					{"sessionid", sessionID},
 					{"serverid", "1"},
 					{"partner", partnerID.ToString()},
 					{"tradeoffermessage", "Sent by ASF"},
 					{"json_tradeoffer", JsonConvert.SerializeObject(trade)},
-					{"trade_offer_create_params", string.IsNullOrEmpty(token) ? "" : string.Format("{{ \"trade_offer_access_token\":\"{0}\" }}", token)} // TODO: This should be rewrote
+					{"trade_offer_create_params", string.IsNullOrEmpty(token) ? "" : $"{{\"trade_offer_access_token\":\"{token}\"}}"}
 				};
 
 				HttpResponseMessage response = null;
@@ -426,7 +432,7 @@ namespace ArchiSteamFarm {
 
 			HttpResponseMessage response = null;
 			for (byte i = 0; i < WebBrowser.MaxRetries && response == null; i++) {
-				response = await WebBrowser.UrlGet("https://steamcommunity.com/profiles/" + SteamID + "/inventory/", Cookie).ConfigureAwait(false);
+				response = await WebBrowser.UrlGet("https://steamcommunity.com/profiles/" + SteamID + "/inventory", Cookie).ConfigureAwait(false);
 			}
 
 			if (response == null) {
@@ -464,13 +470,20 @@ namespace ArchiSteamFarm {
 			}
 
 			foreach (string setCookieValue in setCookieValues) {
-				if (setCookieValue.Contains("steamparental=")) {
-					string setCookie = setCookieValue.Substring(setCookieValue.IndexOf("steamparental=") + 14);
-					setCookie = setCookie.Substring(0, setCookie.IndexOf(';'));
-					Cookie["steamparental"] = setCookie;
-					Logging.LogGenericInfo("Success!", Bot.BotName);
-					return;
+				if (!setCookieValue.Contains("steamparental=")) {
+					continue;
 				}
+
+				string setCookie = setCookieValue.Substring(setCookieValue.IndexOf("steamparental=", StringComparison.Ordinal) + 14);
+
+				int index = setCookie.IndexOf(';');
+				if (index > 0) {
+					setCookie = setCookie.Substring(0, index);
+				}
+
+				Cookie["steamparental"] = setCookie;
+				Logging.LogGenericInfo("Success!", Bot.BotName);
+				return;
 			}
 
 			Logging.LogGenericWarning("Failed to unlock parental account!", Bot.BotName);

ArchiSteamFarm/Bot.cs

@@ -27,13 +27,11 @@ using SteamAuth;
 using SteamKit2;
 using SteamKit2.Internal;
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.Security.Cryptography;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Xml;
 using System.Text;
 
 namespace ArchiSteamFarm {
@@ -41,17 +39,19 @@ namespace ArchiSteamFarm {
 		private const ulong ArchiSCFarmGroup = 103582791440160998;
 		private const ushort CallbackSleep = 500; // In miliseconds
 
-		internal static readonly ConcurrentDictionary<string, Bot> Bots = new ConcurrentDictionary<string, Bot>();
-		internal static readonly HashSet<uint> GlobalBlacklist = new HashSet<uint> { 303700, 335590, 368020, 425280 };
+		internal static readonly Dictionary<string, Bot> Bots = new Dictionary<string, Bot>();
 
 		private static readonly uint LoginID = MsgClientLogon.ObfuscationMask; // This must be the same for all ASF bots and all ASF processes
 
-		private readonly string ConfigFile, LoginKeyFile, MobileAuthenticatorFile, SentryFile;
+		private readonly string SentryFile;
+		private readonly Timer AcceptConfirmationsTimer;
 		private readonly Timer SendItemsTimer;
 
 		internal readonly string BotName;
 		internal readonly ArchiHandler ArchiHandler;
 		internal readonly ArchiWebHandler ArchiWebHandler;
+		internal readonly BotConfig BotConfig;
+		internal readonly BotDatabase BotDatabase;
 		internal readonly SteamClient SteamClient;
 
 		private readonly CallbackManager CallbackManager;
@@ -62,49 +62,17 @@ namespace ArchiSteamFarm {
 		private readonly Trading Trading;
 
 		internal bool KeepRunning { get; private set; } = false;
-		internal SteamGuardAccount SteamGuardAccount { get; private set; }
-
-		// Config variables
-		internal bool Enabled { get; private set; } = false;
-		internal string SteamLogin { get; private set; } = "null";
-		internal string SteamPassword { get; private set; } = "null";
-		internal string SteamNickname { get; private set; } = "null";
-		internal string SteamApiKey { get; private set; } = "null";
-		internal string SteamParentalPIN { get; private set; } = "0";
-		internal ulong SteamMasterID { get; private set; } = 0;
-		internal ulong SteamMasterClanID { get; private set; } = 0;
-		internal bool StartOnLaunch { get; private set; } = true;
-		internal bool CardDropsRestricted { get; private set; } = false;
-		internal bool FarmOffline { get; private set; } = false;
-		internal bool HandleOfflineMessages { get; private set; } = false;
-		internal bool ForwardKeysToOtherBots { get; private set; } = false;
-		internal bool DistributeKeys { get; private set; } = false;
-		internal bool UseAsfAsMobileAuthenticator { get; private set; } = false;
-		internal bool ShutdownOnFarmingFinished { get; private set; } = false;
-		internal bool SendOnFarmingFinished { get; private set; } = false;
-		internal string SteamTradeToken { get; private set; } = "null";
-		internal byte SendTradePeriod { get; private set; } = 0;
-		internal HashSet<uint> Blacklist { get; } = new HashSet<uint>();
-		internal bool Statistics { get; private set; } = true;
 
 		private bool InvalidPassword = false;
 		private bool LoggedInElsewhere = false;
-		private string AuthCode, LoginKey, TwoFactorAuth;
+		private string AuthCode, TwoFactorAuth;
 
-		internal static string GetAnyBotName() {
-			foreach (string botName in Bots.Keys) {
-				return botName;
-			}
-
-			return null;
-		}
-
-		internal static async Task RefreshCMs() {
+		internal static async Task RefreshCMs(uint cellID) {
 			bool initialized = false;
 			for (byte i = 0; i < 3 && !initialized; i++) {
 				try {
 					Logging.LogGenericInfo("Refreshing list of CMs...");
-					await SteamDirectory.Initialize().ConfigureAwait(false);
+					await SteamDirectory.Initialize(cellID).ConfigureAwait(false);
 					initialized = true;
 				} catch (Exception e) {
 					Logging.LogGenericException(e);
@@ -138,16 +106,53 @@ namespace ArchiSteamFarm {
 			BotName = botName;
 
 			string botPath = Path.Combine(Program.ConfigDirectory, botName);
-			ConfigFile = botPath + ".xml";
-			LoginKeyFile = botPath + ".key";
-			MobileAuthenticatorFile = botPath + ".auth";
-			SentryFile = botPath + ".bin";
 
-			if (!ReadConfig()) {
+			// CONVERSION START
+			if (File.Exists(botPath + ".xml")) {
+				BotConfig = BotConfig.LoadOldFormat(botPath + ".xml");
+				if (BotConfig == null) {
+					return;
+				}
+
+				if (BotConfig.Convert(botPath + ".json")) {
+					try {
+						File.Delete(botPath + ".xml");
+					} catch (Exception e) {
+						Logging.LogGenericException(e, botName);
+						return;
+					}
+				}
+			}
+			// CONVERSION END
+
+			BotConfig = BotConfig.Load(botPath + ".json");
+			if (BotConfig == null) {
+				Logging.LogGenericError("Your config for this bot instance is invalid, it won't run!", botName);
 				return;
 			}
 
-			if (!Enabled) {
+			// CONVERSION START
+			if (File.Exists(botPath + ".key")) {
+				BotDatabase = BotDatabase.Load(botPath + ".db");
+				try {
+					BotDatabase.LoginKey = File.ReadAllText(botPath + ".key");
+					File.Delete(botPath + ".key");
+				} catch (Exception e) {
+					Logging.LogGenericException(e, BotName);
+				}
+			}
+			if (File.Exists(botPath + ".auth")) {
+				BotDatabase = BotDatabase.Load(botPath + ".db");
+				try {
+					BotDatabase.SteamGuardAccount = JsonConvert.DeserializeObject<SteamGuardAccount>(File.ReadAllText(botPath + ".auth"));
+					File.Delete(botPath + ".auth");
+				} catch (Exception e) {
+					Logging.LogGenericException(e, BotName);
+				}
+			}
+			// CONVERSION END
+
+			if (!BotConfig.Enabled) {
 				return;
 			}
 
@@ -163,9 +168,37 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
+			BotDatabase = BotDatabase.Load(botPath + ".db");
+			SentryFile = botPath + ".bin";
+
+			// Support and convert SDA files
+			if (BotDatabase.SteamGuardAccount == null && File.Exists(botPath + ".maFile")) {
+				Logging.LogGenericInfo("Converting SDA .maFile into ASF format...", botName);
+				try {
+					BotDatabase.SteamGuardAccount = JsonConvert.DeserializeObject<SteamGuardAccount>(File.ReadAllText(botPath + ".maFile"));
+					File.Delete(botPath + ".maFile");
+					Logging.LogGenericInfo("Success!", botName);
+				} catch (Exception e) {
+					Logging.LogGenericException(e, botName);
+				}
+			}
+
 			// Initialize
 			SteamClient = new SteamClient();
 
+			if (Program.GlobalConfig.Debug && !Debugging.NetHookAlreadyInitialized) {
+				try {
+					if (Directory.Exists(Program.DebugDirectory)) {
+						Directory.Delete(Program.DebugDirectory, true);
+					}
+					Directory.CreateDirectory(Program.DebugDirectory);
+					SteamClient.DebugNetworkListener = new NetHookNetworkListener(Program.DebugDirectory);
+					Debugging.NetHookAlreadyInitialized = true;
+				} catch (Exception e) {
+					Logging.LogGenericException(e, botName);
+				}
+			}
+
 			ArchiHandler = new ArchiHandler();
 			SteamClient.AddHandler(ArchiHandler);
 
@@ -183,14 +216,6 @@ namespace ArchiSteamFarm {
 			CallbackManager.Subscribe<SteamFriends.FriendMsgCallback>(OnFriendMsg);
 			CallbackManager.Subscribe<SteamFriends.FriendMsgHistoryCallback>(OnFriendMsgHistory);
 
-			if (UseAsfAsMobileAuthenticator && File.Exists(MobileAuthenticatorFile)) {
-				try {
-					SteamGuardAccount = JsonConvert.DeserializeObject<SteamGuardAccount>(File.ReadAllText(MobileAuthenticatorFile));
-				} catch (Exception e) {
-					Logging.LogGenericException(e, botName);
-				}
-			}
-
 			SteamUser = SteamClient.GetHandler<SteamUser>();
 			CallbackManager.Subscribe<SteamUser.AccountInfoCallback>(OnAccountInfo);
 			CallbackManager.Subscribe<SteamUser.LoggedOffCallback>(OnLoggedOff);
@@ -202,20 +227,29 @@ namespace ArchiSteamFarm {
 			CallbackManager.Subscribe<ArchiHandler.OfflineMessageCallback>(OnOfflineMessage);
 			CallbackManager.Subscribe<ArchiHandler.PurchaseResponseCallback>(OnPurchaseResponse);
 
-			ArchiWebHandler = new ArchiWebHandler(this, SteamApiKey);
+			ArchiWebHandler = new ArchiWebHandler(this);
 			CardsFarmer = new CardsFarmer(this);
 			Trading = new Trading(this);
 
-			if (SendTradePeriod > 0 && SendItemsTimer == null) {
-				SendItemsTimer = new Timer(
-					async e => await ResponseSendTrade().ConfigureAwait(false),
+			if (BotConfig.AcceptConfirmationsPeriod > 0 && AcceptConfirmationsTimer == null) {
+				AcceptConfirmationsTimer = new Timer(
+					async e => await AcceptAllConfirmations().ConfigureAwait(false),
 					null,
-					TimeSpan.FromHours(SendTradePeriod), // Delay
-					TimeSpan.FromHours(SendTradePeriod) // Period
+					TimeSpan.FromMinutes(BotConfig.AcceptConfirmationsPeriod), // Delay
+					TimeSpan.FromMinutes(BotConfig.AcceptConfirmationsPeriod) // Period
 				);
 			}
 
-			if (!StartOnLaunch) {
+			if (BotConfig.SendTradePeriod > 0 && SendItemsTimer == null) {
+				SendItemsTimer = new Timer(
+					async e => await ResponseSendTrade().ConfigureAwait(false),
+					null,
+					TimeSpan.FromHours(BotConfig.SendTradePeriod), // Delay
+					TimeSpan.FromHours(BotConfig.SendTradePeriod) // Period
+				);
+			}
+
+			if (!BotConfig.StartOnLaunch) {
 				return;
 			}
 
@@ -224,15 +258,22 @@ namespace ArchiSteamFarm {
 		}
 
 		internal async Task AcceptAllConfirmations() {
-			if (SteamGuardAccount == null) {
+			if (BotDatabase.SteamGuardAccount == null) {
 				return;
 			}
 
-			await SteamGuardAccount.RefreshSessionAsync().ConfigureAwait(false);
+			if (!await BotDatabase.SteamGuardAccount.RefreshSessionAsync().ConfigureAwait(false)) {
+				return;
+			}
+
+			Confirmation[] confirmations = await BotDatabase.SteamGuardAccount.FetchConfirmationsAsync().ConfigureAwait(false);
+			if (confirmations == null) {
+				return;
+			}
 
 			try {
-				foreach (Confirmation confirmation in await SteamGuardAccount.FetchConfirmationsAsync().ConfigureAwait(false)) {
-					if (SteamGuardAccount.AcceptConfirmation(confirmation)) {
+				foreach (Confirmation confirmation in confirmations) {
+					if (BotDatabase.SteamGuardAccount.AcceptConfirmation(confirmation)) {
 						Logging.LogGenericInfo("Accepting confirmation: Success!", BotName);
 					} else {
 						Logging.LogGenericWarning("Accepting confirmation: Failed!", BotName);
@@ -245,6 +286,14 @@ namespace ArchiSteamFarm {
 			}
 		}
 
+		internal void ResetGamesPlayed() {
+			if (!string.IsNullOrEmpty(BotConfig.CustomGamePlayedWhileIdle)) {
+				ArchiHandler.PlayGame(BotConfig.CustomGamePlayedWhileIdle);
+			} else {
+				ArchiHandler.PlayGames(BotConfig.GamesPlayedWhileIdle);
+			}
+		}
+
 		internal async Task Restart() {
 			Stop();
 			await Utilities.SleepAsync(500).ConfigureAwait(false);
@@ -252,10 +301,10 @@ namespace ArchiSteamFarm {
 		}
 
 		internal async Task OnFarmingFinished(bool farmedSomething) {
-			if (farmedSomething && SendOnFarmingFinished) {
+			if (farmedSomething && BotConfig.SendOnFarmingFinished) {
 				await ResponseSendTrade().ConfigureAwait(false);
 			}
-			if (ShutdownOnFarmingFinished) {
+			if (BotConfig.ShutdownOnFarmingFinished) {
 				Shutdown();
 			}
 		}
@@ -275,6 +324,8 @@ namespace ArchiSteamFarm {
 						return Response2FA();
 					case "!2faoff":
 						return Response2FAOff();
+					case "!2faok":
+						return await Response2FAOK().ConfigureAwait(false);
 					case "!exit":
 						Program.Exit();
 						return null;
@@ -282,7 +333,7 @@ namespace ArchiSteamFarm {
 						return ResponseRejoinChat();
 					case "!restart":
 						Program.Restart();
-						return "Done";
+						return null;
 					case "!status":
 						return ResponseStatus();
 					case "!statusall":
@@ -301,6 +352,8 @@ namespace ArchiSteamFarm {
 						return Response2FA(args[1]);
 					case "!2faoff":
 						return Response2FAOff(args[1]);
+					case "!2faok":
+						return await Response2FAOK(args[1]).ConfigureAwait(false);
 					case "!addlicense":
 						if (args.Length > 2) {
 							return await ResponseAddLicense(args[1], args[2]).ConfigureAwait(false);
@@ -340,7 +393,7 @@ namespace ArchiSteamFarm {
 
 			if (!KeepRunning) {
 				KeepRunning = true;
-				var handleCallbacks = Task.Run(() => HandleCallbacks());
+				Task.Run(() => HandleCallbacks()).Forget();
 			}
 
 			Logging.LogGenericInfo("Starting...", BotName);
@@ -408,23 +461,18 @@ namespace ArchiSteamFarm {
 		}
 
 		private async Task<string> ResponseSendTrade() {
-			if (SteamMasterID == 0) {
+			if (BotConfig.SteamMasterID == 0) {
 				return "Trade couldn't be send because SteamMasterID is not defined!";
 			}
 
-			string token = null;
-			if (!string.IsNullOrEmpty(SteamTradeToken) && !SteamTradeToken.Equals("null")) {
-				token = SteamTradeToken;
-			}
-
 			await Trading.LimitInventoryRequestsAsync().ConfigureAwait(false);
-			List<SteamItem> inventory = await ArchiWebHandler.GetMyTradableInventory().ConfigureAwait(false);
+			List<Steam.Item> inventory = await ArchiWebHandler.GetMyTradableInventory().ConfigureAwait(false);
 
 			if (inventory == null || inventory.Count == 0) {
 				return "Nothing to send, inventory seems empty!";
 			}
 
-			if (await ArchiWebHandler.SendTradeOffer(inventory, SteamMasterID, token).ConfigureAwait(false)) {
+			if (await ArchiWebHandler.SendTradeOffer(inventory, BotConfig.SteamMasterID, BotConfig.SteamTradeToken).ConfigureAwait(false)) {
 				await AcceptAllConfirmations().ConfigureAwait(false);
 				return "Trade offer sent successfully!";
 			} else {
@@ -446,12 +494,12 @@ namespace ArchiSteamFarm {
 		}
 
 		private string Response2FA() {
-			if (SteamGuardAccount == null) {
+			if (BotDatabase.SteamGuardAccount == null) {
 				return "That bot doesn't have ASF 2FA enabled!";
 			}
 
 			long timeLeft = 30 - TimeAligner.GetSteamTime() % 30;
-			return "2FA Token: " + SteamGuardAccount.GenerateSteamGuardCode() + " (expires in " + timeLeft + " seconds)";
+			return "2FA Token: " + BotDatabase.SteamGuardAccount.GenerateSteamGuardCode() + " (expires in " + timeLeft + " seconds)";
 		}
 
 		private static string Response2FA(string botName) {
@@ -468,7 +516,7 @@ namespace ArchiSteamFarm {
 		}
 
 		private string Response2FAOff() {
-			if (SteamGuardAccount == null) {
+			if (BotDatabase.SteamGuardAccount == null) {
 				return "That bot doesn't have ASF 2FA enabled!";
 			}
 
@@ -492,6 +540,28 @@ namespace ArchiSteamFarm {
 			return bot.Response2FAOff();
 		}
 
+		private async Task<string> Response2FAOK() {
+			if (BotDatabase.SteamGuardAccount == null) {
+				return "That bot doesn't have ASF 2FA enabled!";
+			}
+
+			await AcceptAllConfirmations().ConfigureAwait(false);
+			return "Done!";
+		}
+
+		private static async Task<string> Response2FAOK(string botName) {
+			if (string.IsNullOrEmpty(botName)) {
+				return null;
+			}
+
+			Bot bot;
+			if (!Bots.TryGetValue(botName, out bot)) {
+				return "Couldn't find any bot named " + botName + "!";
+			}
+
+			return await bot.Response2FAOK().ConfigureAwait(false);
+		}
+
 		private async Task<string> ResponseRedeem(string message, bool validate) {
 			if (string.IsNullOrEmpty(message)) {
 				return null;
@@ -514,7 +584,7 @@ namespace ArchiSteamFarm {
 
 					ArchiHandler.PurchaseResponseCallback result;
 					try {
-						result = await currentBot.ArchiHandler.RedeemKey(key);
+						result = await currentBot.ArchiHandler.RedeemKey(key).ConfigureAwait(false);
 					} catch (Exception e) {
 						Logging.LogGenericException(e, currentBot.BotName);
 						break;
@@ -533,7 +603,7 @@ namespace ArchiSteamFarm {
 						case ArchiHandler.PurchaseResponseCallback.EPurchaseResult.OnCooldown:
 						case ArchiHandler.PurchaseResponseCallback.EPurchaseResult.RegionLocked:
 							response.Append(Environment.NewLine + "<" + currentBot.BotName + "> Key: " + key + " | Status: " + purchaseResult + " | Items: " + string.Join("", items));
-							if (DistributeKeys) {
+							if (BotConfig.DistributeKeys) {
 								do {
 									if (iterator.MoveNext()) {
 										currentBot = iterator.Current;
@@ -542,13 +612,13 @@ namespace ArchiSteamFarm {
 									}
 								} while (currentBot == this);
 
-								if (!ForwardKeysToOtherBots) {
+								if (!BotConfig.ForwardKeysToOtherBots) {
 									key = reader.ReadLine();
 								}
 								break;
 							}
 
-							if (!ForwardKeysToOtherBots) {
+							if (!BotConfig.ForwardKeysToOtherBots) {
 								key = reader.ReadLine();
 								break;
 							}
@@ -565,7 +635,7 @@ namespace ArchiSteamFarm {
 
 								ArchiHandler.PurchaseResponseCallback otherResult;
 								try {
-									otherResult = await bot.ArchiHandler.RedeemKey(key);
+									otherResult = await bot.ArchiHandler.RedeemKey(key).ConfigureAwait(false);
 								} catch (Exception e) {
 									Logging.LogGenericException(e, bot.BotName);
 									break; // We're done with this key
@@ -597,7 +667,7 @@ namespace ArchiSteamFarm {
 							break;
 						case ArchiHandler.PurchaseResponseCallback.EPurchaseResult.OK:
 							response.Append(Environment.NewLine + "<" + currentBot.BotName + "> Key: " + key + " | Status: " + purchaseResult + " | Items: " + string.Join("", items));
-							if (DistributeKeys) {
+							if (BotConfig.DistributeKeys) {
 								do {
 									if (iterator.MoveNext()) {
 										currentBot = iterator.Current;
@@ -611,7 +681,7 @@ namespace ArchiSteamFarm {
 						case ArchiHandler.PurchaseResponseCallback.EPurchaseResult.DuplicatedKey:
 						case ArchiHandler.PurchaseResponseCallback.EPurchaseResult.InvalidKey:
 							response.Append(Environment.NewLine + "<" + currentBot.BotName + "> Key: " + key + " | Status: " + purchaseResult + " | Items: " + string.Join("", items));
-							if (DistributeKeys && !ForwardKeysToOtherBots) {
+							if (BotConfig.DistributeKeys && !BotConfig.ForwardKeysToOtherBots) {
 								do {
 									if (iterator.MoveNext()) {
 										currentBot = iterator.Current;
@@ -710,7 +780,7 @@ namespace ArchiSteamFarm {
 
 			if (gameIDs.Contains(0)) {
 				if (await CardsFarmer.SwitchToManualMode(false).ConfigureAwait(false)) {
-					ArchiHandler.PlayGames(0);
+					ResetGamesPlayed();
 				}
 			} else {
 				await CardsFarmer.SwitchToManualMode(true).ConfigureAwait(false);
@@ -794,7 +864,7 @@ namespace ArchiSteamFarm {
 
 		private void HandleCallbacks() {
 			TimeSpan timeSpan = TimeSpan.FromMilliseconds(CallbackSleep);
-			while (KeepRunning) {
+			while (KeepRunning || SteamClient.IsConnected) {
 				CallbackManager.RunWaitCallbacks(timeSpan);
 			}
 		}
@@ -812,21 +882,20 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
-			// TODO: I really need something better
-			if (steamID < 110300000000000000) {
-				SteamFriends.SendChatMessage(steamID, EChatEntryType.ChatMsg, message);
-			} else {
+			if (new SteamID(steamID).IsChatAccount) {
 				SteamFriends.SendChatRoomMessage(steamID, EChatEntryType.ChatMsg, message);
+			} else {
+				SteamFriends.SendChatMessage(steamID, EChatEntryType.ChatMsg, message);
 			}
 		}
 
-		private bool LinkMobileAuthenticator() {
-			if (SteamGuardAccount != null) {
-				return false;
+		private void LinkMobileAuthenticator() {
+			if (BotDatabase.SteamGuardAccount != null) {
+				return;
 			}
 
 			Logging.LogGenericInfo("Linking new ASF MobileAuthenticator...", BotName);
-			UserLogin userLogin = new UserLogin(SteamLogin, SteamPassword);
+			UserLogin userLogin = new UserLogin(BotConfig.SteamLogin, BotConfig.SteamPassword);
 			LoginResult loginResult;
 			while ((loginResult = userLogin.DoLogin()) != LoginResult.LoginOkay) {
 				switch (loginResult) {
@@ -835,7 +904,7 @@ namespace ArchiSteamFarm {
 						break;
 					default:
 						Logging.LogGenericError("Unhandled situation: " + loginResult, BotName);
-						return false;
+						return;
 				}
 			}
 
@@ -849,54 +918,43 @@ namespace ArchiSteamFarm {
 						break;
 					default:
 						Logging.LogGenericError("Unhandled situation: " + linkResult, BotName);
-						return false;
+						return;
 				}
 			}
 
-			SteamGuardAccount = authenticatorLinker.LinkedAccount;
-
-			try {
-				File.WriteAllText(MobileAuthenticatorFile, JsonConvert.SerializeObject(SteamGuardAccount));
-			} catch (Exception e) {
-				Logging.LogGenericException(e, BotName);
-				return false;
-			}
+			BotDatabase.SteamGuardAccount = authenticatorLinker.LinkedAccount;
 
 			AuthenticatorLinker.FinalizeResult finalizeResult = authenticatorLinker.FinalizeAddAuthenticator(Program.GetUserInput(BotName, Program.EUserInputType.SMS));
 			if (finalizeResult != AuthenticatorLinker.FinalizeResult.Success) {
 				Logging.LogGenericError("Unhandled situation: " + finalizeResult, BotName);
 				DelinkMobileAuthenticator();
-				return false;
+				return;
 			}
 
 			Logging.LogGenericInfo("Successfully linked ASF as new mobile authenticator for this account!", BotName);
-			Program.GetUserInput(BotName, Program.EUserInputType.RevocationCode, SteamGuardAccount.RevocationCode);
-			return true;
+			Program.GetUserInput(BotName, Program.EUserInputType.RevocationCode, BotDatabase.SteamGuardAccount.RevocationCode);
 		}
 
 		private bool DelinkMobileAuthenticator() {
-			if (SteamGuardAccount == null) {
+			if (BotDatabase.SteamGuardAccount == null) {
 				return false;
 			}
 
-			bool result = SteamGuardAccount.DeactivateAuthenticator();
-			SteamGuardAccount = null;
+			bool result = BotDatabase.SteamGuardAccount.DeactivateAuthenticator();
 
-			try {
-				File.Delete(MobileAuthenticatorFile);
-			} catch (Exception e) {
-				Logging.LogGenericException(e, BotName);
+			if (result) {
+				BotDatabase.SteamGuardAccount = null;
 			}
 
 			return result;
 		}
 
 		private void JoinMasterChat() {
-			if (SteamMasterClanID == 0) {
+			if (BotConfig.SteamMasterClanID == 0) {
 				return;
 			}
 
-			SteamFriends.JoinChat(SteamMasterClanID);
+			SteamFriends.JoinChat(BotConfig.SteamMasterClanID);
 		}
 
 		private void OnConnected(SteamClient.ConnectedCallback callback) {
@@ -911,12 +969,10 @@ namespace ArchiSteamFarm {
 
 			Logging.LogGenericInfo("Connected to Steam!", BotName);
 
-			if (File.Exists(LoginKeyFile)) {
-				try {
-					LoginKey = File.ReadAllText(LoginKeyFile);
-				} catch (Exception e) {
-					Logging.LogGenericException(e, BotName);
-				}
+			if (!KeepRunning) {
+				Logging.LogGenericInfo("Disconnecting...", BotName);
+				SteamClient.Disconnect();
+				return;
 			}
 
 			byte[] sentryHash = null;
@@ -929,20 +985,20 @@ namespace ArchiSteamFarm {
 				}
 			}
 
-			if (SteamLogin.Equals("null")) {
-				SteamLogin = Program.GetUserInput(BotName, Program.EUserInputType.Login);
+			if (string.IsNullOrEmpty(BotConfig.SteamLogin)) {
+				BotConfig.SteamLogin = Program.GetUserInput(BotName, Program.EUserInputType.Login);
 			}
 
-			if (SteamPassword.Equals("null") && string.IsNullOrEmpty(LoginKey)) {
-				SteamPassword = Program.GetUserInput(BotName, Program.EUserInputType.Password);
+			if (string.IsNullOrEmpty(BotConfig.SteamPassword) && string.IsNullOrEmpty(BotDatabase.LoginKey)) {
+				BotConfig.SteamPassword = Program.GetUserInput(BotName, Program.EUserInputType.Password);
 			}
 
 			SteamUser.LogOn(new SteamUser.LogOnDetails {
-				Username = SteamLogin,
-				Password = SteamPassword,
+				Username = BotConfig.SteamLogin,
+				Password = BotConfig.SteamPassword,
 				AuthCode = AuthCode,
 				LoginID = LoginID,
-				LoginKey = LoginKey,
+				LoginKey = BotDatabase.LoginKey,
 				TwoFactorCode = TwoFactorAuth,
 				SentryFileHash = sentryHash,
 				ShouldRememberPassword = true
@@ -968,15 +1024,8 @@ namespace ArchiSteamFarm {
 
 			if (InvalidPassword) {
 				InvalidPassword = false;
-				if (!string.IsNullOrEmpty(LoginKey)) { // InvalidPassword means usually that login key has expired, if we used it
-					LoginKey = null;
-
-					try {
-						File.Delete(LoginKeyFile);
-					} catch (Exception e) {
-						Logging.LogGenericException(e, BotName);
-					}
-
+				if (!string.IsNullOrEmpty(BotDatabase.LoginKey)) { // InvalidPassword means usually that login key has expired, if we used it
+					BotDatabase.LoginKey = null;
 					Logging.LogGenericInfo("Removed expired login key", BotName);
 				} else { // If we didn't use login key, InvalidPassword usually means we got captcha or other network-based throttling
 					Logging.LogGenericInfo("Will retry after 25 minutes...", BotName);
@@ -984,8 +1033,8 @@ namespace ArchiSteamFarm {
 				}
 			} else if (LoggedInElsewhere) {
 				LoggedInElsewhere = false;
-				Logging.LogGenericWarning("Account is being used elsewhere, will try reconnecting in 30 minutes...", BotName);
-				await Utilities.SleepAsync(30 * 60 * 1000).ConfigureAwait(false);
+				Logging.LogGenericInfo("Account is being used elsewhere, ASF will try to resume farming in " + Program.GlobalConfig.AccountPlayingDelay + " minutes...", BotName);
+				await Utilities.SleepAsync(Program.GlobalConfig.AccountPlayingDelay * 60 * 1000).ConfigureAwait(false);
 			}
 
 			Logging.LogGenericInfo("Reconnecting...", BotName);
@@ -1009,7 +1058,7 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
-			if (callback.PatronID != SteamMasterID) {
+			if (callback.PatronID != BotConfig.SteamMasterID) {
 				return;
 			}
 
@@ -1025,7 +1074,7 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
-			if (callback.ChatterID != SteamMasterID) {
+			if (callback.ChatterID != BotConfig.SteamMasterID) {
 				return;
 			}
 
@@ -1054,7 +1103,7 @@ namespace ArchiSteamFarm {
 						// TODO: Accept clan invites from master?
 						break;
 					default:
-						if (friend.SteamID == SteamMasterID) {
+						if (friend.SteamID == BotConfig.SteamMasterID) {
 							SteamFriends.AddFriend(friend.SteamID);
 						}
 						break;
@@ -1071,7 +1120,7 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
-			if (callback.Sender != SteamMasterID) {
+			if (callback.Sender != BotConfig.SteamMasterID) {
 				return;
 			}
 
@@ -1087,7 +1136,7 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
-			if (callback.SteamID != SteamMasterID) {
+			if (callback.SteamID != BotConfig.SteamMasterID) {
 				return;
 			}
 
@@ -1117,7 +1166,7 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
-			if (!FarmOffline) {
+			if (!BotConfig.FarmOffline) {
 				SteamFriends.SetPersonaState(EPersonaState.Online);
 			}
 		}
@@ -1145,13 +1194,13 @@ namespace ArchiSteamFarm {
 
 			switch (callback.Result) {
 				case EResult.AccountLogonDenied:
-					AuthCode = Program.GetUserInput(SteamLogin, Program.EUserInputType.SteamGuard);
+					AuthCode = Program.GetUserInput(BotConfig.SteamLogin, Program.EUserInputType.SteamGuard);
 					break;
 				case EResult.AccountLoginDeniedNeedTwoFactor:
-					if (SteamGuardAccount == null) {
-						TwoFactorAuth = Program.GetUserInput(SteamLogin, Program.EUserInputType.TwoFactorAuthentication);
+					if (BotDatabase.SteamGuardAccount == null) {
+						TwoFactorAuth = Program.GetUserInput(BotConfig.SteamLogin, Program.EUserInputType.TwoFactorAuthentication);
 					} else {
-						TwoFactorAuth = SteamGuardAccount.GenerateSteamGuardCode();
+						TwoFactorAuth = BotDatabase.SteamGuardAccount.GenerateSteamGuardCode();
 					}
 					break;
 				case EResult.InvalidPassword:
@@ -1161,7 +1210,24 @@ namespace ArchiSteamFarm {
 				case EResult.OK:
 					Logging.LogGenericInfo("Successfully logged on!", BotName);
 
-					if (UseAsfAsMobileAuthenticator && TwoFactorAuth == null && SteamGuardAccount == null) {
+					if (callback.CellID != 0) {
+						Program.GlobalDatabase.CellID = callback.CellID;
+					}
+
+					// Support and convert SDA files
+					string maFilePath = Path.Combine(Program.ConfigDirectory, callback.ClientSteamID.ConvertToUInt64() + ".maFile");
+					if (BotDatabase.SteamGuardAccount == null && File.Exists(maFilePath)) {
+						Logging.LogGenericInfo("Converting SDA .maFile into ASF format...", BotName);
+						try {
+							BotDatabase.SteamGuardAccount = JsonConvert.DeserializeObject<SteamGuardAccount>(File.ReadAllText(maFilePath));
+							File.Delete(maFilePath);
+							Logging.LogGenericInfo("Success!", BotName);
+						} catch (Exception e) {
+							Logging.LogGenericException(e, BotName);
+						}
+					}
+
+					if (BotConfig.UseAsfAsMobileAuthenticator && TwoFactorAuth == null && BotDatabase.SteamGuardAccount == null) {
 						LinkMobileAuthenticator();
 					}
 
@@ -1169,32 +1235,34 @@ namespace ArchiSteamFarm {
 					AuthCode = null;
 					TwoFactorAuth = null;
 
-					if (!SteamNickname.Equals("null")) {
-						await SteamFriends.SetPersonaName(SteamNickname);
+					ResetGamesPlayed();
+
+					if (string.IsNullOrEmpty(BotConfig.SteamParentalPIN)) {
+						BotConfig.SteamParentalPIN = Program.GetUserInput(BotName, Program.EUserInputType.SteamParentalPIN);
 					}
 
-					if (SteamParentalPIN.Equals("null")) {
-						SteamParentalPIN = Program.GetUserInput(BotName, Program.EUserInputType.SteamParentalPIN);
-					}
-
-					if (!await ArchiWebHandler.Init(SteamClient, callback.WebAPIUserNonce, SteamParentalPIN).ConfigureAwait(false)) {
+					if (!await ArchiWebHandler.Init(SteamClient, callback.WebAPIUserNonce, BotConfig.SteamParentalPIN).ConfigureAwait(false)) {
 						await Restart().ConfigureAwait(false);
 						return;
 					}
 
-					if (SteamMasterClanID != 0) {
-						await ArchiWebHandler.JoinClan(SteamMasterClanID).ConfigureAwait(false);
+					if (BotConfig.DismissInventoryNotifications) {
+						await ArchiWebHandler.MarkInventory().ConfigureAwait(false);
+					}
+
+					if (BotConfig.SteamMasterClanID != 0) {
+						await ArchiWebHandler.JoinClan(BotConfig.SteamMasterClanID).ConfigureAwait(false);
 						JoinMasterChat();
 					}
 
-					if (Statistics) {
+					if (Program.GlobalConfig.Statistics) {
 						await ArchiWebHandler.JoinClan(ArchiSCFarmGroup).ConfigureAwait(false);
 						SteamFriends.JoinChat(ArchiSCFarmGroup);
 					}
 
 					Trading.CheckTrades();
 
-					var start = Task.Run(async () => await CardsFarmer.StartFarming().ConfigureAwait(false));
+					Task.Run(async () => await CardsFarmer.StartFarming().ConfigureAwait(false)).Forget();
 					break;
 				case EResult.NoConnection:
 				case EResult.ServiceUnavailable:
@@ -1214,12 +1282,7 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
-			try {
-				File.WriteAllText(LoginKeyFile, callback.LoginKey);
-			} catch (Exception e) {
-				Logging.LogGenericException(e, BotName);
-			}
-
+			BotDatabase.LoginKey = callback.LoginKey;
 			SteamUser.AcceptNewLoginKey(callback);
 		}
 
@@ -1282,7 +1345,7 @@ namespace ArchiSteamFarm {
 				Trading.CheckTrades();
 			}
 
-			if (markInventory) {
+			if (markInventory && BotConfig.DismissInventoryNotifications) {
 				await ArchiWebHandler.MarkInventory().ConfigureAwait(false);
 			}
 		}
@@ -1292,126 +1355,22 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
-			if (!HandleOfflineMessages) {
+			if (!BotConfig.HandleOfflineMessages) {
 				return;
 			}
 
 			SteamFriends.RequestOfflineMessages();
 		}
 
-		private async void OnPurchaseResponse(ArchiHandler.PurchaseResponseCallback callback) {
+		private void OnPurchaseResponse(ArchiHandler.PurchaseResponseCallback callback) {
 			if (callback == null) {
 				return;
 			}
 
 			if (callback.PurchaseResult == ArchiHandler.PurchaseResponseCallback.EPurchaseResult.OK) {
 				// We will restart CF module to recalculate current status and decide about new optimal approach
-				await CardsFarmer.RestartFarming().ConfigureAwait(false);
+				Task.Run(async () => await CardsFarmer.RestartFarming().ConfigureAwait(false)).Forget();
 			}
 		}
-
-		private bool ReadConfig() {
-			if (!File.Exists(ConfigFile)) {
-				return false;
-			}
-
-			try {
-				using (XmlReader reader = XmlReader.Create(ConfigFile)) {
-					while (reader.Read()) {
-						if (reader.NodeType != XmlNodeType.Element) {
-							continue;
-						}
-
-						string key = reader.Name;
-						if (string.IsNullOrEmpty(key)) {
-							continue;
-						}
-
-						string value = reader.GetAttribute("value");
-						if (string.IsNullOrEmpty(value)) {
-							continue;
-						}
-
-						switch (key) {
-							case "Enabled":
-								Enabled = bool.Parse(value);
-								break;
-							case "SteamLogin":
-								SteamLogin = value;
-								break;
-							case "SteamPassword":
-								SteamPassword = value;
-								break;
-							case "SteamNickname":
-								SteamNickname = value;
-								break;
-							case "SteamApiKey":
-								SteamApiKey = value;
-								break;
-							case "SteamTradeToken":
-								SteamTradeToken = value;
-								break;
-							case "SteamParentalPIN":
-								SteamParentalPIN = value;
-								break;
-							case "SteamMasterID":
-								SteamMasterID = ulong.Parse(value);
-								break;
-							case "SteamMasterClanID":
-								SteamMasterClanID = ulong.Parse(value);
-								break;
-							case "StartOnLaunch":
-								StartOnLaunch = bool.Parse(value);
-								break;
-							case "UseAsfAsMobileAuthenticator":
-								UseAsfAsMobileAuthenticator = bool.Parse(value);
-								break;
-							case "CardDropsRestricted":
-								CardDropsRestricted = bool.Parse(value);
-								break;
-							case "FarmOffline":
-								FarmOffline = bool.Parse(value);
-								break;
-							case "HandleOfflineMessages":
-								HandleOfflineMessages = bool.Parse(value);
-								break;
-							case "ForwardKeysToOtherBots":
-								ForwardKeysToOtherBots = bool.Parse(value);
-								break;
-							case "DistributeKeys":
-								DistributeKeys = bool.Parse(value);
-								break;
-							case "ShutdownOnFarmingFinished":
-								ShutdownOnFarmingFinished = bool.Parse(value);
-								break;
-							case "SendOnFarmingFinished":
-								SendOnFarmingFinished = bool.Parse(value);
-								break;
-							case "SendTradePeriod":
-								SendTradePeriod = byte.Parse(value);
-								break;
-							case "Blacklist":
-								Blacklist.Clear();
-								foreach (string appID in value.Split(',')) {
-									Blacklist.Add(uint.Parse(appID));
-								}
-								break;
-							case "Statistics":
-								Statistics = bool.Parse(value);
-								break;
-							default:
-								Logging.LogGenericWarning("Unrecognized config value: " + key + "=" + value, BotName);
-								break;
-						}
-					}
-				}
-			} catch (Exception e) {
-				Logging.LogGenericException(e, BotName);
-				Logging.LogGenericError("Your config for this bot instance is invalid, it won't run!", BotName);
-				return false;
-			}
-
-			return true;
-		}
 	}
 }

ArchiSteamFarm/BotConfig.cs

@@ -0,0 +1,258 @@
+/*
+    _                _      _  ____   _                           _____
+   / \    _ __  ___ | |__  (_)/ ___| | |_  ___   __ _  _ __ ___  |  ___|__ _  _ __  _ __ ___
+  / _ \  | '__|/ __|| '_ \ | |\___ \ | __|/ _ \ / _` || '_ ` _ \ | |_  / _` || '__|| '_ ` _ \
+ / ___ \ | |  | (__ | | | || | ___) || |_|  __/| (_| || | | | | ||  _|| (_| || |   | | | | | |
+/_/   \_\|_|   \___||_| |_||_||____/  \__|\___| \__,_||_| |_| |_||_|   \__,_||_|   |_| |_| |_|
+
+ Copyright 2015-2016 Łukasz "JustArchi" Domeradzki
+ Contact: JustArchi@JustArchi.net
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+					
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+*/
+
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Xml;
+
+namespace ArchiSteamFarm {
+	internal sealed class BotConfig {
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal bool Enabled { get; private set; } = false;
+
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal bool StartOnLaunch { get; private set; } = true;
+
+		[JsonProperty]
+		internal string SteamLogin { get; set; } = null;
+
+		[JsonProperty]
+		internal string SteamPassword { get; set; } = null;
+
+		[JsonProperty]
+		internal string SteamParentalPIN { get; set; } = "0";
+
+		[JsonProperty]
+		internal string SteamApiKey { get; private set; } = null;
+
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal ulong SteamMasterID { get; private set; } = 0;
+
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal ulong SteamMasterClanID { get; private set; } = 0;
+
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal bool CardDropsRestricted { get; private set; } = false;
+
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal bool DismissInventoryNotifications { get; private set; } = true;
+
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal bool FarmOffline { get; private set; } = false;
+
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal bool HandleOfflineMessages { get; private set; } = false;
+
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal bool ForwardKeysToOtherBots { get; private set; } = false;
+
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal bool DistributeKeys { get; private set; } = false;
+
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal bool UseAsfAsMobileAuthenticator { get; private set; } = false;
+
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal bool ShutdownOnFarmingFinished { get; private set; } = false;
+
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal bool SendOnFarmingFinished { get; private set; } = false;
+
+		[JsonProperty]
+		internal string SteamTradeToken { get; private set; } = null;
+
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal byte SendTradePeriod { get; private set; } = 0;
+
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal byte AcceptConfirmationsPeriod { get; private set; } = 0;
+
+		[JsonProperty]
+		internal string CustomGamePlayedWhileIdle { get; private set; } = null;
+
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal HashSet<uint> GamesPlayedWhileIdle { get; private set; } = new HashSet<uint>() { 0 };
+
+
+		internal static BotConfig Load(string path) {
+			if (!File.Exists(path)) {
+				return null;
+			}
+
+			BotConfig botConfig;
+			try {
+				botConfig = JsonConvert.DeserializeObject<BotConfig>(File.ReadAllText(path));
+			} catch (Exception e) {
+				Logging.LogGenericException(e);
+				return null;
+			}
+
+			return botConfig;
+		}
+
+		// TODO: This should be removed soon
+		internal static BotConfig LoadOldFormat(string path) {
+			if (!File.Exists(path)) {
+				return null;
+			}
+
+			BotConfig botConfig = new BotConfig();
+
+			try {
+				using (XmlReader reader = XmlReader.Create(path)) {
+					while (reader.Read()) {
+						if (reader.NodeType != XmlNodeType.Element) {
+							continue;
+						}
+
+						string key = reader.Name;
+						if (string.IsNullOrEmpty(key)) {
+							continue;
+						}
+
+						string value = reader.GetAttribute("value");
+						if (string.IsNullOrEmpty(value)) {
+							continue;
+						}
+
+						switch (key) {
+							case "Enabled":
+								botConfig.Enabled = bool.Parse(value);
+								break;
+							case "SteamLogin":
+								botConfig.SteamLogin = value;
+								break;
+							case "SteamPassword":
+								botConfig.SteamPassword = value;
+								break;
+							case "SteamApiKey":
+								botConfig.SteamApiKey = value;
+								break;
+							case "SteamTradeToken":
+								botConfig.SteamTradeToken = value;
+								break;
+							case "SteamParentalPIN":
+								botConfig.SteamParentalPIN = value;
+								break;
+							case "SteamMasterID":
+								botConfig.SteamMasterID = ulong.Parse(value);
+								break;
+							case "SteamMasterClanID":
+								botConfig.SteamMasterClanID = ulong.Parse(value);
+								break;
+							case "StartOnLaunch":
+								botConfig.StartOnLaunch = bool.Parse(value);
+								break;
+							case "UseAsfAsMobileAuthenticator":
+								botConfig.UseAsfAsMobileAuthenticator = bool.Parse(value);
+								break;
+							case "CardDropsRestricted":
+								botConfig.CardDropsRestricted = bool.Parse(value);
+								break;
+							case "FarmOffline":
+								botConfig.FarmOffline = bool.Parse(value);
+								break;
+							case "HandleOfflineMessages":
+								botConfig.HandleOfflineMessages = bool.Parse(value);
+								break;
+							case "ForwardKeysToOtherBots":
+								botConfig.ForwardKeysToOtherBots = bool.Parse(value);
+								break;
+							case "DistributeKeys":
+								botConfig.DistributeKeys = bool.Parse(value);
+								break;
+							case "ShutdownOnFarmingFinished":
+								botConfig.ShutdownOnFarmingFinished = bool.Parse(value);
+								break;
+							case "SendOnFarmingFinished":
+								botConfig.SendOnFarmingFinished = bool.Parse(value);
+								break;
+							case "SendTradePeriod":
+								botConfig.SendTradePeriod = byte.Parse(value);
+								break;
+							case "GamesPlayedWhileIdle":
+								botConfig.GamesPlayedWhileIdle.Clear();
+								foreach (string appID in value.Split(',')) {
+									botConfig.GamesPlayedWhileIdle.Add(uint.Parse(appID));
+								}
+								break;
+							case "Statistics":
+							case "Blacklist":
+							case "SteamNickname":
+								break;
+							default:
+								Logging.LogGenericWarning("Unrecognized config value: " + key + "=" + value);
+								break;
+						}
+					}
+				}
+			} catch (Exception e) {
+				Logging.LogGenericException(e);
+				Logging.LogGenericError("Your config for this bot instance is invalid, it won't run!");
+				return null;
+			}
+
+			// Fixups for new format
+			if (botConfig.SteamLogin != null && botConfig.SteamLogin.Equals("null")) {
+				botConfig.SteamLogin = null;
+			}
+
+			if (botConfig.SteamPassword != null && botConfig.SteamPassword.Equals("null")) {
+				botConfig.SteamPassword = null;
+			}
+
+			if (botConfig.SteamApiKey != null && botConfig.SteamApiKey.Equals("null")) {
+				botConfig.SteamApiKey = null;
+			}
+
+			if (botConfig.SteamParentalPIN != null && botConfig.SteamParentalPIN.Equals("null")) {
+				botConfig.SteamParentalPIN = null;
+			}
+
+			if (botConfig.SteamTradeToken != null && botConfig.SteamTradeToken.Equals("null")) {
+				botConfig.SteamTradeToken = null;
+			}
+
+			return botConfig;
+		}
+
+		// This constructor is used only by deserializer
+		private BotConfig() { }
+
+		// TODO: This should be removed soon
+		internal bool Convert(string path) {
+			try {
+				File.WriteAllText(path, JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented));
+			} catch (Exception e) {
+				Logging.LogGenericException(e);
+				return false;
+			}
+
+			Logging.LogGenericWarning("Your config was converted to new ASF V2.0 format");
+			return true;
+		}
+	}
+}

ArchiSteamFarm/BotDatabase.cs

@@ -0,0 +1,104 @@
+/*
+    _                _      _  ____   _                           _____
+   / \    _ __  ___ | |__  (_)/ ___| | |_  ___   __ _  _ __ ___  |  ___|__ _  _ __  _ __ ___
+  / _ \  | '__|/ __|| '_ \ | |\___ \ | __|/ _ \ / _` || '_ ` _ \ | |_  / _` || '__|| '_ ` _ \
+ / ___ \ | |  | (__ | | | || | ___) || |_|  __/| (_| || | | | | ||  _|| (_| || |   | | | | | |
+/_/   \_\|_|   \___||_| |_||_||____/  \__|\___| \__,_||_| |_| |_||_|   \__,_||_|   |_| |_| |_|
+
+ Copyright 2015-2016 Łukasz "JustArchi" Domeradzki
+ Contact: JustArchi@JustArchi.net
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+					
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+*/
+
+using Newtonsoft.Json;
+using SteamAuth;
+using System;
+using System.IO;
+
+namespace ArchiSteamFarm {
+	internal sealed class BotDatabase {
+		internal string LoginKey {
+			get {
+				return _LoginKey;
+			}
+			set {
+				if (_LoginKey == value) {
+					return;
+				}
+
+				_LoginKey = value;
+				Save();
+			}
+		}
+
+		internal SteamGuardAccount SteamGuardAccount {
+			get {
+				return _SteamGuardAccount;
+			}
+			set {
+				if (_SteamGuardAccount == value) {
+					return;
+				}
+
+				_SteamGuardAccount = value;
+				Save();
+			}
+		}
+
+		[JsonProperty(Required = Required.AllowNull)]
+		private string _LoginKey;
+
+		[JsonProperty(Required = Required.AllowNull)]
+		private SteamGuardAccount _SteamGuardAccount;
+
+		private string FilePath;
+
+		internal static BotDatabase Load(string filePath) {
+			if (!File.Exists(filePath)) {
+				return new BotDatabase(filePath);
+			}
+
+			BotDatabase botDatabase;
+			try {
+				botDatabase = JsonConvert.DeserializeObject<BotDatabase>(File.ReadAllText(filePath));
+			} catch (Exception e) {
+				Logging.LogGenericException(e);
+				return null;
+			}
+
+			botDatabase.FilePath = filePath;
+			return botDatabase;
+		}
+
+		// This constructor is used when creating new database
+		private BotDatabase(string filePath) {
+			FilePath = filePath;
+			Save();
+		}
+
+		// This constructor is used only by deserializer
+		private BotDatabase() { }
+
+		private void Save() {
+			lock (FilePath) {
+				try {
+					File.WriteAllText(FilePath, JsonConvert.SerializeObject(this));
+				} catch (Exception e) {
+					Logging.LogGenericException(e);
+				}
+			}
+		}
+	}
+}

ArchiSteamFarm/CardsFarmer.cs

@@ -27,17 +27,15 @@ using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 
 namespace ArchiSteamFarm {
 	internal sealed class CardsFarmer {
-		private const byte StatusCheckSleep = 5; // In minutes, how long to wait before checking the appID again
-		private const ushort MaxFarmingTime = 600; // In minutes, how long ASF is allowed to farm one game in solo mode
-
 		internal readonly ConcurrentDictionary<uint, float> GamesToFarm = new ConcurrentDictionary<uint, float>();
-		internal readonly List<uint> CurrentGamesFarming = new List<uint>();
+		internal readonly HashSet<uint> CurrentGamesFarming = new HashSet<uint>();
 
 		private readonly ManualResetEvent FarmResetEvent = new ManualResetEvent(false);
 		private readonly SemaphoreSlim Semaphore = new SemaphoreSlim(1);
@@ -49,22 +47,28 @@ namespace ArchiSteamFarm {
 		private bool NowFarming = false;
 
 		internal CardsFarmer(Bot bot) {
+			if (bot == null) {
+				return;
+			}
+
 			Bot = bot;
 
-			Timer = new Timer(
-				async e => await CheckGamesForFarming().ConfigureAwait(false),
-				null,
-				TimeSpan.FromMinutes(15), // Delay
-				TimeSpan.FromMinutes(60) // Period
-			);
+			if (Program.GlobalConfig.IdleFarmingPeriod > 0 && Timer == null) {
+				Timer = new Timer(
+					async e => await CheckGamesForFarming().ConfigureAwait(false),
+					null,
+					TimeSpan.FromHours(Program.GlobalConfig.IdleFarmingPeriod), // Delay
+					TimeSpan.FromHours(Program.GlobalConfig.IdleFarmingPeriod) // Period
+				);
+			}
 		}
 
-		internal static List<uint> GetGamesToFarmSolo(ConcurrentDictionary<uint, float> gamesToFarm) {
+		internal static HashSet<uint> GetGamesToFarmSolo(ConcurrentDictionary<uint, float> gamesToFarm) {
 			if (gamesToFarm == null) {
 				return null;
 			}
 
-			List<uint> result = new List<uint>();
+			HashSet<uint> result = new HashSet<uint>();
 			foreach (KeyValuePair<uint, float> keyValue in gamesToFarm) {
 				if (keyValue.Value >= 2) {
 					result.Add(keyValue.Key);
@@ -79,11 +83,7 @@ namespace ArchiSteamFarm {
 				return 0;
 			}
 
-			foreach (uint appID in gamesToFarm.Keys) {
-				return appID;
-			}
-
-			return 0;
+			return gamesToFarm.Keys.FirstOrDefault();
 		}
 
 		internal async Task<bool> SwitchToManualMode(bool manualMode) {
@@ -98,7 +98,7 @@ namespace ArchiSteamFarm {
 				await StopFarming().ConfigureAwait(false);
 			} else {
 				Logging.LogGenericInfo("Now running in Automatic Farming mode", Bot.BotName);
-				var start = Task.Run(async () => await StartFarming().ConfigureAwait(false));
+				Task.Run(async () => await StartFarming().ConfigureAwait(false)).Forget();
 			}
 
 			return true;
@@ -110,7 +110,6 @@ namespace ArchiSteamFarm {
 			}
 
 			float maxHour = 0;
-
 			foreach (float hour in appIDs.Values) {
 				if (hour > maxHour) {
 					maxHour = hour;
@@ -168,6 +167,7 @@ namespace ArchiSteamFarm {
 
 			if (!await IsAnythingToFarm().ConfigureAwait(false)) {
 				Semaphore.Release(); // We have nothing to do, don't forget to release semaphore
+				Logging.LogGenericInfo("We don't have anything to farm on this account!", Bot.BotName);
 				return;
 			}
 
@@ -178,13 +178,13 @@ namespace ArchiSteamFarm {
 			bool farmedSomething = false;
 
 			// Now the algorithm used for farming depends on whether account is restricted or not
-			if (Bot.CardDropsRestricted) { // If we have restricted card drops, we use complex algorithm
+			if (Bot.BotConfig.CardDropsRestricted) { // If we have restricted card drops, we use complex algorithm
 				Logging.LogGenericInfo("Chosen farming algorithm: Complex", Bot.BotName);
 				while (GamesToFarm.Count > 0) {
-					List<uint> gamesToFarmSolo = GetGamesToFarmSolo(GamesToFarm);
+					HashSet<uint> gamesToFarmSolo = GetGamesToFarmSolo(GamesToFarm);
 					if (gamesToFarmSolo.Count > 0) {
 						while (gamesToFarmSolo.Count > 0) {
-							uint appID = gamesToFarmSolo[0];
+							uint appID = gamesToFarmSolo.First();
 							if (await FarmSolo(appID).ConfigureAwait(false)) {
 								farmedSomething = true;
 								Logging.LogGenericInfo("Done farming: " + appID, Bot.BotName);
@@ -197,7 +197,6 @@ namespace ArchiSteamFarm {
 						}
 					} else {
 						if (FarmMultiple(GamesToFarm)) {
-							farmedSomething = true;
 							Logging.LogGenericInfo("Done farming: " + string.Join(", ", GamesToFarm.Keys), Bot.BotName);
 						} else {
 							NowFarming = false;
@@ -222,6 +221,14 @@ namespace ArchiSteamFarm {
 			CurrentGamesFarming.Clear();
 			CurrentGamesFarming.TrimExcess();
 			NowFarming = false;
+
+			// We finished our queue for now, make sure that everything is indeed farmed before proceeding further
+			// Some games could be added in the meantime
+			if (await IsAnythingToFarm().ConfigureAwait(false)) {
+				Task.Run(async () => await StartFarming().ConfigureAwait(false)).Forget();
+				return;
+			}
+
 			Logging.LogGenericInfo("Farming finished!", Bot.BotName);
 			await Bot.OnFarmingFinished(farmedSomething).ConfigureAwait(false);
 		}
@@ -247,7 +254,7 @@ namespace ArchiSteamFarm {
 
 		private async Task<bool> IsAnythingToFarm() {
 			if (NowFarming) {
-				return false;
+				return true;
 			}
 
 			if (await Bot.ArchiWebHandler.ReconnectIfNeeded().ConfigureAwait(false)) {
@@ -290,12 +297,12 @@ namespace ArchiSteamFarm {
 			await Task.WhenAll(tasks).ConfigureAwait(false);
 
 			if (GamesToFarm.Count == 0) {
-				return true;
+				return false;
 			}
 
 			// If we have restricted card drops, actually do check hours of all games that are left to farm
-			if (Bot.CardDropsRestricted) {
-				tasks = new List<Task>(GamesToFarm.Keys.Count);
+			if (Bot.BotConfig.CardDropsRestricted) {
+				tasks = new List<Task>(GamesToFarm.Count);
 				Logging.LogGenericInfo("Checking hours...", Bot.BotName);
 				foreach (uint appID in GamesToFarm.Keys) {
 					tasks.Add(Task.Run(async () => await CheckHours(appID).ConfigureAwait(false)));
@@ -318,7 +325,7 @@ namespace ArchiSteamFarm {
 
 			foreach (HtmlNode htmlNode in htmlNodeCollection) {
 				string steamLink = htmlNode.GetAttributeValue("href", null);
-				if (steamLink == null) {
+				if (string.IsNullOrEmpty(steamLink)) {
 					continue;
 				}
 
@@ -327,7 +334,7 @@ namespace ArchiSteamFarm {
 					continue;
 				}
 
-				if (Bot.GlobalBlacklist.Contains(appID) || Bot.Blacklist.Contains(appID)) {
+				if (GlobalConfig.GlobalBlacklist.Contains(appID) || Program.GlobalConfig.Blacklist.Contains(appID)) {
 					continue;
 				}
 
@@ -385,7 +392,7 @@ namespace ArchiSteamFarm {
 		}
 
 		private async Task CheckGamesForFarming() {
-			if (NowFarming || ManualMode || GamesToFarm.Count > 0 || !Bot.SteamClient.IsConnected) {
+			if (NowFarming || ManualMode || !Bot.SteamClient.IsConnected) {
 				return;
 			}
 
@@ -417,16 +424,16 @@ namespace ArchiSteamFarm {
 			bool success = true;
 
 			bool? keepFarming = await ShouldFarm(appID).ConfigureAwait(false);
-			for (ushort farmingTime = 0; farmingTime <= MaxFarmingTime && (!keepFarming.HasValue || keepFarming.Value); farmingTime += StatusCheckSleep) {
+			for (ushort farmingTime = 0; farmingTime <= 60 * Program.GlobalConfig.MaxFarmingTime && keepFarming.GetValueOrDefault(true); farmingTime += Program.GlobalConfig.FarmingDelay) {
 				Logging.LogGenericInfo("Still farming: " + appID, Bot.BotName);
-				if (FarmResetEvent.WaitOne(1000 * 60 * StatusCheckSleep)) {
+				if (FarmResetEvent.WaitOne(60 * 1000 * Program.GlobalConfig.FarmingDelay)) {
 					success = false;
 					break;
 				}
 				keepFarming = await ShouldFarm(appID).ConfigureAwait(false);
 			}
 
-			Bot.ArchiHandler.PlayGames(0);
+			Bot.ResetGamesPlayed();
 			Logging.LogGenericInfo("Stopped farming: " + appID, Bot.BotName);
 			return success;
 		}
@@ -441,13 +448,13 @@ namespace ArchiSteamFarm {
 			bool success = true;
 			while (maxHour < 2) {
 				Logging.LogGenericInfo("Still farming: " + string.Join(", ", appIDs), Bot.BotName);
-				if (FarmResetEvent.WaitOne(1000 * 60 * StatusCheckSleep)) {
+				if (FarmResetEvent.WaitOne(60 * 1000 * Program.GlobalConfig.FarmingDelay)) {
 					success = false;
 					break;
 				}
 
 				// Don't forget to update our GamesToFarm hours
-				float timePlayed = StatusCheckSleep / 60.0F;
+				float timePlayed = Program.GlobalConfig.FarmingDelay / 60.0F;
 				foreach (KeyValuePair<uint, float> gameToFarm in GamesToFarm) {
 					if (!appIDs.Contains(gameToFarm.Key)) {
 						continue;
@@ -459,7 +466,7 @@ namespace ArchiSteamFarm {
 				maxHour += timePlayed;
 			}
 
-			Bot.ArchiHandler.PlayGames(0);
+			Bot.ResetGamesPlayed();
 			Logging.LogGenericInfo("Stopped farming: " + string.Join(", ", appIDs), Bot.BotName);
 			return success;
 		}

ArchiSteamFarm/Debugging.cs

@@ -31,5 +31,7 @@ namespace ArchiSteamFarm {
 #endif
 
 		internal static bool IsReleaseBuild => !IsDebugBuild;
+
+		internal static bool NetHookAlreadyInitialized { get; set; } = false;
 	}
 }

ArchiSteamFarm/GlobalConfig.cs

@@ -0,0 +1,103 @@
+/*
+    _                _      _  ____   _                           _____
+   / \    _ __  ___ | |__  (_)/ ___| | |_  ___   __ _  _ __ ___  |  ___|__ _  _ __  _ __ ___
+  / _ \  | '__|/ __|| '_ \ | |\___ \ | __|/ _ \ / _` || '_ ` _ \ | |_  / _` || '__|| '_ ` _ \
+ / ___ \ | |  | (__ | | | || | ___) || |_|  __/| (_| || | | | | ||  _|| (_| || |   | | | | | |
+/_/   \_\|_|   \___||_| |_||_||____/  \__|\___| \__,_||_| |_| |_||_|   \__,_||_|   |_| |_| |_|
+
+ Copyright 2015-2016 Łukasz "JustArchi" Domeradzki
+ Contact: JustArchi@JustArchi.net
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+					
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+*/
+
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+namespace ArchiSteamFarm {
+	internal sealed class GlobalConfig {
+		internal enum EUpdateChannel : byte {
+			Unknown,
+			Stable,
+			Experimental
+		}
+
+		// This is hardcoded blacklist which should not be possible to change
+		internal static readonly HashSet<uint> GlobalBlacklist = new HashSet<uint> { 267420, 303700, 335590, 368020, 425280 };
+
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal bool Debug { get; private set; } = false;
+
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal bool AutoUpdates { get; private set; } = true;
+
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal EUpdateChannel UpdateChannel { get; private set; } = EUpdateChannel.Stable;
+
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal byte MaxFarmingTime { get; private set; } = 10;
+
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal byte IdleFarmingPeriod { get; private set; } = 3;
+
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal byte FarmingDelay { get; private set; } = 5;
+
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal byte AccountPlayingDelay { get; private set; } = 5;
+
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal byte LoginLimiterDelay { get; private set; } = 7;
+
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal byte InventoryLimiterDelay { get; private set; } = 3;
+
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal byte HttpTimeout { get; private set; } = 30;
+
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal string WCFHostname { get; private set; } = "localhost";
+
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal ushort WCFPort { get; private set; } = 1242;
+
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal bool Statistics { get; private set; } = true;
+
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal HashSet<uint> Blacklist { get; private set; } = new HashSet<uint>(GlobalBlacklist);
+
+		internal static GlobalConfig Load() {
+			string filePath = Path.Combine(Program.ConfigDirectory, Program.GlobalConfigFile);
+			if (!File.Exists(filePath)) {
+				return null;
+			}
+
+			GlobalConfig globalConfig;
+			try {
+				globalConfig = JsonConvert.DeserializeObject<GlobalConfig>(File.ReadAllText(filePath));
+			} catch (Exception e) {
+				Logging.LogGenericException(e);
+				return null;
+			}
+
+			return globalConfig;
+		}
+
+		// This constructor is used only by deserializer
+		private GlobalConfig() { }
+	}
+}

ArchiSteamFarm/GlobalDatabase.cs

@@ -23,33 +23,57 @@
 */
 
 using Newtonsoft.Json;
+using System;
+using System.IO;
 
 namespace ArchiSteamFarm {
-	internal sealed class SteamItem {
-		// REF: https://developer.valvesoftware.com/wiki/Steam_Web_API/IEconService#CEcon_Asset
+	internal sealed class GlobalDatabase {
+		private static readonly string FilePath = Path.Combine(Program.ConfigDirectory, Program.GlobalDatabaseFile);
 
-		[JsonProperty(Required = Required.DisallowNull)]
-		internal string appid { get; set; }
+		internal uint CellID {
+			get {
+				return _CellID;
+			}
+			set {
+				if (_CellID == value) {
+					return;
+				}
 
-		[JsonProperty(Required = Required.DisallowNull)]
-		internal string contextid { get; set; }
-
-		[JsonProperty(Required = Required.DisallowNull)]
-		internal string assetid { get; set; }
-
-		[JsonProperty(Required = Required.DisallowNull)]
-		internal string id {
-			get { return assetid; }
-			set { assetid = value; }
+				_CellID = value;
+				Save();
+			}
 		}
 
-		[JsonProperty(Required = Required.AllowNull)]
-		internal string classid { get; set; }
+		[JsonProperty(Required = Required.DisallowNull)]
+		private uint _CellID = 0;
 
-		[JsonProperty(Required = Required.AllowNull)]
-		internal string instanceid { get; set; }
+		internal static GlobalDatabase Load() {
+			if (!File.Exists(FilePath)) {
+				return new GlobalDatabase();
+			}
 
-		[JsonProperty(Required = Required.Always)]
-		internal string amount { get; set; }
+			GlobalDatabase globalDatabase;
+			try {
+				globalDatabase = JsonConvert.DeserializeObject<GlobalDatabase>(File.ReadAllText(FilePath));
+			} catch (Exception e) {
+				Logging.LogGenericException(e);
+				return null;
+			}
+
+			return globalDatabase;
+		}
+
+		// This constructor is used only by deserializer
+		private GlobalDatabase() { }
+
+		private void Save() {
+			lock (FilePath) {
+				try {
+					File.WriteAllText(FilePath, JsonConvert.SerializeObject(this));
+				} catch (Exception e) {
+					Logging.LogGenericException(e);
+				}
+			}
+		}
 	}
 }

ArchiSteamFarm/JSON/GitHub.cs

@@ -26,8 +26,21 @@ using Newtonsoft.Json;
 using System.Collections.Generic;
 
 namespace ArchiSteamFarm {
-	internal sealed class SteamItemList {
-		[JsonProperty(Required = Required.Always)]
-		internal List<SteamItem> assets { get; } = new List<SteamItem>();
+	internal static class GitHub {
+		internal sealed class Asset {
+			[JsonProperty(PropertyName = "name", Required = Required.Always)]
+			internal string Name { get; private set; }
+
+			[JsonProperty(PropertyName = "browser_download_url", Required = Required.Always)]
+			internal string DownloadURL { get; private set; }
+		}
+
+		internal sealed class ReleaseResponse {
+			[JsonProperty(PropertyName = "tag_name", Required = Required.Always)]
+			internal string Tag { get; private set; }
+
+			[JsonProperty(PropertyName = "assets", Required = Required.Always)]
+			internal List<Asset> Assets { get; private set; }
+		}
 	}
 }

ArchiSteamFarm/JSON/Steam.cs

@@ -0,0 +1,122 @@
+/*
+    _                _      _  ____   _                           _____
+   / \    _ __  ___ | |__  (_)/ ___| | |_  ___   __ _  _ __ ___  |  ___|__ _  _ __  _ __ ___
+  / _ \  | '__|/ __|| '_ \ | |\___ \ | __|/ _ \ / _` || '_ ` _ \ | |_  / _` || '__|| '_ ` _ \
+ / ___ \ | |  | (__ | | | || | ___) || |_|  __/| (_| || | | | | ||  _|| (_| || |   | | | | | |
+/_/   \_\|_|   \___||_| |_||_||____/  \__|\___| \__,_||_| |_| |_||_|   \__,_||_|   |_| |_| |_|
+
+ Copyright 2015-2016 Łukasz "JustArchi" Domeradzki
+ Contact: JustArchi@JustArchi.net
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+					
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+*/
+
+using Newtonsoft.Json;
+using SteamKit2;
+using System.Collections.Generic;
+
+namespace ArchiSteamFarm {
+	internal static class Steam {
+		internal sealed class Item {
+			// REF: https://developer.valvesoftware.com/wiki/Steam_Web_API/IEconService#CEcon_Asset
+			[JsonProperty(Required = Required.DisallowNull)]
+			internal string appid { get; set; }
+
+			[JsonProperty(Required = Required.DisallowNull)]
+			internal string contextid { get; set; }
+
+			[JsonProperty(Required = Required.DisallowNull)]
+			internal string assetid { get; set; }
+
+			[JsonProperty(Required = Required.DisallowNull)]
+			internal string id {
+				get { return assetid; }
+				set { assetid = value; }
+			}
+
+			[JsonProperty(Required = Required.AllowNull)]
+			internal string classid { get; set; }
+
+			[JsonProperty(Required = Required.AllowNull)]
+			internal string instanceid { get; set; }
+
+			[JsonProperty(Required = Required.Always)]
+			internal string amount { get; set; }
+		}
+
+		internal sealed class ItemList {
+			[JsonProperty(Required = Required.Always)]
+			internal List<Steam.Item> assets { get; } = new List<Steam.Item>();
+		}
+
+		internal sealed class TradeOffer {
+			// REF: https://developer.valvesoftware.com/wiki/Steam_Web_API/IEconService#CEcon_TradeOffer
+			internal enum ETradeOfferState : byte {
+				Unknown,
+				Invalid,
+				Active,
+				Accepted,
+				Countered,
+				Expired,
+				Canceled,
+				Declined,
+				InvalidItems,
+				EmailPending,
+				EmailCanceled,
+				OnHold
+			}
+
+			[JsonProperty(Required = Required.Always)]
+			internal string tradeofferid { get; set; }
+
+			[JsonProperty(Required = Required.Always)]
+			internal int accountid_other { get; set; }
+
+			[JsonProperty(Required = Required.Always)]
+			internal ETradeOfferState trade_offer_state { get; set; }
+
+			[JsonProperty(Required = Required.Always)]
+			internal List<Steam.Item> items_to_give { get; } = new List<Steam.Item>();
+
+			[JsonProperty(Required = Required.Always)]
+			internal List<Steam.Item> items_to_receive { get; } = new List<Steam.Item>();
+
+			// Extra
+			private ulong _OtherSteamID64 = 0;
+			internal ulong OtherSteamID64 {
+				get {
+					if (_OtherSteamID64 == 0 && accountid_other != 0) {
+						_OtherSteamID64 = new SteamID((uint) accountid_other, EUniverse.Public, EAccountType.Individual).ConvertToUInt64();
+					}
+
+					return _OtherSteamID64;
+				}
+			}
+		}
+
+		internal sealed class TradeOfferRequest {
+			[JsonProperty(Required = Required.Always)]
+			internal bool newversion { get; } = true;
+
+			[JsonProperty(Required = Required.Always)]
+			internal int version { get; } = 2;
+
+			[JsonProperty(Required = Required.Always)]
+			internal Steam.ItemList me { get; } = new Steam.ItemList();
+
+			[JsonProperty(Required = Required.Always)]
+			internal Steam.ItemList them { get; } = new Steam.ItemList();
+		}
+	}
+}

ArchiSteamFarm/Logging.cs

@@ -31,17 +31,18 @@ namespace ArchiSteamFarm {
 	internal static class Logging {
 		private static readonly object FileLock = new object();
 
-		internal static bool LogToFile { get; set; } = false;
+		internal static bool? LogToFile { get; set; } = null;
 
 		internal static void Init() {
+			if (!LogToFile.HasValue) {
+				LogToFile = true;
+			}
+
 			lock (FileLock) {
 				try {
 					File.Delete(Program.LogFile);
 				} catch (Exception e) {
-					bool logToFile = LogToFile;
-					LogToFile = false;
 					LogGenericException(e);
-					LogToFile = logToFile;
 				}
 			}
 		}
@@ -121,15 +122,14 @@ namespace ArchiSteamFarm {
 				Console.Write(loggedMessage);
 			}
 
-			if (LogToFile) {
+			if (LogToFile.GetValueOrDefault()) {
 				lock (FileLock) {
 					try {
 						File.AppendAllText(Program.LogFile, loggedMessage);
 					} catch (Exception e) {
-						bool logToFile = LogToFile;
 						LogToFile = false;
 						LogGenericException(e);
-						LogToFile = logToFile;
+						LogToFile = true;
 					}
 				}
 			}

ArchiSteamFarm/Program.cs

@@ -22,9 +22,12 @@
 
 */
 
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
 using System;
+using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
@@ -48,48 +51,202 @@ namespace ArchiSteamFarm {
 			Server // Normal + WCF server
 		}
 
-		private const string LatestGithubReleaseURL = "https://api.github.com/repos/JustArchi/ArchiSteamFarm/releases/latest";
+		private const string GithubReleaseURL = "https://api.github.com/repos/JustArchi/ArchiSteamFarm/releases";
+
+		internal const string ASF = "ASF";
 		internal const string ConfigDirectory = "config";
+		internal const string DebugDirectory = "debug";
 		internal const string LogFile = "log.txt";
+		internal const string GlobalConfigFile = ASF + ".json";
+		internal const string GlobalDatabaseFile = ASF + ".db";
 
 		private static readonly object ConsoleLock = new object();
 		private static readonly SemaphoreSlim SteamSemaphore = new SemaphoreSlim(1);
 		private static readonly ManualResetEvent ShutdownResetEvent = new ManualResetEvent(false);
 		private static readonly Assembly Assembly = Assembly.GetExecutingAssembly();
 		private static readonly string ExecutableFile = Assembly.Location;
+		private static readonly string ExecutableName = Path.GetFileName(ExecutableFile);
 		private static readonly string ExecutableDirectory = Path.GetDirectoryName(ExecutableFile);
 		private static readonly WCF WCF = new WCF();
 
 		internal static readonly string Version = Assembly.GetName().Version.ToString();
 
-		private static EMode Mode;
-
+		internal static GlobalConfig GlobalConfig { get; private set; }
+		internal static GlobalDatabase GlobalDatabase { get; private set; }
 		internal static bool ConsoleIsBusy { get; private set; } = false;
 
+		private static Timer AutoUpdatesTimer;
+		private static EMode Mode = EMode.Normal;
+
 		private static async Task CheckForUpdate() {
-			JObject response = await WebBrowser.UrlGetToJObject(LatestGithubReleaseURL).ConfigureAwait(false);
-			if (response == null) {
+			string oldExeFile = ExecutableFile + ".old";
+
+			// We booted successfully so we can now remove old exe file
+			if (File.Exists(oldExeFile)) {
+				try {
+					File.Delete(oldExeFile);
+				} catch (Exception e) {
+					Logging.LogGenericException(e);
+					return;
+				}
+			}
+
+			if (GlobalConfig.UpdateChannel == GlobalConfig.EUpdateChannel.Unknown) {
 				return;
 			}
 
-			string remoteVersion = response["tag_name"].ToString();
-			if (string.IsNullOrEmpty(remoteVersion)) {
+			string releaseURL = GithubReleaseURL;
+			if (GlobalConfig.UpdateChannel == GlobalConfig.EUpdateChannel.Stable) {
+				releaseURL += "/latest";
+			}
+
+			string response = null;
+			Logging.LogGenericInfo("Checking new version...");
+			for (byte i = 0; i < WebBrowser.MaxRetries && string.IsNullOrEmpty(response); i++) {
+				response = await WebBrowser.UrlGetToContent(releaseURL).ConfigureAwait(false);
+			}
+
+			if (string.IsNullOrEmpty(response)) {
+				Logging.LogGenericWarning("Could not check latest version!");
 				return;
 			}
 
-			string localVersion = Version;
+			GitHub.ReleaseResponse releaseResponse;
+			if (GlobalConfig.UpdateChannel == GlobalConfig.EUpdateChannel.Stable) {
+				try {
+					releaseResponse = JsonConvert.DeserializeObject<GitHub.ReleaseResponse>(response);
+				} catch (JsonException e) {
+					Logging.LogGenericException(e);
+					return;
+				}
+			} else {
+				List<GitHub.ReleaseResponse> releases;
+				try {
+					releases = JsonConvert.DeserializeObject<List<GitHub.ReleaseResponse>>(response);
+				} catch (JsonException e) {
+					Logging.LogGenericException(e);
+					return;
+				}
 
-			Logging.LogGenericInfo("Local version: " + localVersion);
-			Logging.LogGenericInfo("Remote version: " + remoteVersion);
+				if (releases == null || releases.Count == 0) {
+					Logging.LogGenericWarning("Could not check latest version!");
+					return;
+				}
 
-			int comparisonResult = localVersion.CompareTo(remoteVersion);
-			if (comparisonResult < 0) {
+				releaseResponse = releases[0];
+			}
+
+			if (string.IsNullOrEmpty(releaseResponse.Tag)) {
+				Logging.LogGenericWarning("Could not check latest version!");
+				return;
+			}
+
+			Logging.LogGenericInfo("Local version: " + Version + " | Remote version: " + releaseResponse.Tag);
+
+			if (string.Compare(Version, releaseResponse.Tag, StringComparison.Ordinal) >= 0) { // If local version is the same or newer than remote version
+				if (GlobalConfig.AutoUpdates && AutoUpdatesTimer == null) {
+					Logging.LogGenericInfo("ASF will automatically check for new versions every 24 hours");
+					AutoUpdatesTimer = new Timer(
+						async e => await CheckForUpdate().ConfigureAwait(false),
+						null,
+						TimeSpan.FromDays(1), // Delay
+						TimeSpan.FromDays(1) // Period
+					);
+				}
+				return;
+			}
+
+			if (!GlobalConfig.AutoUpdates) {
 				Logging.LogGenericInfo("New version is available!");
 				Logging.LogGenericInfo("Consider updating yourself!");
 				await Utilities.SleepAsync(5000).ConfigureAwait(false);
-			} else if (comparisonResult > 0) {
-				Logging.LogGenericInfo("You're currently using pre-release version!");
-				Logging.LogGenericInfo("Be careful!");
+				return;
+			}
+
+			// Auto update logic starts here
+			if (releaseResponse.Assets == null) {
+				Logging.LogGenericWarning("Could not proceed with update because that version doesn't include assets!");
+				return;
+			}
+
+			GitHub.Asset binaryAsset = null;
+			foreach (var asset in releaseResponse.Assets) {
+				if (string.IsNullOrEmpty(asset.Name) || !asset.Name.Equals(ExecutableName)) {
+					continue;
+				}
+
+				binaryAsset = asset;
+				break;
+			}
+
+			if (binaryAsset == null) {
+				Logging.LogGenericWarning("Could not proceed with update because there is no asset that relates to currently running binary!");
+				return;
+			}
+
+			if (string.IsNullOrEmpty(binaryAsset.DownloadURL)) {
+				Logging.LogGenericWarning("Could not proceed with update because download URL is empty!");
+				return;
+			}
+
+			Logging.LogGenericInfo("Downloading new version...");
+			Stream newExe = await WebBrowser.UrlGetToStream(binaryAsset.DownloadURL).ConfigureAwait(false);
+			if (newExe == null) {
+				Logging.LogGenericWarning("Could not download new version!");
+				return;
+			}
+
+			// We start deep update logic here
+			string newExeFile = ExecutableFile + ".new";
+
+			// Firstly we create new exec
+			try {
+				using (FileStream fileStream = File.Open(newExeFile, FileMode.Create)) {
+					await newExe.CopyToAsync(fileStream).ConfigureAwait(false);
+				}
+			} catch (Exception e) {
+				Logging.LogGenericException(e);
+				return;
+			}
+
+			// Now we move current -> old
+			try {
+				File.Move(ExecutableFile, oldExeFile);
+			} catch (Exception e) {
+				Logging.LogGenericException(e);
+				try {
+					// Cleanup
+					File.Delete(newExeFile);
+				} catch { }
+				return;
+			}
+
+			// Now we move new -> current
+			try {
+				File.Move(newExeFile, ExecutableFile);
+			} catch (Exception e) {
+				Logging.LogGenericException(e);
+				try {
+					// Cleanup
+					File.Move(oldExeFile, ExecutableFile);
+					File.Delete(newExeFile);
+				} catch { }
+				return;
+			}
+
+			Logging.LogGenericInfo("Update process is finished! ASF will now restart itself...");
+			await Utilities.SleepAsync(5000);
+
+			if (!Restart()) {
+				// Make sure that we won't try updating again in this case
+				if (AutoUpdatesTimer != null) {
+					AutoUpdatesTimer.Dispose();
+					AutoUpdatesTimer = null;
+				}
+
+				// Inform user about failure
+				Logging.LogGenericWarning("ASF could not restart itself, you may need to restart it manually!");
+				await Utilities.SleepAsync(5000);
 			}
 		}
 
@@ -97,17 +254,26 @@ namespace ArchiSteamFarm {
 			Environment.Exit(exitCode);
 		}
 
-		internal static void Restart() {
-			System.Diagnostics.Process.Start(ExecutableFile, string.Join(" ", Environment.GetCommandLineArgs()));
-			Exit();
+		internal static bool Restart() {
+			try {
+				if (Process.Start(ExecutableFile, string.Join(" ", Environment.GetCommandLineArgs().Skip(1))) != null) {
+					Exit();
+					return true;
+				} else {
+					return false;
+				}
+			} catch (Exception e) {
+				Logging.LogGenericException(e);
+				return false;
+			}
 		}
 
 		internal static async Task LimitSteamRequestsAsync() {
 			await SteamSemaphore.WaitAsync().ConfigureAwait(false);
-			var releaseLater = Task.Run(async () => {
-				await Utilities.SleepAsync(7000).ConfigureAwait(false); // We must add some delay to not get caught by Steam rate limiter
+			Task.Run(async () => {
+				await Utilities.SleepAsync(GlobalConfig.LoginLimiterDelay * 1000).ConfigureAwait(false);
 				SteamSemaphore.Release();
-			});
+			}).Forget();
 		}
 
 		internal static string GetUserInput(string botLogin, EUserInputType userInputType, string extraInformation = null) {
@@ -147,7 +313,7 @@ namespace ArchiSteamFarm {
 				ConsoleIsBusy = false;
 			}
 
-			return result.Trim(); // Get rid of all whitespace characters
+			return string.IsNullOrEmpty(result) ? null : result.Trim();
 		}
 
 		internal static void OnBotShutdown() {
@@ -166,8 +332,23 @@ namespace ArchiSteamFarm {
 		}
 
 		private static void InitServices() {
-			Logging.Init();
+			GlobalConfig = GlobalConfig.Load();
+			if (GlobalConfig == null) {
+				Logging.LogGenericError("Global config could not be loaded, please make sure that ASF.db exists and is valid!");
+				Thread.Sleep(5000);
+				Exit(1);
+			}
+
+			GlobalDatabase = GlobalDatabase.Load();
+			if (GlobalDatabase == null) {
+				Logging.LogGenericError("Global database could not be loaded!");
+				Thread.Sleep(5000);
+				Exit(1);
+			}
+
+			ArchiWebHandler.Init();
 			WebBrowser.Init();
+			WCF.Init();
 		}
 
 		private static void ParseArgs(string[] args) {
@@ -244,11 +425,7 @@ namespace ArchiSteamFarm {
 				}
 			}
 
-			// By default we're operating on normal mode
-			Mode = EMode.Normal;
-			Logging.LogToFile = true;
-
-			// But that can be overriden by arguments
+			// Parse args
 			ParseArgs(args);
 
 			// If we ran ASF as a client, we're done by now
@@ -256,7 +433,8 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
-			Task.Run(async () => await CheckForUpdate().ConfigureAwait(false)).Wait();
+			// From now on it's server mode
+			Logging.Init();
 
 			if (!Directory.Exists(ConfigDirectory)) {
 				Logging.LogGenericError("Config directory doesn't exist!");
@@ -264,17 +442,34 @@ namespace ArchiSteamFarm {
 				Exit(1);
 			}
 
-			// Before attempting to connect, initialize our list of CMs
-			Bot.RefreshCMs().Wait();
+			CheckForUpdate().Wait();
 
-			foreach (var configFile in Directory.EnumerateFiles(ConfigDirectory, "*.xml")) {
+			// Before attempting to connect, initialize our list of CMs
+			Bot.RefreshCMs(GlobalDatabase.CellID).Wait();
+
+			foreach (var configFile in Directory.EnumerateFiles(ConfigDirectory, "*.json")) {
 				string botName = Path.GetFileNameWithoutExtension(configFile);
+				if (botName.Equals(ASF)) {
+					continue;
+				}
+
 				Bot bot = new Bot(botName);
-				if (!bot.Enabled) {
+				if (!bot.BotConfig.Enabled) {
 					Logging.LogGenericInfo("Not starting this instance because it's disabled in config file", botName);
 				}
 			}
 
+			// CONVERSION START
+			foreach (var configFile in Directory.EnumerateFiles(ConfigDirectory, "*.xml")) {
+				string botName = Path.GetFileNameWithoutExtension(configFile);
+				Logging.LogGenericWarning("Found legacy " + botName + ".xml config file, it will now be converted to new ASF V2.0 format!");
+				Bot bot = new Bot(botName);
+				if (bot.BotConfig == null || !bot.BotConfig.Enabled) {
+					Logging.LogGenericInfo("Not starting this instance because it's disabled in config file", botName);
+				}
+			}
+			// CONVERSION END
+
 			// Check if we got any bots running
 			OnBotShutdown();
 

ArchiSteamFarm/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("ArchiSteamFarm")]
-[assembly: AssemblyCopyright("Copyright © Łukasz Domeradzki 2015")]
+[assembly: AssemblyCopyright("Copyright © Łukasz Domeradzki 2015-2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.7.0.0")]
-[assembly: AssemblyFileVersion("1.7.0.0")]
+[assembly: AssemblyVersion("2.0.0.5")]
+[assembly: AssemblyFileVersion("2.0.0.5")]

ArchiSteamFarm/SteamTradeOffer.cs

@@ -1,74 +0,0 @@
-/*
-    _                _      _  ____   _                           _____
-   / \    _ __  ___ | |__  (_)/ ___| | |_  ___   __ _  _ __ ___  |  ___|__ _  _ __  _ __ ___
-  / _ \  | '__|/ __|| '_ \ | |\___ \ | __|/ _ \ / _` || '_ ` _ \ | |_  / _` || '__|| '_ ` _ \
- / ___ \ | |  | (__ | | | || | ___) || |_|  __/| (_| || | | | | ||  _|| (_| || |   | | | | | |
-/_/   \_\|_|   \___||_| |_||_||____/  \__|\___| \__,_||_| |_| |_||_|   \__,_||_|   |_| |_| |_|
-
- Copyright 2015-2016 Łukasz "JustArchi" Domeradzki
- Contact: JustArchi@JustArchi.net
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-					
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-*/
-
-using Newtonsoft.Json;
-using SteamKit2;
-using System.Collections.Generic;
-
-namespace ArchiSteamFarm {
-	internal sealed class SteamTradeOffer {
-		// REF: https://developer.valvesoftware.com/wiki/Steam_Web_API/IEconService#CEcon_TradeOffer
-		internal enum ETradeOfferState : byte {
-			Unknown,
-			Invalid,
-			Active,
-			Accepted,
-			Countered,
-			Expired,
-			Canceled,
-			Declined,
-			InvalidItems,
-			EmailPending,
-			EmailCanceled,
-			OnHold
-		}
-
-		[JsonProperty(Required = Required.Always)]
-		internal string tradeofferid { get; set; }
-
-		[JsonProperty(Required = Required.Always)]
-		internal int accountid_other { get; set; }
-
-		[JsonProperty(Required = Required.Always)]
-		internal ETradeOfferState trade_offer_state { get; set; }
-
-		[JsonProperty(Required = Required.Always)]
-		internal List<SteamItem> items_to_give { get; } = new List<SteamItem>();
-
-		[JsonProperty(Required = Required.Always)]
-		internal List<SteamItem> items_to_receive { get; } = new List<SteamItem>();
-
-		// Extra
-		private ulong _OtherSteamID64 = 0;
-		internal ulong OtherSteamID64 {
-			get {
-				if (_OtherSteamID64 == 0 && accountid_other != 0) {
-					_OtherSteamID64 = new SteamID((uint) accountid_other, EUniverse.Public, EAccountType.Individual).ConvertToUInt64();
-				}
-
-				return _OtherSteamID64;
-			}
-		}
-	}
-}

ArchiSteamFarm/SteamTradeOfferRequest.cs

@@ -1,41 +0,0 @@
-/*
-    _                _      _  ____   _                           _____
-   / \    _ __  ___ | |__  (_)/ ___| | |_  ___   __ _  _ __ ___  |  ___|__ _  _ __  _ __ ___
-  / _ \  | '__|/ __|| '_ \ | |\___ \ | __|/ _ \ / _` || '_ ` _ \ | |_  / _` || '__|| '_ ` _ \
- / ___ \ | |  | (__ | | | || | ___) || |_|  __/| (_| || | | | | ||  _|| (_| || |   | | | | | |
-/_/   \_\|_|   \___||_| |_||_||____/  \__|\___| \__,_||_| |_| |_||_|   \__,_||_|   |_| |_| |_|
-
- Copyright 2015-2016 Łukasz "JustArchi" Domeradzki
- Contact: JustArchi@JustArchi.net
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-					
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-*/
-
-using Newtonsoft.Json;
-
-namespace ArchiSteamFarm {
-	internal sealed class SteamTradeOfferRequest {
-		[JsonProperty(Required = Required.Always)]
-		internal bool newversion { get; } = true;
-
-		[JsonProperty(Required = Required.Always)]
-		internal int version { get; } = 2;
-
-		[JsonProperty(Required = Required.Always)]
-		internal SteamItemList me { get; } = new SteamItemList();
-
-		[JsonProperty(Required = Required.Always)]
-		internal SteamItemList them { get; } = new SteamItemList();
-	}
-}

ArchiSteamFarm/Trading.cs

@@ -39,37 +39,43 @@ namespace ArchiSteamFarm {
 
 		internal static async Task LimitInventoryRequestsAsync() {
 			await InventorySemaphore.WaitAsync().ConfigureAwait(false);
-			var releaseLater = Task.Run(async () => {
-				await Utilities.SleepAsync(3000).ConfigureAwait(false); // We must add some delay to not get caught by Steam rate limiter
+			Task.Run(async () => {
+				await Utilities.SleepAsync(Program.GlobalConfig.InventoryLimiterDelay * 1000).ConfigureAwait(false);
 				InventorySemaphore.Release();
-			});
+			}).Forget();
 		}
 
 		internal Trading(Bot bot) {
+			if (bot == null) {
+				return;
+			}
+
 			Bot = bot;
 		}
 
 		internal async void CheckTrades() {
-			if (ParsingTasks < 2) {
-				ParsingTasks++;
-
-				await Semaphore.WaitAsync().ConfigureAwait(false);
-				await ParseActiveTrades().ConfigureAwait(false);
-				Semaphore.Release();
-
-				ParsingTasks--;
+			if (ParsingTasks >= 2) {
+				return;
 			}
+
+			ParsingTasks++;
+
+			await Semaphore.WaitAsync().ConfigureAwait(false);
+			await ParseActiveTrades().ConfigureAwait(false);
+			Semaphore.Release();
+
+			ParsingTasks--;
 		}
 
 		private async Task ParseActiveTrades() {
-			List<SteamTradeOffer> tradeOffers = Bot.ArchiWebHandler.GetTradeOffers();
+			List<Steam.TradeOffer> tradeOffers = Bot.ArchiWebHandler.GetTradeOffers();
 			if (tradeOffers == null) {
 				return;
 			}
 
 			List<Task> tasks = new List<Task>();
-			foreach (SteamTradeOffer tradeOffer in tradeOffers) {
-				if (tradeOffer.trade_offer_state == SteamTradeOffer.ETradeOfferState.Active) {
+			foreach (Steam.TradeOffer tradeOffer in tradeOffers) {
+				if (tradeOffer.trade_offer_state == Steam.TradeOffer.ETradeOfferState.Active) {
 					tasks.Add(Task.Run(async () => await ParseTrade(tradeOffer).ConfigureAwait(false)));
 				}
 			}
@@ -78,7 +84,7 @@ namespace ArchiSteamFarm {
 			await Bot.AcceptAllConfirmations().ConfigureAwait(false);
 		}
 
-		private async Task ParseTrade(SteamTradeOffer tradeOffer) {
+		private async Task ParseTrade(Steam.TradeOffer tradeOffer) {
 			if (tradeOffer == null) {
 				return;
 			}
@@ -88,7 +94,7 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
-			if (tradeOffer.items_to_give.Count == 0 || tradeOffer.OtherSteamID64 == Bot.SteamMasterID) {
+			if (tradeOffer.items_to_give.Count == 0 || tradeOffer.OtherSteamID64 == Bot.BotConfig.SteamMasterID) {
 				Logging.LogGenericInfo("Accepting trade: " + tradeID, Bot.BotName);
 				await Bot.ArchiWebHandler.AcceptTradeOffer(tradeID).ConfigureAwait(false);
 			} else {

ArchiSteamFarm/Utilities.cs

@@ -27,6 +27,8 @@ using System.Threading.Tasks;
 
 namespace ArchiSteamFarm {
 	internal static class Utilities {
+		internal static void Forget(this Task task) { }
+
 		internal static async Task SleepAsync(int miliseconds) {
 			await Task.Delay(miliseconds).ConfigureAwait(false);
 		}

ArchiSteamFarm/WCF.cs

@@ -23,6 +23,7 @@
 */
 
 using System;
+using System.Linq;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 
@@ -35,11 +36,15 @@ namespace ArchiSteamFarm {
 
 	internal sealed class WCF : IWCF {
 
-		private const 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;
 
+		internal static void Init() {
+			URL = "http://" + Program.GlobalConfig.WCFHostname + ":" + Program.GlobalConfig.WCFPort + "/ASF";
+		}
+
 		internal bool IsServerRunning() {
 			return ServiceHost != null;
 		}
@@ -96,7 +101,7 @@ namespace ArchiSteamFarm {
 			if (args.Length > 1) { // If we have args[1] provided, use given botName
 				botName = args[1];
 			} else { // If not, just pick first one
-				botName = Bot.GetAnyBotName();
+				botName = Bot.Bots.Keys.FirstOrDefault();
 			}
 
 			if (string.IsNullOrEmpty(botName)) {

ArchiSteamFarm/WebBrowser.cs

@@ -26,6 +26,7 @@ using HtmlAgilityPack;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Net;
 using System.Net.Http;
 using System.Text;
@@ -33,7 +34,6 @@ using System.Threading.Tasks;
 
 namespace ArchiSteamFarm {
 	internal static class WebBrowser {
-		internal const byte HttpTimeout = 180; // In seconds, how long we can wait for server's response
 		internal const byte MaxConnections = 10; // Defines maximum number of connections per ServicePoint. Be careful, as it also defines maximum number of sockets in CLOSE_WAIT state
 		internal const byte MaxIdleTime = 15; // In seconds, how long socket is allowed to stay in CLOSE_WAIT state after there are no connections to it
 		internal const byte MaxRetries = 5; // Defines maximum number of retries, UrlRequest() does not handle retry by itself (it's app responsibility)
@@ -42,10 +42,12 @@ namespace ArchiSteamFarm {
 		private static readonly HttpClient HttpClient = new HttpClient(new HttpClientHandler {
 			UseCookies = false
 		}) {
-			Timeout = TimeSpan.FromSeconds(HttpTimeout)
+			Timeout = TimeSpan.FromSeconds(30)
 		};
 
 		internal static void Init() {
+			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)
 			HttpClient.DefaultRequestHeaders.UserAgent.ParseAdd(DefaultUserAgent);
@@ -80,7 +82,7 @@ namespace ArchiSteamFarm {
 			return await UrlRequest(request, HttpMethod.Post, data, cookies, referer).ConfigureAwait(false);
 		}
 
-		internal static async Task<string> UrlGetToContent(string request, Dictionary<string, string> cookies, string referer = null) {
+		internal static async Task<string> UrlGetToContent(string request, Dictionary<string, string> cookies = null, string referer = null) {
 			if (string.IsNullOrEmpty(request)) {
 				return null;
 			}
@@ -90,12 +92,28 @@ namespace ArchiSteamFarm {
 				return null;
 			}
 
-			HttpContent httpContent = httpResponse.Content;
-			if (httpContent == null) {
+			if (httpResponse.Content == null) {
 				return null;
 			}
 
-			return await httpContent.ReadAsStringAsync().ConfigureAwait(false);
+			return await httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+		}
+
+		internal static async Task<Stream> UrlGetToStream(string request, Dictionary<string, string> cookies = null, string referer = null) {
+			if (string.IsNullOrEmpty(request)) {
+				return null;
+			}
+
+			HttpResponseMessage httpResponse = await UrlGet(request, cookies, referer).ConfigureAwait(false);
+			if (httpResponse == null) {
+				return null;
+			}
+
+			if (httpResponse.Content == null) {
+				return null;
+			}
+
+			return await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false);
 		}
 
 		internal static async Task<HtmlDocument> UrlGetToHtmlDocument(string request, Dictionary<string, string> cookies = null, string referer = null) {
@@ -144,7 +162,7 @@ namespace ArchiSteamFarm {
 
 			HttpResponseMessage responseMessage;
 			using (HttpRequestMessage requestMessage = new HttpRequestMessage(httpMethod, request)) {
-				if (data != null) {
+				if (data != null && data.Count > 0) {
 					try {
 						requestMessage.Content = new FormUrlEncodedContent(data);
 					} catch (UriFormatException e) {
@@ -161,7 +179,7 @@ namespace ArchiSteamFarm {
 					requestMessage.Headers.Add("Cookie", cookieHeader.ToString());
 				}
 
-				if (referer != null) {
+				if (!string.IsNullOrEmpty(referer)) {
 					requestMessage.Headers.Referrer = new Uri(referer);
 				}
 

ArchiSteamFarm/config/ASF.json

@@ -0,0 +1,22 @@
+{
+  "Debug": false,
+  "AutoUpdates": true,
+  "UpdateChannel": 1,
+  "MaxFarmingTime": 10,
+  "IdleFarmingPeriod": 3,
+  "FarmingDelay": 5,
+  "AccountPlayingDelay": 5,
+  "LoginLimiterDelay": 7,
+  "InventoryLimiterDelay": 3,
+  "HttpTimeout": 30,
+  "WCFHostname": "localhost",
+  "WCFPort": 1242,
+  "Statistics": true,
+  "Blacklist": [
+    267420,
+    303700,
+    335590,
+    368020,
+    425280
+  ]
+}

ArchiSteamFarm/config/example.json

@@ -0,0 +1,26 @@
+{
+  "Enabled": false,
+  "StartOnLaunch": true,
+  "SteamLogin": null,
+  "SteamPassword": null,
+  "SteamParentalPIN": "0",
+  "SteamApiKey": null,
+  "SteamMasterID": 0,
+  "SteamMasterClanID": 0,
+  "CardDropsRestricted": false,
+  "DismissInventoryNotifications": true,
+  "FarmOffline": false,
+  "HandleOfflineMessages": false,
+  "ForwardKeysToOtherBots": false,
+  "DistributeKeys": false,
+  "UseAsfAsMobileAuthenticator": false,
+  "ShutdownOnFarmingFinished": false,
+  "SendOnFarmingFinished": false,
+  "SteamTradeToken": null,
+  "SendTradePeriod": 0,
+  "AcceptConfirmationsPeriod": 0,
+  "CustomGamePlayedWhileIdle": null,
+  "GamesPlayedWhileIdle": [
+    0
+  ]
+}

ArchiSteamFarm/config/example.xml

@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-	<!-- This is full-fledged example config, you may be also interested in minimal.xml for bare minimum one -->
-
-	<!-- This config includes all user-switchable properties that you may want to change on per-bot basis -->
-	<!-- Default values used in config match default ASF values when given config property is not found -->
-	<!-- In other words, if given property is not defined, ASF will assume default pre-programmed value -->
-
-	<!-- Notice, if you use special characters reserved for XML, you should escape them -->
-	<!-- Escape table: [& - &amp;] | [" - &quot;] | [' - &apos;] | [< - &lt;] | [> - &gt;] -->
-	<!-- So e.g. if your SteamPassword is "foo&" you should write value="foo&amp;" -->
-
-	<!-- Type of the property is a tip for you that defines what values you can use -->
-	<!-- bool - Boolean value that can be only "true" or "false" -->
-	<!-- string - Any sequence of characters, unless stated otherwise (keep in mind escape table above), with special treatment of "null" value -->
-	<!-- byte - 8-bit unsigned integer, used mostly for small numbers (0-255) -->
-	<!-- uint - 32-bit unsigned integer, used mostly for steam appID -->
-	<!-- ulong - 64-bit unsigned (long) integer, used mostly for representing steamID64 -->
-	<!-- HashSet(uint) - Comma-separated list of unique 32-bit unsigned integers -->
-
-	<!-- Master switch to turn account on and off, set to "true" after you're done -->
-	<!-- This bot instance won't run unless below switch is set to "true" -->
-	<Enabled type="bool" value="false"/>
-
-	<!-- This is your steam login, the one you use for logging in to steam -->
-	<!-- You can use "null" if you wish to enter login on every startup -->
-	<SteamLogin type="string" value="null"/>
-
-	<!-- This is your steam password, the one you use for logging in to steam -->
-	<!-- You can use "null" if you wish to enter password on every startup -->
-	<SteamPassword type="string" value="null"/>
-
-	<!-- This is steam nickname, the one you want to use for bot. Can be anything up to 32 characters -->
-	<!-- You can use "null" if you wish to preserve your actual nickname, and this is what you want most likely -->
-	<SteamNickname type="string" value="null"/>
-
-	<!-- This is your bot's API key, get one at https://steamcommunity.com/dev/apikey while logged in as a bot, domain doesn't matter -->
-	<!-- Remember that each account should have unique API key generated through above link, wrong API key will make all API-based functionalities to fail -->
-	<!-- API key is useless for primary accounts, as they're not using trading feature, you can leave it at "null" if you're configuring a primary account -->
-	<!-- When at "null", it will disable all ASF API-based functionalities such as trading -->
-	<SteamApiKey type="string" value="null"/>
-
-	<!-- This is your parental PIN if you use steam parental functionality -->
-	<!-- Most likely you don't want to change it. You can use "null" if you wish to enter PIN on every startup, 0 means there is no PIN, and this is probably what you want -->
-	<SteamParentalPIN type="string" value="0"/>
-
-	<!-- This is steamID64 of the bot-master - you, for example "76561198006963719" -->
-	<!-- You can get one e.g. by logging in to http://steamrep.com/ -->
-	<!-- If you're configuring primary account, you can safely leave it at "0", as you're master yourself -->
-	<!-- When at "0", bot won't accept any commands, including steam cd-keys or trades" -->
-	<SteamMasterID type="ulong" value="0"/>
-
-	<!-- This is steamID64 of the master clan (group). If defined, bot will join the group and the chat automatically after logging in -->
-	<!-- The easiest way to get one is to check groups on your profile: http://steamcommunity.com/my/profile" -->
-	<!-- Then copying the URL of "Leave group" link, it will look like this: javascript:leaveGroupPrompt('103582791440160998','Archi\'s SC Farm') -->
-	<!-- The steamID64 we're looking for is there, in above example: "103582791440160998" -->
-	<!-- Remember that joining a group and the chat requires having non-restricted access to steam community, which is not always the case with alts -->
-	<!-- If you don't have your own farming group, most likely you don't want to change it, 0 means there is no master group defined -->
-	<SteamMasterClanID type="ulong" value="0"/>
-
-	<!-- This switch defines if bot should automatically start when ASF process is launched -->
-	<!-- Some people might want to avoid that, as they may prefer to issue "!start" command themselves -->
-	<!-- Most likely you want to keep this switch enabled, unless you have a reason -->
-	<StartOnLaunch type="bool" value="true"/>
-
-	<!-- This switch defines if you want to use built-in ASF two-factor-authentication (ASF 2FA) for this account -->
-	<!-- The one and only purpose for this function is automating steam logins and steam trades, so you won't need to enter 2FA codes all the time -->
-	<!-- This however defeats the whole purpose of two-factor-auth, and should be used on alt accounts ONLY -->
-	<!-- You should read full documentation, along with explanation here: https://github.com/JustArchi/ArchiSteamFarm/wiki/Escrow -->
-	<!-- Personally I suggest switching this to "true" ONLY for alts -->
-	<!-- WARNING, this option can potentially LOCK OUT YOUR ACCOUNT! If you don't fully understand this feature, DON'T USE IT! -->
-	<UseAsfAsMobileAuthenticator type="bool" value="false"/>
-
-	<!-- This switch defines if the account has card drops restricted -->
-	<!-- Restricted card drops means that the account doesn't receive any steam cards until it plays the game for at least 2 hours -->
-	<!-- There is no magical way to detect it by ASF, I made this option config-based switch -->
-	<!-- Based on our observations, it looks like most accounts that never issued a refund have non-restricted card drops, and this is what default value assumes -->
-	<!-- However, if you noticed that your cards never drop until you hit 2 hours played mark, consider setting it as "true" -->
-	<!-- Guessing "wrong" won't have any real consequences, ASF will just work in non-optimal way, and everybody wants to drop cards fast, right? -->
-	<!-- Based on this parameter, ASF will try to choose the most optimal cards farming algorithm for this account -->
-	<CardDropsRestricted type="bool" value="false"/>
-
-	<!-- This switch defines if the account should stay as "Offline" after logging in to Steam. This has several advantages and disadvantages -->
-	<!-- Personally I find it extremely useful for primary accounts, as your status will remain "Online" and not "In-Game" when ASF is farming -->
-	<!-- Thanks to that, your friends will never ask you again if you're playing or farming the game. Your status will now nicely reflect that -->
-	<!-- However, it's less useful for alt accounts, as you won't be able to interact with bots and check what they're doing - they'll appear as "Offline" -->
-	<!-- Personally I suggest switching this to "true" for primary accounts, and leaving it at "false" for alt accounts -->
-	<!-- Bot won't be able to receive and answer to your commands, unless you set "HandleOfflineMessages" below to "true" as well -->
-	<FarmOffline type="bool" value="false"/>
-
-	<!-- This switch defines if bot should handle offline messages when it sees them -->
-	<!-- Basically it should be used only when "FarmOffline" property above is true, so bot can handle offline messages -->
-	<!-- Reading offline messages will also mark them as received, therefore it should not be used if you want to keep them for later -->
-	<!-- Personally I suggest keeping this on "false" for primary accounts, and considering switching to "true" for alts, if "FarmOffline" above is set to true as well -->
-	<HandleOfflineMessages type="bool" value="false"/>
-
-	<!-- This switch defines if bot should try to forward key to the other bot in case of failing to redeem on his own account -->
-	<!-- This can be useful if you want to send key to your farm and you don't care which account redeems it -->
-	<!-- When "true", bot will try redeeming "AlreadyOwned", "BaseGameRequired", "OnCooldown" and "RegionLocked" keys on other available accounts -->
-	<!-- By default this option is disabled, as not everyone might want to redeem keys on other configured accounts -->
-	<!-- WARNING: Remember that Steam issues temporary ban on too many failed key activations (OnCooldown status) -->
-	<!-- Therefore, be careful when it comes to multiple keys activations, this option is supposed to help you, not make you lazy -->
-	<ForwardKeysToOtherBots type="bool" value="false"/>
-
-	<!-- This switch defines bot's behaviour on getting multiple keys -->
-	<!-- When "false", bot will try to redeem all keys on it's own account, when "true", keys will be distributed on "one bot, one key" basis -->
-	<!-- Keep in mind that "ForwardKeysToOtherBots" property defined above affects this switch as well -->
-	<!-- When "ForwardKeysToOtherBots" is "true", bot will try redeeming "AlreadyOwned", "BaseGameRequired", "OnCooldown" and "RegionLocked" keys on other available accounts -->
-	<!-- If "ForwardKeysToOtherBots" is set to "false", bot will keep unused keys for itself -->
-	<!-- By default this option is disabled, as not everyone might want to alter the multiple keys redeeming behaviour -->
-	<!-- Switch this to "true" only if you prefer to use "one bot, one key" behaviour, instead of default one, which is to redeem all keys only on one account -->
-	<DistributeKeys type="bool" value="false"/>
-
-	<!-- This switch defines if bot should disconnect once farming is finished -->
-	<!-- Keep in mind that when no bots are active, ASF will shutdown as well -->
-	<!-- You may want to disconnect the bot after he's done, if that's the case, set below to "true" -->
-	<!-- However, you may instead want to keep it online for the whole time, in this case, leave it at "false" -->
-	<!-- Even when bot is not farming anything, he'll keep checking badges from time to time, if there is anything new to farm -->
-	<!-- Personally I suggest leaving it at "false", unless you have a reason to close the process after all bots finished farming -->
-	<ShutdownOnFarmingFinished type="bool" value="false"/>
-
-	<!-- This switch defines if bot should send you all the items it farmed after farming is finished -->
-	<!-- Remember that in order to use this feature, SteamMasterID must be defined above -->
-	<!-- If SteamMasterID is not a friend of this bot, SteamTradeToken will also be needed to set below -->
-	<SendOnFarmingFinished type="bool" value="false"/>
-
-	<!-- This is a SteamTradeToken of SteamMasterID, which is required if bot doesn't have SteamMasterID on friend list -->
-	<!-- You can get the token here: http://steamcommunity.com/id/me/tradeoffers/privacy while being logged in as SteamMasterID -->
-	<!-- The token has 8 characters and is written in the last part of trade URL link, starting after "&token=" -->
-	<SteamTradeToken type="string" value="null"/>
-
-	<!-- This switch defines if bot should send you trade offer with all farmed cards on regular basis -->
-	<!-- This can become useful if you have lots of games to farm and you don't want to wait for all of them to be farmed -->
-	<!-- However, if you have many bots running, it may become a bit spammy/intrusive, so it's not enabled by default -->
-	<!-- Remember that there is also "SendOnFarmingFinished" switch above, which is far less intrusive and can be used instead -->
-	<!-- This property defines how often bot should send you a trade offer, in hours -->
-	<!-- For example, setting this to "24" will result in a trade offer being sent once per day (24 hours) -->
-	<!-- Default value of "0" disables that feature -->
-	<SendTradePeriod type="byte" value="0"/>
-
-	<!-- This is comma-separated list of IDs that should not be considered for farming -->
-	<!-- Default value includes appIDs that are wrongly appearing on the profile, e.g. Summer Sale, Winter Sale or Monster Summer Game -->
-	<!-- In addition to blacklist defined here, ASF also has global blacklist, which is being updated on as-needed basis, so you don't need to update this entry -->
-	<!-- You probably don't want to change anything here -->
-	<Blacklist type="HashSet(uint)" value="303700,335590,368020,425280"/>
-
-	<!-- This switch enables statistics for me - bot will join Archi's SC Farm group and chat on steam -->
-	<!-- Consider leaving it at "true", this way I can check how many running bots are active -->
-	<!-- Such information directly affects my willings to work on the project, as I can see how many users are actually using it -->
-	<!-- So if you want to see new versions coming up, bugs being fixed, and new features getting implemented, consider leaving it at "true" -->
-	<!-- You can find the group, along with all the statistics here: http://steamcommunity.com/groups/ascfarm -->
-	<Statistics type="bool" value="true"/>
-</configuration>

ArchiSteamFarm/config/minimal.json

@@ -0,0 +1,5 @@
+{
+  "Enabled": false,
+  "SteamLogin": null,
+  "SteamPassword": null
+}

ArchiSteamFarm/config/minimal.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-	<!-- This is minimalistic config "just to make ASF work". For full-fledged config, please take a look at example.xml -->
-	<!-- Full-fledged config includes some neat features such as offline farming or cards farming algorithm selection -->
-	<!-- ASF will use default values for missing properties, check example.xml to see all of them -->
-	<Enabled type="bool" value="false"/>
-	<SteamLogin type="string" value="null"/>
-	<SteamPassword type="string" value="null"/>
-</configuration>

README.md

@@ -1,6 +1,10 @@
 ArchiSteamFarm
 ===================
 
+[![Build status](https://ci.appveyor.com/api/projects/status/yi0y25nipcb1j1yj?svg=true)](https://ci.appveyor.com/project/JustArchi/archisteamfarm) [![GitHub release](https://img.shields.io/github/release/JustArchi/ArchiSteamFarm.svg)](https://github.com/JustArchi/ArchiSteamFarm/releases/latest) [![Github All Releases](https://img.shields.io/github/downloads/JustArchi/ArchiSteamFarm/total.svg)](https://github.com/JustArchi/ArchiSteamFarm/releases) [![Paypal donate](https://img.shields.io/badge/paypal-donate-yellow.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=HD2P2P3WGS5Y4) [![Steam donate](https://img.shields.io/badge/steam-donate-yellow.svg)](https://steamcommunity.com/tradeoffer/new/?partner=46697991&token=0ix2Ruv_)
+
+---
+
 ASF is a C# application that allows you to farm steam cards using multiple steam accounts simultaneously. Unlike idle master which works only on one account at given time, requires steam client running in background, and launches additional processes imitiating "game playing" status, ASF doesn't require any steam client running in the background, doesn't launch any additional processes and is made to handle unlimited steam accounts at once. In addition to that, it's meant to be run on servers or other desktop-less machines, and features full Mono support, which makes it possible to launch on any Mono-supported operating system, such as Windows, Linux or OS X. ASF is based on, and possible, thanks to [SteamKit2](https://github.com/SteamRE/SteamKit).
 
 ASF doesn't require and doesn't interfere in any way with Steam client. In addition to that, it no longer requires exclusive access to given account, which means that you can use your main account in Steam client, and use ASF for farming the same account at the same time. If you decide to launch a game, ASF will get disconnected, and resume farming once you finish playing your game, being as transparent as possible.

SteamAuth/Confirmation.cs

@@ -8,8 +8,29 @@ namespace SteamAuth
 {
     public class Confirmation
     {
-        public string ConfirmationID;
-        public string ConfirmationKey;
-        public string ConfirmationDescription;
+        public string ID;
+        public string Key;
+        public string Description;
+
+        public ConfirmationType ConfType
+        {
+            get
+            {
+                if (String.IsNullOrEmpty(Description)) return ConfirmationType.Unknown;
+                if (Description.StartsWith("Confirm ")) return ConfirmationType.GenericConfirmation;
+                if (Description.StartsWith("Trade with ")) return ConfirmationType.Trade;
+                if (Description.StartsWith("Sell -")) return ConfirmationType.MarketSellTransaction;
+
+                return ConfirmationType.Unknown;
+            }
+        }
+
+        public enum ConfirmationType
+        {
+            GenericConfirmation,
+            Trade,
+            MarketSellTransaction,
+            Unknown
+        }
     }
 }

SteamAuth/SteamGuardAccount.cs

@@ -71,7 +71,7 @@ namespace SteamAuth
                 if (removeResponse == null || removeResponse.Response == null || !removeResponse.Response.Success) return false;
                 return true;
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 return false;
             }
@@ -115,7 +115,7 @@ namespace SteamAuth
                     codePoint /= steamGuardCodeTranslations.Length;
                 }
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 return null; //Change later, catch-alls are bad!
             }
@@ -162,9 +162,9 @@ namespace SteamAuth
                 string confDesc = confDescs[i].Groups[1].Value;
                 Confirmation conf = new Confirmation()
                 {
-                    ConfirmationDescription = confDesc,
-                    ConfirmationID = confID,
-                    ConfirmationKey = confKey
+                    Description = confDesc,
+                    ID = confID,
+                    Key = confKey
                 };
                 ret.Add(conf);
             }
@@ -212,9 +212,9 @@ namespace SteamAuth
                 string confDesc = confDescs[i].Groups[1].Value;
                 Confirmation conf = new Confirmation()
                 {
-                    ConfirmationDescription = confDesc,
-                    ConfirmationID = confID,
-                    ConfirmationKey = confKey
+                    Description = confDesc,
+                    ID = confID,
+                    Key = confKey
                 };
                 ret.Add(conf);
             }
@@ -268,7 +268,7 @@ namespace SteamAuth
                 this.Session.SteamLoginSecure = tokenSecure;
                 return true;
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 return false;
             }
@@ -300,7 +300,7 @@ namespace SteamAuth
                 this.Session.SteamLoginSecure = tokenSecure;
                 return true;
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 return false;
             }
@@ -308,7 +308,7 @@ namespace SteamAuth
 
         private ConfirmationDetailsResponse _getConfirmationDetails(Confirmation conf)
         {
-            string url = APIEndpoints.COMMUNITY_BASE + "/mobileconf/details/" + conf.ConfirmationID + "?";
+            string url = APIEndpoints.COMMUNITY_BASE + "/mobileconf/details/" + conf.ID + "?";
             string queryString = GenerateConfirmationQueryParams("details");
             url += queryString;
 
@@ -329,7 +329,7 @@ namespace SteamAuth
             string url = APIEndpoints.COMMUNITY_BASE + "/mobileconf/ajaxop";
             string queryString = "?op=" + op + "&";
             queryString += GenerateConfirmationQueryParams(op);
-            queryString += "&cid=" + conf.ConfirmationID + "&ck=" + conf.ConfirmationKey;
+            queryString += "&cid=" + conf.ID + "&ck=" + conf.Key;
             url += queryString;
 
             CookieContainer cookies = new CookieContainer();
@@ -401,7 +401,7 @@ namespace SteamAuth
                 string hash = WebUtility.UrlEncode(encodedData);
                 return hash;
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 return null; //Fix soon: catch-all is BAD!
             }

SteamAuth/UserLogin.cs

@@ -161,8 +161,6 @@ namespace SteamAuth
                 this.LoggedIn = true;
                 return LoginResult.LoginOkay;
             }
-
-            return LoginResult.GeneralFailure;
         }
 
         private class LoginResponse

tools/hook.bat

@@ -0,0 +1 @@
+rundll32 NetHook2.dll,Inject

tools/unhook.bat

@@ -0,0 +1 @@
+rundll32 NetHook2.dll,Eject