Fix crash in 2025.5 (#1309)

* Add test

* Add converter for arrays of arrays of strings, more test cases

* Remove testing workaroudn

---------

Co-authored-by: Frank Bakker <[email protected]>
Co-authored-by: Frank Bakker <[email protected]>

Author: 333fred

src/Client/NetDaemon.HassClient/Common/HomeAssistant/Model/HassDevice.cs

@@ -28,5 +28,6 @@ public record HassDevice
     [JsonConverter(typeof(EnsureStringConverter))]
     [JsonPropertyName("serial_number")] public string? SerialNumber { get; init; }
 
+    [JsonConverter(typeof(EnsureArrayOfArrayOfStringConverter))]
     [JsonPropertyName("identifiers")] public IReadOnlyList<IReadOnlyList<string>> Identifiers { get; init; } = [];
 }

src/Client/NetDaemon.HassClient/Internal/Json/EnsureArrayOfArrayOfStringConverter.cs

@@ -0,0 +1,55 @@
+namespace NetDaemon.Client.Internal.Json;
+
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+/// <summary>
+/// Converts a Json element that can be an array of arrays of strings to a list of lists of strings.
+/// </summary>
+class EnsureArrayOfArrayOfStringConverter : JsonConverter<IReadOnlyList<IReadOnlyList<string>>>
+{
+    private readonly EnsureStringConverter _ensureStringConverter = new();
+
+    public override IReadOnlyList<IReadOnlyList<string>> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (reader.TokenType == JsonTokenType.StartArray)
+        {
+            var list = new List<IReadOnlyList<string>>();
+            while (reader.Read() && reader.TokenType != JsonTokenType.EndArray)
+            {
+                if (reader.TokenType == JsonTokenType.StartArray)
+                {
+                    var innerList = new List<string>();
+                    while (reader.Read() && reader.TokenType != JsonTokenType.EndArray)
+                    {
+                        string? item = _ensureStringConverter.Read(ref reader, typeof(string), options);
+                        if (item != null)
+                        {
+                            innerList.Add(item);
+                        }
+                    }
+                    list.Add(innerList);
+                }
+            }
+            return list;
+        }
+
+        reader.Skip();
+        return [];
+    }
+
+    public override void Write(Utf8JsonWriter writer, IReadOnlyList<IReadOnlyList<string>> value, JsonSerializerOptions options)
+    {
+        writer.WriteStartArray();
+        foreach (var innerList in value)
+        {
+            writer.WriteStartArray();
+            foreach (var item in innerList)
+            {
+                writer.WriteStringValue(item);
+            }
+            writer.WriteEndArray();
+        }
+        writer.WriteEndArray();
+    }
+}

src/Client/NetDaemon.HassClient/Internal/Json/EnsureStringConverter.cs

@@ -20,6 +20,7 @@ class EnsureStringConverter : JsonConverter<string?>
                 if (reader.TryGetDouble(out var doubleValue))
                     return doubleValue.ToString(CultureInfo.InvariantCulture);
 
+                reader.Skip();
                 return null;
 
             default:

src/HassModel/NetDaemon.HassModel.Tests/Internal/HassObjectMapperTest.cs

@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using NetDaemon.Client.HomeAssistant.Model;
-using NetDaemon.HassModel.Entities;
+using NetDaemon.Client.Internal.Json;
 using NetDaemon.HassModel.Internal;
 
 namespace NetDaemon.HassModel.Tests.Internal;
@@ -14,7 +14,7 @@ public class HassObjectMapperTest
     private readonly JsonSerializerOptions _defaultSerializerOptions = new()
     {
         WriteIndented = false,
-        DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+        DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
     };
 
     [Fact]
@@ -39,7 +39,10 @@ public void TestConversionWithIdentifiers()
                 ],
                 [
                     "SKIP"
-                ]
+                ],
+                [1,2],
+                [1.1, 2],
+                ["1", 2.2]
             ]
         }
         """;
@@ -50,8 +53,18 @@ public void TestConversionWithIdentifiers()
 
         var ndDevice = hassDevice.Map(Mock.Of<IHaRegistryNavigator>());
 
-        Assert.Single(ndDevice.Identifiers!);
+        Assert.Equal(4, ndDevice.Identifiers!.Count);
         Assert.Equal(ndDevice.Identifiers![0].Item1, "Google");
         Assert.Equal(ndDevice.Identifiers![0].Item2, "42cdda32a2a3428e86c2e27699d79ead");
+
+        Assert.Equal(ndDevice.Identifiers![1].Item1, "1");
+        Assert.Equal(ndDevice.Identifiers![1].Item2, "2");
+
+        Assert.Equal(ndDevice.Identifiers![2].Item1, "1.1");
+        Assert.Equal(ndDevice.Identifiers![2].Item2, "2");
+
+        Assert.Equal(ndDevice.Identifiers![3].Item1, "1");
+        Assert.Equal(ndDevice.Identifiers![3].Item2, "2.2");
     }
+
 }