From 649eca98f1c5ceec42db525069739af4ac79dbca Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 22 Jan 2024 11:31:12 -0500 Subject: [PATCH] DataStreamWebApp check pt (works w/ default launchProfile) --- .../Bts.DataStreamWebApp.Client/src/App.jsx | 27 +-- .../Bts.DataStreamWebApp.Server.csproj | 2 + .../DataStreamSubscriptionController.cs | 75 +++++++- .../DataStreamSubscription.cs | 3 + .../DataStreamUpdate.cs | 8 + .../DataStreamWebAppServerOptions.cs | 14 ++ .../Bts.DataStreamWebApp.Server/Program.cs | 178 +++++++----------- .../wwwroot/index.html | 18 +- src/DataStreamSuite/DataStreamSuite.sln | 6 + 9 files changed, 188 insertions(+), 143 deletions(-) create mode 100644 src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamUpdate.cs create mode 100644 src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamWebAppServerOptions.cs diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.jsx b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.jsx index 82473433d..c5530911a 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.jsx +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.jsx @@ -12,17 +12,7 @@ export class Home extends Component { render() { let socket = null; - - // const WS_URL = "ws://127.0.0.1:800"; - const wsUrl = `ws://${Home.sparkdHost}:8080`; - // const { sendJsonMessage, lastJsonMessage, readyState } = useWebSocket( - // WS_URL, - // { - // share: false, - // shouldReconnect: () => true, - // }); - - // let wsUrl = `ws://${window.location.hostname}://`; + const wsUrl = `ws://localhost:5268/ws`; function connectToSparkd() { // const wsUrl = Home.websocket_url; if (socket == null) { @@ -67,21 +57,6 @@ export class Home extends Component { } if (socket.readyState === WebSocket.OPEN) { const queryInput = document.getElementById("query-input"); - // const req = { - // header: { - // messageType: "subscribe", - // sentTime: "", - // version: "", - // requestId: "1", - // token: "" - // }, - // payload: { - // subscriptionMessageTypes: ["TRD"], - // subscriptions: [{ - // exchangeMic: "XCME", productType: "FUT", productCode: "BTC" - // }] - // } - // }; const rpcReq = { jsonrpc: "2.0", method: "subscribe", diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Bts.DataStreamWebApp.Server.csproj b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Bts.DataStreamWebApp.Server.csproj index 2b6b0bf8e..ce2c22644 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Bts.DataStreamWebApp.Server.csproj +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Bts.DataStreamWebApp.Server.csproj @@ -15,6 +15,7 @@ 8.*-* + @@ -25,6 +26,7 @@ +