From a47fc311b34c56112ef462b84eb7c0618cf698f6 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 30 Jul 2024 17:26:21 +0000 Subject: [PATCH] Propagate ViewStream errors to webapp frontend --- .../DataStreamWebSocketServer.cs | 21 ++- .../Messages/ErrorCode.cs | 1 + .../Messages/SubscribeRequest.cs | 4 +- ...ueryParseError.cs => SubscriptionError.cs} | 2 +- .../Primitives/Filter/FilterStream.cs | 134 +++++++++--------- .../DataStreamCore/DataStream.cs | 3 +- 6 files changed, 95 insertions(+), 70 deletions(-) rename src/DataStreamSuite/Bts.DataStreamWebApp.Server/Messages/{QueryParseError.cs => SubscriptionError.cs} (88%) diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamWebSocketServer.cs b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamWebSocketServer.cs index 9238fec6e..f3c35e8a5 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamWebSocketServer.cs +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamWebSocketServer.cs @@ -60,7 +60,7 @@ public class DataStreamWebSocketServer : IDisposable, IAsyncDisposable { ArgumentException.ThrowIfNullOrEmpty(req.Method); if (!SubscribeRequest.Parse(req, out var subReq, out var parseErr, out var errCode)) { logger.LogError("Invalid 'subscribe' request: {Reason}", parseErr); - var rpcError = JsonRpcResponse.CreateError( + var rpcError = JsonRpcResponse.CreateError( req.Id, new() { Code = (long)errCode, Message = "Failed to parse subscription request", Data = parseErr }); await send(rpcError, cancellationToken); return; @@ -69,7 +69,7 @@ public class DataStreamWebSocketServer : IDisposable, IAsyncDisposable { disposeSubscription(subId); if (!subReq.ParseQuery(out var vs, out parseErr, out errCode)) { logger.LogError("Invalid 'subscribe' request: {Reason}", parseErr); - var rpcError = JsonRpcResponse.CreateError( + var rpcError = JsonRpcResponse.CreateError( req.Id, new() { Code = (long)errCode, Message = "Failed to parse subscription request", Data = parseErr }); await send(rpcError, cancellationToken); return; @@ -81,7 +81,24 @@ public class DataStreamWebSocketServer : IDisposable, IAsyncDisposable { var sub = new DataStreamSubscription(subId, req.Id.Value, vs, webSocket, logger); subscriptions[subId] = sub; await sendSubscriptionStatus(req.Id.Value, subId, req.Method, SubscriptionStatus.Subscribed, cancellationToken); + vs.ErrorChanged += OnStreamError; await sub.StartAsync(cancellationToken); + + async void OnStreamError(Exception exception) { + logger.LogError("Error in ViewStream (disposing subscription): {Exception}", exception); + subscriptions.Remove(sub.Id); + sub.Dispose(); + var error = new SubscriptionError() { + ErrorMessage = "Error in ViewStream (disposing subscription)" + }; + if (exception is not null) { + error.ErrorMessage += ". " + exception.Message; + error.StackTrace = exception.StackTrace?.Split("\n")?.ToList(); + } + var rpcError = JsonRpcResponse.CreateError( + req.Id, new() { Code = (long)ErrorCode.ViewStreamError, Message = "Error in ViewStream (disposing subscription)", Data = error }); + await send(rpcError, cancellationToken); + } } async Task onUnsubscribe(JsonRpcRequest req, CancellationToken cancellationToken) { diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Messages/ErrorCode.cs b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Messages/ErrorCode.cs index 994346c9b..5efa6cfd0 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Messages/ErrorCode.cs +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Messages/ErrorCode.cs @@ -3,4 +3,5 @@ namespace Bts.DataStreamWebApp.Server.Messages; enum ErrorCode { None = 0, InvalidSubscriptionRequest, + ViewStreamError, } diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Messages/SubscribeRequest.cs b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Messages/SubscribeRequest.cs index cc0dcb0b0..fb608ecf9 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Messages/SubscribeRequest.cs +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Messages/SubscribeRequest.cs @@ -18,7 +18,7 @@ public class SubscribeRequest { [JsonPropertyName("subscription_id")] public string? SubscriptionId { get; set; } - internal static bool Parse(JsonRpcRequest req, [NotNullWhen(true)]out SubscribeRequest? subscription, [NotNullWhen(false)]out QueryParseError? error, out ErrorCode errorCode) { + internal static bool Parse(JsonRpcRequest req, [NotNullWhen(true)]out SubscribeRequest? subscription, [NotNullWhen(false)]out SubscriptionError? error, out ErrorCode errorCode) { subscription = null; errorCode = ErrorCode.None; var paramsJsonObj = req.Params?.AsObject(); @@ -37,7 +37,7 @@ public class SubscribeRequest { return true; } - internal bool ParseQuery([NotNullWhen(true)] out ViewStream? stream, [NotNullWhen(false)] out QueryParseError? error, out ErrorCode errorCode) { + internal bool ParseQuery([NotNullWhen(true)] out ViewStream? stream, [NotNullWhen(false)] out SubscriptionError? error, out ErrorCode errorCode) { stream = null; errorCode = ErrorCode.None; error = null; diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Messages/QueryParseError.cs b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Messages/SubscriptionError.cs similarity index 88% rename from src/DataStreamSuite/Bts.DataStreamWebApp.Server/Messages/QueryParseError.cs rename to src/DataStreamSuite/Bts.DataStreamWebApp.Server/Messages/SubscriptionError.cs index 04ead07f1..c295fa7ef 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Messages/QueryParseError.cs +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Messages/SubscriptionError.cs @@ -2,7 +2,7 @@ namespace Bts.DataStreamWebApp.Server.Messages; using System.Text.Json.Serialization; -public class QueryParseError { +public class SubscriptionError { [JsonPropertyName("error_message")] public string? ErrorMessage { get; set; } diff --git a/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs b/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs index 1a9f7bf99..9a0bed58b 100644 --- a/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs +++ b/src/DataStreamSuite/DataStream/Primitives/Filter/FilterStream.cs @@ -59,35 +59,38 @@ namespace BCG.StreamWorld.Addition private void myHandleChanges(object newValue) { - DataPacket dp = newValue as DataPacket; - if (myStateTable == null) - { - bts.Log.assert(myBaseTable == null); - myStateTable = new BlueTable(dp.schema); - myBaseTable = new BlueTable(dp.schema); - } - BlueTable dels = new BlueTable(dp.schema), - adds = new BlueTable(dp.schema); - foreach (IBlueRow r in dp.deletedRows) - { - myBaseTable.deleteRow(r); - if (myStateTable.containsID((int)r["id"])) + try { + DataPacket dp = newValue as DataPacket; + if (myStateTable == null) { - dels.addRow(r); - myStateTable.deleteRow(r); + bts.Log.assert(myBaseTable == null); + myStateTable = new BlueTable(dp.schema); + myBaseTable = new BlueTable(dp.schema); } - } - foreach (IBlueRow r in dp.addedRows) - { - myBaseTable.addRow(r); - if (filterRow(r)) + BlueTable dels = new BlueTable(dp.schema), + adds = new BlueTable(dp.schema); + foreach (IBlueRow r in dp.deletedRows) { - adds.addRow(r); - myStateTable.addRow(r); + myBaseTable.deleteRow(r); + if (myStateTable.containsID((int)r["id"])) + { + dels.addRow(r); + myStateTable.deleteRow(r); + } } + foreach (IBlueRow r in dp.addedRows) { + myBaseTable.addRow(r); + if (filterRow(r)) { + adds.addRow(r); + myStateTable.addRow(r); + } + } + if ((dels.Count > 0 || adds.Count > 0) || (myLastValue == null)) { + myFireEvent(new DataPacket(myStateTable, adds, dels)); + } + } catch (Exception ex) { + OnError(ex); } - if ((dels.Count > 0 || adds.Count > 0) || (myLastValue == null)) - myFireEvent(new DataPacket(myStateTable, adds, dels)); } public IStreamFilter filter @@ -242,37 +245,37 @@ namespace BCG } #endregion - private void myHandleCallbacks(object newValue) - { + private void myHandleCallbacks(object newValue) { DataPacket retVal; DataPacket arrivedPacket = newValue as DataPacket; myLastReceivedRows = arrivedPacket.newRows; - if (myLastFiredRows != null) - { - retVal = new DataPacket(myLastFiredRows, new BlueTable(myLastFiredRows.schema), - new BlueTable(myLastFiredRows.schema)); - foreach (IBlueRow r in arrivedPacket.deletedRows) - if (myLastFiredRows.containsID((int)r["id"])) - { - myLastFiredRows.deleteRow(r); - (retVal.deletedRows as BlueTable).addRow(r); + try { + if (myLastFiredRows != null) { + retVal = new DataPacket(myLastFiredRows, new BlueTable(myLastFiredRows.schema), + new BlueTable(myLastFiredRows.schema)); + foreach (IBlueRow r in arrivedPacket.deletedRows) { + if (myLastFiredRows.containsID((int)r["id"])) { + myLastFiredRows.deleteRow(r); + (retVal.deletedRows as BlueTable).addRow(r); + } } - foreach (IBlueRow r in arrivedPacket.addedRows) - if (filterRow(r)) - { - myLastFiredRows.addRow(r); - (retVal.addedRows as BlueTable).addRow(r); + foreach (IBlueRow r in arrivedPacket.addedRows) { + if (filterRow(r)) { + myLastFiredRows.addRow(r); + (retVal.addedRows as BlueTable).addRow(r); + } } + } else { + myLastFiredRows = new BlueTable(arrivedPacket.schema); + retVal = new DataPacket(myLastFiredRows, myLastFiredRows, new BlueTable(myLastFiredRows.schema)); + foreach (IBlueRow r in arrivedPacket.newRows) + if (filterRow(r)) + myLastFiredRows.addRow(r); + } + myFireEvent(retVal); + } catch (Exception ex) { + OnError(ex); } - else - { - myLastFiredRows = new BlueTable(arrivedPacket.schema); - retVal = new DataPacket(myLastFiredRows, myLastFiredRows, new BlueTable(myLastFiredRows.schema)); - foreach (IBlueRow r in arrivedPacket.newRows) - if (filterRow(r)) - myLastFiredRows.addRow(r); - } - myFireEvent(retVal); } public IStreamFilter filter @@ -288,18 +291,23 @@ namespace BCG myFilter = value; if (numberOfSubscribers > 0) { - if (myLastReceivedRows != null) - { - BlueTable nRows = new BlueTable(myLastReceivedRows.schema); - foreach (IBlueRow r in myLastReceivedRows) - if (filterRow(r)) - nRows.addRow(r); - IBlueRowCollection dRows = new BlueTable(nRows.schema), - aRows = new BlueTable(nRows.schema); - BlueDataUtility.computeDifferences(nRows, myLastFiredRows, out dRows, out aRows); - myLastFiredRows = nRows; - myFireEvent(new DataPacket(nRows, aRows, dRows)); - } + if (myLastReceivedRows != null) { + try { + BlueTable nRows = new BlueTable(myLastReceivedRows.schema); + foreach (IBlueRow r in myLastReceivedRows) { + if (filterRow(r)) { + nRows.addRow(r); + } + } + IBlueRowCollection dRows = new BlueTable(nRows.schema), + aRows = new BlueTable(nRows.schema); + BlueDataUtility.computeDifferences(nRows, myLastFiredRows, out dRows, out aRows); + myLastFiredRows = nRows; + myFireEvent(new DataPacket(nRows, aRows, dRows)); + } catch (Exception ex) { + OnError(ex); + } + } } } } @@ -328,10 +336,8 @@ namespace BCG try { return myFilter.filter(r); } catch (Exception ex) { - Log.Gen.error($"FilterStream delegate threw exception: {ex}"); - OnError(new StreamFilterException(StreamId, StreamName, null, ex, r)); + throw new StreamFilterException(StreamId, StreamName, null, ex, r); } - return false; } } } diff --git a/src/DataStreamSuite/DataStreamCore/DataStream.cs b/src/DataStreamSuite/DataStreamCore/DataStream.cs index 760c77393..dd1e367c2 100644 --- a/src/DataStreamSuite/DataStreamCore/DataStream.cs +++ b/src/DataStreamSuite/DataStreamCore/DataStream.cs @@ -156,7 +156,8 @@ namespace BCG } protected void OnError(Exception error) { - ErrorChanged?.Invoke(error); + Log.Gen.error($"{GetType()} OnError: {error}"); + ErrorChanged?.Invoke(error); } public Guid ID