💾 Feat(ConfigManager): 重构配置管理，提取公共属性更新逻辑至 ApplyConfig 方法

💾 Feat(EventService): 引入类型化事件处理器，优化事件订阅与取消逻辑
💾 Feat(WorkflowScriptService): 初始化 BlockScriptParser 时注册内置函数

Author: StardustSeemsInk

KitX Clients/KitX Core/KitX.Core/Configuration/ConfigManager.cs

@@ -210,14 +210,7 @@ private void ReloadConfigFile<T>(string fileName) where T : class
         if (config != null)
         {
             _configs[typeof(T).Name] = config;
-
-            // Update the public properties
-            if (typeof(T) == typeof(AppConfig))
-                AppConfig = config as IAppConfig ?? new AppConfig();
-            else if (typeof(T) == typeof(PluginsConfig))
-                PluginsConfig = config as IPluginsConfig ?? new PluginsConfig();
-            else if (typeof(T) == typeof(SecurityConfig))
-                SecurityConfig = config as ISecurityConfig ?? new SecurityConfig();
+            ApplyConfig(config);
 
             Log.Information("Reloaded config file {FileName}", fileName);
         }
@@ -365,14 +358,7 @@ public void Reload()
                 if (config != null)
                 {
                     _configs[typeof(T).Name] = config;
-
-                    // Update the public properties
-                    if (typeof(T) == typeof(AppConfig))
-                        AppConfig = config as IAppConfig ?? new AppConfig();
-                    else if (typeof(T) == typeof(PluginsConfig))
-                        PluginsConfig = config as IPluginsConfig ?? new PluginsConfig();
-                    else if (typeof(T) == typeof(SecurityConfig))
-                        SecurityConfig = config as ISecurityConfig ?? new SecurityConfig();
+                    ApplyConfig(config);
                 }
             }
             else
@@ -383,14 +369,7 @@ public void Reload()
 
                 // Save default config
                 SaveConfigFile(config, fileName);
-
-                // Update the public properties
-                if (typeof(T) == typeof(AppConfig))
-                    AppConfig = config as IAppConfig ?? new AppConfig();
-                else if (typeof(T) == typeof(PluginsConfig))
-                    PluginsConfig = config as IPluginsConfig ?? new PluginsConfig();
-                else if (typeof(T) == typeof(SecurityConfig))
-                    SecurityConfig = config as ISecurityConfig ?? new SecurityConfig();
+                ApplyConfig(config);
             }
         }
         catch (Exception ex)
@@ -399,6 +378,19 @@ public void Reload()
         }
     }
 
+    /// <summary>
+    /// Updates the public config properties based on the config object's type
+    /// </summary>
+    private void ApplyConfig(object config)
+    {
+        if (config is IAppConfig appConfig)
+            AppConfig = appConfig;
+        else if (config is IPluginsConfig pluginsConfig)
+            PluginsConfig = pluginsConfig;
+        else if (config is ISecurityConfig securityConfig)
+            SecurityConfig = securityConfig;
+    }
+
     /// <summary>
     /// Saves config file
     /// </summary>

KitX Clients/KitX Core/KitX.Core/Event/EventService.cs

@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Threading;
 using KitX.Core.Contract.Event;
-using KitX.Shared.CSharp.Device;
 using Serilog;
 
 namespace KitX.Core.Event;
@@ -27,6 +25,11 @@ public class EventService : IEventService
     /// </summary>
     private readonly object _lock = new();
 
+    /// <summary>
+    /// Maps (eventName, originalHandler) to wrapper lambda for typed subscribe/unsubscribe
+    /// </summary>
+    private readonly Dictionary<(string eventName, Delegate handler), EventHandler<EventArgs>> _typedWrapperMap = new();
+
     /// <summary>
     /// Thread-local counter to track publish depth for recursion detection
     /// </summary>
@@ -95,12 +98,18 @@ public void Publish(string eventName, EventArgs args)
 
         try
         {
-            if (_eventHandlers.TryGetValue(eventName, out var handlers))
+            // Take a snapshot of handlers under lock to avoid concurrent modification
+            List<EventHandler<EventArgs>> snapshot;
+            lock (_lock)
             {
-                foreach (var handler in handlers)
-                {
-                    handler.Invoke(this, args);
-                }
+                if (!_eventHandlers.TryGetValue(eventName, out var handlers))
+                    return;
+                snapshot = new List<EventHandler<EventArgs>>(handlers);
+            }
+
+            foreach (var handler in snapshot)
+            {
+                handler.Invoke(this, args);
             }
         }
         finally
@@ -125,13 +134,16 @@ public void Subscribe<TEventArgs>(string eventName, EventHandler<TEventArgs> han
                 _eventHandlers[eventName] = new List<EventHandler<EventArgs>>();
             }
 
-            _eventHandlers[eventName].Add((sender, args) =>
+            EventHandler<EventArgs> wrapper = (sender, args) =>
             {
                 if (args is TEventArgs typedArgs)
                 {
                     handler(sender, typedArgs);
                 }
-            });
+            };
+
+            _typedWrapperMap[(eventName, handler)] = wrapper;
+            _eventHandlers[eventName].Add(wrapper);
         }
     }
 
@@ -144,11 +156,17 @@ public void Subscribe<TEventArgs>(string eventName, EventHandler<TEventArgs> han
     public void Unsubscribe<TEventArgs>(string eventName, EventHandler<TEventArgs> handler)
         where TEventArgs : EventArgs
     {
-        if (_eventHandlers.TryGetValue(eventName, out var handlers))
+        lock (_lock)
         {
-            // Note: Exact handler removal is not supported in this implementation
-            // The handler wrapper makes exact matching difficult
-            // Consider using a different approach for production
+            var key = (eventName, handler);
+            if (_typedWrapperMap.TryGetValue(key, out var wrapper))
+            {
+                if (_eventHandlers.TryGetValue(eventName, out var handlers))
+                {
+                    handlers.Remove(wrapper);
+                }
+                _typedWrapperMap.Remove(key);
+            }
         }
     }
 
@@ -165,135 +183,4 @@ public void Publish<TEventArgs>(string eventName, TEventArgs args)
         Publish(eventName, (EventArgs)args);
     }
 
-    /// <summary>
-    /// Invokes a static event dynamically (legacy support)
-    /// </summary>
-    /// <param name="eventName">The event name</param>
-    /// <param name="objects">Optional parameters</param>
-    [Obsolete("Use IEventService.Publish with event names instead")]
-    public static void Invoke(string eventName, object[]? objects = null)
-    {
-        var type = typeof(EventService);
-
-        var eventField = type.GetField(eventName, System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic);
-
-        if (eventField is null || !typeof(Delegate).IsAssignableFrom(eventField.FieldType))
-        {
-            throw new ArgumentException($"No event found with the name '{eventName}'.", nameof(eventName));
-        }
-
-        var @delegate = eventField.GetValue(null) as Delegate;
-
-        @delegate?.DynamicInvoke(objects);
-    }
-
-    #region Static Events (Legacy Support)
-
-#pragma warning disable CS0067 // Event is never used
-
-    /// <summary>
-    /// Language changed event
-    /// </summary>
-    [Obsolete("Use IEventService with EventNames.LanguageChanged instead")]
-    public static event Action LanguageChanged = () => { };
-
-    /// <summary>
-    /// Greeting text interval updated event
-    /// </summary>
-    [Obsolete("Use IEventService with EventNames.GreetingTextIntervalUpdated instead")]
-    public static event Action GreetingTextIntervalUpdated = () => { };
-
-    /// <summary>
-    /// App config changed event
-    /// </summary>
-    [Obsolete("Use IEventService with EventNames.AppConfigChanged instead")]
-    public static event Action AppConfigChanged = () => { };
-
-    /// <summary>
-    /// Plugins config changed event
-    /// </summary>
-    [Obsolete("Use IEventService with EventNames.PluginsConfigChanged instead")]
-    public static event Action PluginsConfigChanged = () => { };
-
-    /// <summary>
-    /// Mica opacity changed event
-    /// </summary>
-    [Obsolete("Use IEventService with EventNames.MicaOpacityChanged instead")]
-    public static event Action MicaOpacityChanged = () => { };
-
-    /// <summary>
-    /// Develop settings changed event
-    /// </summary>
-    [Obsolete("Use IEventService with EventNames.DevelopSettingsChanged instead")]
-    public static event Action DevelopSettingsChanged = () => { };
-
-    /// <summary>
-    /// Log config updated event
-    /// </summary>
-    [Obsolete("Use IEventService with EventNames.LogConfigUpdated instead")]
-    public static event Action LogConfigUpdated = () => { };
-
-    /// <summary>
-    /// Theme config changed event
-    /// </summary>
-    [Obsolete("Use IEventService with EventNames.ThemeConfigChanged instead")]
-    public static event Action ThemeConfigChanged = () => { };
-
-    /// <summary>
-    /// Use statistics changed event
-    /// </summary>
-    [Obsolete("Use IEventService with EventNames.UseStatisticsChanged instead")]
-    public static event Action UseStatisticsChanged = () => { };
-
-    /// <summary>
-    /// Devices server port changed event
-    /// </summary>
-    [Obsolete("Use IEventService with EventNames.DevicesServerPortChanged instead")]
-    public static event Action<int> DevicesServerPortChanged = port => { };
-
-    /// <summary>
-    /// Plugins server port changed event
-    /// </summary>
-    [Obsolete("Use IEventService with EventNames.PluginsServerPortChanged instead")]
-    public static event Action<int> PluginsServerPortChanged = port => { };
-
-    /// <summary>
-    /// Activities updated event
-    /// </summary>
-    [Obsolete("Use IEventService with EventNames.OnActivitiesUpdated instead")]
-    public static event Action OnActivitiesUpdated = () => { };
-
-    /// <summary>
-    /// Receive cancel exchanging device key event
-    /// </summary>
-    [Obsolete("Use IEventService with EventNames.OnReceiveCancelExchangingDeviceKey instead")]
-    public static event Action OnReceiveCancelExchangingDeviceKey = () => { };
-
-    /// <summary>
-    /// Exiting event
-    /// </summary>
-    [Obsolete("Use IEventService with EventNames.OnExiting instead")]
-    public static event Action OnExiting = () => { };
-
-    /// <summary>
-    /// Receiving device info event
-    /// </summary>
-    [Obsolete("Use IEventService with EventNames.OnReceivingDeviceInfo instead")]
-    public static event Action<DeviceInfo> OnReceivingDeviceInfo = _ => { };
-
-    /// <summary>
-    /// Config hot reloaded event
-    /// </summary>
-    [Obsolete("Use IEventService with EventNames.OnConfigHotReloaded instead")]
-    public static event Action OnConfigHotReloaded = () => { };
-
-    /// <summary>
-    /// Accepting device key event
-    /// </summary>
-    [Obsolete("Use IEventService with EventNames.OnAcceptingDeviceKey instead")]
-    public static event Action<string> OnAcceptingDeviceKey = _ => { };
-
-#pragma warning restore CS0067 // Event is never used
-
-    #endregion
 }

KitX Clients/KitX Core/KitX.Core/Workflow/WorkflowScriptService.cs

@@ -15,6 +15,7 @@
 using Kscript.CSharp.Parser;
 using KitX.Core.Contract.Workflow;
 using KitX.Core.Device;
+using KitX.Core.Workflow.BlockScripting;
 using KitX.Shared.CSharp.Plugin;
 using Serilog;
 using CTask = System.Threading.Tasks.Task;
@@ -689,7 +690,8 @@ public string MergeHelperFunctions(string mainCode, List<HelperFunction> helperF
     /// Gets the block script parser
     /// </summary>
     private BlockScripting.BlockScriptParser BlockScriptParser =>
-        _blockScriptParser ??= new BlockScripting.BlockScriptParser();
+        _blockScriptParser ??= new BlockScripting.BlockScriptParser(
+            BuiltinFunctionRegistry.Discover(typeof(BuiltinFunctionRegistry).Assembly));
 
     /// <summary>
     /// Gets the block script executor (initialized with plugin manager)