Smooth transition

Author: nvborisenko

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

@@ -277,7 +277,27 @@ public async Task UnsubscribeAsync(Modules.Session.Subscription subscription, Ev
 
         eventHandlers.Remove(eventHandler);
 
-        await _bidi.SessionModule.UnsubscribeAsync([subscription]).ConfigureAwait(false);
+        if (subscription is not null)
+        {
+            await _bidi.SessionModule.UnsubscribeAsync([subscription]).ConfigureAwait(false);
+        }
+        else
+        {
+            if (eventHandler.Contexts is not null)
+            {
+                if (!eventHandlers.Any(h => eventHandler.Contexts.Equals(h.Contexts)) && !eventHandlers.Any(h => h.Contexts is null))
+                {
+                    await _bidi.SessionModule.UnsubscribeAsync([eventHandler.EventName], new() { Contexts = eventHandler.Contexts }).ConfigureAwait(false);
+                }
+            }
+            else
+            {
+                if (!eventHandlers.Any(h => h.Contexts is not null) && !eventHandlers.Any(h => h.Contexts is null))
+                {
+                    await _bidi.SessionModule.UnsubscribeAsync([eventHandler.EventName]).ConfigureAwait(false);
+                }
+            }
+        }
     }
 
     public async ValueTask DisposeAsync()

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

@@ -44,13 +44,22 @@ public async Task<SubscribeResult> SubscribeAsync(IEnumerable<string> events, Su
         return await Broker.ExecuteCommandAsync<SubscribeCommand, SubscribeResult>(new(@params), options).ConfigureAwait(false);
     }
 
-    public async Task UnsubscribeAsync(IEnumerable<Subscription> subscriptions, UnsubscribeOptions? options = null)
+    public async Task UnsubscribeAsync(IEnumerable<Subscription> subscriptions, UnsubscribeByIdOptions? options = null)
     {
         var @params = new UnsubscribeByIdCommandParameters(subscriptions);
 
         await Broker.ExecuteCommandAsync(new UnsubscribeByIdCommand(@params), options).ConfigureAwait(false);
     }
 
+    public async Task UnsubscribeAsync(IEnumerable<string> eventNames = null, UnsubscribeByAttributesOptions? options = null)
+    {
+        var @params = new UnsubscribeByAttributesCommandParameters(eventNames);
+
+        @params.Contexts = options?.Contexts;
+
+        await Broker.ExecuteCommandAsync(new UnsubscribeByAttributesCommand(@params), options).ConfigureAwait(false);
+    }
+
     public async Task<NewResult> NewAsync(CapabilitiesRequest capabilitiesRequest, NewOptions? options = null)
     {
         var @params = new NewCommandParameters(capabilitiesRequest);

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

@@ -18,6 +18,7 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
+using System;
 using System.Collections.Generic;
 
 #nullable enable
@@ -32,6 +33,16 @@ internal class UnsubscribeByAttributesCommand(UnsubscribeByAttributesCommandPara
 
 internal record UnsubscribeByIdCommandParameters(IEnumerable<Subscription> Subscriptions) : CommandParameters;
 
-internal record UnsubscribeByAttributesCommandParameters : CommandParameters;
+public record UnsubscribeByIdOptions : CommandOptions;
 
-public record UnsubscribeOptions : SubscribeOptions;
+internal record UnsubscribeByAttributesCommandParameters(IEnumerable<string> Events) : CommandParameters
+{
+    [Obsolete("Contexts param is deprecated and will be removed in the future versions")]
+    // https://w3c.github.io/webdriver-bidi/#type-session-UnsubscribeByAttributesRequest
+    public IEnumerable<BrowsingContext.BrowsingContext>? Contexts { get; set; }
+}
+
+public record UnsubscribeByAttributesOptions : CommandOptions
+{
+    public IEnumerable<BrowsingContext.BrowsingContext>? Contexts { get; set; }
+}