Network

Author: nvborisenko

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

@@ -137,16 +137,25 @@ namespace OpenQA.Selenium.BiDi.Communication.Json;
 [JsonSerializable(typeof(Network.AddInterceptCommand))]
 [JsonSerializable(typeof(Network.AddInterceptResult))]
 [JsonSerializable(typeof(Network.ContinueRequestCommand))]
+[JsonSerializable(typeof(Network.ContinueRequestResult))]
 [JsonSerializable(typeof(Network.ContinueResponseCommand))]
+[JsonSerializable(typeof(Network.ContinueResponseResult))]
 [JsonSerializable(typeof(Network.ContinueWithAuthCommand))]
+[JsonSerializable(typeof(Network.ContinueWithAuthResult))]
 [JsonSerializable(typeof(Network.FailRequestCommand))]
+[JsonSerializable(typeof(Network.FailRequestResult))]
 [JsonSerializable(typeof(Network.GetDataCommand))]
 [JsonSerializable(typeof(Network.GetDataResult))]
 [JsonSerializable(typeof(Network.ProvideResponseCommand))]
+[JsonSerializable(typeof(Network.ProvideResponseResult))]
 [JsonSerializable(typeof(Network.RemoveDataCollectorCommand))]
+[JsonSerializable(typeof(Network.RemoveDataCollectorResult))]
 [JsonSerializable(typeof(Network.RemoveInterceptCommand))]
+[JsonSerializable(typeof(Network.RemoveInterceptResult))]
 [JsonSerializable(typeof(Network.SetCacheBehaviorCommand))]
+[JsonSerializable(typeof(Network.SetCacheBehaviorResult))]
 [JsonSerializable(typeof(Network.SetExtraHeadersCommand))]
+[JsonSerializable(typeof(Network.SetExtraHeadersResult))]
 
 [JsonSerializable(typeof(Network.BeforeRequestSentEventArgs))]
 [JsonSerializable(typeof(Network.ResponseStartedEventArgs))]

dotnet/src/webdriver/BiDi/Network/ContinueRequestCommand.cs

@@ -23,7 +23,7 @@
 namespace OpenQA.Selenium.BiDi.Network;
 
 internal sealed class ContinueRequestCommand(ContinueRequestParameters @params)
-    : Command<ContinueRequestParameters, EmptyResult>(@params, "network.continueRequest");
+    : Command<ContinueRequestParameters, ContinueRequestResult>(@params, "network.continueRequest");
 
 internal sealed record ContinueRequestParameters(Request Request, BytesValue? Body, IEnumerable<CookieHeader>? Cookies, IEnumerable<Header>? Headers, string? Method, string? Url) : Parameters;
 
@@ -39,3 +39,5 @@ public sealed class ContinueRequestOptions : CommandOptions
 
     public string? Url { get; set; }
 }
+
+public sealed record ContinueRequestResult : EmptyResult;

dotnet/src/webdriver/BiDi/Network/ContinueResponseCommand.cs

@@ -23,7 +23,7 @@
 namespace OpenQA.Selenium.BiDi.Network;
 
 internal sealed class ContinueResponseCommand(ContinueResponseParameters @params)
-    : Command<ContinueResponseParameters, EmptyResult>(@params, "network.continueResponse");
+    : Command<ContinueResponseParameters, ContinueResponseResult>(@params, "network.continueResponse");
 
 internal sealed record ContinueResponseParameters(Request Request, IEnumerable<SetCookieHeader>? Cookies, IEnumerable<AuthCredentials>? Credentials, IEnumerable<Header>? Headers, string? ReasonPhrase, long? StatusCode) : Parameters;
 
@@ -39,3 +39,5 @@ public sealed class ContinueResponseOptions : CommandOptions
 
     public long? StatusCode { get; set; }
 }
+
+public sealed record ContinueResponseResult : EmptyResult;

dotnet/src/webdriver/BiDi/Network/ContinueWithAuthCommand.cs

@@ -23,7 +23,7 @@
 namespace OpenQA.Selenium.BiDi.Network;
 
 internal class ContinueWithAuthCommand(ContinueWithAuthParameters @params)
-    : Command<ContinueWithAuthParameters, EmptyResult>(@params, "network.continueWithAuth");
+    : Command<ContinueWithAuthParameters, ContinueWithAuthResult>(@params, "network.continueWithAuth");
 
 [JsonPolymorphic(TypeDiscriminatorPropertyName = "action")]
 [JsonDerivedType(typeof(ContinueWithAuthCredentials), "provideCredentials")]
@@ -49,3 +49,4 @@ public sealed class ContinueWithAuthDefaultCredentialsOptions : ContinueWithAuth
 
 public sealed class ContinueWithAuthCancelCredentialsOptions : ContinueWithAuthNoCredentialsOptions;
 
+public sealed record ContinueWithAuthResult : EmptyResult;

dotnet/src/webdriver/BiDi/Network/FailRequestCommand.cs

@@ -22,8 +22,10 @@
 namespace OpenQA.Selenium.BiDi.Network;
 
 internal sealed class FailRequestCommand(FailRequestParameters @params)
-    : Command<FailRequestParameters, EmptyResult>(@params, "network.failRequest");
+    : Command<FailRequestParameters, FailRequestResult>(@params, "network.failRequest");
 
 internal sealed record FailRequestParameters(Request Request) : Parameters;
 
 public sealed class FailRequestOptions : CommandOptions;
+
+public sealed record FailRequestResult : EmptyResult;

dotnet/src/webdriver/BiDi/Network/NetworkModule.cs

@@ -44,53 +44,53 @@ public async Task<Intercept> AddInterceptAsync(IEnumerable<InterceptPhase> phase
         return result.Intercept;
     }
 
-    public async Task<EmptyResult> RemoveDataCollectorAsync(Collector collector, RemoveDataCollectorOptions? options = null)
+    public async Task<RemoveDataCollectorResult> RemoveDataCollectorAsync(Collector collector, RemoveDataCollectorOptions? options = null)
     {
         var @params = new RemoveDataCollectorParameters(collector);
 
-        return await Broker.ExecuteCommandAsync(new RemoveDataCollectorCommand(@params), options, JsonContext.RemoveDataCollectorCommand, JsonContext.EmptyResult).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync(new RemoveDataCollectorCommand(@params), options, JsonContext.RemoveDataCollectorCommand, JsonContext.RemoveDataCollectorResult).ConfigureAwait(false);
     }
 
-    public async Task<EmptyResult> RemoveInterceptAsync(Intercept intercept, RemoveInterceptOptions? options = null)
+    public async Task<RemoveInterceptResult> RemoveInterceptAsync(Intercept intercept, RemoveInterceptOptions? options = null)
     {
         var @params = new RemoveInterceptParameters(intercept);
 
-        return await Broker.ExecuteCommandAsync(new RemoveInterceptCommand(@params), options, JsonContext.RemoveInterceptCommand, JsonContext.EmptyResult).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync(new RemoveInterceptCommand(@params), options, JsonContext.RemoveInterceptCommand, JsonContext.RemoveInterceptResult).ConfigureAwait(false);
     }
 
-    public async Task<EmptyResult> SetCacheBehaviorAsync(CacheBehavior behavior, SetCacheBehaviorOptions? options = null)
+    public async Task<SetCacheBehaviorResult> SetCacheBehaviorAsync(CacheBehavior behavior, SetCacheBehaviorOptions? options = null)
     {
         var @params = new SetCacheBehaviorParameters(behavior, options?.Contexts);
 
-        return await Broker.ExecuteCommandAsync(new SetCacheBehaviorCommand(@params), options, JsonContext.SetCacheBehaviorCommand, JsonContext.EmptyResult).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync(new SetCacheBehaviorCommand(@params), options, JsonContext.SetCacheBehaviorCommand, JsonContext.SetCacheBehaviorResult).ConfigureAwait(false);
     }
 
-    public async Task<EmptyResult> SetExtraHeadersAsync(IEnumerable<Header> headers, SetExtraHeadersOptions? options = null)
+    public async Task<SetExtraHeadersResult> SetExtraHeadersAsync(IEnumerable<Header> headers, SetExtraHeadersOptions? options = null)
     {
         var @params = new SetExtraHeadersParameters(headers, options?.Contexts, options?.UserContexts);
 
-        return await Broker.ExecuteCommandAsync(new SetExtraHeadersCommand(@params), options, JsonContext.SetExtraHeadersCommand, JsonContext.EmptyResult).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync(new SetExtraHeadersCommand(@params), options, JsonContext.SetExtraHeadersCommand, JsonContext.SetExtraHeadersResult).ConfigureAwait(false);
     }
 
-    public async Task<EmptyResult> ContinueRequestAsync(Request request, ContinueRequestOptions? options = null)
+    public async Task<ContinueRequestResult> ContinueRequestAsync(Request request, ContinueRequestOptions? options = null)
     {
         var @params = new ContinueRequestParameters(request, options?.Body, options?.Cookies, options?.Headers, options?.Method, options?.Url);
 
-        return await Broker.ExecuteCommandAsync(new ContinueRequestCommand(@params), options, JsonContext.ContinueRequestCommand, JsonContext.EmptyResult).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync(new ContinueRequestCommand(@params), options, JsonContext.ContinueRequestCommand, JsonContext.ContinueRequestResult).ConfigureAwait(false);
     }
 
-    public async Task<EmptyResult> ContinueResponseAsync(Request request, ContinueResponseOptions? options = null)
+    public async Task<ContinueResponseResult> ContinueResponseAsync(Request request, ContinueResponseOptions? options = null)
     {
         var @params = new ContinueResponseParameters(request, options?.Cookies, options?.Credentials, options?.Headers, options?.ReasonPhrase, options?.StatusCode);
 
-        return await Broker.ExecuteCommandAsync(new ContinueResponseCommand(@params), options, JsonContext.ContinueResponseCommand, JsonContext.EmptyResult).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync(new ContinueResponseCommand(@params), options, JsonContext.ContinueResponseCommand, JsonContext.ContinueResponseResult).ConfigureAwait(false);
     }
 
-    public async Task<EmptyResult> FailRequestAsync(Request request, FailRequestOptions? options = null)
+    public async Task<FailRequestResult> FailRequestAsync(Request request, FailRequestOptions? options = null)
     {
         var @params = new FailRequestParameters(request);
 
-        return await Broker.ExecuteCommandAsync(new FailRequestCommand(@params), options, JsonContext.FailRequestCommand, JsonContext.EmptyResult).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync(new FailRequestCommand(@params), options, JsonContext.FailRequestCommand, JsonContext.FailRequestResult).ConfigureAwait(false);
     }
 
     public async Task<BytesValue> GetDataAsync(DataType dataType, Request request, GetDataOptions? options = null)
@@ -102,26 +102,26 @@ public async Task<BytesValue> GetDataAsync(DataType dataType, Request request, G
         return result.Bytes;
     }
 
-    public async Task<EmptyResult> ProvideResponseAsync(Request request, ProvideResponseOptions? options = null)
+    public async Task<ProvideResponseResult> ProvideResponseAsync(Request request, ProvideResponseOptions? options = null)
     {
         var @params = new ProvideResponseParameters(request, options?.Body, options?.Cookies, options?.Headers, options?.ReasonPhrase, options?.StatusCode);
 
-        return await Broker.ExecuteCommandAsync(new ProvideResponseCommand(@params), options, JsonContext.ProvideResponseCommand, JsonContext.EmptyResult).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync(new ProvideResponseCommand(@params), options, JsonContext.ProvideResponseCommand, JsonContext.ProvideResponseResult).ConfigureAwait(false);
     }
 
-    public async Task<EmptyResult> ContinueWithAuthAsync(Request request, AuthCredentials credentials, ContinueWithAuthCredentialsOptions? options = null)
+    public async Task<ContinueWithAuthResult> ContinueWithAuthAsync(Request request, AuthCredentials credentials, ContinueWithAuthCredentialsOptions? options = null)
     {
-        return await Broker.ExecuteCommandAsync(new ContinueWithAuthCommand(new ContinueWithAuthCredentials(request, credentials)), options, JsonContext.ContinueWithAuthCommand, JsonContext.EmptyResult).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync(new ContinueWithAuthCommand(new ContinueWithAuthCredentials(request, credentials)), options, JsonContext.ContinueWithAuthCommand, JsonContext.ContinueWithAuthResult).ConfigureAwait(false);
     }
 
-    public async Task<EmptyResult> ContinueWithAuthAsync(Request request, ContinueWithAuthDefaultCredentialsOptions? options = null)
+    public async Task<ContinueWithAuthResult> ContinueWithAuthAsync(Request request, ContinueWithAuthDefaultCredentialsOptions? options = null)
     {
-        return await Broker.ExecuteCommandAsync(new ContinueWithAuthCommand(new ContinueWithAuthDefaultCredentials(request)), options, JsonContext.ContinueWithAuthCommand, JsonContext.EmptyResult).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync(new ContinueWithAuthCommand(new ContinueWithAuthDefaultCredentials(request)), options, JsonContext.ContinueWithAuthCommand, JsonContext.ContinueWithAuthResult).ConfigureAwait(false);
     }
 
-    public async Task<EmptyResult> ContinueWithAuthAsync(Request request, ContinueWithAuthCancelCredentialsOptions? options = null)
+    public async Task<ContinueWithAuthResult> ContinueWithAuthAsync(Request request, ContinueWithAuthCancelCredentialsOptions? options = null)
     {
-        return await Broker.ExecuteCommandAsync(new ContinueWithAuthCommand(new ContinueWithAuthCancelCredentials(request)), options, JsonContext.ContinueWithAuthCommand, JsonContext.EmptyResult).ConfigureAwait(false);
+        return await Broker.ExecuteCommandAsync(new ContinueWithAuthCommand(new ContinueWithAuthCancelCredentials(request)), options, JsonContext.ContinueWithAuthCommand, JsonContext.ContinueWithAuthResult).ConfigureAwait(false);
     }
 
     public async Task<Subscription> OnBeforeRequestSentAsync(Func<BeforeRequestSentEventArgs, Task> handler, SubscriptionOptions? options = null)

dotnet/src/webdriver/BiDi/Network/ProvideResponseCommand.cs

@@ -23,7 +23,7 @@
 namespace OpenQA.Selenium.BiDi.Network;
 
 internal sealed class ProvideResponseCommand(ProvideResponseParameters @params)
-    : Command<ProvideResponseParameters, EmptyResult>(@params, "network.provideResponse");
+    : Command<ProvideResponseParameters, ProvideResponseResult>(@params, "network.provideResponse");
 
 internal sealed record ProvideResponseParameters(Request Request, BytesValue? Body, IEnumerable<SetCookieHeader>? Cookies, IEnumerable<Header>? Headers, string? ReasonPhrase, long? StatusCode) : Parameters;
 
@@ -39,3 +39,5 @@ public sealed class ProvideResponseOptions : CommandOptions
 
     public long? StatusCode { get; set; }
 }
+
+public sealed record ProvideResponseResult : EmptyResult;

dotnet/src/webdriver/BiDi/Network/RemoveDataCollectorCommand.cs

@@ -22,8 +22,10 @@
 namespace OpenQA.Selenium.BiDi.Network;
 
 internal sealed class RemoveDataCollectorCommand(RemoveDataCollectorParameters @params)
-    : Command<RemoveDataCollectorParameters, EmptyResult>(@params, "network.removeDataCollector");
+    : Command<RemoveDataCollectorParameters, RemoveDataCollectorResult>(@params, "network.removeDataCollector");
 
 internal sealed record RemoveDataCollectorParameters(Collector Collector) : Parameters;
 
 public class RemoveDataCollectorOptions : CommandOptions;
+
+public sealed record RemoveDataCollectorResult : EmptyResult;

dotnet/src/webdriver/BiDi/Network/RemoveInterceptCommand.cs

@@ -22,8 +22,10 @@
 namespace OpenQA.Selenium.BiDi.Network;
 
 internal sealed class RemoveInterceptCommand(RemoveInterceptParameters @params)
-    : Command<RemoveInterceptParameters, EmptyResult>(@params, "network.removeIntercept");
+    : Command<RemoveInterceptParameters, RemoveInterceptResult>(@params, "network.removeIntercept");
 
 internal sealed record RemoveInterceptParameters(Intercept Intercept) : Parameters;
 
 public class RemoveInterceptOptions : CommandOptions;
+
+public sealed record RemoveInterceptResult : EmptyResult;

dotnet/src/webdriver/BiDi/Network/SetCacheBehaviorCommand.cs

@@ -25,7 +25,7 @@
 namespace OpenQA.Selenium.BiDi.Network;
 
 internal sealed class SetCacheBehaviorCommand(SetCacheBehaviorParameters @params)
-    : Command<SetCacheBehaviorParameters, EmptyResult>(@params, "network.setCacheBehavior");
+    : Command<SetCacheBehaviorParameters, SetCacheBehaviorResult>(@params, "network.setCacheBehavior");
 
 internal sealed record SetCacheBehaviorParameters(CacheBehavior CacheBehavior, IEnumerable<BrowsingContext.BrowsingContext>? Contexts) : Parameters;
 
@@ -52,3 +52,5 @@ public enum CacheBehavior
     Default,
     Bypass
 }
+
+public sealed record SetCacheBehaviorResult : EmptyResult;