Refactor the TinyEventBus

dotnetcore · Sep 11, 2024 · 05c468b · 05c468b
1 parent 12286f0
commit 05c468b
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 56 deletions.
diff --git a/src/AgileConfig.Server.Common/EventBus/ITinyEventBus.cs b/src/AgileConfig.Server.Common/EventBus/ITinyEventBus.cs
@@ -1,5 +1,4 @@
 using System.Threading.Tasks;
-using System;
 
 namespace AgileConfig.Server.Common.EventBus
 {

diff --git a/src/AgileConfig.Server.Common/EventBus/ServiceCollectionExt.cs b/src/AgileConfig.Server.Common/EventBus/ServiceCollectionExt.cs
@@ -8,6 +8,7 @@ public static IServiceCollection AddTinyEventBus(this IServiceCollection sc)
         {
             sc.AddSingleton<ITinyEventBus, TinyEventBus>(sp => 
                 new TinyEventBus(sc));
+
             return sc;
         }
     }

diff --git a/src/AgileConfig.Server.Common/EventBus/TinyEventBus.cs b/src/AgileConfig.Server.Common/EventBus/TinyEventBus.cs
@@ -11,65 +11,68 @@ namespace AgileConfig.Server.Common.EventBus
     public class TinyEventBus : ITinyEventBus
     {
         private readonly IServiceCollection _serviceCollection;
-        private readonly static ConcurrentDictionary<Type, List<Type>> _eventHandlerMap = new ConcurrentDictionary<Type, List<Type>>();
+        private static readonly ConcurrentDictionary<Type, List<Type>> EventHandlerMap = new ();
+        private IServiceProvider _localServiceProvider;
+        private ILogger _logger;
 
         public TinyEventBus(IServiceCollection serviceCollection)
         {
-            this._serviceCollection = serviceCollection;
+            _serviceCollection = serviceCollection;
+            _logger = _serviceCollection.BuildServiceProvider().GetService<ILoggerFactory>().CreateLogger<TinyEventBus>();
         }
         public void Register<T>() where T : class, IEventHandler
         {
             var handlerType = typeof(T);
-            var eventType = handlerType.GetInterfaces().FirstOrDefault(x => x.IsGenericType).GenericTypeArguments.FirstOrDefault();
-            if (_eventHandlerMap.TryGetValue(eventType, out List<Type> handlerTypes))
+            var eventType = handlerType.GetInterfaces().FirstOrDefault(x => x.IsGenericType)!.GenericTypeArguments.FirstOrDefault();
+            if (EventHandlerMap.TryGetValue(eventType, out List<Type> handlerTypes))
             {
                 handlerTypes.Add(handlerType);
             }
             else
             {
-                _eventHandlerMap.TryAdd(eventType, new List<Type> {
+                EventHandlerMap.TryAdd(eventType, new List<Type> {
                     handlerType
                 });
             }
             _serviceCollection.AddScoped<T>();
 
         }
 
+        /// <summary>
+        /// Trigger an event. This method must be called before the handler is registered.
+        /// </summary>
+        /// <typeparam name="TEvent"></typeparam>
+        /// <param name="evt"></param>
         public void Fire<TEvent>(TEvent evt) where TEvent : IEvent
         {
-            var sp = _serviceCollection.BuildServiceProvider();
-            using var scope = sp.CreateScope();
-            var logger = scope.ServiceProvider.GetService<ILoggerFactory>().CreateLogger<TinyEventBus>();
+            _localServiceProvider ??= _serviceCollection.BuildServiceProvider();
 
-            logger.LogInformation($"Event fired: {typeof(TEvent).Name}");
+            _logger.LogInformation($"Event fired: {typeof(TEvent).Name}");
 
             var eventType = typeof(TEvent);
-            if (_eventHandlerMap.TryGetValue(eventType, out List<Type> handlers))
+            if (EventHandlerMap.TryGetValue(eventType, out List<Type> handlers))
             {
                 if (handlers.Count == 0)
                 {
-                    logger.LogInformation($"Event fired: {typeof(TEvent).Name}, but no handlers.");
+                    _logger.LogInformation($"Event fired: {typeof(TEvent).Name}, but no handlers.");
                     return;
                 }
 
                 foreach (var handlerType in handlers)
                 {
                     _ = Task.Run(async () =>
                     {
-                        using var sc = sp.CreateScope();
+                        using var sc = _localServiceProvider.CreateScope();
                         var handler = sc.ServiceProvider.GetService(handlerType);
-                        if (handler != null)
+
+                        try
                         {
-                            var handlerInstance = handler as IEventHandler;
-                            try
-                            {
-                                await handlerInstance.Handle(evt);
-                            }
-                            catch (Exception ex)
-                            {
-                                sc.ServiceProvider.GetService<ILoggerFactory>().CreateLogger<TinyEventBus>()
-                                    .LogError(ex, "try run {handler} occur error.", handlerType);
-                            }
+                            await (handler as IEventHandler)?.Handle(evt)!;
+                        }
+                        catch (Exception ex)
+                        {
+                            _logger
+                                .LogError(ex, "try run {handler} occur error.", handlerType);
                         }
                     });
                 }

diff --git a/src/AgileConfig.Server.Service/EventRegisterService/SystemEventHandlersRegister.cs b/src/AgileConfig.Server.Service/EventRegisterService/SystemEventHandlersRegister.cs
@@ -4,39 +4,32 @@
 
 namespace AgileConfig.Server.Service.EventRegisterService;
 
-public class SystemEventHandlersRegister : IEventHandlerRegister
+public class SystemEventHandlersRegister(ITinyEventBus tinyEventBus) : IEventHandlerRegister
 {
-    private readonly ITinyEventBus _tinyEventBus;
-
-    public SystemEventHandlersRegister(ITinyEventBus tinyEventBus)
-    {
-        _tinyEventBus = tinyEventBus;
-    }
-
     public void Register()
     {
-        _tinyEventBus.Register<LoginEventHandler>();
-        _tinyEventBus.Register<InitSaPasswordEventHandler>();
-        _tinyEventBus.Register<ResetUserPasswordEventHandler>();
-        _tinyEventBus.Register<ChangeUserPasswordEventHandler>();
-        _tinyEventBus.Register<AddAppEventHandler>();
-        _tinyEventBus.Register<EditAppEventHandler>();
-        _tinyEventBus.Register<DisableOrEnableAppEventHandler>();
-        _tinyEventBus.Register<DeleteAppEventHandler>();
-        _tinyEventBus.Register<AddConfigEventHandler>();
-        _tinyEventBus.Register<EditConfigEventHandler>();
-        _tinyEventBus.Register<DeleteConfigEventHandler>();
-        _tinyEventBus.Register<DeleteSomeConfigEventHandler>();
-        _tinyEventBus.Register<PublishConfigEventHandler>();
-        _tinyEventBus.Register<RollbackConfigEventHandler>();
-        _tinyEventBus.Register<DisContectClientEventHandler>();
-        _tinyEventBus.Register<RegisterAServiceEventHandler>();
-        _tinyEventBus.Register<UnRegisterAServiceEventHandler>();
-        _tinyEventBus.Register<AddNodeEventHandler>();
-        _tinyEventBus.Register<DeleteNodeEventHandler>();
-        _tinyEventBus.Register<AddUserEventHandler>();
-        _tinyEventBus.Register<EditUserEventHandler>();
-        _tinyEventBus.Register<DeleteUserEventHandler>();
+        tinyEventBus.Register<LoginEventHandler>();
+        tinyEventBus.Register<InitSaPasswordEventHandler>();
+        tinyEventBus.Register<ResetUserPasswordEventHandler>();
+        tinyEventBus.Register<ChangeUserPasswordEventHandler>();
+        tinyEventBus.Register<AddAppEventHandler>();
+        tinyEventBus.Register<EditAppEventHandler>();
+        tinyEventBus.Register<DisableOrEnableAppEventHandler>();
+        tinyEventBus.Register<DeleteAppEventHandler>();
+        tinyEventBus.Register<AddConfigEventHandler>();
+        tinyEventBus.Register<EditConfigEventHandler>();
+        tinyEventBus.Register<DeleteConfigEventHandler>();
+        tinyEventBus.Register<DeleteSomeConfigEventHandler>();
+        tinyEventBus.Register<PublishConfigEventHandler>();
+        tinyEventBus.Register<RollbackConfigEventHandler>();
+        tinyEventBus.Register<DisContectClientEventHandler>();
+        tinyEventBus.Register<RegisterAServiceEventHandler>();
+        tinyEventBus.Register<UnRegisterAServiceEventHandler>();
+        tinyEventBus.Register<AddNodeEventHandler>();
+        tinyEventBus.Register<DeleteNodeEventHandler>();
+        tinyEventBus.Register<AddUserEventHandler>();
+        tinyEventBus.Register<EditUserEventHandler>();
+        tinyEventBus.Register<DeleteUserEventHandler>();
 
     }
 }
diff --git a/test/AgileConfig.Server.ServiceTests/mysql/SysLogServiceTests.cs b/test/AgileConfig.Server.ServiceTests/mysql/SysLogServiceTests.cs
@@ -4,9 +4,7 @@
 using System.Threading.Tasks;
 using System;
 using Testcontainers.MySql;
-using System.Data;
 using AgileConfig.Server.Data.Entity;
-using Microsoft.Extensions.Configuration;
 
 namespace AgileConfig.Server.ServiceTests.mysql
 {
-Original file line number
+Diff line change
@@ Expand Up @@
             {
                 sc.AddSingleton<ITinyEventBus, TinyEventBus>(sp =>
                     new TinyEventBus(sc));
                 return sc;
             }
         }
@@ Expand Down @@