Fix live reload

Author: Mpdreamz

src/tooling/docs-builder/Http/DocumentationWebHost.cs

@@ -34,11 +34,13 @@ public DocumentationWebHost(ILoggerFactory logFactory, string? path, int port, I
 	{
 		_writeFileSystem = writeFs;
 		var builder = WebApplication.CreateSlimBuilder();
-		DocumentationTooling.CreateServiceCollection(builder.Services, LogLevel.Warning);
+		DocumentationTooling.CreateServiceCollection(builder.Services, LogLevel.Information);
 
 		_ = builder.Logging
 			.AddFilter("Microsoft.AspNetCore.Hosting.Diagnostics", LogLevel.Error)
 			.AddFilter("Microsoft.AspNetCore.StaticFiles.StaticFileMiddleware", LogLevel.Error)
+			.AddFilter("Microsoft.AspNetCore.Routing.EndpointMiddleware", LogLevel.Warning)
+			.AddFilter("Microsoft.AspNetCore.Http.Result.ContentResult", LogLevel.Warning)
 			.AddFilter("Microsoft.Hosting.Lifetime", LogLevel.Information);
 
 		var collector = new LiveModeDiagnosticsCollector(logFactory);
@@ -92,7 +94,6 @@ private void SetUpRoutes()
 		_ = _webApplication
 			.UseLiveReloadWithManualScriptInjection(_webApplication.Lifetime)
 			.UseDeveloperExceptionPage(new DeveloperExceptionPageOptions())
-			//.UseMiddleware<NoInjectLiveReloadMiddleware>()
 			.UseStaticFiles(
 				new StaticFileOptions
 				{

src/tooling/docs-builder/Http/LiveReload.cs

@@ -23,8 +23,7 @@ namespace Westwind.AspNetCore.LiveReload;
 [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL3050:RequiresDynamicCode", Justification = "Manually verified")]
 public static class LiveReloadMiddlewareExtensions
 {
-	public static IServiceCollection AddAotLiveReload(this IServiceCollection services,
-		Action<LiveReloadConfiguration> configAction)
+	public static IServiceCollection AddAotLiveReload(this IServiceCollection services, Action<LiveReloadConfiguration> configAction)
 	{
 
 		var provider = services.BuildServiceProvider();
@@ -68,9 +67,9 @@ public static IApplicationBuilder UseLiveReloadWithManualScriptInjection(this IA
 
 		if (config.LiveReloadEnabled)
 		{
-			var webSocketOptions = new WebSocketOptions()
+			var webSocketOptions = new WebSocketOptions
 			{
-				KeepAliveInterval = TimeSpan.FromSeconds(300),
+				KeepAliveInterval = TimeSpan.FromSeconds(300)
 			};
 			_ = builder.UseWebSockets(webSocketOptions);
 
@@ -80,7 +79,6 @@ public static IApplicationBuilder UseLiveReloadWithManualScriptInjection(this IA
 					var middleWare = new NoInjectLiveReloadMiddleware(next, webApplicationLifetime);
 					return middleWare.InvokeAsync(context);
 				});
-			LiveReloadFileWatcher.StartFileWatcher();
 
 			// always refresh when the server restarts...
 			_ = LiveReloadMiddleware.RefreshWebSocketRequest();

src/tooling/docs-builder/Http/ReloadGeneratorService.cs

@@ -4,13 +4,11 @@
 
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
+using Westwind.AspNetCore.LiveReload;
 
 namespace Documentation.Builder.Http;
 
-public sealed class ReloadGeneratorService(
-	ReloadableGeneratorState reloadableGenerator,
-	ILogger<ReloadGeneratorService> logger) : IHostedService,
-	IDisposable
+public sealed class ReloadGeneratorService(ReloadableGeneratorState reloadableGenerator, ILogger<ReloadGeneratorService> logger) : IHostedService, IDisposable
 {
 	private FileSystemWatcher? _watcher;
 	private ReloadableGeneratorState ReloadableGenerator { get; } = reloadableGenerator;
@@ -23,7 +21,9 @@ public async Task StartAsync(Cancel cancellationToken)
 	{
 		await ReloadableGenerator.ReloadAsync(cancellationToken);
 
-		var watcher = new FileSystemWatcher(ReloadableGenerator.Generator.DocumentationSet.SourceDirectory.FullName)
+		var directory = ReloadableGenerator.Generator.DocumentationSet.SourceDirectory.FullName;
+		Logger.LogInformation("Start file watch on: {Directory}", directory);
+		var watcher = new FileSystemWatcher(directory)
 		{
 			NotifyFilter = NotifyFilters.Attributes
 							| NotifyFilters.CreationTime
@@ -50,10 +50,11 @@ public async Task StartAsync(Cancel cancellationToken)
 	private void Reload() =>
 		_ = _debouncer.ExecuteAsync(async ctx =>
 		{
-			Logger.LogInformation("Reload due to changes!");
 			await ReloadableGenerator.ReloadAsync(ctx);
 			Logger.LogInformation("Reload complete!");
-		}, default);
+
+			_ = LiveReloadMiddleware.RefreshWebSocketRequest();
+		}, Cancel.None);
 
 	public Task StopAsync(Cancel cancellationToken)
 	{
@@ -66,26 +67,27 @@ private void OnChanged(object sender, FileSystemEventArgs e)
 		if (e.ChangeType != WatcherChangeTypes.Changed)
 			return;
 
+		Logger.LogInformation("Changed: {FullPath}", e.FullPath);
+
 		if (e.FullPath.EndsWith("docset.yml"))
 			Reload();
 		if (e.FullPath.EndsWith(".md"))
 			Reload();
 
-		Logger.LogInformation("Changed: {FullPath}", e.FullPath);
 	}
 
 	private void OnCreated(object sender, FileSystemEventArgs e)
 	{
+		Logger.LogInformation("Created: {FullPath}", e.FullPath);
 		if (e.FullPath.EndsWith(".md"))
 			Reload();
-		Logger.LogInformation("Created: {FullPath}", e.FullPath);
 	}
 
 	private void OnDeleted(object sender, FileSystemEventArgs e)
 	{
+		Logger.LogInformation("Deleted: {FullPath}", e.FullPath);
 		if (e.FullPath.EndsWith(".md"))
 			Reload();
-		Logger.LogInformation("Deleted: {FullPath}", e.FullPath);
 	}
 
 	private void OnRenamed(object sender, RenamedEventArgs e)