[dotnet] [bidi] Separate empty and base result

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

@@ -186,19 +186,19 @@ public async Task ExecuteCommandAsync<TCommand>(TCommand command, CommandOptions
 
     public async Task<TResult> ExecuteCommandAsync<TCommand, TResult>(TCommand command, CommandOptions? options)
         where TCommand : Command
-        where TResult : EmptyResult
+        where TResult : BiDiResult
     {
         var result = await ExecuteCommandCoreAsync(command, options).ConfigureAwait(false);
 
         return (TResult)result;
     }
 
-    private async Task<EmptyResult> ExecuteCommandCoreAsync<TCommand>(TCommand command, CommandOptions? options)
+    private async Task<BiDiResult> ExecuteCommandCoreAsync<TCommand>(TCommand command, CommandOptions? options)
         where TCommand : Command
     {
         command.Id = Interlocked.Increment(ref _currentCommandId);
 
-        var tcs = new TaskCompletionSource<EmptyResult>(TaskCreationOptions.RunContinuationsAsynchronously);
+        var tcs = new TaskCompletionSource<BiDiResult>(TaskCreationOptions.RunContinuationsAsynchronously);
 
         var timeout = options?.Timeout ?? TimeSpan.FromSeconds(30);
 
@@ -380,7 +380,7 @@ private void ProcessReceivedMessage(byte[]? data)
 
                 var successCommand = _pendingCommands[id.Value];
                 var messageSuccess = JsonSerializer.Deserialize(ref resultReader, successCommand.ResultType, _jsonSerializerContext)!;
-                successCommand.TaskCompletionSource.SetResult((EmptyResult)messageSuccess);
+                successCommand.TaskCompletionSource.SetResult((BiDiResult)messageSuccess);
                 _pendingCommands.TryRemove(id.Value, out _);
                 break;
 
@@ -406,12 +406,12 @@ private void ProcessReceivedMessage(byte[]? data)
         }
     }
 
-    class CommandInfo(long id, Type resultType, TaskCompletionSource<EmptyResult> taskCompletionSource)
+    class CommandInfo(long id, Type resultType, TaskCompletionSource<BiDiResult> taskCompletionSource)
     {
         public long Id { get; } = id;
 
         public Type ResultType { get; } = resultType;
 
-        public TaskCompletionSource<EmptyResult> TaskCompletionSource { get; } = taskCompletionSource;
+        public TaskCompletionSource<BiDiResult> TaskCompletionSource { get; } = taskCompletionSource;
     };
 }

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

@@ -42,7 +42,7 @@ protected Command(string method, Type resultType)
 
 internal abstract class Command<TCommandParameters, TCommandResult>(TCommandParameters @params, string method) : Command(method, typeof(TCommandResult))
     where TCommandParameters : CommandParameters
-    where TCommandResult : EmptyResult
+    where TCommandResult : BiDiResult
 {
     [JsonPropertyOrder(2)]
     public TCommandParameters Params { get; } = @params;
@@ -53,4 +53,7 @@ internal record CommandParameters
     public static CommandParameters Empty { get; } = new CommandParameters();
 }
 
-public record EmptyResult;
+public sealed record EmptyResult : BiDiResult;
+
+public abstract record BiDiResult;
+

dotnet/src/webdriver/BiDi/Communication/Json/BiDiJsonSerializerContext.cs

@@ -67,7 +67,7 @@ namespace OpenQA.Selenium.BiDi.Communication.Json;
 #endregion
 
 [JsonSerializable(typeof(Command))]
-[JsonSerializable(typeof(EmptyResult))]
+[JsonSerializable(typeof(BiDiResult))]
 
 [JsonSerializable(typeof(Modules.Session.StatusCommand))]
 [JsonSerializable(typeof(Modules.Session.StatusResult))]

dotnet/src/webdriver/BiDi/Communication/Json/Converters/InputOriginConverter.cs

@@ -17,16 +17,15 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Internal;
 using OpenQA.Selenium.BiDi.Modules.Input;
+using OpenQA.Selenium.BiDi.Modules.Script;
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Communication.Json.Converters;
 
-[UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Json serializer options should have AOT-safe type resolution")]
-[UnconditionalSuppressMessage("AOT", "IL3050", Justification = "Json serializer options should have AOT-safe type resolution")]
 internal class InputOriginConverter : JsonConverter<Origin>
 {
     public override Origin Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -49,7 +48,7 @@ public override void Write(Utf8JsonWriter writer, Origin value, JsonSerializerOp
             writer.WriteStartObject();
             writer.WriteString("type", "element");
             writer.WritePropertyName("element");
-            JsonSerializer.Serialize(writer, element.Element, options);
+            JsonSerializer.Serialize(writer, element.Element, options.GetTypeInfo<ISharedReference>());
             writer.WriteEndObject();
         }
     }

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

@@ -21,7 +21,7 @@ namespace OpenQA.Selenium.BiDi.Communication;
 
 internal abstract record Message;
 
-internal record MessageSuccess(long Id, EmptyResult Result) : Message;
+internal record MessageSuccess(long Id, BiDiResult Result) : Message;
 
 internal record MessageError(long Id) : Message
 {

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

@@ -28,7 +28,7 @@ internal class GetClientWindowsCommand()
 
 public record GetClientWindowsOptions : CommandOptions;
 
-public record GetClientWindowsResult : EmptyResult, IReadOnlyList<ClientWindowInfo>
+public record GetClientWindowsResult : BiDiResult, IReadOnlyList<ClientWindowInfo>
 {
     private readonly IReadOnlyList<ClientWindowInfo> _clientWindows;
 

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

@@ -28,7 +28,7 @@ internal class GetUserContextsCommand()
 
 public record GetUserContextsOptions : CommandOptions;
 
-public record GetUserContextsResult : EmptyResult, IReadOnlyList<UserContextInfo>
+public record GetUserContextsResult : BiDiResult, IReadOnlyList<UserContextInfo>
 {
     private readonly IReadOnlyList<UserContextInfo> _userContexts;
 

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

@@ -21,4 +21,4 @@
 
 namespace OpenQA.Selenium.BiDi.Modules.Browser;
 
-public record UserContextInfo(UserContext UserContext) : EmptyResult;
+public record UserContextInfo(UserContext UserContext) : BiDiResult;

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

@@ -56,7 +56,7 @@ public record BoxClipRectangle(double X, double Y, double Width, double Height)
 
 public record ElementClipRectangle([property: JsonPropertyName("element")] Script.ISharedReference SharedReference) : ClipRectangle;
 
-public record CaptureScreenshotResult(string Data) : EmptyResult
+public record CaptureScreenshotResult(string Data) : BiDiResult
 {
     public byte[] ToByteArray() => System.Convert.FromBase64String(Data);
 }

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

@@ -41,4 +41,4 @@ public enum ContextType
     Window
 }
 
-public record CreateResult(BrowsingContext Context) : EmptyResult;
+public record CreateResult(BrowsingContext Context) : BiDiResult;

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

@@ -46,4 +46,4 @@ public record BrowsingContextGetTreeOptions
     public long? MaxDepth { get; set; }
 }
 
-public record GetTreeResult(IReadOnlyList<BrowsingContextInfo> Contexts) : EmptyResult;
+public record GetTreeResult(IReadOnlyList<BrowsingContextInfo> Contexts) : BiDiResult;

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

@@ -37,7 +37,7 @@ public record LocateNodesOptions : CommandOptions
     public IEnumerable<Script.ISharedReference>? StartNodes { get; set; }
 }
 
-public record LocateNodesResult : EmptyResult, IReadOnlyList<Script.NodeRemoteValue>
+public record LocateNodesResult : BiDiResult, IReadOnlyList<Script.NodeRemoteValue>
 {
     private readonly IReadOnlyList<Script.NodeRemoteValue> _nodes;
 

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

@@ -38,4 +38,4 @@ public enum ReadinessState
     Complete
 }
 
-public record NavigateResult(Navigation Navigation, string Url) : EmptyResult;
+public record NavigateResult(Navigation Navigation, string Url) : BiDiResult;

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

@@ -112,7 +112,7 @@ public static implicit operator PrintPageRange(Range range)
 #endif
 }
 
-public record PrintResult(string Data) : EmptyResult
+public record PrintResult(string Data) : BiDiResult
 {
     public byte[] ToByteArray() => Convert.FromBase64String(Data);
 }

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

@@ -28,4 +28,4 @@ internal record TraverseHistoryCommandParameters(BrowsingContext Context, long D
 
 public record TraverseHistoryOptions : CommandOptions;
 
-public record TraverseHistoryResult : EmptyResult;
+public record TraverseHistoryResult : BiDiResult;

dotnet/src/webdriver/BiDi/Modules/Network/AddInterceptCommand.cs

@@ -46,7 +46,7 @@ public record BrowsingContextAddInterceptOptions
     public IEnumerable<UrlPattern>? UrlPatterns { get; set; }
 }
 
-public record AddInterceptResult(Intercept Intercept) : EmptyResult;
+public record AddInterceptResult(Intercept Intercept) : BiDiResult;
 
 public enum InterceptPhase
 {

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

@@ -51,4 +51,4 @@ public record BrowsingContextAddPreloadScriptOptions
     public string? Sandbox { get; set; }
 }
 
-internal record AddPreloadScriptResult(PreloadScript Script) : EmptyResult;
+internal record AddPreloadScriptResult(PreloadScript Script) : BiDiResult;

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

@@ -39,7 +39,7 @@ public record EvaluateOptions : CommandOptions
 //[JsonPolymorphic(TypeDiscriminatorPropertyName = "type")]
 //[JsonDerivedType(typeof(EvaluateResultSuccess), "success")]
 //[JsonDerivedType(typeof(EvaluateResultException), "exception")]
-public abstract record EvaluateResult : EmptyResult;
+public abstract record EvaluateResult : BiDiResult;
 
 public record EvaluateResultSuccess(RemoteValue Result, Realm Realm) : EvaluateResult
 {

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

@@ -35,7 +35,7 @@ public record GetRealmsOptions : CommandOptions
     public RealmType? Type { get; set; }
 }
 
-public record GetRealmsResult : EmptyResult, IReadOnlyList<RealmInfo>
+public record GetRealmsResult : BiDiResult, IReadOnlyList<RealmInfo>
 {
     private readonly IReadOnlyList<RealmInfo> _realms;
 

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

@@ -28,7 +28,7 @@ internal record NewCommandParameters(CapabilitiesRequest Capabilities) : Command
 
 public record NewOptions : CommandOptions;
 
-public record NewResult(string SessionId, Capability Capability) : EmptyResult;
+public record NewResult(string SessionId, Capability Capability) : BiDiResult;
 
 public record Capability(bool AcceptInsecureCerts, string BrowserName, string BrowserVersion, string PlatformName, bool SetWindowRect, string UserAgent)
 {

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

@@ -24,6 +24,6 @@ namespace OpenQA.Selenium.BiDi.Modules.Session;
 internal class StatusCommand()
     : Command<CommandParameters, StatusResult>(CommandParameters.Empty, "session.status");
 
-public record StatusResult(bool Ready, string Message) : EmptyResult;
+public record StatusResult(bool Ready, string Message) : BiDiResult;
 
 public record StatusOptions : CommandOptions;

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

@@ -32,4 +32,4 @@ public record SubscribeOptions : CommandOptions
     public IEnumerable<BrowsingContext.BrowsingContext>? Contexts { get; set; }
 }
 
-internal record SubscribeResult(Subscription Subscription) : EmptyResult;
+internal record SubscribeResult(Subscription Subscription) : BiDiResult;

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

@@ -28,4 +28,4 @@ internal record DeleteCookiesCommandParameters(CookieFilter? Filter, PartitionDe
 
 public record DeleteCookiesOptions : GetCookiesOptions;
 
-public record DeleteCookiesResult(PartitionKey PartitionKey) : EmptyResult;
+public record DeleteCookiesResult(PartitionKey PartitionKey) : BiDiResult;

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

@@ -37,7 +37,7 @@ public record GetCookiesOptions : CommandOptions
     public PartitionDescriptor? Partition { get; set; }
 }
 
-public record GetCookiesResult : EmptyResult, IReadOnlyList<Network.Cookie>
+public record GetCookiesResult : BiDiResult, IReadOnlyList<Network.Cookie>
 {
     private readonly IReadOnlyList<Network.Cookie> _cookies;
 

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

@@ -45,4 +45,4 @@ public record SetCookieOptions : CommandOptions
     public PartitionDescriptor? Partition { get; set; }
 }
 
-public record SetCookieResult(PartitionKey PartitionKey) : EmptyResult;
+public record SetCookieResult(PartitionKey PartitionKey) : BiDiResult;