add event loadbalancing

Attributes/SimApiAuthAttribute.cs

@@ -43,7 +43,7 @@ public class SimApiAuthAttribute : ActionFilterAttribute
 
     public override void OnActionExecuting(ActionExecutingContext context)
     {
-        var loginInfo = (SimApiLoginItem)context.HttpContext.Items["LoginInfo"];
+        var loginInfo = (SimApiLoginItem)context.HttpContext.Items["LoginInfo"]!;
         //检测是否登录
         if (loginInfo == null)
         {

Attributes/SynapseEventAttribute.cs

@@ -3,12 +3,7 @@ using System;
 namespace SimApi.Attributes;
 
 [AttributeUsage(AttributeTargets.Method)]
-public class SynapseEventAttribute : Attribute
+public class SynapseEventAttribute(string? name = null) : Attribute
 {
-    public string Name { get; }
-
-    public SynapseEventAttribute(string name)
-    {
-        Name = name;
-    }
+    public string? Name { get; } = name;
 }

Attributes/SynapseRpcAttribute.cs

@@ -5,7 +5,7 @@ namespace SimApi.Attributes;
 [AttributeUsage(AttributeTargets.Method)]
 public class SynapseRpcAttribute : Attribute
 {
-    public string Name { get; }
+    public string? Name { get; }
 
     public SynapseRpcAttribute()
     {

Communications/SimApiBaseRequest.cs

@@ -1,22 +1,37 @@
-namespace SimApi.Communications;
+using System.ComponentModel.DataAnnotations;
+
+namespace SimApi.Communications;
 
 /// <summary>
 /// 只有ID的请求
 /// </summary>
-public record SimApiIdOnlyRequest(int Id);
+public class SimApiIdOnlyRequest
+{
+    [Required] public int Id { get; set; }
+}
 
 /// <summary>
 /// 只有ID的请求(字符串)
 /// </summary>
-public record SimApiStringIdOnlyRequest(string Id);
+public class SimApiStringIdOnlyRequest
+{
+    [Required] public string? Id { get; set; }
+}
 
 /// <summary>
 /// 动态类型单字段请求
 /// </summary>
 /// <typeparam name="T"></typeparam>
-public record SimApiOneFieldRequest<T>(T Data);
+public class SimApiOneFieldRequest<T>
+{
+    [Required] public T? Data { get; set; }
+}
 
 /// <summary>
 /// 基础分页请求
 /// </summary>
-public record SimApiBasePageRequest(int Page, int Count);
+public class SimApiBasePageRequest
+{
+    [Required] public int Page { get; set; }
+    [Required] public int Count { get; set; }
+}

Communications/SimApiBaseResponse.cs

@@ -7,8 +7,11 @@ namespace SimApi.Communications;
 /// <summary>
 /// 基础相应
 /// </summary>
-public record SimApiBaseResponse(int Code = 200, string Message = "成功")
+public class SimApiBaseResponse(int code = 200, string message = "成功")
 {
+    public int Code { get; set; } = code;
+    public string Message { get; set; } = message;
+
     /// <summary>
     /// 默认错误代码对应提示信息
     /// </summary>
@@ -23,7 +26,7 @@ public record SimApiBaseResponse(int Code = 200, string Message = "成功")
         { 500, "服务器错误" }
     };
 
-    public SimApiBaseResponse(int code) : this(code, MsgBox.ContainsKey(code) ? MsgBox[code] : "未知错误")
+    public SimApiBaseResponse(int code) : this(code, MsgBox.GetValueOrDefault(code, "未知错误"))
     {
     }
 
@@ -49,17 +52,32 @@ public record SimApiBaseResponse(int Code = 200, string Message = "成功")
 /// 动态内容分页
 /// </summary>
 /// <typeparam name="T"></typeparam>
-public record SimApiBasePageResponse<T>(
-    T List,
-    int Page = 1,
-    int Count = 1,
-    int Total = 1,
-    int Code = 200,
-    string Message = "成功") : SimApiBaseResponse(Code, Message);
+public class SimApiBasePageResponse<T>() : SimApiBaseResponse
+{
+    public T List { get; set; }
+    public int Page { get; set; } = 1;
+    public int Count { get; set; } = 20;
+    public int Total { get; set; }
+
+    public SimApiBasePageResponse(T list, int page, int count, int total) : this()
+    {
+        List = list;
+        Page = page;
+        Count = count;
+        Total = total;
+    }
+}
 
 /// <summary>
 /// 动态Data返回
 /// </summary>
 /// <typeparam name="T"></typeparam>
-public record SimApiBaseResponse<T>(T Data, int Code = 200, string Message = "成功") : SimApiBaseResponse(Code,
-    Message);
+public class SimApiBaseResponse<T>() : SimApiBaseResponse
+{
+    public T Data { get; set; }
+
+    public SimApiBaseResponse(T data) : this()
+    {
+        Data = data;
+    }
+}

Communications/SimApiLoginItem.cs

@@ -1,6 +1,8 @@
-namespace SimApi.Communications;
+using System.Collections.Generic;
+
+namespace SimApi.Communications;
 
 /// <summary>
 /// 登录信息中间件
 /// </summary>
-public record SimApiLoginItem(string Id, string[] Type);
+public record SimApiLoginItem(string Id, string[] Type,Dictionary<string,string>? Meta = null);

Configurations/SimApiDocOptions.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Swashbuckle.AspNetCore.SwaggerUI;
 
-namespace SimApi.Configs;
+namespace SimApi.Configurations;
 
 /// <summary>
 /// 文档组配置

Configurations/SimApiOptions.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace SimApi.Configs;
+namespace SimApi.Configurations;
 
 public class SimApiOptions
 {
@@ -11,7 +11,7 @@ public class SimApiOptions
     public bool EnableCors { get; set; } = true;
 
     /// <summary>
-    /// 启用SimapiAuth，一个简单的基于Header Token的认证方式。
+    /// 启用SimApiAuth，一个简单的基于Header Token的认证方式。
     /// default: false
     /// </summary>
     public bool EnableSimApiAuth { get; set; } = false;

Configurations/SimApiStorageOptions.cs

@@ -1,23 +1,23 @@
-namespace SimApi.Configs;
+namespace SimApi.Configurations;
 
 public class SimApiStorageOptions
 {
     /// <summary>
     /// S3 服务器入口地址
     /// </summary>
-    public string Endpoint { get; set; }
+    public string? Endpoint { get; set; }
 
     /// <summary>
     /// S3 服务器文件访问地址
     /// </summary>
-    public string ServeUrl { get; set; }
+    public string? ServeUrl { get; set; }
 
     /// <summary>
     /// S3服务 Bucket
     /// </summary>
-    public string Bucket { get; set; }
+    public string? Bucket { get; set; }
 
-    public string AccessKey { get; set; }
+    public string? AccessKey { get; set; }
 
-    public string SecretKey { get; set; }
+    public string? SecretKey { get; set; }
 }

Configurations/SimApiSynapseOptions.cs

@@ -1,30 +1,25 @@
-namespace SimApi.Configs;
+namespace SimApi.Configurations;
 
 public class SimApiSynapseOptions
 {
-    public string MqHost { get; set; }
-
-    public int MqPort { get; set; }
-
-    public string MqUser { get; set; }
-
-    public string MqPass { get; set; }
-
-    public string MqVHost { get; set; } = "/";
-
-    public string SysName { get; set; }
-
-    public string AppName { get; set; }
-
-    public string AppId { get; set; }
-
+    /// <summary>
+    /// Mqtt服务器的Websocket地址
+    /// </summary>
+    public string? Websocket { get; set; }
+    public string? Username { get; set; }
+    public string? Password { get; set; }
+    public string? SysName { get; set; }
+    public string? AppName { get; set; }
+    public string? AppId { get; set; }
     public int RpcTimeout { get; set; } = 3;
 
-    public ushort EventProcessorNum { get; set; } = 20;
-
-    public ushort RpcProcessorNum { get; set; } = 20;
-
+    /// <summary>
+    /// Event是否使用负载均衡
+    /// 也就是订阅$queue主题,消息会分发给不同的AppId
+    /// 如果false,多个AppId都可以同时收到消息
+    /// </summary>
+    public bool EventLoadBalancing { get; set; } = false;
+    public bool EnableConfigStore { get; set; } = true;
     public bool DisableEventClient { get; set; } = false;
-
     public bool DisableRpcClient { get; set; } = false;
 }

Controllers/SimApiBaseController.cs

@@ -18,7 +18,7 @@ public class SimApiBaseController : Controller
     /// <summary>
     /// 当前登录用户的ID
     /// </summary>
-    protected SimApiLoginItem LoginInfo => (SimApiLoginItem)HttpContext.Items["LoginInfo"];
+    protected SimApiLoginItem LoginInfo => (SimApiLoginItem)HttpContext.Items["LoginInfo"]!;
 
     /// <summary>
     /// 验证请求参数
@@ -50,12 +50,12 @@ public class SimApiBaseController : Controller
     }
 
     /// <summary>
-    /// 检测条件，根据条件返回报错
+    /// 检测条件，根据条件返回报错 如果condition是ture报错
     /// </summary>
     /// <param name="condition">检测条件</param>
     /// <param name="code">错误代码</param>
     /// <param name="message">错误描述</param>
-    protected static void ErrorWhen(bool condition, int code = 500, string message = "")
+    protected static void ErrorWhen(bool condition, int code = 400, string message = "")
     {
         if (condition)
         {
@@ -63,13 +63,37 @@ public class SimApiBaseController : Controller
         }
     }
 
+
+    /// <summary>
+    /// 检测条件，根据条件返回报错 如果condition是ture报错
+    /// </summary>
+    /// <param name="condition">检测条件</param>
+    /// <param name="code">错误代码</param>
+    /// <param name="message">错误描述</param>
+    protected static void ErrorWhenTrue(bool condition, int code = 400, string message = "")
+    {
+        ErrorWhen(condition, code, message);
+    }
+
+
+    /// <summary>
+    /// 如果condition是false 报错
+    /// </summary>
+    /// <param name="condition"></param>
+    /// <param name="code"></param>
+    /// <param name="message"></param>
+    protected static void ErrorWhenFalse(bool condition, int code = 400, string message = "")
+    {
+        ErrorWhen(!condition, code, message);
+    }
+
     /// <summary>
     /// 检测给定的变量是否为NUll
     /// </summary>
     /// <param name="condition">检测条件</param>
     /// <param name="code">错误代码</param>
     /// <param name="message">错误描述</param>
-    protected static void ErrorWhenNull(object condition, int code = 404, string message = "")
+    protected static void ErrorWhenNull(object? condition, int code = 404, string message = "请求的资源不存在")
     {
         ErrorWhen(condition == null, code, message);
     }
@@ -80,6 +104,6 @@ public class SimApiBaseController : Controller
     /// <returns></returns>
     protected SimApiBaseResponse<string> UploadFile()
     {
-        return new SimApiBaseResponse<string>(null);
+        return new SimApiBaseResponse<string>();
     }
 }

Controllers/SimApiCommonController.cs

@@ -28,7 +28,10 @@ public class SimApiCommonController(SimApiAuth auth) : SimApiBaseController
     public SimApiBaseResponse<string> CheckLogin()
     {
         ErrorWhenNull(LoginInfo, 401);
-        return new SimApiBaseResponse<string>(LoginInfo.Id);
+        return new SimApiBaseResponse<string>
+        {
+            Data = LoginInfo.Id
+        };
     }
 
     /// <summary>
@@ -38,14 +41,20 @@ public class SimApiCommonController(SimApiAuth auth) : SimApiBaseController
     [HttpPost("/auth/logout"), SimApiDoc("认证", "退出登陆")]
     public SimApiBaseResponse Logout()
     {
-        string token = null;
+        string? token = null;
 
-        if (Request.Headers.ContainsKey("Token"))
+        if (Request.Headers.TryGetValue("Token", out var value))
         {
-            token = Request.Headers["Token"];
+            token = value;
         }
 
-        auth.Logout(token);
+        auth.Logout(token!);
         return new SimApiBaseResponse();
     }
+    
+    [HttpPost("/logined"),SimApiAuth]
+    public SimApiBaseResponse<SimApiLoginItem> UserInfo()
+    {
+        return new SimApiBaseResponse<SimApiLoginItem>(LoginInfo);
+    }
 }

Helpers/SimApiAuth.cs

@@ -1,4 +1,6 @@
+#nullable enable
 using System;
+using System.Collections.Generic;
 using System.Text.Json;
 using Microsoft.Extensions.Caching.Distributed;
 using SimApi.Communications;
@@ -14,10 +16,13 @@ public class SimApiAuth(IDistributedCache cache)
     /// 产生一个Token记录并返回Token
     /// </summary>
     /// <param name="id"></param>
+    /// <param name="type"></param>
+    /// <param name="meta"></param>
+    /// <param name="token"></param>
     /// <returns></returns>
-    public string Login(string id, string type = "user", string token = null)
+    public string Login(string id, Dictionary<string, string>? meta = null, string type = "user", string? token = null)
     {
-        return Login(id, new[] { type }, token);
+        return Login(id, meta, new[] { type }, token);
     }
 
     /// <summary>
@@ -25,15 +30,44 @@ public class SimApiAuth(IDistributedCache cache)
     /// </summary>
     /// <param name="id"></param>
     /// <param name="type"></param>
+    /// <param name="meta"></param>
+    /// <param name="uuid"></param>
     /// <returns></returns>
-    public string Login(string id, string[] type, string uuid = null)
+    // ReSharper disable once MemberCanBePrivate.Global
+    public string Login(string id, Dictionary<string, string>? meta, string[] type, string? uuid = null)
     {
         uuid ??= Guid.NewGuid().ToString();
-        var loginItem = new SimApiLoginItem(id, type);
+        var loginItem = new SimApiLoginItem(id, type, meta);
         cache.SetString(uuid, JsonSerializer.Serialize(loginItem));
         return uuid;
     }
 
+    /// <summary>
+    /// 设置登录的Meta信息
+    /// </summary>
+    /// <param name="token"></param>
+    /// <param name="meta"></param>
+    /// <returns></returns>
+    public bool SetMeta(string token, Dictionary<string, string> meta)
+    {
+        var login = GetLogin(token);
+        if (login == null) { return false; }
+        var newLogin = new SimApiLoginItem(login.Id, login.Type, login.Meta);
+        cache.SetString(token,JsonSerializer.Serialize(newLogin));
+        return true;
+    }
+
+    /// <summary>
+    /// 获取登陆信息
+    /// </summary>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    public SimApiLoginItem? GetLogin(string token)
+    {
+        var login = cache.GetString(token);
+        return login != null ? JsonSerializer.Deserialize<SimApiLoginItem>(login) : default;
+    }
+
     /// <summary>
     /// 退出登陆
     /// </summary>

Helpers/SimApiStorage.cs

@@ -1,19 +1,23 @@
-using System;
+#nullable enable
+using System;
 using System.IO;
 using Microsoft.AspNetCore.Http;
 using Minio;
-using SimApi.Configs;
+using Minio.DataModel.Args;
+using SimApi.Configurations;
 
 namespace SimApi.Helpers;
 
 public class SimApiStorage
 {
-    private MinioClient Mc { get; }
+    private IMinioClient Mc { get; }
 
-    public MinioClient Client => Mc;
+    public IMinioClient Client => Mc;
 
     private string ServeUrl { get; }
 
+    private string Endpoint { get; }
+
     public string Bucket { get; }
 
     private IHttpContextAccessor HttpContextAccessor { get; }
@@ -22,9 +26,10 @@ public class SimApiStorage
     {
         var options = apiOptions.SimApiStorageOptions;
         HttpContextAccessor = httpContextAccessor;
+        Endpoint = options.Endpoint!;
         var useSsl = false;
         string endpoint;
-        if (options.Endpoint.StartsWith("http://"))
+        if (options.Endpoint!.StartsWith("http://"))
         {
             endpoint = options.Endpoint.Replace("http://", string.Empty);
         }
@@ -38,14 +43,16 @@ public class SimApiStorage
             throw new Exception("SimApiStorage: Error Endpoint");
         }
 
-        ServeUrl = options.ServeUrl;
-        Bucket = options.Bucket;
+        ServeUrl = options.ServeUrl!;
+        if (ServeUrl.EndsWith('/')) throw new Exception("SimApiStorage: ServeUrl must not end with /");
+        Bucket = options.Bucket!;
         var mcb = new MinioClient().WithEndpoint(endpoint)
             .WithCredentials(options.AccessKey, options.SecretKey);
         if (useSsl)
         {
             mcb = mcb.WithSSL();
         }
+
         Mc = mcb.Build();
 
         var found = Mc.BucketExistsAsync(new BucketExistsArgs().WithBucket(Bucket)).Result;
@@ -61,10 +68,13 @@ public class SimApiStorage
     /// <param name="path"></param>
     /// <param name="expire"></param>
     /// <returns></returns>
-    public string GetUploadUrl(string path, int expire = 7200)
+    public GetUploadUrlResponse GetUploadUrl(string path, int expire = 7200)
     {
-        return Mc.PresignedPutObjectAsync(new PresignedPutObjectArgs().WithBucket(Bucket)
-            .WithObject(path).WithExpiry(expire)).Result;
+        CheckPath(path);
+        var obj = path.TrimStart('/');
+        var uploadUrl = Mc.PresignedPutObjectAsync(new PresignedPutObjectArgs().WithBucket(Bucket)
+            .WithObject(obj).WithExpiry(expire)).Result;
+        return new GetUploadUrlResponse(uploadUrl, $"{ServeUrl}{path}", path);
     }
 
     /// <summary>
@@ -75,20 +85,38 @@ public class SimApiStorage
     /// <returns></returns>
     public string GetDownloadUrl(string path, int expire = 600)
     {
+        CheckPath(path);
+        path = path.TrimStart('/');
         return Mc.PresignedGetObjectAsync(new PresignedGetObjectArgs().WithBucket(Bucket).WithObject(path)
             .WithExpiry(expire)).Result;
     }
 
 
-    public string UploadFile(string path, Stream stream, string contentType = "image/png")
+    /// <summary>
+    /// 直接上传文件
+    /// </summary>
+    /// <param name="path"></param>
+    /// <param name="stream"></param>
+    /// <param name="contentType"></param>
+    public void UploadFile(string path, Stream stream, string contentType = "image/png")
     {
+        CheckPath(path);
+        path = path.TrimStart('/');
         Mc.PutObjectAsync(new PutObjectArgs().WithBucket(Bucket).WithObject(path).WithObjectSize(stream.Length)
             .WithStreamData(stream).WithContentType(contentType)).Wait();
-        return null;
     }
 
+    /// <summary>
+    /// 使用path获取完整的访问URL
+    /// </summary>
+    /// <param name="path"></param>
+    /// <returns></returns>
+    /// <exception cref="Exception"></exception>
     public string FullUrl(string path)
     {
+        if (string.IsNullOrEmpty(path)) return path;
+        if(path.StartsWith("http://") || path.StartsWith("https://")) return path;
+        if (!(path.StartsWith('/') || path.StartsWith("~/"))) return path;
         var httpRequest = HttpContextAccessor.HttpContext?.Request;
         var url = $"{httpRequest?.Scheme}://{httpRequest?.Host}";
         if (string.IsNullOrEmpty(path))
@@ -98,4 +126,42 @@ public class SimApiStorage
 
         return path.StartsWith('~') ? string.Concat(url, path.AsSpan(1, path.Length - 1)) : $"{ServeUrl}{path}";
     }
-}
+
+    /// <summary>
+    /// 获取一个Path得访问URL
+    /// </summary>
+    /// <param name="path"></param>
+    /// <returns></returns>
+    public string? GetUrl(string? path)
+    {
+        if (string.IsNullOrEmpty(path)) return path;
+        if (path.StartsWith("~/"))
+        {
+            var httpRequest = HttpContextAccessor.HttpContext?.Request;
+            var url = $"{httpRequest?.Scheme}://{httpRequest?.Host}";
+            return string.Concat(url, path.AsSpan(1, path.Length - 1));
+        }
+        if (path.StartsWith('/'))
+        {
+            return $"{ServeUrl}{path}";
+        }
+        return path;
+    }
+
+    /// <summary>
+    /// 从URL中获取相对路径 (如果url不是当前服务器的url,则原样返回)
+    /// </summary>
+    /// <param name="url"></param>
+    /// <returns></returns>
+    public string? GetPath(string? url)
+    {
+        return url?.Replace($"{Endpoint}/{Bucket}", string.Empty).Replace(ServeUrl,string.Empty);
+    }
+
+    private void CheckPath(string path)
+    {
+        if (!path.StartsWith('/')) throw new Exception("path must start with /");
+    }
+}
+
+public record GetUploadUrlResponse(string UploadUrl, string DownloadUrl, string Path);

Helpers/SimApiUtil.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.Encodings.Web;
@@ -50,16 +51,15 @@ public static class SimApiUtil
     /// <returns></returns>
     public static string Md5(string source, string mode = "x2")
     {
-        var sor = Encoding.UTF8.GetBytes(source);
-        var md5 = MD5.Create();
-        var result = md5.ComputeHash(sor);
-        var strbul = new StringBuilder(40);
+        var sourceBytes = Encoding.UTF8.GetBytes(source);
+        var result = MD5.HashData(sourceBytes);
+        var stringBuilder = new StringBuilder(40);
         foreach (var t in result)
         {
-            strbul.Append(t.ToString(mode));
+            stringBuilder.Append(t.ToString(mode));
         }
 
-        return strbul.ToString();
+        return stringBuilder.ToString();
     }
 
     /// <summary>
@@ -71,4 +71,21 @@ public static class SimApiUtil
     {
         return JsonSerializer.Serialize(obj, JsonOption);
     }
+
+    /// <summary>
+    /// 分页
+    /// </summary>
+    /// <param name="query"></param>
+    /// <param name="page">页码</param>
+    /// <param name="count">每页数量</param>
+    /// <typeparam name="T"></typeparam>
+    /// <returns></returns>
+    public static IQueryable<T> Paginate<T>(this IQueryable<T> query, int page, int count)
+    {
+        if (page < 1)
+            page = 1;
+        if (count <= 0)
+            count = 10;
+        return query.Skip((page - 1) * count).Take(count);
+    }
 }

Logger/SimApiLogger.cs

@@ -10,7 +10,7 @@ public class SimApiLogger(string name) : ILogger
 
     public bool IsEnabled(LogLevel logLevel) => true;
 
-    public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception,
+    public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception,
         Func<TState, Exception, string> formatter)
     {
         Console.ForegroundColor = logLevel switch
@@ -23,11 +23,13 @@ public class SimApiLogger(string name) : ILogger
             _ => ConsoleColor.White
         };
         var message =
-            $"[ {name} ][ {SimApiUtil.CstNow.ToString("yyyy-MM-dd HH:mm:ss:ffff")} ][ {logLevel.ToString()} ]\n{state}\n";
+            $"[ {name} ][ {DateTime.Now:yyyy-MM-dd HH:mm:ss:ffff} ][ {logLevel.ToString()} ]\n{state}\n";
         if (exception != null)
         {
             message += $"{exception}\n";
         }
+
         Console.WriteLine(message);
+        Console.ResetColor();
     }
 }

Logger/SimApiLoggerConfiguration.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.Extensions.Logging;
-
-namespace SimApi.Logger;
-
-public class SimApiLoggerConfiguration
-{
-    public int EventId { get; set; }
-
-    public Dictionary<LogLevel, ConsoleColor> LogLevels { get; set; } = new()
-    {
-        [LogLevel.Information] = ConsoleColor.Green
-    };
-}

Middlewares/SimApiAuthMiddleware.cs

@@ -3,6 +3,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Caching.Distributed;
 using SimApi.Communications;
+using SimApi.Helpers;
 
 namespace SimApi.Middlewares;
 
@@ -11,23 +12,20 @@ namespace SimApi.Middlewares;
 /// </summary>
 public class SimApiAuthMiddleware(RequestDelegate next)
 {
-    public Task Invoke(HttpContext httpContext, IDistributedCache cache)
+    public Task Invoke(HttpContext httpContext, IDistributedCache cache, SimApiAuth auth)
     {
-        string token = null;
+        string? token = null;
         if (httpContext.Request.Headers.TryGetValue("Token", out var header))
         {
             token = header;
         }
 
-        if (!string.IsNullOrEmpty(token))
+        if (string.IsNullOrEmpty(token)) return next(httpContext);
+        var login = auth.GetLogin(token);
+        if (login != null)
         {
-            var login = cache.GetString(token);
-            if (login != null)
-            {
-                httpContext.Items.Add("LoginInfo", JsonSerializer.Deserialize<SimApiLoginItem>(login));
-            }
+            httpContext.Items.Add("LoginInfo", login);
         }
-
         return next(httpContext);
     }
 }

Middlewares/SimApiExceptionMiddleware.cs

@@ -24,12 +24,17 @@ public class SimApiExceptionMiddleware(RequestDelegate next, ILogger<SimApiExcep
         try
         {
             await next(context);
-            if (context.Response.StatusCode != 200)
+            switch (context.Response.StatusCode)
             {
-                if (!new[] { 301, 302 }.Contains(context.Response.StatusCode))
-                {
+                case 200:
+                    break;
+                case 404:
+                    throw new SimApiException(context.Response.StatusCode, "请求的接口不存在");
+                case 301:
+                case 302:
+                    break;
+                default:
                     throw new SimApiException(context.Response.StatusCode);
-                }
             }
         }
         catch (SimApiException ex)
@@ -42,8 +47,8 @@ public class SimApiExceptionMiddleware(RequestDelegate next, ILogger<SimApiExcep
         }
         catch (Exception ex)
         {
-            log.LogError(ex.Message);
-            log.LogError(ex.StackTrace);
+            log.LogError("{Msg}", ex.Message);
+            log.LogError("{Msg}", ex.StackTrace);
             response = new SimApiBaseResponse(500, ex.Message);
             ErrorResponse(context, response);
         }
@@ -54,13 +59,11 @@ public class SimApiExceptionMiddleware(RequestDelegate next, ILogger<SimApiExcep
     /// </summary>
     /// <param name="context"></param>
     /// <param name="response"></param>
-    private void ErrorResponse(HttpContext context, SimApiBaseResponse response)
+    private static void ErrorResponse(HttpContext context, SimApiBaseResponse response)
     {
-        if (!context.Response.HasStarted)
-        {
-            context.Response.StatusCode = 200;
-            context.Response.Headers.Append("Content-Type", "application/json");
-            context.Response.WriteAsync(response.ToString());
-        }
+        if (context.Response.HasStarted) return;
+        context.Response.StatusCode = 200;
+        context.Response.Headers.Append("Content-Type", "application/json");
+        context.Response.WriteAsync(response.ToString());
     }
 }

Models/SimApiBaseModel.cs

@@ -7,14 +7,11 @@ namespace SimApi.Models;
 
 public class SimApiBaseModel
 {
-    [Column(Order = 1)]
-    public string Id { get; set; } = Guid.NewGuid().ToString();
+    [Column(Order = 1)] public string Id { get; set; } = Guid.NewGuid().ToString();
 
-    [Column(Order = 9998)]
-    public DateTime UpdatedAt { get; set; } = SimApiUtil.CstNow;
+    [Column(Order = 9998)] public DateTime UpdatedAt { get; set; } = DateTime.Now;
 
-    [Column(Order = 9999)]
-    public DateTime CreatedAt { get; set; } = SimApiUtil.CstNow;
+    [Column(Order = 9999)] public DateTime CreatedAt { get; set; } = DateTime.Now;
 
     protected virtual string[] MapperIgnoreField { get; set; } = { "Id", "CreatedAt", "UpdatedAt" };
 
@@ -23,7 +20,7 @@ public class SimApiBaseModel
     public void MapData<TS>(TS source, bool mapAll = false)
     {
         //获取要赋值的源数据不为null的项目
-        var sourceProps = source.GetType().GetProperties().Where(x => x.GetValue(source) != null)
+        var sourceProps = source!.GetType().GetProperties().Where(x => x.GetValue(source) != null)
             .Select(x => new
             {
                 x.Name,
@@ -52,7 +49,7 @@ public class SimApiBaseModel
     public void MapData<TS>(TS source, string[] mapFields)
     {
         //获取要赋值的源数据不为null的项目
-        var sourceProps = source.GetType().GetProperties().Where(x => x.GetValue(source) != null)
+        var sourceProps = source!.GetType().GetProperties().Where(x => x.GetValue(source) != null)
             .Select(x => new
             {
                 x.Name,
@@ -84,6 +81,6 @@ public class SimApiBaseModel
     /// <returns></returns>
     public void UpdateTime()
     {
-        GetType().GetProperty(UpdatedTimeField)?.SetValue(this, SimApiUtil.CstNow);
+        GetType().GetProperty(UpdatedTimeField)?.SetValue(this, DateTime.Now);
     }
 }

SimApi.csproj

@@ -15,6 +15,7 @@
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <PackageVersion>5.0.2</PackageVersion>
         <TargetFramework>net8.0</TargetFramework>
+        <Nullable>enable</Nullable>
     </PropertyGroup>
 
     <ItemGroup>
@@ -25,10 +26,10 @@
         <Folder Include="Exceptions\"/>
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Minio" Version="4.0.7"/>
-        <PackageReference Include="RabbitMQ.Client" Version="6.6.0"/>
-        <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0"/>
-        <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.5.0"/>
+        <PackageReference Include="Minio" Version="6.0.3" />
+        <PackageReference Include="MQTTnet" Version="4.3.6.1152" />
+        <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.6.2" />
+        <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.6.2" />
     </ItemGroup>
     <ProjectExtensions>
         <MonoDevelop>

SimApiExtensions.cs

@@ -5,8 +5,9 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.OpenApi.Models;
 using SimApi.Middlewares;
 using Microsoft.AspNetCore.HttpOverrides;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using SimApi.Configs;
+using SimApi.Configurations;
 using SimApi.Logger;
 
 namespace SimApi;
@@ -30,10 +31,11 @@ public static class SimApiExtensions
                 logger.AddProvider(new SimApiLoggerProvider());
             });
         }
+
         // 是否使用 AUTH
         if (simApiOptions.EnableSimApiAuth)
         {
-            builder.AddScoped<SimApiAuth>();
+            builder.AddSingleton<SimApiAuth>();
         }
 
         if (simApiOptions.EnableCors)
@@ -188,17 +190,47 @@ public static class SimApiExtensions
         return builder;
     }
 
+    public static IHost UseSimApi(this IHost builder)
+    {
+       var options = builder.Services.GetRequiredService<SimApiOptions>();
+
+        var logger = builder.Services.GetRequiredService<ILogger<SimApiOptions>>();
+
+        logger.LogInformation("当前时区: {LocalId}", TimeZoneInfo.Local.Id);
+        
+        //请求一下检测存储错误
+        if (options.EnableSimApiStorage)
+        {
+            logger.LogInformation("开始配置SimApiStorage...");
+            builder.Services.GetService<SimApiStorage>();
+        }
+
+        if (options.EnableLowerUrl)
+        {
+            logger.LogInformation("开始配置使用URL小写...");
+        }
+
+        if (options.EnableSynapse)
+        {
+            var synapse = builder.Services.GetRequiredService<Synapse>();
+            synapse.Init();
+        }
+
+        return builder;
+    }
+
     /// <summary>
     ///  使用所有SimApi自定义中间件
     /// </summary>
     /// <param name="builder"></param>
     /// <returns></returns>
-    public static IApplicationBuilder UseSimApi(this IApplicationBuilder builder)
+    public static WebApplication UseSimApi(this WebApplication builder)
     {
-        var options = builder.ApplicationServices.GetRequiredService<SimApiOptions>();
+        var options = builder.Services.GetRequiredService<SimApiOptions>();
 
-        var logger = builder.ApplicationServices.GetRequiredService<ILogger<SimApiOptions>>();
+        var logger = builder.Services.GetRequiredService<ILogger<SimApiOptions>>();
 
+        logger.LogInformation("当前时区: {LocalId}", TimeZoneInfo.Local.Id);
         if (options.EnableForwardHeaders)
         {
             logger.LogInformation("开始配置ForwardedHeaders...");
@@ -245,7 +277,7 @@ public static class SimApiExtensions
         if (options.EnableSimApiStorage)
         {
             logger.LogInformation("开始配置SimApiStorage...");
-            builder.ApplicationServices.GetService<SimApiStorage>();
+            builder.Services.GetService<SimApiStorage>();
         }
 
         if (options.EnableLowerUrl)
@@ -255,7 +287,7 @@ public static class SimApiExtensions
 
         if (options.EnableSynapse)
         {
-            var synapse = builder.ApplicationServices.GetRequiredService<Synapse>();
+            var synapse = builder.Services.GetRequiredService<Synapse>();
             synapse.Init();
         }
 

Synapse/ConfigStore.cs

@@ -0,0 +1,57 @@
+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)
+    {
+        if (key.Contains('#') || key.Contains('+')) return false;
+        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);
+}

Synapse/EventClient.cs

@@ -1,31 +1,33 @@
-using System;
-using System.Text;
-using System.Text.Encodings.Web;
 using System.Text.Json;
-using System.Text.Unicode;
+using System.Threading;
 using Microsoft.Extensions.Logging;
+using MQTTnet;
 using SimApi.Helpers;
 
 namespace SimApi;
 
 public partial class Synapse
 {
-    private void RunEventClient()
+    private bool FireEvent(string eventName, object? param)
     {
-        EventClientChannel = CreateChannel(0, "EventClient");
-    }
-
-    private void FireEvent(string eventName, object param)
-    {
-        var paramJson = JsonSerializer.Serialize(param, SimApiUtil.JsonOption);
-        var router = $"event.{Options.AppName}.{eventName}";
-        var props = EventClientChannel.CreateBasicProperties();
-        props.AppId = Options.AppId;
-        props.MessageId = Guid.NewGuid().ToString();
-        props.ReplyTo = Options.AppName;
-        props.Type = eventName;
-        EventClientChannel.BasicPublish(Options.SysName, router, false, props, Encoding.UTF8.GetBytes(paramJson));
-        Logger.LogDebug("Event Publish: {OptionsAppName}.{EventName}\n{ParamJson}", Options.AppName, eventName,
-            paramJson);
+        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(false)
+            .Build();
+        if (!Client!.IsConnected) return false;
+        Client.PublishAsync(message, CancellationToken.None).Wait();
+        logger.LogDebug("Synapse Event Publish: {Event}@{App} {Json}", eventName, Options.AppName, paramJson);
+        return true;
     }
 }

Synapse/EventServer.cs

@@ -1,10 +1,11 @@
 using System;
 using System.Linq;
-using System.Text;
 using System.Text.Json;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using RabbitMQ.Client.Events;
+using MQTTnet;
 using SimApi.Helpers;
 
 namespace SimApi;
@@ -13,38 +14,55 @@ public partial class Synapse
 {
     private void RunEventServer()
     {
-        EventServerChannel = CreateChannel(Options.EventProcessorNum, "EventServer");
-        var queue = $"{Options.SysName}_{Options.AppName}_event";
-        EventServerChannel.QueueDeclare(queue, true, false, true, null);
-        foreach (var ev in EventRegistry.Where(ev => !ev.Key.Contains('*') && !ev.Key.Contains('#')))
+        var esTopicPrefix = $"{Options.SysName}/event/";
+        Client!.ApplicationMessageReceivedAsync += e =>
         {
-            EventServerChannel.QueueBind(queue, Options.SysName, $"event.{ev.Key}", null);
-        }
-        var consumer = new EventingBasicConsumer(EventServerChannel);
-        consumer.Received += (ch, ea) =>
-        {
-            var reqBody = Encoding.UTF8.GetString(ea.Body.ToArray());
-            Logger.LogDebug("Event Receive: {BasicPropertiesReplyTo}.{BasicPropertiesType}\n{S}",
-                ea.BasicProperties.ReplyTo, ea.BasicProperties.Type, reqBody);
+            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: {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()[1].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}\n{Stack}", ex.Message,ex.StackTrace);
+                }
+            }
 
-            var key = ea.RoutingKey.Replace("event.", string.Empty);
-            var method = EventRegistry.FirstOrDefault(x => x.Key == key);
-            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) });
-                EventServerChannel.BasicAck(ea.DeliveryTag, false);
-            }
-            catch (Exception e)
-            {
-                Logger.LogError("Event Processor Error: {Err}", e.InnerException);
-                EventServerChannel.BasicNack(ea.DeliveryTag, false, false);
-            }
+            return Task.CompletedTask;
         };
-        EventServerChannel.BasicConsume(queue, false, "", false, false, null, consumer);
+        foreach (var ev in EventRegistry)
+        {
+            
+            var topic = $"{esTopicPrefix}{ev.Key}";
+            if (Options.EventLoadBalancing)
+            {
+                topic = "$queue/" + topic;
+            }
+            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);
+        }
     }
 }

Synapse/RpcClient.cs

@@ -1,12 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
-using System.Text.Encodings.Web;
 using System.Text.Json;
-using System.Text.Unicode;
+using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Newtonsoft.Json.Serialization;
-using RabbitMQ.Client.Events;
+using MQTTnet;
 using SimApi.Communications;
 using SimApi.Helpers;
 
@@ -14,57 +12,76 @@ namespace SimApi;
 
 public partial class Synapse
 {
-    private Dictionary<string, byte[]> ResponseCache { get; } = new();
+    private Dictionary<string, TaskCompletionSource<string>> ResponseCompletionSources { get; } = new();
 
     private void RunRpcClient()
     {
-        RpcClientChannel = CreateChannel(0, "RpcClient");
-        var queue = $"{Options.SysName}_{Options.AppName}_client_{Options.AppId}";
-        var router = $"client.{Options.AppName}.{Options.AppId}";
-        RpcClientChannel.QueueDeclare(queue, true, false, true, null);
-        RpcClientChannel.QueueBind(queue, Options.SysName, router, null);
-        var consumer = new EventingBasicConsumer(RpcClientChannel);
-        consumer.Received += (ch, ea) =>
+        var rcTopic = $"{Options.SysName}/{Options.AppName}/rpc/client/{Options.AppId}/";
+        var rcSubOpts = MqttFactory.CreateSubscribeOptionsBuilder()
+            .WithTopicFilter(o => o.WithTopic($"{rcTopic}+")).Build();
+        Client!.ApplicationMessageReceivedAsync += e =>
         {
-            ResponseCache.Add(ea.BasicProperties.CorrelationId, ea.Body.ToArray());
-            RpcClientChannel.BasicAck(ea.DeliveryTag, false);
-            Logger.LogDebug(
-                "RPC Response: ({BasicPropertiesCorrelationId}) {BasicPropertiesType}@{BasicPropertiesReplyTo} -> {OptionsAppName}\n{S}",
-                ea.BasicProperties.CorrelationId, ea.BasicProperties.Type, ea.BasicProperties.ReplyTo, Options.AppName,
-                Encoding.UTF8.GetString(ea.Body.ToArray()));
+            if (!e.ApplicationMessage.Topic.StartsWith(rcTopic)) return Task.CompletedTask;
+            var reqBody = e.ApplicationMessage.ConvertPayloadToString();
+            var messageId = e.ApplicationMessage.Topic.Replace(rcTopic, string.Empty);
+            if (!ResponseCompletionSources.TryGetValue(messageId, out var tcs)) return Task.CompletedTask;
+            tcs.SetResult(reqBody);
+            ResponseCompletionSources.Remove(messageId);
+            return Task.CompletedTask;
         };
-        RpcClientChannel.BasicConsume(queue, false, "", false, false, null, consumer);
+        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);
-        var router = $"server.{app}";
-        string response;
-        var props = RpcClientChannel.CreateBasicProperties();
-        props.AppId = Options.AppId;
-        props.MessageId = Guid.NewGuid().ToString();
-        props.Type = action;
-        props.ReplyTo = Options.AppName;
-        RpcClientChannel.BasicPublish(Options.SysName, router, false, props, Encoding.UTF8.GetBytes(paramJson));
-        Logger.LogDebug("RPC Request: ({PropsMessageId}) {OptionsAppName} -> {Action}@{App}\n{ParamJson}",
-            props.MessageId,
-            Options.AppName, action, app, paramJson);
-        var ts = SimApiUtil.TimestampNow;
-        while (true)
+        string paramJson;
+        if (param is string strParam)
         {
-            if (SimApiUtil.TimestampNow - ts > Options.RpcTimeout)
+            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>();
+        ResponseCompletionSources.Add(messageId, tcs);
+        var message = new MqttApplicationMessageBuilder()
+            .WithTopic(topic)
+            .WithPayload(paramJson)
+            .WithResponseTopic($"{Options.AppName},{Options.AppId}")
+            .WithContentType(messageId)
+            .WithRetainFlag(false)
+            .Build();
+        if (!Client!.IsConnected) return null;
+        Client.PublishAsync(message, CancellationToken.None).Wait();
+        logger.LogDebug(
+            "Synapse RPC Client Request: ({PropsMessageId}) {OptionsAppName} -> {Action}@{App}\n{ParamJson}", messageId,
+            Options.AppName, action, app, paramJson);
+
+        string response;
+        try
+        {
+            if (tcs.Task.Wait(Options.RpcTimeout * 1000))
+            {
+                response = tcs.Task.Result;
+                logger.LogDebug(
+                    "Synapse RPC Client Response: ({BasicPropertiesCorrelationId}) {BasicPropertiesType}@{BasicPropertiesReplyTo} -> {OptionsAppName}\n{S}",
+                    messageId, action, app, Options.AppName, response);
+            }
+            else
             {
                 response = JsonSerializer.Serialize(new SimApiBaseResponse(502, "timeout"), SimApiUtil.JsonOption);
-                break;
-            }
-            if (ResponseCache.TryGetValue(props.MessageId, out var value))
-            {
-                response = Encoding.UTF8.GetString(value);
-                ResponseCache.Remove(props.MessageId);
-                break;
             }
         }
+        catch
+        {
+            response = JsonSerializer.Serialize(new SimApiBaseResponse(500, "Synapse RPC Client Error"),
+                SimApiUtil.JsonOption);
+        }
+
         return response;
     }
 }

Synapse/RpcServer.cs

@@ -1,14 +1,12 @@
 using System;
 using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Text.Encodings.Web;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-using System.Text.Unicode;
+using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using RabbitMQ.Client.Events;
+using MQTTnet;
+using MQTTnet.Protocol;
 using SimApi.Communications;
 using SimApi.Exceptions;
 using SimApi.Helpers;
@@ -20,74 +18,81 @@ public partial class Synapse
 {
     private void RunRpcServer()
     {
-        RpcServerChannel = CreateChannel(Options.RpcProcessorNum, "RpcServer");
-        var queue = $"{Options.SysName}_{Options.AppName}_server";
-        var router = $"server.{Options.AppName}";
-        RpcServerChannel.QueueDeclare(queue, true, false, true, null);
-        RpcServerChannel.QueueBind(queue, Options.SysName, router, null);
-        var consumer = new EventingBasicConsumer(RpcServerChannel);
-        consumer.Received += (ch, ea) =>
+        var rsTopicPrefix = $"{Options.SysName}/{Options.AppName}/rpc/server/";
+        var rsSubOpts = MqttFactory.CreateSubscribeOptionsBuilder()
+            .WithTopicFilter(o =>
+                o.WithTopic($"$queue/{rsTopicPrefix}+").WithRetainHandling(MqttRetainHandling.SendAtSubscribe))
+            .Build();
+        Client!.ApplicationMessageReceivedAsync += e =>
         {
-            var reqBody = Encoding.UTF8.GetString(ea.Body.ToArray());
-            Logger.LogDebug(
-                "RPC Receive: ({BasicPropertiesMessageId}) {BasicPropertiesReplyTo} -> {BasicPropertiesType}@{OptionsAppName}\n{S}",
-                ea.BasicProperties.MessageId, ea.BasicProperties.ReplyTo, ea.BasicProperties.Type, Options.AppName,
+            if (!e.ApplicationMessage.Topic.StartsWith(rsTopicPrefix)) return Task.CompletedTask;
+            var reqBody = e.ApplicationMessage.ConvertPayloadToString();
+            var action = e.ApplicationMessage.Topic.Replace(rsTopicPrefix, string.Empty);
+            var appInfo = e.ApplicationMessage.ResponseTopic.Split(",");
+            logger.LogDebug(
+                "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");
-            var method = RpcRegistry.FirstOrDefault(x => x.Key == ea.BasicProperties.Type);
-            if (method != null)
+            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!);
+            try
             {
-                var callClass = Sp.CreateScope().ServiceProvider.GetRequiredService(method.Class);
-                var mt = callClass.GetType().GetMethod(method.Method);
-                var param = Array.Empty<object>();
-                try
+                var methodParams = mt!.GetParameters();
+                object? ret;
+                if (methodParams.Length == 0)
+                {
+                    ret = mt.Invoke(callClass, []);
+                }
+                else
                 {
                     var pt = mt.GetParameters()[0].ParameterType;
-                    if (pt == typeof(string))
-                    {
-                        param = new[] { reqBody };
-                    }
-                    else
-                    {
-                        var paramObj = JsonSerializer.Deserialize(reqBody, pt, SimApiUtil.JsonOption);
-                        param = new[] { paramObj };
-                    }
-                    var ret = mt.Invoke(callClass, param);
-                    res = new SimApiBaseResponse<object>(ret);
+                    var param = pt == typeof(string)
+                        ? [reqBody]
+                        : new[] { JsonSerializer.Deserialize(reqBody, pt, SimApiUtil.JsonOption) };
+                    ret = mt.Invoke(callClass, param);
                 }
-                catch (TargetInvocationException e)
+
+                res = new SimApiBaseResponse<object?>
                 {
-                    if (e.InnerException is SimApiException ie)
-                    {
-                        Logger.LogDebug("RPC调用错误: {Err}", ie.Message);
-                        res = new SimApiBaseResponse(ie.Code, ie.Message);
-                    }
-                    else
-                    {
-                        res = new SimApiBaseResponse(500, e.Message);
-                    }
-                }
-                catch (Exception e)
+                    Data = ret
+                };
+            }
+            catch (TargetInvocationException ex)
+            {
+                if (ex.InnerException is SimApiException ie)
                 {
-                    Logger.LogDebug("RPC调用失败: {Err}", e.Message);
-                    res = new SimApiBaseResponse(500, e.Message);
+                    logger.LogDebug("Synapse RPC调用错误: {Err}", ie.Message);
+                    res = new SimApiBaseResponse(ie.Code, ie.Message);
                 }
+                else
+                {
+                    res = new SimApiBaseResponse(500, ex.Message);
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.LogDebug("Synapse RPC调用失败: {Err}", ex.Message);
+                res = new SimApiBaseResponse(500, ex.Message);
             }
 
             var returnJson = JsonSerializer.Serialize((object)res, SimApiUtil.JsonOption);
-            var reply = $"client.{ea.BasicProperties.ReplyTo}.{ea.BasicProperties.AppId}";
-            var props = RpcServerChannel.CreateBasicProperties();
-            props.AppId = Options.AppId;
-            props.CorrelationId = ea.BasicProperties.MessageId;
-            props.MessageId = Guid.NewGuid().ToString();
-            props.ReplyTo = Options.AppName;
-            props.Type = ea.BasicProperties.Type;
-            RpcServerChannel.BasicPublish(Options.SysName, reply, false, props, Encoding.UTF8.GetBytes(returnJson));
-            Logger.LogDebug(
-                "Rpc Return: ({BasicPropertiesMessageId}) {BasicPropertiesType}@{OptionsAppName} -> {BasicPropertiesReplyTo}\n{ReturnJson}",
-                ea.BasicProperties.MessageId, ea.BasicProperties.Type, Options.AppName, ea.BasicProperties.ReplyTo,
-                returnJson);
+            var reply = $"{Options.SysName}/{appInfo[0]}/rpc/client/{appInfo[1]}/{e.ApplicationMessage.ContentType}";
+            var message = new MqttApplicationMessageBuilder()
+                .WithTopic(reply)
+                .WithPayload(returnJson)
+                .WithRetainFlag(false)
+                .Build();
+            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);
+
+            return Task.CompletedTask;
         };
-        RpcServerChannel.BasicConsume(queue, true, "", false, false, null, consumer);
+        Client.SubscribeAsync(rsSubOpts).Wait();
     }
 }

Synapse/Synapse.cs

@@ -3,188 +3,193 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using RabbitMQ.Client;
-using RabbitMQ.Client.Exceptions;
+using MQTTnet;
+using MQTTnet.Client;
+using MQTTnet.Formatter;
 using SimApi.Attributes;
 using SimApi.Communications;
-using SimApi.Configs;
+using SimApi.Configurations;
 using SimApi.Helpers;
 
 namespace SimApi;
 
-public partial class Synapse
+public partial class Synapse(SimApiOptions simApiOptions, ILogger<Synapse> logger, IServiceProvider sp)
 {
-    private IServiceProvider Sp { get; }
+    private SimApiSynapseOptions Options { get; } = simApiOptions.SimApiSynapseOptions;
 
-    private SimApiSynapseOptions Options { get; }
+    private MqttFactory MqttFactory { get; } = new();
+    public IMqttClient? Client { get; set; }
 
-    private ILogger<Synapse> Logger { get; }
+    private List<RegisterItem> EventRegistry { get; set; } = new();
 
-    private IConnection Connection { get; set; }
-
-    private IModel EventClientChannel { get; set; }
-
-    private IModel EventServerChannel { get; set; }
-
-    private IModel RpcClientChannel { get; set; }
-
-    private IModel RpcServerChannel { get; set; }
-
-    private List<RegisterItem> EventRegistry { get; set; }
-
-    private List<RegisterItem> RpcRegistry { get; set; }
-
-    public Synapse(SimApiOptions simApiOptions, ILogger<Synapse> logger, IServiceProvider sp)
-    {
-        Logger = logger;
-        Sp = sp;
-        Options = simApiOptions.SimApiSynapseOptions;
-    }
+    private List<RegisterItem> RpcRegistry { get; set; } = new();
 
     public void Init()
     {
-        ProcessAttribute();
-        Logger.LogDebug("Synapse初始化配置信息: {Json}", SimApiUtil.Json(Options));
+        logger.LogDebug("Synapse初始化配置信息: {Json}", SimApiUtil.Json(Options));
         if (string.IsNullOrEmpty(Options.AppName) || string.IsNullOrEmpty(Options.SysName))
         {
-            Logger.LogCritical("Synapse初始化失败: AppName or SysName 错误");
+            logger.LogCritical("Synapse初始化失败:  AppName 和 SysName 不能为空");
         }
+
         Options.AppId ??= Guid.NewGuid().ToString();
-        Logger.LogInformation("System Name: {SysName}\nApp Name: {AppName}\nAppId: {AppId}", Options.SysName,
-            Options.AppName, Options.AppId);
+        logger.LogInformation("Synapse Sys Name: {SysName}\nSynapse App Name: {AppName}\nSynapse App Id: {AppId}",
+            Options.SysName, Options.AppName, Options.AppId);
         CreateConnection();
-        CheckAndCreateExchange();
+        ProcessAttribute();
         //事件客户端
         if (Options.DisableEventClient)
         {
-            Logger.LogWarning("Event Client Disabled: DisableEventClient set true");
+            logger.LogWarning("Synapse Event Client Disabled: DisableEventClient set true");
         }
         else
         {
-            RunEventClient();
-            Logger.LogInformation("Event Client Ready");
+            logger.LogInformation("Synapse Event Client Ready");
         }
 
         //RPC客户端
         if (Options.DisableRpcClient)
         {
-            Logger.LogWarning("Rpc Client Disabled: DisableEventClient set true");
+            logger.LogWarning("Synapse Rpc Client Disabled: DisableEventClient set true");
         }
         else
         {
             RunRpcClient();
-            Logger.LogInformation("Rpc Client Ready, Client Timeout: {OptionsRpcTimeout}s", Options.RpcTimeout);
+            logger.LogInformation("Synapse Rpc Client Ready, Client Timeout: {OptionsRpcTimeout}s", Options.RpcTimeout);
         }
+
         if (RpcRegistry.Count > 0)
         {
             RunRpcServer();
         }
+
         if (EventRegistry.Count > 0)
         {
             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, "Rpc Client Disabled!");
+        var res = new SimApiBaseResponse(500, "Synapse Rpc Client Disabled!");
         if (Options.DisableRpcClient)
         {
-            Logger.LogError("Rpc Client Disabled!");
+            logger.LogError("Synapse Rpc Client Disabled!");
         }
         else
         {
             var data = FireRpc(appName, method, param);
             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("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()
     {
-        var factory = new ConnectionFactory
+        Client = MqttFactory.CreateMqttClient();
+        var clientOpts = new MqttClientOptionsBuilder().WithProtocolVersion(MqttProtocolVersion.V500)
+            .WithWebSocketServer(o => o.WithUri(Options.Websocket))
+            .WithCredentials(Options.Username, Options.Password)
+            .WithClientId($"{Options.AppName}:{Options.AppId}")
+            .Build();
+        Client!.ConnectAsync(clientOpts, CancellationToken.None).Wait();
+        Client.ConnectedAsync += _ =>
         {
-            HostName = Options.MqHost,
-            Port = Options.MqPort,
-            VirtualHost = Options.MqVHost,
-            UserName = Options.MqUser,
-            Password = Options.MqPass
+            logger.LogInformation("Synapse MQTT[{AppName}:{AppId}] 连接成功...", Options.AppName, Options.AppId);
+            return Task.CompletedTask;
         };
-        try
+        //重连
+        Client.DisconnectedAsync += async _ =>
         {
-            Connection = factory.CreateConnection();
-            Logger.LogInformation("连接RabbitMQ服务器成功");
-        }
-        catch (BrokerUnreachableException e)
-        {
-            Logger.LogError("连接RabbitMQ失败: \n{Err}", e);
-        }
-    }
-
-    private IModel CreateChannel(ushort processNum = 0, string desc = "unknow")
-    {
-        IModel channel = null;
-        try
-        {
-            var log = $"Channel [{desc}] 创建成功...";
-            channel = Connection.CreateModel();
-            if (processNum != 0)
+            logger.LogError("Synapse MQTT[{AppName}:{AppId}] 断开连接,开始重连...", Options.AppName, Options.AppId);
+            await Task.Delay(TimeSpan.FromSeconds(5));
+            try
             {
-                channel.BasicQos(0, processNum, false);
-                log += $"最大处理器数量: {processNum}";
+                logger.LogInformation("Synapse MQTT[{AppName}:{AppId}] 开始连接MQTT服务器...", Options.AppName, Options.AppId);
+                Client.ConnectAsync(clientOpts).Wait();
             }
-            Logger.LogInformation(log);
-        }
-        catch (ConnectFailureException e)
-        {
-            Logger.LogError("Channel [{{Desc}}] 创建失败...\n {0}", e);
-        }
-        return channel;
-    }
-
-    private void CheckAndCreateExchange()
-    {
-        var channel = CreateChannel(0, "Exchange");
-        try
-        {
-            channel.ExchangeDeclare(Options.SysName, ExchangeType.Topic, true, true, null);
-            Logger.LogDebug("Register Exchange Success");
-        }
-        catch (ConnectFailureException e)
-        {
-            Logger.LogError("Failed to declare Exchange.\n {Err}", e);
-        }
-        channel.Close();
-        Logger.LogDebug("Exchange Channel Closed");
+            catch
+            {
+                logger.LogError("Synapse MQTT[{AppName}:{AppId}] 重连失败...", Options.AppName, Options.AppId);
+            }
+        };
     }
 
     private void ProcessAttribute()
     {
-        EventRegistry = new List<RegisterItem>();
-        RpcRegistry = new List<RegisterItem>();
         var stackTrace = new StackTrace();
-        var callingMethod = stackTrace.GetFrame(stackTrace.FrameCount - 1).GetMethod();
-        var assembly = callingMethod.DeclaringType.Assembly;
-        var types = assembly.GetTypes(); // 获取程序集中的所有类型
+        var callingMethod = stackTrace.GetFrame(stackTrace.FrameCount - 1)?.GetMethod();
+        var assembly = callingMethod?.DeclaringType?.Assembly;
+        var types = assembly!.GetTypes(); // 获取程序集中的所有类型
         foreach (var type in types)
         {
             var methods = type.GetMethods(); // 获取类型中的所有方法
@@ -193,46 +198,84 @@ public partial class Synapse
                 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}");
-        Logger.LogInformation(">>> Synapse System 读取Event方法:{Event}\n>>>Synapse System 读取RPC方法:{Rpc}", events, 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; set; }
+    public string? Key { get; init; }
 
-    public Type Class { get; set; }
+    public Type? Class { get; init; }
 
-    public string Method { get; set; }
+    public string? Method { get; init; }
 }