From 6ce1744131cae5accdca05fff5b85ab128e4e9d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dar=C3=ADo=20Kondratiuk?= <dariokondratiuk@gmail.com>
Date: Wed, 2 Jul 2025 12:50:53 -0300
Subject: [PATCH 1/7] Bidi unlock prerender tests

---
 .../TestExpectations/TestExpectations.local.json  | 15 ---------------
 .../PrerenderTests/PrerenderTests.cs              |  1 -
 2 files changed, 16 deletions(-)

diff --git a/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectations.local.json b/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectations.local.json
index cfe6877c4..d8800477a 100644
--- a/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectations.local.json
+++ b/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectations.local.json
@@ -1822,19 +1822,4 @@
       "FAIL"
     ]
   },
-  {
-    "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
-    "testIdPattern": "[prerender.spec] *",
-    "platforms": [
-      "darwin",
-      "linux",
-      "win32"
-    ],
-    "parameters": [
-      "webDriverBiDi"
-    ],
-    "expectations": [
-      "FAIL"
-    ]
-  }
 ]
diff --git a/lib/PuppeteerSharp.Tests/PrerenderTests/PrerenderTests.cs b/lib/PuppeteerSharp.Tests/PrerenderTests/PrerenderTests.cs
index 09e452d19..cc998e530 100644
--- a/lib/PuppeteerSharp.Tests/PrerenderTests/PrerenderTests.cs
+++ b/lib/PuppeteerSharp.Tests/PrerenderTests/PrerenderTests.cs
@@ -31,7 +31,6 @@ public async Task CanNavigateToAPrerenderedPageViaPuppeteer()
         var button = await Page.WaitForSelectorAsync("button");
         await button.ClickAsync();
 
-
         await Page.GoToAsync(TestConstants.ServerUrl + "/prerender/target.html");
         Assert.That(await Page.EvaluateExpressionAsync<string>("document.body.innerText"), Is.EqualTo("target"));
     }

From acfb633b89f33fb90d05022093da61e6eee27d64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dar=C3=ADo=20Kondratiuk?= <dariokondratiuk@gmail.com>
Date: Wed, 2 Jul 2025 12:54:35 -0300
Subject: [PATCH 2/7] remove comma

---
 .../TestExpectations/TestExpectations.local.json                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectations.local.json b/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectations.local.json
index d8800477a..ed0535660 100644
--- a/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectations.local.json
+++ b/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectations.local.json
@@ -1821,5 +1821,5 @@
     "expectations": [
       "FAIL"
     ]
-  },
+  }
 ]

From 4878f4450cabdf03c2669b0206c3366e31253f23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dar=C3=ADo=20Kondratiuk?= <dariokondratiuk@gmail.com>
Date: Wed, 2 Jul 2025 13:48:24 -0300
Subject: [PATCH 3/7] fix

---
 .../TestExpectations.local.json               | 15 --------------
 .../TestExpectations.upstream.json            | 20 ++++++++++++++-----
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectations.local.json b/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectations.local.json
index ed0535660..bc8460cbb 100644
--- a/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectations.local.json
+++ b/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectations.local.json
@@ -1762,21 +1762,6 @@
       "FAIL"
     ]
   },
-  {
-    "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
-    "testIdPattern": "[DeviceRequestPrompt.test.ts] *",
-    "platforms": [
-      "darwin",
-      "linux",
-      "win32"
-    ],
-    "parameters": [
-      "webDriverBiDi"
-    ],
-    "expectations": [
-      "FAIL"
-    ]
-  },
   {
     "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
     "testIdPattern": "[launcher.spec] PuppeteerSharp *",
diff --git a/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectations.upstream.json b/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectations.upstream.json
index ee7ae3f6a..d75627429 100644
--- a/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectations.upstream.json
+++ b/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectations.upstream.json
@@ -1568,6 +1568,7 @@
     "expectations": ["SKIP"],
     "comment": "TODO: add a comment explaining why this expectation is required (include links to issues)"
   },
+  {
     "testIdPattern": "[extensions.spec] extensions can evaluate in the service worker",
     "platforms": ["win32"],
     "parameters": ["cdp", "chrome"],
@@ -3467,13 +3468,22 @@
     "comment": "TODO: add a comment explaining why this expectation is required (include links to issues)"
   },
   {
-
     "testIdPattern": "[extensions.spec] extensions service_worker target type should be available",
-    "platforms": ["darwin", "linux", "win32"],
-    "parameters": ["cdp", "chrome", "chrome-headless-shell"],
-    "expectations": ["SKIP"],
+    "platforms": [
+      "darwin",
+      "linux",
+      "win32"
+    ],
+    "parameters": [
+      "cdp",
+      "chrome",
+      "chrome-headless-shell"
+    ],
+    "expectations": [
+      "SKIP"
+    ],
     "comment": "TODO: add a comment explaining why this expectation is required (include links to issues)"
-  ],
+  },
   {
     "testIdPattern": "[mouse.spec] Mouse should select the text with mouse",
     "platforms": ["win32"],

From bfdc0d3e3044a5b96371b64de9d333218186e3ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dar=C3=ADo=20Kondratiuk?= <dariokondratiuk@gmail.com>
Date: Thu, 3 Jul 2025 10:51:12 -0300
Subject: [PATCH 4/7] some progress

---
 lib/PuppeteerSharp/Bidi/BidiElementHandle.cs |  3 -
 lib/PuppeteerSharp/Bidi/BidiFrameRealm.cs    | 35 +++++---
 lib/PuppeteerSharp/Bidi/BidiJSHandle.cs      | 15 +++-
 lib/PuppeteerSharp/Bidi/BidiRealm.cs         | 84 ++++++++++++++++----
 lib/PuppeteerSharp/Bidi/Core/Realm.cs        |  4 +
 lib/PuppeteerSharp/Bidi/Core/Session.cs      |  2 +
 lib/PuppeteerSharp/Cdp/CdpElementHandle.cs   | 14 ----
 lib/PuppeteerSharp/ElementHandle.cs          | 16 +++-
 lib/PuppeteerSharp/PuppeteerSharp.csproj     |  2 +-
 9 files changed, 128 insertions(+), 47 deletions(-)

diff --git a/lib/PuppeteerSharp/Bidi/BidiElementHandle.cs b/lib/PuppeteerSharp/Bidi/BidiElementHandle.cs
index b3fb070ac..fb8a0a614 100644
--- a/lib/PuppeteerSharp/Bidi/BidiElementHandle.cs
+++ b/lib/PuppeteerSharp/Bidi/BidiElementHandle.cs
@@ -21,7 +21,6 @@
 //  * SOFTWARE.
 
 using System.Threading.Tasks;
-using PuppeteerSharp.Cdp.Messaging;
 using PuppeteerSharp.QueryHandlers;
 using WebDriverBiDi.Script;
 
@@ -47,8 +46,6 @@ public static IJSHandle From(RemoteValue value, BidiRealm realm)
         return new BidiElementHandle(value, realm);
     }
 
-    public override ValueTask DisposeAsync() => throw new System.NotImplementedException();
-
     public override Task UploadFileAsync(bool resolveFilePaths, params string[] filePaths) => throw new System.NotImplementedException();
 
     public override Task<IFrame> ContentFrameAsync() => throw new System.NotImplementedException();
diff --git a/lib/PuppeteerSharp/Bidi/BidiFrameRealm.cs b/lib/PuppeteerSharp/Bidi/BidiFrameRealm.cs
index 82d7cee96..0fd6ae4d1 100644
--- a/lib/PuppeteerSharp/Bidi/BidiFrameRealm.cs
+++ b/lib/PuppeteerSharp/Bidi/BidiFrameRealm.cs
@@ -20,14 +20,20 @@
 //  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //  * SOFTWARE.
 
+using System;
 using System.Threading.Tasks;
+using PuppeteerSharp.Helpers;
+using PuppeteerSharp.QueryHandlers;
 
 namespace PuppeteerSharp.Bidi;
 
 internal class BidiFrameRealm(WindowRealm realm, BidiFrame frame) : BidiRealm(realm, frame.TimeoutSettings)
 {
     private readonly WindowRealm _realm = realm;
-    private bool _bindingsInstalled;
+    private readonly TaskQueue _puppeteerUtilQueue = new();
+    private IJSHandle _puppeteerUtil;
+
+    internal override IEnvironment Environment => frame;
 
     public static BidiFrameRealm From(WindowRealm realm, BidiFrame frame)
     {
@@ -38,17 +44,26 @@ public static BidiFrameRealm From(WindowRealm realm, BidiFrame frame)
 
     public override async Task<IJSHandle> GetPuppeteerUtilAsync()
     {
-        var installTcs = new TaskCompletionSource<bool>();
+        var scriptInjector = frame.BrowsingContext.Session.ScriptInjector;
 
-        if (!_bindingsInstalled)
+        await _puppeteerUtilQueue.Enqueue(async () =>
         {
-            // TODO: Implement
-            installTcs.TrySetResult(true);
-            _bindingsInstalled = true;
-        }
+            if (_puppeteerUtil == null)
+            {
+                await scriptInjector.InjectAsync(
+                    async (script) =>
+                    {
+                        if (_puppeteerUtil != null)
+                        {
+                            await _puppeteerUtil.DisposeAsync().ConfigureAwait(false);
+                        }
 
-        await installTcs.Task.ConfigureAwait(false);
-        return await base.GetPuppeteerUtilAsync().ConfigureAwait(false);
+                        _puppeteerUtil = await EvaluateExpressionHandleAsync(script).ConfigureAwait(false);
+                    },
+                    _puppeteerUtil == null).ConfigureAwait(false);
+            }
+        }).ConfigureAwait(false);
+        return _puppeteerUtil;
     }
 
     protected override void Initialize()
@@ -58,7 +73,7 @@ protected override void Initialize()
         _realm.Updated += (_, __) =>
         {
             (Environment as Frame)?.ClearDocumentHandle();
-            _bindingsInstalled = false;
+            _puppeteerUtil = null;
         };
     }
 }
diff --git a/lib/PuppeteerSharp/Bidi/BidiJSHandle.cs b/lib/PuppeteerSharp/Bidi/BidiJSHandle.cs
index 28f44a6aa..91ef8a29a 100644
--- a/lib/PuppeteerSharp/Bidi/BidiJSHandle.cs
+++ b/lib/PuppeteerSharp/Bidi/BidiJSHandle.cs
@@ -28,6 +28,8 @@ namespace PuppeteerSharp.Bidi;
 
 internal class BidiJSHandle(RemoteValue value, BidiRealm realm) : JSHandle
 {
+    private bool _disposed;
+
     public RemoteValue RemoteValue { get; } = value;
 
     public bool IsPrimitiveValue
@@ -42,6 +44,8 @@ public bool IsPrimitiveValue
         }
     }
 
+    internal string Id => RemoteValue.Handle;
+
     internal override Realm Realm { get; } = realm;
 
     public static BidiJSHandle From(RemoteValue value, BidiRealm realm)
@@ -51,7 +55,16 @@ public static BidiJSHandle From(RemoteValue value, BidiRealm realm)
 
     public override Task<T> JsonValueAsync<T>() => throw new System.NotImplementedException();
 
-    public override ValueTask DisposeAsync() => throw new System.NotImplementedException();
+    public override async ValueTask DisposeAsync()
+    {
+        if (_disposed)
+        {
+            return;
+        }
+
+        _disposed = true;
+        await realm.DestroyHandlesAsync(this).ConfigureAwait(false);
+    }
 
     /// <inheritdoc/>
     public override string ToString()
diff --git a/lib/PuppeteerSharp/Bidi/BidiRealm.cs b/lib/PuppeteerSharp/Bidi/BidiRealm.cs
index e35cc30a7..e2c155fde 100644
--- a/lib/PuppeteerSharp/Bidi/BidiRealm.cs
+++ b/lib/PuppeteerSharp/Bidi/BidiRealm.cs
@@ -32,17 +32,11 @@
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using PuppeteerSharp.Bidi.Core;
+using PuppeteerSharp.Helpers.Json;
 using WebDriverBiDi.Script;
 
 namespace PuppeteerSharp.Bidi;
 
-/// <summary>
-/// A BidiLazyArg is an evaluation argument that will be resolved when the CDP call is built.
-/// </summary>
-/// <param name="context">Execution context.</param>
-/// <returns>Resolved argument.</returns>
-public delegate Task<LocalValue> BidiLazyArg(IPuppeteerUtilWrapper context);
-
 internal class BidiRealm(Core.Realm realm, TimeoutSettings timeoutSettings) : Realm(timeoutSettings), IDisposable, IPuppeteerUtilWrapper
 {
     private static readonly Regex _sourceUrlRegex = new(@"^[\x20\t]*//([@#])\s*sourceURL=\s{0,10}(\S*?)\s{0,10}$", RegexOptions.Multiline);
@@ -61,17 +55,70 @@ public void Dispose()
 
     public virtual Task<IJSHandle> GetPuppeteerUtilAsync() => throw new NotImplementedException();
 
-    internal override Task<IJSHandle> AdoptHandleAsync(IJSHandle handle) => throw new System.NotImplementedException();
+    public async Task DestroyHandlesAsync(params BidiJSHandle[] handles)
+    {
+        if (Disposed)
+        {
+            return;
+        }
+
+        var handleIds = handles
+            .Select((handle) => handle.Id)
+            .Where(id => !string.IsNullOrEmpty(id)).ToArray();
+
+        if (handleIds.Length == 0)
+        {
+            return;
+        }
+
+        try
+        {
+            await realm.DisownAsync(handleIds).ConfigureAwait(false);
+        }
+        catch
+        {
+            // TODO: Add Logger
+        }
+    }
+
+    internal override async Task<IJSHandle> AdoptHandleAsync(IJSHandle handle)
+    {
+        try
+        {
+            return await EvaluateFunctionHandleAsync(
+                @"node => {
+                return node;
+            }",
+                handle).ConfigureAwait(false);
+        }
+        catch (Exception e)
+        {
+            Console.WriteLine(e);
+            throw;
+        }
+    }
 
     internal override Task<IElementHandle> AdoptBackendNodeAsync(object backendNodeId) => throw new System.NotImplementedException();
 
-    internal override Task<IJSHandle> TransferHandleAsync(IJSHandle handle) => throw new System.NotImplementedException();
+    internal override async Task<IJSHandle> TransferHandleAsync(IJSHandle handle)
+    {
+        var handleImpl = handle as JSHandle;
+
+        if (handleImpl.Realm == this)
+        {
+            return handle;
+        }
+
+        var transferredHandle = AdoptHandleAsync(handle);
+        await handle.DisposeAsync().ConfigureAwait(false);
+        return await transferredHandle.ConfigureAwait(false);
+    }
 
     internal async override Task<IJSHandle> EvaluateExpressionHandleAsync(string script)
         => CreateHandleAsync(await EvaluateAsync(false, true, script).ConfigureAwait(false));
 
     internal async override Task<IJSHandle> EvaluateFunctionHandleAsync(string script, params object[] args)
-        => CreateHandleAsync(await EvaluateAsync(false, false, script).ConfigureAwait(false));
+        => CreateHandleAsync(await EvaluateAsync(false, false, script, args).ConfigureAwait(false));
 
     internal override async Task<T> EvaluateExpressionAsync<T>(string script)
         => DeserializeResult<T>((await EvaluateAsync(true, true, script).ConfigureAwait(false)).Result.Value);
@@ -236,14 +283,14 @@ private T DeserializeResult<T>(object result)
         return (T)result;
     }
 
-    private async Task<LocalValue> FormatArgumentAsync(object arg)
+    private async Task<ArgumentValue> FormatArgumentAsync(object arg)
     {
         if (arg is TaskCompletionSource<object> tcs)
         {
             arg = await tcs.Task.ConfigureAwait(false);
         }
 
-        if (arg is BidiLazyArg lazyArg)
+        if (arg is LazyArg lazyArg)
         {
             arg = await lazyArg(this).ConfigureAwait(false);
         }
@@ -288,17 +335,20 @@ private async Task<LocalValue> FormatArgumentAsync(object arg)
                 return LocalValue.Number(longValue);
             case float floatValue:
                 return LocalValue.Number(floatValue);
+            case decimal decimalValue:
+                return LocalValue.Number(decimalValue);
             case IEnumerable enumerable:
-                var list = new List<LocalValue>();
+                var list = new List<ArgumentValue>();
                 foreach (var item in enumerable)
                 {
                     list.Add(await FormatArgumentAsync(item).ConfigureAwait(false));
                 }
 
-                return LocalValue.Array(list);
-            case IJSHandle objectHandle:
-                // TODO: Implement this
-                return null;
+                return LocalValue.Array(list.Select(el => el as LocalValue).ToList());
+            case BidiJSHandle objectHandle:
+                return objectHandle.RemoteValue.ToRemoteReference();
+            case BidiElementHandle elementHandle:
+                return elementHandle.Value.ToRemoteReference();
 
                 // TODO: Cover the rest of the cases
         }
diff --git a/lib/PuppeteerSharp/Bidi/Core/Realm.cs b/lib/PuppeteerSharp/Bidi/Core/Realm.cs
index ed7a7c61c..f5cd20323 100644
--- a/lib/PuppeteerSharp/Bidi/Core/Realm.cs
+++ b/lib/PuppeteerSharp/Bidi/Core/Realm.cs
@@ -21,6 +21,7 @@
 //  * SOFTWARE.
 
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 using WebDriverBiDi.Script;
 
@@ -96,6 +97,9 @@ public Task<EvaluateResult> CallFunctionAsync(
         return Session.Driver.Script.CallFunctionAsync(parameters);
     }
 
+    public Task DisownAsync(string[] handleIds)
+        => Session.Driver.Script.DisownAsync(new DisownCommandParameters(Target, handleIds));
+
     protected virtual void OnUpdated() => Updated?.Invoke(this, EventArgs.Empty);
 
     private void OnDestroyed() => Destroyed?.Invoke(this, new ClosedEventArgs(_reason));
diff --git a/lib/PuppeteerSharp/Bidi/Core/Session.cs b/lib/PuppeteerSharp/Bidi/Core/Session.cs
index 05f435872..fe39bc425 100644
--- a/lib/PuppeteerSharp/Bidi/Core/Session.cs
+++ b/lib/PuppeteerSharp/Bidi/Core/Session.cs
@@ -68,6 +68,8 @@ internal class Session(BiDiDriver driver, NewCommandResult info) : IDisposable
 
     public Browser Browser { get; private set; }
 
+    internal ScriptInjector ScriptInjector { get; } = new();
+
     public static async Task<Session> FromAsync(BiDiDriver driver, NewCommandParameters capabilities, ILoggerFactory loggerFactory)
     {
         var result = await driver.Session.NewSessionAsync(capabilities).ConfigureAwait(false);
diff --git a/lib/PuppeteerSharp/Cdp/CdpElementHandle.cs b/lib/PuppeteerSharp/Cdp/CdpElementHandle.cs
index 61acf2029..61b38899e 100644
--- a/lib/PuppeteerSharp/Cdp/CdpElementHandle.cs
+++ b/lib/PuppeteerSharp/Cdp/CdpElementHandle.cs
@@ -162,20 +162,6 @@ await handle.Client.SendAsync(
                 return handle;
             });
 
-    /// <inheritdoc />
-    public override async ValueTask DisposeAsync()
-    {
-        if (Disposed)
-        {
-            return;
-        }
-
-        Disposed = true;
-
-        await Handle.DisposeAsync().ConfigureAwait(false);
-        GC.SuppressFinalize(this);
-    }
-
     /// <inheritdoc />
     public override string ToString() => Handle.ToString();
 
diff --git a/lib/PuppeteerSharp/ElementHandle.cs b/lib/PuppeteerSharp/ElementHandle.cs
index 46bb2d97c..09b0941c9 100644
--- a/lib/PuppeteerSharp/ElementHandle.cs
+++ b/lib/PuppeteerSharp/ElementHandle.cs
@@ -30,7 +30,7 @@ internal ElementHandle(JSHandle handle)
         /// <summary>
         /// Base handle.
         /// </summary>
-        protected JSHandle Handle { get; }
+        internal JSHandle Handle { get; }
 
         /// <summary>
         /// Element's page.
@@ -662,6 +662,20 @@ public override Task<Dictionary<string, IJSHandle>> GetPropertiesAsync()
         public override Task<T> JsonValueAsync<T>()
             => BindIsolatedHandleAsync<T, ElementHandle>(element => element.Handle.JsonValueAsync<T>());
 
+        /// <inheritdoc />
+        public override async ValueTask DisposeAsync()
+        {
+            if (Disposed)
+            {
+                return;
+            }
+
+            Disposed = true;
+
+            await Handle.DisposeAsync().ConfigureAwait(false);
+            GC.SuppressFinalize(this);
+        }
+
         /// <inheritdoc/>
         public virtual Task ScrollIntoViewAsync()
             => BindIsolatedHandleAsync<JsonElement?, ElementHandle>(handle
diff --git a/lib/PuppeteerSharp/PuppeteerSharp.csproj b/lib/PuppeteerSharp/PuppeteerSharp.csproj
index fcc254c43..9d5419bbc 100644
--- a/lib/PuppeteerSharp/PuppeteerSharp.csproj
+++ b/lib/PuppeteerSharp/PuppeteerSharp.csproj
@@ -43,7 +43,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="WebDriverBiDi" Version="0.0.11" />
+    <PackageReference Include="WebDriverBiDi" Version="0.0.15" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />

From 266d785d5ef4c6c8192ef3e691594803fd09cb65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dar=C3=ADo=20Kondratiuk?= <dariokondratiuk@gmail.com>
Date: Fri, 4 Jul 2025 11:11:11 -0300
Subject: [PATCH 5/7] Some cool implementations

---
 lib/PuppeteerSharp/Bidi/BidiElementHandle.cs  |   4 +-
 lib/PuppeteerSharp/Bidi/BidiFrameRealm.cs     |   2 +
 lib/PuppeteerSharp/Bidi/BidiMouse.cs          | 106 ++++++++++++++++++
 lib/PuppeteerSharp/Bidi/BidiPage.cs           |   1 +
 lib/PuppeteerSharp/Bidi/BidiRealm.cs          |  31 +++++
 .../Bidi/Core/BrowsingContext.cs              |   8 ++
 .../Helpers/DictionaryExtensions.cs           |   4 +
 7 files changed, 155 insertions(+), 1 deletion(-)
 create mode 100644 lib/PuppeteerSharp/Bidi/BidiMouse.cs

diff --git a/lib/PuppeteerSharp/Bidi/BidiElementHandle.cs b/lib/PuppeteerSharp/Bidi/BidiElementHandle.cs
index fb8a0a614..70d6a738a 100644
--- a/lib/PuppeteerSharp/Bidi/BidiElementHandle.cs
+++ b/lib/PuppeteerSharp/Bidi/BidiElementHandle.cs
@@ -39,7 +39,9 @@ internal class BidiElementHandle(RemoteValue value, BidiRealm realm) : ElementHa
 
     internal override CustomQuerySelectorRegistry CustomQuerySelectorRegistry { get; } = new();
 
-    protected override Page Page { get; }
+    internal BidiFrame BidiFrame => realm.Environment as BidiFrame;
+
+    protected override Page Page => BidiFrame.BidiPage;
 
     public static IJSHandle From(RemoteValue value, BidiRealm realm)
     {
diff --git a/lib/PuppeteerSharp/Bidi/BidiFrameRealm.cs b/lib/PuppeteerSharp/Bidi/BidiFrameRealm.cs
index 0fd6ae4d1..57b49628c 100644
--- a/lib/PuppeteerSharp/Bidi/BidiFrameRealm.cs
+++ b/lib/PuppeteerSharp/Bidi/BidiFrameRealm.cs
@@ -35,6 +35,8 @@ internal class BidiFrameRealm(WindowRealm realm, BidiFrame frame) : BidiRealm(re
 
     internal override IEnvironment Environment => frame;
 
+    internal BidiFrame Frame => frame;
+
     public static BidiFrameRealm From(WindowRealm realm, BidiFrame frame)
     {
         var frameRealm = new BidiFrameRealm(realm, frame);
diff --git a/lib/PuppeteerSharp/Bidi/BidiMouse.cs b/lib/PuppeteerSharp/Bidi/BidiMouse.cs
new file mode 100644
index 000000000..ec178441d
--- /dev/null
+++ b/lib/PuppeteerSharp/Bidi/BidiMouse.cs
@@ -0,0 +1,106 @@
+// * MIT License
+//  *
+//  * Copyright (c) Darío Kondratiuk
+//  *
+//  * Permission is hereby granted, free of charge, to any person obtaining a copy
+//  * of this software and associated documentation files (the "Software"), to deal
+//  * in the Software without restriction, including without limitation the rights
+//  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  * copies of the Software, and to permit persons to whom the Software is
+//  * furnished to do so, subject to the following conditions:
+//  *
+//  * The above copyright notice and this permission notice shall be included in all
+//  * copies or substantial portions of the Software.
+//  *
+//  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  * SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using PuppeteerSharp.Input;
+using WebDriverBiDi.Input;
+
+namespace PuppeteerSharp.Bidi;
+
+internal class BidiMouse(BidiPage page) : Mouse
+{
+    public override Task DropAsync(decimal x, decimal y, DragData data) => throw new NotImplementedException();
+
+    public override Task DragAndDropAsync(decimal startX, decimal startY, decimal endX, decimal endY, int delay = 0) => throw new NotImplementedException();
+
+    public override Task ResetAsync() => throw new NotImplementedException();
+
+    public override Task MoveAsync(decimal x, decimal y, MoveOptions options = null) => throw new NotImplementedException();
+
+    public override Task UpAsync(ClickOptions options = null) => throw new NotImplementedException();
+
+    public override Task WheelAsync(decimal deltaX, decimal deltaY) => throw new NotImplementedException();
+
+    public override Task<DragData> DragAsync(decimal startX, decimal startY, decimal endX, decimal endY) => throw new NotImplementedException();
+
+    public override Task DragEnterAsync(decimal x, decimal y, DragData data) => throw new NotImplementedException();
+
+    public override Task DragOverAsync(decimal x, decimal y, DragData data) => throw new NotImplementedException();
+
+    public override Task DownAsync(ClickOptions options = null) => throw new NotImplementedException();
+
+    public override async Task ClickAsync(decimal x, decimal y, ClickOptions options = null)
+    {
+        var actions = new List<IPointerSourceAction>
+        {
+            new PointerMoveAction()
+            {
+                X = (long)Math.Round(x),
+                Y = (long)Math.Round(y),
+            },
+        };
+
+        var pointerDownAction = new PointerDownAction(GetBidiButton(options?.Button ?? MouseButton.Left));
+        var pointerUpAction = new PointerUpAction(GetBidiButton(options?.Button ?? MouseButton.Left));
+
+        for (var i = 1; i < (options?.Count ?? 1); ++i)
+        {
+            actions.Add(pointerDownAction);
+            actions.Add(pointerUpAction);
+        }
+
+        actions.Add(pointerDownAction);
+
+        if (options?.Delay is > 0)
+        {
+            actions.Add(new PauseAction()
+            {
+                Duration = TimeSpan.FromMilliseconds(options.Delay),
+            });
+        }
+
+        actions.Add(pointerUpAction);
+
+        var finalSource = new PointerSourceActions();
+        finalSource.Actions.AddRange(actions);
+
+        await page.BidiMainFrame.BrowsingContext.PerformActionsAsync([finalSource]).ConfigureAwait(false);
+    }
+
+    protected override void Dispose(bool disposing) => throw new NotImplementedException();
+
+    private long GetBidiButton(MouseButton optionsButton)
+    {
+        return optionsButton switch
+        {
+            MouseButton.Left => 0,
+            MouseButton.Middle => 1,
+            MouseButton.Right => 2,
+            MouseButton.Back => 3,
+            MouseButton.Forward => 4,
+            _ => throw new ArgumentOutOfRangeException(nameof(optionsButton), $"Unsupported mouse button: {optionsButton}"),
+        };
+    }
+}
+
diff --git a/lib/PuppeteerSharp/Bidi/BidiPage.cs b/lib/PuppeteerSharp/Bidi/BidiPage.cs
index 3a8f34f4e..a09b2a806 100644
--- a/lib/PuppeteerSharp/Bidi/BidiPage.cs
+++ b/lib/PuppeteerSharp/Bidi/BidiPage.cs
@@ -44,6 +44,7 @@ internal BidiPage(BidiBrowserContext browserContext, BrowsingContext browsingCon
         Browser = browserContext.Browser;
         BidiMainFrame = BidiFrame.From(this, null, browsingContext);
         _cdpEmulationManager = new CdpEmulationManager(BidiMainFrame.Client);
+        Mouse = new BidiMouse(this);
     }
 
     /// <inheritdoc />
diff --git a/lib/PuppeteerSharp/Bidi/BidiRealm.cs b/lib/PuppeteerSharp/Bidi/BidiRealm.cs
index e2c155fde..ab2c5da7c 100644
--- a/lib/PuppeteerSharp/Bidi/BidiRealm.cs
+++ b/lib/PuppeteerSharp/Bidi/BidiRealm.cs
@@ -32,6 +32,7 @@
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using PuppeteerSharp.Bidi.Core;
+using PuppeteerSharp.Helpers;
 using PuppeteerSharp.Helpers.Json;
 using WebDriverBiDi.Script;
 
@@ -246,6 +247,11 @@ private T DeserializeResult<T>(object result)
             return (T)(object)Convert.ToBoolean(result, CultureInfo.InvariantCulture);
         }
 
+        if (result is RemoteValueDictionary dic)
+        {
+            return RemoteDictionaryTo<T>(dic);
+        }
+
         if (typeof(T).IsArray)
         {
             // Get the element type of the array
@@ -283,6 +289,31 @@ private T DeserializeResult<T>(object result)
         return (T)result;
     }
 
+    private T RemoteDictionaryTo<T>(RemoteValueDictionary dic)
+    {
+        var localDictionary = new Dictionary<object, object>();
+
+        foreach (var kvp in dic)
+        {
+            // Convert RemoteValue to its actual value
+            var value = kvp.Value.Value;
+
+            // If the value is a RemoteValue, we need to deserialize it
+            if (value is RemoteValue remoteValue)
+            {
+                value = remoteValue.Value;
+            }
+
+            localDictionary[kvp.Key] = value;
+        }
+
+        // Serialize the dictionary to JSON
+        var json = JsonSerializer.Serialize(localDictionary, JsonHelper.DefaultJsonSerializerSettings.Value);
+
+        // Deserialize JSON into the target type
+        return JsonSerializer.Deserialize<T>(json, JsonHelper.DefaultJsonSerializerSettings.Value);
+    }
+
     private async Task<ArgumentValue> FormatArgumentAsync(object arg)
     {
         if (arg is TaskCompletionSource<object> tcs)
diff --git a/lib/PuppeteerSharp/Bidi/Core/BrowsingContext.cs b/lib/PuppeteerSharp/Bidi/Core/BrowsingContext.cs
index ad43bb5cb..e388e41ec 100644
--- a/lib/PuppeteerSharp/Bidi/Core/BrowsingContext.cs
+++ b/lib/PuppeteerSharp/Bidi/Core/BrowsingContext.cs
@@ -26,6 +26,7 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Options;
 using WebDriverBiDi.BrowsingContext;
+using WebDriverBiDi.Input;
 
 namespace PuppeteerSharp.Bidi.Core;
 
@@ -160,6 +161,13 @@ internal async Task SetViewportAsync(SetViewportOptions options = null)
         await Session.Driver.BrowsingContext.SetViewportAsync(parameters).ConfigureAwait(false);
     }
 
+    internal async Task PerformActionsAsync(SourceActions[] actions)
+    {
+        var param = new PerformActionsCommandParameters(Id);
+        param.Actions.AddRange(actions);
+        await Session.Driver.Input.PerformActionsAsync(param).ConfigureAwait(false);
+    }
+
     internal WindowRealm CreateWindowRealm(string sandbox = null)
     {
         var realm = WindowRealm.From(this, sandbox);
diff --git a/lib/PuppeteerSharp/Helpers/DictionaryExtensions.cs b/lib/PuppeteerSharp/Helpers/DictionaryExtensions.cs
index 9ba649e83..3ce2b8f47 100644
--- a/lib/PuppeteerSharp/Helpers/DictionaryExtensions.cs
+++ b/lib/PuppeteerSharp/Helpers/DictionaryExtensions.cs
@@ -1,4 +1,8 @@
+using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Text.Json;
+using PuppeteerSharp.Helpers.Json;
 
 namespace PuppeteerSharp.Helpers
 {

From 459b57d9876f2e2a8282a0cb36e028f8fdaa1388 Mon Sep 17 00:00:00 2001
From: Manuel Cabral <Manny651@users.noreply.github.com>
Date: Fri, 4 Jul 2025 10:24:07 -0400
Subject: [PATCH 6/7] Fix Invalid referrerPolicy error in latest versions of
 Chromium (#2924)

* Fix Invalid referrerPolicy in Chromium

* Convert to camelCase
---
 .../NavigationTests/PageGotoTests.cs                  |  2 +-
 lib/PuppeteerSharp/Cdp/CdpFrame.cs                    | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/PuppeteerSharp.Tests/NavigationTests/PageGotoTests.cs b/lib/PuppeteerSharp.Tests/NavigationTests/PageGotoTests.cs
index 9e79f8846..613eaa4d4 100644
--- a/lib/PuppeteerSharp.Tests/NavigationTests/PageGotoTests.cs
+++ b/lib/PuppeteerSharp.Tests/NavigationTests/PageGotoTests.cs
@@ -507,7 +507,7 @@ await Task.WhenAll(
                 Server.WaitForRequest("/digits/1.png", r => referer2 = r.Headers["Referer"]),
                 Page.GoToAsync(TestConstants.ServerUrl + "/grid.html", new NavigationOptions
                 {
-                    ReferrerPolicy = "no-referer"
+                    ReferrerPolicy = "no-referrer"
                 })
             );
 
diff --git a/lib/PuppeteerSharp/Cdp/CdpFrame.cs b/lib/PuppeteerSharp/Cdp/CdpFrame.cs
index 12d07c03b..147914080 100644
--- a/lib/PuppeteerSharp/Cdp/CdpFrame.cs
+++ b/lib/PuppeteerSharp/Cdp/CdpFrame.cs
@@ -22,6 +22,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using PuppeteerSharp.Cdp.Messaging;
@@ -114,7 +115,7 @@ async Task NavigateAsync()
             {
                 Url = url,
                 Referrer = referrer ?? string.Empty,
-                ReferrerPolicy = referrerPolicy ?? string.Empty,
+                ReferrerPolicy = ReferrerPolicyToProtocol(referrerPolicy),
                 FrameId = Id,
             }).ConfigureAwait(false);
 
@@ -335,4 +336,12 @@ internal void UpdateClient(CDPSession client, bool keepWorlds = false)
     /// <inheritdoc />
     protected internal override DeviceRequestPromptManager GetDeviceRequestPromptManager()
         => FrameManager.GetDeviceRequestPromptManager(Client);
+
+    // See https://chromedevtools.github.io/devtools-protocol/tot/Page/#type-ReferrerPolicy.
+    private static string ReferrerPolicyToProtocol(string referrerPolicy)
+    {
+        // Transform kebab-case to camelCase
+        return string.IsNullOrEmpty(referrerPolicy) ? null :
+            Regex.Replace(referrerPolicy, "-(.)", match => match.Groups[1].Value.ToUpperInvariant());
+    }
 }

From 70be3d250e0a1c62238bf5e35a94053e4ba18b10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dar=C3=ADo=20Kondratiuk?= <dariokondratiuk@gmail.com>
Date: Mon, 14 Jul 2025 14:32:56 -0300
Subject: [PATCH 7/7] tiny refactor

---
 lib/PuppeteerSharp/Bidi/BidiHttpRequest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/PuppeteerSharp/Bidi/BidiHttpRequest.cs b/lib/PuppeteerSharp/Bidi/BidiHttpRequest.cs
index bdf443767..f50f62d8e 100644
--- a/lib/PuppeteerSharp/Bidi/BidiHttpRequest.cs
+++ b/lib/PuppeteerSharp/Bidi/BidiHttpRequest.cs
@@ -39,7 +39,7 @@ private BidiHttpRequest(Request request, BidiFrame frame, BidiHttpRequest redire
     {
         _request = request;
         Frame = frame;
-        RedirectChainList = new List<IRequest>();
+        RedirectChainList = [];
         Requests.AddItem(request, this);
     }