Parametrize command results

nvborisenko · nvborisenko · commit acac7d4c3cf9 · 2025-04-03T21:16:24.000+03:00
diff --git a/dotnet/src/webdriver/BiDi/Communication/Command.cs b/dotnet/src/webdriver/BiDi/Communication/Command.cs
@@ -35,8 +35,9 @@ protected Command(string method)
     public int Id { get; internal set; }
 }
 
-internal abstract class Command<TCommandParameters>(TCommandParameters @params, string method) : Command(method)
+internal abstract class Command<TCommandParameters, TCommandResult>(TCommandParameters @params, string method) : Command(method)
     where TCommandParameters : CommandParameters
+    where TCommandResult : EmptyResult
 {
     [JsonPropertyOrder(2)]
     public TCommandParameters Params { get; } = @params;
@@ -46,3 +47,5 @@ internal record CommandParameters
 {
     public static CommandParameters Empty { get; } = new CommandParameters();
 }
+
+public record EmptyResult;
diff --git a/dotnet/src/webdriver/BiDi/Modules/Browser/CloseCommand.cs b/dotnet/src/webdriver/BiDi/Modules/Browser/CloseCommand.cs
@@ -22,6 +22,6 @@
 namespace OpenQA.Selenium.BiDi.Modules.Browser;
 
 internal class CloseCommand()
-    : Command<CommandParameters>(CommandParameters.Empty, "browser.close");
+    : Command<CommandParameters, EmptyResult>(CommandParameters.Empty, "browser.close");
 
 public record CloseOptions : CommandOptions;
diff --git a/dotnet/src/webdriver/BiDi/Modules/Browser/CreateUserContextCommand.cs b/dotnet/src/webdriver/BiDi/Modules/Browser/CreateUserContextCommand.cs
@@ -22,6 +22,6 @@
 namespace OpenQA.Selenium.BiDi.Modules.Browser;
 
 internal class CreateUserContextCommand()
-    : Command<CommandParameters>(CommandParameters.Empty, "browser.createUserContext");
+    : Command<CommandParameters, UserContextInfo>(CommandParameters.Empty, "browser.createUserContext");
 
 public record CreateUserContextOptions : CommandOptions;
diff --git a/dotnet/src/webdriver/BiDi/Modules/Browser/GetClientWindowsCommand.cs b/dotnet/src/webdriver/BiDi/Modules/Browser/GetClientWindowsCommand.cs
@@ -24,11 +24,11 @@
 namespace OpenQA.Selenium.BiDi.Modules.Browser;
 
 internal class GetClientWindowsCommand()
-    : Command<CommandParameters>(CommandParameters.Empty, "browser.getClientWindows");
+    : Command<CommandParameters, GetClientWindowsResult>(CommandParameters.Empty, "browser.getClientWindows");
 
 public record GetClientWindowsOptions : CommandOptions;
 
-public record GetClientWindowsResult : IReadOnlyList<ClientWindowInfo>
+public record GetClientWindowsResult : EmptyResult, IReadOnlyList<ClientWindowInfo>
 {
     private readonly IReadOnlyList<ClientWindowInfo> _clientWindows;
 
diff --git a/dotnet/src/webdriver/BiDi/Modules/Browser/GetUserContextsCommand.cs b/dotnet/src/webdriver/BiDi/Modules/Browser/GetUserContextsCommand.cs
@@ -24,11 +24,11 @@
 namespace OpenQA.Selenium.BiDi.Modules.Browser;
 
 internal class GetUserContextsCommand()
-    : Command<CommandParameters>(CommandParameters.Empty, "browser.getUserContexts");
+    : Command<CommandParameters, GetUserContextsResult>(CommandParameters.Empty, "browser.getUserContexts");
 
 public record GetUserContextsOptions : CommandOptions;
 
-public record GetUserContextsResult : IReadOnlyList<UserContextInfo>
+public record GetUserContextsResult : EmptyResult, IReadOnlyList<UserContextInfo>
 {
     private readonly IReadOnlyList<UserContextInfo> _userContexts;
 
diff --git a/dotnet/src/webdriver/BiDi/Modules/Browser/RemoveUserContextCommand.cs b/dotnet/src/webdriver/BiDi/Modules/Browser/RemoveUserContextCommand.cs
@@ -22,7 +22,7 @@
 namespace OpenQA.Selenium.BiDi.Modules.Browser;
 
 internal class RemoveUserContextCommand(RemoveUserContextCommandParameters @params)
-    : Command<RemoveUserContextCommandParameters>(@params, "browser.removeUserContext");
+    : Command<RemoveUserContextCommandParameters, EmptyResult>(@params, "browser.removeUserContext");
 
 internal record RemoveUserContextCommandParameters(UserContext UserContext) : CommandParameters;
 
diff --git a/dotnet/src/webdriver/BiDi/Modules/Browser/UserContextInfo.cs b/dotnet/src/webdriver/BiDi/Modules/Browser/UserContextInfo.cs
@@ -17,6 +17,8 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication;
+
 namespace OpenQA.Selenium.BiDi.Modules.Browser;
 
-public record UserContextInfo(UserContext UserContext);
+public record UserContextInfo(UserContext UserContext) : EmptyResult;
diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/ActivateCommand.cs b/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/ActivateCommand.cs
@@ -22,7 +22,7 @@
 namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;
 
 internal class ActivateCommand(ActivateCommandParameters @params)
-    : Command<ActivateCommandParameters>(@params, "browsingContext.activate");
+    : Command<ActivateCommandParameters, EmptyResult>(@params, "browsingContext.activate");
 
 internal record ActivateCommandParameters(BrowsingContext Context) : CommandParameters;
 
diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/CaptureScreenshotCommand.cs b/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/CaptureScreenshotCommand.cs
@@ -23,7 +23,7 @@
 namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;
 
 internal class CaptureScreenshotCommand(CaptureScreenshotCommandParameters @params)
-    : Command<CaptureScreenshotCommandParameters>(@params, "browsingContext.captureScreenshot");
+    : Command<CaptureScreenshotCommandParameters, CaptureScreenshotResult>(@params, "browsingContext.captureScreenshot");
 
 internal record CaptureScreenshotCommandParameters(BrowsingContext Context, ScreenshotOrigin? Origin, ImageFormat? Format, ClipRectangle? Clip) : CommandParameters;
 
@@ -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)
+public record CaptureScreenshotResult(string Data) : EmptyResult
 {
     public byte[] ToByteArray() => System.Convert.FromBase64String(Data);
 }
diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/CloseCommand.cs b/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/CloseCommand.cs
@@ -22,7 +22,7 @@
 namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;
 
 internal class CloseCommand(CloseCommandParameters @params)
-    : Command<CloseCommandParameters>(@params, "browsingContext.close");
+    : Command<CloseCommandParameters, EmptyResult>(@params, "browsingContext.close");
 
 internal record CloseCommandParameters(BrowsingContext Context, bool? PromptUnload) : CommandParameters;
 
diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/CreateCommand.cs b/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/CreateCommand.cs
@@ -22,7 +22,7 @@
 namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;
 
 internal class CreateCommand(CreateCommandParameters @params)
-    : Command<CreateCommandParameters>(@params, "browsingContext.create");
+    : Command<CreateCommandParameters, CreateResult>(@params, "browsingContext.create");
 
 internal record CreateCommandParameters(ContextType Type, BrowsingContext? ReferenceContext, bool? Background, Browser.UserContext? UserContext) : CommandParameters;
 
@@ -41,4 +41,4 @@ public enum ContextType
     Window
 }
 
-public record CreateResult(BrowsingContext Context);
+public record CreateResult(BrowsingContext Context) : EmptyResult;
diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/GetTreeCommand.cs b/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/GetTreeCommand.cs
@@ -23,7 +23,7 @@
 namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;
 
 internal class GetTreeCommand(GetTreeCommandParameters @params)
-    : Command<GetTreeCommandParameters>(@params, "browsingContext.getTree");
+    : Command<GetTreeCommandParameters, GetTreeResult>(@params, "browsingContext.getTree");
 
 internal record GetTreeCommandParameters(long? MaxDepth, BrowsingContext? Root) : CommandParameters;
 
@@ -46,4 +46,4 @@ public record BrowsingContextGetTreeOptions
     public long? MaxDepth { get; set; }
 }
 
-public record GetTreeResult(IReadOnlyList<BrowsingContextInfo> Contexts);
+public record GetTreeResult(IReadOnlyList<BrowsingContextInfo> Contexts) : EmptyResult;
diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/HandleUserPromptCommand.cs b/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/HandleUserPromptCommand.cs
@@ -22,7 +22,7 @@
 namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;
 
 class HandleUserPromptCommand(HandleUserPromptCommandParameters @params)
-    : Command<HandleUserPromptCommandParameters>(@params, "browsingContext.handleUserPrompt");
+    : Command<HandleUserPromptCommandParameters, EmptyResult>(@params, "browsingContext.handleUserPrompt");
 
 internal record HandleUserPromptCommandParameters(BrowsingContext Context, bool? Accept, string? UserText) : CommandParameters;
 
diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/LocateNodesCommand.cs b/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/LocateNodesCommand.cs
@@ -24,7 +24,7 @@
 namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;
 
 internal class LocateNodesCommand(LocateNodesCommandParameters @params)
-    : Command<LocateNodesCommandParameters>(@params, "browsingContext.locateNodes");
+    : Command<LocateNodesCommandParameters, LocateNodesResult>(@params, "browsingContext.locateNodes");
 
 internal record LocateNodesCommandParameters(BrowsingContext Context, Locator Locator, long? MaxNodeCount, Script.SerializationOptions? SerializationOptions, IEnumerable<Script.ISharedReference>? StartNodes) : CommandParameters;
 
@@ -37,7 +37,7 @@ public record LocateNodesOptions : CommandOptions
     public IEnumerable<Script.ISharedReference>? StartNodes { get; set; }
 }
 
-public record LocateNodesResult : IReadOnlyList<Script.NodeRemoteValue>
+public record LocateNodesResult : EmptyResult, IReadOnlyList<Script.NodeRemoteValue>
 {
     private readonly IReadOnlyList<Script.NodeRemoteValue> _nodes;
 
diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/NavigateCommand.cs b/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/NavigateCommand.cs
@@ -22,7 +22,7 @@
 namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;
 
 internal class NavigateCommand(NavigateCommandParameters @params)
-    : Command<NavigateCommandParameters>(@params, "browsingContext.navigate");
+    : Command<NavigateCommandParameters, NavigateResult>(@params, "browsingContext.navigate");
 
 internal record NavigateCommandParameters(BrowsingContext Context, string Url, ReadinessState? Wait) : CommandParameters;
 
@@ -38,4 +38,4 @@ public enum ReadinessState
     Complete
 }
 
-public record NavigateResult(Navigation Navigation, string Url);
+public record NavigateResult(Navigation Navigation, string Url) : EmptyResult;
diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/PrintCommand.cs b/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/PrintCommand.cs
@@ -24,7 +24,7 @@
 namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;
 
 internal class PrintCommand(PrintCommandParameters @params)
-    : Command<PrintCommandParameters>(@params, "browsingContext.print");
+    : Command<PrintCommandParameters, PrintResult>(@params, "browsingContext.print");
 
 internal record PrintCommandParameters(BrowsingContext Context, bool? Background, PrintMargin? Margin, PrintOrientation? Orientation, PrintPage? Page, IEnumerable<PrintPageRange>? PageRanges, double? Scale, bool? ShrinkToFit) : CommandParameters;
 
@@ -112,7 +112,7 @@ public static implicit operator PrintPageRange(Range range)
 #endif
 }
 
-public record PrintResult(string Data)
+public record PrintResult(string Data) : EmptyResult
 {
     public byte[] ToByteArray() => Convert.FromBase64String(Data);
 }
diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/ReloadCommand.cs b/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/ReloadCommand.cs
@@ -22,7 +22,7 @@
 namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;
 
 internal class ReloadCommand(ReloadCommandParameters @params)
-    : Command<ReloadCommandParameters>(@params, "browsingContext.reload");
+    : Command<ReloadCommandParameters, NavigateResult>(@params, "browsingContext.reload");
 
 internal record ReloadCommandParameters(BrowsingContext Context, bool? IgnoreCache, ReadinessState? Wait) : CommandParameters;
 
diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/SetViewportCommand.cs b/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/SetViewportCommand.cs
@@ -22,7 +22,7 @@
 namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;
 
 internal class SetViewportCommand(SetViewportCommandParameters @params)
-    : Command<SetViewportCommandParameters>(@params, "browsingContext.setViewport");
+    : Command<SetViewportCommandParameters, EmptyResult>(@params, "browsingContext.setViewport");
 
 internal record SetViewportCommandParameters(BrowsingContext Context, Viewport? Viewport, double? DevicePixelRatio) : CommandParameters;
 
diff --git a/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/TraverseHistoryCommand.cs b/dotnet/src/webdriver/BiDi/Modules/BrowsingContext/TraverseHistoryCommand.cs
@@ -22,10 +22,10 @@
 namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;
 
 internal class TraverseHistoryCommand(TraverseHistoryCommandParameters @params)
-    : Command<TraverseHistoryCommandParameters>(@params, "browsingContext.traverseHistory");
+    : Command<TraverseHistoryCommandParameters, TraverseHistoryResult>(@params, "browsingContext.traverseHistory");
 
 internal record TraverseHistoryCommandParameters(BrowsingContext Context, long Delta) : CommandParameters;
 
 public record TraverseHistoryOptions : CommandOptions;
 
-public record TraverseHistoryResult;
+public record TraverseHistoryResult : EmptyResult;
diff --git a/dotnet/src/webdriver/BiDi/Modules/Input/PerformActionsCommand.cs b/dotnet/src/webdriver/BiDi/Modules/Input/PerformActionsCommand.cs
@@ -23,7 +23,7 @@
 namespace OpenQA.Selenium.BiDi.Modules.Input;
 
 internal class PerformActionsCommand(PerformActionsCommandParameters @params)
-    : Command<PerformActionsCommandParameters>(@params, "input.performActions");
+    : Command<PerformActionsCommandParameters, EmptyResult>(@params, "input.performActions");
 
 internal record PerformActionsCommandParameters(BrowsingContext.BrowsingContext Context, IEnumerable<SourceActions> Actions) : CommandParameters;
 
diff --git a/dotnet/src/webdriver/BiDi/Modules/Input/ReleaseActionsCommand.cs b/dotnet/src/webdriver/BiDi/Modules/Input/ReleaseActionsCommand.cs
@@ -22,7 +22,7 @@
 namespace OpenQA.Selenium.BiDi.Modules.Input;
 
 internal class ReleaseActionsCommand(ReleaseActionsCommandParameters @params)
-    : Command<ReleaseActionsCommandParameters>(@params, "input.releaseActions");
+    : Command<ReleaseActionsCommandParameters, EmptyResult>(@params, "input.releaseActions");
 
 internal record ReleaseActionsCommandParameters(BrowsingContext.BrowsingContext Context) : CommandParameters;
 
diff --git a/dotnet/src/webdriver/BiDi/Modules/Input/SetFilesCommand.cs b/dotnet/src/webdriver/BiDi/Modules/Input/SetFilesCommand.cs
@@ -23,7 +23,7 @@
 namespace OpenQA.Selenium.BiDi.Modules.Input;
 
 internal class SetFilesCommand(SetFilesCommandParameters @params)
-    : Command<SetFilesCommandParameters>(@params, "input.setFiles");
+    : Command<SetFilesCommandParameters, EmptyResult>(@params, "input.setFiles");
 
 internal record SetFilesCommandParameters(BrowsingContext.BrowsingContext Context, Script.ISharedReference Element, IEnumerable<string> Files) : CommandParameters;
 
diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/AddInterceptCommand.cs b/dotnet/src/webdriver/BiDi/Modules/Network/AddInterceptCommand.cs
@@ -23,7 +23,7 @@
 namespace OpenQA.Selenium.BiDi.Modules.Network;
 
 internal class AddInterceptCommand(AddInterceptCommandParameters @params)
-    : Command<AddInterceptCommandParameters>(@params, "network.addIntercept");
+    : Command<AddInterceptCommandParameters, AddInterceptResult>(@params, "network.addIntercept");
 
 internal record AddInterceptCommandParameters(IEnumerable<InterceptPhase> Phases, IEnumerable<BrowsingContext.BrowsingContext>? Contexts, IEnumerable<UrlPattern>? UrlPatterns) : CommandParameters;
 
@@ -46,7 +46,7 @@ public record BrowsingContextAddInterceptOptions
     public IEnumerable<UrlPattern>? UrlPatterns { get; set; }
 }
 
-public record AddInterceptResult(Intercept Intercept);
+public record AddInterceptResult(Intercept Intercept) : EmptyResult;
 
 public enum InterceptPhase
 {
diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/ContinueRequestCommand.cs b/dotnet/src/webdriver/BiDi/Modules/Network/ContinueRequestCommand.cs
@@ -23,7 +23,7 @@
 namespace OpenQA.Selenium.BiDi.Modules.Network;
 
 internal class ContinueRequestCommand(ContinueRequestCommandParameters @params)
-    : Command<ContinueRequestCommandParameters>(@params, "network.continueRequest");
+    : Command<ContinueRequestCommandParameters, EmptyResult>(@params, "network.continueRequest");
 
 internal record ContinueRequestCommandParameters(Request Request, BytesValue? Body, IEnumerable<CookieHeader>? Cookies, IEnumerable<Header>? Headers, string? Method, string? Url) : CommandParameters;
 
diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/ContinueResponseCommand.cs b/dotnet/src/webdriver/BiDi/Modules/Network/ContinueResponseCommand.cs
@@ -23,7 +23,7 @@
 namespace OpenQA.Selenium.BiDi.Modules.Network;
 
 internal class ContinueResponseCommand(ContinueResponseCommandParameters @params)
-    : Command<ContinueResponseCommandParameters>(@params, "network.continueResponse");
+    : Command<ContinueResponseCommandParameters, EmptyResult>(@params, "network.continueResponse");
 
 internal record ContinueResponseCommandParameters(Request Request, IEnumerable<SetCookieHeader>? Cookies, IEnumerable<AuthCredentials>? Credentials, IEnumerable<Header>? Headers, string? ReasonPhrase, long? StatusCode) : CommandParameters;
 
diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/ContinueWithAuthCommand.cs b/dotnet/src/webdriver/BiDi/Modules/Network/ContinueWithAuthCommand.cs
@@ -23,7 +23,7 @@
 namespace OpenQA.Selenium.BiDi.Modules.Network;
 
 internal class ContinueWithAuthCommand(ContinueWithAuthParameters @params)
-    : Command<ContinueWithAuthParameters>(@params, "network.continueWithAuth");
+    : Command<ContinueWithAuthParameters, EmptyResult>(@params, "network.continueWithAuth");
 
 [JsonPolymorphic(TypeDiscriminatorPropertyName = "action")]
 [JsonDerivedType(typeof(ContinueWithAuthCredentials), "provideCredentials")]
diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/FailRequestCommand.cs b/dotnet/src/webdriver/BiDi/Modules/Network/FailRequestCommand.cs
@@ -22,7 +22,7 @@
 namespace OpenQA.Selenium.BiDi.Modules.Network;
 
 internal class FailRequestCommand(FailRequestCommandParameters @params)
-    : Command<FailRequestCommandParameters>(@params, "network.failRequest");
+    : Command<FailRequestCommandParameters, EmptyResult>(@params, "network.failRequest");
 
 internal record FailRequestCommandParameters(Request Request) : CommandParameters;
 
diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/ProvideResponseCommand.cs b/dotnet/src/webdriver/BiDi/Modules/Network/ProvideResponseCommand.cs
@@ -23,7 +23,7 @@
 namespace OpenQA.Selenium.BiDi.Modules.Network;
 
 internal class ProvideResponseCommand(ProvideResponseCommandParameters @params)
-    : Command<ProvideResponseCommandParameters>(@params, "network.provideResponse");
+    : Command<ProvideResponseCommandParameters, EmptyResult>(@params, "network.provideResponse");
 
 internal record ProvideResponseCommandParameters(Request Request, BytesValue? Body, IEnumerable<SetCookieHeader>? Cookies, IEnumerable<Header>? Headers, string? ReasonPhrase, long? StatusCode) : CommandParameters;
 
diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/RemoveInterceptCommand.cs b/dotnet/src/webdriver/BiDi/Modules/Network/RemoveInterceptCommand.cs
@@ -22,7 +22,7 @@
 namespace OpenQA.Selenium.BiDi.Modules.Network;
 
 internal class RemoveInterceptCommand(RemoveInterceptCommandParameters @params)
-    : Command<RemoveInterceptCommandParameters>(@params, "network.removeIntercept");
+    : Command<RemoveInterceptCommandParameters, EmptyResult>(@params, "network.removeIntercept");
 
 internal record RemoveInterceptCommandParameters(Intercept Intercept) : CommandParameters;
 
diff --git a/dotnet/src/webdriver/BiDi/Modules/Network/SetCacheBehaviorCommand.cs b/dotnet/src/webdriver/BiDi/Modules/Network/SetCacheBehaviorCommand.cs
@@ -23,7 +23,7 @@
 namespace OpenQA.Selenium.BiDi.Modules.Network;
 
 internal class SetCacheBehaviorCommand(SetCacheBehaviorCommandParameters @params)
-    : Command<SetCacheBehaviorCommandParameters>(@params, "network.setCacheBehavior");
+    : Command<SetCacheBehaviorCommandParameters, EmptyResult>(@params, "network.setCacheBehavior");
 
 internal record SetCacheBehaviorCommandParameters(CacheBehavior CacheBehavior, IEnumerable<BrowsingContext.BrowsingContext>? Contexts) : CommandParameters;
 
diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/AddPreloadScriptCommand.cs b/dotnet/src/webdriver/BiDi/Modules/Script/AddPreloadScriptCommand.cs
@@ -23,7 +23,7 @@
 namespace OpenQA.Selenium.BiDi.Modules.Script;
 
 internal class AddPreloadScriptCommand(AddPreloadScriptCommandParameters @params)
-    : Command<AddPreloadScriptCommandParameters>(@params, "script.addPreloadScript");
+    : Command<AddPreloadScriptCommandParameters, AddPreloadScriptResult>(@params, "script.addPreloadScript");
 
 internal record AddPreloadScriptCommandParameters(string FunctionDeclaration, IEnumerable<ChannelLocalValue>? Arguments, IEnumerable<BrowsingContext.BrowsingContext>? Contexts, string? Sandbox) : CommandParameters;
 
@@ -51,4 +51,4 @@ public record BrowsingContextAddPreloadScriptOptions
     public string? Sandbox { get; set; }
 }
 
-internal record AddPreloadScriptResult(PreloadScript Script);
+internal record AddPreloadScriptResult(PreloadScript Script) : EmptyResult;
diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/CallFunctionCommand.cs b/dotnet/src/webdriver/BiDi/Modules/Script/CallFunctionCommand.cs
@@ -23,7 +23,7 @@
 namespace OpenQA.Selenium.BiDi.Modules.Script;
 
 internal class CallFunctionCommand(CallFunctionCommandParameters @params)
-    : Command<CallFunctionCommandParameters>(@params, "script.callFunction");
+    : Command<CallFunctionCommandParameters, EvaluateResult>(@params, "script.callFunction");
 
 internal record CallFunctionCommandParameters(string FunctionDeclaration, bool AwaitPromise, Target Target, IEnumerable<LocalValue>? Arguments, ResultOwnership? ResultOwnership, SerializationOptions? SerializationOptions, LocalValue? This, bool? UserActivation) : CommandParameters;
 
diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/DisownCommand.cs b/dotnet/src/webdriver/BiDi/Modules/Script/DisownCommand.cs
@@ -23,6 +23,6 @@
 namespace OpenQA.Selenium.BiDi.Modules.Script;
 
 internal class DisownCommand(DisownCommandParameters @params)
-    : Command<DisownCommandParameters>(@params, "script.disown");
+    : Command<DisownCommandParameters, EmptyResult>(@params, "script.disown");
 
 internal record DisownCommandParameters(IEnumerable<Handle> Handles, Target Target) : CommandParameters;
diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/EvaluateCommand.cs b/dotnet/src/webdriver/BiDi/Modules/Script/EvaluateCommand.cs
@@ -22,7 +22,7 @@
 namespace OpenQA.Selenium.BiDi.Modules.Script;
 
 internal class EvaluateCommand(EvaluateCommandParameters @params)
-    : Command<EvaluateCommandParameters>(@params, "script.evaluate");
+    : Command<EvaluateCommandParameters, EvaluateResult>(@params, "script.evaluate");
 
 internal record EvaluateCommandParameters(string Expression, Target Target, bool AwaitPromise, ResultOwnership? ResultOwnership, SerializationOptions? SerializationOptions, bool? UserActivation) : CommandParameters;
 
@@ -39,7 +39,7 @@ public record EvaluateOptions : CommandOptions
 //[JsonPolymorphic(TypeDiscriminatorPropertyName = "type")]
 //[JsonDerivedType(typeof(EvaluateResultSuccess), "success")]
 //[JsonDerivedType(typeof(EvaluateResultException), "exception")]
-public abstract record EvaluateResult;
+public abstract record EvaluateResult : EmptyResult;
 
 public record EvaluateResultSuccess(RemoteValue Result, Realm Realm) : EvaluateResult
 {
diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/GetRealmsCommand.cs b/dotnet/src/webdriver/BiDi/Modules/Script/GetRealmsCommand.cs
diff --git a/dotnet/src/webdriver/BiDi/Modules/Script/RemovePreloadScriptCommand.cs b/dotnet/src/webdriver/BiDi/Modules/Script/RemovePreloadScriptCommand.cs
diff --git a/dotnet/src/webdriver/BiDi/Modules/Session/EndCommand.cs b/dotnet/src/webdriver/BiDi/Modules/Session/EndCommand.cs
diff --git a/dotnet/src/webdriver/BiDi/Modules/Session/NewCommand.cs b/dotnet/src/webdriver/BiDi/Modules/Session/NewCommand.cs
diff --git a/dotnet/src/webdriver/BiDi/Modules/Session/StatusCommand.cs b/dotnet/src/webdriver/BiDi/Modules/Session/StatusCommand.cs
diff --git a/dotnet/src/webdriver/BiDi/Modules/Session/SubscribeCommand.cs b/dotnet/src/webdriver/BiDi/Modules/Session/SubscribeCommand.cs
diff --git a/dotnet/src/webdriver/BiDi/Modules/Session/UnsubscribeCommand.cs b/dotnet/src/webdriver/BiDi/Modules/Session/UnsubscribeCommand.cs
diff --git a/dotnet/src/webdriver/BiDi/Modules/Storage/DeleteCookiesCommand.cs b/dotnet/src/webdriver/BiDi/Modules/Storage/DeleteCookiesCommand.cs
diff --git a/dotnet/src/webdriver/BiDi/Modules/Storage/GetCookiesCommand.cs b/dotnet/src/webdriver/BiDi/Modules/Storage/GetCookiesCommand.cs
diff --git a/dotnet/src/webdriver/BiDi/Modules/Storage/SetCookieCommand.cs b/dotnet/src/webdriver/BiDi/Modules/Storage/SetCookieCommand.cs

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,9 @@ protected Command(string method)`
`35`	`35`	`public int Id { get; internal set; }`
`36`	`36`	`}`
`37`	`37`
`38`		`-internal abstract class Command<TCommandParameters>(TCommandParameters @params, string method) : Command(method)`
	`38`	`+internal abstract class Command<TCommandParameters, TCommandResult>(TCommandParameters @params, string method) : Command(method)`
`39`	`39`	`where TCommandParameters : CommandParameters`
	`40`	`+ where TCommandResult : EmptyResult`
`40`	`41`	`{`
`41`	`42`	`[JsonPropertyOrder(2)]`
`42`	`43`	`public TCommandParameters Params { get; } = @params;`
`@@ -46,3 +47,5 @@ internal record CommandParameters`
`46`	`47`	`{`
`47`	`48`	`public static CommandParameters Empty { get; } = new CommandParameters();`
`48`	`49`	`}`
	`50`	`+`
	`51`	`+public record EmptyResult;`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`namespace OpenQA.Selenium.BiDi.Modules.BrowsingContext;`
`24`	`24`
`25`	`25`	`internal class CaptureScreenshotCommand(CaptureScreenshotCommandParameters @params)`
`26`		`- : Command<CaptureScreenshotCommandParameters>(@params, "browsingContext.captureScreenshot");`
	`26`	`+ : Command<CaptureScreenshotCommandParameters, CaptureScreenshotResult>(@params, "browsingContext.captureScreenshot");`
`27`	`27`
`28`	`28`	`internal record CaptureScreenshotCommandParameters(BrowsingContext Context, ScreenshotOrigin? Origin, ImageFormat? Format, ClipRectangle? Clip) : CommandParameters;`
`29`	`29`
`@@ -56,7 +56,7 @@ public record BoxClipRectangle(double X, double Y, double Width, double Height)`
`56`	`56`
`57`	`57`	`public record ElementClipRectangle([property: JsonPropertyName("element")] Script.ISharedReference SharedReference) : ClipRectangle;`
`58`	`58`
`59`		`-public record CaptureScreenshotResult(string Data)`
	`59`	`+public record CaptureScreenshotResult(string Data) : EmptyResult`
`60`	`60`	`{`
`61`	`61`	`public byte[] ToByteArray() => System.Convert.FromBase64String(Data);`
`62`	`62`	`}`