From 80fd7d0ce8c72a290a948720b5ab050695c5050f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dar=C3=ADo=20Kondratiuk?= <dariokondratiuk@gmail.com>
Date: Fri, 18 Jul 2025 09:13:05 -0300
Subject: [PATCH 1/6] Unlock setContent

---
 .../TestExpectations/TestExpectations.local.json  | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectations.local.json b/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectations.local.json
index cfe6877c4..02df38a38 100644
--- a/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectations.local.json
+++ b/lib/PuppeteerSharp.Nunit/TestExpectations/TestExpectations.local.json
@@ -1522,21 +1522,6 @@
       "FAIL"
     ]
   },
-  {
-    "comment": "This is part of organizing the webdriver bidi implementation, We will remove it one by one",
-    "testIdPattern": "[page.spec] *Page.setContent*",
-    "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": "[proxy.spec] *",

From ee90f950e50833c4a1032936bfbd96248d4465f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dar=C3=ADo=20Kondratiuk?= <dariokondratiuk@gmail.com>
Date: Mon, 21 Jul 2025 14:52:31 -0300
Subject: [PATCH 2/6] implement

---
 lib/PuppeteerSharp/Bidi/BidiFrame.cs | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/lib/PuppeteerSharp/Bidi/BidiFrame.cs b/lib/PuppeteerSharp/Bidi/BidiFrame.cs
index 195765065..44550a4d3 100644
--- a/lib/PuppeteerSharp/Bidi/BidiFrame.cs
+++ b/lib/PuppeteerSharp/Bidi/BidiFrame.cs
@@ -97,7 +97,26 @@ internal BidiPage BidiPage
     public override Task<IElementHandle> AddScriptTagAsync(AddTagOptions options) => throw new System.NotImplementedException();
 
     /// <inheritdoc />
-    public override Task SetContentAsync(string html, NavigationOptions options = null) => throw new System.NotImplementedException();
+    public override async Task SetContentAsync(string html, NavigationOptions options = null)
+    {
+        var waitUntil = options?.WaitUntil ?? new[] { WaitUntilNavigation.Load };
+        var timeout = options?.Timeout ?? TimeoutSettings.NavigationTimeout;
+
+        // Set the frame content using JavaScript, similar to CDP implementation
+        await EvaluateFunctionAsync(
+            @"html => {
+                document.open();
+                document.write(html);
+                document.close();
+            }",
+            html).ConfigureAwait(false);
+
+        // Wait for load and network idle events
+        var waitForLoadTask = WaitForLoadAsync(options);
+        var waitForNetworkIdleTask = WaitForNetworkIdleAsync(options);
+
+        await Task.WhenAll(waitForLoadTask, waitForNetworkIdleTask).WithTimeout(timeout).ConfigureAwait(false);
+    }
 
     /// <inheritdoc />
     public override async Task<IResponse> GoToAsync(string url, NavigationOptions options)

From bf2db011b450e0babc3278f741b08d0fb4d01a79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dar=C3=ADo=20Kondratiuk?= <dariokondratiuk@gmail.com>
Date: Mon, 21 Jul 2025 16:56:55 -0300
Subject: [PATCH 3/6] Bring some code changes

---
 .../PageTests/SetContentTests.cs              |  6 +-
 .../PuppeteerBrowserBaseTest.cs               | 11 ++-
 lib/PuppeteerSharp/Bidi/BidiElementHandle.cs  |  7 +-
 lib/PuppeteerSharp/Bidi/BidiFrame.cs          |  9 +--
 lib/PuppeteerSharp/Bidi/BidiFrameRealm.cs     | 35 +++++---
 lib/PuppeteerSharp/Bidi/BidiJSHandle.cs       | 18 ++++-
 lib/PuppeteerSharp/Bidi/BidiRealm.cs          | 81 +++++++++++++++----
 lib/PuppeteerSharp/Bidi/Core/Realm.cs         |  3 +
 lib/PuppeteerSharp/Bidi/Core/Session.cs       |  2 +
 lib/PuppeteerSharp/Cdp/CdpElementHandle.cs    | 14 ----
 lib/PuppeteerSharp/ElementHandle.cs           | 14 ++++
 lib/PuppeteerSharp/PuppeteerSharp.csproj      |  2 +-
 12 files changed, 144 insertions(+), 58 deletions(-)

diff --git a/lib/PuppeteerSharp.Tests/PageTests/SetContentTests.cs b/lib/PuppeteerSharp.Tests/PageTests/SetContentTests.cs
index 3c186af30..efd10544e 100644
--- a/lib/PuppeteerSharp.Tests/PageTests/SetContentTests.cs
+++ b/lib/PuppeteerSharp.Tests/PageTests/SetContentTests.cs
@@ -7,7 +7,7 @@ namespace PuppeteerSharp.Tests.PageTests
 {
     public class SetContentTests : PuppeteerPageBaseTest
     {
-        const string ExpectedOutput = "<html><head></head><body><div>hello</div></body></html>";
+        private const string ExpectedOutput = "<html><head></head><body><div>hello</div></body></html>";
 
         public async Task Usage(IBrowser browser)
         {
@@ -65,7 +65,7 @@ public async Task ShouldRespectTimeout()
                     Timeout = 1
                 }));
 
-            Assert.That(exception.Message, Does.Contain("Timeout of 1 ms exceeded"));
+            Assert.That(exception!.Message, Does.Contain("Timeout of 1 ms exceeded"));
         }
 
         [Test, PuppeteerTest("page.spec", "Page Page.setContent", "should respect default navigation timeout")]
@@ -79,7 +79,7 @@ public async Task ShouldRespectDefaultTimeout()
             var exception = Assert.ThrowsAsync<TimeoutException>(async () =>
                 await Page.SetContentAsync($"<img src='{TestConstants.ServerUrl + imgPath}'></img>"));
 
-            Assert.That(exception.Message, Does.Contain("Timeout of 1 ms exceeded"));
+            Assert.That(exception!.Message, Does.Contain("Timeout of 1 ms exceeded"));
         }
 
         [Test, PuppeteerTest("page.spec", "Page Page.setContent", "should await resources to load")]
diff --git a/lib/PuppeteerSharp.Tests/PuppeteerBrowserBaseTest.cs b/lib/PuppeteerSharp.Tests/PuppeteerBrowserBaseTest.cs
index 5395435c2..aa94988f3 100644
--- a/lib/PuppeteerSharp.Tests/PuppeteerBrowserBaseTest.cs
+++ b/lib/PuppeteerSharp.Tests/PuppeteerBrowserBaseTest.cs
@@ -18,9 +18,16 @@ public async Task InitializeAsync()
         [TearDown]
         public async Task TearDownAsync()
         {
-            if (Browser is not null)
+            try
             {
-                await Browser.DisposeAsync();
+                if (Browser is not null)
+                {
+                    await Browser.DisposeAsync();
+                }
+            }
+            catch
+            {
+                // Ignore exceptions during browser disposal
             }
         }
     }
diff --git a/lib/PuppeteerSharp/Bidi/BidiElementHandle.cs b/lib/PuppeteerSharp/Bidi/BidiElementHandle.cs
index b3fb070ac..70d6a738a 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;
 
@@ -40,15 +39,15 @@ 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)
     {
         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/BidiFrame.cs b/lib/PuppeteerSharp/Bidi/BidiFrame.cs
index 44550a4d3..d3da44273 100644
--- a/lib/PuppeteerSharp/Bidi/BidiFrame.cs
+++ b/lib/PuppeteerSharp/Bidi/BidiFrame.cs
@@ -99,9 +99,12 @@ internal BidiPage BidiPage
     /// <inheritdoc />
     public override async Task SetContentAsync(string html, NavigationOptions options = null)
     {
-        var waitUntil = options?.WaitUntil ?? new[] { WaitUntilNavigation.Load };
         var timeout = options?.Timeout ?? TimeoutSettings.NavigationTimeout;
 
+        // Wait for load and network idle events
+        var waitForLoadTask = WaitForLoadAsync(options);
+        var waitForNetworkIdleTask = WaitForNetworkIdleAsync(options);
+
         // Set the frame content using JavaScript, similar to CDP implementation
         await EvaluateFunctionAsync(
             @"html => {
@@ -111,10 +114,6 @@ await EvaluateFunctionAsync(
             }",
             html).ConfigureAwait(false);
 
-        // Wait for load and network idle events
-        var waitForLoadTask = WaitForLoadAsync(options);
-        var waitForNetworkIdleTask = WaitForNetworkIdleAsync(options);
-
         await Task.WhenAll(waitForLoadTask, waitForNetworkIdleTask).WithTimeout(timeout).ConfigureAwait(false);
     }
 
diff --git a/lib/PuppeteerSharp/Bidi/BidiFrameRealm.cs b/lib/PuppeteerSharp/Bidi/BidiFrameRealm.cs
index 82d7cee96..d7d8c41e1 100644
--- a/lib/PuppeteerSharp/Bidi/BidiFrameRealm.cs
+++ b/lib/PuppeteerSharp/Bidi/BidiFrameRealm.cs
@@ -21,13 +21,19 @@
 //  * SOFTWARE.
 
 using System.Threading.Tasks;
+using PuppeteerSharp.Helpers;
 
 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;
+
+    internal BidiFrame Frame => 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..1cbaa715e 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,8 +55,6 @@ 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();
-
     /// <inheritdoc/>
     public override string ToString()
     {
@@ -63,4 +65,16 @@ public override string ToString()
 
         return "JSHandle@" + RemoteValue.Type;
     }
+
+    /// <inheritdoc/>
+    public override async ValueTask DisposeAsync()
+    {
+        if (_disposed)
+        {
+            return;
+        }
+
+        _disposed = true;
+        await realm.DestroyHandlesAsync(this).ConfigureAwait(false);
+    }
 }
diff --git a/lib/PuppeteerSharp/Bidi/BidiRealm.cs b/lib/PuppeteerSharp/Bidi/BidiRealm.cs
index e35cc30a7..569638bcb 100644
--- a/lib/PuppeteerSharp/Bidi/BidiRealm.cs
+++ b/lib/PuppeteerSharp/Bidi/BidiRealm.cs
@@ -36,13 +36,6 @@
 
 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 +54,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 +282,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);
         }
@@ -289,16 +335,17 @@ private async Task<LocalValue> FormatArgumentAsync(object arg)
             case float floatValue:
                 return LocalValue.Number(floatValue);
             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..788a602f4 100644
--- a/lib/PuppeteerSharp/Bidi/Core/Realm.cs
+++ b/lib/PuppeteerSharp/Bidi/Core/Realm.cs
@@ -96,6 +96,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 16af9b69e..b9463b420 100644
--- a/lib/PuppeteerSharp/ElementHandle.cs
+++ b/lib/PuppeteerSharp/ElementHandle.cs
@@ -674,6 +674,20 @@ public virtual Task ScrollIntoViewAsync()
                             });
                         }"));
 
+        /// <inheritdoc />
+        public override async ValueTask DisposeAsync()
+        {
+            if (Disposed)
+            {
+                return;
+            }
+
+            Disposed = true;
+
+            await Handle.DisposeAsync().ConfigureAwait(false);
+            GC.SuppressFinalize(this);
+        }
+
         /// <summary>
         /// Checks whether the element is still connected to the browser.
         /// </summary>
diff --git a/lib/PuppeteerSharp/PuppeteerSharp.csproj b/lib/PuppeteerSharp/PuppeteerSharp.csproj
index 7a862e8e0..6969f6f2f 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 657e29af0d609cf2b19a33f0dd2b36d9eb657a58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dar=C3=ADo=20Kondratiuk?= <dariokondratiuk@gmail.com>
Date: Mon, 13 Oct 2025 18:32:37 -0300
Subject: [PATCH 4/6] fixes

---
 lib/PuppeteerSharp/Bidi/BidiFrame.cs          | 258 ++++++++++++++++--
 lib/PuppeteerSharp/Bidi/BidiHttpResponse.cs   |  21 +-
 .../Bidi/Core/BrowsingContext.cs              |  14 +
 lib/PuppeteerSharp/Bidi/Core/Request.cs       |   4 +
 lib/PuppeteerSharp/Bidi/Core/Session.cs       |   5 +
 lib/PuppeteerSharp/NavigationOptions.cs       |   5 +
 6 files changed, 279 insertions(+), 28 deletions(-)

diff --git a/lib/PuppeteerSharp/Bidi/BidiFrame.cs b/lib/PuppeteerSharp/Bidi/BidiFrame.cs
index d3da44273..34de8dd5a 100644
--- a/lib/PuppeteerSharp/Bidi/BidiFrame.cs
+++ b/lib/PuppeteerSharp/Bidi/BidiFrame.cs
@@ -28,6 +28,7 @@
 using PuppeteerSharp.Bidi.Core;
 using PuppeteerSharp.Cdp.Messaging;
 using PuppeteerSharp.Helpers;
+using Request = PuppeteerSharp.Bidi.Core.Request;
 
 namespace PuppeteerSharp.Bidi;
 
@@ -52,7 +53,7 @@ internal BidiFrame(BidiPage parentPage, BidiFrame parentFrame, BrowsingContext b
     }
 
     /// <inheritdoc />
-    public override IReadOnlyCollection<IFrame> ChildFrames { get; }
+    public override IReadOnlyCollection<IFrame> ChildFrames => _frames.Values.Cast<IFrame>().ToList();
 
     /// <inheritdoc/>
     public override string Url => BrowsingContext.Url;
@@ -146,34 +147,137 @@ public override async Task<IResponse> WaitForNavigationAsync(NavigationOptions o
 
         async Task<Navigation> WaitForEventNavigationAsync()
         {
-            // TODO: This logic is missing tons of things.
+            // Wait for navigation or history updated event
             var navigationTcs = new TaskCompletionSource<Navigation>(TaskCreationOptions.RunContinuationsAsynchronously);
+            var historyUpdatedTcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
 
-            // TODO: Async void is not safe. Refactor code.
-            BrowsingContext.Navigation += (sender, args) => navigationTcs.TrySetResult(args.Navigation);
-
-            await navigationTcs.Task.ConfigureAwait(false);
+            void OnNavigation(object sender, BrowserContextNavigationEventArgs args)
+            {
+                navigationTcs.TrySetResult(args.Navigation);
+            }
 
-            var waitForLoadTask = WaitForLoadAsync(options);
+            void OnHistoryUpdated(object sender, EventArgs args)
+            {
+                historyUpdatedTcs.TrySetResult(true);
+            }
 
-            Task<bool> waitForFragmentTask;
+            BrowsingContext.Navigation += OnNavigation;
+            BrowsingContext.HistoryUpdated += OnHistoryUpdated;
 
-            if (navigationTcs.Task.Result.FragmentReceived)
+            try
             {
-                waitForFragmentTask = Task.FromResult(true);
+                // Wait for either event
+                var completedTask = await Task.WhenAny(navigationTcs.Task, historyUpdatedTcs.Task).ConfigureAwait(false);
+
+                if (completedTask == historyUpdatedTcs.Task)
+                {
+                    var delay = Task.Delay(100);
+                    await Task.WhenAny(navigationTcs.Task, delay).ConfigureAwait(false);
+
+                    if (!navigationTcs.Task.IsCompleted)
+                    {
+                        return null;
+                    }
+                }
+
+                var navigation = navigationTcs.Task.Result;
+
+                // Collect child frames for detachment tracking
+                var childFrames = ChildFrames.Cast<BidiFrame>().ToList();
+                var childFrameDetachedTasks = childFrames.Select(frame =>
+                {
+                    var tcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+                    void OnClosed(object sender, ClosedEventArgs args) => tcs.TrySetResult(true);
+                    frame.BrowsingContext.Closed += OnClosed;
+
+                    // Clean up handler when task completes
+                    tcs.Task.ContinueWith(_ => frame.BrowsingContext.Closed -= OnClosed, TaskScheduler.Default);
+                    return tcs.Task;
+                }).ToList();
+
+                // Wait for load events first
+                var waitForLoadTask = WaitForLoadAsync(options);
+
+                // Setup fragment, failed, and aborted event handlers
+                Task<bool> waitForFragmentTask;
+                if (navigation.FragmentReceived)
+                {
+                    waitForFragmentTask = Task.FromResult(true);
+                }
+                else
+                {
+                    var fragmentTcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+                    void OnFragment(object sender, NavigationEventArgs args) => fragmentTcs.TrySetResult(true);
+                    navigation.Fragment += OnFragment;
+                    waitForFragmentTask = fragmentTcs.Task;
+                    _ = waitForFragmentTask.ContinueWith(_ => navigation.Fragment -= OnFragment, TaskScheduler.Default);
+                }
+
+                var failedTcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+                navigation.Failed += OnFailed;
+                var waitForFailedTask = failedTcs.Task;
+                _ = waitForFailedTask.ContinueWith(_ => navigation.Failed -= OnFailed, TaskScheduler.Default);
+
+                var abortedTcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+                navigation.Aborted += OnAborted;
+                var waitForAbortedTask = abortedTcs.Task;
+                _ = waitForAbortedTask.ContinueWith(_ => navigation.Aborted -= OnAborted, TaskScheduler.Default);
+
+                // Setup frame detachment handler
+                var frameDetachedTcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+
+                BrowsingContext.Closed += OnFrameDetached;
+                var frameDetachedTask = frameDetachedTcs.Task;
+                _ = frameDetachedTask.ContinueWith(_ => BrowsingContext.Closed -= OnFrameDetached, TaskScheduler.Default);
+
+                // Create a task that waits for load, then child frames to detach
+                var waitForLoadAndChildFramesTask = Task.Run(async () =>
+                {
+                    await waitForLoadTask.ConfigureAwait(false);
+
+                    if (childFrameDetachedTasks.Count > 0)
+                    {
+                        await Task.WhenAll(childFrameDetachedTasks).ConfigureAwait(false);
+                    }
+                });
+
+                // Race between (load+childFrames) and fragment/failed/aborted/frameDetached
+                // Any of these events can complete the navigation
+                await Task.WhenAny(
+                    waitForLoadAndChildFramesTask,
+                    waitForFragmentTask,
+                    waitForFailedTask,
+                    waitForAbortedTask,
+                    frameDetachedTask).ConfigureAwait(false);
+
+                // If the frame was detached, the exception will be thrown here
+                if (frameDetachedTask.IsCompleted && frameDetachedTask.IsFaulted)
+                {
+                    await frameDetachedTask.ConfigureAwait(false);
+                }
+
+                // Wait for request completion if navigation has a request
+                if (navigation.Request != null)
+                {
+                    await WaitForRequestFinishedAsync(navigation.Request).ConfigureAwait(false);
+                }
+
+                return navigation;
+
+                void OnAborted(object sender, NavigationEventArgs args) => abortedTcs.TrySetResult(true);
+
+                void OnFrameDetached(object sender, ClosedEventArgs args)
+                {
+                    frameDetachedTcs.TrySetException(new TargetClosedException("Frame detached."));
+                }
+
+                void OnFailed(object sender, NavigationEventArgs args) => failedTcs.TrySetResult(true);
             }
-            else
+            finally
             {
-                var waitForFragmentTcs = new TaskCompletionSource<bool>();
-                navigationTcs.Task.Result.Fragment += (sender, args) => waitForFragmentTcs.TrySetResult(true);
-                waitForFragmentTask = waitForFragmentTcs.Task;
+                BrowsingContext.Navigation -= OnNavigation;
+                BrowsingContext.HistoryUpdated -= OnHistoryUpdated;
             }
-
-            // TODO: Add frame detached event.
-            // TODO: Add failed and aborted events.
-            await Task.WhenAny(waitForLoadTask, waitForFragmentTask).WithTimeout(timeout).ConfigureAwait(false);
-
-            return navigationTcs.Task.Result;
         }
 
         var waitForEventNavigationTask = WaitForEventNavigationAsync();
@@ -183,25 +287,72 @@ async Task<Navigation> WaitForEventNavigationAsync()
         {
             await Task.WhenAll(waitForEventNavigationTask, waitForNetworkIdleTask).ConfigureAwait(false);
             var navigation = waitForEventNavigationTask.Result;
-            var request = navigation.Request;
 
-            if (navigation.Request == null)
+            // Navigation might be null
+            if (navigation == null)
             {
                 return null;
             }
 
+            // For cached history navigation (GoBack/GoForward), BiDi doesn't create a request
+            // because the page is loaded from cache. We create a synthetic response.
+            // See: https://github.com/w3c/webdriver-bidi/issues/502
+            var request = navigation.Request;
+
+            if (request == null)
+            {
+                // Create a synthetic cached response with the current URL
+                return BidiHttpResponse.FromCachedNavigation(BrowsingContext.Url);
+            }
+
             var lastRequest = request.LastRedirect ?? request;
-            BidiHttpRequest.Requests.TryGetValue(lastRequest, out var httpRequest);
 
-            return httpRequest.Response;
+            // Try to get the BidiHttpRequest wrapper
+            if (BidiHttpRequest.Requests.TryGetValue(lastRequest, out var httpRequest))
+            {
+                return httpRequest?.Response;
+            }
+
+            // If not found (e.g., history navigation), check if the Core.Request has a response
+            // and create a BidiHttpResponse from it
+            if (lastRequest.Response != null)
+            {
+                // For history navigations, create the BidiHttpRequest wrapper
+                // It might already have a response or the Success event might have already fired
+                var bidiRequest = BidiHttpRequest.From(lastRequest, this, null);
+
+                // If the response isn't set yet (because Success event already fired before handler was attached),
+                // we need to trigger the response creation manually
+                if (bidiRequest.Response == null)
+                {
+                    // Create the response directly since the Success event was missed
+                    var response = BidiHttpResponse.From(lastRequest.Response, bidiRequest, BidiPage.BidiBrowser.CdpSupported);
+                    return response;
+                }
+
+                return bidiRequest.Response;
+            }
+
+            return null;
         });
 
         var waitForResponseTask = waitForResponse();
 
-        // TODO: Listen to frame detached event.
-        await Task.WhenAny(waitForResponseTask).WithTimeout(timeout).ConfigureAwait(false);
+        // Handle cancellation token if provided
+        var tasksToRace = new List<Task> { waitForResponseTask };
+
+        if (options?.CancellationToken.HasValue == true)
+        {
+            var cancellationToken = options.CancellationToken.Value;
+            var cancellationTcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+            cancellationToken.Register(() => cancellationTcs.TrySetCanceled(cancellationToken));
+            tasksToRace.Add(cancellationTcs.Task);
+        }
+
+        await Task.WhenAny(tasksToRace).WithTimeout(timeout).ConfigureAwait(false);
 
-        return waitForResponseTask.Result;
+        var result = waitForResponseTask.Result;
+        return result;
     }
 
     internal static BidiFrame From(BidiPage parentPage, BidiFrame parentFrame, BrowsingContext browsingContext)
@@ -252,6 +403,59 @@ private Task WaitForNetworkIdleAsync(NavigationOptions options)
         return Task.CompletedTask;
     }
 
+    private async Task WaitForRequestFinishedAsync(Request request)
+    {
+        if (request == null)
+        {
+            return;
+        }
+
+        // Reduces flakiness if the response events arrive after the load event.
+        // Usually, the response or error is already there at this point.
+        if (request.Response != null || request.HasError)
+        {
+            return;
+        }
+
+        // If this is a redirect, recursively wait for the redirect to complete
+        if (request.LastRedirect != null)
+        {
+            await WaitForRequestFinishedAsync(request.LastRedirect).ConfigureAwait(false);
+            return;
+        }
+
+        // Wait for success, error, or redirect events
+        var successTcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+        var errorTcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+        var redirectTcs = new TaskCompletionSource<Request>(TaskCreationOptions.RunContinuationsAsynchronously);
+
+        void OnSuccess(object sender, ResponseEventArgs args) => successTcs.TrySetResult(true);
+        void OnError(object sender, Core.ErrorEventArgs args) => errorTcs.TrySetResult(true);
+        void OnRedirect(object sender, Core.RequestEventArgs args) => redirectTcs.TrySetResult(args.Request);
+
+        request.Success += OnSuccess;
+        request.Error += OnError;
+        request.Redirect += OnRedirect;
+
+        try
+        {
+            var completedTask = await Task.WhenAny(successTcs.Task, errorTcs.Task, redirectTcs.Task).ConfigureAwait(false);
+
+            // If we got a redirect, recursively wait for it to finish
+            if (completedTask == redirectTcs.Task)
+            {
+                var redirectRequest = await redirectTcs.Task.ConfigureAwait(false);
+                await WaitForRequestFinishedAsync(redirectRequest).ConfigureAwait(false);
+            }
+        }
+        finally
+        {
+            request.Success -= OnSuccess;
+            request.Error -= OnError;
+            request.Redirect -= OnRedirect;
+        }
+    }
+
     private async Task NavigateAsync(string url)
     {
         // Some implementations currently only report errors when the
diff --git a/lib/PuppeteerSharp/Bidi/BidiHttpResponse.cs b/lib/PuppeteerSharp/Bidi/BidiHttpResponse.cs
index b3335d44b..490c570e1 100644
--- a/lib/PuppeteerSharp/Bidi/BidiHttpResponse.cs
+++ b/lib/PuppeteerSharp/Bidi/BidiHttpResponse.cs
@@ -30,6 +30,7 @@ public class BidiHttpResponse : Response<BidiHttpRequest>
 {
     private readonly WebDriverBiDi.Network.ResponseData _data;
     private readonly BidiHttpRequest _request;
+    private readonly bool _fromCache;
 
     private BidiHttpResponse(WebDriverBiDi.Network.ResponseData data, BidiHttpRequest request, bool cdpSupported)
     {
@@ -37,10 +38,21 @@ private BidiHttpResponse(WebDriverBiDi.Network.ResponseData data, BidiHttpReques
         _request = request;
         Status = (HttpStatusCode)data.Status;
         Url = data.Url;
+        _fromCache = data.FromCache;
+    }
+
+    // Internal constructor for synthetic responses (e.g., cached history navigation)
+    private BidiHttpResponse(string url, HttpStatusCode status, bool fromCache)
+    {
+        _data = null;
+        _request = null;
+        Url = url;
+        Status = status;
+        _fromCache = fromCache;
     }
 
     /// <inheritdoc />
-    public override bool FromCache { get; }
+    public override bool FromCache => _fromCache;
 
     /// <inheritdoc />
     public override ValueTask<byte[]> BufferAsync() => throw new System.NotImplementedException();
@@ -52,6 +64,13 @@ internal static BidiHttpResponse From(WebDriverBiDi.Network.ResponseData data, B
         return response;
     }
 
+    // Creates a synthetic response for cached navigation (e.g., history navigation)
+    // See: https://github.com/w3c/webdriver-bidi/issues/502
+    internal static BidiHttpResponse FromCachedNavigation(string url)
+    {
+        return new BidiHttpResponse(url, HttpStatusCode.OK, fromCache: true);
+    }
+
     private void Initialize()
     {
         if (_data.FromCache)
diff --git a/lib/PuppeteerSharp/Bidi/Core/BrowsingContext.cs b/lib/PuppeteerSharp/Bidi/Core/BrowsingContext.cs
index ad43bb5cb..f2a926245 100644
--- a/lib/PuppeteerSharp/Bidi/Core/BrowsingContext.cs
+++ b/lib/PuppeteerSharp/Bidi/Core/BrowsingContext.cs
@@ -61,6 +61,8 @@ private BrowsingContext(UserContext userContext, BrowsingContext parent, string
 
     public event EventHandler<BrowserContextNavigationEventArgs> Navigation;
 
+    public event EventHandler HistoryUpdated;
+
     public UserContext UserContext { get; }
 
     public string Id { get; }
@@ -264,6 +266,16 @@ private void Initialize()
             OnNavigation(new BrowserContextNavigationEventArgs(_navigation));
         };
 
+        Session.BrowsingContextHistoryUpdated += (sender, args) =>
+        {
+            if (args.BrowsingContextId != Id)
+            {
+                return;
+            }
+
+            OnHistoryUpdated();
+        };
+
         Session.NetworkBeforeRequestSent += (sender, args) =>
         {
             if (args.BrowsingContextId != Id)
@@ -293,6 +305,8 @@ private void UpdateUrlFromEvent(object sender, NavigationEventArgs e)
 
     private void OnDomContentLoaded() => DomContentLoaded?.Invoke(this, EventArgs.Empty);
 
+    private void OnHistoryUpdated() => HistoryUpdated?.Invoke(this, EventArgs.Empty);
+
     private void Dispose(string reason)
     {
         _reason = reason;
diff --git a/lib/PuppeteerSharp/Bidi/Core/Request.cs b/lib/PuppeteerSharp/Bidi/Core/Request.cs
index a12257dd2..9e225f352 100644
--- a/lib/PuppeteerSharp/Bidi/Core/Request.cs
+++ b/lib/PuppeteerSharp/Bidi/Core/Request.cs
@@ -62,6 +62,10 @@ private Request(BrowsingContext browsingContext, BeforeRequestSentEventArgs args
 
     public string Url => _eventArgs.Request.Url;
 
+    public WebDriverBiDi.Network.ResponseData Response => _response;
+
+    public bool HasError => _error != null;
+
     public static Request From(BrowsingContext browsingContext, BeforeRequestSentEventArgs args)
     {
         var request = new Request(browsingContext, args);
diff --git a/lib/PuppeteerSharp/Bidi/Core/Session.cs b/lib/PuppeteerSharp/Bidi/Core/Session.cs
index fe39bc425..180ae3aea 100644
--- a/lib/PuppeteerSharp/Bidi/Core/Session.cs
+++ b/lib/PuppeteerSharp/Bidi/Core/Session.cs
@@ -54,6 +54,8 @@ internal class Session(BiDiDriver driver, NewCommandResult info) : IDisposable
 
     public event EventHandler<WebDriverBiDi.BrowsingContext.NavigationEventArgs> BrowsingContextFragmentNavigated;
 
+    public event EventHandler<WebDriverBiDi.BrowsingContext.HistoryUpdatedEventArgs> BrowsingContextHistoryUpdated;
+
     public event EventHandler<BeforeRequestSentEventArgs> NetworkBeforeRequestSent;
 
     public event EventHandler<AuthRequiredEventArgs> NetworkAuthRequired;
@@ -105,6 +107,7 @@ private async Task InitializeAsync()
         Driver.BrowsingContext.OnFragmentNavigated.AddObserver(OnFragmentNavigated);
         Driver.BrowsingContext.OnNavigationFailed.AddObserver(OnBrowsingContextNavigationFailed);
         Driver.BrowsingContext.OnNavigationAborted.AddObserver(OnBrowsingContextNavigationAborted);
+        Driver.BrowsingContext.OnHistoryUpdated.AddObserver(OnBrowsingContextHistoryUpdated);
         Driver.Network.OnBeforeRequestSent.AddObserver(OnBeforeRequestSent);
         Driver.Network.OnAuthRequired.AddObserver(OnNetworkAuthRequired);
         Driver.Network.OnFetchError.AddObserver(OnNetworkFetchError);
@@ -137,6 +140,8 @@ private void OnFragmentNavigated(WebDriverBiDi.BrowsingContext.NavigationEventAr
 
     private void OnBrowsingContextFragmentNavigated(WebDriverBiDi.BrowsingContext.NavigationEventArgs obj) => BrowsingContextFragmentNavigated?.Invoke(this, obj);
 
+    private void OnBrowsingContextHistoryUpdated(WebDriverBiDi.BrowsingContext.HistoryUpdatedEventArgs obj) => BrowsingContextHistoryUpdated?.Invoke(this, obj);
+
     private void OnBrowsingContextNavigationStarted(WebDriverBiDi.BrowsingContext.NavigationEventArgs obj) => BrowsingContextNavigationStarted?.Invoke(this, obj);
 
     private void OnBrowsingContextLoad(WebDriverBiDi.BrowsingContext.NavigationEventArgs arg) => BrowsingContextLoad?.Invoke(this, arg);
diff --git a/lib/PuppeteerSharp/NavigationOptions.cs b/lib/PuppeteerSharp/NavigationOptions.cs
index d974e607d..3b2873461 100644
--- a/lib/PuppeteerSharp/NavigationOptions.cs
+++ b/lib/PuppeteerSharp/NavigationOptions.cs
@@ -29,6 +29,11 @@ public record NavigationOptions
         /// </summary>
         public string ReferrerPolicy { get; set; }
 
+        /// <summary>
+        /// Optional cancellation token to abort navigation.
+        /// </summary>
+        public System.Threading.CancellationToken? CancellationToken { get; set; }
+
         internal bool IgnoreSameDocumentNavigation { get; set; }
     }
 }

From e0c05a60d7658ada55d0a19d2b804191380bbc10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dar=C3=ADo=20Kondratiuk?= <dariokondratiuk@gmail.com>
Date: Tue, 14 Oct 2025 10:07:56 -0300
Subject: [PATCH 5/6] fixes

---
 .../NavigationTests/PageGoBackTests.cs        |  4 ---
 lib/PuppeteerSharp/Bidi/BidiFrame.cs          | 36 ++++++++++++++++---
 lib/PuppeteerSharp/BrowserData/Firefox.cs     |  2 +-
 lib/PuppeteerSharp/PuppeteerSharp.csproj      |  4 +--
 4 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/lib/PuppeteerSharp.Tests/NavigationTests/PageGoBackTests.cs b/lib/PuppeteerSharp.Tests/NavigationTests/PageGoBackTests.cs
index 84d14fd46..cfd0458e5 100644
--- a/lib/PuppeteerSharp.Tests/NavigationTests/PageGoBackTests.cs
+++ b/lib/PuppeteerSharp.Tests/NavigationTests/PageGoBackTests.cs
@@ -6,10 +6,6 @@ namespace PuppeteerSharp.Tests.NavigationTests
 {
     public class PageGoBackTests : PuppeteerPageBaseTest
     {
-        public PageGoBackTests() : base()
-        {
-        }
-
         //TODO: This is working in puppeteer. I don't know why is hanging here.
         [Test, PuppeteerTest("navigation.spec", "navigation Page.goBack", "should work")]
         public async Task ShouldWork()
diff --git a/lib/PuppeteerSharp/Bidi/BidiFrame.cs b/lib/PuppeteerSharp/Bidi/BidiFrame.cs
index 34de8dd5a..963ce4a9c 100644
--- a/lib/PuppeteerSharp/Bidi/BidiFrame.cs
+++ b/lib/PuppeteerSharp/Bidi/BidiFrame.cs
@@ -256,6 +256,23 @@ await Task.WhenAny(
                     await frameDetachedTask.ConfigureAwait(false);
                 }
 
+                // Wait for request to be created if we don't have one yet
+                if (navigation.Request == null)
+                {
+                    var requestCreatedTcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+                    void OnRequestCreated(object sender, Core.RequestEventArgs args) => requestCreatedTcs.TrySetResult(true);
+
+                    navigation.RequestCreated += OnRequestCreated;
+
+                    // Wait up to 1 second for request to be created
+                    // If it doesn't happen, it means this is a cached/history navigation
+                    var requestCreatedTask = requestCreatedTcs.Task;
+                    var delay = Task.Delay(1000);
+                    await Task.WhenAny(requestCreatedTask, delay).ConfigureAwait(false);
+
+                    navigation.RequestCreated -= OnRequestCreated;
+                }
+
                 // Wait for request completion if navigation has a request
                 if (navigation.Request != null)
                 {
@@ -294,15 +311,26 @@ void OnFrameDetached(object sender, ClosedEventArgs args)
                 return null;
             }
 
-            // For cached history navigation (GoBack/GoForward), BiDi doesn't create a request
-            // because the page is loaded from cache. We create a synthetic response.
+            // If there's no request associated with this navigation after waiting,
+            // it means this is either:
+            // 1. A special URL like about:blank (no network request) - return null
+            // 2. A cached history navigation (GoBack/GoForward) - create synthetic response
             // See: https://github.com/w3c/webdriver-bidi/issues/502
             var request = navigation.Request;
 
             if (request == null)
             {
-                // Create a synthetic cached response with the current URL
-                return BidiHttpResponse.FromCachedNavigation(BrowsingContext.Url);
+                var url = BrowsingContext.Url;
+
+                // Special URLs like about:blank don't have network requests
+                if (url.StartsWith("about:", StringComparison.OrdinalIgnoreCase) ||
+                    url.StartsWith("data:", StringComparison.OrdinalIgnoreCase))
+                {
+                    return null;
+                }
+
+                // For cached history navigations, create a synthetic response
+                return BidiHttpResponse.FromCachedNavigation(url);
             }
 
             var lastRequest = request.LastRedirect ?? request;
diff --git a/lib/PuppeteerSharp/BrowserData/Firefox.cs b/lib/PuppeteerSharp/BrowserData/Firefox.cs
index ef50b0658..f6f006ef1 100644
--- a/lib/PuppeteerSharp/BrowserData/Firefox.cs
+++ b/lib/PuppeteerSharp/BrowserData/Firefox.cs
@@ -18,7 +18,7 @@ public static class Firefox
         /// <summary>
         /// Default firefox build.
         /// </summary>
-        public const string DefaultBuildId = "stable_131.0.3";
+        public const string DefaultBuildId = "stable_143.0.4";
 
         private static readonly Dictionary<string, string> _cachedBuildIds = [];
 
diff --git a/lib/PuppeteerSharp/PuppeteerSharp.csproj b/lib/PuppeteerSharp/PuppeteerSharp.csproj
index 8b54a1ef8..da8df18f7 100644
--- a/lib/PuppeteerSharp/PuppeteerSharp.csproj
+++ b/lib/PuppeteerSharp/PuppeteerSharp.csproj
@@ -43,11 +43,11 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="WebDriverBiDi" Version="0.0.15" />
+    <PackageReference Include="WebDriverBiDi" Version="0.0.30" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
-    <PackageReference Include="System.Text.Json" Version="8.0.5" />
+    <PackageReference Include="System.Text.Json" Version="8.0.6" />
   </ItemGroup>
   <ItemGroup>
     <AdditionalFiles Include="..\stylecop.json" Link="stylecop.json" />

From de8551e4dc5bd448aa4731c1ea242a9a3563afc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dar=C3=ADo=20Kondratiuk?= <dariokondratiuk@gmail.com>
Date: Tue, 14 Oct 2025 10:26:52 -0300
Subject: [PATCH 6/6] fix

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

diff --git a/lib/PuppeteerSharp/BrowserData/Firefox.cs b/lib/PuppeteerSharp/BrowserData/Firefox.cs
index f6f006ef1..a4b30fb98 100644
--- a/lib/PuppeteerSharp/BrowserData/Firefox.cs
+++ b/lib/PuppeteerSharp/BrowserData/Firefox.cs
@@ -199,7 +199,7 @@ private static string GetFormat(string buildId)
         private static string GetArchive(Platform platform, string buildId)
             => platform switch
             {
-                Platform.Linux or Platform.LinuxArm64 => $"firefox-{buildId}.tar.bz2",
+                Platform.Linux or Platform.LinuxArm64 => $"firefox-{buildId}.tar.{GetFormat(buildId)}",
                 Platform.MacOS or Platform.MacOSArm64 => $"Firefox {buildId}.dmg",
                 Platform.Win32 or Platform.Win64 =>
                     $"Firefox Setup {buildId}.exe",