Fix debugging story

.devcontainer/Dockerfile

@@ -28,6 +28,3 @@ ENV TZ=Europe/Stockholm
 # Switch back to dialog for any ad-hoc use of apt-get
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TEST=AK
-
-# We do not load local assemblies
-ENV NETDAEMON__APPSOURCE=/workspaces/netdaemon/exampleapps

DEV.md

@@ -0,0 +1,18 @@
+# Developing NetDaemon 
+These instructions are for developing NetDaemon. For apps please use [the docs](https://netdaemon.xyz).
+
+## Setup the environment vars
+Easiest is to setup environment varables for your Home Assistant instance
+
+| Environment variable | Description |
+| ------ | ------ |
+| HOMEASSISTANT__TOKEN   |  Token secret to access the HA instance
+  |
+| HOMEASSISTANT__HOST | The ip or hostname of HA
+| HOMEASSISTANT__PORT | The port of home assistant (defaults to 8123 if not specified) |
+| NETDAEMON__GENERATEENTITIES | Generate entities, recommed set false unless debugging|
+| NETDAEMON__SOURCEFOLDER | The folder where it will find the source code. Set this to empty `""` to debug apps local. If needed to debug the dynamic source compilation, set to `/workspaces/netdaemon/Service/apps`
+
+Use `src/Service/apps` as starting point to debug your stuff! 
+
+Good luck

src/App/NetDaemon.App/Common/Configuration/NetDaemonSettings.cs

@@ -34,7 +34,7 @@ public class NetDaemonSettings
         /// </summary>
         public string GetAppSourceDirectory()
         {
-            var source = AppSource?.Trim() ?? throw new NullReferenceException("AppSource cannot be null!");
+            var source = AppSource?.Trim() ?? Directory.GetCurrentDirectory();
 
             if (source.EndsWith(".csproj") || source.EndsWith(".dll"))
             {

src/DaemonRunner/DaemonRunner/Service/Infrastructure/HassioConfig.cs → src/DaemonRunner/DaemonRunner/Infrastructure/Config/HassioConfig.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Service.Infrastructure
+namespace NetDaemon.Infrastructure.Config
 {
     public class HassioConfig
     {

src/DaemonRunner/DaemonRunner/Service/Infrastructure/SerilogConfigurator.cs → src/DaemonRunner/DaemonRunner/Infrastructure/Config/SerilogConfigurator.cs

@@ -5,7 +5,7 @@
 using Serilog.Events;
 using Serilog.Sinks.SystemConsole.Themes;
 
-namespace NetDaemon.Service.Infrastructure
+namespace NetDaemon.Infrastructure.Config
 {
     internal class NetDaemonTheme : Serilog.Sinks.SystemConsole.Themes.ConsoleTheme
     {

src/DaemonRunner/DaemonRunner/NetDaemonExtensions.cs

@@ -9,9 +9,8 @@
 using NetDaemon.Daemon.Config;
 using NetDaemon.Service;
 using NetDaemon.Service.App;
-using NetDaemon.Service.Infrastructure;
 using Serilog;
-using Service.Infrastructure;
+using NetDaemon.Infrastructure.Config;
 
 namespace NetDaemon
 {
@@ -57,7 +56,7 @@ public static void CleanupNetDaemon()
 
         private static void RegisterNetDaemonAssembly(IServiceCollection services)
         {
-            if (!BypassLocalAssemblyLoading())
+            if (UseLocalAssemblyLoading())
                 services.AddSingleton<IDaemonAppCompiler, LocalDaemonAppCompiler>();
             else
                 services.AddSingleton<IDaemonAppCompiler, DaemonAppCompiler>();
@@ -68,16 +67,19 @@ private static void RegisterNetDaemonAssembly(IServiceCollection services)
         ///     This is typically when running in container. When running in dev
         ///     you want the local loading
         /// </summary>
-        private static bool BypassLocalAssemblyLoading()
+        private static bool UseLocalAssemblyLoading()
         {
 
-            var appSource = Environment.GetEnvironmentVariable("NETDAEMON__APPSOURCE") ??
-                throw new NullReferenceException("NETDAEMON__APPSOURCE cannot be null!");
+
+            var appSource = Environment.GetEnvironmentVariable("NETDAEMON__APPSOURCE");
+
+            if (string.IsNullOrEmpty(appSource))
+                return true;
 
             if (appSource.EndsWith(".csproj") || appSource.EndsWith(".dll"))
-                return false;
-            else
                 return true;
+            else
+                return false;
         }
 
         /// <summary>

src/DaemonRunner/DaemonRunner/Service/App/CodeGenerator.cs

@@ -162,15 +162,15 @@ public class CodeGenerator
     {{
         public string EntityId => EntityIds.First();
 
-        public string? Area => DaemonRxApp.State(EntityId)?.Area;
+        public string? Area => DaemonRxApp?.State(EntityId)?.Area;
 
-        public dynamic? Attribute => DaemonRxApp.State(EntityId)?.Attribute;
+        public dynamic? Attribute => DaemonRxApp?.State(EntityId)?.Attribute;
         
-        public DateTime LastChanged => DaemonRxApp.State(EntityId).LastChanged;
+        public DateTime? LastChanged => DaemonRxApp?.State(EntityId)?.LastChanged;
 
-        public DateTime LastUpdated => DaemonRxApp.State(EntityId).LastUpdated;
+        public DateTime? LastUpdated => DaemonRxApp?.State(EntityId)?.LastUpdated;
 
-        public dynamic? State => DaemonRxApp.State(EntityId)?.State;
+        public dynamic? State => DaemonRxApp?.State(EntityId)?.State;
 
         public {domain.ToCamelCase()}Entity(INetDaemonReactive daemon, IEnumerable<string> entityIds) : base(daemon, entityIds)
         {{          
@@ -211,7 +211,8 @@ public class CodeGenerator
                         else if (data is not null)
                         {{
                             var expObject = ((object)data).ToExpandoObject();
-                            serviceData.CopyFrom(expObject);
+                            if (expObject is not null)
+                                serviceData.CopyFrom(expObject);
                         }}
                         {entityAssignmentStatement}
                         DaemonRxApp.CallService(""{domain}"", ""{s.Service}"", serviceData);

src/Service/apps/DebugApp.cs

@@ -0,0 +1,28 @@
+using System.Threading.Tasks;
+using System.Linq;
+using System;
+using System.Reactive.Linq;
+using System.Collections.Generic;
+using NetDaemon.Common.Reactive;
+using NetDaemon.Common;
+
+namespace Debug
+{
+
+    /// <summary> Use this class as startingpoint for debugging </summary>
+    public class DebugApp : NetDaemonRxApp
+    {
+
+        public override void Initialize()
+        {
+            RunEvery(TimeSpan.FromSeconds(5), () => Log("Hello world!"));
+        }
+
+        [HomeAssistantServiceCall]
+        public void CallMeFromHass(dynamic data)
+        {
+            Log("A call from hass! {data}", data);
+        }
+    }
+
+}

src/Service/apps/DebugApp.yaml

@@ -0,0 +1,2 @@
+debug_app:
+  class: Debug.DebugApp

src/Service/apps/README.md

@@ -0,0 +1,4 @@
+# Service project
+This is the startup project for NetDaemon service. You can use this as debugger of NetDaemon. Provided in `apps` folder there are apps that can be used as starting point for debugging. These are not moved to output folder or publish folder. 
+
+See `Dev.md` for details how to setup debugging of this project