Merge branch 'trunk' into async-http-client

SeleniumHQ · Oct 29, 2024 · f83ad29 · f83ad29
2 parents 86fc08a + f391cd0
commit f83ad29
Show file tree

Hide file tree

Showing 206 changed files with 4,229 additions and 1,444 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -173,7 +173,7 @@ maven.install(
         "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.0-jre",
+        "com.google.guava:guava:33.3.1-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",

diff --git a/dotnet/src/webdriver/BiDi/BiDi.cs b/dotnet/src/webdriver/BiDi/BiDi.cs
@@ -1,9 +1,10 @@
 using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using OpenQA.Selenium.BiDi.Communication;
 using OpenQA.Selenium.BiDi.Communication.Transport;
 
+#nullable enable
+
 namespace OpenQA.Selenium.BiDi;
 
 public class BiDi : IAsyncDisposable
@@ -38,11 +39,11 @@ internal BiDi(string url)
     }
 
     internal Modules.Session.SessionModule SessionModule => _sessionModule.Value;
-    internal Modules.BrowsingContext.BrowsingContextModule BrowsingContextModule => _browsingContextModule.Value;
+    internal Modules.BrowsingContext.BrowsingContextModule BrowsingContext => _browsingContextModule.Value;
     public Modules.Browser.BrowserModule Browser => _browserModule.Value;
     public Modules.Network.NetworkModule Network => _networkModule.Value;
     internal Modules.Input.InputModule InputModule => _inputModule.Value;
-    internal Modules.Script.ScriptModule ScriptModule => _scriptModule.Value;
+    public Modules.Script.ScriptModule Script => _scriptModule.Value;
     public Modules.Log.LogModule Log => _logModule.Value;
     public Modules.Storage.StorageModule Storage => _storageModule.Value;
 
@@ -60,16 +61,6 @@ public static async Task<BiDi> ConnectAsync(string url)
         return bidi;
     }
 
-    public Task<Modules.BrowsingContext.BrowsingContext> CreateContextAsync(Modules.BrowsingContext.ContextType type, Modules.BrowsingContext.CreateOptions? options = null)
-    {
-        return BrowsingContextModule.CreateAsync(type, options);
-    }
-
-    public Task<IReadOnlyList<Modules.BrowsingContext.BrowsingContextInfo>> GetTreeAsync(Modules.BrowsingContext.GetTreeOptions? options = null)
-    {
-        return BrowsingContextModule.GetTreeAsync(options);
-    }
-
     public Task EndAsync(Modules.Session.EndOptions? options = null)
     {
         return SessionModule.EndAsync(options);
@@ -81,44 +72,4 @@ public async ValueTask DisposeAsync()
 
         _transport?.Dispose();
     }
-
-    public Task<Subscription> OnContextCreatedAsync(Func<Modules.BrowsingContext.BrowsingContextInfo, Task> handler, BrowsingContextsSubscriptionOptions? options = null)
-    {
-        return BrowsingContextModule.OnContextCreatedAsync(handler, options);
-    }
-
-    public Task<Subscription> OnContextCreatedAsync(Action<Modules.BrowsingContext.BrowsingContextInfo> handler, BrowsingContextsSubscriptionOptions? options = null)
-    {
-        return BrowsingContextModule.OnContextCreatedAsync(handler, options);
-    }
-
-    public Task<Subscription> OnContextDestroyedAsync(Func<Modules.BrowsingContext.BrowsingContextInfo, Task> handler, BrowsingContextsSubscriptionOptions? options = null)
-    {
-        return BrowsingContextModule.OnContextDestroyedAsync(handler, options);
-    }
-
-    public Task<Subscription> OnContextDestroyedAsync(Action<Modules.BrowsingContext.BrowsingContextInfo> handler, BrowsingContextsSubscriptionOptions? options = null)
-    {
-        return BrowsingContextModule.OnContextDestroyedAsync(handler, options);
-    }
-
-    public Task<Subscription> OnUserPromptOpenedAsync(Func<Modules.BrowsingContext.UserPromptOpenedEventArgs, Task> handler, BrowsingContextsSubscriptionOptions? options = null)
-    {
-        return BrowsingContextModule.OnUserPromptOpenedAsync(handler, options);
-    }
-
-    public Task<Subscription> OnUserPromptOpenedAsync(Action<Modules.BrowsingContext.UserPromptOpenedEventArgs> handler, BrowsingContextsSubscriptionOptions? options = null)
-    {
-        return BrowsingContextModule.OnUserPromptOpenedAsync(handler, options);
-    }
-
-    public Task<Subscription> OnUserPromptClosedAsync(Func<Modules.BrowsingContext.UserPromptClosedEventArgs, Task> handler, BrowsingContextsSubscriptionOptions? options = null)
-    {
-        return BrowsingContextModule.OnUserPromptClosedAsync(handler, options);
-    }
-
-    public Task<Subscription> OnUserPromptClosedAsync(Action<Modules.BrowsingContext.UserPromptClosedEventArgs> handler, BrowsingContextsSubscriptionOptions? options = null)
-    {
-        return BrowsingContextModule.OnUserPromptClosedAsync(handler, options);
-    }
 }
diff --git a/dotnet/src/webdriver/BiDi/BiDiException.cs b/dotnet/src/webdriver/BiDi/BiDiException.cs
@@ -1,5 +1,7 @@
 using System;
 
+#nullable enable
+
 namespace OpenQA.Selenium.BiDi;
 
 public class BiDiException : Exception

diff --git a/dotnet/src/webdriver/BiDi/Communication/Broker.cs b/dotnet/src/webdriver/BiDi/Communication/Broker.cs
@@ -10,6 +10,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 
+#nullable enable
+
 namespace OpenQA.Selenium.BiDi.Communication;
 
 public class Broker : IAsyncDisposable
@@ -34,7 +36,7 @@ public class Broker : IAsyncDisposable
 
     private readonly JsonSerializerOptions _jsonSerializerOptions;
 
-    public Broker(BiDi bidi, ITransport transport)
+    internal Broker(BiDi bidi, ITransport transport)
     {
         _bidi = bidi;
         _transport = transport;
@@ -51,14 +53,15 @@ public Broker(BiDi bidi, ITransport transport)
                 new NavigationConverter(),
                 new InterceptConverter(_bidi),
                 new RequestConverter(_bidi),
-                new ChannelConverter(_bidi),
+                new ChannelConverter(),
                 new HandleConverter(_bidi),
                 new InternalIdConverter(_bidi),
                 new PreloadScriptConverter(_bidi),
                 new RealmConverter(_bidi),
                 new RealmTypeConverter(),
                 new DateTimeOffsetConverter(),
                 new PrintPageRangeConverter(),
+                new InputOriginConverter(),
                 new JsonStringEnumConverter(JsonNamingPolicy.CamelCase),
 
                 // https://github.com/dotnet/runtime/issues/72604
@@ -68,6 +71,13 @@ public Broker(BiDi bidi, ITransport transport)
                 new Json.Converters.Polymorphic.RealmInfoConverter(),
                 new Json.Converters.Polymorphic.LogEntryConverter(),
                 //
+
+                // 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.GetRealmsResultConverter(),
             }
         };
     }

diff --git a/dotnet/src/webdriver/BiDi/Communication/Command.cs b/dotnet/src/webdriver/BiDi/Communication/Command.cs
@@ -1,5 +1,7 @@
 using System.Text.Json.Serialization;
 
+#nullable enable
+
 namespace OpenQA.Selenium.BiDi.Communication;
 
 [JsonPolymorphic(TypeDiscriminatorPropertyName = "method")]

diff --git a/dotnet/src/webdriver/BiDi/Communication/CommandOptions.cs b/dotnet/src/webdriver/BiDi/Communication/CommandOptions.cs
@@ -1,5 +1,7 @@
 using System;
 
+#nullable enable
+
 namespace OpenQA.Selenium.BiDi.Communication;
 
 public record CommandOptions

diff --git a/dotnet/src/webdriver/BiDi/Communication/EventHandler.cs b/dotnet/src/webdriver/BiDi/Communication/EventHandler.cs
@@ -3,6 +3,8 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
+#nullable enable
+
 namespace OpenQA.Selenium.BiDi.Communication;
 
 public abstract class EventHandler(string eventName, Type eventArgsType, IEnumerable<BrowsingContext>? contexts = null)

diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/BrowserUserContextConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/BrowserUserContextConverter.cs
@@ -3,6 +3,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
+#nullable enable
+
 namespace OpenQA.Selenium.BiDi.Communication.Json.Converters;
 
 internal class BrowserUserContextConverter : JsonConverter<UserContext>

diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/BrowsingContextConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/BrowsingContextConverter.cs
@@ -3,6 +3,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
+#nullable enable
+
 namespace OpenQA.Selenium.BiDi.Communication.Json.Converters;
 
 internal class BrowsingContextConverter : JsonConverter<BrowsingContext>

diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/ChannelConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/ChannelConverter.cs
@@ -3,22 +3,17 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
+#nullable enable
+
 namespace OpenQA.Selenium.BiDi.Communication.Json.Converters;
 
 internal class ChannelConverter : JsonConverter<Channel>
 {
-    private readonly BiDi _bidi;
-
-    public ChannelConverter(BiDi bidi)
-    {
-        _bidi = bidi;
-    }
-
     public override Channel? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
         var id = reader.GetString();
 
-        return new Channel(_bidi, id!);
+        return new Channel(id!);
     }
 
     public override void Write(Utf8JsonWriter writer, Channel value, JsonSerializerOptions options)

diff --git a/dotnet/src/webdriver/BiDi/Communication/Json/Converters/DateTimeOffsetConverter.cs b/dotnet/src/webdriver/BiDi/Communication/Json/Converters/DateTimeOffsetConverter.cs
@@ -2,6 +2,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
+#nullable enable
+
 namespace OpenQA.Selenium.BiDi.Communication.Json.Converters;
 
 internal class DateTimeOffsetConverter : JsonConverter<DateTimeOffset>

diff --git a/.../src/webdriver/BiDi/Communication/Json/Converters/Enumerable/GetCookiesResultConverter.cs b/.../src/webdriver/BiDi/Communication/Json/Converters/Enumerable/GetCookiesResultConverter.cs
@@ -0,0 +1,26 @@
+using OpenQA.Selenium.BiDi.Modules.Storage;
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+#nullable enable
+
+namespace OpenQA.Selenium.BiDi.Communication.Json.Converters.Enumerable;
+
+internal class GetCookiesResultConverter : JsonConverter<GetCookiesResult>
+{
+    public override GetCookiesResult Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        var doc = JsonDocument.ParseValue(ref reader);
+        var cookies = doc.RootElement.GetProperty("cookies").Deserialize<IReadOnlyList<Modules.Network.Cookie>>(options);
+        var partitionKey = doc.RootElement.GetProperty("partitionKey").Deserialize<PartitionKey>(options);
+
+        return new GetCookiesResult(cookies!, partitionKey!);
+    }
+
+    public override void Write(Utf8JsonWriter writer, GetCookiesResult value, JsonSerializerOptions options)
+    {
+        throw new NotImplementedException();
+    }
+}
diff --git a/...t/src/webdriver/BiDi/Communication/Json/Converters/Enumerable/GetRealmsResultConverter.cs b/...t/src/webdriver/BiDi/Communication/Json/Converters/Enumerable/GetRealmsResultConverter.cs
@@ -0,0 +1,25 @@
+using OpenQA.Selenium.BiDi.Modules.Script;
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+#nullable enable
+
+namespace OpenQA.Selenium.BiDi.Communication.Json.Converters.Enumerable;
+
+internal class GetRealmsResultConverter : JsonConverter<GetRealmsResult>
+{
+    public override GetRealmsResult Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        var doc = JsonDocument.ParseValue(ref reader);
+        var realms = doc.RootElement.GetProperty("realms").Deserialize<IReadOnlyList<RealmInfo>>(options);
+
+        return new GetRealmsResult(realms!);
+    }
+
+    public override void Write(Utf8JsonWriter writer, GetRealmsResult value, JsonSerializerOptions options)
+    {
+        throw new NotImplementedException();
+    }
+}
diff --git a/...webdriver/BiDi/Communication/Json/Converters/Enumerable/GetUserContextsResultConverter.cs b/...webdriver/BiDi/Communication/Json/Converters/Enumerable/GetUserContextsResultConverter.cs
@@ -0,0 +1,25 @@
+using OpenQA.Selenium.BiDi.Modules.Browser;
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+#nullable enable
+
+namespace OpenQA.Selenium.BiDi.Communication.Json.Converters.Enumerable;
+
+internal class GetUserContextsResultConverter : JsonConverter<GetUserContextsResult>
+{
+    public override GetUserContextsResult Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        var doc = JsonDocument.ParseValue(ref reader);
+        var userContexts = doc.RootElement.GetProperty("userContexts").Deserialize<IReadOnlyList<UserContextInfo>>(options);
+
+        return new GetUserContextsResult(userContexts!);
+    }
+
+    public override void Write(Utf8JsonWriter writer, GetUserContextsResult value, JsonSerializerOptions options)
+    {
+        throw new NotImplementedException();
+    }
+}
diff --git a/...rc/webdriver/BiDi/Communication/Json/Converters/Enumerable/InputSourceActionsConverter.cs b/...rc/webdriver/BiDi/Communication/Json/Converters/Enumerable/InputSourceActionsConverter.cs
@@ -0,0 +1,61 @@
+using OpenQA.Selenium.BiDi.Modules.Input;
+using System;
+using System.Linq;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+#nullable enable
+
+namespace OpenQA.Selenium.BiDi.Communication.Json.Converters.Enumerable;
+
+internal class InputSourceActionsConverter : JsonConverter<SourceActions>
+{
+    public override SourceActions Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        throw new NotImplementedException();
+    }
+
+    public override void Write(Utf8JsonWriter writer, SourceActions value, JsonSerializerOptions options)
+    {
+        writer.WriteStartObject();
+
+        writer.WriteString("id", value.Id);
+
+        switch (value)
+        {
+            case KeyActions keys:
+                writer.WriteString("type", "key");
+                writer.WritePropertyName("actions");
+                JsonSerializer.Serialize(writer, keys.Actions.Select(a => a as IKeySourceAction), options);
+
+                break;
+            case PointerActions pointers:
+                writer.WriteString("type", "pointer");
+                if (pointers.Options is not null)
+                {
+                    writer.WritePropertyName("parameters");
+                    JsonSerializer.Serialize(writer, pointers.Options, options);
+                }
+
+                writer.WritePropertyName("actions");
+                JsonSerializer.Serialize(writer, pointers.Actions.Select(a => a as IPointerSourceAction), options);
+
+                break;
+            case WheelActions wheels:
+                writer.WriteString("type", "wheel");
+                writer.WritePropertyName("actions");
+                JsonSerializer.Serialize(writer, wheels.Actions.Select(a => a as IWheelSourceAction), options);
+
+                break;
+            case NoneActions none:
+                writer.WriteString("type", "none");
+                writer.WritePropertyName("actions");
+                JsonSerializer.Serialize(writer, none.Actions.Select(a => a as INoneSourceAction), options);
+
+                break;
+        }
+
+        writer.WriteEndObject();
+    }
+}
+
diff --git a/...src/webdriver/BiDi/Communication/Json/Converters/Enumerable/LocateNodesResultConverter.cs b/...src/webdriver/BiDi/Communication/Json/Converters/Enumerable/LocateNodesResultConverter.cs
@@ -0,0 +1,26 @@
+using OpenQA.Selenium.BiDi.Modules.BrowsingContext;
+using OpenQA.Selenium.BiDi.Modules.Script;
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+#nullable enable
+
+namespace OpenQA.Selenium.BiDi.Communication.Json.Converters.Enumerable;
+
+internal class LocateNodesResultConverter : JsonConverter<LocateNodesResult>
+{
+    public override LocateNodesResult Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        var doc = JsonDocument.ParseValue(ref reader);
+        var nodes = doc.RootElement.GetProperty("nodes").Deserialize<IReadOnlyList<RemoteValue.Node>>(options);
+
+        return new LocateNodesResult(nodes!);
+    }
+
+    public override void Write(Utf8JsonWriter writer, LocateNodesResult value, JsonSerializerOptions options)
+    {
+        throw new NotImplementedException();
+    }
+}