fix synapse use mqtt

Synapse/RpcClient.cs

@@ -1,9 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using RabbitMQ.Client.Events;
+using MQTTnet;
 using SimApi.Communications;
 using SimApi.Helpers;
 
@@ -11,42 +12,43 @@ namespace SimApi;
 
 public partial class Synapse
 {
-    private Dictionary<string, byte[]> ResponseCache { get; } = new();
+    private Dictionary<string, string> ResponseCache { 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);
+            ResponseCache.Add(messageId, reqBody);
+            logger.LogDebug("Synapse RPC Client Message: ({BasicPropertiesCorrelationId}) => {S}", messageId, reqBody);
+            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,
-            Options.AppName, action, app, paramJson);
+        var topic = $"{Options.SysName}/{app}/rpc/server/{action}";
+        var messageId = Guid.NewGuid().ToString();
+        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)
         {
@@ -55,13 +57,16 @@ public partial class Synapse
                 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;
-            }
+
+            if (!ResponseCache.TryGetValue(messageId, out var value)) continue;
+            response = value;
+            ResponseCache.Remove(messageId);
+            logger.LogDebug(
+                "Synapse RPC Client Response: ({BasicPropertiesCorrelationId}) {BasicPropertiesType}@{BasicPropertiesReplyTo} -> {OptionsAppName}\n{S}",
+                messageId, action, app, Options.AppName, response);
+            break;
         }
+
         return response;
     }
 }