Merge branch 'trunk' into dotnet-deprecated-getattribute

shbenzer · web-flow · commit 6659ec51df42 · 2024-10-31T14:23:36.000-04:00
diff --git a/common/mirror/selenium b/common/mirror/selenium
@@ -23,13 +23,13 @@
     "tag_name": "nightly",
     "assets": [
       {
-        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-java-4.26.0-SNAPSHOT.zip"
+        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-java-4.27.0-SNAPSHOT.zip"
       },
       {
-        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.26.0-SNAPSHOT.jar"
+        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.27.0-SNAPSHOT.jar"
       },
       {
-        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.26.0-SNAPSHOT.zip"
+        "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.27.0-SNAPSHOT.zip"
       }
     ]
   },
diff --git a/dotnet/CHANGELOG b/dotnet/CHANGELOG
@@ -1,3 +1,8 @@
+v4.26.1
+======
+* [bidi] Reveal browsing context module in bidi instance (#14684)
+* Fix adding cookies when ReturnedCookie class is used (#14697)
+
 v4.26.0
 ======
 * [bidi] Fix web socket communication for .net framework
diff --git a/dotnet/selenium-dotnet-version.bzl b/dotnet/selenium-dotnet-version.bzl
@@ -1,6 +1,6 @@
 # BUILD FILE SYNTAX: STARLARK
 
-SE_VERSION = "4.27.0-nightly202410301443"
+SE_VERSION = "4.27.0-nightly202410311906"
 ASSEMBLY_VERSION = "4.0.0.0"
 SUPPORTED_NET_STANDARD_VERSIONS = ["netstandard2.0"]
 
diff --git a/dotnet/src/webdriver/BiDi/BiDi.cs b/dotnet/src/webdriver/BiDi/BiDi.cs
@@ -39,7 +39,7 @@ internal BiDi(string url)
     }
 
     internal Modules.Session.SessionModule SessionModule => _sessionModule.Value;
-    internal Modules.BrowsingContext.BrowsingContextModule BrowsingContext => _browsingContextModule.Value;
+    public Modules.BrowsingContext.BrowsingContextModule BrowsingContext => _browsingContextModule.Value;
     public Modules.Browser.BrowserModule Browser => _browserModule.Value;
     public Modules.Network.NetworkModule Network => _networkModule.Value;
     internal Modules.Input.InputModule InputModule => _inputModule.Value;
diff --git a/dotnet/src/webdriver/Command.cs b/dotnet/src/webdriver/Command.cs
@@ -159,6 +159,7 @@ private static Dictionary<string, object> ConvertParametersFromJson(string value
     [JsonSerializable(typeof(byte[]))]
     [JsonSerializable(typeof(Dictionary<string, object>))]
     [JsonSerializable(typeof(Cookie))]
+    [JsonSerializable(typeof(ReturnedCookie))]
     [JsonSerializable(typeof(Proxy))]
     internal partial class CommandJsonSerializerContext : JsonSerializerContext
     {
diff --git a/java/src/org/openqa/selenium/bidi/script/NodeProperties.java b/java/src/org/openqa/selenium/bidi/script/NodeProperties.java
@@ -25,7 +25,7 @@
 public class NodeProperties {
   private enum Mode {
     OPEN("open"),
-    CLOSE("close");
+    CLOSED("closed");
 
     private final String value;
 
diff --git a/java/src/org/openqa/selenium/netty/server/SeleniumHandler.java b/java/src/org/openqa/selenium/netty/server/SeleniumHandler.java
@@ -19,8 +19,10 @@
 
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 import org.openqa.selenium.internal.Require;
 import org.openqa.selenium.remote.ErrorFilter;
 import org.openqa.selenium.remote.http.HttpHandler;
@@ -31,18 +33,27 @@ class SeleniumHandler extends SimpleChannelInboundHandler<HttpRequest> {
 
   private static final ExecutorService EXECUTOR = Executors.newCachedThreadPool();
   private final HttpHandler seleniumHandler;
+  private Future<?> lastOne;
 
   public SeleniumHandler(HttpHandler seleniumHandler) {
     super(HttpRequest.class);
     this.seleniumHandler = Require.nonNull("HTTP handler", seleniumHandler).with(new ErrorFilter());
+    this.lastOne = CompletableFuture.completedFuture(null);
   }
 
   @Override
   protected void channelRead0(ChannelHandlerContext ctx, HttpRequest msg) {
-    EXECUTOR.submit(
-        () -> {
-          HttpResponse res = seleniumHandler.execute(msg);
-          ctx.writeAndFlush(res);
-        });
+    lastOne =
+        EXECUTOR.submit(
+            () -> {
+              HttpResponse res = seleniumHandler.execute(msg);
+              ctx.writeAndFlush(res);
+            });
+  }
+
+  @Override
+  public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+    lastOne.cancel(true);
+    super.channelInactive(ctx);
   }
 }
diff --git a/java/src/org/openqa/selenium/remote/http/jdk/JdkHttpClient.java b/java/src/org/openqa/selenium/remote/http/jdk/JdkHttpClient.java
@@ -388,17 +388,16 @@ public CompletableFuture<HttpResponse> executeAsync(HttpRequest request) {
               }
             });
 
-    // try to interrupt the http request in case of a timeout, to avoid
-    // https://bugs.openjdk.org/browse/JDK-8258397
-    cf.exceptionally(
-        (throwable) -> {
-          if (throwable instanceof java.util.concurrent.TimeoutException) {
-            // interrupts the thread
+    cf.whenComplete(
+        (result, throwable) -> {
+          if (throwable instanceof java.util.concurrent.CancellationException) {
+            // try to interrupt the http request in case someone canceled the future returned
+            future.cancel(true);
+          } else if (throwable instanceof java.util.concurrent.TimeoutException) {
+            // try to interrupt the http request in case of a timeout, to avoid
+            // https://bugs.openjdk.org/browse/JDK-8258397
             future.cancel(true);
           }
-
-          // nobody will read this result
-          return null;
         });
 
     // will complete exceptionally with a java.util.concurrent.TimeoutException
@@ -407,13 +406,15 @@ public CompletableFuture<HttpResponse> executeAsync(HttpRequest request) {
 
   @Override
   public HttpResponse execute(HttpRequest req) throws UncheckedIOException {
+    Future<HttpResponse> async = executeAsync(req);
     try {
       // executeAsync does define a timeout, no need to use a timeout here
-      return executeAsync(req).get();
+      return async.get();
     } catch (CancellationException e) {
       throw new WebDriverException(e.getMessage(), e);
     } catch (InterruptedException e) {
       Thread.currentThread().interrupt();
+      async.cancel(true);
       throw new WebDriverException(e.getMessage(), e);
     } catch (ExecutionException e) {
       Throwable cause = e.getCause();
@@ -495,7 +496,7 @@ private HttpResponse execute0(HttpRequest req) throws UncheckedIOException {
       throw new UncheckedIOException(e);
     } catch (InterruptedException e) {
       Thread.currentThread().interrupt();
-      throw new RuntimeException(e);
+      throw new WebDriverException(e.getMessage(), e);
     } finally {
       LOG.log(
           Level.FINE,
diff --git a/java/test/org/openqa/selenium/bidi/browsingcontext/LocateNodesTest.java b/java/test/org/openqa/selenium/bidi/browsingcontext/LocateNodesTest.java
@@ -162,8 +162,6 @@ void canLocateNodesWithMaxNodeCount() {
   }
 
   @Test
-  @NotYetImplemented(CHROME)
-  @NotYetImplemented(EDGE)
   void canLocateNodesGivenStartNodes() {
     String handle = driver.getWindowHandle();
     BrowsingContext browsingContext = new BrowsingContext(driver, handle);
diff --git a/java/test/org/openqa/selenium/netty/server/NettyServerTest.java b/java/test/org/openqa/selenium/netty/server/NettyServerTest.java
@@ -28,14 +28,20 @@
 
 import com.google.common.collect.ImmutableMap;
 import java.net.URL;
+import java.time.Duration;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.openqa.selenium.TimeoutException;
 import org.openqa.selenium.grid.config.CompoundConfig;
 import org.openqa.selenium.grid.config.Config;
 import org.openqa.selenium.grid.config.MapConfig;
 import org.openqa.selenium.grid.server.BaseServerOptions;
 import org.openqa.selenium.grid.server.Server;
 import org.openqa.selenium.net.PortProber;
+import org.openqa.selenium.remote.http.ClientConfig;
 import org.openqa.selenium.remote.http.HttpClient;
 import org.openqa.selenium.remote.http.HttpRequest;
 import org.openqa.selenium.remote.http.HttpResponse;
@@ -141,6 +147,43 @@ void shouldNotBindToHost() {
     assertEquals("anyRandomHost", server.getUrl().getHost());
   }
 
+  @Test
+  void doesInterruptPending() throws Exception {
+    CountDownLatch interrupted = new CountDownLatch(1);
+    Config cfg = new MapConfig(ImmutableMap.of());
+    BaseServerOptions options = new BaseServerOptions(cfg);
+
+    Server<?> server =
+        new NettyServer(
+                options,
+                req -> {
+                  try {
+                    Thread.sleep(800);
+                  } catch (InterruptedException ex) {
+                    interrupted.countDown();
+                  }
+                  return new HttpResponse();
+                })
+            .start();
+    ClientConfig config =
+        ClientConfig.defaultConfig()
+            .readTimeout(Duration.ofMillis(400))
+            .baseUri(server.getUrl().toURI());
+
+    // provoke a client timeout
+    Assertions.assertThrows(
+        TimeoutException.class,
+        () -> {
+          try (HttpClient client = HttpClient.Factory.createDefault().createClient(config)) {
+            HttpRequest request = new HttpRequest(DELETE, "/session");
+            request.setHeader("Accept", "*/*");
+            client.execute(request);
+          }
+        });
+
+    assertTrue(interrupted.await(1000, TimeUnit.MILLISECONDS), "The handling was interrupted");
+  }
+
   private void outputHeaders(HttpResponse res) {
     res.forEachHeader((name, value) -> System.out.printf("%s -> %s\n", name, value));
   }
diff --git a/java/test/org/openqa/selenium/remote/internal/HttpClientTestBase.java b/java/test/org/openqa/selenium/remote/internal/HttpClientTestBase.java
@@ -35,7 +35,9 @@
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 import java.util.stream.StreamSupport;
 import org.junit.jupiter.api.AfterAll;
@@ -44,6 +46,7 @@
 import org.openqa.selenium.BuildInfo;
 import org.openqa.selenium.Platform;
 import org.openqa.selenium.TimeoutException;
+import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.environment.webserver.AppServer;
 import org.openqa.selenium.environment.webserver.NettyAppServer;
 import org.openqa.selenium.json.Json;
@@ -234,32 +237,89 @@ public void shouldAllowConfigurationFromSystemProperties() {
     }
   }
 
-  @Test
-  public void shouldStopRequestAfterTimeout() throws InterruptedException {
-    AtomicInteger counter = new AtomicInteger();
+  private ClientConfig prepareShouldStopTest(
+      CountDownLatch executing, CountDownLatch interrupted, int timeout) {
+    CountDownLatch unlock = new CountDownLatch(1);
 
     delegate =
         req -> {
-          counter.incrementAndGet();
           try {
-            Thread.sleep(1600);
+            unlock.await(20, TimeUnit.SECONDS);
           } catch (InterruptedException ex) {
             Thread.currentThread().interrupt();
+            throw new RuntimeException(ex);
           }
-          HttpResponse response = new HttpResponse();
-          response.setStatus(302);
-          response.addHeader("Location", "/");
-          return response;
+
+          return new HttpResponse();
         };
-    ClientConfig clientConfig = ClientConfig.defaultConfig().readTimeout(Duration.ofMillis(800));
+
+    return ClientConfig.defaultConfig()
+        .withFilter(
+            (handler) ->
+                (request) -> {
+                  try {
+                    executing.countDown();
+                    return handler.execute(request);
+                  } catch (WebDriverException ex) {
+                    if (ex.getCause() instanceof InterruptedException) {
+                      interrupted.countDown();
+                    }
+
+                    throw ex;
+                  } finally {
+                    unlock.countDown();
+                  }
+                })
+        .readTimeout(Duration.ofMillis(timeout));
+  }
+
+  @Test
+  public void shouldStopRequestAfterTimeout() throws InterruptedException {
+    CountDownLatch executing = new CountDownLatch(1);
+    CountDownLatch interrupted = new CountDownLatch(1);
+    ClientConfig clientConfig = prepareShouldStopTest(executing, interrupted, 400);
 
     try (HttpClient client =
         createFactory().createClient(clientConfig.baseUri(URI.create(server.whereIs("/"))))) {
       HttpRequest request = new HttpRequest(GET, "/delayed");
+
       assertThatExceptionOfType(TimeoutException.class).isThrownBy(() -> client.execute(request));
-      Thread.sleep(4200);
+      assertThat(interrupted.await(800, TimeUnit.MILLISECONDS)).isTrue();
+    }
+  }
+
+  @Test
+  public void shouldStopAsyncRequestAfterTimeout() throws InterruptedException {
+    CountDownLatch executing = new CountDownLatch(1);
+    CountDownLatch interrupted = new CountDownLatch(1);
+    ClientConfig clientConfig = prepareShouldStopTest(executing, interrupted, 400);
+
+    try (HttpClient client =
+        createFactory().createClient(clientConfig.baseUri(URI.create(server.whereIs("/"))))) {
+      HttpRequest request = new HttpRequest(GET, "/delayed");
+      // does intentionally not read the future
+      client.executeAsync(request);
+      assertThat(interrupted.await(800, TimeUnit.MILLISECONDS)).isTrue();
+    }
+  }
+
+  @Test
+  public void shouldStopRequestOnCancel() throws InterruptedException {
+    CountDownLatch executing = new CountDownLatch(1);
+    CountDownLatch interrupted = new CountDownLatch(1);
+    CountDownLatch unlock = new CountDownLatch(1);
+    ClientConfig clientConfig = prepareShouldStopTest(executing, interrupted, 4000);
+
+    try (HttpClient client =
+        createFactory().createClient(clientConfig.baseUri(URI.create(server.whereIs("/"))))) {
+      HttpRequest request = new HttpRequest(GET, "/delayed");
+
+      Future<?> future = client.executeAsync(request);
 
-      assertThat(counter.get()).isEqualTo(1);
+      assertThat(executing.await(800, TimeUnit.MILLISECONDS)).isTrue();
+      assertThat(future.cancel(true)).isTrue();
+      assertThat(interrupted.await(800, TimeUnit.MILLISECONDS)).isTrue();
+      unlock.countDown();
     }
   }
 
diff --git a/py/selenium/webdriver/chromium/remote_connection.py b/py/selenium/webdriver/chromium/remote_connection.py
@@ -30,9 +30,10 @@ def __init__(
         ignore_proxy: Optional[bool] = False,
         client_config: Optional[ClientConfig] = None,
     ) -> None:
+        client_config = client_config or ClientConfig(
+            remote_server_addr=remote_server_addr, keep_alive=keep_alive, timeout=120
+        )
         super().__init__(
-            remote_server_addr=remote_server_addr,
-            keep_alive=keep_alive,
             ignore_proxy=ignore_proxy,
             client_config=client_config,
         )
diff --git a/py/selenium/webdriver/firefox/remote_connection.py b/py/selenium/webdriver/firefox/remote_connection.py
@@ -32,9 +32,10 @@ def __init__(
         ignore_proxy: Optional[bool] = False,
         client_config: Optional[ClientConfig] = None,
     ) -> None:
+        client_config = client_config or ClientConfig(
+            remote_server_addr=remote_server_addr, keep_alive=keep_alive, timeout=120
+        )
         super().__init__(
-            remote_server_addr=remote_server_addr,
-            keep_alive=keep_alive,
             ignore_proxy=ignore_proxy,
             client_config=client_config,
         )
diff --git a/py/selenium/webdriver/ie/webdriver.py b/py/selenium/webdriver/ie/webdriver.py
@@ -16,6 +16,7 @@
 # under the License.
 
 from selenium.webdriver.common.driver_finder import DriverFinder
+from selenium.webdriver.remote.client_config import ClientConfig
 from selenium.webdriver.remote.remote_connection import RemoteConnection
 from selenium.webdriver.remote.webdriver import WebDriver as RemoteWebDriver
 
@@ -49,10 +50,10 @@ def __init__(
         self.service.path = self.service.env_path() or DriverFinder(self.service, options).get_driver_path()
         self.service.start()
 
+        client_config = ClientConfig(remote_server_addr=self.service.service_url, keep_alive=keep_alive, timeout=120)
         executor = RemoteConnection(
-            remote_server_addr=self.service.service_url,
-            keep_alive=keep_alive,
             ignore_proxy=options._ignore_local_proxy,
+            client_config=client_config,
         )
 
         try:
diff --git a/py/selenium/webdriver/remote/remote_connection.py b/py/selenium/webdriver/remote/remote_connection.py
diff --git a/py/selenium/webdriver/safari/remote_connection.py b/py/selenium/webdriver/safari/remote_connection.py
diff --git a/py/selenium/webdriver/safari/webdriver.py b/py/selenium/webdriver/safari/webdriver.py
diff --git a/py/test/unit/selenium/webdriver/remote/remote_connection_tests.py b/py/test/unit/selenium/webdriver/remote/remote_connection_tests.py

Original file line number	Diff line number	Diff line change
`@@ -23,13 +23,13 @@`
`23`	`23`	`"tag_name": "nightly",`
`24`	`24`	`"assets": [`
`25`	`25`	`{`
`26`		`- "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-java-4.26.0-SNAPSHOT.zip"`
	`26`	`+ "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-java-4.27.0-SNAPSHOT.zip"`
`27`	`27`	`},`
`28`	`28`	`{`
`29`		`- "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.26.0-SNAPSHOT.jar"`
	`29`	`+ "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.27.0-SNAPSHOT.jar"`
`30`	`30`	`},`
`31`	`31`	`{`
`32`		`- "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.26.0-SNAPSHOT.zip"`
	`32`	`+ "browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.27.0-SNAPSHOT.zip"`
`33`	`33`	`}`
`34`	`34`	`]`
`35`	`35`	`},`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ internal BiDi(string url)`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`internal Modules.Session.SessionModule SessionModule => _sessionModule.Value;`
`42`		`- internal Modules.BrowsingContext.BrowsingContextModule BrowsingContext => _browsingContextModule.Value;`
	`42`	`+ public Modules.BrowsingContext.BrowsingContextModule BrowsingContext => _browsingContextModule.Value;`
`43`	`43`	`public Modules.Browser.BrowserModule Browser => _browserModule.Value;`
`44`	`44`	`public Modules.Network.NetworkModule Network => _networkModule.Value;`
`45`	`45`	`internal Modules.Input.InputModule InputModule => _inputModule.Value;`
Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,7 @@ private static Dictionary<string, object> ConvertParametersFromJson(string value`
`159`	`159`	`[JsonSerializable(typeof(byte[]))]`
`160`	`160`	`[JsonSerializable(typeof(Dictionary<string, object>))]`
`161`	`161`	`[JsonSerializable(typeof(Cookie))]`
	`162`	`+ [JsonSerializable(typeof(ReturnedCookie))]`
`162`	`163`	`[JsonSerializable(typeof(Proxy))]`
`163`	`164`	`internal partial class CommandJsonSerializerContext : JsonSerializerContext`
`164`	`165`	`{`
Original file line number	Diff line number	Diff line change
`@@ -162,8 +162,6 @@ void canLocateNodesWithMaxNodeCount() {`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`@Test`
`165`		`- @NotYetImplemented(CHROME)`
`166`		`- @NotYetImplemented(EDGE)`
`167`	`165`	`void canLocateNodesGivenStartNodes() {`
`168`	`166`	`String handle = driver.getWindowHandle();`
`169`	`167`	`BrowsingContext browsingContext = new BrowsingContext(driver, handle);`