[dotnet] Replace stateful BiDi converters with thread-static BiDi instance

dotnet/src/webdriver/BiDi/BiDi.cs

@@ -103,16 +103,7 @@ private JsonSerializerOptions GetJsonOptions()
             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),
             }
         };
     }

dotnet/src/webdriver/BiDi/Broker.cs

@@ -50,6 +50,12 @@ public sealed class Broker : IAsyncDisposable
     private Task? _eventEmitterTask;
     private CancellationTokenSource? _receiveMessagesCancellationTokenSource;
 
+
+    internal static BiDi? ThreadStaticBiDi => _threadStaticBiDi;
+
+    [ThreadStatic]
+    private static BiDi? _threadStaticBiDi;
+
     internal Broker(BiDi bidi, Uri url)
     {
         _bidi = bidi;
@@ -276,8 +282,10 @@ private void ProcessReceivedMessage(byte[]? data)
                 {
                     try
                     {
+                        _threadStaticBiDi = _bidi;
                         var commandResult = JsonSerializer.Deserialize(ref resultReader, command.JsonResultTypeInfo)
                             ?? throw new JsonException("Remote end returned null command result in the 'result' property.");
+                        _threadStaticBiDi = null;
 
                         command.TaskCompletionSource.SetResult((EmptyResult)commandResult);
                     }

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

@@ -17,11 +17,14 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Json.Converters;
 using System;
+using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
 namespace OpenQA.Selenium.BiDi.Browser;
 
+[JsonConverter(typeof(BrowserUserContextConverter))]
 public sealed class UserContext : IEquatable<UserContext>, IAsyncDisposable
 {
     private readonly BiDi _bidi;

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

@@ -17,13 +17,15 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Json.Converters;
 using System;
 using System.Text.Json.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
 
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
 
+[JsonConverter(typeof(BrowsingContextConverter))]
 public sealed class BrowsingContext
 {
     internal BrowsingContext(BiDi bidi, string id)

dotnet/src/webdriver/BiDi/Json/Converters/BrowserUserContextConverter.cs

@@ -26,18 +26,12 @@ namespace OpenQA.Selenium.BiDi.Json.Converters;
 
 internal class BrowserUserContextConverter : JsonConverter<UserContext>
 {
-    private readonly BiDi _bidi;
-
-    public BrowserUserContextConverter(BiDi bidi)
-    {
-        _bidi = bidi;
-    }
-
     public override UserContext? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
         var id = reader.GetString();
+        var bidi = Broker.ThreadStaticBiDi ?? throw new InvalidOperationException("No BiDi set");
 
-        return new UserContext(_bidi, id!);
+        return new UserContext(bidi, id!);
     }
 
     public override void Write(Utf8JsonWriter writer, UserContext value, JsonSerializerOptions options)

dotnet/src/webdriver/BiDi/Json/Converters/BrowsingContextConverter.cs

@@ -25,18 +25,12 @@ namespace OpenQA.Selenium.BiDi.Json.Converters;
 
 internal class BrowsingContextConverter : JsonConverter<BrowsingContext.BrowsingContext>
 {
-    private readonly BiDi _bidi;
-
-    public BrowsingContextConverter(BiDi bidi)
-    {
-        _bidi = bidi;
-    }
-
     public override BrowsingContext.BrowsingContext? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
         var id = reader.GetString();
+        var bidi = Broker.ThreadStaticBiDi ?? throw new InvalidOperationException("No BiDi set");
 
-        return new BrowsingContext.BrowsingContext(_bidi, id!);
+        return new BrowsingContext.BrowsingContext(bidi, id!);
     }
 
     public override void Write(Utf8JsonWriter writer, BrowsingContext.BrowsingContext value, JsonSerializerOptions options)

dotnet/src/webdriver/BiDi/Json/Converters/CollectorConverter.cs

@@ -26,18 +26,12 @@ namespace OpenQA.Selenium.BiDi.Json.Converters;
 
 internal class CollectorConverter : JsonConverter<Collector>
 {
-    private readonly BiDi _bidi;
-
-    public CollectorConverter(BiDi bidi)
-    {
-        _bidi = bidi;
-    }
-
     public override Collector? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
         var id = reader.GetString();
+        var bidi = Broker.ThreadStaticBiDi ?? throw new InvalidOperationException("No BiDi set");
 
-        return new Collector(_bidi, id!);
+        return new Collector(bidi, id!);
     }
 
     public override void Write(Utf8JsonWriter writer, Collector value, JsonSerializerOptions options)

dotnet/src/webdriver/BiDi/Json/Converters/HandleConverter.cs

@@ -26,18 +26,12 @@ namespace OpenQA.Selenium.BiDi.Json.Converters;
 
 internal class HandleConverter : JsonConverter<Handle>
 {
-    private readonly BiDi _bidi;
-
-    public HandleConverter(BiDi bidi)
-    {
-        _bidi = bidi;
-    }
-
     public override Handle? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
         var id = reader.GetString();
+        var bidi = Broker.ThreadStaticBiDi ?? throw new InvalidOperationException("No BiDi set");
 
-        return new Handle(_bidi, id!);
+        return new Handle(bidi, id!);
     }
 
     public override void Write(Utf8JsonWriter writer, Handle value, JsonSerializerOptions options)

dotnet/src/webdriver/BiDi/Json/Converters/InterceptConverter.cs

@@ -26,18 +26,12 @@ namespace OpenQA.Selenium.BiDi.Json.Converters;
 
 internal class InterceptConverter : JsonConverter<Intercept>
 {
-    private readonly BiDi _bidi;
-
-    public InterceptConverter(BiDi bidi)
-    {
-        _bidi = bidi;
-    }
-
     public override Intercept? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
         var id = reader.GetString();
+        var bidi = Broker.ThreadStaticBiDi ?? throw new InvalidOperationException("No BiDi set");
 
-        return new Intercept(_bidi, id!);
+        return new Intercept(bidi, id!);
     }
 
     public override void Write(Utf8JsonWriter writer, Intercept value, JsonSerializerOptions options)

dotnet/src/webdriver/BiDi/Json/Converters/InternalIdConverter.cs

@@ -26,18 +26,12 @@ namespace OpenQA.Selenium.BiDi.Json.Converters;
 
 internal class InternalIdConverter : JsonConverter<InternalId>
 {
-    private readonly BiDi _bidi;
-
-    public InternalIdConverter(BiDi bidi)
-    {
-        _bidi = bidi;
-    }
-
     public override InternalId? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
         var id = reader.GetString();
+        var bidi = Broker.ThreadStaticBiDi ?? throw new InvalidOperationException("No BiDi set");
 
-        return new InternalId(_bidi, id!);
+        return new InternalId(bidi, id!);
     }
 
     public override void Write(Utf8JsonWriter writer, InternalId value, JsonSerializerOptions options)

dotnet/src/webdriver/BiDi/Json/Converters/PreloadScriptConverter.cs

@@ -26,18 +26,12 @@ namespace OpenQA.Selenium.BiDi.Json.Converters;
 
 internal class PreloadScriptConverter : JsonConverter<PreloadScript>
 {
-    private readonly BiDi _bidi;
-
-    public PreloadScriptConverter(BiDi bidi)
-    {
-        _bidi = bidi;
-    }
-
     public override PreloadScript? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
         var id = reader.GetString();
+        var bidi = Broker.ThreadStaticBiDi ?? throw new InvalidOperationException("No BiDi set");
 
-        return new PreloadScript(_bidi, id!);
+        return new PreloadScript(bidi, id!);
     }
 
     public override void Write(Utf8JsonWriter writer, PreloadScript value, JsonSerializerOptions options)

dotnet/src/webdriver/BiDi/Json/Converters/RealmConverter.cs

@@ -26,18 +26,12 @@ namespace OpenQA.Selenium.BiDi.Json.Converters;
 
 internal class RealmConverter : JsonConverter<Realm>
 {
-    private readonly BiDi _bidi;
-
-    public RealmConverter(BiDi bidi)
-    {
-        _bidi = bidi;
-    }
-
     public override Realm? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
         var id = reader.GetString();
+        var bidi = Broker.ThreadStaticBiDi ?? throw new InvalidOperationException("No BiDi set");
 
-        return new Realm(_bidi, id!);
+        return new Realm(bidi, id!);
     }
 
     public override void Write(Utf8JsonWriter writer, Realm value, JsonSerializerOptions options)

dotnet/src/webdriver/BiDi/Json/Converters/WebExtensionConverter.cs

@@ -26,18 +26,12 @@ namespace OpenQA.Selenium.BiDi.Json.Converters;
 
 internal class WebExtensionConverter : JsonConverter<Extension>
 {
-    private readonly BiDi _bidi;
-
-    public WebExtensionConverter(BiDi bidi)
-    {
-        _bidi = bidi;
-    }
-
     public override Extension? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
         var id = reader.GetString();
+        var bidi = Broker.ThreadStaticBiDi ?? throw new InvalidOperationException("No BiDi set");
 
-        return new Extension(_bidi, id!);
+        return new Extension(bidi, id!);
     }
 
     public override void Write(Utf8JsonWriter writer, Extension value, JsonSerializerOptions options)

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

@@ -17,11 +17,14 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Json.Converters;
 using System;
+using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
 namespace OpenQA.Selenium.BiDi.Network;
 
+[JsonConverter(typeof(CollectorConverter))]
 public sealed class Collector : IAsyncDisposable
 {
     private readonly BiDi _bidi;

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

@@ -17,13 +17,16 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Json.Converters;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
 namespace OpenQA.Selenium.BiDi.Network;
 
+[JsonConverter(typeof(InterceptConverter))]
 public sealed class Intercept : IAsyncDisposable
 {
     private readonly BiDi _bidi;

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

@@ -17,8 +17,12 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Json.Converters;
+using System.Text.Json.Serialization;
+
 namespace OpenQA.Selenium.BiDi.Script;
 
+[JsonConverter(typeof(HandleConverter))]
 public sealed class Handle
 {
     private readonly BiDi _bidi;

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

@@ -17,8 +17,12 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Json.Converters;
+using System.Text.Json.Serialization;
+
 namespace OpenQA.Selenium.BiDi.Script;
 
+[JsonConverter(typeof(InternalIdConverter))]
 public sealed class InternalId
 {
     readonly BiDi _bidi;

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

@@ -17,11 +17,14 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Json.Converters;
 using System;
+using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
 namespace OpenQA.Selenium.BiDi.Script;
 
+[JsonConverter(typeof(PreloadScriptConverter))]
 public sealed class PreloadScript : IAsyncDisposable
 {
     private readonly BiDi _bidi;

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

@@ -17,8 +17,12 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Json.Converters;
+using System.Text.Json.Serialization;
+
 namespace OpenQA.Selenium.BiDi.Script;
 
+[JsonConverter(typeof(RealmConverter))]
 public sealed class Realm
 {
     private readonly BiDi _bidi;

dotnet/src/webdriver/BiDi/WebExtension/Extension.cs

@@ -17,10 +17,13 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Json.Converters;
+using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
 namespace OpenQA.Selenium.BiDi.WebExtension;
 
+[JsonConverter(typeof(WebExtensionConverter))]
 public sealed class Extension
 {
     private readonly BiDi _bidi;