Merge branch 'trunk' into exception-test

Author: RenderMichael

Rakefile

@@ -582,10 +582,11 @@ namespace :py do
   desc 'Update Python version'
   task :version, [:version] do |_task, arguments|
     old_version = python_version
-    nightly = ".dev#{Time.now.strftime('%Y%m%d%H%M')}"
+    nightly = ".#{Time.now.strftime('%Y%m%d%H%M')}"
     new_version = updated_version(old_version, arguments[:version], nightly)
 
     ['py/setup.py',
+     'py/pyproject.toml',
      'py/BUILD.bazel',
      'py/selenium/__init__.py',
      'py/selenium/webdriver/__init__.py',
@@ -1138,7 +1139,7 @@ def updated_version(current, desired = nil, nightly = nil)
     desired.split('.').tap { |v| v << 0 while v.size < 3 }.join('.')
   elsif current.split(/\.|-/).size > 3
     # if current version is already nightly, just need to bump it; this will be noop for some languages
-    pattern = /-?\.?(nightly|SNAPSHOT|dev)\d*$/
+    pattern = /-?\.?(nightly|SNAPSHOT|dev|\d{12})\d*$/
     current.gsub(pattern, nightly)
   elsif current.split(/\.|-/).size == 3
     # if current version is not nightly, need to bump the version and make nightly

dotnet/src/webdriver/Firefox/FirefoxDriver.cs

@@ -413,6 +413,7 @@ public DevToolsSession GetDevToolsSession(int devToolsProtocolVersion)
         /// Creates a session to communicate with a browser using a Developer Tools debugging protocol.
         /// </summary>
         /// <returns>The active session to use to communicate with the Developer Tools debugging protocol.</returns>
+        [Obsolete("CDP support for Firefox is deprecated and will be removed in future versions. Please switch to WebDriver BiDi.")]
         public DevToolsSession GetDevToolsSession(DevToolsOptions options)
         {
             if (this.devToolsSession == null)

dotnet/src/webdriver/Remote/RemoteWebDriver.cs

@@ -17,6 +17,7 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.Internal.Logging;
 using OpenQA.Selenium.DevTools;
 using System;
 using System.Collections.Generic;
@@ -63,6 +64,8 @@ namespace OpenQA.Selenium.Remote
     /// </example>
     public class RemoteWebDriver : WebDriver, IDevTools, IHasDownloads
     {
+        private static readonly ILogger _logger = OpenQA.Selenium.Internal.Logging.Log.GetLogger(typeof(RemoteWebDriver));
+
         /// <summary>
         /// The name of the Selenium grid remote DevTools end point capability.
         /// </summary>
@@ -425,6 +428,14 @@ public ReadOnlyCollection<IWebElement> FindElementsByCssSelector(string cssSelec
         /// <returns>The active session to use to communicate with the Developer Tools debugging protocol.</returns>
         public DevToolsSession GetDevToolsSession()
         {
+            if (this.Capabilities.GetCapability(CapabilityType.BrowserName) == "firefox")
+            {
+                if (_logger.IsEnabled(LogEventLevel.Warn))
+                {
+                    _logger.Warn("CDP support for Firefox is deprecated and will be removed in future versions. Please switch to WebDriver BiDi.");
+                }
+            }
+
             return GetDevToolsSession(new DevToolsOptions() { ProtocolVersion = DevToolsSession.AutoDetectDevToolsProtocolVersion });
         }
 

java/src/org/openqa/selenium/grid/sessionqueue/local/LocalNewSessionQueue.java

@@ -300,9 +300,7 @@ public boolean retryAddToQueue(SessionRequest request) {
           // return true to avoid handleNewSessionRequest to call 'complete' an other time
           return true;
         } else if (data.isCanceled()) {
-          complete(
-              request.getRequestId(),
-              Either.left(new SessionNotCreatedException("Client has gone away")));
+          failDueToCanceled(request.getRequestId());
           // return true to avoid handleNewSessionRequest to call 'complete' an other time
           return true;
         }
@@ -370,7 +368,18 @@ public List<SessionRequest> getNextAvailable(Map<Capabilities, Long> stereotypes
               .limit(batchSize)
               .collect(Collectors.toList());
 
-      availableRequests.forEach(req -> this.remove(req.getRequestId()));
+      availableRequests.removeIf(
+          (req) -> {
+            Data data = this.requests.get(req.getRequestId());
+
+            if (data.isCanceled()) {
+              failDueToCanceled(req.getRequestId());
+              return true;
+            }
+
+            this.remove(req.getRequestId());
+            return false;
+          });
 
       return availableRequests;
     } finally {
@@ -458,6 +467,11 @@ private void failDueToTimeout(RequestId reqId) {
     complete(reqId, Either.left(new SessionNotCreatedException("Timed out creating session")));
   }
 
+  private void failDueToCanceled(RequestId reqId) {
+    // this error should never reach the client, as this is a client initiated state
+    complete(reqId, Either.left(new SessionNotCreatedException("Client has gone away")));
+  }
+
   private class Data {
 
     public final Instant endTime;

java/test/org/openqa/selenium/environment/webserver/NettyAppServer.java

@@ -149,7 +149,16 @@ public void start() {
             () -> {
               server.start();
               if (secure != null) {
-                secure.start();
+                try {
+                  secure.start();
+                } catch (Exception e) {
+                  try {
+                    server.stop();
+                  } catch (Exception ex) {
+                    e.addSuppressed(ex);
+                    throw e;
+                  }
+                }
               }
             });
   }

py/BUILD.bazel

@@ -62,7 +62,7 @@ compile_pip_requirements(
     ],
 )
 
-SE_VERSION = "4.27.0.dev202410311942"
+SE_VERSION = "4.27.0.202410311942"
 
 BROWSER_VERSIONS = [
     "v85",

py/docs/source/conf.py

@@ -58,7 +58,7 @@
 # The short X.Y version.
 version = '4.27'
 # The full version, including alpha/beta/rc tags.
-release = '4.27.0.dev202410311942'
+release = '4.27.0.202410311942'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

py/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "selenium"
-version = "4.27.0.dev202410311942"
+version = "4.27.0.202410311942"
 license = "Apache 2.0"
 description = "Official Python bindings for Selenium WebDriver."
 readme = "README.rst"
@@ -52,15 +52,15 @@ SourceCode = "https://github.com/SeleniumHQ/selenium/tree/trunk/py"
 
 [tool.setuptools.package-data]
 selenium_package = [
-    "*.py", 
+    "*.py",
     "*.rst",
-    "*.json", 
-    "*.xpi", 
+    "*.json",
+    "*.xpi",
     "*.js",
     "py.typed",
     "prune*",
     "selenium.egg-info*",
-    "selenium-manager", 
+    "selenium-manager",
     "selenium-manager.exe",
     "CHANGES",
     "LICENSE"

py/selenium/__init__.py

@@ -16,4 +16,4 @@
 # under the License.
 
 
-__version__ = "4.27.0.dev202410311942"
+__version__ = "4.27.0.202410311942"

py/selenium/webdriver/__init__.py

@@ -44,7 +44,7 @@
 from .wpewebkit.service import Service as WPEWebKitService  # noqa
 from .wpewebkit.webdriver import WebDriver as WPEWebKit  # noqa
 
-__version__ = "4.27.0.dev202410311942"
+__version__ = "4.27.0.202410311942"
 
 # We need an explicit __all__ because the above won't otherwise be exported.
 __all__ = [