Merge pull request #99 from Erol444/fix-14-04-2022

Fix 15 04 2022

Author: vinaghost

TbsCore/Core/TaskExecutor.cs

@@ -25,7 +25,7 @@ public static async Task PageLoaded(Account acc)
             if (IsCaptcha(acc) || IsWWMsg(acc) || IsBanMsg(acc) || IsMaintanance(acc)) //Check if a captcha/ban/end of server/maintanance
             {
                 acc.Logger.Warning("Captcha/WW/Ban/Maintanance found! Stopping bot for this account!");
-                acc.TaskTimer.ForceTimerStop();
+                acc.TaskTimer.Stop();
             }
             if (CheckCookies(acc))
                 await DriverHelper.ExecuteScript(acc, "document.getElementById('CybotCookiebotDialogBodyLevelButtonLevelOptinDeclineAll').click();");
@@ -92,7 +92,7 @@ public static async Task Execute(Account acc, BotTask task)
                     var result = await acc.Wb.Init(acc);
                     if (!result)
                     {
-                        acc.TaskTimer.ForceTimerStop();
+                        acc.TaskTimer.Stop();
                         return;
                     }
                 }

TbsCore/Core/TaskTimer.cs

@@ -14,13 +14,6 @@ public sealed class TaskTimer : IDisposable
         private readonly Random _random;
         private readonly Account _acc;
         private readonly Timer _mainTimer;
-        private bool flagStopTimer;
-
-        public void ForceTimerStop()
-        {
-            _acc.Status = Status.Stopping;
-            flagStopTimer = true;
-        }
 
         private long _isTaskExcuting;
 
@@ -63,21 +56,25 @@ public void Start()
             if (IsBotRunning) return;
             IsBotRunning = true;
             IsTaskExcuting = false;
-            flagStopTimer = false;
             _mainTimer.Start();
         }
 
-        public async Task Stop(bool force = false)
+        public void Stop()
         {
             if (!IsBotRunning) return;
 
             IsBotRunning = false;
             _mainTimer.Stop();
 
-            if (!force)
-            {
-                await Task.Run(() => { while (IsTaskExcuting) { } });
-            }
+            var currentTask = _acc.Tasks.CurrentTask;
+            if (currentTask != null) currentTask.StopFlag = true;
+            _acc.Status = Status.Pausing;
+        }
+
+        public async Task WaitStop()
+        {
+            await Task.Run(() => { while (IsTaskExcuting) { } });
+            _acc.Status = Status.Paused;
         }
 
         private void MainTimerElapsed(object source, ElapsedEventArgs e) => NewTick();
@@ -86,12 +83,6 @@ private async void NewTick()
         {
             if (!IsBotRunning) return;
             if (IsTaskExcuting) return;
-            if (flagStopTimer)
-            {
-                await Stop(true);
-                _acc.Status = Status.Offline;
-                return;
-            }
             IsTaskExcuting = true;
 
             if (_acc.Tasks.Count == 0)

TbsCore/Extensions/AccountExtension.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Threading.Tasks;
 using TbsCore.Models.AccModels;
 
 namespace TbsCore.Extensions

TbsCore/Helpers/IoHelperCore.cs

@@ -190,8 +190,11 @@ public static async Task<bool> Login(Account acc)
         /// <param name="acc"></param>
         public static async Task Logout(Account acc)
         {
-            await acc.TaskTimer.Stop();
+            acc.TaskTimer.Stop();
+            await acc.TaskTimer.WaitStop();
+            acc.Status = Status.Stopping;
             acc.Wb.Close();
+            acc.Status = Status.Offline;
         }
     }
 }

TbsCore/Helpers/NavigationHelper.cs

@@ -105,12 +105,42 @@ private static async Task ToBuildingId(Account acc, int index)
             while (true);
         }
 
-        internal static async Task ToConstructionTab(Account acc, BuildingEnum building)
+        internal static async Task<bool> ToConstructionTab(Account acc, BuildingEnum building)
         {
-            BuildingCategoryEnum tab = BuildingsData.GetBuildingsCategory(building);
-            if ((int)tab == 0) return;
-            await DriverHelper.ClickByClassName(acc, "tabItem", (int)tab);
-            await DriverHelper.WaitPageLoaded(acc);
+            var tab = BuildingsData.GetBuildingsCategory(building);
+            if (tab == BuildingCategoryEnum.Infrastructure) return true;
+            acc.Logger.Information($"{building} is in {tab} section, switch tab");
+            string classNode;
+            switch (tab)
+            {
+                case BuildingCategoryEnum.Military:
+                    classNode = "military";
+                    break;
+
+                case BuildingCategoryEnum.Resources:
+                    classNode = "resources";
+                    break;
+
+                default:
+                    classNode = "";
+                    break;
+            }
+            var node = acc.Wb.Html.DocumentNode.Descendants("a").FirstOrDefault(x => x.HasClass("tabItem") && x.HasClass(classNode));
+            if (node == null) return false;
+
+            var element = acc.Wb.Driver.FindElement(By.XPath(node.XPath));
+            if (element == null) return false;
+            element.Click();
+            acc.Logger.Information($"Waitting tab change");
+            try
+            {
+                await DriverHelper.WaitPageChange(acc, "category", 0.5);
+            }
+            catch
+            {
+                await DriverHelper.WaitPageLoaded(acc);
+            }
+            return true;
         }
 
         /// <summary>

TbsCore/Models/AccModels/TaskList.cs

@@ -152,6 +152,11 @@ public BotTask FirstTask
             get => _tasks.FirstOrDefault();
         }
 
+        public BotTask CurrentTask
+        {
+            get => _tasks.FirstOrDefault(x => x.Stage == TaskStage.Executing);
+        }
+
         public void Save()
         {
             var list = new List<TaskFileModel>();

TbsCore/Tasks/LowLevel/BotTask.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using TbsCore.Models.AccModels;
 using TbsCore.Models.VillageModels;
@@ -44,14 +45,43 @@ public abstract class BotTask
         /// Counts how many times we retried executing the task. After 3rd try, stop retrying. Something is clearly wrong
         /// Used in TaskExecutor and TaskTimer
         /// </summary>
-        public int RetryCounter { get; set; }
+        public int RetryCounter { get; set; } = 0;
 
         /// <summary>
         /// How high of a priority does this task have.
         /// Tasks like attacking and deffending (waves) have highest priority and should as such be executed first
         /// </summary>
         public TaskPriority Priority { get; set; }
 
+        private long stopFlag;
+
+        public bool StopFlag
+        {
+            get
+            {
+                return Interlocked.Read(ref stopFlag) == 1;
+            }
+            set
+            {
+                Interlocked.Exchange(ref stopFlag, Convert.ToInt64(value));
+            }
+        }
+
+        protected void Retry(Account acc, string message)
+        {
+            if (RetryCounter < 4)
+            {
+                RetryCounter++;
+                acc.Logger.Information($"{message}. Try again. ({RetryCounter} time(s))", this);
+            }
+            else
+            {
+                acc.Logger.Information($"{message}.", this);
+                acc.Logger.Warning($"Already tries 3 times. Considering there is error, please check account's browser.", this);
+                StopFlag = true;
+            }
+        }
+
         public enum TaskRes
         {
             Executed,

TbsCore/Tasks/LowLevel/LoginTask.cs

@@ -35,7 +35,7 @@ public override async Task<TaskRes> Execute(Account acc)
             {
                 // Wrong password/nickname
                 acc.Logger.Warning("Password is incorrect!");
-                acc.TaskTimer.ForceTimerStop();
+                acc.TaskTimer.Stop();
             }
             else
             {

TbsCore/Tasks/LowLevel/ReopenDriver.cs

@@ -50,7 +50,7 @@ public override async Task<TaskRes> Execute(Account acc)
             var result = await acc.Wb.Init(acc, ChangeAccess);
             if (!result)
             {
-                acc.TaskTimer.ForceTimerStop();
+                acc.TaskTimer.Stop();
             }
 
             return TaskRes.Executed;