Merge branch 'trunk' into dotnet-getcookie-endpoint

Author: nvborisenko

.bazelversion

@@ -1 +1 @@
-7.3.1
+7.4.1

.github/workflows/bazel.yml

@@ -82,9 +82,12 @@ jobs:
     steps:
       - name: Checkout source tree
         uses: actions/checkout@v4
-      - name: Pull latest changes
-        if: startsWith(github.head_ref, 'renovate/')
+      - name: Pull latest changes from head ref for PRs
+        if: contains(github.head_ref, 'renovate/')
         run: git pull origin ${{ github.head_ref }}
+      - name: Pull latest changes from ref for branch pushes
+        if: contains(github.ref, 'renovate/')
+        run: git pull origin ${{ github.ref }}
       - name: Free space
         if: inputs.os != 'windows'
         run: ./scripts/github-actions/free-disk-space.sh

.github/workflows/stale.yml

@@ -21,7 +21,7 @@ jobs:
           stale-issue-message: 'This issue is stale because it has been open 280 days with no activity. Remove stale label or comment or this will be closed in 14 days.'
           close-issue-message: 'This issue was closed because it has been stalled for 14 days with no activity.'
           stale-issue-label: 'I-stale'
-          days-before-stale: 280
+          days-before-stale: 180
           days-before-close: 14
       - uses: actions/stale@v9
         with:

LICENSE

@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2024 Software Freedom Conservancy (SFC)
+   Copyright 2025 Software Freedom Conservancy (SFC)
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

MODULE.bazel

@@ -1,27 +1,27 @@
 module(name = "selenium")
 
 bazel_dep(name = "apple_rules_lint", version = "0.4.0")
-bazel_dep(name = "aspect_bazel_lib", version = "2.8.1")
+bazel_dep(name = "aspect_bazel_lib", version = "2.10.0")
 bazel_dep(name = "aspect_rules_esbuild", version = "0.21.0")
 bazel_dep(name = "aspect_rules_js", version = "2.0.1")
 bazel_dep(name = "aspect_rules_ts", version = "3.1.0")
-bazel_dep(name = "bazel_features", version = "1.13.0")
+bazel_dep(name = "bazel_features", version = "1.23.0")
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "buildifier_prebuilt", version = "6.4.0")
 bazel_dep(name = "contrib_rules_jvm", version = "0.27.0")
 bazel_dep(name = "platforms", version = "0.0.10")
 
 # Required for the closure rules
-bazel_dep(name = "protobuf", version = "29.1", dev_dependency = True, repo_name = "com_google_protobuf")
+bazel_dep(name = "protobuf", version = "29.2", dev_dependency = True, repo_name = "com_google_protobuf")
 
 # Required for rules_rust to import the crates properly
 bazel_dep(name = "rules_cc", version = "0.0.9", dev_dependency = True)
 
-bazel_dep(name = "rules_dotnet", version = "0.16.1")
-bazel_dep(name = "rules_java", version = "7.11.1")
+bazel_dep(name = "rules_dotnet", version = "0.17.5")
+bazel_dep(name = "rules_java", version = "7.12.4")
 bazel_dep(name = "rules_jvm_external", version = "6.6")
-bazel_dep(name = "rules_nodejs", version = "6.3.0")
-bazel_dep(name = "rules_oci", version = "1.7.6")
+bazel_dep(name = "rules_nodejs", version = "6.3.2")
+bazel_dep(name = "rules_oci", version = "1.8.0")
 bazel_dep(name = "rules_pkg", version = "0.10.1")
 bazel_dep(name = "rules_python", version = "0.33.0")
 bazel_dep(name = "rules_proto", version = "6.0.2")
@@ -169,19 +169,19 @@ maven.install(
     name = "maven",
     artifacts = [
         "com.beust:jcommander:1.82",
-        "com.github.javaparser:javaparser-core:3.26.2",
+        "com.github.javaparser:javaparser-core:3.26.3",
         "com.github.spotbugs:spotbugs:4.8.6",
         "com.github.stephenc.jcip:jcip-annotations:1.0-1",
         "com.google.code.gson:gson:2.11.0",
-        "com.google.guava:guava:33.3.1-jre",
+        "com.google.guava:guava:33.4.0-jre",
         "com.google.auto:auto-common:1.2.2",
         "com.google.auto.service:auto-service:1.1.1",
         "com.google.auto.service:auto-service-annotations:1.1.1",
-        "com.google.googlejavaformat:google-java-format:jar:1.25.0",
+        "com.google.googlejavaformat:google-java-format:1.25.2:1.25.0",
         "com.graphql-java:graphql-java:22.3",
         "dev.failsafe:failsafe:3.3.2",
-        "io.grpc:grpc-context:1.68.1",
-        "io.lettuce:lettuce-core:6.5.0.RELEASE",
+        "io.grpc:grpc-context:1.69.0",
+        "io.lettuce:lettuce-core:6.5.2.RELEASE",
         "io.netty:netty-buffer",
         "io.netty:netty-codec-http",
         "io.netty:netty-codec-http2",
@@ -200,11 +200,11 @@ maven.install(
         "io.opentelemetry:opentelemetry-sdk-trace",
         "io.opentelemetry.semconv:opentelemetry-semconv:1.28.0-alpha",
         "it.ozimov:embedded-redis:0.7.3",
-        "net.bytebuddy:byte-buddy:1.15.10",
-        "org.htmlunit:htmlunit-core-js:4.6.0",
+        "net.bytebuddy:byte-buddy:1.15.11",
+        "org.htmlunit:htmlunit-core-js:4.7.0",
         "org.apache.commons:commons-exec:1.4.0",
-        "org.apache.logging.log4j:log4j-core:2.24.1",
-        "org.assertj:assertj-core:3.26.3",
+        "org.apache.logging.log4j:log4j-core:2.24.3",
+        "org.assertj:assertj-core:3.27.2",
         "org.bouncycastle:bcpkix-jdk18on:1.79",
         "org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5",
         "org.hsqldb:hsqldb:2.7.4",
@@ -217,7 +217,7 @@ maven.install(
         "org.junit.platform:junit-platform-commons",
         "org.junit.platform:junit-platform-engine",
         "org.mockito:mockito-core:5.14.2",
-        "org.redisson:redisson:3.39.0",
+        "org.redisson:redisson:3.41.0",
         "org.slf4j:slf4j-api:2.0.16",
         "org.slf4j:slf4j-jdk14:2.0.16",
         "org.tomlj:tomlj:1.1.1",

NOTICE

@@ -1,2 +1,2 @@
-Copyright 2011-2024 Software Freedom Conservancy
+Copyright 2011-2025 Software Freedom Conservancy
 Copyright 2004-2011 Selenium committers

common/src/web/fedcm/fedcm_async_js.html

@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>FedCM Example</title>
+</head>
+<body>
+    <button id="triggerButton" onclick="triggerFedCm()">Trigger FedCM</button>
+    <div id="result"></div>
+
+    <script>
+        // Use a relative path for the configURL
+        let configURL = `http://${location.host}/common/fedcm/config.json`;
+        console.log(configURL)
+        let result = null;
+
+        async function triggerFedCm() {
+            console.log("Config URL:", configURL);
+            try {
+                let promise = await navigator.credentials.get({
+                    identity: {
+                        providers: [{
+                            configURL: configURL,
+                            clientId: '1',
+                        }]
+                    }
+                });
+                result = promise;
+
+                console.log("Promised!")
+                console.log(result)
+                document.getElementById('result').innerText = JSON.stringify(result);
+            } catch (error) {
+                console.error("FedCM Error:", error);
+                result = { error: error.message };
+                document.getElementById('result').innerText = JSON.stringify(result);
+            }
+        }
+    </script>
+</body>
+</html>

dotnet/paket.nuget.bzl

@@ -17,6 +17,7 @@
 // under the License.
 // </copyright>
 
+using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 using System.Threading;
@@ -90,7 +91,7 @@ public DevToolsCommandData(long commandId, string sessionId, string commandName,
         /// Get or sets the result of the command execution.
         /// </summary>
         [JsonIgnore]
-        public JsonNode Result { get; set; }
+        public JsonElement Result { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether the command resulted in an error response.

dotnet/src/webdriver/DevTools/DevToolsCommandData.cs

@@ -168,7 +168,7 @@ public T GetVersionSpecificDomains<T>() where T : DevToolsSessionDomains
                 throw new InvalidOperationException($"Type {command.GetType()} does not correspond to a known command response type.");
             }
 
-            return result.Deserialize(commandResponseType) as ICommandResponse<TCommand>;
+            return result.Value.Deserialize(commandResponseType) as ICommandResponse<TCommand>;
         }
 
         /// <summary>
@@ -201,7 +201,7 @@ public T GetVersionSpecificDomains<T>() where T : DevToolsSessionDomains
                 throw new InvalidOperationException($"Type {typeof(TCommand)} does not correspond to a known command response type.");
             }
 
-            return result.Deserialize(commandResponseType) as ICommandResponse<TCommand>;
+            return result.Value.Deserialize(commandResponseType) as ICommandResponse<TCommand>;
         }
 
         /// <summary>
@@ -230,7 +230,7 @@ public T GetVersionSpecificDomains<T>() where T : DevToolsSessionDomains
                 return default(TCommandResponse);
             }
 
-            return result.Deserialize<TCommandResponse>();
+            return result.Value.Deserialize<TCommandResponse>();
         }
 
         /// <summary>
@@ -243,7 +243,7 @@ public T GetVersionSpecificDomains<T>() where T : DevToolsSessionDomains
         /// <param name="throwExceptionIfResponseNotReceived"><see langword="true"/> to throw an exception if a response is not received; otherwise, <see langword="false"/>.</param>
         /// <returns>The command response object implementing the <see cref="ICommandResponse{T}"/> interface.</returns>
         //[DebuggerStepThrough]
-        public async Task<JsonNode> SendCommand(string commandName, JsonNode commandParameters, CancellationToken cancellationToken = default(CancellationToken), int? millisecondsTimeout = null, bool throwExceptionIfResponseNotReceived = true)
+        public async Task<JsonElement?> SendCommand(string commandName, JsonNode commandParameters, CancellationToken cancellationToken = default(CancellationToken), int? millisecondsTimeout = null, bool throwExceptionIfResponseNotReceived = true)
         {
             if (this.attachedTargetId == null)
             {
@@ -265,7 +265,7 @@ public T GetVersionSpecificDomains<T>() where T : DevToolsSessionDomains
         /// <param name="throwExceptionIfResponseNotReceived"><see langword="true"/> to throw an exception if a response is not received; otherwise, <see langword="false"/>.</param>
         /// <returns>The command response object implementing the <see cref="ICommandResponse{T}"/> interface.</returns>
         //[DebuggerStepThrough]
-        public async Task<JsonNode> SendCommand(string commandName, string sessionId, JsonNode commandParameters, CancellationToken cancellationToken = default(CancellationToken), int? millisecondsTimeout = null, bool throwExceptionIfResponseNotReceived = true)
+        public async Task<JsonElement?> SendCommand(string commandName, string sessionId, JsonNode commandParameters, CancellationToken cancellationToken = default(CancellationToken), int? millisecondsTimeout = null, bool throwExceptionIfResponseNotReceived = true)
         {
             if (millisecondsTimeout.HasValue == false)
             {
@@ -298,8 +298,8 @@ public T GetVersionSpecificDomains<T>() where T : DevToolsSessionDomains
                 {
                     if (modified.IsError)
                     {
-                        var errorMessage = modified.Result["message"].GetValue<string>();
-                        var errorData = modified.Result["data"]?.GetValue<string>();
+                        var errorMessage = modified.Result.GetProperty("message").GetString();
+                        var errorData = modified.Result.TryGetProperty("data", out var data) ? data.GetString() : null;
 
                         var exceptionMessage = $"{commandName}: {errorMessage}";
                         if (!string.IsNullOrWhiteSpace(errorData))
@@ -310,7 +310,7 @@ public T GetVersionSpecificDomains<T>() where T : DevToolsSessionDomains
                         LogTrace("Recieved Error Response {0}: {1} {2}", modified.CommandId, message, errorData);
                         throw new CommandResponseException(exceptionMessage)
                         {
-                            Code = modified.Result["code"]?.GetValue<long>() ?? -1
+                            Code = modified.Result.TryGetProperty("code", out var code) ? code.GetInt64() : -1
                         };
                     }
 
@@ -559,23 +559,27 @@ private void ProcessMessage(string message)
                 logger.Trace($"CDP RCV << {message}");
             }
 
-            var messageObject = JsonObject.Parse(message).AsObject();
+            JsonElement messageObject;
+            using (var doc = JsonDocument.Parse(message))
+            {
+                messageObject = doc.RootElement.Clone();
+            }
 
-            if (messageObject.TryGetPropertyValue("id", out var idProperty))
+            if (messageObject.TryGetProperty("id", out var idProperty))
             {
-                long commandId = (long)idProperty;
+                long commandId = idProperty.GetInt64();
 
                 DevToolsCommandData commandInfo;
                 if (this.pendingCommands.TryGetValue(commandId, out commandInfo))
                 {
-                    if (messageObject.TryGetPropertyValue("error", out var errorProperty))
+                    if (messageObject.TryGetProperty("error", out var errorProperty))
                     {
                         commandInfo.IsError = true;
                         commandInfo.Result = errorProperty;
                     }
                     else
                     {
-                        commandInfo.Result = messageObject["result"];
+                        commandInfo.Result = messageObject.GetProperty("result");
                         LogTrace("Recieved Response {0}: {1}", commandId, commandInfo.Result.ToString());
                     }
 
@@ -594,11 +598,11 @@ private void ProcessMessage(string message)
                 return;
             }
 
-            if (messageObject.TryGetPropertyValue("method", out var methodProperty))
+            if (messageObject.TryGetProperty("method", out var methodProperty))
             {
-                var method = (string)methodProperty;
+                var method = methodProperty.GetString();
                 var methodParts = method.Split(new char[] { '.' }, 2);
-                var eventData = messageObject["params"];
+                var eventData = messageObject.GetProperty("params");
 
                 LogTrace("Recieved Event {0}: {1}", method, eventData.ToString());