[dotnet] [bidi] Implement Permissions extension

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

@@ -71,38 +71,16 @@ internal Broker(BiDi bidi, Uri url)
             Converters =
             {
                 new BrowsingContextConverter(_bidi),
-                new BrowserUserContextConverter(bidi),
-                new BrowserClientWindowConverter(),
-                new NavigationConverter(),
+                new BrowserUserContextConverter(_bidi),
                 new InterceptConverter(_bidi),
                 new RequestConverter(_bidi),
-                new ChannelConverter(),
                 new HandleConverter(_bidi),
                 new InternalIdConverter(_bidi),
                 new PreloadScriptConverter(_bidi),
                 new RealmConverter(_bidi),
-                new RealmTypeConverter(),
-                new DateTimeOffsetConverter(),
-                new PrintPageRangeConverter(),
-                new InputOriginConverter(),
-                new SubscriptionConverter(),
-                new JsonStringEnumConverter(JsonNamingPolicy.CamelCase),
 
-                // https://github.com/dotnet/runtime/issues/72604
-                new Json.Converters.Polymorphic.MessageConverter(),
-                new Json.Converters.Polymorphic.EvaluateResultConverter(),
-                new Json.Converters.Polymorphic.RemoteValueConverter(),
-                new Json.Converters.Polymorphic.RealmInfoConverter(),
-                new Json.Converters.Polymorphic.LogEntryConverter(),
-                //
-
-                // Enumerable
-                new Json.Converters.Enumerable.GetCookiesResultConverter(),
-                new Json.Converters.Enumerable.LocateNodesResultConverter(),
-                new Json.Converters.Enumerable.InputSourceActionsConverter(),
-                new Json.Converters.Enumerable.GetUserContextsResultConverter(),
-                new Json.Converters.Enumerable.GetClientWindowsResultConverter(),
-                new Json.Converters.Enumerable.GetRealmsResultConverter(),
+                new BiDiDateTimeOffsetConverter(),
+                new JsonStringEnumConverter(JsonNamingPolicy.CamelCase),
             }
         };
 

dotnet/src/webdriver/BiDi/Communication/Json/Converters/DateTimeOffsetConverter.cs → dotnet/src/webdriver/BiDi/Communication/Json/Converters/BiDiDateTimeOffsetConverter.cs

@@ -1,4 +1,4 @@
-// <copyright file="DateTimeOffsetConverter.cs" company="Selenium Committers">
+// <copyright file="BiDiDateTimeOffsetConverter.cs" company="Selenium Committers">
 // Licensed to the Software Freedom Conservancy (SFC) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
@@ -23,7 +23,7 @@
 
 namespace OpenQA.Selenium.BiDi.Communication.Json.Converters;
 
-internal class DateTimeOffsetConverter : JsonConverter<DateTimeOffset>
+internal class BiDiDateTimeOffsetConverter : JsonConverter<DateTimeOffset>
 {
     public override DateTimeOffset Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {

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

@@ -17,11 +17,15 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters.Polymorphic;
 using System.Text.Json;
+using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Communication;
 
 // https://github.com/dotnet/runtime/issues/72604
+[JsonConverter(typeof(MessageConverter))]
+
 //[JsonPolymorphic(TypeDiscriminatorPropertyName = "type")]
 //[JsonDerivedType(typeof(MessageSuccess), "success")]
 //[JsonDerivedType(typeof(MessageError), "error")]

dotnet/src/webdriver/BiDi/Modules/Browser/ClientWindow.cs

@@ -17,8 +17,12 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
+using System.Text.Json.Serialization;
+
 namespace OpenQA.Selenium.BiDi.Modules.Browser;
 
+[JsonConverter(typeof(BrowserClientWindowConverter))]
 public record ClientWindow
 {
     internal ClientWindow(string id)

dotnet/src/webdriver/BiDi/Modules/Browser/GetClientWindowsCommand.cs

@@ -18,8 +18,10 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
+using OpenQA.Selenium.BiDi.Communication.Json.Converters.Enumerable;
 using System.Collections;
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Modules.Browser;
 
@@ -28,6 +30,7 @@ internal class GetClientWindowsCommand()
 
 public record GetClientWindowsOptions : CommandOptions;
 
+[JsonConverter(typeof(GetClientWindowsResultConverter))]
 public record GetClientWindowsResult : IReadOnlyList<ClientWindowInfo>
 {
     private readonly IReadOnlyList<ClientWindowInfo> _clientWindows;

dotnet/src/webdriver/BiDi/Modules/Browser/GetUserContextsCommand.cs

@@ -18,8 +18,10 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
+using OpenQA.Selenium.BiDi.Communication.Json.Converters.Enumerable;
 using System.Collections;
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Modules.Browser;
 
@@ -28,6 +30,7 @@ internal class GetUserContextsCommand()
 
 public record GetUserContextsOptions : CommandOptions;
 
+[JsonConverter(typeof(GetUserContextsResultConverter))]
 public record GetUserContextsResult : IReadOnlyList<UserContextInfo>
 {
     private readonly IReadOnlyList<UserContextInfo> _userContexts;

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

@@ -18,8 +18,10 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
+using OpenQA.Selenium.BiDi.Communication.Json.Converters.Enumerable;
 using System.Collections;
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;
 
@@ -37,6 +39,7 @@ public record LocateNodesOptions : CommandOptions
     public IEnumerable<Script.ISharedReference>? StartNodes { get; set; }
 }
 
+[JsonConverter(typeof(LocateNodesResultConverter))]
 public record LocateNodesResult : IReadOnlyList<Script.NodeRemoteValue>
 {
     private readonly IReadOnlyList<Script.NodeRemoteValue> _nodes;

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

@@ -17,6 +17,10 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
+using System.Text.Json.Serialization;
+
 namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;
 
+[JsonConverter(typeof(NavigationConverter))]
 public record Navigation(string Id);

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

@@ -18,8 +18,10 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System;
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;
 
@@ -69,6 +71,7 @@ public struct PrintPage
     public double? Width { get; set; }
 }
 
+[JsonConverter(typeof(PrintPageRangeConverter))]
 public readonly record struct PrintPageRange(int? Start, int? End)
 {
     public static implicit operator PrintPageRange(int index) { return new PrintPageRange(index, index); }

dotnet/src/webdriver/BiDi/Modules/Input/Origin.cs

@@ -17,8 +17,12 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
+using System.Text.Json.Serialization;
+
 namespace OpenQA.Selenium.BiDi.Modules.Input;
 
+[JsonConverter(typeof(InputOriginConverter))]
 public abstract record Origin;
 
 public record ViewportOrigin() : Origin;

dotnet/src/webdriver/BiDi/Modules/Input/SourceActions.cs

@@ -17,13 +17,15 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters.Enumerable;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Modules.Input;
 
+[JsonConverter(typeof(InputSourceActionsConverter))]
 public abstract record SourceActions
 {
     public string Id { get; } = Guid.NewGuid().ToString();

dotnet/src/webdriver/BiDi/Modules/Log/LogEntry.cs

@@ -17,12 +17,16 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters.Polymorphic;
 using System;
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Modules.Log;
 
 // https://github.com/dotnet/runtime/issues/72604
+[JsonConverter(typeof(LogEntryConverter))]
+
 //[JsonPolymorphic(TypeDiscriminatorPropertyName = "type")]
 //[JsonDerivedType(typeof(ConsoleLogEntry), "console")]
 //[JsonDerivedType(typeof(JavascriptLogEntry), "javascript")]

dotnet/src/webdriver/BiDi/Modules/Script/Channel.cs

@@ -17,6 +17,10 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
+using System.Text.Json.Serialization;
+
 namespace OpenQA.Selenium.BiDi.Modules.Script;
 
+[JsonConverter(typeof(ChannelConverter))]
 public record Channel(string Id);

dotnet/src/webdriver/BiDi/Modules/Script/EvaluateCommand.cs

@@ -18,6 +18,8 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
+using OpenQA.Selenium.BiDi.Communication.Json.Converters.Polymorphic;
+using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Modules.Script;
 
@@ -36,6 +38,8 @@ public record EvaluateOptions : CommandOptions
 }
 
 // https://github.com/dotnet/runtime/issues/72604
+[JsonConverter(typeof(EvaluateResultConverter))]
+
 //[JsonPolymorphic(TypeDiscriminatorPropertyName = "type")]
 //[JsonDerivedType(typeof(Success), "success")]
 //[JsonDerivedType(typeof(Exception), "exception")]

dotnet/src/webdriver/BiDi/Modules/Script/GetRealmsCommand.cs

@@ -18,8 +18,10 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
+using OpenQA.Selenium.BiDi.Communication.Json.Converters.Enumerable;
 using System.Collections;
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Modules.Script;
 
@@ -35,6 +37,7 @@ public record GetRealmsOptions : CommandOptions
     public RealmType? Type { get; set; }
 }
 
+[JsonConverter(typeof(GetRealmsResultConverter))]
 public record GetRealmsResult : IReadOnlyList<RealmInfo>
 {
     private readonly IReadOnlyList<RealmInfo> _realms;

dotnet/src/webdriver/BiDi/Modules/Script/RealmInfo.cs

@@ -17,11 +17,15 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters.Polymorphic;
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Modules.Script;
 
 // https://github.com/dotnet/runtime/issues/72604
+[JsonConverter(typeof(RealmInfoConverter))]
+
 //[JsonPolymorphic(TypeDiscriminatorPropertyName = "type")]
 //[JsonDerivedType(typeof(WindowRealmInfo), "window")]
 //[JsonDerivedType(typeof(DedicatedWorkerRealmInfo), "dedicated-worker")]

dotnet/src/webdriver/BiDi/Modules/Script/RealmType.cs

@@ -17,8 +17,12 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
+using System.Text.Json.Serialization;
+
 namespace OpenQA.Selenium.BiDi.Modules.Script;
 
+[JsonConverter(typeof(RealmTypeConverter))]
 public enum RealmType
 {
     Window,

dotnet/src/webdriver/BiDi/Modules/Script/RemoteValue.cs

@@ -17,6 +17,7 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters.Polymorphic;
 using System;
 using System.Collections.Generic;
 using System.Numerics;
@@ -26,6 +27,8 @@
 namespace OpenQA.Selenium.BiDi.Modules.Script;
 
 // https://github.com/dotnet/runtime/issues/72604
+[JsonConverter(typeof(RemoteValueConverter))]
+
 //[JsonPolymorphic(TypeDiscriminatorPropertyName = "type")]
 //[JsonDerivedType(typeof(NumberRemoteValue), "number")]
 //[JsonDerivedType(typeof(BooleanRemoteValue), "boolean")]

dotnet/src/webdriver/BiDi/Modules/Session/Subscription.cs

@@ -17,8 +17,12 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
+using System.Text.Json.Serialization;
+
 namespace OpenQA.Selenium.BiDi.Modules.Session;
 
+[JsonConverter(typeof(SubscriptionConverter))]
 public sealed class Subscription
 {
     internal Subscription(string id)

dotnet/src/webdriver/BiDi/Modules/Storage/GetCookiesCommand.cs

@@ -18,6 +18,7 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
+using OpenQA.Selenium.BiDi.Communication.Json.Converters.Enumerable;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -37,6 +38,7 @@ public record GetCookiesOptions : CommandOptions
     public PartitionDescriptor? Partition { get; set; }
 }
 
+[JsonConverter(typeof(GetCookiesResultConverter))]
 public record GetCookiesResult : IReadOnlyList<Network.Cookie>
 {
     private readonly IReadOnlyList<Network.Cookie> _cookies;