Merge pull request #93 from Erol444/hot-fix-weekly-26-03-2022

Hot fix weekly 26 03 2022

Author: Erol444

.github/workflows/pre-release.yml

@@ -38,7 +38,7 @@ jobs:
       - name: 'Create changelog'
         id: Changelog
         run: |
-          changelog="$({github.event.pull_request.body})"
+          changelog="${{github.event.pull_request.body}}"
           changelog="${changelog//'%'/'%25'}"
           changelog="${changelog//$'\n'/'%0A'}"
           changelog="${changelog//$'\r'/'%0D'}"

.github/workflows/release.yml

@@ -40,7 +40,7 @@ jobs:
       - name: 'Create changelog'
         id: Changelog
         run: |
-          changelog="$({github.event.pull_request.body})"
+          changelog="${{github.event.pull_request.body}}"
           changelog="${changelog//'%'/'%25'}"
           changelog="${changelog//$'\n'/'%0A'}"
           changelog="${changelog//$'\r'/'%0D'}"

TbsCore/Core/TaskTimer.cs

@@ -10,6 +10,7 @@ namespace TbsCore.Models.AccModels
 {
     public sealed class TaskTimer : IDisposable
     {
+        private readonly Random _random;
         private readonly Account _acc;
         private readonly Timer _mainTimer;
 
@@ -49,6 +50,7 @@ public TaskTimer(Account Account)
             _acc = Account;
             _mainTimer = new Timer(500);
             _subTimer = new Timer(500);
+            _random = new Random();
             _mainTimer.Elapsed += MainTimerElapsed;
             _subTimer.Elapsed += SubTimerElapsed;
         }
@@ -132,25 +134,32 @@ private async void NewTick()
 
         private void NoTasks(Account _acc)
         {
-            BotTask task = null;
-
-            if (_acc.Settings.AutoCloseDriver &&
-                TimeSpan.FromMinutes(5) < TimeHelper.NextPrioTask(_acc, TaskPriority.Medium))
-            {
-                // Auto close chrome and reopen when there is a high/normal prio BotTask
-                task = new ReopenDriver();
-                ((ReopenDriver)task).LowestPrio = TaskPriority.Medium;
-            }
-            else if (_acc.Settings.AutoRandomTasks)
+            if (_acc.Settings.AutoCloseDriver)
             {
-                task = new RandomTask();
+                var nextTask = _acc.Tasks.ToList().FirstOrDefault();
+                var delay = TimeSpan.FromMinutes(5);
+                if (nextTask == null || nextTask.ExecuteAt - DateTime.Now > delay)
+                {
+                    _acc.Tasks.Add(new ReopenDriver()
+                    {
+                        ExecuteAt = DateTime.Now,
+                    });
+                    return;
+                }
             }
 
-            if (task != null)
+            if (_acc.Settings.AutoRandomTasks)
             {
-                task.ExecuteAt = DateTime.Now;
-                task.Priority = TaskPriority.Low;
-                _acc.Tasks.Add(task);
+                var nextTask = _acc.Tasks.ToList().FirstOrDefault();
+                var delay = TimeSpan.FromMinutes(20);
+                if (nextTask == null || nextTask.ExecuteAt - DateTime.Now > delay)
+                {
+                    _acc.Tasks.Add(new RandomTask()
+                    {
+                        ExecuteAt = DateTime.Now.AddSeconds(_random.Next(60, 600)),
+                    });
+                    return;
+                }
             }
         }
 

TbsCore/Core/WebBrowserInfo.cs

@@ -288,6 +288,7 @@ public void Close()
 
         public void Dispose()
         {
+            Close();
             chromeService.Dispose();
         }
     }

TbsCore/Helpers/AccountHelper.cs

@@ -76,7 +76,6 @@ public static void StartAccountTasks(Account acc)
             acc.Tasks.Add(new Sleep()
             {
                 ExecuteAt = DateTime.Now + TimeHelper.GetWorkTime(acc),
-                AutoSleep = true
             }, true);
 
             // Access change

TbsCore/Helpers/IoHelperCore.cs

@@ -161,7 +161,13 @@ public static void SaveAccounts(List<Account> accounts, bool logout)
         {
             foreach (var acc in accounts)
             {
-                if (logout) Logout(acc);
+                if (logout)
+                {
+                    Logout(acc);
+                    acc.Wb?.Dispose();
+                    acc.TaskTimer?.Dispose();
+                    acc.WebhookClient?.Dispose();
+                }
                 acc.Tasks.Save();
                 DbRepository.SaveAccount(acc);
             }
@@ -175,12 +181,6 @@ public static async Task<bool> LoginAccount(Account acc)
         {
             if (acc.Wb == null)
             {
-                SerilogSingleton.LogOutput.AddUsername(acc.AccInfo.Nickname);
-
-                acc.Logger = new Logger(acc.AccInfo.Nickname);
-
-                acc.Villages.ForEach(vill => vill.UnfinishedTasks = new List<VillUnfinishedTask>());
-
                 acc.Wb = new WebBrowserInfo();
                 var opened = await acc.Wb.Init(acc);
                 if (!opened)
@@ -209,16 +209,8 @@ public static async Task<bool> LoginAccount(Account acc)
         /// <param name="acc"></param>
         public static void Logout(Account acc)
         {
-            if (acc.TaskTimer != null)
-            {
-                acc.TaskTimer.Dispose();
-                acc.TaskTimer = default;
-            }
-            if (acc.Wb != null)
-            {
-                acc.Wb.Dispose();
-                acc.Wb = default;
-            }
+            acc.TaskTimer.Stop();
+            acc.Wb?.Close();
         }
     }
 }

TbsCore/Helpers/TimeHelper.cs

@@ -102,7 +102,7 @@ public static async Task SleepUntilPrioTask(Account acc, TaskPriority lowestPrio
             do
             {
                 await Task.Delay(1000);
-                nextTask = TimeHelper.NextPrioTask(acc, lowestPrio);
+                nextTask = NextPrioTask(acc, lowestPrio);
 
                 var log = $"Chrome will reopen in {(int)nextTask.TotalMinutes} min";
                 if (log != previousLog)

TbsCore/Models/Logging/LogOutput.cs

@@ -1,25 +1,39 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.ComponentModel;
 
 namespace TbsCore.Models.Logging
 {
     public class LogOutput
     {
+        private LogOutput()
+        {
+        }
+
+        private static LogOutput instance = null;
+
+        public static LogOutput Instance
+        {
+            get
+            {
+                if (instance == null)
+                {
+                    instance = new LogOutput();
+                }
+                return instance;
+            }
+        }
+
         public event EventHandler<UpdateLogEventArgs> LogUpdated;
 
-        private IDictionary<string, LinkedList<string>> _logs = new Dictionary<string, LinkedList<string>>();
-        private readonly object _syncRoot = new object();
+        private readonly ConcurrentDictionary<string, LinkedList<string>> _logs = new ConcurrentDictionary<string, LinkedList<string>>();
 
         public string GetLog(string username)
         {
             if (_logs.ContainsKey(username))
             {
-                lock (_syncRoot)
-                {
-                    var log = string.Join("", _logs[username]);
-                    return log;
-                }
+                var log = string.Join("", _logs[username]);
+                return log;
             }
             return "";
         }
@@ -29,31 +43,21 @@ public string GetLastLog(string username)
             return _logs.ContainsKey(username) ? _logs[username].First.Value : "";
         }
 
-        /// <summary>
-        /// lock before use because as i read Dictionary is not theard safe
-        /// </summary>
-        /// <param name="username"></param>
-        /// <param name="message"></param>
         public void Add(string username, string message)
         {
-            lock (_syncRoot)
+            _logs[username].AddFirst(message);
+            // keeps 200 message
+            while (_logs[username].Count > 200)
             {
-                _logs[username].AddFirst(message);
-                // keeps 200 message
-                while (_logs[username].Count > 200)
-                {
-                    _logs[username].RemoveLast();
-                }
+                _logs[username].RemoveLast();
             }
+
             OnUpdateLog(username);
         }
 
         public void AddUsername(string username)
         {
-            if (!_logs.ContainsKey(username))
-            {
-                _logs.Add(username, new LinkedList<string>());
-            }
+            _logs.TryAdd(username, new LinkedList<string>());
         }
 
         private void OnUpdateLog(string username)

TbsCore/Models/Logging/SerilogSingleton.cs

@@ -3,19 +3,22 @@
 
 namespace TbsCore.Models.Logging
 {
-    public static class SerilogSingleton
+    public class SerilogSingleton
     {
-        public static LogOutput LogOutput = new LogOutput();
-
         public static void Init()
         {
             Log.Logger = new LoggerConfiguration()
               .WriteTo.Map("Username", "Other", (name, wt) => wt.File($"./logs/log-{name}-.txt",
                                                                         rollingInterval: RollingInterval.Day,
                                                                         encoding: Encoding.Unicode,
                                                                         outputTemplate: "{Timestamp:HH:mm:ss} [{Level:u3}] {Message:lj}{NewLine}{Exception}"))
-              .WriteTo.TbsSink(LogOutput)
+              .WriteTo.TbsSink()
               .CreateLogger();
         }
+
+        public static void Close()
+        {
+            Log.CloseAndFlush();
+        }
     }
 }

TbsCore/Models/Logging/Sink.cs

@@ -1,80 +1,49 @@
-using System;
-using System.IO;
-using System.Collections.Generic;
-
-using Serilog;
+using Serilog;
+using Serilog.Configuration;
 using Serilog.Core;
 using Serilog.Events;
 using Serilog.Formatting;
-using Serilog.Configuration;
 using Serilog.Formatting.Display;
+using System;
+using System.IO;
 
 namespace TbsCore.Models.Logging
 {
     public class TbsSink : ILogEventSink
     {
         private readonly ITextFormatter _textFormatter;
-        private readonly LogOutput _logs;
-        private readonly object _syncRoot = new object();
 
-        public TbsSink(LogOutput logs, ITextFormatter textFormatter)
+        public TbsSink(ITextFormatter textFormatter)
         {
-            if (textFormatter == null) throw new ArgumentNullException(nameof(textFormatter));
-
-            _logs = logs;
             _textFormatter = textFormatter;
         }
 
         public void Emit(LogEvent logEvent)
         {
-            lock (_syncRoot)
-            {
-                var stringWriter = new StringWriter();
+            var stringWriter = new StringWriter();
 
-                _textFormatter.Format(logEvent, stringWriter);
-                LogEventPropertyValue username;
-                logEvent.Properties.TryGetValue("Username", out username);
-                // toString problem, it turn {"username"} to \"username\"
-                // replace here to solve that
-                _logs.Add(username.ToString().Replace("\"", ""), stringWriter.ToString());
-            }
+            _textFormatter.Format(logEvent, stringWriter);
+            logEvent.Properties.TryGetValue("Username", out LogEventPropertyValue username);
+            // toString problem, it turn {"username"} to \"username\"
+            // replace here to solve that
+            LogOutput.Instance.Add(username.ToString().Replace("\"", ""), stringWriter.ToString());
         }
     }
-}
 
-namespace Serilog
-{
-    public static class TBSLogExtensions
+    public static class TbsSinkExtensions
     {
         private const string DefaultOutputTemplate = "{Timestamp:HH:mm:ss} [{Level}] {Message}{NewLine}{Exception}";
 
         public static LoggerConfiguration TbsSink(
                   this LoggerSinkConfiguration loggerConfiguration,
-                  TbsCore.Models.Logging.LogOutput logs,
                   LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum,
                   string outputTemplate = DefaultOutputTemplate,
                   IFormatProvider formatProvider = null,
                   LoggingLevelSwitch levelSwitch = null)
         {
-            if (logs == null) throw new ArgumentNullException(nameof(logs));
-            if (outputTemplate == null) throw new ArgumentNullException(nameof(outputTemplate));
             var formatter = new MessageTemplateTextFormatter(outputTemplate, formatProvider);
-            var sink = new TbsCore.Models.Logging.TbsSink(logs, formatter);
-
-            return loggerConfiguration.Sink(sink, restrictedToMinimumLevel, levelSwitch);
-        }
-
-        public static LoggerConfiguration TbsSink(
-                  this LoggerSinkConfiguration loggerConfiguration,
-                  ITextFormatter formatter,
-                  TbsCore.Models.Logging.LogOutput logs,
-                  LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum,
-                  LoggingLevelSwitch levelSwitch = null)
-        {
-            if (logs == null) throw new ArgumentNullException(nameof(logs));
-            if (formatter == null) throw new ArgumentNullException(nameof(formatter));
+            var sink = new TbsSink(formatter);
 
-            var sink = new TbsCore.Models.Logging.TbsSink(logs, formatter);
             return loggerConfiguration.Sink(sink, restrictedToMinimumLevel, levelSwitch);
         }
     }