Use better format for API

Seems to fix semi-rare 429 rate-limiting errors. Maybe GabeN increased limits?

ArchiSteamFarm/ArchiWebHandler.cs

@@ -47,6 +47,8 @@ namespace ArchiSteamFarm {
 		private readonly SemaphoreSlim SessionSemaphore = new SemaphoreSlim(1);
 		private readonly WebBrowser WebBrowser;
 
+		internal bool Ready { get; private set; }
+
 		private ulong SteamID;
 		private DateTime LastSessionRefreshCheck = DateTime.MinValue;
 
@@ -67,12 +69,7 @@ namespace ArchiSteamFarm {
 			}
 
 			uint appID;
-			if (uint.TryParse(hashName.Substring(0, index), out appID)) {
+			return uint.TryParse(hashName.Substring(0, index), out appID) ? appID : 0;
-				return appID;
-			}
-
-			Logging.LogNullError(nameof(appID));
-			return 0;
 		}
 
 		private static Steam.Item.EType GetItemType(string name) {
@@ -117,7 +114,9 @@ namespace ArchiSteamFarm {
 			WebBrowser = new WebBrowser(bot.BotName);
 		}
 
-		internal bool Init(SteamClient steamClient, string webAPIUserNonce, string parentalPin) {
+		internal void OnDisconnected() => Ready = false;
+
+		internal async Task<bool> Init(SteamClient steamClient, string webAPIUserNonce, string parentalPin) {
 			if ((steamClient == null) || string.IsNullOrEmpty(webAPIUserNonce)) {
 				Logging.LogNullError(nameof(steamClient) + " || " + nameof(webAPIUserNonce), Bot.BotName);
 				return false;
@@ -179,10 +178,12 @@ namespace ArchiSteamFarm {
 			string steamLoginSecure = authResult["tokensecure"].Value;
 			WebBrowser.CookieContainer.Add(new Cookie("steamLoginSecure", steamLoginSecure, "/", "." + SteamCommunityHost));
 
-			if (!UnlockParentalAccount(parentalPin).Result) {
+			// Unlock Steam Parental if needed
+			if (!await UnlockParentalAccount(parentalPin).ConfigureAwait(false)) {
 				return false;
 			}
 
+			Ready = true;
 			LastSessionRefreshCheck = DateTime.Now;
 			return true;
 		}
@@ -246,7 +247,7 @@ namespace ArchiSteamFarm {
 				return null;
 			}
 
-			string request = SteamCommunityURL + "/mobileconf/conf?p=" + deviceID + "&a=" + SteamID + "&k=" + WebUtility.UrlEncode(confirmationHash) + "&t=" + time + "&m=android&tag=conf";
+			string request = SteamCommunityURL + "/mobileconf/conf?l=english&p=" + deviceID + "&a=" + SteamID + "&k=" + WebUtility.UrlEncode(confirmationHash) + "&t=" + time + "&m=android&tag=conf";
 			return await WebBrowser.UrlGetToHtmlDocumentRetry(request).ConfigureAwait(false);
 		}
 
@@ -369,10 +370,10 @@ namespace ArchiSteamFarm {
 			}
 
 			KeyValue response = null;
+			for (byte i = 0; (i < WebBrowser.MaxRetries) && (response == null); i++) {
 				using (dynamic iPlayerService = WebAPI.GetInterface("IPlayerService", Bot.BotConfig.SteamApiKey)) {
 					iPlayerService.Timeout = Timeout;
 
-				for (byte i = 0; (i < WebBrowser.MaxRetries) && (response == null); i++) {
 					try {
 						response = iPlayerService.GetOwnedGames(
 							steamid: steamID,
@@ -406,10 +407,10 @@ namespace ArchiSteamFarm {
 
 		internal uint GetServerTime() {
 			KeyValue response = null;
+			for (byte i = 0; (i < WebBrowser.MaxRetries) && (response == null); i++) {
 				using (dynamic iTwoFactorService = WebAPI.GetInterface("ITwoFactorService")) {
 					iTwoFactorService.Timeout = Timeout;
 
-				for (byte i = 0; (i < WebBrowser.MaxRetries) && (response == null); i++) {
 					try {
 						response = iTwoFactorService.QueryTime(
 							method: WebRequestMethods.Http.Post,
@@ -435,7 +436,7 @@ namespace ArchiSteamFarm {
 				return null;
 			}
 
-			string request = SteamCommunityURL + "/tradeoffer/" + tradeID;
+			string request = SteamCommunityURL + "/tradeoffer/" + tradeID + "?l=english";
 
 			HtmlDocument htmlDocument = await WebBrowser.UrlGetToHtmlDocumentRetry(request).ConfigureAwait(false);
 			if (htmlDocument == null) {
@@ -487,10 +488,10 @@ namespace ArchiSteamFarm {
 			}
 
 			KeyValue response = null;
+			for (byte i = 0; (i < WebBrowser.MaxRetries) && (response == null); i++) {
 				using (dynamic iEconService = WebAPI.GetInterface("IEconService", Bot.BotConfig.SteamApiKey)) {
 					iEconService.Timeout = Timeout;
 
-				for (byte i = 0; (i < WebBrowser.MaxRetries) && (response == null); i++) {
 					try {
 						response = iEconService.GetTradeOffers(
 							get_received_offers: 1,
@@ -624,10 +625,10 @@ namespace ArchiSteamFarm {
 			}
 
 			KeyValue response = null;
+			for (byte i = 0; (i < WebBrowser.MaxRetries) && (response == null); i++) {
 				using (dynamic iEconService = WebAPI.GetInterface("IEconService", Bot.BotConfig.SteamApiKey)) {
 					iEconService.Timeout = Timeout;
 
-				for (byte i = 0; (i < WebBrowser.MaxRetries) && (response == null); i++) {
 					try {
 						response = iEconService.DeclineTradeOffer(
 							tradeofferid: tradeID.ToString(),
@@ -837,7 +838,7 @@ namespace ArchiSteamFarm {
 				return null;
 			}
 
-			string request = SteamCommunityURL + "/my/badges?p=" + page;
+			string request = SteamCommunityURL + "/my/badges?l=english&p=" + page;
 
 			return await WebBrowser.UrlGetToHtmlDocumentRetry(request).ConfigureAwait(false);
 		}
@@ -852,7 +853,7 @@ namespace ArchiSteamFarm {
 				return null;
 			}
 
-			string request = SteamCommunityURL + "/my/gamecards/" + appID;
+			string request = SteamCommunityURL + "/my/gamecards/" + appID + "?l=english";
 
 			return await WebBrowser.UrlGetToHtmlDocumentRetry(request).ConfigureAwait(false);
 		}

ArchiSteamFarm/Bot.cs

@@ -56,14 +56,19 @@ namespace ArchiSteamFarm {
 		private readonly string SentryFile;
 		private readonly BotDatabase BotDatabase;
 		private readonly CallbackManager CallbackManager;
+
+		[JsonProperty]
 		private readonly CardsFarmer CardsFarmer;
+
 		private readonly SteamApps SteamApps;
 		private readonly SteamFriends SteamFriends;
 		private readonly SteamUser SteamUser;
 		private readonly Timer AcceptConfirmationsTimer, SendItemsTimer;
 		private readonly Trading Trading;
 
+		[JsonProperty]
 		internal bool KeepRunning { get; private set; }
+
 		internal bool PlayingBlocked { get; private set; }
 
 		private bool FirstTradeSent, InvalidPassword, SkipFirstShutdown;
@@ -252,7 +257,7 @@ namespace ArchiSteamFarm {
 			}
 
 			if (acceptedType != Steam.ConfirmationDetails.EType.Unknown) {
-				if (confirmations.RemoveWhere(confirmation => confirmation.Type != acceptedType) > 0) {
+				if (confirmations.RemoveWhere(confirmation => (confirmation.Type != acceptedType) && (confirmation.Type != Steam.ConfirmationDetails.EType.Other)) > 0) {
 					confirmations.TrimExcess();
 					if (confirmations.Count == 0) {
 						return;
@@ -261,8 +266,8 @@ namespace ArchiSteamFarm {
 			}
 
 			if ((acceptedSteamID != 0) || ((acceptedTradeIDs != null) && (acceptedTradeIDs.Count > 0))) {
-				List<Task<Steam.ConfirmationDetails>> detailsTasks = confirmations.Select(BotDatabase.MobileAuthenticator.GetConfirmationDetails).ToList();
+				List<Task<Steam.ConfirmationDetails>> tasks = confirmations.Select(BotDatabase.MobileAuthenticator.GetConfirmationDetails).ToList();
-				Steam.ConfirmationDetails[] detailsResults = await Task.WhenAll(detailsTasks).ConfigureAwait(false);
+				Steam.ConfirmationDetails[] detailsResults = await Task.WhenAll(tasks).ConfigureAwait(false);
 
 				HashSet<uint> ignoredConfirmationIDs = new HashSet<uint>();
 				foreach (Steam.ConfirmationDetails details in detailsResults.Where(details => (details != null) && (
@@ -282,8 +287,11 @@ namespace ArchiSteamFarm {
 				}
 			}
 
-			List<Task<bool>> tasks = confirmations.Select(confirmation => BotDatabase.MobileAuthenticator.HandleConfirmation(confirmation, accept)).ToList();
+			// This could be done in parallel, but for some reason Steam allows only one confirmation being accepted at the time
-			await Task.WhenAll(tasks).ConfigureAwait(false);
+			// Therefore, even though no physical barrier stops us from doing so, we execute this synchronously
+			foreach (MobileAuthenticator.Confirmation confirmation in confirmations) {
+				await BotDatabase.MobileAuthenticator.HandleConfirmation(confirmation, accept).ConfigureAwait(false);
+			}
 		}
 
 		internal async Task<bool> RefreshSession() {
@@ -306,7 +314,7 @@ namespace ArchiSteamFarm {
 				return false;
 			}
 
-			if (ArchiWebHandler.Init(SteamClient, callback.Nonce, BotConfig.SteamParentalPIN)) {
+			if (await ArchiWebHandler.Init(SteamClient, callback.Nonce, BotConfig.SteamParentalPIN).ConfigureAwait(false)) {
 				return true;
 			}
 
@@ -351,6 +359,8 @@ namespace ArchiSteamFarm {
 						return await Response2FAConfirm(steamID, false).ConfigureAwait(false);
 					case "!2faok":
 						return await Response2FAConfirm(steamID, true).ConfigureAwait(false);
+					case "!api":
+						return ResponseAPI(steamID);
 					case "!exit":
 						return ResponseExit(steamID);
 					case "!farm":
@@ -360,9 +370,11 @@ namespace ArchiSteamFarm {
 					case "!loot":
 						return await ResponseSendTrade(steamID).ConfigureAwait(false);
 					case "!pause":
-						return await ResponsePause(steamID).ConfigureAwait(false);
+						return await ResponsePause(steamID, true).ConfigureAwait(false);
 					case "!rejoinchat":
 						return ResponseRejoinChat(steamID);
+					case "!resume":
+						return await ResponsePause(steamID, false).ConfigureAwait(false);
 					case "!restart":
 						return ResponseRestart(steamID);
 					case "!status":
@@ -405,7 +417,7 @@ namespace ArchiSteamFarm {
 
 					return await ResponseOwns(steamID, BotName, args[1]).ConfigureAwait(false);
 				case "!pause":
-					return await ResponsePause(steamID, args[1]).ConfigureAwait(false);
+					return await ResponsePause(steamID, args[1], true).ConfigureAwait(false);
 				case "!play":
 					if (args.Length > 2) {
 						return await ResponsePlay(steamID, args[1], args[2]).ConfigureAwait(false);
@@ -418,6 +430,8 @@ namespace ArchiSteamFarm {
 					}
 
 					return await ResponseRedeem(steamID, BotName, args[1], false).ConfigureAwait(false);
+				case "!resume":
+					return await ResponsePause(steamID, args[1], false).ConfigureAwait(false);
 				case "!start":
 					return await ResponseStart(steamID, args[1]).ConfigureAwait(false);
 				case "!status":
@@ -500,7 +514,7 @@ namespace ArchiSteamFarm {
 			Logging.LogGenericInfo("Successfully finished importing mobile authenticator!", BotName);
 		}
 
-		private async Task<string> ResponsePause(ulong steamID) {
+		private async Task<string> ResponsePause(ulong steamID, bool pause) {
 			if (steamID == 0) {
 				Logging.LogNullError(nameof(steamID), BotName);
 				return null;
@@ -510,16 +524,24 @@ namespace ArchiSteamFarm {
 				return null;
 			}
 
+			if (pause) {
 				if (CardsFarmer.ManualMode) {
-				await CardsFarmer.SwitchToManualMode(false).ConfigureAwait(false);
+					return "Automatic farming is stopped already!";
-				return "Automatic farming is enabled again!";
 				}
 
 				await CardsFarmer.SwitchToManualMode(true).ConfigureAwait(false);
 				return "Automatic farming is now stopped!";
 			}
 
-		private static async Task<string> ResponsePause(ulong steamID, string botName) {
+			if (!CardsFarmer.ManualMode) {
+				return "Automatic farming is enabled already!";
+			}
+
+			await CardsFarmer.SwitchToManualMode(false).ConfigureAwait(false);
+			return "Automatic farming is now enabled!";
+		}
+
+		private static async Task<string> ResponsePause(ulong steamID, string botName, bool pause) {
 			if ((steamID == 0) || string.IsNullOrEmpty(botName)) {
 				Logging.LogNullError(nameof(steamID) + " || " + nameof(botName));
 				return null;
@@ -527,7 +549,7 @@ namespace ArchiSteamFarm {
 
 			Bot bot;
 			if (Bots.TryGetValue(botName, out bot)) {
-				return await bot.ResponsePause(steamID).ConfigureAwait(false);
+				return await bot.ResponsePause(steamID, pause).ConfigureAwait(false);
 			}
 
 			if (IsOwner(steamID)) {
@@ -739,6 +761,28 @@ namespace ArchiSteamFarm {
 			return null;
 		}
 
+		private static string ResponseAPI(ulong steamID) {
+			if (steamID == 0) {
+				Logging.LogNullError(nameof(steamID));
+				return null;
+			}
+
+			if (!IsOwner(steamID)) {
+				return null;
+			}
+
+			var response = new {
+				Bots
+			};
+
+			try {
+				return JsonConvert.SerializeObject(response);
+			} catch (JsonException e) {
+				Logging.LogGenericException(e);
+				return null;
+			}
+		}
+
 		private static string ResponseExit(ulong steamID) {
 			if (steamID == 0) {
 				Logging.LogNullError(nameof(steamID));
@@ -1452,6 +1496,7 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
+			ArchiWebHandler.OnDisconnected();
 			Logging.LogGenericInfo("Disconnected from Steam!", BotName);
 
 			FirstTradeSent = false;
@@ -1503,6 +1548,14 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
+			for (byte i = 0; (i < Program.GlobalConfig.HttpTimeout) && !ArchiWebHandler.Ready; i++) {
+				await Task.Delay(1000).ConfigureAwait(false);
+			}
+
+			if (!ArchiWebHandler.Ready) {
+				return;
+			}
+
 			bool acceptedSomething = false;
 			foreach (ulong gid in callback.GuestPasses.Select(guestPass => guestPass["gid"].AsUnsignedLong()).Where(gid => gid != 0)) {
 				Logging.LogGenericInfo("Accepting gift: " + gid + "...", BotName);
@@ -1698,7 +1751,7 @@ namespace ArchiSteamFarm {
 						}
 					}
 
-					if (!ArchiWebHandler.Init(SteamClient, callback.WebAPIUserNonce, BotConfig.SteamParentalPIN)) {
+					if (!await ArchiWebHandler.Init(SteamClient, callback.WebAPIUserNonce, BotConfig.SteamParentalPIN).ConfigureAwait(false)) {
 						if (!await RefreshSession().ConfigureAwait(false)) {
 							return;
 						}

ArchiSteamFarm/CardsFarmer.cs

@@ -31,10 +31,14 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
+using Newtonsoft.Json;
 
 namespace ArchiSteamFarm {
 	internal sealed class CardsFarmer {
+		[JsonProperty]
 		internal readonly ConcurrentDictionary<uint, float> GamesToFarm = new ConcurrentDictionary<uint, float>();
+
+		[JsonProperty]
 		internal readonly ConcurrentHashSet<uint> CurrentGamesFarming = new ConcurrentHashSet<uint>();
 
 		private readonly ManualResetEventSlim FarmResetEvent = new ManualResetEventSlim(false);
@@ -42,6 +46,7 @@ namespace ArchiSteamFarm {
 		private readonly Bot Bot;
 		private readonly Timer Timer;
 
+		[JsonProperty]
 		internal bool ManualMode { get; private set; }
 
 		private bool KeepFarming, NowFarming;
@@ -388,8 +393,18 @@ namespace ArchiSteamFarm {
 				return null;
 			}
 
-			Logging.LogGenericInfo("Status for " + appID + ": " + progress, Bot.BotName);
+			byte cardsRemaining = 0;
-			return progress.Equals("No card drops remaining");
+
+			Match match = Regex.Match(progress, @"\d+");
+			if (match.Success) {
+				if (!byte.TryParse(match.Value, out cardsRemaining)) {
+					Logging.LogNullError(nameof(cardsRemaining), Bot.BotName);
+					return null;
+				}
+			}
+
+			Logging.LogGenericInfo("Status for " + appID + ": " + cardsRemaining + " cards remaining", Bot.BotName);
+			return cardsRemaining > 0;
 		}
 
 		private bool FarmMultiple() {

ArchiSteamFarm/GlobalConfig.cs

@@ -81,7 +81,7 @@ namespace ArchiSteamFarm {
 		internal byte FarmingDelay { get; private set; } = DefaultFarmingDelay;
 
 		[JsonProperty(Required = Required.DisallowNull)]
-		internal byte LoginLimiterDelay { get; private set; } = 7;
+		internal byte LoginLimiterDelay { get; private set; } = 10;
 
 		[JsonProperty(Required = Required.DisallowNull)]
 		internal byte InventoryLimiterDelay { get; private set; } = 3;

ArchiSteamFarm/JSON/Steam.cs

@@ -442,8 +442,10 @@ namespace ArchiSteamFarm.JSON {
 				}
 			}
 
+#pragma warning disable 649
 			[JsonProperty(PropertyName = "html")]
 			private string HTML;
+#pragma warning restore 649
 
 			private uint _OtherSteamID3;
 			private uint OtherSteamID3 {

ArchiSteamFarm/Properties/AssemblyInfo.cs

@@ -31,5 +31,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("2.1.0.2")]
+[assembly: AssemblyVersion("2.1.0.7")]
-[assembly: AssemblyFileVersion("2.1.0.2")]
+[assembly: AssemblyFileVersion("2.1.0.7")]

ArchiSteamFarm/Trading.cs

@@ -201,14 +201,16 @@ namespace ArchiSteamFarm {
 
 			// Calculate our value of items to give
 			List<uint> amountsToGive = new List<uint>(tradeOffer.ItemsToGive.Count);
+			Dictionary<ulong, uint> amountMapToGive = new Dictionary<ulong, uint>(amountMap);
 			foreach (ulong key in tradeOffer.ItemsToGive.Select(item => item.ClassID)) {
 				uint amount;
-				if (!amountMap.TryGetValue(key, out amount)) {
+				if (!amountMapToGive.TryGetValue(key, out amount)) {
 					amountsToGive.Add(0);
 					continue;
 				}
 
 				amountsToGive.Add(amount);
+				amountMapToGive[key] = amount - 1; // We're giving one, so we have one less
 			}
 
 			// Sort it ascending
@@ -216,20 +218,23 @@ namespace ArchiSteamFarm {
 
 			// Calculate our value of items to receive
 			List<uint> amountsToReceive = new List<uint>(tradeOffer.ItemsToReceive.Count);
+			Dictionary<ulong, uint> amountMapToReceive = new Dictionary<ulong, uint>(amountMap);
 			foreach (ulong key in tradeOffer.ItemsToReceive.Select(item => item.ClassID)) {
 				uint amount;
-				if (!amountMap.TryGetValue(key, out amount)) {
+				if (!amountMapToReceive.TryGetValue(key, out amount)) {
 					amountsToReceive.Add(0);
 					continue;
 				}
 
 				amountsToReceive.Add(amount);
+				amountMapToReceive[key] = amount + 1; // We're getting one, so we have one more
 			}
 
 			// Sort it ascending
 			amountsToReceive.Sort();
 
 			// Check actual difference
+			// We sum only values at proper indexes of giving, because user might be overpaying
 			int difference = amountsToGive.Select((t, i) => (int) (t - amountsToReceive[i])).Sum();
 
 			// Trade is worth for us if the difference is greater than 0

ArchiSteamFarm/WebBrowser.cs

@@ -80,6 +80,9 @@ namespace ArchiSteamFarm {
 
 			// Most web services expect that UserAgent is set, so we declare it globally
 			HttpClient.DefaultRequestHeaders.UserAgent.ParseAdd(DefaultUserAgent);
+
+			// We should always operate in English language, declare it globally
+			HttpClient.DefaultRequestHeaders.AcceptLanguage.ParseAdd("en-US,en;q=0.8,en-GB;q=0.6");
 		}
 
 		internal async Task<bool> UrlHeadRetry(string request, string referer = null) {

ArchiSteamFarm/config/ASF.json

@@ -9,7 +9,7 @@
   "MaxFarmingTime": 10,
   "IdleFarmingPeriod": 3,
   "FarmingDelay": 15,
-  "LoginLimiterDelay": 7,
+  "LoginLimiterDelay": 10,
   "InventoryLimiterDelay": 3,
   "ForceHttp": false,
   "HttpTimeout": 60,

ConfigGenerator/GlobalConfig.cs

@@ -81,7 +81,7 @@ namespace ConfigGenerator {
 		public byte FarmingDelay { get; set; } = DefaultFarmingDelay;
 
 		[JsonProperty(Required = Required.DisallowNull)]
-		public byte LoginLimiterDelay { get; set; } = 7;
+		public byte LoginLimiterDelay { get; set; } = 10;
 
 		[JsonProperty(Required = Required.DisallowNull)]
 		public byte InventoryLimiterDelay { get; set; } = 3;