Event args type safety

Author: nvborisenko

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

@@ -156,7 +156,7 @@ public async Task<TResult> ExecuteCommandAsync<TCommand, TResult>(TCommand comma
         return (TResult)await tcs.Task.ConfigureAwait(false);
     }
 
-    public async Task<Subscription> SubscribeAsync<TEventArgs>(string eventName, Action<TEventArgs> action, SubscriptionOptions? options, JsonTypeInfo jsonTypeInfo)
+    public async Task<Subscription> SubscribeAsync<TEventArgs>(string eventName, Action<TEventArgs> action, SubscriptionOptions? options, JsonTypeInfo<TEventArgs> jsonTypeInfo)
         where TEventArgs : EventArgs
     {
         _eventTypesMap[eventName] = jsonTypeInfo;
@@ -185,7 +185,7 @@ public async Task<Subscription> SubscribeAsync<TEventArgs>(string eventName, Act
         }
     }
 
-    public async Task<Subscription> SubscribeAsync<TEventArgs>(string eventName, Func<TEventArgs, Task> func, SubscriptionOptions? options, JsonTypeInfo jsonTypeInfo)
+    public async Task<Subscription> SubscribeAsync<TEventArgs>(string eventName, Func<TEventArgs, Task> func, SubscriptionOptions? options, JsonTypeInfo<TEventArgs> jsonTypeInfo)
         where TEventArgs : EventArgs
     {
         _eventTypesMap[eventName] = jsonTypeInfo;

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

@@ -23,17 +23,17 @@
 
 namespace OpenQA.Selenium.BiDi.Communication;
 
-public abstract class EventHandler(string eventName, Type eventArgsType, IEnumerable<BrowsingContext.BrowsingContext>? contexts = null)
+public abstract class EventHandler(string eventName, IEnumerable<BrowsingContext.BrowsingContext>? contexts = null)
 {
     public string EventName { get; } = eventName;
-    public Type EventArgsType { get; set; } = eventArgsType;
+
     public IEnumerable<BrowsingContext.BrowsingContext>? Contexts { get; } = contexts;
 
     public abstract ValueTask InvokeAsync(object args);
 }
 
 internal class AsyncEventHandler<TEventArgs>(string eventName, Func<TEventArgs, Task> func, IEnumerable<BrowsingContext.BrowsingContext>? contexts = null)
-    : EventHandler(eventName, typeof(TEventArgs), contexts) where TEventArgs : EventArgs
+    : EventHandler(eventName, contexts) where TEventArgs : EventArgs
 {
     private readonly Func<TEventArgs, Task> _func = func;
 
@@ -44,7 +44,7 @@ public override async ValueTask InvokeAsync(object args)
 }
 
 internal class SyncEventHandler<TEventArgs>(string eventName, Action<TEventArgs> action, IEnumerable<BrowsingContext.BrowsingContext>? contexts = null)
-    : EventHandler(eventName, typeof(TEventArgs), contexts) where TEventArgs : EventArgs
+    : EventHandler(eventName, contexts) where TEventArgs : EventArgs
 {
     private readonly Action<TEventArgs> _action = action;