Compare commits

...
2 Commits
Author SHA1 Message Date
xrain 02523028db add task.run 2025-05-17 20:40:48 +08:00
xrain 7d39ab5e0b add task.run 2025-05-17 20:38:39 +08:00
2 changed files with 108 additions and 101 deletions
+5 -2
View File
@@ -18,6 +18,8 @@ public partial class Synapse
private void RunEventServer() private void RunEventServer()
{ {
Client!.ApplicationMessageReceivedAsync += async e => Client!.ApplicationMessageReceivedAsync += async e =>
{
await Task.Run(async () =>
{ {
if (!e.ApplicationMessage.Topic.StartsWith(EventServerTopicPrefix)) return; if (!e.ApplicationMessage.Topic.StartsWith(EventServerTopicPrefix)) return;
var reqBody = e.ApplicationMessage.ConvertPayloadToString(); var reqBody = e.ApplicationMessage.ConvertPayloadToString();
@@ -37,8 +39,8 @@ public partial class Synapse
{ {
var pt = mt.GetParameters()[1].ParameterType; var pt = mt.GetParameters()[1].ParameterType;
mt.Invoke(callClass, pt == typeof(string) mt.Invoke(callClass, pt == typeof(string)
? new object?[] { eventName, reqBody } ? [eventName, reqBody]
: new object?[] { eventName, JsonSerializer.Deserialize(reqBody, pt, SimApiUtil.JsonOption) }); : [eventName, JsonSerializer.Deserialize(reqBody, pt, SimApiUtil.JsonOption)]);
} }
else else
{ {
@@ -52,6 +54,7 @@ public partial class Synapse
})) }))
.ToList(); .ToList();
await Task.WhenAll(tasks); await Task.WhenAll(tasks);
});
}; };
SubEventServerTopic(); SubEventServerTopic();
} }
+10 -6
View File
@@ -20,9 +20,11 @@ public partial class Synapse
private void RunRpcServer() private void RunRpcServer()
{ {
Client!.ApplicationMessageReceivedAsync += e => Client!.ApplicationMessageReceivedAsync += async e =>
{ {
if (!e.ApplicationMessage.Topic.StartsWith(RpcServerTopicPrefix)) return Task.CompletedTask; await Task.Run(() =>
{
if (!e.ApplicationMessage.Topic.StartsWith(RpcServerTopicPrefix)) return;
var reqBody = e.ApplicationMessage.ConvertPayloadToString(); var reqBody = e.ApplicationMessage.ConvertPayloadToString();
var action = e.ApplicationMessage.Topic.Replace(RpcServerTopicPrefix, string.Empty); var action = e.ApplicationMessage.Topic.Replace(RpcServerTopicPrefix, string.Empty);
var appInfo = e.ApplicationMessage.ResponseTopic.Split(","); var appInfo = e.ApplicationMessage.ResponseTopic.Split(",");
@@ -58,7 +60,10 @@ public partial class Synapse
var pt2 = mt.GetParameters()[0].ParameterType; var pt2 = mt.GetParameters()[0].ParameterType;
var param2 = pt2 == typeof(string) var param2 = pt2 == typeof(string)
? [reqBody] ? [reqBody]
: new[] { JsonSerializer.Deserialize(reqBody, pt2, SimApiUtil.JsonOption), headerData }; : new[]
{
JsonSerializer.Deserialize(reqBody, pt2, SimApiUtil.JsonOption), headerData
};
ret = mt.Invoke(callClass, param2); ret = mt.Invoke(callClass, param2);
break; break;
default: default:
@@ -98,13 +103,12 @@ public partial class Synapse
.WithPayload(returnJson) .WithPayload(returnJson)
.WithRetainFlag(false) .WithRetainFlag(false)
.Build(); .Build();
if (!Client.IsConnected) return Task.CompletedTask; if (!Client.IsConnected) return;
Client.PublishAsync(message, CancellationToken.None).Wait(); Client.PublishAsync(message, CancellationToken.None).Wait();
logger.LogDebug( logger.LogDebug(
"Synapse Rpc Server Return: ({BasicPropertiesMessageId}) {BasicPropertiesType}@{OptionsAppName} -> {BasicPropertiesReplyTo}\n{ReturnJson}", "Synapse Rpc Server Return: ({BasicPropertiesMessageId}) {BasicPropertiesType}@{OptionsAppName} -> {BasicPropertiesReplyTo}\n{ReturnJson}",
appInfo[2], action, Options.AppName, appInfo[0], returnJson); appInfo[2], action, Options.AppName, appInfo[0], returnJson);
});
return Task.CompletedTask;
}; };
SubRpcServerTopic(); SubRpcServerTopic();
} }