[dotnet] [bidi] Return EmptyResult object which might be non-empty

nvborisenko · nvborisenko · commit 1d054e7c30d0 · 2025-07-27T21:19:57.000+03:00
diff --git a/dotnet/src/webdriver/BiDi/Browser/BrowserModule.cs b/dotnet/src/webdriver/BiDi/Browser/BrowserModule.cs
@@ -24,9 +24,9 @@ namespace OpenQA.Selenium.BiDi.Browser;
 
 public sealed class BrowserModule(Broker broker) : Module(broker)
 {
-    public async Task CloseAsync(CloseOptions? options = null)
+    public async Task<EmptyResult> CloseAsync(CloseOptions? options = null)
     {
-        await Broker.ExecuteCommandAsync(new CloseCommand(), options).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync<CloseCommand, EmptyResult>(new CloseCommand(), options).ConfigureAwait(false);
     }
 
     public async Task<UserContextInfo> CreateUserContextAsync(CreateUserContextOptions? options = null)
@@ -41,11 +41,11 @@ public async Task<GetUserContextsResult> GetUserContextsAsync(GetUserContextsOpt
         return await Broker.ExecuteCommandAsync<GetUserContextsCommand, GetUserContextsResult>(new GetUserContextsCommand(), options).ConfigureAwait(false);
     }
 
-    public async Task RemoveUserContextAsync(UserContext userContext, RemoveUserContextOptions? options = null)
+    public async Task<EmptyResult> RemoveUserContextAsync(UserContext userContext, RemoveUserContextOptions? options = null)
     {
         var @params = new RemoveUserContextCommandParameters(userContext);
 
-        await Broker.ExecuteCommandAsync(new RemoveUserContextCommand(@params), options).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync<RemoveUserContextCommand, EmptyResult>(new RemoveUserContextCommand(@params), options).ConfigureAwait(false);
     }
 
     public async Task<GetClientWindowsResult> GetClientWindowsAsync(GetClientWindowsOptions? options = null)
diff --git a/dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContext.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContext.cs
@@ -19,6 +19,7 @@
 
 using System.Threading.Tasks;
 using System;
+using OpenQA.Selenium.BiDi.Communication;
 
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
 
@@ -66,7 +67,7 @@ public Task<NavigateResult> ReloadAsync(ReloadOptions? options = null)
         return BiDi.BrowsingContext.ReloadAsync(this, options);
     }
 
-    public Task ActivateAsync(ActivateOptions? options = null)
+    public Task<EmptyResult> ActivateAsync(ActivateOptions? options = null)
     {
         return BiDi.BrowsingContext.ActivateAsync(this, options);
     }
@@ -81,17 +82,17 @@ public Task<CaptureScreenshotResult> CaptureScreenshotAsync(CaptureScreenshotOpt
         return BiDi.BrowsingContext.CaptureScreenshotAsync(this, options);
     }
 
-    public Task CloseAsync(CloseOptions? options = null)
+    public Task<EmptyResult> CloseAsync(CloseOptions? options = null)
     {
         return BiDi.BrowsingContext.CloseAsync(this, options);
     }
 
-    public Task TraverseHistoryAsync(int delta, TraverseHistoryOptions? options = null)
+    public Task<TraverseHistoryResult> TraverseHistoryAsync(int delta, TraverseHistoryOptions? options = null)
     {
         return BiDi.BrowsingContext.TraverseHistoryAsync(this, delta, options);
     }
 
-    public Task SetViewportAsync(SetViewportOptions? options = null)
+    public Task<EmptyResult> SetViewportAsync(SetViewportOptions? options = null)
     {
         return BiDi.BrowsingContext.SetViewportAsync(this, options);
     }
@@ -101,7 +102,7 @@ public Task<PrintResult> PrintAsync(PrintOptions? options = null)
         return BiDi.BrowsingContext.PrintAsync(this, options);
     }
 
-    public Task HandleUserPromptAsync(HandleUserPromptOptions? options = null)
+    public Task<EmptyResult> HandleUserPromptAsync(HandleUserPromptOptions? options = null)
     {
         return BiDi.BrowsingContext.HandleUserPromptAsync(this, options);
     }
diff --git a/dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextInputModule.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextInputModule.cs
@@ -20,22 +20,23 @@
 using System.Threading.Tasks;
 using OpenQA.Selenium.BiDi.Input;
 using System.Collections.Generic;
+using OpenQA.Selenium.BiDi.Communication;
 
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
 
 public sealed class BrowsingContextInputModule(BrowsingContext context, InputModule inputModule)
 {
-    public Task PerformActionsAsync(IEnumerable<SourceActions> actions, PerformActionsOptions? options = null)
+    public Task<EmptyResult> PerformActionsAsync(IEnumerable<SourceActions> actions, PerformActionsOptions? options = null)
     {
         return inputModule.PerformActionsAsync(context, actions, options);
     }
 
-    public Task ReleaseActionsAsync(ReleaseActionsOptions? options = null)
+    public Task<EmptyResult> ReleaseActionsAsync(ReleaseActionsOptions? options = null)
     {
         return inputModule.ReleaseActionsAsync(context, options);
     }
 
-    public Task SetFilesAsync(Script.ISharedReference element, IEnumerable<string> files, SetFilesOptions? options = null)
+    public Task<EmptyResult> SetFilesAsync(Script.ISharedReference element, IEnumerable<string> files, SetFilesOptions? options = null)
     {
         return inputModule.SetFilesAsync(context, element, files, options);
     }
diff --git a/dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextModule.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextModule.cs
@@ -41,11 +41,11 @@ public async Task<NavigateResult> NavigateAsync(BrowsingContext context, string
         return await Broker.ExecuteCommandAsync<NavigateCommand, NavigateResult>(new NavigateCommand(@params), options).ConfigureAwait(false);
     }
 
-    public async Task ActivateAsync(BrowsingContext context, ActivateOptions? options = null)
+    public async Task<EmptyResult> ActivateAsync(BrowsingContext context, ActivateOptions? options = null)
     {
         var @params = new ActivateCommandParameters(context);
 
-        await Broker.ExecuteCommandAsync(new ActivateCommand(@params), options).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync<ActivateCommand, EmptyResult>(new ActivateCommand(@params), options).ConfigureAwait(false);
     }
 
     public async Task<LocateNodesResult> LocateNodesAsync(BrowsingContext context, Locator locator, LocateNodesOptions? options = null)
@@ -62,11 +62,11 @@ public async Task<CaptureScreenshotResult> CaptureScreenshotAsync(BrowsingContex
         return await Broker.ExecuteCommandAsync<CaptureScreenshotCommand, CaptureScreenshotResult>(new CaptureScreenshotCommand(@params), options).ConfigureAwait(false);
     }
 
-    public async Task CloseAsync(BrowsingContext context, CloseOptions? options = null)
+    public async Task<EmptyResult> CloseAsync(BrowsingContext context, CloseOptions? options = null)
     {
         var @params = new CloseCommandParameters(context, options?.PromptUnload);
 
-        await Broker.ExecuteCommandAsync(new CloseCommand(@params), options).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync<CloseCommand, EmptyResult>(new CloseCommand(@params), options).ConfigureAwait(false);
     }
 
     public async Task<TraverseHistoryResult> TraverseHistoryAsync(BrowsingContext context, int delta, TraverseHistoryOptions? options = null)
@@ -83,11 +83,11 @@ public async Task<NavigateResult> ReloadAsync(BrowsingContext context, ReloadOpt
         return await Broker.ExecuteCommandAsync<ReloadCommand, NavigateResult>(new ReloadCommand(@params), options).ConfigureAwait(false);
     }
 
-    public async Task SetViewportAsync(BrowsingContext context, SetViewportOptions? options = null)
+    public async Task<EmptyResult> SetViewportAsync(BrowsingContext context, SetViewportOptions? options = null)
     {
         var @params = new SetViewportCommandParameters(context, options?.Viewport, options?.DevicePixelRatio);
 
-        await Broker.ExecuteCommandAsync(new SetViewportCommand(@params), options).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync<SetViewportCommand, EmptyResult>(new SetViewportCommand(@params), options).ConfigureAwait(false);
     }
 
     public async Task<GetTreeResult> GetTreeAsync(GetTreeOptions? options = null)
@@ -104,11 +104,11 @@ public async Task<PrintResult> PrintAsync(BrowsingContext context, PrintOptions?
         return await Broker.ExecuteCommandAsync<PrintCommand, PrintResult>(new PrintCommand(@params), options).ConfigureAwait(false);
     }
 
-    public async Task HandleUserPromptAsync(BrowsingContext context, HandleUserPromptOptions? options = null)
+    public async Task<EmptyResult> HandleUserPromptAsync(BrowsingContext context, HandleUserPromptOptions? options = null)
     {
         var @params = new HandleUserPromptCommandParameters(context, options?.Accept, options?.UserText);
 
-        await Broker.ExecuteCommandAsync(new HandleUserPromptCommand(@params), options).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync<HandleUserPromptCommand, EmptyResult>(new HandleUserPromptCommand(@params), options).ConfigureAwait(false);
     }
 
     public async Task<Subscription> OnNavigationStartedAsync(Func<NavigationInfo, Task> handler, BrowsingContextsSubscriptionOptions? options = null)
diff --git a/dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextNetworkModule.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/BrowsingContextNetworkModule.cs
@@ -20,6 +20,7 @@
 using System.Threading.Tasks;
 using System;
 using OpenQA.Selenium.BiDi.Network;
+using OpenQA.Selenium.BiDi.Communication;
 
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
 
@@ -73,7 +74,7 @@ await intercept.OnAuthRequiredAsync(
         return intercept;
     }
 
-    public Task SetCacheBehaviorAsync(CacheBehavior behavior, BrowsingContextSetCacheBehaviorOptions? options = null)
+    public Task<EmptyResult> SetCacheBehaviorAsync(CacheBehavior behavior, BrowsingContextSetCacheBehaviorOptions? options = null)
     {
         SetCacheBehaviorOptions setCacheBehaviorOptions = new(options)
         {
diff --git a/dotnet/src/webdriver/BiDi/Communication/Broker.cs b/dotnet/src/webdriver/BiDi/Communication/Broker.cs
@@ -179,12 +179,6 @@ private async Task ProcessEventsAwaiterAsync()
         }
     }
 
-    public async Task ExecuteCommandAsync<TCommand>(TCommand command, CommandOptions? options)
-        where TCommand : Command
-    {
-        await ExecuteCommandCoreAsync(command, options).ConfigureAwait(false);
-    }
-
     public async Task<TResult> ExecuteCommandAsync<TCommand, TResult>(TCommand command, CommandOptions? options)
         where TCommand : Command
         where TResult : EmptyResult
diff --git a/dotnet/src/webdriver/BiDi/Input/InputModule.cs b/dotnet/src/webdriver/BiDi/Input/InputModule.cs
@@ -25,24 +25,24 @@ namespace OpenQA.Selenium.BiDi.Input;
 
 public sealed class InputModule(Broker broker) : Module(broker)
 {
-    public async Task PerformActionsAsync(BrowsingContext.BrowsingContext context, IEnumerable<SourceActions> actions, PerformActionsOptions? options = null)
+    public async Task<EmptyResult> PerformActionsAsync(BrowsingContext.BrowsingContext context, IEnumerable<SourceActions> actions, PerformActionsOptions? options = null)
     {
         var @params = new PerformActionsCommandParameters(context, actions);
 
-        await Broker.ExecuteCommandAsync(new PerformActionsCommand(@params), options).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync<PerformActionsCommand, EmptyResult>(new PerformActionsCommand(@params), options).ConfigureAwait(false);
     }
 
-    public async Task ReleaseActionsAsync(BrowsingContext.BrowsingContext context, ReleaseActionsOptions? options = null)
+    public async Task<EmptyResult> ReleaseActionsAsync(BrowsingContext.BrowsingContext context, ReleaseActionsOptions? options = null)
     {
         var @params = new ReleaseActionsCommandParameters(context);
 
-        await Broker.ExecuteCommandAsync(new ReleaseActionsCommand(@params), options).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync<ReleaseActionsCommand, EmptyResult>(new ReleaseActionsCommand(@params), options).ConfigureAwait(false);
     }
 
-    public async Task SetFilesAsync(BrowsingContext.BrowsingContext context, Script.ISharedReference element, IEnumerable<string> files, SetFilesOptions? options = null)
+    public async Task<EmptyResult> SetFilesAsync(BrowsingContext.BrowsingContext context, Script.ISharedReference element, IEnumerable<string> files, SetFilesOptions? options = null)
     {
         var @params = new SetFilesCommandParameters(context, element, files);
 
-        await Broker.ExecuteCommandAsync(new SetFilesCommand(@params), options).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync<SetFilesCommand, EmptyResult>(new SetFilesCommand(@params), options).ConfigureAwait(false);
     }
 }
diff --git a/dotnet/src/webdriver/BiDi/Network/NetworkModule.cs b/dotnet/src/webdriver/BiDi/Network/NetworkModule.cs
@@ -35,61 +35,61 @@ internal async Task<Intercept> AddInterceptAsync(IEnumerable<InterceptPhase> pha
         return result.Intercept;
     }
 
-    internal async Task RemoveInterceptAsync(Intercept intercept, RemoveInterceptOptions? options = null)
+    internal async Task<EmptyResult> RemoveInterceptAsync(Intercept intercept, RemoveInterceptOptions? options = null)
     {
         var @params = new RemoveInterceptCommandParameters(intercept);
 
-        await Broker.ExecuteCommandAsync(new RemoveInterceptCommand(@params), options).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync<RemoveInterceptCommand, EmptyResult>(new RemoveInterceptCommand(@params), options).ConfigureAwait(false);
     }
 
-    public async Task SetCacheBehaviorAsync(CacheBehavior behavior, SetCacheBehaviorOptions? options = null)
+    public async Task<EmptyResult> SetCacheBehaviorAsync(CacheBehavior behavior, SetCacheBehaviorOptions? options = null)
     {
         var @params = new SetCacheBehaviorCommandParameters(behavior, options?.Contexts);
 
-        await Broker.ExecuteCommandAsync(new SetCacheBehaviorCommand(@params), options).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync<SetCacheBehaviorCommand, EmptyResult>(new SetCacheBehaviorCommand(@params), options).ConfigureAwait(false);
     }
 
-    internal async Task ContinueRequestAsync(Request request, ContinueRequestOptions? options = null)
+    internal async Task<EmptyResult> ContinueRequestAsync(Request request, ContinueRequestOptions? options = null)
     {
         var @params = new ContinueRequestCommandParameters(request, options?.Body, options?.Cookies, options?.Headers, options?.Method, options?.Url);
 
-        await Broker.ExecuteCommandAsync(new ContinueRequestCommand(@params), options).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync<ContinueRequestCommand, EmptyResult>(new ContinueRequestCommand(@params), options).ConfigureAwait(false);
     }
 
-    internal async Task ContinueResponseAsync(Request request, ContinueResponseOptions? options = null)
+    internal async Task<EmptyResult> ContinueResponseAsync(Request request, ContinueResponseOptions? options = null)
     {
         var @params = new ContinueResponseCommandParameters(request, options?.Cookies, options?.Credentials, options?.Headers, options?.ReasonPhrase, options?.StatusCode);
 
-        await Broker.ExecuteCommandAsync(new ContinueResponseCommand(@params), options).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync<ContinueResponseCommand, EmptyResult>(new ContinueResponseCommand(@params), options).ConfigureAwait(false);
     }
 
-    internal async Task FailRequestAsync(Request request, FailRequestOptions? options = null)
+    internal async Task<EmptyResult> FailRequestAsync(Request request, FailRequestOptions? options = null)
     {
         var @params = new FailRequestCommandParameters(request);
 
-        await Broker.ExecuteCommandAsync(new FailRequestCommand(@params), options).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync<FailRequestCommand, EmptyResult>(new FailRequestCommand(@params), options).ConfigureAwait(false);
     }
 
-    internal async Task ProvideResponseAsync(Request request, ProvideResponseOptions? options = null)
+    internal async Task<EmptyResult> ProvideResponseAsync(Request request, ProvideResponseOptions? options = null)
     {
         var @params = new ProvideResponseCommandParameters(request, options?.Body, options?.Cookies, options?.Headers, options?.ReasonPhrase, options?.StatusCode);
 
-        await Broker.ExecuteCommandAsync(new ProvideResponseCommand(@params), options).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync<ProvideResponseCommand, EmptyResult>(new ProvideResponseCommand(@params), options).ConfigureAwait(false);
     }
 
-    internal async Task ContinueWithAuthAsync(Request request, AuthCredentials credentials, ContinueWithAuthCredentialsOptions? options = null)
+    internal async Task<EmptyResult> ContinueWithAuthAsync(Request request, AuthCredentials credentials, ContinueWithAuthCredentialsOptions? options = null)
     {
-        await Broker.ExecuteCommandAsync(new ContinueWithAuthCommand(new ContinueWithAuthCredentials(request, credentials)), options).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync<ContinueWithAuthCommand, EmptyResult>(new ContinueWithAuthCommand(new ContinueWithAuthCredentials(request, credentials)), options).ConfigureAwait(false);
     }
 
-    internal async Task ContinueWithAuthAsync(Request request, ContinueWithAuthDefaultCredentialsOptions? options = null)
+    internal async Task<EmptyResult> ContinueWithAuthAsync(Request request, ContinueWithAuthDefaultCredentialsOptions? options = null)
     {
-        await Broker.ExecuteCommandAsync(new ContinueWithAuthCommand(new ContinueWithAuthDefaultCredentials(request)), options).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync<ContinueWithAuthCommand, EmptyResult>(new ContinueWithAuthCommand(new ContinueWithAuthDefaultCredentials(request)), options).ConfigureAwait(false);
     }
 
-    internal async Task ContinueWithAuthAsync(Request request, ContinueWithAuthCancelCredentialsOptions? options = null)
+    internal async Task<EmptyResult> ContinueWithAuthAsync(Request request, ContinueWithAuthCancelCredentialsOptions? options = null)
     {
-        await Broker.ExecuteCommandAsync(new ContinueWithAuthCommand(new ContinueWithAuthCancelCredentials(request)), options).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync<ContinueWithAuthCommand, EmptyResult>(new ContinueWithAuthCommand(new ContinueWithAuthCancelCredentials(request)), options).ConfigureAwait(false);
     }
 
     public async Task<Subscription> OnBeforeRequestSentAsync(Func<BeforeRequestSentEventArgs, Task> handler, SubscriptionOptions? options = null)
diff --git a/dotnet/src/webdriver/BiDi/Script/ScriptModule.cs b/dotnet/src/webdriver/BiDi/Script/ScriptModule.cs
@@ -69,11 +69,11 @@ public async Task<PreloadScript> AddPreloadScriptAsync(string functionDeclaratio
         return result.Script;
     }
 
-    public async Task RemovePreloadScriptAsync(PreloadScript script, RemovePreloadScriptOptions? options = null)
+    public async Task<EmptyResult> RemovePreloadScriptAsync(PreloadScript script, RemovePreloadScriptOptions? options = null)
     {
         var @params = new RemovePreloadScriptCommandParameters(script);
 
-        await Broker.ExecuteCommandAsync(new RemovePreloadScriptCommand(@params), options).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync<RemovePreloadScriptCommand, EmptyResult>(new RemovePreloadScriptCommand(@params), options).ConfigureAwait(false);
     }
 
     public async Task<Subscription> OnMessageAsync(Func<MessageEventArgs, Task> handler, SubscriptionOptions? options = null)
diff --git a/dotnet/src/webdriver/BiDi/Session/SessionModule.cs b/dotnet/src/webdriver/BiDi/Session/SessionModule.cs

Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,9 @@ namespace OpenQA.Selenium.BiDi.Browser;`
`24`	`24`
`25`	`25`	`public sealed class BrowserModule(Broker broker) : Module(broker)`
`26`	`26`	`{`
`27`		`- public async Task CloseAsync(CloseOptions? options = null)`
	`27`	`+ public async Task<EmptyResult> CloseAsync(CloseOptions? options = null)`
`28`	`28`	`{`
`29`		`- await Broker.ExecuteCommandAsync(new CloseCommand(), options).ConfigureAwait(false);`
	`29`	`+ return await Broker.ExecuteCommandAsync<CloseCommand, EmptyResult>(new CloseCommand(), options).ConfigureAwait(false);`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`public async Task<UserContextInfo> CreateUserContextAsync(CreateUserContextOptions? options = null)`
`@@ -41,11 +41,11 @@ public async Task<GetUserContextsResult> GetUserContextsAsync(GetUserContextsOpt`
`41`	`41`	`return await Broker.ExecuteCommandAsync<GetUserContextsCommand, GetUserContextsResult>(new GetUserContextsCommand(), options).ConfigureAwait(false);`
`42`	`42`	`}`
`43`	`43`
`44`		`- public async Task RemoveUserContextAsync(UserContext userContext, RemoveUserContextOptions? options = null)`
	`44`	`+ public async Task<EmptyResult> RemoveUserContextAsync(UserContext userContext, RemoveUserContextOptions? options = null)`
`45`	`45`	`{`
`46`	`46`	`var @params = new RemoveUserContextCommandParameters(userContext);`
`47`	`47`
`48`		`- await Broker.ExecuteCommandAsync(new RemoveUserContextCommand(@params), options).ConfigureAwait(false);`
	`48`	`+ return await Broker.ExecuteCommandAsync<RemoveUserContextCommand, EmptyResult>(new RemoveUserContextCommand(@params), options).ConfigureAwait(false);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public async Task<GetClientWindowsResult> GetClientWindowsAsync(GetClientWindowsOptions? options = null)`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`
`20`	`20`	`using System.Threading.Tasks;`
`21`	`21`	`using System;`
	`22`	`+using OpenQA.Selenium.BiDi.Communication;`
`22`	`23`
`23`	`24`	`namespace OpenQA.Selenium.BiDi.BrowsingContext;`
`24`	`25`
`@@ -66,7 +67,7 @@ public Task<NavigateResult> ReloadAsync(ReloadOptions? options = null)`
`66`	`67`	`return BiDi.BrowsingContext.ReloadAsync(this, options);`
`67`	`68`	`}`
`68`	`69`
`69`		`- public Task ActivateAsync(ActivateOptions? options = null)`
	`70`	`+ public Task<EmptyResult> ActivateAsync(ActivateOptions? options = null)`
`70`	`71`	`{`
`71`	`72`	`return BiDi.BrowsingContext.ActivateAsync(this, options);`
`72`	`73`	`}`
`@@ -81,17 +82,17 @@ public Task<CaptureScreenshotResult> CaptureScreenshotAsync(CaptureScreenshotOpt`
`81`	`82`	`return BiDi.BrowsingContext.CaptureScreenshotAsync(this, options);`
`82`	`83`	`}`
`83`	`84`
`84`		`- public Task CloseAsync(CloseOptions? options = null)`
	`85`	`+ public Task<EmptyResult> CloseAsync(CloseOptions? options = null)`
`85`	`86`	`{`
`86`	`87`	`return BiDi.BrowsingContext.CloseAsync(this, options);`
`87`	`88`	`}`
`88`	`89`
`89`		`- public Task TraverseHistoryAsync(int delta, TraverseHistoryOptions? options = null)`
	`90`	`+ public Task<TraverseHistoryResult> TraverseHistoryAsync(int delta, TraverseHistoryOptions? options = null)`
`90`	`91`	`{`
`91`	`92`	`return BiDi.BrowsingContext.TraverseHistoryAsync(this, delta, options);`
`92`	`93`	`}`
`93`	`94`
`94`		`- public Task SetViewportAsync(SetViewportOptions? options = null)`
	`95`	`+ public Task<EmptyResult> SetViewportAsync(SetViewportOptions? options = null)`
`95`	`96`	`{`
`96`	`97`	`return BiDi.BrowsingContext.SetViewportAsync(this, options);`
`97`	`98`	`}`
`@@ -101,7 +102,7 @@ public Task<PrintResult> PrintAsync(PrintOptions? options = null)`
`101`	`102`	`return BiDi.BrowsingContext.PrintAsync(this, options);`
`102`	`103`	`}`
`103`	`104`
`104`		`- public Task HandleUserPromptAsync(HandleUserPromptOptions? options = null)`
	`105`	`+ public Task<EmptyResult> HandleUserPromptAsync(HandleUserPromptOptions? options = null)`
`105`	`106`	`{`
`106`	`107`	`return BiDi.BrowsingContext.HandleUserPromptAsync(this, options);`
`107`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,22 +20,23 @@`
`20`	`20`	`using System.Threading.Tasks;`
`21`	`21`	`using OpenQA.Selenium.BiDi.Input;`
`22`	`22`	`using System.Collections.Generic;`
	`23`	`+using OpenQA.Selenium.BiDi.Communication;`
`23`	`24`
`24`	`25`	`namespace OpenQA.Selenium.BiDi.BrowsingContext;`
`25`	`26`
`26`	`27`	`public sealed class BrowsingContextInputModule(BrowsingContext context, InputModule inputModule)`
`27`	`28`	`{`
`28`		`- public Task PerformActionsAsync(IEnumerable<SourceActions> actions, PerformActionsOptions? options = null)`
	`29`	`+ public Task<EmptyResult> PerformActionsAsync(IEnumerable<SourceActions> actions, PerformActionsOptions? options = null)`
`29`	`30`	`{`
`30`	`31`	`return inputModule.PerformActionsAsync(context, actions, options);`
`31`	`32`	`}`
`32`	`33`
`33`		`- public Task ReleaseActionsAsync(ReleaseActionsOptions? options = null)`
	`34`	`+ public Task<EmptyResult> ReleaseActionsAsync(ReleaseActionsOptions? options = null)`
`34`	`35`	`{`
`35`	`36`	`return inputModule.ReleaseActionsAsync(context, options);`
`36`	`37`	`}`
`37`	`38`
`38`		`- public Task SetFilesAsync(Script.ISharedReference element, IEnumerable<string> files, SetFilesOptions? options = null)`
	`39`	`+ public Task<EmptyResult> SetFilesAsync(Script.ISharedReference element, IEnumerable<string> files, SetFilesOptions? options = null)`
`39`	`40`	`{`
`40`	`41`	`return inputModule.SetFilesAsync(context, element, files, options);`
`41`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,11 +41,11 @@ public async Task<NavigateResult> NavigateAsync(BrowsingContext context, string`
`41`	`41`	`return await Broker.ExecuteCommandAsync<NavigateCommand, NavigateResult>(new NavigateCommand(@params), options).ConfigureAwait(false);`
`42`	`42`	`}`
`43`	`43`
`44`		`- public async Task ActivateAsync(BrowsingContext context, ActivateOptions? options = null)`
	`44`	`+ public async Task<EmptyResult> ActivateAsync(BrowsingContext context, ActivateOptions? options = null)`
`45`	`45`	`{`
`46`	`46`	`var @params = new ActivateCommandParameters(context);`
`47`	`47`
`48`		`- await Broker.ExecuteCommandAsync(new ActivateCommand(@params), options).ConfigureAwait(false);`
	`48`	`+ return await Broker.ExecuteCommandAsync<ActivateCommand, EmptyResult>(new ActivateCommand(@params), options).ConfigureAwait(false);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public async Task<LocateNodesResult> LocateNodesAsync(BrowsingContext context, Locator locator, LocateNodesOptions? options = null)`
`@@ -62,11 +62,11 @@ public async Task<CaptureScreenshotResult> CaptureScreenshotAsync(BrowsingContex`
`62`	`62`	`return await Broker.ExecuteCommandAsync<CaptureScreenshotCommand, CaptureScreenshotResult>(new CaptureScreenshotCommand(@params), options).ConfigureAwait(false);`
`63`	`63`	`}`
`64`	`64`
`65`		`- public async Task CloseAsync(BrowsingContext context, CloseOptions? options = null)`
	`65`	`+ public async Task<EmptyResult> CloseAsync(BrowsingContext context, CloseOptions? options = null)`
`66`	`66`	`{`
`67`	`67`	`var @params = new CloseCommandParameters(context, options?.PromptUnload);`
`68`	`68`
`69`		`- await Broker.ExecuteCommandAsync(new CloseCommand(@params), options).ConfigureAwait(false);`
	`69`	`+ return await Broker.ExecuteCommandAsync<CloseCommand, EmptyResult>(new CloseCommand(@params), options).ConfigureAwait(false);`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`public async Task<TraverseHistoryResult> TraverseHistoryAsync(BrowsingContext context, int delta, TraverseHistoryOptions? options = null)`
`@@ -83,11 +83,11 @@ public async Task<NavigateResult> ReloadAsync(BrowsingContext context, ReloadOpt`
`83`	`83`	`return await Broker.ExecuteCommandAsync<ReloadCommand, NavigateResult>(new ReloadCommand(@params), options).ConfigureAwait(false);`
`84`	`84`	`}`
`85`	`85`
`86`		`- public async Task SetViewportAsync(BrowsingContext context, SetViewportOptions? options = null)`
	`86`	`+ public async Task<EmptyResult> SetViewportAsync(BrowsingContext context, SetViewportOptions? options = null)`
`87`	`87`	`{`
`88`	`88`	`var @params = new SetViewportCommandParameters(context, options?.Viewport, options?.DevicePixelRatio);`
`89`	`89`
`90`		`- await Broker.ExecuteCommandAsync(new SetViewportCommand(@params), options).ConfigureAwait(false);`
	`90`	`+ return await Broker.ExecuteCommandAsync<SetViewportCommand, EmptyResult>(new SetViewportCommand(@params), options).ConfigureAwait(false);`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`public async Task<GetTreeResult> GetTreeAsync(GetTreeOptions? options = null)`
`@@ -104,11 +104,11 @@ public async Task<PrintResult> PrintAsync(BrowsingContext context, PrintOptions?`
`104`	`104`	`return await Broker.ExecuteCommandAsync<PrintCommand, PrintResult>(new PrintCommand(@params), options).ConfigureAwait(false);`
`105`	`105`	`}`
`106`	`106`
`107`		`- public async Task HandleUserPromptAsync(BrowsingContext context, HandleUserPromptOptions? options = null)`
	`107`	`+ public async Task<EmptyResult> HandleUserPromptAsync(BrowsingContext context, HandleUserPromptOptions? options = null)`
`108`	`108`	`{`
`109`	`109`	`var @params = new HandleUserPromptCommandParameters(context, options?.Accept, options?.UserText);`
`110`	`110`
`111`		`- await Broker.ExecuteCommandAsync(new HandleUserPromptCommand(@params), options).ConfigureAwait(false);`
	`111`	`+ return await Broker.ExecuteCommandAsync<HandleUserPromptCommand, EmptyResult>(new HandleUserPromptCommand(@params), options).ConfigureAwait(false);`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`public async Task<Subscription> OnNavigationStartedAsync(Func<NavigationInfo, Task> handler, BrowsingContextsSubscriptionOptions? options = null)`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`using System.Threading.Tasks;`
`21`	`21`	`using System;`
`22`	`22`	`using OpenQA.Selenium.BiDi.Network;`
	`23`	`+using OpenQA.Selenium.BiDi.Communication;`
`23`	`24`
`24`	`25`	`namespace OpenQA.Selenium.BiDi.BrowsingContext;`
`25`	`26`
`@@ -73,7 +74,7 @@ await intercept.OnAuthRequiredAsync(`
`73`	`74`	`return intercept;`
`74`	`75`	`}`
`75`	`76`
`76`		`- public Task SetCacheBehaviorAsync(CacheBehavior behavior, BrowsingContextSetCacheBehaviorOptions? options = null)`
	`77`	`+ public Task<EmptyResult> SetCacheBehaviorAsync(CacheBehavior behavior, BrowsingContextSetCacheBehaviorOptions? options = null)`
`77`	`78`	`{`
`78`	`79`	`SetCacheBehaviorOptions setCacheBehaviorOptions = new(options)`
`79`	`80`	`{`
Original file line number	Diff line number	Diff line change
`@@ -179,12 +179,6 @@ private async Task ProcessEventsAwaiterAsync()`
`179`	`179`	`}`
`180`	`180`	`}`
`181`	`181`
`182`		`- public async Task ExecuteCommandAsync<TCommand>(TCommand command, CommandOptions? options)`
`183`		`- where TCommand : Command`
`184`		`- {`
`185`		`- await ExecuteCommandCoreAsync(command, options).ConfigureAwait(false);`
`186`		`- }`
`187`		`-`
`188`	`182`	`public async Task<TResult> ExecuteCommandAsync<TCommand, TResult>(TCommand command, CommandOptions? options)`
`189`	`183`	`where TCommand : Command`
`190`	`184`	`where TResult : EmptyResult`
Original file line number	Diff line number	Diff line change
`@@ -25,24 +25,24 @@ namespace OpenQA.Selenium.BiDi.Input;`
`25`	`25`
`26`	`26`	`public sealed class InputModule(Broker broker) : Module(broker)`
`27`	`27`	`{`
`28`		`- public async Task PerformActionsAsync(BrowsingContext.BrowsingContext context, IEnumerable<SourceActions> actions, PerformActionsOptions? options = null)`
	`28`	`+ public async Task<EmptyResult> PerformActionsAsync(BrowsingContext.BrowsingContext context, IEnumerable<SourceActions> actions, PerformActionsOptions? options = null)`
`29`	`29`	`{`
`30`	`30`	`var @params = new PerformActionsCommandParameters(context, actions);`
`31`	`31`
`32`		`- await Broker.ExecuteCommandAsync(new PerformActionsCommand(@params), options).ConfigureAwait(false);`
	`32`	`+ return await Broker.ExecuteCommandAsync<PerformActionsCommand, EmptyResult>(new PerformActionsCommand(@params), options).ConfigureAwait(false);`
`33`	`33`	`}`
`34`	`34`
`35`		`- public async Task ReleaseActionsAsync(BrowsingContext.BrowsingContext context, ReleaseActionsOptions? options = null)`
	`35`	`+ public async Task<EmptyResult> ReleaseActionsAsync(BrowsingContext.BrowsingContext context, ReleaseActionsOptions? options = null)`
`36`	`36`	`{`
`37`	`37`	`var @params = new ReleaseActionsCommandParameters(context);`
`38`	`38`
`39`		`- await Broker.ExecuteCommandAsync(new ReleaseActionsCommand(@params), options).ConfigureAwait(false);`
	`39`	`+ return await Broker.ExecuteCommandAsync<ReleaseActionsCommand, EmptyResult>(new ReleaseActionsCommand(@params), options).ConfigureAwait(false);`
`40`	`40`	`}`
`41`	`41`
`42`		`- public async Task SetFilesAsync(BrowsingContext.BrowsingContext context, Script.ISharedReference element, IEnumerable<string> files, SetFilesOptions? options = null)`
	`42`	`+ public async Task<EmptyResult> SetFilesAsync(BrowsingContext.BrowsingContext context, Script.ISharedReference element, IEnumerable<string> files, SetFilesOptions? options = null)`
`43`	`43`	`{`
`44`	`44`	`var @params = new SetFilesCommandParameters(context, element, files);`
`45`	`45`
`46`		`- await Broker.ExecuteCommandAsync(new SetFilesCommand(@params), options).ConfigureAwait(false);`
	`46`	`+ return await Broker.ExecuteCommandAsync<SetFilesCommand, EmptyResult>(new SetFilesCommand(@params), options).ConfigureAwait(false);`
`47`	`47`	`}`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,61 +35,61 @@ internal async Task<Intercept> AddInterceptAsync(IEnumerable<InterceptPhase> pha`
`35`	`35`	`return result.Intercept;`
`36`	`36`	`}`
`37`	`37`
`38`		`- internal async Task RemoveInterceptAsync(Intercept intercept, RemoveInterceptOptions? options = null)`
	`38`	`+ internal async Task<EmptyResult> RemoveInterceptAsync(Intercept intercept, RemoveInterceptOptions? options = null)`
`39`	`39`	`{`
`40`	`40`	`var @params = new RemoveInterceptCommandParameters(intercept);`
`41`	`41`
`42`		`- await Broker.ExecuteCommandAsync(new RemoveInterceptCommand(@params), options).ConfigureAwait(false);`
	`42`	`+ return await Broker.ExecuteCommandAsync<RemoveInterceptCommand, EmptyResult>(new RemoveInterceptCommand(@params), options).ConfigureAwait(false);`
`43`	`43`	`}`
`44`	`44`
`45`		`- public async Task SetCacheBehaviorAsync(CacheBehavior behavior, SetCacheBehaviorOptions? options = null)`
	`45`	`+ public async Task<EmptyResult> SetCacheBehaviorAsync(CacheBehavior behavior, SetCacheBehaviorOptions? options = null)`
`46`	`46`	`{`
`47`	`47`	`var @params = new SetCacheBehaviorCommandParameters(behavior, options?.Contexts);`
`48`	`48`
`49`		`- await Broker.ExecuteCommandAsync(new SetCacheBehaviorCommand(@params), options).ConfigureAwait(false);`
	`49`	`+ return await Broker.ExecuteCommandAsync<SetCacheBehaviorCommand, EmptyResult>(new SetCacheBehaviorCommand(@params), options).ConfigureAwait(false);`
`50`	`50`	`}`
`51`	`51`
`52`		`- internal async Task ContinueRequestAsync(Request request, ContinueRequestOptions? options = null)`
	`52`	`+ internal async Task<EmptyResult> ContinueRequestAsync(Request request, ContinueRequestOptions? options = null)`
`53`	`53`	`{`
`54`	`54`	`var @params = new ContinueRequestCommandParameters(request, options?.Body, options?.Cookies, options?.Headers, options?.Method, options?.Url);`
`55`	`55`
`56`		`- await Broker.ExecuteCommandAsync(new ContinueRequestCommand(@params), options).ConfigureAwait(false);`
	`56`	`+ return await Broker.ExecuteCommandAsync<ContinueRequestCommand, EmptyResult>(new ContinueRequestCommand(@params), options).ConfigureAwait(false);`
`57`	`57`	`}`
`58`	`58`
`59`		`- internal async Task ContinueResponseAsync(Request request, ContinueResponseOptions? options = null)`
	`59`	`+ internal async Task<EmptyResult> ContinueResponseAsync(Request request, ContinueResponseOptions? options = null)`
`60`	`60`	`{`
`61`	`61`	`var @params = new ContinueResponseCommandParameters(request, options?.Cookies, options?.Credentials, options?.Headers, options?.ReasonPhrase, options?.StatusCode);`
`62`	`62`
`63`		`- await Broker.ExecuteCommandAsync(new ContinueResponseCommand(@params), options).ConfigureAwait(false);`
	`63`	`+ return await Broker.ExecuteCommandAsync<ContinueResponseCommand, EmptyResult>(new ContinueResponseCommand(@params), options).ConfigureAwait(false);`
`64`	`64`	`}`
`65`	`65`
`66`		`- internal async Task FailRequestAsync(Request request, FailRequestOptions? options = null)`
	`66`	`+ internal async Task<EmptyResult> FailRequestAsync(Request request, FailRequestOptions? options = null)`
`67`	`67`	`{`
`68`	`68`	`var @params = new FailRequestCommandParameters(request);`
`69`	`69`
`70`		`- await Broker.ExecuteCommandAsync(new FailRequestCommand(@params), options).ConfigureAwait(false);`
	`70`	`+ return await Broker.ExecuteCommandAsync<FailRequestCommand, EmptyResult>(new FailRequestCommand(@params), options).ConfigureAwait(false);`
`71`	`71`	`}`
`72`	`72`
`73`		`- internal async Task ProvideResponseAsync(Request request, ProvideResponseOptions? options = null)`
	`73`	`+ internal async Task<EmptyResult> ProvideResponseAsync(Request request, ProvideResponseOptions? options = null)`
`74`	`74`	`{`
`75`	`75`	`var @params = new ProvideResponseCommandParameters(request, options?.Body, options?.Cookies, options?.Headers, options?.ReasonPhrase, options?.StatusCode);`
`76`	`76`
`77`		`- await Broker.ExecuteCommandAsync(new ProvideResponseCommand(@params), options).ConfigureAwait(false);`
	`77`	`+ return await Broker.ExecuteCommandAsync<ProvideResponseCommand, EmptyResult>(new ProvideResponseCommand(@params), options).ConfigureAwait(false);`
`78`	`78`	`}`
`79`	`79`
`80`		`- internal async Task ContinueWithAuthAsync(Request request, AuthCredentials credentials, ContinueWithAuthCredentialsOptions? options = null)`
	`80`	`+ internal async Task<EmptyResult> ContinueWithAuthAsync(Request request, AuthCredentials credentials, ContinueWithAuthCredentialsOptions? options = null)`
`81`	`81`	`{`
`82`		`- await Broker.ExecuteCommandAsync(new ContinueWithAuthCommand(new ContinueWithAuthCredentials(request, credentials)), options).ConfigureAwait(false);`
	`82`	`+ return await Broker.ExecuteCommandAsync<ContinueWithAuthCommand, EmptyResult>(new ContinueWithAuthCommand(new ContinueWithAuthCredentials(request, credentials)), options).ConfigureAwait(false);`
`83`	`83`	`}`
`84`	`84`
`85`		`- internal async Task ContinueWithAuthAsync(Request request, ContinueWithAuthDefaultCredentialsOptions? options = null)`
	`85`	`+ internal async Task<EmptyResult> ContinueWithAuthAsync(Request request, ContinueWithAuthDefaultCredentialsOptions? options = null)`
`86`	`86`	`{`
`87`		`- await Broker.ExecuteCommandAsync(new ContinueWithAuthCommand(new ContinueWithAuthDefaultCredentials(request)), options).ConfigureAwait(false);`
	`87`	`+ return await Broker.ExecuteCommandAsync<ContinueWithAuthCommand, EmptyResult>(new ContinueWithAuthCommand(new ContinueWithAuthDefaultCredentials(request)), options).ConfigureAwait(false);`
`88`	`88`	`}`
`89`	`89`
`90`		`- internal async Task ContinueWithAuthAsync(Request request, ContinueWithAuthCancelCredentialsOptions? options = null)`
	`90`	`+ internal async Task<EmptyResult> ContinueWithAuthAsync(Request request, ContinueWithAuthCancelCredentialsOptions? options = null)`
`91`	`91`	`{`
`92`		`- await Broker.ExecuteCommandAsync(new ContinueWithAuthCommand(new ContinueWithAuthCancelCredentials(request)), options).ConfigureAwait(false);`
	`92`	`+ return await Broker.ExecuteCommandAsync<ContinueWithAuthCommand, EmptyResult>(new ContinueWithAuthCommand(new ContinueWithAuthCancelCredentials(request)), options).ConfigureAwait(false);`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`public async Task<Subscription> OnBeforeRequestSentAsync(Func<BeforeRequestSentEventArgs, Task> handler, SubscriptionOptions? options = null)`
Original file line number	Diff line number	Diff line change
`@@ -69,11 +69,11 @@ public async Task<PreloadScript> AddPreloadScriptAsync(string functionDeclaratio`
`69`	`69`	`return result.Script;`
`70`	`70`	`}`
`71`	`71`
`72`		`- public async Task RemovePreloadScriptAsync(PreloadScript script, RemovePreloadScriptOptions? options = null)`
	`72`	`+ public async Task<EmptyResult> RemovePreloadScriptAsync(PreloadScript script, RemovePreloadScriptOptions? options = null)`
`73`	`73`	`{`
`74`	`74`	`var @params = new RemovePreloadScriptCommandParameters(script);`
`75`	`75`
`76`		`- await Broker.ExecuteCommandAsync(new RemovePreloadScriptCommand(@params), options).ConfigureAwait(false);`
	`76`	`+ return await Broker.ExecuteCommandAsync<RemovePreloadScriptCommand, EmptyResult>(new RemovePreloadScriptCommand(@params), options).ConfigureAwait(false);`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`public async Task<Subscription> OnMessageAsync(Func<MessageEventArgs, Task> handler, SubscriptionOptions? options = null)`