Skip to content

Commit ce668bd

Browse files
committed
chore: 处理警告;release version
1 parent 930add5 commit ce668bd

4 files changed

Lines changed: 19 additions & 2 deletions

File tree

Cyaim.WebSocketServer/Cluster/Cyaim.WebSocketServer.Cluster.RabbitMQ/RabbitMQClusterTransport.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,13 @@ public async Task StartAsync()
123123
var messageJson = Encoding.UTF8.GetString(body);
124124
var clusterMessage = JsonSerializer.Deserialize<ClusterMessage>(messageJson);
125125

126+
if (clusterMessage == null)
127+
{
128+
_logger.LogWarning("Received null or invalid message from RabbitMQ");
129+
await _channel.BasicAckAsync(ea.DeliveryTag, false);
130+
return;
131+
}
132+
126133
// Skip messages from self / 跳过来自自己的消息
127134
if (clusterMessage.FromNodeId == _nodeId)
128135
{

Cyaim.WebSocketServer/Cyaim.WebSocketServer.SourceGenerator/EndpointInjectorGenerator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,14 @@ public void Execute(GeneratorExecutionContext context)
6969
}
7070
}
7171

72-
private IPropertySymbol FindProperty(INamedTypeSymbol classSymbol, string propertyName)
72+
private IPropertySymbol? FindProperty(INamedTypeSymbol classSymbol, string propertyName)
7373
{
7474
return classSymbol.GetMembers(propertyName)
7575
.OfType<IPropertySymbol>()
7676
.FirstOrDefault(p => p.SetMethod != null && !p.SetMethod.IsStatic);
7777
}
7878

79-
private string GenerateInjectorCode(string namespaceName, string className, string classFullName, IPropertySymbol httpContextProperty, IPropertySymbol webSocketProperty)
79+
private string GenerateInjectorCode(string namespaceName, string className, string classFullName, IPropertySymbol? httpContextProperty, IPropertySymbol? webSocketProperty)
8080
{
8181
var sb = new StringBuilder();
8282
sb.AppendLine("using Cyaim.WebSocketServer.Infrastructure.Injectors;");

Cyaim.WebSocketServer/Cyaim.WebSocketServer/Infrastructure/Cluster/ClusterChannelHandler.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,11 @@ private static async Task HandleClusterConnection(WebSocket webSocket, HttpConte
8989
try
9090
{
9191
var message = JsonSerializer.Deserialize<ClusterMessage>(messageJson);
92+
if (message == null)
93+
{
94+
logger.LogWarning("Received null or invalid cluster message");
95+
continue;
96+
}
9297

9398
// Identify the node from the message
9499
// 从消息中识别节点

Cyaim.WebSocketServer/Cyaim.WebSocketServer/Infrastructure/Cluster/Transports/WebSocketClusterTransport.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,11 @@ private async Task ReceiveMessagesAsync(string nodeId, WebSocket webSocket)
271271
try
272272
{
273273
var message = JsonSerializer.Deserialize<ClusterMessage>(messageJson);
274+
if (message == null)
275+
{
276+
_logger.LogWarning($"Received null or invalid message from node {nodeId}");
277+
continue;
278+
}
274279
message.FromNodeId = nodeId;
275280

276281
MessageReceived?.Invoke(this, new ClusterMessageEventArgs

0 commit comments

Comments
 (0)