Merge pull request #971 from visagang/features/vguruparan

Update webdriver code

Author: Oceania2018

src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightWebDriver.Screenshot.cs

@@ -1,14 +1,11 @@
-using BotSharp.Abstraction.Browsing.Settings;
-
 namespace BotSharp.Plugin.WebDriver.Drivers.PlaywrightDriver;
 
 public partial class PlaywrightWebDriver
 {
     public async Task<BrowserActionResult> ScreenshotAsync(MessageInfo message, string path)
     {
         var result = new BrowserActionResult();
-        var _webDriver = _services.GetRequiredService<WebBrowsingSettings>();
-        if (_webDriver.IsEnableScreenshot)
+        if (_webBrowsingSettings.IsEnableScreenshot)
         {
             await _instance.Wait(message.ContextId, waitNetworkIdle: false);
             var page = _instance.GetPage(message.ContextId);

src/Plugins/BotSharp.Plugin.WebDriver/Drivers/PlaywrightDriver/PlaywrightWebDriver.cs

@@ -1,22 +1,26 @@
 
+using BotSharp.Abstraction.Browsing.Settings;
+
 namespace BotSharp.Plugin.WebDriver.Drivers.PlaywrightDriver;
 
 public partial class PlaywrightWebDriver : IWebBrowser
 {
     private IServiceProvider _services => _instance.Services;
     private readonly PlaywrightInstance _instance;
     private readonly ILogger _logger;
+    private readonly WebBrowsingSettings _webBrowsingSettings;
     public PlaywrightInstance Instance => _instance;
 
     public Agent Agent => _agent;
     private Agent _agent;
 
-    public PlaywrightWebDriver(IServiceProvider services, PlaywrightInstance instance, ILogger<PlaywrightWebDriver> logger)
+    public PlaywrightWebDriver(IServiceProvider services, PlaywrightInstance instance, ILogger<PlaywrightWebDriver> logger, WebBrowsingSettings webBrowsingSettings)
     {
         _instance = instance;
         _logger = logger;
         _instance.SetServiceProvider(services);
-    }
+        _webBrowsingSettings = webBrowsingSettings;
+     }
 
     public void SetAgent(Agent agent)
     {

src/Plugins/BotSharp.Plugin.WebDriver/UtilFunctions/UtilWebActionOnElementFn.cs

@@ -34,7 +34,8 @@ public async Task<bool> Execute(RoleDialogModel message)
 
         var conv = _services.GetRequiredService<IConversationService>();
 
-        var browser = _services.GetRequiredService<IWebBrowser>();
+        var services = _services.CreateScope().ServiceProvider;
+        var browser = services.GetRequiredService<IWebBrowser>();
         var webDriverService = _services.GetRequiredService<WebDriverService>();
         var msg = new MessageInfo
         {

src/Plugins/BotSharp.Plugin.WebDriver/UtilFunctions/UtilWebCloseBrowserFn.cs

@@ -19,7 +19,8 @@ public async Task<bool> Execute(RoleDialogModel message)
     {
         var conv = _services.GetRequiredService<IConversationService>();
         var webDriverService = _services.GetRequiredService<WebDriverService>();
-        var browser = _services.GetRequiredService<IWebBrowser>();
+        var services = _services.CreateScope().ServiceProvider;
+        var browser = services.GetRequiredService<IWebBrowser>();
         var msg = new MessageInfo
         {
             AgentId = message.CurrentAgentId,

src/Plugins/BotSharp.Plugin.WebDriver/UtilFunctions/UtilWebGoToPageFn.cs

@@ -30,7 +30,8 @@ public async Task<bool> Execute(RoleDialogModel message)
 
         var conv = _services.GetRequiredService<IConversationService>();
         var webDriverService = _services.GetRequiredService<WebDriverService>();
-        var browser = _services.GetRequiredService<IWebBrowser>();
+        var services = _services.CreateScope().ServiceProvider;
+        var browser = services.GetRequiredService<IWebBrowser>();
         var msg = new MessageInfo
         {
             AgentId = message.CurrentAgentId,

src/Plugins/BotSharp.Plugin.WebDriver/UtilFunctions/UtilWebLocateElementFn.cs

@@ -21,7 +21,8 @@ public async Task<bool> Execute(RoleDialogModel message)
         var conv = _services.GetRequiredService<IConversationService>();
         locatorArgs.Highlight = true;
 
-        var browser = _services.GetRequiredService<IWebBrowser>();
+        var services = _services.CreateScope().ServiceProvider;
+        var browser = services.GetRequiredService<IWebBrowser>();
         var webDriverService = _services.GetRequiredService<WebDriverService>();
         var msg = new MessageInfo
         {