Closes #198

It was possible that we initiated a loop for bot that was connected, and it got disconnected shortly after, which could result in infinite loop if DistributeKeys was disabled (and nothing would change that bot to other one)

ArchiSteamFarm/Bot.cs

@@ -777,9 +777,13 @@ namespace ArchiSteamFarm {
 						continue; // Without changing the bot
 					}
 
-					if (currentBot.SteamClient.IsConnected) {
+					if (!currentBot.SteamClient.IsConnected) {
+						currentBot = null; // Either bot will be changed, or loop aborted
+					} else {
 						ArchiHandler.PurchaseResponseCallback result = await currentBot.ArchiHandler.RedeemKey(key).ConfigureAwait(false);
-						if (result != null) {
+						if (result == null) {
+							currentBot = null; // Either bot will be changed, or loop aborted
+						} else {
 							switch (result.PurchaseResult) {
 								case ArchiHandler.PurchaseResponseCallback.EPurchaseResult.DuplicatedKey:
 								case ArchiHandler.PurchaseResponseCallback.EPurchaseResult.InvalidKey:
@@ -1226,14 +1230,27 @@ namespace ArchiSteamFarm {
 
 			string sms = Program.GetUserInput(Program.EUserInputType.SMS, BotName);
 			if (string.IsNullOrEmpty(sms)) {
+				Logging.LogGenericWarning("Aborted!", BotName);
+				DelinkMobileAuthenticator();
 				return;
 			}
 
-			AuthenticatorLinker.FinalizeResult finalizeResult = authenticatorLinker.FinalizeAddAuthenticator(sms);
-			if (finalizeResult != AuthenticatorLinker.FinalizeResult.Success) {
-				Logging.LogGenericError("Unhandled situation: " + finalizeResult, BotName);
-				DelinkMobileAuthenticator();
-				return;
+			AuthenticatorLinker.FinalizeResult finalizeResult;
+			while ((finalizeResult = authenticatorLinker.FinalizeAddAuthenticator(sms)) != AuthenticatorLinker.FinalizeResult.Success) {
+				switch (finalizeResult) {
+					case AuthenticatorLinker.FinalizeResult.BadSMSCode:
+						sms = Program.GetUserInput(Program.EUserInputType.SMS, BotName);
+						if (string.IsNullOrEmpty(sms)) {
+							Logging.LogGenericWarning("Aborted!", BotName);
+							DelinkMobileAuthenticator();
+							return;
+						}
+						break;
+					default:
+						Logging.LogGenericError("Unhandled situation: " + finalizeResult, BotName);
+						DelinkMobileAuthenticator();
+						return;
+				}
 			}
 
 			// Ensure that we also save changes made by finalization step (if any)
@@ -1248,13 +1265,13 @@ namespace ArchiSteamFarm {
 				return false;
 			}
 
-			bool result = BotDatabase.SteamGuardAccount.DeactivateAuthenticator();
-
-			if (result) {
+			// Try to deactivate authenticator, and assume we're safe to remove if it wasn't fully enrolled yet (even if request fails)
+			if (BotDatabase.SteamGuardAccount.DeactivateAuthenticator() || !BotDatabase.SteamGuardAccount.FullyEnrolled) {
 				BotDatabase.SteamGuardAccount = null;
+				return true;
 			}
 
-			return result;
+			return false;
 		}
 
 		private void JoinMasterChat() {
@@ -1364,10 +1381,6 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
-			if (!KeepRunning) {
-				return;
-			}
-
 			if (InvalidPassword) {
 				InvalidPassword = false;
 				if (!string.IsNullOrEmpty(BotDatabase.LoginKey)) { // InvalidPassword means usually that login key has expired, if we used it
@@ -1389,6 +1402,10 @@ namespace ArchiSteamFarm {
 				await Utilities.SleepAsync(Program.GlobalConfig.AccountPlayingDelay * 60 * 1000).ConfigureAwait(false);
 			}
 
+			if (!KeepRunning || SteamClient.IsConnected) {
+				return;
+			}
+
 			Logging.LogGenericInfo("Reconnecting...", BotName);
 
 			// 2FA tokens are expiring soon, use limiter only when we don't have any pending

ArchiSteamFarm/Program.cs

@@ -187,7 +187,7 @@ namespace ArchiSteamFarm {
 
 			GitHub.Asset binaryAsset = null;
 			foreach (var asset in releaseResponse.Assets) {
-				if (string.IsNullOrEmpty(asset.Name) || !asset.Name.Equals(ExecutableName)) {
+				if (string.IsNullOrEmpty(asset.Name) || !asset.Name.Equals(ExecutableName, StringComparison.OrdinalIgnoreCase)) {
 					continue;
 				}
 
@@ -205,21 +205,22 @@ namespace ArchiSteamFarm {
 				return;
 			}
 
-			Logging.LogGenericInfo("Downloading new version...");
-			Stream newExe = await WebBrowser.UrlGetToStream(binaryAsset.DownloadURL).ConfigureAwait(false);
-			if (newExe == null) {
-				Logging.LogGenericWarning("Could not download new version!");
+			byte[] result = null;
+			for (byte i = 0; i < WebBrowser.MaxRetries && result == null; i++) {
+				Logging.LogGenericInfo("Downloading new version...");
+				result = await WebBrowser.UrlGetToBytes(binaryAsset.DownloadURL).ConfigureAwait(false);
+			}
+
+			if (result == null) {
+				Logging.LogGenericWTF("Request failed even after " + WebBrowser.MaxRetries + " tries");
 				return;
 			}
 
-			// We start deep update logic here
 			string newExeFile = ExecutableFile + ".new";
 
 			// Firstly we create new exec
 			try {
-				using (FileStream fileStream = File.Open(newExeFile, FileMode.Create)) {
-					await newExe.CopyToAsync(fileStream).ConfigureAwait(false);
-				}
+				File.WriteAllBytes(newExeFile, result);
 			} catch (Exception e) {
 				Logging.LogGenericException(e);
 				return;

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.3.0")]
-[assembly: AssemblyFileVersion("2.0.3.0")]
+[assembly: AssemblyVersion("2.0.3.3")]
+[assembly: AssemblyFileVersion("2.0.3.3")]

ArchiSteamFarm/WebBrowser.cs

@@ -88,13 +88,9 @@ namespace ArchiSteamFarm {
 				return false;
 			}
 
-			HttpResponseMessage response = await UrlGetToResponse(request, referer).ConfigureAwait(false);
-			if (response == null) {
-				return false;
+			using (HttpResponseMessage response = await UrlGetToResponse(request, referer).ConfigureAwait(false)) {
+				return response != null;
 			}
-
-			response.Dispose();
-			return true;
 		}
 
 		internal async Task<bool> UrlPost(string request, Dictionary<string, string> data = null, string referer = null) {
@@ -102,29 +98,9 @@ namespace ArchiSteamFarm {
 				return false;
 			}
 
-			HttpResponseMessage response = await UrlPostToResponse(request, data, referer).ConfigureAwait(false);
-			if (response == null) {
-				return false;
+			using (HttpResponseMessage response = await UrlPostToResponse(request, data, referer).ConfigureAwait(false)) {
+				return response != null;
 			}
-
-			response.Dispose();
-			return true;
-		}
-
-		internal async Task<HttpResponseMessage> UrlGetToResponse(string request, string referer = null) {
-			if (string.IsNullOrEmpty(request)) {
-				return null;
-			}
-
-			return await UrlRequest(request, HttpMethod.Get, null, referer).ConfigureAwait(false);
-		}
-
-		internal async Task<HttpResponseMessage> UrlPostToResponse(string request, Dictionary<string, string> data = null, string referer = null) {
-			if (string.IsNullOrEmpty(request)) {
-				return null;
-			}
-
-			return await UrlRequest(request, HttpMethod.Post, data, referer).ConfigureAwait(false);
 		}
 
 		internal async Task<string> UrlGetToContent(string request, string referer = null) {
@@ -132,31 +108,27 @@ namespace ArchiSteamFarm {
 				return null;
 			}
 
-			HttpResponseMessage httpResponse = await UrlGetToResponse(request, referer).ConfigureAwait(false);
-			if (httpResponse == null) {
-				return null;
+			using (HttpResponseMessage httpResponse = await UrlGetToResponse(request, referer).ConfigureAwait(false)) {
+				if (httpResponse == null) {
+					return null;
+				}
+
+				return await httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
 			}
-
-			string result = await httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-			httpResponse.Dispose();
-
-			return result;
 		}
 
-		internal async Task<Stream> UrlGetToStream(string request, string referer = null) {
+		internal async Task<byte[]> UrlGetToBytes(string request, string referer = null) {
 			if (string.IsNullOrEmpty(request)) {
 				return null;
 			}
 
-			HttpResponseMessage httpResponse = await UrlGetToResponse(request, referer).ConfigureAwait(false);
-			if (httpResponse == null) {
-				return null;
+			using (HttpResponseMessage httpResponse = await UrlGetToResponse(request, referer).ConfigureAwait(false)) {
+				if (httpResponse == null) {
+					return null;
+				}
+
+				return await httpResponse.Content.ReadAsByteArrayAsync().ConfigureAwait(false);
 			}
-
-			Stream result = await httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false);
-			httpResponse.Dispose();
-
-			return result;
 		}
 
 		internal async Task<HtmlDocument> UrlGetToHtmlDocument(string request, string referer = null) {
@@ -220,6 +192,22 @@ namespace ArchiSteamFarm {
 			return xmlDocument;
 		}
 
+		private async Task<HttpResponseMessage> UrlGetToResponse(string request, string referer = null) {
+			if (string.IsNullOrEmpty(request)) {
+				return null;
+			}
+
+			return await UrlRequest(request, HttpMethod.Get, null, referer).ConfigureAwait(false);
+		}
+
+		private async Task<HttpResponseMessage> UrlPostToResponse(string request, Dictionary<string, string> data = null, string referer = null) {
+			if (string.IsNullOrEmpty(request)) {
+				return null;
+			}
+
+			return await UrlRequest(request, HttpMethod.Post, data, referer).ConfigureAwait(false);
+		}
+
 		private async Task<HttpResponseMessage> UrlRequest(string request, HttpMethod httpMethod, Dictionary<string, string> data = null, string referer = null) {
 			if (string.IsNullOrEmpty(request) || httpMethod == null) {
 				return null;

GUI/GUI.csproj

@@ -135,6 +135,7 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
+<!--
     <PostBuildEvent Condition=" '$(OS)' != 'Unix' AND '$(ConfigurationName)' == 'Release' ">
       "$(SolutionDir)tools\ILRepack\ILRepack.exe" /ndebug /internalize /parallel /targetplatform:v4 /wildcards /out:"$(SolutionDir)out\ASF-GUI.exe" "$(TargetDir)$(TargetName).exe" "$(TargetDir)*.dll"
       del "$(SolutionDir)out\ASF-GUI.exe.config"
@@ -143,6 +144,7 @@
       mono -O=all "$(SolutionDir)tools/ILRepack/ILRepack.exe" /ndebug /internalize /parallel /targetplatform:v4 /wildcards /out:"$(SolutionDir)out/ASF-GUI.exe" "$(TargetDir)$(TargetName).exe" "$(TargetDir)*.dll"
       rm "$(SolutionDir)out/ASF-GUI.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.