Support Host.CreateApplicationBuilder() (#1327)

* Also support IHostApplicationBuilder instead of only IhostBuilder

* fix merge error

* remove duplicate AddSeriLog

Author: FrankBakkerNl

src/AppModel/NetDaemon.AppModel/Common/Extensions/ServiceCollectionExtension.cs

@@ -1,7 +1,6 @@
 using System.Reflection;
 using NetDaemon.AppModel.Internal.AppAssemblyProviders;
 using NetDaemon.AppModel.Internal.AppFactoryProviders;
-
 using NetDaemon.AppModel.Internal.Config;
 
 namespace NetDaemon.AppModel;

src/Extensions/NetDaemon.Extensions.Logging/Common/ServiceCollectionExtensions.cs

@@ -1,4 +1,5 @@
-using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using NetDaemon.Extensions.Logging.Internal;
 using Serilog;
 
@@ -18,4 +19,15 @@ public static IHostBuilder UseNetDaemonDefaultLogging(this IHostBuilder builder)
         return builder.UseSerilog((context, loggerConfiguration) =>
             SerilogConfigurator.Configure(loggerConfiguration, context.HostingEnvironment));
     }
-}
+
+    /// <summary>
+    ///    Adds default logging capabilities for NetDaemon
+    /// </summary>
+    /// <param name="services"></param>
+    public static IServiceCollection AddNetDaemonDefaultLogging(this IServiceCollection services)
+    {
+        services.AddSerilog((context, loggerConfiguration) =>
+            SerilogConfigurator.Configure(loggerConfiguration, context.GetRequiredService<IHostEnvironment>()));
+        return services;
+    }
+}

src/Extensions/NetDaemon.Extensions.MqttEntityManager/DependencyInjectionSetup.cs

@@ -20,16 +20,25 @@ public static class DependencyInjectionSetup
     /// <returns></returns>
     public static IHostBuilder UseNetDaemonMqttEntityManagement(this IHostBuilder hostBuilder)
     {
-        return hostBuilder.ConfigureServices((context, services) =>
+        return hostBuilder.ConfigureServices((_, services) =>
         {
-            services.AddSingleton<IMqttFactory, MqttFactoryFactory>();
-            services.AddSingleton<IMqttClientOptionsFactory, MqttClientOptionsFactory>();
-            services.AddSingleton<IMqttFactoryWrapper, MqttFactoryWrapper>();
-            services.AddSingleton<IMqttEntityManager, MqttEntityManager>();
-            services.AddSingleton<IAssuredMqttConnection, AssuredMqttConnection>();
-            services.AddSingleton<IMessageSender, MessageSender>();
-            services.AddSingleton<IMessageSubscriber, MessageSubscriber>();
-            services.Configure<MqttConfiguration>(context.Configuration.GetSection("Mqtt"));
+            services.AddNetDaemonMqttEntityManagement();
         });
     }
-}
+
+    /// <summary>
+    /// Add support for managing entities via MQTT
+    /// </summary>
+    public static IServiceCollection AddNetDaemonMqttEntityManagement(this IServiceCollection services)
+    {
+        services.AddSingleton<IMqttFactory, MqttFactoryFactory>();
+        services.AddSingleton<IMqttClientOptionsFactory, MqttClientOptionsFactory>();
+        services.AddSingleton<IMqttFactoryWrapper, MqttFactoryWrapper>();
+        services.AddSingleton<IMqttEntityManager, MqttEntityManager>();
+        services.AddSingleton<IAssuredMqttConnection, AssuredMqttConnection>();
+        services.AddSingleton<IMessageSender, MessageSender>();
+        services.AddSingleton<IMessageSubscriber, MessageSubscriber>();
+        services.AddOptions<MqttConfiguration>().BindConfiguration("Mqtt");
+        return services;
+    }
+}

src/Extensions/NetDaemon.Extensions.Tts/HostBuilderExtensions.cs

@@ -1,6 +1,4 @@
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using NetDaemon.Extensions.Tts.Internal;
+using Microsoft.Extensions.Hosting;
 
 namespace NetDaemon.Extensions.Tts;
 
@@ -17,9 +15,8 @@ public static IHostBuilder UseNetDaemonTextToSpeech(this IHostBuilder hostBuilde
     {
         hostBuilder.ConfigureServices(services =>
         {
-            services.AddSingleton<TextToSpeechService>();
-            services.AddSingleton<ITextToSpeechService>(s => s.GetRequiredService<TextToSpeechService>());
+            services.AddNetDaemonTextToSpeech();
         });
         return hostBuilder;
     }
-}
+}

src/Extensions/NetDaemon.Extensions.Tts/ServiceCollectionExtensions.cs

@@ -0,0 +1,21 @@
+using Microsoft.Extensions.DependencyInjection;
+using NetDaemon.Extensions.Tts.Internal;
+
+namespace NetDaemon.Extensions.Tts;
+
+/// <summary>
+///   Extension methods for text-to-speech
+/// </summary>
+public static class ServiceCollectionExtensions
+{
+    /// <summary>
+    ///    Use the text-to-speech engine of NetDaemon
+    /// </summary>
+    /// <param name="services"></param>
+    public static IServiceCollection AddNetDaemonTextToSpeech(this IServiceCollection services)
+    {
+        services.AddSingleton<TextToSpeechService>();
+        services.AddSingleton<ITextToSpeechService>(s => s.GetRequiredService<TextToSpeechService>());
+        return services;
+    }
+}

src/Runtime/NetDaemon.Runtime/Common/Extensions/HostBuilderExtensions.cs

@@ -1,7 +1,5 @@
 using Microsoft.Extensions.Configuration;
 using NetDaemon.AppModel;
-using NetDaemon.HassModel;
-using NetDaemon.Runtime.Internal;
 
 namespace NetDaemon.Runtime;
 
@@ -19,7 +17,7 @@ public static class HostBuilderExtensions
     ///  - Register appsettings.json to the host configuration
     ///  - Register all the yaml settings from the path set in the current configuration to the configuration provider
     ///  - Call 'ConfigureNetDaemonServices' in the service collection
-    ///  
+    ///
     /// You can call these methods separately if you want to do something else in between, or if you're calling any of these methods already.
     /// Change `UseNetDaemonAppSettings` to `.RegisterAppSettingsJsonToHost().RegisterYamlSettings()` and call `ConfigureNetDaemonServices(context.Configuration)` in ConfigureServices.
     /// </remarks>
@@ -28,18 +26,33 @@ public static IHostBuilder UseNetDaemonAppSettings(this IHostBuilder hostBuilder
         return hostBuilder
             .RegisterAppSettingsJsonToHost()
             .RegisterYamlSettings()
-            .ConfigureServices((context, services)
-                => services.ConfigureNetDaemonServices(context.Configuration)
+            .ConfigureServices((_, services)
+                => services.ConfigureNetDaemonServices()
             );
     }
 
+    /// <summary>
+    /// Adds the yaml appsettings to the configuration
+    /// </summary>
+    /// <param name="hostBuilder"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public static T UseNetDaemonAppSettings<T>(this T hostBuilder) where T : IHostApplicationBuilder
+    {
+        hostBuilder.Configuration.AddYamlAppConfigs(hostBuilder.Configuration);
+
+        return hostBuilder;
+    }
+
+
     /// <summary>
     /// Registers appsettings.json to the host configuration
     /// </summary>
     /// <param name="hostBuilder"></param>
     /// <remarks>This enables using data from the appsettings.json in the `ConfigureAppConfiguration` call</remarks>
     public static IHostBuilder RegisterAppSettingsJsonToHost(this IHostBuilder hostBuilder)
     {
+        // The default Host Builders already add appsettings.json, not sure why this is needed here
         return hostBuilder.ConfigureHostConfiguration(config =>
         {
             config.AddJsonFile("appsettings.json", optional: true);
@@ -65,16 +78,9 @@ public static IHostBuilder RegisterYamlSettings(this IHostBuilder hostBuilder)
     public static IHostBuilder UseNetDaemonRuntime(this IHostBuilder hostBuilder)
     {
         return hostBuilder
-            .UseAppScopedHaContext()
-            .ConfigureServices((context, services) =>
+            .ConfigureServices((_, services) =>
             {
-                services.AddLogging();
-                services.AddHostedService<RuntimeService>();
-                services.AddHomeAssistantClient();
-                services.Configure<HomeAssistantSettings>(context.Configuration.GetSection("HomeAssistant"));
-                services.AddSingleton<NetDaemonRuntime>();
-                services.AddSingleton<IRuntime>(provider => provider.GetRequiredService<NetDaemonRuntime>());
-                services.AddSingleton<INetDaemonRuntime>(provider => provider.GetRequiredService<NetDaemonRuntime>());
+                services.AddNetDaemonRuntime();
             });
     }
 }

src/Runtime/NetDaemon.Runtime/Common/Extensions/ServiceCollectionExtensions.cs

@@ -1,5 +1,7 @@
 using Microsoft.Extensions.Configuration;
 using NetDaemon.AppModel;
+using NetDaemon.HassModel;
+using NetDaemon.Runtime.Internal;
 
 namespace NetDaemon.Runtime;
 
@@ -9,15 +11,30 @@ namespace NetDaemon.Runtime;
 public static class ServiceCollectionExtensions
 {
     /// <summary>
-    /// Loads NetDaemon and HomeAssistant configuration sections
+    /// Adds the NetDaemon Runtime Services to a IServiceCollection
+    /// </summary>
+    public static IServiceCollection AddNetDaemonRuntime(this IServiceCollection services)
+    {
+        services.AddScopedHaContext();
+        services.AddLogging();
+        services.AddHostedService<RuntimeService>();
+        services.AddHomeAssistantClient();
+        services.AddOptions<HomeAssistantSettings>().BindConfiguration("HomeAssistant");
+        services.AddSingleton<NetDaemonRuntime>();
+        services.AddSingleton<IRuntime>(provider => provider.GetRequiredService<NetDaemonRuntime>());
+        services.AddSingleton<INetDaemonRuntime>(provider => provider.GetRequiredService<NetDaemonRuntime>());
+        return services;
+    }
+
+    /// <summary>
+    /// Loads NetDaemon configuration section
     /// </summary>
     /// <param name="services">The <see cref="IServiceCollection" /> to add services to.</param>
     /// <param name="config">The current <see cref="IConfiguration" /> instance</param>
     /// <returns>The <see cref="IServiceCollection"/> so that additional calls can be chained.</returns>
-    public static IServiceCollection ConfigureNetDaemonServices(this IServiceCollection services, IConfiguration config)
+    public static IServiceCollection ConfigureNetDaemonServices(this IServiceCollection services)
     {
-        return services.Configure<AppConfigurationLocationSetting>(config.GetSection("NetDaemon"))
-                       .Configure<HomeAssistantSettings>(config.GetSection("HomeAssistant"));
-        // todo: maybe remove 'HomeAssistant' section this here, is this method really needed? If we remove this we can inline the rest
+         services.AddOptions<AppConfigurationLocationSetting>().BindConfiguration("NetDaemon");
+         return services;
     }
-}
+}

src/debug/DebugHost/Program.cs

@@ -6,30 +6,15 @@
 using NetDaemon.Extensions.Tts;
 using NetDaemon.Extensions.MqttEntityManager;
 
-#pragma warning disable CA1812
+var builder = Host.CreateApplicationBuilder(args);
+builder.UseNetDaemonAppSettings();
 
-try
-{
-    await Host.CreateDefaultBuilder(args)
-              .UseNetDaemonAppSettings()
-              .UseNetDaemonDefaultLogging()
-              .UseNetDaemonRuntime()
-              .UseNetDaemonTextToSpeech()
-              .UseNetDaemonMqttEntityManagement()
-              .ConfigureServices((_, services) =>
-                  services
-                      // change type of compilation here
-                      // .AddAppsFromSource(true)
-                      .AddAppsFromAssembly(Assembly.GetEntryAssembly()!)
-                      // Remove this is you are not running the integration!
-                      .AddNetDaemonStateManager()
-              )
-              .Build()
-              .RunAsync()
-              .ConfigureAwait(false);
-}
-catch (Exception e)
-{
-    Console.WriteLine($"Failed to start host... {e}");
-    throw;
-}
+builder.Services
+    .AddNetDaemonRuntime()
+    .AddNetDaemonDefaultLogging()
+    .AddNetDaemonTextToSpeech()
+    .AddNetDaemonMqttEntityManagement()
+    .AddAppsFromAssembly(Assembly.GetExecutingAssembly())
+    .AddNetDaemonStateManager();
+
+await builder.Build().RunAsync();

src/debug/DebugWebHost/Program.cs

@@ -2,8 +2,8 @@
 using NetDaemon.Runtime;
 
 var builder = WebApplication.CreateBuilder(args);
-builder.Host.UseNetDaemonRuntime();
 
+builder.Services.AddNetDaemonRuntime();
 var app = builder.Build();
 
 app.MapGet("/", (IHaContext ha) => ha.GetAllEntities().Where(e=>e.EntityId.StartsWith("light", StringComparison.Ordinal)).Select(e => e.EntityId));