AddBlazorR3 more feature

Cysharp · Mar 4, 2024 · 661b27a · 661b27a
1 parent 6bbac38
commit 661b27a
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/src/R3.Blazor/ObservableSystemInitializationService.cs b/src/R3.Blazor/ObservableSystemInitializationService.cs
@@ -4,28 +4,38 @@ public static class BlazorR3Extensions
 {
     public static IServiceCollection AddBlazorR3(this IServiceCollection services)
     {
-        services.AddHttpContextAccessor();
-        services.AddScoped<TimeProvider>(_ => new SynchronizationContextTimeProvider());
-        services.AddHostedService<ObservableSystemInitializationService>();
+        return AddBlazorR3(services, _ => new SynchronizationContextTimeProvider(), null!);
+    }
 
-        return services;
+    public static IServiceCollection AddBlazorR3(this IServiceCollection services, Action<Exception> unhandledExceptionHandler)
+    {
+        return AddBlazorR3(services, _ => new SynchronizationContextTimeProvider(), unhandledExceptionHandler);
     }
 
     public static IServiceCollection AddBlazorR3(this IServiceCollection services, Func<IServiceProvider, TimeProvider> timeProviderFactory)
+    {
+        return AddBlazorR3(services, timeProviderFactory, null!);
+    }
+
+    public static IServiceCollection AddBlazorR3(this IServiceCollection services, Func<IServiceProvider, TimeProvider> timeProviderFactory, Action<Exception> unhandledExceptionHandler)
     {
         services.AddHttpContextAccessor();
         services.AddScoped<TimeProvider>(timeProviderFactory);
-        services.AddHostedService<ObservableSystemInitializationService>();
+        services.AddHostedService(sp => new ObservableSystemInitializationService(sp.GetRequiredService<IHttpContextAccessor>(), unhandledExceptionHandler));
 
         return services;
     }
 }
 
-public sealed class ObservableSystemInitializationService(IHttpContextAccessor accessor) : IHostedService
+public sealed class ObservableSystemInitializationService(IHttpContextAccessor accessor, Action<Exception>? unhandledExceptionHandler) : IHostedService
 {
     public Task StartAsync(CancellationToken cancellationToken)
     {
         ObservableSystem.RegisterServiceProvider(() => accessor.HttpContext!.RequestServices);
+        if (unhandledExceptionHandler != null)
+        {
+            ObservableSystem.RegisterUnhandledExceptionHandler(unhandledExceptionHandler);
+        }
         return Task.CompletedTask;
     }