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 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..2fb5177e5 --- /dev/null +++ b/src/DataStreamSuite/Bts.DataStreamWebApp.Server/wwwroot/index.html @@ -0,0 +1,176 @@ + + + + + + + + +

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