Remote LocalValue.ConvertFrom(JsonNode), expand ConvertFrom(object)

Author: RenderMichael

dotnet/src/webdriver/BiDi/BiDiException.cs

@@ -26,4 +26,7 @@ public class BiDiException : Exception
     public BiDiException(string message) : base(message)
     {
     }
+    public BiDiException(string? message, Exception? innerException) : base(message, innerException)
+    {
+    }
 }

dotnet/src/webdriver/BiDi/Modules/Script/LocalValue.cs

@@ -19,12 +19,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Numerics;
-using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
-using System.Text.RegularExpressions;
 
 namespace OpenQA.Selenium.BiDi.Modules.Script;
 
@@ -75,73 +72,67 @@ public static LocalValue ConvertFrom(object? value)
             case string str:
                 return new StringLocalValue(str);
 
-            case IEnumerable<object?> list:
-                return new ArrayLocalValue(list.Select(ConvertFrom).ToList());
-
-            case object:
+            case IDictionary<string, string?> dictionary:
                 {
-                    var type = value.GetType();
+                    var bidiObject = new List<List<LocalValue>>(dictionary.Count);
 
-                    var properties = type.GetProperties(System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Instance);
-
-                    List<List<LocalValue>> values = [];
-
-                    foreach (var property in properties)
+                    foreach (var item in dictionary)
                     {
-                        values.Add([property.Name, ConvertFrom(property.GetValue(value))]);
+                        bidiObject.Add([new StringLocalValue(item.Key), ConvertFrom(item.Value)]);
                     }
 
-                    return new ObjectLocalValue(values);
+                    return new ObjectLocalValue(bidiObject);
                 }
-        }
-    }
-
-    public static LocalValue ConvertFrom(JsonNode? node)
-    {
-        if (node is null)
-        {
-            return new NullLocalValue();
-        }
-
-        switch (node.GetValueKind())
-        {
-            case System.Text.Json.JsonValueKind.Null:
-                return new NullLocalValue();
 
-            case System.Text.Json.JsonValueKind.True:
-                return new BooleanLocalValue(true);
+            case IDictionary<string, object?> dictionary:
+                {
+                    var bidiObject = new List<List<LocalValue>>(dictionary.Count);
 
-            case System.Text.Json.JsonValueKind.False:
-                return new BooleanLocalValue(false);
+                    foreach (var item in dictionary)
+                    {
+                        bidiObject.Add([new StringLocalValue(item.Key), ConvertFrom(item.Value)]);
+                    }
 
-            case System.Text.Json.JsonValueKind.String:
-                return new StringLocalValue(node.ToString());
+                    return new ObjectLocalValue(bidiObject);
+                }
 
-            case System.Text.Json.JsonValueKind.Number:
+            case IDictionary<int, object?> dictionary:
                 {
-                    var numberString = node.ToString();
-
-                    var numberAsDouble = double.Parse(numberString);
+                    var bidiObject = new List<List<LocalValue>>(dictionary.Count);
 
-                    if (double.IsInfinity(numberAsDouble))
+                    foreach (var item in dictionary)
                     {
-                        // Numbers outside of Int64's range will successfully parse, but become +- Infinity
-                        // We can retain the value using a BigInt
-                        return new BigIntLocalValue(numberString);
+                        bidiObject.Add([ConvertFrom(item.Key), ConvertFrom(item.Value)]);
                     }
 
-                    return new NumberLocalValue(numberAsDouble);
+                    return new MapLocalValue(bidiObject);
                 }
 
-            case System.Text.Json.JsonValueKind.Array:
-                return new ArrayLocalValue(node.AsArray().Select(ConvertFrom));
+            case IEnumerable<object?> list:
+                return new ArrayLocalValue(list.Select(ConvertFrom).ToList());
+
+            case object:
+                {
+                    const System.Reflection.BindingFlags Flags = System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Instance;
+                    var properties = value.GetType().GetProperties(Flags);
 
-            case System.Text.Json.JsonValueKind.Object:
-                var convertedToListForm = node.AsObject().Select(property => new LocalValue[] { new StringLocalValue(property.Key), ConvertFrom(property.Value) }).ToList();
-                return new ObjectLocalValue(convertedToListForm);
+                    var values = new List<List<LocalValue>>(properties.Length);
+                    foreach (var property in properties)
+                    {
+                        object? propertyValue;
+                        try
+                        {
+                            propertyValue = property.GetValue(value);
+                        }
+                        catch (Exception ex)
+                        {
+                            throw new BiDiException($"Could not retrieve property {property.Name} from {property.DeclaringType}", ex);
+                        }
+                        values.Add([property.Name, ConvertFrom(propertyValue)]);
+                    }
 
-            default:
-                throw new InvalidOperationException("Invalid JSON node");
+                    return new ObjectLocalValue(values);
+                }
         }
     }
 }