Events

Author: nvborisenko

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

@@ -151,14 +151,10 @@ private async Task ReceiveMessagesAsync(CancellationToken cancellationToken)
 
                         utfJsonReader.Read();
 
-                        EventArgs eventArgs = null;
+                        // TODO: Just getting type info, could be better
+                        var type = _eventHandlers[method].First().EventArgsType;
 
-                        switch (method)
-                        {
-                            case "network.beforeRequestSent":
-                                eventArgs = JsonSerializer.Deserialize(ref utfJsonReader, _jsonSerializerContext.BeforeRequestSentEventArgs);
-                                break;
-                        }
+                        var eventArgs = (EventArgs)JsonSerializer.Deserialize(ref utfJsonReader, type, _jsonSerializerContext);
 
                         var messageEvent = new MessageEvent(method, eventArgs);
                         _pendingEvents.Add(messageEvent);

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

@@ -77,7 +77,7 @@ namespace OpenQA.Selenium.BiDi.Communication.Json;
 [JsonSerializable(typeof(Modules.Session.StatusCommand))]
 [JsonSerializable(typeof(MessageSuccess<Modules.Session.StatusResult>))]
 [JsonSerializable(typeof(Modules.Session.NewCommand))]
-[JsonSerializable(typeof(Modules.Session.NewResult))]
+[JsonSerializable(typeof(MessageSuccess<Modules.Session.NewResult>))]
 [JsonSerializable(typeof(Modules.Session.EndCommand))]
 [JsonSerializable(typeof(Modules.Session.SubscribeCommand))]
 [JsonSerializable(typeof(MessageSuccess<Modules.Session.SubscribeResult>))]
@@ -87,11 +87,11 @@ namespace OpenQA.Selenium.BiDi.Communication.Json;
 [JsonSerializable(typeof(Modules.Browser.CloseCommand), TypeInfoPropertyName = "Browser_CloseCommand")]
 [JsonSerializable(typeof(Modules.Browser.CreateUserContextCommand))]
 [JsonSerializable(typeof(Modules.Browser.GetUserContextsCommand))]
-[JsonSerializable(typeof(Modules.Browser.GetUserContextsResult))]
+[JsonSerializable(typeof(MessageSuccess<Modules.Browser.GetUserContextsResult>))]
 [JsonSerializable(typeof(Modules.Browser.RemoveUserContextCommand))]
 [JsonSerializable(typeof(Modules.Browser.GetClientWindowsCommand))]
-[JsonSerializable(typeof(Modules.Browser.GetClientWindowsResult))]
-[JsonSerializable(typeof(Modules.Browser.UserContextInfo))]
+[JsonSerializable(typeof(MessageSuccess<Modules.Browser.GetClientWindowsResult>))]
+[JsonSerializable(typeof(MessageSuccess<Modules.Browser.UserContextInfo>))]
 [JsonSerializable(typeof(IReadOnlyList<Modules.Browser.UserContextInfo>))]
 [JsonSerializable(typeof(IReadOnlyList<Modules.Browser.ClientWindowInfo>))]
 
@@ -101,7 +101,7 @@ namespace OpenQA.Selenium.BiDi.Communication.Json;
 [JsonSerializable(typeof(MessageSuccess<Modules.BrowsingContext.CaptureScreenshotResult>))]
 [JsonSerializable(typeof(Modules.BrowsingContext.CloseCommand), TypeInfoPropertyName = "BrowsingContext_CloseCommand")]
 [JsonSerializable(typeof(Modules.BrowsingContext.CreateCommand))]
-[JsonSerializable(typeof(Modules.BrowsingContext.CreateResult))]
+[JsonSerializable(typeof(MessageSuccess<Modules.BrowsingContext.CreateResult>))]
 [JsonSerializable(typeof(Modules.BrowsingContext.GetTreeCommand))]
 [JsonSerializable(typeof(MessageSuccess<Modules.BrowsingContext.GetTreeResult>))]
 [JsonSerializable(typeof(Modules.BrowsingContext.HandleUserPromptCommand))]
@@ -110,19 +110,19 @@ namespace OpenQA.Selenium.BiDi.Communication.Json;
 [JsonSerializable(typeof(Modules.BrowsingContext.NavigateCommand))]
 [JsonSerializable(typeof(MessageSuccess<Modules.BrowsingContext.NavigateResult>))]
 [JsonSerializable(typeof(Modules.BrowsingContext.PrintCommand))]
-[JsonSerializable(typeof(Modules.BrowsingContext.PrintResult))]
+[JsonSerializable(typeof(MessageSuccess<Modules.BrowsingContext.PrintResult>))]
 [JsonSerializable(typeof(Modules.BrowsingContext.ReloadCommand))]
 [JsonSerializable(typeof(Modules.BrowsingContext.SetViewportCommand))]
 [JsonSerializable(typeof(Modules.BrowsingContext.TraverseHistoryCommand))]
-[JsonSerializable(typeof(Modules.BrowsingContext.TraverseHistoryResult))]
+[JsonSerializable(typeof(MessageSuccess<Modules.BrowsingContext.TraverseHistoryResult>))]
 [JsonSerializable(typeof(Modules.BrowsingContext.BrowsingContextInfo))]
 [JsonSerializable(typeof(Modules.BrowsingContext.NavigationInfo))]
 
 [JsonSerializable(typeof(Modules.BrowsingContext.UserPromptOpenedEventArgs))]
 [JsonSerializable(typeof(Modules.BrowsingContext.UserPromptClosedEventArgs))]
 
 [JsonSerializable(typeof(Modules.Network.AddInterceptCommand))]
-[JsonSerializable(typeof(Modules.Network.AddInterceptResult))]
+[JsonSerializable(typeof(MessageSuccess<Modules.Network.AddInterceptResult>))]
 [JsonSerializable(typeof(Modules.Network.ContinueRequestCommand))]
 [JsonSerializable(typeof(Modules.Network.ContinueResponseCommand))]
 [JsonSerializable(typeof(Modules.Network.ContinueWithAuthCommand))]
@@ -138,13 +138,13 @@ namespace OpenQA.Selenium.BiDi.Communication.Json;
 [JsonSerializable(typeof(Modules.Network.AuthRequiredEventArgs))]
 
 [JsonSerializable(typeof(Modules.Script.AddPreloadScriptCommand))]
-[JsonSerializable(typeof(Modules.Script.AddPreloadScriptResult))]
+[JsonSerializable(typeof(MessageSuccess<Modules.Script.AddPreloadScriptResult>))]
 [JsonSerializable(typeof(Modules.Script.DisownCommand))]
 [JsonSerializable(typeof(Modules.Script.CallFunctionCommand))]
 [JsonSerializable(typeof(Modules.Script.EvaluateCommand))]
 [JsonSerializable(typeof(MessageSuccess<Modules.Script.EvaluateResult>))]
 [JsonSerializable(typeof(Modules.Script.GetRealmsCommand))]
-[JsonSerializable(typeof(Modules.Script.GetRealmsResult))]
+[JsonSerializable(typeof(MessageSuccess<Modules.Script.GetRealmsResult>))]
 [JsonSerializable(typeof(Modules.Script.RemovePreloadScriptCommand))]
 
 [JsonSerializable(typeof(Modules.Script.MessageEventArgs))]
@@ -154,11 +154,11 @@ namespace OpenQA.Selenium.BiDi.Communication.Json;
 [JsonSerializable(typeof(Modules.Log.LogEntry))]
 
 [JsonSerializable(typeof(Modules.Storage.GetCookiesCommand))]
-[JsonSerializable(typeof(Modules.Storage.GetCookiesResult))]
+[JsonSerializable(typeof(MessageSuccess<Modules.Storage.GetCookiesResult>))]
 [JsonSerializable(typeof(Modules.Storage.SetCookieCommand))]
-[JsonSerializable(typeof(Modules.Storage.SetCookieResult))]
+[JsonSerializable(typeof(MessageSuccess<Modules.Storage.SetCookieResult>))]
 [JsonSerializable(typeof(Modules.Storage.DeleteCookiesCommand))]
-[JsonSerializable(typeof(Modules.Storage.DeleteCookiesResult))]
+[JsonSerializable(typeof(MessageSuccess<Modules.Storage.DeleteCookiesResult>))]
 
 [JsonSerializable(typeof(Modules.Input.PerformActionsCommand))]
 [JsonSerializable(typeof(Modules.Input.ReleaseActionsCommand))]