diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamWebSocketServer.cs b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamWebSocketServer.cs index c40f14d42..e537489a9 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamWebSocketServer.cs +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamWebSocketServer.cs @@ -58,7 +58,16 @@ public class DataStreamWebSocketServer : IDisposable, IAsyncDisposable { async Task onSubscribe(JsonRpcRequest req, CancellationToken cancellationToken) { ArgumentNullException.ThrowIfNull(req.Id); ArgumentException.ThrowIfNullOrEmpty(req.Method); - if (!SubscribeRequest.ParseQuery(req, out var vs, out var subId, out var parseErr, out var errCode)) { + if (!SubscribeRequest.Parse(req, out var subReq, out var parseErr, out var errCode)) { + logger.LogError("Invalid 'subscribe' request: {Reason}", parseErr); + var rpcError = JsonRpcResponse.CreateError( + req.Id, new() { Code = (long)errCode, Message = "Failed to parse subscription request", Data = parseErr }); + await send(rpcError, cancellationToken); + return; + } + var subId = subReq.SubscriptionId ?? throw new InvalidOperationException("SubscriptionId is null (parse false)"); + disposeSubscription(subId); + if (!subReq.ParseQuery(out var vs, out parseErr, out errCode)) { logger.LogError("Invalid 'subscribe' request: {Reason}", parseErr); var rpcError = JsonRpcResponse.CreateError( req.Id, new() { Code = (long)errCode, Message = "Failed to parse subscription request", Data = parseErr }); @@ -79,14 +88,18 @@ public class DataStreamWebSocketServer : IDisposable, IAsyncDisposable { ArgumentNullException.ThrowIfNull(req.Id); ArgumentException.ThrowIfNullOrEmpty(req.Method); var subId = req.Params?.SubscriptionId ?? string.Empty; + disposeSubscription(subId); + await sendSubscriptionStatus(req.Id.Value, subId, "unsubscribe", SubscriptionStatus.Unsubscribed, cancellationToken); + } + + void disposeSubscription(string subId) { if (!subscriptions.TryGetValue(subId, out var sub)) { - logger.LogInformation("Ignoring '{Method}' request because no subscription was found with id {Id}.", req.Method, subId); + logger.LogInformation("Unable to dispose subscription. Subscription with id {Id} not found.", subId); return; } - logger.LogInformation("Disposing subscription"); + logger.LogInformation("Disposing subscription with id {Id}", subId); sub.Dispose(); subscriptions.Remove(subId); - await sendSubscriptionStatus(req.Id.Value, subId, req.Method, SubscriptionStatus.Unsubscribed, cancellationToken); } Task sendSubscriptionStatus(JsonRpcId reqId, string subId, string method, SubscriptionStatus status, CancellationToken cancellationToken) { diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Messages/SubscribeRequest.cs b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Messages/SubscribeRequest.cs index 7ce72bebc..cc0dcb0b0 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Messages/SubscribeRequest.cs +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Messages/SubscribeRequest.cs @@ -18,9 +18,8 @@ public class SubscribeRequest { [JsonPropertyName("subscription_id")] public string? SubscriptionId { get; set; } - internal static bool ParseQuery(JsonRpcRequest req, [NotNullWhen(true)] out ViewStream? stream, [NotNullWhen(true)] out string? subscriptionId, [NotNullWhen(false)] out QueryParseError? error, out ErrorCode errorCode) { - stream = null; - subscriptionId = null; + internal static bool Parse(JsonRpcRequest req, [NotNullWhen(true)]out SubscribeRequest? subscription, [NotNullWhen(false)]out QueryParseError? error, out ErrorCode errorCode) { + subscription = null; errorCode = ErrorCode.None; var paramsJsonObj = req.Params?.AsObject(); error = null; @@ -29,20 +28,25 @@ public class SubscribeRequest { error = new() { ErrorMessage = "'params' object not found" }; return false; } - var subReq = paramsJsonObj.Deserialize(); - if (subReq is null) { + subscription = paramsJsonObj.Deserialize(); + if (subscription is null) { errorCode = ErrorCode.InvalidSubscriptionRequest; error = new() { ErrorMessage = "'params' object invalid" }; return false; } - subscriptionId = subReq.SubscriptionId ?? string.Empty; - var query = subReq.Query; - if (query is null) { + return true; + } + + internal bool ParseQuery([NotNullWhen(true)] out ViewStream? stream, [NotNullWhen(false)] out QueryParseError? error, out ErrorCode errorCode) { + stream = null; + errorCode = ErrorCode.None; + error = null; + if (Query is null) { errorCode = ErrorCode.InvalidSubscriptionRequest; error = new() { ErrorMessage = "'params.query' field not found (expected a string)" }; return false; } - var exp = DataStreamExpressionsInterpreter.Evaluate(query); + var exp = DataStreamExpressionsInterpreter.Evaluate(Query); if (exp is null) { errorCode = ErrorCode.InvalidSubscriptionRequest; error = new() { ErrorMessage = "'params.query' expression has invalid syntax" };