Merge branch 'trunk' into fix-python-type-annotations

Author: Paresh-0007

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

@@ -84,6 +84,7 @@ 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,16 +27,7 @@ internal class DateTimeOffsetConverter : JsonConverter<DateTimeOffset>
 {
     public override DateTimeOffset Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
-        // Workaround: it should be Int64, chrome uses double for `expiry` like "expiry":1737379944.308351
-
-        if (reader.TryGetInt64(out long unixTime) is false)
-        {
-            var doubleValue = reader.GetDouble();
-
-            unixTime = Convert.ToInt64(doubleValue);
-        }
-
-        return DateTimeOffset.FromUnixTimeMilliseconds(unixTime);
+        return DateTimeOffset.FromUnixTimeMilliseconds(reader.GetInt64());
     }
 
     public override void Write(Utf8JsonWriter writer, DateTimeOffset value, JsonSerializerOptions options)

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

@@ -0,0 +1,44 @@
+// <copyright file="TimeSpanConverter.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;
+
+internal class TimeSpanConverter : JsonConverter<TimeSpan>
+{
+    public override TimeSpan Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (reader.TryGetInt64(out long milliseconds) is false)
+        {
+            var doubleValue = reader.GetDouble();
+
+            milliseconds = Convert.ToInt64(doubleValue);
+        }
+
+        return TimeSpan.FromMilliseconds(milliseconds);
+    }
+
+    public override void Write(Utf8JsonWriter writer, TimeSpan value, JsonSerializerOptions options)
+    {
+        writer.WriteNumberValue(value.TotalMilliseconds);
+    }
+}

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

@@ -18,15 +18,10 @@
 // </copyright>
 
 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)
-{
-    [JsonInclude]
-    public DateTimeOffset? Expiry { get; internal set; }
-}
+public sealed record Cookie(string Name, BytesValue Value, string Domain, string Path, long Size, bool HttpOnly, bool Secure, SameSite SameSite, TimeSpan? Expiry);
 
 public enum SameSite
 {

java/src/org/openqa/selenium/grid/node/Node.java

@@ -199,7 +199,9 @@ protected Node(
                 .to(() -> new Drain(this, json))
                 .with(spanDecorator("node.drain").andThen(requiresSecret)),
             get("/se/grid/node/status")
-                .to(() -> req -> new HttpResponse().setContent(asJson(getStatus())))
+                .to(
+                    () ->
+                        req -> new HttpResponse().setContent(asJson(Map.of("value", getStatus()))))
                 .with(spanDecorator("node.node_status")),
             get("/status").to(() -> new StatusHandler(this)).with(spanDecorator("node.status")));
   }

java/src/org/openqa/selenium/grid/router/HandleSession.java

@@ -21,13 +21,15 @@
 import static org.openqa.selenium.remote.RemoteTags.SESSION_ID;
 import static org.openqa.selenium.remote.RemoteTags.SESSION_ID_EVENT;
 import static org.openqa.selenium.remote.http.Contents.asJson;
+import static org.openqa.selenium.remote.http.HttpMethod.GET;
 import static org.openqa.selenium.remote.tracing.Tags.EXCEPTION;
 import static org.openqa.selenium.remote.tracing.Tags.HTTP_REQUEST;
 import static org.openqa.selenium.remote.tracing.Tags.HTTP_REQUEST_EVENT;
 import static org.openqa.selenium.remote.tracing.Tags.HTTP_RESPONSE;
 
 import java.io.Closeable;
 import java.net.URI;
+import java.time.Duration;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.Iterator;
@@ -43,8 +45,10 @@
 import org.openqa.selenium.NoSuchSessionException;
 import org.openqa.selenium.concurrent.ExecutorServices;
 import org.openqa.selenium.concurrent.GuardedRunnable;
+import org.openqa.selenium.grid.data.NodeStatus;
 import org.openqa.selenium.grid.sessionmap.SessionMap;
 import org.openqa.selenium.grid.web.ReverseProxyHandler;
+import org.openqa.selenium.grid.web.Values;
 import org.openqa.selenium.internal.Require;
 import org.openqa.selenium.remote.ErrorCodec;
 import org.openqa.selenium.remote.SessionId;
@@ -230,8 +234,7 @@ private Callable<UsageCountingReverseProxyHandler> loadSessionId(
                       return entry;
                     }
 
-                    ClientConfig config =
-                        ClientConfig.defaultConfig().baseUri(sessionUri).withRetries();
+                    ClientConfig config = fetchNodeSessionTimeout(sessionUri).withRetries();
                     HttpClient httpClient = httpClientFactory.createClient(config);
 
                     return new CacheEntry(httpClient, 1);
@@ -247,6 +250,22 @@ private Callable<UsageCountingReverseProxyHandler> loadSessionId(
         });
   }
 
+  private ClientConfig fetchNodeSessionTimeout(URI uri) {
+    ClientConfig config = ClientConfig.defaultConfig().baseUri(uri);
+    Duration sessionTimeout = config.readTimeout();
+    try (HttpClient httpClient = httpClientFactory.createClient(config)) {
+      HttpRequest statusRequest = new HttpRequest(GET, "/se/grid/node/status");
+      HttpResponse res = httpClient.execute(statusRequest);
+      NodeStatus nodeStatus = Values.get(res, NodeStatus.class);
+      if (nodeStatus != null) {
+        sessionTimeout = nodeStatus.getSessionTimeout();
+      }
+    }
+    LOG.fine("Set read timeout: " + sessionTimeout.toSeconds() + " seconds for " + uri);
+    config = config.readTimeout(sessionTimeout);
+    return config;
+  }
+
   @Override
   public void close() {
     ExecutorServices.shutdownGracefully(