Merge branch 'trunk' into sendKeys-fileDetector

Author: AutomatedTester

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

dotnet/src/webdriver/BiDi/BiDiException.cs

@@ -1,5 +1,7 @@
 using System;
 
+#nullable enable
+
 namespace OpenQA.Selenium.BiDi;
 
 public class BiDiException : Exception

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(),
             }
         };
     }

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")]

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

@@ -1,5 +1,7 @@
 using System;
 
+#nullable enable
+
 namespace OpenQA.Selenium.BiDi.Communication;
 
 public record CommandOptions

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)

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>

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>

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)

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>