Pull config out of RunnerService (#158)

* Context

* Post merge clean.

* Update client.
Add support for context.
Move things around a little.

* Fix name, also in an attempt to re-run tests on build server.

* Pull config out of runner service, use .net core built-in configuration.

Environment variables take preference over daemon_config.

* * Break apart HA settings from NetDaemon settings

* Remove HostBuilderExtensions
 - No need to generate a sample config file.  It now comes with one (appsettings.json)
 - No need to add json or env variables as generic host add these automatically

Runner.cs
* Pulled HassIO config file to environment variables out and into its own method (readability)
 - Comment out HASSCLIENT_MSGLOGLEVEL, couldn't see any usages
 - Comment out HASS_RUN_PROJECT_FOLDER, couldn't see any usages
* Register HA and ND settings in IOC

RunnerService.cs
* Inject settings
* Extract generate entities code into its own method (readability)

* PR comments.  Default config host value should be localhost.

* PR comments.

* PR comments.

* Move hosting code to Service.

* PR comments.

These are used by hass client.

* Update some docker variables.

* Allow changing of minimum log level by config or environment variables.

* Update project folder variable.

Author: asherw

.devcontainer/devcontainer.json

@@ -17,12 +17,12 @@
 		"coverage-gutters.showLineCoverage": true,
 	},
 	"remoteEnv": {
-		"HASS_TOKEN": "${localEnv:HASS_TOKEN}",
-		"HASS_HOST": "${localEnv:HASS_HOST}",
-		"HASS_PORT": "${localEnv:HASS_PORT}",
-		"HASS_LOGLEVEL": "${localEnv:HASS_LOGLEVEL}",
-		"HASS_GEN_ENTITIES": "${localEnv:HASS_GEN_ENTITIES}",
-		"HASS_DAEMONAPPFOLDER": "${localEnv:HASS_DAEMONAPPFOLDER}"
+		"HOMEASSISTANT__TOKEN": "${localEnv:HOMEASSISTANT__TOKEN}",
+		"HOMEASSISTANT__HOST": "${localEnv:HOMEASSISTANT__HOST}",
+		"HOMEASSISTANT__PORT": "${localEnv:HOMEASSISTANT__PORT}",
+		"LOGGING__MINIMUMLEVEL": "${localEnv:LOGGING__MINIMUMLEVEL}",
+		"NETDAEMON__GENERATEENTITIES": "${localEnv:NETDAEMON__GENERATEENTITIES}",
+		"NETDAEMON__SOURCEFOLDER": "${localEnv:NETDAEMON__SOURCEFOLDER}"
 	},
 	"postCreateCommand": "dotnet restore && .devcontainer/install_prettyprompt.sh",
 	// Uncomment the next line if you want to publish any ports.

Docker/rootfs/etc/services.d/NetDaemon/run

@@ -9,9 +9,9 @@ set -e
 declare runtype="Service"
 declare daemondir="/daemon"
 
-cd "${HASS_RUN_PROJECT_FOLDER}" || echo -e "\\033[31mCould not change directory to run project\\033[0m" >&2
+cd "${NETDAEMON__PROJECTFOLDER}" || echo -e "\\033[31mCould not change directory to run project\\033[0m" >&2
 
-if [[ "${PWD}" != "${HASS_RUN_PROJECT_FOLDER}" ]]; then
+if [[ "${PWD}" != "${NETDAEMON__PROJECTFOLDER}" ]]; then
     exit 1
 fi
 

Dockerfile

@@ -13,12 +13,12 @@ COPY ./Docker/rootfs/etc/services.d/NetDaemon/run /rundaemon
 ENV \
     DOTNET_NOLOGO=true \
     DOTNET_CLI_TELEMETRY_OPTOUT=true \
-    HASS_RUN_PROJECT_FOLDER=/usr/src/Service \
-    HASS_HOST=localhost \
+    NETDAEMON__PROJECTFOLDER=/usr/src/Service \
+    HOMEASSISTANT__HOST=localhost \
+    HOMEASSISTANT__PORT=8123 \
+    HOMEASSISTANT__TOKEN=NOT_SET \
     HASSCLIENT_MSGLOGLEVEL=Default \
-    HASS_PORT=8123 \
-    HASS_TOKEN=NOT_SET \
-    HASS_DAEMONAPPFOLDER=/data
+    NETDAEMON__SOURCEFOLDER=/data
 
 
 ENTRYPOINT ["bash", "/rundaemon"]

src/DaemonRunner/DaemonRunner/DaemonRunner.csproj

@@ -26,7 +26,6 @@
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.5" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="3.1.5" />
     <PackageReference Include="YamlDotNet" Version="8.1.2" />
-    <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
   </ItemGroup>
 
   <ItemGroup>

src/DaemonRunner/DaemonRunner/NetDaemonExtensions.cs

@@ -0,0 +1,22 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using NetDaemon.Service;
+using NetDaemon.Service.Configuration;
+
+namespace NetDaemon
+{
+    public static class NetDaemonExtensions
+    {
+        public static IHostBuilder UseNetDaemon(this IHostBuilder hostBuilder)
+        {
+            return hostBuilder.ConfigureServices((context, services) =>
+            {
+                services.Configure<HomeAssistantSettings>(context.Configuration.GetSection("HomeAssistant"));
+                services.Configure<NetDaemonSettings>(context.Configuration.GetSection("NetDaemon"));
+
+                services.AddHttpClient();
+                services.AddHostedService<RunnerService>();
+            });
+        }
+    }
+}

src/DaemonRunner/DaemonRunner/Service/Configuration/HomeAssistantSettings.cs

@@ -0,0 +1,10 @@
+namespace NetDaemon.Service.Configuration
+{
+    public class HomeAssistantSettings
+    {
+        public string Host { get; set; } = "localhost";
+        public short Port { get; set; } = 8123;
+        public bool Ssl { get; set; } = false;
+        public string Token { get; set; } = string.Empty;
+    }
+}

src/DaemonRunner/DaemonRunner/Service/Configuration/NetDaemonSettings.cs

@@ -0,0 +1,9 @@
+namespace NetDaemon.Service.Configuration
+{
+    public class NetDaemonSettings
+    {
+        public bool? GenerateEntities { get; set; } = false;
+        public string? SourceFolder { get; set; } = null;
+        public string? ProjectFolder { get; set; } = string.Empty;
+    }
+}