Merge branch 'trunk' into webdriver-nullable-1

Author: RenderMichael

dotnet/src/webdriver/DevTools/DevToolsDomains.cs

@@ -82,7 +82,7 @@ public abstract class DevToolsDomains
         /// Initializes the supplied DevTools session's domains for the specified browser version.
         /// </summary>
         /// <param name="protocolVersion">The version of the DevTools Protocol to use.</param>
-        /// <param name="session">The <see cref="DevToolsSession"/> for which to initialiize the domains.</param>
+        /// <param name="session">The <see cref="DevToolsSession"/> for which to initialize the domains.</param>
         /// <returns>The <see cref="DevToolsDomains"/> object containing the version-specific domains.</returns>
         /// <exception cref="ArgumentException">If <paramref name="protocolVersion"/> is negative.</exception>
         /// <exception cref="WebDriverException">If the desired protocol version is not supported.</exception>
@@ -95,7 +95,7 @@ public static DevToolsDomains InitializeDomains(int protocolVersion, DevToolsSes
         /// Initializes the supplied DevTools session's domains for the specified browser version within the specified number of versions.
         /// </summary>
         /// <param name="protocolVersion">The version of the DevTools Protocol to use.</param>
-        /// <param name="session">The <see cref="DevToolsSession"/> for which to initialiize the domains.</param>
+        /// <param name="session">The <see cref="DevToolsSession"/> for which to initialize the domains.</param>
         /// <param name="versionRange">The range of versions within which to match the provided version number. Defaults to 5 versions.</param>
         /// <returns>The <see cref="DevToolsDomains"/> object containing the version-specific domains.</returns>
         /// <exception cref="ArgumentException">If <paramref name="protocolVersion"/> is negative.</exception>

dotnet/src/webdriver/DevTools/v130/V130Domains.cs

@@ -17,22 +17,27 @@
 // under the License.
 // </copyright>
 
+using System;
+
+#nullable enable
+
 namespace OpenQA.Selenium.DevTools.V130
 {
     /// <summary>
     /// Class containing the domain implementation for version 130 of the DevTools Protocol.
     /// </summary>
     public class V130Domains : DevToolsDomains
     {
-        private DevToolsSessionDomains domains;
+        private readonly DevToolsSessionDomains domains;
 
         /// <summary>
         /// Initializes a new instance of the V130Domains class.
         /// </summary>
         /// <param name="session">The DevToolsSession to use with this set of domains.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="session"/> is <see langword="null"/>.</exception>
         public V130Domains(DevToolsSession session)
         {
-            this.domains = new DevToolsSessionDomains(session);
+            this.domains = new DevToolsSessionDomains(session ?? throw new ArgumentNullException(nameof(session)));
         }
 
         /// <summary>

dotnet/src/webdriver/DevTools/v131/V131Domains.cs

@@ -17,22 +17,27 @@
 // under the License.
 // </copyright>
 
+using System;
+
+#nullable enable
+
 namespace OpenQA.Selenium.DevTools.V131
 {
     /// <summary>
     /// Class containing the domain implementation for version 131 of the DevTools Protocol.
     /// </summary>
     public class V131Domains : DevToolsDomains
     {
-        private DevToolsSessionDomains domains;
+        private readonly DevToolsSessionDomains domains;
 
         /// <summary>
         /// Initializes a new instance of the V131Domains class.
         /// </summary>
         /// <param name="session">The DevToolsSession to use with this set of domains.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="session"/> is <see langword="null"/>.</exception>
         public V131Domains(DevToolsSession session)
         {
-            this.domains = new DevToolsSessionDomains(session);
+            this.domains = new DevToolsSessionDomains(session ?? throw new ArgumentNullException(nameof(session)));
         }
 
         /// <summary>

dotnet/src/webdriver/DevTools/v132/V132Domains.cs

@@ -17,22 +17,27 @@
 // under the License.
 // </copyright>
 
+using System;
+
+#nullable enable
+
 namespace OpenQA.Selenium.DevTools.V132
 {
     /// <summary>
     /// Class containing the domain implementation for version 132 of the DevTools Protocol.
     /// </summary>
     public class V132Domains : DevToolsDomains
     {
-        private DevToolsSessionDomains domains;
+        private readonly DevToolsSessionDomains domains;
 
         /// <summary>
         /// Initializes a new instance of the V132Domains class.
         /// </summary>
         /// <param name="session">The DevToolsSession to use with this set of domains.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="session"/> is <see langword="null"/>.</exception>
         public V132Domains(DevToolsSession session)
         {
-            this.domains = new DevToolsSessionDomains(session);
+            this.domains = new DevToolsSessionDomains(session ?? throw new ArgumentNullException(nameof(session)));
         }
 
         /// <summary>

dotnet/src/webdriver/DevTools/v85/V85Domains.cs

@@ -17,22 +17,27 @@
 // under the License.
 // </copyright>
 
+using System;
+
+#nullable enable
+
 namespace OpenQA.Selenium.DevTools.V85
 {
     /// <summary>
     /// Class containing the domain implementation for version 86 of the DevTools Protocol.
     /// </summary>
     public class V85Domains : DevToolsDomains
     {
-        private DevToolsSessionDomains domains;
+        private readonly DevToolsSessionDomains domains;
 
         /// <summary>
         /// Initializes a new instance of the V85Domains class.
         /// </summary>
         /// <param name="session">The DevToolsSession to use with this set of domains.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="session"/> is <see langword="null"/>.</exception>
         public V85Domains(DevToolsSession session)
         {
-            this.domains = new DevToolsSessionDomains(session);
+            this.domains = new DevToolsSessionDomains(session ?? throw new ArgumentNullException(nameof(session)));
         }
 
         /// <summary>

dotnet/src/webdriver/Response.cs

@@ -20,6 +20,7 @@
 using OpenQA.Selenium.Internal;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -215,6 +216,21 @@ public string ToJson()
             return JsonSerializer.Serialize(this);
         }
 
+        /// <summary>
+        /// Throws if <see cref="Value"/> is <see langword="null"/>.
+        /// </summary>
+        /// <exception cref="WebDriverException">If <see cref="Value"/> is <see langword="null"/>.</exception>
+        [MemberNotNull(nameof(Value))]
+        internal Response EnsureValueIsNotNull()
+        {
+            if (Value is null)
+            {
+                throw new WebDriverException("Response from remote end doesn't have $.Value property");
+            }
+
+            return this;
+        }
+
         /// <summary>
         /// Returns the object as a string.
         /// </summary>

java/src/org/openqa/selenium/grid/data/NodeStatus.java

@@ -76,7 +76,7 @@ public static NodeStatus fromJson(JsonInput input) {
     Set<Slot> slots = null;
     Availability availability = null;
     Duration heartbeatPeriod = null;
-    Duration sessionTimeout = null;
+    Duration sessionTimeout = Duration.ofSeconds(300);
     String version = null;
     Map<String, String> osInfo = null;
 

java/src/org/openqa/selenium/remote/http/jdk/JdkHttpClient.java

@@ -511,15 +511,28 @@ public void close() {
     if (this.client == null) {
       return;
     }
-    this.client = null;
+
     for (WebSocket websocket : websockets) {
       try {
         websocket.close();
       } catch (Exception e) {
         LOG.log(Level.WARNING, "failed to close the websocket: " + websocket, e);
       }
     }
-    executorService.shutdownNow();
+
+    if (this.client instanceof AutoCloseable) {
+      AutoCloseable closeable = (AutoCloseable) this.client;
+      executorService.submit(
+          () -> {
+            try {
+              closeable.close();
+            } catch (Exception e) {
+              LOG.log(Level.WARNING, "failed to close the http client: " + closeable, e);
+            }
+          });
+    }
+    this.client = null;
+    executorService.shutdown();
   }
 
   @AutoService(HttpClient.Factory.class)

java/test/org/openqa/selenium/grid/data/NodeStatusTest.java

@@ -72,4 +72,79 @@ void ensureRoundTripWorks() throws URISyntaxException {
 
     assertThat(seen).isEqualTo(status);
   }
+
+  @Test
+  void withoutSessionTimeoutInJsonStatus() throws URISyntaxException {
+    String source =
+        "{\n"
+            + "      \"availability\": \"UP\",\n"
+            + "      \"externalUri\": \"http:\\u002f\\u002f192.168.1.101:5555\",\n"
+            + "      \"heartbeatPeriod\": 60000,\n"
+            + "      \"maxSessions\": 1,\n"
+            + "      \"nodeId\": \"d136dd9b-6497-4049-9371-42f89b14ea2b\",\n"
+            + "      \"osInfo\": {\n"
+            + "        \"arch\": \"aarch64\",\n"
+            + "        \"name\": \"Mac OS X\",\n"
+            + "        \"version\": \"15.3\"\n"
+            + "      },\n"
+            + "      \"slots\": [\n"
+            + "        {\n"
+            + "          \"id\": {\n"
+            + "            \"hostId\": \"d136dd9b-6497-4049-9371-42f89b14ea2b\",\n"
+            + "            \"id\": \"965e8cb4-7b48-4638-8bc8-6889c6319682\"\n"
+            + "          },\n"
+            + "          \"lastStarted\": \"1970-01-01T00:00:00Z\",\n"
+            + "          \"session\": null,\n"
+            + "          \"stereotype\": {\n"
+            + "            \"browserName\": \"chrome\",\n"
+            + "            \"platformName\": \"mac\"\n"
+            + "          }\n"
+            + "        }\n"
+            + "      ],\n"
+            + "      \"version\": \"4.17.0 (revision unknown*)\"\n"
+            + "    }";
+
+    Json json = new Json();
+    NodeStatus nodeStatus = json.toType(source, NodeStatus.class);
+
+    assertThat(nodeStatus.getSessionTimeout()).isEqualTo(Duration.ofSeconds(300));
+  }
+
+  @Test
+  void withSessionTimeoutInJsonStatus() throws URISyntaxException {
+    String source =
+        "{\n"
+            + "      \"availability\": \"UP\",\n"
+            + "      \"externalUri\": \"http:\\u002f\\u002f192.168.1.101:5555\",\n"
+            + "      \"heartbeatPeriod\": 60000,\n"
+            + "      \"maxSessions\": 1,\n"
+            + "      \"sessionTimeout\": 600000,\n"
+            + "      \"nodeId\": \"d136dd9b-6497-4049-9371-42f89b14ea2b\",\n"
+            + "      \"osInfo\": {\n"
+            + "        \"arch\": \"aarch64\",\n"
+            + "        \"name\": \"Mac OS X\",\n"
+            + "        \"version\": \"15.3\"\n"
+            + "      },\n"
+            + "      \"slots\": [\n"
+            + "        {\n"
+            + "          \"id\": {\n"
+            + "            \"hostId\": \"d136dd9b-6497-4049-9371-42f89b14ea2b\",\n"
+            + "            \"id\": \"965e8cb4-7b48-4638-8bc8-6889c6319682\"\n"
+            + "          },\n"
+            + "          \"lastStarted\": \"1970-01-01T00:00:00Z\",\n"
+            + "          \"session\": null,\n"
+            + "          \"stereotype\": {\n"
+            + "            \"browserName\": \"chrome\",\n"
+            + "            \"platformName\": \"mac\"\n"
+            + "          }\n"
+            + "        }\n"
+            + "      ],\n"
+            + "      \"version\": \"4.17.0 (revision unknown*)\"\n"
+            + "    }";
+
+    Json json = new Json();
+    NodeStatus nodeStatus = json.toType(source, NodeStatus.class);
+
+    assertThat(nodeStatus.getSessionTimeout()).isEqualTo(Duration.ofSeconds(600));
+  }
 }

javascript/node/selenium-webdriver/bidi/network.js

@@ -29,6 +29,11 @@ const NetworkEvent = {
   FETCH_ERROR: 'network.fetchError',
 }
 
+const CacheBehavior = Object.freeze({
+  DEFAULT: 'default',
+  BYPASS: 'bypass',
+})
+
 /**
  * Represents all commands and events of Network module.
  * Described in https://w3c.github.io/webdriver-bidi/#module-network.
@@ -355,6 +360,40 @@ class Network {
     await this.bidi.send(command)
   }
 
+  /**
+   * Sets the cache behavior for network requests.
+   *
+   * @param {string} behavior - The cache behavior ("default" or "bypass")
+   * @param {Array<string>} [contexts] - Optional array of browsing context IDs
+   * @returns {Promise<void>} A promise that resolves when the cache behavior is set
+   * @throws {Error} If behavior is invalid or context IDs are invalid
+   */
+  async setCacheBehavior(behavior, contexts = null) {
+    if (!Object.values(CacheBehavior).includes(behavior)) {
+      throw new Error(`Cache behavior must be either "${CacheBehavior.DEFAULT}" or "${CacheBehavior.BYPASS}"`)
+    }
+
+    const command = {
+      method: 'network.setCacheBehavior',
+      params: {
+        cacheBehavior: behavior,
+      },
+    }
+
+    if (contexts !== null) {
+      if (
+        !Array.isArray(contexts) ||
+        contexts.length === 0 ||
+        contexts.some((c) => typeof c !== 'string' || c.trim() === '')
+      ) {
+        throw new Error('Contexts must be an array of non-empty strings')
+      }
+      command.params.contexts = contexts
+    }
+
+    await this.bidi.send(command)
+  }
+
   /**
    * Unsubscribes from network events for all browsing contexts.
    * @returns {Promise<void>} A promise that resolves when the network connection is closed.
@@ -389,4 +428,4 @@ async function getNetworkInstance(driver, browsingContextIds = null) {
   return instance
 }
 
-module.exports = getNetworkInstance
+module.exports = { Network: getNetworkInstance, CacheBehavior }