Merge branch 'trunk' into fix-numbercoercer-overflow

Author: seethinajayadileep

common/repositories.bzl

@@ -50,8 +50,8 @@ js_library(
 
     http_archive(
         name = "linux_beta_firefox",
-        url = "https://ftp.mozilla.org/pub/firefox/releases/149.0b2/linux-x86_64/en-US/firefox-149.0b2.tar.xz",
-        sha256 = "14057fe24b65ef64125d04bde3507f48e489464b9f22cda832d34db92dede817",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/149.0b4/linux-x86_64/en-US/firefox-149.0b4.tar.xz",
+        sha256 = "57539691f99f49124487846e1ed30b2c3c1e5413a68a4838644d9f35fcd22ec6",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -72,8 +72,8 @@ js_library(
 
     dmg_archive(
         name = "mac_beta_firefox",
-        url = "https://ftp.mozilla.org/pub/firefox/releases/149.0b2/mac/en-US/Firefox%20149.0b2.dmg",
-        sha256 = "cc697fd73992e677e7249be2a42d7e6e9fe1373841ecefe7009acfad113566fb",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/149.0b4/mac/en-US/Firefox%20149.0b4.dmg",
+        sha256 = "69b90c44f1757f0ba0799e82767e38bac8cad4762de76113a14237190f9c4212",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])

dotnet/src/webdriver/BiDi/BiDi.cs

@@ -27,6 +27,7 @@ namespace OpenQA.Selenium.BiDi;
 public sealed class BiDi : IBiDi
 {
     private readonly ConcurrentDictionary<Type, Module> _modules = new();
+    private bool _disposed;
 
     private Broker Broker { get; set; } = null!;
 
@@ -83,6 +84,13 @@ public Task<EndResult> EndAsync(EndOptions? options = null, CancellationToken ca
 
     public async ValueTask DisposeAsync()
     {
+        if (_disposed)
+        {
+            return;
+        }
+
+        _disposed = true;
+
         await Broker.DisposeAsync().ConfigureAwait(false);
         GC.SuppressFinalize(this);
     }

dotnet/src/webdriver/BiDi/Json/Converters/BrowserUserContextConverter.cs

@@ -17,6 +17,8 @@
 // under the License.
 // </copyright>
 
+using System.Collections.Concurrent;
+using System.Runtime.CompilerServices;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using OpenQA.Selenium.BiDi.Browser;
@@ -25,11 +27,15 @@ namespace OpenQA.Selenium.BiDi.Json.Converters;
 
 internal class BrowserUserContextConverter(IBiDi bidi) : JsonConverter<UserContext>
 {
+    private static readonly ConditionalWeakTable<IBiDi, ConcurrentDictionary<string, UserContext>> s_cache = new();
+
     public override UserContext? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
         var id = reader.GetString();
 
-        return new UserContext(id!) { BiDi = bidi };
+        var sessionCache = s_cache.GetValue(bidi, _ => new ConcurrentDictionary<string, UserContext>());
+
+        return sessionCache.GetOrAdd(id!, key => new UserContext(bidi, key));
     }
 
     public override void Write(Utf8JsonWriter writer, UserContext value, JsonSerializerOptions options)

dotnet/src/webdriver/BiDi/Json/Converters/BrowsingContextConverter.cs

@@ -17,20 +17,24 @@
 // under the License.
 // </copyright>
 
+using System.Collections.Concurrent;
+using System.Runtime.CompilerServices;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Json.Converters;
 
 internal class BrowsingContextConverter(IBiDi bidi) : JsonConverter<BrowsingContext.BrowsingContext>
 {
-    private readonly IBiDi _bidi = bidi;
+    private static readonly ConditionalWeakTable<IBiDi, ConcurrentDictionary<string, BrowsingContext.BrowsingContext>> s_cache = new();
 
     public override BrowsingContext.BrowsingContext? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
         var id = reader.GetString();
 
-        return new BrowsingContext.BrowsingContext(id!) { BiDi = _bidi };
+        var sessionCache = s_cache.GetValue(bidi, _ => new ConcurrentDictionary<string, BrowsingContext.BrowsingContext>());
+
+        return sessionCache.GetOrAdd(id!, key => new BrowsingContext.BrowsingContext(bidi, key));
     }
 
     public override void Write(Utf8JsonWriter writer, BrowsingContext.BrowsingContext value, JsonSerializerOptions options)

dotnet/src/webdriver/BiDi/Script/RemoteValue.cs

@@ -54,49 +54,101 @@ namespace OpenQA.Selenium.BiDi.Script;
 [JsonConverter(typeof(RemoteValueConverter))]
 public abstract record RemoteValue
 {
-    public static implicit operator double(RemoteValue remoteValue) => (double)((NumberRemoteValue)remoteValue).Value;
+    public static implicit operator bool(RemoteValue remoteValue) => remoteValue.ConvertTo<bool>();
+    public static implicit operator double(RemoteValue remoteValue) => remoteValue.ConvertTo<double>();
+    public static implicit operator float(RemoteValue remoteValue) => remoteValue.ConvertTo<float>();
+    public static implicit operator int(RemoteValue remoteValue) => remoteValue.ConvertTo<int>();
+    public static implicit operator long(RemoteValue remoteValue) => remoteValue.ConvertTo<long>();
+    public static implicit operator string?(RemoteValue remoteValue) => remoteValue.ConvertTo<string>();
 
-    public static implicit operator int(RemoteValue remoteValue) => (int)(double)remoteValue;
-    public static implicit operator long(RemoteValue remoteValue) => (long)(double)remoteValue;
-
-    public static implicit operator string?(RemoteValue remoteValue)
-    {
-        return remoteValue switch
+    public TResult? ConvertTo<TResult>()
+        => (this, typeof(TResult)) switch
         {
-            StringRemoteValue stringValue => stringValue.Value,
-            NullRemoteValue => null,
-            _ => throw new InvalidCastException($"Cannot convert {remoteValue} to string")
+            (_, Type t) when t.IsAssignableFrom(GetType())
+                => (TResult)(object)this,
+            (BooleanRemoteValue b, Type t) when t == typeof(bool)
+                => (TResult)(object)b.Value,
+            (NullRemoteValue, Type t) when !t.IsValueType || Nullable.GetUnderlyingType(t) is not null
+                => default,
+            (NumberRemoteValue n, Type t) when t == typeof(byte)
+                => (TResult)(object)Convert.ToByte(n.Value),
+            (NumberRemoteValue n, Type t) when t == typeof(sbyte)
+                => (TResult)(object)Convert.ToSByte(n.Value),
+            (NumberRemoteValue n, Type t) when t == typeof(short)
+                => (TResult)(object)Convert.ToInt16(n.Value),
+            (NumberRemoteValue n, Type t) when t == typeof(ushort)
+                => (TResult)(object)Convert.ToUInt16(n.Value),
+            (NumberRemoteValue n, Type t) when t == typeof(int)
+                => (TResult)(object)Convert.ToInt32(n.Value),
+            (NumberRemoteValue n, Type t) when t == typeof(uint)
+                => (TResult)(object)Convert.ToUInt32(n.Value),
+            (NumberRemoteValue n, Type t) when t == typeof(long)
+                => (TResult)(object)Convert.ToInt64(n.Value),
+            (NumberRemoteValue n, Type t) when t == typeof(ulong)
+                => (TResult)(object)Convert.ToUInt64(n.Value),
+            (NumberRemoteValue n, Type t) when t == typeof(double)
+                => (TResult)(object)n.Value,
+            (NumberRemoteValue n, Type t) when t == typeof(float)
+                => (TResult)(object)Convert.ToSingle(n.Value),
+            (NumberRemoteValue n, Type t) when t == typeof(decimal)
+                => (TResult)(object)Convert.ToDecimal(n.Value),
+            (StringRemoteValue s, Type t) when t == typeof(string)
+                => (TResult)(object)s.Value,
+            (ArrayRemoteValue a, Type t) when t.IsArray
+                => ConvertRemoteValuesToArray<TResult>(a.Value, t.GetElementType()!),
+            (ArrayRemoteValue a, Type t) when t.IsGenericType && t.IsAssignableFrom(typeof(List<>).MakeGenericType(t.GetGenericArguments()[0]))
+                => ConvertRemoteValuesToGenericList<TResult>(a.Value, typeof(List<>).MakeGenericType(t.GetGenericArguments()[0])),
+
+            (_, Type t) when Nullable.GetUnderlyingType(t) is { } underlying
+                => ConvertToNullable<TResult>(underlying),
+
+            _ => throw new InvalidCastException($"Cannot convert {GetType().Name} to {typeof(TResult).FullName}")
         };
-    }
 
-    // TODO: extend types
-    public TResult? ConvertTo<TResult>()
+    private TResult ConvertToNullable<TResult>(Type underlyingType)
     {
-        var type = typeof(TResult);
+        var convertMethod = typeof(RemoteValue).GetMethod(nameof(ConvertTo))!.MakeGenericMethod(underlyingType);
+        var value = convertMethod.Invoke(this, null);
+        return (TResult)value!;
+    }
 
-        if (typeof(RemoteValue).IsAssignableFrom(type)) // handle native derived types
-        {
-            return (TResult)(this as object);
-        }
-        if (type == typeof(bool))
-        {
-            return (TResult)(Convert.ToBoolean(((BooleanRemoteValue)this).Value) as object);
-        }
-        if (type == typeof(int))
+    private static TResult ConvertRemoteValuesToArray<TResult>(IEnumerable<RemoteValue>? remoteValues, Type elementType)
+    {
+        if (remoteValues is null)
         {
-            return (TResult)(Convert.ToInt32(((NumberRemoteValue)this).Value) as object);
+            return (TResult)(object)Array.CreateInstance(elementType, 0);
         }
-        else if (type == typeof(string))
+
+        var convertMethod = typeof(RemoteValue).GetMethod(nameof(ConvertTo))!.MakeGenericMethod(elementType);
+        var items = remoteValues.ToList();
+        var array = Array.CreateInstance(elementType, items.Count);
+
+        for (int i = 0; i < items.Count; i++)
         {
-            return (TResult)(((StringRemoteValue)this).Value as object);
+            var convertedItem = convertMethod.Invoke(items[i], null);
+            array.SetValue(convertedItem, i);
         }
-        else if (type is object)
+
+        return (TResult)(object)array;
+    }
+
+    private static TResult ConvertRemoteValuesToGenericList<TResult>(IEnumerable<RemoteValue>? remoteValues, Type listType)
+    {
+        var elementType = listType.GetGenericArguments()[0];
+        var list = (System.Collections.IList)Activator.CreateInstance(listType)!;
+
+        if (remoteValues is not null)
         {
-            // :)
-            return (TResult)new object();
+            var convertMethod = typeof(RemoteValue).GetMethod(nameof(ConvertTo))!.MakeGenericMethod(elementType);
+
+            foreach (var item in remoteValues)
+            {
+                var convertedItem = convertMethod.Invoke(item, null);
+                list.Add(convertedItem);
+            }
         }
 
-        throw new BiDiException("Cannot convert .....");
+        return (TResult)list;
     }
 }