Merge branch 'trunk' into 15697Fix

Author: rpallavisharma

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; }
 }
 

dotnet/src/webdriver/BiDi/Storage/SetCookieCommand.cs

@@ -30,13 +30,23 @@ public static class PortUtilities
     /// <summary>
     /// Finds a random, free port to be listened on.
     /// </summary>
+    /// <remarks>
+    /// Prefers IPv4, but falls back to IPv6 if necessary.
+    /// </remarks>
     /// <returns>A random, free port to be listened on.</returns>
     public static int FindFreePort()
     {
-        using var socket = new Socket(AddressFamily.InterNetworkV6, SocketType.Stream, ProtocolType.Tcp);
-        socket.DualMode = true;
-        socket.Bind(new IPEndPoint(IPAddress.IPv6Loopback, 0));
-        return (socket.LocalEndPoint as IPEndPoint)!.Port;
-
+        try
+        {
+            using var ipV4socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+            ipV4socket.Bind(new IPEndPoint(IPAddress.Loopback, 0));
+            return ((IPEndPoint)ipV4socket.LocalEndPoint!).Port;
+        }
+        catch (SocketException)
+        {
+            using var ipV6socket = new Socket(AddressFamily.InterNetworkV6, SocketType.Stream, ProtocolType.Tcp);
+            ipV6socket.Bind(new IPEndPoint(IPAddress.IPv6Loopback, 0));
+            return ((IPEndPoint)ipV6socket.LocalEndPoint!).Port;
+        }
     }
 }

dotnet/src/webdriver/Internal/PortUtilities.cs

@@ -81,7 +81,7 @@ public async Task CanAddAndGetCookie()
     {
         driver.Url = UrlBuilder.WhereIs("animals");
 
-        var expiry = DateTime.Now.AddDays(1);
+        var expiry = DateTimeOffset.Now.AddDays(1);
 
         await context.Storage.SetCookieAsync(new("fish", "cod", UrlBuilder.HostName)
         {
@@ -106,7 +106,7 @@ await context.Storage.SetCookieAsync(new("fish", "cod", UrlBuilder.HostName)
         Assert.That(cookie.Secure, Is.False);
         Assert.That(cookie.SameSite, Is.EqualTo(SameSite.Lax));
         Assert.That(cookie.Size, Is.EqualTo(7));
-        // Assert.That(cookie.Expiry, Is.EqualTo(expiry)); // chrome issue
+        Assert.That(cookie.Expiry, Is.EqualTo(expiry).Within(1).Seconds);
     }
 
     [Test]

dotnet/test/common/BiDi/Storage/StorageTest.cs

@@ -57,14 +57,15 @@ def __init__(
         driver_path_env_key: Optional[str] = None,
         **kwargs,
     ) -> None:
+        self.log_output: Optional[Union[int, IOBase]]
         if isinstance(log_output, str):
             self.log_output = cast(IOBase, open(log_output, "a+", encoding="utf-8"))
         elif log_output == subprocess.STDOUT:
-            self.log_output = cast(Optional[Union[int, IOBase]], None)
+            self.log_output = None
         elif log_output is None or log_output == subprocess.DEVNULL:
-            self.log_output = cast(Optional[Union[int, IOBase]], subprocess.DEVNULL)
+            self.log_output = subprocess.DEVNULL
         else:
-            self.log_output = log_output
+            self.log_output = cast(Union[int, IOBase], log_output)
 
         self.port = port or utils.free_port()
         # Default value for every python subprocess: subprocess.Popen(..., creationflags=0)