[dotnet] Enable external BiDi modules

Author: RenderMichael

dotnet/src/webdriver/BiDi/BiDi.cs

@@ -30,15 +30,13 @@ namespace OpenQA.Selenium.BiDi;
 
 public sealed class BiDi : IAsyncDisposable
 {
-    private readonly Broker _broker;
-    private readonly JsonSerializerOptions _jsonOptions;
+    internal Broker Broker { get; }
+    internal JsonSerializerOptions JsonOptions { get; }
     private readonly BiDiJsonSerializerContext _jsonContext;
 
-    private BiDi(string url)
+    public JsonSerializerOptions DefaultBiDiOptions()
     {
-        var uri = new Uri(url);
-
-        _jsonOptions = new JsonSerializerOptions
+        return new JsonSerializerOptions
         {
             PropertyNameCaseInsensitive = true,
             PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
@@ -61,20 +59,27 @@ private BiDi(string url)
                 new WebExtensionConverter(this),
             }
         };
+    }
+
+    private BiDi(string url)
+    {
+        var uri = new Uri(url);
 
-        _jsonContext = new BiDiJsonSerializerContext(_jsonOptions);
-
-        _broker = new Broker(this, uri, _jsonOptions);
-        SessionModule = Module.Create<Session.SessionModule>(this, _broker, _jsonOptions, _jsonContext);
-        BrowsingContext = Module.Create<BrowsingContext.BrowsingContextModule>(this, _broker, _jsonOptions, _jsonContext);
-        Browser = Module.Create<Browser.BrowserModule>(this, _broker, _jsonOptions, _jsonContext);
-        Network = Module.Create<Network.NetworkModule>(this, _broker, _jsonOptions, _jsonContext);
-        InputModule = Module.Create<Input.InputModule>(this, _broker, _jsonOptions, _jsonContext);
-        Script = Module.Create<Script.ScriptModule>(this, _broker, _jsonOptions, _jsonContext);
-        Log = Module.Create<Log.LogModule>(this, _broker, _jsonOptions, _jsonContext);
-        Storage = Module.Create<Storage.StorageModule>(this, _broker, _jsonOptions, _jsonContext);
-        WebExtension = Module.Create<WebExtension.WebExtensionModule>(this, _broker, _jsonOptions, _jsonContext);
-        Emulation = Module.Create<Emulation.EmulationModule>(this, _broker, _jsonOptions, _jsonContext);
+        JsonOptions = DefaultBiDiOptions();
+
+        _jsonContext = new BiDiJsonSerializerContext(JsonOptions);
+
+        Broker = new Broker(this, uri, JsonOptions);
+        SessionModule = Module.Create<Session.SessionModule>(this, JsonOptions, _jsonContext);
+        BrowsingContext = Module.Create<BrowsingContext.BrowsingContextModule>(this, JsonOptions, _jsonContext);
+        Browser = Module.Create<Browser.BrowserModule>(this, JsonOptions, _jsonContext);
+        Network = Module.Create<Network.NetworkModule>(this, JsonOptions, _jsonContext);
+        InputModule = Module.Create<Input.InputModule>(this, JsonOptions, _jsonContext);
+        Script = Module.Create<Script.ScriptModule>(this, JsonOptions, _jsonContext);
+        Log = Module.Create<Log.LogModule>(this, JsonOptions, _jsonContext);
+        Storage = Module.Create<Storage.StorageModule>(this, JsonOptions, _jsonContext);
+        WebExtension = Module.Create<WebExtension.WebExtensionModule>(this, JsonOptions, _jsonContext);
+        Emulation = Module.Create<Emulation.EmulationModule>(this, JsonOptions, _jsonContext);
     }
 
     internal Session.SessionModule SessionModule { get; }
@@ -106,7 +111,7 @@ public static async Task<BiDi> ConnectAsync(string url, BiDiOptions? options = n
     {
         var bidi = new BiDi(url);
 
-        await bidi._broker.ConnectAsync(CancellationToken.None).ConfigureAwait(false);
+        await bidi.Broker.ConnectAsync(CancellationToken.None).ConfigureAwait(false);
 
         return bidi;
     }
@@ -118,7 +123,7 @@ public Task EndAsync(Session.EndOptions? options = null)
 
     public async ValueTask DisposeAsync()
     {
-        await _broker.DisposeAsync().ConfigureAwait(false);
+        await Broker.DisposeAsync().ConfigureAwait(false);
         GC.SuppressFinalize(this);
     }
 }

dotnet/src/webdriver/BiDi/Browser/BrowserModule.cs

@@ -22,7 +22,7 @@
 
 namespace OpenQA.Selenium.BiDi.Browser;
 
-public sealed class BrowserModule : Module
+public sealed class BrowserModule : InternalModule
 {
     public async Task<CloseResult> CloseAsync(CloseOptions? options = null)
     {

dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextModule.cs

@@ -23,7 +23,7 @@
 
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
 
-public sealed class BrowsingContextModule : Module
+public sealed class BrowsingContextModule : InternalModule
 {
     public async Task<CreateResult> CreateAsync(ContextType type, CreateOptions? options = null)
     {

dotnet/src/webdriver/BiDi/Emulation/EmulationModule.cs

@@ -22,7 +22,7 @@
 
 namespace OpenQA.Selenium.BiDi.Emulation;
 
-public sealed class EmulationModule : Module
+public sealed class EmulationModule : InternalModule
 {
     public async Task<SetTimezoneOverrideResult> SetTimezoneOverrideAsync(string? timezone, SetTimezoneOverrideOptions? options = null)
     {

dotnet/src/webdriver/BiDi/Input/InputModule.cs

@@ -23,7 +23,7 @@
 
 namespace OpenQA.Selenium.BiDi.Input;
 
-public sealed class InputModule : Module
+public sealed class InputModule : InternalModule
 {
     public async Task<PerformActionsResult> PerformActionsAsync(BrowsingContext.BrowsingContext context, IEnumerable<SourceActions> actions, PerformActionsOptions? options = null)
     {

dotnet/src/webdriver/BiDi/Log/LogModule.cs

@@ -23,7 +23,7 @@
 
 namespace OpenQA.Selenium.BiDi.Log;
 
-public sealed class LogModule : Module
+public sealed class LogModule : InternalModule
 {
     public async Task<Subscription> OnEntryAddedAsync(Func<LogEntry, Task> handler, SubscriptionOptions? options = null)
     {

dotnet/src/webdriver/BiDi/Module.cs

@@ -18,29 +18,28 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
-using OpenQA.Selenium.BiDi.Communication.Json;
 using System.Text.Json;
+using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi;
 
 public abstract class Module
 {
     protected Broker Broker { get; private set; }
 
-    internal BiDiJsonSerializerContext JsonContext { get; private set; }
+    internal JsonSerializerContext JsonContext { get; private set; }
 
-    protected virtual void Initialize(JsonSerializerOptions options) { }
+    protected abstract JsonSerializerContext Initialize(JsonSerializerOptions options);
 
-    internal static TModule Create<TModule>(BiDi bidi, Broker broker, JsonSerializerOptions jsonOptions, BiDiJsonSerializerContext context)
+    public static TModule Create<TModule>(BiDi bidi, JsonSerializerOptions jsonOptions, JsonSerializerContext? cachedContext = null)
         where TModule : Module, new()
     {
         TModule module = new()
         {
-            Broker = broker,
-            JsonContext = context
+            Broker = bidi.Broker,
         };
 
-        module.Initialize(jsonOptions);
+        module.JsonContext = cachedContext ?? module.Initialize(jsonOptions);
 
         return module;
     }

dotnet/src/webdriver/BiDi/Network/NetworkModule.cs

@@ -24,7 +24,7 @@
 
 namespace OpenQA.Selenium.BiDi.Network;
 
-public sealed partial class NetworkModule : Module
+public sealed partial class NetworkModule : InternalModule
 {
     public async Task<Collector> AddDataCollectorAsync(IEnumerable<DataType> DataTypes, int MaxEncodedDataSize, AddDataCollectorOptions? options = null)
     {

dotnet/src/webdriver/BiDi/Script/ScriptModule.cs

@@ -24,7 +24,7 @@
 
 namespace OpenQA.Selenium.BiDi.Script;
 
-public sealed class ScriptModule : Module
+public sealed class ScriptModule : InternalModule
 {
     public async Task<EvaluateResult> EvaluateAsync(string expression, bool awaitPromise, Target target, EvaluateOptions? options = null)
     {

dotnet/src/webdriver/BiDi/Session/SessionModule.cs

@@ -23,7 +23,7 @@
 
 namespace OpenQA.Selenium.BiDi.Session;
 
-internal sealed class SessionModule : Module
+internal sealed class SessionModule : InternalModule
 {
     public async Task<StatusResult> StatusAsync(StatusOptions? options = null)
     {