Handle expired sessionIDs for main accounts

JustArchiNET · Dec 16, 2015 · 98e1d51 · 98e1d51
1 parent 5e22c83
commit 98e1d51
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 8 deletions.
diff --git a/ArchiSteamFarm/ArchiWebHandler.cs b/ArchiSteamFarm/ArchiWebHandler.cs
@@ -150,6 +150,28 @@ internal async Task Init(SteamClient steamClient, string webAPIUserNonce, string
 			}
 		}
 
+		internal async Task<bool?> IsLoggedIn() {
+			if (SteamID == 0) {
+				return false;
+			}
+
+			HtmlDocument htmlDocument = await WebBrowser.UrlGetToHtmlDocument("http://steamcommunity.com/my/profile", SteamCookieDictionary).ConfigureAwait(false);
+			if (htmlDocument == null) {
+				return null;
+			}
+
+			HtmlNode htmlNode = htmlDocument.DocumentNode.SelectSingleNode("//span[@id='account_pulldown']");
+			return htmlNode != null;
+		}
+
+		internal async Task 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
+			}
+		}
+
 		internal List<SteamTradeOffer> GetTradeOffers() {
 			if (ApiKey == null) {
 				return null;

diff --git a/ArchiSteamFarm/CardsFarmer.cs b/ArchiSteamFarm/CardsFarmer.cs
@@ -323,15 +323,22 @@ private async Task CheckGamesForFarming() {
 		}
 
 		private async Task<bool?> ShouldFarm(ulong appID) {
-			bool? result = null;
-			HtmlDocument gamePageDocument = await Bot.ArchiWebHandler.GetGameCardsPage(appID).ConfigureAwait(false);
-			if (gamePageDocument != null) {
-				HtmlNode gamePageNode = gamePageDocument.DocumentNode.SelectSingleNode("//span[@class='progress_info_bold']");
-				if (gamePageNode != null) {
-					result = !gamePageNode.InnerText.Contains("No card drops");
-				}
+			if (appID == 0) {
+				return false;
 			}
-			return result;
+
+			HtmlDocument htmlDocument = await Bot.ArchiWebHandler.GetGameCardsPage(appID).ConfigureAwait(false);
+			if (htmlDocument == null) {
+				return null;
+			}
+
+			HtmlNode htmlNode = htmlDocument.DocumentNode.SelectSingleNode("//span[@class='progress_info_bold']");
+			if (htmlNode == null) {
+				await Bot.ArchiWebHandler.ReconnectIfNeeded().ConfigureAwait(false);
+				return null;
+			}
+
+			return !htmlNode.InnerText.Contains("No card drops");
 		}
 
 		private async Task<bool> Farm(uint appID) {