[dotnet] [bidi] Combine network interception to apply rules

Author: nvborisenko

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

@@ -0,0 +1,59 @@
+// <copyright file="NetworkModule.HighLevel.cs" company="Selenium Committers">
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+// </copyright>
+
+using System;
+using System.Threading.Tasks;
+
+namespace OpenQA.Selenium.BiDi.Modules.Network;
+
+public partial class NetworkModule
+{
+    public async Task<Intercept> InterceptRequestAsync(Func<BeforeRequestSentEventArgs, Task> handler, InterceptRequestOptions? options = null)
+    {
+        var intercept = await AddInterceptAsync([InterceptPhase.BeforeRequestSent], options).ConfigureAwait(false);
+
+        await intercept.OnBeforeRequestSentAsync(handler).ConfigureAwait(false);
+
+        return intercept;
+    }
+
+    public async Task<Intercept> InterceptResponseAsync(Func<ResponseStartedEventArgs, Task> handler, InterceptResponseOptions? options = null)
+    {
+        var intercept = await AddInterceptAsync([InterceptPhase.ResponseStarted], options).ConfigureAwait(false);
+
+        await intercept.OnResponseStartedAsync(handler).ConfigureAwait(false);
+
+        return intercept;
+    }
+
+    public async Task<Intercept> InterceptAuthAsync(Func<AuthRequiredEventArgs, Task> handler, InterceptAuthOptions? options = null)
+    {
+        var intercept = await AddInterceptAsync([InterceptPhase.AuthRequired], options).ConfigureAwait(false);
+
+        await intercept.OnAuthRequiredAsync(handler).ConfigureAwait(false);
+
+        return intercept;
+    }
+}
+
+public record InterceptRequestOptions : AddInterceptOptions;
+
+public record InterceptResponseOptions : AddInterceptOptions;
+
+public record InterceptAuthOptions : AddInterceptOptions;

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

@@ -24,7 +24,7 @@
 
 namespace OpenQA.Selenium.BiDi.Modules.Network;
 
-public sealed class NetworkModule(Broker broker) : Module(broker)
+public sealed partial class NetworkModule(Broker broker) : Module(broker)
 {
     internal async Task<Intercept> AddInterceptAsync(IEnumerable<InterceptPhase> phases, AddInterceptOptions? options = null)
     {
@@ -42,40 +42,13 @@ internal async Task RemoveInterceptAsync(Intercept intercept, RemoveInterceptOpt
         await Broker.ExecuteCommandAsync(new RemoveInterceptCommand(@params), options).ConfigureAwait(false);
     }
 
-    public async Task<Intercept> InterceptRequestAsync(Func<BeforeRequestSentEventArgs, Task> handler, AddInterceptOptions? interceptOptions = null, SubscriptionOptions? options = null)
-    {
-        var intercept = await AddInterceptAsync([InterceptPhase.BeforeRequestSent], interceptOptions).ConfigureAwait(false);
-
-        await intercept.OnBeforeRequestSentAsync(handler, options).ConfigureAwait(false);
-
-        return intercept;
-    }
-
-    public async Task<Intercept> InterceptResponseAsync(Func<ResponseStartedEventArgs, Task> handler, AddInterceptOptions? interceptOptions = null, SubscriptionOptions? options = null)
-    {
-        var intercept = await AddInterceptAsync([InterceptPhase.ResponseStarted], interceptOptions).ConfigureAwait(false);
-
-        await intercept.OnResponseStartedAsync(handler, options).ConfigureAwait(false);
-
-        return intercept;
-    }
-
     public async Task SetCacheBehaviorAsync(CacheBehavior behavior, SetCacheBehaviorOptions? options = null)
     {
         var @params = new SetCacheBehaviorCommandParameters(behavior, options?.Contexts);
 
         await Broker.ExecuteCommandAsync(new SetCacheBehaviorCommand(@params), options).ConfigureAwait(false);
     }
 
-    public async Task<Intercept> InterceptAuthAsync(Func<AuthRequiredEventArgs, Task> handler, AddInterceptOptions? interceptOptions = null, SubscriptionOptions? options = null)
-    {
-        var intercept = await AddInterceptAsync([InterceptPhase.AuthRequired], interceptOptions).ConfigureAwait(false);
-
-        await intercept.OnAuthRequiredAsync(handler, options).ConfigureAwait(false);
-
-        return intercept;
-    }
-
     internal async Task ContinueRequestAsync(Request request, ContinueRequestOptions? options = null)
     {
         var @params = new ContinueRequestCommandParameters(request, options?.Body, options?.Cookies, options?.Headers, options?.Method, options?.Url);

dotnet/test/common/BiDi/Network/NetworkTest.cs

@@ -51,7 +51,7 @@ public async Task CanAddInterceptStringUrlPattern()
     [Test]
     public async Task CanAddInterceptUrlPattern()
     {
-        await using var intercept = await bidi.Network.InterceptRequestAsync(e => Task.CompletedTask, interceptOptions: new()
+        await using var intercept = await bidi.Network.InterceptRequestAsync(e => Task.CompletedTask, options: new()
         {
             UrlPatterns = [new PatternUrlPattern()
             {