Improve Hot Reload Integration (#851)

dotnet · Apr 27, 2021 · 0edc29e · 0edc29e
1 parent e289c34
commit 0edc29e
Show file tree

Hide file tree

Showing 17 changed files with 188 additions and 96 deletions.
diff --git a/src/Core/src/Hosting/AppHost.cs b/src/Core/src/Hosting/AppHost.cs
@@ -0,0 +1,19 @@
+#nullable enable
+
+namespace Microsoft.Maui.Hosting
+{
+	public static class AppHost
+	{
+		public static IAppHostBuilder CreateDefaultBuilder()
+		{
+			var builder = new AppHostBuilder();
+
+			builder.UseMauiServiceProviderFactory(false);
+
+			builder.UseMauiHandlers();
+			builder.ConfigureFonts();
+
+			return builder;
+		}
+	}
+}
diff --git a/src/Core/src/Hosting/AppHostBuilder.cs b/src/Core/src/Hosting/AppHostBuilder.cs
@@ -37,18 +37,6 @@ public AppHostBuilder()
 
 		public IDictionary<object, object> Properties => new Dictionary<object, object>();
 
-		public static IAppHostBuilder CreateDefaultAppBuilder()
-		{
-			var builder = new AppHostBuilder();
-
-			builder.UseMauiServiceProviderFactory(false);
-
-			builder.UseMauiHandlers();
-			builder.ConfigureFonts();
-
-			return builder;
-		}
-
 		public IAppHost Build()
 		{
 			_services = _serviceCollectionFactory();
@@ -76,7 +64,7 @@ public IAppHost Build()
 
 			ConfigureServiceCollectionBuilders(_serviceProvider);
 
-			return new AppHost(_serviceProvider, null);
+			return new Internal.AppHost(_serviceProvider, null);
 		}
 
 		public IAppHostBuilder ConfigureAppConfiguration(Action<HostBuilderContext, IConfigurationBuilder> configureDelegate)

diff --git a/src/Core/src/Hosting/AppHostBuilderExtensions.cs b/src/Core/src/Hosting/AppHostBuilderExtensions.cs
@@ -1,13 +1,11 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Maui.Handlers;
 using Microsoft.Maui.Hosting.Internal;
-using Microsoft.Maui.HotReload;
 
 namespace Microsoft.Maui.Hosting
 {
@@ -64,6 +62,13 @@ public static IAppHostBuilder ConfigureServices<TBuilder>(this IAppHostBuilder b
 			return builder;
 		}
 
+		public static IAppHostBuilder ConfigureServices<TBuilder>(this IAppHostBuilder builder)
+			where TBuilder : IMauiServiceBuilder, new()
+		{
+			builder.ConfigureServices<TBuilder>((_, services) => { });
+			return builder;
+		}
+
 		public static IAppHostBuilder ConfigureAppConfiguration(this IAppHostBuilder builder, Action<IConfigurationBuilder> configureDelegate)
 		{
 			builder.ConfigureAppConfiguration((_, config) => configureDelegate(config));
@@ -96,40 +101,7 @@ public static IAppHostBuilder UseMauiServiceProviderFactory(this IAppHostBuilder
 			return builder;
 		}
 
-		public static IAppHostBuilder EnableHotReload(this IAppHostBuilder builder, string? ideIp = null, int idePort = 9988)
-		{
-			builder.ConfigureMauiHandlers((context, handlersCollection) =>
-			{
-				if (handlersCollection is IMauiServiceCollection mauiCollection)
-					MauiHotReloadHelper.Init(mauiCollection);
-				else
-					throw new NotSupportedException("Hot Reload only works with a IMauiServiceCollection");
-			});
-			Reloadify.Reload.Instance.ReplaceType = (d) =>
-			{
-				MauiHotReloadHelper.RegisterReplacedView(d.ClassName, d.Type);
-			};
-
-			Reloadify.Reload.Instance.FinishedReload = () =>
-			{
-				MauiHotReloadHelper.TriggerReload();
-			};
-			Task.Run(async () =>
-			{
-				try
-				{
-					var success = await Reloadify.Reload.Init(ideIp, idePort);
-					Console.WriteLine($"HotReload Initialize: {success}");
-				}
-				catch (Exception ex)
-				{
-					Console.WriteLine(ex);
-				}
-			});
-			return builder;
-		}
-
-		class HandlerCollectionBuilder : MauiServiceCollection, IMauiHandlersCollection, IMauiServiceBuilder
+		class HandlerCollectionBuilder : MauiHandlersCollection, IMauiServiceBuilder
 		{
 			public void ConfigureServices(HostBuilderContext context, IServiceCollection services)
 			{

diff --git a/src/Core/src/Hosting/IMauiHandlersCollection.cs b/src/Core/src/Hosting/IMauiHandlersCollection.cs
@@ -2,7 +2,7 @@
 
 namespace Microsoft.Maui.Hosting
 {
-	public interface IMauiHandlersCollection : IServiceCollection
+	public interface IMauiHandlersCollection : IMauiServiceCollection
 	{
 	}
 }
diff --git a/src/Core/src/Hosting/IMauiHandlersServiceProvider.cs b/src/Core/src/Hosting/IMauiHandlersServiceProvider.cs
@@ -3,7 +3,7 @@
 
 namespace Microsoft.Maui
 {
-	public interface IMauiHandlersServiceProvider : IServiceProvider
+	public interface IMauiHandlersServiceProvider : IMauiServiceProvider
 	{
 		Type? GetHandlerType(Type iview);
 

diff --git a/src/Core/src/Hosting/Internal/MauiHandlersCollection.cs b/src/Core/src/Hosting/Internal/MauiHandlersCollection.cs
@@ -0,0 +1,8 @@
+#nullable enable
+
+namespace Microsoft.Maui.Hosting.Internal
+{
+	class MauiHandlersCollection : MauiServiceCollection, IMauiHandlersCollection
+	{
+	}
+}
diff --git a/src/Core/src/Hosting/Internal/MauiHandlersServiceProvider.cs b/src/Core/src/Hosting/Internal/MauiHandlersServiceProvider.cs
@@ -1,13 +1,17 @@
 #nullable enable
 using System;
+using Microsoft.Maui.HotReload;
 
 namespace Microsoft.Maui.Hosting.Internal
 {
-	class MauiHandlersServiceProvider : MauiServiceProvider, IMauiHandlersServiceProvider
+	class MauiHandlersServiceProvider : MauiServiceProvider, IMauiHandlersServiceProvider, IHotReloadableHandlersServiceProvider
 	{
-		public MauiHandlersServiceProvider(IMauiServiceCollection collection)
+		readonly IMauiHandlersCollection _collection;
+
+		public MauiHandlersServiceProvider(IMauiHandlersCollection collection)
 			: base(collection, false)
 		{
+			_collection = collection;
 		}
 
 		public IViewHandler? GetHandler(Type type)
@@ -17,5 +21,7 @@ public MauiHandlersServiceProvider(IMauiServiceCollection collection)
 			=> GetHandler(typeof(T));
 
 		public Type? GetHandlerType(Type iview) => GetServiceType(iview)?.ImplementationType;
+
+		public IMauiHandlersCollection GetCollection() => _collection;
 	}
 }
diff --git a/src/Core/src/Hosting/MauiHandlersCollectionExtensions.cs b/src/Core/src/Hosting/MauiHandlersCollectionExtensions.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 
 namespace Microsoft.Maui.Hosting
 {
@@ -28,5 +29,28 @@ public static IMauiHandlersCollection AddHandler<TType, TTypeRender>(this IMauiH
 			handlersCollection.AddTransient(typeof(TType), typeof(TTypeRender));
 			return handlersCollection;
 		}
+
+		public static IMauiHandlersCollection TryAddHandlers(this IMauiHandlersCollection handlersCollection, Dictionary<Type, Type> handlers)
+		{
+			foreach (var handler in handlers)
+			{
+				handlersCollection.TryAddTransient(handler.Key, handler.Value);
+			}
+			return handlersCollection;
+		}
+
+		public static IMauiHandlersCollection TryAddHandler(this IMauiHandlersCollection handlersCollection, Type viewType, Type handlerType)
+		{
+			handlersCollection.AddTransient(viewType, handlerType);
+			return handlersCollection;
+		}
+
+		public static IMauiHandlersCollection TryAddHandler<TType, TTypeRender>(this IMauiHandlersCollection handlersCollection)
+			where TType : IFrameworkElement
+			where TTypeRender : IViewHandler
+		{
+			handlersCollection.AddTransient(typeof(TType), typeof(TTypeRender));
+			return handlersCollection;
+		}
 	}
 }
diff --git a/src/Core/src/Hosting/StartupExtensions.cs b/src/Core/src/Hosting/StartupExtensions.cs
@@ -7,7 +7,7 @@ public static IAppHostBuilder CreateAppHostBuilder(this IStartup startup)
 			if (startup is IAppHostBuilderStartup hostBuilderStartup)
 				return hostBuilderStartup.CreateAppHostBuilder();
 
-			return AppHostBuilder.CreateDefaultAppBuilder();
+			return AppHost.CreateDefaultBuilder();
 		}
 
 		public static IAppHostBuilder ConfigureUsing(this IAppHostBuilder appHostBuilder, IStartup startup)

diff --git a/src/Core/src/HotReload/AppHostBuilderExtensions.cs b/src/Core/src/HotReload/AppHostBuilderExtensions.cs
@@ -0,0 +1,66 @@
+#nullable enable
+using System;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Maui.HotReload;
+
+namespace Microsoft.Maui.Hosting
+{
+	public static partial class AppHostBuilderExtensions
+	{
+		public static IAppHostBuilder EnableHotReload(this IAppHostBuilder builder, string? ideIp = null, int idePort = 9988)
+		{
+			builder.ConfigureServices<HotReloadBuilder>(hotReload =>
+			{
+				hotReload.IdeIp = ideIp;
+				hotReload.IdePort = idePort;
+			});
+			return builder;
+		}
+
+		class HotReloadBuilder : IMauiServiceBuilder
+		{
+			public string? IdeIp { get; set; }
+
+			public int IdePort { get; set; } = 9988;
+
+			public void ConfigureServices(HostBuilderContext context, IServiceCollection services)
+			{
+			}
+
+			public async void Configure(HostBuilderContext context, IServiceProvider services)
+			{
+				var handlers = services.GetRequiredService<IMauiHandlersServiceProvider>();
+				if (handlers is IHotReloadableHandlersServiceProvider hotReloadable)
+					MauiHotReloadHelper.Init(hotReloadable.GetCollection());
+				else
+					throw new NotSupportedException($"Hot Reload only works with a {nameof(IHotReloadableHandlersServiceProvider)}.");
+
+				Reloadify.Reload.Instance.ReplaceType = (d) =>
+				{
+					MauiHotReloadHelper.RegisterReplacedView(d.ClassName, d.Type);
+				};
+
+				Reloadify.Reload.Instance.FinishedReload = () =>
+				{
+					MauiHotReloadHelper.TriggerReload();
+				};
+
+				await Task.Run(async () =>
+				{
+					try
+					{
+						var success = await Reloadify.Reload.Init(IdeIp, IdePort);
+
+						Console.WriteLine($"HotReload Initialize: {success}");
+					}
+					catch (Exception ex)
+					{
+						Console.WriteLine(ex);
+					}
+				});
+			}
+		}
+	}
+}
diff --git a/src/Core/src/HotReload/HotReloadHelper.cs b/src/Core/src/HotReload/HotReloadHelper.cs
@@ -11,9 +11,9 @@ namespace Microsoft.Maui.HotReload
 {
 	public static class MauiHotReloadHelper
 	{
-		static IMauiServiceCollection? HandlerService;
+		static IMauiHandlersCollection? HandlerService;
 		//static IMauiHandlersServiceProvider? HandlerServiceProvider;
-		public static void Init(IMauiServiceCollection handlerService)
+		public static void Init(IMauiHandlersCollection handlerService)
 		{
 			HandlerService = handlerService;
 			//HandlerServiceProvider = new MauiHandlersServiceProvider(handlerService);
@@ -148,7 +148,7 @@ static void RegisterHandler(KeyValuePair<Type, Type> pair, Type newHandler)
 			var newType = newHandler;
 			if (pair.Value.IsGenericType)
 				newType = pair.Value.GetGenericTypeDefinition().MakeGenericType(newHandler);
-			HandlerService.AddTransient(view, newType);
+			HandlerService.AddHandler(view, newType);
 		}
 
 		public static void TriggerReload()

diff --git a/src/Core/src/HotReload/IHotReloadableHandlersServiceProvider.cs b/src/Core/src/HotReload/IHotReloadableHandlersServiceProvider.cs
@@ -0,0 +1,10 @@
+#nullable enable
+using Microsoft.Maui.Hosting;
+
+namespace Microsoft.Maui.HotReload
+{
+	public interface IHotReloadableHandlersServiceProvider : IMauiHandlersServiceProvider
+	{
+		IMauiHandlersCollection GetCollection();
+	}
+}
diff --git a/src/Core/tests/Benchmarks/Benchmarks/GetHandlersBenchmarker.cs b/src/Core/tests/Benchmarks/Benchmarks/GetHandlersBenchmarker.cs
@@ -16,8 +16,8 @@ public class GetHandlersBenchmarker
 		[GlobalSetup(Target = nameof(GetHandlerUsingDI))]
 		public void SetupForDI()
 		{
-			_host = AppHostBuilder
-				.CreateDefaultAppBuilder()
+			_host = AppHost
+				.CreateDefaultBuilder()
 				.Build();
 		}