DataStreamWebApp check pt (works w/ default launchProfile)
This commit is contained in:
1 parent
591b4d9181
commit
8b543f77b8
9 files changed
+188
-143
No files matched your search
@@ -1,32 +1,75 @@
|
||||
using BCG;
|
||||
|
||||
using bts;
|
||||
using bts.api.core;
|
||||
using bts.utils;
|
||||
|
||||
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<IBlueRow>().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 upd = new DataStreamUpdate();
|
||||
// upd.addedRows.AddRange(dp.addedRows.Cast<IBlueRow>());
|
||||
// upd.deletedRows.AddRange(dp.deletedRows.Cast<IBlueRow>());
|
||||
// return fmtDataStreamUpdate(upd);
|
||||
}
|
||||
|
||||
static string fmtDataStreamUpdate(DataStreamUpdate rows) {
|
||||
return JsonSerializer.Serialize(rows);
|
||||
}
|
||||
|
||||
var parser = new Parser(ps => {
|
||||
ps.CaseInsensitiveEnumValues = true;
|
||||
ps.HelpWriter = Console.Out;
|
||||
});
|
||||
|
||||
await parser.ParseArguments<Arguments>(args).
|
||||
await parser.ParseArguments<DataStreamWebAppServerOptions>(args).
|
||||
MapResult(run, errors => Task.FromResult(1));
|
||||
|
||||
async Task<int> run(Arguments parsed_args) {
|
||||
async Task<int> 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);
|
||||
// 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();
|
||||
|
||||
builder.Services.AddDirectoryBrowser();
|
||||
var app = builder.Build();
|
||||
var wsOpts = new WebSocketOptions {
|
||||
KeepAliveInterval = TimeSpan.FromMinutes(2)
|
||||
@@ -34,28 +77,23 @@ async Task<int> run(Arguments parsed_args) {
|
||||
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) => {
|
||||
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(
|
||||
parsed_args.sparkd, parsed_args.user!, parsed_args.password!, webSocket);
|
||||
opts.sparkd, opts.user!, opts.password!, webSocket);
|
||||
} else {
|
||||
context.Response.StatusCode = StatusCodes.Status400BadRequest;
|
||||
}
|
||||
} else {
|
||||
Console.WriteLine($"Webserver ignoring req: {reqDesc}");
|
||||
await next(context);
|
||||
}
|
||||
});
|
||||
@@ -66,33 +104,31 @@ async Task<int> run(Arguments parsed_args) {
|
||||
Console.WriteLine($"Exception on DataStreamWebsocketServer thread: {ex}");
|
||||
return 1;
|
||||
}
|
||||
Spark.Core.Disposables.Disposable.dispose(ref vsWorkLoop);
|
||||
return 0;
|
||||
}
|
||||
|
||||
async Task<int> 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<byte>(buffer), CancellationToken.None);
|
||||
|
||||
try {
|
||||
while (!receiveResult.CloseStatus.HasValue) {
|
||||
Console.WriteLine("Awaiting websocket message from client");
|
||||
receiveResult = await webSocket.ReceiveAsync(
|
||||
new ArraySegment<byte>(buffer), CancellationToken.None);
|
||||
var msg = Encoding.UTF8.GetString(buffer, 0, receiveResult.Count);
|
||||
var queryArgs = new QueryArguments { Query = msg };
|
||||
// var queryArgs = JsonSerializer.Deserialize<QueryArguments>(msg);
|
||||
// if (queryArgs is null) {
|
||||
// Console.WriteLine("Invalid queryArgs.");
|
||||
// continue;
|
||||
// }
|
||||
var rpcReq = JsonSerializer.Deserialize<Bts.Websocket.JsonRpcRequest<DataStreamSubscription>>(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<string, StatementExpression>(0));
|
||||
Console.WriteLine("Subscribing to stream...");
|
||||
vs.onChange += onStreamChanged;
|
||||
|
||||
await webSocket.SendAsync(
|
||||
@@ -114,8 +150,10 @@ async Task<int> runWebSocketServer(string? sparkd, string user, string password,
|
||||
$"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}";
|
||||
Console.WriteLine("Received stream update.");
|
||||
var sb = new StringBuilder();
|
||||
var updateDesc = fmtDataPacket(dp);
|
||||
var msg = $"Received new rows:\n{updateDesc}";
|
||||
// var payload = new ReadOnlyMemory<byte>([.. msg]);
|
||||
var encoded = Encoding.UTF8.GetBytes(msg);
|
||||
var payload = new ArraySegment<byte>(encoded, 0, encoded.Length);
|
||||
@@ -126,85 +164,3 @@ async Task<int> runWebSocketServer(string? sparkd, string user, string password,
|
||||
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();
|
||||
|
||||
// // <snippet_UseWebSockets>
|
||||
// var webSocketOptions = new WebSocketOptions {
|
||||
// KeepAliveInterval = TimeSpan.FromMinutes(2)
|
||||
// };
|
||||
|
||||
// app.UseWebSockets(webSocketOptions);
|
||||
// // </snippet_UseWebSockets>
|
||||
|
||||
// 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();
|
||||
Reference in new issue
Block a user