Merge branch 'trunk' into py-bidi-bc-event

Author: cgoldberg

common/repositories.bzl

@@ -50,8 +50,8 @@ js_library(
 
     http_archive(
         name = "linux_beta_firefox",
-        url = "https://ftp.mozilla.org/pub/firefox/releases/142.0b8/linux-x86_64/en-US/firefox-142.0b8.tar.xz",
-        sha256 = "52c7c24dcc1258c9cd43c7b070def0a93bae58d2f5d077d11a7979307857e5c2",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/142.0b9/linux-x86_64/en-US/firefox-142.0b9.tar.xz",
+        sha256 = "0e230f54a1d933df55e0d730c7d774437e60b5fdcbd74401f5da69bce184c30b",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -72,8 +72,8 @@ js_library(
 
     dmg_archive(
         name = "mac_beta_firefox",
-        url = "https://ftp.mozilla.org/pub/firefox/releases/142.0b8/mac/en-US/Firefox%20142.0b8.dmg",
-        sha256 = "74c20a61fcc05fd69427f370a6a97ab660615299ef254d4cfaa617ec095dba98",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/142.0b9/mac/en-US/Firefox%20142.0b9.dmg",
+        sha256 = "529509a53278d8cbd482fa8ef95ac243b33c6cc4acc7924c15f6ce3f59c64bbf",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -165,8 +165,8 @@ js_library(
 
     http_archive(
         name = "linux_edgedriver",
-        url = "https://msedgedriver.microsoft.com/138.0.3351.121/edgedriver_linux64.zip",
-        sha256 = "1a0bed812b1b84f1093fa1e759cae2a210481620cd9ea3cb91dc2a60e0b21e4d",
+        url = "https://msedgedriver.microsoft.com/139.0.3405.86/edgedriver_linux64.zip",
+        sha256 = "49ce29de50f9ac418a3a2416708a5563215b8412b27d3e505f3c859fc6ffba12",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -182,8 +182,8 @@ js_library(
 
     http_archive(
         name = "mac_edgedriver",
-        url = "https://msedgedriver.microsoft.com/138.0.3351.121/edgedriver_mac64.zip",
-        sha256 = "96b648865de254ae5db7008676340b16476e39b0b90c2da71964c14cb53a0195",
+        url = "https://msedgedriver.microsoft.com/139.0.3405.86/edgedriver_mac64.zip",
+        sha256 = "b6c8244dfb7b8a223d3ac8fd569533f0a307eadaca2b8cbc884ce7f69294682e",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])

dotnet/src/webdriver/DriverProcessStartedEventArgs.cs

@@ -19,7 +19,6 @@
 
 using System;
 using System.Diagnostics;
-using System.IO;
 
 namespace OpenQA.Selenium;
 
@@ -41,31 +40,10 @@ public DriverProcessStartedEventArgs(Process driverProcess)
         }
 
         this.ProcessId = driverProcess.Id;
-        if (driverProcess.StartInfo.RedirectStandardOutput && !driverProcess.StartInfo.UseShellExecute)
-        {
-            this.StandardOutputStreamReader = driverProcess.StandardOutput;
-        }
-
-        if (driverProcess.StartInfo.RedirectStandardError && !driverProcess.StartInfo.UseShellExecute)
-        {
-            this.StandardErrorStreamReader = driverProcess.StandardError;
-        }
     }
 
     /// <summary>
     /// Gets the unique ID of the driver executable process.
     /// </summary>
     public int ProcessId { get; }
-
-    /// <summary>
-    /// Gets a <see cref="StreamReader"/> object that can be used to read the contents
-    /// printed to <c>stdout</c> by a driver service process.
-    /// </summary>
-    public StreamReader? StandardOutputStreamReader { get; }
-
-    /// <summary>
-    /// Gets a <see cref="StreamReader"/> object that can be used to read the contents
-    /// printed to <c>stderr</c> by a driver service process.
-    /// </summary>
-    public StreamReader? StandardErrorStreamReader { get; }
 }

dotnet/src/webdriver/DriverService.cs

@@ -26,6 +26,7 @@
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
+using OpenQA.Selenium.Internal.Logging;
 
 namespace OpenQA.Selenium;
 
@@ -37,6 +38,8 @@ public abstract class DriverService : ICommandServer
     private bool isDisposed;
     private Process? driverServiceProcess;
 
+    private static readonly ILogger _logger = Log.GetLogger(typeof(DriverService));
+
     /// <summary>
     /// Initializes a new instance of the <see cref="DriverService"/> class.
     /// </summary>
@@ -243,11 +246,22 @@ public void Start()
         this.driverServiceProcess.StartInfo.UseShellExecute = false;
         this.driverServiceProcess.StartInfo.CreateNoWindow = this.HideCommandPromptWindow;
 
+        this.driverServiceProcess.StartInfo.RedirectStandardOutput = true;
+        this.driverServiceProcess.StartInfo.RedirectStandardError = true;
+
+        this.driverServiceProcess.OutputDataReceived += this.OnDriverProcessDataReceived;
+        this.driverServiceProcess.ErrorDataReceived += this.OnDriverProcessDataReceived;
+
         DriverProcessStartingEventArgs eventArgs = new DriverProcessStartingEventArgs(this.driverServiceProcess.StartInfo);
         this.OnDriverProcessStarting(eventArgs);
 
+        // Important: Start the process and immediately begin reading the output and error streams to avoid IO deadlocks.
         this.driverServiceProcess.Start();
+        this.driverServiceProcess.BeginOutputReadLine();
+        this.driverServiceProcess.BeginErrorReadLine();
+
         bool serviceAvailable = this.WaitForServiceInitialization();
+
         DriverProcessStartedEventArgs processStartedEventArgs = new DriverProcessStartedEventArgs(this.driverServiceProcess);
         this.OnDriverProcessStarted(processStartedEventArgs);
 
@@ -274,6 +288,12 @@ protected virtual void Dispose(bool disposing)
             if (disposing)
             {
                 this.Stop();
+
+                if (this.driverServiceProcess is not null)
+                {
+                    this.driverServiceProcess.OutputDataReceived -= this.OnDriverProcessDataReceived;
+                    this.driverServiceProcess.ErrorDataReceived -= this.OnDriverProcessDataReceived;
+                }
             }
 
             this.isDisposed = true;
@@ -308,6 +328,23 @@ protected virtual void OnDriverProcessStarted(DriverProcessStartedEventArgs even
         this.DriverProcessStarted?.Invoke(this, eventArgs);
     }
 
+    /// <summary>
+    /// Handles the output and error data received from the driver process.
+    /// </summary>
+    /// <param name="sender">The sender of the event.</param>
+    /// <param name="args">The data received event arguments.</param>
+    /// <param name="isError">A value indicating whether the data received is from the error stream.</param>
+    protected virtual void OnDriverProcessDataReceived(object sender, DataReceivedEventArgs args)
+    {
+        if (string.IsNullOrEmpty(args.Data))
+            return;
+
+        if (_logger.IsEnabled(LogEventLevel.Trace))
+        {
+            _logger.Trace(args.Data);
+        }
+    }
+
     /// <summary>
     /// Stops the DriverService.
     /// </summary>

dotnet/src/webdriver/Firefox/FirefoxDriverService.cs

@@ -19,10 +19,10 @@
 
 using OpenQA.Selenium.Internal;
 using System;
+using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace OpenQA.Selenium.Firefox;
 
@@ -223,11 +223,11 @@ protected override string CommandLineArguments
     }
 
     /// <summary>
-    /// Handles the event when the driver service process is starting.
+    /// Called when the driver process is starting. This method sets up log file writing if a log path is specified.
     /// </summary>
     /// <param name="eventArgs">The event arguments containing information about the driver service process.</param>
     /// <remarks>
-    /// This method initializes a log writer if a log path is specified and redirects output streams to capture logs.
+    /// This method initializes a log writer if a log path is specified.
     /// </remarks>
     protected override void OnDriverProcessStarting(DriverProcessStartingEventArgs eventArgs)
     {
@@ -239,40 +239,36 @@ protected override void OnDriverProcessStarting(DriverProcessStartingEventArgs e
                 Directory.CreateDirectory(directory);
             }
 
-            // Initialize the log writer
             logWriter = new StreamWriter(this.LogPath, append: true) { AutoFlush = true };
-
-            // Configure process to redirect output
-            eventArgs.DriverServiceProcessStartInfo.RedirectStandardOutput = true;
-            eventArgs.DriverServiceProcessStartInfo.RedirectStandardError = true;
         }
 
         base.OnDriverProcessStarting(eventArgs);
     }
 
     /// <summary>
-    /// Handles the event when the driver process has started.
+    /// Handles the output and error data received from the driver process and sends it to the log writer if available.
     /// </summary>
-    /// <param name="eventArgs">The event arguments containing information about the started driver process.</param>
-    /// <remarks>
-    /// This method reads the output and error streams asynchronously and writes them to the log file if available.
-    /// </remarks>
-    protected override void OnDriverProcessStarted(DriverProcessStartedEventArgs eventArgs)
+    /// <param name="sender">The sender of the event.</param>
+    /// <param name="args">The data received event arguments.</param>
+    protected override void OnDriverProcessDataReceived(object sender, DataReceivedEventArgs args)
     {
-        if (logWriter == null) return;
-        if (eventArgs.StandardOutputStreamReader != null)
+        if (string.IsNullOrEmpty(args.Data))
+            return;
+
+        if (!string.IsNullOrEmpty(this.LogPath))
         {
-            _ = Task.Run(() => ReadStreamAsync(eventArgs.StandardOutputStreamReader));
+            if (logWriter != null)
+            {
+                logWriter.WriteLine(args.Data);
+            }
         }
-
-        if (eventArgs.StandardErrorStreamReader != null)
+        else
         {
-            _ = Task.Run(() => ReadStreamAsync(eventArgs.StandardErrorStreamReader));
+            base.OnDriverProcessDataReceived(sender, args);
         }
-
-        base.OnDriverProcessStarted(eventArgs);
     }
 
+
     /// <summary>
     /// Disposes of the resources used by the <see cref="FirefoxDriverService"/> instance.
     /// </summary>
@@ -282,13 +278,13 @@ protected override void OnDriverProcessStarted(DriverProcessStartedEventArgs eve
     /// </remarks>
     protected override void Dispose(bool disposing)
     {
+        base.Dispose(disposing);
+
         if (logWriter != null && disposing)
         {
             logWriter.Dispose();
             logWriter = null;
         }
-
-        base.Dispose(disposing);
     }
 
     /// <summary>
@@ -372,24 +368,4 @@ private static string FirefoxDriverServiceFileName()
 
         return fileName;
     }
-
-    private async Task ReadStreamAsync(StreamReader reader)
-    {
-        try
-        {
-            string? line;
-            while ((line = await reader.ReadLineAsync()) != null)
-            {
-                if (logWriter != null)
-                {
-                    logWriter.WriteLine($"{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff} {line}");
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            // Log or handle the exception appropriately
-            System.Diagnostics.Debug.WriteLine($"Error reading stream: {ex.Message}");
-        }
-    }
 }

dotnet/test/firefox/FirefoxDriverServiceTest.cs

@@ -17,25 +17,52 @@
 // under the License.
 // </copyright>
 
+using System;
+using System.Collections.Generic;
 using NUnit.Framework;
 using System.IO;
+using System.Linq;
+using OpenQA.Selenium.Internal.Logging;
 
 namespace OpenQA.Selenium.Firefox;
 
 [TestFixture]
-public class FirefoxDriverServiceTest : DriverTestFixture
+public class FirefoxDriverServiceTest
 {
+    private TestLogHandler testLogHandler;
+
+    private void ResetGlobalLog()
+    {
+        Log.SetLevel(LogEventLevel.Info);
+        Log.Handlers.Clear().Handlers.Add(new TextWriterHandler(Console.Error));
+    }
+
+    [SetUp]
+    public void SetUp()
+    {
+        ResetGlobalLog();
+
+        testLogHandler = new TestLogHandler();
+    }
+
+    [TearDown]
+    public void TearDown()
+    {
+        ResetGlobalLog();
+    }
+
     [Test]
     public void ShouldRedirectGeckoDriverLogsToFile()
     {
         FirefoxOptions options = new FirefoxOptions();
         string logPath = Path.GetTempFileName();
-        options.LogLevel = FirefoxDriverLogLevel.Trace;
+        options.LogLevel = FirefoxDriverLogLevel.Info;
 
         FirefoxDriverService service = FirefoxDriverService.CreateDefaultService();
         service.LogPath = logPath;
 
-        IWebDriver driver2 = new FirefoxDriver(service, options);
+        IWebDriver firefoxDriver = new FirefoxDriver(service, options);
+        firefoxDriver.Quit();
 
         try
         {
@@ -45,9 +72,44 @@ public void ShouldRedirectGeckoDriverLogsToFile()
         }
         finally
         {
-            driver2.Quit();
             File.Delete(logPath);
         }
     }
 
+    [Test]
+    public void ShouldRedirectGeckoDriverLogsToConsole()
+    {
+        Log.SetLevel(LogEventLevel.Trace).Handlers.Add(testLogHandler);
+        FirefoxOptions options = new FirefoxOptions();
+        options.LogLevel = FirefoxDriverLogLevel.Info;
+
+        FirefoxDriverService service = FirefoxDriverService.CreateDefaultService();
+
+        IWebDriver firefoxDriver = new FirefoxDriver(service, options);
+
+        try
+        {
+            Assert.That(testLogHandler.Events, Has.Count.AtLeast(1));
+            Assert.That(testLogHandler.Events.Any(e => e.Message.Contains("geckodriver")), Is.True);
+        }
+        finally
+        {
+            firefoxDriver.Quit();
+        }
+    }
+}
+
+class TestLogHandler : ILogHandler
+{
+    public ILogHandler Clone()
+    {
+        return this;
+    }
+
+    public void Handle(LogEvent logEvent)
+    {
+        Events.Add(logEvent);
+    }
+
+    public IList<LogEvent> Events { get; internal set; } = new List<LogEvent>();
 }

java/spotbugs-excludes.xml

@@ -199,11 +199,6 @@
     <Bug pattern="NM_SAME_SIMPLE_NAME_AS_INTERFACE" />
   </Match>
 
-  <Match>
-    <Class name="org.openqa.selenium.remote.internal.WebElementToJsonConverter" />
-    <Bug pattern="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS" />
-  </Match>
-
   <Match>
     <Class name="org.openqa.selenium.chrome.AddHasCasting" />
     <Bug pattern="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS" />