Add more debugging for SK2

ArchiSteamFarm/ArchiWebHandler.cs

@@ -34,6 +34,10 @@ using System.Threading.Tasks;
 
 namespace ArchiSteamFarm {
 	internal sealed class ArchiWebHandler {
+		private const string SteamCommunity = "steamcommunity.com";
+
+		private static string SteamCommunityURL = "https://" + SteamCommunity;
+
 		private static int Timeout = 30 * 1000;
 
 		private readonly Bot Bot;
@@ -43,6 +47,7 @@ namespace ArchiSteamFarm {
 
 		internal static void Init() {
 			Timeout = Program.GlobalConfig.HttpTimeout * 1000;
+			SteamCommunityURL = (Program.GlobalConfig.ForceHttp ? "http://" : "https://") + SteamCommunity;
 		}
 
 		internal ArchiWebHandler(Bot bot) {
@@ -91,7 +96,7 @@ namespace ArchiSteamFarm {
 						sessionkey: Encoding.ASCII.GetString(WebUtility.UrlEncodeToBytes(cryptedSessionKey, 0, cryptedSessionKey.Length)),
 						encrypted_loginkey: Encoding.ASCII.GetString(WebUtility.UrlEncodeToBytes(cryptedLoginKey, 0, cryptedLoginKey.Length)),
 						method: WebRequestMethods.Http.Post,
-						secure: true
+						secure: !Program.GlobalConfig.ForceHttp
 					);
 				} catch (Exception e) {
 					Logging.LogGenericException(e, Bot.BotName);
@@ -126,7 +131,7 @@ namespace ArchiSteamFarm {
 
 			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);
+				htmlDocument = await WebBrowser.UrlGetToHtmlDocument(SteamCommunityURL + "/my/profile", Cookie).ConfigureAwait(false);
 			}
 
 			if (htmlDocument == null) {
@@ -163,7 +168,7 @@ namespace ArchiSteamFarm {
 						response = iEconService.GetTradeOffers(
 							get_received_offers: 1,
 							active_only: 1,
-							secure: true
+							secure: !Program.GlobalConfig.ForceHttp
 						);
 					} catch (Exception e) {
 						Logging.LogGenericException(e, Bot.BotName);
@@ -180,7 +185,7 @@ namespace ArchiSteamFarm {
 			foreach (KeyValue trade in response["trade_offers_received"].Children) {
 				Steam.TradeOffer tradeOffer = new Steam.TradeOffer {
 					tradeofferid = trade["tradeofferid"].AsString(),
-					accountid_other = trade["accountid_other"].AsInteger(),
+					accountid_other = (uint) trade["accountid_other"].AsUnsignedLong(), // TODO: Correct this when SK2 with https://github.com/SteamRE/SteamKit/pull/255 gets released
 					trade_offer_state = trade["trade_offer_state"].AsEnum<Steam.TradeOffer.ETradeOfferState>()
 				};
 				foreach (KeyValue item in trade["items_to_give"].Children) {
@@ -219,7 +224,7 @@ namespace ArchiSteamFarm {
 				return false;
 			}
 
-			string request = "https://steamcommunity.com/gid/" + clanID;
+			string request = SteamCommunityURL + "/gid/" + clanID;
 
 			Dictionary<string, string> data = new Dictionary<string, string>(2) {
 				{"sessionID", sessionID},
@@ -249,7 +254,7 @@ namespace ArchiSteamFarm {
 				return false;
 			}
 
-			string referer = "https://steamcommunity.com/tradeoffer/" + tradeID;
+			string referer = SteamCommunityURL + "/tradeoffer/" + tradeID;
 			string request = referer + "/accept";
 
 			Dictionary<string, string> data = new Dictionary<string, string>(3) {
@@ -285,7 +290,7 @@ namespace ArchiSteamFarm {
 						response = iEconService.DeclineTradeOffer(
 							tradeofferid: tradeID.ToString(),
 							method: WebRequestMethods.Http.Post,
-							secure: true
+							secure: !Program.GlobalConfig.ForceHttp
 						);
 					} catch (Exception e) {
 						Logging.LogGenericException(e, Bot.BotName);
@@ -304,7 +309,7 @@ namespace ArchiSteamFarm {
 		internal async Task<List<Steam.Item>> GetMyTradableInventory() {
 			JObject jObject = null;
 			for (byte i = 0; i < WebBrowser.MaxRetries && jObject == null; i++) {
-				jObject = await WebBrowser.UrlGetToJObject("https://steamcommunity.com/my/inventory/json/753/6?trading=1", Cookie).ConfigureAwait(false);
+				jObject = await WebBrowser.UrlGetToJObject(SteamCommunityURL + "/my/inventory/json/753/6?trading=1", Cookie).ConfigureAwait(false);
 			}
 
 			if (jObject == null) {
@@ -362,7 +367,7 @@ namespace ArchiSteamFarm {
 				});
 			}
 
-			string referer = "https://steamcommunity.com/tradeoffer/new";
+			string referer = SteamCommunityURL + "/tradeoffer/new";
 			string request = referer + "/send";
 
 			foreach (Steam.TradeOfferRequest trade in trades) {
@@ -396,7 +401,7 @@ namespace ArchiSteamFarm {
 
 			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);
+				htmlDocument = await WebBrowser.UrlGetToHtmlDocument(SteamCommunityURL + "/profiles/" + SteamID + "/badges?l=english&p=" + page, Cookie).ConfigureAwait(false);
 			}
 
 			if (htmlDocument == null) {
@@ -414,7 +419,7 @@ namespace ArchiSteamFarm {
 
 			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);
+				htmlDocument = await WebBrowser.UrlGetToHtmlDocument(SteamCommunityURL + "/profiles/" + SteamID + "/gamecards/" + appID + "?l=english", Cookie).ConfigureAwait(false);
 			}
 
 			if (htmlDocument == null) {
@@ -432,7 +437,7 @@ namespace ArchiSteamFarm {
 
 			HttpResponseMessage response = null;
 			for (byte i = 0; i < WebBrowser.MaxRetries && response == null; i++) {
-				response = await WebBrowser.UrlGet("https://steamcommunity.com/profiles/" + SteamID + "/inventory", Cookie).ConfigureAwait(false);
+				response = await WebBrowser.UrlGet(SteamCommunityURL + "/profiles/" + SteamID + "/inventory", Cookie).ConfigureAwait(false);
 			}
 
 			if (response == null) {
@@ -453,9 +458,12 @@ namespace ArchiSteamFarm {
 				{ "pin", parentalPin }
 			};
 
+			string referer = SteamCommunityURL;
+			string request = referer + "/parental/ajaxunlock";
+
 			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);
+				response = await WebBrowser.UrlPost(request, data, Cookie, referer).ConfigureAwait(false);
 			}
 
 			if (response == null) {

ArchiSteamFarm/Bot.cs

@@ -172,26 +172,16 @@ namespace ArchiSteamFarm {
 			SentryFile = botPath + ".bin";
 
 			// Support and convert SDA files
-			if (BotDatabase.SteamGuardAccount == null && File.Exists(botPath + ".maFile")) {
-				Logging.LogGenericInfo("Converting SDA .maFile into ASF format...", botName);
-				try {
-					BotDatabase.SteamGuardAccount = JsonConvert.DeserializeObject<SteamGuardAccount>(File.ReadAllText(botPath + ".maFile"));
-					File.Delete(botPath + ".maFile");
-					Logging.LogGenericInfo("Success!", botName);
-				} catch (Exception e) {
-					Logging.LogGenericException(e, botName);
-				}
+			string maFilePath = botPath + ".maFile";
+			if (BotDatabase.SteamGuardAccount == null && File.Exists(maFilePath)) {
+				ImportAuthenticator(maFilePath);
 			}
 
 			// Initialize
 			SteamClient = new SteamClient();
 
-			if (Program.GlobalConfig.Debug && !Debugging.NetHookAlreadyInitialized) {
+			if (Program.GlobalConfig.Debug && !Debugging.NetHookAlreadyInitialized && Directory.Exists(Program.DebugDirectory)) {
 				try {
-					if (Directory.Exists(Program.DebugDirectory)) {
-						Directory.Delete(Program.DebugDirectory, true);
-					}
-					Directory.CreateDirectory(Program.DebugDirectory);
 					SteamClient.DebugNetworkListener = new NetHookNetworkListener(Program.DebugDirectory);
 					Debugging.NetHookAlreadyInitialized = true;
 				} catch (Exception e) {
@@ -262,16 +252,16 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
-			if (!await BotDatabase.SteamGuardAccount.RefreshSessionAsync().ConfigureAwait(false)) {
-				return;
-			}
-
-			Confirmation[] confirmations = await BotDatabase.SteamGuardAccount.FetchConfirmationsAsync().ConfigureAwait(false);
-			if (confirmations == null) {
-				return;
-			}
-
 			try {
+				if (!await BotDatabase.SteamGuardAccount.RefreshSessionAsync().ConfigureAwait(false)) {
+					return;
+				}
+
+				Confirmation[] confirmations = await BotDatabase.SteamGuardAccount.FetchConfirmationsAsync().ConfigureAwait(false);
+				if (confirmations == null) {
+					return;
+				}
+
 				foreach (Confirmation confirmation in confirmations) {
 					if (BotDatabase.SteamGuardAccount.AcceptConfirmation(confirmation)) {
 						Logging.LogGenericInfo("Accepting confirmation: Success!", BotName);
@@ -283,6 +273,9 @@ namespace ArchiSteamFarm {
 				Logging.LogGenericWarning("Accepting confirmation: Failed!", BotName);
 				Logging.LogGenericWarning("Confirmation could not be accepted because of invalid token exception", BotName);
 				Logging.LogGenericWarning("If issue persists, consider removing and readding ASF 2FA", BotName);
+			} catch (Exception e) {
+				Logging.LogGenericException(e, BotName);
+				return;
 			}
 		}
 
@@ -295,8 +288,7 @@ namespace ArchiSteamFarm {
 		}
 
 		internal async Task Restart() {
-			Stop();
-			await Utilities.SleepAsync(500).ConfigureAwait(false);
+			await Stop().ConfigureAwait(false);
 			await Start().ConfigureAwait(false);
 		}
 
@@ -305,7 +297,7 @@ namespace ArchiSteamFarm {
 				await ResponseSendTrade().ConfigureAwait(false);
 			}
 			if (BotConfig.ShutdownOnFarmingFinished) {
-				Shutdown();
+				await Shutdown().ConfigureAwait(false);
 			}
 		}
 
@@ -329,6 +321,10 @@ namespace ArchiSteamFarm {
 					case "!exit":
 						Program.Exit();
 						return null;
+					case "!farm":
+						return await ResponseFarm().ConfigureAwait(false);
+					case "!loot":
+						return await ResponseSendTrade().ConfigureAwait(false);
 					case "!rejoinchat":
 						return ResponseRejoinChat();
 					case "!restart":
@@ -339,9 +335,10 @@ namespace ArchiSteamFarm {
 					case "!statusall":
 						return ResponseStatusAll();
 					case "!stop":
-						return ResponseStop();
-					case "!loot":
-						return await ResponseSendTrade().ConfigureAwait(false);
+						return await ResponseStop().ConfigureAwait(false);
+					case "!update":
+						await Program.CheckForUpdate().ConfigureAwait(false);
+						return "Done!";
 					default:
 						return "Unrecognized command: " + message;
 				}
@@ -360,6 +357,10 @@ namespace ArchiSteamFarm {
 						} else {
 							return await ResponseAddLicense(BotName, args[1]).ConfigureAwait(false);
 						}
+					case "!farm":
+						return await ResponseFarm(args[1]).ConfigureAwait(false);
+					case "!loot":
+						return await ResponseSendTrade(args[1]).ConfigureAwait(false);
 					case "!play":
 						if (args.Length > 2) {
 							return await ResponsePlay(args[1], args[2]).ConfigureAwait(false);
@@ -374,12 +375,10 @@ namespace ArchiSteamFarm {
 						}
 					case "!start":
 						return await ResponseStart(args[1]).ConfigureAwait(false);
-					case "!stop":
-						return ResponseStop(args[1]);
 					case "!status":
 						return ResponseStatus(args[1]);
-					case "!loot":
-						return await ResponseSendTrade(args[1]).ConfigureAwait(false);
+					case "!stop":
+						return await ResponseStop(args[1]).ConfigureAwait(false);
 					default:
 						return "Unrecognized command: " + args[0];
 				}
@@ -406,22 +405,87 @@ namespace ArchiSteamFarm {
 			SteamClient.Connect();
 		}
 
-		private void Stop() {
+		private async Task Stop() {
 			if (!SteamClient.IsConnected) {
 				return;
 			}
 
 			Logging.LogGenericInfo("Stopping...", BotName);
 
-			SteamClient.Disconnect();
+			for (byte i = 0; i < WebBrowser.MaxRetries && SteamClient.IsConnected; i++) {
+				SteamClient.Disconnect();
+				await Utilities.SleepAsync(1000).ConfigureAwait(false);
+			}
+
+			if (SteamClient.IsConnected) {
+				Logging.LogGenericWarning("Could not stop this bot instance!", BotName);
+			} else {
+				Logging.LogGenericInfo("Stopped!", BotName);
+			}
 		}
 
-		private void Shutdown() {
+		private async Task Shutdown() {
 			KeepRunning = false;
-			Stop();
+			await Stop().ConfigureAwait(false);
 			Program.OnBotShutdown();
 		}
 
+		private void ImportAuthenticator(string maFilePath) {
+			if (BotDatabase.SteamGuardAccount != null || !File.Exists(maFilePath)) {
+				return;
+			}
+
+			Logging.LogGenericInfo("Converting SDA .maFile into ASF format...", BotName);
+			try {
+				BotDatabase.SteamGuardAccount = JsonConvert.DeserializeObject<SteamGuardAccount>(File.ReadAllText(maFilePath));
+				File.Delete(maFilePath);
+				Logging.LogGenericInfo("Success!", BotName);
+			} catch (Exception e) {
+				Logging.LogGenericException(e, BotName);
+				return;
+			}
+
+			// If this is SDA file, then we should already have everything ready
+			if (BotDatabase.SteamGuardAccount.Session != null) {
+				Logging.LogGenericInfo("Successfully finished importing mobile authenticator!", BotName);
+				return;
+			}
+
+			// But here we're dealing with WinAuth authenticator
+			Logging.LogGenericInfo("ASF requires a few more steps to complete authenticator import...", BotName);
+
+			InitializeLoginAndPassword();
+
+			UserLogin userLogin = new UserLogin(BotConfig.SteamLogin, BotConfig.SteamPassword);
+			LoginResult loginResult;
+			while ((loginResult = userLogin.DoLogin()) != LoginResult.LoginOkay) {
+				switch (loginResult) {
+					case LoginResult.Need2FA:
+						userLogin.TwoFactorCode = Program.GetUserInput(BotName, Program.EUserInputType.TwoFactorAuthentication);
+						break;
+					default:
+						Logging.LogGenericError("Unhandled situation: " + loginResult, BotName);
+						return;
+				}
+			}
+
+			if (userLogin.Session == null) {
+				BotDatabase.SteamGuardAccount = null;
+				Logging.LogGenericError("Session is invalid, linking can't be completed!", BotName);
+				return;
+			}
+
+			BotDatabase.SteamGuardAccount.FullyEnrolled = true;
+			BotDatabase.SteamGuardAccount.Session = userLogin.Session;
+
+			if (string.IsNullOrEmpty(BotDatabase.SteamGuardAccount.DeviceID)) {
+				BotDatabase.SteamGuardAccount.DeviceID = Program.GetUserInput(BotName, Program.EUserInputType.DeviceID);
+			}
+
+			BotDatabase.Save();
+			Logging.LogGenericInfo("Successfully finished importing mobile authenticator!", BotName);
+		}
+
 		private string ResponseStatus() {
 			if (CardsFarmer.CurrentGamesFarming.Count > 0) {
 				return "Bot " + BotName + " is currently farming appIDs: " + string.Join(", ", CardsFarmer.CurrentGamesFarming) + " and has a total of " + CardsFarmer.GamesToFarm.Count + " games left to farm.";
@@ -562,6 +626,24 @@ namespace ArchiSteamFarm {
 			return await bot.Response2FAOK().ConfigureAwait(false);
 		}
 
+		private async Task<string> ResponseFarm() {
+			await CardsFarmer.RestartFarming().ConfigureAwait(false);
+			return "Done!";
+		}
+
+		private static async Task<string> ResponseFarm(string botName) {
+			if (string.IsNullOrEmpty(botName)) {
+				return null;
+			}
+
+			Bot bot;
+			if (!Bots.TryGetValue(botName, out bot)) {
+				return "Couldn't find any bot named " + botName + "!";
+			}
+
+			return await bot.ResponseFarm().ConfigureAwait(false);
+		}
+
 		private async Task<string> ResponseRedeem(string message, bool validate) {
 			if (string.IsNullOrEmpty(message)) {
 				return null;
@@ -840,16 +922,16 @@ namespace ArchiSteamFarm {
 			return await bot.ResponseStart().ConfigureAwait(false);
 		}
 
-		private string ResponseStop() {
+		private async Task<string> ResponseStop() {
 			if (!KeepRunning) {
 				return "That bot instance is already inactive!";
 			}
 
-			Shutdown();
+			await Shutdown().ConfigureAwait(false);
 			return "Done!";
 		}
 
-		private static string ResponseStop(string botName) {
+		private static async Task<string> ResponseStop(string botName) {
 			if (string.IsNullOrEmpty(botName)) {
 				return null;
 			}
@@ -859,7 +941,7 @@ namespace ArchiSteamFarm {
 				return "Couldn't find any bot named " + botName + "!";
 			}
 
-			return bot.ResponseStop();
+			return await bot.ResponseStop().ConfigureAwait(false);
 		}
 
 		private void HandleCallbacks() {
@@ -895,6 +977,9 @@ namespace ArchiSteamFarm {
 			}
 
 			Logging.LogGenericInfo("Linking new ASF MobileAuthenticator...", BotName);
+
+			InitializeLoginAndPassword();
+
 			UserLogin userLogin = new UserLogin(BotConfig.SteamLogin, BotConfig.SteamPassword);
 			LoginResult loginResult;
 			while ((loginResult = userLogin.DoLogin()) != LoginResult.LoginOkay) {
@@ -957,6 +1042,16 @@ namespace ArchiSteamFarm {
 			SteamFriends.JoinChat(BotConfig.SteamMasterClanID);
 		}
 
+		private void InitializeLoginAndPassword() {
+			if (string.IsNullOrEmpty(BotConfig.SteamLogin)) {
+				BotConfig.SteamLogin = Program.GetUserInput(BotName, Program.EUserInputType.Login);
+			}
+
+			if (string.IsNullOrEmpty(BotConfig.SteamPassword) && string.IsNullOrEmpty(BotDatabase.LoginKey)) {
+				BotConfig.SteamPassword = Program.GetUserInput(BotName, Program.EUserInputType.Password);
+			}
+		}
+
 		private void OnConnected(SteamClient.ConnectedCallback callback) {
 			if (callback == null) {
 				return;
@@ -985,13 +1080,7 @@ namespace ArchiSteamFarm {
 				}
 			}
 
-			if (string.IsNullOrEmpty(BotConfig.SteamLogin)) {
-				BotConfig.SteamLogin = Program.GetUserInput(BotName, Program.EUserInputType.Login);
-			}
-
-			if (string.IsNullOrEmpty(BotConfig.SteamPassword) && string.IsNullOrEmpty(BotDatabase.LoginKey)) {
-				BotConfig.SteamPassword = Program.GetUserInput(BotName, Program.EUserInputType.Password);
-			}
+			InitializeLoginAndPassword();
 
 			SteamUser.LogOn(new SteamUser.LogOnDetails {
 				Username = BotConfig.SteamLogin,
@@ -1217,14 +1306,7 @@ namespace ArchiSteamFarm {
 					// Support and convert SDA files
 					string maFilePath = Path.Combine(Program.ConfigDirectory, callback.ClientSteamID.ConvertToUInt64() + ".maFile");
 					if (BotDatabase.SteamGuardAccount == null && File.Exists(maFilePath)) {
-						Logging.LogGenericInfo("Converting SDA .maFile into ASF format...", BotName);
-						try {
-							BotDatabase.SteamGuardAccount = JsonConvert.DeserializeObject<SteamGuardAccount>(File.ReadAllText(maFilePath));
-							File.Delete(maFilePath);
-							Logging.LogGenericInfo("Success!", BotName);
-						} catch (Exception e) {
-							Logging.LogGenericException(e, BotName);
-						}
+						ImportAuthenticator(maFilePath);
 					}
 
 					if (BotConfig.UseAsfAsMobileAuthenticator && TwoFactorAuth == null && BotDatabase.SteamGuardAccount == null) {
@@ -1272,7 +1354,7 @@ namespace ArchiSteamFarm {
 					break;
 				default: // Unexpected result, shutdown immediately
 					Logging.LogGenericWarning("Unable to login to Steam: " + callback.Result, BotName);
-					Shutdown();
+					await Shutdown().ConfigureAwait(false);
 					break;
 			}
 		}

ArchiSteamFarm/BotDatabase.cs

@@ -91,7 +91,7 @@ namespace ArchiSteamFarm {
 		// This constructor is used only by deserializer
 		private BotDatabase() { }
 
-		private void Save() {
+		internal void Save() {
 			lock (FilePath) {
 				try {
 					File.WriteAllText(FilePath, JsonConvert.SerializeObject(this));

ArchiSteamFarm/CardsFarmer.cs

@@ -399,7 +399,7 @@ namespace ArchiSteamFarm {
 			await StartFarming().ConfigureAwait(false);
 		}
 
-		private async Task<bool?> ShouldFarm(ulong appID) {
+		private async Task<bool?> ShouldFarm(uint appID) {
 			if (appID == 0) {
 				return false;
 			}
@@ -425,12 +425,12 @@ namespace ArchiSteamFarm {
 
 			bool? keepFarming = await ShouldFarm(appID).ConfigureAwait(false);
 			for (ushort farmingTime = 0; farmingTime <= 60 * Program.GlobalConfig.MaxFarmingTime && keepFarming.GetValueOrDefault(true); farmingTime += Program.GlobalConfig.FarmingDelay) {
-				Logging.LogGenericInfo("Still farming: " + appID, Bot.BotName);
 				if (FarmResetEvent.WaitOne(60 * 1000 * Program.GlobalConfig.FarmingDelay)) {
 					success = false;
 					break;
 				}
 				keepFarming = await ShouldFarm(appID).ConfigureAwait(false);
+				Logging.LogGenericInfo("Still farming: " + appID, Bot.BotName);
 			}
 
 			Bot.ResetGamesPlayed();

ArchiSteamFarm/Debugging.cs

@@ -22,6 +22,10 @@
 
 */
 
+using SteamKit2;
+using System;
+using System.IO;
+
 namespace ArchiSteamFarm {
 	internal static class Debugging {
 #if DEBUG
@@ -33,5 +37,27 @@ namespace ArchiSteamFarm {
 		internal static bool IsReleaseBuild => !IsDebugBuild;
 
 		internal static bool NetHookAlreadyInitialized { get; set; } = false;
+
+		internal sealed class DebugListener : IDebugListener {
+			private readonly string FilePath;
+
+			internal DebugListener(string filePath) {
+				if (string.IsNullOrEmpty(filePath)) {
+					return;
+				}
+
+				FilePath = filePath;
+			}
+
+			public void WriteLine(string category, string msg) {
+				lock (FilePath) {
+					try {
+						File.AppendAllText(FilePath, category + " | " + msg + Environment.NewLine);
+					} catch (Exception e) {
+						Logging.LogGenericException(e);
+					}
+				}
+			}
+		}
 	}
 }

ArchiSteamFarm/GlobalConfig.cs

@@ -66,7 +66,10 @@ namespace ArchiSteamFarm {
 		internal byte InventoryLimiterDelay { get; private set; } = 3;
 
 		[JsonProperty(Required = Required.DisallowNull)]
-		internal byte HttpTimeout { get; private set; } = 30;
+		internal bool ForceHttp { get; private set; } = false;
+
+		[JsonProperty(Required = Required.DisallowNull)]
+		internal byte HttpTimeout { get; private set; } = 60;
 
 		[JsonProperty(Required = Required.DisallowNull)]
 		internal string WCFHostname { get; private set; } = "localhost";

ArchiSteamFarm/JSON/Steam.cs

@@ -81,7 +81,7 @@ namespace ArchiSteamFarm {
 			internal string tradeofferid { get; set; }
 
 			[JsonProperty(Required = Required.Always)]
-			internal int accountid_other { get; set; }
+			internal uint accountid_other { get; set; }
 
 			[JsonProperty(Required = Required.Always)]
 			internal ETradeOfferState trade_offer_state { get; set; }
@@ -97,7 +97,7 @@ namespace ArchiSteamFarm {
 			internal ulong OtherSteamID64 {
 				get {
 					if (_OtherSteamID64 == 0 && accountid_other != 0) {
-						_OtherSteamID64 = new SteamID((uint) accountid_other, EUniverse.Public, EAccountType.Individual).ConvertToUInt64();
+						_OtherSteamID64 = new SteamID(accountid_other, EUniverse.Public, EAccountType.Individual).ConvertToUInt64();
 					}
 
 					return _OtherSteamID64;

ArchiSteamFarm/Logging.cs

@@ -71,9 +71,8 @@ namespace ArchiSteamFarm {
 			Log("[!] EXCEPTION: " + previousMethodName + "() <" + botName + "> " + exception.Message);
 			Log("[!] StackTrace: " + exception.StackTrace);
 
-			Exception innerException = exception.InnerException;
-			if (innerException != null) {
-				LogGenericException(innerException, botName, previousMethodName);
+			if (exception.InnerException != null) {
+				LogGenericException(exception.InnerException, botName, previousMethodName);
 			}
 		}
 
@@ -119,7 +118,9 @@ namespace ArchiSteamFarm {
 
 			// Write on console only when not awaiting response from user
 			if (!Program.ConsoleIsBusy) {
-				Console.Write(loggedMessage);
+				try {
+					Console.Write(loggedMessage);
+				} catch { }
 			}
 
 			if (LogToFile.GetValueOrDefault()) {
@@ -129,7 +130,6 @@ namespace ArchiSteamFarm {
 					} catch (Exception e) {
 						LogToFile = false;
 						LogGenericException(e);
-						LogToFile = true;
 					}
 				}
 			}

ArchiSteamFarm/Program.cs

@@ -35,6 +35,8 @@ using System.Threading.Tasks;
 namespace ArchiSteamFarm {
 	internal static class Program {
 		internal enum EUserInputType : byte {
+			Unknown,
+			DeviceID,
 			Login,
 			Password,
 			PhoneNumber,
@@ -46,12 +48,13 @@ namespace ArchiSteamFarm {
 		}
 
 		internal enum EMode : byte {
+			Unknown,
 			Normal, // Standard most common usage
 			Client, // WCF client only
 			Server // Normal + WCF server
 		}
 
-		private const string GithubReleaseURL = "https://api.github.com/repos/JustArchi/ArchiSteamFarm/releases";
+		private const string GithubReleaseURL = "https://api.github.com/repos/JustArchi/ArchiSteamFarm/releases"; // GitHub API is HTTPS only
 
 		internal const string ASF = "ASF";
 		internal const string ConfigDirectory = "config";
@@ -78,7 +81,7 @@ namespace ArchiSteamFarm {
 		private static Timer AutoUpdatesTimer;
 		private static EMode Mode = EMode.Normal;
 
-		private static async Task CheckForUpdate() {
+		internal static async Task CheckForUpdate() {
 			string oldExeFile = ExecutableFile + ".old";
 
 			// We booted successfully so we can now remove old exe file
@@ -277,10 +280,17 @@ namespace ArchiSteamFarm {
 		}
 
 		internal static string GetUserInput(string botLogin, EUserInputType userInputType, string extraInformation = null) {
+			if (userInputType == EUserInputType.Unknown) {
+				return null;
+			}
+
 			string result;
 			lock (ConsoleLock) {
 				ConsoleIsBusy = true;
 				switch (userInputType) {
+					case EUserInputType.DeviceID:
+						Console.Write("<" + botLogin + "> Please enter your Device ID (including \"android:\"): ");
+						break;
 					case EUserInputType.Login:
 						Console.Write("<" + botLogin + "> Please enter your login: ");
 						break;
@@ -307,6 +317,9 @@ namespace ArchiSteamFarm {
 					case EUserInputType.TwoFactorAuthentication:
 						Console.Write("<" + botLogin + "> Please enter your 2 factor auth code from your authenticator app: ");
 						break;
+					default:
+						Console.Write("<" + botLogin + "> Please enter not documented yet value of \"" + userInputType + "\": ");
+						break;
 				}
 				result = Console.ReadLine();
 				Console.Clear(); // For security purposes
@@ -334,7 +347,7 @@ namespace ArchiSteamFarm {
 		private static void InitServices() {
 			GlobalConfig = GlobalConfig.Load();
 			if (GlobalConfig == null) {
-				Logging.LogGenericError("Global config could not be loaded, please make sure that ASF.db exists and is valid!");
+				Logging.LogGenericError("Global config could not be loaded, please make sure that ASF.json exists and is valid!");
 				Thread.Sleep(5000);
 				Exit(1);
 			}
@@ -425,6 +438,18 @@ namespace ArchiSteamFarm {
 				}
 			}
 
+			// If debugging is on, we prepare debug directory prior to running
+			if (GlobalConfig.Debug) {
+				if (Directory.Exists(Program.DebugDirectory)) {
+					Directory.Delete(Program.DebugDirectory, true);
+					Thread.Sleep(1000); // Dirty workaround giving Windows some time to sync
+				}
+				Directory.CreateDirectory(Program.DebugDirectory);
+
+				SteamKit2.DebugLog.AddListener(new Debugging.DebugListener(Path.Combine(Program.DebugDirectory, "debug.txt")));
+				SteamKit2.DebugLog.Enabled = true;
+			}
+
 			// Parse args
 			ParseArgs(args);
 
@@ -454,7 +479,7 @@ namespace ArchiSteamFarm {
 				}
 
 				Bot bot = new Bot(botName);
-				if (!bot.BotConfig.Enabled) {
+				if (bot.BotConfig == null || !bot.BotConfig.Enabled) {
 					Logging.LogGenericInfo("Not starting this instance because it's disabled in config file", botName);
 				}
 			}
@@ -464,7 +489,7 @@ namespace ArchiSteamFarm {
 				string botName = Path.GetFileNameWithoutExtension(configFile);
 				Logging.LogGenericWarning("Found legacy " + botName + ".xml config file, it will now be converted to new ASF V2.0 format!");
 				Bot bot = new Bot(botName);
-				if (!bot.BotConfig.Enabled) {
+				if (bot.BotConfig == null || !bot.BotConfig.Enabled) {
 					Logging.LogGenericInfo("Not starting this instance because it's disabled in config file", botName);
 				}
 			}

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

ArchiSteamFarm/config/ASF.json

@@ -8,7 +8,8 @@
   "AccountPlayingDelay": 5,
   "LoginLimiterDelay": 7,
   "InventoryLimiterDelay": 3,
-  "HttpTimeout": 30,
+  "ForceHttp": false,
+  "HttpTimeout": 60,
   "WCFHostname": "localhost",
   "WCFPort": 1242,
   "Statistics": true,