Code review

Works around latest nightly Mono fuckup by the way

.gitignore

@@ -7,6 +7,9 @@ ArchiSteamFarm/config/*
 !ArchiSteamFarm/config/example.xml
 !ArchiSteamFarm/config/minimal.xml
 
+# Ignore local debugging log file
+ArchiSteamFarm/log.txt
+
 #################
 ## Eclipse
 #################

ArchiSteamFarm/App.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
 	<startup>
-		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
+		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/>
 	</startup>
 </configuration>

ArchiSteamFarm/ArchiHandler.cs

@@ -5,7 +5,7 @@
  / ___ \ | |  | (__ | | | || | ___) || |_|  __/| (_| || | | | | ||  _|| (_| || |   | | | | | |
 /_/   \_\|_|   \___||_| |_||_||____/  \__|\___| \__,_||_| |_| |_||_|   \__,_||_|   |_| |_| |_|
 
- Copyright 2015 Łukasz "JustArchi" Domeradzki
+ Copyright 2015-2016 Łukasz "JustArchi" Domeradzki
  Contact: JustArchi@JustArchi.net
 
  Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,74 +24,149 @@
 
 using SteamKit2;
 using SteamKit2.Internal;
-using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Net;
 
 namespace ArchiSteamFarm {
 	internal sealed class ArchiHandler : ClientMsgHandler {
+		/*
+		  ____        _  _  _                   _
+		 / ___| __ _ | || || |__    __ _   ___ | | __ ___
+		| |    / _` || || || '_ \  / _` | / __|| |/ // __|
+		| |___| (_| || || || |_) || (_| || (__ |   < \__ \
+		 \____|\__,_||_||_||_.__/  \__,_| \___||_|\_\|___/
+
+		*/
+
+		internal sealed class NotificationsCallback : CallbackMsg {
+			internal sealed class Notification {
+				internal enum ENotificationType {
+					Unknown = 0,
+					Trading = 1,
+				}
+
+				internal ENotificationType NotificationType { get; set; }
+			}
+
+			internal readonly List<Notification> Notifications;
+
+			internal NotificationsCallback(JobID jobID, CMsgClientUserNotifications msg) {
+				JobID = jobID;
+
+				if (msg == null) {
+					return;
+				}
+
+				Notifications = new List<Notification>();
+				foreach (var notification in msg.notifications) {
+					Notifications.Add(new Notification {
+						NotificationType = (Notification.ENotificationType) notification.user_notification_type
+					});
+				}
+			}
+		}
+
+		internal sealed class OfflineMessageCallback : CallbackMsg {
+			internal readonly uint OfflineMessages;
+			internal readonly List<uint> Users;
+
+			internal OfflineMessageCallback(JobID jobID, CMsgClientOfflineMessageNotification msg) {
+				JobID = jobID;
+
+				if (msg == null) {
+					return;
+				}
+
+				OfflineMessages = msg.offline_messages;
+				Users = msg.friends_with_offline_messages;
+			}
+		}
 
 		internal sealed class PurchaseResponseCallback : CallbackMsg {
 			internal enum EPurchaseResult {
 				Unknown = -1,
 				OK = 0,
 				AlreadyOwned = 9,
-				RegionLockedKey = 13,
+				RegionLocked = 13,
 				InvalidKey = 14,
 				DuplicatedKey = 15,
 				BaseGameRequired = 24,
 				OnCooldown = 53
 			}
 
-			internal EResult Result { get; private set; }
-			internal EPurchaseResult PurchaseResult { get; private set; }
-			internal KeyValue ReceiptInfo { get; private set; } = new KeyValue();
-			internal Dictionary<uint, string> Items { get; private set; } = new Dictionary<uint, string>();
+			internal readonly EResult Result;
+			internal readonly EPurchaseResult PurchaseResult;
+			internal readonly KeyValue ReceiptInfo;
+			internal readonly Dictionary<uint, string> Items;
 
-			internal PurchaseResponseCallback(CMsgClientPurchaseResponse body) {
-				Result = (EResult) body.eresult;
-				PurchaseResult = (EPurchaseResult) body.purchase_result_details;
+			internal PurchaseResponseCallback(JobID jobID, CMsgClientPurchaseResponse msg) {
+				JobID = jobID;
 
-				using (MemoryStream ms = new MemoryStream(body.purchase_receipt_info)) {
+				if (msg == null) {
+					return;
+				}
+
+				Result = (EResult) msg.eresult;
+				PurchaseResult = (EPurchaseResult) msg.purchase_result_details;
+
+				ReceiptInfo = new KeyValue();
+				using (MemoryStream ms = new MemoryStream(msg.purchase_receipt_info)) {
 					if (!ReceiptInfo.TryReadAsBinary(ms)) {
 						return;
 					}
 
-					foreach (KeyValue lineItem in ReceiptInfo["lineitems"].Children) {
-						Items.Add((uint) lineItem["PackageID"].AsUnsignedLong(), lineItem["ItemDescription"].AsString());
+					List<KeyValue> lineItems = ReceiptInfo["lineitems"].Children;
+					Items = new Dictionary<uint, string>(lineItems.Count);
+
+					foreach (KeyValue lineItem in lineItems) {
+						uint appID = (uint) lineItem["PackageID"].AsUnsignedLong();
+						string gameName = lineItem["ItemDescription"].AsString();
+						gameName = WebUtility.UrlDecode(gameName); // Apparently steam expects client to decode sent HTML
+						Items.Add(appID, gameName);
 					}
 				}
 			}
 		}
 
-		internal sealed class NotificationCallback : CallbackMsg {
-			internal enum ENotificationType {
-				Unknown = 0,
-				Trading = 1,
-			}
+		/*
+		 __  __        _    _                 _
+		|  \/  |  ___ | |_ | |__    ___    __| | ___
+		| |\/| | / _ \| __|| '_ \  / _ \  / _` |/ __|
+		| |  | ||  __/| |_ | | | || (_) || (_| |\__ \
+		|_|  |_| \___| \__||_| |_| \___/  \__,_||___/
 
-			internal ENotificationType NotificationType { get; private set; }
-
-			internal NotificationCallback(CMsgClientUserNotifications.Notification body) {
-				NotificationType = (ENotificationType) body.user_notification_type;
-			}
-		}
+		*/
 
 		internal void AcceptClanInvite(ulong clanID) {
+			if (clanID == 0 || !Client.IsConnected) {
+				return;
+			}
+
 			var request = new ClientMsg<CMsgClientClanInviteAction>((int) EMsg.ClientAcknowledgeClanInvite);
 			request.Body.GroupID = clanID;
 			request.Body.AcceptInvite = true;
+
 			Client.Send(request);
 		}
 
 		internal void DeclineClanInvite(ulong clanID) {
+			if (clanID == 0 || !Client.IsConnected) {
+				return;
+			}
+
 			var request = new ClientMsg<CMsgClientClanInviteAction>((int) EMsg.ClientAcknowledgeClanInvite);
 			request.Body.GroupID = clanID;
 			request.Body.AcceptInvite = false;
+
 			Client.Send(request);
 		}
 
 		internal void PlayGames(params uint[] gameIDs) {
+			if (!Client.IsConnected) {
+				return;
+			}
+
 			var request = new ClientMsgProtobuf<CMsgClientGamesPlayed>(EMsg.ClientGamesPlayed);
 			foreach (uint gameID in gameIDs) {
 				if (gameID == 0) {
@@ -102,10 +177,15 @@ namespace ArchiSteamFarm {
 					game_id = new GameID(gameID),
 				});
 			}
+
 			Client.Send(request);
 		}
 
 		internal void PlayGames(ICollection<uint> gameIDs) {
+			if (gameIDs == null || gameIDs.Count == 0 || !Client.IsConnected) {
+				return;
+			}
+
 			var request = new ClientMsgProtobuf<CMsgClientGamesPlayed>(EMsg.ClientGamesPlayed);
 			foreach (uint gameID in gameIDs) {
 				if (gameID == 0) {
@@ -116,22 +196,43 @@ namespace ArchiSteamFarm {
 					game_id = new GameID(gameID),
 				});
 			}
+
 			Client.Send(request);
 		}
 
-		// Will provide result in ClientPurchaseResponse, regardless if success or not
-		internal void RedeemKey(string key) {
-			var request = new ClientMsgProtobuf<CMsgClientRegisterKey>(EMsg.ClientRegisterKey);
+		internal AsyncJob<PurchaseResponseCallback> RedeemKey(string key) {
+			if (string.IsNullOrEmpty(key) || !Client.IsConnected) {
+				return null;
+			}
+
+			var request = new ClientMsgProtobuf<CMsgClientRegisterKey>(EMsg.ClientRegisterKey) {
+				SourceJobID = Client.GetNextJobID()
+			};
+
 			request.Body.key = key;
+
 			Client.Send(request);
+			return new AsyncJob<PurchaseResponseCallback>(Client, request.SourceJobID);
 		}
 
-		public sealed override void HandleMsg(IPacketMsg packetMsg) {
+		/*
+		 _   _                    _  _
+		| | | |  __ _  _ __    __| || |  ___  _ __  ___
+		| |_| | / _` || '_ \  / _` || | / _ \| '__|/ __|
+		|  _  || (_| || | | || (_| || ||  __/| |   \__ \
+		|_| |_| \__,_||_| |_| \__,_||_| \___||_|   |___/
+
+		*/
+
+		public override void HandleMsg(IPacketMsg packetMsg) {
 			if (packetMsg == null) {
 				return;
 			}
 
 			switch (packetMsg.MsgType) {
+				case EMsg.ClientFSOfflineMessageNotification:
+					HandleFSOfflineMessageNotification(packetMsg);
+					break;
 				case EMsg.ClientPurchaseResponse:
 					HandlePurchaseResponse(packetMsg);
 					break;
@@ -141,71 +242,31 @@ namespace ArchiSteamFarm {
 			}
 		}
 
-		private void HandlePurchaseResponse(IPacketMsg packetMsg) {
-			var response = new ClientMsgProtobuf<CMsgClientPurchaseResponse>(packetMsg);
-			Client.PostCallback(new PurchaseResponseCallback(response.Body));
-		}
-
-		private void HandleUserNotifications(IPacketMsg packetMsg) {
-			var response = new ClientMsgProtobuf<CMsgClientUserNotifications>(packetMsg);
-			foreach (var notification in response.Body.notifications) {
-				Client.PostCallback(new NotificationCallback(notification));
-			}
-		}
-
-		// TODO: Please remove me entirely once https://github.com/SteamRE/SteamKit/pull/217 gets merged
-		internal void HackedLogOn(uint id, SteamUser.LogOnDetails details) {
-			if (details == null) {
-				throw new ArgumentNullException("details");
-			}
-
-			if (string.IsNullOrEmpty(details.Username) || (string.IsNullOrEmpty(details.Password) && string.IsNullOrEmpty(details.LoginKey))) {
-				throw new ArgumentException("LogOn requires a username and password to be set in 'details'.");
-			}
-
-			if (!string.IsNullOrEmpty(details.LoginKey) && !details.ShouldRememberPassword) {
-				// Prevent consumers from screwing this up.
-				// If should_remember_password is false, the login_key is ignored server-side.
-				// The inverse is not applicable (you can log in with should_remember_password and no login_key).
-				throw new ArgumentException("ShouldRememberPassword is required to be set to true in order to use LoginKey.");
-			}
-
-			if (!Client.IsConnected) {
+		private void HandleFSOfflineMessageNotification(IPacketMsg packetMsg) {
+			if (packetMsg == null) {
 				return;
 			}
 
-			var logon = new ClientMsgProtobuf<CMsgClientLogon>(EMsg.ClientLogon);
+			var response = new ClientMsgProtobuf<CMsgClientOfflineMessageNotification>(packetMsg);
+			Client.PostCallback(new OfflineMessageCallback(packetMsg.TargetJobID, response.Body));
+		}
 
-			SteamID steamId = new SteamID(details.AccountID, details.AccountInstance, Client.ConnectedUniverse, EAccountType.Individual);
+		private void HandlePurchaseResponse(IPacketMsg packetMsg) {
+			if (packetMsg == null) {
+				return;
+			}
 
-			logon.ProtoHeader.client_sessionid = 0;
-			logon.ProtoHeader.steamid = steamId.ConvertToUInt64();
+			var response = new ClientMsgProtobuf<CMsgClientPurchaseResponse>(packetMsg);
+			Client.PostCallback(new PurchaseResponseCallback(packetMsg.TargetJobID, response.Body));
+		}
 
-			logon.Body.obfustucated_private_ip = id;
+		private void HandleUserNotifications(IPacketMsg packetMsg) {
+			if (packetMsg == null) {
+				return;
+			}
 
-			logon.Body.account_name = details.Username;
-			logon.Body.password = details.Password;
-			logon.Body.should_remember_password = details.ShouldRememberPassword;
-
-			logon.Body.protocol_version = MsgClientLogon.CurrentProtocol;
-			logon.Body.client_os_type = (uint) details.ClientOSType;
-			logon.Body.client_language = details.ClientLanguage;
-			logon.Body.cell_id = details.CellID;
-
-			logon.Body.steam2_ticket_request = details.RequestSteam2Ticket;
-
-			logon.Body.client_package_version = 1771;
-
-			// steam guard 
-			logon.Body.auth_code = details.AuthCode;
-			logon.Body.two_factor_code = details.TwoFactorCode;
-
-			logon.Body.login_key = details.LoginKey;
-
-			logon.Body.sha_sentryfile = details.SentryFileHash;
-			logon.Body.eresult_sentryfile = (int) (details.SentryFileHash != null ? EResult.OK : EResult.FileNotFound);
-
-			Client.Send(logon);
+			var response = new ClientMsgProtobuf<CMsgClientUserNotifications>(packetMsg);
+			Client.PostCallback(new NotificationsCallback(packetMsg.TargetJobID, response.Body));
 		}
 	}
 }

ArchiSteamFarm/ArchiSteamFarm.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ArchiSteamFarm</RootNamespace>
     <AssemblyName>ArchiSteamFarm</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <PublishUrl>publish\</PublishUrl>
@@ -47,7 +47,7 @@
     </DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <DocumentationFile>
     </DocumentationFile>
     <Prefer32Bit>true</Prefer32Bit>
@@ -66,19 +66,20 @@
       <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-beta3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.8.0.2\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">
       <HintPath>..\packages\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SteamKit2, Version=1.6.5.29095, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\SteamKit2.1.6.5\lib\net40\SteamKit2.dll</HintPath>
+    <Reference Include="SteamKit2, Version=1.7.0.33680, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SteamKit2.1.7.0\lib\net45\SteamKit2.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -97,9 +98,12 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SteamItem.cs" />
+    <Compile Include="SteamItemList.cs" />
     <Compile Include="SteamTradeOffer.cs" />
+    <Compile Include="SteamTradeOfferRequest.cs" />
     <Compile Include="Trading.cs" />
     <Compile Include="Utilities.cs" />
+    <Compile Include="WCF.cs" />
     <Compile Include="WebBrowser.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -139,13 +143,20 @@
     </PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
-    <PostBuildEvent Condition=" '$(OS)' != 'Unix' ">if $(ConfigurationName) == Release (
-    mkdir "$(TargetDir)out" "$(TargetDir)out\config"
-    copy "$(TargetDir)config\example.xml" "$(TargetDir)out\config"
-    copy "$(TargetDir)config\minimal.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>
+    <PostBuildEvent Condition=" '$(OS)' != 'Unix' AND '$(ConfigurationName)' == 'Release' ">
+      mkdir "$(TargetDir)out" "$(TargetDir)out\config"
+      copy "$(TargetDir)config\example.xml" "$(TargetDir)out\config"
+      copy "$(TargetDir)config\minimal.xml" "$(TargetDir)out\config"
+      "$(SolutionDir)tools\ILRepack.exe" /ndebug /internalize /parallel /targetplatform:v4 /wildcards /out:"$(TargetDir)out\ASF.exe" "$(TargetDir)$(TargetName).exe" "$(TargetDir)*.dll"
+      del "$(TargetDir)out\ASF.exe.config"
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Unix' AND '$(ConfigurationName)' == 'Release' ">
+      mkdir -p "$(TargetDir)out" "$(TargetDir)out/config"
+      cp "$(TargetDir)config/example.xml" "$(TargetDir)out/config"
+      cp "$(TargetDir)config/minimal.xml" "$(TargetDir)out/config"
+      mono -O=all "$(SolutionDir)tools/ILRepack.exe" /ndebug /internalize /parallel /targetplatform:v4 /wildcards /out:"$(TargetDir)out/ASF.exe" "$(TargetDir)$(TargetName).exe" "$(TargetDir)*.dll"
+      rm "$(TargetDir)out/ASF.exe.config"
+    </PostBuildEvent>
   </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.

ArchiSteamFarm/ArchiWebHandler.cs

@@ -5,7 +5,7 @@
  / ___ \ | |  | (__ | | | || | ___) || |_|  __/| (_| || | | | | ||  _|| (_| || |   | | | | | |
 /_/   \_\|_|   \___||_| |_||_||____/  \__|\___| \__,_||_| |_| |_||_|   \__,_||_|   |_| |_| |_|
 
- Copyright 2015 Łukasz "JustArchi" Domeradzki
+ Copyright 2015-2016 Łukasz "JustArchi" Domeradzki
  Contact: JustArchi@JustArchi.net
 
  Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,12 +21,12 @@
  limitations under the License.
 
 */
-
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using HtmlAgilityPack;
 using SteamKit2;
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Net;
 using System.Net.Http;
 using System.Text;
@@ -38,21 +38,9 @@ namespace ArchiSteamFarm {
 
 		private readonly Bot Bot;
 		private readonly string ApiKey;
-		private readonly Dictionary<string, string> SteamCookieDictionary = new Dictionary<string, string>();
+		private readonly Dictionary<string, string> Cookie = new Dictionary<string, string>(3);
 
 		private ulong SteamID;
-		private string VanityURL;
-
-		// This is required because home_process request must be done on final URL
-		private string GetHomeProcess() {
-			if (!string.IsNullOrEmpty(VanityURL)) {
-				return "http://steamcommunity.com/id/" + VanityURL + "/home_process";
-			} else if (SteamID != 0) {
-				return "http://steamcommunity.com/profiles/" + SteamID + "/home_process";
-			} else {
-				return null;
-			}
-		}
 
 		internal ArchiWebHandler(Bot bot, string apiKey) {
 			Bot = bot;
@@ -62,15 +50,14 @@ namespace ArchiSteamFarm {
 			}
 		}
 
-		internal async Task Init(SteamClient steamClient, string webAPIUserNonce, string vanityURL, string parentalPin) {
+		internal async Task<bool> Init(SteamClient steamClient, string webAPIUserNonce, string parentalPin) {
 			if (steamClient == null || steamClient.SteamID == null || string.IsNullOrEmpty(webAPIUserNonce)) {
-				return;
+				return false;
 			}
 
 			SteamID = steamClient.SteamID;
-			VanityURL = vanityURL;
 
-			string sessionID = Convert.ToBase64String(Encoding.UTF8.GetBytes(SteamID.ToString(CultureInfo.InvariantCulture)));
+			string sessionID = Convert.ToBase64String(Encoding.UTF8.GetBytes(SteamID.ToString()));
 
 			// Generate an AES session key
 			byte[] sessionKey = CryptoHelper.GenerateRandomBlock(32);
@@ -82,15 +69,16 @@ namespace ArchiSteamFarm {
 			}
 
 			// Copy our login key
-			byte[] loginKey = new byte[20];
+			byte[] loginKey = new byte[webAPIUserNonce.Length];
 			Array.Copy(Encoding.ASCII.GetBytes(webAPIUserNonce), loginKey, webAPIUserNonce.Length);
 
 			// AES encrypt the loginkey with our session key
 			byte[] cryptedLoginKey = CryptoHelper.SymmetricEncrypt(loginKey, sessionKey);
 
-			// Send the magic
+			// Do the magic
+			Logging.LogGenericInfo("Logging in to ISteamUserAuth...", Bot.BotName);
+
 			KeyValue authResult;
-			Logging.LogGenericInfo(Bot.BotName, "Logging in to ISteamUserAuth...");
 			using (dynamic iSteamUserAuth = WebAPI.GetInterface("ISteamUserAuth")) {
 				iSteamUserAuth.Timeout = Timeout;
 
@@ -103,51 +91,26 @@ namespace ArchiSteamFarm {
 						secure: true
 					);
 				} catch (Exception e) {
-					Logging.LogGenericException(Bot.BotName, e);
-					steamClient.Disconnect(); // We may get 403 if we use the same webAPIUserNonce twice
-					return;
+					Logging.LogGenericException(e, Bot.BotName);
+					return false;
 				}
 			}
 
 			if (authResult == null) {
-				steamClient.Disconnect(); // Try again
-				return;
+				return false;
 			}
 
-			Logging.LogGenericInfo(Bot.BotName, "Success!");
+			Logging.LogGenericInfo("Success!", Bot.BotName);
 
 			string steamLogin = authResult["token"].AsString();
 			string steamLoginSecure = authResult["tokensecure"].AsString();
 
-			SteamCookieDictionary.Clear();
-			SteamCookieDictionary.Add("sessionid", sessionID);
-			SteamCookieDictionary.Add("steamLogin", steamLogin);
-			SteamCookieDictionary.Add("steamLoginSecure", steamLoginSecure);
-			SteamCookieDictionary.Add("birthtime", "-473356799"); // ( ͡° ͜ʖ ͡°)
+			Cookie["sessionid"] = sessionID;
+			Cookie["steamLogin"] = steamLogin;
+			Cookie["steamLoginSecure"] = steamLoginSecure;
 
-			if (!string.IsNullOrEmpty(parentalPin) && !parentalPin.Equals("0")) {
-				Logging.LogGenericInfo(Bot.BotName, "Unlocking parental account...");
-				Dictionary<string, string> postData = new Dictionary<string, string>() {
-					{"pin", parentalPin}
-				};
-
-				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!");
-
-					var setCookieValues = response.Headers.GetValues("Set-Cookie");
-					foreach (string setCookieValue in setCookieValues) {
-						if (setCookieValue.Contains("steamparental=")) {
-							string setCookie = setCookieValue.Substring(setCookieValue.IndexOf("steamparental=") + 14);
-							setCookie = setCookie.Substring(0, setCookie.IndexOf(';'));
-							SteamCookieDictionary.Add("steamparental", setCookie);
-							break;
-						}
-					}
-				} else {
-					Logging.LogGenericInfo(Bot.BotName, "Failed!");
-				}
-			}
+			await UnlockParentalAccount(parentalPin).ConfigureAwait(false);
+			return true;
 		}
 
 		internal async Task<bool?> IsLoggedIn() {
@@ -155,8 +118,13 @@ namespace ArchiSteamFarm {
 				return false;
 			}
 
-			HtmlDocument htmlDocument = await WebBrowser.UrlGetToHtmlDocument("http://steamcommunity.com/my/profile", SteamCookieDictionary).ConfigureAwait(false);
+			HtmlDocument htmlDocument = null;
+			for (byte i = 0; i < WebBrowser.MaxRetries && htmlDocument == null; i++) {
+				htmlDocument = await WebBrowser.UrlGetToHtmlDocument("https://steamcommunity.com/my/profile", Cookie).ConfigureAwait(false);
+			}
+
 			if (htmlDocument == null) {
+				Logging.LogGenericWTF("Request failed even after " + WebBrowser.MaxRetries + " tries", Bot.BotName);
 				return null;
 			}
 
@@ -167,8 +135,8 @@ namespace ArchiSteamFarm {
 		internal async Task<bool> ReconnectIfNeeded() {
 			bool? isLoggedIn = await IsLoggedIn().ConfigureAwait(false);
 			if (isLoggedIn.HasValue && !isLoggedIn.Value) {
-				Logging.LogGenericInfo(Bot.BotName, "Reconnecting because our sessionID expired!");
-				Bot.SteamClient.Disconnect(); // Bot will handle reconnect
+				Logging.LogGenericInfo("Reconnecting because our sessionID expired!", Bot.BotName);
+				var restart = Task.Run(async () => await Bot.Restart().ConfigureAwait(false));
 				return true;
 			}
 
@@ -180,25 +148,25 @@ namespace ArchiSteamFarm {
 				return null;
 			}
 
-			KeyValue response;
-			using (dynamic iEconService = WebAPI.GetInterface("IEconService")) {
-				// Timeout
+			KeyValue response = null;
+			using (dynamic iEconService = WebAPI.GetInterface("IEconService", ApiKey)) {
 				iEconService.Timeout = Timeout;
 
-				try {
-					response = iEconService.GetTradeOffers(
-						key: ApiKey,
-						get_received_offers: 1,
-						active_only: 1,
-						secure: true
-					);
-				} catch (Exception e) {
-					Logging.LogGenericException(Bot.BotName, e);
-					return null;
+				for (byte i = 0; i < WebBrowser.MaxRetries && response == null; i++) {
+					try {
+						response = iEconService.GetTradeOffers(
+							get_received_offers: 1,
+							active_only: 1,
+							secure: true
+						);
+					} catch (Exception e) {
+						Logging.LogGenericException(e, Bot.BotName);
+					}
 				}
 			}
 
 			if (response == null) {
+				Logging.LogGenericWTF("Request failed even after " + WebBrowser.MaxRetries + " tries", Bot.BotName);
 				return null;
 			}
 
@@ -207,28 +175,16 @@ namespace ArchiSteamFarm {
 				SteamTradeOffer tradeOffer = new SteamTradeOffer {
 					tradeofferid = trade["tradeofferid"].AsString(),
 					accountid_other = trade["accountid_other"].AsInteger(),
-					message = trade["message"].AsString(),
-					expiration_time = trade["expiration_time"].AsInteger(),
-					trade_offer_state = (SteamTradeOffer.ETradeOfferState) trade["trade_offer_state"].AsInteger(),
-					items_to_give = new List<SteamItem>(),
-					items_to_receive = new List<SteamItem>(),
-					is_our_offer = trade["is_our_offer"].AsBoolean(),
-					time_created = trade["time_created"].AsInteger(),
-					time_updated = trade["time_updated"].AsInteger(),
-					from_real_time_trade = trade["from_real_time_trade"].AsBoolean(),
-					escrow_end_date = trade["escrow_end_date"].AsInteger(),
-					confirmation_method = (SteamTradeOffer.ETradeOfferConfirmationMethod) trade["confirmation_method"].AsInteger()
+					trade_offer_state = trade["trade_offer_state"].AsEnum<SteamTradeOffer.ETradeOfferState>()
 				};
 				foreach (KeyValue item in trade["items_to_give"].Children) {
 					tradeOffer.items_to_give.Add(new SteamItem {
 						appid = item["appid"].AsString(),
 						contextid = item["contextid"].AsString(),
 						assetid = item["assetid"].AsString(),
-						currencyid = item["currencyid"].AsString(),
 						classid = item["classid"].AsString(),
 						instanceid = item["instanceid"].AsString(),
 						amount = item["amount"].AsString(),
-						missing = item["missing"].AsBoolean()
 					});
 				}
 				foreach (KeyValue item in trade["items_to_receive"].Children) {
@@ -236,11 +192,9 @@ namespace ArchiSteamFarm {
 						appid = item["appid"].AsString(),
 						contextid = item["contextid"].AsString(),
 						assetid = item["assetid"].AsString(),
-						currencyid = item["currencyid"].AsString(),
 						classid = item["classid"].AsString(),
 						instanceid = item["instanceid"].AsString(),
 						amount = item["amount"].AsString(),
-						missing = item["missing"].AsBoolean()
 					});
 				}
 				result.Add(tradeOffer);
@@ -249,44 +203,34 @@ namespace ArchiSteamFarm {
 			return result;
 		}
 
-		internal async Task JoinClan(ulong clanID) {
+		internal async Task<bool> JoinClan(ulong clanID) {
 			if (clanID == 0) {
-				return;
+				return false;
 			}
 
 			string sessionID;
-			if (!SteamCookieDictionary.TryGetValue("sessionid", out sessionID)) {
-				return;
+			if (!Cookie.TryGetValue("sessionid", out sessionID)) {
+				return false;
 			}
 
-			string request = "http://steamcommunity.com/gid/" + clanID;
+			string request = "https://steamcommunity.com/gid/" + clanID;
 
-			Dictionary<string, string> postData = new Dictionary<string, string>() {
+			Dictionary<string, string> data = new Dictionary<string, string>(2) {
 				{"sessionID", sessionID},
 				{"action", "join"}
 			};
 
-			await WebBrowser.UrlPost(request, postData, SteamCookieDictionary).ConfigureAwait(false);
-		}
-
-		internal async Task LeaveClan(ulong clanID) {
-			if (clanID == 0) {
-				return;
+			HttpResponseMessage response = null;
+			for (byte i = 0; i < WebBrowser.MaxRetries && response == null; i++) {
+				response = await WebBrowser.UrlPost(request, data, Cookie).ConfigureAwait(false);
 			}
 
-			string sessionID;
-			if (!SteamCookieDictionary.TryGetValue("sessionid", out sessionID)) {
-				return;
+			if (response == null) {
+				Logging.LogGenericWTF("Request failed even after " + WebBrowser.MaxRetries + " tries", Bot.BotName);
+				return false;
 			}
 
-			string request = GetHomeProcess();
-			Dictionary<string, string> postData = new Dictionary<string, string>() {
-				{"sessionID", sessionID},
-				{"action", "leaveGroup"},
-				{"groupId", clanID.ToString()}
-			};
-
-			await WebBrowser.UrlPost(request, postData, SteamCookieDictionary).ConfigureAwait(false);
+			return true;
 		}
 
 		internal async Task<bool> AcceptTradeOffer(ulong tradeID) {
@@ -295,84 +239,223 @@ namespace ArchiSteamFarm {
 			}
 
 			string sessionID;
-			if (!SteamCookieDictionary.TryGetValue("sessionid", out sessionID)) {
+			if (!Cookie.TryGetValue("sessionid", out sessionID)) {
 				return false;
 			}
 
-			string referer = "https://steamcommunity.com/tradeoffer/" + tradeID + "/";
-			string request = referer + "accept";
+			string referer = "https://steamcommunity.com/tradeoffer/" + tradeID;
+			string request = referer + "/accept";
 
-			Dictionary<string, string> postData = new Dictionary<string, string>() {
+			Dictionary<string, string> data = new Dictionary<string, string>(3) {
 				{"sessionid", sessionID},
 				{"serverid", "1"},
 				{"tradeofferid", tradeID.ToString()}
 			};
 
-			HttpResponseMessage result = await WebBrowser.UrlPost(request, postData, SteamCookieDictionary, referer).ConfigureAwait(false);
-			if (result == null) {
+			HttpResponseMessage response = null;
+			for (byte i = 0; i < WebBrowser.MaxRetries && response == null; i++) {
+				response = await WebBrowser.UrlPost(request, data, Cookie, referer).ConfigureAwait(false);
+			}
+
+			if (response == null) {
+				Logging.LogGenericWTF("Request failed even after " + WebBrowser.MaxRetries + " tries", Bot.BotName);
 				return false;
 			}
 
-			bool success = result.IsSuccessStatusCode;
-
-			if (!success) {
-				Logging.LogGenericWarning(Bot.BotName, "Request failed, reason: " + result.ReasonPhrase);
-				switch (result.StatusCode) {
-					case HttpStatusCode.InternalServerError:
-						Logging.LogGenericWarning(Bot.BotName, "That might be caused by 7-days trade lock from new device");
-						Logging.LogGenericWarning(Bot.BotName, "Try again in 7 days, declining that offer for now");
-						DeclineTradeOffer(tradeID);
-						break;
-				}
-			}
-
-			return success;
+			return true;
 		}
 
 		internal bool DeclineTradeOffer(ulong tradeID) {
-			if (ApiKey == null) {
+			if (tradeID == 0 || ApiKey == null) {
 				return false;
 			}
 
-			if (tradeID == 0) {
-				return false;
-			}
-
-			KeyValue response;
-			using (dynamic iEconService = WebAPI.GetInterface("IEconService")) {
-				// Timeout
+			KeyValue response = null;
+			using (dynamic iEconService = WebAPI.GetInterface("IEconService", ApiKey)) {
 				iEconService.Timeout = Timeout;
 
+				for (byte i = 0; i < WebBrowser.MaxRetries && response == null; i++) {
+					try {
+						response = iEconService.DeclineTradeOffer(
+							tradeofferid: tradeID.ToString(),
+							method: WebRequestMethods.Http.Post,
+							secure: true
+						);
+					} catch (Exception e) {
+						Logging.LogGenericException(e, Bot.BotName);
+					}
+				}
+			}
+
+			if (response == null) {
+				Logging.LogGenericWTF("Request failed even after " + WebBrowser.MaxRetries + " tries", Bot.BotName);
+				return false;
+			}
+
+			return true;
+		}
+
+		internal async Task<List<SteamItem>> GetMyTradableInventory() {
+			JObject jObject = null;
+			for (byte i = 0; i < WebBrowser.MaxRetries && jObject == null; i++) {
+				jObject = await WebBrowser.UrlGetToJObject("https://steamcommunity.com/my/inventory/json/753/6?trading=1", Cookie).ConfigureAwait(false);
+			}
+
+			if (jObject == null) {
+				Logging.LogGenericWTF("Request failed even after " + WebBrowser.MaxRetries + " tries", Bot.BotName);
+				return null;
+			}
+
+			IEnumerable<JToken> jTokens = jObject.SelectTokens("$.rgInventory.*");
+			if (jTokens == null) {
+				Logging.LogNullError("jTokens", Bot.BotName);
+				return null;
+			}
+
+			List<SteamItem> result = new List<SteamItem>();
+			foreach (JToken jToken in jTokens) {
 				try {
-					response = iEconService.DeclineTradeOffer(
-						key: ApiKey,
-						tradeofferid: tradeID.ToString(),
-						method: WebRequestMethods.Http.Post,
-						secure: true
-					);
+					result.Add(JsonConvert.DeserializeObject<SteamItem>(jToken.ToString()));
 				} catch (Exception e) {
-					Logging.LogGenericException(Bot.BotName, e);
+					Logging.LogGenericException(e, Bot.BotName);
+				}
+			}
+
+			return result;
+		}
+
+		internal async Task<bool> SendTradeOffer(List<SteamItem> inventory, ulong partnerID, string token = null) {
+			if (inventory == null || inventory.Count == 0 || partnerID == 0) {
+				return false;
+			}
+
+			string sessionID;
+			if (!Cookie.TryGetValue("sessionid", out sessionID)) {
+				return false;
+			}
+
+			List<SteamTradeOfferRequest> trades = new List<SteamTradeOfferRequest>(1 + inventory.Count / Trading.MaxItemsPerTrade);
+
+			SteamTradeOfferRequest singleTrade = null;
+			for (ushort i = 0; i < inventory.Count; i++) {
+				if (i % Trading.MaxItemsPerTrade == 0) {
+					if (trades.Count >= Trading.MaxTradesPerAccount) {
+						break;
+					}
+
+					singleTrade = new SteamTradeOfferRequest();
+					trades.Add(singleTrade);
+				}
+
+				SteamItem item = inventory[i];
+				singleTrade.me.assets.Add(new SteamItem() {
+					appid = "753",
+					contextid = "6",
+					amount = item.amount,
+					assetid = item.id
+				});
+			}
+
+			string referer = "https://steamcommunity.com/tradeoffer/new";
+			string request = referer + "/send";
+
+			foreach (SteamTradeOfferRequest trade in trades) {
+				Dictionary<string, string> data = new Dictionary<string, string>(6) {
+					{"sessionid", sessionID},
+					{"serverid", "1"},
+					{"partner", partnerID.ToString()},
+					{"tradeoffermessage", "Sent by ASF"},
+					{"json_tradeoffer", JsonConvert.SerializeObject(trade)},
+					{"trade_offer_create_params", string.IsNullOrEmpty(token) ? "" : string.Format("{{ \"trade_offer_access_token\":\"{0}\" }}", token)} // TODO: This should be rewrote
+				};
+
+				HttpResponseMessage response = null;
+				for (byte i = 0; i < WebBrowser.MaxRetries && response == null; i++) {
+					response = await WebBrowser.UrlPost(request, data, Cookie, referer).ConfigureAwait(false);
+				}
+
+				if (response == null) {
+					Logging.LogGenericWTF("Request failed even after " + WebBrowser.MaxRetries + " tries", Bot.BotName);
 					return false;
 				}
 			}
 
-			return response != null; // Steam API doesn't respond with any error code, assume any response is a success
+			return true;
 		}
 
-		internal async Task<HtmlDocument> GetBadgePage(int page) {
-			if (SteamID == 0 || page == 0) {
+		internal async Task<HtmlDocument> GetBadgePage(byte page) {
+			if (page == 0 || SteamID == 0) {
 				return null;
 			}
 
-			return await WebBrowser.UrlGetToHtmlDocument("http://steamcommunity.com/profiles/" + SteamID + "/badges?p=" + page, SteamCookieDictionary).ConfigureAwait(false);
+			HtmlDocument htmlDocument = null;
+			for (byte i = 0; i < WebBrowser.MaxRetries && htmlDocument == null; i++) {
+				htmlDocument = await WebBrowser.UrlGetToHtmlDocument("https://steamcommunity.com/profiles/" + SteamID + "/badges?l=english&p=" + page, Cookie).ConfigureAwait(false);
+			}
+
+			if (htmlDocument == null) {
+				Logging.LogGenericWTF("Request failed even after " + WebBrowser.MaxRetries + " tries", Bot.BotName);
+				return null;
+			}
+
+			return htmlDocument;
 		}
 
 		internal async Task<HtmlDocument> GetGameCardsPage(ulong appID) {
-			if (SteamID == 0 || appID == 0) {
+			if (appID == 0 || SteamID == 0) {
 				return null;
 			}
 
-			return await WebBrowser.UrlGetToHtmlDocument("http://steamcommunity.com/profiles/" + SteamID + "/gamecards/" + appID, SteamCookieDictionary).ConfigureAwait(false);
+			HtmlDocument htmlDocument = null;
+			for (byte i = 0; i < WebBrowser.MaxRetries && htmlDocument == null; i++) {
+				htmlDocument = await WebBrowser.UrlGetToHtmlDocument("https://steamcommunity.com/profiles/" + SteamID + "/gamecards/" + appID + "?l=english", Cookie).ConfigureAwait(false);
+			}
+
+			if (htmlDocument == null) {
+				Logging.LogGenericWTF("Request failed even after " + WebBrowser.MaxRetries + " tries", Bot.BotName);
+				return null;
+			}
+
+			return htmlDocument;
+		}
+
+		private async Task UnlockParentalAccount(string parentalPin) {
+			if (string.IsNullOrEmpty(parentalPin) || parentalPin.Equals("0")) {
+				return;
+			}
+
+			Logging.LogGenericInfo("Unlocking parental account...", Bot.BotName);
+			Dictionary<string, string> data = new Dictionary<string, string>(1) {
+				{ "pin", parentalPin }
+			};
+
+			HttpResponseMessage response = null;
+			for (byte i = 0; i < WebBrowser.MaxRetries && response == null; i++) {
+				response = await WebBrowser.UrlPost("https://steamcommunity.com/parental/ajaxunlock", data, Cookie, "https://steamcommunity.com/").ConfigureAwait(false);
+			}
+
+			if (response == null) {
+				Logging.LogGenericWTF("Request failed even after " + WebBrowser.MaxRetries + " tries", Bot.BotName);
+				return;
+			}
+
+			IEnumerable<string> setCookieValues;
+			if (!response.Headers.TryGetValues("Set-Cookie", out setCookieValues)) {
+				Logging.LogNullError("setCookieValues", Bot.BotName);
+				return;
+			}
+
+			foreach (string setCookieValue in setCookieValues) {
+				if (setCookieValue.Contains("steamparental=")) {
+					string setCookie = setCookieValue.Substring(setCookieValue.IndexOf("steamparental=") + 14);
+					setCookie = setCookie.Substring(0, setCookie.IndexOf(';'));
+					Cookie["steamparental"] = setCookie;
+					Logging.LogGenericInfo("Success!", Bot.BotName);
+					return;
+				}
+			}
+
+			Logging.LogGenericWarning("Failed to unlock parental account!", Bot.BotName);
 		}
 	}
 }

ArchiSteamFarm/CMsgClientClanInviteAction.cs

@@ -5,7 +5,7 @@
  / ___ \ | |  | (__ | | | || | ___) || |_|  __/| (_| || | | | | ||  _|| (_| || |   | | | | | |
 /_/   \_\|_|   \___||_| |_||_||____/  \__|\___| \__,_||_| |_| |_||_|   \__,_||_|   |_| |_| |_|
 
- Copyright 2015 Łukasz "JustArchi" Domeradzki
+ Copyright 2015-2016 Łukasz "JustArchi" Domeradzki
  Contact: JustArchi@JustArchi.net
 
  Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,19 +24,18 @@
 
 using SteamKit2;
 using SteamKit2.Internal;
+using System;
 using System.IO;
 
 namespace ArchiSteamFarm {
-	internal sealed class CMsgClientClanInviteAction : ISteamSerializableMessage, ISteamSerializable {
+	internal sealed class CMsgClientClanInviteAction : ISteamSerializableMessage {
+		internal ulong GroupID { get; set; } = 0;
+		internal bool AcceptInvite { get; set; } = true;
+
 		EMsg ISteamSerializableMessage.GetEMsg() {
 			return EMsg.ClientAcknowledgeClanInvite;
 		}
 
-		internal ulong GroupID = 0;
-		internal bool AcceptInvite = true;
-
-		public CMsgClientClanInviteAction() { }
-
 		void ISteamSerializable.Serialize(Stream stream) {
 			if (stream == null) {
 				return;
@@ -46,8 +45,8 @@ namespace ArchiSteamFarm {
 				BinaryWriter binaryWriter = new BinaryWriter(stream);
 				binaryWriter.Write(GroupID);
 				binaryWriter.Write(AcceptInvite);
-			} catch {
-				throw new IOException();
+			} catch (Exception e) {
+				Logging.LogGenericException(e);
 			}
 		}
 
@@ -60,8 +59,8 @@ namespace ArchiSteamFarm {
 				BinaryReader binaryReader = new BinaryReader(stream);
 				GroupID = binaryReader.ReadUInt64();
 				AcceptInvite = binaryReader.ReadBoolean();
-			} catch {
-				throw new IOException();
+			} catch (Exception e) {
+				Logging.LogGenericException(e);
 			}
 		}
 	}

ArchiSteamFarm/CardsFarmer.cs

@@ -5,7 +5,7 @@
  / ___ \ | |  | (__ | | | || | ___) || |_|  __/| (_| || | | | | ||  _|| (_| || |   | | | | | |
 /_/   \_\|_|   \___||_| |_||_||____/  \__|\___| \__,_||_| |_| |_||_|   \__,_||_|   |_| |_| |_|
 
- Copyright 2015 Łukasz "JustArchi" Domeradzki
+ Copyright 2015-2016 Łukasz "JustArchi" Domeradzki
  Contact: JustArchi@JustArchi.net
 
  Licensed under the Apache License, Version 2.0 (the "License");
@@ -36,16 +36,17 @@ namespace ArchiSteamFarm {
 		private const byte StatusCheckSleep = 5; // In minutes, how long to wait before checking the appID again
 		private const ushort MaxFarmingTime = 600; // In minutes, how long ASF is allowed to farm one game in solo mode
 
+		internal readonly ConcurrentDictionary<uint, float> GamesToFarm = new ConcurrentDictionary<uint, float>();
+		internal readonly List<uint> CurrentGamesFarming = new List<uint>();
+
 		private readonly ManualResetEvent FarmResetEvent = new ManualResetEvent(false);
 		private readonly SemaphoreSlim Semaphore = new SemaphoreSlim(1);
 
 		private readonly Bot Bot;
 		private readonly Timer Timer;
 
-		internal readonly ConcurrentDictionary<uint, double> GamesToFarm = new ConcurrentDictionary<uint, double>();
-		internal readonly List<uint> CurrentGamesFarming = new List<uint>();
-
-		private volatile bool NowFarming = false;
+		private bool ManualMode = false;
+		private bool NowFarming = false;
 
 		internal CardsFarmer(Bot bot) {
 			Bot = bot;
@@ -54,17 +55,17 @@ namespace ArchiSteamFarm {
 				async e => await CheckGamesForFarming().ConfigureAwait(false),
 				null,
 				TimeSpan.FromMinutes(15), // Delay
-				TimeSpan.FromMinutes(15) // Period
+				TimeSpan.FromMinutes(60) // Period
 			);
 		}
 
-		internal static List<uint> GetGamesToFarmSolo(ConcurrentDictionary<uint, double> gamesToFarm) {
+		internal static List<uint> GetGamesToFarmSolo(ConcurrentDictionary<uint, float> gamesToFarm) {
 			if (gamesToFarm == null) {
 				return null;
 			}
 
 			List<uint> result = new List<uint>();
-			foreach (KeyValuePair<uint, double> keyValue in gamesToFarm) {
+			foreach (KeyValuePair<uint, float> keyValue in gamesToFarm) {
 				if (keyValue.Value >= 2) {
 					result.Add(keyValue.Key);
 				}
@@ -73,7 +74,7 @@ namespace ArchiSteamFarm {
 			return result;
 		}
 
-		internal static uint GetAnyGameToFarm(ConcurrentDictionary<uint, double> gamesToFarm) {
+		internal static uint GetAnyGameToFarm(ConcurrentDictionary<uint, float> gamesToFarm) {
 			if (gamesToFarm == null) {
 				return 0;
 			}
@@ -85,30 +86,49 @@ namespace ArchiSteamFarm {
 			return 0;
 		}
 
-		internal bool FarmMultiple() {
-			if (GamesToFarm.Count == 0) {
+		internal async Task<bool> SwitchToManualMode(bool manualMode) {
+			if (ManualMode == manualMode) {
+				return false;
+			}
+
+			ManualMode = manualMode;
+
+			if (ManualMode) {
+				Logging.LogGenericInfo("Now running in Manual Farming mode", Bot.BotName);
+				await StopFarming().ConfigureAwait(false);
+			} else {
+				Logging.LogGenericInfo("Now running in Automatic Farming mode", Bot.BotName);
+				var start = Task.Run(async () => await StartFarming().ConfigureAwait(false));
+			}
+
+			return true;
+		}
+
+		internal bool FarmMultiple(ConcurrentDictionary<uint, float> appIDs) {
+			if (appIDs.Count == 0) {
 				return true;
 			}
 
-			double maxHour = -1;
+			float maxHour = 0;
 
-			foreach (double hour in GamesToFarm.Values) {
+			foreach (float hour in appIDs.Values) {
 				if (hour > maxHour) {
 					maxHour = hour;
 				}
 			}
 
 			CurrentGamesFarming.Clear();
-			foreach (uint appID in GamesToFarm.Keys) {
+			CurrentGamesFarming.TrimExcess();
+			foreach (uint appID in appIDs.Keys) {
 				CurrentGamesFarming.Add(appID);
 			}
 
-			Logging.LogGenericInfo(Bot.BotName, "Now farming: " + string.Join(", ", GamesToFarm.Keys));
-			if (Farm(maxHour, GamesToFarm.Keys)) {
+			Logging.LogGenericInfo("Now farming: " + string.Join(", ", appIDs.Keys), Bot.BotName);
+			if (Farm(maxHour, appIDs.Keys)) {
+				CurrentGamesFarming.Clear();
 				return true;
 			} else {
 				CurrentGamesFarming.Clear();
-				NowFarming = false;
 				return false;
 			}
 		}
@@ -119,186 +139,91 @@ namespace ArchiSteamFarm {
 			}
 
 			CurrentGamesFarming.Clear();
+			CurrentGamesFarming.TrimExcess();
 			CurrentGamesFarming.Add(appID);
 
-			Logging.LogGenericInfo(Bot.BotName, "Now farming: " + appID);
+			Logging.LogGenericInfo("Now farming: " + appID, Bot.BotName);
 			if (await Farm(appID).ConfigureAwait(false)) {
-				double hours;
+				float hours;
 				GamesToFarm.TryRemove(appID, out hours);
 				return true;
 			} else {
 				CurrentGamesFarming.Clear();
-				NowFarming = false;
 				return false;
 			}
 		}
 
-		internal async Task StartFarming() {
+		internal async Task RestartFarming() {
 			await StopFarming().ConfigureAwait(false);
+			await StartFarming().ConfigureAwait(false);
+		}
 
+		internal async Task StartFarming() {
 			await Semaphore.WaitAsync().ConfigureAwait(false);
 
-			if (NowFarming) {
-				Semaphore.Release();
+			if (ManualMode) {
+				Semaphore.Release(); // We have nothing to do, don't forget to release semaphore
 				return;
 			}
 
-			// Check if farming is possible
-			Logging.LogGenericInfo(Bot.BotName, "Checking possibility to farm...");
+			if (!await IsAnythingToFarm().ConfigureAwait(false)) {
+				Semaphore.Release(); // We have nothing to do, don't forget to release semaphore
+				return;
+			}
+
+			Logging.LogGenericInfo("We have a total of " + GamesToFarm.Count + " games to farm on this account...", Bot.BotName);
 			NowFarming = true;
-			Semaphore.Release();
-			Bot.ArchiHandler.PlayGames(1337);
+			Semaphore.Release(); // From this point we allow other calls to shut us down
 
-			// We'll now either receive OnLoggedOff() with LoggedInElsewhere, or nothing happens
-			if (await Task.Run(() => FarmResetEvent.WaitOne(5000)).ConfigureAwait(false)) { // If LoggedInElsewhere happens in 5 seconds from now, abort farming
-				NowFarming = false;
-				return;
-			}
-
-			NowFarming = false;
-			Logging.LogGenericInfo(Bot.BotName, "Farming is possible!");
-
-			await Semaphore.WaitAsync().ConfigureAwait(false);
-
-			if (await Bot.ArchiWebHandler.ReconnectIfNeeded().ConfigureAwait(false)) {
-				Semaphore.Release();
-				return;
-			}
-
-			Logging.LogGenericInfo(Bot.BotName, "Checking badges...");
-
-			// Find the number of badge pages
-			HtmlDocument badgesDocument = await Bot.ArchiWebHandler.GetBadgePage(1).ConfigureAwait(false);
-			if (badgesDocument == null) {
-				Logging.LogGenericWarning(Bot.BotName, "Could not get badges information, farming is stopped!");
-				Semaphore.Release();
-				return;
-			}
-
-			var maxPages = 1;
-			HtmlNodeCollection badgesPagesNodeCollection = badgesDocument.DocumentNode.SelectNodes("//a[@class='pagelink']");
-			if (badgesPagesNodeCollection != null) {
-				maxPages = (badgesPagesNodeCollection.Count / 2) + 1; // Don't do this at home
-			}
-
-			// Find APPIDs we need to farm
-			for (var page = 1; page <= maxPages; page++) {
-				Logging.LogGenericInfo(Bot.BotName, "Checking page: " + page + "/" + maxPages);
-
-				if (page > 1) { // Because we fetched page number 1 already
-					badgesDocument = await Bot.ArchiWebHandler.GetBadgePage(page).ConfigureAwait(false);
-					if (badgesDocument == null) {
-						break;
-					}
-				}
-
-				HtmlNodeCollection badgesPageNodes = badgesDocument.DocumentNode.SelectNodes("//a[@class='btn_green_white_innerfade btn_small_thin']");
-				if (badgesPageNodes == null) {
-					continue;
-				}
-
-				GamesToFarm.Clear();
-				foreach (HtmlNode badgesPageNode in badgesPageNodes) {
-					string steamLink = badgesPageNode.GetAttributeValue("href", null);
-					if (steamLink == null) {
-						continue;
-					}
-
-					uint appID = (uint) Utilities.OnlyNumbers(steamLink);
-					if (appID == 0) {
-						continue;
-					}
-
-					if (Bot.Blacklist.Contains(appID)) {
-						continue;
-					}
-
-					// We assume that every game has at least 2 hours played, until we actually check them
-					GamesToFarm.AddOrUpdate(appID, 2, (key, value) => 2);
-				}
-			}
-
-			// 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();
+			bool farmedSomething = false;
 
 			// Now the algorithm used for farming depends on whether account is restricted or not
-			if (Bot.CardDropsRestricted) {
-				// If we have restricted card drops, we use complex algorithm, 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");
+			if (Bot.CardDropsRestricted) { // If we have restricted card drops, we use complex algorithm
+				Logging.LogGenericInfo("Chosen farming algorithm: Complex", Bot.BotName);
 				while (GamesToFarm.Count > 0) {
 					List<uint> gamesToFarmSolo = GetGamesToFarmSolo(GamesToFarm);
 					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);
+							if (await FarmSolo(appID).ConfigureAwait(false)) {
+								farmedSomething = true;
+								Logging.LogGenericInfo("Done farming: " + appID, Bot.BotName);
 								gamesToFarmSolo.Remove(appID);
+								gamesToFarmSolo.TrimExcess();
 							} else {
+								NowFarming = false;
 								return;
 							}
 						}
 					} else {
-						bool success = FarmMultiple();
-						if (success) {
-							Logging.LogGenericInfo(Bot.BotName, "Done farming: " + string.Join(", ", GamesToFarm.Keys));
+						if (FarmMultiple(GamesToFarm)) {
+							farmedSomething = true;
+							Logging.LogGenericInfo("Done farming: " + string.Join(", ", GamesToFarm.Keys), Bot.BotName);
 						} else {
+							NowFarming = false;
 							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");
+			} else { // If we have unrestricted card drops, we use simple algorithm
+				Logging.LogGenericInfo("Chosen farming algorithm: Simple", Bot.BotName);
 				while (GamesToFarm.Count > 0) {
 					uint appID = GetAnyGameToFarm(GamesToFarm);
-					bool success = await FarmSolo(appID).ConfigureAwait(false);
-					if (success) {
-						Logging.LogGenericInfo(Bot.BotName, "Done farming: " + appID);
+					if (await FarmSolo(appID).ConfigureAwait(false)) {
+						farmedSomething = true;
+						Logging.LogGenericInfo("Done farming: " + appID, Bot.BotName);
 					} else {
+						NowFarming = false;
 						return;
 					}
 				}
 			}
 
 			CurrentGamesFarming.Clear();
+			CurrentGamesFarming.TrimExcess();
 			NowFarming = false;
-			Logging.LogGenericInfo(Bot.BotName, "Farming finished!");
-			await Bot.OnFarmingFinished().ConfigureAwait(false);
+			Logging.LogGenericInfo("Farming finished!", Bot.BotName);
+			await Bot.OnFarmingFinished(farmedSomething).ConfigureAwait(false);
 		}
 
 		internal async Task StopFarming() {
@@ -309,19 +234,158 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
-			Logging.LogGenericInfo(Bot.BotName, "Sending signal to stop farming");
+			Logging.LogGenericInfo("Sending signal to stop farming", Bot.BotName);
 			FarmResetEvent.Set();
-			for (var i = 0; i < 5 && NowFarming; i++) {
-				Logging.LogGenericInfo(Bot.BotName, "Waiting for reaction...");
+			for (byte i = 0; i < 5 && NowFarming; i++) {
+				Logging.LogGenericInfo("Waiting for reaction...", Bot.BotName);
 				await Utilities.SleepAsync(1000).ConfigureAwait(false);
 			}
 			FarmResetEvent.Reset();
-			Logging.LogGenericInfo(Bot.BotName, "Farming stopped!");
+			Logging.LogGenericInfo("Farming stopped!", Bot.BotName);
 			Semaphore.Release();
 		}
 
+		private async Task<bool> IsAnythingToFarm() {
+			if (NowFarming) {
+				return false;
+			}
+
+			if (await Bot.ArchiWebHandler.ReconnectIfNeeded().ConfigureAwait(false)) {
+				return false;
+			}
+
+			Logging.LogGenericInfo("Checking badges...", Bot.BotName);
+
+			// Find the number of badge pages
+			Logging.LogGenericInfo("Checking first page...", Bot.BotName);
+			HtmlDocument htmlDocument = await Bot.ArchiWebHandler.GetBadgePage(1).ConfigureAwait(false);
+			if (htmlDocument == null) {
+				Logging.LogGenericWarning("Could not get badges information, will try again later!", Bot.BotName);
+				return false;
+			}
+
+			byte maxPages = 1;
+			HtmlNodeCollection htmlNodeCollection = htmlDocument.DocumentNode.SelectNodes("//a[@class='pagelink']");
+			if (htmlNodeCollection != null && htmlNodeCollection.Count > 0) {
+				HtmlNode htmlNode = htmlNodeCollection[htmlNodeCollection.Count - 1];
+				if (!byte.TryParse(htmlNode.InnerText, out maxPages)) {
+					maxPages = 1; // Should never happen
+				}
+			}
+
+			GamesToFarm.Clear();
+
+			// Find APPIDs we need to farm
+			Logging.LogGenericInfo("Checking other pages...", Bot.BotName);
+
+			List<Task> tasks = new List<Task>(maxPages - 1);
+			for (byte page = 1; page <= maxPages; page++) {
+				if (page == 1) {
+					CheckPage(htmlDocument); // Because we fetched page number 1 already
+				} else {
+					byte currentPage = page; // We need a copy of variable being passed when in for loops
+					tasks.Add(Task.Run(async () => await CheckPage(currentPage).ConfigureAwait(false)));
+				}
+			}
+			await Task.WhenAll(tasks).ConfigureAwait(false);
+
+			if (GamesToFarm.Count == 0) {
+				return true;
+			}
+
+			// If we have restricted card drops, actually do check hours of all games that are left to farm
+			if (Bot.CardDropsRestricted) {
+				tasks = new List<Task>(GamesToFarm.Keys.Count);
+				Logging.LogGenericInfo("Checking hours...", Bot.BotName);
+				foreach (uint appID in GamesToFarm.Keys) {
+					tasks.Add(Task.Run(async () => await CheckHours(appID).ConfigureAwait(false)));
+				}
+				await Task.WhenAll(tasks).ConfigureAwait(false);
+			}
+
+			return true;
+		}
+
+		private void CheckPage(HtmlDocument htmlDocument) {
+			if (htmlDocument == null) {
+				return;
+			}
+
+			HtmlNodeCollection htmlNodeCollection = htmlDocument.DocumentNode.SelectNodes("//a[@class='btn_green_white_innerfade btn_small_thin']");
+			if (htmlNodeCollection == null) {
+				return;
+			}
+
+			foreach (HtmlNode htmlNode in htmlNodeCollection) {
+				string steamLink = htmlNode.GetAttributeValue("href", null);
+				if (steamLink == null) {
+					continue;
+				}
+
+				uint appID = (uint) Utilities.OnlyNumbers(steamLink);
+				if (appID == 0) {
+					continue;
+				}
+
+				if (Bot.GlobalBlacklist.Contains(appID) || Bot.Blacklist.Contains(appID)) {
+					continue;
+				}
+
+				// We assume that every game has at least 2 hours played, until we actually check them
+				GamesToFarm[appID] = 2;
+			}
+		}
+
+		private async Task CheckPage(byte page) {
+			if (page == 0) {
+				return;
+			}
+
+			HtmlDocument htmlDocument = await Bot.ArchiWebHandler.GetBadgePage(page).ConfigureAwait(false);
+			if (htmlDocument == null) {
+				return;
+			}
+
+			CheckPage(htmlDocument);
+		}
+
+		private async Task CheckHours(uint appID) {
+			if (appID == 0) {
+				return;
+			}
+
+			HtmlDocument htmlDocument = await Bot.ArchiWebHandler.GetGameCardsPage(appID).ConfigureAwait(false);
+			if (htmlDocument == null) {
+				Logging.LogNullError("htmlDocument", Bot.BotName);
+				return;
+			}
+
+			HtmlNode htmlNode = htmlDocument.DocumentNode.SelectSingleNode("//div[@class='badge_title_stats_playtime']");
+			if (htmlNode == null) {
+				Logging.LogNullError("htmlNode", Bot.BotName);
+				return;
+			}
+
+			string hoursString = htmlNode.InnerText;
+			if (string.IsNullOrEmpty(hoursString)) {
+				Logging.LogNullError("hoursString", Bot.BotName);
+				return;
+			}
+
+			hoursString = Regex.Match(hoursString, @"[0-9\.,]+").Value;
+			float hours;
+
+			if (string.IsNullOrEmpty(hoursString)) {
+				hours = 0;
+			} else {
+				hours = float.Parse(hoursString, CultureInfo.InvariantCulture);
+			}
+
+			GamesToFarm[appID] = hours;
+		}
+
 		private async Task CheckGamesForFarming() {
-			if (NowFarming || GamesToFarm.Count > 0) {
+			if (NowFarming || ManualMode || GamesToFarm.Count > 0 || !Bot.SteamClient.IsConnected) {
 				return;
 			}
 
@@ -354,7 +418,7 @@ namespace ArchiSteamFarm {
 
 			bool? keepFarming = await ShouldFarm(appID).ConfigureAwait(false);
 			for (ushort farmingTime = 0; farmingTime <= MaxFarmingTime && (!keepFarming.HasValue || keepFarming.Value); farmingTime += StatusCheckSleep) {
-				Logging.LogGenericInfo(Bot.BotName, "Still farming: " + appID);
+				Logging.LogGenericInfo("Still farming: " + appID, Bot.BotName);
 				if (FarmResetEvent.WaitOne(1000 * 60 * StatusCheckSleep)) {
 					success = false;
 					break;
@@ -363,11 +427,11 @@ namespace ArchiSteamFarm {
 			}
 
 			Bot.ArchiHandler.PlayGames(0);
-			Logging.LogGenericInfo(Bot.BotName, "Stopped farming: " + appID);
+			Logging.LogGenericInfo("Stopped farming: " + appID, Bot.BotName);
 			return success;
 		}
 
-		private bool Farm(double maxHour, ICollection<uint> appIDs) {
+		private bool Farm(float maxHour, ICollection<uint> appIDs) {
 			if (maxHour >= 2) {
 				return true;
 			}
@@ -376,27 +440,27 @@ namespace ArchiSteamFarm {
 
 			bool success = true;
 			while (maxHour < 2) {
-				Logging.LogGenericInfo(Bot.BotName, "Still farming: " + string.Join(", ", appIDs));
+				Logging.LogGenericInfo("Still farming: " + string.Join(", ", appIDs), Bot.BotName);
 				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)) {
+				float timePlayed = StatusCheckSleep / 60.0F;
+				foreach (KeyValuePair<uint, float> gameToFarm in GamesToFarm) {
+					if (!appIDs.Contains(gameToFarm.Key)) {
 						continue;
 					}
 
-					GamesToFarm[keyValue.Key] = keyValue.Value + timePlayed;
+					GamesToFarm[gameToFarm.Key] = gameToFarm.Value + timePlayed;
 				}
 
 				maxHour += timePlayed;
 			}
 
 			Bot.ArchiHandler.PlayGames(0);
-			Logging.LogGenericInfo(Bot.BotName, "Stopped farming: " + string.Join(", ", appIDs));
+			Logging.LogGenericInfo("Stopped farming: " + string.Join(", ", appIDs), Bot.BotName);
 			return success;
 		}
 	}

ArchiSteamFarm/Debugging.cs

@@ -5,7 +5,7 @@
  / ___ \ | |  | (__ | | | || | ___) || |_|  __/| (_| || | | | | ||  _|| (_| || |   | | | | | |
 /_/   \_\|_|   \___||_| |_||_||____/  \__|\___| \__,_||_| |_| |_||_|   \__,_||_|   |_| |_| |_|
 
- Copyright 2015 Łukasz "JustArchi" Domeradzki
+ Copyright 2015-2016 Łukasz "JustArchi" Domeradzki
  Contact: JustArchi@JustArchi.net
 
  Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,20 +22,14 @@
 
 */
 
-using System.Diagnostics;
-
 namespace ArchiSteamFarm {
 	internal static class Debugging {
-		internal static bool IsDebugBuild { get; private set; } = false;
-		internal static bool IsReleaseBuild { get { return !IsDebugBuild; } }
+#if DEBUG
+		internal static readonly bool IsDebugBuild = true;
+#else
+		internal static readonly bool IsDebugBuild = false;
+#endif
 
-		static Debugging() {
-			MarkIfDebug();
-		}
-
-		[Conditional("DEBUG")]
-		private static void MarkIfDebug() {
-			IsDebugBuild = true;
-		}
+		internal static bool IsReleaseBuild => !IsDebugBuild;
 	}
 }

ArchiSteamFarm/Logging.cs

@@ -5,7 +5,7 @@
  / ___ \ | |  | (__ | | | || | ___) || |_|  __/| (_| || | | | | ||  _|| (_| || |   | | | | | |
 /_/   \_\|_|   \___||_| |_||_||____/  \__|\___| \__,_||_| |_| |_||_|   \__,_||_|   |_| |_| |_|
 
- Copyright 2015 Łukasz "JustArchi" Domeradzki
+ Copyright 2015-2016 Łukasz "JustArchi" Domeradzki
  Contact: JustArchi@JustArchi.net
 
  Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,46 +24,115 @@
 
 using System;
 using System.Diagnostics;
+using System.IO;
 using System.Runtime.CompilerServices;
 
 namespace ArchiSteamFarm {
 	internal static class Logging {
-		private static void Log(string message) {
-			if (Program.ConsoleIsBusy) {
+		private static readonly object FileLock = new object();
+
+		internal static bool LogToFile { get; set; } = false;
+
+		internal static void Init() {
+			lock (FileLock) {
+				try {
+					File.Delete(Program.LogFile);
+				} catch (Exception e) {
+					bool logToFile = LogToFile;
+					LogToFile = false;
+					LogGenericException(e);
+					LogToFile = logToFile;
+				}
+			}
+		}
+
+		internal static void LogGenericWTF(string message, string botName = "Main", [CallerMemberName] string previousMethodName = "") {
+			if (string.IsNullOrEmpty(message)) {
 				return;
 			}
 
-			Console.WriteLine(DateTime.Now + " " + message);
+			Log("[!!] WTF: " + previousMethodName + "() <" + botName + "> " + message + ", WTF?");
 		}
 
-		internal static void LogGenericError(string botName, string message, [CallerMemberName] string previousMethodName = "") {
+		internal static void LogGenericError(string message, string botName = "Main", [CallerMemberName] string previousMethodName = "") {
+			if (string.IsNullOrEmpty(message)) {
+				return;
+			}
+
 			Log("[!!] ERROR: " + previousMethodName + "() <" + botName + "> " + message);
 		}
 
-		internal static void LogGenericException(string botName, Exception exception, [CallerMemberName] string previousMethodName = "") {
+		internal static void LogGenericException(Exception exception, string botName = "Main", [CallerMemberName] string previousMethodName = "") {
+			if (exception == null) {
+				return;
+			}
+
 			Log("[!] EXCEPTION: " + previousMethodName + "() <" + botName + "> " + exception.Message);
+			Log("[!] StackTrace: " + exception.StackTrace);
+
+			Exception innerException = exception.InnerException;
+			if (innerException != null) {
+				LogGenericException(innerException, botName, previousMethodName);
+			}
 		}
 
-		internal static void LogGenericWarning(string botName, string message, [CallerMemberName] string previousMethodName = "") {
+		internal static void LogGenericWarning(string message, string botName = "Main", [CallerMemberName] string previousMethodName = "") {
+			if (string.IsNullOrEmpty(message)) {
+				return;
+			}
+
 			Log("[!] WARNING: " + previousMethodName + "() <" + botName + "> " + message);
 		}
 
-		internal static void LogGenericInfo(string botName, string message, [CallerMemberName] string previousMethodName = "") {
+		internal static void LogGenericInfo(string message, string botName = "Main", [CallerMemberName] string previousMethodName = "") {
+			if (string.IsNullOrEmpty(message)) {
+				return;
+			}
+
 			Log("[*] INFO: " + previousMethodName + "() <" + botName + "> " + message);
 		}
 
-		internal static void LogGenericNotice(string botName, string message, [CallerMemberName] string previousMethodName = "") {
-			Log("[*] NOTICE: " + previousMethodName + "() <" + botName + "> " + message);
+		internal static void LogNullError(string nullObjectName, string botName = "Main", [CallerMemberName] string previousMethodName = "") {
+			if (string.IsNullOrEmpty(nullObjectName)) {
+				return;
+			}
+
+			LogGenericError(nullObjectName + " is null!", botName, previousMethodName);
 		}
 
 		[Conditional("DEBUG")]
-		internal static void LogGenericDebug(string botName, string message, [CallerMemberName] string previousMethodName = "") {
+		internal static void LogGenericDebug(string message, string botName = "Main", [CallerMemberName] string previousMethodName = "") {
+			if (string.IsNullOrEmpty(message)) {
+				return;
+			}
+
 			Log("[#] DEBUG: " + previousMethodName + "() <" + botName + "> " + message);
 		}
 
-		[Conditional("DEBUG")]
-		internal static void LogGenericDebug(string message, [CallerMemberName] string previousMethodName = "") {
-			LogGenericDebug("DEBUG", message, previousMethodName);
+		private static void Log(string message) {
+			if (string.IsNullOrEmpty(message)) {
+				return;
+			}
+
+			string loggedMessage = DateTime.Now + " " + message + Environment.NewLine;
+
+			// Write on console only when not awaiting response from user
+			if (!Program.ConsoleIsBusy) {
+				Console.Write(loggedMessage);
+			}
+
+			if (LogToFile) {
+				lock (FileLock) {
+					try {
+						File.AppendAllText(Program.LogFile, loggedMessage);
+					} catch (Exception e) {
+						bool logToFile = LogToFile;
+						LogToFile = false;
+						LogGenericException(e);
+						LogToFile = logToFile;
+					}
+				}
+			}
 		}
 	}
 }

ArchiSteamFarm/Program.cs

@@ -5,7 +5,7 @@
  / ___ \ | |  | (__ | | | || | ___) || |_|  __/| (_| || | | | | ||  _|| (_| || |   | | | | | |
 /_/   \_\|_|   \___||_| |_||_||____/  \__|\___| \__,_||_| |_| |_||_|   \__,_||_|   |_| |_| |_|
 
- Copyright 2015 Łukasz "JustArchi" Domeradzki
+ Copyright 2015-2016 Łukasz "JustArchi" Domeradzki
  Contact: JustArchi@JustArchi.net
 
  Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,7 +31,7 @@ using System.Threading.Tasks;
 
 namespace ArchiSteamFarm {
 	internal static class Program {
-		internal enum EUserInputType {
+		internal enum EUserInputType : byte {
 			Login,
 			Password,
 			PhoneNumber,
@@ -42,23 +42,29 @@ namespace ArchiSteamFarm {
 			TwoFactorAuthentication,
 		}
 
+		internal enum EMode : byte {
+			Normal, // Standard most common usage
+			Client, // WCF client only
+			Server // Normal + WCF server
+		}
+
 		private const string LatestGithubReleaseURL = "https://api.github.com/repos/JustArchi/ArchiSteamFarm/releases/latest";
+		internal const string ConfigDirectory = "config";
+		internal const string LogFile = "log.txt";
 
-		internal const ulong ArchiSCFarmGroup = 103582791440160998;
-		internal const string ConfigDirectoryPath = "config";
-
+		private static readonly object ConsoleLock = new object();
 		private static readonly SemaphoreSlim SteamSemaphore = new SemaphoreSlim(1);
 		private static readonly ManualResetEvent ShutdownResetEvent = new ManualResetEvent(false);
 		private static readonly Assembly Assembly = Assembly.GetExecutingAssembly();
-		private static readonly string ExecutablePath = Assembly.Location;
-		private static readonly AssemblyName AssemblyName = Assembly.GetName();
-		private static readonly object ConsoleLock = new object();
-		//private static readonly string ExeName = AssemblyName.Name + ".exe";
+		private static readonly string ExecutableFile = Assembly.Location;
+		private static readonly string ExecutableDirectory = Path.GetDirectoryName(ExecutableFile);
+		private static readonly WCF WCF = new WCF();
 
-		internal static readonly uint UniqueID = (uint) Utilities.Random.Next();
-		internal static readonly string Version = AssemblyName.Version.ToString();
+		internal static readonly string Version = Assembly.GetName().Version.ToString();
 
-		internal static bool ConsoleIsBusy = false;
+		private static EMode Mode;
+
+		internal static bool ConsoleIsBusy { get; private set; } = false;
 
 		private static async Task CheckForUpdate() {
 			JObject response = await WebBrowser.UrlGetToJObject(LatestGithubReleaseURL).ConfigureAwait(false);
@@ -73,35 +79,35 @@ namespace ArchiSteamFarm {
 
 			string localVersion = Version;
 
-			Logging.LogGenericNotice("", "Local version: " + localVersion);
-			Logging.LogGenericNotice("", "Remote version: " + remoteVersion);
+			Logging.LogGenericInfo("Local version: " + localVersion);
+			Logging.LogGenericInfo("Remote version: " + remoteVersion);
 
 			int comparisonResult = localVersion.CompareTo(remoteVersion);
 			if (comparisonResult < 0) {
-				Logging.LogGenericNotice("", "New version is available!");
-				Logging.LogGenericNotice("", "Consider updating yourself!");
+				Logging.LogGenericInfo("New version is available!");
+				Logging.LogGenericInfo("Consider updating yourself!");
 				await Utilities.SleepAsync(5000).ConfigureAwait(false);
 			} else if (comparisonResult > 0) {
-				Logging.LogGenericNotice("", "You're currently using pre-release version!");
-				Logging.LogGenericNotice("", "Be careful!");
+				Logging.LogGenericInfo("You're currently using pre-release version!");
+				Logging.LogGenericInfo("Be careful!");
 			}
 		}
 
-		internal static async Task Exit(int exitCode = 0) {
-			await Bot.ShutdownAllBots().ConfigureAwait(false);
+		internal static void Exit(int exitCode = 0) {
 			Environment.Exit(exitCode);
 		}
 
-		internal static async Task Restart() {
-			await Bot.ShutdownAllBots().ConfigureAwait(false);
-			System.Diagnostics.Process.Start(ExecutablePath);
-			Environment.Exit(0);
+		internal static void Restart() {
+			System.Diagnostics.Process.Start(ExecutableFile, string.Join(" ", Environment.GetCommandLineArgs()));
+			Exit();
 		}
 
 		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();
+			var releaseLater = Task.Run(async () => {
+				await Utilities.SleepAsync(7000).ConfigureAwait(false); // We must add some delay to not get caught by Steam rate limiter
+				SteamSemaphore.Release();
+			});
 		}
 
 		internal static string GetUserInput(string botLogin, EUserInputType userInputType, string extraInformation = null) {
@@ -144,53 +150,142 @@ namespace ArchiSteamFarm {
 			return result.Trim(); // Get rid of all whitespace characters
 		}
 
-		internal static async void OnBotShutdown() {
-			if (Bot.GetRunningBotsCount() == 0) {
-				Logging.LogGenericInfo("Main", "No bots are running, exiting");
-				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;
-					}
+		internal static void OnBotShutdown() {
+			foreach (Bot bot in Bot.Bots.Values) {
+				if (bot.KeepRunning) {
+					return;
 				}
 			}
 
-			if (!Directory.Exists(ConfigDirectoryPath)) {
-				Logging.LogGenericError("Main", "Config directory doesn't exist!");
-				Console.ReadLine();
-				Task.Run(async () => await Exit(1).ConfigureAwait(false)).Wait();
+			if (WCF.IsServerRunning()) {
+				return;
 			}
 
-			foreach (var configFile in Directory.EnumerateFiles(ConfigDirectoryPath, "*.xml")) {
+			Logging.LogGenericInfo("No bots are running, exiting");
+			ShutdownResetEvent.Set();
+		}
+
+		private static void InitServices() {
+			Logging.Init();
+			WebBrowser.Init();
+		}
+
+		private static void ParseArgs(string[] args) {
+			foreach (string arg in args) {
+				switch (arg) {
+					case "--client":
+						Mode = EMode.Client;
+						Logging.LogToFile = false;
+						break;
+					case "--log":
+						Logging.LogToFile = true;
+						break;
+					case "--no-log":
+						Logging.LogToFile = false;
+						break;
+					case "--server":
+						Mode = EMode.Server;
+						WCF.StartServer();
+						break;
+					default:
+						if (arg.StartsWith("--")) {
+							Logging.LogGenericWarning("Unrecognized parameter: " + arg);
+							continue;
+						}
+
+						if (Mode != EMode.Client) {
+							Logging.LogGenericWarning("Ignoring command because --client wasn't specified: " + arg);
+							continue;
+						}
+
+						Logging.LogGenericInfo("Command sent: \"" + arg + "\"");
+
+						// We intentionally execute this async block synchronously
+						Logging.LogGenericInfo("Response received: \"" + WCF.SendCommand(arg) + "\"");
+						/*
+						Task.Run(async () => {
+							Logging.LogGenericNotice("WCF", "Response received: " + await WCF.SendCommand(arg).ConfigureAwait(false));
+						}).Wait();
+						*/
+						break;
+				}
+			}
+		}
+
+		private static void UnhandledExceptionHandler(object sender, UnhandledExceptionEventArgs args) {
+			if (sender == null || args == null) {
+				return;
+			}
+
+			Logging.LogGenericException((Exception) args.ExceptionObject);
+		}
+
+		private static void Main(string[] args) {
+			AppDomain.CurrentDomain.UnhandledException += UnhandledExceptionHandler;
+
+			Logging.LogGenericInfo("Archi's Steam Farm, version " + Version);
+			Directory.SetCurrentDirectory(ExecutableDirectory);
+			InitServices();
+
+			// Allow loading configs from source tree if it's a debug build
+			if (Debugging.IsDebugBuild) {
+
+				// Common structure is bin/(x64/)Debug/ArchiSteamFarm.exe, so we allow up to 4 directories up
+				for (var i = 0; i < 4; i++) {
+					Directory.SetCurrentDirectory("..");
+					if (Directory.Exists(ConfigDirectory)) {
+						break;
+					}
+				}
+
+				// If config directory doesn't exist after our adjustment, abort all of that
+				if (!Directory.Exists(ConfigDirectory)) {
+					Directory.SetCurrentDirectory(ExecutableDirectory);
+				}
+			}
+
+			// By default we're operating on normal mode
+			Mode = EMode.Normal;
+			Logging.LogToFile = true;
+
+			// But that can be overriden by arguments
+			ParseArgs(args);
+
+			// If we ran ASF as a client, we're done by now
+			if (Mode == EMode.Client) {
+				return;
+			}
+
+			Task.Run(async () => await CheckForUpdate().ConfigureAwait(false)).Wait();
+
+			if (!Directory.Exists(ConfigDirectory)) {
+				Logging.LogGenericError("Config directory doesn't exist!");
+				Thread.Sleep(5000);
+				Exit(1);
+			}
+
+			// Before attempting to connect, initialize our list of CMs
+			Bot.RefreshCMs().Wait();
+
+			foreach (var configFile in Directory.EnumerateFiles(ConfigDirectory, "*.xml")) {
 				string botName = Path.GetFileNameWithoutExtension(configFile);
 				Bot bot = new Bot(botName);
 				if (!bot.Enabled) {
-					Logging.LogGenericInfo(botName, "Not starting this instance because it's disabled in config file");
+					Logging.LogGenericInfo("Not starting this instance because it's disabled in config file", botName);
 				}
 			}
 
 			// Check if we got any bots running
 			OnBotShutdown();
 
+			// Wait for signal to shutdown
 			ShutdownResetEvent.WaitOne();
+
+			// We got a signal to shutdown, consider giving user some time to read the message
+			Thread.Sleep(5000);
+
+			// This is over, cleanup only now
+			WCF.StopServer();
 		}
 	}
 }

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("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]

ArchiSteamFarm/SteamItem.cs

@@ -5,7 +5,7 @@
  / ___ \ | |  | (__ | | | || | ___) || |_|  __/| (_| || | | | | ||  _|| (_| || |   | | | | | |
 /_/   \_\|_|   \___||_| |_||_||____/  \__|\___| \__,_||_| |_| |_||_|   \__,_||_|   |_| |_| |_|
 
- Copyright 2015 Łukasz "JustArchi" Domeradzki
+ Copyright 2015-2016 Łukasz "JustArchi" Domeradzki
  Contact: JustArchi@JustArchi.net
 
  Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,16 +22,34 @@
 
 */
 
+using Newtonsoft.Json;
+
 namespace ArchiSteamFarm {
 	internal sealed class SteamItem {
-		// REF: https://developer.valvesoftware.com/wiki/Steam_Web_API/IEconService
+		// REF: https://developer.valvesoftware.com/wiki/Steam_Web_API/IEconService#CEcon_Asset
+
+		[JsonProperty(Required = Required.DisallowNull)]
 		internal string appid { get; set; }
+
+		[JsonProperty(Required = Required.DisallowNull)]
 		internal string contextid { get; set; }
+
+		[JsonProperty(Required = Required.DisallowNull)]
 		internal string assetid { get; set; }
-		internal string currencyid { get; set; }
+
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal string id {
+			get { return assetid; }
+			set { assetid = value; }
+		}
+
+		[JsonProperty(Required = Required.AllowNull)]
 		internal string classid { get; set; }
+
+		[JsonProperty(Required = Required.AllowNull)]
 		internal string instanceid { get; set; }
+
+		[JsonProperty(Required = Required.Always)]
 		internal string amount { get; set; }
-		internal bool missing { get; set; }
 	}
 }

ArchiSteamFarm/SteamItemList.cs

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

ArchiSteamFarm/SteamTradeOffer.cs

@@ -5,7 +5,7 @@
  / ___ \ | |  | (__ | | | || | ___) || |_|  __/| (_| || | | | | ||  _|| (_| || |   | | | | | |
 /_/   \_\|_|   \___||_| |_||_||____/  \__|\___| \__,_||_| |_| |_||_|   \__,_||_|   |_| |_| |_|
 
- Copyright 2015 Łukasz "JustArchi" Domeradzki
+ Copyright 2015-2016 Łukasz "JustArchi" Domeradzki
  Contact: JustArchi@JustArchi.net
 
  Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,13 +22,14 @@
 
 */
 
+using Newtonsoft.Json;
 using SteamKit2;
 using System.Collections.Generic;
 
 namespace ArchiSteamFarm {
 	internal sealed class SteamTradeOffer {
-		// REF: https://developer.valvesoftware.com/wiki/Steam_Web_API/IEconService
-		internal enum ETradeOfferState {
+		// REF: https://developer.valvesoftware.com/wiki/Steam_Web_API/IEconService#CEcon_TradeOffer
+		internal enum ETradeOfferState : byte {
 			Unknown,
 			Invalid,
 			Active,
@@ -43,25 +44,20 @@ namespace ArchiSteamFarm {
 			OnHold
 		}
 
-		internal enum ETradeOfferConfirmationMethod {
-			Invalid,
-			Email,
-			MobileApp
-		}
-
+		[JsonProperty(Required = Required.Always)]
 		internal string tradeofferid { get; set; }
+
+		[JsonProperty(Required = Required.Always)]
 		internal int accountid_other { get; set; }
-		internal string message { get; set; }
-		internal int expiration_time { get; set; }
+
+		[JsonProperty(Required = Required.Always)]
 		internal ETradeOfferState trade_offer_state { get; set; }
-		internal List<SteamItem> items_to_give { get; set; }
-		internal List<SteamItem> items_to_receive { get; set; }
-		internal bool is_our_offer { get; set; }
-		internal int time_created { get; set; }
-		internal int time_updated { get; set; }
-		internal bool from_real_time_trade { get; set; }
-		internal int escrow_end_date { get; set; }
-		internal ETradeOfferConfirmationMethod confirmation_method { get; set; }
+
+		[JsonProperty(Required = Required.Always)]
+		internal List<SteamItem> items_to_give { get; } = new List<SteamItem>();
+
+		[JsonProperty(Required = Required.Always)]
+		internal List<SteamItem> items_to_receive { get; } = new List<SteamItem>();
 
 		// Extra
 		private ulong _OtherSteamID64 = 0;

ArchiSteamFarm/SteamTradeOfferRequest.cs

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

ArchiSteamFarm/Trading.cs

@@ -5,7 +5,7 @@
  / ___ \ | |  | (__ | | | || | ___) || |_|  __/| (_| || | | | | ||  _|| (_| || |   | | | | | |
 /_/   \_\|_|   \___||_| |_||_||____/  \__|\___| \__,_||_| |_| |_||_|   \__,_||_|   |_| |_| |_|
 
- Copyright 2015 Łukasz "JustArchi" Domeradzki
+ Copyright 2015-2016 Łukasz "JustArchi" Domeradzki
  Contact: JustArchi@JustArchi.net
 
  Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,10 +28,23 @@ using System.Threading.Tasks;
 
 namespace ArchiSteamFarm {
 	internal sealed class Trading {
+		internal const byte MaxItemsPerTrade = 150; // This is due to limit on POST size in WebBrowser
+		internal const byte MaxTradesPerAccount = 5; // This is limit introduced by Valve
+
+		private static readonly SemaphoreSlim InventorySemaphore = new SemaphoreSlim(1);
+
 		private readonly Bot Bot;
 		private readonly SemaphoreSlim Semaphore = new SemaphoreSlim(1);
 		private volatile byte ParsingTasks = 0;
 
+		internal static async Task LimitInventoryRequestsAsync() {
+			await InventorySemaphore.WaitAsync().ConfigureAwait(false);
+			var releaseLater = Task.Run(async () => {
+				await Utilities.SleepAsync(3000).ConfigureAwait(false); // We must add some delay to not get caught by Steam rate limiter
+				InventorySemaphore.Release();
+			});
+		}
+
 		internal Trading(Bot bot) {
 			Bot = bot;
 		}
@@ -76,10 +89,10 @@ namespace ArchiSteamFarm {
 			}
 
 			if (tradeOffer.items_to_give.Count == 0 || tradeOffer.OtherSteamID64 == Bot.SteamMasterID) {
-				Logging.LogGenericInfo(Bot.BotName, "Accepting trade: " + tradeID);
+				Logging.LogGenericInfo("Accepting trade: " + tradeID, Bot.BotName);
 				await Bot.ArchiWebHandler.AcceptTradeOffer(tradeID).ConfigureAwait(false);
 			} else {
-				Logging.LogGenericInfo(Bot.BotName, "Ignoring trade: " + tradeID);
+				Logging.LogGenericInfo("Ignoring trade: " + tradeID, Bot.BotName);
 			}
 		}
 	}

ArchiSteamFarm/Utilities.cs

@@ -5,7 +5,7 @@
  / ___ \ | |  | (__ | | | || | ___) || |_|  __/| (_| || | | | | ||  _|| (_| || |   | | | | | |
 /_/   \_\|_|   \___||_| |_||_||____/  \__|\___| \__,_||_| |_| |_||_|   \__,_||_|   |_| |_| |_|
 
- Copyright 2015 Łukasz "JustArchi" Domeradzki
+ Copyright 2015-2016 Łukasz "JustArchi" Domeradzki
  Contact: JustArchi@JustArchi.net
 
  Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,14 +22,11 @@
 
 */
 
-using System;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
 namespace ArchiSteamFarm {
 	internal static class Utilities {
-		internal static readonly Random Random = new Random();
-
 		internal static async Task SleepAsync(int miliseconds) {
 			await Task.Delay(miliseconds).ConfigureAwait(false);
 		}
@@ -59,5 +56,20 @@ namespace ArchiSteamFarm {
 
 			return Regex.Replace(text, @"[^\d]", "");
 		}
+
+		internal static uint GetCharCountInString(string s, char c) {
+			if (string.IsNullOrEmpty(s)) {
+				return 0;
+			}
+
+			uint count = 0;
+			foreach (char singleChar in s) {
+				if (singleChar == c) {
+					count++;
+				}
+			}
+
+			return count;
+		}
 	}
 }

ArchiSteamFarm/WCF.cs

@@ -0,0 +1,133 @@
+/*
+    _                _      _  ____   _                           _____
+   / \    _ __  ___ | |__  (_)/ ___| | |_  ___   __ _  _ __ ___  |  ___|__ _  _ __  _ __ ___
+  / _ \  | '__|/ __|| '_ \ | |\___ \ | __|/ _ \ / _` || '_ ` _ \ | |_  / _` || '__|| '_ ` _ \
+ / ___ \ | |  | (__ | | | || | ___) || |_|  __/| (_| || | | | | ||  _|| (_| || |   | | | | | |
+/_/   \_\|_|   \___||_| |_||_||____/  \__|\___| \__,_||_| |_| |_||_|   \__,_||_|   |_| |_| |_|
+
+ Copyright 2015-2016 Łukasz "JustArchi" Domeradzki
+ Contact: JustArchi@JustArchi.net
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+					
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+*/
+
+using System;
+using System.ServiceModel;
+using System.ServiceModel.Channels;
+
+namespace ArchiSteamFarm {
+	[ServiceContract]
+	internal interface IWCF {
+		[OperationContract]
+		string HandleCommand(string input);
+	}
+
+	internal sealed class WCF : IWCF {
+
+		private const string URL = "http://localhost:1242/ASF"; // 1242 = 1024 + A(65) + S(83) + F(70)
+
+		private ServiceHost ServiceHost;
+		private Client Client;
+
+		internal bool IsServerRunning() {
+			return ServiceHost != null;
+		}
+
+		internal void StartServer() {
+			if (ServiceHost != null) {
+				return;
+			}
+
+			Logging.LogGenericInfo("Starting WCF server...");
+			ServiceHost = new ServiceHost(typeof(WCF));
+			ServiceHost.AddServiceEndpoint(typeof(IWCF), new BasicHttpBinding(), URL);
+
+			try {
+				ServiceHost.Open();
+			} catch (AddressAccessDeniedException) {
+				Logging.LogGenericWarning("WCF service could not be started because of AddressAccessDeniedException");
+				Logging.LogGenericWarning("If you want to use WCF service provided by ASF, consider starting ASF as administrator, or giving proper permissions");
+				return;
+			} catch (Exception e) {
+				Logging.LogGenericException(e);
+				return;
+			}
+
+			Logging.LogGenericInfo("WCF server ready!");
+		}
+
+		internal void StopServer() {
+			if (ServiceHost == null) {
+				return;
+			}
+
+			ServiceHost.Close();
+			ServiceHost = null;
+		}
+
+		internal string SendCommand(string input) {
+			if (Client == null) {
+				Client = new Client(new BasicHttpBinding(), new EndpointAddress(URL));
+			}
+
+			return Client.HandleCommand(input);
+		}
+
+		public string HandleCommand(string input) {
+			if (string.IsNullOrEmpty(input)) {
+				return null;
+			}
+
+			string[] args = input.Split(' ');
+
+			string botName;
+
+			if (args.Length > 1) { // If we have args[1] provided, use given botName
+				botName = args[1];
+			} else { // If not, just pick first one
+				botName = Bot.GetAnyBotName();
+			}
+
+			if (string.IsNullOrEmpty(botName)) {
+				return "ERROR: Invalid botName: " + botName;
+			}
+
+			Bot bot;
+			if (!Bot.Bots.TryGetValue(botName, out bot)) {
+				return "ERROR: Couldn't find any bot named: " + botName;
+			}
+
+			Logging.LogGenericInfo("Received command: \"" + input + "\"");
+
+			string command = '!' + input;
+			string output = bot.HandleMessage(command).Result; // TODO: This should be asynchronous
+
+			Logging.LogGenericInfo("Answered to command: \"" + input + "\" with: \"" + output + "\"");
+			return output;
+		}
+	}
+
+	internal sealed class Client : ClientBase<IWCF>, IWCF {
+		internal Client(Binding binding, EndpointAddress address) : base(binding, address) { }
+
+		public string HandleCommand(string input) {
+			try {
+				return Channel.HandleCommand(input);
+			} catch (Exception e) {
+				Logging.LogGenericException(e);
+				return null;
+			}
+		}
+	}
+}

ArchiSteamFarm/WebBrowser.cs

@@ -5,7 +5,7 @@
  / ___ \ | |  | (__ | | | || | ___) || |_|  __/| (_| || | | | | ||  _|| (_| || |   | | | | | |
 /_/   \_\|_|   \___||_| |_||_||____/  \__|\___| \__,_||_| |_| |_||_|   \__,_||_|   |_| |_| |_|
 
- Copyright 2015 Łukasz "JustArchi" Domeradzki
+ Copyright 2015-2016 Łukasz "JustArchi" Domeradzki
  Contact: JustArchi@JustArchi.net
 
  Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,62 +30,38 @@ 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
+		internal const byte HttpTimeout = 180; // In seconds, how long we can wait for server's response
+		internal const byte MaxConnections = 10; // Defines maximum number of connections per ServicePoint. Be careful, as it also defines maximum number of sockets in CLOSE_WAIT state
+		internal const byte MaxIdleTime = 15; // In seconds, how long socket is allowed to stay in CLOSE_WAIT state after there are no connections to it
+		internal const byte MaxRetries = 5; // Defines maximum number of retries, UrlRequest() does not handle retry by itself (it's app responsibility)
 
-		private static readonly HttpClientHandler HttpClientHandler = new HttpClientHandler { UseCookies = false };
-		private static readonly HttpClient HttpClient = new HttpClient(HttpClientHandler) { Timeout = TimeSpan.FromSeconds(HttpTimeout) };
+		private static readonly string DefaultUserAgent = "ArchiSteamFarm/" + Program.Version;
+		private static readonly HttpClient HttpClient = new HttpClient(new HttpClientHandler {
+			UseCookies = false
+		}) {
+			Timeout = TimeSpan.FromSeconds(HttpTimeout)
+		};
 
 		internal static void Init() {
-			HttpClient.DefaultRequestHeaders.UserAgent.ParseAdd("ArchiSteamFarm/" + Program.Version);
+			// Most web services expect that UserAgent is set, so we declare it globally
+			// Any request can override that on as-needed basis (see: RequestOptions.FakeUserAgent)
+			HttpClient.DefaultRequestHeaders.UserAgent.ParseAdd(DefaultUserAgent);
 
-			// Don't limit maximum number of allowed concurrent connections
-			// It's application's responsibility to handle that stuff
-			ServicePointManager.DefaultConnectionLimit = int.MaxValue;
+			// Set max connection limit from default of 2 to desired value
+			ServicePointManager.DefaultConnectionLimit = MaxConnections;
 
-			// Don't use Expect100Continue, we don't need to do that
+			// Set max idle time from default of 100 seconds (100 * 1000) to desired value
+			ServicePointManager.MaxServicePointIdleTime = MaxIdleTime * 1000;
+
+			// Don't use Expect100Continue, we're sure about our POSTs, save some TCP packets
 			ServicePointManager.Expect100Continue = false;
-		}
 
-		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;
-			}
-
-			return responseMessage;
+			// Reuse ports if possible
+			// TODO: Mono doesn't support that feature yet
+			//ServicePointManager.ReusePort = true;
 		}
 
 		internal static async Task<HttpResponseMessage> UrlGet(string request, Dictionary<string, string> cookies = null, string referer = null) {
@@ -96,76 +72,15 @@ namespace ArchiSteamFarm {
 			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) {
+		internal static async Task<HttpResponseMessage> UrlPost(string request, Dictionary<string, string> data = 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);
+			return await UrlRequest(request, HttpMethod.Post, data, 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) {
+		internal static async Task<string> UrlGetToContent(string request, Dictionary<string, string> cookies, string referer = null) {
 			if (string.IsNullOrEmpty(request)) {
 				return null;
 			}
@@ -175,10 +90,15 @@ namespace ArchiSteamFarm {
 				return null;
 			}
 
-			return await HttpResponseToHtmlDocument(httpResponse).ConfigureAwait(false);
+			HttpContent httpContent = httpResponse.Content;
+			if (httpContent == null) {
+				return null;
+			}
+
+			return await httpContent.ReadAsStringAsync().ConfigureAwait(false);
 		}
 
-		internal static async Task<JArray> UrlGetToJArray(string request, Dictionary<string, string> cookies = null, string referer = null) {
+		internal static async Task<HtmlDocument> UrlGetToHtmlDocument(string request, Dictionary<string, string> cookies = null, string referer = null) {
 			if (string.IsNullOrEmpty(request)) {
 				return null;
 			}
@@ -188,16 +108,11 @@ namespace ArchiSteamFarm {
 				return null;
 			}
 
-			JArray jArray;
+			content = WebUtility.HtmlDecode(content);
+			HtmlDocument htmlDocument = new HtmlDocument();
+			htmlDocument.LoadHtml(content);
 
-			try {
-				jArray = JArray.Parse(content);
-			} catch (Exception e) {
-				Logging.LogGenericException("WebBrowser", e);
-				return null;
-			}
-
-			return jArray;
+			return htmlDocument;
 		}
 
 		internal static async Task<JObject> UrlGetToJObject(string request, Dictionary<string, string> cookies = null, string referer = null) {
@@ -215,33 +130,53 @@ namespace ArchiSteamFarm {
 			try {
 				jObject = JObject.Parse(content);
 			} catch (Exception e) {
-				Logging.LogGenericException("WebBrowser", e);
+				Logging.LogGenericException(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)) {
+		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;
 			}
 
-			string content = await UrlGetToContent(request, cookies, referer).ConfigureAwait(false);
-			if (string.IsNullOrEmpty(content)) {
+			HttpResponseMessage responseMessage;
+			using (HttpRequestMessage requestMessage = new HttpRequestMessage(httpMethod, request)) {
+				if (data != null) {
+					try {
+						requestMessage.Content = new FormUrlEncodedContent(data);
+					} catch (UriFormatException e) {
+						Logging.LogGenericException(e);
+						return null;
+					}
+				}
+
+				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);
+				}
+
+				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;
 			}
 
-			XmlDocument xmlDocument = new XmlDocument();
-
-			try {
-				xmlDocument.LoadXml(content);
-			} catch (XmlException e) {
-				Logging.LogGenericException("WebBrowser", e);
-				return null;
-			}
-
-			return xmlDocument;
+			return responseMessage;
 		}
 	}
 }

ArchiSteamFarm/config/example.xml

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

ArchiSteamFarm/config/minimal.xml

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

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-beta3" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net452" />
   <package id="protobuf-net" version="2.0.0.668" targetFramework="net45" />
-  <package id="SteamKit2" version="1.6.5" targetFramework="net45" />
+  <package id="SteamKit2" version="1.7.0" targetFramework="net452" />
 </packages>

README.md

@@ -19,25 +19,11 @@ ASF doesn't require and doesn't interfere in any way with Steam client. In addit
 
 **Setting up:**
 
-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. The most minimalistic setup to make ASF working is changing only ```Enabled```, ```SteamLogin``` and ```SteamPassword``` properties, everything else is more or less optional to enable additional features.
-
-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, and launch ASF at the same time, for any number of accounts, including your main one (if needed).
+Detailed setting up instructions are available on **[our wiki](https://github.com/JustArchi/ArchiSteamFarm/wiki/Setting-up)**.
 
 **Current Commands:**
 
-- `!2fa` Generates temporary 2FA token for current bot instance
-- `!2fa <BOT>` Generates temporary 2FA token for given bot instance
-- `!2faoff` Deactivates 2FA for current bot instance
-- `!2faoff <BOT>` Deactivates 2FA for given bot instance
-- `!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
-- `!status` Prints current status of ASF
-- `!stop` Stops current bot instance
-- `!stop <BOT>` Stops given bot instance
+Detailed documentation of all available commands is available on **[our wiki](https://github.com/JustArchi/ArchiSteamFarm/wiki/Commands)**.
 
 > 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.

SteamAuth/AuthenticatorLinker.cs

@@ -15,7 +15,7 @@ namespace SteamAuth
     /// </summary>
     public class AuthenticatorLinker
     {
-       
+
 
         /// <summary>
         /// Set to register a new phone number when linking. If a phone number is not set on the account, this must be set. If a phone number is set on the account, this must be null.
@@ -100,21 +100,23 @@ namespace SteamAuth
 
         public FinalizeResult FinalizeAddAuthenticator(string smsCode)
         {
-            bool smsCodeGood = false;
+            //The act of checking the SMS code is necessary for Steam to finalize adding the phone number to the account.
+            //Of course, we only want to check it if we're adding a phone number in the first place...
+
+            if (!String.IsNullOrEmpty(this.PhoneNumber) && !this._checkSMSCode(smsCode))
+            {
+                return FinalizeResult.BadSMSCode;
+            }
 
             var postData = new NameValueCollection();
             postData.Add("steamid", _session.SteamID.ToString());
             postData.Add("access_token", _session.OAuthToken);
             postData.Add("activation_code", smsCode);
-            postData.Add("authenticator_code", "");
             int tries = 0;
             while (tries <= 30)
             {
-                postData.Set("authenticator_code", tries == 0 ? "" : LinkedAccount.GenerateSteamGuardCode());
-                postData.Add("authenticator_time", TimeAligner.GetSteamTime().ToString());
-
-                if(smsCodeGood)
-                    postData.Set("activation_code", "");
+                postData.Set("authenticator_code", LinkedAccount.GenerateSteamGuardCode());
+                postData.Set("authenticator_time", TimeAligner.GetSteamTime().ToString());
 
                 string response = SteamWeb.MobileLoginRequest(APIEndpoints.STEAMAPI_BASE + "/ITwoFactorService/FinalizeAddAuthenticator/v0001", "POST", postData);
                 if (response == null) return FinalizeResult.GeneralFailure;
@@ -126,14 +128,14 @@ namespace SteamAuth
                     return FinalizeResult.GeneralFailure;
                 }
 
-                if(finalizeResponse.Response.Status == 89)
+                if (finalizeResponse.Response.Status == 89)
                 {
                     return FinalizeResult.BadSMSCode;
                 }
 
-                if(finalizeResponse.Response.Status == 88)
+                if (finalizeResponse.Response.Status == 88)
                 {
-                    if(tries >= 30)
+                    if (tries >= 30)
                     {
                         return FinalizeResult.UnableToGenerateCorrectCodes;
                     }
@@ -144,9 +146,8 @@ namespace SteamAuth
                     return FinalizeResult.GeneralFailure;
                 }
 
-                if (finalizeResponse.Response.WantMore) 
+                if (finalizeResponse.Response.WantMore)
                 {
-                    smsCodeGood = true;
                     tries++;
                     continue;
                 }
@@ -158,6 +159,20 @@ namespace SteamAuth
             return FinalizeResult.GeneralFailure;
         }
 
+        private bool _checkSMSCode(string smsCode)
+        {
+            var postData = new NameValueCollection();
+            postData.Add("op", "check_sms_code");
+            postData.Add("arg", smsCode);
+            postData.Add("sessionid", _session.SessionID);
+
+            string response = SteamWeb.Request(APIEndpoints.COMMUNITY_BASE + "/steamguard/phoneajax", "POST", postData, _cookies);
+            if (response == null) return false;
+
+            var addPhoneNumberResponse = JsonConvert.DeserializeObject<AddPhoneResponse>(response);
+            return addPhoneNumberResponse.Success;
+        }
+
         private bool _addPhoneNumber()
         {
             var postData = new NameValueCollection();

SteamAuth/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Joshua Coffey
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

SteamAuth/SteamAuth.csproj

@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SteamAuth</RootNamespace>
     <AssemblyName>SteamAuth</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -22,16 +23,17 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
+    <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>
+    </DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.8.0.1-beta3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

SteamAuth/SteamGuardAccount.cs

@@ -222,6 +222,16 @@ namespace SteamAuth
             return ret.ToArray();
         }
 
+        public long GetConfirmationTradeOfferID(Confirmation conf)
+        {
+            var confDetails = _getConfirmationDetails(conf);
+            if (confDetails == null || !confDetails.Success) return -1;
+
+            Regex tradeOfferIDRegex = new Regex("<div class=\"tradeoffer\" id=\"tradeofferid_(\\d+)\" >");
+            if(!tradeOfferIDRegex.IsMatch(confDetails.HTML)) return -1;
+            return long.Parse(tradeOfferIDRegex.Match(confDetails.HTML).Groups[1].Value);
+        }
+
         public bool AcceptConfirmation(Confirmation conf)
         {
             return _sendConfirmationAjax(conf, "allow");
@@ -296,6 +306,24 @@ namespace SteamAuth
             }
         }
 
+        private ConfirmationDetailsResponse _getConfirmationDetails(Confirmation conf)
+        {
+            string url = APIEndpoints.COMMUNITY_BASE + "/mobileconf/details/" + conf.ConfirmationID + "?";
+            string queryString = GenerateConfirmationQueryParams("details");
+            url += queryString;
+
+            CookieContainer cookies = new CookieContainer();
+            this.Session.AddCookies(cookies);
+            string referer = GenerateConfirmationURL();
+
+            string response = SteamWeb.Request(url, "GET", null, cookies, null);
+            if (String.IsNullOrEmpty(response)) return null;
+
+            var confResponse = JsonConvert.DeserializeObject<ConfirmationDetailsResponse>(response);
+            if (confResponse == null) return null;
+            return confResponse;
+        }
+
         private bool _sendConfirmationAjax(Confirmation conf, string op)
         {
             string url = APIEndpoints.COMMUNITY_BASE + "/mobileconf/ajaxop";
@@ -325,7 +353,7 @@ namespace SteamAuth
         public string GenerateConfirmationQueryParams(string tag)
         {
             if (String.IsNullOrEmpty(DeviceID))
-                DeviceID = AuthenticatorLinker.GenerateDeviceID();
+                throw new ArgumentException("Device ID is not present");
 
             long time = TimeAligner.GetSteamTime();
             return "p=" + this.DeviceID + "&a=" + this.Session.SteamID.ToString() + "&k=" + _generateConfirmationHashForTime(time, tag) + "&t=" + time + "&m=android&tag=" + tag;
@@ -415,5 +443,14 @@ namespace SteamAuth
             [JsonProperty("success")]
             public bool Success { get; set; }
         }
+
+        private class ConfirmationDetailsResponse
+        {
+            [JsonProperty("success")]
+            public bool Success { get; set; }
+
+            [JsonProperty("html")]
+            public string HTML { get; set; }
+        }
     }
 }

SteamAuth/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="8.0.1-beta3" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net452" />
 </packages>

packages/Newtonsoft.Json.8.0.2/lib/net20/Newtonsoft.Json.xml

@@ -76,38 +76,6 @@
             <param name="readRootValueAsArray">if set to <c>true</c> the root object will be read as a JSON array.</param>
             <param name="dateTimeKindHandling">The <see cref="T:System.DateTimeKind" /> used when reading <see cref="T:System.DateTime"/> values from BSON.</param>
         </member>
-        <member name="M:Newtonsoft.Json.Bson.BsonReader.ReadAsBytes">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Byte"/>[].
-            </summary>
-            <returns>
-            A <see cref="T:System.Byte"/>[] or a null reference if the next JSON token is null. This method will return <c>null</c> at the end of an array.
-            </returns>
-        </member>
-        <member name="M:Newtonsoft.Json.Bson.BsonReader.ReadAsDecimal">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
-            </summary>
-            <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.ReadAsInt32">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
-            </summary>
-            <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.ReadAsString">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.String"/>.
-            </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
-        </member>
-        <member name="M:Newtonsoft.Json.Bson.BsonReader.ReadAsDateTime">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
-            </summary>
-            <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>
             Reads the next JSON token from the stream.
@@ -926,24 +894,24 @@
             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">
+        <member name="T:Newtonsoft.Json.IArrayPool`1">
             <summary>
-            Provides an interface for using pooled buffers.
+            Provides an interface for using pooled arrays.
             </summary>
-            <typeparam name="T">The buffer type content.</typeparam>
+            <typeparam name="T">The array type content.</typeparam>
         </member>
-        <member name="M:Newtonsoft.Json.IJsonBufferPool`1.RentBuffer(System.Int32)">
+        <member name="M:Newtonsoft.Json.IArrayPool`1.Rent(System.Int32)">
             <summary>
-            Rent a buffer from the pool. This buffer must be returned when it is no longer needed.
+            Rent a array from the pool. This array 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>
+            <param name="minimumLength">The minimum required length of the array. The returned array may be longer.</param>
+            <returns>The rented array from the pool. This array must be returned when it is no longer needed.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.IJsonBufferPool`1.ReturnBuffer(`0[]@)">
+        <member name="M:Newtonsoft.Json.IArrayPool`1.Return(`0[])">
             <summary>
-            Return a buffer to the pool.
+            Return an array to the pool.
             </summary>
-            <param name="buffer">The buffer that is being returned.</param>
+            <param name="array">The array that is being returned.</param>
         </member>
         <member name="T:Newtonsoft.Json.JsonConstructorAttribute">
             <summary>
@@ -2177,38 +2145,6 @@
             </summary>
             <param name="token">The token to read from.</param>
         </member>
-        <member name="M:Newtonsoft.Json.Linq.JTokenReader.ReadAsBytes">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Byte"/>[].
-            </summary>
-            <returns>
-            A <see cref="T:System.Byte"/>[] or a null reference if the next JSON token is null. This method will return <c>null</c> at the end of an array.
-            </returns>
-        </member>
-        <member name="M:Newtonsoft.Json.Linq.JTokenReader.ReadAsDecimal">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
-            </summary>
-            <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.ReadAsInt32">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
-            </summary>
-            <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.ReadAsString">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.String"/>.
-            </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
-        </member>
-        <member name="M:Newtonsoft.Json.Linq.JTokenReader.ReadAsDateTime">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
-            </summary>
-            <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>
             Reads the next JSON token from the stream.
@@ -4489,9 +4425,9 @@
         </member>
         <member name="P:Newtonsoft.Json.Serialization.JsonProperty.Order">
             <summary>
-            Gets or sets the order of serialization and deserialization of a member.
+            Gets or sets the order of serialization of a member.
             </summary>
-            <value>The numeric order of serialization or deserialization.</value>
+            <value>The numeric order of serialization.</value>
         </member>
         <member name="P:Newtonsoft.Json.Serialization.JsonProperty.UnderlyingName">
             <summary>
@@ -4806,6 +4742,11 @@
             Gets or sets the extension data getter.
             </summary>
         </member>
+        <member name="P:Newtonsoft.Json.Serialization.JsonObjectContract.ExtensionDataValueType">
+            <summary>
+            Gets or sets the extension data value type.
+            </summary>
+        </member>
         <member name="M:Newtonsoft.Json.Serialization.JsonObjectContract.#ctor(System.Type)">
             <summary>
             Initializes a new instance of the <see cref="T:Newtonsoft.Json.Serialization.JsonObjectContract"/> class.
@@ -6418,7 +6359,7 @@
         </member>
         <member name="P:Newtonsoft.Json.JsonSerializerSettings.Converters">
             <summary>
-            Gets or sets a collection <see cref="T:Newtonsoft.Json.JsonConverter"/> that will be used during serialization.
+            Gets or sets a <see cref="T:Newtonsoft.Json.JsonConverter"/> collection that will be used during serialization.
             </summary>
             <value>The converters.</value>
         </member>
@@ -6432,6 +6373,11 @@
             <summary>
             Gets or sets how type name writing and reading is handled by the serializer.
             </summary>
+            <remarks>
+            <see cref="P:Newtonsoft.Json.JsonSerializerSettings.TypeNameHandling"/> should be used with caution when your application deserializes JSON from an external source.
+            Incoming types should be validated with a custom <see cref="T:System.Runtime.Serialization.SerializationBinder"/>
+            when deserializing with a value other than <c>TypeNameHandling.None</c>.
+            </remarks>
             <value>The type name handling.</value>
         </member>
         <member name="P:Newtonsoft.Json.JsonSerializerSettings.MetadataPropertyHandling">
@@ -6655,6 +6601,18 @@
             </summary>
             <returns>A <see cref="T:System.Nullable`1"/>.</returns>
         </member>
+        <member name="M:Newtonsoft.Json.JsonValidatingReader.ReadAsDouble">
+            <summary>
+            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
+            </summary>
+            <returns>A <see cref="T:System.Nullable`1"/>.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonValidatingReader.ReadAsBoolean">
+            <summary>
+            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
+            </summary>
+            <returns>A <see cref="T:System.Nullable`1"/>.</returns>
+        </member>
         <member name="M:Newtonsoft.Json.JsonValidatingReader.ReadAsString">
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.String"/>.
@@ -6730,7 +6688,7 @@
             </summary>
             <param name="reader">The <c>TextReader</c> containing the XML data to read.</param>
         </member>
-        <member name="P:Newtonsoft.Json.JsonTextReader.BufferPool">
+        <member name="P:Newtonsoft.Json.JsonTextReader.ArrayPool">
             <summary>
             Gets or sets the reader's character buffer pool.
             </summary>
@@ -6743,21 +6701,13 @@
             true if the next token was read successfully; false if there are no more tokens to read.
             </returns>
         </member>
-        <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsBytes">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Byte"/>[].
-            </summary>
-            <returns>
-            A <see cref="T:System.Byte"/>[] or a null reference if the next JSON token is null. This method will return <c>null</c> at the end of an array.
-            </returns>
-        </member>
-        <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsDecimal">
+        <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsInt32">
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
             <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.ReadAsInt32">
+        <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsDateTime">
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
@@ -6769,7 +6719,25 @@
             </summary>
             <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsDateTime">
+        <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsBytes">
+            <summary>
+            Reads the next JSON token from the stream as a <see cref="T:System.Byte"/>[].
+            </summary>
+            <returns>A <see cref="T:System.Byte"/>[] or a null reference if the next JSON token is null. This method will return <c>null</c> at the end of an array.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsBoolean">
+            <summary>
+            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
+            </summary>
+            <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.ReadAsDecimal">
+            <summary>
+            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
+            </summary>
+            <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.ReadAsDouble">
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
@@ -6864,9 +6832,9 @@
         </member>
         <member name="P:Newtonsoft.Json.JsonPropertyAttribute.Order">
             <summary>
-            Gets or sets the order of serialization and deserialization of a member.
+            Gets or sets the order of serialization of a member.
             </summary>
-            <value>The numeric order of serialization or deserialization.</value>
+            <value>The numeric order of serialization.</value>
         </member>
         <member name="P:Newtonsoft.Json.JsonPropertyAttribute.Required">
             <summary>
@@ -6921,9 +6889,9 @@
             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">
+        <member name="P:Newtonsoft.Json.JsonTextWriter.ArrayPool">
             <summary>
-            Gets or sets the writer's character buffer pool.
+            Gets or sets the writer's character array pool.
             </summary>
         </member>
         <member name="P:Newtonsoft.Json.JsonTextWriter.Indentation">
@@ -7515,6 +7483,18 @@
             </summary>
             <returns>A <see cref="T:System.Byte"/>[] or a null reference if the next JSON token is null. This method will return <c>null</c> at the end of an array.</returns>
         </member>
+        <member name="M:Newtonsoft.Json.JsonReader.ReadAsDouble">
+            <summary>
+            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
+            </summary>
+            <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.ReadAsBoolean">
+            <summary>
+            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
+            </summary>
+            <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.ReadAsDecimal">
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
@@ -8121,6 +8101,11 @@
             <summary>
             Gets or sets how type name writing and reading is handled by the serializer.
             </summary>
+            <remarks>
+            <see cref="P:Newtonsoft.Json.JsonSerializer.TypeNameHandling"/> should be used with caution when your application deserializes JSON from an external source.
+            Incoming types should be validated with a custom <see cref="T:System.Runtime.Serialization.SerializationBinder"/>
+            when deserializing with a value other than <c>TypeNameHandling.None</c>.
+            </remarks>
         </member>
         <member name="P:Newtonsoft.Json.JsonSerializer.TypeNameAssemblyFormat">
             <summary>
@@ -9036,6 +9021,11 @@
             <summary>
             Specifies type name handling options for the <see cref="T:Newtonsoft.Json.JsonSerializer"/>.
             </summary>
+            <remarks>
+            <see cref="T:Newtonsoft.Json.TypeNameHandling"/> should be used with caution when your application deserializes JSON from an external source.
+            Incoming types should be validated with a custom <see cref="T:System.Runtime.Serialization.SerializationBinder"/>
+            when deserializing with a value other than <c>TypeNameHandling.None</c>.
+            </remarks>
         </member>
         <member name="F:Newtonsoft.Json.TypeNameHandling.None">
             <summary>
@@ -9590,6 +9580,12 @@
             </summary>
             <param name="ws">The string of white space characters.</param>
         </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.Dispose(System.Boolean)">
+            <summary>
+            Releases unmanaged and - optionally - managed resources
+            </summary>
+            <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
+        </member>
         <member name="M:Newtonsoft.Json.JsonWriter.SetWriteState(Newtonsoft.Json.JsonToken,System.Object)">
             <summary>
             Sets the state of the JsonWriter,

packages/Newtonsoft.Json.8.0.2/lib/net35/Newtonsoft.Json.xml

@@ -59,46 +59,6 @@
             <param name="readRootValueAsArray">if set to <c>true</c> the root object will be read as a JSON array.</param>
             <param name="dateTimeKindHandling">The <see cref="T:System.DateTimeKind" /> used when reading <see cref="T:System.DateTime"/> values from BSON.</param>
         </member>
-        <member name="M:Newtonsoft.Json.Bson.BsonReader.ReadAsBytes">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Byte"/>[].
-            </summary>
-            <returns>
-            A <see cref="T:System.Byte"/>[] or a null reference if the next JSON token is null. This method will return <c>null</c> at the end of an array.
-            </returns>
-        </member>
-        <member name="M:Newtonsoft.Json.Bson.BsonReader.ReadAsDecimal">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
-            </summary>
-            <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.ReadAsInt32">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
-            </summary>
-            <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.ReadAsString">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.String"/>.
-            </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
-        </member>
-        <member name="M:Newtonsoft.Json.Bson.BsonReader.ReadAsDateTime">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
-            </summary>
-            <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>
-            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
-            </summary>
-            <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>
             Reads the next JSON token from the stream.
@@ -977,24 +937,24 @@
             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">
+        <member name="T:Newtonsoft.Json.IArrayPool`1">
             <summary>
-            Provides an interface for using pooled buffers.
+            Provides an interface for using pooled arrays.
             </summary>
-            <typeparam name="T">The buffer type content.</typeparam>
+            <typeparam name="T">The array type content.</typeparam>
         </member>
-        <member name="M:Newtonsoft.Json.IJsonBufferPool`1.RentBuffer(System.Int32)">
+        <member name="M:Newtonsoft.Json.IArrayPool`1.Rent(System.Int32)">
             <summary>
-            Rent a buffer from the pool. This buffer must be returned when it is no longer needed.
+            Rent a array from the pool. This array 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>
+            <param name="minimumLength">The minimum required length of the array. The returned array may be longer.</param>
+            <returns>The rented array from the pool. This array must be returned when it is no longer needed.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.IJsonBufferPool`1.ReturnBuffer(`0[]@)">
+        <member name="M:Newtonsoft.Json.IArrayPool`1.Return(`0[])">
             <summary>
-            Return a buffer to the pool.
+            Return an array to the pool.
             </summary>
-            <param name="buffer">The buffer that is being returned.</param>
+            <param name="array">The array that is being returned.</param>
         </member>
         <member name="T:Newtonsoft.Json.JsonConstructorAttribute">
             <summary>
@@ -2239,44 +2199,6 @@
             </summary>
             <param name="token">The token to read from.</param>
         </member>
-        <member name="M:Newtonsoft.Json.Linq.JTokenReader.ReadAsBytes">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Byte"/>[].
-            </summary>
-            <returns>
-            A <see cref="T:System.Byte"/>[] or a null reference if the next JSON token is null. This method will return <c>null</c> at the end of an array.
-            </returns>
-        </member>
-        <member name="M:Newtonsoft.Json.Linq.JTokenReader.ReadAsDecimal">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
-            </summary>
-            <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.ReadAsInt32">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
-            </summary>
-            <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.ReadAsString">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.String"/>.
-            </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
-        </member>
-        <member name="M:Newtonsoft.Json.Linq.JTokenReader.ReadAsDateTime">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
-            </summary>
-            <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>
-            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
-            </summary>
-            <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>
             Reads the next JSON token from the stream.
@@ -4597,9 +4519,9 @@
         </member>
         <member name="P:Newtonsoft.Json.Serialization.JsonProperty.Order">
             <summary>
-            Gets or sets the order of serialization and deserialization of a member.
+            Gets or sets the order of serialization of a member.
             </summary>
-            <value>The numeric order of serialization or deserialization.</value>
+            <value>The numeric order of serialization.</value>
         </member>
         <member name="P:Newtonsoft.Json.Serialization.JsonProperty.UnderlyingName">
             <summary>
@@ -4914,6 +4836,11 @@
             Gets or sets the extension data getter.
             </summary>
         </member>
+        <member name="P:Newtonsoft.Json.Serialization.JsonObjectContract.ExtensionDataValueType">
+            <summary>
+            Gets or sets the extension data value type.
+            </summary>
+        </member>
         <member name="M:Newtonsoft.Json.Serialization.JsonObjectContract.#ctor(System.Type)">
             <summary>
             Initializes a new instance of the <see cref="T:Newtonsoft.Json.Serialization.JsonObjectContract"/> class.
@@ -5468,7 +5395,7 @@
         </member>
         <member name="P:Newtonsoft.Json.JsonSerializerSettings.Converters">
             <summary>
-            Gets or sets a collection <see cref="T:Newtonsoft.Json.JsonConverter"/> that will be used during serialization.
+            Gets or sets a <see cref="T:Newtonsoft.Json.JsonConverter"/> collection that will be used during serialization.
             </summary>
             <value>The converters.</value>
         </member>
@@ -5482,6 +5409,11 @@
             <summary>
             Gets or sets how type name writing and reading is handled by the serializer.
             </summary>
+            <remarks>
+            <see cref="P:Newtonsoft.Json.JsonSerializerSettings.TypeNameHandling"/> should be used with caution when your application deserializes JSON from an external source.
+            Incoming types should be validated with a custom <see cref="T:System.Runtime.Serialization.SerializationBinder"/>
+            when deserializing with a value other than <c>TypeNameHandling.None</c>.
+            </remarks>
             <value>The type name handling.</value>
         </member>
         <member name="P:Newtonsoft.Json.JsonSerializerSettings.MetadataPropertyHandling">
@@ -5705,6 +5637,18 @@
             </summary>
             <returns>A <see cref="T:System.Nullable`1"/>.</returns>
         </member>
+        <member name="M:Newtonsoft.Json.JsonValidatingReader.ReadAsDouble">
+            <summary>
+            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
+            </summary>
+            <returns>A <see cref="T:System.Nullable`1"/>.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonValidatingReader.ReadAsBoolean">
+            <summary>
+            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
+            </summary>
+            <returns>A <see cref="T:System.Nullable`1"/>.</returns>
+        </member>
         <member name="M:Newtonsoft.Json.JsonValidatingReader.ReadAsString">
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.String"/>.
@@ -5786,7 +5730,7 @@
             </summary>
             <param name="reader">The <c>TextReader</c> containing the XML data to read.</param>
         </member>
-        <member name="P:Newtonsoft.Json.JsonTextReader.BufferPool">
+        <member name="P:Newtonsoft.Json.JsonTextReader.ArrayPool">
             <summary>
             Gets or sets the reader's character buffer pool.
             </summary>
@@ -5799,21 +5743,13 @@
             true if the next token was read successfully; false if there are no more tokens to read.
             </returns>
         </member>
-        <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsBytes">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Byte"/>[].
-            </summary>
-            <returns>
-            A <see cref="T:System.Byte"/>[] or a null reference if the next JSON token is null. This method will return <c>null</c> at the end of an array.
-            </returns>
-        </member>
-        <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsDecimal">
+        <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsInt32">
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
             <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.ReadAsInt32">
+        <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsDateTime">
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
@@ -5825,7 +5761,13 @@
             </summary>
             <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsDateTime">
+        <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsBytes">
+            <summary>
+            Reads the next JSON token from the stream as a <see cref="T:System.Byte"/>[].
+            </summary>
+            <returns>A <see cref="T:System.Byte"/>[] or a null reference if the next JSON token is null. This method will return <c>null</c> at the end of an array.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsBoolean">
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
@@ -5835,7 +5777,19 @@
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
-            <returns>A <see cref="T:System.DateTimeOffset"/>. 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.ReadAsDecimal">
+            <summary>
+            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
+            </summary>
+            <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.ReadAsDouble">
+            <summary>
+            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
+            </summary>
+            <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>
@@ -5926,9 +5880,9 @@
         </member>
         <member name="P:Newtonsoft.Json.JsonPropertyAttribute.Order">
             <summary>
-            Gets or sets the order of serialization and deserialization of a member.
+            Gets or sets the order of serialization of a member.
             </summary>
-            <value>The numeric order of serialization or deserialization.</value>
+            <value>The numeric order of serialization.</value>
         </member>
         <member name="P:Newtonsoft.Json.JsonPropertyAttribute.Required">
             <summary>
@@ -5983,9 +5937,9 @@
             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">
+        <member name="P:Newtonsoft.Json.JsonTextWriter.ArrayPool">
             <summary>
-            Gets or sets the writer's character buffer pool.
+            Gets or sets the writer's character array pool.
             </summary>
         </member>
         <member name="P:Newtonsoft.Json.JsonTextWriter.Indentation">
@@ -6583,6 +6537,18 @@
             </summary>
             <returns>A <see cref="T:System.Byte"/>[] or a null reference if the next JSON token is null. This method will return <c>null</c> at the end of an array.</returns>
         </member>
+        <member name="M:Newtonsoft.Json.JsonReader.ReadAsDouble">
+            <summary>
+            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
+            </summary>
+            <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.ReadAsBoolean">
+            <summary>
+            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
+            </summary>
+            <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.ReadAsDecimal">
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
@@ -7262,6 +7228,11 @@
             <summary>
             Gets or sets how type name writing and reading is handled by the serializer.
             </summary>
+            <remarks>
+            <see cref="P:Newtonsoft.Json.JsonSerializer.TypeNameHandling"/> should be used with caution when your application deserializes JSON from an external source.
+            Incoming types should be validated with a custom <see cref="T:System.Runtime.Serialization.SerializationBinder"/>
+            when deserializing with a value other than <c>TypeNameHandling.None</c>.
+            </remarks>
         </member>
         <member name="P:Newtonsoft.Json.JsonSerializer.TypeNameAssemblyFormat">
             <summary>
@@ -8177,6 +8148,11 @@
             <summary>
             Specifies type name handling options for the <see cref="T:Newtonsoft.Json.JsonSerializer"/>.
             </summary>
+            <remarks>
+            <see cref="T:Newtonsoft.Json.TypeNameHandling"/> should be used with caution when your application deserializes JSON from an external source.
+            Incoming types should be validated with a custom <see cref="T:System.Runtime.Serialization.SerializationBinder"/>
+            when deserializing with a value other than <c>TypeNameHandling.None</c>.
+            </remarks>
         </member>
         <member name="F:Newtonsoft.Json.TypeNameHandling.None">
             <summary>
@@ -8743,6 +8719,12 @@
             </summary>
             <param name="ws">The string of white space characters.</param>
         </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.Dispose(System.Boolean)">
+            <summary>
+            Releases unmanaged and - optionally - managed resources
+            </summary>
+            <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
+        </member>
         <member name="M:Newtonsoft.Json.JsonWriter.SetWriteState(Newtonsoft.Json.JsonToken,System.Object)">
             <summary>
             Sets the state of the JsonWriter,

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

@@ -76,46 +76,6 @@
             <param name="readRootValueAsArray">if set to <c>true</c> the root object will be read as a JSON array.</param>
             <param name="dateTimeKindHandling">The <see cref="T:System.DateTimeKind" /> used when reading <see cref="T:System.DateTime"/> values from BSON.</param>
         </member>
-        <member name="M:Newtonsoft.Json.Bson.BsonReader.ReadAsBytes">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Byte"/>[].
-            </summary>
-            <returns>
-            A <see cref="T:System.Byte"/>[] or a null reference if the next JSON token is null. This method will return <c>null</c> at the end of an array.
-            </returns>
-        </member>
-        <member name="M:Newtonsoft.Json.Bson.BsonReader.ReadAsDecimal">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
-            </summary>
-            <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.ReadAsInt32">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
-            </summary>
-            <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.ReadAsString">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.String"/>.
-            </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
-        </member>
-        <member name="M:Newtonsoft.Json.Bson.BsonReader.ReadAsDateTime">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
-            </summary>
-            <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>
-            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
-            </summary>
-            <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>
             Reads the next JSON token from the stream.
@@ -857,24 +817,24 @@
             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">
+        <member name="T:Newtonsoft.Json.IArrayPool`1">
             <summary>
-            Provides an interface for using pooled buffers.
+            Provides an interface for using pooled arrays.
             </summary>
-            <typeparam name="T">The buffer type content.</typeparam>
+            <typeparam name="T">The array type content.</typeparam>
         </member>
-        <member name="M:Newtonsoft.Json.IJsonBufferPool`1.RentBuffer(System.Int32)">
+        <member name="M:Newtonsoft.Json.IArrayPool`1.Rent(System.Int32)">
             <summary>
-            Rent a buffer from the pool. This buffer must be returned when it is no longer needed.
+            Rent a array from the pool. This array 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>
+            <param name="minimumLength">The minimum required length of the array. The returned array may be longer.</param>
+            <returns>The rented array from the pool. This array must be returned when it is no longer needed.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.IJsonBufferPool`1.ReturnBuffer(`0[]@)">
+        <member name="M:Newtonsoft.Json.IArrayPool`1.Return(`0[])">
             <summary>
-            Return a buffer to the pool.
+            Return an array to the pool.
             </summary>
-            <param name="buffer">The buffer that is being returned.</param>
+            <param name="array">The array that is being returned.</param>
         </member>
         <member name="T:Newtonsoft.Json.IJsonLineInfo">
             <summary>
@@ -1719,9 +1679,9 @@
         </member>
         <member name="P:Newtonsoft.Json.JsonPropertyAttribute.Order">
             <summary>
-            Gets or sets the order of serialization and deserialization of a member.
+            Gets or sets the order of serialization of a member.
             </summary>
-            <value>The numeric order of serialization or deserialization.</value>
+            <value>The numeric order of serialization.</value>
         </member>
         <member name="P:Newtonsoft.Json.JsonPropertyAttribute.Required">
             <summary>
@@ -1956,6 +1916,18 @@
             </summary>
             <returns>A <see cref="T:System.Byte"/>[] or a null reference if the next JSON token is null. This method will return <c>null</c> at the end of an array.</returns>
         </member>
+        <member name="M:Newtonsoft.Json.JsonReader.ReadAsDouble">
+            <summary>
+            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
+            </summary>
+            <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.ReadAsBoolean">
+            <summary>
+            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
+            </summary>
+            <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.ReadAsDecimal">
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
@@ -2123,6 +2095,11 @@
             <summary>
             Gets or sets how type name writing and reading is handled by the serializer.
             </summary>
+            <remarks>
+            <see cref="P:Newtonsoft.Json.JsonSerializer.TypeNameHandling"/> should be used with caution when your application deserializes JSON from an external source.
+            Incoming types should be validated with a custom <see cref="T:System.Runtime.Serialization.SerializationBinder"/>
+            when deserializing with a value other than <c>TypeNameHandling.None</c>.
+            </remarks>
         </member>
         <member name="P:Newtonsoft.Json.JsonSerializer.TypeNameAssemblyFormat">
             <summary>
@@ -2433,7 +2410,7 @@
         </member>
         <member name="P:Newtonsoft.Json.JsonSerializerSettings.Converters">
             <summary>
-            Gets or sets a collection <see cref="T:Newtonsoft.Json.JsonConverter"/> that will be used during serialization.
+            Gets or sets a <see cref="T:Newtonsoft.Json.JsonConverter"/> collection that will be used during serialization.
             </summary>
             <value>The converters.</value>
         </member>
@@ -2447,6 +2424,11 @@
             <summary>
             Gets or sets how type name writing and reading is handled by the serializer.
             </summary>
+            <remarks>
+            <see cref="P:Newtonsoft.Json.JsonSerializerSettings.TypeNameHandling"/> should be used with caution when your application deserializes JSON from an external source.
+            Incoming types should be validated with a custom <see cref="T:System.Runtime.Serialization.SerializationBinder"/>
+            when deserializing with a value other than <c>TypeNameHandling.None</c>.
+            </remarks>
             <value>The type name handling.</value>
         </member>
         <member name="P:Newtonsoft.Json.JsonSerializerSettings.MetadataPropertyHandling">
@@ -2592,7 +2574,7 @@
             </summary>
             <param name="reader">The <c>TextReader</c> containing the XML data to read.</param>
         </member>
-        <member name="P:Newtonsoft.Json.JsonTextReader.BufferPool">
+        <member name="P:Newtonsoft.Json.JsonTextReader.ArrayPool">
             <summary>
             Gets or sets the reader's character buffer pool.
             </summary>
@@ -2605,21 +2587,13 @@
             true if the next token was read successfully; false if there are no more tokens to read.
             </returns>
         </member>
-        <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsBytes">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Byte"/>[].
-            </summary>
-            <returns>
-            A <see cref="T:System.Byte"/>[] or a null reference if the next JSON token is null. This method will return <c>null</c> at the end of an array.
-            </returns>
-        </member>
-        <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsDecimal">
+        <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsInt32">
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
             <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.ReadAsInt32">
+        <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsDateTime">
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
@@ -2631,7 +2605,13 @@
             </summary>
             <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsDateTime">
+        <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsBytes">
+            <summary>
+            Reads the next JSON token from the stream as a <see cref="T:System.Byte"/>[].
+            </summary>
+            <returns>A <see cref="T:System.Byte"/>[] or a null reference if the next JSON token is null. This method will return <c>null</c> at the end of an array.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsBoolean">
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
@@ -2641,7 +2621,19 @@
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
-            <returns>A <see cref="T:System.DateTimeOffset"/>. 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.ReadAsDecimal">
+            <summary>
+            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
+            </summary>
+            <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.ReadAsDouble">
+            <summary>
+            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
+            </summary>
+            <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>
@@ -2677,9 +2669,9 @@
             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">
+        <member name="P:Newtonsoft.Json.JsonTextWriter.ArrayPool">
             <summary>
-            Gets or sets the writer's character buffer pool.
+            Gets or sets the writer's character array pool.
             </summary>
         </member>
         <member name="P:Newtonsoft.Json.JsonTextWriter.Indentation">
@@ -3119,6 +3111,18 @@
             </summary>
             <returns>A <see cref="T:System.Nullable`1"/>.</returns>
         </member>
+        <member name="M:Newtonsoft.Json.JsonValidatingReader.ReadAsDouble">
+            <summary>
+            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
+            </summary>
+            <returns>A <see cref="T:System.Nullable`1"/>.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonValidatingReader.ReadAsBoolean">
+            <summary>
+            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
+            </summary>
+            <returns>A <see cref="T:System.Nullable`1"/>.</returns>
+        </member>
         <member name="M:Newtonsoft.Json.JsonValidatingReader.ReadAsString">
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.String"/>.
@@ -3590,6 +3594,12 @@
             </summary>
             <param name="ws">The string of white space characters.</param>
         </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.Dispose(System.Boolean)">
+            <summary>
+            Releases unmanaged and - optionally - managed resources
+            </summary>
+            <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
+        </member>
         <member name="M:Newtonsoft.Json.JsonWriter.SetWriteState(Newtonsoft.Json.JsonToken,System.Object)">
             <summary>
             Sets the state of the JsonWriter,
@@ -5504,44 +5514,6 @@
             </summary>
             <param name="token">The token to read from.</param>
         </member>
-        <member name="M:Newtonsoft.Json.Linq.JTokenReader.ReadAsBytes">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Byte"/>[].
-            </summary>
-            <returns>
-            A <see cref="T:System.Byte"/>[] or a null reference if the next JSON token is null. This method will return <c>null</c> at the end of an array.
-            </returns>
-        </member>
-        <member name="M:Newtonsoft.Json.Linq.JTokenReader.ReadAsDecimal">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
-            </summary>
-            <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.ReadAsInt32">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
-            </summary>
-            <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.ReadAsString">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.String"/>.
-            </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
-        </member>
-        <member name="M:Newtonsoft.Json.Linq.JTokenReader.ReadAsDateTime">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
-            </summary>
-            <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>
-            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
-            </summary>
-            <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>
             Reads the next JSON token from the stream.
@@ -7619,6 +7591,11 @@
             Gets or sets the extension data getter.
             </summary>
         </member>
+        <member name="P:Newtonsoft.Json.Serialization.JsonObjectContract.ExtensionDataValueType">
+            <summary>
+            Gets or sets the extension data value type.
+            </summary>
+        </member>
         <member name="M:Newtonsoft.Json.Serialization.JsonObjectContract.#ctor(System.Type)">
             <summary>
             Initializes a new instance of the <see cref="T:Newtonsoft.Json.Serialization.JsonObjectContract"/> class.
@@ -7655,9 +7632,9 @@
         </member>
         <member name="P:Newtonsoft.Json.Serialization.JsonProperty.Order">
             <summary>
-            Gets or sets the order of serialization and deserialization of a member.
+            Gets or sets the order of serialization of a member.
             </summary>
-            <value>The numeric order of serialization or deserialization.</value>
+            <value>The numeric order of serialization.</value>
         </member>
         <member name="P:Newtonsoft.Json.Serialization.JsonProperty.UnderlyingName">
             <summary>
@@ -8052,6 +8029,11 @@
             <summary>
             Specifies type name handling options for the <see cref="T:Newtonsoft.Json.JsonSerializer"/>.
             </summary>
+            <remarks>
+            <see cref="T:Newtonsoft.Json.TypeNameHandling"/> should be used with caution when your application deserializes JSON from an external source.
+            Incoming types should be validated with a custom <see cref="T:System.Runtime.Serialization.SerializationBinder"/>
+            when deserializing with a value other than <c>TypeNameHandling.None</c>.
+            </remarks>
         </member>
         <member name="F:Newtonsoft.Json.TypeNameHandling.None">
             <summary>

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

@@ -76,46 +76,6 @@
             <param name="readRootValueAsArray">if set to <c>true</c> the root object will be read as a JSON array.</param>
             <param name="dateTimeKindHandling">The <see cref="T:System.DateTimeKind" /> used when reading <see cref="T:System.DateTime"/> values from BSON.</param>
         </member>
-        <member name="M:Newtonsoft.Json.Bson.BsonReader.ReadAsBytes">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Byte"/>[].
-            </summary>
-            <returns>
-            A <see cref="T:System.Byte"/>[] or a null reference if the next JSON token is null. This method will return <c>null</c> at the end of an array.
-            </returns>
-        </member>
-        <member name="M:Newtonsoft.Json.Bson.BsonReader.ReadAsDecimal">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
-            </summary>
-            <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.ReadAsInt32">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
-            </summary>
-            <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.ReadAsString">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.String"/>.
-            </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
-        </member>
-        <member name="M:Newtonsoft.Json.Bson.BsonReader.ReadAsDateTime">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
-            </summary>
-            <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>
-            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
-            </summary>
-            <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>
             Reads the next JSON token from the stream.
@@ -956,24 +916,24 @@
             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">
+        <member name="T:Newtonsoft.Json.IArrayPool`1">
             <summary>
-            Provides an interface for using pooled buffers.
+            Provides an interface for using pooled arrays.
             </summary>
-            <typeparam name="T">The buffer type content.</typeparam>
+            <typeparam name="T">The array type content.</typeparam>
         </member>
-        <member name="M:Newtonsoft.Json.IJsonBufferPool`1.RentBuffer(System.Int32)">
+        <member name="M:Newtonsoft.Json.IArrayPool`1.Rent(System.Int32)">
             <summary>
-            Rent a buffer from the pool. This buffer must be returned when it is no longer needed.
+            Rent a array from the pool. This array 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>
+            <param name="minimumLength">The minimum required length of the array. The returned array may be longer.</param>
+            <returns>The rented array from the pool. This array must be returned when it is no longer needed.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.IJsonBufferPool`1.ReturnBuffer(`0[]@)">
+        <member name="M:Newtonsoft.Json.IArrayPool`1.Return(`0[])">
             <summary>
-            Return a buffer to the pool.
+            Return an array to the pool.
             </summary>
-            <param name="buffer">The buffer that is being returned.</param>
+            <param name="array">The array that is being returned.</param>
         </member>
         <member name="T:Newtonsoft.Json.IJsonLineInfo">
             <summary>
@@ -1969,9 +1929,9 @@
         </member>
         <member name="P:Newtonsoft.Json.JsonPropertyAttribute.Order">
             <summary>
-            Gets or sets the order of serialization and deserialization of a member.
+            Gets or sets the order of serialization of a member.
             </summary>
-            <value>The numeric order of serialization or deserialization.</value>
+            <value>The numeric order of serialization.</value>
         </member>
         <member name="P:Newtonsoft.Json.JsonPropertyAttribute.Required">
             <summary>
@@ -2206,6 +2166,18 @@
             </summary>
             <returns>A <see cref="T:System.Byte"/>[] or a null reference if the next JSON token is null. This method will return <c>null</c> at the end of an array.</returns>
         </member>
+        <member name="M:Newtonsoft.Json.JsonReader.ReadAsDouble">
+            <summary>
+            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
+            </summary>
+            <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.ReadAsBoolean">
+            <summary>
+            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
+            </summary>
+            <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.ReadAsDecimal">
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
@@ -2373,6 +2345,11 @@
             <summary>
             Gets or sets how type name writing and reading is handled by the serializer.
             </summary>
+            <remarks>
+            <see cref="P:Newtonsoft.Json.JsonSerializer.TypeNameHandling"/> should be used with caution when your application deserializes JSON from an external source.
+            Incoming types should be validated with a custom <see cref="T:System.Runtime.Serialization.SerializationBinder"/>
+            when deserializing with a value other than <c>TypeNameHandling.None</c>.
+            </remarks>
         </member>
         <member name="P:Newtonsoft.Json.JsonSerializer.TypeNameAssemblyFormat">
             <summary>
@@ -2683,7 +2660,7 @@
         </member>
         <member name="P:Newtonsoft.Json.JsonSerializerSettings.Converters">
             <summary>
-            Gets or sets a collection <see cref="T:Newtonsoft.Json.JsonConverter"/> that will be used during serialization.
+            Gets or sets a <see cref="T:Newtonsoft.Json.JsonConverter"/> collection that will be used during serialization.
             </summary>
             <value>The converters.</value>
         </member>
@@ -2697,6 +2674,11 @@
             <summary>
             Gets or sets how type name writing and reading is handled by the serializer.
             </summary>
+            <remarks>
+            <see cref="P:Newtonsoft.Json.JsonSerializerSettings.TypeNameHandling"/> should be used with caution when your application deserializes JSON from an external source.
+            Incoming types should be validated with a custom <see cref="T:System.Runtime.Serialization.SerializationBinder"/>
+            when deserializing with a value other than <c>TypeNameHandling.None</c>.
+            </remarks>
             <value>The type name handling.</value>
         </member>
         <member name="P:Newtonsoft.Json.JsonSerializerSettings.MetadataPropertyHandling">
@@ -2842,7 +2824,7 @@
             </summary>
             <param name="reader">The <c>TextReader</c> containing the XML data to read.</param>
         </member>
-        <member name="P:Newtonsoft.Json.JsonTextReader.BufferPool">
+        <member name="P:Newtonsoft.Json.JsonTextReader.ArrayPool">
             <summary>
             Gets or sets the reader's character buffer pool.
             </summary>
@@ -2855,21 +2837,13 @@
             true if the next token was read successfully; false if there are no more tokens to read.
             </returns>
         </member>
-        <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsBytes">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Byte"/>[].
-            </summary>
-            <returns>
-            A <see cref="T:System.Byte"/>[] or a null reference if the next JSON token is null. This method will return <c>null</c> at the end of an array.
-            </returns>
-        </member>
-        <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsDecimal">
+        <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsInt32">
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
             <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.ReadAsInt32">
+        <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsDateTime">
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
@@ -2881,7 +2855,13 @@
             </summary>
             <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
         </member>
-        <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsDateTime">
+        <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsBytes">
+            <summary>
+            Reads the next JSON token from the stream as a <see cref="T:System.Byte"/>[].
+            </summary>
+            <returns>A <see cref="T:System.Byte"/>[] or a null reference if the next JSON token is null. This method will return <c>null</c> at the end of an array.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonTextReader.ReadAsBoolean">
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
@@ -2891,7 +2871,19 @@
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
             </summary>
-            <returns>A <see cref="T:System.DateTimeOffset"/>. 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.ReadAsDecimal">
+            <summary>
+            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
+            </summary>
+            <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.ReadAsDouble">
+            <summary>
+            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
+            </summary>
+            <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>
@@ -2927,9 +2919,9 @@
             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">
+        <member name="P:Newtonsoft.Json.JsonTextWriter.ArrayPool">
             <summary>
-            Gets or sets the writer's character buffer pool.
+            Gets or sets the writer's character array pool.
             </summary>
         </member>
         <member name="P:Newtonsoft.Json.JsonTextWriter.Indentation">
@@ -3369,6 +3361,18 @@
             </summary>
             <returns>A <see cref="T:System.Nullable`1"/>.</returns>
         </member>
+        <member name="M:Newtonsoft.Json.JsonValidatingReader.ReadAsDouble">
+            <summary>
+            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
+            </summary>
+            <returns>A <see cref="T:System.Nullable`1"/>.</returns>
+        </member>
+        <member name="M:Newtonsoft.Json.JsonValidatingReader.ReadAsBoolean">
+            <summary>
+            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
+            </summary>
+            <returns>A <see cref="T:System.Nullable`1"/>.</returns>
+        </member>
         <member name="M:Newtonsoft.Json.JsonValidatingReader.ReadAsString">
             <summary>
             Reads the next JSON token from the stream as a <see cref="T:System.String"/>.
@@ -3840,6 +3844,12 @@
             </summary>
             <param name="ws">The string of white space characters.</param>
         </member>
+        <member name="M:Newtonsoft.Json.JsonWriter.Dispose(System.Boolean)">
+            <summary>
+            Releases unmanaged and - optionally - managed resources
+            </summary>
+            <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
+        </member>
         <member name="M:Newtonsoft.Json.JsonWriter.SetWriteState(Newtonsoft.Json.JsonToken,System.Object)">
             <summary>
             Sets the state of the JsonWriter,
@@ -5792,44 +5802,6 @@
             </summary>
             <param name="token">The token to read from.</param>
         </member>
-        <member name="M:Newtonsoft.Json.Linq.JTokenReader.ReadAsBytes">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Byte"/>[].
-            </summary>
-            <returns>
-            A <see cref="T:System.Byte"/>[] or a null reference if the next JSON token is null. This method will return <c>null</c> at the end of an array.
-            </returns>
-        </member>
-        <member name="M:Newtonsoft.Json.Linq.JTokenReader.ReadAsDecimal">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
-            </summary>
-            <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.ReadAsInt32">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
-            </summary>
-            <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.ReadAsString">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.String"/>.
-            </summary>
-            <returns>A <see cref="T:System.String"/>. This method will return <c>null</c> at the end of an array.</returns>
-        </member>
-        <member name="M:Newtonsoft.Json.Linq.JTokenReader.ReadAsDateTime">
-            <summary>
-            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
-            </summary>
-            <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>
-            Reads the next JSON token from the stream as a <see cref="T:System.Nullable`1"/>.
-            </summary>
-            <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>
             Reads the next JSON token from the stream.
@@ -7940,6 +7912,11 @@
             Gets or sets the extension data getter.
             </summary>
         </member>
+        <member name="P:Newtonsoft.Json.Serialization.JsonObjectContract.ExtensionDataValueType">
+            <summary>
+            Gets or sets the extension data value type.
+            </summary>
+        </member>
         <member name="M:Newtonsoft.Json.Serialization.JsonObjectContract.#ctor(System.Type)">
             <summary>
             Initializes a new instance of the <see cref="T:Newtonsoft.Json.Serialization.JsonObjectContract"/> class.
@@ -7976,9 +7953,9 @@
         </member>
         <member name="P:Newtonsoft.Json.Serialization.JsonProperty.Order">
             <summary>
-            Gets or sets the order of serialization and deserialization of a member.
+            Gets or sets the order of serialization of a member.
             </summary>
-            <value>The numeric order of serialization or deserialization.</value>
+            <value>The numeric order of serialization.</value>
         </member>
         <member name="P:Newtonsoft.Json.Serialization.JsonProperty.UnderlyingName">
             <summary>
@@ -8373,6 +8350,11 @@
             <summary>
             Specifies type name handling options for the <see cref="T:Newtonsoft.Json.JsonSerializer"/>.
             </summary>
+            <remarks>
+            <see cref="T:Newtonsoft.Json.TypeNameHandling"/> should be used with caution when your application deserializes JSON from an external source.
+            Incoming types should be validated with a custom <see cref="T:System.Runtime.Serialization.SerializationBinder"/>
+            when deserializing with a value other than <c>TypeNameHandling.None</c>.
+            </remarks>
         </member>
         <member name="F:Newtonsoft.Json.TypeNameHandling.None">
             <summary>

packages/SteamKit2.1.7.0/lib/net45/SteamKit2.xml

@@ -821,6 +821,12 @@
             The connection timeout.
             </value>
         </member>
+        <member name="P:SteamKit2.Internal.CMClient.DebugNetworkListener">
+            <summary>
+            Gets or sets the network listening interface. Use this for debugging only.
+            For your convenience, you can use <see cref="T:SteamKit2.NetHookNetworkListener"/> class.
+            </summary>
+        </member>
         <member name="M:SteamKit2.Internal.CMClient.#ctor(System.Net.Sockets.ProtocolType)">
             <summary>
             Initializes a new instance of the <see cref="T:SteamKit2.Internal.CMClient"/> class with a specific connection type.
@@ -1492,14 +1498,14 @@
             Smart list of CM servers.
             </summary>
         </member>
-        <member name="P:SteamKit2.SmartCMServerList.ScoreExpiryTimeSpan">
+        <member name="P:SteamKit2.SmartCMServerList.BadConnectionMemoryTimeSpan">
             <summary>
-            Determines after how much time a server's score should expire and be reset to it's base value.
+            Determines how long a server's bad connection state is remembered for.
             </summary>
         </member>
         <member name="M:SteamKit2.SmartCMServerList.ResetOldScores">
             <summary>
-            Resets the scores of all servers which had their scores last updated a <see cref="P:SteamKit2.SmartCMServerList.ScoreExpiryTimeSpan"/> ago.
+            Resets the scores of all servers which has a last bad connection more than <see cref="P:SteamKit2.SmartCMServerList.BadConnectionMemoryTimeSpan"/> ago.
             </summary>
         </member>
         <member name="M:SteamKit2.SmartCMServerList.TryAdd(System.Net.IPEndPoint)">
@@ -1516,9 +1522,18 @@
             <param name="endPoints">The collection of <see cref="T:System.Net.IPEndPoint"/>s to add.</param>
             <returns>false if any of the specified servers are already in the list, true otherwise.</returns>
         </member>
-        <member name="M:SteamKit2.SmartCMServerList.ResetAllScores">
+        <member name="M:SteamKit2.SmartCMServerList.MergeWithList(System.Collections.Generic.IEnumerable{System.Net.IPEndPoint})">
             <summary>
-            Explicitly resets the quality of every stored server.
+            Merges the list with a new list of servers provided to us by the Steam servers.
+            This adds the new list of <see cref="T:System.Net.IPEndPoint"/>s to the beginning of the list,
+            ensuring that any pre-existing servers are moved into their new place in order near
+            the beginning of the list.
+            </summary>
+            <param name="listToMerge">The <see cref="T:System.Net.IPEndPoint"/>s to merge into this <see cref="T:SteamKit2.SmartCMServerList"/>.</param>
+        </member>
+        <member name="M:SteamKit2.SmartCMServerList.ResetBadServers">
+            <summary>
+            Explicitly resets the known state of all servers.
             </summary>
         </member>
         <member name="M:SteamKit2.SmartCMServerList.Clear">
@@ -1853,6 +1868,7 @@
             <summary>
             Requests details for a specific item of user generated content from the Steam servers.
             Results are returned in a <see cref="T:SteamKit2.SteamCloud.UGCDetailsCallback"/>.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             </summary>
             <param name="ugcId">The unique user generated content id.</param>
             <returns>The Job ID of the request. This can be used to find the appropriate <see cref="T:SteamKit2.SteamCloud.UGCDetailsCallback"/>.</returns>
@@ -1861,6 +1877,7 @@
             <summary>
             Requests details for a specific file in the user's Cloud storage.
             Results are returned in a <see cref="T:SteamKit2.SteamCloud.SingleFileInfoCallback"/>.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             </summary>
             <param name="appid">The app id of the game.</param>
             <param name="filename">The path to the file being requested.</param>
@@ -1870,6 +1887,7 @@
             <summary>
             Commit a Cloud file at the given path to make its UGC handle publicly visible.
             Results are returned in a <see cref="T:SteamKit2.SteamCloud.ShareFileCallback"/>.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             </summary>
             <param name="appid">The app id of the game.</param>
             <param name="filename">The path to the file being requested.</param>
@@ -2009,9 +2027,8 @@
         </member>
         <member name="M:SteamKit2.SteamGameServer.LogOff">
             <summary>
-            Logs the game server off of the Steam3 network.
-            This method does not disconnect the client.
-            Results are returned in a <see cref="T:SteamKit2.SteamUser.LoggedOffCallback"/>.
+            Informs the Steam servers that this client wishes to log off from the network.
+            The Steam server will disconnect the client, and a <see cref="T:SteamKit2.SteamClient.DisconnectedCallback"/> will be posted.
             </summary>
         </member>
         <member name="M:SteamKit2.SteamGameServer.SendStatus(SteamKit2.SteamGameServer.StatusDetails)">
@@ -2139,6 +2156,7 @@
             <summary>
             Requests a list of servers from the Steam game master server.
             Results are returned in a <see cref="T:SteamKit2.SteamMasterServer.QueryCallback"/>.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             </summary>
             <param name="details">The details for the request.</param>
             <returns>The Job ID of the request. This can be used to find the appropriate <see cref="T:SteamKit2.SteamMasterServer.QueryCallback"/>.</returns>
@@ -2242,6 +2260,7 @@
             <summary>
             Adds a screenshot to the user's screenshot library. The screenshot image and thumbnail must already exist on the UFS.
             Results are returned in a <see cref="T:SteamKit2.SteamScreenshots.ScreenshotAddedCallback"/>.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             </summary>
             <param name="details">The details of the screenshot.</param>
             <returns>The Job ID of the request. This can be used to find the appropriate <see cref="T:SteamKit2.SteamScreenshots.ScreenshotAddedCallback"/>.</returns>
@@ -2428,6 +2447,7 @@
             <summary>
             Sends a message.
             Results are returned in a <see cref="T:SteamKit2.SteamUnifiedMessages.ServiceMethodResponse"/>.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             </summary>
             <typeparam name="TResponse">The type of the protobuf object which is the response to the RPC call.</typeparam>
             <param name="expr">RPC call expression, e.g. x => x.SomeMethodCall(message);</param>
@@ -2438,6 +2458,7 @@
             <summary>
             Sends a message.
             Results are returned in a <see cref="T:SteamKit2.SteamUnifiedMessages.ServiceMethodResponse"/>.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             </summary>
             <typeparam name="TRequest">The type of a protobuf object.</typeparam>
             <param name="name">Name of the RPC endpoint. Takes the format ServiceName.RpcName</param>
@@ -2656,6 +2677,7 @@
             <summary>
             Enumerates the list of published files for the current logged in user.
             Results are returned in a <see cref="T:SteamKit2.SteamWorkshop.UserPublishedFilesCallback"/>.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             </summary>
             <param name="details">The specific details of the request.</param>
             <returns>The Job ID of the request. This can be used to find the appropriate <see cref="T:SteamKit2.SteamWorkshop.UserPublishedFilesCallback"/>.</returns>
@@ -2664,6 +2686,7 @@
             <summary>
             Enumerates the list of subscribed files for the current logged in user.
             Results are returned in a <see cref="T:SteamKit2.SteamWorkshop.UserSubscribedFilesCallback"/>.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             </summary>
             <param name="details">The specific details of the request.</param>
             <returns>The Job ID of the request. This can be used to find the appropriate <see cref="T:SteamKit2.SteamWorkshop.UserSubscribedFilesCallback"/>.</returns>
@@ -2672,6 +2695,7 @@
             <summary>
             Enumerates the list of published files for the current logged in user based on user action.
             Results are returned in a <see cref="T:SteamKit2.SteamWorkshop.UserActionPublishedFilesCallback"/>.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             </summary>
             <param name="details">The specific details of the request.</param>
             <returns>The Job ID of the request. This can be used to find the appropriate <see cref="T:SteamKit2.SteamWorkshop.UserActionPublishedFilesCallback"/>.</returns>
@@ -2740,6 +2764,7 @@
             <summary>
             Enumerates the list of all published files on the Steam workshop.
             Results are returned in a <see cref="T:SteamKit2.SteamWorkshop.PublishedFilesCallback"/>.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             </summary>
             <param name="details">The specific details of the request.</param>
             <returns>The Job ID of the request. This can be used to find the appropriate <see cref="T:SteamKit2.SteamWorkshop.PublishedFilesCallback"/>.</returns>
@@ -2767,6 +2792,7 @@
             <summary>
             Asks the Steam back-end for a leaderboard by name for a given appid.
             Results are returned in a <see cref="T:SteamKit2.SteamUserStats.FindOrCreateLeaderboardCallback"/>.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             </summary>
             <param name="appId">The AppID to request a leaderboard for.</param>
             <param name="name">Name of the leaderboard to request.</param>
@@ -2776,6 +2802,7 @@
             <summary>
             Asks the Steam back-end for a leaderboard by name, and will create it if it's not yet.
             Results are returned in a <see cref="T:SteamKit2.SteamUserStats.FindOrCreateLeaderboardCallback"/>.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             </summary>
             <param name="appId">The AppID to request a leaderboard for.</param>
             <param name="name">Name of the leaderboard to create.</param>
@@ -2787,6 +2814,7 @@
             <summary>
             Asks the Steam back-end for a set of rows in the leaderboard.
             Results are returned in a <see cref="T:SteamKit2.SteamUserStats.LeaderboardEntriesCallback"/>.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             </summary>
             <param name="appId">The AppID to request leaderboard rows for.</param>
             <param name="id">ID of the leaderboard to view.</param>
@@ -2896,6 +2924,79 @@
             Gets the list of leaderboard entries this response contains.
             </summary>
         </member>
+        <member name="M:SteamKit2.AsyncJobManager.StartJob(SteamKit2.AsyncJob)">
+            <summary>
+            Tracks a job with this manager.
+            </summary>
+            <param name="asyncJob">The asynchronous job to track.</param>
+        </member>
+        <member name="M:SteamKit2.AsyncJobManager.TryCompleteJob(SteamKit2.JobID,SteamKit2.CallbackMsg)">
+            <summary>
+            Passes a callback to a pending async job.
+            If the given callback completes the job, the job is removed from this manager.
+            </summary>
+            <param name="jobId">The JobID.</param>
+            <param name="callback">The callback.</param>
+        </member>
+        <member name="M:SteamKit2.AsyncJobManager.HeartbeatJob(SteamKit2.JobID)">
+            <summary>
+            Extends the lifetime of a job.
+            </summary>
+            <param name="jobId">The job identifier.</param>
+        </member>
+        <member name="M:SteamKit2.AsyncJobManager.FailJob(SteamKit2.JobID)">
+            <summary>
+            Marks a certain job as remotely failed.
+            </summary>
+            <param name="jobId">The job identifier.</param>
+        </member>
+        <member name="M:SteamKit2.AsyncJobManager.CancelPendingJobs">
+            <summary>
+            Cancels and clears all jobs being tracked.
+            </summary>
+        </member>
+        <member name="M:SteamKit2.AsyncJobManager.SetTimeoutsEnabled(System.Boolean)">
+            <summary>
+            Enables or disables periodic checks for job timeouts.
+            </summary>
+            <param name="enable">Whether or not job timeout checks should be enabled.</param>
+        </member>
+        <member name="M:SteamKit2.AsyncJobManager.CancelTimedoutJobs">
+            <summary>
+            This is called periodically to cancel and clear out any jobs that have timed out (no response from Steam).
+            </summary>
+        </member>
+        <member name="M:SteamKit2.AsyncJobManager.GetJob(SteamKit2.JobID,System.Boolean)">
+            <summary>
+            Retrieves a job from this manager, and optionally removes it from tracking.
+            </summary>
+            <param name="jobId">The JobID.</param>
+            <param name="andRemove">If set to <c>true</c>, this job is removed from tracking.</param>
+            <returns></returns>
+        </member>
+        <member name="T:SteamKit2.AsyncJobFailedException">
+            <summary>
+            Thrown when Steam encounters a remote error with a pending <see cref="T:SteamKit2.AsyncJob"/>.
+            </summary>
+        </member>
+        <member name="M:SteamKit2.AsyncJobFailedException.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:SteamKit2.AsyncJobFailedException"/> class.
+            </summary>
+        </member>
+        <member name="M:SteamKit2.AsyncJobFailedException.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:SteamKit2.AsyncJobFailedException"/> class.
+            </summary>
+            <param name="message">The message that describes the error.</param>
+        </member>
+        <member name="M:SteamKit2.AsyncJobFailedException.#ctor(System.String,System.Exception)">
+            <summary>
+            Initializes a new instance of the <see cref="T:SteamKit2.AsyncJobFailedException"/> class.
+            </summary>
+            <param name="message">The error message that explains the reason for the exception.</param>
+            <param name="innerException">The exception that is the cause of the current exception, or a null reference (Nothing in Visual Basic) if no inner exception is specified.</param>
+        </member>
         <member name="T:SteamKit2.Callback`1">
             <summary>
             This utility class is used for binding a callback to a function.
@@ -3229,19 +3330,20 @@
             Helper class to load servers from the Steam Directory Web API.
             </summary>
         </member>
-        <member name="M:SteamKit2.SteamDirectory.Initialize(System.Int32)">
+        <member name="M:SteamKit2.SteamDirectory.Initialize(System.UInt32)">
             <summary>
             Initializes <see cref="T:SteamKit2.Internal.CMClient"/>'s server list with servers from the Steam Directory.
             </summary>
+            <param name="cellid">Cell ID</param>
         </member>
-        <member name="M:SteamKit2.SteamDirectory.LoadAsync(System.Int32)">
+        <member name="M:SteamKit2.SteamDirectory.LoadAsync(System.UInt32)">
             <summary>
             Load a list of servers from the Steam Directory.
             </summary>
             <param name="cellid">Cell ID</param>
             <returns>A <see cref="T:System.Threading.Tasks.Task"/> with the Result set to an enumerable list of <see cref="T:System.Net.IPEndPoint"/>s.</returns>
         </member>
-        <member name="M:SteamKit2.SteamDirectory.LoadAsync(System.Int32,System.Threading.CancellationToken)">
+        <member name="M:SteamKit2.SteamDirectory.LoadAsync(System.UInt32,System.Threading.CancellationToken)">
             <summary>
             Load a list of servers from the Steam Directory.
             </summary>
@@ -3536,45 +3638,6 @@
             A <see cref="T:System.String"/> that represents this instance.
             </returns>
         </member>
-        <member name="T:SteamKit2.JobID">
-            <summary>
-            Represents an identifier of a network task known as a job.
-            </summary>
-        </member>
-        <member name="F:SteamKit2.JobID.Invalid">
-            <summary>
-            Represents an invalid JobID.
-            </summary>
-        </member>
-        <member name="M:SteamKit2.JobID.#ctor">
-            <summary>
-            Initializes a new instance of the <see cref="T:SteamKit2.JobID"/> class.
-            </summary>
-        </member>
-        <member name="M:SteamKit2.JobID.#ctor(System.UInt64)">
-            <summary>
-            Initializes a new instance of the <see cref="T:SteamKit2.JobID"/> class.
-            </summary>
-            <param name="jobId">The Job ID to initialize this instance with.</param>
-        </member>
-        <member name="M:SteamKit2.JobID.op_Implicit(SteamKit2.JobID)~System.UInt64">
-            <summary>
-            Performs an implicit conversion from <see cref="T:SteamKit2.JobID"/> to <see cref="T:System.UInt64"/>.
-            </summary>
-            <param name="jobId">The Job ID.</param>
-            <returns>
-            The result of the conversion.
-            </returns>
-        </member>
-        <member name="M:SteamKit2.JobID.op_Implicit(System.UInt64)~SteamKit2.JobID">
-            <summary>
-            Performs an implicit conversion from <see cref="T:System.UInt64"/> to <see cref="T:SteamKit2.JobID"/>.
-            </summary>
-            <param name="jobId">The Job ID.</param>
-            <returns>
-            The result of the conversion.
-            </returns>
-        </member>
         <member name="T:SteamKit2.UGCHandle">
             <summary>
             Represents a single unique handle to a piece of User Generated Content.
@@ -3699,6 +3762,195 @@
             <param name="encryptionKey">The encryption key.</param>
             <returns><c>true</c> if the file names were successfully decrypted; otherwise, <c>false</c>.</returns>
         </member>
+        <member name="T:SteamKit2.JobID">
+            <summary>
+            Represents an identifier of a network task known as a job.
+            </summary>
+        </member>
+        <member name="F:SteamKit2.JobID.Invalid">
+            <summary>
+            Represents an invalid JobID.
+            </summary>
+        </member>
+        <member name="M:SteamKit2.JobID.#ctor">
+            <summary>
+            Initializes a new instance of the <see cref="T:SteamKit2.JobID"/> class.
+            </summary>
+        </member>
+        <member name="M:SteamKit2.JobID.#ctor(System.UInt64)">
+            <summary>
+            Initializes a new instance of the <see cref="T:SteamKit2.JobID"/> class.
+            </summary>
+            <param name="jobId">The Job ID to initialize this instance with.</param>
+        </member>
+        <member name="M:SteamKit2.JobID.op_Implicit(SteamKit2.JobID)~System.UInt64">
+            <summary>
+            Performs an implicit conversion from <see cref="T:SteamKit2.JobID"/> to <see cref="T:System.UInt64"/>.
+            </summary>
+            <param name="jobId">The Job ID.</param>
+            <returns>
+            The result of the conversion.
+            </returns>
+        </member>
+        <member name="M:SteamKit2.JobID.op_Implicit(System.UInt64)~SteamKit2.JobID">
+            <summary>
+            Performs an implicit conversion from <see cref="T:System.UInt64"/> to <see cref="T:SteamKit2.JobID"/>.
+            </summary>
+            <param name="jobId">The Job ID.</param>
+            <returns>
+            The result of the conversion.
+            </returns>
+        </member>
+        <member name="M:SteamKit2.JobID.op_Implicit(SteamKit2.AsyncJob)~SteamKit2.JobID">
+            <summary>
+            Performs an implicit conversion from <see cref="T:SteamKit2.AsyncJob"/> to <see cref="T:SteamKit2.JobID"/>.
+            </summary>
+            <param name="asyncJob">The asynchronous job.</param>
+            <returns>
+            The result of the conversion.
+            </returns>
+        </member>
+        <member name="T:SteamKit2.AsyncJob">
+            <summary>
+            The base class for awaitable versions of a <see cref="P:SteamKit2.AsyncJob.JobID"/>.
+            Should not be used or constructed directly, but rather with <see cref="T:SteamKit2.AsyncJob`1"/>.
+            </summary>
+        </member>
+        <member name="P:SteamKit2.AsyncJob.JobID">
+            <summary>
+            Gets the <see cref="P:SteamKit2.AsyncJob.JobID"/> for this job.
+            </summary>
+        </member>
+        <member name="P:SteamKit2.AsyncJob.Timeout">
+            <summary>
+            Gets or sets the period of time before this job will be considered timed out and will be canceled. By default this is 10 seconds.
+            </summary>
+        </member>
+        <member name="M:SteamKit2.AsyncJob.AddResult(SteamKit2.CallbackMsg)">
+            <summary>
+            Adds a callback to the async job's result set.
+            </summary>
+            <param name="callback">The callback.</param>
+            <returns><c>true</c> if this result completes the set; otherwise, <c>false</c>.</returns>
+        </member>
+        <member name="M:SteamKit2.AsyncJob.SetFailed(System.Boolean)">
+            <summary>
+            Sets this job as failed, either remotely or due to a message timeout.
+            </summary>
+            <param name="dueToRemoteFailure">
+            If set to <c>true</c> this job is marked as failed because Steam informed us of a job failure;
+            otherwise, this job has failed due to a message timeout.
+            </param>
+        </member>
+        <member name="M:SteamKit2.AsyncJob.Heartbeat">
+            <summary>
+            Marks this job as having received a heartbeat and extends the job's timeout.
+            </summary>
+        </member>
+        <member name="T:SteamKit2.AsyncJob`1">
+            <summary>
+            Represents an awaitable version of a <see cref="T:SteamKit2.JobID"/>.
+            Can either be converted to a TPL <see cref="T:System.Threading.Tasks.Task"/> with <see cref="M:SteamKit2.AsyncJob`1.ToTask"/> or can be awaited directly.
+            </summary>
+            <typeparam name="T">The callback type that will be returned by this async job.</typeparam>
+        </member>
+        <member name="M:SteamKit2.AsyncJob`1.#ctor(SteamKit2.SteamClient,SteamKit2.JobID)">
+            <summary>
+            Initializes a new instance of the <see cref="T:SteamKit2.AsyncJob`1" /> class.
+            </summary>
+            <param name="client">The <see cref="T:SteamKit2.SteamClient"/> that this job will be associated with.</param>
+            <param name="jobId">The Job ID value associated with this async job.</param>
+        </member>
+        <member name="M:SteamKit2.AsyncJob`1.ToTask">
+            <summary>
+            Converts this <see cref="T:SteamKit2.AsyncJob`1"/> instance into a TPL <see cref="T:System.Threading.Tasks.Task`1"/>.
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:SteamKit2.AsyncJob`1.GetAwaiter">
+            <summary>Gets an awaiter used to await this <see cref="T:SteamKit2.AsyncJob`1"/>.</summary>
+            <returns>An awaiter instance.</returns>
+            <remarks>This method is intended for compiler use rather than use directly in code.</remarks>
+        </member>
+        <member name="M:SteamKit2.AsyncJob`1.AddResult(SteamKit2.CallbackMsg)">
+            <summary>
+            Adds a callback to the async job's result set. For an <see cref="T:SteamKit2.AsyncJob`1"/>, this always completes the set.
+            </summary>
+            <param name="callback">The callback.</param>
+            <returns>Always <c>true</c>.</returns>
+        </member>
+        <member name="M:SteamKit2.AsyncJob`1.SetFailed(System.Boolean)">
+            <summary>
+            Sets this job as failed, either remotely or due to a message timeout.
+            </summary>
+            <param name="dueToRemoteFailure">
+            If set to <c>true</c> this job is marked as failed because Steam informed us of a job failure;
+            otherwise, this job has failed due to a message timeout.
+            </param>
+        </member>
+        <member name="T:SteamKit2.AsyncJobMultiple`1">
+            <summary>
+            Represents an awaitable version of a <see cref="T:SteamKit2.JobID"/>.
+            Can either be converted to a TPL <see cref="T:System.Threading.Tasks.Task"/> with <see cref="M:SteamKit2.AsyncJobMultiple`1.ToTask"/> or can be awaited directly.
+            This type of async job can contain multiple callback results.
+            </summary>
+            <typeparam name="T">The callback type that will be returned by this async job.</typeparam>
+        </member>
+        <member name="T:SteamKit2.AsyncJobMultiple`1.ResultSet">
+            <summary>
+            The set of callback results for an <see cref="T:SteamKit2.AsyncJobMultiple`1"/>.
+            </summary>
+        </member>
+        <member name="P:SteamKit2.AsyncJobMultiple`1.ResultSet.Complete">
+            <summary>
+            Gets a value indicating whether this <see cref="T:SteamKit2.AsyncJobMultiple`1.ResultSet" /> is complete and contains every result sent by Steam.
+            </summary>
+        </member>
+        <member name="P:SteamKit2.AsyncJobMultiple`1.ResultSet.Failed">
+            <summary>
+            Gets a value indicating whether the parent <see cref="T:SteamKit2.AsyncJobMultiple`1" /> received an incomplete result set and then encountered a remote failure.
+            </summary>
+        </member>
+        <member name="P:SteamKit2.AsyncJobMultiple`1.ResultSet.Results">
+            <summary>
+            Gets a read only collection of callback results for this async job.
+            </summary>
+        </member>
+        <member name="M:SteamKit2.AsyncJobMultiple`1.#ctor(SteamKit2.SteamClient,SteamKit2.JobID,System.Predicate{`0})">
+            <summary>
+            Initializes a new instance of the <see cref="T:SteamKit2.AsyncJob`1" /> class.
+            </summary>
+            <param name="client">The <see cref="T:SteamKit2.SteamClient"/> that this job will be associated with.</param>
+            <param name="jobId">The Job ID value associated with this async job.</param>
+            <param name="finishCondition">The condition that must be fulfilled for the result set to be considered complete.</param>
+        </member>
+        <member name="M:SteamKit2.AsyncJobMultiple`1.ToTask">
+            <summary>
+            Converts this <see cref="T:SteamKit2.AsyncJob`1"/> instance into a TPL <see cref="T:System.Threading.Tasks.Task`1"/>.
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:SteamKit2.AsyncJobMultiple`1.GetAwaiter">
+            <summary>Gets an awaiter used to await this <see cref="T:SteamKit2.AsyncJob`1"/>.</summary>
+            <returns>An awaiter instance.</returns>
+            <remarks>This method is intended for compiler use rather than use directly in code.</remarks>
+        </member>
+        <member name="M:SteamKit2.AsyncJobMultiple`1.AddResult(SteamKit2.CallbackMsg)">
+            <summary>
+            Adds a callback to the async job's result set.
+            </summary>
+            <param name="callback">The callback.</param>
+            <returns><c>true</c> if this result completes the set; otherwise, <c>false</c>.</returns>
+        </member>
+        <member name="M:SteamKit2.AsyncJobMultiple`1.SetFailed(System.Boolean)">
+            <summary>
+            Sets this job as failed, either remotely or due to a message timeout.
+            </summary>
+            <param name="dueToRemoteFailure">
+            If set to <c>true</c> this job is marked as failed because Steam informed us of a job failure;
+            otherwise, this job has failed due to a message timeout.
+            </param>
+        </member>
         <member name="T:SteamKit2.MessageObject">
             <summary>
             Represents a <see cref="T:SteamKit2.KeyValue"/> backed MessageObject structure, which are often sent by the Steam servers.
@@ -3840,6 +4092,60 @@
             The result of the operator.
             </returns>
         </member>
+        <member name="T:SteamKit2.IDebugNetworkListener">
+            <summary>
+            This is a debug utility, do not use it to implement your business logic.
+            
+            This interface is used for logging network messages sent to and received from the Steam server that the client is connected to.
+            </summary>
+        </member>
+        <member name="M:SteamKit2.IDebugNetworkListener.OnIncomingNetworkMessage(SteamKit2.EMsg,System.Byte[])">
+            <summary>
+            Called when a packet is received from the Steam server.
+            </summary>
+            <param name="msgType">Network message type of this packet message.</param>
+            <param name="data">Raw packet data that was received.</param>
+        </member>
+        <member name="M:SteamKit2.IDebugNetworkListener.OnOutgoingNetworkMessage(SteamKit2.EMsg,System.Byte[])">
+            <summary>
+            Called when a packet is about to be sent to the Steam server.
+            </summary>
+            <param name="msgType">Network message type of this packet message.</param>
+            <param name="data">Raw packet data that will be sent.</param>
+        </member>
+        <member name="T:SteamKit2.NetHookNetworkListener">
+             <summary>
+             Dump any network messages sent to and received from the Steam server that the client is connected to.
+             These messages are dumped to file, and can be analyzed further with NetHookAnalyzer, a hex editor, or your own purpose-built tools.
+            
+             Be careful with this, sensitive data may be written to the disk (such as your Steam password).
+             </summary>
+        </member>
+        <member name="M:SteamKit2.NetHookNetworkListener.#ctor">
+            <summary>
+            Will create a folder in path "%assembly%/nethook/%currenttime%/"
+            </summary>
+        </member>
+        <member name="M:SteamKit2.NetHookNetworkListener.#ctor(System.String)">
+            <summary>
+            Log to your own folder.
+            </summary>
+            <param name="path">Path to folder.</param>
+        </member>
+        <member name="M:SteamKit2.NetHookNetworkListener.OnIncomingNetworkMessage(SteamKit2.EMsg,System.Byte[])">
+            <summary>
+            Called when a packet is received from the Steam server.
+            </summary>
+            <param name="msgType">Network message type of this packet message.</param>
+            <param name="data">Raw packet data that was received.</param>
+        </member>
+        <member name="M:SteamKit2.NetHookNetworkListener.OnOutgoingNetworkMessage(SteamKit2.EMsg,System.Byte[])">
+            <summary>
+            Called when a packet is about to be sent to the Steam server.
+            </summary>
+            <param name="msgType">Network message type of this packet message.</param>
+            <param name="data">Raw packet data that will be sent.</param>
+        </member>
         <member name="P:SteamKit2.UdpPacket.IsValid">
             <summary>
             Gets a value indicating whether this instance is valid.
@@ -4356,7 +4662,7 @@
         </member>
         <member name="P:SteamKit2.SteamApps.PICSProductInfoCallback.ResponsePending">
             <summary>
-            Gets if the are more product information responses pending
+            Gets if there are more product information responses pending
             </summary>
         </member>
         <member name="P:SteamKit2.SteamApps.PICSProductInfoCallback.UnknownPackages">
@@ -4507,6 +4813,7 @@
             <summary>
             Requests an app ownership ticket for the specified AppID.
             Results are returned in a <see cref="T:SteamKit2.SteamApps.AppOwnershipTicketCallback"/> callback.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             </summary>
             <param name="appid">The appid to request the ownership ticket of.</param>
             <returns>The Job ID of the request. This can be used to find the appropriate <see cref="T:SteamKit2.SteamApps.AppOwnershipTicketCallback"/>.</returns>
@@ -4515,6 +4822,7 @@
             <summary>
             Requests app information for a single app. Use the overload for requesting information on a batch of apps.
             Results are returned in a <see cref="T:SteamKit2.SteamApps.AppInfoCallback"/> callback.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             
             Consider using <see cref="o:SteamApps.PICSGetProductInfo"/> instead.
             </summary>
@@ -4526,6 +4834,7 @@
             <summary>
             Requests app information for a single app. Use the overload for requesting information on a batch of apps.
             Results are returned in a <see cref="T:SteamKit2.SteamApps.AppInfoCallback"/> callback.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             
             Consider using <see cref="o:SteamApps.PICSGetProductInfo"/> instead.
             </summary>
@@ -4537,6 +4846,7 @@
             <summary>
             Requests app information for a list of apps.
             Results are returned in a <see cref="T:SteamKit2.SteamApps.AppInfoCallback"/> callback.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             
             Consider using <see cref="o:SteamApps.PICSGetProductInfo"/> instead.
             </summary>
@@ -4548,6 +4858,7 @@
             <summary>
             Requests app information for a list of apps.
             Results are returned in a <see cref="T:SteamKit2.SteamApps.AppInfoCallback"/> callback.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             
             Consider using <see cref="o:SteamApps.PICSGetProductInfo"/> instead.
             </summary>
@@ -4559,6 +4870,7 @@
             <summary>
             Requests package information for a single package. Use the overload for requesting information on a batch of packages.
             Results are returned in a <see cref="T:SteamKit2.SteamApps.PackageInfoCallback"/> callback.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             
             Consider using <see cref="o:SteamApps.PICSGetProductInfo"/> instead.
             </summary>
@@ -4570,6 +4882,7 @@
             <summary>
             Requests package information for a list of packages.
             Results are returned in a <see cref="T:SteamKit2.SteamApps.PackageInfoCallback"/> callback.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             
             Consider using <see cref="o:SteamApps.PICSGetProductInfo"/> instead.
             </summary>
@@ -4591,15 +4904,27 @@
             <summary>
             Request the depot decryption key for a specified DepotID.
             Results are returned in a <see cref="T:SteamKit2.SteamApps.DepotKeyCallback"/> callback.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             </summary>
             <param name="depotid">The DepotID to request a decryption key for.</param>
             <param name="appid">The AppID to request the decryption key for.</param>
             <returns>The Job ID of the request. This can be used to find the appropriate <see cref="T:SteamKit2.SteamApps.DepotKeyCallback"/>.</returns>
         </member>
+        <member name="M:SteamKit2.SteamApps.PICSGetAccessTokens(System.Nullable{System.UInt32},System.Nullable{System.UInt32})">
+            <summary>
+            Request PICS access tokens for an app or package.
+            Results are returned in a <see cref="T:SteamKit2.SteamApps.PICSTokensCallback"/> callback.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
+            </summary>
+            <param name="app">App id to request access token for.</param>
+            <param name="package">Package id to request access token for.</param>
+            <returns>The Job ID of the request. This can be used to find the appropriate <see cref="T:SteamKit2.SteamApps.PICSTokensCallback"/>.</returns>
+        </member>
         <member name="M:SteamKit2.SteamApps.PICSGetAccessTokens(System.Collections.Generic.IEnumerable{System.UInt32},System.Collections.Generic.IEnumerable{System.UInt32})">
             <summary>
             Request PICS access tokens for a list of app ids and package ids
             Results are returned in a <see cref="T:SteamKit2.SteamApps.PICSTokensCallback"/> callback.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             </summary>
             <param name="appIds">List of app ids to request access tokens for.</param>
             <param name="packageIds">List of package ids to request access tokens for.</param>
@@ -4609,6 +4934,7 @@
             <summary>
             Request changes for apps and packages since a given change number
             Results are returned in a <see cref="T:SteamKit2.SteamApps.PICSChangesCallback"/> callback.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             </summary>
             <param name="lastChangeNumber">Last change number seen.</param>
             <param name="sendAppChangelist">Whether to send app changes.</param>
@@ -4619,6 +4945,7 @@
             <summary>
             Request product information for an app or package
             Results are returned in a <see cref="T:SteamKit2.SteamApps.PICSProductInfoCallback"/> callback.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             </summary>
             <param name="app">App id requested.</param>
             <param name="package">Package id requested.</param>
@@ -4630,6 +4957,7 @@
             <summary>
             Request product information for a list of apps or packages
             Results are returned in a <see cref="T:SteamKit2.SteamApps.PICSProductInfoCallback"/> callback.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             </summary>
             <param name="apps">List of app ids requested.</param>
             <param name="packages">List of package ids requested.</param>
@@ -4641,6 +4969,7 @@
             <summary>
             Request product information for a list of apps or packages
             Results are returned in a <see cref="T:SteamKit2.SteamApps.PICSProductInfoCallback"/> callback.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             </summary>
             <param name="apps">List of <see cref="T:SteamKit2.SteamApps.PICSRequest"/> requests for apps.</param>
             <param name="packages">List of <see cref="T:SteamKit2.SteamApps.PICSRequest"/> requests for packages.</param>
@@ -4651,6 +4980,7 @@
             <summary>
             Request product information for an app or package
             Results are returned in a <see cref="T:SteamKit2.SteamApps.CDNAuthTokenCallback"/> callback.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             </summary>
             <param name="app">App id requested.</param>
             <param name="host_name">CDN host name being requested.</param>
@@ -4660,6 +4990,7 @@
             <summary>
             Request a free license for given appid, can be used for free on demand apps
             Results are returned in a <see cref="T:SteamKit2.SteamApps.FreeLicenseCallback"/> callback.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             </summary>
             <param name="app">The app to request a free license for.</param>
             <returns>The Job ID of the request. This can be used to find the appropriate <see cref="T:SteamKit2.SteamApps.FreeLicenseCallback"/>.</returns>
@@ -4668,6 +4999,7 @@
             <summary>
             Request a free license for given appids, can be used for free on demand apps
             Results are returned in a <see cref="T:SteamKit2.SteamApps.FreeLicenseCallback"/> callback.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             </summary>
             <param name="apps">The apps to request a free license for.</param>
             <returns>The Job ID of the request. This can be used to find the appropriate <see cref="T:SteamKit2.SteamApps.FreeLicenseCallback"/>.</returns>
@@ -5027,6 +5359,54 @@
             </summary>
             <value>The message.</value>
         </member>
+        <member name="T:SteamKit2.SteamFriends.FriendMsgHistoryCallback">
+            <summary>
+            <para>This callback is fired in response to receiving historical messages.</para> 
+            See also <seealso cref="M:SteamKit2.SteamFriends.RequestOfflineMessages"/> and
+            <seealso cref="M:SteamKit2.SteamFriends.RequestMessageHistory(SteamKit2.SteamID)"/>.
+            </summary>
+        </member>
+        <member name="P:SteamKit2.SteamFriends.FriendMsgHistoryCallback.Result">
+            <summary>
+            Gets the result of the request.
+            </summary>
+        </member>
+        <member name="P:SteamKit2.SteamFriends.FriendMsgHistoryCallback.SteamID">
+            <summary>
+            Gets the SteamID of the user with whom these messages were exchanged.
+            </summary>
+        </member>
+        <member name="P:SteamKit2.SteamFriends.FriendMsgHistoryCallback.Messages">
+            <summary>
+            The messages exchanged with the user.
+            Offline messages are marked by having set <see cref="P:SteamKit2.SteamFriends.FriendMsgHistoryCallback.FriendMessage.Unread"/> to <c>true</c>
+            </summary>
+        </member>
+        <member name="T:SteamKit2.SteamFriends.FriendMsgHistoryCallback.FriendMessage">
+            <summary>
+            Represents a single Message sent to or received from a friend
+            </summary>
+        </member>
+        <member name="P:SteamKit2.SteamFriends.FriendMsgHistoryCallback.FriendMessage.SteamID">
+            <summary>
+            The SteamID of the User that wrote the message
+            </summary>
+        </member>
+        <member name="P:SteamKit2.SteamFriends.FriendMsgHistoryCallback.FriendMessage.Unread">
+            <summary>
+            Whether or not the message has been read, i.e., is an offline message.
+            </summary>
+        </member>
+        <member name="P:SteamKit2.SteamFriends.FriendMsgHistoryCallback.FriendMessage.Message">
+            <summary>
+            The actual message
+            </summary>
+        </member>
+        <member name="P:SteamKit2.SteamFriends.FriendMsgHistoryCallback.FriendMessage.Timestamp">
+            <summary>
+            The time (in UTC) when the message was sent
+            </summary>
+        </member>
         <member name="T:SteamKit2.SteamFriends.FriendAddedCallback">
             <summary>
             This callback is fired in response to adding a user to your friends list.
@@ -5345,6 +5725,7 @@
             <summary>
             Sets the local user's persona name and broadcasts it over the network.
             Results are returned in a <see cref="T:SteamKit2.SteamFriends.PersonaChangeCallback"/> callback.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             </summary>
             <param name="name">The name.</param>
             <returns>The Job ID of the request. This can be used to find the appropriate <see cref="T:SteamKit2.SteamFriends.PersonaChangeCallback"/>.</returns>
@@ -5359,6 +5740,7 @@
             <summary>
             Sets the local user's persona state and broadcasts it over the network.
             Results are returned in a <see cref="T:SteamKit2.SteamFriends.PersonaChangeCallback"/> callback.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             </summary>
             <param name="state">The state.</param>
             <returns>The Job ID of the request. This can be used to find the appropriate <see cref="T:SteamKit2.SteamFriends.PersonaChangeCallback"/>.</returns>
@@ -5547,6 +5929,7 @@
             <summary>
             Ignores or unignores a friend on Steam.
             Results are returned in a <see cref="T:SteamKit2.SteamFriends.IgnoreFriendCallback"/>.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             </summary>
             <param name="steamId">The SteamID of the friend to ignore or unignore.</param>
             <param name="setIgnore">if set to <c>true</c>, the friend will be ignored; otherwise, they will be unignored.</param>
@@ -5556,10 +5939,25 @@
             <summary>
             Requests profile information for the given <see cref="T:SteamKit2.SteamID"/>.
             Results are returned in a <see cref="T:SteamKit2.SteamFriends.ProfileInfoCallback"/>.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             </summary>
             <param name="steamId">The SteamID of the friend to request the details of.</param>
             <returns>The Job ID of the request. This can be used to find the appropriate <see cref="T:SteamKit2.SteamFriends.ProfileInfoCallback"/>.</returns>
         </member>
+        <member name="M:SteamKit2.SteamFriends.RequestMessageHistory(SteamKit2.SteamID)">
+            <summary>
+            Requests the last few chat messages with a friend.
+            Results are returned in a <see cref="T:SteamKit2.SteamFriends.FriendMsgHistoryCallback"/>
+            </summary>
+            <param name="steamId">SteamID of the friend</param>
+        </member>
+        <member name="M:SteamKit2.SteamFriends.RequestOfflineMessages">
+            <summary>
+            Requests all offline messages.
+            This also marks them as read server side.
+            Results are returned in a <see cref="T:SteamKit2.SteamFriends.FriendMsgHistoryCallback"/>.
+            </summary>
+        </member>
         <member name="M:SteamKit2.SteamFriends.HandleMsg(SteamKit2.IPacketMsg)">
             <summary>
             Handles a client message. This should not be called directly.
@@ -5920,6 +6318,18 @@
             </summary>
             <value>The CellID.</value>
         </member>
+        <member name="P:SteamKit2.SteamUser.LogOnDetails.LoginID">
+            <summary>
+            Gets or sets the LoginID. This number is used for identifying logon session.
+            The purpose of this field is to allow multiple sessions to the same steam account from the same machine.
+            This is because Steam Network doesn't allow more than one session with the same LoginID to access given account at the same time.
+            If you want to establish more than one active session to given account, you must make sure that every session (to that account) has unique LoginID.
+            By default LoginID is automatically generated based on machine's primary bind address, which is the same for all sessions.
+            Null value will cause this property to be automatically generated based on default behaviour.
+            If in doubt, set this property to null.
+            </summary>
+            <value>The LoginID.</value>
+        </member>
         <member name="P:SteamKit2.SteamUser.LogOnDetails.AuthCode">
             <summary>
             Gets or sets the Steam Guard auth code used to login. This is the code sent to the user's email.
@@ -6139,9 +6549,8 @@
         </member>
         <member name="M:SteamKit2.SteamUser.LogOff">
             <summary>
-            Logs the user off of the Steam3 network.
-            This method does not disconnect the client.
-            Results are returned in a <see cref="T:SteamKit2.SteamUser.LoggedOffCallback"/>.
+            Informs the Steam servers that this client wishes to log off from the network.
+            The Steam server will disconnect the client, and a <see cref="T:SteamKit2.SteamClient.DisconnectedCallback"/> will be posted.
             </summary>
         </member>
         <member name="M:SteamKit2.SteamUser.SendMachineAuthResponse(SteamKit2.SteamUser.MachineAuthDetails)">
@@ -6155,6 +6564,7 @@
             <summary>
             Requests a new WebAPI authentication user nonce.
             Results are returned in a <see cref="T:SteamKit2.SteamUser.WebAPIUserNonceCallback"/>.
+            The returned <see cref="T:SteamKit2.AsyncJob`1"/> can also be awaited to retrieve the callback result.
             </summary>
             <returns>The Job ID of the request. This can be used to find the appropriate <see cref="T:SteamKit2.SteamUser.WebAPIUserNonceCallback"/>.</returns>
         </member>
@@ -6181,37 +6591,6 @@
             then this will be <see cref="P:JobID.Invalid"/>
             </summary>
         </member>
-        <member name="T:SteamKit2.CallbackMsgExtensions">
-            <summary>
-            Useful extensions for ICallbackMsg
-            </summary>
-        </member>
-        <member name="M:SteamKit2.CallbackMsgExtensions.IsType``1(SteamKit2.ICallbackMsg)">
-            <summary>
-            Determines whether this callback is a certain type.
-            </summary>
-            <typeparam name="T">The type to check against.</typeparam>
-            <returns>
-            	<c>true</c> if this callback is the type specified; otherwise, <c>false</c>.
-            </returns>
-            <exception cref="T:System.ArgumentNullException">
-            	<c>msg</c> is null.
-            </exception>
-        </member>
-        <member name="M:SteamKit2.CallbackMsgExtensions.Handle``1(SteamKit2.ICallbackMsg,System.Action{``0})">
-            <summary>
-            Invokes the specified handler delegate if the callback matches the type parameter.
-            </summary>
-            <typeparam name="T">The type to check against.</typeparam>
-            <param name="msg">The callback in question.</param>
-            <param name="handler">The handler to invoke.</param>
-            <returns>
-            	<c>true</c> if the callback matches and the handler was called; otherwise, <c>false</c>.
-            </returns>
-            <exception cref="T:System.ArgumentNullException">
-            	<c>msg</c> is null or <c>handler</c> is null.
-            </exception>
-        </member>
         <member name="T:SteamKit2.CallbackMsg">
             <summary>
             Represents the base object all callbacks are based off.
@@ -6394,6 +6773,13 @@
             Gets the underlying <see cref="T:SteamKit2.SteamClient"/> for use in sending replies.
             </summary>
         </member>
+        <member name="P:SteamKit2.ClientMsgHandler.ExpectDisconnection">
+            <summary>
+            Gets or sets whether or not the related <see cref="T:SteamKit2.SteamClient" /> should imminently expect the server to close the connection.
+            If this is true when the connection is closed, the <see cref="T:SteamKit2.SteamClient.DisconnectedCallback"/>'s <see cref="P:SteamKit2.SteamClient.DisconnectedCallback.UserInitiated"/> property
+            will be set to <c>true</c>.
+            </summary>
+        </member>
         <member name="M:SteamKit2.ClientMsgHandler.#ctor">
             <summary>
             Initializes a new instance of the <see cref="T:SteamKit2.ClientMsgHandler"/> class.
@@ -7104,11 +7490,11 @@
             </summary>
             <param name="packet">The packet.</param>
         </member>
-        <member name="M:SteamKit2.UdpConnection.SetNetEncryptionFilter(SteamKit2.NetFilterEncryption)">
+        <member name="M:SteamKit2.UdpConnection.SetNetEncryptionFilter(SteamKit2.INetFilterEncryption)">
             <summary>
             Sets the network encryption filter for this connection
             </summary>
-            <param name="filter">filter implementing <see cref="T:SteamKit2.NetFilterEncryption"/></param>
+            <param name="filter">filter implementing <see cref="T:SteamKit2.INetFilterEncryption"/></param>
         </member>
         <member name="T:SteamKit2.NetMsgEventArgs">
             <summary>
@@ -7166,11 +7552,11 @@
             </summary>
             <returns>The local IP.</returns>
         </member>
-        <member name="M:SteamKit2.Connection.SetNetEncryptionFilter(SteamKit2.NetFilterEncryption)">
+        <member name="M:SteamKit2.Connection.SetNetEncryptionFilter(SteamKit2.INetFilterEncryption)">
             <summary>
             Sets the network encryption filter for this connection
             </summary>
-            <param name="filter">filter implementing <see cref="T:SteamKit2.NetFilterEncryption"/></param>
+            <param name="filter">filter implementing <see cref="T:SteamKit2.INetFilterEncryption"/></param>
         </member>
         <member name="T:SteamKit2.KeyDictionary">
             <summary>
@@ -7229,16 +7615,36 @@
             Decrypts an input byte array using AES/CBC/PKCS7 with a given key and IV
             </summary>
         </member>
+        <member name="M:SteamKit2.CryptoHelper.SymmetricEncryptWithIV(System.Byte[],System.Byte[],System.Byte[])">
+            <summary>
+            Performs an encryption using AES/CBC/PKCS7 with an input byte array and key, with a random IV prepended using AES/ECB/None
+            </summary>
+        </member>
         <member name="M:SteamKit2.CryptoHelper.SymmetricEncrypt(System.Byte[],System.Byte[])">
             <summary>
             Performs an encryption using AES/CBC/PKCS7 with an input byte array and key, with a random IV prepended using AES/ECB/None
             </summary>
         </member>
+        <member name="M:SteamKit2.CryptoHelper.SymmetricEncryptWithHMACIV(System.Byte[],System.Byte[],System.Byte[])">
+            <summary>
+            Performs an encryption using AES/CBC/PKCS7 with an input byte array and key, with a IV (comprised of random bytes and the HMAC-SHA1 of the random bytes and plaintext) prepended using AES/ECB/None
+            </summary>
+        </member>
         <member name="M:SteamKit2.CryptoHelper.SymmetricDecrypt(System.Byte[],System.Byte[])">
             <summary>
             Decrypts using AES/CBC/PKCS7 with an input byte array and key, using the random IV prepended using AES/ECB/None
             </summary>
         </member>
+        <member name="M:SteamKit2.CryptoHelper.SymmetricDecryptHMACIV(System.Byte[],System.Byte[],System.Byte[])">
+            <summary>
+            Decrypts using AES/CBC/PKCS7 with an input byte array and key, using the IV (comprised of random bytes and the HMAC-SHA1 of the random bytes and plaintext) prepended using AES/ECB/None
+            </summary>
+        </member>
+        <member name="M:SteamKit2.CryptoHelper.SymmetricDecrypt(System.Byte[],System.Byte[],System.Byte[]@)">
+            <summary>
+            Decrypts using AES/CBC/PKCS7 with an input byte array and key, using the random IV prepended using AES/ECB/None
+            </summary>
+        </member>
         <member name="M:SteamKit2.CryptoHelper.VerifyAndDecryptPassword(System.Byte[],System.String)">
             <summary>
             Verifies and performs a symmetricdecrypt on the input using the given password as a key

packages/SteamKit2.1.7.0/readme.txt

@@ -1,3 +1,30 @@
+------------------------------------------------------------------------------
+v 1.7.0			Dec 21, 2015
+------------------------------------------------------------------------------
+* Added awaitable API for job-based messages. APIs which returned a `JobID` now return an `AsyncJob<>`, which can be used to asynchronously await for results. (pr #170)
+* Added `SteamApps.PICSGetAccessTokens` overload with singular parameters. (pr #190)
+* Added `SteamFriends.RequestMessageHistory` and `SteamFriends.RequestOfflineMessages` (pr #193)
+* Added the ability to connect to Developer instances of Steam (`EUniverse.Dev`). If anyone at Valve is using this internally, hi!
+* Added the ability to set a `LoginID` in `SteamUser.LogOnDetails` so that multiple instances can connect from the same host concurrenctly. (pr #217)
+* Added `SteamClient.DebugNetworkListener` API to intercept and log raw messages. (pr #204)
+* Added the ability to dump messages in NetHook2 format for debugging purposes. (pr #204)
+* Upgraded the encryption protocol used to communicate with the Steam servers.
+* Implemented protection against man-in-the-middle attacks. (pr #214)
+* Server List will now maintain ordering from Steam, increasing the chances of a successful and geographically local connection. (pr #218)
+* After calling `SteamUser.LogOff` or `SteamGameServer.LogOff`, `SteamClient.DisconnectedCallback.UserInitiated` will be `true`. (pr #205)
+* Fixed a crash when parsing a Steam ID of the format '[i:1:234]'.
+* Fixed a crash when logging on in an enviromnent where the hard disk has no serial ID, such as Hyper-V.
+* Fixed a bug when parsing a KeyValue file that contains a `/` followed by a newline. (pr #187)
+* Updated Steam enums and protobufs.
+* Updated game-related GC messages and protobufs.
+
+BREAKING CHANGES
+* SteamKit2 now requires .NET 4.5 or equivalent (Mono 3.0), or higher.
+* Removed obsoleted `ICallbackMsg` extension methods `IsType<>` and `Handle<>`. (pr #221)
+* Game Coordinator base messages are now generated per-game, instead of relying on Dota 2. GC messages should use the base messages for their game, which is separated by namespace. (pr #180)
+* Cell IDs are now consistently `uint`s within `SteamDirectory`.
+
+
 ------------------------------------------------------------------------------
 v 1.6.5			Oct 17, 2015
 ------------------------------------------------------------------------------