Merge branch 'SeleniumHQ:trunk' into py-websocket-clientconfig

Author: cgoldberg

.github/workflows/ci-python.yml

@@ -21,13 +21,13 @@ jobs:
       - name: Checkout source tree
         uses: actions/checkout@v4
       - name: Set up Python 3.9
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v6
         with:
           python-version: 3.9
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install tox==4.27.0
+          pip install tox==4.30.2
       - name: Generate docs
         run: tox -c py/tox.ini
         env:
@@ -41,13 +41,13 @@ jobs:
       - name: Checkout source tree
         uses: actions/checkout@v4
       - name: Set up Python 3.9
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v6
         with:
           python-version: 3.9
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install tox==4.27.0
+          pip install tox==4.30.2
       - name: Run type checking
         run: |
           tox -c py/tox.ini || true

.github/workflows/update-documentation.yml

@@ -68,7 +68,7 @@ jobs:
           distribution: 'temurin'
       - name: Set up Python 3.9
         if: ${{ inputs.language == 'py' || inputs.language == 'all' }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: 3.9
       - name: Install dependencies

MODULE.bazel

@@ -19,7 +19,7 @@ bazel_dep(name = "rules_cc", version = "0.2.0", dev_dependency = True)
 
 bazel_dep(name = "rules_dotnet", version = "0.17.5")
 bazel_dep(name = "rules_java", version = "8.7.1")
-bazel_dep(name = "rules_jvm_external", version = "6.6")
+bazel_dep(name = "rules_jvm_external", version = "6.8")
 bazel_dep(name = "rules_multitool", version = "1.3.0")
 bazel_dep(name = "rules_nodejs", version = "6.3.2")
 bazel_dep(name = "rules_oci", version = "1.8.0")
@@ -29,12 +29,10 @@ bazel_dep(name = "rules_proto", version = "7.0.2")
 bazel_dep(name = "rules_ruby", version = "0.19.0")
 
 # Until `rules_jvm_external` 6.8 ships
-git_override(
+single_version_override(
     module_name = "rules_jvm_external",
-    commit = "aca619b117c1fe306ffdd20c5f47cc4dbd5effed",
     patch_strip = 1,
     patches = ["//java:rules_jvm_external_javadoc.patch"],
-    remote = "https://github.com/bazel-contrib/rules_jvm_external.git",
 )
 
 multitool = use_extension("@rules_multitool//multitool:extension.bzl", "multitool")
@@ -186,6 +184,8 @@ maven.install(
         "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:1.28.0",
+        "com.google.protobuf:protobuf-java:3.25.5",
+        "com.google.protobuf.nano:protobuf-javanano:3.1.0",
         "com.graphql-java:graphql-java:24.1",
         "dev.failsafe:failsafe:3.3.2",
         "io.grpc:grpc-context:1.74.0",
@@ -215,6 +215,7 @@ maven.install(
         "org.bouncycastle:bcpkix-jdk18on:1.81",
         "org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5",
         "org.hsqldb:hsqldb:2.7.4",
+        "org.jboss.marshalling:jboss-marshalling:2.2.3.Final",
         "org.jspecify:jspecify:1.0.0",
         "org.junit.jupiter:junit-jupiter-api",
         "org.junit.jupiter:junit-jupiter-engine",
@@ -234,7 +235,7 @@ maven.install(
     ],
     boms = [
         "io.opentelemetry:opentelemetry-bom:1.53.0",
-        "io.netty:netty-bom:4.1.121.Final",
+        "io.netty:netty-bom:4.2.4.Final",
         "org.junit:junit-bom:5.13.4",
     ],
     excluded_artifacts = [

common/repositories.bzl

@@ -123,10 +123,10 @@ js_library(
 
     pkg_archive(
         name = "mac_edge",
-        url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/017e25fc-2906-45b2-958c-1c71c4667dc1/MicrosoftEdge-139.0.3405.111.pkg",
-        sha256 = "1aa42cbaaf38b035e17d43fbbe0a293ceb286c5fd298d463b1a369ed900a03ac",
+        url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/95344cbf-d116-4494-8485-b96014e98901/MicrosoftEdge-139.0.3405.119.pkg",
+        sha256 = "31b3ddce353180a706179d64086ed01b53cfd20a7daea45597a7e9e405fc553f",
         move = {
-            "MicrosoftEdge-139.0.3405.111.pkg/Payload/Microsoft Edge.app": "Edge.app",
+            "MicrosoftEdge-139.0.3405.119.pkg/Payload/Microsoft Edge.app": "Edge.app",
         },
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -143,8 +143,8 @@ js_library(
 
     deb_archive(
         name = "linux_edge",
-        url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_139.0.3405.111-1_amd64.deb",
-        sha256 = "d61b2fcef695083496184a6a323b2bcfb57d45af8fb6867ffe54974a5992dc52",
+        url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_139.0.3405.119-1_amd64.deb",
+        sha256 = "e51e4e36cde5e7be2031fd9145ac9bf26444f734a88ff43858e05c7782e60c7b",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])

common/src/web/data_url.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Page containing an image encoded as a Data URL</title>
+</head>
+<body>
+<img src="data:image/gif;base64,R0lGODlhEAAQAMQAAORHHOVSKudfOulrSOp3WOyDZu6QdvCchPGolfO0o/XBs/fNwfjZ0frl3/zy7////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAkAABAALAAAAAAQABAAAAVVICSOZGlCQAosJ6mu7fiyZeKqNKToQGDsM8hBADgUXoGAiqhSvp5QAnQKGIgUhwFUYLCVDFCrKUE1lBavAViFIDlTImbKC5Gm2hB0SlBCBMQiB0UjIQA7" alt="star" id="data-url-image">
+</body>
+</html>

dotnet/src/webdriver/BiDi/Communication/Broker.cs

@@ -84,7 +84,6 @@ internal Broker(BiDi bidi, Uri url)
                 new RealmConverter(_bidi),
                 new RealmTypeConverter(),
                 new DateTimeOffsetConverter(),
-                new TimeSpanConverter(),
                 new PrintPageRangeConverter(),
                 new InputOriginConverter(),
                 new WebExtensionConverter(_bidi),

dotnet/src/webdriver/BiDi/Communication/Json/Converters/DateTimeOffsetConverter.cs

@@ -27,11 +27,24 @@ internal class DateTimeOffsetConverter : JsonConverter<DateTimeOffset>
 {
     public override DateTimeOffset Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
-        return DateTimeOffset.FromUnixTimeMilliseconds(reader.GetInt64());
+        return DateTimeOffset.FromUnixTimeMilliseconds((long)reader.GetDouble()); // still might get a double
     }
 
     public override void Write(Utf8JsonWriter writer, DateTimeOffset value, JsonSerializerOptions options)
     {
         writer.WriteNumberValue(value.ToUnixTimeMilliseconds());
     }
 }
+
+internal class DateTimeOffsetSecondsConverter : JsonConverter<DateTimeOffset>
+{
+    public override DateTimeOffset Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        return DateTimeOffset.FromUnixTimeSeconds((long)reader.GetDouble()); // still might get a double
+    }
+
+    public override void Write(Utf8JsonWriter writer, DateTimeOffset value, JsonSerializerOptions options)
+    {
+        writer.WriteNumberValue(value.ToUnixTimeSeconds());
+    }
+}

dotnet/src/webdriver/BiDi/Communication/Json/Converters/TimeSpanConverter.cs

@@ -17,11 +17,13 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System;
+using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Network;
 
-public sealed record Cookie(string Name, BytesValue Value, string Domain, string Path, long Size, bool HttpOnly, bool Secure, SameSite SameSite, TimeSpan? Expiry);
+public sealed record Cookie(string Name, BytesValue Value, string Domain, string Path, long Size, bool HttpOnly, bool Secure, SameSite SameSite, [property: JsonConverter(typeof(DateTimeOffsetSecondsConverter))] DateTimeOffset? Expiry);
 
 public enum SameSite
 {

dotnet/src/webdriver/BiDi/Network/Cookie.cs

@@ -18,7 +18,9 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System;
+using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Storage;
 
@@ -37,6 +39,7 @@ public sealed record PartialCookie(string Name, Network.BytesValue Value, string
 
     public Network.SameSite? SameSite { get; set; }
 
+    [JsonConverter(typeof(DateTimeOffsetSecondsConverter))]
     public DateTimeOffset? Expiry { get; set; }
 }