Compare commits
52
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
554ceea2ee | ||
|
|
d54b0437b0 | ||
|
|
81f51352b4 | ||
|
|
6f521f8f6a | ||
|
|
7a0f36f686 | ||
|
|
a14aa58a24 | ||
|
|
667ec4ca10 | ||
|
|
7698fa15f6 | ||
|
|
e78b405139 | ||
|
|
bf96899fa3 | ||
|
|
e919aa9d05 | ||
|
|
a05c7410dc | ||
|
|
6cc0ad4f66 | ||
|
|
8fff414c4c | ||
|
|
8421e4ae1a | ||
|
|
a8d0712e30 | ||
|
|
aa36a7393c | ||
|
|
7e0d5e4f59 | ||
|
|
d26e653a6b | ||
|
|
56e087ab8b | ||
|
|
c71bb8c301 | ||
|
|
44d6173ddf | ||
|
|
322152c743 | ||
|
|
9ab39587e2 | ||
|
|
72f59924ea | ||
|
|
98ab9741b5 | ||
|
|
11f0143845 | ||
|
|
35d47f9cce | ||
|
|
18662fcc0d | ||
|
|
16ffc48846 | ||
|
|
3cf388f041 | ||
|
|
3e401a766d | ||
|
|
b16ff50120 | ||
|
|
44564f7d56 | ||
|
|
eaa5580e89 | ||
|
|
5de4e31880 | ||
|
|
7cf90d95da | ||
|
|
ec36d84412 | ||
|
|
95aad773a2 | ||
|
|
fb476de0a3 | ||
|
|
41b42719ce | ||
|
|
c1f8aadd5d | ||
|
|
ad5e0c77fe | ||
|
|
90ee45db30 | ||
|
|
6dd701dd33 | ||
|
|
456c953839 | ||
|
|
492f02eb21 | ||
|
|
41d2fd9c51 | ||
|
|
59f3c446ba | ||
|
|
9aadda2429 | ||
|
|
57ac078469 | ||
|
|
c39fc70a64 |
No files matched your search
@@ -9,7 +9,7 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"fable": {
|
"fable": {
|
||||||
"version": "4.24.0",
|
"version": "4.0.6",
|
||||||
"commands": [
|
"commands": [
|
||||||
"fable"
|
"fable"
|
||||||
]
|
]
|
||||||
@@ -27,4 +27,4 @@
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -66,6 +66,7 @@ RUN \
|
|||||||
|
|
||||||
# Dotnet
|
# Dotnet
|
||||||
RUN apt-get update && apt-get install -y dotnet7
|
RUN apt-get update && apt-get install -y dotnet7
|
||||||
|
RUN apt-get update && apt-get install -y dotnet8
|
||||||
|
|
||||||
# Node
|
# Node
|
||||||
ARG node_major=18
|
ARG node_major=18
|
||||||
@@ -87,15 +88,6 @@ RUN dpkg -i /emumba/emumba-deribit-connector-3.3.1-Linux.LICENSE_DISABLED.deb \
|
|||||||
# Pcap
|
# Pcap
|
||||||
RUN apt-get update && apt-get install -y libpcap0.8-dev
|
RUN apt-get update && apt-get install -y libpcap0.8-dev
|
||||||
|
|
||||||
# Databento (deps)
|
|
||||||
RUN apt-get update && apt-get -y install libzstd-dev
|
|
||||||
|
|
||||||
# Docker in Docker
|
|
||||||
RUN apt-get update && apt-get install -y \
|
|
||||||
docker.io \
|
|
||||||
docker-compose \
|
|
||||||
docker-compose-v2
|
|
||||||
|
|
||||||
# Set up default executables (update-alternatives)
|
# Set up default executables (update-alternatives)
|
||||||
RUN \
|
RUN \
|
||||||
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-$clang_major 100; \
|
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-$clang_major 100; \
|
||||||
|
|||||||
@@ -1,10 +1,15 @@
|
|||||||
{
|
{
|
||||||
"dockerFile": "Dockerfile",
|
"dockerFile": "Dockerfile",
|
||||||
|
// Creates local dir to mount to HOME in docker
|
||||||
|
"initializeCommand": "mkdir -p ${localEnv:HOME}/.bts/devcontainer-mounts/${devcontainerId}",
|
||||||
"hostRequirements": {
|
"hostRequirements": {
|
||||||
"memory": "8gb",
|
"memory": "4gb",
|
||||||
"storage": "10gb"
|
"storage": "6gb"
|
||||||
},
|
},
|
||||||
|
"postCreateCommand": "/home/bts/spark/docker/sparkd/dev/devcontainer_post_create.sh",
|
||||||
"containerUser": "bts",
|
"containerUser": "bts",
|
||||||
|
"workspaceMount": "source=${localWorkspaceFolder},target=/home/bts/spark,type=bind",
|
||||||
|
"workspaceFolder": "/home/bts/spark",
|
||||||
"updateRemoteUserUID": true,
|
"updateRemoteUserUID": true,
|
||||||
"shutdownAction": "none",
|
"shutdownAction": "none",
|
||||||
// Note: If running multiple containers on the same host, each must use a
|
// Note: If running multiple containers on the same host, each must use a
|
||||||
@@ -12,19 +17,41 @@
|
|||||||
// example, if 8000-8003 is taken, go with 9000-9003, then 10000-10003, etc.
|
// example, if 8000-8003 is taken, go with 9000-9003, then 10000-10003, etc.
|
||||||
"runArgs": [
|
"runArgs": [
|
||||||
"--shm-size",
|
"--shm-size",
|
||||||
"8gb"
|
"2gb",
|
||||||
|
"-p",
|
||||||
|
"5000:5000",
|
||||||
|
"-p",
|
||||||
|
"5001:5001",
|
||||||
|
"-p",
|
||||||
|
"5173:5173",
|
||||||
|
"-p",
|
||||||
|
"5174:5174",
|
||||||
|
"-p",
|
||||||
|
"8000:8000",
|
||||||
|
"-p",
|
||||||
|
"8001:8001",
|
||||||
|
"-p",
|
||||||
|
"8002:8002",
|
||||||
|
"-p",
|
||||||
|
"8003:8003",
|
||||||
|
"-p",
|
||||||
|
"12345:12345",
|
||||||
],
|
],
|
||||||
"mounts": [
|
"mounts": [
|
||||||
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
|
"source=${localEnv:HOME}/.bts/devcontainer-mounts/${devcontainerId},target=/home/bts,type=bind"
|
||||||
],
|
],
|
||||||
"customizations": {
|
"customizations": {
|
||||||
"vscode": {
|
"vscode": {
|
||||||
|
"settings": {
|
||||||
|
"clangd.arguments": [
|
||||||
|
"--compile-commands-dir=${workspaceFolder}/build/clang/debug"
|
||||||
|
]
|
||||||
|
},
|
||||||
"extensions": [
|
"extensions": [
|
||||||
"eamodio.gitlens",
|
"eamodio.gitlens",
|
||||||
"llvm-vs-code-extensions.vscode-clangd",
|
"llvm-vs-code-extensions.vscode-clangd",
|
||||||
"ms-vscode.cmake-tools",
|
"ms-vscode.cmake-tools",
|
||||||
"ms-vscode.cpptools",
|
"ms-vscode.cpptools"
|
||||||
"xaver.clang-format"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+30
-16
@@ -207,17 +207,23 @@ dotnet_naming_symbols.parameters.applicable_accessibilities = public,internal,pr
|
|||||||
dotnet_naming_symbols.private_symbols.applicable_kinds = property,method,field,event,delegate
|
dotnet_naming_symbols.private_symbols.applicable_kinds = property,method,field,event,delegate
|
||||||
dotnet_naming_symbols.private_symbols.applicable_accessibilities = protected,private
|
dotnet_naming_symbols.private_symbols.applicable_accessibilities = protected,private
|
||||||
|
|
||||||
|
# local symbols
|
||||||
|
dotnet_naming_symbols.local_symbols.applicable_kinds = local
|
||||||
|
|
||||||
|
# parameter symbols
|
||||||
|
dotnet_naming_symbols.parameter_symbols.applicable_kinds = parameter
|
||||||
|
|
||||||
# Naming styles
|
# Naming styles
|
||||||
|
|
||||||
dotnet_naming_style.snake_case.required_prefix =
|
dotnet_naming_style.pascal_case.required_prefix =
|
||||||
dotnet_naming_style.snake_case.required_suffix =
|
dotnet_naming_style.pascal_case.required_suffix =
|
||||||
dotnet_naming_style.snake_case.word_separator = _
|
dotnet_naming_style.pascal_case.word_separator =
|
||||||
dotnet_naming_style.snake_case.capitalization = all_lower
|
dotnet_naming_style.pascal_case.capitalization = pascal_case
|
||||||
|
|
||||||
dotnet_naming_style.private_snake_case.required_prefix = _
|
dotnet_naming_style.camel_case.required_prefix =
|
||||||
dotnet_naming_style.private_snake_case.required_suffix =
|
dotnet_naming_style.camel_case.required_suffix =
|
||||||
dotnet_naming_style.private_snake_case.word_separator = _
|
dotnet_naming_style.camel_case.word_separator =
|
||||||
dotnet_naming_style.private_snake_case.capitalization = all_lower
|
dotnet_naming_style.camel_case.capitalization = camel_case
|
||||||
|
|
||||||
dotnet_naming_style.user_types.required_prefix =
|
dotnet_naming_style.user_types.required_prefix =
|
||||||
dotnet_naming_style.user_types.required_suffix =
|
dotnet_naming_style.user_types.required_suffix =
|
||||||
@@ -229,6 +235,10 @@ dotnet_naming_style.interface.required_suffix =
|
|||||||
dotnet_naming_style.interface.word_separator =
|
dotnet_naming_style.interface.word_separator =
|
||||||
dotnet_naming_style.interface.capitalization = pascal_case
|
dotnet_naming_style.interface.capitalization = pascal_case
|
||||||
|
|
||||||
|
dotnet_naming_style.local.capitalization = camel_case
|
||||||
|
|
||||||
|
dotnet_naming_style.parameter.capitalization = camel_case
|
||||||
|
|
||||||
# rules
|
# rules
|
||||||
dotnet_naming_rule.user_types.symbols = user_types
|
dotnet_naming_rule.user_types.symbols = user_types
|
||||||
dotnet_naming_rule.user_types.style = user_types
|
dotnet_naming_rule.user_types.style = user_types
|
||||||
@@ -238,14 +248,18 @@ dotnet_naming_rule.interfaces.symbols = interface
|
|||||||
dotnet_naming_rule.interfaces.style = interface_style
|
dotnet_naming_rule.interfaces.style = interface_style
|
||||||
dotnet_naming_rule.interfaces.severity = suggestion
|
dotnet_naming_rule.interfaces.severity = suggestion
|
||||||
|
|
||||||
dotnet_naming_rule.public_members_snake_case.symbols = public_symbols
|
dotnet_naming_rule.public_members.symbols = public_symbols
|
||||||
dotnet_naming_rule.public_members_snake_case.style = snake_case
|
dotnet_naming_rule.public_members.style = pascal_case
|
||||||
dotnet_naming_rule.public_members_snake_case.severity = suggestion
|
dotnet_naming_rule.public_members.severity = suggestion
|
||||||
|
|
||||||
dotnet_naming_rule.private_members_snake_case.symbols = private_symbols
|
dotnet_naming_rule.private_members.symbols = private_symbols
|
||||||
dotnet_naming_rule.private_members_snake_case.style = private_snake_case
|
dotnet_naming_rule.private_members.style = camel_case
|
||||||
dotnet_naming_rule.private_members_snake_case.severity = suggestion
|
dotnet_naming_rule.private_members.severity = suggestion
|
||||||
|
|
||||||
dotnet_naming_rule.parameters.symbols = parameters
|
dotnet_naming_rule.variables_are_camel_case.severity = suggestion
|
||||||
dotnet_naming_rule.parameters.style = snake_case
|
dotnet_naming_rule.variables_are_camel_case.symbols = local_symbols
|
||||||
|
dotnet_naming_rule.variables_are_camel_case.style = local
|
||||||
|
|
||||||
|
dotnet_naming_rule.parameters.symbols = parameter_symbols
|
||||||
|
dotnet_naming_rule.parameters.style = parameter
|
||||||
dotnet_naming_rule.parameters.severity = suggestion
|
dotnet_naming_rule.parameters.severity = suggestion
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
# This file defines the global default configuration for docker deployments.
|
|
||||||
# It is tracked in source control. For temporary modifications, please create
|
|
||||||
# a separate file called ".env.local" (it's in .gitignore, so won't be tracked).
|
|
||||||
# If a variable is defined in both files, the value in .env.local will be used.
|
|
||||||
#
|
|
||||||
# About the deployment procedure:
|
|
||||||
# We use Docker Compose to build images and launch containers for various services
|
|
||||||
# that make up our software suite:
|
|
||||||
# - sparkd
|
|
||||||
# - TODO: pubsub
|
|
||||||
# - TODO: md-publisher
|
|
||||||
# - TODO: webapp (DSQA on the web)
|
|
||||||
# - TODO: api-server (websocket based)
|
|
||||||
# From inside a devcontainer, you can launch all services in separate containers
|
|
||||||
# on your machine by running:
|
|
||||||
#
|
|
||||||
# tools/deploy.sh
|
|
||||||
#
|
|
||||||
# This script builds release versions for each service, packaged (generally) in
|
|
||||||
# self-contained directories. Next, it runs a few "docker compose" commands to
|
|
||||||
# build docker images loaded with the self-contained binaries from the previous
|
|
||||||
# step, and start containers with those images to run each service. To view the
|
|
||||||
# commands that deploy.sh runs internally (without actually running them), run:
|
|
||||||
#
|
|
||||||
# tools/deploy.sh --dry-run
|
|
||||||
#
|
|
||||||
# For additional information/help, run:
|
|
||||||
#
|
|
||||||
# tools/deploy.sh --help
|
|
||||||
#
|
|
||||||
|
|
||||||
### Sparkd ###
|
|
||||||
# The internal image for sparkd to use. For more info, view:
|
|
||||||
# src/server/sparkd/Dockerfile
|
|
||||||
SPARKD__IMAGE=sparkd
|
|
||||||
# The config dir for this service to use
|
|
||||||
SPARKD__CONFIG_DIR=src/server/sparkd/configurations/dev
|
|
||||||
# Mount a specific volume or dir to "~/sparkdata/data" inside the docker.
|
|
||||||
# Defaults to a volume named "sparkd_<config_port>" (e.g., sparkd_8000).
|
|
||||||
# SPARKD__DATA_DIR=/home/bts/sparkdata/data
|
|
||||||
SPARKD__SOURCE_DIR=install/sparkd-release-gcc
|
|
||||||
SPARKD__RUNTIME_CONF_DIR=/home/ubuntu/8000/sparkdata/conf/
|
|
||||||
SPARKD__CONFIG_PORT=8000
|
|
||||||
SPARKD__QUICKBUS_PORT=8001
|
|
||||||
SPARKD__SIM_FIX_PORT=8002
|
|
||||||
SPARKD__SHM_SIZE=4gb
|
|
||||||
|
|
||||||
# TODO: add config for other services (pubsub, md-publisher, webapp, api-server, etc.)
|
|
||||||
@@ -59,4 +59,3 @@ trace_data/
|
|||||||
.devcontainer/
|
.devcontainer/
|
||||||
*.Generated.cs
|
*.Generated.cs
|
||||||
*.lst
|
*.lst
|
||||||
.env.local
|
|
||||||
Vendored
+75
-191
@@ -6,6 +6,35 @@
|
|||||||
"type": "coreclr",
|
"type": "coreclr",
|
||||||
"request": "attach"
|
"request": "attach"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "Bts.DataStreamWebApp.Server",
|
||||||
|
"type": "coreclr",
|
||||||
|
"request": "launch",
|
||||||
|
"preLaunchTask": "Build DataStream WebApp (Debug)",
|
||||||
|
"program": "${workspaceFolder}/build/Debug/bin/net8.0/Bts.DataStreamWebApp.Server.dll",
|
||||||
|
"args": [
|
||||||
|
"--sparkd",
|
||||||
|
"http://localhost:8000/config",
|
||||||
|
],
|
||||||
|
"env": {
|
||||||
|
"ASPNETCORE_ENVIRONMENT": "Development",
|
||||||
|
"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy",
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Bts.DataStreamWebApp.Server (Skip Build)",
|
||||||
|
"type": "coreclr",
|
||||||
|
"request": "launch",
|
||||||
|
"program": "${workspaceFolder}/build/Debug/bin/net8.0/Bts.DataStreamWebApp.Server.dll",
|
||||||
|
// "args": [
|
||||||
|
// "--config",
|
||||||
|
// "${workspaceFolder}/src/DataStreamSuite/Bts.DataStreamWebApp.Server/Configurations/DevServer.json",
|
||||||
|
// ],
|
||||||
|
"env": {
|
||||||
|
"ASPNETCORE_ENVIRONMENT": "Development",
|
||||||
|
"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy",
|
||||||
|
}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "DataStreamPublisher",
|
"name": "DataStreamPublisher",
|
||||||
"type": "coreclr",
|
"type": "coreclr",
|
||||||
@@ -22,59 +51,34 @@
|
|||||||
"--config",
|
"--config",
|
||||||
"${workspaceFolder}/src/DataStreamSuite/DataStreamPublisher/Configurations/${input:dataStreamPublisherConfig}.json"
|
"${workspaceFolder}/src/DataStreamSuite/DataStreamPublisher/Configurations/${input:dataStreamPublisherConfig}.json"
|
||||||
],
|
],
|
||||||
"cwd": "build/Debug/bin/net7.0",
|
"cwd": "${workspaceFolder}/build/Debug/bin/net7.0",
|
||||||
"stopAtEntry": false,
|
"stopAtEntry": false,
|
||||||
"console": "integratedTerminal"
|
"console": "integratedTerminal"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "(gdb) Launch",
|
"name": "DataStreamPublisher (Skip Build)",
|
||||||
"type": "cppdbg",
|
"type": "coreclr",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
"program": "/home/bts/spark/build/sparkd-debug-clang/server/sparkd",
|
"program": "",
|
||||||
|
"linux": {
|
||||||
|
"program": "DataStreamPublisher",
|
||||||
|
},
|
||||||
|
"windows": {
|
||||||
|
"program": "DataStreamPublisher.exe",
|
||||||
|
},
|
||||||
"args": [
|
"args": [
|
||||||
"run"
|
"--config",
|
||||||
|
"${workspaceFolder}/src/DataStreamSuite/DataStreamPublisher/Configurations/${input:dataStreamPublisherConfig}.json"
|
||||||
],
|
],
|
||||||
|
"cwd": "${workspaceFolder}/build/Debug/bin/net7.0",
|
||||||
"stopAtEntry": false,
|
"stopAtEntry": false,
|
||||||
"cwd": "/home/bts/spark/build/sparkd-debug-clang/server",
|
"console": "integratedTerminal"
|
||||||
"environment": [],
|
|
||||||
"externalConsole": false,
|
|
||||||
"MIMode": "gdb",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "spreader tests2",
|
|
||||||
"type": "cppdbg",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "/home/bts/spark/build/sparkd-debug-clang/server/sparkd",
|
|
||||||
"args": [
|
|
||||||
"test",
|
|
||||||
"[spreader2]"
|
|
||||||
],
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"cwd": "/home/bts/spark/build/sparkd-debug-clang/server",
|
|
||||||
"environment": [],
|
|
||||||
"externalConsole": false,
|
|
||||||
"MIMode": "gdb",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "spreader tests",
|
|
||||||
"type": "cppdbg",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "/home/bts/spark/build/sparkd-debug-clang/server/sparkd",
|
|
||||||
"args": [
|
|
||||||
"test",
|
|
||||||
"[spreader]"
|
|
||||||
],
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"cwd": "/home/bts/spark/build/sparkd-debug-clang/server",
|
|
||||||
"environment": [],
|
|
||||||
"externalConsole": false,
|
|
||||||
"MIMode": "gdb",
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "DataStreamQueryAnalyzer",
|
"name": "DataStreamQueryAnalyzer",
|
||||||
"type": "coreclr",
|
"type": "coreclr",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
//"preLaunchTask": "Build DataStreamQueryAnalyzer (Debug)",
|
"preLaunchTask": "Build DataStreamQueryAnalyzer (Debug)",
|
||||||
"program": "",
|
"program": "",
|
||||||
"windows": {
|
"windows": {
|
||||||
"program": "DataStreamQueryAnalyzer.exe",
|
"program": "DataStreamQueryAnalyzer.exe",
|
||||||
@@ -110,6 +114,25 @@
|
|||||||
"stopAtEntry": false,
|
"stopAtEntry": false,
|
||||||
"console": "integratedTerminal"
|
"console": "integratedTerminal"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "PubSubServer (Skip Build)",
|
||||||
|
"type": "coreclr",
|
||||||
|
"request": "launch",
|
||||||
|
"program": "",
|
||||||
|
"linux": {
|
||||||
|
"program": "PubSubServer",
|
||||||
|
},
|
||||||
|
"windows": {
|
||||||
|
"program": "PubSubServer.exe",
|
||||||
|
},
|
||||||
|
"args": [
|
||||||
|
"--config",
|
||||||
|
"${workspaceFolder}/src/DataStreamSuite/PubSubServer/Configurations/${input:pubSubServerConfig}.json"
|
||||||
|
],
|
||||||
|
"cwd": "build/Debug/bin/net7.0",
|
||||||
|
"stopAtEntry": false,
|
||||||
|
"console": "integratedTerminal"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "Spark",
|
"name": "Spark",
|
||||||
"type": "coreclr",
|
"type": "coreclr",
|
||||||
@@ -123,18 +146,6 @@
|
|||||||
"stopAtEntry": false,
|
"stopAtEntry": false,
|
||||||
"console": "integratedTerminal"
|
"console": "integratedTerminal"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "Spark (Skip Build)",
|
|
||||||
"type": "coreclr",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "",
|
|
||||||
"windows": {
|
|
||||||
"program": "Spark.exe",
|
|
||||||
"cwd": "build/Debug/bin/net7.0-windows",
|
|
||||||
},
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"console": "integratedTerminal"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "Spark (Parameterized)",
|
"name": "Spark (Parameterized)",
|
||||||
"type": "coreclr",
|
"type": "coreclr",
|
||||||
@@ -152,139 +163,22 @@
|
|||||||
"stopAtEntry": false,
|
"stopAtEntry": false,
|
||||||
"console": "integratedTerminal"
|
"console": "integratedTerminal"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "Spark Test",
|
|
||||||
"type": "coreclr",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "",
|
|
||||||
"windows": {
|
|
||||||
"preLaunchTask": "Build Spark (Debug)",
|
|
||||||
"program": "Spark.Console.exe",
|
|
||||||
"cwd": "build/Debug/bin/net7.0",
|
|
||||||
"args": [
|
|
||||||
"test",
|
|
||||||
"${input:sparkTest}"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"console": "integratedTerminal"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Spark Test (Skip Build)",
|
|
||||||
"type": "coreclr",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "",
|
|
||||||
"windows": {
|
|
||||||
"program": "Spark.Console.exe",
|
|
||||||
"cwd": "build/Debug/bin/net7.0",
|
|
||||||
"args": [
|
|
||||||
"test",
|
|
||||||
"${input:sparkTest}"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"console": "integratedTerminal"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "Sparkd",
|
"name": "Sparkd",
|
||||||
"type": "cppdbg",
|
"type": "coreclr",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
|
"preLaunchTask": "Build Sparkd (Debug | Clang)",
|
||||||
"program": "",
|
"program": "",
|
||||||
"linux": {
|
"linux": {
|
||||||
"preLaunchTask": "Build Sparkd (Debug)",
|
"program": "sparkd",
|
||||||
"program": "${workspaceFolder}/build/sparkd-debug-clang/server/sparkd",
|
},
|
||||||
"args": [
|
"args": [
|
||||||
"run"
|
"run"
|
||||||
],
|
],
|
||||||
"stopAtEntry": false,
|
"cwd": "build/sparkd-debug-clang/server",
|
||||||
"cwd": "${workspaceFolder}/build/sparkd-debug-clang/server",
|
"stopAtEntry": false,
|
||||||
"environment": [],
|
"console": "integratedTerminal"
|
||||||
"externalConsole": false,
|
}
|
||||||
"MIMode": "gdb",
|
|
||||||
"setupCommands": [
|
|
||||||
{
|
|
||||||
"description": "Enable pretty-printing for gdb",
|
|
||||||
"text": "-enable-pretty-printing",
|
|
||||||
"ignoreFailures": true
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Sparkd (Skip Build)",
|
|
||||||
"type": "cppdbg",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "",
|
|
||||||
"linux": {
|
|
||||||
"program": "${workspaceFolder}/build/sparkd-debug-clang/server/sparkd",
|
|
||||||
"args": [
|
|
||||||
"run"
|
|
||||||
],
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"cwd": "${workspaceFolder}/build/sparkd-debug-clang/server",
|
|
||||||
"environment": [],
|
|
||||||
"externalConsole": false,
|
|
||||||
"MIMode": "gdb",
|
|
||||||
"setupCommands": [
|
|
||||||
{
|
|
||||||
"description": "Enable pretty-printing for gdb",
|
|
||||||
"text": "-enable-pretty-printing",
|
|
||||||
"ignoreFailures": true
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Sparkd Test",
|
|
||||||
"type": "cppdbg",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "",
|
|
||||||
"linux": {
|
|
||||||
"preLaunchTask": "Build Sparkd (Debug)",
|
|
||||||
"program": "${workspaceFolder}/build/sparkd-debug-clang/server/sparkd",
|
|
||||||
"args": [
|
|
||||||
"test",
|
|
||||||
"${input:sparkdTest}",
|
|
||||||
],
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"cwd": "${workspaceFolder}/build/sparkd-debug-clang/server",
|
|
||||||
"environment": [],
|
|
||||||
"externalConsole": false,
|
|
||||||
"MIMode": "gdb",
|
|
||||||
"setupCommands": [
|
|
||||||
{
|
|
||||||
"description": "Enable pretty-printing for gdb",
|
|
||||||
"text": "-enable-pretty-printing",
|
|
||||||
"ignoreFailures": true
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Sparkd Test (Skip Build)",
|
|
||||||
"type": "cppdbg",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "",
|
|
||||||
"linux": {
|
|
||||||
"program": "${workspaceFolder}/build/sparkd-debug-clang/server/sparkd",
|
|
||||||
"args": [
|
|
||||||
"test",
|
|
||||||
"${input:sparkdTest}",
|
|
||||||
],
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"cwd": "${workspaceFolder}/build/sparkd-debug-clang/server",
|
|
||||||
"environment": [],
|
|
||||||
"externalConsole": false,
|
|
||||||
"MIMode": "gdb",
|
|
||||||
"setupCommands": [
|
|
||||||
{
|
|
||||||
"description": "Enable pretty-printing for gdb",
|
|
||||||
"text": "-enable-pretty-printing",
|
|
||||||
"ignoreFailures": true
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
],
|
],
|
||||||
"inputs": [
|
"inputs": [
|
||||||
{
|
{
|
||||||
@@ -315,15 +209,5 @@
|
|||||||
"description": "Config Server URL",
|
"description": "Config Server URL",
|
||||||
"default": "http://localhost:8000/config",
|
"default": "http://localhost:8000/config",
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"id": "sparkTest",
|
|
||||||
"type": "promptString",
|
|
||||||
"description": "Test to run",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "sparkdTest",
|
|
||||||
"type": "promptString",
|
|
||||||
"description": "Test to run",
|
|
||||||
},
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
Vendored
+111
-106
@@ -121,6 +121,97 @@
|
|||||||
"color": "terminal.ansiCyan"
|
"color": "terminal.ansiCyan"
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"label": "Build DataStreamQueryAnalyzer",
|
||||||
|
"group": "build",
|
||||||
|
"type": "process",
|
||||||
|
"command": "",
|
||||||
|
"windows": {
|
||||||
|
"command": "tools/build_data_stream_query_analyzer.cmd",
|
||||||
|
},
|
||||||
|
"args": [
|
||||||
|
"--configuration",
|
||||||
|
"${input:buildConfiguration}",
|
||||||
|
],
|
||||||
|
"icon": {
|
||||||
|
"id": "terminal",
|
||||||
|
"color": "terminal.ansiCyan"
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "Build DataStreamQueryAnalyzer (Debug)",
|
||||||
|
"group": "build",
|
||||||
|
"type": "process",
|
||||||
|
"command": "",
|
||||||
|
"windows": {
|
||||||
|
"command": "tools/build_data_stream_query_analyzer.cmd",
|
||||||
|
},
|
||||||
|
"args": [
|
||||||
|
"--configuration",
|
||||||
|
"Debug",
|
||||||
|
],
|
||||||
|
"icon": {
|
||||||
|
"id": "terminal",
|
||||||
|
"color": "terminal.ansiCyan"
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "Build DataStreamQueryAnalyzer (Release)",
|
||||||
|
"group": "build",
|
||||||
|
"type": "process",
|
||||||
|
"command": "",
|
||||||
|
"windows": {
|
||||||
|
"command": "tools/build_data_stream_query_analyzer.cmd",
|
||||||
|
},
|
||||||
|
"args": [
|
||||||
|
"--configuration",
|
||||||
|
"Release",
|
||||||
|
],
|
||||||
|
"icon": {
|
||||||
|
"id": "terminal",
|
||||||
|
"color": "terminal.ansiCyan"
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "Build DataStream WebApp",
|
||||||
|
"group": "build",
|
||||||
|
"type": "process",
|
||||||
|
"command": "",
|
||||||
|
"linux": {
|
||||||
|
"command": "tools/build_data_stream_web_app.sh",
|
||||||
|
},
|
||||||
|
"windows": {
|
||||||
|
"command": "tools/build_data_stream_web_app.cmd",
|
||||||
|
},
|
||||||
|
"args": [
|
||||||
|
"--configuration",
|
||||||
|
"${input:buildConfiguration}",
|
||||||
|
],
|
||||||
|
"icon": {
|
||||||
|
"id": "terminal",
|
||||||
|
"color": "terminal.ansiCyan"
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "Build DataStream WebApp (Debug)",
|
||||||
|
"group": "build",
|
||||||
|
"type": "process",
|
||||||
|
"command": "",
|
||||||
|
"linux": {
|
||||||
|
"command": "tools/build_data_stream_web_app.sh",
|
||||||
|
},
|
||||||
|
"windows": {
|
||||||
|
"command": "tools/build_data_stream_web_app.cmd",
|
||||||
|
},
|
||||||
|
"args": [
|
||||||
|
"--configuration",
|
||||||
|
"Debug",
|
||||||
|
],
|
||||||
|
"icon": {
|
||||||
|
"id": "terminal",
|
||||||
|
"color": "terminal.ansiCyan"
|
||||||
|
},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"label": "Build Spark",
|
"label": "Build Spark",
|
||||||
"group": "build",
|
"group": "build",
|
||||||
@@ -303,6 +394,22 @@
|
|||||||
"color": "terminal.ansiCyan"
|
"color": "terminal.ansiCyan"
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"label": "Publish DataStreamWebApp",
|
||||||
|
"group": "build",
|
||||||
|
"type": "process",
|
||||||
|
"command": "",
|
||||||
|
"linux": {
|
||||||
|
"command": "tools/publish_data_stream_web_app.sh",
|
||||||
|
},
|
||||||
|
"windows": {
|
||||||
|
"command": "tools/publish_data_stream_web_app.cmd",
|
||||||
|
},
|
||||||
|
"icon": {
|
||||||
|
"id": "terminal",
|
||||||
|
"color": "terminal.ansiCyan"
|
||||||
|
},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"label": "Edit DataStream Config",
|
"label": "Edit DataStream Config",
|
||||||
"type": "process",
|
"type": "process",
|
||||||
@@ -353,7 +460,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"label": "Run DataStreamQueryAnalyzer",
|
"label": "Run DataStreamQueryAnalyzer",
|
||||||
"dependsOn": "Build DataStream",
|
"dependsOn": "Build DataStreamQueryAnalyzer",
|
||||||
"type": "process",
|
"type": "process",
|
||||||
"command": "",
|
"command": "",
|
||||||
"windows": {
|
"windows": {
|
||||||
@@ -373,7 +480,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"label": "Run DataStreamQueryAnalyzer (Debug)",
|
"label": "Run DataStreamQueryAnalyzer (Debug)",
|
||||||
"dependsOn": "Build DataStream (Debug)",
|
"dependsOn": "Build DataStreamQueryAnalyzer (Debug)",
|
||||||
"type": "process",
|
"type": "process",
|
||||||
"command": "",
|
"command": "",
|
||||||
"windows": {
|
"windows": {
|
||||||
@@ -393,7 +500,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"label": "Run DataStreamQueryAnalyzer (Release)",
|
"label": "Run DataStreamQueryAnalyzer (Release)",
|
||||||
"dependsOn": "Build DataStream (Release)",
|
"dependsOn": "Build DataStreamQueryAnalyzer (Release)",
|
||||||
"type": "process",
|
"type": "process",
|
||||||
"command": "",
|
"command": "",
|
||||||
"windows": {
|
"windows": {
|
||||||
@@ -641,21 +748,6 @@
|
|||||||
"color": "terminal.ansiGreen",
|
"color": "terminal.ansiGreen",
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"label": "Run Spark (Skip Build)",
|
|
||||||
"type": "process",
|
|
||||||
"command": "",
|
|
||||||
"windows": {
|
|
||||||
"command": "Spark.exe",
|
|
||||||
"options": {
|
|
||||||
"cwd": "${workspaceFolder}/build/${input:buildConfiguration}/bin/net7.0-windows"
|
|
||||||
},
|
|
||||||
},
|
|
||||||
"icon": {
|
|
||||||
"id": "run",
|
|
||||||
"color": "terminal.ansiGreen",
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"label": "Run Spark Config Query",
|
"label": "Run Spark Config Query",
|
||||||
"dependsOn": "Build Spark",
|
"dependsOn": "Build Spark",
|
||||||
@@ -699,24 +791,6 @@
|
|||||||
"color": "terminal.ansiGreen",
|
"color": "terminal.ansiGreen",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"label": "Run Sparkd (Skip Build)",
|
|
||||||
"type": "process",
|
|
||||||
"command": "",
|
|
||||||
"linux": {
|
|
||||||
"command": "sparkd",
|
|
||||||
},
|
|
||||||
"args": [
|
|
||||||
"run"
|
|
||||||
],
|
|
||||||
"options": {
|
|
||||||
"cwd": "${workspaceFolder}/build/${input:sparkdCmakePreset}/server"
|
|
||||||
},
|
|
||||||
"icon": {
|
|
||||||
"id": "run",
|
|
||||||
"color": "terminal.ansiGreen",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"label": "Run Sparkd Config Query",
|
"label": "Run Sparkd Config Query",
|
||||||
"dependsOn": "Build Sparkd",
|
"dependsOn": "Build Sparkd",
|
||||||
@@ -738,65 +812,6 @@
|
|||||||
"color": "terminal.ansiGreen",
|
"color": "terminal.ansiGreen",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"label": "Test Spark (Debug)",
|
|
||||||
"dependsOn": "Build Spark (Debug)",
|
|
||||||
"type": "process",
|
|
||||||
"icon": {
|
|
||||||
"id": "coverage",
|
|
||||||
"color": "terminal.ansiYellow",
|
|
||||||
},
|
|
||||||
"command": "",
|
|
||||||
"windows": {
|
|
||||||
"command": "Spark.Console.exe",
|
|
||||||
"args": [
|
|
||||||
"test",
|
|
||||||
"${input:sparkTest}"
|
|
||||||
],
|
|
||||||
"options": {
|
|
||||||
"cwd": "${workspaceFolder}/build/Debug/bin/net7.0",
|
|
||||||
}
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "Test Sparkd",
|
|
||||||
"dependsOn": "Build Sparkd",
|
|
||||||
"type": "process",
|
|
||||||
"command": "",
|
|
||||||
"linux": {
|
|
||||||
"command": "sparkd",
|
|
||||||
},
|
|
||||||
"args": [
|
|
||||||
"test",
|
|
||||||
"${input:sparkdTest}",
|
|
||||||
],
|
|
||||||
"options": {
|
|
||||||
"cwd": "${workspaceFolder}/build/${input:sparkdCmakePreset}/server"
|
|
||||||
},
|
|
||||||
"icon": {
|
|
||||||
"id": "coverage",
|
|
||||||
"color": "terminal.ansiYellow",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "Test Sparkd (Skip Build)",
|
|
||||||
"type": "process",
|
|
||||||
"command": "",
|
|
||||||
"linux": {
|
|
||||||
"command": "sparkd",
|
|
||||||
},
|
|
||||||
"args": [
|
|
||||||
"test",
|
|
||||||
"${input:sparkdTest}",
|
|
||||||
],
|
|
||||||
"options": {
|
|
||||||
"cwd": "${workspaceFolder}/build/${input:sparkdCmakePreset}/server"
|
|
||||||
},
|
|
||||||
"icon": {
|
|
||||||
"id": "coverage",
|
|
||||||
"color": "terminal.ansiYellow",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"label": "View DataStreamQueryAnalyzer Logs (Last Run)",
|
"label": "View DataStreamQueryAnalyzer Logs (Last Run)",
|
||||||
"type": "process",
|
"type": "process",
|
||||||
@@ -915,16 +930,6 @@
|
|||||||
"id": "sparkdConfigQuery",
|
"id": "sparkdConfigQuery",
|
||||||
"type": "promptString",
|
"type": "promptString",
|
||||||
"description": "Config Type(s)"
|
"description": "Config Type(s)"
|
||||||
},
|
}
|
||||||
{
|
|
||||||
"id": "sparkTest",
|
|
||||||
"type": "promptString",
|
|
||||||
"description": "Test to run",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "sparkdTest",
|
|
||||||
"type": "promptString",
|
|
||||||
"description": "Test to run",
|
|
||||||
},
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
+7
-20
@@ -1,10 +1,7 @@
|
|||||||
cmake_minimum_required(VERSION 3.12)
|
cmake_minimum_required(VERSION 3.12)
|
||||||
project(spark)
|
project(spark)
|
||||||
include(GNUInstallDirs)
|
|
||||||
include(${CMAKE_SOURCE_DIR}/cmake/GitVersion.cmake)
|
|
||||||
set(CMAKE_CXX_STANDARD 20)
|
set(CMAKE_CXX_STANDARD 20)
|
||||||
|
|
||||||
get_version_from_git()
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
set(platform "windows")
|
set(platform "windows")
|
||||||
else()
|
else()
|
||||||
@@ -52,6 +49,8 @@ else()
|
|||||||
# make sparkd look for libspark.so in its directory
|
# make sparkd look for libspark.so in its directory
|
||||||
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
|
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
|
||||||
set(CMAKE_INSTALL_RPATH ".")
|
set(CMAKE_INSTALL_RPATH ".")
|
||||||
|
set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/install")
|
||||||
|
set(SPARK_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/$<CONFIG>")
|
||||||
|
|
||||||
if(BUILD_SPARKD)
|
if(BUILD_SPARKD)
|
||||||
# Note: All macros that begin w/ 'CCAPI' are ccapi's macros (defined and/or
|
# Note: All macros that begin w/ 'CCAPI' are ccapi's macros (defined and/or
|
||||||
@@ -90,15 +89,9 @@ else()
|
|||||||
add_compile_definitions(BINANCE_US_PRICE_STATS_PATH="/api/v3/ticker/24hr")
|
add_compile_definitions(BINANCE_US_PRICE_STATS_PATH="/api/v3/ticker/24hr")
|
||||||
|
|
||||||
# ** Binance USDS Futures **
|
# ** Binance USDS Futures **
|
||||||
add_compile_definitions(CCAPI_BINANCE_USDS_FUTURES_URL_REST_BASE="https://fapi.binance.com")
|
add_compile_definitions(CCAPI_BINANCE_USDS_FUTURES_URL_REST_BASE="https://dapi.binance.com")
|
||||||
add_compile_definitions(BINANCE_USDS_FUTURES_INSTRUMENTS_PATH="/fapi/v1/exchangeInfo")
|
add_compile_definitions(BINANCE_USDS_FUTURES_INSTRUMENTS_PATH="/dapi/v1/exchangeInfo")
|
||||||
add_compile_definitions(BINANCE_USDS_FUTURES_PRICE_STATS_PATH="/fapi/v1/ticker/24hr")
|
add_compile_definitions(BINANCE_USDS_FUTURES_PRICE_STATS_PATH="/dapi/v1/ticker/24hr")
|
||||||
add_compile_definitions(BINANCE_USDS_FUTURES_USER_DATA_PATH="/api/v3/userDataStream")
|
|
||||||
|
|
||||||
# ** Binance Coin Futures **
|
|
||||||
add_compile_definitions(CCAPI_BINANCE_COIN_FUTURES_URL_REST_BASE="https://dapi.binance.com")
|
|
||||||
add_compile_definitions(BINANCE_COIN_FUTURES_INSTRUMENTS_PATH="/dapi/v1/exchangeInfo")
|
|
||||||
add_compile_definitions(BINANCE_COIN_FUTURES_PRICE_STATS_PATH="/dapi/v1/ticker/24hr")
|
|
||||||
|
|
||||||
# ** Deribit **
|
# ** Deribit **
|
||||||
add_compile_definitions(DERIBIT_INSTRUMENT_PATH="/api/v2/public/get_instrument")
|
add_compile_definitions(DERIBIT_INSTRUMENT_PATH="/api/v2/public/get_instrument")
|
||||||
@@ -118,7 +111,6 @@ else()
|
|||||||
|
|
||||||
# subdirs
|
# subdirs
|
||||||
if (BUILD_SPARKD)
|
if (BUILD_SPARKD)
|
||||||
add_subdirectory(src/lib_binance_execution)
|
|
||||||
add_subdirectory(src/server/sparkd)
|
add_subdirectory(src/server/sparkd)
|
||||||
add_subdirectory(src/data_files)
|
add_subdirectory(src/data_files)
|
||||||
endif()
|
endif()
|
||||||
@@ -140,8 +132,6 @@ else()
|
|||||||
COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/server/sparkd/sparkd ${CMAKE_BINARY_DIR}/server
|
COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/server/sparkd/sparkd ${CMAKE_BINARY_DIR}/server
|
||||||
COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/data_files ${CMAKE_BINARY_DIR}/server
|
COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/data_files ${CMAKE_BINARY_DIR}/server
|
||||||
COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/lib/libspark.so ${CMAKE_BINARY_DIR}/server
|
COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/lib/libspark.so ${CMAKE_BINARY_DIR}/server
|
||||||
COMMAND ln ARGS -sf ${EXTERNALS_ROOT}/lib/${CMAKE_BUILD_TYPE}/libonixs-fix-engine.so.4 ${CMAKE_BINARY_DIR}/server
|
|
||||||
|
|
||||||
COMMAND
|
COMMAND
|
||||||
ln ARGS -sf
|
ln ARGS -sf
|
||||||
${EXTERNALS_ROOT}/lib/Release/libOnixS.IceImpactMulticastPriceFeedHandlerCpp.so.3.16.0.0
|
${EXTERNALS_ROOT}/lib/Release/libOnixS.IceImpactMulticastPriceFeedHandlerCpp.so.3.16.0.0
|
||||||
@@ -155,14 +145,11 @@ else()
|
|||||||
|
|
||||||
install(
|
install(
|
||||||
DIRECTORY "${CMAKE_BINARY_DIR}/server/plugins"
|
DIRECTORY "${CMAKE_BINARY_DIR}/server/plugins"
|
||||||
DESTINATION "${CMAKE_INSTALL_BINDIR}")
|
DESTINATION "${SPARK_INSTALL_PREFIX}/bin")
|
||||||
install(
|
install(
|
||||||
FILES
|
FILES
|
||||||
"${SPARK_LIB}/libACE-5.7.5.so"
|
"${SPARK_LIB}/libACE-5.7.5.so"
|
||||||
"${SPARK_LIB}/libOnixS.IceImpactMulticastPriceFeedHandlerCpp.so.3.16.0.0"
|
"${SPARK_LIB}/libOnixS.IceImpactMulticastPriceFeedHandlerCpp.so.3.16.0.0"
|
||||||
"${SPARK_LIB}/libonixs-fix-engine.so.4.10.1"
|
DESTINATION "${SPARK_INSTALL_PREFIX}/bin")
|
||||||
"${SPARK_LIB}/libonixs-fix-engine.so.4"
|
|
||||||
"${SPARK_LIB}/libonixs-fix-engine.so"
|
|
||||||
DESTINATION "${CMAKE_INSTALL_BINDIR}")
|
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
+14
-6
@@ -26,14 +26,12 @@
|
|||||||
"CMAKE_CXX_FLAGS_DEBUG": "$env{SPARK_CMAKE_CXX_FLAGS} /MTd",
|
"CMAKE_CXX_FLAGS_DEBUG": "$env{SPARK_CMAKE_CXX_FLAGS} /MTd",
|
||||||
"CMAKE_CXX_FLAGS_RELEASE": "$env{SPARK_CMAKE_CXX_FLAGS} /MT",
|
"CMAKE_CXX_FLAGS_RELEASE": "$env{SPARK_CMAKE_CXX_FLAGS} /MT",
|
||||||
"CMAKE_CXX_STANDARD": "20",
|
"CMAKE_CXX_STANDARD": "20",
|
||||||
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
|
|
||||||
"CMAKE_SHARED_LINKER_FLAGS_DEBUG": "/DEBUG",
|
"CMAKE_SHARED_LINKER_FLAGS_DEBUG": "/DEBUG",
|
||||||
"CMAKE_SHARED_LINKER_FLAGS_RELEASE": "/OPT:REF /OPT:ICF /LTCG",
|
"CMAKE_SHARED_LINKER_FLAGS_RELEASE": "/OPT:REF /OPT:ICF /LTCG",
|
||||||
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake",
|
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake",
|
||||||
"EXTERNALS_ROOT": "${sourceDir}/externals/windows",
|
"EXTERNALS_ROOT": "${sourceDir}/externals/windows",
|
||||||
"CONFIG_DEFAULTS_PATH": "config/profiles/default/*.conf",
|
"CONFIG_DEFAULTS_PATH": "config/profiles/default/*.conf",
|
||||||
"DOTNET_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net7.0",
|
"DOTNET_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net7.0;${sourceDir}/build/$<CONFIG>/bin/net7.0-windows",
|
||||||
"DOTNET_WINDOWS_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net7.0-windows",
|
|
||||||
"EXPORT_MD_CONSUMER": {
|
"EXPORT_MD_CONSUMER": {
|
||||||
"type": "BOOL",
|
"type": "BOOL",
|
||||||
"value": "ON"
|
"value": "ON"
|
||||||
@@ -62,7 +60,7 @@
|
|||||||
},
|
},
|
||||||
"CMAKE_CXX_STANDARD": "20",
|
"CMAKE_CXX_STANDARD": "20",
|
||||||
"CMAKE_INSTALL_RPATH": ".",
|
"CMAKE_INSTALL_RPATH": ".",
|
||||||
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
|
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}/sparkd",
|
||||||
"CMAKE_EXE_LINKER_FLAGS": "-Wno-undef",
|
"CMAKE_EXE_LINKER_FLAGS": "-Wno-undef",
|
||||||
"EXTERNALS_ROOT": "${sourceDir}/externals/linux",
|
"EXTERNALS_ROOT": "${sourceDir}/externals/linux",
|
||||||
"BUILD_SDK": {
|
"BUILD_SDK": {
|
||||||
@@ -223,6 +221,7 @@
|
|||||||
"APP_DATA_DIR": "${dollar}{APPDATA}/bts/DataStream",
|
"APP_DATA_DIR": "${dollar}{APPDATA}/bts/DataStream",
|
||||||
"APP_DATA_DIR_OVERRIDE": "${dollar}{DATA_STREAM_DATA_DIR}",
|
"APP_DATA_DIR_OVERRIDE": "${dollar}{DATA_STREAM_DATA_DIR}",
|
||||||
"CONFIG_DEFAULTS_PATH": "config/profiles/default/*.conf;config/profiles/data_stream/*.conf",
|
"CONFIG_DEFAULTS_PATH": "config/profiles/default/*.conf;config/profiles/data_stream/*.conf",
|
||||||
|
"DOTNET_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net7.0;${sourceDir}/build/$<CONFIG>/bin/net7.0-windows;${sourceDir}/build/$<CONFIG>/bin/net8.0",
|
||||||
"SHARED_MEMORY_PREFIX": "data_stream"
|
"SHARED_MEMORY_PREFIX": "data_stream"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -259,7 +258,7 @@
|
|||||||
"CMAKE_CXX_FLAGS_RELEASE": "-fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -fno-omit-frame-pointer -DNDEBUG -O3",
|
"CMAKE_CXX_FLAGS_RELEASE": "-fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -fno-omit-frame-pointer -DNDEBUG -O3",
|
||||||
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
|
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
|
||||||
"CONFIG_DEFAULTS_PATH": "config/profiles/default/*.conf;config/profiles/data_stream/*.conf",
|
"CONFIG_DEFAULTS_PATH": "config/profiles/default/*.conf;config/profiles/data_stream/*.conf",
|
||||||
"DOTNET_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net7.0",
|
"DOTNET_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net7.0;${sourceDir}/build/$<CONFIG>/bin/net8.0",
|
||||||
"EXPORT_MD_CONSUMER": {
|
"EXPORT_MD_CONSUMER": {
|
||||||
"type": "BOOL",
|
"type": "BOOL",
|
||||||
"value": "ON"
|
"value": "ON"
|
||||||
@@ -303,7 +302,16 @@
|
|||||||
"lhs": "${hostSystemName}",
|
"lhs": "${hostSystemName}",
|
||||||
"rhs": "Linux"
|
"rhs": "Linux"
|
||||||
},
|
},
|
||||||
"hidden": true
|
"hidden": true,
|
||||||
|
"targets": [
|
||||||
|
"data_files_dir",
|
||||||
|
"admin_web_app_bundle",
|
||||||
|
"install",
|
||||||
|
"libspark",
|
||||||
|
"rapidjson_project",
|
||||||
|
"server_layout",
|
||||||
|
"sparkd"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -14,34 +14,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "spark_test", "src\client\sp
|
|||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spark.Console", "src\client\Spark.Console\Spark.Console.csproj", "{89D666E6-B500-498F-B026-4D167F68ADFC}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spark.Console", "src\client\Spark.Console\Spark.Console.csproj", "{89D666E6-B500-498F-B026-4D167F68ADFC}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{267F81EF-A8AB-49FD-9F56-D7EC3C1F7C7C}"
|
|
||||||
EndProject
|
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DataStreamSuite", "DataStreamSuite", "{C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataStreamCore", "src\DataStreamSuite\DataStreamCore\DataStreamCore.csproj", "{EF26A475-6101-4C9C-A717-D60BB92A2302}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedStreams", "src\DataStreamSuite\SharedStreams\SharedStreams.csproj", "{911B08A3-515A-441D-84C8-8A43740B5FC1}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PubSub", "src\DataStreamSuite\PubSub\PubSub.csproj", "{14140310-2233-430A-821B-F3058A25234B}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BaseUtilities", "src\DataStreamSuite\BaseUtilities\BaseUtilities.csproj", "{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExpressionCore", "src\DataStreamSuite\ExpressionCore\ExpressionCore.csproj", "{6F22DB96-6EAB-4034-99D9-287021C36F01}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArithmeticExpressions", "src\DataStreamSuite\ArithmeticExpressions\ArithmeticExpressions.csproj", "{A5C33956-A41F-49B3-A41D-1082CBA59D02}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataStreamExpressions", "src\DataStreamSuite\DataStreamExpressions\DataStreamExpressions.csproj", "{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.ColumnSortExpressions", "src\DataStreamSuite\Bts.ColumnSortExpressions\Bts.ColumnSortExpressions.csproj", "{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ColumnMapExpressions", "src\DataStreamSuite\ColumnMapExpressions\ColumnMapExpressions.csproj", "{B945A183-2174-4ACB-B289-8A5C546656FE}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooleanExpressions", "src\DataStreamSuite\BooleanExpressions\BooleanExpressions.csproj", "{9F6D7DE8-185B-4C1D-B809-3314D092DF28}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.ColumnExpressions", "src\DataStreamSuite\Bts.ColumnExpressions\Bts.ColumnExpressions.csproj", "{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataStream", "src\DataStreamSuite\DataStream\DataStream.csproj", "{39AEA075-6457-46C0-8821-1158BE6EFA57}"
|
|
||||||
EndProject
|
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|x64 = Debug|x64
|
Debug|x64 = Debug|x64
|
||||||
@@ -98,102 +70,6 @@ Global
|
|||||||
{89D666E6-B500-498F-B026-4D167F68ADFC}.Release|x64.Build.0 = Release|x64
|
{89D666E6-B500-498F-B026-4D167F68ADFC}.Release|x64.Build.0 = Release|x64
|
||||||
{89D666E6-B500-498F-B026-4D167F68ADFC}.RelWithDebInfo|x64.ActiveCfg = Debug|x64
|
{89D666E6-B500-498F-B026-4D167F68ADFC}.RelWithDebInfo|x64.ActiveCfg = Debug|x64
|
||||||
{89D666E6-B500-498F-B026-4D167F68ADFC}.RelWithDebInfo|x64.Build.0 = Debug|x64
|
{89D666E6-B500-498F-B026-4D167F68ADFC}.RelWithDebInfo|x64.Build.0 = Debug|x64
|
||||||
{EF26A475-6101-4C9C-A717-D60BB92A2302}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{EF26A475-6101-4C9C-A717-D60BB92A2302}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{EF26A475-6101-4C9C-A717-D60BB92A2302}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{EF26A475-6101-4C9C-A717-D60BB92A2302}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
|
||||||
{EF26A475-6101-4C9C-A717-D60BB92A2302}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{EF26A475-6101-4C9C-A717-D60BB92A2302}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{EF26A475-6101-4C9C-A717-D60BB92A2302}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{EF26A475-6101-4C9C-A717-D60BB92A2302}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
|
||||||
{911B08A3-515A-441D-84C8-8A43740B5FC1}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{911B08A3-515A-441D-84C8-8A43740B5FC1}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{911B08A3-515A-441D-84C8-8A43740B5FC1}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{911B08A3-515A-441D-84C8-8A43740B5FC1}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
|
||||||
{911B08A3-515A-441D-84C8-8A43740B5FC1}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{911B08A3-515A-441D-84C8-8A43740B5FC1}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{911B08A3-515A-441D-84C8-8A43740B5FC1}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{911B08A3-515A-441D-84C8-8A43740B5FC1}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
|
||||||
{14140310-2233-430A-821B-F3058A25234B}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{14140310-2233-430A-821B-F3058A25234B}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{14140310-2233-430A-821B-F3058A25234B}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{14140310-2233-430A-821B-F3058A25234B}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
|
||||||
{14140310-2233-430A-821B-F3058A25234B}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{14140310-2233-430A-821B-F3058A25234B}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{14140310-2233-430A-821B-F3058A25234B}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{14140310-2233-430A-821B-F3058A25234B}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
|
||||||
{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
|
||||||
{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
|
||||||
{6F22DB96-6EAB-4034-99D9-287021C36F01}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{6F22DB96-6EAB-4034-99D9-287021C36F01}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{6F22DB96-6EAB-4034-99D9-287021C36F01}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{6F22DB96-6EAB-4034-99D9-287021C36F01}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
|
||||||
{6F22DB96-6EAB-4034-99D9-287021C36F01}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{6F22DB96-6EAB-4034-99D9-287021C36F01}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{6F22DB96-6EAB-4034-99D9-287021C36F01}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{6F22DB96-6EAB-4034-99D9-287021C36F01}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
|
||||||
{A5C33956-A41F-49B3-A41D-1082CBA59D02}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{A5C33956-A41F-49B3-A41D-1082CBA59D02}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{A5C33956-A41F-49B3-A41D-1082CBA59D02}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{A5C33956-A41F-49B3-A41D-1082CBA59D02}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
|
||||||
{A5C33956-A41F-49B3-A41D-1082CBA59D02}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{A5C33956-A41F-49B3-A41D-1082CBA59D02}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{A5C33956-A41F-49B3-A41D-1082CBA59D02}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{A5C33956-A41F-49B3-A41D-1082CBA59D02}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
|
||||||
{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
|
||||||
{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
|
||||||
{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
|
||||||
{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
|
||||||
{B945A183-2174-4ACB-B289-8A5C546656FE}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{B945A183-2174-4ACB-B289-8A5C546656FE}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{B945A183-2174-4ACB-B289-8A5C546656FE}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{B945A183-2174-4ACB-B289-8A5C546656FE}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
|
||||||
{B945A183-2174-4ACB-B289-8A5C546656FE}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{B945A183-2174-4ACB-B289-8A5C546656FE}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{B945A183-2174-4ACB-B289-8A5C546656FE}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{B945A183-2174-4ACB-B289-8A5C546656FE}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
|
||||||
{39AEA075-6457-46C0-8821-1158BE6EFA57}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{39AEA075-6457-46C0-8821-1158BE6EFA57}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{39AEA075-6457-46C0-8821-1158BE6EFA57}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{39AEA075-6457-46C0-8821-1158BE6EFA57}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
|
||||||
{39AEA075-6457-46C0-8821-1158BE6EFA57}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{39AEA075-6457-46C0-8821-1158BE6EFA57}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{39AEA075-6457-46C0-8821-1158BE6EFA57}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{39AEA075-6457-46C0-8821-1158BE6EFA57}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
|
||||||
{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
|
||||||
{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
|
||||||
{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
|
||||||
{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
@@ -204,19 +80,4 @@ Global
|
|||||||
GlobalSection(Performance) = preSolution
|
GlobalSection(Performance) = preSolution
|
||||||
HasPerformanceSessions = true
|
HasPerformanceSessions = true
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(NestedProjects) = preSolution
|
|
||||||
{C09ED521-D2DF-40BC-A76F-EB3CB870B2F6} = {267F81EF-A8AB-49FD-9F56-D7EC3C1F7C7C}
|
|
||||||
{EF26A475-6101-4C9C-A717-D60BB92A2302} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
|
|
||||||
{911B08A3-515A-441D-84C8-8A43740B5FC1} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
|
|
||||||
{14140310-2233-430A-821B-F3058A25234B} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
|
|
||||||
{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
|
|
||||||
{6F22DB96-6EAB-4034-99D9-287021C36F01} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
|
|
||||||
{A5C33956-A41F-49B3-A41D-1082CBA59D02} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
|
|
||||||
{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
|
|
||||||
{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
|
|
||||||
{B945A183-2174-4ACB-B289-8A5C546656FE} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
|
|
||||||
{39AEA075-6457-46C0-8821-1158BE6EFA57} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
|
|
||||||
{9F6D7DE8-185B-4C1D-B809-3314D092DF28} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
|
|
||||||
{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
|
|
||||||
EndGlobalSection
|
|
||||||
EndGlobal
|
EndGlobal
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
include_guard(GLOBAL)
|
|
||||||
|
|
||||||
function(get_version_from_git)
|
|
||||||
find_package(Git QUIET)
|
|
||||||
if(NOT Git_FOUND)
|
|
||||||
message(WARNING "Git not found")
|
|
||||||
return()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
execute_process(
|
|
||||||
COMMAND ${GIT_EXECUTABLE} describe --tags --always
|
|
||||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
|
||||||
OUTPUT_VARIABLE GIT_TAG
|
|
||||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
|
||||||
RESULT_VARIABLE GIT_RESULT
|
|
||||||
)
|
|
||||||
|
|
||||||
if(NOT GIT_RESULT EQUAL 0)
|
|
||||||
message(WARNING "Failed to get git tag")
|
|
||||||
return()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
execute_process(
|
|
||||||
COMMAND ${GIT_EXECUTABLE} rev-parse --short=7 HEAD
|
|
||||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
|
||||||
OUTPUT_VARIABLE GIT_COMMIT_SHORT_HASH
|
|
||||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
|
||||||
)
|
|
||||||
set(PROJECT_VERSION_BUILD_METADATA ${GIT_COMMIT_SHORT_HASH})
|
|
||||||
set(PROJECT_VERSION_BUILD_METADATA ${GIT_COMMIT_SHORT_HASH} PARENT_SCOPE)
|
|
||||||
|
|
||||||
string(REGEX REPLACE "^v" "" CLEAN_TAG "${GIT_TAG}")
|
|
||||||
if(CLEAN_TAG MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)(-.*)?$")
|
|
||||||
set(PROJECT_VERSION_MAJOR ${CMAKE_MATCH_1})
|
|
||||||
set(PROJECT_VERSION_MAJOR ${CMAKE_MATCH_1} PARENT_SCOPE)
|
|
||||||
set(PROJECT_VERSION_MINOR ${CMAKE_MATCH_2})
|
|
||||||
set(PROJECT_VERSION_MINOR ${CMAKE_MATCH_2} PARENT_SCOPE)
|
|
||||||
set(PROJECT_VERSION_PATCH ${CMAKE_MATCH_3})
|
|
||||||
set(PROJECT_VERSION_PATCH ${CMAKE_MATCH_3} PARENT_SCOPE)
|
|
||||||
|
|
||||||
set(PROJECT_VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}")
|
|
||||||
set(PROJECT_VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}" PARENT_SCOPE)
|
|
||||||
set(PROJECT_VERSION_FULL "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}+${GIT_COMMIT_SHORT_HASH}")
|
|
||||||
set(PROJECT_VERSION_FULL "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}+${GIT_COMMIT_SHORT_HASH}" PARENT_SCOPE)
|
|
||||||
else()
|
|
||||||
message(WARNING "Tag '${CLEAN_TAG}' does not match semver format")
|
|
||||||
endif()
|
|
||||||
endfunction()
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
include_guard(DIRECTORY)
|
|
||||||
|
|
||||||
function(protobuf_generate_fs)
|
|
||||||
set(_options)
|
|
||||||
set(_one_value_args TARGET_NAME OUT_DIR PROTOC)
|
|
||||||
set(_multi_value_args PROTO_INCLUDE_DIRS PROTO_SOURCES)
|
|
||||||
cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
|
|
||||||
|
|
||||||
if (NOT DEFINED _ARGS_TARGET_NAME)
|
|
||||||
set(_ARGS_TARGET_NAME "${PROJECT_NAME}_generate_fs_protos")
|
|
||||||
endif()
|
|
||||||
if (NOT DEFINED _ARGS_PROTOC)
|
|
||||||
set(_ARGS_PROTOC "${SPARK_BIN}/protoc")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(_proto_include_cli_args)
|
|
||||||
foreach(_dir ${_ARGS_PROTO_INCLUDE_DIRS})
|
|
||||||
list(APPEND _proto_include_cli_args -I ${_dir})
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
set(_outputs)
|
|
||||||
foreach(_proto_source ${_ARGS_PROTO_SOURCES})
|
|
||||||
# get_filename_component(_abs_proto_source ${_proto_source} ABSOLUTE)
|
|
||||||
get_filename_component(_proto_source_we ${_proto_source} NAME_WE)
|
|
||||||
# get_filename_component(_proto_source_dir ${_proto_source} DIRECTORY)
|
|
||||||
list(APPEND _outputs ${_ARGS_OUT_DIR}/${_proto_source_we}.fable.fs)
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
set(_venv_exec ${CMAKE_SOURCE_DIR}/tools/venv_exec.sh)
|
|
||||||
set(_plugin_py ${CMAKE_SOURCE_DIR}/src/lib/api/service_compiler/plugin.py)
|
|
||||||
set(_template_fs ${CMAKE_SOURCE_DIR}/src/lib/api/service_compiler/templates/fs/fable.fs)
|
|
||||||
add_custom_command(
|
|
||||||
OUTPUT ${_outputs}
|
|
||||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
|
||||||
COMMAND ${_venv_exec}
|
|
||||||
${_ARGS_PROTOC}
|
|
||||||
--plugin=protoc-gen-service=${_plugin_py}
|
|
||||||
--service_out=lang=fs,strip_out_path=1:${_ARGS_OUT_DIR}
|
|
||||||
${_proto_include_cli_args}
|
|
||||||
${_ARGS_PROTO_SOURCES}
|
|
||||||
DEPENDS
|
|
||||||
${_venv_exec}
|
|
||||||
${_plugin_py}
|
|
||||||
${_template_fs}
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json
|
|
||||||
${_ARGS_PROTO_SOURCES}
|
|
||||||
)
|
|
||||||
add_custom_target(${_ARGS_TARGET_NAME} ALL DEPENDS "${_outputs}")
|
|
||||||
endfunction()
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
include_guard(DIRECTORY)
|
|
||||||
|
|
||||||
function(protobuf_generate_js)
|
|
||||||
set(_options)
|
|
||||||
set(_one_value_args TARGET_NAME OUTPUT)
|
|
||||||
set(_multi_value_args PROTO_INCLUDE_DIRS PROTO_SOURCES)
|
|
||||||
cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
|
|
||||||
|
|
||||||
if (NOT DEFINED _ARGS_TARGET_NAME)
|
|
||||||
set(_ARGS_TARGET_NAME "${PROJECT_NAME}_generate_js_protos")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(_proto_include_cli_args)
|
|
||||||
foreach(_dir ${_ARGS_PROTO_INCLUDE_DIRS})
|
|
||||||
list(APPEND _proto_include_cli_args -p ${_dir})
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
add_custom_command(
|
|
||||||
OUTPUT ${_ARGS_OUTPUT}
|
|
||||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
|
||||||
COMMAND npx
|
|
||||||
--no-install pbjs
|
|
||||||
-t json-module
|
|
||||||
-w commonjs
|
|
||||||
-o ${_ARGS_OUTPUT}
|
|
||||||
${_proto_include_cli_args}
|
|
||||||
${_ARGS_PROTO_SOURCES}
|
|
||||||
DEPENDS
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json
|
|
||||||
${_ARGS_PROTO_SOURCES}
|
|
||||||
)
|
|
||||||
add_custom_target(${_ARGS_TARGET_NAME} ALL DEPENDS ${_ARGS_OUTPUT})
|
|
||||||
endfunction()
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
include_guard(DIRECTORY)
|
|
||||||
include(${CMAKE_SOURCE_DIR}/cmake/TernaryOperator.cmake)
|
|
||||||
|
|
||||||
function(sym_link_dir)
|
|
||||||
set(_options)
|
|
||||||
set(_one_value_args TARGET_NAME SOURCE DEST COMMENT)
|
|
||||||
set(_multi_value_args)
|
|
||||||
cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
|
|
||||||
add_custom_command(
|
|
||||||
OUTPUT ${_ARGS_DEST}
|
|
||||||
COMMAND ln ARGS -sf ${_ARGS_SOURCE} ${_ARGS_DEST}
|
|
||||||
)
|
|
||||||
set_ternary(_comment _ARGS_COMMENT "${_ARGS_COMMENT}" "linking dir ${_ARGS_SOURCE} -> ${_ARGS_DEST}")
|
|
||||||
add_custom_target(
|
|
||||||
${_ARGS_TARGET_NAME} ALL
|
|
||||||
DEPENDS ${_ARGS_DEST}
|
|
||||||
COMMENT "${_comment}"
|
|
||||||
)
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
function(sym_link_file)
|
|
||||||
set(_options)
|
|
||||||
set(_one_value_args SOURCE DEST INSTALL_DEST)
|
|
||||||
set(_multi_value_args)
|
|
||||||
cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
|
|
||||||
file(
|
|
||||||
CREATE_LINK
|
|
||||||
${_ARGS_SOURCE}
|
|
||||||
${_ARGS_DEST}
|
|
||||||
SYMBOLIC
|
|
||||||
)
|
|
||||||
if (DEFINED _ARGS_INSTALL_DEST)
|
|
||||||
install(
|
|
||||||
FILES
|
|
||||||
${_ARGS_SOURCE}
|
|
||||||
DESTINATION ${_ARGS_INSTALL_DEST}
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
function(sym_link_local_lib LIB_NAME)
|
|
||||||
set(_lib_file_name "${CMAKE_SHARED_LIBRARY_PREFIX}${LIB_NAME}.so")
|
|
||||||
file(
|
|
||||||
CREATE_LINK
|
|
||||||
"${CMAKE_BINARY_DIR}/src/lib_${LIB_NAME}/${_lib_file_name}"
|
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/${_lib_file_name}"
|
|
||||||
SYMBOLIC
|
|
||||||
)
|
|
||||||
endfunction()
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
include_guard(GLOBAL)
|
|
||||||
|
|
||||||
macro(set_ternary RESULT CONDITION TRUE_VALUE FALSE_VALUE)
|
|
||||||
if(${CONDITION})
|
|
||||||
set(${RESULT} ${TRUE_VALUE})
|
|
||||||
else()
|
|
||||||
set(${RESULT} ${FALSE_VALUE})
|
|
||||||
endif()
|
|
||||||
endmacro()
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
#ifndef BTS_SPARK_VERSION_H
|
|
||||||
#define BTS_SPARK_VERSION_H
|
|
||||||
|
|
||||||
#define BTS_SPARK_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
|
|
||||||
#define BTS_SPARK_VERSION_MINOR @PROJECT_VERSION_MINOR@
|
|
||||||
#define BTS_SPARK_VERSION_PATCH @PROJECT_VERSION_PATCH@
|
|
||||||
#define BTS_SPARK_VERSION_BUILD_METADATA @PROJECT_VERSION_BUILD_METADATA@
|
|
||||||
#define BTS_SPARK_VERSION "@PROJECT_VERSION@"
|
|
||||||
#define BTS_SPARK_VERSION_FULL "@PROJECT_VERSION_FULL@"
|
|
||||||
|
|
||||||
#endif
|
|
||||||
-100
@@ -1,100 +0,0 @@
|
|||||||
services:
|
|
||||||
sparkd:
|
|
||||||
volumes:
|
|
||||||
- ${SPARKD__DATA_DIR:-sparkd_data}:/home/bts/sparkdata/data
|
|
||||||
build:
|
|
||||||
dockerfile: src/server/sparkd/Dockerfile
|
|
||||||
args:
|
|
||||||
- IMAGE=${SPARKD__IMAGE}
|
|
||||||
- SOURCE_DIR=${SPARKD__SOURCE_DIR}
|
|
||||||
- CONFIG_DIR=${SPARKD__CONFIG_DIR}
|
|
||||||
shm_size: "${SPARKD__SHM_SIZE:-512mb}"
|
|
||||||
command: >
|
|
||||||
sh -c "
|
|
||||||
echo bts | sudo -S chown -R bts:bts /home/bts/sparkdata/data
|
|
||||||
if [ -e "/home/bts/sparkdata/data/logging.sparkd/log" ]; then
|
|
||||||
mv "/home/bts/sparkdata/data/logging.sparkd/log" "/home/bts/sparkdata/data/logging.sparkd/log_$(date '+%Y%m%d-%H%M')"
|
|
||||||
fi
|
|
||||||
if [ -e "/home/bts/sparkdata/conf/.env.local" ]; then
|
|
||||||
echo 'Sourcing /home/bts/sparkdata/conf/.env.local'
|
|
||||||
set -a
|
|
||||||
. /home/bts/sparkdata/conf/.env.local
|
|
||||||
set +a
|
|
||||||
fi
|
|
||||||
./sparkd run"
|
|
||||||
env_file:
|
|
||||||
- .env
|
|
||||||
- ${SPARKD__CONFIG_DIR}/.env
|
|
||||||
ports:
|
|
||||||
- "${SPARKD__CONFIG_PORT}:${SPARKD__CONFIG_PORT}"
|
|
||||||
- "${SPARKD__QUICKBUS_PORT}:${SPARKD__QUICKBUS_PORT}"
|
|
||||||
- "${SPARKD__SIM_FIX_PORT}:${SPARKD__SIM_FIX_PORT}"
|
|
||||||
deploy:
|
|
||||||
resources:
|
|
||||||
limits:
|
|
||||||
memory: "${SPARKD__MEMORY:-4gb}"
|
|
||||||
sparkd-symbols:
|
|
||||||
volumes:
|
|
||||||
- ${SPARKD__DATA_DIR:-sparkd_data}:/home/bts/sparkdata/data
|
|
||||||
- ${SPARKD__RUNTIME_CONF_DIR:-sparkd_conf}:/home/bts/sparkdata/conf
|
|
||||||
build:
|
|
||||||
dockerfile: src/server/sparkd/Dockerfile
|
|
||||||
args:
|
|
||||||
- IMAGE=${SPARKD__IMAGE}
|
|
||||||
- SOURCE_DIR=${SPARKD__SOURCE_DIR}
|
|
||||||
- CONFIG_DIR=${SPARKD__CONFIG_DIR}
|
|
||||||
shm_size: "${SPARKD__SHM_SIZE:-512mb}"
|
|
||||||
command: >
|
|
||||||
sh -c "
|
|
||||||
echo bts | sudo -S chown -R bts:bts /home/bts/sparkdata/data
|
|
||||||
if [ -e "/home/bts/sparkdata/data/logging.sparkd/log" ]; then
|
|
||||||
mv "/home/bts/sparkdata/data/logging.sparkd/log" "/home/bts/sparkdata/data/logging.sparkd/log_$(date '+%Y%m%d-%H%M')"
|
|
||||||
fi
|
|
||||||
ls -alh /home/bts/sparkdata/conf/
|
|
||||||
cat /home/bts/sparkdata/conf/.env.local
|
|
||||||
if [ -e "/home/bts/sparkdata/conf/.env.local" ]; then
|
|
||||||
echo 'Sourcing /home/bts/sparkdata/conf/.env.local'
|
|
||||||
set -a
|
|
||||||
. /home/bts/sparkdata/conf/.env.local
|
|
||||||
set +a
|
|
||||||
fi
|
|
||||||
./sparkd run"
|
|
||||||
env_file:
|
|
||||||
- .env
|
|
||||||
- ${SPARKD__CONFIG_DIR}/.env
|
|
||||||
ports:
|
|
||||||
- "${SPARKD__CONFIG_PORT}:${SPARKD__CONFIG_PORT}"
|
|
||||||
- "${SPARKD__QUICKBUS_PORT}:${SPARKD__QUICKBUS_PORT}"
|
|
||||||
- "${SPARKD__SIM_FIX_PORT}:${SPARKD__SIM_FIX_PORT}"
|
|
||||||
deploy:
|
|
||||||
resources:
|
|
||||||
limits:
|
|
||||||
memory: "${SPARKD__MEMORY:-4gb}"
|
|
||||||
|
|
||||||
sparkd-tail:
|
|
||||||
image: bluetradingsystems/linux_dotnet7
|
|
||||||
volumes:
|
|
||||||
- type: volume
|
|
||||||
read_only: true
|
|
||||||
source: sparkd_data
|
|
||||||
target: /home/bts/sparkdata/data/logging.sparkd
|
|
||||||
volume:
|
|
||||||
subpath: logging.sparkd
|
|
||||||
command: ["tail", "-f", "/home/bts/sparkdata/data/logging.sparkd/log"]
|
|
||||||
|
|
||||||
sparkd-ping-test:
|
|
||||||
depends_on:
|
|
||||||
- sparkd
|
|
||||||
profiles:
|
|
||||||
- ping-test
|
|
||||||
build:
|
|
||||||
context: .
|
|
||||||
dockerfile_inline: |
|
|
||||||
FROM bluetradingsystems/linux_dotnet7
|
|
||||||
USER "root"
|
|
||||||
RUN apt-get update && apt-get -y install iputils-ping
|
|
||||||
command: [ "ping", "sparkd" ]
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
sparkd_data:
|
|
||||||
name: "sparkd_${SPARKD__CONFIG_PORT:-8000}"
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
FROM ubuntu:22.04
|
|
||||||
|
|
||||||
ARG DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y pkg-config
|
|
||||||
RUN apt-get update && apt-get install -y locales
|
|
||||||
RUN apt-get update && apt-get install -y ca-certificates
|
|
||||||
RUN apt-get update && apt-get install -y libssh2-1-dev
|
|
||||||
RUN apt-get update && apt-get install -y software-properties-common
|
|
||||||
RUN apt-get update && apt-get install -y sudo
|
|
||||||
|
|
||||||
# GCC
|
|
||||||
ARG gcc_major=13
|
|
||||||
RUN add-apt-repository ppa:ubuntu-toolchain-r/test \
|
|
||||||
&& apt-get update \
|
|
||||||
&& apt-get install -y g++-$gcc_major
|
|
||||||
|
|
||||||
RUN apt-get update \
|
|
||||||
&& apt-get install -y dotnet7
|
|
||||||
|
|
||||||
RUN locale-gen en_US.UTF-8
|
|
||||||
|
|
||||||
ARG docker_user="bts"
|
|
||||||
ARG docker_uid="1000"
|
|
||||||
ARG docker_pass="bts"
|
|
||||||
|
|
||||||
RUN \
|
|
||||||
groupadd -g "$docker_uid" "$docker_user" \
|
|
||||||
&& useradd \
|
|
||||||
-m \
|
|
||||||
-u "$docker_uid" \
|
|
||||||
-g "$docker_uid" \
|
|
||||||
-G sudo \
|
|
||||||
--password "$(openssl passwd -1 "$docker_pass")" \
|
|
||||||
"$docker_user"
|
|
||||||
|
|
||||||
USER bts
|
|
||||||
WORKDIR /home/bts
|
|
||||||
+1
-1
Submodule externals updated: 959b63f2f6...cae5fd20da.
@@ -1,20 +1,11 @@
|
|||||||
astroid==2.7.3
|
astroid==2.7.3
|
||||||
autopep8==1.5.7
|
autopep8==1.5.7
|
||||||
blinker==1.9.0
|
|
||||||
boto3==1.37.9
|
|
||||||
botocore==1.37.9
|
|
||||||
certifi==2023.5.7
|
certifi==2023.5.7
|
||||||
charset-normalizer==3.1.0
|
charset-normalizer==3.1.0
|
||||||
click==8.1.8
|
|
||||||
colorama==0.4.4
|
colorama==0.4.4
|
||||||
Flask==3.1.0
|
|
||||||
idna==3.4
|
idna==3.4
|
||||||
isort==5.9.3
|
isort==5.9.3
|
||||||
itsdangerous==2.2.0
|
|
||||||
Jinja2==3.1.6
|
|
||||||
jmespath==1.0.1
|
|
||||||
lazy-object-proxy==1.6.0
|
lazy-object-proxy==1.6.0
|
||||||
MarkupSafe==3.0.2
|
|
||||||
mccabe==0.6.1
|
mccabe==0.6.1
|
||||||
platformdirs==2.3.0
|
platformdirs==2.3.0
|
||||||
protobuf==4.21.12
|
protobuf==4.21.12
|
||||||
@@ -23,14 +14,9 @@ pycodestyle==2.7.0
|
|||||||
pycparser==2.20
|
pycparser==2.20
|
||||||
pylint==2.10.2
|
pylint==2.10.2
|
||||||
PyMeta3==0.5.1
|
PyMeta3==0.5.1
|
||||||
python-dateutil==2.9.0.post0
|
|
||||||
python-dotenv==1.0.1
|
|
||||||
requests==2.31.0
|
requests==2.31.0
|
||||||
s3transfer==0.11.4
|
|
||||||
six==1.17.0
|
|
||||||
termcolor==1.1.0
|
termcolor==1.1.0
|
||||||
toml==0.10.2
|
toml==0.10.2
|
||||||
urllib3==2.0.3
|
urllib3==2.0.3
|
||||||
Werkzeug==3.1.3
|
|
||||||
wrapt==1.12.1
|
wrapt==1.12.1
|
||||||
yapf==0.31.0
|
yapf==0.31.0
|
||||||
File renamed without changes.
@@ -8,7 +8,6 @@
|
|||||||
public int Integer;
|
public int Integer;
|
||||||
public double Real;
|
public double Real;
|
||||||
public string Identifier;
|
public string Identifier;
|
||||||
public DateTime DateTime;
|
|
||||||
public ImmutableList<IArithmeticExpression> Arguments;
|
public ImmutableList<IArithmeticExpression> Arguments;
|
||||||
public ImmutableList<Assignment> Assignments;
|
public ImmutableList<Assignment> Assignments;
|
||||||
public IArithmeticExpression Argument;
|
public IArithmeticExpression Argument;
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
using System;
|
using System;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
using System.Runtime.Versioning;
|
||||||
|
|
||||||
using Microsoft.Win32;
|
using Microsoft.Win32;
|
||||||
|
|
||||||
namespace BCG
|
namespace BCG
|
||||||
@@ -10,13 +13,11 @@ namespace BCG
|
|||||||
rk.SetValue (name, value.ToString ());
|
rk.SetValue (name, value.ToString ());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[SupportedOSPlatform("windows")]
|
||||||
public static double getValue (RegistryKey rk, string name)
|
public static double getValue (RegistryKey rk, string name)
|
||||||
{
|
{
|
||||||
object v = rk.GetValue (name);
|
var str = rk.GetValue(name)?.ToString();
|
||||||
if (v != null)
|
return str is not null && double.TryParse(str, out var dbl) ? dbl : double.NaN;
|
||||||
return double.Parse (v.ToString ());
|
|
||||||
else
|
|
||||||
return double.NaN;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
module.exports = {
|
||||||
|
root: true,
|
||||||
|
env: { browser: true, es2020: true },
|
||||||
|
extends: [
|
||||||
|
'eslint:recommended',
|
||||||
|
'plugin:react/recommended',
|
||||||
|
'plugin:react/jsx-runtime',
|
||||||
|
'plugin:react-hooks/recommended',
|
||||||
|
],
|
||||||
|
ignorePatterns: ['dist', '.eslintrc.cjs'],
|
||||||
|
parserOptions: { ecmaVersion: 'latest', sourceType: 'module' },
|
||||||
|
settings: { react: { version: '18.3.1' } },
|
||||||
|
plugins: ['react-refresh'],
|
||||||
|
rules: {
|
||||||
|
'react-refresh/only-export-components': [
|
||||||
|
'warn',
|
||||||
|
{ allowConstantExport: true },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
# Logs
|
||||||
|
logs
|
||||||
|
*.log
|
||||||
|
npm-debug.log*
|
||||||
|
yarn-debug.log*
|
||||||
|
yarn-error.log*
|
||||||
|
pnpm-debug.log*
|
||||||
|
lerna-debug.log*
|
||||||
|
|
||||||
|
node_modules
|
||||||
|
dist
|
||||||
|
dist-ssr
|
||||||
|
*.local
|
||||||
|
|
||||||
|
# Editor directories and files
|
||||||
|
.vscode/*
|
||||||
|
!.vscode/extensions.json
|
||||||
|
.idea
|
||||||
|
.DS_Store
|
||||||
|
*.suo
|
||||||
|
*.ntvs*
|
||||||
|
*.njsproj
|
||||||
|
*.sln
|
||||||
|
*.sw?
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
<Project Sdk="Microsoft.VisualStudio.JavaScript.Sdk/0.5.128-alpha">
|
||||||
|
<PropertyGroup>
|
||||||
|
<StartupCommand>npm run dev</StartupCommand>
|
||||||
|
<JavaScriptTestRoot>src\</JavaScriptTestRoot>
|
||||||
|
<JavaScriptTestFramework>Jest</JavaScriptTestFramework>
|
||||||
|
<!-- Allows the build (or compile) script located on package.json to run on Build -->
|
||||||
|
<ShouldRunBuildScript>true</ShouldRunBuildScript>
|
||||||
|
<!-- Folder where production build objects will be placed -->
|
||||||
|
<PublishAssetsDirectory>$(MSBuildProjectDirectory)\distill</PublishAssetsDirectory>
|
||||||
|
</PropertyGroup>
|
||||||
|
</Project>
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
# React + Vite
|
||||||
|
|
||||||
|
This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
|
||||||
|
|
||||||
|
Currently, two official plugins are available:
|
||||||
|
|
||||||
|
- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh
|
||||||
|
- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
<!doctype html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8" />
|
||||||
|
<link rel="icon" type="image/ico" href="/logo.ico" />
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
|
<title>BTS Cloud Streams</title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<div id="root"></div>
|
||||||
|
<script type="module" src="/src/main.jsx"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<configuration>
|
||||||
|
<packageSources>
|
||||||
|
<clear />
|
||||||
|
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
|
||||||
|
</packageSources>
|
||||||
|
<disabledPackageSources>
|
||||||
|
<clear />
|
||||||
|
</disabledPackageSources>
|
||||||
|
</configuration>
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,38 @@
|
|||||||
|
{
|
||||||
|
"name": "bts.datastreamwebapp.client",
|
||||||
|
"private": true,
|
||||||
|
"version": "0.0.0",
|
||||||
|
"type": "module",
|
||||||
|
"scripts": {
|
||||||
|
"dev": "vite",
|
||||||
|
"build": "vite build",
|
||||||
|
"lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0",
|
||||||
|
"preview": "vite preview"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"@angular/material": "^18.0.4",
|
||||||
|
"@emotion/react": "^11.11.4",
|
||||||
|
"@emotion/styled": "^11.11.5",
|
||||||
|
"@fontsource/noto-sans": "^5.0.22",
|
||||||
|
"@material/data-table": "^15.0.0-canary.7f224ddd4.0",
|
||||||
|
"@mui/icons-material": "^5.15.20",
|
||||||
|
"@mui/material": "^5.15.20",
|
||||||
|
"@mui/x-data-grid": "^7.7.1",
|
||||||
|
"bulma": "^1.0.1",
|
||||||
|
"react": "^18.3.1",
|
||||||
|
"react-data-table-component": "^7.6.2",
|
||||||
|
"react-dom": "^18.3.1",
|
||||||
|
"react-use-websocket": "^4.8.1",
|
||||||
|
"rpc-websockets": "^7.11.2"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@types/react": "^18.3.3",
|
||||||
|
"@types/react-dom": "^18.3.0",
|
||||||
|
"@vitejs/plugin-react": "^4.3.1",
|
||||||
|
"eslint": "^8.57.0",
|
||||||
|
"eslint-plugin-react": "^7.34.2",
|
||||||
|
"eslint-plugin-react-hooks": "^4.6.2",
|
||||||
|
"eslint-plugin-react-refresh": "^0.4.7",
|
||||||
|
"vite": "^5.2.13"
|
||||||
|
}
|
||||||
|
}
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 8.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 107 KiB |
@@ -0,0 +1 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
|
||||||
|
After Width: | Height: | Size: 1.5 KiB |
@@ -0,0 +1,28 @@
|
|||||||
|
@use "@material/checkbox";
|
||||||
|
@use "@material/icon-button";
|
||||||
|
@use "@material/data-table/data-table";
|
||||||
|
|
||||||
|
h1#main-header {
|
||||||
|
padding: 4px 8px 4px 8px;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
td:hover {
|
||||||
|
background-color: cadetblue;
|
||||||
|
}
|
||||||
|
|
||||||
|
td#cell-decimal {
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
||||||
|
td#cell-integer {
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
||||||
|
td#cell-string {
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
td#cell-date-time {
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
import { createTheme, ThemeProvider, CssBaseline } from '@mui/material';
|
||||||
|
import useMediaQuery from '@mui/material/useMediaQuery';
|
||||||
|
import QueryControl from './QueryControl';
|
||||||
|
import getTheme from './Theme';
|
||||||
|
import '@fontsource/noto-sans';
|
||||||
|
import './App.css';
|
||||||
|
|
||||||
|
const App = () => {
|
||||||
|
const prefersDarkMode = useMediaQuery('(prefers-color-scheme: dark)');
|
||||||
|
const theme = getTheme({ mode: prefersDarkMode ? 'dark' : 'light' });
|
||||||
|
|
||||||
|
return (
|
||||||
|
<ThemeProvider theme={theme}>
|
||||||
|
<CssBaseline />
|
||||||
|
<h1 id='main-header' style={{
|
||||||
|
color: theme.palette.text.primary,
|
||||||
|
fontFamily: 'Noto Sans',
|
||||||
|
}}>BTS Cloud Streams</h1>
|
||||||
|
<QueryControl websocketUrl="ws://localhost:5000/ws" theme={theme} />
|
||||||
|
</ThemeProvider>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default App;
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
@use "@material/checkbox";
|
||||||
|
@use "@material/icon-button";
|
||||||
|
@use "@material/data-table/data-table";
|
||||||
|
|
||||||
|
th {
|
||||||
|
font-size: large;
|
||||||
|
padding: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
td {
|
||||||
|
padding: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
td:hover {
|
||||||
|
background-color: cadetblue;
|
||||||
|
}
|
||||||
|
|
||||||
|
td#cell-decimal {
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
||||||
|
td#cell-integer {
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
||||||
|
td#cell-string {
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
td#cell-date-time {
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
@@ -0,0 +1,52 @@
|
|||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import { DataGrid } from '@mui/x-data-grid';
|
||||||
|
|
||||||
|
function getGridColDef(col) {
|
||||||
|
return {
|
||||||
|
field: col.name,
|
||||||
|
headerName: col.name,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function DataTable({ columns, rows }) {
|
||||||
|
return (
|
||||||
|
<DataGrid
|
||||||
|
columns={columns.map(getGridColDef)}
|
||||||
|
rows={rows}
|
||||||
|
sx={{
|
||||||
|
borderColor: 'primary.main',
|
||||||
|
backgroundColor: 'primary.dark',
|
||||||
|
color: 'text.primary',
|
||||||
|
'& .MuiDataGrid-columnHeader': {
|
||||||
|
color: 'primary.main',
|
||||||
|
fontWeight: 700,
|
||||||
|
backgroundColor: 'primary.dark'
|
||||||
|
},
|
||||||
|
'& .MuiDataGrid-filler': {
|
||||||
|
color: 'primary.main',
|
||||||
|
fontWeight: 700,
|
||||||
|
backgroundColor: 'primary.dark'
|
||||||
|
},
|
||||||
|
'& .MuiDataGrid-cell': {
|
||||||
|
color: 'text.primary',
|
||||||
|
},
|
||||||
|
'& .MuiDataGrid-cell:hover': {
|
||||||
|
color: 'primary.main',
|
||||||
|
},
|
||||||
|
'& .MuiDataGrid-row': {
|
||||||
|
'--DataGrid-rowBorderColor': 'secondary.dark'
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
DataTable.propTypes = {
|
||||||
|
columns: PropTypes.arrayOf(
|
||||||
|
PropTypes.shape({
|
||||||
|
name: PropTypes.string.isRequired,
|
||||||
|
type: PropTypes.string.isRequired,
|
||||||
|
})
|
||||||
|
).isRequired,
|
||||||
|
rows: PropTypes.arrayOf(PropTypes.array).isRequired,
|
||||||
|
};
|
||||||
@@ -0,0 +1,100 @@
|
|||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import DataTable from './DataTable';
|
||||||
|
import QueryInputForm from './QueryInputForm';
|
||||||
|
import Container from '@mui/material/Container';
|
||||||
|
import React from 'react';
|
||||||
|
|
||||||
|
var rpcReqIdCounter = 1;
|
||||||
|
|
||||||
|
function subscribeReq(query) {
|
||||||
|
return {
|
||||||
|
jsonrpc: "2.0",
|
||||||
|
id: rpcReqIdCounter++,
|
||||||
|
method: "subscribe",
|
||||||
|
params: {
|
||||||
|
subscription_id: "1",
|
||||||
|
query: query
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function unsubscribeReq() {
|
||||||
|
return {
|
||||||
|
jsonrpc: "2.0",
|
||||||
|
id: rpcReqIdCounter++,
|
||||||
|
method: "unsubscribe",
|
||||||
|
params: {
|
||||||
|
subscription_id: "1",
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
class QueryControl extends React.Component {
|
||||||
|
constructor({ websocketUrl, theme }) {
|
||||||
|
super(websocketUrl);
|
||||||
|
console.log('Connecting to WebSocket:', websocketUrl);
|
||||||
|
this.state = {
|
||||||
|
rows: null,
|
||||||
|
ws: new WebSocket(websocketUrl),
|
||||||
|
columns: null,
|
||||||
|
isRunning: false,
|
||||||
|
theme: theme,
|
||||||
|
};
|
||||||
|
this.state.ws.onopen = () => {
|
||||||
|
console.info('WebSocket open');
|
||||||
|
};
|
||||||
|
this.state.ws.onclose = () => {
|
||||||
|
console.info('WebSocket closed');
|
||||||
|
};
|
||||||
|
this.state.ws.onmessage = e => {
|
||||||
|
console.info(`Received message: ${e.data}`);
|
||||||
|
const msg = JSON.parse(e.data);
|
||||||
|
if (msg.id != null) {
|
||||||
|
let newState = { ...this.state };
|
||||||
|
newState.isRunning = msg.result.status == 'Subscribed';
|
||||||
|
this.setState(newState);
|
||||||
|
} else {
|
||||||
|
let newState = { ...this.state };
|
||||||
|
newState.rows = msg.params.all;
|
||||||
|
console.info(`Received rows: ${newState.rows}`);
|
||||||
|
newState.columns = msg.params.columns;
|
||||||
|
this.setState(newState);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
this.start = (query) => {
|
||||||
|
this.state.ws.send(JSON.stringify(subscribeReq(query)));
|
||||||
|
};
|
||||||
|
|
||||||
|
this.stop = () => {
|
||||||
|
this.state.ws.send(JSON.stringify(unsubscribeReq()));
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
componentWillUnmount() {
|
||||||
|
if (this.state.ws) {
|
||||||
|
console.warn('Closing websocket because component is unmounting');
|
||||||
|
this.state.ws.close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
render() {
|
||||||
|
console.info('Rendering');
|
||||||
|
return (
|
||||||
|
<Container>
|
||||||
|
<QueryInputForm isRunning={this.state.isRunning} onStart={this.start} onStop={this.stop} />
|
||||||
|
{
|
||||||
|
this.state.rows == null ? <p style={{ color: this.state.theme.palette.warning.main }}>No data received</p> :
|
||||||
|
<DataTable columns={this.state.columns} rows={this.state.rows} />
|
||||||
|
}
|
||||||
|
</Container>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QueryControl.propTypes = {
|
||||||
|
websocketUrl: PropTypes.string.isRequired,
|
||||||
|
theme: PropTypes.object.isRequired,
|
||||||
|
};
|
||||||
|
|
||||||
|
export default QueryControl;
|
||||||
@@ -0,0 +1,93 @@
|
|||||||
|
import { useRef } from 'react';
|
||||||
|
import Box from '@mui/material/Box';
|
||||||
|
import Button from '@mui/material/Button';
|
||||||
|
import Grid from '@mui/material/Grid';
|
||||||
|
import Paper from '@mui/material/Paper';
|
||||||
|
import PlayArrowIcon from '@mui/icons-material/PlayArrow';
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import StopIcon from '@mui/icons-material/Stop';
|
||||||
|
import TextField from '@mui/material/TextField';
|
||||||
|
import Tooltip from '@mui/material/Tooltip';
|
||||||
|
|
||||||
|
const QueryInputForm = ({ isRunning, onStart, onStop }) => {
|
||||||
|
let textInput = useRef(null);
|
||||||
|
|
||||||
|
const onClearClick = () => {
|
||||||
|
textInput.current.value = '';
|
||||||
|
};
|
||||||
|
|
||||||
|
const onRunClick = () => {
|
||||||
|
onStart(textInput.current.value);
|
||||||
|
};
|
||||||
|
|
||||||
|
const onStopClick = () => {
|
||||||
|
onStop();
|
||||||
|
};
|
||||||
|
|
||||||
|
const onKeyDown = (e) => {
|
||||||
|
// Detect keyboard shortcuts.
|
||||||
|
// Ctrl+Enter : Run
|
||||||
|
if (e.ctrlKey && e.key === 'Enter') {
|
||||||
|
onRunClick();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Box sx={{ p: 2 }}>
|
||||||
|
<Paper elevation={3} sx={{ color: 'primary.main' }}>
|
||||||
|
<Box sx={{ p: 2 }}>
|
||||||
|
<TextField
|
||||||
|
fullWidth
|
||||||
|
multiline
|
||||||
|
rows={10}
|
||||||
|
variant="outlined"
|
||||||
|
onKeyDown={onKeyDown}
|
||||||
|
inputRef={textInput}
|
||||||
|
placeholder="Enter Query..."
|
||||||
|
/>
|
||||||
|
</Box>
|
||||||
|
<Box sx={{ p: 2, borderTop: 1 }}>
|
||||||
|
<Grid container spacing={2} justifyContent="flex-start">
|
||||||
|
<Grid item xs>
|
||||||
|
<Tooltip title="Clear Query Text">
|
||||||
|
<Button onClick={onClearClick} sx={{ padding: '11px', color: 'text.dark' }}>
|
||||||
|
Clear
|
||||||
|
</Button>
|
||||||
|
</Tooltip>
|
||||||
|
</Grid>
|
||||||
|
<Grid item>
|
||||||
|
<Tooltip title="Run (Ctrl+Enter)">
|
||||||
|
<Button onClick={onRunClick} sx={{
|
||||||
|
color: `query_start_button.${isRunning ? 'active' : 'inactive'}.color`,
|
||||||
|
bgcolor: `query_start_button.${isRunning ? 'active' : 'inactive'}.background_color`,
|
||||||
|
padding: '11px'
|
||||||
|
}}>
|
||||||
|
<PlayArrowIcon />
|
||||||
|
</Button>
|
||||||
|
</Tooltip>
|
||||||
|
</Grid>
|
||||||
|
<Grid item>
|
||||||
|
<Tooltip title="Stop">
|
||||||
|
<Button onClick={onStopClick} sx={{
|
||||||
|
color: `query_stop_button.${isRunning ? 'inactive' : 'active'}.color`,
|
||||||
|
bgcolor: `query_stop_button.${isRunning ? 'inactive' : 'active'}.background_color`,
|
||||||
|
padding: '11px'
|
||||||
|
}}>
|
||||||
|
<StopIcon />
|
||||||
|
</Button>
|
||||||
|
</Tooltip>
|
||||||
|
</Grid>
|
||||||
|
</Grid>
|
||||||
|
</Box>
|
||||||
|
</Paper>
|
||||||
|
</Box>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
QueryInputForm.propTypes = {
|
||||||
|
isRunning: PropTypes.bool.isRequired,
|
||||||
|
onStart: PropTypes.func.isRequired,
|
||||||
|
onStop: PropTypes.func.isRequired,
|
||||||
|
};
|
||||||
|
|
||||||
|
export default QueryInputForm;
|
||||||
@@ -0,0 +1,88 @@
|
|||||||
|
import { createTheme } from '@mui/material/styles';
|
||||||
|
import PropTypes from 'prop-types';
|
||||||
|
import '@fontsource/noto-sans';
|
||||||
|
import './App.css';
|
||||||
|
|
||||||
|
const getLightPalette = () => {
|
||||||
|
return {
|
||||||
|
mode: 'light',
|
||||||
|
primary: {
|
||||||
|
light: '#6573c3',
|
||||||
|
main: '#3f51b5',
|
||||||
|
dark: '#2c387e',
|
||||||
|
contrastText: '#ffffff',
|
||||||
|
},
|
||||||
|
secondary: {
|
||||||
|
light: '#f73378',
|
||||||
|
main: '#f50057',
|
||||||
|
dark: '#ab003c',
|
||||||
|
contrastText: '#ffffff',
|
||||||
|
},
|
||||||
|
text: {
|
||||||
|
primary: '#000000c4',
|
||||||
|
secondary: '#00000086',
|
||||||
|
disabled: '#0000005b',
|
||||||
|
hint: '#0000005b',
|
||||||
|
}
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
const getDarkPalette = () => {
|
||||||
|
return {
|
||||||
|
mode: 'dark',
|
||||||
|
primary: {
|
||||||
|
light: '#bcc5ff',
|
||||||
|
main: '#33baf9',
|
||||||
|
dark: '#202334',
|
||||||
|
contrastText: '#78a2ac',
|
||||||
|
},
|
||||||
|
secondary: {
|
||||||
|
light: '#9fd0b8',
|
||||||
|
main: '#5eb289',
|
||||||
|
dark: '#ffffff12',
|
||||||
|
contrastText: '#c8d4f7',
|
||||||
|
},
|
||||||
|
text: {
|
||||||
|
primary: '#eaf8f8',
|
||||||
|
dark: '#eaf8f8a0'
|
||||||
|
},
|
||||||
|
query_start_button: {
|
||||||
|
active: {
|
||||||
|
color: '#33baf9',
|
||||||
|
background_color: '#ffffff40',
|
||||||
|
},
|
||||||
|
inactive: {
|
||||||
|
color: '#ffffff40',
|
||||||
|
background_color: '#ffffff00',
|
||||||
|
}
|
||||||
|
},
|
||||||
|
warning: {
|
||||||
|
main: '#c4823f'
|
||||||
|
},
|
||||||
|
query_stop_button: {
|
||||||
|
active: {
|
||||||
|
color: '#ff4444a0',
|
||||||
|
background_color: '#ffffff40',
|
||||||
|
},
|
||||||
|
inactive: {
|
||||||
|
color: '#ff444450',
|
||||||
|
background_color: '#ffffff00',
|
||||||
|
}
|
||||||
|
},
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
const getTheme = ({ mode }) => {
|
||||||
|
return createTheme({
|
||||||
|
typography: {
|
||||||
|
fontFamily: '"Helvetica"'
|
||||||
|
},
|
||||||
|
palette: mode == 'dark' ? getDarkPalette() : getLightPalette()
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
export default getTheme;
|
||||||
|
|
||||||
|
getTheme.propTypes = {
|
||||||
|
mode: PropTypes.string.isRequired,
|
||||||
|
};
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>
|
||||||
|
After Width: | Height: | Size: 4.0 KiB |
@@ -0,0 +1,51 @@
|
|||||||
|
.dark-high-contrast {
|
||||||
|
--md-sys-color-primary: rgb(251 250 255);
|
||||||
|
--md-sys-color-surface-tint: rgb(165 200 255);
|
||||||
|
--md-sys-color-on-primary: rgb(0 0 0);
|
||||||
|
--md-sys-color-primary-container: rgb(173 204 255);
|
||||||
|
--md-sys-color-on-primary-container: rgb(0 0 0);
|
||||||
|
--md-sys-color-secondary: rgb(250 250 255);
|
||||||
|
--md-sys-color-on-secondary: rgb(0 0 0);
|
||||||
|
--md-sys-color-secondary-container: rgb(159 208 255);
|
||||||
|
--md-sys-color-on-secondary-container: rgb(0 0 0);
|
||||||
|
--md-sys-color-tertiary: rgb(255 249 251);
|
||||||
|
--md-sys-color-on-tertiary: rgb(0 0 0);
|
||||||
|
--md-sys-color-tertiary-container: rgb(222 193 231);
|
||||||
|
--md-sys-color-on-tertiary-container: rgb(0 0 0);
|
||||||
|
--md-sys-color-error: rgb(255 249 249);
|
||||||
|
--md-sys-color-on-error: rgb(0 0 0);
|
||||||
|
--md-sys-color-error-container: rgb(255 186 177);
|
||||||
|
--md-sys-color-on-error-container: rgb(0 0 0);
|
||||||
|
--md-sys-color-background: rgb(17 19 24);
|
||||||
|
--md-sys-color-on-background: rgb(225 226 233);
|
||||||
|
--md-sys-color-surface: rgb(17 19 24);
|
||||||
|
--md-sys-color-on-surface: rgb(255 255 255);
|
||||||
|
--md-sys-color-surface-variant: rgb(67 71 78);
|
||||||
|
--md-sys-color-on-surface-variant: rgb(251 250 255);
|
||||||
|
--md-sys-color-outline: rgb(200 202 212);
|
||||||
|
--md-sys-color-outline-variant: rgb(200 202 212);
|
||||||
|
--md-sys-color-shadow: rgb(0 0 0);
|
||||||
|
--md-sys-color-scrim: rgb(0 0 0);
|
||||||
|
--md-sys-color-inverse-surface: rgb(225 226 233);
|
||||||
|
--md-sys-color-inverse-on-surface: rgb(0 0 0);
|
||||||
|
--md-sys-color-inverse-primary: rgb(0 42 83);
|
||||||
|
--md-sys-color-primary-fixed: rgb(219 231 255);
|
||||||
|
--md-sys-color-on-primary-fixed: rgb(0 0 0);
|
||||||
|
--md-sys-color-primary-fixed-dim: rgb(173 204 255);
|
||||||
|
--md-sys-color-on-primary-fixed-variant: rgb(0 22 49);
|
||||||
|
--md-sys-color-secondary-fixed: rgb(214 233 255);
|
||||||
|
--md-sys-color-on-secondary-fixed: rgb(0 0 0);
|
||||||
|
--md-sys-color-secondary-fixed-dim: rgb(159 208 255);
|
||||||
|
--md-sys-color-on-secondary-fixed-variant: rgb(0 24 42);
|
||||||
|
--md-sys-color-tertiary-fixed: rgb(249 222 255);
|
||||||
|
--md-sys-color-on-tertiary-fixed: rgb(0 0 0);
|
||||||
|
--md-sys-color-tertiary-fixed-dim: rgb(222 193 231);
|
||||||
|
--md-sys-color-on-tertiary-fixed-variant: rgb(33 14 42);
|
||||||
|
--md-sys-color-surface-dim: rgb(17 19 24);
|
||||||
|
--md-sys-color-surface-bright: rgb(55 57 62);
|
||||||
|
--md-sys-color-surface-container-lowest: rgb(12 14 19);
|
||||||
|
--md-sys-color-surface-container-low: rgb(25 28 32);
|
||||||
|
--md-sys-color-surface-container: rgb(29 32 36);
|
||||||
|
--md-sys-color-surface-container-high: rgb(40 42 47);
|
||||||
|
--md-sys-color-surface-container-highest: rgb(50 53 58);
|
||||||
|
}
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
.dark-medium-contrast {
|
||||||
|
--md-sys-color-primary: rgb(173 204 255);
|
||||||
|
--md-sys-color-surface-tint: rgb(165 200 255);
|
||||||
|
--md-sys-color-on-primary: rgb(0 22 49);
|
||||||
|
--md-sys-color-primary-container: rgb(112 146 198);
|
||||||
|
--md-sys-color-on-primary-container: rgb(0 0 0);
|
||||||
|
--md-sys-color-secondary: rgb(159 208 255);
|
||||||
|
--md-sys-color-on-secondary: rgb(0 24 42);
|
||||||
|
--md-sys-color-secondary-container: rgb(100 149 193);
|
||||||
|
--md-sys-color-on-secondary-container: rgb(0 0 0);
|
||||||
|
--md-sys-color-tertiary: rgb(222 193 231);
|
||||||
|
--md-sys-color-on-tertiary: rgb(33 14 42);
|
||||||
|
--md-sys-color-tertiary-container: rgb(162 136 171);
|
||||||
|
--md-sys-color-on-tertiary-container: rgb(0 0 0);
|
||||||
|
--md-sys-color-error: rgb(255 186 177);
|
||||||
|
--md-sys-color-on-error: rgb(55 0 1);
|
||||||
|
--md-sys-color-error-container: rgb(255 84 73);
|
||||||
|
--md-sys-color-on-error-container: rgb(0 0 0);
|
||||||
|
--md-sys-color-background: rgb(17 19 24);
|
||||||
|
--md-sys-color-on-background: rgb(225 226 233);
|
||||||
|
--md-sys-color-surface: rgb(17 19 24);
|
||||||
|
--md-sys-color-on-surface: rgb(251 250 255);
|
||||||
|
--md-sys-color-surface-variant: rgb(67 71 78);
|
||||||
|
--md-sys-color-on-surface-variant: rgb(200 202 212);
|
||||||
|
--md-sys-color-outline: rgb(160 163 171);
|
||||||
|
--md-sys-color-outline-variant: rgb(128 131 139);
|
||||||
|
--md-sys-color-shadow: rgb(0 0 0);
|
||||||
|
--md-sys-color-scrim: rgb(0 0 0);
|
||||||
|
--md-sys-color-inverse-surface: rgb(225 226 233);
|
||||||
|
--md-sys-color-inverse-on-surface: rgb(40 42 47);
|
||||||
|
--md-sys-color-inverse-primary: rgb(35 73 120);
|
||||||
|
--md-sys-color-primary-fixed: rgb(212 227 255);
|
||||||
|
--md-sys-color-on-primary-fixed: rgb(0 17 40);
|
||||||
|
--md-sys-color-primary-fixed-dim: rgb(165 200 255);
|
||||||
|
--md-sys-color-on-primary-fixed-variant: rgb(10 55 100);
|
||||||
|
--md-sys-color-secondary-fixed: rgb(206 229 255);
|
||||||
|
--md-sys-color-on-secondary-fixed: rgb(0 18 34);
|
||||||
|
--md-sys-color-secondary-fixed-dim: rgb(154 203 250);
|
||||||
|
--md-sys-color-on-secondary-fixed-variant: rgb(0 57 91);
|
||||||
|
--md-sys-color-tertiary-fixed: rgb(247 216 255);
|
||||||
|
--md-sys-color-on-tertiary-fixed: rgb(28 9 37);
|
||||||
|
--md-sys-color-tertiary-fixed-dim: rgb(218 189 226);
|
||||||
|
--md-sys-color-on-tertiary-fixed-variant: rgb(67 46 76);
|
||||||
|
--md-sys-color-surface-dim: rgb(17 19 24);
|
||||||
|
--md-sys-color-surface-bright: rgb(55 57 62);
|
||||||
|
--md-sys-color-surface-container-lowest: rgb(12 14 19);
|
||||||
|
--md-sys-color-surface-container-low: rgb(25 28 32);
|
||||||
|
--md-sys-color-surface-container: rgb(29 32 36);
|
||||||
|
--md-sys-color-surface-container-high: rgb(40 42 47);
|
||||||
|
--md-sys-color-surface-container-highest: rgb(50 53 58);
|
||||||
|
}
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
.dark {
|
||||||
|
--md-sys-color-primary: rgb(165 200 255);
|
||||||
|
--md-sys-color-surface-tint: rgb(165 200 255);
|
||||||
|
--md-sys-color-on-primary: rgb(0 49 94);
|
||||||
|
--md-sys-color-primary-container: rgb(34 72 118);
|
||||||
|
--md-sys-color-on-primary-container: rgb(212 227 255);
|
||||||
|
--md-sys-color-secondary: rgb(154 203 250);
|
||||||
|
--md-sys-color-on-secondary: rgb(0 51 83);
|
||||||
|
--md-sys-color-secondary-container: rgb(12 74 114);
|
||||||
|
--md-sys-color-on-secondary-container: rgb(206 229 255);
|
||||||
|
--md-sys-color-tertiary: rgb(218 189 226);
|
||||||
|
--md-sys-color-on-tertiary: rgb(61 41 70);
|
||||||
|
--md-sys-color-tertiary-container: rgb(85 63 93);
|
||||||
|
--md-sys-color-on-tertiary-container: rgb(247 216 255);
|
||||||
|
--md-sys-color-error: rgb(255 180 171);
|
||||||
|
--md-sys-color-on-error: rgb(105 0 5);
|
||||||
|
--md-sys-color-error-container: rgb(147 0 10);
|
||||||
|
--md-sys-color-on-error-container: rgb(255 218 214);
|
||||||
|
--md-sys-color-background: rgb(17 19 24);
|
||||||
|
--md-sys-color-on-background: rgb(225 226 233);
|
||||||
|
--md-sys-color-surface: rgb(17 19 24);
|
||||||
|
--md-sys-color-on-surface: rgb(225 226 233);
|
||||||
|
--md-sys-color-surface-variant: rgb(67 71 78);
|
||||||
|
--md-sys-color-on-surface-variant: rgb(195 198 207);
|
||||||
|
--md-sys-color-outline: rgb(141 145 153);
|
||||||
|
--md-sys-color-outline-variant: rgb(67 71 78);
|
||||||
|
--md-sys-color-shadow: rgb(0 0 0);
|
||||||
|
--md-sys-color-scrim: rgb(0 0 0);
|
||||||
|
--md-sys-color-inverse-surface: rgb(225 226 233);
|
||||||
|
--md-sys-color-inverse-on-surface: rgb(46 48 53);
|
||||||
|
--md-sys-color-inverse-primary: rgb(60 96 144);
|
||||||
|
--md-sys-color-primary-fixed: rgb(212 227 255);
|
||||||
|
--md-sys-color-on-primary-fixed: rgb(0 28 58);
|
||||||
|
--md-sys-color-primary-fixed-dim: rgb(165 200 255);
|
||||||
|
--md-sys-color-on-primary-fixed-variant: rgb(34 72 118);
|
||||||
|
--md-sys-color-secondary-fixed: rgb(206 229 255);
|
||||||
|
--md-sys-color-on-secondary-fixed: rgb(0 29 50);
|
||||||
|
--md-sys-color-secondary-fixed-dim: rgb(154 203 250);
|
||||||
|
--md-sys-color-on-secondary-fixed-variant: rgb(12 74 114);
|
||||||
|
--md-sys-color-tertiary-fixed: rgb(247 216 255);
|
||||||
|
--md-sys-color-on-tertiary-fixed: rgb(39 20 48);
|
||||||
|
--md-sys-color-tertiary-fixed-dim: rgb(218 189 226);
|
||||||
|
--md-sys-color-on-tertiary-fixed-variant: rgb(85 63 93);
|
||||||
|
--md-sys-color-surface-dim: rgb(17 19 24);
|
||||||
|
--md-sys-color-surface-bright: rgb(55 57 62);
|
||||||
|
--md-sys-color-surface-container-lowest: rgb(12 14 19);
|
||||||
|
--md-sys-color-surface-container-low: rgb(25 28 32);
|
||||||
|
--md-sys-color-surface-container: rgb(29 32 36);
|
||||||
|
--md-sys-color-surface-container-high: rgb(40 42 47);
|
||||||
|
--md-sys-color-surface-container-highest: rgb(50 53 58);
|
||||||
|
}
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
.light-high-contrast {
|
||||||
|
--md-sys-color-primary: rgb(0 34 70);
|
||||||
|
--md-sys-color-surface-tint: rgb(60 96 144);
|
||||||
|
--md-sys-color-on-primary: rgb(255 255 255);
|
||||||
|
--md-sys-color-primary-container: rgb(29 68 114);
|
||||||
|
--md-sys-color-on-primary-container: rgb(255 255 255);
|
||||||
|
--md-sys-color-secondary: rgb(0 36 61);
|
||||||
|
--md-sys-color-on-secondary: rgb(255 255 255);
|
||||||
|
--md-sys-color-secondary-container: rgb(3 70 110);
|
||||||
|
--md-sys-color-on-secondary-container: rgb(255 255 255);
|
||||||
|
--md-sys-color-tertiary: rgb(46 26 55);
|
||||||
|
--md-sys-color-on-tertiary: rgb(255 255 255);
|
||||||
|
--md-sys-color-tertiary-container: rgb(81 59 89);
|
||||||
|
--md-sys-color-on-tertiary-container: rgb(255 255 255);
|
||||||
|
--md-sys-color-error: rgb(78 0 2);
|
||||||
|
--md-sys-color-on-error: rgb(255 255 255);
|
||||||
|
--md-sys-color-error-container: rgb(140 0 9);
|
||||||
|
--md-sys-color-on-error-container: rgb(255 255 255);
|
||||||
|
--md-sys-color-background: rgb(249 249 255);
|
||||||
|
--md-sys-color-on-background: rgb(25 28 32);
|
||||||
|
--md-sys-color-surface: rgb(249 249 255);
|
||||||
|
--md-sys-color-on-surface: rgb(0 0 0);
|
||||||
|
--md-sys-color-surface-variant: rgb(224 226 236);
|
||||||
|
--md-sys-color-on-surface-variant: rgb(32 36 43);
|
||||||
|
--md-sys-color-outline: rgb(63 67 74);
|
||||||
|
--md-sys-color-outline-variant: rgb(63 67 74);
|
||||||
|
--md-sys-color-shadow: rgb(0 0 0);
|
||||||
|
--md-sys-color-scrim: rgb(0 0 0);
|
||||||
|
--md-sys-color-inverse-surface: rgb(46 48 53);
|
||||||
|
--md-sys-color-inverse-on-surface: rgb(255 255 255);
|
||||||
|
--md-sys-color-inverse-primary: rgb(228 236 255);
|
||||||
|
--md-sys-color-primary-fixed: rgb(29 68 114);
|
||||||
|
--md-sys-color-on-primary-fixed: rgb(255 255 255);
|
||||||
|
--md-sys-color-primary-fixed-dim: rgb(0 45 88);
|
||||||
|
--md-sys-color-on-primary-fixed-variant: rgb(255 255 255);
|
||||||
|
--md-sys-color-secondary-fixed: rgb(3 70 110);
|
||||||
|
--md-sys-color-on-secondary-fixed: rgb(255 255 255);
|
||||||
|
--md-sys-color-secondary-fixed-dim: rgb(0 47 77);
|
||||||
|
--md-sys-color-on-secondary-fixed-variant: rgb(255 255 255);
|
||||||
|
--md-sys-color-tertiary-fixed: rgb(81 59 89);
|
||||||
|
--md-sys-color-on-tertiary-fixed: rgb(255 255 255);
|
||||||
|
--md-sys-color-tertiary-fixed-dim: rgb(57 37 66);
|
||||||
|
--md-sys-color-on-tertiary-fixed-variant: rgb(255 255 255);
|
||||||
|
--md-sys-color-surface-dim: rgb(217 218 224);
|
||||||
|
--md-sys-color-surface-bright: rgb(249 249 255);
|
||||||
|
--md-sys-color-surface-container-lowest: rgb(255 255 255);
|
||||||
|
--md-sys-color-surface-container-low: rgb(243 243 250);
|
||||||
|
--md-sys-color-surface-container: rgb(237 237 244);
|
||||||
|
--md-sys-color-surface-container-high: rgb(231 232 238);
|
||||||
|
--md-sys-color-surface-container-highest: rgb(225 226 233);
|
||||||
|
}
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
.light-medium-contrast {
|
||||||
|
--md-sys-color-primary: rgb(29 68 114);
|
||||||
|
--md-sys-color-surface-tint: rgb(60 96 144);
|
||||||
|
--md-sys-color-on-primary: rgb(255 255 255);
|
||||||
|
--md-sys-color-primary-container: rgb(83 118 167);
|
||||||
|
--md-sys-color-on-primary-container: rgb(255 255 255);
|
||||||
|
--md-sys-color-secondary: rgb(3 70 110);
|
||||||
|
--md-sys-color-on-secondary: rgb(255 255 255);
|
||||||
|
--md-sys-color-secondary-container: rgb(71 121 163);
|
||||||
|
--md-sys-color-on-secondary-container: rgb(255 255 255);
|
||||||
|
--md-sys-color-tertiary: rgb(81 59 89);
|
||||||
|
--md-sys-color-on-tertiary: rgb(255 255 255);
|
||||||
|
--md-sys-color-tertiary-container: rgb(133 108 141);
|
||||||
|
--md-sys-color-on-tertiary-container: rgb(255 255 255);
|
||||||
|
--md-sys-color-error: rgb(140 0 9);
|
||||||
|
--md-sys-color-on-error: rgb(255 255 255);
|
||||||
|
--md-sys-color-error-container: rgb(218 52 46);
|
||||||
|
--md-sys-color-on-error-container: rgb(255 255 255);
|
||||||
|
--md-sys-color-background: rgb(249 249 255);
|
||||||
|
--md-sys-color-on-background: rgb(25 28 32);
|
||||||
|
--md-sys-color-surface: rgb(249 249 255);
|
||||||
|
--md-sys-color-on-surface: rgb(25 28 32);
|
||||||
|
--md-sys-color-surface-variant: rgb(224 226 236);
|
||||||
|
--md-sys-color-on-surface-variant: rgb(63 67 74);
|
||||||
|
--md-sys-color-outline: rgb(91 95 103);
|
||||||
|
--md-sys-color-outline-variant: rgb(119 123 131);
|
||||||
|
--md-sys-color-shadow: rgb(0 0 0);
|
||||||
|
--md-sys-color-scrim: rgb(0 0 0);
|
||||||
|
--md-sys-color-inverse-surface: rgb(46 48 53);
|
||||||
|
--md-sys-color-inverse-on-surface: rgb(240 240 247);
|
||||||
|
--md-sys-color-inverse-primary: rgb(165 200 255);
|
||||||
|
--md-sys-color-primary-fixed: rgb(83 118 167);
|
||||||
|
--md-sys-color-on-primary-fixed: rgb(255 255 255);
|
||||||
|
--md-sys-color-primary-fixed-dim: rgb(58 93 141);
|
||||||
|
--md-sys-color-on-primary-fixed-variant: rgb(255 255 255);
|
||||||
|
--md-sys-color-secondary-fixed: rgb(71 121 163);
|
||||||
|
--md-sys-color-on-secondary-fixed: rgb(255 255 255);
|
||||||
|
--md-sys-color-secondary-fixed-dim: rgb(43 96 137);
|
||||||
|
--md-sys-color-on-secondary-fixed-variant: rgb(255 255 255);
|
||||||
|
--md-sys-color-tertiary-fixed: rgb(133 108 141);
|
||||||
|
--md-sys-color-on-tertiary-fixed: rgb(255 255 255);
|
||||||
|
--md-sys-color-tertiary-fixed-dim: rgb(107 84 116);
|
||||||
|
--md-sys-color-on-tertiary-fixed-variant: rgb(255 255 255);
|
||||||
|
--md-sys-color-surface-dim: rgb(217 218 224);
|
||||||
|
--md-sys-color-surface-bright: rgb(249 249 255);
|
||||||
|
--md-sys-color-surface-container-lowest: rgb(255 255 255);
|
||||||
|
--md-sys-color-surface-container-low: rgb(243 243 250);
|
||||||
|
--md-sys-color-surface-container: rgb(237 237 244);
|
||||||
|
--md-sys-color-surface-container-high: rgb(231 232 238);
|
||||||
|
--md-sys-color-surface-container-highest: rgb(225 226 233);
|
||||||
|
}
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
.light {
|
||||||
|
--md-sys-color-primary: rgb(60 96 144);
|
||||||
|
--md-sys-color-surface-tint: rgb(60 96 144);
|
||||||
|
--md-sys-color-on-primary: rgb(255 255 255);
|
||||||
|
--md-sys-color-primary-container: rgb(212 227 255);
|
||||||
|
--md-sys-color-on-primary-container: rgb(0 28 58);
|
||||||
|
--md-sys-color-secondary: rgb(46 98 140);
|
||||||
|
--md-sys-color-on-secondary: rgb(255 255 255);
|
||||||
|
--md-sys-color-secondary-container: rgb(206 229 255);
|
||||||
|
--md-sys-color-on-secondary-container: rgb(0 29 50);
|
||||||
|
--md-sys-color-tertiary: rgb(110 86 118);
|
||||||
|
--md-sys-color-on-tertiary: rgb(255 255 255);
|
||||||
|
--md-sys-color-tertiary-container: rgb(247 216 255);
|
||||||
|
--md-sys-color-on-tertiary-container: rgb(39 20 48);
|
||||||
|
--md-sys-color-error: rgb(186 26 26);
|
||||||
|
--md-sys-color-on-error: rgb(255 255 255);
|
||||||
|
--md-sys-color-error-container: rgb(255 218 214);
|
||||||
|
--md-sys-color-on-error-container: rgb(65 0 2);
|
||||||
|
--md-sys-color-background: rgb(249 249 255);
|
||||||
|
--md-sys-color-on-background: rgb(25 28 32);
|
||||||
|
--md-sys-color-surface: rgb(249 249 255);
|
||||||
|
--md-sys-color-on-surface: rgb(25 28 32);
|
||||||
|
--md-sys-color-surface-variant: rgb(224 226 236);
|
||||||
|
--md-sys-color-on-surface-variant: rgb(67 71 78);
|
||||||
|
--md-sys-color-outline: rgb(116 119 127);
|
||||||
|
--md-sys-color-outline-variant: rgb(195 198 207);
|
||||||
|
--md-sys-color-shadow: rgb(0 0 0);
|
||||||
|
--md-sys-color-scrim: rgb(0 0 0);
|
||||||
|
--md-sys-color-inverse-surface: rgb(46 48 53);
|
||||||
|
--md-sys-color-inverse-on-surface: rgb(240 240 247);
|
||||||
|
--md-sys-color-inverse-primary: rgb(165 200 255);
|
||||||
|
--md-sys-color-primary-fixed: rgb(212 227 255);
|
||||||
|
--md-sys-color-on-primary-fixed: rgb(0 28 58);
|
||||||
|
--md-sys-color-primary-fixed-dim: rgb(165 200 255);
|
||||||
|
--md-sys-color-on-primary-fixed-variant: rgb(34 72 118);
|
||||||
|
--md-sys-color-secondary-fixed: rgb(206 229 255);
|
||||||
|
--md-sys-color-on-secondary-fixed: rgb(0 29 50);
|
||||||
|
--md-sys-color-secondary-fixed-dim: rgb(154 203 250);
|
||||||
|
--md-sys-color-on-secondary-fixed-variant: rgb(12 74 114);
|
||||||
|
--md-sys-color-tertiary-fixed: rgb(247 216 255);
|
||||||
|
--md-sys-color-on-tertiary-fixed: rgb(39 20 48);
|
||||||
|
--md-sys-color-tertiary-fixed-dim: rgb(218 189 226);
|
||||||
|
--md-sys-color-on-tertiary-fixed-variant: rgb(85 63 93);
|
||||||
|
--md-sys-color-surface-dim: rgb(217 218 224);
|
||||||
|
--md-sys-color-surface-bright: rgb(249 249 255);
|
||||||
|
--md-sys-color-surface-container-lowest: rgb(255 255 255);
|
||||||
|
--md-sys-color-surface-container-low: rgb(243 243 250);
|
||||||
|
--md-sys-color-surface-container: rgb(237 237 244);
|
||||||
|
--md-sys-color-surface-container-high: rgb(231 232 238);
|
||||||
|
--md-sys-color-surface-container-highest: rgb(225 226 233);
|
||||||
|
}
|
||||||
@@ -0,0 +1,107 @@
|
|||||||
|
:root {
|
||||||
|
font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
|
||||||
|
line-height: 1.5;
|
||||||
|
font-weight: 400;
|
||||||
|
|
||||||
|
color-scheme: light dark;
|
||||||
|
color: rgba(0, 0, 0, 0.87);
|
||||||
|
background-color: #242424;
|
||||||
|
|
||||||
|
font-synthesis: none;
|
||||||
|
text-rendering: optimizeLegibility;
|
||||||
|
-webkit-font-smoothing: antialiased;
|
||||||
|
-moz-osx-font-smoothing: grayscale;
|
||||||
|
}
|
||||||
|
|
||||||
|
a {
|
||||||
|
font-weight: 500;
|
||||||
|
color: #646cff;
|
||||||
|
text-decoration: inherit;
|
||||||
|
}
|
||||||
|
a:hover {
|
||||||
|
color: #535bf2;
|
||||||
|
}
|
||||||
|
|
||||||
|
body {
|
||||||
|
margin: 0;
|
||||||
|
display: flex;
|
||||||
|
place-items: center;
|
||||||
|
min-width: 320px;
|
||||||
|
min-height: 100vh;
|
||||||
|
}
|
||||||
|
|
||||||
|
button {
|
||||||
|
border-radius: 8px;
|
||||||
|
border: 1px solid transparent;
|
||||||
|
padding: 0.6em 1.2em;
|
||||||
|
font-size: 1em;
|
||||||
|
font-weight: 500;
|
||||||
|
font-family: inherit;
|
||||||
|
background-color: #1a1a1a;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: border-color 0.25s;
|
||||||
|
}
|
||||||
|
button:hover {
|
||||||
|
border-color: #646cff;
|
||||||
|
}
|
||||||
|
button:focus,
|
||||||
|
button:focus-visible {
|
||||||
|
outline: 4px auto -webkit-focus-ring-color;
|
||||||
|
}
|
||||||
|
|
||||||
|
button#query-button {
|
||||||
|
height: 5em;
|
||||||
|
vertical-align: top;
|
||||||
|
}
|
||||||
|
|
||||||
|
button#play-button {
|
||||||
|
padding: '10px 20px';
|
||||||
|
font-size: '16px';
|
||||||
|
cursor: 'pointer';
|
||||||
|
background-color: '#28a745';
|
||||||
|
color: '#fff';
|
||||||
|
border: 'none';
|
||||||
|
border-radius: '5px';
|
||||||
|
};
|
||||||
|
|
||||||
|
button#pause-button {
|
||||||
|
background-color: #ffc107;
|
||||||
|
}
|
||||||
|
|
||||||
|
button#stop-button {
|
||||||
|
background-color: #dc3545;
|
||||||
|
}
|
||||||
|
|
||||||
|
h1 {
|
||||||
|
font-size: 3.2em;
|
||||||
|
line-height: 1.1;
|
||||||
|
}
|
||||||
|
|
||||||
|
p#footer {
|
||||||
|
float: none;
|
||||||
|
clear: both;
|
||||||
|
vertical-align: bottom;
|
||||||
|
}
|
||||||
|
|
||||||
|
table#query-output {
|
||||||
|
float: none;
|
||||||
|
clear: both;
|
||||||
|
}
|
||||||
|
|
||||||
|
textarea#query-input {
|
||||||
|
height: 5em;
|
||||||
|
width: 50em;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (prefers-color-scheme: light) {
|
||||||
|
:root {
|
||||||
|
color: #213547;
|
||||||
|
background-color: #ffffff;
|
||||||
|
}
|
||||||
|
a:hover {
|
||||||
|
color: #747bff;
|
||||||
|
}
|
||||||
|
button {
|
||||||
|
background-color: #f9f9f9;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import ReactDOM from 'react-dom/client';
|
||||||
|
import App from './App';
|
||||||
|
|
||||||
|
ReactDOM.createRoot(document.getElementById('root')).render(
|
||||||
|
<React.StrictMode>
|
||||||
|
<App />
|
||||||
|
</React.StrictMode>
|
||||||
|
)
|
||||||
@@ -0,0 +1,69 @@
|
|||||||
|
import { fileURLToPath, URL } from 'node:url';
|
||||||
|
import { defineConfig } from 'vite';
|
||||||
|
import plugin from '@vitejs/plugin-react';
|
||||||
|
import fs from 'fs';
|
||||||
|
import path from 'path';
|
||||||
|
import child_process from 'child_process';
|
||||||
|
import process, { env } from 'process';
|
||||||
|
|
||||||
|
const baseFolder =
|
||||||
|
process.env.APPDATA !== undefined && process.env.APPDATA !== ''
|
||||||
|
? `${process.env.APPDATA}/ASP.NET/https`
|
||||||
|
: `${process.env.HOME}/.aspnet/https`;
|
||||||
|
|
||||||
|
const certificateName = "bts.datastreamwebapp.client";
|
||||||
|
const certFilePath = path.join(baseFolder, `${certificateName}.pem`);
|
||||||
|
const keyFilePath = path.join(baseFolder, `${certificateName}.key`);
|
||||||
|
|
||||||
|
if (!fs.existsSync(certFilePath) || !fs.existsSync(keyFilePath)) {
|
||||||
|
if (0 !== child_process.spawnSync('dotnet', [
|
||||||
|
'dev-certs',
|
||||||
|
'https',
|
||||||
|
'--export-path',
|
||||||
|
certFilePath,
|
||||||
|
'--format',
|
||||||
|
'Pem',
|
||||||
|
'--no-password',
|
||||||
|
], { stdio: 'inherit', }).status) {
|
||||||
|
throw new Error("Could not create certificate.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const target = env.ASPNETCORE_HTTPS_PORT
|
||||||
|
? `https://localhost:${env.ASPNETCORE_HTTPS_PORT}`
|
||||||
|
: env.ASPNETCORE_URLS
|
||||||
|
? env.ASPNETCORE_URLS.split(';')[0]
|
||||||
|
: 'https://localhost:5001';
|
||||||
|
|
||||||
|
export default defineConfig(({ $$command, mode, $$isSsrBuild, $$isPreview }) => {
|
||||||
|
return {
|
||||||
|
plugins: [plugin()],
|
||||||
|
resolve: {
|
||||||
|
alias: {
|
||||||
|
'@': fileURLToPath(new URL('./src', import.meta.url))
|
||||||
|
}
|
||||||
|
},
|
||||||
|
build: {
|
||||||
|
minify: false,
|
||||||
|
sourcemap: true,
|
||||||
|
outDir: `../../../build/Bts.DataStreamWebApp.Client/${mode}/dist`
|
||||||
|
},
|
||||||
|
server: {
|
||||||
|
proxy: {
|
||||||
|
'^/api': {
|
||||||
|
target,
|
||||||
|
secure: false
|
||||||
|
},
|
||||||
|
'^/ws': {
|
||||||
|
target,
|
||||||
|
secure: false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
port: 5173,
|
||||||
|
https: {
|
||||||
|
key: fs.readFileSync(keyFilePath),
|
||||||
|
cert: fs.readFileSync(certFilePath),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
});
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
|
<InvariantGlobalization>true</InvariantGlobalization>
|
||||||
|
<SpaRoot>..\Bts.DataStreamWebApp.Client</SpaRoot>
|
||||||
|
<SpaProxyLaunchCommand>npm run dev</SpaProxyLaunchCommand>
|
||||||
|
<SpaProxyServerUrl>https://localhost:5173</SpaProxyServerUrl>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="CommandLineParser" Version="2.9.1" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="8.0.6" />
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="8.0.6" />
|
||||||
|
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||||
|
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\Bts.DataStreamWebApp.Client\Bts.DataStreamWebApp.Client.esproj">
|
||||||
|
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||||
|
</ProjectReference>
|
||||||
|
<ProjectReference Include="..\DataStream\DataStream.csproj" />
|
||||||
|
<ProjectReference Include="..\SharedStreams\SharedStreams.csproj" />
|
||||||
|
<ProjectReference Include="..\..\client\spark_api\spark_api.csproj" />
|
||||||
|
<ProjectReference Include="..\..\client\spark_core\spark_core.csproj" />
|
||||||
|
<ProjectReference Include="..\..\client\spark_websocket\spark_websocket.csproj" />
|
||||||
|
<ProjectReference Include="..\Bts.Extensions.DependencyInjection\Bts.Extensions.DependencyInjection.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<!-- <ItemGroup>
|
||||||
|
<Content Update="wwwroot\alt-index.html" CopyToPublishDirectory="Never" />
|
||||||
|
</ItemGroup> -->
|
||||||
|
</Project>
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
{
|
||||||
|
"Spark": {
|
||||||
|
"ConfigServer": "http://localhost:8000/config"
|
||||||
|
},
|
||||||
|
"SparkdCredentials": {
|
||||||
|
"User": "bts",
|
||||||
|
"Password": ""
|
||||||
|
},
|
||||||
|
"MasterWorker": {
|
||||||
|
"Interval": "00:00:00.1"
|
||||||
|
},
|
||||||
|
"PubSub": {
|
||||||
|
"Routing": {
|
||||||
|
"PublisherRoutes": [
|
||||||
|
{
|
||||||
|
"Name": "default",
|
||||||
|
"ServerAddress": "bts-cloud://127.0.0.1:12345",
|
||||||
|
"TagRegExp": ".*"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"SubscriberRoutes": [
|
||||||
|
{
|
||||||
|
"Name": "default",
|
||||||
|
"ServerAddress": "bts-cloud://127.0.0.1:12345",
|
||||||
|
"TagRegExp": ".*"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"ViewStreamDatabase": {
|
||||||
|
"Interval": "00:00:01"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"content_root_path": "build/Bts.DataStreamWebApp.Client/production",
|
||||||
|
"web_root_path": "dist"
|
||||||
|
}
|
||||||
+36
@@ -0,0 +1,36 @@
|
|||||||
|
namespace Bts.DataStreamWebApp.Server.Controllers;
|
||||||
|
|
||||||
|
using BCG;
|
||||||
|
|
||||||
|
using bts.api.core;
|
||||||
|
|
||||||
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
|
||||||
|
[Route("/ws")]
|
||||||
|
public class DataStreamSubscriptionController : ControllerBase {
|
||||||
|
readonly ILogger logger;
|
||||||
|
readonly PrimitiveManager primitiveManager;
|
||||||
|
readonly IServiceProvider serviceProvider;
|
||||||
|
|
||||||
|
public DataStreamSubscriptionController(ILogger<DataStreamSubscriptionController> logger, PrimitiveManager primitiveManager, IServiceProvider serviceProvider) {
|
||||||
|
this.logger = logger;
|
||||||
|
this.primitiveManager = primitiveManager;
|
||||||
|
this.serviceProvider = serviceProvider;
|
||||||
|
logger.LogInformation("Creating {ControllerType}", GetType().Name);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Route("/ws")]
|
||||||
|
public async Task Get() {
|
||||||
|
if (!HttpContext.WebSockets.IsWebSocketRequest) {
|
||||||
|
logger.LogError("Expected websocket request on path '{}'", HttpContext.Request.Path);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
logger.LogInformation("Establishing websocket connection...");
|
||||||
|
using var webSocket = await HttpContext.WebSockets.AcceptWebSocketAsync();
|
||||||
|
logger.LogInformation("Websocket connection established.");
|
||||||
|
var context = ServiceContext.create();
|
||||||
|
await context.login("bts", string.Empty);
|
||||||
|
var server = new DataStreamWebSocketServer(webSocket, logger, primitiveManager, serviceProvider);
|
||||||
|
await server.Run();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,112 @@
|
|||||||
|
namespace Bts.DataStreamWebApp.Server.Controllers;
|
||||||
|
|
||||||
|
using BCG;
|
||||||
|
|
||||||
|
using bts.websocket_core.json_rpc;
|
||||||
|
|
||||||
|
using Bts.DataStreamCore;
|
||||||
|
using Bts.DataStreamWebApp.Server.Messages;
|
||||||
|
|
||||||
|
using System.Net.WebSockets;
|
||||||
|
using System.Text;
|
||||||
|
using System.Text.Json;
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
|
class DataStreamSubscription : IDisposable {
|
||||||
|
public readonly ViewStream ViewStream;
|
||||||
|
public DataPacket? LastFired;
|
||||||
|
public readonly string Id;
|
||||||
|
|
||||||
|
readonly ILogger logger;
|
||||||
|
readonly WebSocket webSocket;
|
||||||
|
readonly DataPacketJsonSerializer dataPacketSerializer = new();
|
||||||
|
|
||||||
|
public DataStreamSubscription(string id, ViewStream viewStream, WebSocket webSocket, ILogger logger) {
|
||||||
|
ViewStream = viewStream;
|
||||||
|
Id = id;
|
||||||
|
this.webSocket = webSocket;
|
||||||
|
this.logger = logger;
|
||||||
|
}
|
||||||
|
|
||||||
|
public SubscriptionStatus Status { get; private set; }
|
||||||
|
|
||||||
|
public void Start() {
|
||||||
|
if (Status == SubscriptionStatus.Subscribed) {
|
||||||
|
logger.LogWarning("Ignoring redundant call to 'Start'. Id = {Id} Status = {Status}", Id, Status);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
logger.LogInformation("Subscribing to ViewStream. SubscriptionId = {SubscriptionId}", Id);
|
||||||
|
Status = SubscriptionStatus.Subscribed;
|
||||||
|
ViewStream.onChange += onChange;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task Clear() {
|
||||||
|
if (LastFired is null) {
|
||||||
|
return Task.CompletedTask;
|
||||||
|
}
|
||||||
|
logger.LogInformation("Clearing subscription (firing DataPacket to delete all rows). Id = {Id} Status = {Status}", Id, Status);
|
||||||
|
return sendDataPacket("clear", new(new BlueTable(LastFired.schema), new BlueTable(LastFired.schema), LastFired.newRows));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Stop() {
|
||||||
|
if (Status == SubscriptionStatus.Unsubscribed) {
|
||||||
|
logger.LogWarning("Ignoring redundant call to 'Stop'. Id = {Id} Status = {Status}", Id, Status);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
logger.LogInformation("Unsubscribing from ViewStream. SubscriptionId = {SubscriptionId}", Id);
|
||||||
|
Status = SubscriptionStatus.Unsubscribed;
|
||||||
|
ViewStream.onChange -= onChange;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose() =>
|
||||||
|
Stop();
|
||||||
|
|
||||||
|
async void onChange(object newValue) {
|
||||||
|
if (newValue is not DataPacket dp) {
|
||||||
|
logger.LogError("Expected DataPacket in stream callback (actually received {}).", newValue?.GetType());
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (webSocket.State != WebSocketState.Open) {
|
||||||
|
logger.LogError(
|
||||||
|
"Unsubscribing from stream early because WebSocket state = {WebSocketState}", webSocket.State);
|
||||||
|
Dispose();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
await sendDataPacket("subscribe", dp);
|
||||||
|
}
|
||||||
|
|
||||||
|
async Task sendDataPacket(string method, DataPacket dp) {
|
||||||
|
var serializerOpts = new JsonSerializerOptions {
|
||||||
|
NumberHandling = JsonNumberHandling.AllowNamedFloatingPointLiterals
|
||||||
|
};
|
||||||
|
serializerOpts.Converters.Add(new DataPacketJsonConverter() {
|
||||||
|
IncludeCurrent = true,
|
||||||
|
UseObjectRows = true,
|
||||||
|
});
|
||||||
|
var res = JsonRpcRequest.CreateNotification(method, dp);
|
||||||
|
var str = serialize(res, serializerOpts);
|
||||||
|
if (str is null) {
|
||||||
|
logger.LogError("Unsubscribing from stream early because we failed to serialize an outgoing DataPacket");
|
||||||
|
Dispose();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
logger.LogInformation(
|
||||||
|
"Sending DataPacket. NumRows = {NumRows} NumCols = {NumCols} MessageLength = {MessageLength}",
|
||||||
|
dp.newRows.Count,
|
||||||
|
dp.schema.columnNames.Length,
|
||||||
|
str.Length);
|
||||||
|
var bytes = Encoding.UTF8.GetBytes(str);
|
||||||
|
await webSocket.SendAsync(bytes, WebSocketMessageType.Text, true, CancellationToken.None);
|
||||||
|
LastFired = dp;
|
||||||
|
}
|
||||||
|
|
||||||
|
string? serialize<T>(T message, JsonSerializerOptions? opts) {
|
||||||
|
opts ??= JsonSerializerOptions.Default;
|
||||||
|
try {
|
||||||
|
return JsonSerializer.Serialize(message, opts);
|
||||||
|
} catch (Exception ex) {
|
||||||
|
logger.LogError("Failed to serialize message of type {MessageType}: {Exception}", typeof(T), ex);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
+26
-36
@@ -1,17 +1,13 @@
|
|||||||
namespace Bts.DataStreamPublisher;
|
namespace Bts.DataStreamWebApp.Server;
|
||||||
|
|
||||||
using Bts.PubSub;
|
using Bts.PubSub;
|
||||||
|
|
||||||
using CommandLine;
|
using CommandLine;
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.IO;
|
|
||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
public class DataStreamPublisherConfig
|
class DataStreamWebAppServerConfig {
|
||||||
{
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The login user for sparkd
|
/// The login user for sparkd
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -33,27 +29,23 @@ public class DataStreamPublisherConfig
|
|||||||
[Option("sparkd", HelpText = "The sparkd config server")]
|
[Option("sparkd", HelpText = "The sparkd config server")]
|
||||||
public string? Sparkd { get; set; }
|
public string? Sparkd { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The tables to publish on startup. Each key/value represents a table name/query to publish.
|
|
||||||
/// </summary>
|
|
||||||
[JsonPropertyName("publishers")]
|
|
||||||
public List<PublisherNode>? Publishers { get; set; }
|
|
||||||
|
|
||||||
[JsonPropertyName("mongodb_url")]
|
|
||||||
public string MONGO_DB_URL { get; set; }
|
|
||||||
|
|
||||||
[JsonPropertyName("mongodb_db_name")]
|
|
||||||
public string MONGO_DB_NAME { get; set; }
|
|
||||||
|
|
||||||
[JsonPropertyName("mongodb_db_collection")]
|
|
||||||
public string MONGO_DB_COLLECTION { get; set; }
|
|
||||||
|
|
||||||
[JsonPropertyName("benzinga_news_ttl")]
|
|
||||||
public string BENZINGA_NEWS_TTL { get; set; }
|
|
||||||
|
|
||||||
[JsonPropertyName("pubsub")]
|
[JsonPropertyName("pubsub")]
|
||||||
public PubSubConfig? PubSub { get; set; }
|
public PubSubConfig? PubSub { get; set; }
|
||||||
|
|
||||||
|
[Option("content-root-path")]
|
||||||
|
[JsonPropertyName("content_root_path")]
|
||||||
|
public string? ContentRootPath { get; set; }
|
||||||
|
|
||||||
|
[Option("web-root-path")]
|
||||||
|
[JsonPropertyName("web_root_path")]
|
||||||
|
public string? WebRootPath { get; set; }
|
||||||
|
|
||||||
|
[Option("environment-name")]
|
||||||
|
[JsonPropertyName("environment_name")]
|
||||||
|
public string? EnvironmentName { get; set; }
|
||||||
|
|
||||||
|
public DirectoryBrowserOptions? DirectoryBrowser { get; set; }
|
||||||
|
|
||||||
[Option(
|
[Option(
|
||||||
"config",
|
"config",
|
||||||
MetaValue = "PATH",
|
MetaValue = "PATH",
|
||||||
@@ -61,19 +53,19 @@ public class DataStreamPublisherConfig
|
|||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
public string? ConfigFile { get; set; }
|
public string? ConfigFile { get; set; }
|
||||||
|
|
||||||
public static DataStreamPublisherConfig Default() =>
|
public static DataStreamWebAppServerConfig Default() =>
|
||||||
new()
|
new() {
|
||||||
{
|
User = "bts",
|
||||||
PubSub = PubSubConfig.Default(),
|
PubSub = PubSubConfig.Default(),
|
||||||
};
|
};
|
||||||
|
|
||||||
public void MergeWith(DataStreamPublisherConfig other)
|
public void MergeWith(DataStreamWebAppServerConfig other) {
|
||||||
{
|
|
||||||
User ??= other.User;
|
User ??= other.User;
|
||||||
Password ??= other.Password;
|
Password ??= other.Password;
|
||||||
Sparkd ??= other.Sparkd;
|
|
||||||
Publishers ??= other.Publishers;
|
|
||||||
PubSub ??= other.PubSub;
|
PubSub ??= other.PubSub;
|
||||||
|
Sparkd ??= other.Sparkd;
|
||||||
|
ContentRootPath ??= other.ContentRootPath;
|
||||||
|
WebRootPath ??= other.WebRootPath;
|
||||||
ConfigFile ??= other.ConfigFile;
|
ConfigFile ??= other.ConfigFile;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -84,14 +76,12 @@ public class DataStreamPublisherConfig
|
|||||||
/// <exception cref="InvalidOperationException">
|
/// <exception cref="InvalidOperationException">
|
||||||
/// JsonSerializer.Deserialize returns null
|
/// JsonSerializer.Deserialize returns null
|
||||||
/// </exception>
|
/// </exception>
|
||||||
public void MergeWithConfigFile()
|
public void MergeWithConfigFile() {
|
||||||
{
|
if (ConfigFile is null) {
|
||||||
if (ConfigFile is null)
|
|
||||||
{
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
var cfgString = File.ReadAllText(ConfigFile);
|
var cfgString = File.ReadAllText(ConfigFile);
|
||||||
var parsedCfg = JsonSerializer.Deserialize<DataStreamPublisherConfig>(cfgString) ??
|
var parsedCfg = JsonSerializer.Deserialize<DataStreamWebAppServerConfig>(cfgString) ??
|
||||||
throw new InvalidOperationException($"Failed to parse json from {ConfigFile}");
|
throw new InvalidOperationException($"Failed to parse json from {ConfigFile}");
|
||||||
MergeWith(parsedCfg);
|
MergeWith(parsedCfg);
|
||||||
ConfigFile = null;
|
ConfigFile = null;
|
||||||
@@ -0,0 +1,93 @@
|
|||||||
|
namespace Bts.DataStreamWebApp.Server.Controllers;
|
||||||
|
|
||||||
|
using BCG;
|
||||||
|
|
||||||
|
using bts.websocket_core.json_rpc;
|
||||||
|
|
||||||
|
using Bts.DataStreamWebApp.Server.Messages;
|
||||||
|
|
||||||
|
using System.Net.WebSockets;
|
||||||
|
using System.Text;
|
||||||
|
using System.Text.Json;
|
||||||
|
using System.Text.Json.Nodes;
|
||||||
|
|
||||||
|
public class DataStreamWebSocketServer {
|
||||||
|
readonly ILogger logger;
|
||||||
|
readonly WebSocket webSocket;
|
||||||
|
readonly Dictionary<string, DataStreamSubscription> subscriptions = new();
|
||||||
|
readonly PrimitiveManager primitiveManager;
|
||||||
|
readonly IServiceProvider serviceProvider;
|
||||||
|
|
||||||
|
public DataStreamWebSocketServer(WebSocket webSocket, ILogger logger, PrimitiveManager primitiveManager, IServiceProvider serviceProvider) {
|
||||||
|
this.webSocket = webSocket;
|
||||||
|
this.logger = logger;
|
||||||
|
this.primitiveManager = primitiveManager;
|
||||||
|
this.serviceProvider = serviceProvider;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<int> Run() {
|
||||||
|
logger.LogInformation("DataStreamWebSocketServer running");
|
||||||
|
await foreach (var req in JsonRpcRequestAsyncEnumerable.Create(webSocket, logger)) {
|
||||||
|
await (req.Method switch {
|
||||||
|
"subscribe" => onSubscribe(req),
|
||||||
|
"unsubscribe" => onUnsubscribe(req.Deserialize<UnsubscribeRequest>()),
|
||||||
|
_ => Task.CompletedTask,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
logger.LogInformation("DataStreamWebSocketServer stopped");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
async Task onSubscribe(JsonRpcRequest<JsonNode> req) {
|
||||||
|
ArgumentNullException.ThrowIfNull(req.Id);
|
||||||
|
ArgumentException.ThrowIfNullOrEmpty(req.Method);
|
||||||
|
if (!SubscribeRequest.ParseQuery(req, primitiveManager, out var vs, out var subId, out var errMsg, out var errCode)) {
|
||||||
|
logger.LogError("Invalid 'subscribe' request: {Reason}", errMsg);
|
||||||
|
await send(new JsonRpcError<JsonNode>() {
|
||||||
|
Code = (long)errCode,
|
||||||
|
Message = $"{errCode}: {errMsg}",
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (subscriptions.TryGetValue(subId, out var oldSub)) {
|
||||||
|
oldSub.Dispose();
|
||||||
|
}
|
||||||
|
vs.Reset(serviceProvider);
|
||||||
|
var sub = new DataStreamSubscription(subId, vs, webSocket, logger);
|
||||||
|
subscriptions[subId] = sub;
|
||||||
|
await sendSubscriptionStatus(req.Id.Value, subId, req.Method, SubscriptionStatus.Subscribed);
|
||||||
|
sub.Start();
|
||||||
|
}
|
||||||
|
|
||||||
|
async Task onUnsubscribe(JsonRpcRequest<UnsubscribeRequest> req) {
|
||||||
|
ArgumentNullException.ThrowIfNull(req.Id);
|
||||||
|
ArgumentException.ThrowIfNullOrEmpty(req.Method);
|
||||||
|
var subId = req.Params?.SubscriptionId ?? string.Empty;
|
||||||
|
if (!subscriptions.TryGetValue(subId, out var sub)) {
|
||||||
|
logger.LogInformation("Ignoring '{Method}' request because no subscription was found with id {Id}.", req.Method, subId);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
logger.LogInformation("Disposing subscription");
|
||||||
|
sub.Dispose();
|
||||||
|
subscriptions.Remove(subId);
|
||||||
|
await sendSubscriptionStatus(req.Id.Value, subId, req.Method, SubscriptionStatus.Unsubscribed);
|
||||||
|
}
|
||||||
|
|
||||||
|
Task sendSubscriptionStatus(JsonRpcId reqId, string subId, string method, SubscriptionStatus status) {
|
||||||
|
logger.LogInformation("Sending {Method} ack. SubscriptionId = {SubscriptionId}", method, subId);
|
||||||
|
return send(JsonRpcResponse.Create(reqId, new SubscriptionStatusMessage() {
|
||||||
|
SubscriptionId = subId,
|
||||||
|
Status = status,
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
Task send<T>(T message) {
|
||||||
|
if (message is null) {
|
||||||
|
return Task.CompletedTask;
|
||||||
|
}
|
||||||
|
var str = JsonSerializer.Serialize(message);
|
||||||
|
var bytes = Encoding.UTF8.GetBytes(str);
|
||||||
|
logger.LogTrace("Sending data. Length = {Length}", bytes.Length);
|
||||||
|
return webSocket.SendAsync(bytes, WebSocketMessageType.Text, true, CancellationToken.None);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
namespace Bts.DataStreamWebApp.Server.Messages;
|
||||||
|
|
||||||
|
enum ErrorCode {
|
||||||
|
None = 0,
|
||||||
|
InvalidSubscriptionRequest,
|
||||||
|
}
|
||||||
@@ -0,0 +1,74 @@
|
|||||||
|
namespace Bts.DataStreamWebApp.Server.Messages;
|
||||||
|
|
||||||
|
using BCG;
|
||||||
|
|
||||||
|
using bts.websocket_core.json_rpc;
|
||||||
|
|
||||||
|
using Bts.DataStreamExpressions;
|
||||||
|
|
||||||
|
using System.Diagnostics.CodeAnalysis;
|
||||||
|
using System.Text.Json;
|
||||||
|
using System.Text.Json.Nodes;
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
|
public class SubscribeRequest {
|
||||||
|
[JsonPropertyName("query")]
|
||||||
|
public string? Query { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("subscription_id")]
|
||||||
|
public string? SubscriptionId { get; set; }
|
||||||
|
|
||||||
|
internal static bool ParseQuery(
|
||||||
|
JsonRpcRequest<JsonNode> req,
|
||||||
|
PrimitiveManager primitiveManager,
|
||||||
|
[NotNullWhen(true)] out ViewStream? stream,
|
||||||
|
[NotNullWhen(true)] out string? subscriptionId,
|
||||||
|
[NotNullWhen(false)] out string? errorMessage,
|
||||||
|
out ErrorCode errorCode
|
||||||
|
) {
|
||||||
|
stream = null;
|
||||||
|
subscriptionId = null;
|
||||||
|
errorCode = ErrorCode.None;
|
||||||
|
var paramsJsonObj = req.Params?.AsObject();
|
||||||
|
if (paramsJsonObj is null) {
|
||||||
|
errorCode = ErrorCode.InvalidSubscriptionRequest;
|
||||||
|
errorMessage = "'params' object not found";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
var subReq = paramsJsonObj.Deserialize<SubscribeRequest>();
|
||||||
|
if (subReq is null) {
|
||||||
|
errorCode = ErrorCode.InvalidSubscriptionRequest;
|
||||||
|
errorMessage = "'params' object invalid";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
subscriptionId = subReq.SubscriptionId ?? string.Empty;
|
||||||
|
var query = subReq.Query;
|
||||||
|
if (query is null) {
|
||||||
|
errorCode = ErrorCode.InvalidSubscriptionRequest;
|
||||||
|
errorMessage = "'params.query' field not found (expected a string)";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
errorMessage = null;
|
||||||
|
var exp = DataStreamExpressionsInterpreter.Evaluate(query);
|
||||||
|
if (exp is null) {
|
||||||
|
errorCode = ErrorCode.InvalidSubscriptionRequest;
|
||||||
|
errorMessage = "'params.query' expression has invalid syntax";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
string? exceptionMsg = null;
|
||||||
|
try {
|
||||||
|
stream = exp.getView(new Dictionary<string, StatementExpression>(0), primitiveManager);
|
||||||
|
} catch (Exception ex) {
|
||||||
|
exceptionMsg = ex.ToString();
|
||||||
|
}
|
||||||
|
if (stream is null) {
|
||||||
|
errorCode = ErrorCode.InvalidSubscriptionRequest;
|
||||||
|
errorMessage = "Failed to create ViewStream from 'params.query' expression (check for typos in arguments/typenames)";
|
||||||
|
if (exceptionMsg is not null) {
|
||||||
|
errorMessage += ". Error" + exceptionMsg;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
namespace Bts.DataStreamWebApp.Server.Messages;
|
||||||
|
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
|
enum SubscriptionStatus {
|
||||||
|
None,
|
||||||
|
Subscribed,
|
||||||
|
Unsubscribed,
|
||||||
|
}
|
||||||
|
|
||||||
|
class SubscriptionStatusMessage {
|
||||||
|
[JsonPropertyName("subscription_id")]
|
||||||
|
public string? SubscriptionId { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("status")]
|
||||||
|
[JsonConverter(typeof(JsonStringEnumConverter))]
|
||||||
|
public SubscriptionStatus Status { get; set; } = SubscriptionStatus.None;
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
namespace Bts.DataStreamWebApp.Server.Messages;
|
||||||
|
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
|
public class UnsubscribeRequest {
|
||||||
|
[JsonPropertyName("subscription_id")]
|
||||||
|
public string? SubscriptionId { get; set; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,64 @@
|
|||||||
|
using Bts.DataStreamCore.Services;
|
||||||
|
using Bts.DataStreamWebApp.Server.Services;
|
||||||
|
using Bts.PubSub.Services;
|
||||||
|
|
||||||
|
using Spark.Api.Services;
|
||||||
|
using Spark.Core.Services;
|
||||||
|
|
||||||
|
using System.Reactive.Linq;
|
||||||
|
|
||||||
|
var builder = WebApplication.CreateBuilder(new WebApplicationOptions {
|
||||||
|
Args = args,
|
||||||
|
ApplicationName = "Bts.DataStreamWebApp.Server",
|
||||||
|
});
|
||||||
|
ConfigureApp(builder.Configuration);
|
||||||
|
ConfigureServices(builder.Services, builder.Configuration);
|
||||||
|
|
||||||
|
var app = builder.Build();
|
||||||
|
if (app.Environment.IsDevelopment()) {
|
||||||
|
app.UseDirectoryBrowser();
|
||||||
|
}
|
||||||
|
var wsOpts = new WebSocketOptions {
|
||||||
|
KeepAliveInterval = TimeSpan.FromMinutes(2)
|
||||||
|
};
|
||||||
|
app.UseWebSockets(wsOpts);
|
||||||
|
app.UseDefaultFiles();
|
||||||
|
app.UseStaticFiles();
|
||||||
|
if (app.Environment.IsDevelopment()) {
|
||||||
|
app.UseSwagger();
|
||||||
|
app.UseSwaggerUI();
|
||||||
|
}
|
||||||
|
app.UseHttpsRedirection();
|
||||||
|
app.UseAuthorization();
|
||||||
|
app.MapControllers();
|
||||||
|
try {
|
||||||
|
Console.Write($"Starting Application");
|
||||||
|
app.Run();
|
||||||
|
Console.Write($"Application exited gracefully.");
|
||||||
|
} catch (Exception ex) {
|
||||||
|
Console.Error.Write($"Application crashed: {ex}");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
static void ConfigureApp(ConfigurationManager configBuilder) {
|
||||||
|
configBuilder.AddCommandLine(Environment.GetCommandLineArgs());
|
||||||
|
var cfgRoot = configBuilder.GetSection("config");
|
||||||
|
if (cfgRoot?.Value is not null) {
|
||||||
|
configBuilder.AddJsonFile(cfgRoot.Value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void ConfigureServices(IServiceCollection services, IConfiguration config) {
|
||||||
|
services.AddDirectoryBrowser();
|
||||||
|
services.AddControllers();
|
||||||
|
services.AddEndpointsApiExplorer();
|
||||||
|
services.AddSwaggerGen();
|
||||||
|
services.AddMasterWorker(config.GetSection("MasterWorker"));
|
||||||
|
services.AddViewStreamDatabase(config.GetSection("ViewStreamDatabase"));
|
||||||
|
services.AddPubSubClient(config.GetSection("PubSub"));
|
||||||
|
services.AddPrimitiveManager();
|
||||||
|
services.AddSpark(config.GetSection("Spark"));
|
||||||
|
services.AddSparkd(config.GetSection("SparkdCredentials"));
|
||||||
|
services.AddHostedService<DataStreamWebAppService>();
|
||||||
|
}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
{
|
||||||
|
"$schema": "http://json.schemastore.org/launchsettings.json",
|
||||||
|
"profiles": {
|
||||||
|
"http": {
|
||||||
|
"commandName": "Project",
|
||||||
|
"dotnetRunMessages": true,
|
||||||
|
"launchBrowser": true,
|
||||||
|
"launchUrl": "swagger",
|
||||||
|
"applicationUrl": "http://localhost:5000",
|
||||||
|
"environmentVariables": {
|
||||||
|
"ASPNETCORE_ENVIRONMENT": "Development",
|
||||||
|
"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy",
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"https": {
|
||||||
|
"commandName": "Project",
|
||||||
|
"dotnetRunMessages": true,
|
||||||
|
"launchBrowser": true,
|
||||||
|
"applicationUrl": "http://localhost:5000;https://localhost:5001",
|
||||||
|
"environmentVariables": {
|
||||||
|
"ASPNETCORE_ENVIRONMENT": "Development",
|
||||||
|
"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy",
|
||||||
|
}
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
namespace Bts.DataStreamWebApp.Server.Services;
|
||||||
|
|
||||||
|
using BCG;
|
||||||
|
using BCG.Utilities.General;
|
||||||
|
|
||||||
|
using bts;
|
||||||
|
using bts.api.core;
|
||||||
|
|
||||||
|
using Bts.DataStreamExpressions;
|
||||||
|
|
||||||
|
using Microsoft.Extensions.Hosting;
|
||||||
|
using Microsoft.Extensions.Options;
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text.Json;
|
||||||
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// An IHostedService wrapper for ViewStream publishers. It provides a way for the Application to
|
||||||
|
/// start/stop the view publishers.
|
||||||
|
/// </summary>
|
||||||
|
class DataStreamWebAppService : IHostedService {
|
||||||
|
readonly DataStreamWebAppServerConfig config;
|
||||||
|
readonly ViewStreamDatabase vsd;
|
||||||
|
readonly TaskCompletionSource taskCompletionSource = new();
|
||||||
|
readonly CancellationTokenSource cancellationTokenSource = new();
|
||||||
|
|
||||||
|
public DataStreamWebAppService(
|
||||||
|
ViewStreamDatabase vsd,
|
||||||
|
IOptions<DataStreamWebAppServerConfig> config
|
||||||
|
) {
|
||||||
|
this.vsd = vsd;
|
||||||
|
this.config = config.Value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task StartAsync(CancellationToken cancellationToken) {
|
||||||
|
// Task.Factory.StartNew(Run, cancellationToken, TaskCreationOptions.LongRunning, TaskScheduler.Default);
|
||||||
|
return Task.CompletedTask;
|
||||||
|
|
||||||
|
// void Run() {
|
||||||
|
// Log.Gen.info("DataStreamWebAppService STARTED");
|
||||||
|
// var defaultWaitTime = TimeSpan.FromMilliseconds(100);
|
||||||
|
// var innerCancellationToken = cancellationTokenSource.Token;
|
||||||
|
// var psConfig = config.PubSub ?? throw new InvalidOperationException("PubSub config is null");
|
||||||
|
// while (!innerCancellationToken.IsCancellationRequested) {
|
||||||
|
// vsd.doWork();
|
||||||
|
// masterWorker.doWork();
|
||||||
|
// Thread.Sleep(defaultWaitTime);
|
||||||
|
// }
|
||||||
|
// Log.Gen.info("DataStreamWebAppService STOPPED");
|
||||||
|
// taskCompletionSource.SetResult();
|
||||||
|
// }
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task StopAsync(CancellationToken cancellationToken) {
|
||||||
|
Log.Gen.info("Stopping DataStreamWebAppService");
|
||||||
|
cancellationTokenSource.Cancel();
|
||||||
|
return Task.CompletedTask;
|
||||||
|
// return taskCompletionSource.Task;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
"WebServer": {
|
||||||
|
"ContentRootPath": "build/Bts.DataStreamWebApp.Client/production",
|
||||||
|
"WebRootPath": "dist"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
{
|
||||||
|
"Logging": {
|
||||||
|
"LogLevel": {
|
||||||
|
"Default": "Information",
|
||||||
|
"Microsoft.AspNetCore": "Warning"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"AllowedHosts": "*",
|
||||||
|
"Spark": {
|
||||||
|
"ConfigServer": "http://localhost:8000/config"
|
||||||
|
},
|
||||||
|
"SparkdCredentials": {
|
||||||
|
"User": "bts",
|
||||||
|
"Password": ""
|
||||||
|
},
|
||||||
|
"MasterWorker": {
|
||||||
|
"Interval": "00:00:00.1"
|
||||||
|
},
|
||||||
|
"PubSub": {
|
||||||
|
"Routing": {
|
||||||
|
"PublisherRoutes": [
|
||||||
|
{
|
||||||
|
"Name": "default",
|
||||||
|
"ServerAddress": "bts-cloud://127.0.0.1:12345",
|
||||||
|
"TagRegExp": ".*"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"SubscriberRoutes": [
|
||||||
|
{
|
||||||
|
"Name": "default",
|
||||||
|
"ServerAddress": "bts-cloud://127.0.0.1:12345",
|
||||||
|
"TagRegExp": ".*"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"ViewStreamDatabase": {
|
||||||
|
"Interval": "00:00:01"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,168 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8" />
|
||||||
|
<title></title>
|
||||||
|
<style>
|
||||||
|
table {
|
||||||
|
border: 0
|
||||||
|
}
|
||||||
|
|
||||||
|
.commslog-data {
|
||||||
|
font-family: Consolas, Courier New, Courier, monospace;
|
||||||
|
}
|
||||||
|
|
||||||
|
.commslog-server {
|
||||||
|
background-color: red;
|
||||||
|
color: white
|
||||||
|
}
|
||||||
|
|
||||||
|
.commslog-client {
|
||||||
|
background-color: green;
|
||||||
|
color: white
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<h1>ALT WebSocket Sample Application</h1>
|
||||||
|
<p id="stateLabel">Ready to connect...</p>
|
||||||
|
<div>
|
||||||
|
<label for="connectionUrl">WebSocket Server URL:</label>
|
||||||
|
<input id="connectionUrl" />
|
||||||
|
<button id="connectButton" type="submit">Connect</button>
|
||||||
|
</div>
|
||||||
|
<p></p>
|
||||||
|
<div>
|
||||||
|
<label for="sendMessage">Message to send:</label>
|
||||||
|
<input id="sendMessage" disabled />
|
||||||
|
<button id="sendButton" type="submit" disabled>Send</button>
|
||||||
|
<button id="closeButton" disabled>Close Socket</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<h2>Communication Log</h2>
|
||||||
|
<table style="width: 800px">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<td style="width: 100px">From</td>
|
||||||
|
<td style="width: 100px">To</td>
|
||||||
|
<td>Data</td>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody id="commsLog">
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
var connectionUrl = document.getElementById("connectionUrl");
|
||||||
|
var connectButton = document.getElementById("connectButton");
|
||||||
|
var stateLabel = document.getElementById("stateLabel");
|
||||||
|
var sendMessage = document.getElementById("sendMessage");
|
||||||
|
var sendButton = document.getElementById("sendButton");
|
||||||
|
var commsLog = document.getElementById("commsLog");
|
||||||
|
var closeButton = document.getElementById("closeButton");
|
||||||
|
var socket;
|
||||||
|
|
||||||
|
var scheme = document.location.protocol === "https:" ? "wss" : "ws";
|
||||||
|
var port = document.location.port ? (":" + document.location.port) : "";
|
||||||
|
|
||||||
|
connectionUrl.value = scheme + "://" + document.location.hostname + port + "/ws" ;
|
||||||
|
|
||||||
|
function updateState() {
|
||||||
|
function disable() {
|
||||||
|
sendMessage.disabled = true;
|
||||||
|
sendButton.disabled = true;
|
||||||
|
closeButton.disabled = true;
|
||||||
|
}
|
||||||
|
function enable() {
|
||||||
|
sendMessage.disabled = false;
|
||||||
|
sendButton.disabled = false;
|
||||||
|
closeButton.disabled = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
connectionUrl.disabled = true;
|
||||||
|
connectButton.disabled = true;
|
||||||
|
|
||||||
|
if (!socket) {
|
||||||
|
disable();
|
||||||
|
} else {
|
||||||
|
switch (socket.readyState) {
|
||||||
|
case WebSocket.CLOSED:
|
||||||
|
stateLabel.innerHTML = "Closed";
|
||||||
|
disable();
|
||||||
|
connectionUrl.disabled = false;
|
||||||
|
connectButton.disabled = false;
|
||||||
|
break;
|
||||||
|
case WebSocket.CLOSING:
|
||||||
|
stateLabel.innerHTML = "Closing...";
|
||||||
|
disable();
|
||||||
|
break;
|
||||||
|
case WebSocket.CONNECTING:
|
||||||
|
stateLabel.innerHTML = "Connecting...";
|
||||||
|
disable();
|
||||||
|
break;
|
||||||
|
case WebSocket.OPEN:
|
||||||
|
stateLabel.innerHTML = "Open";
|
||||||
|
enable();
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
stateLabel.innerHTML = "Unknown WebSocket State: " + htmlEscape(socket.readyState);
|
||||||
|
disable();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
closeButton.onclick = function () {
|
||||||
|
if (!socket || socket.readyState !== WebSocket.OPEN) {
|
||||||
|
alert("socket not connected");
|
||||||
|
}
|
||||||
|
socket.close(1000, "Closing from client");
|
||||||
|
};
|
||||||
|
|
||||||
|
sendButton.onclick = function () {
|
||||||
|
if (!socket || socket.readyState !== WebSocket.OPEN) {
|
||||||
|
alert("socket not connected");
|
||||||
|
}
|
||||||
|
var data = sendMessage.value;
|
||||||
|
socket.send(data);
|
||||||
|
commsLog.innerHTML += '<tr>' +
|
||||||
|
'<td class="commslog-client">Client</td>' +
|
||||||
|
'<td class="commslog-server">Server</td>' +
|
||||||
|
'<td class="commslog-data">' + htmlEscape(data) + '</td></tr>';
|
||||||
|
};
|
||||||
|
|
||||||
|
connectButton.onclick = function() {
|
||||||
|
stateLabel.innerHTML = "Connecting";
|
||||||
|
socket = new WebSocket(connectionUrl.value);
|
||||||
|
socket.onopen = function (event) {
|
||||||
|
updateState();
|
||||||
|
commsLog.innerHTML += '<tr>' +
|
||||||
|
'<td colspan="3" class="commslog-data">Connection opened</td>' +
|
||||||
|
'</tr>';
|
||||||
|
};
|
||||||
|
socket.onclose = function (event) {
|
||||||
|
updateState();
|
||||||
|
commsLog.innerHTML += '<tr>' +
|
||||||
|
'<td colspan="3" class="commslog-data">Connection closed. Code: ' + htmlEscape(event.code) + '. Reason: ' + htmlEscape(event.reason) + '</td>' +
|
||||||
|
'</tr>';
|
||||||
|
};
|
||||||
|
socket.onerror = updateState;
|
||||||
|
socket.onmessage = function (event) {
|
||||||
|
commsLog.innerHTML += '<tr>' +
|
||||||
|
'<td class="commslog-server">Server</td>' +
|
||||||
|
'<td class="commslog-client">Client</td>' +
|
||||||
|
'<td class="commslog-data">' + htmlEscape(event.data) + '</td></tr>';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
function htmlEscape(str) {
|
||||||
|
return str.toString()
|
||||||
|
.replace(/&/g, '&')
|
||||||
|
.replace(/"/g, '"')
|
||||||
|
.replace(/'/g, ''')
|
||||||
|
.replace(/</g, '<')
|
||||||
|
.replace(/>/g, '>');
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 8.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
@@ -0,0 +1,176 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8" />
|
||||||
|
<title></title>
|
||||||
|
<style>
|
||||||
|
table {
|
||||||
|
border: 0
|
||||||
|
}
|
||||||
|
|
||||||
|
.commslog-data {
|
||||||
|
font-family: Consolas, Courier New, Courier, monospace;
|
||||||
|
}
|
||||||
|
|
||||||
|
.commslog-server {
|
||||||
|
background-color: red;
|
||||||
|
color: white
|
||||||
|
}
|
||||||
|
|
||||||
|
.commslog-client {
|
||||||
|
background-color: green;
|
||||||
|
color: white
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<h1>DataStreams via WebSocket</h1>
|
||||||
|
<p id="stateLabel">Ready to connect...</p>
|
||||||
|
<div>
|
||||||
|
<label for="connectionUrl">WebSocket Server URL:</label>
|
||||||
|
<input id="connectionUrl" />
|
||||||
|
<button id="connectButton" type="submit">Connect</button>
|
||||||
|
</div>
|
||||||
|
<p></p>
|
||||||
|
<div>
|
||||||
|
<label for="sendMessage">Query:</label>
|
||||||
|
<input id="sendMessage" disabled />
|
||||||
|
<button id="sendButton" type="submit" disabled>Send</button>
|
||||||
|
<button id="closeButton" disabled>Close Socket</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<h2>Communication Log</h2>
|
||||||
|
<table style="width: 800px">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<td style="width: 100px">From</td>
|
||||||
|
<td style="width: 100px">To</td>
|
||||||
|
<td>Data</td>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody id="commsLog">
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
var connectionUrl = document.getElementById("connectionUrl");
|
||||||
|
var connectButton = document.getElementById("connectButton");
|
||||||
|
var stateLabel = document.getElementById("stateLabel");
|
||||||
|
var sendMessage = document.getElementById("sendMessage");
|
||||||
|
var sendButton = document.getElementById("sendButton");
|
||||||
|
var commsLog = document.getElementById("commsLog");
|
||||||
|
var closeButton = document.getElementById("closeButton");
|
||||||
|
var socket;
|
||||||
|
|
||||||
|
var scheme = document.location.protocol === "https:" ? "wss" : "ws";
|
||||||
|
var port = document.location.port ? (":" + document.location.port) : "";
|
||||||
|
|
||||||
|
connectionUrl.value = scheme + "://" + document.location.hostname + port + "/ws" ;
|
||||||
|
|
||||||
|
function updateState() {
|
||||||
|
function disable() {
|
||||||
|
sendMessage.disabled = true;
|
||||||
|
sendButton.disabled = true;
|
||||||
|
closeButton.disabled = true;
|
||||||
|
}
|
||||||
|
function enable() {
|
||||||
|
sendMessage.disabled = false;
|
||||||
|
sendButton.disabled = false;
|
||||||
|
closeButton.disabled = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
connectionUrl.disabled = true;
|
||||||
|
connectButton.disabled = true;
|
||||||
|
|
||||||
|
if (!socket) {
|
||||||
|
disable();
|
||||||
|
} else {
|
||||||
|
switch (socket.readyState) {
|
||||||
|
case WebSocket.CLOSED:
|
||||||
|
stateLabel.innerHTML = "Closed";
|
||||||
|
disable();
|
||||||
|
connectionUrl.disabled = false;
|
||||||
|
connectButton.disabled = false;
|
||||||
|
break;
|
||||||
|
case WebSocket.CLOSING:
|
||||||
|
stateLabel.innerHTML = "Closing...";
|
||||||
|
disable();
|
||||||
|
break;
|
||||||
|
case WebSocket.CONNECTING:
|
||||||
|
stateLabel.innerHTML = "Connecting...";
|
||||||
|
disable();
|
||||||
|
break;
|
||||||
|
case WebSocket.OPEN:
|
||||||
|
stateLabel.innerHTML = "Open";
|
||||||
|
enable();
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
stateLabel.innerHTML = "Unknown WebSocket State: " + htmlEscape(socket.readyState);
|
||||||
|
disable();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
closeButton.onclick = function () {
|
||||||
|
if (!socket || socket.readyState !== WebSocket.OPEN) {
|
||||||
|
alert("socket not connected");
|
||||||
|
}
|
||||||
|
socket.close(1000, "Closing from client");
|
||||||
|
};
|
||||||
|
|
||||||
|
sendButton.onclick = function () {
|
||||||
|
if (!socket || socket.readyState !== WebSocket.OPEN) {
|
||||||
|
alert("socket not connected");
|
||||||
|
}
|
||||||
|
const rpcReq = {
|
||||||
|
jsonrpc: "2.0",
|
||||||
|
method: "subscribe",
|
||||||
|
params: {
|
||||||
|
query: sendMessage.value,
|
||||||
|
},
|
||||||
|
id: 1,
|
||||||
|
};
|
||||||
|
const rpcReqStr = JSON.stringify(rpcReq);
|
||||||
|
socket.send(rpcReqStr);
|
||||||
|
commsLog.innerHTML += '<tr>' +
|
||||||
|
'<td class="commslog-client">Client</td>' +
|
||||||
|
'<td class="commslog-server">Server</td>' +
|
||||||
|
'<td class="commslog-data">' + htmlEscape(rpcReqStr) + '</td></tr>';
|
||||||
|
};
|
||||||
|
|
||||||
|
connectButton.onclick = function() {
|
||||||
|
stateLabel.innerHTML = "Connecting";
|
||||||
|
socket = new WebSocket(connectionUrl.value);
|
||||||
|
socket.onopen = function (event) {
|
||||||
|
updateState();
|
||||||
|
commsLog.innerHTML += '<tr>' +
|
||||||
|
'<td colspan="3" class="commslog-data">Connection opened</td>' +
|
||||||
|
'</tr>';
|
||||||
|
};
|
||||||
|
socket.onclose = function (event) {
|
||||||
|
updateState();
|
||||||
|
commsLog.innerHTML += '<tr>' +
|
||||||
|
'<td colspan="3" class="commslog-data">Connection closed. Code: ' + htmlEscape(event.code) + '. Reason: ' + htmlEscape(event.reason) + '</td>' +
|
||||||
|
'</tr>';
|
||||||
|
};
|
||||||
|
socket.onerror = updateState;
|
||||||
|
socket.onmessage = function (event) {
|
||||||
|
commsLog.innerHTML += '<tr>' +
|
||||||
|
'<td class="commslog-server">Server</td>' +
|
||||||
|
'<td class="commslog-client">Client</td>' +
|
||||||
|
'<td class="commslog-data">' + htmlEscape(event.data) + '</td></tr>';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
function htmlEscape(str) {
|
||||||
|
return str.toString()
|
||||||
|
.replace(/&/g, '&')
|
||||||
|
.replace(/"/g, '"')
|
||||||
|
.replace(/'/g, ''')
|
||||||
|
.replace(/</g, '<')
|
||||||
|
.replace(/>/g, '>');
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
+13
@@ -0,0 +1,13 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>net7.0</TargetFramework>
|
||||||
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
namespace Bts.Extensions.DependencyInjection;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// This interface provides a way to move dependencies outside of the constructor (and accept them
|
||||||
|
/// via <see cref="IDependOn{T}.Reset(T?)"/> instead). It was designed to resolve circular
|
||||||
|
/// dependency issues among startup services.
|
||||||
|
/// </summary>
|
||||||
|
/// <typeparam name="T">The type of dependency</typeparam>
|
||||||
|
public interface IDependOn<T> {
|
||||||
|
void Reset(T? value);
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
#nullable enable
|
||||||
|
namespace Bts.Extensions.DependencyInjection;
|
||||||
|
|
||||||
|
public interface IDependOnKeyed<T> : IDependOn<T> {
|
||||||
|
string Key { get; }
|
||||||
|
}
|
||||||
+130
@@ -0,0 +1,130 @@
|
|||||||
|
namespace Bts.Extensions.DependencyInjection;
|
||||||
|
|
||||||
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
|
using Microsoft.Extensions.Hosting;
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Linq;
|
||||||
|
|
||||||
|
public static class ServiceCollectionExtensions {
|
||||||
|
/// <summary>
|
||||||
|
/// Adds a singleton service only if a service of type <typeparamref name="T"/> hasn't been added
|
||||||
|
/// already.
|
||||||
|
/// </summary>
|
||||||
|
/// <typeparam name="T"></typeparam>
|
||||||
|
/// <param name="services"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static IServiceCollection EnsureSingleton<T>(this IServiceCollection services) where T : class =>
|
||||||
|
services.HasService<T>()
|
||||||
|
? services
|
||||||
|
: services.AddSingleton<T>();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Adds a singleton service only if a service of type <typeparamref name="T"/> hasn't been added
|
||||||
|
/// already.
|
||||||
|
/// </summary>
|
||||||
|
/// <typeparam name="T"></typeparam>
|
||||||
|
/// <param name="services"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static IServiceCollection EnsureSingleton<T>(this IServiceCollection services, Func<IServiceProvider, T> implementationFactory) where T : class =>
|
||||||
|
services.HasService<T>()
|
||||||
|
? services
|
||||||
|
: services.AddSingleton(implementationFactory);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Adds a singleton service only if a service of type <typeparamref name="T"/> hasn't been added
|
||||||
|
/// already.
|
||||||
|
/// </summary>
|
||||||
|
/// <typeparam name="T">The type of the service to add.</typeparam>
|
||||||
|
/// <typeparam name="TImplementation">The type of the implementation to use.</typeparam>
|
||||||
|
/// <param name="services">The <see cref="IServiceCollection"/> to add the service to.</param>
|
||||||
|
/// <returns>A reference to this instance after the operation has completed.</returns>
|
||||||
|
public static IServiceCollection EnsureSingleton<T, TImplementation>(this IServiceCollection services) where T : class where TImplementation : class, T =>
|
||||||
|
services.HasService<T>()
|
||||||
|
? services
|
||||||
|
: services.AddSingleton<T, TImplementation>();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Adds a singleton service only if a service of type <typeparamref name="T"/> hasn't been added
|
||||||
|
/// already.
|
||||||
|
/// </summary>
|
||||||
|
/// <typeparam name="T">The type of the service to add.</typeparam>
|
||||||
|
/// <param name="services">The <see cref="IServiceCollection"/> to add the service to.</param>
|
||||||
|
/// <returns>A reference to this instance after the operation has completed.</returns>
|
||||||
|
public static IServiceCollection EnsureSingleton<T>(this IServiceCollection services, Func<IServiceProvider, object?, T> implementationFactory) where T : class =>
|
||||||
|
services.HasService<T>()
|
||||||
|
? services
|
||||||
|
: services.AddSingleton(implementationFactory);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Adds a singleton service only if a service of type <typeparamref name="T"/> hasn't been added
|
||||||
|
/// already.
|
||||||
|
/// </summary>
|
||||||
|
/// <typeparam name="T">The type of the service to add.</typeparam>
|
||||||
|
/// <typeparam name="TImplementation">The type of the implementation to use.</typeparam>
|
||||||
|
/// <param name="services">The <see cref="IServiceCollection"/> to add the service to.</param>
|
||||||
|
/// <returns>A reference to this instance after the operation has completed.</returns>
|
||||||
|
public static IServiceCollection EnsureSingleton<T, TImplementation>(this IServiceCollection services, Func<IServiceProvider, TImplementation> implementationFactory) where T : class where TImplementation : class, T =>
|
||||||
|
services.HasService<T>()
|
||||||
|
? services
|
||||||
|
: services.AddSingleton(implementationFactory);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Adds a singleton service only if a service of type <typeparamref name="T"/> hasn't been added
|
||||||
|
/// already.
|
||||||
|
/// </summary>
|
||||||
|
/// <typeparam name="T">The type of the service to add.</typeparam>
|
||||||
|
/// <param name="services">The <see cref="IServiceCollection"/> to add the service to.</param>
|
||||||
|
/// <returns>A reference to this instance after the operation has completed.</returns>
|
||||||
|
public static IServiceCollection EnsureKeyedSingleton<T>(this IServiceCollection services, object? key) where T : class =>
|
||||||
|
services.HasKeyedService<T>(key)
|
||||||
|
? services
|
||||||
|
: services.AddKeyedSingleton<T>(key);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Adds a singleton service only if a service of type <typeparamref name="T"/> hasn't been added
|
||||||
|
/// already.
|
||||||
|
/// </summary>
|
||||||
|
/// <typeparam name="T">The type of the service to add.</typeparam>
|
||||||
|
/// <param name="services">The <see cref="IServiceCollection"/> to add the service to.</param>
|
||||||
|
/// <param name="implementationFactory">The factory that creates the service.</param>
|
||||||
|
/// <returns>A reference to this instance after the operation has completed.</returns>
|
||||||
|
public static IServiceCollection EnsureKeyedSingleton<T>(this IServiceCollection services, object? key, Func<IServiceProvider, object?, T> implementationFactory) where T : class =>
|
||||||
|
services.HasKeyedService<T>(key)
|
||||||
|
? services
|
||||||
|
: services.AddKeyedSingleton(key, implementationFactory);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Adds a singleton service only if a service of type <typeparamref name="T"/> hasn't been added
|
||||||
|
/// already.
|
||||||
|
/// </summary>
|
||||||
|
/// <typeparam name="T">The type of the service to add.</typeparam>
|
||||||
|
/// <param name="services">The <see cref="IServiceCollection"/> to add the service to.</param>
|
||||||
|
/// <returns>A reference to this instance after the operation has completed.</returns>
|
||||||
|
public static IServiceCollection EnsureHostedService<T>(this IServiceCollection services) where T : class, IHostedService =>
|
||||||
|
services.HasService<T>()
|
||||||
|
? services
|
||||||
|
: services.AddHostedService<T>();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Adds a singleton service only if a service of type <typeparamref name="T"/> hasn't been added
|
||||||
|
/// already.
|
||||||
|
/// </summary>
|
||||||
|
/// <typeparam name="T">The type of the service to add.</typeparam>
|
||||||
|
/// <param name="services">The <see cref="IServiceCollection"/> to add the service to.</param>
|
||||||
|
/// <param name="implementationFactory">The factory that creates the service.</param>
|
||||||
|
/// <returns>A reference to this instance after the operation has completed.</returns>
|
||||||
|
public static IServiceCollection EnsureHostedService<T>(this IServiceCollection services, Func<IServiceProvider, T> implementationFactory) where T : class, IHostedService =>
|
||||||
|
services.HasService<T>()
|
||||||
|
? services
|
||||||
|
: services.AddHostedService(implementationFactory);
|
||||||
|
|
||||||
|
public static bool HasService<T>(this IServiceCollection services) =>
|
||||||
|
services.Any(s => s.ServiceType.IsAssignableTo(typeof(T)));
|
||||||
|
|
||||||
|
public static bool HasServiceImplementation<T, TImplementation>(this IServiceCollection services) =>
|
||||||
|
services.Any(s => s.ServiceType.IsAssignableTo(typeof(T)) && s.ImplementationType == typeof(TImplementation));
|
||||||
|
|
||||||
|
public static bool HasKeyedService<T>(this IServiceCollection services, object? key) =>
|
||||||
|
services.Any(s => Equals(s.ServiceKey, key) && s.ServiceType.IsAssignableTo(typeof(T)));
|
||||||
|
}
|
||||||
@@ -14,15 +14,13 @@
|
|||||||
<ProjectReference Include="..\DataStreamCore\DataStreamCore.csproj" />
|
<ProjectReference Include="..\DataStreamCore\DataStreamCore.csproj" />
|
||||||
<ProjectReference Include="..\DataStreamExpressions\DataStreamExpressions.csproj" />
|
<ProjectReference Include="..\DataStreamExpressions\DataStreamExpressions.csproj" />
|
||||||
<ProjectReference Include="..\..\client\spark_core\spark_core.csproj" />
|
<ProjectReference Include="..\..\client\spark_core\spark_core.csproj" />
|
||||||
|
<ProjectReference Include="..\Bts.Extensions.DependencyInjection\Bts.Extensions.DependencyInjection.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="HtmlAgilityPack" Version="1.11.57" />
|
<PackageReference Include="HtmlAgilityPack" Version="1.11.57" />
|
||||||
<PackageReference Include="Microsoft.Data.Analysis" Version="0.21.1" />
|
|
||||||
<PackageReference Include="MongoDB.Bson" Version="2.23.1" />
|
<PackageReference Include="MongoDB.Bson" Version="2.23.1" />
|
||||||
<PackageReference Include="MongoDB.Driver" Version="2.23.1" />
|
<PackageReference Include="MongoDB.Driver" Version="2.23.1" />
|
||||||
<PackageReference Include="Parquet.Net" Version="5.0.1" />
|
|
||||||
<PackageReference Include="System.Data.SQLite" Version="1.0.118" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
namespace Bts.DataStream;
|
||||||
|
|
||||||
|
using BCG;
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
|
public class BoundImportAttribute {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public class DataStreamActivator {
|
||||||
|
Dictionary<string, Type> myTypeLookupTable = new();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Constructs and returns a ViewStream of type corresponding to the friendly name
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="friendlyName">friendly primitive name </param>
|
||||||
|
/// <param name="args">args can be null or an empty ICollection if the paramterless constructor
|
||||||
|
/// is the desired one</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public ViewStream Activate(string friendlyName, IList<object>? args) {
|
||||||
|
object[]? constructorArgs = null;
|
||||||
|
if (args != null && args.Count > 0) {
|
||||||
|
constructorArgs = new object[args.Count];
|
||||||
|
args.CopyTo(constructorArgs, 0);
|
||||||
|
}
|
||||||
|
if (!myTypeLookupTable.TryGetValue(friendlyName, out var type)) {
|
||||||
|
throw new ApplicationException(friendlyName + " is not the friendly name of any of the loaded types");
|
||||||
|
}
|
||||||
|
return constructorArgs is null ?
|
||||||
|
Activator.CreateInstance(myTypeLookupTable[friendlyName] as Type) as ViewStream :
|
||||||
|
Activator.CreateInstance(myTypeLookupTable[friendlyName] as Type, constructorArgs) as ViewStream;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
namespace Bts.DataStream;
|
||||||
|
|
||||||
|
using BCG;
|
||||||
|
|
||||||
|
public interface IViewStreamFactory {
|
||||||
|
public ViewStream? Create();
|
||||||
|
}
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
namespace bts.SilverPine {
|
|
||||||
using System;
|
|
||||||
using BCG;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using Bts.DataStreamExpressions;
|
|
||||||
|
|
||||||
// All this does is take in a dsl expression, parse it and fire the data that come out of running it.
|
|
||||||
// So for example, if an expresison is passed
|
|
||||||
[DataStreamUserRespresentation("dsl")]
|
|
||||||
public class DSLStream : ViewStream {
|
|
||||||
private readonly string _dsl;
|
|
||||||
public DSLStream(string dsl) {
|
|
||||||
Log.Gen.info($"DSLStream.cons dsl: {dsl}");
|
|
||||||
_dsl = dsl;
|
|
||||||
ViewStream rs = build_stream(dsl);
|
|
||||||
rs = rs ?? new LiteralStream("error", $"msg:invalid dsl \"{dsl}\"");
|
|
||||||
mySetRealSource(rs);
|
|
||||||
}
|
|
||||||
|
|
||||||
static ViewStream? build_stream(string stream_expression) {
|
|
||||||
try {
|
|
||||||
var exp = DataStreamExpressionsInterpreter.Evaluate(stream_expression);
|
|
||||||
var rv = exp.getView(new Dictionary<string, StatementExpression>(0));
|
|
||||||
return rv;
|
|
||||||
|
|
||||||
} catch (Exception ex) {
|
|
||||||
Log.Gen.error($"Could not build stream: {stream_expression} ex: {ex}");
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -11,11 +11,8 @@ public class PandasScriptStream : ViewStream {
|
|||||||
public PandasScriptStream(ViewStream vs, string file)
|
public PandasScriptStream(ViewStream vs, string file)
|
||||||
: this(vs, file, null) { }
|
: this(vs, file, null) { }
|
||||||
|
|
||||||
public PandasScriptStream(ViewStream vs, string file, string? pythonExe)
|
public PandasScriptStream(ViewStream vs, string file, string? pythonExe) {
|
||||||
: this(vs, file, pythonExe, ViewStreamDatabase.instance) { }
|
mySetRealSource(AttachStream<PandasStream>(new(vs, readFile(), pythonExe)));
|
||||||
|
|
||||||
public PandasScriptStream(ViewStream vs, string file, string? pythonExe, ViewStreamDatabase vsd) {
|
|
||||||
mySetRealSource(new PandasStream(vs, readFile(), pythonExe, vsd));
|
|
||||||
|
|
||||||
string readFile() {
|
string readFile() {
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
namespace Bts.DataStream;
|
namespace Bts.DataStream;
|
||||||
|
|
||||||
using BCG;
|
using BCG;
|
||||||
using BCG.Extensions;
|
|
||||||
using BCG.Utilities.General;
|
using BCG.Utilities.General;
|
||||||
|
|
||||||
using bts;
|
using bts;
|
||||||
@@ -23,7 +22,6 @@ public class PandasStream : ViewStream, IWorker {
|
|||||||
readonly string inputFile = $"PandasStream_{Guid.NewGuid()}.csv";
|
readonly string inputFile = $"PandasStream_{Guid.NewGuid()}.csv";
|
||||||
readonly string outputFile = $"PandasStream_{Guid.NewGuid()}.csv";
|
readonly string outputFile = $"PandasStream_{Guid.NewGuid()}.csv";
|
||||||
readonly string pythonExe;
|
readonly string pythonExe;
|
||||||
readonly ViewStreamDatabase vsd;
|
|
||||||
readonly CSVSaverStream inputCsvStream;
|
readonly CSVSaverStream inputCsvStream;
|
||||||
readonly Lazy<string> pythonCode;
|
readonly Lazy<string> pythonCode;
|
||||||
IDictionary<int, IBlueRow>? lastRowMap = null;
|
IDictionary<int, IBlueRow>? lastRowMap = null;
|
||||||
@@ -34,12 +32,11 @@ public class PandasStream : ViewStream, IWorker {
|
|||||||
IDisposable? dispose;
|
IDisposable? dispose;
|
||||||
|
|
||||||
public PandasStream(ViewStream vs, string dataFrameExpression)
|
public PandasStream(ViewStream vs, string dataFrameExpression)
|
||||||
: this(vs, dataFrameExpression, null, ViewStreamDatabase.instance) { }
|
: this(vs, dataFrameExpression, null) { }
|
||||||
|
|
||||||
public PandasStream(ViewStream vs, string dataFrameExpression, string? pythonExe, ViewStreamDatabase vsd) {
|
public PandasStream(ViewStream vs, string dataFrameExpression, string? pythonExe) {
|
||||||
pythonExe ??= Environment.GetEnvironmentVariable("PYTHON_EXE") ?? @"C:\Users\johnc\GoogleDrive\Repos\bts\spark\.venv\Scripts\python.exe";
|
pythonExe ??= Environment.GetEnvironmentVariable("PYTHON_EXE") ?? @"C:\Users\johnc\GoogleDrive\Repos\bts\spark\.venv\Scripts\python.exe";
|
||||||
this.pythonExe = pythonExe;
|
this.pythonExe = pythonExe;
|
||||||
this.vsd = vsd;
|
|
||||||
// This should fire an update when it writes to the output file
|
// This should fire an update when it writes to the output file
|
||||||
inputCsvStream = new CSVSaverStream(vs, inputFile, true, int.MaxValue, true);
|
inputCsvStream = new CSVSaverStream(vs, inputFile, true, int.MaxValue, true);
|
||||||
pythonCode = new(getPythonCode);
|
pythonCode = new(getPythonCode);
|
||||||
@@ -59,7 +56,7 @@ import sys
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected override void myOnFirstSubscriber() {
|
protected override void myOnFirstSubscriber() {
|
||||||
vsd.addWorker(this);
|
base.myOnFirstSubscriber();
|
||||||
inputCsvStream.onChange += onInputChanged;
|
inputCsvStream.onChange += onInputChanged;
|
||||||
this.dispose = Disposable.Create(dispose);
|
this.dispose = Disposable.Create(dispose);
|
||||||
|
|
||||||
@@ -68,7 +65,6 @@ import sys
|
|||||||
|
|
||||||
void dispose() {
|
void dispose() {
|
||||||
inputCsvStream.onChange -= onInputChanged;
|
inputCsvStream.onChange -= onInputChanged;
|
||||||
vsd.removeWorker(this);
|
|
||||||
deleteFile(inputFile);
|
deleteFile(inputFile);
|
||||||
deleteFile(outputFile);
|
deleteFile(outputFile);
|
||||||
}
|
}
|
||||||
@@ -85,8 +81,10 @@ import sys
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void myOnLastSubscriber() =>
|
protected override void myOnLastSubscriber() {
|
||||||
|
base.myOnLastSubscriber();
|
||||||
Disposable.dispose(ref dispose);
|
Disposable.dispose(ref dispose);
|
||||||
|
}
|
||||||
|
|
||||||
static void executePythonCode(string pythonCode, string? pythonExe = null) {
|
static void executePythonCode(string pythonCode, string? pythonExe = null) {
|
||||||
pythonExe ??= "python";
|
pythonExe ??= "python";
|
||||||
|
|||||||
@@ -1,16 +1,19 @@
|
|||||||
using BCG.Utilities.General;
|
using BCG.Utilities.General;
|
||||||
|
|
||||||
|
using Bts.PubSub;
|
||||||
|
|
||||||
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
|
|
||||||
namespace BCG {
|
namespace BCG {
|
||||||
public class TCPConnectionTestStream : ViewStream, IWorker, ITCPConnectionHandler, ITCPMessageHandler {
|
public class TCPConnectionTestStream : ViewStream, IParameterizedWorker, ITCPConnectionHandler, ITCPMessageHandler {
|
||||||
class State {
|
class State {
|
||||||
public int n_sends = 0;
|
public int n_sends = 0;
|
||||||
public int n_recvs = 0;
|
public int n_recvs = 0;
|
||||||
}
|
}
|
||||||
private readonly string _ip;
|
private readonly string _ip;
|
||||||
private readonly int _port;
|
private readonly int _port;
|
||||||
private readonly ViewStreamDatabase _vsd;
|
|
||||||
State _state = new State();
|
State _state = new State();
|
||||||
private readonly int _msg_size;
|
private readonly int _msg_size;
|
||||||
|
|
||||||
@@ -18,14 +21,12 @@ namespace BCG {
|
|||||||
private TimeSpan _send_period;
|
private TimeSpan _send_period;
|
||||||
private ITCPConnection _connection = null;
|
private ITCPConnection _connection = null;
|
||||||
private byte[] _buff;
|
private byte[] _buff;
|
||||||
|
WorkActivator workActivator;
|
||||||
public TCPConnectionTestStream(string ip, int port, int msg_size, int send_period_seconds) :
|
|
||||||
this(ip, port, msg_size, send_period_seconds, ViewStreamDatabase.instance) { }
|
public TCPConnectionTestStream(string ip, int port, int msg_size, int send_period_seconds) {
|
||||||
public TCPConnectionTestStream(string ip, int port, int msg_size, int send_period_seconds, ViewStreamDatabase vsd) {
|
|
||||||
_ip = ip;
|
_ip = ip;
|
||||||
_port = port;
|
_port = port;
|
||||||
_msg_size = msg_size;
|
_msg_size = msg_size;
|
||||||
_vsd = vsd;
|
|
||||||
_schema = BlueDataUtility.form_schema("TCPClient",
|
_schema = BlueDataUtility.form_schema("TCPClient",
|
||||||
Tuple.Create("id", TypeCode.Int32),
|
Tuple.Create("id", TypeCode.Int32),
|
||||||
Tuple.Create("n_sends", TypeCode.UInt32),
|
Tuple.Create("n_sends", TypeCode.UInt32),
|
||||||
@@ -35,16 +36,21 @@ namespace BCG {
|
|||||||
for (int i = 0; i < _buff.Length; i++) {
|
for (int i = 0; i < _buff.Length; i++) {
|
||||||
_buff[i] = (byte)i;
|
_buff[i] = (byte)i;
|
||||||
}
|
}
|
||||||
|
workActivator = new(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
TimeSpan IParameterizedWorker.Interval => _send_period;
|
||||||
|
|
||||||
|
protected override void OnServiceProvider(IServiceProvider serviceProvider) {
|
||||||
|
workActivator.OnWorkScheduler(serviceProvider.GetRequiredService<IWorkScheduler>());
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void myOnFirstSubscriber() {
|
protected override void myOnFirstSubscriber() {
|
||||||
MasterWorker.getInstance(false).addWorker(this, _send_period);
|
workActivator.Start();
|
||||||
var server_rci = new RemoteConnectionInfo(_ip, _port);
|
|
||||||
bts.AsyncTCPConnector_APM.connect_to(server_rci, this);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void myOnLastSubscriber() {
|
protected override void myOnLastSubscriber() {
|
||||||
MasterWorker.getInstance(false).removeWorker(this);
|
workActivator.Stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void doWork() {
|
public void doWork() {
|
||||||
@@ -60,20 +66,20 @@ namespace BCG {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void onConnection(ITCPConnection connection) {
|
public void onConnection(ITCPConnection connection) {
|
||||||
_connection = connection;
|
_connection = connection;
|
||||||
_connection.register(this);
|
_connection.register(this);
|
||||||
}
|
}
|
||||||
public bool isDisposed { get; }
|
public bool isDisposed { get; }
|
||||||
|
|
||||||
public void onData(RemoteMessage msg) {
|
public void onData(RemoteMessage msg) {
|
||||||
bts.Log.Gen.info($"TCPConnectionTestStream received msg: {msg}");
|
bts.Log.Gen.info($"TCPConnectionTestStream received msg: {msg}");
|
||||||
_state.n_recvs++;
|
_state.n_recvs++;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Dispose() {
|
public void Dispose() {
|
||||||
|
workActivator.Stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2,13 +2,14 @@ using System;
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
|
||||||
using Bts.DataStreamExpressions;
|
using Bts.DataStreamExpressions;
|
||||||
using BCG.Utilities.General;
|
|
||||||
using bts;
|
using bts;
|
||||||
|
using Bts.DataStreamCore;
|
||||||
|
using Bts.PubSub;
|
||||||
|
|
||||||
namespace BCG {
|
namespace BCG {
|
||||||
// listens to the requests posted on "cloud_streams" request table, and
|
// listens to the requests posted on "cloud_streams" request table, and
|
||||||
// if unfulfilled starts a ViewPubsliher
|
// if unfulfilled starts a ViewPubsliher
|
||||||
public class RemoteQueryManager : IWorker {
|
public class RemoteQueryManager : IParameterizedWorker {
|
||||||
public class StreamPubUnit {
|
public class StreamPubUnit {
|
||||||
public string name;
|
public string name;
|
||||||
public string stream_expression;
|
public string stream_expression;
|
||||||
@@ -24,12 +25,13 @@ namespace BCG {
|
|||||||
view_publisher = view_publisher_;
|
view_publisher = view_publisher_;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
static ViewStream? build_stream(string stream_expression)
|
static ViewStream? build_stream(string stream_expression, PrimitiveManager primitiveManager, IServiceProvider serviceProvider)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var exp = DataStreamExpressionsInterpreter.Evaluate(stream_expression);
|
var exp = DataStreamExpressionsInterpreter.Evaluate(stream_expression);
|
||||||
var rv = exp.getView(new Dictionary<string, StatementExpression>(0));
|
var rv = exp.getView(new Dictionary<string, StatementExpression>(0), primitiveManager);
|
||||||
|
rv?.Reset(serviceProvider);
|
||||||
return rv;
|
return rv;
|
||||||
|
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
@@ -40,17 +42,25 @@ namespace BCG {
|
|||||||
private IDictionary<string, StreamPubUnit>
|
private IDictionary<string, StreamPubUnit>
|
||||||
_stream_pub_map = new Dictionary<string, StreamPubUnit>();
|
_stream_pub_map = new Dictionary<string, StreamPubUnit>();
|
||||||
private ViewStream _stream = new TableStream("cloud_streams");
|
private ViewStream _stream = new TableStream("cloud_streams");
|
||||||
private PubTableBroker _broker = new PubTableBroker();
|
readonly IPubTableBroker _broker;
|
||||||
private ManagedSubscriber _sub = ManagedSubscriber.instance;
|
private readonly ManagedSubscriber _sub;
|
||||||
|
readonly PrimitiveManager primitiveManager;
|
||||||
|
readonly IServiceProvider serviceProvider;
|
||||||
|
|
||||||
|
public RemoteQueryManager(ManagedSubscriber sub, IPubTableBroker broker, PrimitiveManager primitiveManager, IServiceProvider serviceProvider) {
|
||||||
public RemoteQueryManager() {
|
_sub = sub;
|
||||||
|
_broker = broker;
|
||||||
|
this.primitiveManager = primitiveManager;
|
||||||
|
this.serviceProvider = serviceProvider;
|
||||||
_stream.onChange += _on_str;
|
_stream.onChange += _on_str;
|
||||||
_sub.subscribe("RemoteRequest", (string tag, byte[] data) => {
|
_sub.subscribe("RemoteRequest", (string tag, byte[] data) => {
|
||||||
RemoteRequest req = RemoteRequest.construct_from_bytes(data);
|
RemoteRequest req = RemoteRequest.construct_from_bytes(data);
|
||||||
_spawn_remote_stream(req.published_table_name, req.stream_expression, false);
|
_spawn_remote_stream(req.published_table_name, req.stream_expression, false);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TimeSpan IParameterizedWorker.Interval => TimeSpan.FromSeconds(1);
|
||||||
|
|
||||||
private void _on_str(object obj)
|
private void _on_str(object obj)
|
||||||
{
|
{
|
||||||
if (obj is not DataPacket dp) {
|
if (obj is not DataPacket dp) {
|
||||||
@@ -69,7 +79,11 @@ namespace BCG {
|
|||||||
|
|
||||||
private void _spawn_remote_stream(string name, string stream_expression, bool persist) {
|
private void _spawn_remote_stream(string name, string stream_expression, bool persist) {
|
||||||
bts.Log.Gen.info($"CloudStreamManager.assign name: {name} stream_expression: {stream_expression}");
|
bts.Log.Gen.info($"CloudStreamManager.assign name: {name} stream_expression: {stream_expression}");
|
||||||
ViewStream stream = build_stream(stream_expression);
|
var stream = build_stream(stream_expression, primitiveManager, serviceProvider);
|
||||||
|
if (stream is null) {
|
||||||
|
Log.Gen.error($"Failed to spawn remote stream. stream_expression: {stream_expression}");
|
||||||
|
return;
|
||||||
|
}
|
||||||
_expose_to_ws(name, stream);
|
_expose_to_ws(name, stream);
|
||||||
if (persist) {
|
if (persist) {
|
||||||
stream = new PersistorStream(stream, name, "C:\\Temp\\", 1000000); // 10MBs
|
stream = new PersistorStream(stream, name, "C:\\Temp\\", 1000000); // 10MBs
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
using BCG;
|
|
||||||
|
|
||||||
using bts;
|
using bts;
|
||||||
|
|
||||||
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
|
|
||||||
namespace BCG {
|
namespace BCG {
|
||||||
@@ -9,7 +9,7 @@ namespace BCG {
|
|||||||
[DataStreamUserRespresentation("remoteQuery")]
|
[DataStreamUserRespresentation("remoteQuery")]
|
||||||
public class RemoteQueryStream : ViewStream {
|
public class RemoteQueryStream : ViewStream {
|
||||||
private readonly string _name, _stream_exp;
|
private readonly string _name, _stream_exp;
|
||||||
private PublisherCore _publisher_core = new PublisherCore();
|
IPublisherCore? _publisher_core_backing;
|
||||||
private ViewStream _source_str;
|
private ViewStream _source_str;
|
||||||
|
|
||||||
public RemoteQueryStream(params string[] lines) {
|
public RemoteQueryStream(params string[] lines) {
|
||||||
@@ -20,7 +20,14 @@ namespace BCG {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
IPublisherCore? _publisher_core =>
|
||||||
|
_publisher_core_backing ??= ServiceProvider?.GetService<IPublisherCore>();
|
||||||
|
|
||||||
protected override void myOnFirstSubscriber() {
|
protected override void myOnFirstSubscriber() {
|
||||||
|
if (_publisher_core is null) {
|
||||||
|
throw new InvalidOperationException(
|
||||||
|
"Unable to initialize PublisherStream because PublisherCore is null");
|
||||||
|
}
|
||||||
RemoteRequest rem_req = new RemoteRequest(_stream_exp, _name);
|
RemoteRequest rem_req = new RemoteRequest(_stream_exp, _name);
|
||||||
byte[] rem_req_bytes = rem_req.serialize();
|
byte[] rem_req_bytes = rem_req.serialize();
|
||||||
_publisher_core.publish("System", "RemoteRequest", rem_req_bytes);
|
_publisher_core.publish("System", "RemoteRequest", rem_req_bytes);
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ namespace BCG {
|
|||||||
|
|
||||||
public AddColumnsStream(ViewStream vs, string col_def) {
|
public AddColumnsStream(ViewStream vs, string col_def) {
|
||||||
_new_col = parse_exp(col_def);
|
_new_col = parse_exp(col_def);
|
||||||
ViewStream rs = new MapStream(vs, (IBlueTableSchema s) => _get_schema(s), (IBlueRow r) => _map(r));
|
ViewStream rs = AttachStream(new MapStream(vs, _get_schema, _map));
|
||||||
mySetRealSource(rs);
|
mySetRealSource(rs);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+9
-5
@@ -91,10 +91,14 @@ namespace BCG
|
|||||||
}
|
}
|
||||||
_increment_values = increment_values_del;
|
_increment_values = increment_values_del;
|
||||||
_get_column_prefix = get_column_prefix_del;
|
_get_column_prefix = get_column_prefix_del;
|
||||||
if(only_fire_once)
|
if(only_fire_once) {
|
||||||
mySetRealSource(new NonIncGroupByStream(new OnlyFireOnceStream(stream), this));
|
ViewStream vs = AttachStream(new OnlyFireOnceStream(stream));
|
||||||
else
|
vs = AttachStream(new NonIncGroupByStream(vs, this));
|
||||||
mySetRealSource(new NonIncGroupByStream(stream, this));
|
mySetRealSource(vs);
|
||||||
|
} else {
|
||||||
|
ViewStream vs = AttachStream(new NonIncGroupByStream(stream, this));
|
||||||
|
mySetRealSource(vs);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void _set_schema(List<string> tc_prefixes, Pair<string, Type>[] group_by_col_info, string table_name)
|
private void _set_schema(List<string> tc_prefixes, Pair<string, Type>[] group_by_col_info, string table_name)
|
||||||
@@ -241,4 +245,4 @@ namespace BCG
|
|||||||
return values;
|
return values;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -14,7 +14,7 @@ namespace BCG
|
|||||||
public CaseChangeStream(ViewStream input, bool toUpper, params string[] columnsToChangeCase)
|
public CaseChangeStream(ViewStream input, bool toUpper, params string[] columnsToChangeCase)
|
||||||
{
|
{
|
||||||
myCaseChangingColumns = columnsToChangeCase;
|
myCaseChangingColumns = columnsToChangeCase;
|
||||||
mySetRealSource(new SuperMapStream(input, this));
|
mySetRealSource(AttachStream(new SuperMapStream(input, this)));
|
||||||
myIsUpperCase = toUpper;
|
myIsUpperCase = toUpper;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -32,10 +32,10 @@ namespace BCG
|
|||||||
|
|
||||||
{
|
{
|
||||||
mySetRealSource (
|
mySetRealSource (
|
||||||
new MapStream (sourceStream,
|
AttachStream(new MapStream (sourceStream,
|
||||||
isConcatenatedDataConfined ? new ConcatenateColumnsMapperForSameDataSet (columnDefs) :
|
isConcatenatedDataConfined ? new ConcatenateColumnsMapperForSameDataSet (columnDefs) :
|
||||||
new ConcatenateColumnsMapper (columnDefs)
|
new ConcatenateColumnsMapper (columnDefs)
|
||||||
)
|
))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ namespace BCG
|
|||||||
public AverageCollectorStream(ViewStream stream, params string[] columnsToAverage)
|
public AverageCollectorStream(ViewStream stream, params string[] columnsToAverage)
|
||||||
{
|
{
|
||||||
myAveragingColumns = columnsToAverage;
|
myAveragingColumns = columnsToAverage;
|
||||||
mySetRealSource(new CrushingCollectorStream(stream, this));
|
mySetRealSource(AttachStream(new CrushingCollectorStream(stream, this)));
|
||||||
}
|
}
|
||||||
|
|
||||||
private string[] myAveragingColumns;
|
private string[] myAveragingColumns;
|
||||||
|
|||||||
@@ -1,24 +1,23 @@
|
|||||||
using bts;
|
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
|
|
||||||
namespace BCG {
|
namespace BCG
|
||||||
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Provides a stream that with distinct rows with respect to the columns
|
/// Provides a stream that with distinct rows with respect to the columns
|
||||||
/// the user specifies in the argument
|
/// the user specifies in the argument
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[DataStreamUserRespresentation("distinct")]
|
[DataStreamUserRespresentation ("distinct")]
|
||||||
public class DistinctRowStream : ViewStream {
|
public class DistinctRowStream : ViewStream
|
||||||
public DistinctRowStream(ViewStream stream, params string[] cols) {
|
{
|
||||||
var g_by_eval = new DistinctRowEvaluator(cols);
|
public DistinctRowStream (ViewStream stream, params string[] cols)
|
||||||
ViewStream r = new GroupByStream(stream, g_by_eval);
|
{
|
||||||
var proj_exp = String.Empty;
|
ArrayList groupByCols = new ArrayList ();
|
||||||
foreach (var c in cols)
|
foreach (string col in cols)
|
||||||
proj_exp += $"{c} ";
|
foreach (string c in col.Split (' '))
|
||||||
proj_exp = proj_exp.Trim();
|
groupByCols.Add (c);
|
||||||
r = new NewProjectStream(r, proj_exp);
|
mySetRealSource (AttachStream(new GroupByStream (stream,
|
||||||
mySetRealSource(r);
|
new DistinctRowEvaluator (groupByCols.ToArray (typeof(string)) as string[]), false)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
// using System;
|
||||||
|
// using System.Collections.Generic;
|
||||||
|
// using System.Text;
|
||||||
|
// using System.IO;
|
||||||
|
|
||||||
|
// using System.Runtime.Serialization.Formatters.Binary;
|
||||||
|
|
||||||
|
// namespace BCG
|
||||||
|
// {
|
||||||
|
// public class DumpLoaderStream : ViewStream, ISideEffectStream
|
||||||
|
// {
|
||||||
|
// //wtf
|
||||||
|
// //public class Exception : System.Exception
|
||||||
|
// //{public Exception(string msg) : base(msg) { }}
|
||||||
|
|
||||||
|
// public DumpLoaderStream(string fileName, int secondsBetweenPolls)
|
||||||
|
// {
|
||||||
|
// mySetRealSource(
|
||||||
|
// new PollStream(() => new LoaderStream(fileName).rows, secondsBetweenPolls,
|
||||||
|
// ViewStreamDatabase.instance));
|
||||||
|
// }
|
||||||
|
|
||||||
|
// public DumpLoaderStream(string fileName)
|
||||||
|
// {
|
||||||
|
// if (fileName == null)
|
||||||
|
// throw new LoaderStream.Exception("File name cannot be null");
|
||||||
|
|
||||||
|
// for (int i = 0; i < 5; i++)
|
||||||
|
// try
|
||||||
|
// {
|
||||||
|
// using (FileStream fs = new FileStream(fileName, FileMode.Open, FileAccess.Read))
|
||||||
|
// {
|
||||||
|
// IClientDeserializer deser = new ClientUniversalDeserializer();
|
||||||
|
// byte[] the_ops;
|
||||||
|
// Array the_rows;
|
||||||
|
// deser.deserialize(new Stream[] { fs }, out the_ops, out the_rows);
|
||||||
|
|
||||||
|
// mySetRealSource(new BlueRowCollectionStaticStream((IBlueRowCollection)the_rows.GetValue(0)));
|
||||||
|
// }
|
||||||
|
// break;
|
||||||
|
// }
|
||||||
|
// catch (IOException)
|
||||||
|
// {
|
||||||
|
// System.Threading.Thread.Sleep(50);
|
||||||
|
// }
|
||||||
|
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
using BCG;
|
using BCG;
|
||||||
|
|
||||||
namespace bts {
|
namespace bts {
|
||||||
// This is the other side of the SaverStream, its "loads" the stream and fires once
|
|
||||||
[DataStreamUserRespresentation("loader")]
|
[DataStreamUserRespresentation("loader")]
|
||||||
public class LoaderStream : ViewStream {
|
public class LoaderStream : ViewStream {
|
||||||
|
|
||||||
|
|||||||
@@ -5,11 +5,10 @@ using System.Text;
|
|||||||
using System.IO;
|
using System.IO;
|
||||||
using Google.Protobuf;
|
using Google.Protobuf;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using BCG;
|
using bts;
|
||||||
|
|
||||||
namespace bts {
|
namespace BCG {
|
||||||
// Writes all the udpates to a stream in a file or multiples files dependong on the rollover size (as opposed to Saver
|
// Writes all the udpates to a stream in a file.
|
||||||
// which just writes one update, as a create)
|
|
||||||
// File naming:
|
// File naming:
|
||||||
// token_epoch_yyyyMMdd_HHmmss
|
// token_epoch_yyyyMMdd_HHmmss
|
||||||
// File location: directory(passed)\token\
|
// File location: directory(passed)\token\
|
||||||
@@ -95,10 +94,10 @@ namespace bts {
|
|||||||
void _on_change(object new_value) {
|
void _on_change(object new_value) {
|
||||||
DataPacket dp = new_value as DataPacket;
|
DataPacket dp = new_value as DataPacket;
|
||||||
byte[] serialized_update = null;
|
byte[] serialized_update = null;
|
||||||
bool first_write = _serializer == null || _n_updates_in_current_file == 0;
|
bool _write_create = _serializer == null || _n_updates_in_current_file == 0;
|
||||||
_serializer = _serializer ?? new UniversalStreamIOSerializer();
|
_serializer = _serializer ?? new UniversalStreamIOSerializer();
|
||||||
if (first_write) {
|
if (_write_create) {
|
||||||
// first file always starts with create
|
// new files always starts with create
|
||||||
serialized_update = _serializer.serialize(new bts.StreamIOMessage(new bts.StreamIOMessage.CreateMessage(dp.newRows)));
|
serialized_update = _serializer.serialize(new bts.StreamIOMessage(new bts.StreamIOMessage.CreateMessage(dp.newRows)));
|
||||||
} else
|
} else
|
||||||
serialized_update = _serializer.serialize(new bts.StreamIOMessage(new bts.StreamIOMessage.MultipleRemoveAddMessage(dp.deletedRows, dp.addedRows)));
|
serialized_update = _serializer.serialize(new bts.StreamIOMessage(new bts.StreamIOMessage.MultipleRemoveAddMessage(dp.deletedRows, dp.addedRows)));
|
||||||
@@ -106,8 +105,8 @@ namespace bts {
|
|||||||
long utc_epoch = epoch_now();
|
long utc_epoch = epoch_now();
|
||||||
|
|
||||||
//time, length of data, data
|
//time, length of data, data
|
||||||
//bw.Write(utc_epoch);
|
bw.Write(utc_epoch);
|
||||||
//bw.Write(serialized_update.Length);
|
bw.Write(serialized_update.Length);
|
||||||
bw.Write(serialized_update);
|
bw.Write(serialized_update);
|
||||||
_out_fs.Flush();
|
_out_fs.Flush();
|
||||||
myFireEvent(dp);
|
myFireEvent(dp);
|
||||||
|
|||||||
@@ -0,0 +1,190 @@
|
|||||||
|
// using System;
|
||||||
|
// using System.Collections.Generic;
|
||||||
|
// using System.Linq;
|
||||||
|
// using System.Text;
|
||||||
|
// using System.IO;
|
||||||
|
// using System.Runtime.Serialization.Formatters.Binary;
|
||||||
|
// using BCG.Utilities.General;
|
||||||
|
// using bts.collections;
|
||||||
|
// using System.Reflection.Metadata;
|
||||||
|
|
||||||
|
|
||||||
|
// namespace BCG {
|
||||||
|
|
||||||
|
// public class PlaybackStream : ViewStream, IWorker {
|
||||||
|
// private readonly PlaybackType _type;
|
||||||
|
// private BlueTable _current_table;
|
||||||
|
// private IClientDeserializer _deserilializer = new ClientUniversalDeserializer();
|
||||||
|
// // these are the packets already downloaded from the current file
|
||||||
|
// private List<PlaybackPacket> _packets = new List<PlaybackPacket>();
|
||||||
|
// //private IEnumerable<FileStream> _file_streams = new List<FileStream>();
|
||||||
|
// private IEnumerable<string> _file_names;
|
||||||
|
// private Tuple<int, FileStream> _current_fs = new Tuple<int, FileStream>(-1, null);
|
||||||
|
// private DateTime _playback_t0, _playback_t1;
|
||||||
|
// private bool _all_files_read = false;
|
||||||
|
// SnapshotData _snapshot_data = null; // only initialized when in snapshot mode
|
||||||
|
|
||||||
|
// public PlaybackStream(string datetime_start, string datetime_end, string directory_name, string token) {
|
||||||
|
// _type = PlaybackType.Streaming;
|
||||||
|
// _playback_t0 = PersistorStream.parse_datetime(datetime_start);
|
||||||
|
// _playback_t1 = PersistorStream.parse_datetime(datetime_end);
|
||||||
|
// string token_directory_name = $"{directory_name}\\{token}";
|
||||||
|
// bts.Log.Gen.info($"PlaybackStream t0: {_playback_t0} t1: {_playback_t1} dir: {token_directory_name}");
|
||||||
|
// List<string> files_in_range = new List<string>();
|
||||||
|
// if (Directory.Exists(token_directory_name)) {
|
||||||
|
// _file_names =
|
||||||
|
// Directory.GetFiles(token_directory_name).Where(f => {
|
||||||
|
// DateTime file_time = PersistorStream.parse_datetime_from_filename(f);
|
||||||
|
// return file_time > _playback_t0 && file_time < _playback_t1;
|
||||||
|
// });
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
// protected override void myOnFirstSubscriber() {
|
||||||
|
// FileStream fs = new FileStream(_snapshot_data.snapshot_file, FileMode.Open, FileAccess.Read);
|
||||||
|
// _snapshot_data.packets = StreamPersistorUtils.load_packets_from_file(fs);
|
||||||
|
// PlaybackPacket snapshot_packet = StreamPersistorUtils.find_packet_at_time(_snapshot_data.packets, _snapshot_data.snapshot_time);
|
||||||
|
// if (snapshot_packet != null) {
|
||||||
|
// foreach (PlaybackPacket p in _snapshot_data.packets) {
|
||||||
|
// byte[] ops;
|
||||||
|
// Array row_array;
|
||||||
|
// _deserilializer.deserialize(new Stream[] { new MemoryStream(p.data) }, out ops, out row_array);
|
||||||
|
// for (int i = 0; i < ops.Length; i++) {
|
||||||
|
// IBlueRowCollection[] rows_args = row_array.GetValue(i) as IBlueRowCollection[];
|
||||||
|
// byte op = ops[i];
|
||||||
|
// if (op == StreamOpCode.create) {
|
||||||
|
// IBlueRowCollection full_table = rows_args[0];
|
||||||
|
// _current_table = new BlueTable(full_table);
|
||||||
|
// } else if (op == StreamOpCode.multipleRemoveAdd) {
|
||||||
|
// //IBlueRowCollection[] del_added = rows_args.GetValue(0) as IBlueRowCollection[];
|
||||||
|
// IBlueRowCollection dels = rows_args.GetValue(0) as IBlueRowCollection;
|
||||||
|
// IBlueRowCollection adds = rows_args.GetValue(1) as IBlueRowCollection;
|
||||||
|
// BlueDataUtility.absorbChanges(_current_table, dels, adds);
|
||||||
|
// } else {
|
||||||
|
// bts.Log.assert(false, $"Oprator: {op} is not expected");
|
||||||
|
// }
|
||||||
|
// if (p.idx == snapshot_packet.idx) {
|
||||||
|
// myFireEvent(new DataPacket(_current_table, _current_table, new BlueTable(_current_table.schema)));
|
||||||
|
// break;
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
|
||||||
|
// private void _load_packets_from_current_file() {
|
||||||
|
// int curr_idx = _current_fs.Item1;
|
||||||
|
// FileStream curr_fs = _current_fs.Item2;
|
||||||
|
// _packets = new List<PlaybackPacket>();
|
||||||
|
// _packets.AddRange(StreamPersistorUtils.load_packets_from_file(curr_fs));
|
||||||
|
// }
|
||||||
|
|
||||||
|
// private bool current_file_all_replayed {
|
||||||
|
// get {
|
||||||
|
// bool rv = true;
|
||||||
|
// _packets.ForEach(p => rv = rv && p.replayed);
|
||||||
|
// return rv;
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
// protected override void myOnLastSubscriber() {
|
||||||
|
// var fs = _current_fs.Item2;
|
||||||
|
// if (fs != null) {
|
||||||
|
// fs.Close();
|
||||||
|
// }
|
||||||
|
// ViewStreamDatabase.instance.removeWorker(this);
|
||||||
|
// }
|
||||||
|
|
||||||
|
// // public event PlaybackStreamProgress onProgress;
|
||||||
|
// // public event Action onFileExhausted;
|
||||||
|
// private PlaybackPacket _locate_packet_to_replay() {
|
||||||
|
// foreach (var p in _packets) {
|
||||||
|
// // returns the first non replayed packet
|
||||||
|
// if (!p.replayed)
|
||||||
|
// return p;
|
||||||
|
// }
|
||||||
|
// //else
|
||||||
|
// {
|
||||||
|
// double secondsElapsed = new BinaryReader(myFileReader).ReadDouble();
|
||||||
|
// myNextPacketTime = myPlaybackStart + new TimeSpan(0, 0, 0, 0, (int)(1000 * secondsElapsed / myPlaybackSpeed));
|
||||||
|
// if (onProgress != null)
|
||||||
|
// onProgress(myFileReader.Position, myFileReader.Length);
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
// #region IWorker Members
|
||||||
|
|
||||||
|
// public void doWork() {
|
||||||
|
// if (_all_files_read)
|
||||||
|
// return;
|
||||||
|
// if (current_file_all_replayed) {
|
||||||
|
// _load_next_file();
|
||||||
|
// }
|
||||||
|
// PlaybackPacket curr_packet = _locate_packet_to_replay();
|
||||||
|
// if (curr_packet.idx == 0) { // first packet in the file, fire it rightaway
|
||||||
|
// byte[] ops;
|
||||||
|
// Array row_array;
|
||||||
|
// // what a stupid interface!
|
||||||
|
// _deserilializer.deserialize(new Stream[] { new MemoryStream(curr_packet.data) }, out ops, out row_array);
|
||||||
|
// _fire_packet(ops, row_array);
|
||||||
|
// curr_packet.replay_timestamp = PersistorStream.epoch_now();
|
||||||
|
// } else {
|
||||||
|
// PlaybackPacket prev_packet = _get_previous_packet(curr_packet);
|
||||||
|
// // this is the time we need to fire (replay) this packet
|
||||||
|
// long time_to_fire = prev_packet.replay_timestamp + curr_packet.offset_from_previous;
|
||||||
|
// long now_epoch = PersistorStream.epoch_now();
|
||||||
|
// // fire when we are past the
|
||||||
|
// if (now_epoch >= time_to_fire) {
|
||||||
|
// byte[] ops;
|
||||||
|
// Array row_array;
|
||||||
|
// _deserilializer.deserialize(new Stream[] { new MemoryStream(curr_packet.data) }, out ops, out row_array);
|
||||||
|
// _fire_packet(ops, row_array);
|
||||||
|
// curr_packet.replay_timestamp = PersistorStream.epoch_now();
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
// private void _fire_packet(byte[] ops, Array row_array) {
|
||||||
|
// for (int i = 0; i < ops.Length; i++) {
|
||||||
|
// IBlueRowCollection[] rows_args = row_array.GetValue(i) as IBlueRowCollection[];
|
||||||
|
// byte op = ops[i];
|
||||||
|
// if (op == StreamOpCode.create) {
|
||||||
|
// IBlueRowCollection full_table = rows_args[0];
|
||||||
|
// _current_table = new BlueTable(full_table);
|
||||||
|
// //_current_table.addRows(full_table);
|
||||||
|
// myFireEvent(new DataPacket(full_table, full_table, myLastValue == null ? new BlueTable(full_table.schema) :
|
||||||
|
// (myLastValue as DataPacket).newRows));
|
||||||
|
// } else if (op == StreamOpCode.multipleRemoveAdd) {
|
||||||
|
// //IBlueRowCollection[] del_added = rows_args.GetValue(0) as IBlueRowCollection[];
|
||||||
|
// IBlueRowCollection dels = rows_args.GetValue(0) as IBlueRowCollection;
|
||||||
|
// IBlueRowCollection adds = rows_args.GetValue(1) as IBlueRowCollection;
|
||||||
|
// BlueDataUtility.absorbChanges(_current_table, dels, adds);
|
||||||
|
// myFireEvent(new DataPacket(_current_table, adds, dels));
|
||||||
|
// } else {
|
||||||
|
// bts.Log.assert(false, $"Oprator: {op} is not expected");
|
||||||
|
// }
|
||||||
|
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
// private void _load_next_file() {
|
||||||
|
// var new_idx = _current_fs.Item1 + 1;
|
||||||
|
// if (new_idx >= _file_names.Count()) {
|
||||||
|
// _all_files_read = true;
|
||||||
|
// bts.Log.Gen.info("All files read");
|
||||||
|
// return;
|
||||||
|
// }
|
||||||
|
// var prev_fs = _current_fs.Item2;
|
||||||
|
// if (prev_fs != null)
|
||||||
|
// prev_fs.Close();
|
||||||
|
// var new_filename = _file_names.ElementAt(new_idx);
|
||||||
|
// bts.Log.Gen.info("PlaybackStream_load_next_file new_filename=: {new_filename}");
|
||||||
|
// var new_fs = new FileStream(new_filename, FileMode.Open, FileAccess.Read);
|
||||||
|
// _current_fs = new Tuple<int, FileStream>(new_idx, new_fs);
|
||||||
|
// _load_packets_from_current_file();
|
||||||
|
// }
|
||||||
|
|
||||||
|
// #endregion
|
||||||
|
// }
|
||||||
|
// }
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
// using System;
|
||||||
|
// using System.Collections.Generic;
|
||||||
|
// using System.Linq;
|
||||||
|
// using System.Text;
|
||||||
|
// using System.IO;
|
||||||
|
|
||||||
|
// namespace BCG
|
||||||
|
// {
|
||||||
|
// public class RecorderStream : ViewStream
|
||||||
|
// {
|
||||||
|
// private ViewStream mySource;
|
||||||
|
// private DateTime myStartTime;
|
||||||
|
// private FileStream myOutFile;
|
||||||
|
// private string myFileName;
|
||||||
|
// private IBlueDataSerializer mySerializer;
|
||||||
|
|
||||||
|
// public RecorderStream(ViewStream src, string recordFile)
|
||||||
|
// {
|
||||||
|
// mySource = src;
|
||||||
|
// myFileName = recordFile;
|
||||||
|
|
||||||
|
// myFileName = myFileName.Replace("%DATE%", DateTime.Now.ToString("yyyyMMdd_HHmmss"));
|
||||||
|
// }
|
||||||
|
|
||||||
|
// protected override void myOnFirstSubscriber()
|
||||||
|
// {
|
||||||
|
// myStartTime = DateTime.Now;
|
||||||
|
// mySource.onChange += new ChangeDelegate(mySource_onChange);
|
||||||
|
// myOutFile = new FileStream(myFileName, FileMode.OpenOrCreate);
|
||||||
|
// }
|
||||||
|
|
||||||
|
// protected override void myOnLastSubscriber()
|
||||||
|
// {
|
||||||
|
// mySource.onChange -= mySource_onChange;
|
||||||
|
// myOutFile.Close();
|
||||||
|
// }
|
||||||
|
|
||||||
|
// void mySource_onChange(object newValue)
|
||||||
|
// {
|
||||||
|
// DataPacket dp = (DataPacket)newValue;
|
||||||
|
|
||||||
|
// BlueTable toWrite = new BlueTable(dp.schema);
|
||||||
|
|
||||||
|
// if (mySerializer == null)
|
||||||
|
// {
|
||||||
|
// mySerializer = new UniversalSerializer(dp.schema);
|
||||||
|
// }
|
||||||
|
// foreach (IBlueRow r in dp.newRows)
|
||||||
|
// toWrite.addRow(r);
|
||||||
|
|
||||||
|
// byte[] result;
|
||||||
|
|
||||||
|
// if (myLastValue == null)
|
||||||
|
// mySerializer.serialize(StreamOpCode.create, new IBlueRowCollection[] { dp.newRows }, out result);
|
||||||
|
// else
|
||||||
|
// mySerializer.serialize(StreamOpCode.multipleRemoveAdd, new IBlueRowCollection[] { dp.deletedRows, dp.addedRows }, out result);
|
||||||
|
|
||||||
|
// BinaryWriter bw = new BinaryWriter(myOutFile);
|
||||||
|
// //write down what time this happened
|
||||||
|
// bw.Write((DateTime.Now - myStartTime).TotalSeconds);
|
||||||
|
// bw.Write(result.Length);
|
||||||
|
// bw.Write(result);
|
||||||
|
// myOutFile.Flush();
|
||||||
|
|
||||||
|
// myFireEvent(dp);
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
@@ -5,8 +5,7 @@ using System.IO;
|
|||||||
using BCG;
|
using BCG;
|
||||||
|
|
||||||
namespace bts {
|
namespace bts {
|
||||||
// this saves the updates as a Create on the same file, each update calls -save, which
|
// this saves the total state in the filr provided in the cons
|
||||||
// reqrites the whole data to the packet. The other side of this stream is the Loader
|
|
||||||
[DataStreamUserRespresentation("saver")]
|
[DataStreamUserRespresentation("saver")]
|
||||||
public class SaverStream : ViewStream {
|
public class SaverStream : ViewStream {
|
||||||
private ViewStream _stream;
|
private ViewStream _stream;
|
||||||
@@ -32,6 +31,7 @@ namespace bts {
|
|||||||
StreamIOMessage.CreateMessage cr_msg = new StreamIOMessage.CreateMessage(dp.newRows);
|
StreamIOMessage.CreateMessage cr_msg = new StreamIOMessage.CreateMessage(dp.newRows);
|
||||||
byte[] str_bytes = _serializer.serialize(new StreamIOMessage(cr_msg));
|
byte[] str_bytes = _serializer.serialize(new StreamIOMessage(cr_msg));
|
||||||
StreamSerializationUtils.write_to_file(str_bytes, _filename);
|
StreamSerializationUtils.write_to_file(str_bytes, _filename);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3,7 +3,6 @@ using System.Collections.Generic;
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using bts;
|
|
||||||
|
|
||||||
|
|
||||||
namespace BCG {
|
namespace BCG {
|
||||||
|
|||||||
@@ -3,25 +3,20 @@ using System.Collections.Generic;
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using BCG.Utilities.General;
|
using BCG.Utilities.General;
|
||||||
|
|
||||||
namespace BCG
|
namespace BCG
|
||||||
{
|
{
|
||||||
public class DateBasedFilter: IDynamicStreamFilter, IWorker
|
public class DateBasedFilter: IDynamicStreamFilter, IWorker
|
||||||
{
|
{
|
||||||
private ViewStreamDatabase myVSD;
|
|
||||||
private string myDateColumn;
|
private string myDateColumn;
|
||||||
private int myNDays;
|
private int myNDays;
|
||||||
private DateTime myReference;
|
private DateTime myReference;
|
||||||
private DateTime myTodaysDate;
|
private DateTime myTodaysDate;
|
||||||
|
|
||||||
public DateBasedFilter(string dateColumn, int nDays)
|
public DateBasedFilter(string dateColumn, int nDays)
|
||||||
: this(dateColumn, nDays, ViewStreamDatabase.instance) { }
|
|
||||||
|
|
||||||
public DateBasedFilter(string dateColumn, int nDays, ViewStreamDatabase vsd)
|
|
||||||
{
|
{
|
||||||
myDateColumn = dateColumn;
|
myDateColumn = dateColumn;
|
||||||
myNDays = nDays;
|
myNDays = nDays;
|
||||||
myVSD = vsd;
|
|
||||||
myVSD.addWorker(this);
|
|
||||||
myTodaysDate = DateTime.Today;
|
myTodaysDate = DateTime.Today;
|
||||||
myReference = myTodaysDate.AddDays(-1 * myNDays);
|
myReference = myTodaysDate.AddDays(-1 * myNDays);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,12 @@
|
|||||||
|
using BCG.Utilities.General;
|
||||||
|
|
||||||
using Bts.DataStream;
|
using Bts.DataStream;
|
||||||
|
using Bts.PubSub;
|
||||||
|
|
||||||
using mbts.config;
|
using mbts.config;
|
||||||
|
|
||||||
|
using Spark.Core.Disposables;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
|
|
||||||
@@ -141,6 +146,7 @@ namespace BCG
|
|||||||
private BlueTable myLastFiredRows;
|
private BlueTable myLastFiredRows;
|
||||||
private IBlueRowCollection myLastReceivedRows;
|
private IBlueRowCollection myLastReceivedRows;
|
||||||
private IStreamFilter myFilter;
|
private IStreamFilter myFilter;
|
||||||
|
private IDisposable? filterWorkerSubscription;
|
||||||
private ViewStream myParentStream;
|
private ViewStream myParentStream;
|
||||||
private string myFilterString;
|
private string myFilterString;
|
||||||
private BCG.StreamWorld.Addition.FilterStream myFilterStream;
|
private BCG.StreamWorld.Addition.FilterStream myFilterStream;
|
||||||
@@ -168,7 +174,7 @@ namespace BCG
|
|||||||
if (myUseNewFilter)
|
if (myUseNewFilter)
|
||||||
{
|
{
|
||||||
myFilterStream = new BCG.StreamWorld.Addition.FilterStream(vs, filter);
|
myFilterStream = new BCG.StreamWorld.Addition.FilterStream(vs, filter);
|
||||||
mySetRealSource(myFilterStream);
|
mySetRealSource(AttachStream(myFilterStream));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -260,6 +266,7 @@ namespace BCG
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
Disposable.dispose(ref filterWorkerSubscription);
|
||||||
myFilter = value;
|
myFilter = value;
|
||||||
if (numberOfSubscribers > 0)
|
if (numberOfSubscribers > 0)
|
||||||
{
|
{
|
||||||
@@ -274,6 +281,9 @@ namespace BCG
|
|||||||
BlueDataUtility.computeDifferences(nRows, myLastFiredRows, out dRows, out aRows);
|
BlueDataUtility.computeDifferences(nRows, myLastFiredRows, out dRows, out aRows);
|
||||||
myLastFiredRows = nRows;
|
myLastFiredRows = nRows;
|
||||||
myFireEvent(new DataPacket(nRows, aRows, dRows));
|
myFireEvent(new DataPacket(nRows, aRows, dRows));
|
||||||
|
if (myFilter is IWorker filterWorker) {
|
||||||
|
filterWorkerSubscription = ViewStreamDatabase.Subscribe(filterWorker);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -294,6 +304,14 @@ namespace BCG
|
|||||||
return GetType().ToString() + " " + myFilterString;
|
return GetType().ToString() + " " + myFilterString;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected override void OnViewStreamDatabase(IWorkScheduler viewStreamDatabase) {
|
||||||
|
base.OnViewStreamDatabase(viewStreamDatabase);
|
||||||
|
var w = this as IWorker;
|
||||||
|
if (w is not null) {
|
||||||
|
filterWorkerSubscription = viewStreamDatabase.Subscribe(w);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void myHandleFilterChange()
|
private void myHandleFilterChange()
|
||||||
{
|
{
|
||||||
filter = myFilter;
|
filter = myFilter;
|
||||||
|
|||||||
Loaded 100 of 1225 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user