Merge branch 'trunk' into py-daemon-threads

cgoldberg · web-flow · commit 7de75457f820 · 2025-10-06T20:20:52.000-04:00
diff --git a/.github/workflows/bazel.yml b/.github/workflows/bazel.yml
@@ -126,6 +126,8 @@ jobs:
         with:
           bazelisk-cache: true
           bazelrc: common --color=yes
+          # Workaround for long path issues: https://github.com/bazelbuild/bazel/pull/22532
+          output-base: ${{ inputs.os == 'windows' && 'D://b' || '' }}
           cache-version: 2
           disk-cache: ${{ inputs.cache-key }}
           external-cache: |
diff --git a/.github/workflows/ci-python.yml b/.github/workflows/ci-python.yml
@@ -99,18 +99,13 @@ jobs:
             os: ubuntu
           - browser: firefox
             os: ubuntu
-          - browser: chrome
-            os: windows
-          - browser: edge
-            os: windows
     with:
       name: Integration Tests (${{ matrix.browser }}, ${{ matrix.os }})
       browser: ${{ matrix.browser }}
       os: ${{ matrix.os }}
       cache-key: py-browser-${{ matrix.browser }}
       run: |
-        bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:common-${{ matrix.browser }}-bidi
-        bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:test-${{ matrix.browser }}
+        bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:common-${{ matrix.browser }}-bidi //py:test-${{ matrix.browser }}
 
   safari-tests:
     name: Browser Tests
@@ -128,5 +123,4 @@ jobs:
       os: ${{ matrix.os }}
       cache-key: py-browser-${{ matrix.browser }}
       run: |
-        bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:common-${{ matrix.browser }}
-        bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:test-${{ matrix.browser }}
+        bazel test --local_test_jobs 1 --flaky_test_attempts 3 --pin_browsers=true //py:common-${{ matrix.browser }} //py:test-${{ matrix.browser }}
diff --git a/dotnet/src/webdriver/BiDi/Browser/ClientWindow.cs b/dotnet/src/webdriver/BiDi/Browser/ClientWindow.cs
@@ -17,8 +17,12 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
+using System.Text.Json.Serialization;
+
 namespace OpenQA.Selenium.BiDi.Browser;
 
+[JsonConverter(typeof(BrowserClientWindowConverter))]
 public sealed record ClientWindow
 {
     internal ClientWindow(string id)
diff --git a/dotnet/src/webdriver/BiDi/Browser/GetClientWindowsCommand.cs b/dotnet/src/webdriver/BiDi/Browser/GetClientWindowsCommand.cs
@@ -18,8 +18,10 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
+using OpenQA.Selenium.BiDi.Communication.Json.Converters.Enumerable;
 using System.Collections;
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Browser;
 
@@ -28,6 +30,7 @@ internal sealed class GetClientWindowsCommand()
 
 public sealed class GetClientWindowsOptions : CommandOptions;
 
+[JsonConverter(typeof(GetClientWindowsResultConverter))]
 public sealed record GetClientWindowsResult : EmptyResult, IReadOnlyList<ClientWindowInfo>
 {
     internal GetClientWindowsResult(IReadOnlyList<ClientWindowInfo> clientWindows)
diff --git a/dotnet/src/webdriver/BiDi/Browser/GetUserContextsCommand.cs b/dotnet/src/webdriver/BiDi/Browser/GetUserContextsCommand.cs
@@ -18,8 +18,10 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
+using OpenQA.Selenium.BiDi.Communication.Json.Converters.Enumerable;
 using System.Collections;
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Browser;
 
@@ -28,6 +30,7 @@ internal sealed class GetUserContextsCommand()
 
 public class GetUserContextsOptions : CommandOptions;
 
+[JsonConverter(typeof(GetUserContextsResultConverter))]
 public sealed record GetUserContextsResult : EmptyResult, IReadOnlyList<UserContextInfo>
 {
     internal GetUserContextsResult(IReadOnlyList<UserContextInfo> userContexts)
diff --git a/dotnet/src/webdriver/BiDi/BrowsingContext/DownloadEndEventArgs.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/DownloadEndEventArgs.cs
@@ -17,14 +17,17 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters.Polymorphic;
 using System;
+using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
 
 // https://github.com/dotnet/runtime/issues/72604
 //[JsonPolymorphic(TypeDiscriminatorPropertyName = "status")]
 //[JsonDerivedType(typeof(DownloadCanceledEventArgs), "canceled")]
 //[JsonDerivedType(typeof(DownloadCompleteEventArgs), "complete")]
+[JsonConverter(typeof(DownloadEndEventArgsConverter))]
 public abstract record DownloadEndEventArgs(BiDi BiDi, BrowsingContext Context)
     : BrowsingContextEventArgs(BiDi, Context);
 
diff --git a/dotnet/src/webdriver/BiDi/BrowsingContext/GetTreeCommand.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/GetTreeCommand.cs
@@ -18,8 +18,10 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
+using OpenQA.Selenium.BiDi.Communication.Json.Converters.Enumerable;
 using System.Collections;
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
 
@@ -47,6 +49,7 @@ public sealed record BrowsingContextGetTreeOptions
     public long? MaxDepth { get; set; }
 }
 
+[JsonConverter(typeof(GetTreeResultConverter))]
 public sealed record GetTreeResult : EmptyResult, IReadOnlyList<BrowsingContextInfo>
 {
     internal GetTreeResult(IReadOnlyList<BrowsingContextInfo> contexts)
diff --git a/dotnet/src/webdriver/BiDi/BrowsingContext/LocateNodesCommand.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/LocateNodesCommand.cs
@@ -18,8 +18,10 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
+using OpenQA.Selenium.BiDi.Communication.Json.Converters.Enumerable;
 using System.Collections;
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
 
@@ -37,6 +39,7 @@ public sealed class LocateNodesOptions : CommandOptions
     public IEnumerable<Script.ISharedReference>? StartNodes { get; set; }
 }
 
+[JsonConverter(typeof(LocateNodesResultConverter))]
 public sealed record LocateNodesResult : EmptyResult, IReadOnlyList<Script.NodeRemoteValue>
 {
     internal LocateNodesResult(IReadOnlyList<Script.NodeRemoteValue> nodes)
diff --git a/dotnet/src/webdriver/BiDi/BrowsingContext/Navigation.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/Navigation.cs
@@ -17,6 +17,10 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
+using System.Text.Json.Serialization;
+
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
 
+[JsonConverter(typeof(NavigationConverter))]
 public sealed record Navigation(string Id);
diff --git a/dotnet/src/webdriver/BiDi/BrowsingContext/PrintCommand.cs b/dotnet/src/webdriver/BiDi/BrowsingContext/PrintCommand.cs
@@ -72,6 +72,7 @@ public struct PrintPage
     public double? Width { get; set; }
 }
 
+[JsonConverter(typeof(PrintPageRangeConverter))]
 public readonly record struct PrintPageRange(int? Start, int? End)
 {
     public static implicit operator PrintPageRange(int index) { return new PrintPageRange(index, index); }
diff --git a/dotnet/src/webdriver/BiDi/Communication/Broker.cs b/dotnet/src/webdriver/BiDi/Communication/Broker.cs
@@ -72,39 +72,15 @@ internal Broker(BiDi bidi, Uri url)
             Converters =
             {
                 new BrowsingContextConverter(_bidi),
-                new BrowserUserContextConverter(bidi),
-                new BrowserClientWindowConverter(),
-                new NavigationConverter(),
+                new BrowserUserContextConverter(_bidi),
                 new CollectorConverter(_bidi),
                 new InterceptConverter(_bidi),
-                new RequestConverter(),
-                new ChannelConverter(),
                 new HandleConverter(_bidi),
                 new InternalIdConverter(_bidi),
                 new PreloadScriptConverter(_bidi),
                 new RealmConverter(_bidi),
                 new DateTimeOffsetConverter(),
-                new PrintPageRangeConverter(),
-                new InputOriginConverter(),
                 new WebExtensionConverter(_bidi),
-                new SubscriptionConverter(),
-
-                // https://github.com/dotnet/runtime/issues/72604
-                new Json.Converters.Polymorphic.EvaluateResultConverter(),
-                new Json.Converters.Polymorphic.RemoteValueConverter(),
-                new Json.Converters.Polymorphic.RealmInfoConverter(),
-                new Json.Converters.Polymorphic.LogEntryConverter(),
-                new Json.Converters.Polymorphic.DownloadEndEventArgsConverter(),
-                //
-
-                // Enumerable
-                new Json.Converters.Enumerable.GetCookiesResultConverter(),
-                new Json.Converters.Enumerable.LocateNodesResultConverter(),
-                new Json.Converters.Enumerable.InputSourceActionsConverter(),
-                new Json.Converters.Enumerable.GetUserContextsResultConverter(),
-                new Json.Converters.Enumerable.GetClientWindowsResultConverter(),
-                new Json.Converters.Enumerable.GetRealmsResultConverter(),
-                new Json.Converters.Enumerable.GetTreeResultConverter(),
             }
         };
 
diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/SpecialNumberConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/SpecialNumberConverter.cs
@@ -0,0 +1,97 @@
+// <copyright file="SpecialNumberConverter.cs" company="Selenium Committers">
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+// </copyright>
+
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace OpenQA.Selenium.BiDi.Communication.Json.Converters;
+
+// Serializes and deserializes double into a BiDi spec-compliant number value.
+// See https://w3c.github.io/webdriver-bidi/#type-script-PrimitiveProtocolValue
+internal sealed class SpecialNumberConverter : JsonConverter<double>
+{
+    public override double Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        switch (reader.TokenType)
+        {
+            case JsonTokenType.Number:
+                return reader.GetDouble();
+
+            case JsonTokenType.String:
+                var str = reader.GetString()!;
+                if (str.Equals("-0", StringComparison.Ordinal))
+                {
+                    return -0.0;
+                }
+
+                if (str.Equals("NaN", StringComparison.Ordinal))
+                {
+                    return double.NaN;
+                }
+
+                if (str.Equals("Infinity", StringComparison.Ordinal))
+                {
+                    return double.PositiveInfinity;
+                }
+
+                if (str.Equals("-Infinity", StringComparison.Ordinal))
+                {
+                    return double.NegativeInfinity;
+                }
+
+                throw new JsonException($"JSON '{str}' string could not be parsed to a special number");
+
+            default:
+                throw new JsonException($"JSON type not a number or string: {reader.TokenType}");
+        }
+    }
+
+    public override void Write(Utf8JsonWriter writer, double value, JsonSerializerOptions options)
+    {
+        if (double.IsNaN(value))
+        {
+            writer.WriteStringValue("NaN");
+        }
+        else if (double.IsPositiveInfinity(value))
+        {
+            writer.WriteStringValue("Infinity");
+        }
+        else if (double.IsNegativeInfinity(value))
+        {
+            writer.WriteStringValue("-Infinity");
+        }
+        else if (IsNegativeZero(value))
+        {
+            writer.WriteStringValue("-0");
+        }
+        else
+        {
+            writer.WriteNumberValue(value);
+        }
+
+        static bool IsNegativeZero(double x)
+        {
+            // Negative zero is less trivial to test, because 0 == -0 is true
+            // We need to do a bit pattern comparison
+
+            return BitConverter.DoubleToInt64Bits(x) == BitConverter.DoubleToInt64Bits(-0.0);
+        }
+    }
+}
diff --git a/dotnet/src/webdriver/BiDi/Input/Origin.cs b/dotnet/src/webdriver/BiDi/Input/Origin.cs
@@ -17,8 +17,12 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
+using System.Text.Json.Serialization;
+
 namespace OpenQA.Selenium.BiDi.Input;
 
+[JsonConverter(typeof(InputOriginConverter))]
 public abstract record Origin;
 
 public sealed record ViewportOrigin() : Origin;
diff --git a/dotnet/src/webdriver/BiDi/Input/SourceActions.cs b/dotnet/src/webdriver/BiDi/Input/SourceActions.cs
@@ -18,13 +18,15 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication.Json.Converters;
+using OpenQA.Selenium.BiDi.Communication.Json.Converters.Enumerable;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Input;
 
+[JsonConverter(typeof(InputSourceActionsConverter))]
 public abstract record SourceActions
 {
     public string Id { get; } = Guid.NewGuid().ToString();
diff --git a/dotnet/src/webdriver/BiDi/Log/LogEntry.cs b/dotnet/src/webdriver/BiDi/Log/LogEntry.cs
@@ -18,6 +18,7 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication.Json.Converters;
+using OpenQA.Selenium.BiDi.Communication.Json.Converters.Polymorphic;
 using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
@@ -29,6 +30,7 @@ namespace OpenQA.Selenium.BiDi.Log;
 //[JsonDerivedType(typeof(GenericLogEntry))]
 //[JsonDerivedType(typeof(ConsoleLogEntry), "console")]
 //[JsonDerivedType(typeof(JavascriptLogEntry), "javascript")]
+[JsonConverter(typeof(LogEntryConverter))]
 public abstract record LogEntry(BiDi BiDi, Level Level, Script.Source Source, string? Text, DateTimeOffset Timestamp)
     : EventArgs(BiDi)
 {
diff --git a/dotnet/src/webdriver/BiDi/Network/Request.cs b/dotnet/src/webdriver/BiDi/Network/Request.cs
@@ -17,8 +17,12 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
+using System.Text.Json.Serialization;
+
 namespace OpenQA.Selenium.BiDi.Network;
 
+[JsonConverter(typeof(RequestConverter))]
 public sealed class Request
 {
     internal Request(string id)
diff --git a/dotnet/src/webdriver/BiDi/Script/Channel.cs b/dotnet/src/webdriver/BiDi/Script/Channel.cs
@@ -17,6 +17,10 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
+using System.Text.Json.Serialization;
+
 namespace OpenQA.Selenium.BiDi.Script;
 
+[JsonConverter(typeof(ChannelConverter))]
 public sealed record Channel(string Id);
diff --git a/dotnet/src/webdriver/BiDi/Script/EvaluateCommand.cs b/dotnet/src/webdriver/BiDi/Script/EvaluateCommand.cs
@@ -18,7 +18,9 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
+using OpenQA.Selenium.BiDi.Communication.Json.Converters.Polymorphic;
 using System;
+using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Script;
 
@@ -40,6 +42,7 @@ public sealed class EvaluateOptions : CommandOptions
 //[JsonPolymorphic(TypeDiscriminatorPropertyName = "type")]
 //[JsonDerivedType(typeof(EvaluateResultSuccess), "success")]
 //[JsonDerivedType(typeof(EvaluateResultException), "exception")]
+[JsonConverter(typeof(EvaluateResultConverter))]
 public abstract record EvaluateResult : EmptyResult
 {
     public RemoteValue AsSuccessResult()
diff --git a/dotnet/src/webdriver/BiDi/Script/GetRealmsCommand.cs b/dotnet/src/webdriver/BiDi/Script/GetRealmsCommand.cs
diff --git a/dotnet/src/webdriver/BiDi/Script/LocalValue.cs b/dotnet/src/webdriver/BiDi/Script/LocalValue.cs
diff --git a/dotnet/src/webdriver/BiDi/Script/RealmInfo.cs b/dotnet/src/webdriver/BiDi/Script/RealmInfo.cs
diff --git a/dotnet/src/webdriver/BiDi/Script/RemoteValue.cs b/dotnet/src/webdriver/BiDi/Script/RemoteValue.cs
diff --git a/dotnet/src/webdriver/BiDi/Session/Subscription.cs b/dotnet/src/webdriver/BiDi/Session/Subscription.cs
diff --git a/dotnet/src/webdriver/BiDi/Storage/GetCookiesCommand.cs b/dotnet/src/webdriver/BiDi/Storage/GetCookiesCommand.cs
diff --git a/dotnet/test/common/BiDi/Script/CallFunctionLocalValueTest.cs b/dotnet/test/common/BiDi/Script/CallFunctionLocalValueTest.cs
diff --git a/py/test/selenium/webdriver/common/selenium_manager_tests.py b/py/test/selenium/webdriver/common/selenium_manager_tests.py

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,10 @@`
`18`	`18`	`// </copyright>`
`19`	`19`
`20`	`20`	`using OpenQA.Selenium.BiDi.Communication;`
	`21`	`+using OpenQA.Selenium.BiDi.Communication.Json.Converters.Enumerable;`
`21`	`22`	`using System.Collections;`
`22`	`23`	`using System.Collections.Generic;`
	`24`	`+using System.Text.Json.Serialization;`
`23`	`25`
`24`	`26`	`namespace OpenQA.Selenium.BiDi.BrowsingContext;`
`25`	`27`
`@@ -47,6 +49,7 @@ public sealed record BrowsingContextGetTreeOptions`
`47`	`49`	`public long? MaxDepth { get; set; }`
`48`	`50`	`}`
`49`	`51`
	`52`	`+[JsonConverter(typeof(GetTreeResultConverter))]`
`50`	`53`	`public sealed record GetTreeResult : EmptyResult, IReadOnlyList<BrowsingContextInfo>`
`51`	`54`	`{`
`52`	`55`	`internal GetTreeResult(IReadOnlyList<BrowsingContextInfo> contexts)`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@ public struct PrintPage`
`72`	`72`	`public double? Width { get; set; }`
`73`	`73`	`}`
`74`	`74`
	`75`	`+[JsonConverter(typeof(PrintPageRangeConverter))]`
`75`	`76`	`public readonly record struct PrintPageRange(int? Start, int? End)`
`76`	`77`	`{`
`77`	`78`	`public static implicit operator PrintPageRange(int index) { return new PrintPageRange(index, index); }`