add task delay to upgrade building task

Author: vinaghost

TbsCore/Helpers/AccountHelper.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Threading.Tasks;
 using TbsCore.Models.AccModels;
 using TbsCore.Models.VillageModels;
 using TbsCore.Tasks.LowLevel;
@@ -9,6 +10,8 @@ namespace TbsCore.Helpers
 {
     public static class AccountHelper
     {
+        private static Random rnd = new Random();
+
         public static Village GetMainVillage(Account acc)
         {
             var main = acc.Villages.FirstOrDefault(x => x.Id == acc.Settings.MainVillage);
@@ -46,15 +49,14 @@ public static Village GetQuestsClaimVillage(Account acc)
         }
 
         /// <summary>
-        /// Returns a random delay (click delay, ~0.5-1.6sec).
+        /// Returns a random
+        ///
+        /// (click delay, ~0.5-1.6sec).
         /// </summary>
         /// <returns>Random delay in milliseconds</returns>
-        public static int Delay(Account acc)
-        {
-            //Return random delay
-            Random rnd = new Random();
-            return rnd.Next(acc.Settings.DelayClickingMin, acc.Settings.DelayClickingMax);
-        }
+        public static int Delay(Account acc) => rnd.Next(acc.Settings.DelayClickingMin, acc.Settings.DelayClickingMax);
+
+        public static Task DelayWait(Account acc) => Task.Delay(Delay(acc));
 
         public static void StartAccountTasks(Account acc)
         {

TbsCore/Tasks/LowLevel/UpgradeBuilding.cs

@@ -53,6 +53,7 @@ public override async Task<TaskRes> Execute(Account acc)
                 if (acc.AccInfo.ServerVersion == ServerVersionEnum.TTwars && !_buildingTask.ConstructNew)
                 {
                     acc.Logger.Information("Try using TTWars fast build method", this);
+                    await Task.Delay(AccountHelper.Delay(acc));
                     var fastUpgrade = await TTWarsTryFastUpgrade(acc, $"{acc.AccInfo.ServerUrl}/build.php?id={_buildingTask.BuildingId}");
                     if (fastUpgrade) continue;
                     acc.Logger.Information("Using TTWars fast build method failed. Continue normal method", this);
@@ -99,11 +100,19 @@ private async Task<bool> Construct(Account acc)
             // Check for prerequisites
             if (button == null)
             {
+                Retry(acc, "Button disappear.");
                 return false;
             }
 
-            await DriverHelper.ClickById(acc, button.Id);
-
+            await Task.Delay(AccountHelper.Delay(acc));
+            acc.Logger.Information($"Starting contruct {_buildingTask.Building} in {Vill.Name}");
+            var element = acc.Wb.Driver.FindElement(By.XPath(button.XPath));
+            if (element == null)
+            {
+                Retry(acc, "Button disappear.");
+                return false;
+            }
+            element.Click();
             _buildingTask.ConstructNew = false;
 
             acc.Logger.Warning($"Started construction of {_buildingTask.Building} in {Vill.Name}");
@@ -168,14 +177,14 @@ private async Task<bool> Upgrade(Account acc)
 
             if (upgradeButton == null)
             {
-                acc.Logger.Information($"We wanted to upgrade {_buildingTask.Building}, but no 'upgrade' button was found!", this);
+                Retry(acc, $"We wanted to upgrade {_buildingTask.Building}, but no 'upgrade' button was found!");
                 return false;
             }
 
             // Not enough resources?
             if (acc.AccInfo.ServerVersion == ServerVersionEnum.T4_5 && errorMessage != null)
             {
-                acc.Logger.Information($"We wanted to upgrade {_buildingTask.Building}, but there was an error message:\n{errorMessage.InnerText}", this);
+                Retry(acc, $"We wanted to upgrade {_buildingTask.Building}, but there was an error message:\n{errorMessage.InnerText}");
                 return false;
             }
 
@@ -188,12 +197,23 @@ private async Task<bool> Upgrade(Account acc)
             if (acc.AccInfo.ServerVersion == ServerVersionEnum.T4_5 && buildDuration.TotalMinutes > acc.Settings.WatchAdAbove)
             {
                 // watchAd = await TryFastUpgrade(acc);
+                acc.Logger.Information("Try using watch ads upgrade button");
+                acc.Logger.Information("Watch ads function is disable because of bugs from Chrome. We cannot do anything about this");
             }
 
             if (!watchAd)
             {
+                acc.Logger.Information("Using normal upgrade button");
+
                 upgradeButton = buttons.FirstOrDefault(x => x.HasClass("build"));
-                await DriverHelper.ClickById(acc, upgradeButton.Id); // Normal upgrade
+
+                var element = acc.Wb.Driver.FindElement(By.XPath(upgradeButton.XPath));
+                if (element == null)
+                {
+                    Retry(acc, "Button disappear.");
+                    return false;
+                }
+                element.Click();
             }
 
             acc.Logger.Information($"Upgraded {_buildingTask.Building} to level {lvl + 1} in {Vill.Name}", this);
@@ -440,11 +460,13 @@ private async Task<bool> FreeCropCondition(Account acc)
 
         private async Task MoveIntoBuilding(Account acc)
         {
+            await Task.Delay(AccountHelper.Delay(acc));
             acc.Logger.Information($"Move into building {_buildingTask.Building}", this);
             await NavigationHelper.EnterBuilding(acc, Vill, (int)_buildingTask.BuildingId);
             var build = Vill.Build.Buildings.FirstOrDefault(x => x.Id == _buildingTask.BuildingId);
             if (build.Type == BuildingEnum.Site)
             {
+                await Task.Delay(AccountHelper.Delay(acc));
                 acc.Logger.Information($"This is contruct task, choose correct tab for building {_buildingTask.Building}", this);
                 await NavigationHelper.ToConstructionTab(acc, _buildingTask.Building);
             }