Move DevTools JSON context to each adapter

Author: RenderMichael

dotnet/src/webdriver/DevTools/IAdapter.cs

@@ -0,0 +1,28 @@
+// <copyright file="IAdapter.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.Text.Json.Nodes;
+
+namespace OpenQA.Selenium.DevTools;
+
+internal interface IAdapter
+{
+    JsonNode SerializeToNode<TCommand>(TCommand command)
+        where TCommand : ICommand;
+}

third_party/dotnet/devtools/src/generator/CodeGen/CommandGenerator.cs

@@ -2,7 +2,6 @@
 using OpenQA.Selenium.DevToolsGenerator.ProtocolDefinition;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace OpenQA.Selenium.DevToolsGenerator.CodeGen
 {
@@ -34,8 +33,7 @@ public override IDictionary<string, string> GenerateCode(CommandDefinition comma
                 className = className,
                 domain = context.Domain,
                 rootNamespace = Settings.RootNamespace,
-                context = context,
-                protocolVersion = Settings.RootNamespace.Split('.').Last()
+                context = context
             });
 
             var outputPath = Utility.ReplaceTokensInPath(Settings.DefinitionTemplates.CommandTemplate.OutputPath, className, context, Settings);

third_party/dotnet/devtools/src/generator/CodeGen/DomainGenerator.cs

@@ -3,6 +3,7 @@
 using OpenQA.Selenium.DevToolsGenerator.ProtocolDefinition;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace OpenQA.Selenium.DevToolsGenerator.CodeGen
 {
@@ -61,7 +62,8 @@ public override IDictionary<string, string> GenerateCode(DomainDefinition domain
                 domain = domainDefinition,
                 className = className,
                 rootNamespace = Settings.RootNamespace,
-                context = context
+                context = context,
+                protocolVersion = Settings.RootNamespace.Split('.').Last()
             });
 
             var outputPath = Utility.ReplaceTokensInPath(Settings.DefinitionTemplates.DomainTemplate.OutputPath, className, context, Settings);

third_party/dotnet/devtools/src/generator/Templates/command.hbs

@@ -55,12 +55,3 @@ namespace {{rootNamespace}}.{{domain.Name}}
     {{/each}}
     }
 }
-
-namespace {{rootNamespace}}
-{   
-    [global::System.Text.Json.Serialization.JsonSerializable(typeof(global::{{rootNamespace}}.{{domain.Name}}.{{className}}CommandSettings))]
-    internal sealed partial class {{protocolVersion}}RequestSerializationContext;
-
-    [global::System.Text.Json.Serialization.JsonSerializable(typeof(global::{{rootNamespace}}.{{domain.Name}}.{{className}}CommandResponse))]
-    internal sealed partial class {{protocolVersion}}ResponseSerializationContext;
-}

third_party/dotnet/devtools/src/generator/Templates/domain.hbs

@@ -10,8 +10,13 @@ namespace {{rootNamespace}}.{{domain.Name}}
     /// <summary>
     /// Represents an adapter for the {{domain.Name}} domain to simplify the command interface.
     /// </summary>
-    public class {{dehumanize domain.Name}}Adapter
+    public class {{dehumanize domain.Name}}Adapter : global::OpenQA.Selenium.DevTools.IAdapter
     {
+        private static readonly JsonSerializerOptions jsonSerializerOptions = new()
+        {
+            TypeInfoResolver = {{protocolVersion}}{{dehumanize domain.Name}}SerializerContext.Default
+        };
+
         private readonly string m_domainName = "{{dehumanize domain.Name}}";
         private Dictionary<string, DevToolsEventData> m_eventMap = new Dictionary<string, DevToolsEventData>();
 
@@ -46,9 +51,18 @@ namespace {{rootNamespace}}.{{domain.Name}}
         /// <summary>
         /// {{xml-code-comment Description 2}}
         /// </summary>
-        public Task<{{dehumanize Name}}CommandResponse> {{dehumanize Name}}({{dehumanize Name}}CommandSettings command{{#if NoParameters}} = null{{/if}}, CancellationToken cancellationToken = default(CancellationToken), int? millisecondsTimeout = null, bool throwExceptionIfResponseNotReceived = true)
+        public async Task<{{dehumanize Name}}CommandResponse> {{dehumanize Name}}({{dehumanize Name}}CommandSettings command{{#if NoParameters}} = null{{/if}}, CancellationToken cancellationToken = default(CancellationToken), int? millisecondsTimeout = null, bool throwExceptionIfResponseNotReceived = true)
         {
-            return Session.SendCommand<{{dehumanize Name}}CommandSettings, {{dehumanize Name}}CommandResponse>(command{{#if NoParameters}} ?? new {{dehumanize Name}}CommandSettings(){{/if}}, cancellationToken, millisecondsTimeout, throwExceptionIfResponseNotReceived);
+            {{#if NoParameters}}command ??= new {{dehumanize Name}}CommandSettings();{{/if}}
+            global::System.Text.Json.Nodes.JsonNode serializedCommand = JsonSerializer.SerializeToNode(command, jsonSerializerOptions);
+            global::System.Text.Json.JsonElement? response = await Session.SendCommand(command.CommandName, serializedCommand, cancellationToken, millisecondsTimeout, throwExceptionIfResponseNotReceived).ConfigureAwait(false);
+
+            if (response == null)
+            {
+                return default({{dehumanize Name}}CommandResponse);
+            }
+
+            return response.Value.Deserialize<{{dehumanize Name}}CommandResponse>(jsonSerializerOptions);
         }
 
     {{/each}}
@@ -57,9 +71,8 @@ namespace {{rootNamespace}}.{{domain.Name}}
         {
             if (e.DomainName == m_domainName)
             {
-                if (m_eventMap.ContainsKey(e.EventName))
+                if (m_eventMap.TryGetValue(e.EventName, out var eventData))
                 {
-                    var eventData = m_eventMap[e.EventName];
                     var eventArgs = e.EventData.Deserialize(eventData.EventArgsType, global::OpenQA.Selenium.DevTools.Json.DevToolsJsonOptions.Default);
                     eventData.EventInvoker(eventArgs);
                 }
@@ -76,5 +89,20 @@ namespace {{rootNamespace}}.{{domain.Name}}
         }
 
     {{/each}}
+
+        global::System.Text.Json.Nodes.JsonNode IAdapter.SerializeToNode<TCommand>(TCommand command)
+        {
+            return JsonSerializer.SerializeToNode(command, jsonSerializerOptions);
+        }
     }
 }
+
+namespace {{rootNamespace}}
+{
+    [global::System.Text.Json.Serialization.JsonSerializable(typeof(string))] // Placeholder in case nothing gets generated
+    {{#each domain.Commands}}
+    [global::System.Text.Json.Serialization.JsonSerializable(typeof(global::{{../rootNamespace}}.{{dehumanize ../domain.Name}}.{{dehumanize Name}}CommandSettings))]
+    [global::System.Text.Json.Serialization.JsonSerializable(typeof(global::{{../rootNamespace}}.{{dehumanize ../domain.Name}}.{{dehumanize Name}}CommandResponse))]
+    {{/each}}
+    internal sealed partial class {{protocolVersion}}{{dehumanize domain.Name}}SerializerContext : global::System.Text.Json.Serialization.JsonSerializerContext;
+}