This commit is contained in:
dingo
2026-02-28 17:02:43 -05:00
parent e18cdc6b80
commit 76e50b5be9
2 changed files with 31 additions and 9 deletions
@@ -118,15 +118,18 @@ public sealed class MessageDispatcher : IMessageDispatcher
"Dispatching '{Type}' remotely on {Subject} seq={Seq} for user {UserId}",
message.Type, subject, message.Seq, connection.UserId);
var reply = await _nats.RequestAsync<RemoteDispatchRequest, RemoteDispatchResponse>(
subject,
var requestBytes = JsonSerializer.SerializeToUtf8Bytes(
new RemoteDispatchRequest(
message.Type,
message.Seq,
message.Payload.ToArray(),
connection.UserId,
connection.DisplayName,
connection.SessionToken),
connection.SessionToken));
var reply = await _nats.RequestAsync<byte[], byte[]>(
subject,
requestBytes,
null,
null,
null,
@@ -138,8 +141,8 @@ public sealed class MessageDispatcher : IMessageDispatcher
},
timeoutCts.Token);
var remote = reply.Data;
if (remote is null)
var replyBytes = reply.Data;
if (replyBytes is null || replyBytes.Length == 0)
{
_logger.LogWarning(
"Remote dispatch for '{Type}' returned an empty reply",
@@ -147,6 +150,15 @@ public sealed class MessageDispatcher : IMessageDispatcher
return ServerMessage.Error(message.Seq, "INTERNAL_ERROR", "Internal service returned an empty reply.");
}
var remote = JsonSerializer.Deserialize<RemoteDispatchResponse>(replyBytes);
if (remote is null)
{
_logger.LogWarning(
"Remote dispatch for '{Type}' returned an unreadable reply",
message.Type);
return ServerMessage.Error(message.Seq, "INTERNAL_ERROR", "Internal service returned an invalid reply.");
}
if (!remote.Handled)
{
return ServerMessage.Error(
@@ -107,10 +107,10 @@ public sealed class NatsMessageRpcResponder : IHostedService
try
{
await foreach (var msg in _nats
.SubscribeAsync<RemoteDispatchRequest>(subject, queueGroup, cancellationToken: cancellationToken)
.SubscribeAsync<byte[]>(subject, queueGroup, cancellationToken: cancellationToken)
.WithCancellation(cancellationToken))
{
if (msg.Data is null)
if (msg.Data is null || msg.Data.Length == 0)
continue;
if (string.IsNullOrWhiteSpace(msg.ReplyTo))
@@ -121,8 +121,18 @@ public sealed class NatsMessageRpcResponder : IHostedService
continue;
}
var response = await DispatchAsync(handlerType, msg.Data, cancellationToken);
await _nats.PublishAsync(msg.ReplyTo, response, cancellationToken: cancellationToken);
var request = JsonSerializer.Deserialize<RemoteDispatchRequest>(msg.Data);
if (request is null)
{
_logger.LogWarning(
"Received unreadable RPC payload for '{Type}'",
messageType);
continue;
}
var response = await DispatchAsync(handlerType, request, cancellationToken);
var responseBytes = JsonSerializer.SerializeToUtf8Bytes(response);
await _nats.PublishAsync(msg.ReplyTo, responseBytes, cancellationToken: cancellationToken);
}
}
catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested)