some progress

Author: kblok

lib/PuppeteerSharp/Bidi/BidiBrowser.cs

@@ -21,11 +21,10 @@
 //  * SOFTWARE.
 
 using System;
-using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using PuppeteerSharp.Bidi.Core;
-using PuppeteerSharp.Transport;
 using WebDriverBiDi;
 using WebDriverBiDi.Session;
 
@@ -36,9 +35,37 @@ namespace PuppeteerSharp.Bidi;
 /// </summary>
 public class BidiBrowser : Browser
 {
+    private readonly LaunchOptions _options;
+
+    private BidiBrowser(Core.Browser browserCore, LaunchOptions options)
+    {
+        _options = options;
+        BrowserCore = browserCore;
+    }
+
     /// <inheritdoc />
     public override bool IsClosed { get; }
 
+    internal Core.Browser BrowserCore { get; }
+
+    internal static string[] SubscribeModules { get; } = [
+        "browsingContext",
+        "network",
+        "log",
+        "script",
+    ];
+
+    internal static string[] SubscribeCdpEvents { get; } =
+    [
+        "cdp.Debugger.scriptParsed",
+        "cdp.CSS.styleSheetAdded",
+        "cdp.Runtime.executionContextsCleared",
+        "cdp.Tracing.tracingComplete",
+        "cdp.Network.requestWillBeSent",
+        "cdp.Debugger.scriptParsed",
+        "cdp.Page.screencastFrame",
+    ];
+
     internal override ProtocolType Protocol => ProtocolType.WebdriverBiDi;
 
     /// <inheritdoc />
@@ -47,32 +74,89 @@ public class BidiBrowser : Browser
     /// <inheritdoc />
     public override Task<string> GetUserAgentAsync() => throw new NotImplementedException();
 
+    [SuppressMessage("Reliability", "CA2000:Dispose objects before losing scope", Justification = "We return the session, the browser needs to dispose the session")]
     internal static async Task<BidiBrowser> CreateAsync(
         BiDiDriver driver,
         LaunchOptions options,
         ILoggerFactory loggerFactory)
     {
-        var session = await Session.FromAsync(driver,
+        var session = await Session.FromAsync(
+            driver,
             new NewCommandParameters
             {
                 AlwaysMatch = new CapabilitiesRequest()
                 {
-                    AcceptInsecureCertificates = options.IgnoreHTTPSErrors, WebSocketUrl = true,
-                }
+                    AcceptInsecureCertificates = options.IgnoreHTTPSErrors,
+                    AdditionalCapabilities =
+                    {
+                        ["webSocketUrl"] = true,
+                    },
+                },
             },
             loggerFactory).ConfigureAwait(false);
 
         await session.SubscribeAsync(
-            session.capabilities.browserName.toLocaleLowerCase().includes('firefox')
-                ? BidiBrowser.subscribeModules
-                : [...BidiBrowser.subscribeModules, ...BidiBrowser.subscribeCdpEvents]
-        );
+            session.Info.Capabilities.BrowserName.ToLowerInvariant().Contains("firefox")
+                ? SubscribeModules
+                : [.. SubscribeModules, .. SubscribeCdpEvents]).ConfigureAwait(false);
 
-        const browser = new BidiBrowser(session.browser, opts);
-        browser.#initialize();
+        var browser = new BidiBrowser(session.Browser, options);
+        browser.InitializeAsync();
         return browser;
     }
 
+    private void InitializeAsync()
+    {
+        // Initializing existing contexts.
+        foreach (var userContext in BrowserCore.UserContexts)
+        {
+            CreateBrowserContext(userContext);
+        }
+
+        this.#browserCore.once('disconnected', () => {
+            this.#trustedEmitter.emit(BrowserEvent.Disconnected, undefined);
+            this.#trustedEmitter.removeAllListeners();
+        });
+        this.#process?.once('close', () => {
+            this.#browserCore.dispose('Browser process exited.', true);
+            this.connection.dispose();
+        });
+    }
+
+    private BidiBrowserContext CreateBrowserContext(UserContext userContext)
+    {
+        const browserContext = BidiBrowserContext.From(
+            this,
+            userContext,
+            new LaunchOptions()
+            {
+                DefaultViewport: _options.DefaultViewport,
+            });
+
+        this.#browserContexts.set(userContext, browserContext);
+
+        browserContext.trustedEmitter.on(
+            BrowserContextEvent.TargetCreated,
+            target => {
+                this.#trustedEmitter.emit(BrowserEvent.TargetCreated, target);
+            }
+        );
+        browserContext.trustedEmitter.on(
+            BrowserContextEvent.TargetChanged,
+            target => {
+                this.#trustedEmitter.emit(BrowserEvent.TargetChanged, target);
+            }
+        );
+        browserContext.trustedEmitter.on(
+            BrowserContextEvent.TargetDestroyed,
+            target => {
+                this.#trustedEmitter.emit(BrowserEvent.TargetDestroyed, target);
+            }
+        );
+
+        return browserContext;
+    }
+
     /// <inheritdoc />
     public override void Disconnect() => throw new NotImplementedException();
 

lib/PuppeteerSharp/Bidi/Core/Browser.cs

@@ -22,9 +22,9 @@
 
 using System;
 using System.Collections.Concurrent;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using PuppeteerSharp.Cdp;
-using PuppeteerSharp.States;
 using WebDriverBiDi.Protocol;
 using WebDriverBiDi.Script;
 
@@ -33,7 +33,7 @@ namespace PuppeteerSharp.Bidi.Core;
 internal class Browser(Session session) : IDisposable
 {
     private bool _disposed;
-
+    private readonly ConcurrentDictionary<string, UserContext> _userContexts = new();
     private readonly ConcurrentDictionary<string, CdpWebWorker> _workers = new();
 
     public Session Session { get; } = session;
@@ -42,6 +42,8 @@ internal class Browser(Session session) : IDisposable
 
     public string Reason { get; set; }
 
+    internal ICollection<UserContext> UserContexts => _userContexts.Values;
+
     public async Task<Browser> From(Session session)
     {
         var browser = new Browser(session);
@@ -94,7 +96,7 @@ private void OnEventReceived(object sender, EventReceivedEventArgs e)
         }
     }
 
-    private void OnSessionEnded(object sender, SessionEndedArgs e)
+    private void OnSessionEnded(object sender, SessionEndArgs e)
     {
         Dispose(e.Reason);
     }

lib/PuppeteerSharp/Bidi/Core/Session.cs

@@ -21,41 +21,45 @@
 //  * SOFTWARE.
 
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using WebDriverBiDi;
 using WebDriverBiDi.Session;
 
 namespace PuppeteerSharp.Bidi.Core;
 
-internal class Session(BiDiDriver driver, NewCommandResult newCommandResult) : IDisposable
+internal class Session(BiDiDriver driver, NewCommandResult info) : IDisposable
 {
-    public event EventHandler<SessionEndedArgs> Ended;
+    public event EventHandler<SessionEndArgs> Ended;
 
     public BiDiDriver Driver { get; } = driver;
 
-    public NewCommandResult NewCommandResult { get; } = newCommandResult;
+    public NewCommandResult Info { get; } = info;
 
     public Browser Browser { get; private set; }
 
-    public void Dispose()
-    {
-    }
-
-    internal static async Task<Session> FromAsync(BiDiDriver driver, NewCommandParameters capabilities, ILoggerFactory loggerFactory)
+    public static async Task<Session> FromAsync(BiDiDriver driver, NewCommandParameters capabilities, ILoggerFactory loggerFactory)
     {
         var result = await driver.Session.NewSessionAsync(capabilities).ConfigureAwait(false);
         var session = new Session(driver, result);
         await session.InitializeAsync().ConfigureAwait(false);
         return session;
     }
 
+    public void Dispose()
+    {
+    }
+
+    public Task SubscribeAsync(string[] events, string[] contexts = null)
+        => Driver.Session.SubscribeAsync(new SubscribeCommandParameters(events, contexts ?? []);
+
     private async Task InitializeAsync()
     {
         Browser = await Browser.From(this).ConfigureAwait(false);
 
-        const browserEmitter = this.#disposables.use(this.browser);
-        browserEmitter.once('closed', ({reason}) => {
+        Browser.Closed += () => Dispose()
+        Browser.once('closed', ({reason}) => {
             this.dispose(reason);
         });
 

…eteerSharp/Bidi/Core/SessionEndedArgs.cs …ppeteerSharp/Bidi/Core/SessionEndArgs.cslib/PuppeteerSharp/Bidi/Core/SessionEndedArgs.cs renamed to lib/PuppeteerSharp/Bidi/Core/SessionEndArgs.cs lib/PuppeteerSharp/Bidi/Core/SessionEndedArgs.cs renamed to lib/PuppeteerSharp/Bidi/Core/SessionEndArgs.cs

@@ -22,7 +22,7 @@
 
 namespace PuppeteerSharp.Bidi.Core;
 
-internal record SessionEndedArgs
+internal record SessionEndArgs
 {
     public string Reason { get; set; }
 }

lib/PuppeteerSharp/Browser.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Net.Sockets;
 using System.Threading.Tasks;
 using PuppeteerSharp.Cdp;
 using PuppeteerSharp.Helpers;

lib/PuppeteerSharp/Launcher.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.IO;
 using System.Net.Http;
@@ -43,6 +44,7 @@ public class Launcher
         /// for a description of the differences between Chromium and Chrome.
         /// <a href="https://chromium.googlesource.com/chromium/src/+/lkcr/docs/chromium_browser_vs_google_chrome.md">This article</a> describes some differences for Linux users.
         /// </remarks>
+        [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Justification = "The caller is responsible for disposing the returned object.")]
         public async Task<IBrowser> LaunchAsync(LaunchOptions options)
         {
             if (options == null)

lib/PuppeteerSharp/Page.cs

@@ -780,6 +780,12 @@ internal void OnDialog(PageJavascriptDialogOpeningResponse message)
             Dialog?.Invoke(this, new DialogEventArgs(dialog));
         }
 
+        /// <summary>
+        /// Raises the <see cref="FrameAttached"/> event.
+        /// </summary>
+        /// <param name="e">Event arguments.</param>
+        internal void OnFrameAttached(FrameEventArgs e) => FrameAttached?.Invoke(this, e);
+
         /// <summary>
         /// Dispose resources.
         /// </summary>
@@ -790,12 +796,6 @@ protected virtual void Dispose(bool disposing)
             _ = DisposeAsync();
         }
 
-        /// <summary>
-        /// Raises the <see cref="FrameAttached"/> event.
-        /// </summary>
-        /// <param name="e">Event arguments.</param>
-        protected void OnFrameAttached(FrameEventArgs e) => FrameAttached?.Invoke(this, e);
-
         /// <summary>
         /// Raises the <see cref="FrameNavigated"/> event.
         /// </summary>