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

Author: Haiping Chen

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

@@ -16,7 +16,10 @@ public class PageActionArgs
     /// <summary>
     /// This value has to be set to true if you want to get the page XHR/ Fetch responses
     /// </summary>
-    public bool OpenNewTab { get; set; } = false;
+    [JsonPropertyName("open_new_tab")]
+    public bool OpenNewTab { get; set; } = true;
+    [JsonPropertyName("open_blank_page")]
+    public bool OpenBlankPage { get; set; } = true;
 
     public bool EnableResponseCallback { get; set; } = false;
 
@@ -47,4 +50,6 @@ public class PageActionArgs
     public int WaitTime { get; set; }
 
     public bool ReadInnerHTMLAsBody { get; set; } = false;
+    [JsonPropertyName("keep_browser_open")]
+    public bool KeepBrowserOpen { get; set; } = false;
 }

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

@@ -15,7 +15,14 @@ public async Task<BrowserActionResult> GoToPage(MessageInfo message, PageActionA
 
                 if (page != null)
                 {
-                    if (page.Url != "about:blank")
+                    if (!args.OpenBlankPage)
+                    {
+                        if (!_instance.Pages[message.ContextId].Contains(page))
+                        {
+                            _instance.Pages[message.ContextId].Add(page);
+                        }
+                    }
+                    if (args.OpenBlankPage && page.Url != "about:blank")
                     {
                         await page.EvaluateAsync(@"() => {
                             window.open('', '_blank');
@@ -48,7 +55,6 @@ await page.EvaluateAsync(@"() => {
 
             // Active current tab
             await page.BringToFrontAsync();
-
             var response = await page.GotoAsync(args.Url, new PageGotoOptions
             {
                 Timeout = args.Timeout > 0 ? args.Timeout : 30000

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

@@ -27,7 +27,6 @@ public async Task<bool> Execute(RoleDialogModel message)
         args.Timeout = _webDriver.DefaultTimeout;
         args.WaitForNetworkIdle = false;
         args.WaitTime = _webDriver.DefaultWaitTime;
-        args.OpenNewTab = true;
 
         var conv = _services.GetRequiredService<IConversationService>();
 
@@ -38,7 +37,10 @@ public async Task<bool> Execute(RoleDialogModel message)
             MessageId = message.MessageId,
             ContextId = message.CurrentAgentId,
         };
-        await browser.CloseCurrentPage(msg);
+        if (!args.KeepBrowserOpen)
+        {
+            await browser.CloseCurrentPage(msg);
+        }
         var result = await browser.GoToPage(msg, args);
         if (!result.IsSuccess)
         {

src/Plugins/BotSharp.Plugin.WebDriver/data/agents/6745151e-6d46-4a02-8de4-1c4f21c7da95/functions/util-web-go_to_page.json

@@ -7,6 +7,14 @@
       "url": {
         "type": "string",
         "description": "Web URL"
+      },
+      "open_new_tab": {
+        "type": "boolean",
+        "description": "Open new tab"
+      },
+      "open_blank_page": {
+        "type": "boolean",
+        "description": "Open blank page"
       }
     },
     "required": [ "url" ]