Merge branch 'master' of https://github.com/hchen2020/BotSharp

Author: Haiping Chen

src/Infrastructure/BotSharp.Abstraction/Browsing/Enums/BroswerActionEnum.cs

@@ -7,4 +7,5 @@ public enum BroswerActionEnum
     Typing = 3,
     Hover = 4,
     Scroll = 5,
+    DragAndDrop = 6
 }

src/Infrastructure/BotSharp.Abstraction/Browsing/Models/ElementPosition.cs

@@ -5,4 +5,9 @@ public class ElementPosition
     public float X { get; set; } = default!;
 
     public float Y { get; set; } = default!;
+
+    public override string ToString()
+    {
+        return $"[{X}, {Y}]";
+    }
 }

src/Infrastructure/BotSharp.Abstraction/Infrastructures/Enums/EventPriority.cs

@@ -0,0 +1,8 @@
+namespace BotSharp.Abstraction.Infrastructures.Enums;
+
+public enum EventPriority
+{
+    Low = 1,
+    Medium = 2,
+    High = 3
+}

src/Infrastructure/BotSharp.Abstraction/Infrastructures/Events/IEventPublisher.cs

@@ -10,7 +10,11 @@ public interface IEventPublisher
     /// <returns></returns>
     Task BroadcastAsync(string channel, string message);
 
-    Task PublishAsync(string channel, string message);
+    Task<string?> PublishAsync(string channel, string message, EventPriority? priority = null);
 
     Task ReDispatchAsync(string channel, int count = 10, string order = "asc");
+
+    Task ReDispatchPendingAsync(string channel, string group, int count = 10);
+
+    Task RemoveAsync(string channel, int count = 10);
 }

src/Infrastructure/BotSharp.Abstraction/Infrastructures/Events/IEventSubscriber.cs

@@ -1,8 +1,12 @@
+using System.Threading;
+
 namespace BotSharp.Abstraction.Infrastructures.Events;
 
 public interface IEventSubscriber
 {
     Task SubscribeAsync(string channel, Func<string, string, Task> received);
 
-    Task SubscribeAsync(string channel, string group, Func<string, string, Task> received);
+    Task SubscribeAsync(string channel, string group, int? port, bool priorityEnabled, 
+        Func<string, string, Task> received,
+        CancellationToken? stoppingToken = null);
 }

src/Infrastructure/BotSharp.Abstraction/Infrastructures/SharpCacheAttribute.cs

@@ -50,7 +50,9 @@ public override void OnSuccess(MethodContext context)
         }
 
         var httpContext = Services.GetRequiredService<IHttpContextAccessor>();
-        if (httpContext.HttpContext.Response.Headers["Cache-Control"].ToString().Contains("no-store"))
+        if (httpContext != null &&
+            httpContext.HttpContext != null &&
+            httpContext.HttpContext.Response.Headers["Cache-Control"].ToString().Contains("no-store"))
         {
             return;
         }

src/Infrastructure/BotSharp.Abstraction/Repositories/BotSharpDatabaseSettings.cs

@@ -2,18 +2,19 @@ namespace BotSharp.Abstraction.Repositories;
 
 public class BotSharpDatabaseSettings : DatabaseBasicSettings
 {
-    public string[] Assemblies { get; set; }
-    public string FileRepository { get; set; }
-    public string BotSharpMongoDb { get; set; }
-    public string TablePrefix { get; set; }
-    public DbConnectionSetting BotSharp { get; set; }
-    public string Redis { get; set; }
+    public string[] Assemblies { get; set; } = [];
+    public string FileRepository { get; set; } = string.Empty;
+    public string BotSharpMongoDb { get; set; } = string.Empty;
+    public string TablePrefix { get; set; } = string.Empty;
+    public DbConnectionSetting BotSharp { get; set; } = new();
+    public string Redis { get; set; } = string.Empty;
+    public bool EnableReplica { get; set; } = true;
 }
 
 public class DatabaseBasicSettings
 {
-    public string Default { get; set; }
-    public DbConnectionSetting DefaultConnection { get; set; }
+    public string Default { get; set; } = string.Empty;
+    public DbConnectionSetting DefaultConnection { get; set; } = new();
     public bool EnableSqlLog { get; set; }
     public bool EnableSensitiveDataLogging { get; set; }
     public bool EnableRetryOnFailure { get; set; }
@@ -23,9 +24,11 @@ public class DbConnectionSetting
 {
     public string Master { get; set; }
     public string[] Slavers { get; set; }
+    public int ConnectionTimeout { get; set; } = 30;
+    public int ExecutionTimeout { get; set; } = 30;
 
     public DbConnectionSetting()
     {
-        Slavers = new string[0];
+        Slavers = [];
     }
 }

src/Infrastructure/BotSharp.Abstraction/Repositories/IBotSharpRepository.cs

@@ -5,6 +5,7 @@
 using BotSharp.Abstraction.Shared;
 using BotSharp.Abstraction.Tasks.Models;
 using BotSharp.Abstraction.Translation.Models;
+using BotSharp.Abstraction.Users.Enums;
 using BotSharp.Abstraction.Users.Models;
 using BotSharp.Abstraction.VectorStorage.Models;
 
@@ -26,7 +27,7 @@ public interface IBotSharpRepository : IHaveServiceProvider
 
     #region User
     User? GetUserByEmail(string email) => throw new NotImplementedException();
-    User? GetUserByPhone(string phone, string role = null, string regionCode = "CN") => throw new NotImplementedException();
+    User? GetUserByPhone(string phone, string type = UserType.Client, string regionCode = "CN") => throw new NotImplementedException();
     User? GetAffiliateUserByPhone(string phone) => throw new NotImplementedException();
     User? GetUserById(string id) => throw new NotImplementedException();
     List<User> GetUserByIds(List<string> ids) => throw new NotImplementedException();

src/Infrastructure/BotSharp.Abstraction/Users/Models/User.cs

@@ -23,6 +23,7 @@ public class User
     public bool Verified { get; set; }
     public string RegionCode { get; set; } = "CN";
     public string? AffiliateId { get; set; }
+    public string? ReferralCode { get; set; }
     public string? EmployeeId { get; set; }
     public bool IsDisabled { get; set; }
     public IEnumerable<string> Permissions { get; set; } = [];

src/Infrastructure/BotSharp.Abstraction/Utilities/MathExt.cs

@@ -0,0 +1,14 @@
+namespace BotSharp.Abstraction.Utilities;
+
+public static class MathExt
+{
+    public static int Max(int a, int b, int c)
+    {
+        return Math.Max(Math.Max(a, b), c);
+    }
+
+    public static long Max(long a, long b, long c)
+    {
+        return Math.Max(Math.Max(a, b), c);
+    }
+}