[dotnet] allow driver to execute commands asynchronously

Author: titusfortner

dotnet/src/webdriver/ICommandExecutor.cs

@@ -17,6 +17,7 @@
 // </copyright>
 
 using System;
+using System.Threading.Tasks;
 
 namespace OpenQA.Selenium
 {
@@ -39,5 +40,13 @@ public interface ICommandExecutor : IDisposable
         /// <param name="commandToExecute">The command you wish to execute</param>
         /// <returns>A response from the browser</returns>
         Response Execute(Command commandToExecute);
+
+
+        /// <summary>
+        /// Executes a command as an asynchronous task.
+        /// </summary>
+        /// <param name="commandToExecute">The command you wish to execute</param>
+        /// <returns>A task object representing the asynchronous operation</returns>
+        Task<Response> ExecuteAsync(Command commandToExecute);
     }
 }

dotnet/src/webdriver/Remote/DriverServiceCommandExecutor.cs

@@ -17,6 +17,7 @@
 // </copyright>
 
 using System;
+using System.Threading.Tasks;
 
 namespace OpenQA.Selenium.Remote
 {
@@ -92,6 +93,16 @@ public HttpCommandExecutor HttpExecutor
         /// <param name="commandToExecute">The command you wish to execute</param>
         /// <returns>A response from the browser</returns>
         public Response Execute(Command commandToExecute)
+        {
+            return Task.Run(() => this.ExecuteAsync(commandToExecute)).GetAwaiter().GetResult();
+        }
+
+        /// <summary>
+        /// Executes a command as an asynchronous task.
+        /// </summary>
+        /// <param name="commandToExecute">The command you wish to execute</param>
+        /// <returns>A task object representing the asynchronous operation</returns>
+        public async Task<Response> ExecuteAsync(Command commandToExecute)
         {
             if (commandToExecute == null)
             {
@@ -108,7 +119,7 @@ public Response Execute(Command commandToExecute)
             // command, so that we can get the finally block.
             try
             {
-                toReturn = this.internalExecutor.Execute(commandToExecute);
+                toReturn = await this.internalExecutor.ExecuteAsync(commandToExecute).ConfigureAwait(false);
             }
             finally
             {

dotnet/src/webdriver/Remote/HttpCommandExecutor.cs

@@ -158,6 +158,16 @@ public bool TryAddCommand(string commandName, CommandInfo info)
         /// <param name="commandToExecute">The command you wish to execute</param>
         /// <returns>A response from the browser</returns>
         public virtual Response Execute(Command commandToExecute)
+        {
+            return Task.Run(() => this.ExecuteAsync(commandToExecute)).GetAwaiter().GetResult();
+        }
+
+        /// <summary>
+        /// Executes a command as an asynchronous task.
+        /// </summary>
+        /// <param name="commandToExecute">The command you wish to execute</param>
+        /// <returns>A task object representing the asynchronous operation</returns>
+        public virtual async Task<Response> ExecuteAsync(Command commandToExecute)
         {
             if (commandToExecute == null)
             {
@@ -184,7 +194,7 @@ public virtual Response Execute(Command commandToExecute)
             HttpResponseInfo responseInfo = null;
             try
             {
-                responseInfo = Task.Run(async () => await this.MakeHttpRequest(requestInfo)).GetAwaiter().GetResult();
+                responseInfo = await this.MakeHttpRequest(requestInfo).ConfigureAwait(false);
             }
             catch (HttpRequestException ex)
             {

dotnet/src/webdriver/WebDriver.cs

@@ -24,6 +24,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Globalization;
+using System.Threading.Tasks;
 
 namespace OpenQA.Selenium
 {
@@ -556,7 +557,25 @@ internal ReadOnlyCollection<IWebElement> GetElementsFromResponse(Response respon
         /// <returns>WebDriver Response</returns>
         internal Response InternalExecute(string driverCommandToExecute, Dictionary<string, object> parameters)
         {
-            return this.Execute(driverCommandToExecute, parameters);
+            return Task.Run(() => this.InternalExecuteAsync(driverCommandToExecute, parameters)).GetAwaiter().GetResult();
+        }
+
+        /// <summary>
+        /// Executes commands with the driver asynchronously
+        /// </summary>
+        /// <param name="driverCommandToExecute">Command that needs executing</param>
+        /// <param name="parameters">Parameters needed for the command</param>
+        /// <returns>A task object representing the asynchronous operation</returns>
+        internal Task<Response> InternalExecuteAsync(string driverCommandToExecute,
+            Dictionary<string, object> parameters)
+        {
+            return this.ExecuteAsync(driverCommandToExecute, parameters);
+        }
+
+        internal Response Execute(string driverCommandToExecute,
+            Dictionary<string, object> parameters)
+        {
+            return Task.Run(() => this.ExecuteAsync(driverCommandToExecute, parameters)).GetAwaiter().GetResult();
         }
 
         /// <summary>
@@ -565,15 +584,15 @@ internal Response InternalExecute(string driverCommandToExecute, Dictionary<stri
         /// <param name="driverCommandToExecute">A <see cref="DriverCommand"/> value representing the command to execute.</param>
         /// <param name="parameters">A <see cref="Dictionary{K, V}"/> containing the names and values of the parameters of the command.</param>
         /// <returns>A <see cref="Response"/> containing information about the success or failure of the command and any data returned by the command.</returns>
-        protected virtual Response Execute(string driverCommandToExecute, Dictionary<string, object> parameters)
+        protected virtual async Task<Response> ExecuteAsync(string driverCommandToExecute, Dictionary<string, object> parameters)
         {
             Command commandToExecute = new Command(this.sessionId, driverCommandToExecute, parameters);
 
             Response commandResponse;
 
             try
             {
-                commandResponse = this.executor.Execute(commandToExecute);
+                commandResponse = await this.executor.ExecuteAsync(commandToExecute).ConfigureAwait(false);
             }
             catch (System.Net.Http.HttpRequestException e)
             {