From e65e2aed3683d6411e13377b1bb7ee4d4bbf1aef Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 18 Jan 2024 00:32:30 -0500 Subject: [PATCH] Add bones for Bts.DataStreamWebApp.Server --- .../Bts.DataStreamWebApp.Server.csproj | 35 ++++ .../Bts.DataStreamWebApp.Server.http | 6 + .../DataStreamSubscriptionController.cs | 107 +++++++++++ .../Controllers/WeatherForecastController.cs | 22 +++ .../DataStreamSubscription.cs | 8 + .../DataStreamUpdate.cs | 8 + .../DataStreamWebAppServerOptions.cs | 14 ++ .../DataStreamWebsocketHandler.cs | 58 ++++++ .../Bts.DataStreamWebApp.Server/Program.cs | 159 ++++++++++++++++ .../Properties/launchSettings.json | 48 +++++ .../WeatherForecast.cs | 12 ++ .../WebsocketConnectionManager.cs | 37 ++++ .../appsettings.Development.json | 8 + .../appsettings.json | 9 + .../wwwroot/alt-index.html | 168 +++++++++++++++++ .../wwwroot/images/BTS-300.png | Bin 0 -> 8352 bytes .../wwwroot/images/favicon.ico | Bin 0 -> 1150 bytes .../wwwroot/index.html | 176 ++++++++++++++++++ src/DataStreamSuite/DataStreamSuite.sln | 12 ++ 19 files changed, 887 insertions(+) create mode 100644 src/DataStreamSuite/Bts.DataStreamWebApp.Server/Bts.DataStreamWebApp.Server.csproj create mode 100644 src/DataStreamSuite/Bts.DataStreamWebApp.Server/Bts.DataStreamWebApp.Server.http create mode 100644 src/DataStreamSuite/Bts.DataStreamWebApp.Server/Controllers/DataStreamSubscriptionController.cs create mode 100644 src/DataStreamSuite/Bts.DataStreamWebApp.Server/Controllers/WeatherForecastController.cs create mode 100644 src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamSubscription.cs create mode 100644 src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamUpdate.cs create mode 100644 src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamWebAppServerOptions.cs create mode 100644 src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamWebsocketHandler.cs create mode 100644 src/DataStreamSuite/Bts.DataStreamWebApp.Server/Program.cs create mode 100644 src/DataStreamSuite/Bts.DataStreamWebApp.Server/Properties/launchSettings.json create mode 100644 src/DataStreamSuite/Bts.DataStreamWebApp.Server/WeatherForecast.cs create mode 100644 src/DataStreamSuite/Bts.DataStreamWebApp.Server/WebsocketConnectionManager.cs create mode 100644 src/DataStreamSuite/Bts.DataStreamWebApp.Server/appsettings.Development.json create mode 100644 src/DataStreamSuite/Bts.DataStreamWebApp.Server/appsettings.json create mode 100644 src/DataStreamSuite/Bts.DataStreamWebApp.Server/wwwroot/alt-index.html create mode 100644 src/DataStreamSuite/Bts.DataStreamWebApp.Server/wwwroot/images/BTS-300.png create mode 100644 src/DataStreamSuite/Bts.DataStreamWebApp.Server/wwwroot/images/favicon.ico create mode 100644 src/DataStreamSuite/Bts.DataStreamWebApp.Server/wwwroot/index.html diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Bts.DataStreamWebApp.Server.csproj b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Bts.DataStreamWebApp.Server.csproj new file mode 100644 index 000000000..ce2c22644 --- /dev/null +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Bts.DataStreamWebApp.Server.csproj @@ -0,0 +1,35 @@ + + + + net8.0 + enable + enable + true + ..\Bts.DataStreamWebApp.Client + npm run dev + https://localhost:5173 + + + + + + 8.*-* + + + + + + + + false + + + + + + + + + diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Bts.DataStreamWebApp.Server.http b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Bts.DataStreamWebApp.Server.http new file mode 100644 index 000000000..611e5399a --- /dev/null +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Bts.DataStreamWebApp.Server.http @@ -0,0 +1,6 @@ +@Bts.DataStreamWebApp.Server_HostAddress = http://localhost:5268 + +GET {{Bts.DataStreamWebApp.Server_HostAddress}}/weatherforecast/ +Accept: application/json + +### diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Controllers/DataStreamSubscriptionController.cs b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Controllers/DataStreamSubscriptionController.cs new file mode 100644 index 000000000..652a85a0e --- /dev/null +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Controllers/DataStreamSubscriptionController.cs @@ -0,0 +1,107 @@ +namespace Bts.DataStreamWebApp.Server.Controllers; + +using BCG; + +using bts.api.core; +using bts.websocket_core.json_rpc; + +using Bts.DataStreamExpressions; + +using Microsoft.AspNetCore.Mvc; + +using Spark.Core.Disposables; + +using System.Net.WebSockets; +using System.Text; +using System.Text.Json; + +[Route("/ws")] +public class DataStreamSubscriptionController(ILogger logger) : ControllerBase { + readonly ILogger logger = logger; + IDisposable? streamSubscription; + + [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 runWebSocketServer(null, "bts", string.Empty, webSocket); + } + + 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); + } + + 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); + + try { + while (!receiveResult.CloseStatus.HasValue) { + receiveResult = await webSocket.ReceiveAsync( + new ArraySegment(buffer), CancellationToken.None); + var msg = Encoding.UTF8.GetString(buffer, 0, receiveResult.Count); + var rpcReq = JsonSerializer.Deserialize>(msg); + var query = rpcReq?.Params?.Query ?? throw new InvalidOperationException( + "Failed to parse JsonRpcRequest.Params"); + var exp = DataStreamExpressionsInterpreter.Evaluate(query); + if (exp is null) { + Console.WriteLine($"Invalid query expression: {query}."); + continue; + } + var vs = exp.getView(new Dictionary(0)); + Disposable.dispose(ref streamSubscription); + vs.onChange += OnStreamChanged; + streamSubscription = Disposable.Create(() => vs.onChange -= OnStreamChanged); + } + } catch (Exception ex) { + Console.WriteLine($"Exception on WebsocketServer thread: {ex}"); + return 1; + } + + return 0; + + async void OnStreamChanged(object newValue) { + if (newValue is not DataPacket dp) { + Console.WriteLine( + $"OnStreamChanged delegate expected DataPacket (actually received {newValue?.GetType()}."); + return; + } + Console.WriteLine("Received stream update."); + var added_rows_str = dp.addedRows.get_printed_rows(val => val.Length); + var msg = $"Received new rows:\n{added_rows_str}"; + var encoded = Encoding.UTF8.GetBytes(msg); + var payload = new ArraySegment(encoded, 0, encoded.Length); + await webSocket.SendAsync( + payload, + receiveResult.MessageType, + receiveResult.EndOfMessage, + CancellationToken.None); + } + } +} diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Controllers/WeatherForecastController.cs b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Controllers/WeatherForecastController.cs new file mode 100644 index 000000000..f8e0cc2d7 --- /dev/null +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Controllers/WeatherForecastController.cs @@ -0,0 +1,22 @@ +namespace Bts.DataStreamWebApp.Server.Controllers; +using Microsoft.AspNetCore.Mvc; + +[ApiController] +[Route("[controller]")] +public class WeatherForecastController(ILogger logger) : ControllerBase { + static readonly string[] Summaries = [ + "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" + ]; + + readonly ILogger _logger = logger; + + [HttpGet(Name = "GetWeatherForecast")] + 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)] + }) + .ToArray(); + } +} diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamSubscription.cs b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamSubscription.cs new file mode 100644 index 000000000..ac7ea680f --- /dev/null +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamSubscription.cs @@ -0,0 +1,8 @@ +namespace Bts.DataStreamWebApp.Server; + +using System.Text.Json.Serialization; + +public class DataStreamSubscription { + [JsonPropertyName("query")] + public string? Query { get; set; } +} diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamUpdate.cs b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamUpdate.cs new file mode 100644 index 000000000..fd4dc84fb --- /dev/null +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamUpdate.cs @@ -0,0 +1,8 @@ +namespace Bts.DataStreamWebApp.Server; + +using BCG; + +class DataStreamUpdate { + public List addedRows { get; set; } = new(0); + public List deletedRows { get; set; } = new(0); +} diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamWebAppServerOptions.cs b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamWebAppServerOptions.cs new file mode 100644 index 000000000..73d6805fb --- /dev/null +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/DataStreamWebAppServerOptions.cs @@ -0,0 +1,14 @@ +namespace Bts.DataStreamWebApp.Server; + +using CommandLine; + +class DataStreamWebAppServerOptions { + [Option("sparkd")] + public string? sparkd { get; set; } + + [Option("user", Default = "bts")] + public string? user { get; set; } + + [Option("password", Default = "")] + public string? password { get; set; } +} 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 new file mode 100644 index 000000000..a1ee48837 --- /dev/null +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Program.cs @@ -0,0 +1,159 @@ +using BCG; + +using bts; +using bts.api.core; +using bts.utils; +using bts.websocket_core.json_rpc; + +using Bts.DataStreamExpressions; +using Bts.DataStreamWebApp.Server; +using Bts.DataStreamWebApp.Server.Controllers; + +using CommandLine; + +using mbts.config; + +using System.Net.WebSockets; +using System.Reactive.Disposables; +using System.Reactive.Linq; +using System.Text; +using System.Text.Json; +using System.Text.Json.Serialization; + +static string fmtReq(HttpRequest req) => + $"{req.Protocol}://{req.Host}/{req.Path}?{req.QueryString}"; + +static string fmtDataPacket(DataPacket dp) { + var sb = new StringBuilder(); + var rows = dp.addedRows.Cast().ToList(); + var colWidths = dp.schema.columnInfo.Select(c => rows.Max(r => r[c.colNo]?.ToString()?.Length ?? 0)).ToArray(); + foreach (IBlueRow r in dp.addedRows) { + for (int i = 0; i < colWidths.Length; i++) { + var str = r[i]?.ToString() ?? string.Empty; + if (i > 0) { + sb.Append(" | "); + } + sb.Append(str); + var width = colWidths[i]; + if (str.Length < width) { + sb.Append(new string(' ', width - str.Length)); + } + } + sb.AppendLine(); + } + return sb.ToString(); +} + +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(DataStreamWebAppServerOptions opts) { + BTSNativeMethods.provide_command_line(args, args.Length); + Configuration.initialize(); + var context = ServiceContext.create(opts.sparkd); + await context.login(opts.user!, opts.password!); + var vsWorkLoop = Observable.Interval(TimeSpan.FromMilliseconds(200)).Subscribe(_ => { + ViewStreamDatabase.instance.doWork(); + MasterWorker.getInstance(false).doWork(); + }); + var builder = WebApplication.CreateBuilder(args); + builder.Services.AddDirectoryBrowser(); + var app = builder.Build(); + var wsOpts = new WebSocketOptions { + KeepAliveInterval = TimeSpan.FromMinutes(2) + }; + app.UseWebSockets(wsOpts); + app.UseDefaultFiles(); + app.UseStaticFiles(); + app.MapFallbackToFile("/index.html"); + + app.Use(async (context, next) => { + var reqDesc = fmtReq(context.Request); + Console.WriteLine($"Webserver received: {reqDesc}"); + if (context.Request.Path == "/ws") { + if (context.WebSockets.IsWebSocketRequest) { + Console.WriteLine("Accepting websocket connection..."); + using var webSocket = await context.WebSockets.AcceptWebSocketAsync(); + Console.WriteLine("Websocket connection accepted."); + await runWebSocketServer( + opts.sparkd, opts.user!, opts.password!, webSocket); + } else { + context.Response.StatusCode = StatusCodes.Status400BadRequest; + } + } else { + Console.WriteLine($"Webserver ignoring req: {reqDesc}"); + await next(context); + } + }); + + try { + await app.RunAsync(); + } catch (Exception ex) { + Console.WriteLine($"Exception on DataStreamWebsocketServer thread: {ex}"); + return 1; + } + Spark.Core.Disposables.Disposable.dispose(ref vsWorkLoop); + return 0; +} + +async Task runWebSocketServer(string? sparkd, string user, string password, WebSocket webSocket) { + var buffer = new byte[1024 * 4]; + var receiveResult = await webSocket.ReceiveAsync( + new ArraySegment(buffer), CancellationToken.None); + + try { + while (!receiveResult.CloseStatus.HasValue) { + Console.WriteLine("Awaiting websocket message from client"); + receiveResult = await webSocket.ReceiveAsync( + new ArraySegment(buffer), CancellationToken.None); + var msg = Encoding.UTF8.GetString(buffer, 0, receiveResult.Count); + var rpcReq = JsonSerializer.Deserialize>(msg); + var queryArgs = rpcReq!.Params!; + // var queryArgs = new DataStreamSubscription { Query = msg }; + 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)); + Console.WriteLine("Subscribing to stream..."); + vs.onChange += onStreamChanged; + + 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; + } + + return 0; + + async void onStreamChanged(object newValue) { + if (newValue is not DataPacket dp) { + Console.WriteLine( + $"OnStreamChanged delegate expected DataPacket (actually received {newValue?.GetType()}."); + return; + } + Console.WriteLine("Received stream update."); + var sb = new StringBuilder(); + var updateDesc = fmtDataPacket(dp); + var msg = $"Received new rows:\n{updateDesc}"; + // 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); + } +} diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Properties/launchSettings.json b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Properties/launchSettings.json new file mode 100644 index 000000000..e1178d066 --- /dev/null +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Properties/launchSettings.json @@ -0,0 +1,48 @@ +{ + "profiles": { + "default": { + "commandName": "Project", + "launchBrowser": true, + "applicationUrl": "http://localhost:5400" + }, + "http": { + "commandName": "Project", + "launchBrowser": true, + "launchUrl": "swagger", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy" + }, + "dotnetRunMessages": true, + "applicationUrl": "http://localhost:5268" + }, + "https": { + "commandName": "Project", + "launchUrl": "swagger", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy" + }, + "dotnetRunMessages": true, + "applicationUrl": "https://localhost:7128;http://localhost:5268" + }, + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "launchUrl": "swagger", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy" + } + } + }, + "$schema": "http://json.schemastore.org/launchsettings.json", + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:2083", + "sslPort": 44383 + } + } +} diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/WeatherForecast.cs b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/WeatherForecast.cs new file mode 100644 index 000000000..d7385e52e --- /dev/null +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/WeatherForecast.cs @@ -0,0 +1,12 @@ +namespace Bts.DataStreamWebApp.Server; + +public class WeatherForecast +{ + public DateOnly Date { get; set; } + + public int TemperatureC { get; set; } + + public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); + + public string? Summary { get; set; } +} 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/appsettings.Development.json b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/appsettings.Development.json new file mode 100644 index 000000000..0c208ae91 --- /dev/null +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/src/DataStreamSuite/Bts.DataStreamWebApp.Server/appsettings.json b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/appsettings.json new file mode 100644 index 000000000..10f68b8c8 --- /dev/null +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/appsettings.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "AllowedHosts": "*" +} 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 0000000000000000000000000000000000000000..e95897e4eb0b2d9e67f7c86e982361c103e1114e GIT binary patch literal 8352 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..72ee404ee580a2eecc49c118b191352cd8c806f7 GIT binary patch literal 1150 zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x$A1^@s5XBfo;8wUGZ8TRdOXE+ST ztqj`^bun0j;^aU(gXw`bhE@<;+tO0V(8S^Z3>z6+Ox4zQ-~p>^W4O4tg+U&Kfo5a? z&6^Jr-`C3E4Aj3A#74&kCYCdSW_g0d_qQ=z0IKT+(mR0o`rbB%OlX`mY~oVF(1{c7};SH}vdjXK(?!zY^${T_Ew=WEoYUeb@Aj%^eL)EF3@> z=6<012|#sVe6Wq7`Cto!?15IWUbr|=UdPbX(iy0)9)@+y&Bf9EHOj|~Yy4rt08AU0 ZxIK}9VRtP91Bl+7&%n@TkEsTv4* + + + + + + + +

DataStreams via WebSocket

+

Ready to connect...

+
+ + + +
+

+
+ + + + +
+ +

Communication Log

+ + + + + + + + + + +
FromToData
+ + + + diff --git a/src/DataStreamSuite/DataStreamSuite.sln b/src/DataStreamSuite/DataStreamSuite.sln index efbb1119a..52990cb7c 100644 --- a/src/DataStreamSuite/DataStreamSuite.sln +++ b/src/DataStreamSuite/DataStreamSuite.sln @@ -42,6 +42,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.ColumnExpressions", "Bt EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.ColumnSortExpressions", "Bts.ColumnSortExpressions\Bts.ColumnSortExpressions.csproj", "{B038CB72-4E81-4AF1-976F-ED8655C2C3D6}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.DataStreamWebApp.Server", "Bts.DataStreamWebApp.Server\Bts.DataStreamWebApp.Server.csproj", "{6DE5E4CE-423E-4571-81F7-539D268D6059}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "spark_websocket", "..\client\spark_websocket\spark_websocket.csproj", "{09B0FF33-D34F-4BB4-BE96-B7D35960BB3B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -131,5 +135,13 @@ Global {B038CB72-4E81-4AF1-976F-ED8655C2C3D6}.Debug|Any CPU.Build.0 = Debug|Any CPU {B038CB72-4E81-4AF1-976F-ED8655C2C3D6}.Release|Any CPU.ActiveCfg = Release|Any CPU {B038CB72-4E81-4AF1-976F-ED8655C2C3D6}.Release|Any CPU.Build.0 = Release|Any CPU + {6DE5E4CE-423E-4571-81F7-539D268D6059}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6DE5E4CE-423E-4571-81F7-539D268D6059}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6DE5E4CE-423E-4571-81F7-539D268D6059}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6DE5E4CE-423E-4571-81F7-539D268D6059}.Release|Any CPU.Build.0 = Release|Any CPU + {09B0FF33-D34F-4BB4-BE96-B7D35960BB3B}.Debug|Any CPU.ActiveCfg = Debug|x64 + {09B0FF33-D34F-4BB4-BE96-B7D35960BB3B}.Debug|Any CPU.Build.0 = Debug|x64 + {09B0FF33-D34F-4BB4-BE96-B7D35960BB3B}.Release|Any CPU.ActiveCfg = Release|x64 + {09B0FF33-D34F-4BB4-BE96-B7D35960BB3B}.Release|Any CPU.Build.0 = Release|x64 EndGlobalSection EndGlobal