add config store

2024-07-26 08:11:21 +08:00
parent 82f7e0fc00
commit 929ddaced3
21 changed files with 302 additions and 153 deletions
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using MQTTnet;
+using MQTTnet.Protocol;
+
+namespace SimApi;
+
+public partial class Synapse
+{
+    public event EventHandler<ConfigStoreItem>? OnConfigChanged;
+    private Dictionary<string, string> CurrentConfig { get; } = new();
+
+    private bool FireSetConfig(string key, string value)
+    {
+        var topic = $"{Options.SysName}/synapse-config-store/{key}";
+        var message = new MqttApplicationMessageBuilder()
+            .WithTopic(topic)
+            .WithPayload(value)
+            .WithRetainFlag()
+            .Build();
+        if (!Client!.IsConnected) return false;
+        Client!.PublishAsync(message, CancellationToken.None).Wait();
+        logger.LogDebug("Synapse Config Set: {Config} => {Data}", key, value);
+        return true;
+    }
+
+    private string? FireGetConfig(string key)
+    {
+        return CurrentConfig.GetValueOrDefault(key);
+    }
+
+    private void RunConfigStoreServer()
+    {
+        var csTopicPrefix = $"{Options.SysName}/synapse-config-store/";
+        var eventSubOpts = MqttFactory.CreateSubscribeOptionsBuilder()
+            .WithTopicFilter(o =>
+                o.WithTopic($"{csTopicPrefix}+").WithRetainHandling(MqttRetainHandling.SendAtSubscribe))
+            .Build();
+        Client!.ApplicationMessageReceivedAsync += e =>
+        {
+            if (!e.ApplicationMessage.Topic.StartsWith(csTopicPrefix)) return Task.CompletedTask;
+            var reqBody = e.ApplicationMessage.ConvertPayloadToString();
+            var eventName = e.ApplicationMessage.Topic.Replace(csTopicPrefix, string.Empty);
+            CurrentConfig[eventName] = reqBody;
+            OnConfigChanged?.Invoke(this, new ConfigStoreItem(eventName, reqBody));
+            logger.LogDebug("Synapse Config Changed: {Config} => {Data}", eventName, reqBody);
+            return Task.CompletedTask;
+        };
+        Client.SubscribeAsync(eventSubOpts).Wait();
+    }
+
+    public record ConfigStoreItem(string Key, string Value);
+}
@@ -8,18 +8,26 @@ namespace SimApi;

 public partial class Synapse
 {
-    private bool FireEvent(string eventName, object param, bool retain = false)
+    private bool FireEvent(string eventName, object? param)
    {
-        var paramJson = JsonSerializer.Serialize(param, SimApiUtil.JsonOption);
-        var topic = $"{Options.SysName}/{Options.AppName}/event/{eventName}";
+        string paramJson;
+        if (param is string strParam)
+        {
+            paramJson = strParam;
+        }
+        else
+        {
+            paramJson  = JsonSerializer.Serialize(param, SimApiUtil.JsonOption);
+        }
+        var topic = $"{Options.SysName}/event/{Options.AppName}/{eventName}";
        var message = new MqttApplicationMessageBuilder()
            .WithTopic(topic)
            .WithPayload(paramJson)
-            .WithRetainFlag(retain)
+            .WithRetainFlag(false)
            .Build();
        if (!Client!.IsConnected) return false;
-        Client!.PublishAsync(message, CancellationToken.None).Wait();
-        logger.LogDebug("Event Publish: {Event}@{App} {Json}", eventName, Options.AppName, paramJson);
+        Client.PublishAsync(message, CancellationToken.None).Wait();
+        logger.LogDebug("Synapse Event Publish: {Event}@{App} {Json}", eventName, Options.AppName, paramJson);
        return true;
    }
 }
@@ -1,11 +1,11 @@
 using System;
 using System.Linq;
 using System.Text.Json;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using MQTTnet;
-using MQTTnet.Protocol;
 using SimApi.Helpers;

 namespace SimApi;
@@ -14,36 +14,50 @@ public partial class Synapse
 {
    private void RunEventServer()
    {
-        var esTopicPrefix = $"{Options.SysName}/{Options.AppName}/event/";
-        var eventSubOpts = MqttFactory.CreateSubscribeOptionsBuilder()
-            .WithTopicFilter(o =>
-                o.WithTopic($"$queue/{esTopicPrefix}+").WithRetainHandling(MqttRetainHandling.SendAtSubscribe))
-            .Build();
-        Client.ApplicationMessageReceivedAsync += e =>
+        var esTopicPrefix = $"{Options.SysName}/event/";
+        Client!.ApplicationMessageReceivedAsync += e =>
        {
            if (!e.ApplicationMessage.Topic.StartsWith(esTopicPrefix)) return Task.CompletedTask;
            var reqBody = e.ApplicationMessage.ConvertPayloadToString();
            var eventName = e.ApplicationMessage.Topic.Replace(esTopicPrefix, string.Empty);
-            logger.LogDebug("Synapse Event Receive: {AppName}.{EventName}\n{Body}",
-                Options.AppName, eventName, reqBody);
+            logger.LogDebug("Synapse Event Receive: {EventName}\n{Body}", eventName, reqBody);
+            var methods = EventRegistry
+                .Where(x => Regex.IsMatch(eventName,
+                    "^" + Regex.Escape(x.Key!).Replace("\\+", "[^/]+").Replace("\\#", ".*") + "$"))
+                .ToArray();
+            foreach (var method in methods)
+            {
+                var callClass = sp.CreateScope().ServiceProvider.GetRequiredService(method.Class!);
+                var mt = callClass.GetType().GetMethod(method.Method!);
+                try
+                {
+                    if (mt!.GetParameters().Length == 2)
+                    {
+                        var pt = mt!.GetParameters()[0].ParameterType;
+                        mt.Invoke(callClass, pt == typeof(string)
+                            ? [eventName, reqBody]
+                            : [eventName, JsonSerializer.Deserialize(reqBody, pt, SimApiUtil.JsonOption)]);
+                    }
+                    else
+                    {
+                        mt.Invoke(callClass, [eventName]);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    logger.LogError("Synapse Event Processor Error: {Err}", ex.InnerException);
+                }
+            }

-            var method = EventRegistry.FirstOrDefault(x => x.Key == eventName);
-            if (method == null) return Task.CompletedTask;
-            var callClass = Sp.CreateScope().ServiceProvider.GetRequiredService(method!.Class);
-            var mt = callClass.GetType().GetMethod(method.Method);
-            var pt = mt!.GetParameters()[0].ParameterType;
-            try
-            {
-                mt.Invoke(callClass, pt == typeof(string)
-                    ? new object[] { reqBody }
-                    : new[] { JsonSerializer.Deserialize(reqBody, pt, SimApiUtil.JsonOption) });
-            }
-            catch (Exception ex)
-            {
-                logger.LogError("SynapseEvent Processor Error: {Err}", ex.InnerException);
-            }
            return Task.CompletedTask;
        };
-        Client.SubscribeAsync(eventSubOpts).Wait();
+        foreach (var ev in EventRegistry)
+        {
+            var topic = $"$queue/{esTopicPrefix}{ev.Key}";
+            var evSubOpts = MqttFactory.CreateSubscribeOptionsBuilder()
+                .WithTopicFilter(o => o.WithTopic(topic)).Build();
+            Client.SubscribeAsync(evSubOpts).Wait();
+            logger.LogDebug("Synapse Event Register Event Success: {EventName}\nFull Topic: {Topic}", ev.Key, topic);
+        }
    }
 }
@@ -19,7 +19,7 @@ public partial class Synapse
        var rcTopic = $"{Options.SysName}/{Options.AppName}/rpc/client/{Options.AppId}/";
        var rcSubOpts = MqttFactory.CreateSubscribeOptionsBuilder()
            .WithTopicFilter(o => o.WithTopic($"{rcTopic}+")).Build();
-        Client.ApplicationMessageReceivedAsync += e =>
+        Client!.ApplicationMessageReceivedAsync += e =>
        {
            if (!e.ApplicationMessage.Topic.StartsWith(rcTopic)) return Task.CompletedTask;
            var reqBody = e.ApplicationMessage.ConvertPayloadToString();
@@ -32,9 +32,18 @@ public partial class Synapse
        Client.SubscribeAsync(rcSubOpts).Wait();
    }

-    private string FireRpc(string app, string action, object param)
+    private string? FireRpc(string app, string action, object? param)
    {
-        var paramJson = JsonSerializer.Serialize(param, SimApiUtil.JsonOption);
+        string paramJson;
+        if (param is string strParam)
+        {
+            paramJson = strParam;
+        }
+        else
+        {
+            paramJson = JsonSerializer.Serialize(param, SimApiUtil.JsonOption);
+        }
+
        var topic = $"{Options.SysName}/{app}/rpc/server/{action}";
        var messageId = Guid.NewGuid().ToString();
        var tcs = new TaskCompletionSource<string>();
@@ -47,7 +56,7 @@ public partial class Synapse
            .WithRetainFlag(false)
            .Build();
        if (!Client!.IsConnected) return null;
-        Client!.PublishAsync(message, CancellationToken.None).Wait();
+        Client.PublishAsync(message, CancellationToken.None).Wait();
        logger.LogDebug(
            "Synapse RPC Client Request: ({PropsMessageId}) {OptionsAppName} -> {Action}@{App}\n{ParamJson}", messageId,
            Options.AppName, action, app, paramJson);
@@ -23,7 +23,7 @@ public partial class Synapse
            .WithTopicFilter(o =>
                o.WithTopic($"$queue/{rsTopicPrefix}+").WithRetainHandling(MqttRetainHandling.SendAtSubscribe))
            .Build();
-        Client.ApplicationMessageReceivedAsync += e =>
+        Client!.ApplicationMessageReceivedAsync += e =>
        {
            if (!e.ApplicationMessage.Topic.StartsWith(rsTopicPrefix)) return Task.CompletedTask;
            var reqBody = e.ApplicationMessage.ConvertPayloadToString();
@@ -33,19 +33,29 @@ public partial class Synapse
                "Synapse RPC Server Receive: ({BasicPropertiesMessageId}) {BasicPropertiesReplyTo} -> {BasicPropertiesType}@{OptionsAppName}\n{S}",
                e.ApplicationMessage.ContentType, appInfo[0], action, Options.AppName,
                reqBody);
-            var res = new SimApiBaseResponse(404, "method not found");
+            SimApiBaseResponse res;
            var method = RpcRegistry.FirstOrDefault(x => x.Key == action);
            if (method == null) return Task.CompletedTask;
-            var callClass = Sp.CreateScope().ServiceProvider.GetRequiredService(method.Class);
-            var mt = callClass.GetType().GetMethod(method.Method);
+            var callClass = sp.CreateScope().ServiceProvider.GetRequiredService(method.Class!);
+            var mt = callClass.GetType().GetMethod(method.Method!);
            try
            {
-                var pt = mt!.GetParameters()[0].ParameterType;
-                var param = pt == typeof(string)
-                    ? [reqBody]
-                    : new[] { JsonSerializer.Deserialize(reqBody, pt, SimApiUtil.JsonOption) };
-                var ret = mt.Invoke(callClass, param);
-                res = new SimApiBaseResponse<object>
+                var methodParams = mt!.GetParameters();
+                object? ret;
+                if (methodParams.Length == 0)
+                {
+                    ret = mt.Invoke(callClass, []);
+                }
+                else
+                {
+                    var pt = mt.GetParameters()[0].ParameterType;
+                    var param = pt == typeof(string)
+                        ? [reqBody]
+                        : new[] { JsonSerializer.Deserialize(reqBody, pt, SimApiUtil.JsonOption) };
+                    ret = mt.Invoke(callClass, param);
+                }
+
+                res = new SimApiBaseResponse<object?>
                {
                    Data = ret
                };
@@ -67,6 +77,7 @@ public partial class Synapse
                logger.LogDebug("Synapse RPC调用失败: {Err}", ex.Message);
                res = new SimApiBaseResponse(500, ex.Message);
            }
+
            var returnJson = JsonSerializer.Serialize((object)res, SimApiUtil.JsonOption);
            var reply = $"{Options.SysName}/{appInfo[0]}/rpc/client/{appInfo[1]}/{e.ApplicationMessage.ContentType}";
            var message = new MqttApplicationMessageBuilder()
@@ -74,8 +85,8 @@ public partial class Synapse
                .WithPayload(returnJson)
                .WithRetainFlag(false)
                .Build();
-            if (!Client!.IsConnected) return Task.CompletedTask;
-            Client!.PublishAsync(message, CancellationToken.None).Wait();
+            if (!Client.IsConnected) return Task.CompletedTask;
+            Client.PublishAsync(message, CancellationToken.None).Wait();
            logger.LogDebug(
                "Synapse Rpc Server Return: ({BasicPropertiesMessageId}) {BasicPropertiesType}@{OptionsAppName} -> {BasicPropertiesReplyTo}\n{ReturnJson}",
                e.ApplicationMessage.ContentType, action, Options.AppName, appInfo[0], returnJson);
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using MQTTnet;
 using MQTTnet.Client;
@@ -18,20 +19,17 @@ namespace SimApi;

 public partial class Synapse(SimApiOptions simApiOptions, ILogger<Synapse> logger, IServiceProvider sp)
 {
-    private IServiceProvider Sp { get; } = sp;
-
    private SimApiSynapseOptions Options { get; } = simApiOptions.SimApiSynapseOptions;

    private MqttFactory MqttFactory { get; } = new();
-    public IMqttClient Client { get; set; }
+    public IMqttClient? Client { get; set; }

-    private List<RegisterItem> EventRegistry { get; set; }
+    private List<RegisterItem> EventRegistry { get; set; } = new();

-    private List<RegisterItem> RpcRegistry { get; set; }
+    private List<RegisterItem> RpcRegistry { get; set; } = new();

    public void Init()
    {
-        ProcessAttribute();
        logger.LogDebug("Synapse初始化配置信息: {Json}", SimApiUtil.Json(Options));
        if (string.IsNullOrEmpty(Options.AppName) || string.IsNullOrEmpty(Options.SysName))
        {
@@ -42,6 +40,7 @@ public partial class Synapse(SimApiOptions simApiOptions, ILogger<Synapse> logge
        logger.LogInformation("Synapse Sys Name: {SysName}\nSynapse App Name: {AppName}\nSynapse App Id: {AppId}",
            Options.SysName, Options.AppName, Options.AppId);
        CreateConnection();
+        ProcessAttribute();
        //事件客户端
        if (Options.DisableEventClient)
        {
@@ -72,10 +71,24 @@ public partial class Synapse(SimApiOptions simApiOptions, ILogger<Synapse> logge
        {
            RunEventServer();
        }
+
+        if (Options.EnableConfigStore)
+        {
+            RunConfigStoreServer();
+            logger.LogInformation("Synapse Config Store Ready [{SysName}] ...", Options.SysName);
+        }
    }


-    public SimApiBaseResponse<T> Rpc<T>(string appName, string method, dynamic param)
+    /// <summary>
+    /// 调用RPC使用明确的返回值类型
+    /// </summary>
+    /// <param name="appName"></param>
+    /// <param name="method"></param>
+    /// <param name="param"></param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public SimApiBaseResponse<T> Rpc<T>(string appName, string method, dynamic? param = null)
    {
        var res = new SimApiBaseResponse(500, "Synapse Rpc Client Disabled!");
        if (Options.DisableRpcClient)
@@ -88,24 +101,56 @@ public partial class Synapse(SimApiOptions simApiOptions, ILogger<Synapse> logge
            res = JsonSerializer.Deserialize<SimApiBaseResponse<T>>(data, SimApiUtil.JsonOption);
        }

-        return res as SimApiBaseResponse<T>;
+        return (res as SimApiBaseResponse<T>)!;
    }

-    public SimApiBaseResponse<object> Rpc(string appName, string method, dynamic param)
+    /// <summary>
+    /// 调用RPC使用object作为返回值类型
+    /// </summary>
+    /// <param name="appName"></param>
+    /// <param name="method"></param>
+    /// <param name="param"></param>
+    /// <returns></returns>
+    public SimApiBaseResponse<object> Rpc(string appName, string method, dynamic? param = null)
    {
        return Rpc<object>(appName, method, param);
    }

-    public void Event(string eventName, dynamic param)
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="eventName"></param>
+    /// <param name="param"></param>
+    public bool Event(string eventName, dynamic? param = null)
    {
-        if (Options.DisableEventClient)
-        {
-            logger.LogError("Synapse Event Client Disabled!");
-        }
-        else
-        {
-            FireEvent(eventName, param);
-        }
+        if (!Options.DisableEventClient) return FireEvent(eventName, param);
+        logger.LogError("Synapse Event Client Disabled!");
+        return false;
+    }
+
+    /// <summary>
+    /// 设置一个系统配置项
+    /// </summary>
+    /// <param name="key"></param>
+    /// <param name="value"></param>
+    /// <returns></returns>
+    public bool SetConfig(string key, string value)
+    {
+        if (Options.EnableConfigStore) return FireSetConfig(key, value);
+        logger.LogError("Synapse Config Store Disabled!");
+        return false;
+    }
+
+    /// <summary>
+    /// 读取一个配置项,如果没有则为空
+    /// </summary>
+    /// <param name="key"></param>
+    /// <returns></returns>
+    public string? GetConfig(string key)
+    {
+        if (Options.EnableConfigStore) return FireGetConfig(key);
+        logger.LogError("Synapse Config Store Disabled!");
+        return null;
    }

    private void CreateConnection()
@@ -141,8 +186,6 @@ public partial class Synapse(SimApiOptions simApiOptions, ILogger<Synapse> logge

    private void ProcessAttribute()
    {
-        EventRegistry = [];
-        RpcRegistry = [];
        var stackTrace = new StackTrace();
        var callingMethod = stackTrace.GetFrame(stackTrace.FrameCount - 1)?.GetMethod();
        var assembly = callingMethod?.DeclaringType?.Assembly;
@@ -155,49 +198,84 @@ public partial class Synapse(SimApiOptions simApiOptions, ILogger<Synapse> logge
                if (method.IsDefined(typeof(SynapseEventAttribute), false))
                {
                    var attribute =
-                        (SynapseEventAttribute)Attribute.GetCustomAttribute(method, typeof(SynapseEventAttribute));
-                    if (attribute != null)
+                        (SynapseEventAttribute)Attribute.GetCustomAttribute(method, typeof(SynapseEventAttribute))!;
+                    var tmp = new RegisterItem
                    {
-                        EventRegistry.Add(new RegisterItem
-                        {
-                            Key = attribute.Name ?? method.Name,
-                            Class = type,
-                            Method = method.Name
-                        });
+                        Key = attribute.Name ?? method.Name,
+                        Class = type,
+                        Method = method.Name
+                    };
+                    if (tmp.Key.StartsWith('/') || tmp.Key.EndsWith('/'))
+                    {
+                        logger.LogError("Synapse Event Register Error: {Key} Can't start or end of '/'", tmp.Key);
+                        continue;
                    }
+                    
+                    var callClass = sp.CreateScope().ServiceProvider.GetRequiredService(tmp.Class!);
+                    var mt = callClass.GetType().GetMethod(tmp.Method);
+                    if (mt!.GetParameters().Length > 2 || mt.GetParameters().Length<1)
+                    {
+                        logger.LogError(
+                            "Synapse Event Register Error: Only one or two parameter supported. {Key} -> {Method}@{Class}",
+                            tmp.Key, tmp.Method, tmp.Class.Name);
+                        continue;
+                    }
+
+                    EventRegistry.Add(tmp);
                }

                if (method.IsDefined(typeof(SynapseRpcAttribute), false))
                {
                    var attribute =
-                        (SynapseRpcAttribute)Attribute.GetCustomAttribute(method, typeof(SynapseRpcAttribute));
-                    if (attribute != null)
+                        (SynapseRpcAttribute)Attribute.GetCustomAttribute(method, typeof(SynapseRpcAttribute))!;
+                    var tmp = new RegisterItem
                    {
-                        RpcRegistry.Add(new RegisterItem
-                        {
-                            Key = attribute.Name ?? $"{type.Name}.{method.Name}",
-                            Class = type,
-                            Method = method.Name
-                        });
+                        Key = attribute.Name ?? $"{type.Name}.{method.Name}",
+                        Class = type,
+                        Method = method.Name
+                    };
+                    if (tmp.Key.Contains('/') || tmp.Key.Contains('#') || tmp.Key.Contains('+'))
+                    {
+                        logger.LogError("Synapse Rpc Register Error: {Key} contains '/' , '#' , '+'", tmp.Key);
+                        continue;
                    }
+
+                    var callClass = sp.CreateScope().ServiceProvider.GetRequiredService(tmp.Class!);
+                    var mt = callClass.GetType().GetMethod(tmp.Method);
+                    if (mt!.GetParameters().Length > 1)
+                    {
+                        logger.LogError(
+                            "Synapse Rpc Register Error: Only one or none parameter supported. {Key} -> {Method}@{Class}",
+                            tmp.Key, tmp.Method, tmp.Class.Name);
+                        continue;
+                    }
+
+                    if (RpcRegistry.Any(x => x.Key == tmp.Key))
+                    {
+                        logger.LogError("Synapse Rpc Register Error: {Key} Already Exists -> {Method}@{Class}", tmp.Key,
+                            tmp.Method, tmp.Class.Name);
+                        continue;
+                    }
+
+                    RpcRegistry.Add(tmp);
                }
            }
        }

        var events = EventRegistry.Aggregate(string.Empty,
-            (current, ev) => current + $"\n |- {ev.Key} -> {ev.Method}@{ev.Class.Name}");
+            (current, ev) => current + $"\n |- {ev.Key} -> {ev.Method}@{ev.Class!.Name}");
        var rpcList = RpcRegistry.Aggregate(string.Empty,
-            (current, ev) => current + $"\n |- {ev.Key} -> {ev.Method}@{ev.Class.Name}");
-        if (EventRegistry.Count > 0) logger.LogInformation(">>> Synapse System 读取Event方法:{Event}", events);
-        if (RpcRegistry.Count > 0) logger.LogInformation(">>> Synapse System 读取RPC方法:{Rpc}", rpcList);
+            (current, ev) => current + $"\n |- {ev.Key} -> {ev.Method}@{ev.Class!.Name}");
+        if (EventRegistry.Count > 0) logger.LogInformation(" >> Synapse System 读取Event方法:{Event}", events);
+        if (RpcRegistry.Count > 0) logger.LogInformation(" >> Synapse System 读取RPC方法:{Rpc}", rpcList);
    }
 }

 public class RegisterItem
 {
-    public string Key { get; init; }
+    public string? Key { get; init; }

-    public Type Class { get; init; }
+    public Type? Class { get; init; }

-    public string Method { get; init; }
+    public string? Method { get; init; }
 }