library/simapi-net
1
0
Fork 0
Code Pull Requests Activity

1. RpcServer can return not found , 2. Event server process all parllels

Browse Source
This commit is contained in:
xrain
2024-08-05 19:55:14 +08:00
parent a4bae0226e
commit 141846d79d
2 changed files with 63 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Synapse/EventServer.cs
+24 -22
View File
@@ -1,4 +1,5 @@
using System; using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text.Json; using System.Text.Json;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
@@ -12,14 +13,13 @@ namespace SimApi;
public partial class Synapse public partial class Synapse
{ {
private string EventServerTopicPrefix => $"{Options.SysName}/event/"; private string EventServerTopicPrefix => $"{Options.SysName}/event/";
private void RunEventServer() private void RunEventServer()
{ {
Client!.ApplicationMessageReceivedAsync += e => Client!.ApplicationMessageReceivedAsync += async e =>
{ {
if (!e.ApplicationMessage.Topic.StartsWith(EventServerTopicPrefix)) return Task.CompletedTask; if (!e.ApplicationMessage.Topic.StartsWith(EventServerTopicPrefix)) return;
var reqBody = e.ApplicationMessage.ConvertPayloadToString(); var reqBody = e.ApplicationMessage.ConvertPayloadToString();
var eventName = e.ApplicationMessage.Topic.Replace(EventServerTopicPrefix, string.Empty); var eventName = e.ApplicationMessage.Topic.Replace(EventServerTopicPrefix, string.Empty);
logger.LogDebug("Synapse Event Receive: {EventName}\n{Body}", eventName, reqBody); logger.LogDebug("Synapse Event Receive: {EventName}\n{Body}", eventName, reqBody);
@@ -27,30 +27,31 @@ public partial class Synapse
.Where(x => Regex.IsMatch(eventName, .Where(x => Regex.IsMatch(eventName,
"^" + Regex.Escape(x.Key!).Replace("\\+", "[^/]+").Replace("\\#", ".*") + "$")) "^" + Regex.Escape(x.Key!).Replace("\\+", "[^/]+").Replace("\\#", ".*") + "$"))
.ToArray(); .ToArray();
foreach (var method in methods) var tasks = methods.Select(method => Task.Run(() =>
{
var callClass = sp.CreateScope().ServiceProvider.GetRequiredService(method.Class!);
var mt = callClass.GetType().GetMethod(method.Method!);
try
{ {
if (mt!.GetParameters().Length == 2) var callClass = sp.CreateScope().ServiceProvider.GetRequiredService(method.Class!);
var mt = callClass.GetType().GetMethod(method.Method!);
try
{ {
var pt = mt.GetParameters()[1].ParameterType; if (mt!.GetParameters().Length == 2)
mt.Invoke(callClass, pt == typeof(string) {
? [eventName, reqBody] var pt = mt.GetParameters()[1].ParameterType;
: [eventName, JsonSerializer.Deserialize(reqBody, pt, SimApiUtil.JsonOption)]); mt.Invoke(callClass, pt == typeof(string)
? new object?[] { eventName, reqBody }
: new object?[] { eventName, JsonSerializer.Deserialize(reqBody, pt, SimApiUtil.JsonOption) });
}
else
{
mt.Invoke(callClass, new object[] { eventName });
}
} }
else catch (Exception ex)
{ {
mt.Invoke(callClass, [eventName]); logger.LogError("Synapse Event Processor Error: {Err}\n{Stack}", ex.Message, ex.StackTrace);
} }
} }))
catch (Exception ex) .ToList();
{ await Task.WhenAll(tasks);
logger.LogError("Synapse Event Processor Error: {Err}\n{Stack}", ex.Message,ex.StackTrace);
}
}
return Task.CompletedTask;
}; };
SubEventServerTopic(); SubEventServerTopic();
} }
@@ -64,6 +65,7 @@ public partial class Synapse
{ {
topic = "$queue/" + topic; topic = "$queue/" + topic;
} }
var evSubOpts = MqttFactory.CreateSubscribeOptionsBuilder() var evSubOpts = MqttFactory.CreateSubscribeOptionsBuilder()
.WithTopicFilter(o => o.WithTopic(topic)).Build(); .WithTopicFilter(o => o.WithTopic(topic)).Build();
Client!.SubscribeAsync(evSubOpts).Wait(); Client!.SubscribeAsync(evSubOpts).Wait();
Synapse/RpcServer.cs
+39 -33
View File
@@ -32,48 +32,54 @@ public partial class Synapse
reqBody); reqBody);
SimApiBaseResponse res; SimApiBaseResponse res;
var method = RpcRegistry.FirstOrDefault(x => x.Key == action); var method = RpcRegistry.FirstOrDefault(x => x.Key == action);
if (method == null) return Task.CompletedTask; if (method == null)
var callClass = sp.CreateScope().ServiceProvider.GetRequiredService(method.Class!);
var mt = callClass.GetType().GetMethod(method.Method!);
try
{ {
var methodParams = mt!.GetParameters(); res = new SimApiBaseResponse(404, "method not found");
object? ret;
if (methodParams.Length == 0)
{
ret = mt.Invoke(callClass, []);
}
else
{
var pt = mt.GetParameters()[0].ParameterType;
var param = pt == typeof(string)
? [reqBody]
: new[] { JsonSerializer.Deserialize(reqBody, pt, SimApiUtil.JsonOption) };
ret = mt.Invoke(callClass, param);
}
res = new SimApiBaseResponse<object?>
{
Data = ret
};
} }
catch (TargetInvocationException ex) else
{ {
if (ex.InnerException is SimApiException ie) var callClass = sp.CreateScope().ServiceProvider.GetRequiredService(method.Class!);
var mt = callClass.GetType().GetMethod(method.Method!);
try
{ {
logger.LogDebug("Synapse RPC调用错误: {Err}", ie.Message); var methodParams = mt!.GetParameters();
res = new SimApiBaseResponse(ie.Code, ie.Message); object? ret;
if (methodParams.Length == 0)
{
ret = mt.Invoke(callClass, []);
}
else
{
var pt = mt.GetParameters()[0].ParameterType;
var param = pt == typeof(string)
? [reqBody]
: new[] { JsonSerializer.Deserialize(reqBody, pt, SimApiUtil.JsonOption) };
ret = mt.Invoke(callClass, param);
}
res = new SimApiBaseResponse<object?>
{
Data = ret
};
} }
else catch (TargetInvocationException ex)
{ {
if (ex.InnerException is SimApiException ie)
{
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); 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 returnJson = JsonSerializer.Serialize((object)res, SimApiUtil.JsonOption);
var reply = $"{Options.SysName}/{appInfo[0]}/rpc/client/{appInfo[1]}/{e.ApplicationMessage.ContentType}"; var reply = $"{Options.SysName}/{appInfo[0]}/rpc/client/{appInfo[1]}/{e.ApplicationMessage.ContentType}";