Correct anti-captcha delay

added extended !status syntax

ArchiSteamFarm/ArchiHandler.cs

@@ -24,6 +24,8 @@
 
 using SteamKit2;
 using SteamKit2.Internal;
+using System.Collections.Generic;
+using System.IO;
 
 namespace ArchiSteamFarm {
 	internal sealed class ArchiHandler : ClientMsgHandler {
@@ -33,6 +35,7 @@ namespace ArchiSteamFarm {
 				Unknown = -1,
 				OK = 0,
 				AlreadyOwned = 9,
+				RegionLockedKey = 13,
 				InvalidKey = 14,
 				DuplicatedKey = 15,
 				BaseGameRequired = 24,
@@ -41,14 +44,22 @@ namespace ArchiSteamFarm {
 
 			internal EResult Result { get; private set; }
 			internal EPurchaseResult PurchaseResult { get; private set; }
-			internal int ErrorCode { get; private set; }
-			internal byte[] ReceiptInfo { get; private set; }
+			internal KeyValue ReceiptInfo { get; private set; } = new KeyValue();
+			internal Dictionary<uint, string> Items { get; private set; } = new Dictionary<uint, string>();
 
 			internal PurchaseResponseCallback(CMsgClientPurchaseResponse body) {
 				Result = (EResult) body.eresult;
-				ErrorCode = body.purchase_result_details;
-				ReceiptInfo = body.purchase_receipt_info;
-				PurchaseResult = (EPurchaseResult) ErrorCode;
+				PurchaseResult = (EPurchaseResult) body.purchase_result_details;
+
+				using (MemoryStream ms = new MemoryStream(body.purchase_receipt_info)) {
+					if (!ReceiptInfo.TryReadAsBinary(ms)) {
+						return;
+					}
+
+					foreach (KeyValue lineItem in ReceiptInfo["lineitems"].Children) {
+						Items.Add((uint) lineItem["PackageID"].AsUnsignedLong(), lineItem["ItemDescription"].AsString());
+					}
+				}
 			}
 		}
 
@@ -79,14 +90,30 @@ namespace ArchiSteamFarm {
 			Client.Send(request);
 		}
 
-		internal void PlayGames(params ulong[] gameIDs) {
+		internal void PlayGames(params uint[] gameIDs) {
 			var request = new ClientMsgProtobuf<CMsgClientGamesPlayed>(EMsg.ClientGamesPlayed);
-			foreach (ulong gameID in gameIDs) {
-				if (gameID != 0) {
-					request.Body.games_played.Add(new CMsgClientGamesPlayed.GamePlayed {
-						game_id = new GameID(gameID),
-					});
+			foreach (uint gameID in gameIDs) {
+				if (gameID == 0) {
+					continue;
 				}
+
+				request.Body.games_played.Add(new CMsgClientGamesPlayed.GamePlayed {
+					game_id = new GameID(gameID),
+				});
+			}
+			Client.Send(request);
+		}
+
+		internal void PlayGames(ICollection<uint> gameIDs) {
+			var request = new ClientMsgProtobuf<CMsgClientGamesPlayed>(EMsg.ClientGamesPlayed);
+			foreach (uint gameID in gameIDs) {
+				if (gameID == 0) {
+					continue;
+				}
+
+				request.Body.games_played.Add(new CMsgClientGamesPlayed.GamePlayed {
+					game_id = new GameID(gameID),
+				});
 			}
 			Client.Send(request);
 		}
@@ -99,15 +126,17 @@ namespace ArchiSteamFarm {
 		}
 
 		public sealed override void HandleMsg(IPacketMsg packetMsg) {
-			if (packetMsg != null) {
-				switch (packetMsg.MsgType) {
-					case EMsg.ClientPurchaseResponse:
-						HandlePurchaseResponse(packetMsg);
-						break;
-					case EMsg.ClientUserNotifications:
-						HandleUserNotifications(packetMsg);
-						break;
-				}
+			if (packetMsg == null) {
+				return;
+			}
+
+			switch (packetMsg.MsgType) {
+				case EMsg.ClientPurchaseResponse:
+					HandlePurchaseResponse(packetMsg);
+					break;
+				case EMsg.ClientUserNotifications:
+					HandleUserNotifications(packetMsg);
+					break;
 			}
 		}
 

ArchiSteamFarm/ArchiSteamFarm.csproj

@@ -50,17 +50,22 @@
     <DocumentationFile>
     </DocumentationFile>
     <Prefer32Bit>true</Prefer32Bit>
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>cirno.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="HtmlAgilityPack, Version=1.4.9.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
       <HintPath>..\packages\HtmlAgilityPack.1.4.9\lib\Net45\HtmlAgilityPack.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.8.0.1-beta1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.8.0.1-beta3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="protobuf-net, Version=2.0.0.668, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
@@ -94,6 +99,7 @@
     <Compile Include="SteamTradeOffer.cs" />
     <Compile Include="Trading.cs" />
     <Compile Include="Utilities.cs" />
+    <Compile Include="WebBrowser.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
@@ -113,22 +119,23 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="cirno.ico" />
+    <Content Include="config\example.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent Condition=" '$(OS)' != 'Unix' ">(robocopy $(ProjectDir)config $(TargetDir)config /S /E) ^&amp; IF %25ERRORLEVEL%25 GEQ 2 exit 0
-
-if $(ConfigurationName) == Release (
+    <PreBuildEvent>
+    </PreBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent Condition=" '$(OS)' != 'Unix' ">if $(ConfigurationName) == Release (
     mkdir "$(TargetDir)out" "$(TargetDir)out\config"
     copy "$(TargetDir)config\example.xml" "$(TargetDir)out\config"
     "$(SolutionDir)tools\ILMerge.exe" /out:"$(TargetDir)out\ASF.exe" "$(TargetDir)$(TargetName).exe" "$(TargetDir)*.dll" /target:exe /targetplatform:v4,C:\Windows\Microsoft.NET\Framework64\v4.0.30319 /wildcards
     del "$(TargetDir)out\ASF.pdb"
 )</PostBuildEvent>
   </PropertyGroup>
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

ArchiSteamFarm/ArchiWebHandler.cs

@@ -33,14 +33,15 @@ using System.Text;
 using System.Threading.Tasks;
 
 namespace ArchiSteamFarm {
-	internal class ArchiWebHandler {
-		private const int Timeout = 1000 * 15; // In miliseconds
+	internal sealed class ArchiWebHandler {
+		private const int Timeout = 1000 * WebBrowser.HttpTimeout; // In miliseconds
+
 		private readonly Bot Bot;
 		private readonly string ApiKey;
+		private readonly Dictionary<string, string> SteamCookieDictionary = new Dictionary<string, string>();
 
 		private ulong SteamID;
 		private string VanityURL;
-		private readonly Dictionary<string, string> SteamCookieDictionary = new Dictionary<string, string>();
 
 		// This is required because home_process request must be done on final URL
 		private string GetHomeProcess() {
@@ -130,7 +131,7 @@ namespace ArchiSteamFarm {
 					{"pin", parentalPin}
 				};
 
-				HttpResponseMessage response = await Utilities.UrlPostRequestWithResponse("https://steamcommunity.com/parental/ajaxunlock", postData, SteamCookieDictionary, "https://steamcommunity.com/").ConfigureAwait(false);
+				HttpResponseMessage response = await WebBrowser.UrlPost("https://steamcommunity.com/parental/ajaxunlock", postData, SteamCookieDictionary, "https://steamcommunity.com/").ConfigureAwait(false);
 				if (response != null && response.IsSuccessStatusCode) {
 					Logging.LogGenericInfo(Bot.BotName, "Success!");
 
@@ -240,7 +241,7 @@ namespace ArchiSteamFarm {
 				{"action", "join"}
 			};
 
-			await Utilities.UrlPostRequest(request, postData, SteamCookieDictionary).ConfigureAwait(false);
+			await WebBrowser.UrlPost(request, postData, SteamCookieDictionary).ConfigureAwait(false);
 		}
 
 		internal async Task LeaveClan(ulong clanID) {
@@ -259,7 +260,8 @@ namespace ArchiSteamFarm {
 				{"action", "leaveGroup"},
 				{"groupId", clanID.ToString()}
 			};
-			await Utilities.UrlPostRequest(request, postData, SteamCookieDictionary).ConfigureAwait(false);
+
+			await WebBrowser.UrlPost(request, postData, SteamCookieDictionary).ConfigureAwait(false);
 		}
 
 		internal async Task<bool> AcceptTradeOffer(ulong tradeID) {
@@ -281,7 +283,11 @@ namespace ArchiSteamFarm {
 				{"tradeofferid", tradeID.ToString()}
 			};
 
-			HttpResponseMessage result = await Utilities.UrlPostRequestWithResponse(request, postData, SteamCookieDictionary, referer).ConfigureAwait(false);
+			HttpResponseMessage result = await WebBrowser.UrlPost(request, postData, SteamCookieDictionary, referer).ConfigureAwait(false);
+			if (result == null) {
+				return false;
+			}
+
 			bool success = result.IsSuccessStatusCode;
 
 			if (!success) {
@@ -333,7 +339,7 @@ namespace ArchiSteamFarm {
 				return null;
 			}
 
-			return await Utilities.UrlToHtmlDocument("http://steamcommunity.com/profiles/" + SteamID + "/badges?p=" + page, SteamCookieDictionary).ConfigureAwait(false);
+			return await WebBrowser.UrlGetToHtmlDocument("http://steamcommunity.com/profiles/" + SteamID + "/badges?p=" + page, SteamCookieDictionary).ConfigureAwait(false);
 		}
 
 		internal async Task<HtmlDocument> GetGameCardsPage(ulong appID) {
@@ -341,7 +347,7 @@ namespace ArchiSteamFarm {
 				return null;
 			}
 
-			return await Utilities.UrlToHtmlDocument("http://steamcommunity.com/profiles/" + SteamID + "/gamecards/" + appID, SteamCookieDictionary).ConfigureAwait(false);
+			return await WebBrowser.UrlGetToHtmlDocument("http://steamcommunity.com/profiles/" + SteamID + "/gamecards/" + appID, SteamCookieDictionary).ConfigureAwait(false);
 		}
 	}
 }

ArchiSteamFarm/Bot.cs

@@ -24,27 +24,26 @@
 
 using SteamKit2;
 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;
 
 namespace ArchiSteamFarm {
-	internal class Bot {
+	internal sealed class Bot {
 		private const ushort CallbackSleep = 500; // In miliseconds
 
-		private static readonly HashSet<Bot> Bots = new HashSet<Bot>();
+		private static readonly ConcurrentDictionary<string, Bot> Bots = new ConcurrentDictionary<string, Bot>();
 
-		private readonly string ConfigFile;
-		private readonly string SentryFile;
+		private readonly string ConfigFile, SentryFile;
+
+		internal readonly string BotName;
 
 		private bool IsRunning = false;
 		private string AuthCode, TwoFactorAuth;
 
-		internal readonly string BotName;
-
 		internal ArchiHandler ArchiHandler { get; private set; }
 		internal ArchiWebHandler ArchiWebHandler { get; private set; }
 		internal CallbackManager CallbackManager { get; private set; }
@@ -55,51 +54,68 @@ namespace ArchiSteamFarm {
 		internal Trading Trading { get; private set; }
 
 		// Config variables
-		internal bool Enabled { get; private set; } = true;
+		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; } = 76561198006963719;
+		internal ulong SteamMasterID { get; private set; } = 0;
 		internal ulong SteamMasterClanID { get; private set; } = 0;
+		internal bool CardDropsRestricted { get; private set; } = false;
 		internal bool ShutdownOnFarmingFinished { get; private set; } = false;
-		internal HashSet<uint> Blacklist { get; private set; } = new HashSet<uint> { 368020 };
+		internal HashSet<uint> Blacklist { get; private set; } = new HashSet<uint> { 303700, 335590, 368020 };
 		internal bool Statistics { get; private set; } = true;
 
-		internal static int GetRunningBotsCount() {
-			int result;
-			lock (Bots) {
-				result = Bots.Count;
+		private static bool IsValidCdKey(string key) {
+			if (string.IsNullOrEmpty(key)) {
+				return false;
 			}
-			return result;
+
+			if (key.Length != 17 && key.Length != 29) {
+				return false;
+			}
+
+			for (byte i = 5; i < key.Length; i += 6) {
+				if (key[i] != '-') {
+					return false;
+				}
+			}
+
+			return true;
+		}
+
+		internal static int GetRunningBotsCount() {
+			return Bots.Count;
 		}
 
 		internal static async Task ShutdownAllBots() {
 			List<Task> tasks = new List<Task>();
-			lock (Bots) {
-				foreach (Bot bot in Bots) {
-					tasks.Add(Task.Run(async () => await bot.Shutdown().ConfigureAwait(false)));
-				}
+			foreach (Bot bot in Bots.Values) {
+				tasks.Add(Task.Run(async () => await bot.Shutdown().ConfigureAwait(false)));
 			}
 			await Task.WhenAll(tasks).ConfigureAwait(false);
 		}
 
 		internal Bot(string botName) {
+			if (Bots.ContainsKey(botName)) {
+				return;
+			}
+
 			BotName = botName;
 
 			ConfigFile = Path.Combine(Program.ConfigDirectoryPath, BotName + ".xml");
 			SentryFile = Path.Combine(Program.ConfigDirectoryPath, BotName + ".bin");
 
-			ReadConfig();
+			if (!ReadConfig()) {
+				return;
+			}
 
 			if (!Enabled) {
 				return;
 			}
 
-			lock (Bots) {
-				Bots.Add(this);
-			}
+			Bots.AddOrUpdate(BotName, this, (key, value) => this);
 
 			// Initialize
 			SteamClient = new SteamClient();
@@ -114,7 +130,6 @@ namespace ArchiSteamFarm {
 			SteamFriends = SteamClient.GetHandler<SteamFriends>();
 			CallbackManager.Subscribe<SteamFriends.FriendsListCallback>(OnFriendsList);
 			CallbackManager.Subscribe<SteamFriends.FriendMsgCallback>(OnFriendMsg);
-			CallbackManager.Subscribe<SteamFriends.PersonaStateCallback>(OnPersonaState);
 
 			SteamUser = SteamClient.GetHandler<SteamUser>();
 			CallbackManager.Subscribe<SteamUser.AccountInfoCallback>(OnAccountInfo);
@@ -130,79 +145,98 @@ namespace ArchiSteamFarm {
 			Trading = new Trading(this);
 
 			// Start
-			Start();
+			var fireAndForget = Task.Run(async () => await Start().ConfigureAwait(false));
 		}
 
-		private void ReadConfig() {
-			using (XmlReader reader = XmlReader.Create(ConfigFile)) {
-				while (reader.Read()) {
-					if (reader.NodeType != XmlNodeType.Element) {
-						continue;
-					}
+		private bool ReadConfig() {
+			if (!File.Exists(ConfigFile)) {
+				return false;
+			}
 
-					string key = reader.Name;
-					if (string.IsNullOrEmpty(key)) {
-						continue;
-					}
+			try {
+				using (XmlReader reader = XmlReader.Create(ConfigFile)) {
+					while (reader.Read()) {
+						if (reader.NodeType != XmlNodeType.Element) {
+							continue;
+						}
 
-					string value = reader.GetAttribute("value");
-					if (string.IsNullOrEmpty(value)) {
-						continue;
-					}
+						string key = reader.Name;
+						if (string.IsNullOrEmpty(key)) {
+							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 "SteamParentalPIN":
-							SteamParentalPIN = value;
-							break;
-						case "SteamMasterID":
-							SteamMasterID = ulong.Parse(value);
-							break;
-						case "SteamMasterClanID":
-							SteamMasterClanID = ulong.Parse(value);
-							break;
-						case "ShutdownOnFarmingFinished":
-							ShutdownOnFarmingFinished = bool.Parse(value);
-							break;
-						case "Blacklist":
-							foreach (string appID in value.Split(',')) {
-								Blacklist.Add(uint.Parse(appID));
-							}
-							break;
-						case "Statistics":
-							Statistics = bool.Parse(value);
-							break;
-						default:
-							Logging.LogGenericWarning(BotName, "Unrecognized config value: " + key + "=" + value);
-							break;
+						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 "SteamParentalPIN":
+								SteamParentalPIN = value;
+								break;
+							case "SteamMasterID":
+								SteamMasterID = ulong.Parse(value);
+								break;
+							case "SteamMasterClanID":
+								SteamMasterClanID = ulong.Parse(value);
+								break;
+							case "CardDropsRestricted":
+								CardDropsRestricted = bool.Parse(value);
+								break;
+							case "ShutdownOnFarmingFinished":
+								ShutdownOnFarmingFinished = bool.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(BotName, "Unrecognized config value: " + key + "=" + value);
+								break;
+						}
 					}
 				}
+			} catch (Exception e) {
+				Logging.LogGenericException(BotName, e);
+				Logging.LogGenericError(BotName, "Your config for this bot instance is invalid, it won't run!");
+				return false;
 			}
+
+			return true;
 		}
 
-		internal void Start() {
+		internal async Task Start() {
 			if (IsRunning) {
 				return;
 			}
 
-			SteamClient.Connect();
 			IsRunning = true;
 
-			Task.Run(() => HandleCallbacks());
+			Logging.LogGenericInfo(BotName, "Starting...");
+			await Program.LimitSteamRequestsAsync().ConfigureAwait(false);
+			SteamClient.Connect();
+
+			var fireAndForget = Task.Run(() => HandleCallbacks());
 		}
 
 		internal async Task Stop() {
@@ -211,16 +245,25 @@ namespace ArchiSteamFarm {
 			}
 
 			await CardsFarmer.StopFarming().ConfigureAwait(false);
-			SteamClient.Disconnect();
 			IsRunning = false;
+			SteamClient.Disconnect();
 		}
 
-		internal async Task Shutdown() {
-			await Stop().ConfigureAwait(false);
-			lock (Bots) {
-				Bots.Remove(this);
+		private async Task<bool> Shutdown(string botNameToShutdown) {
+			Bot botToShutdown;
+			if (!Bots.TryGetValue(botNameToShutdown, out botToShutdown)) {
+				return false;
 			}
-			Program.OnBotShutdown(this);
+
+			await botToShutdown.Stop().ConfigureAwait(false);
+			Bots.TryRemove(botNameToShutdown, out botToShutdown);
+
+			Program.OnBotShutdown(botToShutdown);
+			return true;
+		}
+
+		internal async Task<bool> Shutdown() {
+			return await Shutdown(BotName).ConfigureAwait(false);
 		}
 
 		internal async Task OnFarmingFinished() {
@@ -229,10 +272,6 @@ namespace ArchiSteamFarm {
 			}
 		}
 
-		internal void PlayGame(params ulong[] gameIDs) {
-			ArchiHandler.PlayGames(gameIDs);
-		}
-
 		private void HandleCallbacks() {
 			TimeSpan timeSpan = TimeSpan.FromMilliseconds(CallbackSleep);
 			while (IsRunning) {
@@ -240,6 +279,76 @@ namespace ArchiSteamFarm {
 			}
 		}
 
+		private void SendMessageToUser(ulong steamID, string message) {
+			if (steamID == 0 || string.IsNullOrEmpty(message)) {
+				return;
+			}
+
+			SteamFriends.SendChatMessage(steamID, EChatEntryType.ChatMsg, message);
+		}
+
+
+		private void ResponseStatus(ulong steamID, string botName = null) {
+			if (steamID == 0) {
+				return;
+			}
+
+			Bot bot;
+
+			if (string.IsNullOrEmpty(botName)) {
+				bot = this;
+			} else {
+				if (!Bots.TryGetValue(botName, out bot)) {
+					SendMessageToUser(steamID, "Couldn't find any bot named " + botName + "!");
+					return;
+				}
+			}
+
+			if (bot.CardsFarmer.CurrentGamesFarming.Count > 0) {
+				SendMessageToUser(steamID, "Bot " + bot.BotName + " is currently farming appIDs: " + string.Join(", ", bot.CardsFarmer.CurrentGamesFarming) + " and has a total of " + bot.CardsFarmer.GamesToFarm.Count + " games left to farm");
+			}
+			SendMessageToUser(steamID, "Currently " + Bots.Count + " bots are running");
+		}
+
+		private void ResponseStart(ulong steamID, string botNameToStart) {
+			if (steamID == 0 || string.IsNullOrEmpty(botNameToStart)) {
+				return;
+			}
+
+			if (Bots.ContainsKey(botNameToStart)) {
+				SendMessageToUser(steamID, "That bot instance is already running!");
+				return;
+			}
+
+			new Bot(botNameToStart);
+			if (Bots.ContainsKey(botNameToStart)) {
+				SendMessageToUser(steamID, "Done!");
+			} else {
+				SendMessageToUser(steamID, "That bot instance failed to start, make sure that " + botNameToStart + ".xml config exists and bot is active!");
+			}
+		}
+
+		private async Task ResponseStop(ulong steamID, string botNameToShutdown) {
+			if (steamID == 0 || string.IsNullOrEmpty(botNameToShutdown)) {
+				return;
+			}
+
+			if (!Bots.ContainsKey(botNameToShutdown)) {
+				SendMessageToUser(steamID, "That bot instance is already inactive!");
+				return;
+			}
+
+			if (await Shutdown(botNameToShutdown).ConfigureAwait(false)) {
+				SendMessageToUser(steamID, "Done!");
+			} else {
+				SendMessageToUser(steamID, "That bot instance failed to shutdown!");
+			}
+		}
+
+
+
+
+
 		private void OnConnected(SteamClient.ConnectedCallback callback) {
 			if (callback == null) {
 				return;
@@ -275,17 +384,21 @@ namespace ArchiSteamFarm {
 			});
 		}
 
-		private void OnDisconnected(SteamClient.DisconnectedCallback callback) {
+		private async void OnDisconnected(SteamClient.DisconnectedCallback callback) {
 			if (callback == null) {
 				return;
 			}
 
+			if (!IsRunning) {
+				return;
+			}
+
 			if (SteamClient == null) {
 				return;
 			}
 
 			Logging.LogGenericWarning(BotName, "Disconnected from Steam, reconnecting...");
-			Thread.Sleep(TimeSpan.FromMilliseconds(CallbackSleep));
+			await Program.LimitSteamRequestsAsync().ConfigureAwait(false);
 			SteamClient.Connect();
 		}
 
@@ -302,7 +415,7 @@ namespace ArchiSteamFarm {
 				SteamID steamID = friend.SteamID;
 				switch (steamID.AccountType) {
 					case EAccountType.Clan:
-						//ArchiHandler.AcceptClanInvite(steamID);
+						ArchiHandler.DeclineClanInvite(steamID);
 						break;
 					default:
 						if (steamID == SteamMasterID) {
@@ -334,30 +447,52 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
-			if (message.Length == 17 && message[5] == '-' && message[11] == '-') {
+			if (IsValidCdKey(message)) {
 				ArchiHandler.RedeemKey(message);
-			}
-
-			switch (message) {
-				case "!farm":
-					await CardsFarmer.StartFarming().ConfigureAwait(false);
-					break;
-				case "!exit":
-					await Shutdown().ConfigureAwait(false);
-					break;
-			}
-		}
-
-		private void OnPersonaState(SteamFriends.PersonaStateCallback callback) {
-			if (callback == null) {
 				return;
 			}
 
-			SteamID steamID = callback.FriendID;
-			SteamID sourceSteamID = callback.SourceSteamID;
-			string steamNickname = callback.Name;
-			EPersonaState personaState = callback.State;
-			EClanRank clanRank = (EClanRank) callback.ClanRank;
+			if (!message.StartsWith("!")) {
+				return;
+			}
+
+			if (!message.Contains(" ")) {
+				switch (message) {
+					case "!exit":
+						await ShutdownAllBots().ConfigureAwait(false);
+						break;
+					case "!farm":
+						SendMessageToUser(steamID, "Please wait...");
+						await CardsFarmer.StartFarming().ConfigureAwait(false);
+						SendMessageToUser(steamID, "Done!");
+						break;
+					case "!restart":
+						await Program.Restart().ConfigureAwait(false);
+						break;
+					case "!status":
+						ResponseStatus(steamID);
+						break;
+					case "!stop":
+						await Shutdown().ConfigureAwait(false);
+						break;
+				}
+			} else {
+				string[] args = message.Split(' ');
+				switch (args[0]) {
+					case "!redeem":
+						ArchiHandler.RedeemKey(args[1]);
+						break;
+					case "!start":
+						ResponseStart(steamID, args[1]);
+						break;
+					case "!stop":
+						await ResponseStop(steamID, args[1]).ConfigureAwait(false);
+						break;
+					case "!status":
+						ResponseStatus(steamID, args[1]);
+						break;
+				}
+			}
 		}
 
 		private void OnAccountInfo(SteamUser.AccountInfoCallback callback) {
@@ -389,6 +524,12 @@ namespace ArchiSteamFarm {
 				case EResult.AccountLoginDeniedNeedTwoFactor:
 					TwoFactorAuth = Program.GetUserInput(SteamLogin, Program.EUserInputType.TwoFactorAuthentication);
 					break;
+				case EResult.InvalidPassword:
+					Logging.LogGenericWarning(BotName, "Unable to login to Steam: " + result + ", will retry after a longer while");
+					await Stop().ConfigureAwait(false);
+					await Utilities.SleepAsync(25 * 1000).ConfigureAwait(false); // Steam removes requirement of captcha after around 20 minutes
+					await Start().ConfigureAwait(false);
+					break;
 				case EResult.OK:
 					Logging.LogGenericInfo(BotName, "Successfully logged on!");
 
@@ -416,13 +557,12 @@ namespace ArchiSteamFarm {
 					break;
 				case EResult.Timeout:
 				case EResult.TryAnotherCM:
-					Logging.LogGenericWarning(BotName, "Unable to login to Steam: " + callback.Result + " / " + callback.ExtendedResult + ", retrying...");
+					Logging.LogGenericWarning(BotName, "Unable to login to Steam: " + result + ", retrying...");
 					await Stop().ConfigureAwait(false);
-					Thread.Sleep(5000);
-					Start();
+					await Start().ConfigureAwait(false);
 					break;
 				default:
-					Logging.LogGenericWarning(BotName, "Unable to login to Steam: " + callback.Result + " / " + callback.ExtendedResult);
+					Logging.LogGenericWarning(BotName, "Unable to login to Steam: " + result);
 					await Shutdown().ConfigureAwait(false);
 					break;
 			}
@@ -484,7 +624,8 @@ namespace ArchiSteamFarm {
 			}
 
 			var purchaseResult = callback.PurchaseResult;
-			SteamFriends.SendChatMessage(SteamMasterID, EChatEntryType.ChatMsg, "Status: " + purchaseResult);
+			var items = callback.Items;
+			SendMessageToUser(SteamMasterID, "Status: " + purchaseResult + " | Items: " + string.Join("", items));
 
 			if (purchaseResult == ArchiHandler.PurchaseResponseCallback.EPurchaseResult.OK) {
 				await CardsFarmer.StartFarming().ConfigureAwait(false);

ArchiSteamFarm/CMsgClientClanInviteAction.cs

@@ -27,28 +27,21 @@ using SteamKit2.Internal;
 using System.IO;
 
 namespace ArchiSteamFarm {
-	/// <summary>
-	/// Message used to Accept or Decline a group(clan) invite.
-	/// </summary>
 	internal sealed class CMsgClientClanInviteAction : ISteamSerializableMessage, ISteamSerializable {
 		EMsg ISteamSerializableMessage.GetEMsg() {
 			return EMsg.ClientAcknowledgeClanInvite;
 		}
 
-		public CMsgClientClanInviteAction() {
-		}
-
-		/// <summary>
-		/// Group invited to.
-		/// </summary>
 		internal ulong GroupID = 0;
-
-		/// <summary>
-		/// To accept or decline the invite.
-		/// </summary>
 		internal bool AcceptInvite = true;
 
+		public CMsgClientClanInviteAction() { }
+
 		void ISteamSerializable.Serialize(Stream stream) {
+			if (stream == null) {
+				return;
+			}
+
 			try {
 				BinaryWriter binaryWriter = new BinaryWriter(stream);
 				binaryWriter.Write(GroupID);
@@ -59,6 +52,10 @@ namespace ArchiSteamFarm {
 		}
 
 		void ISteamSerializable.Deserialize(Stream stream) {
+			if (stream == null) {
+				return;
+			}
+
 			try {
 				BinaryReader binaryReader = new BinaryReader(stream);
 				GroupID = binaryReader.ReadUInt64();

ArchiSteamFarm/CardsFarmer.cs

@@ -23,24 +23,106 @@
 */
 
 using HtmlAgilityPack;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Globalization;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 
 namespace ArchiSteamFarm {
-	internal class CardsFarmer {
+	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
 
 		private readonly ManualResetEvent FarmResetEvent = new ManualResetEvent(false);
 		private readonly SemaphoreSlim Semaphore = new SemaphoreSlim(1);
 		private readonly Bot Bot;
 
+		internal readonly ConcurrentDictionary<uint, double> GamesToFarm = new ConcurrentDictionary<uint, double>();
+		internal readonly List<uint> CurrentGamesFarming = new List<uint>();
+
 		private volatile bool NowFarming = false;
 
 		internal CardsFarmer(Bot bot) {
 			Bot = bot;
 		}
 
+		internal static List<uint> GetGamesToFarmSolo(ConcurrentDictionary<uint, double> gamesToFarm) {
+			if (gamesToFarm == null) {
+				return null;
+			}
+
+			List<uint> result = new List<uint>();
+			foreach (KeyValuePair<uint, double> keyValue in gamesToFarm) {
+				if (keyValue.Value >= 2) {
+					result.Add(keyValue.Key);
+				}
+			}
+
+			return result;
+		}
+
+		internal static uint GetAnyGameToFarm(ConcurrentDictionary<uint, double> gamesToFarm) {
+			if (gamesToFarm == null) {
+				return 0;
+			}
+
+			foreach (uint appID in gamesToFarm.Keys) {
+				return appID;
+			}
+
+			return 0;
+		}
+
+		internal bool FarmMultiple() {
+			if (GamesToFarm == null || GamesToFarm.Count == 0) {
+				return true;
+			}
+
+			double maxHour = -1;
+
+			foreach (double hour in GamesToFarm.Values) {
+				if (hour > maxHour) {
+					maxHour = hour;
+				}
+			}
+
+			CurrentGamesFarming.Clear();
+			foreach (uint appID in GamesToFarm.Keys) {
+				CurrentGamesFarming.Add(appID);
+			}
+
+			Logging.LogGenericInfo(Bot.BotName, "Now farming: " + string.Join(", ", GamesToFarm.Keys));
+			if (Farm(maxHour, GamesToFarm.Keys)) {
+				return true;
+			} else {
+				CurrentGamesFarming.Clear();
+				NowFarming = false;
+				return false;
+			}
+		}
+
+		internal async Task<bool> FarmSolo(uint appID) {
+			if (appID == 0) {
+				return true;
+			}
+
+			CurrentGamesFarming.Clear();
+			CurrentGamesFarming.Add(appID);
+
+			Logging.LogGenericInfo(Bot.BotName, "Now farming: " + appID);
+			if (await Farm(appID).ConfigureAwait(false)) {
+				double hours;
+				GamesToFarm.TryRemove(appID, out hours);
+				return true;
+			} else {
+				CurrentGamesFarming.Clear();
+				NowFarming = false;
+				return false;
+			}
+		}
+
 		internal async Task StartFarming() {
 			await StopFarming().ConfigureAwait(false);
 
@@ -68,7 +150,6 @@ namespace ArchiSteamFarm {
 			}
 
 			// Find APPIDs we need to farm
-			List<uint> appIDs = new List<uint>();
 			for (var page = 1; page <= maxPages; page++) {
 				Logging.LogGenericInfo(Bot.BotName, "Checking page: " + page + "/" + maxPages);
 
@@ -84,16 +165,15 @@ namespace ArchiSteamFarm {
 					continue;
 				}
 
+				GamesToFarm.Clear();
 				foreach (HtmlNode badgesPageNode in badgesPageNodes) {
 					string steamLink = badgesPageNode.GetAttributeValue("href", null);
 					if (steamLink == null) {
-						Logging.LogGenericError(Bot.BotName, "Couldn't get steamLink for one of the games: " + badgesPageNode.OuterHtml);
 						continue;
 					}
 
 					uint appID = (uint) Utilities.OnlyNumbers(steamLink);
 					if (appID == 0) {
-						Logging.LogGenericError(Bot.BotName, "Couldn't get appID for one of the games: " + badgesPageNode.OuterHtml);
 						continue;
 					}
 
@@ -101,21 +181,90 @@ namespace ArchiSteamFarm {
 						continue;
 					}
 
-					appIDs.Add(appID);
+					// We assume that every game has at least 2 hours played, until we actually check them
+					GamesToFarm.AddOrUpdate(appID, 2, (key, value) => 2);
 				}
 			}
 
-			// Start farming
-			while (appIDs.Count > 0) {
-				Logging.LogGenericInfo(Bot.BotName, "Farming in progress...");
-				uint appID = appIDs[0];
-				if (await Farm(appID).ConfigureAwait(false)) {
-					appIDs.Remove(appID);
-				} else {
-					return;
+			// If we have restricted card drops, actually do check all games that are left to farm
+			if (Bot.CardDropsRestricted) {
+				foreach (uint appID in GamesToFarm.Keys) {
+					Logging.LogGenericInfo(Bot.BotName, "Checking hours of appID: " + appID);
+					HtmlDocument appPage = await Bot.ArchiWebHandler.GetGameCardsPage(appID).ConfigureAwait(false);
+					if (appPage == null) {
+						continue;
+					}
+
+					HtmlNode appNode = appPage.DocumentNode.SelectSingleNode("//div[@class='badge_title_stats_playtime']");
+					if (appNode == null) {
+						continue;
+					}
+
+					string hoursString = appNode.InnerText;
+					if (string.IsNullOrEmpty(hoursString)) {
+						continue;
+					}
+
+					hoursString = Regex.Match(hoursString, @"[0-9\.,]+").Value;
+					double hours;
+
+					if (string.IsNullOrEmpty(hoursString)) {
+						hours = 0;
+					} else {
+						hours = double.Parse(hoursString, CultureInfo.InvariantCulture);
+					}
+
+					GamesToFarm[appID] = hours;
 				}
 			}
 
+			Logging.LogGenericInfo(Bot.BotName, "Farming in progress...");
+
+			NowFarming = GamesToFarm.Count > 0;
+			Semaphore.Release();
+
+			// 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, which prioritizes farming solo titles >= 2 hours, then all at once, until any game hits mentioned 2 hours
+				Logging.LogGenericInfo(Bot.BotName, "Chosen farming algorithm: Complex");
+				while (GamesToFarm.Count > 0) {
+					List<uint> gamesToFarmSolo = GetGamesToFarmSolo(GamesToFarm);
+					if (gamesToFarmSolo.Count > 0) {
+						while (gamesToFarmSolo.Count > 0) {
+							uint appID = gamesToFarmSolo[0];
+							bool success = await FarmSolo(appID).ConfigureAwait(false);
+							if (success) {
+								Logging.LogGenericInfo(Bot.BotName, "Done farming: " + appID);
+								gamesToFarmSolo.Remove(appID);
+							} else {
+								return;
+							}
+						}
+					} else {
+						bool success = FarmMultiple();
+						if (success) {
+							Logging.LogGenericInfo(Bot.BotName, "Done farming: " + string.Join(", ", GamesToFarm.Keys));
+						} else {
+							return;
+						}
+					}
+				}
+			} else {
+				// If we have unrestricted card drops, we use simple algorithm and farm cards one-by-one
+				Logging.LogGenericInfo(Bot.BotName, "Chosen farming algorithm: Simple");
+				while (GamesToFarm.Count > 0) {
+					uint appID = GetAnyGameToFarm(GamesToFarm);
+					bool success = await FarmSolo(appID).ConfigureAwait(false);
+					if (success) {
+						Logging.LogGenericInfo(Bot.BotName, "Done farming: " + appID);
+					} else {
+						return;
+					}
+				}
+			}
+
+			CurrentGamesFarming.Clear();
+			NowFarming = false;
 			Logging.LogGenericInfo(Bot.BotName, "Farming finished!");
 			await Bot.OnFarmingFinished().ConfigureAwait(false);
 		}
@@ -132,7 +281,7 @@ namespace ArchiSteamFarm {
 			FarmResetEvent.Set();
 			while (NowFarming) {
 				Logging.LogGenericInfo(Bot.BotName, "Waiting for reaction...");
-				Thread.Sleep(1000);
+				await Utilities.SleepAsync(1000).ConfigureAwait(false);
 			}
 			FarmResetEvent.Reset();
 			Logging.LogGenericInfo(Bot.BotName, "Farming stopped!");
@@ -151,18 +300,14 @@ namespace ArchiSteamFarm {
 			return result;
 		}
 
-		private async Task<bool> Farm(ulong appID) {
+		private async Task<bool> Farm(uint appID) {
+			Bot.ArchiHandler.PlayGames(appID);
+
 			bool success = true;
+
 			bool? keepFarming = await ShouldFarm(appID).ConfigureAwait(false);
-			while (keepFarming == null || keepFarming.Value) {
-				if (!NowFarming) {
-					NowFarming = true;
-					Logging.LogGenericInfo(Bot.BotName, "Now farming: " + appID);
-					Bot.PlayGame(appID);
-					Semaphore.Release(); // We're farming, allow other tasks to shut us down
-				} else {
-					Logging.LogGenericInfo(Bot.BotName, "Still farming: " + appID);
-				}
+			for (ushort farmingTime = 0; farmingTime <= MaxFarmingTime && (!keepFarming.HasValue || keepFarming.Value); farmingTime += StatusCheckSleep) {
+				Logging.LogGenericInfo(Bot.BotName, "Still farming: " + appID);
 				if (FarmResetEvent.WaitOne(1000 * 60 * StatusCheckSleep)) {
 					success = false;
 					break;
@@ -170,10 +315,42 @@ namespace ArchiSteamFarm {
 				keepFarming = await ShouldFarm(appID).ConfigureAwait(false);
 			}
 
-			Bot.PlayGame(0);
-			NowFarming = false;
+			Bot.ArchiHandler.PlayGames(0);
 			Logging.LogGenericInfo(Bot.BotName, "Stopped farming: " + appID);
 			return success;
 		}
+
+		private bool Farm(double maxHour, ICollection<uint> appIDs) {
+			if (maxHour >= 2) {
+				return true;
+			}
+
+			Bot.ArchiHandler.PlayGames(appIDs);
+
+			bool success = true;
+			while (maxHour < 2) {
+				Logging.LogGenericInfo(Bot.BotName, "Still farming: " + string.Join(", ", appIDs));
+				if (FarmResetEvent.WaitOne(1000 * 60 * StatusCheckSleep)) {
+					success = false;
+					break;
+				}
+
+				// Don't forget to update our GamesToFarm hours
+				double timePlayed = StatusCheckSleep / 60.0;
+				foreach (KeyValuePair<uint, double> keyValue in GamesToFarm) {
+					if (!appIDs.Contains(keyValue.Key)) {
+						continue;
+					}
+
+					GamesToFarm[keyValue.Key] = keyValue.Value + timePlayed;
+				}
+
+				maxHour += timePlayed;
+			}
+
+			Bot.ArchiHandler.PlayGames(0);
+			Logging.LogGenericInfo(Bot.BotName, "Stopped farming: " + string.Join(", ", appIDs));
+			return success;
+		}
 	}
 }

ArchiSteamFarm/Debugging.cs

@@ -26,7 +26,8 @@ using System.Diagnostics;
 
 namespace ArchiSteamFarm {
 	internal static class Debugging {
-		internal static bool IsReleaseBuild { get; private set; } = true;
+		internal static bool IsDebugBuild { get; private set; } = false;
+		internal static bool IsReleaseBuild { get { return !IsDebugBuild; } }
 
 		static Debugging() {
 			MarkIfDebug();
@@ -34,7 +35,7 @@ namespace ArchiSteamFarm {
 
 		[Conditional("DEBUG")]
 		private static void MarkIfDebug() {
-			IsReleaseBuild = false;
+			IsDebugBuild = true;
 		}
 	}
 }

ArchiSteamFarm/Program.cs

@@ -39,18 +39,23 @@ namespace ArchiSteamFarm {
 			TwoFactorAuthentication,
 		}
 
-		internal const ulong ArchiSCFarmGroup = 103582791440160998;
-		internal const string ConfigDirectoryPath = "config";
 		private const string LatestGithubReleaseURL = "https://api.github.com/repos/JustArchi/ArchiSteamFarm/releases/latest";
 
-		internal static readonly object ConsoleLock = new object();
+		internal const ulong ArchiSCFarmGroup = 103582791440160998;
+		internal const string ConfigDirectoryPath = "config";
+
+		private static readonly SemaphoreSlim SteamSemaphore = new SemaphoreSlim(1);
 		private static readonly ManualResetEvent ShutdownResetEvent = new ManualResetEvent(false);
-		private static readonly AssemblyName AssemblyName = Assembly.GetExecutingAssembly().GetName();
-		private static readonly string ExeName = AssemblyName.Name + ".exe";
-		private static readonly string Version = AssemblyName.Version.ToString();
+		private static readonly Assembly Assembly = Assembly.GetExecutingAssembly();
+		private static readonly string ExecutablePath = Assembly.Location;
+		private static readonly AssemblyName AssemblyName = Assembly.GetName();
+		//private static readonly string ExeName = AssemblyName.Name + ".exe";
+
+		internal static readonly string Version = AssemblyName.Version.ToString();
+		internal static readonly object ConsoleLock = new object();
 
 		private static async Task CheckForUpdate() {
-			JObject response = await Utilities.UrlToJObject(LatestGithubReleaseURL).ConfigureAwait(false);
+			JObject response = await WebBrowser.UrlGetToJObject(LatestGithubReleaseURL).ConfigureAwait(false);
 			if (response == null) {
 				return;
 			}
@@ -66,11 +71,11 @@ namespace ArchiSteamFarm {
 			Logging.LogGenericNotice("", "Remote version: " + remoteVersion);
 
 			int comparisonResult = localVersion.CompareTo(remoteVersion);
-			if (localVersion.CompareTo(remoteVersion) < 0) {
+			if (comparisonResult < 0) {
 				Logging.LogGenericNotice("", "New version is available!");
 				Logging.LogGenericNotice("", "Consider updating yourself!");
-				Thread.Sleep(5000);
-			} else if (localVersion.CompareTo(remoteVersion) > 0) {
+				await Utilities.SleepAsync(5000).ConfigureAwait(false);
+			} else if (comparisonResult > 0) {
 				Logging.LogGenericNotice("", "You're currently using pre-release version!");
 				Logging.LogGenericNotice("", "Be careful!");
 			}
@@ -81,6 +86,18 @@ namespace ArchiSteamFarm {
 			Environment.Exit(exitCode);
 		}
 
+		internal static async Task Restart() {
+			await Bot.ShutdownAllBots().ConfigureAwait(false);
+			System.Diagnostics.Process.Start(ExecutablePath);
+			Environment.Exit(0);
+		}
+
+		internal static async Task LimitSteamRequestsAsync() {
+			await SteamSemaphore.WaitAsync().ConfigureAwait(false);
+			await Utilities.SleepAsync(5 * 1000).ConfigureAwait(false); // We must add some delay to not get caught by Steam anty-DoS
+			SteamSemaphore.Release();
+		}
+
 		internal static string GetUserInput(string botLogin, EUserInputType userInputType) {
 			string result;
 			lock (ConsoleLock) {
@@ -104,22 +121,39 @@ namespace ArchiSteamFarm {
 				result = Console.ReadLine();
 				Console.Clear(); // For security purposes
 			}
+			result = result.Trim(); // Get rid of all whitespace characters
 			return result;
 		}
 
-		internal static void OnBotShutdown(Bot bot) {
+		internal static async void OnBotShutdown(Bot bot) {
 			if (Bot.GetRunningBotsCount() == 0) {
 				Logging.LogGenericInfo("Main", "No bots are running, exiting");
-				Thread.Sleep(5000); // This might be the only message user gets, consider giving him some time
+				await Utilities.SleepAsync(5000).ConfigureAwait(false); // This might be the only message user gets, consider giving him some time
 				ShutdownResetEvent.Set();
 			}
 		}
 
+		private static void InitServices() {
+			WebBrowser.Init();
+		}
+
 		private static void Main(string[] args) {
 			Logging.LogGenericInfo("Main", "Archi's Steam Farm, version " + Version);
 
+			InitServices();
+
 			Task.Run(async () => await CheckForUpdate().ConfigureAwait(false)).Wait();
 
+			// Allow loading configs from source tree if it's a debug build
+			if (Debugging.IsDebugBuild) {
+				for (var i = 0; i < 4; i++) {
+					Directory.SetCurrentDirectory("..");
+					if (Directory.Exists(ConfigDirectoryPath)) {
+						break;
+					}
+				}
+			}
+
 			if (!Directory.Exists(ConfigDirectoryPath)) {
 				Logging.LogGenericError("Main", "Config directory doesn't exist!");
 				Console.ReadLine();

ArchiSteamFarm/Properties/AssemblyInfo.cs

@@ -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("0.5.0.0")]
-[assembly: AssemblyFileVersion("0.5.0.0")]
+[assembly: AssemblyVersion("0.8.0.0")]
+[assembly: AssemblyFileVersion("0.8.0.0")]

ArchiSteamFarm/Trading.cs

@@ -36,33 +36,32 @@ namespace ArchiSteamFarm {
 			Bot = bot;
 		}
 
-		internal void CheckTrades() {
+		internal async void CheckTrades() {
 			if (ParsingTasks < 2) {
 				ParsingTasks++;
-				Task.Run(() => ParseActiveTrades());
+
+				await Semaphore.WaitAsync().ConfigureAwait(false);
+				await ParseActiveTrades().ConfigureAwait(false);
+				Semaphore.Release();
+
+				ParsingTasks--;
 			}
 		}
 
 		private async Task ParseActiveTrades() {
-			await Semaphore.WaitAsync().ConfigureAwait(false);
-
 			List<SteamTradeOffer> tradeOffers = Bot.ArchiWebHandler.GetTradeOffers();
-			if (tradeOffers != null) {
-				List<Task> tasks = new List<Task>();
-				foreach (SteamTradeOffer tradeOffer in tradeOffers) {
-					if (tradeOffer.trade_offer_state == SteamTradeOffer.ETradeOfferState.Active) {
-						Task task = Task.Run(async () => {
-							await ParseTrade(tradeOffer).ConfigureAwait(false);
-						});
-						tasks.Add(task);
-					}
-				}
-
-				await Task.WhenAll(tasks).ConfigureAwait(false);
+			if (tradeOffers == null) {
+				return;
 			}
 
-			ParsingTasks--;
-			Semaphore.Release();
+			List<Task> tasks = new List<Task>();
+			foreach (SteamTradeOffer tradeOffer in tradeOffers) {
+				if (tradeOffer.trade_offer_state == SteamTradeOffer.ETradeOfferState.Active) {
+					tasks.Add(Task.Run(async () => await ParseTrade(tradeOffer).ConfigureAwait(false)));
+				}
+			}
+
+			await Task.WhenAll(tasks).ConfigureAwait(false);
 		}
 
 		private async Task ParseTrade(SteamTradeOffer tradeOffer) {

ArchiSteamFarm/Utilities.cs

@@ -22,19 +22,27 @@
 
 */
 
-using HtmlAgilityPack;
-using Newtonsoft.Json.Linq;
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Net;
-using System.Net.Http;
-using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
 namespace ArchiSteamFarm {
 	internal static class Utilities {
+		private static readonly Random Random = new Random();
+
+		internal static int RandomNumber(int min, int max) {
+			return Random.Next(min, max + 1);
+		}
+
+		internal static byte RandomDice() {
+			return (byte) RandomNumber(1, 6);
+		}
+
+		internal static async Task SleepAsync(int miliseconds) {
+			await Task.Delay(miliseconds).ConfigureAwait(false);
+		}
+
 		internal static ulong OnlyNumbers(string inputString) {
 			if (string.IsNullOrEmpty(inputString)) {
 				return 0;
@@ -51,161 +59,5 @@ namespace ArchiSteamFarm {
 
 			return ulong.Parse(resultString, CultureInfo.InvariantCulture);
 		}
-
-		internal static async Task<HttpResponseMessage> UrlToHttpResponse(string websiteAddress, Dictionary<string, string> cookieVariables = null) {
-			if (string.IsNullOrEmpty(websiteAddress)) {
-				return null;
-			}
-
-			HttpResponseMessage result = null;
-
-			try {
-				using (HttpClientHandler clientHandler = new HttpClientHandler { UseCookies = false }) {
-					using (HttpClient client = new HttpClient(clientHandler)) {
-						client.Timeout = TimeSpan.FromSeconds(10);
-						client.DefaultRequestHeaders.UserAgent.ParseAdd("ArchiSteamFarm/1.0");
-						HttpRequestMessage requestMessage = new HttpRequestMessage(HttpMethod.Get, websiteAddress);
-						if (cookieVariables != null) {
-							StringBuilder cookie = new StringBuilder();
-							foreach (KeyValuePair<string, string> cookieVariable in cookieVariables) {
-								cookie.Append(cookieVariable.Key + "=" + cookieVariable.Value + ";");
-							}
-							requestMessage.Headers.Add("Cookie", cookie.ToString());
-						}
-						HttpResponseMessage responseMessage = await client.SendAsync(requestMessage).ConfigureAwait(false);
-						if (responseMessage != null) {
-							responseMessage.EnsureSuccessStatusCode();
-							result = responseMessage;
-						}
-					}
-				}
-			} catch (Exception e) {
-				Logging.LogGenericException("Utilities", e);
-			}
-
-			return result;
-		}
-
-		internal static async Task<HtmlDocument> UrlToHtmlDocument(string websiteAddress, Dictionary<string, string> cookieVariables = null) {
-			if (string.IsNullOrEmpty(websiteAddress)) {
-				return null;
-			}
-
-			HtmlDocument result = null;
-
-			try {
-				HttpResponseMessage responseMessage = await UrlToHttpResponse(websiteAddress, cookieVariables).ConfigureAwait(false);
-				if (responseMessage != null) {
-					string source = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false);
-					if (!string.IsNullOrEmpty(source)) {
-						source = WebUtility.HtmlDecode(source);
-						result = new HtmlDocument();
-						result.LoadHtml(source);
-					}
-				}
-			} catch (Exception e) {
-				Logging.LogGenericException("Utilities", e);
-			}
-
-			return result;
-		}
-
-		internal static async Task<bool> UrlPostRequest(string request, Dictionary<string, string> postData, Dictionary<string, string> cookieVariables = null, string referer = null) {
-			if (string.IsNullOrEmpty(request) || postData == null) {
-				return false;
-			}
-
-			bool result = false;
-
-			try {
-				using (HttpClientHandler clientHandler = new HttpClientHandler { UseCookies = false }) {
-					using (HttpClient client = new HttpClient(clientHandler)) {
-						client.Timeout = TimeSpan.FromSeconds(10);
-						client.DefaultRequestHeaders.UserAgent.ParseAdd("ArchiSteamFarm/1.0");
-						HttpRequestMessage requestMessage = new HttpRequestMessage(HttpMethod.Post, request);
-						requestMessage.Content = new FormUrlEncodedContent(postData);
-						if (cookieVariables != null && cookieVariables.Count > 0) {
-							StringBuilder cookie = new StringBuilder();
-							foreach (KeyValuePair<string, string> cookieVariable in cookieVariables) {
-								cookie.Append(cookieVariable.Key + "=" + cookieVariable.Value + ";");
-							}
-							requestMessage.Headers.Add("Cookie", cookie.ToString());
-						}
-						if (referer != null) {
-							requestMessage.Headers.Referrer = new Uri(referer);
-						}
-						HttpResponseMessage responseMessage = await client.SendAsync(requestMessage).ConfigureAwait(false);
-						if (responseMessage != null) {
-							result = responseMessage.IsSuccessStatusCode;
-						}
-					}
-				}
-			} catch (Exception e) {
-				Logging.LogGenericException("Utilities", e);
-			}
-
-			return result;
-		}
-
-		internal static async Task<HttpResponseMessage> UrlPostRequestWithResponse(string request, Dictionary<string, string> postData, Dictionary<string, string> cookieVariables = null, string referer = null) {
-			if (string.IsNullOrEmpty(request) || postData == null) {
-				return null;
-			}
-
-			HttpResponseMessage result = null;
-
-			try {
-				using (HttpClientHandler clientHandler = new HttpClientHandler { UseCookies = false }) {
-					using (HttpClient client = new HttpClient(clientHandler)) {
-						client.Timeout = TimeSpan.FromSeconds(10);
-						client.DefaultRequestHeaders.UserAgent.ParseAdd("ArchiSteamFarm/1.0");
-						HttpRequestMessage requestMessage = new HttpRequestMessage(HttpMethod.Post, request);
-						requestMessage.Content = new FormUrlEncodedContent(postData);
-						if (cookieVariables != null && cookieVariables.Count > 0) {
-							StringBuilder cookie = new StringBuilder();
-							foreach (KeyValuePair<string, string> cookieVariable in cookieVariables) {
-								cookie.Append(cookieVariable.Key + "=" + cookieVariable.Value + ";");
-							}
-							requestMessage.Headers.Add("Cookie", cookie.ToString());
-						}
-						if (referer != null) {
-							requestMessage.Headers.Referrer = new Uri(referer);
-						}
-						HttpResponseMessage responseMessage = await client.SendAsync(requestMessage).ConfigureAwait(false);
-						if (responseMessage != null) {
-							result = responseMessage;
-						}
-					}
-				}
-			} catch (Exception e) {
-				Logging.LogGenericException("Utilities", e);
-			}
-
-			return result;
-		}
-
-		internal static async Task<JObject> UrlToJObject(string request) {
-			if (string.IsNullOrEmpty(request)) {
-				return null;
-			}
-
-			HttpResponseMessage httpResponseMessage = await UrlToHttpResponse(request, null).ConfigureAwait(false);
-			if (httpResponseMessage == null) {
-				return null;
-			}
-
-			string source = await httpResponseMessage.Content.ReadAsStringAsync().ConfigureAwait(false);
-			if (string.IsNullOrEmpty(source)) {
-				return null;
-			}
-
-			JObject result = null;
-			try {
-				result = JObject.Parse(source);
-			} catch {
-			}
-
-			return result;
-		}
 	}
 }

ArchiSteamFarm/WebBrowser.cs

@@ -0,0 +1,220 @@
+using HtmlAgilityPack;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml;
+
+namespace ArchiSteamFarm {
+	internal static class WebBrowser {
+		internal const byte HttpTimeout = 180; // In seconds
+
+		private static readonly HttpClientHandler HttpClientHandler = new HttpClientHandler { UseCookies = false };
+		private static readonly HttpClient HttpClient = new HttpClient(HttpClientHandler) { Timeout = TimeSpan.FromSeconds(HttpTimeout) };
+
+		internal static void Init() {
+			HttpClient.DefaultRequestHeaders.UserAgent.ParseAdd("ArchiSteamFarm/" + Program.Version);
+		}
+
+		private static async Task<HttpResponseMessage> UrlRequest(string request, HttpMethod httpMethod, Dictionary<string, string> data = null, Dictionary<string, string> cookies = null, string referer = null) {
+			if (string.IsNullOrEmpty(request) || httpMethod == null) {
+				return null;
+			}
+
+			HttpRequestMessage requestMessage = new HttpRequestMessage(httpMethod, request);
+
+			if (httpMethod == HttpMethod.Post && data != null) {
+				requestMessage.Content = new FormUrlEncodedContent(data);
+			}
+
+			if (cookies != null && cookies.Count > 0) {
+				StringBuilder cookieHeader = new StringBuilder();
+				foreach (KeyValuePair<string, string> cookie in cookies) {
+					cookieHeader.Append(cookie.Key + "=" + cookie.Value + ";");
+				}
+				requestMessage.Headers.Add("Cookie", cookieHeader.ToString());
+			}
+
+			if (referer != null) {
+				requestMessage.Headers.Referrer = new Uri(referer);
+			}
+
+			HttpResponseMessage responseMessage;
+
+			try {
+				responseMessage = await HttpClient.SendAsync(requestMessage).ConfigureAwait(false);
+			} catch { // Request failed, we don't need to know the exact reason, swallow exception
+				return null;
+			}
+
+			if (responseMessage == null || !responseMessage.IsSuccessStatusCode) {
+				return null;
+			}
+
+			if (!responseMessage.IsSuccessStatusCode) {
+				return null;
+			}
+
+			return responseMessage;
+		}
+
+		internal static async Task<HttpResponseMessage> UrlGet(string request, Dictionary<string, string> cookies = null, string referer = null) {
+			if (string.IsNullOrEmpty(request)) {
+				return null;
+			}
+
+			return await UrlRequest(request, HttpMethod.Get, null, cookies, referer).ConfigureAwait(false);
+		}
+
+		internal static async Task<HttpResponseMessage> UrlPost(string request, Dictionary<string, string> postData = null, Dictionary<string, string> cookies = null, string referer = null) {
+			if (string.IsNullOrEmpty(request)) {
+				return null;
+			}
+
+			return await UrlRequest(request, HttpMethod.Post, postData, cookies, referer).ConfigureAwait(false);
+		}
+
+		internal static async Task<HtmlDocument> HttpResponseToHtmlDocument(HttpResponseMessage httpResponse) {
+			if (httpResponse == null || httpResponse.Content == null) {
+				return null;
+			}
+
+			string content = await httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+			if (string.IsNullOrEmpty(content)) {
+				return null;
+			}
+
+			content = WebUtility.HtmlDecode(content);
+			HtmlDocument htmlDocument = new HtmlDocument();
+			htmlDocument.LoadHtml(content);
+
+			return htmlDocument;
+		}
+
+		internal static async Task<string> UrlGetToContent(string request, Dictionary<string, string> cookies = null, string referer = null) {
+			if (string.IsNullOrEmpty(request)) {
+				return null;
+			}
+
+			HttpResponseMessage responseMessage = await UrlGet(request, cookies, referer).ConfigureAwait(false);
+			if (responseMessage == null || responseMessage.Content == null) {
+				return null;
+			}
+
+			return await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false);
+		}
+
+		internal static async Task<string> UrlPostToContent(string request, Dictionary<string, string> postData = null, Dictionary<string, string> cookies = null, string referer = null) {
+			if (string.IsNullOrEmpty(request)) {
+				return null;
+			}
+
+			HttpResponseMessage responseMessage = await UrlPost(request, postData, cookies, referer).ConfigureAwait(false);
+			if (responseMessage == null || responseMessage.Content == null) {
+				return null;
+			}
+
+			return await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false);
+		}
+
+		internal static async Task<string> UrlGetToTitle(string request, Dictionary<string, string> cookies = null, string referer = null) {
+			if (string.IsNullOrEmpty(request)) {
+				return null;
+			}
+
+			HtmlDocument htmlDocument = await UrlGetToHtmlDocument(request, cookies, referer).ConfigureAwait(false);
+			if (htmlDocument == null) {
+				return null;
+			}
+
+			HtmlNode htmlNode = htmlDocument.DocumentNode.SelectSingleNode("//head/title");
+			if (htmlNode == null) {
+				return null;
+			}
+
+			return htmlNode.InnerText;
+		}
+
+		internal static async Task<HtmlDocument> UrlGetToHtmlDocument(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;
+			}
+
+			return await HttpResponseToHtmlDocument(httpResponse).ConfigureAwait(false);
+		}
+
+		internal static async Task<JArray> UrlGetToJArray(string request, Dictionary<string, string> cookies = null, string referer = null) {
+			if (string.IsNullOrEmpty(request)) {
+				return null;
+			}
+
+			string content = await UrlGetToContent(request, cookies, referer).ConfigureAwait(false);
+			if (string.IsNullOrEmpty(content)) {
+				return null;
+			}
+
+			JArray jArray;
+
+			try {
+				jArray = JArray.Parse(content);
+			} catch (Exception e) {
+				Logging.LogGenericException("WebBrowser", e);
+				return null;
+			}
+
+			return jArray;
+		}
+
+		internal static async Task<JObject> UrlGetToJObject(string request, Dictionary<string, string> cookies = null, string referer = null) {
+			if (string.IsNullOrEmpty(request)) {
+				return null;
+			}
+
+			string content = await UrlGetToContent(request, cookies, referer).ConfigureAwait(false);
+			if (string.IsNullOrEmpty(content)) {
+				return null;
+			}
+
+			JObject jObject;
+
+			try {
+				jObject = JObject.Parse(content);
+			} catch (Exception e) {
+				Logging.LogGenericException("WebBrowser", e);
+				return null;
+			}
+
+			return jObject;
+		}
+
+		internal static async Task<XmlDocument> UrlGetToXML(string request, Dictionary<string, string> cookies = null, string referer = null) {
+			if (string.IsNullOrEmpty(request)) {
+				return null;
+			}
+
+			string content = await UrlGetToContent(request, cookies, referer).ConfigureAwait(false);
+			if (string.IsNullOrEmpty(content)) {
+				return null;
+			}
+
+			XmlDocument xmlDocument = new XmlDocument();
+
+			try {
+				xmlDocument.LoadXml(content);
+			} catch (XmlException e) {
+				Logging.LogGenericException("WebBrowser", e);
+				return null;
+			}
+
+			return xmlDocument;
+		}
+	}
+}

ArchiSteamFarm/config/example.xml

@@ -1,53 +1,66 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <configuration>
+	<!-- Every bot should have it's own unique .xml configuration file, this is example on which you can base on -->
 
-<!-- Every bot should have it's own unique .xml configuration file, this is example on which you can base on -->
+	<!-- 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;" -->
 
-<!-- Master switch to turn account on and off, set to "true" after you're done -->
-<!-- TIP: This bot instance won't run unless below switch is set to "true" -->
-<Enabled type="bool" value="false"/>
+	<!-- Master switch to turn account on and off, set to "true" after you're done -->
+	<!-- TIP: 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 -->
-<!-- TIP: You can use "null" if you wish to enter login on every startup -->
-<SteamLogin type="string" value="null"/>
+	<!-- This is your steam login, the one you use for logging in to steam -->
+	<!-- TIP: 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 -->
-<!-- TIP: You can use "null" if you wish to enter password on every startup -->
-<SteamPassword type="string" value="null"/>
+	<!-- This is your steam password, the one you use for logging in to steam -->
+	<!-- TIP: 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 -->
-<!-- TIP: You can use "null" if you wish to preserve your actual nickname -->
-<SteamNickname type="string" value="null"/>
+	<!-- This is steam nickname, the one you want to use for bot. Can be anything up to 32 characters -->
+	<!-- TIP: You can use "null" if you wish to preserve your actual nickname -->
+	<SteamNickname type="string" value="null"/>
 
-<!-- This is your bot's API key, get one at https://steamcommunity.com/dev/apikey while logged in as bot, domain doesn't matter -->
-<!-- TIP: You can use "null", but it will disable all API-based functionalities such as trading -->
-<SteamApiKey type="string" value="null"/>
+	<!-- This is your bot's API key, get one at https://steamcommunity.com/dev/apikey while logged in as bot, domain doesn't matter -->
+	<!-- TIP: You can use "null", but it will disable all API-based functionalities such as trading -->
+	<SteamApiKey type="string" value="null"/>
 
-<!-- This is your parental PIN if you use steam parental functionality -->
-<!-- TIP: 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 -->
-<SteamParentalPIN type="string" value="0"/>
+	<!-- This is your parental PIN if you use steam parental functionality -->
+	<!-- TIP: 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 -->
+	<SteamParentalPIN type="string" value="0"/>
 
-<!-- This is steamID of the bot-master - you, in steamID64 format -->
-<!-- TIP: You can use "0", but bot won't accept steam cd-keys or trades from anybody" -->
-<SteamMasterID type="ulong" value="76561198006963719"/>
+	<!-- This is steamID64 of the bot-master - you, [Example: 76561198006963719] -->
+	<!-- TIP: You can use "0", but bot won't accept steam cd-keys or trades from anybody" -->
+	<SteamMasterID type="ulong" value="0"/>
 
-<!-- This defines clan of the master, bot will join chatroom of that clan automatically after logging in -->
-<!-- TIP: Most likely you don't want to change it -->
-<SteamMasterClanID type="ulong" value="0"/>
+	<!-- This defines clan of the master, bot will join chatroom of that clan automatically after logging in if set -->
+	<!-- SteamMasterClanID could be found by visiting your group-page  -->
+	<!-- [Example: http://steamcommunity.com/groups/hellokitty/] -->
+	<!-- Adding "memberslistxml/?xml=1" to the end of this url so it looks like -->
+	<!-- [Example: http://steamcommunity.com/groups/hellokitty/memberslistxml/?xml=1] -->
+	<!-- Finally replace the SteamMasterClanID value with groupID64 you got from your groups xml-file -->
+	<!-- TIP: Most likely you don't want to change it -->
+	<SteamMasterClanID type="ulong" value="0"/>
 
-<!-- This switch defines if bot should disconnect once farming is finished -->
-<!-- When no bots are active, ASF will shutdown as well -->
-<!-- Some people may want to keep their bots 24/7, other disconnect them after job is done -->
-<!-- Choose yourself what you prefer -->
-<ShutdownOnFarmingFinished 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 -->
+	<!-- As there is no magical way to detect it by ASF, I made this option config-based switch -->
+	<!-- TIP: Based on this parameter, ASF will try to choose the most optimized cards farming algorithm for this account -->
+	<CardDropsRestricted type="bool" value="false"/>
 
-<!-- Comma-separated list of IDs that should not be considered for farming -->
-<!-- TIP: Most likely you don't want to change it -->
-<Blacklist type="HashSet(uint)" value="368020"/>
+	<!-- This switch defines if bot should disconnect once farming is finished -->
+	<!-- When no bots are active, ASF will shutdown as well -->
+	<!-- Some people may want to keep their bots 24/7, other disconnect them after job is done -->
+	<!-- Choose yourself what you prefer -->
+	<ShutdownOnFarmingFinished type="bool" value="false"/>
 
-<!-- This enables statistics for me - bot will join Archi's SC Farm group and chat -->
-<!-- Consider leaving it at "true", this way I can check how many running bots are active -->
-<!-- TIP: Group link is http://steamcommunity.com/groups/ascfarm -->
-<Statistics type="bool" value="true"/>
+	<!-- Comma-separated list of IDs that should not be considered for farming -->
+	<!-- TIP: Most likely you don't want to change it -->
+	<Blacklist type="HashSet(uint)" value="303700,335590,368020"/>
 
-</configuration>
+	<!-- This enables statistics for me - bot will join Archi's SC Farm group and chat -->
+	<!-- Consider leaving it at "true", this way I can check how many running bots are active -->
+	<!-- TIP: Group link is http://steamcommunity.com/groups/ascfarm -->
+	<Statistics type="bool" value="true"/>
+</configuration>

ArchiSteamFarm/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="HtmlAgilityPack" version="1.4.9" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="8.0.1-beta1" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="8.0.1-beta3" targetFramework="net45" />
   <package id="protobuf-net" version="2.0.0.668" targetFramework="net45" />
   <package id="SteamKit2" version="1.6.5" targetFramework="net45" />
 </packages>

README.md

@@ -1,26 +1,53 @@
-# ArchiSteamFarm
+ArchiSteamFarm
+===================
 
-Big work-in-progress
+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).
 
-Allows you to farm steam cards using multiple accounts simultaneously.
+**Core features:**
 
-Each account is defined by it's own XML config in "config" directory.
+ - Automatically farm available games using any number of active accounts
+ - Automatically accept friend requests sent from master
+ - Automatically accept all trades coming from master
+ - Automatically accept all steam cd-keys sent via chat from master
+ - Possibility to choose the most efficient cards farming algorithm, based on given account
+ - SteamGuard / SteamParental / 2FA support
+ - Update notifications
+ - Full Mono support, cross-OS compatibility
 
-Current functions:
-- Does not need Steam client running, or even a GUI. Fully based on SteamKit2 and reverse-engineered Steam protocol.
-- Automatically farm steam cards using any number of active accounts
-- Automatically accept friend requests sent from master
-- Automatically accept all trades coming from master
-- Automatically accept all steam cd-keys sent via chat from master
-- SteamGuard / 2-factor-authentication support
-- Full Mono support, tested on Debian "9.0" Stretch (testing)
+**Setting up:**
 
-TODO:
-- Smart multi-games farming till every game reaches 2 hours, then one-by-one (similar to Idle Master) - Backend code is already here, just missing the logic and tests.
-- Possible integration with SteamTradeMatcher, bot can detect dupes and trade them automatically. Again, backend code is already here, just missing actual implementation.
-- Automatic sending of steam trades to master, after game is fully farmed.
-- Probably much more
+Each ASF bot is defined in it's own XML config file in `config` directory. ASF comes with included ```example.xml``` config file, on which you should base all of your bots. Simply copy ```example.xml``` to a new file, and edit properties inside. Don't forget to switch ```Enabled``` property to ```true``` once you're done, as this is the master switch which enables configured bot to launch.
 
-This is big WIP, so feel free to send pull requests if you wish.
+ASF expects exclusive access to all steam accounts it's using, which means that you should not use the account which is currently being used by ASF at the same time. You may however ```!start``` and ```!stop``` bots during farming, as well as use config property such as ```ShutdownOnFarmingFinished``` which will automatically release account after farming is done.
 
-I'll release some releases later, when everything is tested and code cleaned up.
+After you set up all your bots (their configs), you should launch ```ASF.exe```. If your accounts require additional steps to unlock, such as Steam guard code, you'll need to enter those too after ASF tries to launch given bot. If everything ended properly, you should notice in the console output, as well as on your Steam, that all of your bots automatically started cards farming.
+
+ASF doesn't require and doesn't interfere in any way with Steam client, which means that you can be logged in to Steam client as your primary account with e.g. Idle Master in the background, and launch ASF for all other accounts (your alts) at the same time.
+
+**Current Commands:**
+
+ - `!exit` Stops whole ASF
+ - `!farm` Restarts cards farming module. ASF automatically executes that if any cd-key is successfully claimed
+ - `!redeem <KEY>` Redeems cd-key on current bot instance. You can also paste cd-key directly to the chat
+ - `!start <BOT>` Starts given bot instance, after it was ```!stop```pped
+ - `!status` Prints current status of ASF
+ - `!stop` Stops current bot instance
+ - `!stop <BOT>` Stops given bot instance
+
+> Commands can be executed via a private chat with your bot.
+> Remember that bot accepts commands only from ```SteamMasterID```. That property can be configured in the config.
+
+**Supported / Tested Operating-Systems:**
+
+ - Windows 10 Professional/Enterprise Edition (Native)
+ - Windows 8.1 Professional (Native)
+ - Windows 7 Ultimate (Native)
+ - Debian 9.0 Stretch (Mono)
+ - Debian 8.1 Jessie (Mono)
+ - OS X 10.11.1 (Mono)
+ 
+However, any operating system [listed here](http://www.mono-project.com/docs/about-mono/supported-platforms/) should run ASF flawlessly.
+
+**Need help or more info?**
+
+Head over to our [wiki](https://github.com/JustArchi/ArchiSteamFarm/wiki) then.

packages/Newtonsoft.Json.8.0.1-beta3/lib/net20/Newtonsoft.Json.xml

@@ -106,7 +106,7 @@
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
+            <returns>A <see cref="T:System.Nullable`1"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
         <member name="M:Newtonsoft.Json.Bson.BsonReader.Read">
             <summary>
@@ -926,6 +926,25 @@
             Causes child objects to be indented according to the <see cref="P:Newtonsoft.Json.JsonTextWriter.Indentation"/> and <see cref="P:Newtonsoft.Json.JsonTextWriter.IndentChar"/> settings.
             </summary>
         </member>
+        <member name="T:Newtonsoft.Json.IJsonBufferPool`1">
+            <summary>
+            Provides an interface for using pooled buffers.
+            </summary>
+            <typeparam name="T">The buffer type content.</typeparam>
+        </member>
+        <member name="M:Newtonsoft.Json.IJsonBufferPool`1.RentBuffer(System.Int32)">
+            <summary>
+            Rent a buffer from the pool. This buffer must be returned when it is no longer needed.
+            </summary>
+            <param name="minSize">The minimum required size of the buffer. The returned buffer may be larger.</param>
+            <returns>The rented buffer from the pool.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.IJsonBufferPool`1.ReturnBuffer(`0[]@)">
+            <summary>
+            Return a buffer to the pool.
+            </summary>
+            <param name="buffer">The buffer that is being returned.</param>
+        </member>
         <member name="T:Newtonsoft.Json.JsonConstructorAttribute">
             <summary>
             Instructs the <see cref="T:Newtonsoft.Json.JsonSerializer"/> to use the specified constructor when deserializing that object.
@@ -1028,6 +1047,21 @@
             Load comments as a <see cref="T:Newtonsoft.Json.Linq.JValue"/> with type <see cref="F:Newtonsoft.Json.Linq.JTokenType.Comment"/>.
             </summary>
         </member>
+        <member name="T:Newtonsoft.Json.Linq.LineInfoHandling">
+            <summary>
+            Specifies how line information is handled when loading JSON.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.LineInfoHandling.Ignore">
+            <summary>
+            Ignore line information.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.LineInfoHandling.Load">
+            <summary>
+            Load line information.
+            </summary>
+        </member>
         <member name="T:Newtonsoft.Json.Linq.JsonLoadSettings">
             <summary>
             Specifies the settings used when loading JSON.
@@ -1039,6 +1073,12 @@
             </summary>
             <value>The JSON comment handling.</value>
         </member>
+        <member name="P:Newtonsoft.Json.Linq.JsonLoadSettings.LineInfoHandling">
+            <summary>
+            Gets or sets how JSON line info is handled when loading JSON.
+            </summary>
+            <value>The JSON line info handling.</value>
+        </member>
         <member name="T:Newtonsoft.Json.Linq.JsonMergeSettings">
             <summary>
             Specifies the settings used when merging JSON.
@@ -2167,7 +2207,7 @@
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
+            <returns>A <see cref="T:System.Nullable`1"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
         <member name="M:Newtonsoft.Json.Linq.JTokenReader.Read">
             <summary>
@@ -6074,6 +6114,11 @@
             The property must be defined in JSON and cannot be a null value.
             </summary>
         </member>
+        <member name="F:Newtonsoft.Json.Required.DisallowNull">
+            <summary>
+            The property is not required but it cannot be a null value.
+            </summary>
+        </member>
         <member name="T:Newtonsoft.Json.PreserveReferencesHandling">
             <summary>
             Specifies reference handling options for the <see cref="T:Newtonsoft.Json.JsonSerializer"/>.
@@ -6620,7 +6665,7 @@
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
+            <returns>A <see cref="T:System.Nullable`1"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
         <member name="M:Newtonsoft.Json.JsonValidatingReader.Read">
             <summary>
@@ -6685,6 +6730,11 @@
             </summary>
             <param name="reader">The <c>TextReader</c> containing the XML data to read.</param>
         </member>
+        <member name="P:Newtonsoft.Json.JsonTextReader.BufferPool">
+            <summary>
+            Gets or sets the reader's character buffer pool.
+            </summary>
+        </member>
         <member name="M:Newtonsoft.Json.JsonTextReader.Read">
             <summary>
             Reads the next JSON token from the stream.
@@ -6723,7 +6773,7 @@
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
+            <returns>A <see cref="T:System.Nullable`1"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
         <member name="M:Newtonsoft.Json.JsonTextReader.Close">
             <summary>
@@ -6871,6 +6921,11 @@
             Represents a writer that provides a fast, non-cached, forward-only way of generating JSON data.
             </summary>
         </member>
+        <member name="P:Newtonsoft.Json.JsonTextWriter.BufferPool">
+            <summary>
+            Gets or sets the writer's character buffer pool.
+            </summary>
+        </member>
         <member name="P:Newtonsoft.Json.JsonTextWriter.Indentation">
             <summary>
             Gets or sets how many IndentChars to write for each level in the hierarchy when <see cref="T:Newtonsoft.Json.Formatting"/> is set to <c>Formatting.Indented</c>.
@@ -7470,7 +7525,7 @@
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
+            <returns>A <see cref="T:System.Nullable`1"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
         <member name="M:Newtonsoft.Json.JsonReader.Skip">
             <summary>

packages/Newtonsoft.Json.8.0.1-beta3/lib/net35/Newtonsoft.Json.xml

@@ -89,7 +89,7 @@
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
+            <returns>A <see cref="T:System.Nullable`1"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
         <member name="M:Newtonsoft.Json.Bson.BsonReader.ReadAsDateTimeOffset">
             <summary>
@@ -977,6 +977,25 @@
             Causes child objects to be indented according to the <see cref="P:Newtonsoft.Json.JsonTextWriter.Indentation"/> and <see cref="P:Newtonsoft.Json.JsonTextWriter.IndentChar"/> settings.
             </summary>
         </member>
+        <member name="T:Newtonsoft.Json.IJsonBufferPool`1">
+            <summary>
+            Provides an interface for using pooled buffers.
+            </summary>
+            <typeparam name="T">The buffer type content.</typeparam>
+        </member>
+        <member name="M:Newtonsoft.Json.IJsonBufferPool`1.RentBuffer(System.Int32)">
+            <summary>
+            Rent a buffer from the pool. This buffer must be returned when it is no longer needed.
+            </summary>
+            <param name="minSize">The minimum required size of the buffer. The returned buffer may be larger.</param>
+            <returns>The rented buffer from the pool.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.IJsonBufferPool`1.ReturnBuffer(`0[]@)">
+            <summary>
+            Return a buffer to the pool.
+            </summary>
+            <param name="buffer">The buffer that is being returned.</param>
+        </member>
         <member name="T:Newtonsoft.Json.JsonConstructorAttribute">
             <summary>
             Instructs the <see cref="T:Newtonsoft.Json.JsonSerializer"/> to use the specified constructor when deserializing that object.
@@ -1079,6 +1098,21 @@
             Load comments as a <see cref="T:Newtonsoft.Json.Linq.JValue"/> with type <see cref="F:Newtonsoft.Json.Linq.JTokenType.Comment"/>.
             </summary>
         </member>
+        <member name="T:Newtonsoft.Json.Linq.LineInfoHandling">
+            <summary>
+            Specifies how line information is handled when loading JSON.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.LineInfoHandling.Ignore">
+            <summary>
+            Ignore line information.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.LineInfoHandling.Load">
+            <summary>
+            Load line information.
+            </summary>
+        </member>
         <member name="T:Newtonsoft.Json.Linq.JPropertyDescriptor">
             <summary>
             Represents a view of a <see cref="T:Newtonsoft.Json.Linq.JProperty"/>.
@@ -1179,6 +1213,12 @@
             </summary>
             <value>The JSON comment handling.</value>
         </member>
+        <member name="P:Newtonsoft.Json.Linq.JsonLoadSettings.LineInfoHandling">
+            <summary>
+            Gets or sets how JSON line info is handled when loading JSON.
+            </summary>
+            <value>The JSON line info handling.</value>
+        </member>
         <member name="T:Newtonsoft.Json.Linq.JsonMergeSettings">
             <summary>
             Specifies the settings used when merging JSON.
@@ -2229,7 +2269,7 @@
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
+            <returns>A <see cref="T:System.Nullable`1"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
         <member name="M:Newtonsoft.Json.Linq.JTokenReader.ReadAsDateTimeOffset">
             <summary>
@@ -5124,6 +5164,11 @@
             The property must be defined in JSON and cannot be a null value.
             </summary>
         </member>
+        <member name="F:Newtonsoft.Json.Required.DisallowNull">
+            <summary>
+            The property is not required but it cannot be a null value.
+            </summary>
+        </member>
         <member name="T:Newtonsoft.Json.PreserveReferencesHandling">
             <summary>
             Specifies reference handling options for the <see cref="T:Newtonsoft.Json.JsonSerializer"/>.
@@ -5670,7 +5715,7 @@
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
+            <returns>A <see cref="T:System.Nullable`1"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
         <member name="M:Newtonsoft.Json.JsonValidatingReader.ReadAsDateTimeOffset">
             <summary>
@@ -5741,6 +5786,11 @@
             </summary>
             <param name="reader">The <c>TextReader</c> containing the XML data to read.</param>
         </member>
+        <member name="P:Newtonsoft.Json.JsonTextReader.BufferPool">
+            <summary>
+            Gets or sets the reader's character buffer pool.
+            </summary>
+        </member>
         <member name="M:Newtonsoft.Json.JsonTextReader.Read">
             <summary>
             Reads the next JSON token from the stream.
@@ -5779,7 +5829,7 @@
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
+            <returns>A <see cref="T:System.Nullable`1"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
         <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsDateTimeOffset">
             <summary>
@@ -5933,6 +5983,11 @@
             Represents a writer that provides a fast, non-cached, forward-only way of generating JSON data.
             </summary>
         </member>
+        <member name="P:Newtonsoft.Json.JsonTextWriter.BufferPool">
+            <summary>
+            Gets or sets the writer's character buffer pool.
+            </summary>
+        </member>
         <member name="P:Newtonsoft.Json.JsonTextWriter.Indentation">
             <summary>
             Gets or sets how many IndentChars to write for each level in the hierarchy when <see cref="T:Newtonsoft.Json.Formatting"/> is set to <c>Formatting.Indented</c>.
@@ -6538,7 +6593,7 @@
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
+            <returns>A <see cref="T:System.Nullable`1"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
         <member name="M:Newtonsoft.Json.JsonReader.ReadAsDateTimeOffset">
             <summary>

packages/Newtonsoft.Json.8.0.1-beta3/lib/net40/Newtonsoft.Json.xml

@@ -89,7 +89,7 @@
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
+            <returns>A <see cref="T:System.Nullable`1"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
         <member name="M:Newtonsoft.Json.Bson.BsonReader.ReadAsDateTimeOffset">
             <summary>
@@ -973,6 +973,25 @@
             Floating point numbers are parsed to <see cref="F:Newtonsoft.Json.FloatParseHandling.Decimal"/>.
             </summary>
         </member>
+        <member name="T:Newtonsoft.Json.IJsonBufferPool`1">
+            <summary>
+            Provides an interface for using pooled buffers.
+            </summary>
+            <typeparam name="T">The buffer type content.</typeparam>
+        </member>
+        <member name="M:Newtonsoft.Json.IJsonBufferPool`1.RentBuffer(System.Int32)">
+            <summary>
+            Rent a buffer from the pool. This buffer must be returned when it is no longer needed.
+            </summary>
+            <param name="minSize">The minimum required size of the buffer. The returned buffer may be larger.</param>
+            <returns>The rented buffer from the pool.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.IJsonBufferPool`1.ReturnBuffer(`0[]@)">
+            <summary>
+            Return a buffer to the pool.
+            </summary>
+            <param name="buffer">The buffer that is being returned.</param>
+        </member>
         <member name="T:Newtonsoft.Json.JsonDictionaryAttribute">
             <summary>
             Instructs the <see cref="T:Newtonsoft.Json.JsonSerializer"/> how to serialize the collection.
@@ -1151,6 +1170,21 @@
             Load comments as a <see cref="T:Newtonsoft.Json.Linq.JValue"/> with type <see cref="F:Newtonsoft.Json.Linq.JTokenType.Comment"/>.
             </summary>
         </member>
+        <member name="T:Newtonsoft.Json.Linq.LineInfoHandling">
+            <summary>
+            Specifies how line information is handled when loading JSON.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.LineInfoHandling.Ignore">
+            <summary>
+            Ignore line information.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.LineInfoHandling.Load">
+            <summary>
+            Load line information.
+            </summary>
+        </member>
         <member name="T:Newtonsoft.Json.Linq.JsonLoadSettings">
             <summary>
             Specifies the settings used when loading JSON.
@@ -1162,6 +1196,12 @@
             </summary>
             <value>The JSON comment handling.</value>
         </member>
+        <member name="P:Newtonsoft.Json.Linq.JsonLoadSettings.LineInfoHandling">
+            <summary>
+            Gets or sets how JSON line info is handled when loading JSON.
+            </summary>
+            <value>The JSON line info handling.</value>
+        </member>
         <member name="T:Newtonsoft.Json.Linq.JsonMergeSettings">
             <summary>
             Specifies the settings used when merging JSON.
@@ -2321,7 +2361,7 @@
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
+            <returns>A <see cref="T:System.Nullable`1"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
         <member name="M:Newtonsoft.Json.Linq.JTokenReader.ReadAsDateTimeOffset">
             <summary>
@@ -5332,6 +5372,11 @@
             The property must be defined in JSON and cannot be a null value.
             </summary>
         </member>
+        <member name="F:Newtonsoft.Json.Required.DisallowNull">
+            <summary>
+            The property is not required but it cannot be a null value.
+            </summary>
+        </member>
         <member name="T:Newtonsoft.Json.PreserveReferencesHandling">
             <summary>
             Specifies reference handling options for the <see cref="T:Newtonsoft.Json.JsonSerializer"/>.
@@ -5878,7 +5923,7 @@
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
+            <returns>A <see cref="T:System.Nullable`1"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
         <member name="M:Newtonsoft.Json.JsonValidatingReader.ReadAsDateTimeOffset">
             <summary>
@@ -5949,6 +5994,11 @@
             </summary>
             <param name="reader">The <c>TextReader</c> containing the XML data to read.</param>
         </member>
+        <member name="P:Newtonsoft.Json.JsonTextReader.BufferPool">
+            <summary>
+            Gets or sets the reader's character buffer pool.
+            </summary>
+        </member>
         <member name="M:Newtonsoft.Json.JsonTextReader.Read">
             <summary>
             Reads the next JSON token from the stream.
@@ -5987,7 +6037,7 @@
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
+            <returns>A <see cref="T:System.Nullable`1"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
         <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsDateTimeOffset">
             <summary>
@@ -6141,6 +6191,11 @@
             Represents a writer that provides a fast, non-cached, forward-only way of generating JSON data.
             </summary>
         </member>
+        <member name="P:Newtonsoft.Json.JsonTextWriter.BufferPool">
+            <summary>
+            Gets or sets the writer's character buffer pool.
+            </summary>
+        </member>
         <member name="P:Newtonsoft.Json.JsonTextWriter.Indentation">
             <summary>
             Gets or sets how many IndentChars to write for each level in the hierarchy when <see cref="T:Newtonsoft.Json.Formatting"/> is set to <c>Formatting.Indented</c>.
@@ -6746,7 +6801,7 @@
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
+            <returns>A <see cref="T:System.Nullable`1"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
         <member name="M:Newtonsoft.Json.JsonReader.ReadAsDateTimeOffset">
             <summary>

packages/Newtonsoft.Json.8.0.1-beta3/lib/net45/Newtonsoft.Json.xml

@@ -106,7 +106,7 @@
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
+            <returns>A <see cref="T:System.Nullable`1"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
         <member name="M:Newtonsoft.Json.Bson.BsonReader.ReadAsDateTimeOffset">
             <summary>
@@ -1084,6 +1084,25 @@
             Causes child objects to be indented according to the <see cref="P:Newtonsoft.Json.JsonTextWriter.Indentation"/> and <see cref="P:Newtonsoft.Json.JsonTextWriter.IndentChar"/> settings.
             </summary>
         </member>
+        <member name="T:Newtonsoft.Json.IJsonBufferPool`1">
+            <summary>
+            Provides an interface for using pooled buffers.
+            </summary>
+            <typeparam name="T">The buffer type content.</typeparam>
+        </member>
+        <member name="M:Newtonsoft.Json.IJsonBufferPool`1.RentBuffer(System.Int32)">
+            <summary>
+            Rent a buffer from the pool. This buffer must be returned when it is no longer needed.
+            </summary>
+            <param name="minSize">The minimum required size of the buffer. The returned buffer may be larger.</param>
+            <returns>The rented buffer from the pool.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.IJsonBufferPool`1.ReturnBuffer(`0[]@)">
+            <summary>
+            Return a buffer to the pool.
+            </summary>
+            <param name="buffer">The buffer that is being returned.</param>
+        </member>
         <member name="T:Newtonsoft.Json.IJsonLineInfo">
             <summary>
             Provides an interface to enable a class to return line and position information.
@@ -2386,7 +2405,7 @@
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
+            <returns>A <see cref="T:System.Nullable`1"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
         <member name="M:Newtonsoft.Json.JsonReader.ReadAsDateTimeOffset">
             <summary>
@@ -3030,6 +3049,11 @@
             </summary>
             <param name="reader">The <c>TextReader</c> containing the XML data to read.</param>
         </member>
+        <member name="P:Newtonsoft.Json.JsonTextReader.BufferPool">
+            <summary>
+            Gets or sets the reader's character buffer pool.
+            </summary>
+        </member>
         <member name="M:Newtonsoft.Json.JsonTextReader.Read">
             <summary>
             Reads the next JSON token from the stream.
@@ -3068,7 +3092,7 @@
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
+            <returns>A <see cref="T:System.Nullable`1"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
         <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsDateTimeOffset">
             <summary>
@@ -3110,6 +3134,11 @@
             Represents a writer that provides a fast, non-cached, forward-only way of generating JSON data.
             </summary>
         </member>
+        <member name="P:Newtonsoft.Json.JsonTextWriter.BufferPool">
+            <summary>
+            Gets or sets the writer's character buffer pool.
+            </summary>
+        </member>
         <member name="P:Newtonsoft.Json.JsonTextWriter.Indentation">
             <summary>
             Gets or sets how many IndentChars to write for each level in the hierarchy when <see cref="T:Newtonsoft.Json.Formatting"/> is set to <c>Formatting.Indented</c>.
@@ -3557,7 +3586,7 @@
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
+            <returns>A <see cref="T:System.Nullable`1"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
         <member name="M:Newtonsoft.Json.JsonValidatingReader.ReadAsDateTimeOffset">
             <summary>
@@ -4080,6 +4109,21 @@
             Load comments as a <see cref="T:Newtonsoft.Json.Linq.JValue"/> with type <see cref="F:Newtonsoft.Json.Linq.JTokenType.Comment"/>.
             </summary>
         </member>
+        <member name="T:Newtonsoft.Json.Linq.LineInfoHandling">
+            <summary>
+            Specifies how line information is handled when loading JSON.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.LineInfoHandling.Ignore">
+            <summary>
+            Ignore line information.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.LineInfoHandling.Load">
+            <summary>
+            Load line information.
+            </summary>
+        </member>
         <member name="T:Newtonsoft.Json.Linq.Extensions">
             <summary>
             Contains the LINQ to JSON extension methods.
@@ -6199,7 +6243,7 @@
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
+            <returns>A <see cref="T:System.Nullable`1"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
         <member name="M:Newtonsoft.Json.Linq.JTokenReader.ReadAsDateTimeOffset">
             <summary>
@@ -6782,6 +6826,12 @@
             </summary>
             <value>The JSON comment handling.</value>
         </member>
+        <member name="P:Newtonsoft.Json.Linq.JsonLoadSettings.LineInfoHandling">
+            <summary>
+            Gets or sets how JSON line info is handled when loading JSON.
+            </summary>
+            <value>The JSON line info handling.</value>
+        </member>
         <member name="T:Newtonsoft.Json.Linq.MergeArrayHandling">
             <summary>
             Specifies how JSON arrays are merged together.
@@ -6966,6 +7016,11 @@
             The property must be defined in JSON and cannot be a null value.
             </summary>
         </member>
+        <member name="F:Newtonsoft.Json.Required.DisallowNull">
+            <summary>
+            The property is not required but it cannot be a null value.
+            </summary>
+        </member>
         <member name="T:Newtonsoft.Json.Schema.Extensions">
             <summary>
             <para>

packages/Newtonsoft.Json.8.0.1-beta3/lib/portable-net40+sl5+wp80+win8+wpa81/Newtonsoft.Json.xml

@@ -106,7 +106,7 @@
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
+            <returns>A <see cref="T:System.Nullable`1"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
         <member name="M:Newtonsoft.Json.Bson.BsonReader.ReadAsDateTimeOffset">
             <summary>
@@ -857,6 +857,25 @@
             Causes child objects to be indented according to the <see cref="P:Newtonsoft.Json.JsonTextWriter.Indentation"/> and <see cref="P:Newtonsoft.Json.JsonTextWriter.IndentChar"/> settings.
             </summary>
         </member>
+        <member name="T:Newtonsoft.Json.IJsonBufferPool`1">
+            <summary>
+            Provides an interface for using pooled buffers.
+            </summary>
+            <typeparam name="T">The buffer type content.</typeparam>
+        </member>
+        <member name="M:Newtonsoft.Json.IJsonBufferPool`1.RentBuffer(System.Int32)">
+            <summary>
+            Rent a buffer from the pool. This buffer must be returned when it is no longer needed.
+            </summary>
+            <param name="minSize">The minimum required size of the buffer. The returned buffer may be larger.</param>
+            <returns>The rented buffer from the pool.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.IJsonBufferPool`1.ReturnBuffer(`0[]@)">
+            <summary>
+            Return a buffer to the pool.
+            </summary>
+            <param name="buffer">The buffer that is being returned.</param>
+        </member>
         <member name="T:Newtonsoft.Json.IJsonLineInfo">
             <summary>
             Provides an interface to enable a class to return line and position information.
@@ -1947,7 +1966,7 @@
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
+            <returns>A <see cref="T:System.Nullable`1"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
         <member name="M:Newtonsoft.Json.JsonReader.ReadAsDateTimeOffset">
             <summary>
@@ -2573,6 +2592,11 @@
             </summary>
             <param name="reader">The <c>TextReader</c> containing the XML data to read.</param>
         </member>
+        <member name="P:Newtonsoft.Json.JsonTextReader.BufferPool">
+            <summary>
+            Gets or sets the reader's character buffer pool.
+            </summary>
+        </member>
         <member name="M:Newtonsoft.Json.JsonTextReader.Read">
             <summary>
             Reads the next JSON token from the stream.
@@ -2611,7 +2635,7 @@
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
+            <returns>A <see cref="T:System.Nullable`1"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
         <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsDateTimeOffset">
             <summary>
@@ -2653,6 +2677,11 @@
             Represents a writer that provides a fast, non-cached, forward-only way of generating JSON data.
             </summary>
         </member>
+        <member name="P:Newtonsoft.Json.JsonTextWriter.BufferPool">
+            <summary>
+            Gets or sets the writer's character buffer pool.
+            </summary>
+        </member>
         <member name="P:Newtonsoft.Json.JsonTextWriter.Indentation">
             <summary>
             Gets or sets how many IndentChars to write for each level in the hierarchy when <see cref="T:Newtonsoft.Json.Formatting"/> is set to <c>Formatting.Indented</c>.
@@ -3100,7 +3129,7 @@
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
+            <returns>A <see cref="T:System.Nullable`1"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
         <member name="M:Newtonsoft.Json.JsonValidatingReader.ReadAsDateTimeOffset">
             <summary>
@@ -3614,6 +3643,21 @@
             Load comments as a <see cref="T:Newtonsoft.Json.Linq.JValue"/> with type <see cref="F:Newtonsoft.Json.Linq.JTokenType.Comment"/>.
             </summary>
         </member>
+        <member name="T:Newtonsoft.Json.Linq.LineInfoHandling">
+            <summary>
+            Specifies how line information is handled when loading JSON.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.LineInfoHandling.Ignore">
+            <summary>
+            Ignore line information.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.LineInfoHandling.Load">
+            <summary>
+            Load line information.
+            </summary>
+        </member>
         <member name="T:Newtonsoft.Json.Linq.Extensions">
             <summary>
             Contains the LINQ to JSON extension methods.
@@ -4517,6 +4561,12 @@
             </summary>
             <value>The JSON comment handling.</value>
         </member>
+        <member name="P:Newtonsoft.Json.Linq.JsonLoadSettings.LineInfoHandling">
+            <summary>
+            Gets or sets how JSON line info is handled when loading JSON.
+            </summary>
+            <value>The JSON line info handling.</value>
+        </member>
         <member name="T:Newtonsoft.Json.Linq.JsonMergeSettings">
             <summary>
             Specifies the settings used when merging JSON.
@@ -5484,7 +5534,7 @@
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
+            <returns>A <see cref="T:System.Nullable`1"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
         <member name="M:Newtonsoft.Json.Linq.JTokenReader.ReadAsDateTimeOffset">
             <summary>
@@ -6231,6 +6281,11 @@
             The property must be defined in JSON and cannot be a null value.
             </summary>
         </member>
+        <member name="F:Newtonsoft.Json.Required.DisallowNull">
+            <summary>
+            The property is not required but it cannot be a null value.
+            </summary>
+        </member>
         <member name="T:Newtonsoft.Json.Schema.Extensions">
             <summary>
             <para>

packages/Newtonsoft.Json.8.0.1-beta3/lib/portable-net45+wp80+win8+wpa81+dnxcore50/Newtonsoft.Json.xml

@@ -106,7 +106,7 @@
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
+            <returns>A <see cref="T:System.Nullable`1"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
         <member name="M:Newtonsoft.Json.Bson.BsonReader.ReadAsDateTimeOffset">
             <summary>
@@ -956,6 +956,25 @@
             Causes child objects to be indented according to the <see cref="P:Newtonsoft.Json.JsonTextWriter.Indentation"/> and <see cref="P:Newtonsoft.Json.JsonTextWriter.IndentChar"/> settings.
             </summary>
         </member>
+        <member name="T:Newtonsoft.Json.IJsonBufferPool`1">
+            <summary>
+            Provides an interface for using pooled buffers.
+            </summary>
+            <typeparam name="T">The buffer type content.</typeparam>
+        </member>
+        <member name="M:Newtonsoft.Json.IJsonBufferPool`1.RentBuffer(System.Int32)">
+            <summary>
+            Rent a buffer from the pool. This buffer must be returned when it is no longer needed.
+            </summary>
+            <param name="minSize">The minimum required size of the buffer. The returned buffer may be larger.</param>
+            <returns>The rented buffer from the pool.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.IJsonBufferPool`1.ReturnBuffer(`0[]@)">
+            <summary>
+            Return a buffer to the pool.
+            </summary>
+            <param name="buffer">The buffer that is being returned.</param>
+        </member>
         <member name="T:Newtonsoft.Json.IJsonLineInfo">
             <summary>
             Provides an interface to enable a class to return line and position information.
@@ -2197,7 +2216,7 @@
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
+            <returns>A <see cref="T:System.Nullable`1"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
         <member name="M:Newtonsoft.Json.JsonReader.ReadAsDateTimeOffset">
             <summary>
@@ -2823,6 +2842,11 @@
             </summary>
             <param name="reader">The <c>TextReader</c> containing the XML data to read.</param>
         </member>
+        <member name="P:Newtonsoft.Json.JsonTextReader.BufferPool">
+            <summary>
+            Gets or sets the reader's character buffer pool.
+            </summary>
+        </member>
         <member name="M:Newtonsoft.Json.JsonTextReader.Read">
             <summary>
             Reads the next JSON token from the stream.
@@ -2861,7 +2885,7 @@
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
+            <returns>A <see cref="T:System.Nullable`1"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
         <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsDateTimeOffset">
             <summary>
@@ -2903,6 +2927,11 @@
             Represents a writer that provides a fast, non-cached, forward-only way of generating JSON data.
             </summary>
         </member>
+        <member name="P:Newtonsoft.Json.JsonTextWriter.BufferPool">
+            <summary>
+            Gets or sets the writer's character buffer pool.
+            </summary>
+        </member>
         <member name="P:Newtonsoft.Json.JsonTextWriter.Indentation">
             <summary>
             Gets or sets how many IndentChars to write for each level in the hierarchy when <see cref="T:Newtonsoft.Json.Formatting"/> is set to <c>Formatting.Indented</c>.
@@ -3350,7 +3379,7 @@
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
+            <returns>A <see cref="T:System.Nullable`1"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
         <member name="M:Newtonsoft.Json.JsonValidatingReader.ReadAsDateTimeOffset">
             <summary>
@@ -3864,6 +3893,21 @@
             Load comments as a <see cref="T:Newtonsoft.Json.Linq.JValue"/> with type <see cref="F:Newtonsoft.Json.Linq.JTokenType.Comment"/>.
             </summary>
         </member>
+        <member name="T:Newtonsoft.Json.Linq.LineInfoHandling">
+            <summary>
+            Specifies how line information is handled when loading JSON.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.LineInfoHandling.Ignore">
+            <summary>
+            Ignore line information.
+            </summary>
+        </member>
+        <member name="F:Newtonsoft.Json.Linq.LineInfoHandling.Load">
+            <summary>
+            Load line information.
+            </summary>
+        </member>
         <member name="T:Newtonsoft.Json.Linq.Extensions">
             <summary>
             Contains the LINQ to JSON extension methods.
@@ -4787,6 +4831,12 @@
             </summary>
             <value>The JSON comment handling.</value>
         </member>
+        <member name="P:Newtonsoft.Json.Linq.JsonLoadSettings.LineInfoHandling">
+            <summary>
+            Gets or sets how JSON line info is handled when loading JSON.
+            </summary>
+            <value>The JSON line info handling.</value>
+        </member>
         <member name="T:Newtonsoft.Json.Linq.JsonMergeSettings">
             <summary>
             Specifies the settings used when merging JSON.
@@ -5772,7 +5822,7 @@
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
+            <returns>A <see cref="T:System.Nullable`1"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
         <member name="M:Newtonsoft.Json.Linq.JTokenReader.ReadAsDateTimeOffset">
             <summary>
@@ -6528,6 +6578,11 @@
             The property must be defined in JSON and cannot be a null value.
             </summary>
         </member>
+        <member name="F:Newtonsoft.Json.Required.DisallowNull">
+            <summary>
+            The property is not required but it cannot be a null value.
+            </summary>
+        </member>
         <member name="T:Newtonsoft.Json.Schema.Extensions">
             <summary>
             <para>