Merge branch 'trunk' into add-enum-for-page-load-strategies

Author: M1troll

Rakefile

@@ -56,6 +56,18 @@ def java_version
   end
 end
 
+def dotnet_version
+  File.foreach('dotnet/selenium-dotnet-version.bzl') do |line|
+    return line.split('=').last.strip.tr('"', '') if line.include?('SE_VERSION')
+  end
+end
+
+def python_version
+  File.foreach('py/BUILD.bazel') do |line|
+    return line.split('=').last.strip.tr('"', '') if line.include?('SE_VERSION')
+  end
+end
+
 # The build system used by webdriver is layered on top of rake, and we call it
 # "crazy fun" for no readily apparent reason.
 
@@ -127,7 +139,7 @@ task all: [
   :"selenium-java",
   '//java/test/org/openqa/selenium/environment:webserver'
 ]
-task all_zip: [:'prep-release-zip']
+task all_zip: [:'java-release-zip', :'dotnet-release-zip']
 task tests: [
   '//java/test/org/openqa/selenium/htmlunit:htmlunit',
   '//java/test/org/openqa/selenium/firefox:test-synthesized',
@@ -324,7 +336,28 @@ task ios_driver: [
   '//javascript/webdriver/atoms/fragments:get_location_in_view:ios'
 ]
 
-task 'prep-release-zip': [
+task 'dotnet-release-zip': [
+  '//dotnet/src/webdriver:webdriver-pack',
+  '//dotnet/src/webdriver:webdriver-strongnamed-pack',
+  '//dotnet/src/support:support-pack',
+  '//dotnet/src/support:support-strongnamed-pack',
+] do
+  [
+      "build/dist/selenium-dotnet-#{dotnet_version}.zip",
+      "build/dist/selenium-dotnet-strongnamed-#{dotnet_version}.zip",
+  ].each do |f|
+    rm_f(f) if File.exists?(f)
+  end
+    mkdir_p 'build/dist'
+    File.delete
+
+    cp "bazel-bin/dotnet/release.zip", "build/dist/selenium-dotnet-#{dotnet_version}.zip", preserve: false
+    chmod 0666, "build/dist/selenium-dotnet-#{dotnet_version}.zip"
+    cp "bazel-bin/dotnet/strongnamed.zip", "build/dist/selenium-dotnet-strongnamed-#{dotnet_version}.zip", preserve: false
+    chmod 0666, "build/dist/selenium-dotnet-strongnamed-#{dotnet_version}.zip"
+end
+
+task 'java-release-zip': [
   '//java/src/org/openqa/selenium:client-zip',
   '//java/src/org/openqa/selenium/grid:server-zip',
   '//java/src/org/openqa/selenium/grid:executable-grid',
@@ -347,7 +380,7 @@ task 'prep-release-zip': [
   chmod 0777, "build/dist/selenium-server-#{java_version}.jar"
 end
 
-task 'release-java': %i[prep-release-zip publish-maven]
+task 'release-java': %i[java-release-zip publish-maven]
 
 def read_m2_user_pass
   # First check env vars, then the settings.xml config inside .m2
@@ -376,13 +409,55 @@ def read_m2_user_pass
   return [user, pass]
 end
 
+task :prepare_release do
+    RELEASE_TARGETS = [
+      '//java/src/org/openqa/selenium:client-zip',
+      '//java/src/org/openqa/selenium/grid:server-zip',
+      '//java/src/org/openqa/selenium/grid:executable-grid',
+      '//dotnet/src/webdriver:webdriver-pack',
+      '//dotnet/src/webdriver:webdriver-strongnamed-pack',
+      '//dotnet/src/support:support-pack',
+      '//dotnet/src/support:support-strongnamed-pack',
+      '//javascript/node/selenium-webdriver:selenium-webdriver',
+      '//py:selenium-wheel',
+      '//py:selenium-sdist',
+    ]
+
+    RELEASE_TARGETS.each do |target|
+        Bazel::execute('build', ['--config', 'release'], target)
+    end
+    Bazel::execute('build', ['--stamp'], '//rb:selenium-webdriver')
+end
+
+PYPI_ASSETS = [
+    "bazel-bin/py/selenium-#{python_version}-py3-none-any.whl",
+    "bazel-bin/py/selenium-#{python_version}.tar.gz"
+]
+
+task 'publish-pypi' do
+    PYPI_ASSETS.each do |asset|
+        sh "python3 -m twine upload #{asset}"
+    end
+end
+
 task 'publish-maven': JAVA_RELEASE_TARGETS do
   creds = read_m2_user_pass
   JAVA_RELEASE_TARGETS.each do |p|
     Bazel::execute('run', ['--stamp', '--define', 'maven_repo=https://oss.sonatype.org/service/local/staging/deploy/maven2', '--define', "maven_user=#{creds[0]}", '--define', "maven_password=#{creds[1]}", '--define', 'gpg_sign=true'], p)
   end
 end
 
+NUGET_RELEASE_ASSETS = [
+  "./bazel-bin/dotnet/src/webdriver/Selenium.WebDriver.#{dotnet_version}.nupkg",
+  "./bazel-bin/dotnet/src/webdriver/Selenium.Support.#{dotnet_version}.nupkg"
+]
+
+task 'publish-nuget' do
+  NUGET_RELEASE_ASSETS.each do |asset|
+    sh "dotnet nuget push #{asset} --api-key #{ENV[:NUGET_API_KEY]} --source https://api.nuget.org/v3/index.json"
+  end
+end
+
 task 'publish-maven-snapshot': JAVA_RELEASE_TARGETS do
   creds = read_m2_user_pass
   if java_version.end_with?('-SNAPSHOT')

common/mirror/selenium

@@ -17,11 +17,20 @@
       {
         "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.16.0/selenium-java-4.16.0.zip"
       },
+      {
+        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.16.0/selenium-java-4.16.1.zip"
+      },
       {
         "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.16.0/selenium-server-4.16.0.jar"
       },
       {
         "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.16.0/selenium-server-4.16.0.zip"
+      },
+      {
+        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.16.0/selenium-server-4.16.1.jar"
+      },
+      {
+        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.16.0/selenium-server-4.16.1.zip"
       }
     ]
   },

dotnet/BUILD.bazel

@@ -8,15 +8,15 @@ exports_files([
 pkg_zip(
     name = "strongnamed",
     srcs = [
-        "//dotnet/src/support:support-strongnamed",
-        "//dotnet/src/webdriver:webdriver-strongnamed",
+        "//dotnet/src/support:support-strongnamed-pack",
+        "//dotnet/src/webdriver:webdriver-strongnamed-pack",
     ],
 )
 
 pkg_zip(
     name = "release",
     srcs = [
-        "//dotnet/src/support",
-        "//dotnet/src/webdriver",
+        "//dotnet/src/support:support-pack",
+        "//dotnet/src/webdriver:webdriver-pack",
     ],
 )

dotnet/src/webdriver/IHasDownloads.cs

@@ -28,8 +28,8 @@ public interface IHasDownloads
         /// <summary>
         /// Retrieves the downloadable files.
         /// </summary>
-        /// <returns>A list of file names available for download.</returns>
-        List<string> GetDownloadableFiles();
+        /// <returns>A read-only list of file names available for download.</returns>
+        IReadOnlyList<string> GetDownloadableFiles();
 
         /// <summary>
         /// Downloads a file with the specified file name and returns a dictionary containing the downloaded file's data.

dotnet/src/webdriver/Internal/Logging/ConsoleLogHandler.cs

@@ -36,14 +36,5 @@ public void Handle(LogEvent logEvent)
         {
             Console.Error.WriteLine($"{logEvent.Timestamp:HH:mm:ss.fff} {_levels[(int)logEvent.Level]} {logEvent.IssuedBy.Name}: {logEvent.Message}");
         }
-
-        /// <summary>
-        /// Creates a new instance of the <see cref="ConsoleLogHandler"/> class.
-        /// </summary>
-        /// <returns>A new instance of the <see cref="ConsoleLogHandler"/> class.</returns>
-        public ILogHandler Clone()
-        {
-            return this;
-        }
     }
 }

dotnet/src/webdriver/Internal/Logging/FileLogHandler.cs

@@ -0,0 +1,94 @@
+using System;
+using System.IO;
+
+namespace OpenQA.Selenium.Internal.Logging
+{
+    /// <summary>
+    /// Represents a log handler that writes log events to a file.
+    /// </summary>
+    public class FileLogHandler : ILogHandler, IDisposable
+    {
+        // performance trick to avoid expensive Enum.ToString() with fixed length
+        private static readonly string[] _levels = { "TRACE", "DEBUG", " INFO", " WARN", "ERROR" };
+
+        private FileStream _fileStream;
+        private StreamWriter _streamWriter;
+
+        private readonly object _lockObj = new object();
+        private bool _isDisposed;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FileLogHandler"/> class with the specified file path.
+        /// </summary>
+        /// <param name="path">The path of the log file.</param>
+        public FileLogHandler(string path)
+        {
+            if (string.IsNullOrEmpty(path)) throw new ArgumentException("File log path cannot be null or empty.", nameof(path));
+
+            var directory = Path.GetDirectoryName(path);
+            if (!string.IsNullOrWhiteSpace(directory) && !Directory.Exists(directory))
+            {
+                Directory.CreateDirectory(directory);
+            }
+
+            _fileStream = File.Open(path, FileMode.OpenOrCreate, FileAccess.Write, FileShare.Read);
+            _fileStream.Seek(0, SeekOrigin.End);
+            _streamWriter = new StreamWriter(_fileStream, System.Text.Encoding.UTF8)
+            {
+                AutoFlush = true
+            };
+        }
+
+        /// <summary>
+        /// Handles a log event by writing it to the log file.
+        /// </summary>
+        /// <param name="logEvent">The log event to handle.</param>
+        public void Handle(LogEvent logEvent)
+        {
+            lock (_lockObj)
+            {
+                _streamWriter.WriteLine($"{logEvent.Timestamp:r} {_levels[(int)logEvent.Level]} {logEvent.IssuedBy.Name}: {logEvent.Message}");
+            }
+        }
+
+        /// <summary>
+        /// Disposes the file log handler and releases any resources used.
+        /// </summary>
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        /// <summary>
+        /// Finalizes the file log handler instance.
+        /// </summary>
+        ~FileLogHandler()
+        {
+            Dispose(false);
+        }
+
+        /// <summary>
+        /// Disposes the file log handler and releases any resources used.
+        /// </summary>
+        /// <param name="disposing">A flag indicating whether to dispose managed resources.</param>
+        protected virtual void Dispose(bool disposing)
+        {
+            lock (_lockObj)
+            {
+                if (!_isDisposed)
+                {
+                    if (disposing)
+                    {
+                        _streamWriter?.Dispose();
+                        _streamWriter = null;
+                        _fileStream?.Dispose();
+                        _fileStream = null;
+                    }
+
+                    _isDisposed = true;
+                }
+            }
+        }
+    }
+}

dotnet/src/webdriver/Internal/Logging/ILogHandler.cs

@@ -28,11 +28,5 @@ public interface ILogHandler
         /// </summary>
         /// <param name="logEvent">The log event to handle.</param>
         void Handle(LogEvent logEvent);
-
-        /// <summary>
-        /// Creates a clone of the log handler.
-        /// </summary>
-        /// <returns>A clone of the log handler.</returns>
-        ILogHandler Clone();
     }
 }

dotnet/src/webdriver/Internal/Logging/LogContext.cs

@@ -60,19 +60,16 @@ public ILogContext CreateContext(LogEventLevel minimumLevel)
                 loggers = new ConcurrentDictionary<Type, ILogger>(_loggers.Select(l => new KeyValuePair<Type, ILogger>(l.Key, new Logger(l.Value.Issuer, minimumLevel))));
             }
 
-            IList<ILogHandler> handlers = null;
+            var context = new LogContext(minimumLevel, this, loggers, null);
 
             if (Handlers != null)
             {
-                handlers = new List<ILogHandler>(Handlers.Select(h => h.Clone()));
-            }
-            else
-            {
-                handlers = new List<ILogHandler>();
+                foreach (var handler in Handlers)
+                {
+                    context.Handlers.Add(handler);
+                }
             }
 
-            var context = new LogContext(minimumLevel, this, loggers, Handlers);
-
             Log.CurrentContext = context;
 
             return context;
@@ -137,6 +134,19 @@ public ILogContext SetLevel(Type issuer, LogEventLevel level)
 
         public void Dispose()
         {
+            // Dispose log handlers associated with this context
+            // if they are hot handled by parent context
+            if (Handlers != null && _parentLogContext != null && _parentLogContext.Handlers != null)
+            {
+                foreach (var logHandler in Handlers)
+                {
+                    if (!_parentLogContext.Handlers.Contains(logHandler))
+                    {
+                        (logHandler as IDisposable)?.Dispose();
+                    }
+                }
+            }
+
             Log.CurrentContext = _parentLogContext;
         }
     }

dotnet/src/webdriver/Remote/RemoteWebDriver.cs

@@ -471,10 +471,10 @@ public DevToolsSession GetDevToolsSession(int protocolVersion)
         }
 
         /// <summary>
-        /// Retrieves the downloadable files as a map of file names and their corresponding URLs.
+        /// Retrieves the downloadable files.
         /// </summary>
-        /// <returns>A list containing file names as keys and URLs as values.</returns>
-        public List<string> GetDownloadableFiles()
+        /// <returns>A read-only list of file names available for download.</returns>
+        public IReadOnlyList<string> GetDownloadableFiles()
         {
             var enableDownloads = this.Capabilities.GetCapability(CapabilityType.EnableDownloads);
             if (enableDownloads == null || !(bool) enableDownloads) {

dotnet/test/common/DownloadsTest.cs

@@ -41,7 +41,7 @@ public void CanListDownloadableFiles()
         {
             DownloadWithBrowser();
 
-            List<string> names = ((RemoteWebDriver) driver).GetDownloadableFiles();
+            IReadOnlyList<string> names = ((RemoteWebDriver) driver).GetDownloadableFiles();
             Assert.That(names, Contains.Item("file_1.txt"));
             Assert.That(names, Contains.Item("file_2.jpg"));
         }
@@ -52,7 +52,7 @@ public void CanDownloadFile()
         {
             DownloadWithBrowser();
 
-            List<string> names = ((RemoteWebDriver) driver).GetDownloadableFiles();
+            IReadOnlyList<string> names = ((RemoteWebDriver) driver).GetDownloadableFiles();
             string fileName = names[0];
             string targetDirectory = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
 
@@ -72,7 +72,7 @@ public void CanDeleteFiles()
 
             ((RemoteWebDriver)driver).DeleteDownloadableFiles();
 
-            List<string> names = ((RemoteWebDriver) driver).GetDownloadableFiles();
+            IReadOnlyList<string> names = ((RemoteWebDriver) driver).GetDownloadableFiles();
             Assert.IsEmpty(names, "The names list should be empty.");
         }