cherry-pick(release-1.41): fix: rewrite json channel converters

PR: #2831

Author: mxschmitt

src/Playwright/Transport/Connection.cs

@@ -58,10 +58,9 @@ public Connection(LocalUtils localUtils = null)
         JsonSerializerOptions NewJsonSerializerOptions(bool keepNulls)
         {
             var options = JsonExtensions.GetNewDefaultSerializerOptions(keepNulls);
-            options.Converters.Add(new ChannelToGuidConverter(this));
-            options.Converters.Add(new ChannelOwnerToGuidConverter<JSHandle>(this));
-            options.Converters.Add(new ChannelOwnerToGuidConverter<ElementHandle>(this));
 
+            // Workaround for https://github.com/dotnet/runtime/issues/46522
+            options.Converters.Add(new ChannelOwnerConverterFactory(this));
             // Workaround for https://github.com/dotnet/runtime/issues/46522
             options.Converters.Add(new ChannelOwnerListToGuidListConverter<WritableStream>(this));
             return options;

src/Playwright/Transport/Converters/ChannelOwnerToGuidConverter.cs src/Playwright/Transport/Converters/ChannelOwnerConverterFactory.cs

@@ -23,13 +23,32 @@
  */
 
 using System;
+using System.Runtime.InteropServices.ComTypes;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Microsoft.Playwright.Transport.Converters;
 
-internal class ChannelOwnerToGuidConverter<T>
-    : JsonConverter<T>
+internal class ChannelOwnerConverterFactory : JsonConverterFactory
+{
+    private readonly Connection _connection;
+
+    public ChannelOwnerConverterFactory(Connection connection)
+    {
+        _connection = connection;
+    }
+
+    public override bool CanConvert(Type typeToConvert) => typeof(ChannelOwner).IsAssignableFrom(typeToConvert);
+
+    public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options)
+    {
+        return (JsonConverter)Activator.CreateInstance(
+            typeof(ChannelOwnerToGuidConverter<>).MakeGenericType(new Type[] { typeToConvert }),
+            new object[] { _connection });
+    }
+}
+
+internal class ChannelOwnerToGuidConverter<T> : JsonConverter<T>
     where T : ChannelOwner
 {
     private readonly Connection _connection;
@@ -39,9 +58,6 @@ public ChannelOwnerToGuidConverter(Connection connection)
         _connection = connection;
     }
 
-    public override bool CanConvert(Type type)
-        => (typeof(T) == typeof(ChannelOwner) && typeof(T).IsAssignableFrom(type)) || type == typeof(T);
-
     public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
         using JsonDocument document = JsonDocument.ParseValue(ref reader);