Merge branch 'trunk' into feature/ft-16215-non-empty-driver-path

Author: cgoldberg

WORKSPACE

@@ -26,8 +26,8 @@ rules_closure_toolchains()
 
 http_archive(
     name = "rules_rust",
-    integrity = "sha256-eEXiHXSGUH6qD1bdI5KXZ/B04m0wIUeoyM7pmujzbbQ=",
-    urls = ["https://github.com/bazelbuild/rules_rust/releases/download/0.55.5/rules_rust-0.55.5.tar.gz"],
+    integrity = "sha256-YrnH/f8jCpEqGAU+keNqauc+QSde9egtcFXqPtJuee4=",
+    urls = ["https://github.com/bazelbuild/rules_rust/releases/download/0.65.0/rules_rust-0.65.0.tar.gz"],
 )
 
 load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains")
@@ -48,3 +48,7 @@ crates_repository(
 load("@crates//:defs.bzl", "crate_repositories")
 
 crate_repositories()
+
+load("@rules_rust//cargo:deps.bzl", "cargo_dependencies")
+
+cargo_dependencies()

dotnet/src/webdriver/BiDi/BrowsingContext/IBaseNavigationInfo.cs

@@ -0,0 +1,33 @@
+// <copyright file="IBaseNavigationInfo.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;
+
+namespace OpenQA.Selenium.BiDi.BrowsingContext;
+
+public interface IBaseNavigationInfo
+{
+    BrowsingContext Context { get; }
+
+    Navigation? Navigation { get; }
+
+    DateTimeOffset Timestamp { get; }
+
+    string Url { get; }
+}

dotnet/src/webdriver/BiDi/BrowsingContext/NavigationInfo.cs

@@ -22,4 +22,4 @@
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
 
 public sealed record NavigationInfo(BiDi BiDi, BrowsingContext Context, Navigation? Navigation, DateTimeOffset Timestamp, string Url)
-    : BrowsingContextEventArgs(BiDi, Context);
+    : BrowsingContextEventArgs(BiDi, Context), IBaseNavigationInfo;

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

@@ -123,21 +123,33 @@ public async Task ConnectAsync(CancellationToken cancellationToken)
 
     private async Task ReceiveMessagesAsync(CancellationToken cancellationToken)
     {
-        while (!cancellationToken.IsCancellationRequested)
+        try
         {
-            try
+            while (!cancellationToken.IsCancellationRequested)
             {
                 var data = await _transport.ReceiveAsync(cancellationToken).ConfigureAwait(false);
 
-                ProcessReceivedMessage(data);
-            }
-            catch (Exception ex)
-            {
-                if (cancellationToken.IsCancellationRequested is not true && _logger.IsEnabled(LogEventLevel.Error))
+                try
                 {
-                    _logger.Error($"Couldn't process received BiDi remote message: {ex}");
+                    ProcessReceivedMessage(data);
                 }
+                catch (Exception ex)
+                {
+                    if (_logger.IsEnabled(LogEventLevel.Error))
+                    {
+                        _logger.Error($"Unhandled error occured while processing remote message: {ex}");
+                    }
+                }
+            }
+        }
+        catch (Exception ex) when (ex is not OperationCanceledException)
+        {
+            if (_logger.IsEnabled(LogEventLevel.Error))
+            {
+                _logger.Error($"Unhandled error occured while receiving remote messages: {ex}");
             }
+
+            throw;
         }
     }
 

dotnet/src/webdriver/DriverService.cs

@@ -268,12 +268,9 @@ public void Start()
 
         this.driverServiceProcess.Start();
 
-        if (this.EnableProcessRedirection)
-        {
-            // Important: Start the process and immediately begin reading the output and error streams to avoid IO deadlocks.
-            this.driverServiceProcess.BeginOutputReadLine();
-            this.driverServiceProcess.BeginErrorReadLine();
-        }
+        // Important: Start the process and immediately begin reading the output and error streams to avoid IO deadlocks.
+        this.driverServiceProcess.BeginOutputReadLine();
+        this.driverServiceProcess.BeginErrorReadLine();
 
         bool serviceAvailable = this.WaitForServiceInitialization();
 

py/selenium/webdriver/chrome/service.py

@@ -54,6 +54,9 @@ def __init__(
             **kwargs,
         )
 
+    def command_line_args(self) -> list[str]:
+        return ["--enable-chrome-logs", f"--port={self.port}"] + self._service_args
+
     @property
     def service_args(self) -> Sequence[str]:
         return self._service_args

rb/Gemfile.lock

@@ -6,6 +6,7 @@ PATH
     selenium-webdriver (4.36.0.nightly)
       base64 (~> 0.2)
       logger (~> 1.4)
+      prism (~> 1.0, < 1.5)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 4.0)
       websocket (~> 1.0)

rb/selenium-webdriver.gemspec

@@ -51,6 +51,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'base64', ['~> 0.2']
   s.add_dependency 'logger', ['~> 1.4']
+  s.add_dependency 'prism', ['~> 1.0', '< 1.5']
   s.add_dependency 'rexml', ['~> 3.2', '>= 3.2.5']
   s.add_dependency 'rubyzip', ['>= 1.2.2', '< 4.0']
   s.add_dependency 'websocket', ['~> 1.0']

rust/BUILD.bazel

@@ -76,7 +76,7 @@ rust_binary(
     # instead of an underscore
     name = "selenium-manager",
     srcs = ["src/main.rs"],
-    edition = "2021",
+    edition = "2024",
     version = "0.4.36-nightly",
     visibility = ["//visibility:public"],
     deps = [
@@ -91,7 +91,7 @@ rust_library(
         ["src/**/*.rs"],
         exclude = ["main.rs"],
     ),
-    edition = "2021",
+    edition = "2024",
     visibility = ["//rust:__subpackages__"],
     deps = all_crate_deps(normal = True),
 )
@@ -115,6 +115,6 @@ rust_test(
     name = "unit",
     size = "small",
     crate = ":selenium_manager",
-    edition = "2021",
+    edition = "2024",
     tags = ["no-sandbox"],
 )