Added support for comples types in config (net-daemon#154)

* Added support for comples types in config

* Fix test timing

* Test timing

* Test fixes

Author: helto4real

exampleapps/apps/_EntityExtensions.cs

@@ -92,51 +92,81 @@ public IEnumerable<INetDaemonAppBase> Instances
 
                 var valueType = entry.Value.NodeType;
 
-                switch (valueType)
-                {
-                    case YamlNodeType.Sequence:
-                        SetPropertyFromYaml(netDaemonApp, prop, (YamlSequenceNode)entry.Value);
-                        break;
-
-                    case YamlNodeType.Scalar:
-                        SetPropertyFromYaml(netDaemonApp, prop, (YamlScalarNode)entry.Value);
-                        break;
+                var instance = InstanceProperty(netDaemonApp, prop.PropertyType, entry.Value);
 
-                    case YamlNodeType.Mapping:
-                        var map = (YamlMappingNode)entry.Value;
-                        break;
-                }
+                prop.SetValue(netDaemonApp, instance);
             }
 
             return netDaemonApp;
         }
 
-        public void SetPropertyFromYaml(INetDaemonAppBase app, PropertyInfo prop, YamlSequenceNode seq)
+        private object? InstanceProperty(Object? parent, Type instanceType, YamlNode node)
         {
-            if (prop.PropertyType.IsGenericType && prop.PropertyType?.GetGenericTypeDefinition() == typeof(IEnumerable<>))
+
+            if (node.NodeType == YamlNodeType.Scalar)
             {
-                Type listType = prop.PropertyType?.GetGenericArguments()[0] ??
-                    throw new NullReferenceException($"The property {prop.Name} of Class {app.GetType().Name} is not compatible with configuration");
+                var scalarNode = (YamlScalarNode)node;
+                ReplaceSecretIfExists(scalarNode);
+                return ((YamlScalarNode)node).ToObject(instanceType);
+            }
+            else if (node.NodeType == YamlNodeType.Sequence)
+            {
+                if (instanceType.IsGenericType && instanceType?.GetGenericTypeDefinition() == typeof(IEnumerable<>))
+                {
+                    Type listType = instanceType?.GetGenericArguments()[0] ??
+                        throw new NullReferenceException($"The property {instanceType?.Name} of Class {parent?.GetType().Name} is not compatible with configuration");
 
-                IList list = listType.CreateListOfPropertyType() ??
-                    throw new NullReferenceException("Failed to create listtype, plese check {prop.Name} of Class {app.GetType().Name}");
+                    IList list = listType.CreateListOfPropertyType() ??
+                        throw new NullReferenceException("Failed to create listtype, plese check {prop.Name} of Class {app.GetType().Name}");
 
-                foreach (YamlNode item in seq.Children)
-                {
-                    if (item.NodeType != YamlNodeType.Scalar)
+                    foreach (YamlNode item in ((YamlSequenceNode)node).Children)
                     {
-                        throw new NotSupportedException($"The property {prop.Name} of Class {app.GetType().Name} is not compatible with configuration");
+
+                        var instance = InstanceProperty(null, listType, item) ??
+                            throw new NotSupportedException($"The class {parent?.GetType().Name} has wrong type in items");
+
+                        list.Add(instance);
                     }
-                    var scalarNode = (YamlScalarNode)item;
-                    ReplaceSecretIfExists(scalarNode);
-                    var value = ((YamlScalarNode)item).ToObject(listType) ??
-                        throw new NotSupportedException($"The class {app.GetType().Name} and property {prop.Name} has wrong type in items");
 
-                    list.Add(value);
+                    return list;
+                }
+            }
+            else if (node.NodeType == YamlNodeType.Mapping)
+            {
+                var instance = Activator.CreateInstance(instanceType);
+
+                foreach (KeyValuePair<YamlNode, YamlNode> entry in ((YamlMappingNode)node).Children)
+                {
+                    string? scalarPropertyName = ((YamlScalarNode)entry.Key).Value;
+                    // Just continue to next configuration if null or class declaration
+                    if (scalarPropertyName == null) continue;
+
+                    var childProp = instanceType.GetYamlProperty(scalarPropertyName) ??
+                        throw new MissingMemberException($"{scalarPropertyName} is missing from the type {instanceType}");
+
+                    var valueType = entry.Value.NodeType;
+                    Object? result = null;
+
+                    switch (valueType)
+                    {
+                        case YamlNodeType.Sequence:
+                            result = InstanceProperty(instance, childProp.PropertyType, (YamlSequenceNode)entry.Value);
+
+                            break;
+
+                        case YamlNodeType.Scalar:
+                            result = InstanceProperty(instance, childProp.PropertyType, (YamlScalarNode)entry.Value);
+                            break;
+
+                        case YamlNodeType.Mapping:
+                            var map = (YamlMappingNode)entry.Value;
+                            break;
+                    }
+                    childProp.SetValue(instance, result);
                 }
-                // Bind the list to the property
-                prop.SetValue(app, list);
+                return instance;
             }
+            return null;
         }
 
         private void ReplaceSecretIfExists(YamlScalarNode scalarNode)
@@ -149,16 +179,6 @@ private void ReplaceSecretIfExists(YamlScalarNode scalarNode)
             scalarNode.Value = secretReplacement ?? throw new ApplicationException($"{scalarNode.Value!} not found in secrets.yaml");
         }
 
-        public void SetPropertyFromYaml(INetDaemonAppBase app, PropertyInfo prop, YamlScalarNode sc)
-        {
-            ReplaceSecretIfExists(sc);
-            var scalarValue = sc.ToObject(prop.PropertyType) ??
-                throw new NotSupportedException($"The class {app.GetType().Name} and property {prop.Name} unexpected value {sc.Value} is wrong type");
-
-            // Bind the list to the property
-            prop.SetValue(app, scalarValue);
-        }
-
         private string? GetTypeNameFromClassConfig(YamlMappingNode appNode)
         {
             KeyValuePair<YamlNode, YamlNode> classChild = appNode.Children.Where(n =>

exampleapps/apps/_EntityExtensionsRx.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using JoySoftware.HomeAssistant.NetDaemon.Common;
+/// <summary>
+///     Greets (or insults) people when coming home :)
+/// </summary>
+public class AppComplexConfig : NetDaemonApp
+{
+    public string? AString { get; set; }
+    public int? AnInt { get; set; }
+    public bool? ABool { get; set; }
+    public IEnumerable<string>? AStringList { get; set; }
+    public IEnumerable<Device>? Devices { get; set; }
+    public override Task InitializeAsync()
+    {
+        // Do nothing
+
+        return Task.CompletedTask;
+    }
+}
+
+public class Device
+{
+    public string? name { get; set; }
+    public IEnumerable<Command>? commands { get; set; }
+}
+public class Command
+{
+    public string? name { get; set; }
+    public string? data { get; set; }
+}

src/Daemon/NetDaemon.Daemon/Daemon/Config/YamlConfig.cs

@@ -206,5 +206,45 @@ public void YamlScalarNodeToObjectUsingDeciaml()
             Assert.Equal((float)1.5f, scalarValue.ToObject(typeof(float)));
             Assert.Equal((double)1.5, scalarValue.ToObject(typeof(double)));
         }
+
+        [Fact]
+        public void YamlAdvancedObjectsShouldReturnCorrectData()
+        {
+            var yaml = @"
+            a_string: hello world
+            an_int: 10
+            a_bool: true
+            a_string_list:
+            - hi
+            - this
+            - is
+            - cool!
+            devices:
+            - name: tv
+              commands:
+                - name: command1
+                  data: some code
+                - name: command2
+                  data: some code2";
+
+            var yamlConfig = new YamlAppConfig(new List<Type>(), new System.IO.StringReader(yaml), new YamlConfig(ConfigFixturePath), ConfigFixturePath);
+
+            var yamlStream = new YamlStream();
+            yamlStream.Load(new StringReader(yaml));
+            var root = (YamlMappingNode)yamlStream.Documents[0].RootNode;
+
+            var instance = (AppComplexConfig?)yamlConfig.InstanceAndSetPropertyConfig(typeof(AppComplexConfig), root, "id");
+
+            Assert.Equal("hello world", instance?.AString);
+            Assert.Equal(10, instance?.AnInt);
+            Assert.Equal(true, instance?.ABool);
+            Assert.NotNull(instance?.Devices);
+            Assert.Equal(1, instance?.Devices.Count());
+            Assert.Equal("tv", instance?.Devices.First().name);
+            Assert.Equal("command1", instance?.Devices.First().commands.ElementAt(0).name);
+            Assert.Equal("some code", instance?.Devices.First().commands.ElementAt(0).data);
+            Assert.Equal("command2", instance?.Devices.First().commands.ElementAt(1).name);
+            Assert.Equal("some code2", instance?.Devices.First().commands.ElementAt(1).data);
+        }
     }
 }

tests/NetDaemon.Daemon.Tests/DaemonRunner/Config/AppComplexConfig.cs

@@ -26,6 +26,8 @@ public async Task EventShouldCallCorrectFunction()
         {
             // ARRANGE
 
+            await WaitForDefaultDaemonToConnect(DefaultDaemonHost, CancellationToken.None);
+
             dynamic helloWorldDataObject = GetDynamicDataObject(HelloWorldData);
 
             DefaultHassClientMock.AddCustomEvent("CUSTOM_EVENT", helloWorldDataObject);
@@ -55,7 +57,9 @@ public async Task AttributeServiceCallShouldFindCorrectFunction()
             var app = new AssmeblyDaemonApp();
             app.Id = "id";
 
+
             DefaultDaemonHost.InternalRunningAppInstances[app.Id] = app;
+            await WaitForDefaultDaemonToConnect(DefaultDaemonHost, CancellationToken.None);
 
             // ACT
             await app.HandleAttributeInitialization(DefaultDaemonHost).ConfigureAwait(false);
@@ -68,7 +72,7 @@ public async Task AttributeServiceCallShouldFindCorrectFunction()
         public void GetStateMissingEntityReturnsNull()
         {
             // ARRANGE
-
+            
             // ACT
             var entity = DefaultDaemonHost.GetState("light.missing_entity");
 
@@ -203,6 +207,8 @@ public async Task SpeakShouldCallCorrectService()
             // ACT
             var (daemonTask, _) = ReturnRunningDefauldDaemonHostTask();
 
+            await WaitForDefaultDaemonToConnect(DefaultDaemonHost, CancellationToken.None);
+
             DefaultDaemonHost.Speak("media_player.fakeplayer", "Hello test!");
 
             var (_, expObject) = GetDynamicObject(
@@ -226,6 +232,8 @@ public async Task SpeakShouldWaitUntilMediaPlays()
             // Get a running default Daemon
             var (daemonTask, _) = ReturnRunningDefauldDaemonHostTask(500);
 
+            await WaitForDefaultDaemonToConnect(DefaultDaemonHost, CancellationToken.None);
+
             DefaultDaemonHost.InternalDelayTimeForTts = 0; // Allow now extra waittime
 
             // Expected data call service

tests/NetDaemon.Daemon.Tests/DaemonRunner/Config/ConfigTest.cs

@@ -30,7 +30,7 @@ public async Task EntityOnStateChangedForTimeTurnOffLightCallsCorrectServiceCall
             var lastChanged = new DateTime(2020, 1, 1, 1, 1, 1, 20);
             var lastUpdated = new DateTime(2020, 1, 1, 1, 1, 1, 50);
 
-            var daemonTask = RunDefauldDaemonUntilCanceled(200); //overrideDebugNotCancel: true
+            var daemonTask = RunDefauldDaemonUntilCanceled(300); //overrideDebugNotCancel: true
 
             await WaitForDefaultDaemonToConnect(DefaultDaemonHost, CancellationToken.None);
 
@@ -48,7 +48,7 @@ public async Task EntityOnStateChangedForTimeTurnOffLightCallsCorrectServiceCall
             // ASSERT
             await Task.Delay(10); // After 10ms we should not have call
             DefaultHassClientMock.VerifyCallServiceTimes("turn_off", Times.Never());
-            await Task.Delay(200); // After 30ms we should have call
+            await Task.Delay(300); // After 30ms we should have call
             DefaultHassClientMock.VerifyCallServiceTimes("turn_off", Times.Once());
             await daemonTask;