Merge pull request #417 from Qtoss-Alpha/master

SeleniumWebDriver

Author: Oceania2018

src/Infrastructure/BotSharp.Abstraction/Browsing/IWebBrowser.cs

@@ -25,5 +25,5 @@ public interface IWebBrowser
     Task CloseBrowser(string contextId);
     Task CloseCurrentPage(string contextId);
     Task<BrowserActionResult> SendHttpRequest(string contextId, HttpRequestParams actionParams);
-    Task<string> GetAttributeValue(MessageInfo message, ElementLocatingArgs location, BrowserActionResult result);
+    Task<BrowserActionResult> GetAttributeValue(MessageInfo message, ElementLocatingArgs location);
 }

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

@@ -4,20 +4,29 @@ namespace BotSharp.Abstraction.Browsing.Models;
 
 public class ElementActionArgs
 {
-    private BroswerActionEnum _action;
-    public BroswerActionEnum Action => _action;
+    public BroswerActionEnum Action { get; set; }
 
-    private string _content;
-    public string Content => _content;
+    public string? Content { get; set; }
 
-    public ElementActionArgs(BroswerActionEnum action)
+    public ElementPosition? Position { get; set; }
+
+    /// <summary>
+    /// Required for deserialization
+    /// </summary>
+    public ElementActionArgs()
+    {
+
+    }
+
+    public ElementActionArgs(BroswerActionEnum action, ElementPosition? position = null)
     {
-        _action = action;
+        Action = action;
+        Position = position;
     }
 
     public ElementActionArgs(BroswerActionEnum action, string content)
     {
-        _action = action;
-        _content = content;
+        Action = action;
+        Content = content;
     }
 }

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

@@ -0,0 +1,8 @@
+namespace BotSharp.Abstraction.Browsing.Models;
+
+public class ElementPosition
+{
+    public float X { get; set; } = default!;
+
+    public float Y { get; set; } = default!;
+}

src/Infrastructure/BotSharp.Abstraction/Browsing/Settings/WebBrowsingSettings.cs

@@ -0,0 +1,6 @@
+namespace BotSharp.Abstraction.Browsing.Settings;
+
+public class WebBrowsingSettings
+{
+    public string Driver { get; set; } = "Playwright";
+}

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

@@ -7,6 +7,7 @@ public class BotSharpDatabaseSettings : DatabaseBasicSettings
     public string BotSharpMongoDb { get; set; }
     public string TablePrefix { get; set; }
     public DbConnectionSetting BotSharp { get; set; }
+    public string Redis { get; set; }
 }
 
 public class DatabaseBasicSettings

src/Infrastructure/BotSharp.Core/BotSharp.Core.csproj

@@ -149,9 +149,10 @@
   <ItemGroup>
     <PackageReference Include="Aspects.Cache" Version="2.0.4" />
     <PackageReference Include="Colorful.Console" Version="1.2.15" />
-    <PackageReference Include="EntityFrameworkCore.BootKit" Version="6.3.1" />
-    <PackageReference Include="Fluid.Core" Version="2.7.0" />
+    <PackageReference Include="EntityFrameworkCore.BootKit" Version="8.2.1" />
+    <PackageReference Include="Fluid.Core" Version="2.8.0" />
     <PackageReference Include="Nanoid" Version="3.0.0" />
+    <PackageReference Include="RedLock.net" Version="2.3.2" />
   </ItemGroup>
 
   <ItemGroup>

src/Infrastructure/BotSharp.Core/BotSharpCoreExtensions.cs

@@ -14,9 +14,11 @@ public static IServiceCollection AddBotSharpCore(this IServiceCollection service
     {
         services.AddScoped<ISettingService, SettingService>();
         services.AddScoped<IUserService, UserService>();
+        services.AddSingleton<DistributedLocker>();
 
         RegisterPlugins(services, config);
         ConfigureBotSharpOptions(services, configOptions);
+
         return services;
     }
 

src/Infrastructure/BotSharp.Core/Infrastructures/DistributedLocker.cs

@@ -0,0 +1,50 @@
+using RedLockNet;
+using RedLockNet.SERedis;
+using RedLockNet.SERedis.Configuration;
+using StackExchange.Redis;
+
+namespace BotSharp.Core.Infrastructures;
+
+public class DistributedLocker
+{
+    private readonly BotSharpDatabaseSettings _settings;
+    private readonly RedLockFactory _lockFactory;
+
+    public DistributedLocker(/*BotSharpDatabaseSettings settings*/)
+    {
+        // _settings = settings;
+
+        var multiplexers = new List<RedLockMultiplexer>();
+        foreach (var x in "".Split(';'))
+        {
+            var option = new ConfigurationOptions
+            {
+                AbortOnConnectFail = false,
+                EndPoints = { x }
+            };
+            var _connMuliplexer = ConnectionMultiplexer.Connect(option);
+            multiplexers.Add(_connMuliplexer);
+        }
+
+        _lockFactory = RedLockFactory.Create(multiplexers);
+    }
+
+    public async Task Lock(string resource, Func<Task> action)
+    {
+        var expiry = TimeSpan.FromSeconds(60);
+        var wait = TimeSpan.FromSeconds(30);
+        var retry = TimeSpan.FromSeconds(3);
+
+        await using (var redLock = await _lockFactory.CreateLockAsync(resource, expiry, wait, retry))
+        {
+            if (redLock.IsAcquired)
+            {
+                await action();
+            }
+            else
+            {
+                Console.WriteLine($"Acquire locak failed due to {resource} after {wait}s timeout.");
+            }
+        }
+    }
+}

src/Infrastructure/BotSharp.Core/Repository/DataContextHelper.cs

@@ -1,4 +1,3 @@
-using BotSharp.Abstraction.Repositories;
 using Microsoft.Data.SqlClient;
 using MySqlConnector;
 using System.Data.Common;

src/Plugins/BotSharp.Plugin.SqlDriver/BotSharp.Plugin.SqlDriver.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
@@ -33,7 +33,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dapper" Version="2.1.28" />
     <PackageReference Include="MySqlConnector" Version="2.3.5" />
   </ItemGroup>