Compare commits

...
2 Commits
Author SHA1 Message Date
xrain e27d5e1c77 fix data 2024-09-08 14:42:51 +08:00
xrain 6af68da3eb timeout rpc supported 2024-09-05 15:06:44 +08:00
3 changed files with 27 additions and 6 deletions
+17
View File
@@ -1,4 +1,7 @@
using System; using System;
using System.Diagnostics;
using System.Linq;
using System.Reflection;
using SimApi.Helpers; using SimApi.Helpers;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
@@ -7,6 +10,7 @@ using SimApi.Middlewares;
using Microsoft.AspNetCore.HttpOverrides; using Microsoft.AspNetCore.HttpOverrides;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using SimApi.Attributes;
using SimApi.CoceSdk; using SimApi.CoceSdk;
using SimApi.Configurations; using SimApi.Configurations;
using SimApi.Logger; using SimApi.Logger;
@@ -53,6 +57,19 @@ public static class SimApiExtensions
if (simApiOptions.EnableSynapse) if (simApiOptions.EnableSynapse)
{ {
builder.AddSingleton<Synapse>(); builder.AddSingleton<Synapse>();
//自动依赖注入
var stackTrace = new StackTrace();
var callingMethod = stackTrace.GetFrame(stackTrace.FrameCount - 1)?.GetMethod();
var assembly = callingMethod?.DeclaringType?.Assembly;
var types = assembly?.GetTypes() ?? [];
foreach (var type in types)
{
var methodsWithSynapse = type.GetMethods()
.Where(m => m.GetCustomAttribute<SynapseRpcAttribute>() != null ||
m.GetCustomAttribute<SynapseEventAttribute>() != null);
if (!methodsWithSynapse.Any()) continue;
builder.AddScoped(type);
}
} }
// 使用SimApiDoc // 使用SimApiDoc
+4 -2
View File
@@ -40,7 +40,8 @@ public partial class Synapse
Client!.SubscribeAsync(rcSubOpts).Wait(); Client!.SubscribeAsync(rcSubOpts).Wait();
} }
private string? FireRpc(string app, string action, object? param, Dictionary<string, string>? headers = null) private string? FireRpc(string app, string action, object? param, Dictionary<string, string>? headers = null,
int? timeout = null)
{ {
string paramJson; string paramJson;
if (param is string strParam) if (param is string strParam)
@@ -77,7 +78,8 @@ public partial class Synapse
string response; string response;
try try
{ {
if (tcs.Task.Wait(Options.RpcTimeout * 1000)) timeout ??= Options.RpcTimeout;
if (tcs.Task.Wait(timeout.Value * 1000))
{ {
response = tcs.Task.Result; response = tcs.Task.Result;
logger.LogDebug( logger.LogDebug(
+6 -4
View File
@@ -88,10 +88,11 @@ public partial class Synapse(SimApiOptions simApiOptions, ILogger<Synapse> logge
/// <param name="method"></param> /// <param name="method"></param>
/// <param name="param"></param> /// <param name="param"></param>
/// <param name="headers"></param> /// <param name="headers"></param>
/// <param name="timeout"></param>
/// <typeparam name="T"></typeparam> /// <typeparam name="T"></typeparam>
/// <returns></returns> /// <returns></returns>
public SimApiBaseResponse<T> Rpc<T>(string appName, string method, dynamic? param = null, public SimApiBaseResponse<T> Rpc<T>(string appName, string method, dynamic? param = null,
Dictionary<string, string>? headers = null) Dictionary<string, string>? headers = null, int? timeout = null)
{ {
var res = new SimApiBaseResponse(500, "Synapse Rpc Client Disabled!"); var res = new SimApiBaseResponse(500, "Synapse Rpc Client Disabled!");
if (Options.DisableRpcClient) if (Options.DisableRpcClient)
@@ -100,7 +101,7 @@ public partial class Synapse(SimApiOptions simApiOptions, ILogger<Synapse> logge
} }
else else
{ {
var data = FireRpc(appName, method, param, headers); var data = FireRpc(appName, method, param, headers, timeout);
res = JsonSerializer.Deserialize<SimApiBaseResponse<T>>(data, SimApiUtil.JsonOption); res = JsonSerializer.Deserialize<SimApiBaseResponse<T>>(data, SimApiUtil.JsonOption);
} }
@@ -114,11 +115,12 @@ public partial class Synapse(SimApiOptions simApiOptions, ILogger<Synapse> logge
/// <param name="method"></param> /// <param name="method"></param>
/// <param name="param"></param> /// <param name="param"></param>
/// <param name="headers"></param> /// <param name="headers"></param>
/// <param name="timeout"></param>
/// <returns></returns> /// <returns></returns>
public SimApiBaseResponse<object> Rpc(string appName, string method, dynamic? param = null, public SimApiBaseResponse<object> Rpc(string appName, string method, dynamic? param = null,
Dictionary<string, string>? headers = null) Dictionary<string, string>? headers = null, int? timeout = null)
{ {
return Rpc<object>(appName, method, param, headers); return Rpc<object>(appName, method, param, headers, timeout);
} }