From de9d47cd00a26bd5a88cf47ae10fd3299255b7cb Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 26 Jul 2024 04:17:27 +0000 Subject: [PATCH] Include subscription id in ds websocket updates --- .../Bts.DataStreamWebApp.Client/src/App.jsx | 5 +++-- .../DataStreamSubscription.cs | 5 ++++- .../DataStreamSubscriptionUpdate.cs | 13 +++++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamSubscriptionUpdate.cs diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.jsx b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.jsx index 6729585bc..e2d88091a 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.jsx +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.jsx @@ -94,8 +94,9 @@ const App = () => { } else if (msg.id != null) { setQueryState(msg.result.status); } else { - console.info(`Received rows: ${msg.params.all}`); - setBlueTable({columns: msg.params.columns, rows: msg.params.all}); + console.assert(msg.params.subscription_id == subscriptionId); + console.info(`Received rows: ${msg.params.table.all}`); + setBlueTable({columns: msg.params.table.columns, rows: msg.params.table.all}); } }; }, [getWebSocket, readyState]); diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamSubscription.cs b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamSubscription.cs index a2d84acb2..992d27b11 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamSubscription.cs +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamSubscription.cs @@ -97,7 +97,10 @@ class DataStreamSubscription : IDisposable, IHostedService { IncludeCurrent = true, UseObjectRows = true, }); - var res = JsonRpcRequest.CreateNotification(method, dp); + var res = JsonRpcRequest.CreateNotification(method, new DataStreamSubscriptionUpdate() { + SubscriptionId = Id, + Table = dp + }); var str = serialize(res, serializerOpts); if (str is null) { logger.LogError("Unsubscribing from stream early because we failed to serialize an outgoing DataPacket"); diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamSubscriptionUpdate.cs b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamSubscriptionUpdate.cs new file mode 100644 index 000000000..f7b3c200d --- /dev/null +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamSubscriptionUpdate.cs @@ -0,0 +1,13 @@ +namespace Bts.DataStreamWebApp.Server; + +using BCG; + +using System.Text.Json.Serialization; + +public class DataStreamSubscriptionUpdate { + [JsonPropertyName("subscription_id")] + public string? SubscriptionId { get; set; } + + [JsonPropertyName("table")] + public DataPacket? Table { get; set; } +}