Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
15f74b6570 | ||
|
|
ac4619a789 | ||
|
|
4d0f801f21 | ||
|
|
683cf9176a | ||
|
|
1ee8d941e9 | ||
|
|
1d474f596a | ||
|
|
929ddaced3 | ||
|
|
82f7e0fc00 | ||
|
|
f4bc6dc080 | ||
|
|
56b0490d1e | ||
|
|
45e19c3561 | ||
|
|
04b2be1bb7 | ||
|
|
f78c3a0e0d | ||
|
|
506704fd90 |
@@ -43,7 +43,7 @@ public class SimApiAuthAttribute : ActionFilterAttribute
|
||||
|
||||
public override void OnActionExecuting(ActionExecutingContext context)
|
||||
{
|
||||
var loginInfo = (SimApiLoginItem)context.HttpContext.Items["LoginInfo"];
|
||||
var loginInfo = (SimApiLoginItem)context.HttpContext.Items["LoginInfo"]!;
|
||||
//检测是否登录
|
||||
if (loginInfo == null)
|
||||
{
|
||||
|
||||
@@ -3,12 +3,7 @@ using System;
|
||||
namespace SimApi.Attributes;
|
||||
|
||||
[AttributeUsage(AttributeTargets.Method)]
|
||||
public class SynapseEventAttribute : Attribute
|
||||
public class SynapseEventAttribute(string? name = null) : Attribute
|
||||
{
|
||||
public string Name { get; }
|
||||
|
||||
public SynapseEventAttribute(string name)
|
||||
{
|
||||
Name = name;
|
||||
}
|
||||
public string? Name { get; } = name;
|
||||
}
|
||||
@@ -5,7 +5,7 @@ namespace SimApi.Attributes;
|
||||
[AttributeUsage(AttributeTargets.Method)]
|
||||
public class SynapseRpcAttribute : Attribute
|
||||
{
|
||||
public string Name { get; }
|
||||
public string? Name { get; }
|
||||
|
||||
public SynapseRpcAttribute()
|
||||
{
|
||||
|
||||
@@ -15,7 +15,7 @@ public class SimApiIdOnlyRequest
|
||||
/// </summary>
|
||||
public class SimApiStringIdOnlyRequest
|
||||
{
|
||||
[Required] public string Id { get; set; }
|
||||
[Required] public string? Id { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -24,7 +24,7 @@ public class SimApiStringIdOnlyRequest
|
||||
/// <typeparam name="T"></typeparam>
|
||||
public class SimApiOneFieldRequest<T>
|
||||
{
|
||||
[Required] public T Data { get; set; }
|
||||
[Required] public T? Data { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -54,7 +54,7 @@ public class SimApiBaseResponse(int code = 200, string message = "成功")
|
||||
/// <typeparam name="T"></typeparam>
|
||||
public class SimApiBasePageResponse<T>() : SimApiBaseResponse
|
||||
{
|
||||
public T List { get; set; }
|
||||
public T? List { get; set; }
|
||||
public int Page { get; set; } = 1;
|
||||
public int Count { get; set; } = 20;
|
||||
public int Total { get; set; }
|
||||
@@ -74,7 +74,7 @@ public class SimApiBasePageResponse<T>() : SimApiBaseResponse
|
||||
/// <typeparam name="T"></typeparam>
|
||||
public class SimApiBaseResponse<T>() : SimApiBaseResponse
|
||||
{
|
||||
public T Data { get; set; }
|
||||
public T? Data { get; set; }
|
||||
|
||||
public SimApiBaseResponse(T data) : this()
|
||||
{
|
||||
|
||||
@@ -5,4 +5,4 @@ namespace SimApi.Communications;
|
||||
/// <summary>
|
||||
/// 登录信息中间件
|
||||
/// </summary>
|
||||
public record SimApiLoginItem(string Id, string[] Type,Dictionary<string,string> Meta = null);
|
||||
public record SimApiLoginItem(string Id, string[] Type,Dictionary<string,string>? Meta = null);
|
||||
@@ -11,17 +11,17 @@ public class SimApiDocGroupOption
|
||||
/// <summary>
|
||||
/// 文档标识
|
||||
/// </summary>
|
||||
public string Id { get; set; }
|
||||
public string Id { get; set; } = null!;
|
||||
|
||||
/// <summary>
|
||||
/// 文档名称
|
||||
/// </summary>
|
||||
public string Name { get; set; }
|
||||
public string Name { get; set; } = null!;
|
||||
|
||||
/// <summary>
|
||||
/// 文档描述
|
||||
/// </summary>
|
||||
public string Description { get; set; }
|
||||
public string Description { get; set; } = null!;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -33,11 +33,11 @@ public class SimApiAuthOption
|
||||
|
||||
public string Description { get; set; } = "认证服务器颁发的AccessToken";
|
||||
|
||||
public string AuthorizationUrl { get; set; }
|
||||
public string AuthorizationUrl { get; set; } = null!;
|
||||
|
||||
public string TokenUrl { get; set; }
|
||||
public string TokenUrl { get; set; } = null!;
|
||||
|
||||
public Dictionary<string, string> Scopes { get; set; }
|
||||
public Dictionary<string, string> Scopes { get; set; } = null!;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -14,13 +14,13 @@ public class SimApiOptions
|
||||
/// 启用SimApiAuth,一个简单的基于Header Token的认证方式。
|
||||
/// default: false
|
||||
/// </summary>
|
||||
public bool EnableSimApiAuth { get; set; } = false;
|
||||
public bool EnableSimApiAuth { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 启用在线文档,启用后 访问 /swagger 可以查看对应的api文档。
|
||||
/// default: false
|
||||
/// </summary>
|
||||
public bool EnableSimApiDoc { get; set; } = false;
|
||||
public bool EnableSimApiDoc { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 启用异常拦截,启用后,所有的异常将被通过json反馈。
|
||||
@@ -32,7 +32,7 @@ public class SimApiOptions
|
||||
/// 开启S3兼容的存储系统。
|
||||
/// default: false
|
||||
/// </summary>
|
||||
public bool EnableSimApiStorage { get; set; } = false;
|
||||
public bool EnableSimApiStorage { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 开启ForwardHeaders,开启后可以透传负载均衡的Headers
|
||||
@@ -50,12 +50,12 @@ public class SimApiOptions
|
||||
/// 启用格式化的 Console Logger
|
||||
/// default: false
|
||||
/// </summary>
|
||||
public bool EnableLogger { get; set; } = false;
|
||||
public bool EnableLogger { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 是否启用Synapse
|
||||
/// </summary>
|
||||
public bool EnableSynapse { get; set; } = false;
|
||||
public bool EnableSynapse { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
@@ -70,7 +70,7 @@ public class SimApiOptions
|
||||
|
||||
public SimApiSynapseOptions SimApiSynapseOptions { get; set; } = new();
|
||||
|
||||
public void ConfigureSimApiSynapse(Action<SimApiSynapseOptions> options = null)
|
||||
public void ConfigureSimApiSynapse(Action<SimApiSynapseOptions>? options = null)
|
||||
{
|
||||
options?.Invoke(SimApiSynapseOptions);
|
||||
}
|
||||
@@ -80,12 +80,12 @@ public class SimApiOptions
|
||||
SimApiSynapseOptions = options;
|
||||
}
|
||||
|
||||
public void ConfigureSimApiDoc(Action<SimApiDocOptions> options = null)
|
||||
public void ConfigureSimApiDoc(Action<SimApiDocOptions>? options = null)
|
||||
{
|
||||
options?.Invoke(SimApiDocOptions);
|
||||
}
|
||||
|
||||
public void ConfigureSimApiStorage(Action<SimApiStorageOptions> options = null)
|
||||
public void ConfigureSimApiStorage(Action<SimApiStorageOptions>? options = null)
|
||||
{
|
||||
options?.Invoke(SimApiStorageOptions);
|
||||
}
|
||||
|
||||
@@ -5,19 +5,19 @@ public class SimApiStorageOptions
|
||||
/// <summary>
|
||||
/// S3 服务器入口地址
|
||||
/// </summary>
|
||||
public string Endpoint { get; set; }
|
||||
public string? Endpoint { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// S3 服务器文件访问地址
|
||||
/// </summary>
|
||||
public string ServeUrl { get; set; }
|
||||
public string? ServeUrl { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// S3服务 Bucket
|
||||
/// </summary>
|
||||
public string Bucket { get; set; }
|
||||
public string? Bucket { get; set; }
|
||||
|
||||
public string AccessKey { get; set; }
|
||||
public string? AccessKey { get; set; }
|
||||
|
||||
public string SecretKey { get; set; }
|
||||
public string? SecretKey { get; set; }
|
||||
}
|
||||
@@ -2,29 +2,24 @@ namespace SimApi.Configurations;
|
||||
|
||||
public class SimApiSynapseOptions
|
||||
{
|
||||
public string MqHost { get; set; }
|
||||
|
||||
public int MqPort { get; set; }
|
||||
|
||||
public string MqUser { get; set; }
|
||||
|
||||
public string MqPass { get; set; }
|
||||
|
||||
public string MqVHost { get; set; } = "/";
|
||||
|
||||
public string SysName { get; set; }
|
||||
|
||||
public string AppName { get; set; }
|
||||
|
||||
public string AppId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Mqtt服务器的Websocket地址
|
||||
/// </summary>
|
||||
public string? Websocket { get; set; }
|
||||
public string? Username { 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;
|
||||
|
||||
/// <summary>
|
||||
/// Event是否使用负载均衡
|
||||
/// 也就是订阅$queue主题,消息会分发给不同的AppId
|
||||
/// 如果false,多个AppId都可以同时收到消息
|
||||
/// </summary>
|
||||
public bool EventLoadBalancing { get; set; } = false;
|
||||
public bool EnableConfigStore { get; set; } = true;
|
||||
public bool DisableEventClient { get; set; } = false;
|
||||
|
||||
public bool DisableRpcClient { get; set; } = false;
|
||||
}
|
||||
@@ -18,7 +18,7 @@ public class SimApiBaseController : Controller
|
||||
/// <summary>
|
||||
/// 当前登录用户的ID
|
||||
/// </summary>
|
||||
protected SimApiLoginItem LoginInfo => (SimApiLoginItem)HttpContext.Items["LoginInfo"];
|
||||
protected SimApiLoginItem LoginInfo => (SimApiLoginItem)HttpContext.Items["LoginInfo"]!;
|
||||
|
||||
/// <summary>
|
||||
/// 验证请求参数
|
||||
@@ -26,14 +26,12 @@ public class SimApiBaseController : Controller
|
||||
/// <param name="context"></param>
|
||||
public override void OnActionExecuting(ActionExecutingContext context)
|
||||
{
|
||||
if (!context.ModelState.IsValid)
|
||||
if (context.ModelState.IsValid) return;
|
||||
foreach (var item in context.ModelState.Values.Where(item =>
|
||||
item.ValidationState == ModelValidationState.Invalid))
|
||||
{
|
||||
foreach (var item in context.ModelState.Values.Where(item =>
|
||||
item.ValidationState == ModelValidationState.Invalid))
|
||||
{
|
||||
Error(400, item.Errors.First().ErrorMessage);
|
||||
break;
|
||||
}
|
||||
Error(400, item.Errors.First().ErrorMessage);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -93,7 +91,7 @@ public class SimApiBaseController : Controller
|
||||
/// <param name="condition">检测条件</param>
|
||||
/// <param name="code">错误代码</param>
|
||||
/// <param name="message">错误描述</param>
|
||||
protected static void ErrorWhenNull(object condition, int code = 404, string message = "请求的资源不存在")
|
||||
protected static void ErrorWhenNull(object? condition, int code = 404, string message = "请求的资源不存在")
|
||||
{
|
||||
ErrorWhen(condition == null, code, message);
|
||||
}
|
||||
|
||||
@@ -41,7 +41,7 @@ public class SimApiCommonController(SimApiAuth auth) : SimApiBaseController
|
||||
[HttpPost("/auth/logout"), SimApiDoc("认证", "退出登陆")]
|
||||
public SimApiBaseResponse Logout()
|
||||
{
|
||||
string token = null;
|
||||
string? token = null;
|
||||
|
||||
if (Request.Headers.TryGetValue("Token", out var value))
|
||||
{
|
||||
|
||||
@@ -26,10 +26,10 @@ public class SimApiStorage
|
||||
{
|
||||
var options = apiOptions.SimApiStorageOptions;
|
||||
HttpContextAccessor = httpContextAccessor;
|
||||
Endpoint = options.Endpoint;
|
||||
Endpoint = options.Endpoint!;
|
||||
var useSsl = false;
|
||||
string endpoint;
|
||||
if (options.Endpoint.StartsWith("http://"))
|
||||
if (options.Endpoint!.StartsWith("http://"))
|
||||
{
|
||||
endpoint = options.Endpoint.Replace("http://", string.Empty);
|
||||
}
|
||||
@@ -43,9 +43,9 @@ public class SimApiStorage
|
||||
throw new Exception("SimApiStorage: Error Endpoint");
|
||||
}
|
||||
|
||||
ServeUrl = options.ServeUrl;
|
||||
ServeUrl = options.ServeUrl!;
|
||||
if (ServeUrl.EndsWith('/')) throw new Exception("SimApiStorage: ServeUrl must not end with /");
|
||||
Bucket = options.Bucket;
|
||||
Bucket = options.Bucket!;
|
||||
var mcb = new MinioClient().WithEndpoint(endpoint)
|
||||
.WithCredentials(options.AccessKey, options.SecretKey);
|
||||
if (useSsl)
|
||||
@@ -112,10 +112,11 @@ public class SimApiStorage
|
||||
/// <param name="path"></param>
|
||||
/// <returns></returns>
|
||||
/// <exception cref="Exception"></exception>
|
||||
public string FullUrl(string path)
|
||||
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("~/"))) throw new Exception("path must start with / or ~/");
|
||||
if (!(path.StartsWith('/') || path.StartsWith("~/"))) return path;
|
||||
var httpRequest = HttpContextAccessor.HttpContext?.Request;
|
||||
var url = $"{httpRequest?.Scheme}://{httpRequest?.Host}";
|
||||
if (string.IsNullOrEmpty(path))
|
||||
@@ -126,6 +127,27 @@ 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>
|
||||
@@ -133,7 +155,7 @@ public class SimApiStorage
|
||||
/// <returns></returns>
|
||||
public string? GetPath(string? url)
|
||||
{
|
||||
return url?.Replace($"{Endpoint}/{Bucket}", string.Empty);
|
||||
return url?.Replace($"{Endpoint}/{Bucket}", string.Empty).Replace(ServeUrl,string.Empty);
|
||||
}
|
||||
|
||||
private void CheckPath(string path)
|
||||
|
||||
+13
-5
@@ -1,16 +1,14 @@
|
||||
using System;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using SimApi.Helpers;
|
||||
|
||||
namespace SimApi.Logger;
|
||||
|
||||
public class SimApiLogger(string name) : ILogger
|
||||
{
|
||||
public IDisposable BeginScope<TState>(TState state) => default!;
|
||||
|
||||
public IDisposable BeginScope<TState>(TState state) where TState : notnull => default!;
|
||||
public bool IsEnabled(LogLevel logLevel) => true;
|
||||
|
||||
public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception,
|
||||
public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception,
|
||||
Func<TState, Exception, string> formatter)
|
||||
{
|
||||
Console.ForegroundColor = logLevel switch
|
||||
@@ -23,12 +21,22 @@ public class SimApiLogger(string name) : ILogger
|
||||
_ => ConsoleColor.White
|
||||
};
|
||||
var message =
|
||||
$"[ {name} ][ {DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff")} ][ {logLevel.ToString()} ]\n{state}\n";
|
||||
$"[ {name} ][ {DateTime.Now:yyyy-MM-dd HH:mm:ss:ffff} ][ {logLevel.ToString()} ]\n{state}\n";
|
||||
if (exception != null)
|
||||
{
|
||||
message += $"{exception}\n";
|
||||
}
|
||||
|
||||
Console.WriteLine(message);
|
||||
Console.ResetColor();
|
||||
}
|
||||
}
|
||||
|
||||
public class EmptyDisposable : IDisposable
|
||||
{
|
||||
public static EmptyDisposable Instance { get; } = new EmptyDisposable();
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
}
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Microsoft.Extensions.Logging;
|
||||
|
||||
namespace SimApi.Logger;
|
||||
|
||||
public class SimApiLoggerConfiguration
|
||||
{
|
||||
public int EventId { get; set; }
|
||||
|
||||
public Dictionary<LogLevel, ConsoleColor> LogLevels { get; set; } = new()
|
||||
{
|
||||
[LogLevel.Information] = ConsoleColor.Green
|
||||
};
|
||||
}
|
||||
@@ -14,21 +14,18 @@ public class SimApiAuthMiddleware(RequestDelegate next)
|
||||
{
|
||||
public Task Invoke(HttpContext httpContext, IDistributedCache cache, SimApiAuth auth)
|
||||
{
|
||||
string token = null;
|
||||
string? token = null;
|
||||
if (httpContext.Request.Headers.TryGetValue("Token", out var header))
|
||||
{
|
||||
token = header;
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(token))
|
||||
if (string.IsNullOrEmpty(token)) return next(httpContext);
|
||||
var login = auth.GetLogin(token);
|
||||
if (login != null)
|
||||
{
|
||||
var login = auth.GetLogin(token);
|
||||
if (login != null)
|
||||
{
|
||||
httpContext.Items.Add("LoginInfo", login);
|
||||
}
|
||||
httpContext.Items.Add("LoginInfo", login);
|
||||
}
|
||||
|
||||
return next(httpContext);
|
||||
}
|
||||
}
|
||||
@@ -20,7 +20,7 @@ public class SimApiBaseModel
|
||||
public void MapData<TS>(TS source, bool mapAll = false)
|
||||
{
|
||||
//获取要赋值的源数据不为null的项目
|
||||
var sourceProps = source.GetType().GetProperties().Where(x => x.GetValue(source) != null)
|
||||
var sourceProps = source!.GetType().GetProperties().Where(x => x.GetValue(source) != null)
|
||||
.Select(x => new
|
||||
{
|
||||
x.Name,
|
||||
@@ -49,7 +49,7 @@ public class SimApiBaseModel
|
||||
public void MapData<TS>(TS source, string[] mapFields)
|
||||
{
|
||||
//获取要赋值的源数据不为null的项目
|
||||
var sourceProps = source.GetType().GetProperties().Where(x => x.GetValue(source) != null)
|
||||
var sourceProps = source!.GetType().GetProperties().Where(x => x.GetValue(source) != null)
|
||||
.Select(x => new
|
||||
{
|
||||
x.Name,
|
||||
|
||||
+2
-1
@@ -15,6 +15,7 @@
|
||||
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
||||
<PackageVersion>5.0.2</PackageVersion>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
@@ -26,7 +27,7 @@
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Minio" Version="6.0.3" />
|
||||
<PackageReference Include="RabbitMQ.Client" Version="6.8.1" />
|
||||
<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>
|
||||
|
||||
+36
-6
@@ -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;
|
||||
@@ -18,7 +19,7 @@ public static class SimApiExtensions
|
||||
{
|
||||
//**********快捷添加**************
|
||||
public static IServiceCollection AddSimApi(this IServiceCollection builder,
|
||||
Action<SimApiOptions> options = null)
|
||||
Action<SimApiOptions>? options = null)
|
||||
{
|
||||
var simApiOptions = new SimApiOptions();
|
||||
options?.Invoke(simApiOptions);
|
||||
@@ -189,16 +190,45 @@ 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>
|
||||
/// <param name="builder"></param>
|
||||
/// <returns></returns>
|
||||
public static IApplicationBuilder UseSimApi(this IApplicationBuilder builder)
|
||||
public static WebApplication UseSimApi(this WebApplication builder)
|
||||
{
|
||||
var options = builder.ApplicationServices.GetRequiredService<SimApiOptions>();
|
||||
var options = builder.Services.GetRequiredService<SimApiOptions>();
|
||||
|
||||
var logger = builder.ApplicationServices.GetRequiredService<ILogger<SimApiOptions>>();
|
||||
var logger = builder.Services.GetRequiredService<ILogger<SimApiOptions>>();
|
||||
|
||||
logger.LogInformation("当前时区: {LocalId}", TimeZoneInfo.Local.Id);
|
||||
if (options.EnableForwardHeaders)
|
||||
@@ -247,7 +277,7 @@ public static class SimApiExtensions
|
||||
if (options.EnableSimApiStorage)
|
||||
{
|
||||
logger.LogInformation("开始配置SimApiStorage...");
|
||||
builder.ApplicationServices.GetService<SimApiStorage>();
|
||||
builder.Services.GetService<SimApiStorage>();
|
||||
}
|
||||
|
||||
if (options.EnableLowerUrl)
|
||||
@@ -257,7 +287,7 @@ public static class SimApiExtensions
|
||||
|
||||
if (options.EnableSynapse)
|
||||
{
|
||||
var synapse = builder.ApplicationServices.GetRequiredService<Synapse>();
|
||||
var synapse = builder.Services.GetRequiredService<Synapse>();
|
||||
synapse.Init();
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using MQTTnet;
|
||||
using MQTTnet.Protocol;
|
||||
|
||||
namespace SimApi;
|
||||
|
||||
public partial class Synapse
|
||||
{
|
||||
public event EventHandler<ConfigStoreItem>? OnConfigChanged;
|
||||
private Dictionary<string, string> CurrentConfig { get; } = new();
|
||||
|
||||
private string ConfigStoreTopicPrefix => $"{Options.SysName}/synapse-config-store/";
|
||||
|
||||
private bool FireSetConfig(string key, string value)
|
||||
{
|
||||
if (key.Contains('#') || key.Contains('+')) return false;
|
||||
var topic = $"{Options.SysName}/synapse-config-store/{key}";
|
||||
var message = new MqttApplicationMessageBuilder()
|
||||
.WithTopic(topic)
|
||||
.WithPayload(value)
|
||||
.WithRetainFlag()
|
||||
.Build();
|
||||
if (!Client!.IsConnected) return false;
|
||||
Client!.PublishAsync(message, CancellationToken.None).Wait();
|
||||
logger.LogDebug("Synapse Config Set: {Config} => {Data}", key, value);
|
||||
return true;
|
||||
}
|
||||
|
||||
private string? FireGetConfig(string key)
|
||||
{
|
||||
return CurrentConfig.GetValueOrDefault(key);
|
||||
}
|
||||
|
||||
private void RunConfigStoreServer()
|
||||
{
|
||||
Client!.ApplicationMessageReceivedAsync += e =>
|
||||
{
|
||||
if (!e.ApplicationMessage.Topic.StartsWith(ConfigStoreTopicPrefix)) return Task.CompletedTask;
|
||||
var reqBody = e.ApplicationMessage.ConvertPayloadToString();
|
||||
var eventName = e.ApplicationMessage.Topic.Replace(ConfigStoreTopicPrefix, string.Empty);
|
||||
CurrentConfig[eventName] = reqBody;
|
||||
OnConfigChanged?.Invoke(this, new ConfigStoreItem(eventName, reqBody));
|
||||
logger.LogDebug("Synapse Config Changed: {Config} => {Data}", eventName, reqBody);
|
||||
return Task.CompletedTask;
|
||||
};
|
||||
SubConfigStoreServerTopic();
|
||||
}
|
||||
|
||||
private void SubConfigStoreServerTopic()
|
||||
{
|
||||
var csSubOpts = MqttFactory.CreateSubscribeOptionsBuilder()
|
||||
.WithTopicFilter(o =>
|
||||
o.WithTopic($"{ConfigStoreTopicPrefix}#").WithRetainHandling(MqttRetainHandling.SendAtSubscribe))
|
||||
.Build();
|
||||
Client!.SubscribeAsync(csSubOpts).Wait();
|
||||
}
|
||||
|
||||
public record ConfigStoreItem(string Key, string Value);
|
||||
}
|
||||
+22
-20
@@ -1,31 +1,33 @@
|
||||
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()
|
||||
private bool FireEvent(string eventName, object? param)
|
||||
{
|
||||
EventClientChannel = CreateChannel(0, "EventClient");
|
||||
}
|
||||
|
||||
private void FireEvent(string eventName, object param)
|
||||
{
|
||||
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);
|
||||
string paramJson;
|
||||
if (param is string strParam)
|
||||
{
|
||||
paramJson = strParam;
|
||||
}
|
||||
else
|
||||
{
|
||||
paramJson = JsonSerializer.Serialize(param, SimApiUtil.JsonOption);
|
||||
}
|
||||
var topic = $"{Options.SysName}/event/{Options.AppName}/{eventName}";
|
||||
var message = new MqttApplicationMessageBuilder()
|
||||
.WithTopic(topic)
|
||||
.WithPayload(paramJson)
|
||||
.WithRetainFlag(false)
|
||||
.Build();
|
||||
if (!Client!.IsConnected) return false;
|
||||
Client.PublishAsync(message, CancellationToken.None).Wait();
|
||||
logger.LogDebug("Synapse Event Publish: {Event}@{App} {Json}", eventName, Options.AppName, paramJson);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
+54
-31
@@ -1,50 +1,73 @@
|
||||
using System;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Text.Json;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using RabbitMQ.Client.Events;
|
||||
using MQTTnet;
|
||||
using SimApi.Helpers;
|
||||
|
||||
namespace SimApi;
|
||||
|
||||
public partial class Synapse
|
||||
{
|
||||
|
||||
private string EventServerTopicPrefix => $"{Options.SysName}/event/";
|
||||
|
||||
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('#')))
|
||||
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);
|
||||
|
||||
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 mt = callClass.GetType().GetMethod(method.Method);
|
||||
var pt = mt.GetParameters()[0].ParameterType;
|
||||
try
|
||||
if (!e.ApplicationMessage.Topic.StartsWith(EventServerTopicPrefix)) return Task.CompletedTask;
|
||||
var reqBody = e.ApplicationMessage.ConvertPayloadToString();
|
||||
var eventName = e.ApplicationMessage.Topic.Replace(EventServerTopicPrefix, string.Empty);
|
||||
logger.LogDebug("Synapse Event Receive: {EventName}\n{Body}", eventName, reqBody);
|
||||
var methods = EventRegistry
|
||||
.Where(x => Regex.IsMatch(eventName,
|
||||
"^" + Regex.Escape(x.Key!).Replace("\\+", "[^/]+").Replace("\\#", ".*") + "$"))
|
||||
.ToArray();
|
||||
foreach (var method in methods)
|
||||
{
|
||||
mt.Invoke(callClass, pt == typeof(string)
|
||||
? new object[] { reqBody }
|
||||
: new[] { JsonSerializer.Deserialize(reqBody, pt, SimApiUtil.JsonOption) });
|
||||
EventServerChannel.BasicAck(ea.DeliveryTag, false);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Logger.LogError("Event Processor Error: {Err}", e.InnerException);
|
||||
EventServerChannel.BasicNack(ea.DeliveryTag, false, false);
|
||||
var callClass = sp.CreateScope().ServiceProvider.GetRequiredService(method.Class!);
|
||||
var mt = callClass.GetType().GetMethod(method.Method!);
|
||||
try
|
||||
{
|
||||
if (mt!.GetParameters().Length == 2)
|
||||
{
|
||||
var pt = mt.GetParameters()[1].ParameterType;
|
||||
mt.Invoke(callClass, pt == typeof(string)
|
||||
? [eventName, reqBody]
|
||||
: [eventName, JsonSerializer.Deserialize(reqBody, pt, SimApiUtil.JsonOption)]);
|
||||
}
|
||||
else
|
||||
{
|
||||
mt.Invoke(callClass, [eventName]);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger.LogError("Synapse Event Processor Error: {Err}\n{Stack}", ex.Message,ex.StackTrace);
|
||||
}
|
||||
}
|
||||
return Task.CompletedTask;
|
||||
};
|
||||
EventServerChannel.BasicConsume(queue, false, "", false, false, null, consumer);
|
||||
SubRpcServerTopic();
|
||||
}
|
||||
|
||||
private void SubEventServerTopic()
|
||||
{
|
||||
foreach (var ev in EventRegistry)
|
||||
{
|
||||
var topic = $"{EventServerTopicPrefix}{ev.Key}";
|
||||
if (Options.EventLoadBalancing)
|
||||
{
|
||||
topic = "$queue/" + topic;
|
||||
}
|
||||
var evSubOpts = MqttFactory.CreateSubscribeOptionsBuilder()
|
||||
.WithTopicFilter(o => o.WithTopic(topic)).Build();
|
||||
Client!.SubscribeAsync(evSubOpts).Wait();
|
||||
logger.LogDebug("Synapse Event Register Event Success: {EventName}\nFull Topic: {Topic}", ev.Key, topic);
|
||||
}
|
||||
}
|
||||
}
|
||||
+66
-40
@@ -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,57 +12,82 @@ namespace SimApi;
|
||||
|
||||
public partial class Synapse
|
||||
{
|
||||
private Dictionary<string, byte[]> ResponseCache { get; } = new();
|
||||
private Dictionary<string, TaskCompletionSource<string>> ResponseCompletionSources { get; } = new();
|
||||
|
||||
private string EventClientTopicPrefix => $"{Options.SysName}/{Options.AppName}/rpc/client/{Options.AppId}/";
|
||||
|
||||
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) =>
|
||||
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(EventClientTopicPrefix)) return Task.CompletedTask;
|
||||
var reqBody = e.ApplicationMessage.ConvertPayloadToString();
|
||||
var messageId = e.ApplicationMessage.Topic.Replace(EventClientTopicPrefix, 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);
|
||||
SubRpcClientTopic();
|
||||
}
|
||||
|
||||
private string FireRpc(string app, string action, object param)
|
||||
private void SubRpcClientTopic()
|
||||
{
|
||||
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 ts = SimApiUtil.TimestampNow;
|
||||
while (true)
|
||||
var rcSubOpts = MqttFactory.CreateSubscribeOptionsBuilder()
|
||||
.WithTopicFilter(o => o.WithTopic($"{EventClientTopicPrefix}+")).Build();
|
||||
Client!.SubscribeAsync(rcSubOpts).Wait();
|
||||
}
|
||||
|
||||
private string? FireRpc(string app, string action, object? param)
|
||||
{
|
||||
string paramJson;
|
||||
if (param is string strParam)
|
||||
{
|
||||
if (SimApiUtil.TimestampNow - ts > Options.RpcTimeout)
|
||||
paramJson = strParam;
|
||||
}
|
||||
else
|
||||
{
|
||||
paramJson = JsonSerializer.Serialize(param, SimApiUtil.JsonOption);
|
||||
}
|
||||
|
||||
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);
|
||||
|
||||
string response;
|
||||
try
|
||||
{
|
||||
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;
|
||||
}
|
||||
}
|
||||
+73
-62
@@ -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;
|
||||
@@ -14,80 +16,89 @@ namespace SimApi;
|
||||
|
||||
public partial class Synapse
|
||||
{
|
||||
private string RpcServerTopicPrefix => $"{Options.SysName}/{Options.AppName}/rpc/server/";
|
||||
|
||||
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) =>
|
||||
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(RpcServerTopicPrefix)) return Task.CompletedTask;
|
||||
var reqBody = e.ApplicationMessage.ConvertPayloadToString();
|
||||
var action = e.ApplicationMessage.Topic.Replace(RpcServerTopicPrefix, 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)
|
||||
SimApiBaseResponse res;
|
||||
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 methodParams = mt!.GetParameters();
|
||||
object? ret;
|
||||
if (methodParams.Length == 0)
|
||||
{
|
||||
ret = mt.Invoke(callClass, []);
|
||||
}
|
||||
else
|
||||
{
|
||||
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 param = pt == typeof(string)
|
||||
? [reqBody]
|
||||
: new[] { JsonSerializer.Deserialize(reqBody, pt, SimApiUtil.JsonOption) };
|
||||
ret = mt.Invoke(callClass, param);
|
||||
}
|
||||
|
||||
var ret = mt.Invoke(callClass, param);
|
||||
res = new SimApiBaseResponse<object>
|
||||
{
|
||||
Data = ret
|
||||
};
|
||||
}
|
||||
catch (TargetInvocationException e)
|
||||
res = new SimApiBaseResponse<object?>
|
||||
{
|
||||
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)
|
||||
Data = ret
|
||||
};
|
||||
}
|
||||
catch (TargetInvocationException ex)
|
||||
{
|
||||
if (ex.InnerException is SimApiException ie)
|
||||
{
|
||||
Logger.LogDebug("RPC调用失败: {Err}", e.Message);
|
||||
res = new SimApiBaseResponse(500, e.Message);
|
||||
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);
|
||||
}
|
||||
|
||||
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);
|
||||
SubRpcServerTopic();
|
||||
}
|
||||
|
||||
public void SubRpcServerTopic()
|
||||
{
|
||||
var rsSubOpts = MqttFactory.CreateSubscribeOptionsBuilder()
|
||||
.WithTopicFilter(o =>
|
||||
o.WithTopic($"$queue/{RpcServerTopicPrefix}+").WithRetainHandling(MqttRetainHandling.SendAtSubscribe))
|
||||
.Build();
|
||||
Client!.SubscribeAsync(rsSubOpts).Wait();
|
||||
}
|
||||
}
|
||||
+169
-130
@@ -3,9 +3,13 @@ using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Linq;
|
||||
using System.Text.Json;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
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 +17,49 @@ 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 SimApiSynapseOptions Options { get; } = simApiOptions.SimApiSynapseOptions;
|
||||
|
||||
private SimApiSynapseOptions Options { get; }
|
||||
private MqttFactory MqttFactory { get; } = new();
|
||||
public IMqttClient? Client { get; set; }
|
||||
|
||||
private ILogger<Synapse> Logger { get; }
|
||||
private List<RegisterItem> EventRegistry { get; set; } = new();
|
||||
|
||||
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 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;
|
||||
}
|
||||
private List<RegisterItem> RpcRegistry { get; set; } = new();
|
||||
|
||||
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();
|
||||
ProcessAttribute();
|
||||
//事件客户端
|
||||
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)
|
||||
@@ -87,15 +71,29 @@ public partial class Synapse
|
||||
{
|
||||
RunEventServer();
|
||||
}
|
||||
|
||||
if (Options.EnableConfigStore)
|
||||
{
|
||||
RunConfigStoreServer();
|
||||
logger.LogInformation("Synapse Config Store Ready [{SysName}] ...", Options.SysName);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public SimApiBaseResponse<T> Rpc<T>(string appName, string method, dynamic param)
|
||||
/// <summary>
|
||||
/// 调用RPC使用明确的返回值类型
|
||||
/// </summary>
|
||||
/// <param name="appName"></param>
|
||||
/// <param name="method"></param>
|
||||
/// <param name="param"></param>
|
||||
/// <typeparam name="T"></typeparam>
|
||||
/// <returns></returns>
|
||||
public SimApiBaseResponse<T> Rpc<T>(string appName, string method, dynamic? param = null)
|
||||
{
|
||||
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
|
||||
{
|
||||
@@ -103,95 +101,100 @@ public partial class Synapse
|
||||
res = JsonSerializer.Deserialize<SimApiBaseResponse<T>>(data, SimApiUtil.JsonOption);
|
||||
}
|
||||
|
||||
return res as SimApiBaseResponse<T>;
|
||||
return (res as SimApiBaseResponse<T>)!;
|
||||
}
|
||||
|
||||
public SimApiBaseResponse<object> Rpc(string appName, string method, dynamic param)
|
||||
/// <summary>
|
||||
/// 调用RPC使用object作为返回值类型
|
||||
/// </summary>
|
||||
/// <param name="appName"></param>
|
||||
/// <param name="method"></param>
|
||||
/// <param name="param"></param>
|
||||
/// <returns></returns>
|
||||
public SimApiBaseResponse<object> Rpc(string appName, string method, dynamic? param = null)
|
||||
{
|
||||
return Rpc<object>(appName, method, param);
|
||||
}
|
||||
|
||||
public void Event(string eventName, dynamic param)
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
/// <param name="eventName"></param>
|
||||
/// <param name="param"></param>
|
||||
public bool Event(string eventName, dynamic? param = null)
|
||||
{
|
||||
if (Options.DisableEventClient)
|
||||
{
|
||||
Logger.LogError("Event Client Disabled!");
|
||||
}
|
||||
else
|
||||
{
|
||||
FireEvent(eventName, param);
|
||||
}
|
||||
if (!Options.DisableEventClient) return FireEvent(eventName, param);
|
||||
logger.LogError("Synapse Event Client Disabled!");
|
||||
return false;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 设置一个系统配置项
|
||||
/// </summary>
|
||||
/// <param name="key"></param>
|
||||
/// <param name="value"></param>
|
||||
/// <returns></returns>
|
||||
public bool SetConfig(string key, string value)
|
||||
{
|
||||
if (Options.EnableConfigStore) return FireSetConfig(key, value);
|
||||
logger.LogError("Synapse Config Store Disabled!");
|
||||
return false;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 读取一个配置项,如果没有则为空
|
||||
/// </summary>
|
||||
/// <param name="key"></param>
|
||||
/// <returns></returns>
|
||||
public string? GetConfig(string key)
|
||||
{
|
||||
if (Options.EnableConfigStore) return FireGetConfig(key);
|
||||
logger.LogError("Synapse Config Store Disabled!");
|
||||
return null;
|
||||
}
|
||||
|
||||
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);
|
||||
//RPC客户端
|
||||
if (!Options.DisableRpcClient) SubRpcClientTopic();
|
||||
if (RpcRegistry.Count > 0) SubRpcServerTopic();
|
||||
if (EventRegistry.Count > 0) SubEventServerTopic();
|
||||
if (Options.EnableConfigStore) SubConfigStoreServerTopic();
|
||||
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>();
|
||||
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(); // 获取类型中的所有方法
|
||||
@@ -200,48 +203,84 @@ public partial class Synapse
|
||||
if (method.IsDefined(typeof(SynapseEventAttribute), false))
|
||||
{
|
||||
var attribute =
|
||||
(SynapseEventAttribute)Attribute.GetCustomAttribute(method, typeof(SynapseEventAttribute));
|
||||
if (attribute != null)
|
||||
(SynapseEventAttribute)Attribute.GetCustomAttribute(method, typeof(SynapseEventAttribute))!;
|
||||
var tmp = new RegisterItem
|
||||
{
|
||||
EventRegistry.Add(new RegisterItem
|
||||
{
|
||||
Key = attribute.Name ?? method.Name,
|
||||
Class = type,
|
||||
Method = method.Name
|
||||
});
|
||||
Key = attribute.Name ?? method.Name,
|
||||
Class = type,
|
||||
Method = method.Name
|
||||
};
|
||||
if (tmp.Key.StartsWith('/') || tmp.Key.EndsWith('/'))
|
||||
{
|
||||
logger.LogError("Synapse Event Register Error: {Key} Can't start or end of '/'", tmp.Key);
|
||||
continue;
|
||||
}
|
||||
|
||||
var callClass = sp.CreateScope().ServiceProvider.GetRequiredService(tmp.Class!);
|
||||
var mt = callClass.GetType().GetMethod(tmp.Method);
|
||||
if (mt!.GetParameters().Length > 2 || mt.GetParameters().Length < 1)
|
||||
{
|
||||
logger.LogError(
|
||||
"Synapse Event Register Error: Only one or two parameter supported. {Key} -> {Method}@{Class}",
|
||||
tmp.Key, tmp.Method, tmp.Class.Name);
|
||||
continue;
|
||||
}
|
||||
|
||||
EventRegistry.Add(tmp);
|
||||
}
|
||||
|
||||
if (method.IsDefined(typeof(SynapseRpcAttribute), false))
|
||||
{
|
||||
var attribute =
|
||||
(SynapseRpcAttribute)Attribute.GetCustomAttribute(method, typeof(SynapseRpcAttribute));
|
||||
if (attribute != null)
|
||||
(SynapseRpcAttribute)Attribute.GetCustomAttribute(method, typeof(SynapseRpcAttribute))!;
|
||||
var tmp = new RegisterItem
|
||||
{
|
||||
RpcRegistry.Add(new RegisterItem
|
||||
{
|
||||
Key = attribute.Name ?? $"{type.Name}.{method.Name}",
|
||||
Class = type,
|
||||
Method = method.Name
|
||||
});
|
||||
Key = attribute.Name ?? $"{type.Name}.{method.Name}",
|
||||
Class = type,
|
||||
Method = method.Name
|
||||
};
|
||||
if (tmp.Key.Contains('/') || tmp.Key.Contains('#') || tmp.Key.Contains('+'))
|
||||
{
|
||||
logger.LogError("Synapse Rpc Register Error: {Key} contains '/' , '#' , '+'", tmp.Key);
|
||||
continue;
|
||||
}
|
||||
|
||||
var callClass = sp.CreateScope().ServiceProvider.GetRequiredService(tmp.Class!);
|
||||
var mt = callClass.GetType().GetMethod(tmp.Method);
|
||||
if (mt!.GetParameters().Length > 1)
|
||||
{
|
||||
logger.LogError(
|
||||
"Synapse Rpc Register Error: Only one or none parameter supported. {Key} -> {Method}@{Class}",
|
||||
tmp.Key, tmp.Method, tmp.Class.Name);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (RpcRegistry.Any(x => x.Key == tmp.Key))
|
||||
{
|
||||
logger.LogError("Synapse Rpc Register Error: {Key} Already Exists -> {Method}@{Class}", tmp.Key,
|
||||
tmp.Method, tmp.Class.Name);
|
||||
continue;
|
||||
}
|
||||
|
||||
RpcRegistry.Add(tmp);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var events = EventRegistry.Aggregate(string.Empty,
|
||||
(current, ev) => current + $"\n |- {ev.Key} -> {ev.Method}@{ev.Class.Name}");
|
||||
(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);
|
||||
(current, ev) => current + $"\n |- {ev.Key} -> {ev.Method}@{ev.Class!.Name}");
|
||||
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; }
|
||||
}
|
||||
Reference in New Issue
Block a user