diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/package-lock.json b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/package-lock.json index 8745e1e7b..fc6a5e77b 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/package-lock.json +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/package-lock.json @@ -9,7 +9,8 @@ "version": "0.0.0", "dependencies": { "react": "^18.2.0", - "react-dom": "^18.2.0" + "react-dom": "^18.2.0", + "react-use-websocket": "^4.5.0" }, "devDependencies": { "@types/react": "^18.2.43", @@ -3325,6 +3326,15 @@ "node": ">=0.10.0" } }, + "node_modules/react-use-websocket": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/react-use-websocket/-/react-use-websocket-4.5.0.tgz", + "integrity": "sha512-oxYVLWM3Lv0InCfjW7hG/Hk0hkE0P1SiLd5/I3d5x0W4riAnDUkD4VEu7qNVAqxNjBF3nU7k0jLMOetLXpwfsA==", + "peerDependencies": { + "react": ">= 18.0.0", + "react-dom": ">= 18.0.0" + } + }, "node_modules/reflect.getprototypeof": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.4.tgz", diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/package.json b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/package.json index 6430e483f..1c33a4831 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/package.json +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/package.json @@ -11,7 +11,8 @@ }, "dependencies": { "react": "^18.2.0", - "react-dom": "^18.2.0" + "react-dom": "^18.2.0", + "react-use-websocket": "^4.5.0" }, "devDependencies": { "@types/react": "^18.2.43", diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.css b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.css index 972546707..a066c2537 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.css +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.css @@ -21,3 +21,24 @@ th, td { background-color: var(--cell-background-color); color: var(--cell-color); } + +textarea#query-input { + height: 5em; + width: 50em; +} + +button#query-button { + height: 5em; + vertical-align: top; +} + +table#query-output { + float: none; + clear: both; +} + +p#footer { + float: none; + clear: both; + vertical-align: bottom; +} diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.jsx b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.jsx index f002c2c2f..82473433d 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.jsx +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/App.jsx @@ -1,57 +1,11 @@ -import { useEffect, useState, Component } from 'react'; -import './App.css'; - -function App() { - const [forecasts, setForecasts] = useState(); - - useEffect(() => { - populateWeatherData(); - }, []); - - const contents = forecasts === undefined - ?

Loading... Please refresh once the ASP.NET backend has started. See https://aka.ms/jspsintegrationreact for more details.

- : - - - - - - - - - - {forecasts.map(forecast => - - - - - - - )} - -
DateTemp. (C)Temp. (F)Summary
{forecast.date}{forecast.temperatureC}{forecast.temperatureF}{forecast.summary}
; - - return ( -
-

Weather forecast

-

This component demonstrates fetching data from the server.

- {contents} -
- ); - - async function populateWeatherData() { - const response = await fetch('weatherforecast'); - const data = await response.json(); - setForecasts(data); - } -} - -export default App; +import { useEffect, useState, Component } from "react"; +import { useWebSocket } from "react-use-websocket"; +import "./App.css"; export class Home extends Component { static displayName = Home.name; // static sparkdHost = '192.168.50.94'; - static sparkdHost = 'localhost'; + static sparkdHost = "localhost"; // static websocket_url = 'wss://markets.api.uat.cmegroup.com/marketdatastream/v1'; // static access_token = 'eyJhbGciOiJSUzI1NiIsImtpZCI6IjF0al9MTVFrT2pGVzJWQTZvdkZzOEZHUWViMCIsInBpLmF0bSI6IjEifQ.eyJzY29wZSI6W10sImNsaWVudF9pZCI6ImFwaV90aGlua2FscGhhMzIxIiwiYXVkIjoiTnIiLCJqdGkiOiIweERtb3NnU2NHcE5GUEFaIiwic3ViIjoiYXBpX3RoaW5rYWxwaGEzMjEiLCJleHAiOjE2OTgzNTY5OTJ9.uJJEhWpujGiyJ5_lypiIPB8xR0GkuXqydtCugp5xD0hyTuX6VkQdNoY_oaRXXGRCUPCvfsXpU-HfL7pRkcXCjMLTrVIqf3RjD4_gar_ExbIb180nbYMG87E4rOILi5bIin51KOcMNBdHW7pTKwsS221XGyIAKIj65WxD-K8QSVr1HN6s7KDfYdez5dstWWC6xGg_3IZkrJjx8Df1HNT73K9PwUaAl7gcK4_2RSr8L636QbF3_y4Tv26g5IEv90Mc1mnAFPvUGI-nDR4s5Vso0398DlYl_tw-zbQQmn-QuQ6rS_ZIcZKgyoHKwD-3lgV-J1_--ndHdh8qwJC7Hk8ZKg' @@ -59,17 +13,26 @@ 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}://`; function connectToSparkd() { - const wsUrl = `ws://${Home.sparkdHost}:8080`; // const wsUrl = Home.websocket_url; if (socket == null) { - socket = new WebSocket(wsUrl) + socket = new WebSocket(wsUrl); } if (socket && socket.readyState === WebSocket.OPEN) { return; } - const output = document.getElementById('query-output'); + const output = document.getElementById("query-output"); socket.onopen = (event) => { console.log(`Connected to ${wsUrl}`); }; @@ -99,11 +62,11 @@ export class Home extends Component { connectToSparkd(); } if (socket == null || !socket) { - console.log('Failed to connect to websocket server'); + console.log("Failed to connect to websocket server"); return; } if (socket.readyState === WebSocket.OPEN) { - const queryInput = document.getElementById('query-input'); + const queryInput = document.getElementById("query-input"); // const req = { // header: { // messageType: "subscribe", @@ -120,10 +83,10 @@ export class Home extends Component { // } // }; const rpcReq = { - jsonrpc: '2.0', - method: 'subscribe', + jsonrpc: "2.0", + method: "subscribe", params: { - query: queryInput.value + query: queryInput.value, }, id: 1, }; @@ -136,19 +99,19 @@ export class Home extends Component {

Data Stream Query Analyzer

Run queries against the BTS Cloud

- + +
-
- -
- -
- -

The ClientApp subdirectory is a standard React application based on the create-react-app template. If you open a command prompt in that directory, you can run npm commands such as npm test or npm install.

+
+ ); } diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/main.jsx b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/main.jsx index 54b39dd1d..0502237bd 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/main.jsx +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Client/src/main.jsx @@ -1,10 +1,10 @@ import React from 'react' import ReactDOM from 'react-dom/client' -import App from './App.jsx' +import {Home} from './App.jsx' import './index.css' ReactDOM.createRoot(document.getElementById('root')).render( - + , ) diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Bts.DataStreamWebApp.Server.csproj b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Bts.DataStreamWebApp.Server.csproj index e72953136..2b6b0bf8e 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Bts.DataStreamWebApp.Server.csproj +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Bts.DataStreamWebApp.Server.csproj @@ -11,6 +11,7 @@ + 8.*-* @@ -26,4 +27,7 @@ + diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Controllers/DataStreamSubscriptionController.cs b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Controllers/DataStreamSubscriptionController.cs index f801ec59e..81e3ea84d 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Controllers/DataStreamSubscriptionController.cs +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Controllers/DataStreamSubscriptionController.cs @@ -1,25 +1,44 @@ namespace Bts.DataStreamWebApp.Server.Controllers; using Microsoft.AspNetCore.Mvc; -[ApiController] -[Route("[controller]")] -public class DataStreamSubscriptionController : ControllerBase { - private static readonly string[] Summaries = new[] - { - "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" - }; +using System.Net.WebSockets; - private readonly ILogger _logger; +// [Route("[controller]")] +[Route("/ws")] +public class DataStreamSubscriptionController(ILogger logger) : ControllerBase { + readonly ILogger _logger = logger; - public DataStreamSubscriptionController(ILogger logger) { - _logger = logger; + [Route("/ws")] + public async Task Get() { + if (!HttpContext.WebSockets.IsWebSocketRequest) { + _logger.LogError("Expected websocket request on path '{}'", HttpContext.Request.Path); + return; + } + Console.WriteLine("Establishing websocket connection..."); + using var webSocket = await HttpContext.WebSockets.AcceptWebSocketAsync(); + Console.WriteLine($"Websocket connection established."); + await Echo(webSocket); } - [HttpGet(Name = "GetDataStreamSubscription")] - public IEnumerable Get() { - return Enumerable.Range(1, 5).Select(index => new DataStreamSubscription { - Query = "fake queronious" - }) - .ToArray(); + public static async Task Echo(WebSocket webSocket) { + var buffer = new byte[1024 * 4]; + var receiveResult = await webSocket.ReceiveAsync( + new ArraySegment(buffer), CancellationToken.None); + + while (!receiveResult.CloseStatus.HasValue) { + await webSocket.SendAsync( + new ArraySegment(buffer, 0, receiveResult.Count), + receiveResult.MessageType, + receiveResult.EndOfMessage, + CancellationToken.None); + + receiveResult = await webSocket.ReceiveAsync( + new ArraySegment(buffer), CancellationToken.None); + } + + await webSocket.CloseAsync( + receiveResult.CloseStatus.Value, + receiveResult.CloseStatusDescription, + CancellationToken.None); } } diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Controllers/WeatherForecastController.cs b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Controllers/WeatherForecastController.cs index 8037c6c3f..f8e0cc2d7 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Controllers/WeatherForecastController.cs +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Controllers/WeatherForecastController.cs @@ -3,25 +3,16 @@ using Microsoft.AspNetCore.Mvc; [ApiController] [Route("[controller]")] -public class WeatherForecastController : ControllerBase -{ - private static readonly string[] Summaries = new[] - { - "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" - }; +public class WeatherForecastController(ILogger logger) : ControllerBase { + static readonly string[] Summaries = [ + "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" + ]; - private readonly ILogger _logger; - - public WeatherForecastController(ILogger logger) - { - _logger = logger; - } + readonly ILogger _logger = logger; [HttpGet(Name = "GetWeatherForecast")] - public IEnumerable Get() - { - return Enumerable.Range(1, 5).Select(index => new WeatherForecast - { + public IEnumerable Get() { + return Enumerable.Range(1, 5).Select(index => new WeatherForecast { Date = DateOnly.FromDateTime(DateTime.Now.AddDays(index)), TemperatureC = Random.Shared.Next(-20, 55), Summary = Summaries[Random.Shared.Next(Summaries.Length)] diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamWebsocketHandler.cs b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamWebsocketHandler.cs new file mode 100644 index 000000000..9859958bb --- /dev/null +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamWebsocketHandler.cs @@ -0,0 +1,58 @@ +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Logging; + +using System; +using System.Net.WebSockets; +using System.Threading; +using System.Threading.Tasks; + +namespace Bts.DataStreamWebApp.Server { + // public class DataStreamWebSocketHandler { + // readonly WebSocketConnectionManager _connectionManager = new(); + // readonly ILogger _logger; + + // public DataStreamWebSocketHandler( + // WebSocketConnectionManager connectionManager, + // ILogger logger + // ) { + // _connectionManager = connectionManager; + // _logger = logger; + // } + + // public async Task HandleWebSocket(HttpContext context, WebSocket webSocket) { + // var socketId = _connectionManager.AddSocket(webSocket); + + // _logger.LogInformation($"WebSocket connection established with ID {socketId}"); + + // while (webSocket.State == WebSocketState.Open) { + // var message = await ReceiveMessageAsync(webSocket); + // if (message != null) { + // _logger.LogInformation($"Received message from ID {socketId}: {message}"); + // await BroadcastMessageAsync(message); + // } + // } + + // _connectionManager.RemoveSocket(socketId); + // _logger.LogInformation($"WebSocket connection closed with ID {socketId}"); + // } + + // async Task ReceiveMessageAsync(WebSocket webSocket) { + // var buffer = new byte[1024]; + // var result = await webSocket.ReceiveAsync(new ArraySegment(buffer), CancellationToken.None); + + // if (result.CloseStatus.HasValue) { + // return null; + // } + + // return System.Text.Encoding.UTF8.GetString(buffer, 0, result.Count); + // } + + // async Task BroadcastMessageAsync(string message) { + // foreach (var socket in _connectionManager.GetAllSockets()) { + // if (socket.Value.State == WebSocketState.Open) { + // await socket.Value.SendAsync(System.Text.Encoding.UTF8.GetBytes(message), WebSocketMessageType.Text, true, CancellationToken.None); + // } + // } + // } + // } +} diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Program.cs b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Program.cs index 19785ef61..d6a7d4bfb 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Program.cs +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Program.cs @@ -1,30 +1,210 @@ -var builder = WebApplication.CreateBuilder(args); +using BCG; -// Add services to the container. +using bts.api.core; -builder.Services.AddControllers(); -// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle -builder.Services.AddEndpointsApiExplorer(); -builder.Services.AddSwaggerGen(); +using Bts.DataStreamExpressions; +using Bts.DataStreamWebApp.Server.Controllers; -var app = builder.Build(); +using CommandLine; -app.UseDefaultFiles(); -app.UseStaticFiles(); +using System.Net.WebSockets; +using System.Text; +using System.Text.Json; -// Configure the HTTP request pipeline. -if (app.Environment.IsDevelopment()) -{ - app.UseSwagger(); - app.UseSwaggerUI(); +var parser = new Parser(ps => { + ps.CaseInsensitiveEnumValues = true; + ps.HelpWriter = Console.Out; +}); + +await parser.ParseArguments(args). + MapResult(run, errors => Task.FromResult(1)); + +async Task run(Arguments parsed_args) { + var builder = WebApplication.CreateBuilder(args); + // Add services to the container. + // builder.Services.AddControllers(); + // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle + // builder.Services.AddEndpointsApiExplorer(); + // builder.Services.AddSwaggerGen(); + + var app = builder.Build(); + var wsOpts = new WebSocketOptions { + KeepAliveInterval = TimeSpan.FromMinutes(2) + }; + app.UseWebSockets(wsOpts); + app.UseDefaultFiles(); + app.UseStaticFiles(); + + // Configure the HTTP request pipeline. + if (app.Environment.IsDevelopment()) { + app.UseSwagger(); + app.UseSwaggerUI(); + } + + // app.UseHttpsRedirection(); + // app.UseAuthorization(); + // app.MapControllers(); + app.MapFallbackToFile("/index.html"); + + app.Use(async (context, next) => { + if (context.Request.Path == "/ws") { + if (context.WebSockets.IsWebSocketRequest) { + using var webSocket = await context.WebSockets.AcceptWebSocketAsync(); + await runWebSocketServer( + parsed_args.sparkd, parsed_args.user!, parsed_args.password!, webSocket); + } else { + context.Response.StatusCode = StatusCodes.Status400BadRequest; + } + } else { + await next(context); + } + }); + + try { + await app.RunAsync(); + } catch (Exception ex) { + Console.WriteLine($"Exception on DataStreamWebsocketServer thread: {ex}"); + return 1; + } + return 0; } -app.UseHttpsRedirection(); +async Task runWebSocketServer(string? sparkd, string user, string password, WebSocket webSocket) { + var context = ServiceContext.create(sparkd); + await context.login(user, password); + var buffer = new byte[1024 * 4]; + var receiveResult = await webSocket.ReceiveAsync( + new ArraySegment(buffer), CancellationToken.None); -app.UseAuthorization(); + try { + while (!receiveResult.CloseStatus.HasValue) { + receiveResult = await webSocket.ReceiveAsync( + new ArraySegment(buffer), CancellationToken.None); + var msg = Encoding.UTF8.GetString(buffer, 0, receiveResult.Count); + var queryArgs = new QueryArguments { Query = msg }; + // var queryArgs = JsonSerializer.Deserialize(msg); + // if (queryArgs is null) { + // Console.WriteLine("Invalid queryArgs."); + // continue; + // } + var exp = DataStreamExpressionsInterpreter.Evaluate(queryArgs.Query!); + if (exp is null) { + Console.WriteLine($"Invalid query expression: {queryArgs.Query}."); + continue; + } + var vs = exp.getView(new Dictionary(0)); + vs.onChange += onStreamChanged; -app.MapControllers(); + await webSocket.SendAsync( + new ArraySegment(buffer, 0, receiveResult.Count), + receiveResult.MessageType, + receiveResult.EndOfMessage, + CancellationToken.None); + } + } catch (Exception ex) { + Console.WriteLine($"Exception on WebsocketServer thread: {ex}"); + return 1; + } -app.MapFallbackToFile("/index.html"); + return 0; -app.Run(); + async void onStreamChanged(object newValue) { + if (newValue is not DataPacket dp) { + Console.WriteLine( + $"OnStreamChanged delegate expected DataPacket (actually received {newValue?.GetType()}."); + return; + } + var added_rows_str = dp.addedRows.get_printed_rows(val => val.Length); + var msg = $"Received new rows:\n{added_rows_str}"; + // var payload = new ReadOnlyMemory([.. msg]); + var encoded = Encoding.UTF8.GetBytes(msg); + var payload = new ArraySegment(encoded, 0, encoded.Length); + await webSocket.SendAsync( + payload, + receiveResult.MessageType, + receiveResult.EndOfMessage, + CancellationToken.None); + } +} + +class QueryArguments { + public string? Query { get; set; } +} + +class Arguments { + [Option("sparkd")] + public string? sparkd { get; set; } + + [Option("user", Default = "bts")] + public string? user { get; set; } + + [Option("password", Default = "")] + public string? password { get; set; } +} + + +// using Bts.DataStreamWebApp.Server.Controllers; + +// using Microsoft.Extensions.FileProviders; + +// var builder = WebApplication.CreateBuilder(args); + +// builder.Services.AddControllers(); +// builder.Services.AddDirectoryBrowser(); +// builder.Services.AddEndpointsApiExplorer(); +// builder.Services.AddSwaggerGen(); + +// var app = builder.Build(); + +// // +// var webSocketOptions = new WebSocketOptions { +// KeepAliveInterval = TimeSpan.FromMinutes(2) +// }; + +// app.UseWebSockets(webSocketOptions); +// // + +// app.UseDefaultFiles(); +// app.UseStaticFiles(); + +// app.MapControllers(); +// app.MapDefaultControllerRoute(); + +// app.UseHttpsRedirection(); +// app.UseAuthorization(); + +// var fileProvider = new PhysicalFileProvider( +// Path.Combine(builder.Environment.WebRootPath, "images")); +// var requestPath = "/MyImages"; + +// // Enable displaying browser links. +// app.UseStaticFiles(new StaticFileOptions { +// FileProvider = fileProvider, +// RequestPath = requestPath +// }); + +// app.UseDirectoryBrowser(new DirectoryBrowserOptions { +// FileProvider = fileProvider, +// RequestPath = requestPath +// }); + +// // Configure the HTTP request pipeline. +// if (app.Environment.IsDevelopment()) { +// app.UseSwagger(); +// app.UseSwaggerUI(); +// } + +// app.Use(async (context, next) => { +// if (context.Request.Path == "/ws") { +// if (context.WebSockets.IsWebSocketRequest) { +// using var webSocket = await context.WebSockets.AcceptWebSocketAsync(); +// await DataStreamSubscriptionController.Echo(webSocket); +// } else { +// context.Response.StatusCode = StatusCodes.Status400BadRequest; +// } +// } else { +// await next(context); +// } +// }); + +// app.Run(); diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Properties/launchSettings.json b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Properties/launchSettings.json index 80285d4e5..e1178d066 100644 --- a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Properties/launchSettings.json +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Properties/launchSettings.json @@ -1,5 +1,10 @@ { "profiles": { + "default": { + "commandName": "Project", + "launchBrowser": true, + "applicationUrl": "http://localhost:5400" + }, "http": { "commandName": "Project", "launchBrowser": true, @@ -40,4 +45,4 @@ "sslPort": 44383 } } -} \ No newline at end of file +} diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/WebsocketConnectionManager.cs b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/WebsocketConnectionManager.cs new file mode 100644 index 000000000..87524dea6 --- /dev/null +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/WebsocketConnectionManager.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Concurrent; +using System.Net.WebSockets; + +namespace Bts.DataStreamWebApp.Server { + // public class WebSocketConnectionManager { + // private readonly ConcurrentDictionary _sockets = new ConcurrentDictionary(); + + // public Guid AddSocket(WebSocket socket) { + // var socketId = Guid.NewGuid(); + // _sockets.TryAdd(socketId, socket); + // return socketId; + // } + + // public WebSocket? GetSocket(Guid socketId) { + // _sockets.TryGetValue(socketId, out var socket); + // return socket; + // } + + // public ConcurrentDictionary.ValueCollection GetAllSockets() { + // return _sockets.Values; + // } + + // public Guid? GetSocketId(WebSocket socket) { + // foreach (var (key, value) in _sockets) { + // if (value == socket) { + // return key; + // } + // } + // return null; + // } + + // public void RemoveSocket(Guid socketId) { + // _sockets.TryRemove(socketId, out _); + // } + // } +} diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/wwwroot/alt-index.html b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/wwwroot/alt-index.html new file mode 100644 index 000000000..f0464246c --- /dev/null +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/wwwroot/alt-index.html @@ -0,0 +1,168 @@ + + + + + + + + +

ALT WebSocket Sample Application

+

Ready to connect...

+
+ + + +
+

+
+ + + + +
+ +

Communication Log

+ + + + + + + + + + +
FromToData
+ + + + diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/wwwroot/images/BTS-300.png b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/wwwroot/images/BTS-300.png new file mode 100644 index 000000000..e95897e4e Binary files /dev/null and b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/wwwroot/images/BTS-300.png differ diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/wwwroot/images/favicon.ico b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/wwwroot/images/favicon.ico new file mode 100644 index 000000000..72ee404ee Binary files /dev/null and b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/wwwroot/images/favicon.ico differ diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/wwwroot/index.html b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/wwwroot/index.html new file mode 100644 index 000000000..f4d96a68c --- /dev/null +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/wwwroot/index.html @@ -0,0 +1,168 @@ + + + + + + + + +

WebSocket Sample Application

+

Ready to connect...

+
+ + + +
+

+
+ + + + +
+ +

Communication Log

+ + + + + + + + + + +
FromToData
+ + + +