Move ownership of json options to bidi

Author: nvborisenko

dotnet/src/webdriver/BiDi/BiDi.cs

@@ -19,23 +19,51 @@
 
 using System;
 using System.Collections.Concurrent;
+using System.Text.Json;
+using System.Text.Json.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
 using OpenQA.Selenium.BiDi.Communication;
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 
 namespace OpenQA.Selenium.BiDi;
 
 public sealed class BiDi : IAsyncDisposable
 {
     private readonly Broker _broker;
+    private readonly JsonSerializerOptions _jsonOptions;
 
     private readonly ConcurrentDictionary<Type, Module> _modules = [];
 
     private BiDi(string url)
     {
         var uri = new Uri(url);
 
-        _broker = new Broker(this, uri);
+        _jsonOptions = new JsonSerializerOptions
+        {
+            PropertyNameCaseInsensitive = true,
+            PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
+
+            // BiDi returns special numbers such as "NaN" as strings
+            // Additionally, -0 is returned as a string "-0"
+            NumberHandling = JsonNumberHandling.AllowNamedFloatingPointLiterals | JsonNumberHandling.AllowReadingFromString,
+            Converters =
+            {
+                new BrowsingContextConverter(this),
+                new BrowserUserContextConverter(this),
+                new CollectorConverter(this),
+                new InterceptConverter(this),
+                new HandleConverter(this),
+                new InternalIdConverter(this),
+                new PreloadScriptConverter(this),
+                new RealmConverter(this),
+                new DateTimeOffsetConverter(),
+                new WebExtensionConverter(this),
+            }
+        };
+
+        _broker = new Broker(this, uri, _jsonOptions);
     }
 
     internal Session.SessionModule SessionModule => AsModule<Session.SessionModule>();
@@ -60,7 +88,7 @@ private BiDi(string url)
 
     public TModule AsModule<TModule>() where TModule : Module, new()
     {
-        return (TModule)_modules.GetOrAdd(typeof(TModule), _ => Module.Create<TModule>(_broker));
+        return (TModule)_modules.GetOrAdd(typeof(TModule), _ => Module.Create<TModule>(this, _broker, _jsonOptions));
     }
 
     public Task<Session.StatusResult> StatusAsync()

dotnet/src/webdriver/BiDi/Communication/Broker.cs

@@ -17,8 +17,6 @@
 // under the License.
 // </copyright>
 
-using OpenQA.Selenium.BiDi.Communication.Json;
-using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using OpenQA.Selenium.BiDi.Communication.Transport;
 using OpenQA.Selenium.Internal.Logging;
 using System;
@@ -53,39 +51,12 @@ public sealed class Broker : IAsyncDisposable
     private Task? _eventEmitterTask;
     private CancellationTokenSource? _receiveMessagesCancellationTokenSource;
 
-    internal Broker(BiDi bidi, Uri url)
+    internal Broker(BiDi bidi, Uri url, JsonSerializerOptions jsonOptions)
     {
         _bidi = bidi;
         _transport = new WebSocketTransport(url);
     }
 
-    public JsonSerializerOptions CreateOptions()
-    {
-        return new JsonSerializerOptions
-        {
-            PropertyNameCaseInsensitive = true,
-            PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
-
-            // BiDi returns special numbers such as "NaN" as strings
-            // Additionally, -0 is returned as a string "-0"
-            NumberHandling = JsonNumberHandling.AllowNamedFloatingPointLiterals | JsonNumberHandling.AllowReadingFromString,
-            Converters =
-            {
-                new BrowsingContextConverter(_bidi),
-                new BrowserUserContextConverter(_bidi),
-                new CollectorConverter(_bidi),
-                new InterceptConverter(_bidi),
-                new HandleConverter(_bidi),
-                new InternalIdConverter(_bidi),
-                new PreloadScriptConverter(_bidi),
-                new RealmConverter(_bidi),
-                new DateTimeOffsetConverter(),
-                new WebExtensionConverter(_bidi),
-            }
-        };
-    }
-
     public async Task ConnectAsync(CancellationToken cancellationToken)
     {
         await _transport.ConnectAsync(cancellationToken).ConfigureAwait(false);

dotnet/src/webdriver/BiDi/Module.cs

@@ -31,11 +31,13 @@ public abstract class Module
 
     protected internal abstract JsonSerializerContext ConfigureJson(JsonSerializerOptions options);
 
-    public static TModule Create<TModule>(Broker broker) where TModule : Module, new()
+    public static TModule Create<TModule>(BiDi bidi, Broker broker, JsonSerializerOptions jsonOptions) where TModule : Module, new()
     {
-        TModule module = new();
-        module.Broker = broker;
-        module.JsonContext = module.ConfigureJson(broker.CreateOptions());
+        TModule module = new()
+        {
+            Broker = broker
+        };
+        module.JsonContext = module.ConfigureJson(jsonOptions);
         return module;
     }
 }