use Task insteadof while improve performance

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/SimApiSynapseOptions.cs

@@ -2,28 +2,22 @@ namespace SimApi.Configurations;
 
 public class SimApiSynapseOptions
 {
-    public string MqHost { get; set; }
+    /// <summary>
+    /// Mqtt服务器的Websocket地址
+    /// </summary>
+    public string Websocket { get; set; }
 
-    public int MqPort { get; set; }
+    public string Username { get; set; }
 
-    public string MqUser { get; set; }
-
-    public string MqPass { get; set; }
-
-    public string MqVHost { 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;
-
     public bool DisableEventClient { get; set; } = false;
 
     public bool DisableRpcClient { get; set; } = false;

Controllers/SimApiCommonController.cs

@@ -51,4 +51,10 @@ public class SimApiCommonController(SimApiAuth auth) : SimApiBaseController
         auth.Logout(token!);
         return new SimApiBaseResponse();
     }
+    
+    [HttpPost("/logined"),SimApiAuth]
+    public SimApiBaseResponse<SimApiLoginItem> UserInfo()
+    {
+        return new SimApiBaseResponse<SimApiLoginItem>(LoginInfo);
+    }
 }

Helpers/SimApiAuth.cs

@@ -1,5 +1,6 @@
 #nullable enable
 using System;
+using System.Collections.Generic;
 using System.Text.Json;
 using Microsoft.Extensions.Caching.Distributed;
 using SimApi.Communications;
@@ -16,11 +17,12 @@ public class SimApiAuth(IDistributedCache cache)
     /// </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>
@@ -28,16 +30,33 @@ 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>

Helpers/SimApiStorage.cs

@@ -1,20 +1,24 @@
-using System;
+#nullable enable
+using System;
 using System.IO;
 using Microsoft.AspNetCore.Http;
 using Minio;
+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 Bucket { get; }
+    private string Endpoint { get; }
+
+    public string Bucket { get; }
 
     private IHttpContextAccessor HttpContextAccessor { get; }
 
@@ -22,6 +26,7 @@ public class SimApiStorage
     {
         var options = apiOptions.SimApiStorageOptions;
         HttpContextAccessor = httpContextAccessor;
+        Endpoint = options.Endpoint;
         var useSsl = false;
         string endpoint;
         if (options.Endpoint.StartsWith("http://"))
@@ -39,6 +44,7 @@ public class SimApiStorage
         }
 
         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);
@@ -62,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>
@@ -76,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))
@@ -99,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);

Logger/SimApiLogger.cs

@@ -30,5 +30,6 @@ public class SimApiLogger(string name) : ILogger
         }
 
         Console.WriteLine(message);
+        Console.ResetColor();
     }
 }

SimApi.csproj

@@ -25,10 +25,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,6 +5,7 @@ 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.Configurations;
 using SimApi.Logger;
@@ -189,6 +190,35 @@ 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>

Synapse/EventClient.cs

@@ -1,31 +1,25 @@
-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()
-    {
-        EventClientChannel = CreateChannel(0, "EventClient");
-    }
-
-    private void FireEvent(string eventName, object param)
+    private bool FireEvent(string eventName, object param, bool retain = false)
     {
         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);
+        var topic = $"{Options.SysName}/{Options.AppName}/event/{eventName}";
+        var message = new MqttApplicationMessageBuilder()
+            .WithTopic(topic)
+            .WithPayload(paramJson)
+            .WithRetainFlag(retain)
+            .Build();
+        if (!Client!.IsConnected) return false;
+        Client!.PublishAsync(message, CancellationToken.None).Wait();
+        logger.LogDebug("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.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using RabbitMQ.Client.Events;
+using MQTTnet;
+using MQTTnet.Protocol;
 using SimApi.Helpers;
 
 namespace SimApi;
@@ -13,38 +14,36 @@ 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}/{Options.AppName}/event/";
+        var eventSubOpts = MqttFactory.CreateSubscribeOptionsBuilder()
+            .WithTopicFilter(o =>
+                o.WithTopic($"$queue/{esTopicPrefix}+").WithRetainHandling(MqttRetainHandling.SendAtSubscribe))
+            .Build();
+        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: {AppName}.{EventName}\n{Body}",
+                Options.AppName, eventName, reqBody);
 
-            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 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;
+            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)
+            catch (Exception ex)
             {
-                Logger.LogError("Event Processor Error: {Err}", e.InnerException);
-                EventServerChannel.BasicNack(ea.DeliveryTag, false, false);
+                logger.LogError("SynapseEvent Processor Error: {Err}", ex.InnerException);
             }
+            return Task.CompletedTask;
         };
-        EventServerChannel.BasicConsume(queue, false, "", false, false, null, consumer);
+        Client.SubscribeAsync(eventSubOpts).Wait();
     }
 }

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,67 @@ 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)
     {
         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,
+        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);
-        var ts = SimApiUtil.TimestampNow;
-        while (true)
+
+        string response;
+        try
         {
-            if (SimApiUtil.TimestampNow - ts > Options.RpcTimeout)
+            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,10 +1,12 @@
 using System;
 using System.Linq;
 using System.Reflection;
-using System.Text;
+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;
@@ -16,78 +18,70 @@ 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)
+            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 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 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>
-                    {
-                        Data = ret
-                    };
+                    Data = ret
+                };
+            }
+            catch (TargetInvocationException ex)
+            {
+                if (ex.InnerException is SimApiException ie)
+                {
+                    logger.LogDebug("Synapse RPC调用错误: {Err}", ie.Message);
+                    res = new SimApiBaseResponse(ie.Code, ie.Message);
                 }
-                catch (TargetInvocationException e)
+                else
                 {
-                    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)
-                {
-                    Logger.LogDebug("RPC调用失败: {Err}", e.Message);
-                    res = new SimApiBaseResponse(500, e.Message);
+                    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,9 +3,12 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
 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.Configurations;
@@ -13,69 +16,51 @@ 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 IServiceProvider Sp { get; } = sp;
 
-    private SimApiSynapseOptions Options { get; }
+    private SimApiSynapseOptions Options { get; } = simApiOptions.SimApiSynapseOptions;
 
-    private ILogger<Synapse> Logger { get; }
-
-    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 MqttFactory MqttFactory { get; } = new();
+    public IMqttClient Client { 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;
-    }
-
     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();
         //事件客户端
         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)
@@ -92,10 +77,10 @@ public partial class Synapse
 
     public SimApiBaseResponse<T> Rpc<T>(string appName, string method, dynamic param)
     {
-        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
         {
@@ -115,7 +100,7 @@ public partial class Synapse
     {
         if (Options.DisableEventClient)
         {
-            Logger.LogError("Event Client Disabled!");
+            logger.LogError("Synapse Event Client Disabled!");
         }
         else
         {
@@ -125,73 +110,43 @@ public partial class Synapse
 
     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>();
+        EventRegistry = [];
+        RpcRegistry = [];
         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(); // 获取类型中的所有方法
@@ -233,15 +188,16 @@ public partial class Synapse
             (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);
+        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; }
 }