Merge pull request #95 from Erol444/weekly-02-04-2022

Weekly 02 04 2022

Author: vinaghost

TbsCore/Core/TaskExecutor.cs

@@ -25,8 +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.Stop();
-                return;
+                acc.TaskTimer.ForceTimerStop();
             }
             if (CheckCookies(acc))
                 await DriverHelper.ExecuteScript(acc, "document.getElementById('CybotCookiebotDialogBodyLevelButtonLevelOptinDeclineAll').click();");
@@ -48,8 +47,8 @@ public static async Task PageLoaded(Account acc)
 
             if (IsLoginScreen(acc)) //Check if you are on login page -> Login task
             {
-                acc.Tasks.Add(new LoginTask() { ExecuteAt = DateTime.MinValue });
-                return;
+                var task = new LoginTask();
+                await task.Execute(acc);
             }
 
             if (IsSysMsg(acc)) //Check if there is a system message (eg. Artifacts/WW plans appeared)
@@ -89,7 +88,13 @@ public static async Task Execute(Account acc, BotTask task)
                     acc.Logger.Warning($"Chrome has problem while executing task {task.GetName()}! Vill {task.Vill?.Name}. Try reopen Chrome");
 
                     acc.Wb.Close();
-                    await acc.Wb.Init(acc);
+
+                    var result = await acc.Wb.Init(acc);
+                    if (!result)
+                    {
+                        acc.TaskTimer.ForceTimerStop();
+                        return;
+                    }
                 }
                 catch (Exception e)
                 {

TbsCore/Core/TaskTimer.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Threading.Tasks;
 using System.Timers;
 using TbsCore.Helpers;
 using TbsCore.Tasks;
@@ -13,9 +14,13 @@ public sealed class TaskTimer : IDisposable
         private readonly Random _random;
         private readonly Account _acc;
         private readonly Timer _mainTimer;
+        private bool flagStopTimer;
 
-        // subTimer is for Tbs's Alzheimer disease
-        private readonly Timer _subTimer;
+        public void ForceTimerStop()
+        {
+            _acc.Status = Status.Stopping;
+            flagStopTimer = true;
+        }
 
         private long _isTaskExcuting;
 
@@ -49,86 +54,72 @@ public TaskTimer(Account Account)
         {
             _acc = Account;
             _mainTimer = new Timer(500);
-            _subTimer = new Timer(500);
             _random = new Random();
             _mainTimer.Elapsed += MainTimerElapsed;
-            _subTimer.Elapsed += SubTimerElapsed;
         }
 
         public void Start()
         {
+            if (IsBotRunning) return;
             IsBotRunning = true;
             IsTaskExcuting = false;
+            flagStopTimer = false;
             _mainTimer.Start();
         }
 
-        public void Stop()
+        public async Task Stop(bool force = false)
         {
+            if (!IsBotRunning) return;
+
             IsBotRunning = false;
-            IsTaskExcuting = false;
             _mainTimer.Stop();
+
+            if (!force)
+            {
+                await Task.Run(() => { while (IsTaskExcuting) { } });
+            }
         }
 
         private void MainTimerElapsed(object source, ElapsedEventArgs e) => NewTick();
 
-        private void SubTimerElapsed(object sender, ElapsedEventArgs e)
-        {
-            // if there is no task and bot still dont know it can execute next task
-            if (_acc.Tasks.IsTaskExcuting()) return;
-            if (!IsTaskExcuting) return;
-
-            IsTaskExcuting = false;
-        }
-
         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)
             {
                 IsTaskExcuting = false;
                 return; //No tasks
             }
-            // Another task is already in progress. wait
-            if (_acc.Tasks.IsTaskExcuting())
-            {
-                IsTaskExcuting = false;
-                return;
-            }
 
-            var tasks = _acc.Tasks.GetTasksReady();
-            if (tasks.Count == 0)
+            var task = _acc.Tasks.FirstTask;
+            if (task.ExecuteAt > DateTime.Now)
             {
                 NoTasks(_acc);
                 IsTaskExcuting = false;
                 return;
             }
 
-            BotTask firstTask = tasks.FirstOrDefault(x => x.Priority == TaskPriority.High);
-            if (firstTask == null) firstTask = tasks.FirstOrDefault(x => x.Priority == TaskPriority.Medium);
-            if (firstTask == null) firstTask = tasks.FirstOrDefault();
-
-            if (firstTask.Stage == TaskStage.Executing)
-            {
-                IsTaskExcuting = false;
-                return;
-            }
-
-            firstTask.Stage = TaskStage.Executing;
+            task.Stage = TaskStage.Executing;
 
             //If correct village is selected, otherwise change village
-            if (firstTask.Vill != null)
+            if (task.Vill != null && task.GetType() != typeof(UpgradeBuilding))
             {
                 var active = _acc.Villages.FirstOrDefault(x => x.Active);
-                if (active != null && active != firstTask.Vill)
+                if (active != null && active != task.Vill)
                 {
-                    await VillageHelper.SwitchVillage(_acc, firstTask.Vill.Id);
+                    await VillageHelper.SwitchVillage(_acc, task.Vill.Id);
                 }
             }
-            await TaskExecutor.Execute(_acc, firstTask);
+            await TaskExecutor.Execute(_acc, task);
             IsTaskExcuting = false;
         }
 
@@ -140,7 +131,7 @@ private void NoTasks(Account _acc)
                 var delay = TimeSpan.FromMinutes(5);
                 if (nextTask == null || nextTask.ExecuteAt - DateTime.Now > delay)
                 {
-                    _acc.Tasks.Add(new ReopenDriver()
+                    _acc.Tasks.Add(new TaskSleep()
                     {
                         ExecuteAt = DateTime.Now,
                     });
@@ -166,7 +157,6 @@ private void NoTasks(Account _acc)
         public void Dispose()
         {
             _mainTimer.Dispose();
-            _subTimer.Dispose();
         }
     }
 }

TbsCore/Core/WebBrowserInfo.cs

@@ -38,6 +38,14 @@ public WebBrowserInfo()
         public async Task<bool> Init(Account acc, bool newAccess = true)
         {
             this.acc = acc;
+            if (acc.Access.AllAccess.Count == 0)
+            {
+                acc.Logger.Warning("Account doesn't have any access. Press Edit account to check access");
+                return false;
+            }
+
+            acc.Access.AllAccess.ForEach(a => a.Ok = true);
+
             Access.Access access = newAccess ? acc.Access.GetNewAccess() : acc.Access.GetCurrentAccess();
 
             if (!string.IsNullOrEmpty(access.Proxy))
@@ -259,7 +267,7 @@ public async Task<bool> CheckProxy(Account acc)
                     }
                     else
                     {
-                        acc.Logger.Warning($"There's only one access to this account! Please check your proxy status");
+                        acc.Logger.Warning($"There's only one proxy to this account! Please check your proxy status");
                         return false;
                     }
                 }
@@ -276,13 +284,17 @@ public void Close()
         {
             if (Driver != null)
             {
-                var tabs = Driver.WindowHandles;
-                foreach (var tab in tabs)
+                try
                 {
-                    Driver.SwitchTo().Window(tab);
-                    Driver.Close();
+                    var tabs = Driver.WindowHandles;
+                    foreach (var tab in tabs)
+                    {
+                        Driver.SwitchTo().Window(tab);
+                        Driver.Close();
+                    }
+                    Driver.Dispose();
                 }
-                Driver.Dispose();
+                catch { }
             }
         }
 

TbsCore/Database/UseragentDatabase.cs

@@ -73,7 +73,7 @@ public void Load()
             _userAgentList = modelLoaded.UserAgentList;
             _dateTime = modelLoaded.DateTime;
 
-            if (_dateTime.IsExpired())
+            if (_dateTime.IsExpired() || _userAgentList.Count < 1000)
             {
                 Update();
             }
@@ -108,7 +108,11 @@ public string GetUserAgent()
                     }
                 }
                 while (duplicate);
-                return _userAgentList[index]; // i dont think this will loop over 5000 times =))            }
+
+                var result = _userAgentList[index];
+                _userAgentList.RemoveAt(index);
+                Save();
+                return result;
             }
         }
 

TbsCore/Extensions/AccountExtension.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using TbsCore.Models.AccModels;
+
+namespace TbsCore.Extensions
+{
+    public static class AccountExtension
+    {
+        public static bool CanLogin(this Account acc)
+        {
+            if (acc.Status == Status.Offline) return true;
+            return false;
+        }
+
+        public static bool CanLogout(this Account acc)
+        {
+            if (acc.Status == Status.Paused) return true;
+            if (acc.Status == Status.Online) return true;
+            return false;
+        }
+    }
+}

TbsCore/Helpers/AccountHelper.cs

@@ -73,7 +73,7 @@ public static void StartAccountTasks(Account acc)
             if (acc.Farming.Enabled) acc.Tasks.Add(new SendFLs() { ExecuteAt = DateTime.Now }, true);
 
             // Bot sleep
-            acc.Tasks.Add(new Sleep()
+            acc.Tasks.Add(new TimeSleep()
             {
                 ExecuteAt = DateTime.Now + TimeHelper.GetWorkTime(acc),
             }, true);

TbsCore/Helpers/Classificator.cs

@@ -61,7 +61,10 @@ public enum HeroItemCategory
             Armor,
             Boots,
             Horse,
-            Others // Expand others?
+            Resource,
+            Stackable,
+            NonStackable,
+            Others,
         }
 
         public enum HeroItemEnum
@@ -195,16 +198,16 @@ public enum HeroItemEnum
             Horse_Horse_3,
 
             // Others
-            Others_Ointment_0, // =106
+            Stackable_Ointment_0, // =106
 
-            Others_Scroll_0,
-            Others_Bucket_0,
-            Others_Tablets_0,
-            Others_Book_0, // =110
-            Others_Artwork_0,
-            Others_SmallBandage_0,
-            Others_BigBandage_0,
-            Others_Cage_0,
+            Stackable_Scroll_0,
+            NonStackable_Bucket_0,
+            NonStackable_Tablets_0,
+            NonStackable_Book_0, // =110
+            NonStackable_Artwork_0,
+            Stackable_SmallBandage_0,
+            Stackable_BigBandage_0,
+            Stackable_Cage_0,
 
             // Egyptian weapons
             Weapon_SlaveMilitia_1, // =115
@@ -242,12 +245,10 @@ public enum HeroItemEnum
             Weapon_Marauder_2,
             Weapon_Marauder_3,
 
-            // Resources (Since T4.5)
-            Others_Wood_0, // =145
-
-            Others_Clay_0,
-            Others_Iron_0,
-            Others_Crop_0 // =148
+            Resource_Wood_0,
+            Resource_Clay_0,
+            Resource_Iron_0,
+            Resource_Crop_0 // =148
         }
 
         public enum TroopsEnum

TbsCore/Helpers/DriverHelper.cs

@@ -216,12 +216,5 @@ public static async Task WaitPageChange(Account acc, string part, double delay =
             wait.Until(driver => driver.Url.Contains(part));
             await WaitPageLoaded(acc, delay);
         }
-
-        public static async Task ReopenChrome(Account acc)
-        {
-            acc.Wb.Close();
-
-            await acc.Wb.Init(acc, false);
-        }
     }
 }