[dotnet] Propagate service asynchronicity to the command executor.

dotnet/src/webdriver/DriverService.cs

@@ -37,6 +37,7 @@ namespace OpenQA.Selenium
     public abstract class DriverService : ICommandServer
     {
         private bool isDisposed;
+        private readonly object driverServiceProcessLock = new();
         private Process? driverServiceProcess;
 
         /// <summary>
@@ -176,32 +177,27 @@ protected virtual bool IsInitialized
         {
             get
             {
-                bool isInitialized = false;
-
                 try
                 {
-                    using (var httpClient = new HttpClient())
-                    {
-                        httpClient.DefaultRequestHeaders.ConnectionClose = true;
-                        httpClient.Timeout = TimeSpan.FromSeconds(5);
+                    using var httpClient = new HttpClient();
+                    httpClient.DefaultRequestHeaders.ConnectionClose = true;
+                    httpClient.Timeout = TimeSpan.FromSeconds(5);
 
-                        Uri serviceHealthUri = new Uri(this.ServiceUrl, new Uri(DriverCommand.Status, UriKind.Relative));
-                        using (var response = Task.Run(async () => await httpClient.GetAsync(serviceHealthUri)).GetAwaiter().GetResult())
-                        {
-                            // Checking the response from the 'status' end point. Note that we are simply checking
-                            // that the HTTP status returned is a 200 status, and that the resposne has the correct
-                            // Content-Type header. A more sophisticated check would parse the JSON response and
-                            // validate its values. At the moment we do not do this more sophisticated check.
-                            isInitialized = response.StatusCode == HttpStatusCode.OK && response.Content.Headers.ContentType is { MediaType: string mediaType } && mediaType.StartsWith("application/json", StringComparison.OrdinalIgnoreCase);
-                        }
-                    }
+                    Uri serviceHealthUri = new Uri(this.ServiceUrl, new Uri(DriverCommand.Status, UriKind.Relative));
+                    using var response = Task.Run(async () => await httpClient.GetAsync(serviceHealthUri)).GetAwaiter().GetResult();
+
+                    // Checking the response from the 'status' end point. Note that we are simply checking
+                    // that the HTTP status returned is a 200 status, and that the response has the correct
+                    // Content-Type header. A more sophisticated check would parse the JSON response and
+                    // validate its values. At the moment we do not do this more sophisticated check.
+                    bool isInitialized = response.StatusCode == HttpStatusCode.OK && response.Content.Headers.ContentType is { MediaType: string mediaType } && mediaType.StartsWith("application/json", StringComparison.OrdinalIgnoreCase);
+
+                    return isInitialized;
                 }
                 catch (Exception ex) when (ex is HttpRequestException || ex is TaskCanceledException)
                 {
-                    // Do nothing. The exception is expected, meaning driver service is not initialized.
+                    return false;
                 }
-
-                return isInitialized;
             }
         }
 
@@ -220,42 +216,55 @@ public void Dispose()
         [MemberNotNull(nameof(driverServiceProcess))]
         public void Start()
         {
-            if (this.driverServiceProcess != null)
+            if (this.driverServiceProcess is null)
             {
-                return;
-            }
+                lock (this.driverServiceProcessLock)
+                {
+                    if (this.driverServiceProcess is null)
+                    {
+                        var driverServiceProcess = new Process();
 
-            this.driverServiceProcess = new Process();
+                        try
+                        {
+                            if (this.DriverServicePath != null)
+                            {
+                                if (this.DriverServiceExecutableName is null)
+                                {
+                                    throw new InvalidOperationException("If the driver service path is specified, the driver service executable name must be as well");
+                                }
 
-            if (this.DriverServicePath != null)
-            {
-                if (this.DriverServiceExecutableName is null)
-                {
-                    throw new InvalidOperationException("If the driver service path is specified, the driver service executable name must be as well");
-                }
+                                driverServiceProcess.StartInfo.FileName = Path.Combine(this.DriverServicePath, this.DriverServiceExecutableName);
+                            }
+                            else
+                            {
+                                driverServiceProcess.StartInfo.FileName = new DriverFinder(this.GetDefaultDriverOptions()).GetDriverPath();
+                            }
 
-                this.driverServiceProcess.StartInfo.FileName = Path.Combine(this.DriverServicePath, this.DriverServiceExecutableName);
-            }
-            else
-            {
-                this.driverServiceProcess.StartInfo.FileName = new DriverFinder(this.GetDefaultDriverOptions()).GetDriverPath();
-            }
+                            driverServiceProcess.StartInfo.Arguments = this.CommandLineArguments;
+                            driverServiceProcess.StartInfo.UseShellExecute = false;
+                            driverServiceProcess.StartInfo.CreateNoWindow = this.HideCommandPromptWindow;
 
-            this.driverServiceProcess.StartInfo.Arguments = this.CommandLineArguments;
-            this.driverServiceProcess.StartInfo.UseShellExecute = false;
-            this.driverServiceProcess.StartInfo.CreateNoWindow = this.HideCommandPromptWindow;
+                            this.OnDriverProcessStarting(new DriverProcessStartingEventArgs(driverServiceProcess.StartInfo));
 
-            DriverProcessStartingEventArgs eventArgs = new DriverProcessStartingEventArgs(this.driverServiceProcess.StartInfo);
-            this.OnDriverProcessStarting(eventArgs);
+                            driverServiceProcess.Start();
+                            bool serviceAvailable = this.WaitForServiceInitialization();
 
-            this.driverServiceProcess.Start();
-            bool serviceAvailable = this.WaitForServiceInitialization();
-            DriverProcessStartedEventArgs processStartedEventArgs = new DriverProcessStartedEventArgs(this.driverServiceProcess);
-            this.OnDriverProcessStarted(processStartedEventArgs);
+                            this.OnDriverProcessStarted(new DriverProcessStartedEventArgs(driverServiceProcess));
 
-            if (!serviceAvailable)
-            {
-                throw new WebDriverException($"Cannot start the driver service on {this.ServiceUrl}");
+                            if (!serviceAvailable)
+                            {
+                                throw new WebDriverException($"Cannot start the driver service on {this.ServiceUrl}");
+                            }
+                        }
+                        catch
+                        {
+                            driverServiceProcess.Dispose();
+                            throw;
+                        }
+
+                        this.driverServiceProcess = driverServiceProcess;
+                    }
+                }
             }
         }