Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a986dacc60 | ||
|
|
5b1bf06feb | ||
|
|
bc6dc44555 | ||
|
|
01e62b9aae |
No files matched your search
@@ -87,11 +87,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
|
||||||
|
|
||||||
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; \
|
||||||
@@ -125,5 +120,3 @@ RUN \
|
|||||||
-G sudo \
|
-G sudo \
|
||||||
--password "$(openssl passwd -1 "$docker_pass")" \
|
--password "$(openssl passwd -1 "$docker_pass")" \
|
||||||
"$docker_user"
|
"$docker_user"
|
||||||
|
|
||||||
RUN usermod -aG docker "$docker_user"
|
|
||||||
@@ -18,12 +18,17 @@
|
|||||||
"runArgs": [
|
"runArgs": [
|
||||||
"--shm-size",
|
"--shm-size",
|
||||||
"2gb",
|
"2gb",
|
||||||
"--network",
|
"-p",
|
||||||
"host"
|
"8000:8000",
|
||||||
|
"-p",
|
||||||
|
"8001:8001",
|
||||||
|
"-p",
|
||||||
|
"8002:8002",
|
||||||
|
"-p",
|
||||||
|
"8003:8003"
|
||||||
],
|
],
|
||||||
"mounts": [
|
"mounts": [
|
||||||
"source=${localEnv:HOME}/.bts/devcontainer-mounts/${devcontainerId},target=/home/bts,type=bind",
|
"source=${localEnv:HOME}/.bts/devcontainer-mounts/${devcontainerId},target=/home/bts,type=bind"
|
||||||
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
|
|
||||||
],
|
],
|
||||||
"customizations": {
|
"customizations": {
|
||||||
"vscode": {
|
"vscode": {
|
||||||
|
|||||||
+16
-30
@@ -207,23 +207,17 @@ 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.pascal_case.required_prefix =
|
dotnet_naming_style.snake_case.required_prefix =
|
||||||
dotnet_naming_style.pascal_case.required_suffix =
|
dotnet_naming_style.snake_case.required_suffix =
|
||||||
dotnet_naming_style.pascal_case.word_separator =
|
dotnet_naming_style.snake_case.word_separator = _
|
||||||
dotnet_naming_style.pascal_case.capitalization = pascal_case
|
dotnet_naming_style.snake_case.capitalization = all_lower
|
||||||
|
|
||||||
dotnet_naming_style.camel_case.required_prefix =
|
dotnet_naming_style.private_snake_case.required_prefix = _
|
||||||
dotnet_naming_style.camel_case.required_suffix =
|
dotnet_naming_style.private_snake_case.required_suffix =
|
||||||
dotnet_naming_style.camel_case.word_separator =
|
dotnet_naming_style.private_snake_case.word_separator = _
|
||||||
dotnet_naming_style.camel_case.capitalization = camel_case
|
dotnet_naming_style.private_snake_case.capitalization = all_lower
|
||||||
|
|
||||||
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 =
|
||||||
@@ -235,10 +229,6 @@ 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
|
||||||
@@ -248,18 +238,14 @@ 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.symbols = public_symbols
|
dotnet_naming_rule.public_members_snake_case.symbols = public_symbols
|
||||||
dotnet_naming_rule.public_members.style = pascal_case
|
dotnet_naming_rule.public_members_snake_case.style = snake_case
|
||||||
dotnet_naming_rule.public_members.severity = suggestion
|
dotnet_naming_rule.public_members_snake_case.severity = suggestion
|
||||||
|
|
||||||
dotnet_naming_rule.private_members.symbols = private_symbols
|
dotnet_naming_rule.private_members_snake_case.symbols = private_symbols
|
||||||
dotnet_naming_rule.private_members.style = camel_case
|
dotnet_naming_rule.private_members_snake_case.style = private_snake_case
|
||||||
dotnet_naming_rule.private_members.severity = suggestion
|
dotnet_naming_rule.private_members_snake_case.severity = suggestion
|
||||||
|
|
||||||
dotnet_naming_rule.variables_are_camel_case.severity = suggestion
|
dotnet_naming_rule.parameters.symbols = parameters
|
||||||
dotnet_naming_rule.variables_are_camel_case.symbols = local_symbols
|
dotnet_naming_rule.parameters.style = snake_case
|
||||||
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,4 +0,0 @@
|
|||||||
*.cmd text=auto eol=crlf
|
|
||||||
*.cs text=auto eol=crlf
|
|
||||||
*.sh text=auto eol=lf
|
|
||||||
*.py text=auto eol=lf
|
|
||||||
+1
-3
@@ -8,9 +8,7 @@ cmake-build-debug/
|
|||||||
.idea/
|
.idea/
|
||||||
.dir-locals.el
|
.dir-locals.el
|
||||||
*.pyc
|
*.pyc
|
||||||
**.vscode/*
|
**.vscode
|
||||||
!.vscode/launch.json
|
|
||||||
!.vscode/tasks.json
|
|
||||||
.vs
|
.vs
|
||||||
obj/
|
obj/
|
||||||
*.csproj.user
|
*.csproj.user
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[submodule "externals"]
|
[submodule "externals"]
|
||||||
path = externals
|
path = externals
|
||||||
url = https://bitbucket.org/bluetradesys/externals.git
|
url = git@bitbucket.org:bluetradesys/externals.git
|
||||||
[submodule "vcpkg"]
|
[submodule "vcpkg"]
|
||||||
path = vcpkg
|
path = vcpkg
|
||||||
url = https://github.com/microsoft/vcpkg.git
|
url = https://github.com/microsoft/vcpkg.git
|
||||||
Vendored
-312
@@ -1,312 +0,0 @@
|
|||||||
{
|
|
||||||
"version": "0.2.0",
|
|
||||||
"configurations": [
|
|
||||||
{
|
|
||||||
"name": ".NET Core Attach",
|
|
||||||
"type": "coreclr",
|
|
||||||
"request": "attach"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Api Server",
|
|
||||||
"type": "coreclr",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "",
|
|
||||||
"windows": {
|
|
||||||
"preLaunchTask": "Build Api Server (Debug)",
|
|
||||||
"program": "spark_api_server.exe",
|
|
||||||
"args": [
|
|
||||||
"run",
|
|
||||||
"--sparkd",
|
|
||||||
"http://127.0.0.1:8000/config"
|
|
||||||
],
|
|
||||||
"cwd": "build/Debug/bin/net7.0",
|
|
||||||
},
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"console": "integratedTerminal"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Api Server (Skip Build)",
|
|
||||||
"type": "coreclr",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "",
|
|
||||||
"windows": {
|
|
||||||
"program": "spark_api_server.exe",
|
|
||||||
"args": [
|
|
||||||
"run",
|
|
||||||
"--sparkd",
|
|
||||||
"http://127.0.0.1:8000/config"
|
|
||||||
],
|
|
||||||
"cwd": "build/Debug/bin/net7.0",
|
|
||||||
},
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"console": "integratedTerminal"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Bts.DataStreamWebApp.Server",
|
|
||||||
"type": "coreclr",
|
|
||||||
"request": "launch",
|
|
||||||
"preLaunchTask": "Build DataStream WebApp (Debug)",
|
|
||||||
"program": "${workspaceFolder}/build/Debug/bin/net7.0/Bts.DataStreamWebApp.Server.dll",
|
|
||||||
"cwd": "${workspaceFolder}/build/Debug/bin/net7.0",
|
|
||||||
"env": {
|
|
||||||
"ASPNETCORE_HTTP_PORT": "8080",
|
|
||||||
"ASPNETCORE_HTTPS_PORT": "8443",
|
|
||||||
"ASPNETCORE_ENVIRONMENT": "${input:dataStreamWebAppServerEnvironment}",
|
|
||||||
"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy",
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Bts.DataStreamWebApp.Server (Skip Build)",
|
|
||||||
"type": "coreclr",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "${workspaceFolder}/build/Debug/bin/net7.0/Bts.DataStreamWebApp.Server.dll",
|
|
||||||
"cwd": "${workspaceFolder}/build/Debug/bin/net7.0",
|
|
||||||
"env": {
|
|
||||||
"ASPNETCORE_HTTP_PORT": "8080",
|
|
||||||
"ASPNETCORE_HTTPS_PORT": "8443",
|
|
||||||
"ASPNETCORE_ENVIRONMENT": "${input:dataStreamWebAppServerEnvironment}",
|
|
||||||
"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy",
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "DataStreamPublisher",
|
|
||||||
"type": "coreclr",
|
|
||||||
"request": "launch",
|
|
||||||
"preLaunchTask": "Build DataStream (Debug)",
|
|
||||||
"program": "",
|
|
||||||
"linux": {
|
|
||||||
"program": "DataStreamPublisher",
|
|
||||||
},
|
|
||||||
"windows": {
|
|
||||||
"program": "DataStreamPublisher.exe",
|
|
||||||
},
|
|
||||||
"env": {
|
|
||||||
"DOTNET_ENVIRONMENT": "${input:dataStreamPublisherEnvironment}",
|
|
||||||
},
|
|
||||||
"cwd": "${workspaceFolder}/build/Debug/bin/net7.0",
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"console": "integratedTerminal"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "DataStreamPublisher (Skip Build)",
|
|
||||||
"type": "coreclr",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "",
|
|
||||||
"linux": {
|
|
||||||
"program": "DataStreamPublisher",
|
|
||||||
},
|
|
||||||
"windows": {
|
|
||||||
"program": "DataStreamPublisher.exe",
|
|
||||||
},
|
|
||||||
"env": {
|
|
||||||
"DOTNET_ENVIRONMENT": "${input:dataStreamPublisherEnvironment}",
|
|
||||||
},
|
|
||||||
"cwd": "${workspaceFolder}/build/Debug/bin/net7.0",
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"console": "integratedTerminal"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "DataStreamQueryAnalyzer",
|
|
||||||
"type": "coreclr",
|
|
||||||
"request": "launch",
|
|
||||||
"preLaunchTask": "Build DataStreamQueryAnalyzer (Debug)",
|
|
||||||
"program": "",
|
|
||||||
"windows": {
|
|
||||||
"program": "DataStreamQueryAnalyzer.exe",
|
|
||||||
"args": [
|
|
||||||
"--config",
|
|
||||||
"${workspaceFolder}/src/DataStreamSuite/DataStreamQueryAnalyzer/Configurations/DataStreamQueryAnalyzer.json"
|
|
||||||
],
|
|
||||||
"cwd": "build/Debug/bin/net7.0-windows",
|
|
||||||
"env": {
|
|
||||||
"PYTHON_EXE": "${workspaceFolder}/.venv/Scripts/python.exe"
|
|
||||||
},
|
|
||||||
},
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"console": "integratedTerminal",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "PubSubServer",
|
|
||||||
"type": "coreclr",
|
|
||||||
"request": "launch",
|
|
||||||
"preLaunchTask": "Build DataStream (Debug)",
|
|
||||||
"program": "",
|
|
||||||
"linux": {
|
|
||||||
"program": "PubSubServer",
|
|
||||||
},
|
|
||||||
"windows": {
|
|
||||||
"program": "PubSubServer.exe",
|
|
||||||
},
|
|
||||||
"cwd": "build/Debug/bin/net7.0",
|
|
||||||
"env": {
|
|
||||||
"DOTNET_ENVIRONMENT": "${input:pubSubServerEnvironment}",
|
|
||||||
},
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"console": "integratedTerminal"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "PubSubServer (Skip Build)",
|
|
||||||
"type": "coreclr",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "",
|
|
||||||
"linux": {
|
|
||||||
"program": "PubSubServer",
|
|
||||||
},
|
|
||||||
"windows": {
|
|
||||||
"program": "PubSubServer.exe",
|
|
||||||
},
|
|
||||||
"cwd": "build/Debug/bin/net7.0",
|
|
||||||
"env": {
|
|
||||||
"DOTNET_ENVIRONMENT": "${input:pubSubServerEnvironment}",
|
|
||||||
},
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"console": "integratedTerminal"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Spark",
|
|
||||||
"type": "coreclr",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "",
|
|
||||||
"windows": {
|
|
||||||
"preLaunchTask": "Build Spark (Debug)",
|
|
||||||
"program": "Spark.exe",
|
|
||||||
"args": [
|
|
||||||
"--sparkd",
|
|
||||||
"http://127.0.0.1:8000/config"
|
|
||||||
],
|
|
||||||
"cwd": "build/Debug/bin/net7.0-windows",
|
|
||||||
},
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"console": "integratedTerminal"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Spark (Parameterized)",
|
|
||||||
"type": "coreclr",
|
|
||||||
"request": "launch",
|
|
||||||
"preLaunchTask": "Build Spark (Debug)",
|
|
||||||
"program": "",
|
|
||||||
"windows": {
|
|
||||||
"program": "Spark.exe",
|
|
||||||
"args": [
|
|
||||||
"--sparkd",
|
|
||||||
"${input:sparkConfigServer}"
|
|
||||||
],
|
|
||||||
"cwd": "build/Debug/bin/net7.0-windows",
|
|
||||||
},
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"console": "integratedTerminal"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Sparkd",
|
|
||||||
"type": "cppdbg",
|
|
||||||
"request": "launch",
|
|
||||||
"preLaunchTask": "Build Sparkd (Debug | Clang)",
|
|
||||||
"program": "",
|
|
||||||
"linux": {
|
|
||||||
"program": "${workspaceFolder}/build/sparkd-debug-clang/server/sparkd",
|
|
||||||
},
|
|
||||||
"args": [
|
|
||||||
"run"
|
|
||||||
],
|
|
||||||
"cwd": "${workspaceFolder}/build/sparkd-debug-clang/server",
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"externalConsole": false,
|
|
||||||
"MIMode": "gdb",
|
|
||||||
"setupCommands": [
|
|
||||||
{
|
|
||||||
"description": "Enable pretty-printing for gdb",
|
|
||||||
"text": "-enable-pretty-printing",
|
|
||||||
"ignoreFailures": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "Set Disassembly Flavor to Intel",
|
|
||||||
"text": "-gdb-set disassembly-flavor intel",
|
|
||||||
"ignoreFailures": true
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Sparkd (Skip Build)",
|
|
||||||
"type": "cppdbg",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "",
|
|
||||||
"linux": {
|
|
||||||
"program": "${workspaceFolder}/build/sparkd-debug-clang/server/sparkd",
|
|
||||||
},
|
|
||||||
"args": [
|
|
||||||
"run"
|
|
||||||
],
|
|
||||||
"cwd": "${workspaceFolder}/build/sparkd-debug-clang/server",
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"externalConsole": false,
|
|
||||||
"MIMode": "gdb",
|
|
||||||
"setupCommands": [
|
|
||||||
{
|
|
||||||
"description": "Enable pretty-printing for gdb",
|
|
||||||
"text": "-enable-pretty-printing",
|
|
||||||
"ignoreFailures": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "Set Disassembly Flavor to Intel",
|
|
||||||
"text": "-gdb-set disassembly-flavor intel",
|
|
||||||
"ignoreFailures": true
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"inputs": [
|
|
||||||
{
|
|
||||||
"id": "dataStreamPublisherEnvironment",
|
|
||||||
"type": "pickString",
|
|
||||||
"description": "Publisher Configuration",
|
|
||||||
"options": [
|
|
||||||
"Development",
|
|
||||||
"MarketData",
|
|
||||||
"Production",
|
|
||||||
"ProductionAws",
|
|
||||||
"Staging",
|
|
||||||
],
|
|
||||||
"default": "MarketDataPublisher",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "pubSubServerEnvironment",
|
|
||||||
"type": "pickString",
|
|
||||||
"description": "PubSub Configuration",
|
|
||||||
"options": [
|
|
||||||
"Development",
|
|
||||||
"EchoServer",
|
|
||||||
"Production",
|
|
||||||
"ProductionAws",
|
|
||||||
"Staging",
|
|
||||||
],
|
|
||||||
"default": "Development",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "dataStreamWebAppServerEnvironment",
|
|
||||||
"type": "pickString",
|
|
||||||
"description": "DataStream WebApp Environment",
|
|
||||||
"options": [
|
|
||||||
"Development",
|
|
||||||
"Production",
|
|
||||||
"ProductionAws",
|
|
||||||
"Staging",
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "sparkConfigServer",
|
|
||||||
"type": "promptString",
|
|
||||||
"description": "Config Server URL",
|
|
||||||
"default": "http://localhost:8000/config",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "isSparkApiEnabled",
|
|
||||||
"type": "pickString",
|
|
||||||
"description": "Enable Spark Api (connect to sparkd)",
|
|
||||||
"options": [
|
|
||||||
"True",
|
|
||||||
"False",
|
|
||||||
],
|
|
||||||
"default": "True",
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
Vendored
-1038
File diff suppressed because it is too large.
Load diff
+53
-24
@@ -14,17 +14,12 @@ set(
|
|||||||
CACHE
|
CACHE
|
||||||
STRING
|
STRING
|
||||||
"External dependencies root folder (should contain folders: lib, bin, include")
|
"External dependencies root folder (should contain folders: lib, bin, include")
|
||||||
|
set(SPARK_BIN "${EXTERNALS_ROOT}/bin")
|
||||||
# SHARED_MEMORY_PREFIX serves as a kind of namespace so multiple applications
|
set(SPARK_INCLUDE "${EXTERNALS_ROOT}/include")
|
||||||
# can run simultaneously without fighting over the same shm files (e.g., sparkd,
|
set(SPARK_LIB "${EXTERNALS_ROOT}/lib/$<CONFIG>")
|
||||||
# api server, etc.).
|
set(BUILD_API_SERVER OFF CACHE BOOL "Build the api server")
|
||||||
set(SHARED_MEMORY_PREFIX "bts" CACHE STRING "Prefix to use when creating shared memory files")
|
|
||||||
set(EXTERNALS_BIN "${EXTERNALS_ROOT}/bin")
|
|
||||||
set(EXTERNALS_INCLUDE "${EXTERNALS_ROOT}/include")
|
|
||||||
set(EXTERNALS_LIB "${EXTERNALS_ROOT}/lib/$<CONFIG>")
|
|
||||||
set(BUILD_DOCS OFF CACHE BOOL "Build documentation")
|
set(BUILD_DOCS OFF CACHE BOOL "Build documentation")
|
||||||
set(BUILD_SDK OFF CACHE BOOL "Build the sdk")
|
set(BUILD_SDK OFF CACHE BOOL "Build the sdk")
|
||||||
set(EXPORT_MD_CONSUMER OFF CACHE BOOL "Export (extern) C functions for MD consumer interop")
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
set(BUILD_SPARKD OFF CACHE BOOL "Build sparkd")
|
set(BUILD_SPARKD OFF CACHE BOOL "Build sparkd")
|
||||||
set(BUILD_ADMIN_WEB_APP OFF CACHE BOOL "Build the Admin WebApp")
|
set(BUILD_ADMIN_WEB_APP OFF CACHE BOOL "Build the Admin WebApp")
|
||||||
@@ -33,24 +28,32 @@ else()
|
|||||||
set(BUILD_ADMIN_WEB_APP ON CACHE BOOL "Build the Admin WebApp")
|
set(BUILD_ADMIN_WEB_APP ON CACHE BOOL "Build the Admin WebApp")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
include_directories(BEFORE SYSTEM ${EXTERNALS_INCLUDE} ${EXTERNALS_ROOT}/include/zlib)
|
include_directories(BEFORE SYSTEM ${SPARK_INCLUDE} ${EXTERNALS_ROOT}/include/zlib)
|
||||||
link_directories(${EXTERNALS_LIB})
|
link_directories(${SPARK_LIB})
|
||||||
|
|
||||||
add_compile_definitions(SHARED_MEMORY_PREFIX="${SHARED_MEMORY_PREFIX}")
|
if(BUILD_API_SERVER)
|
||||||
if(DEFINED APP_DATA_DIR)
|
add_compile_definitions(SPARK_ENABLE_API_SERVER)
|
||||||
add_compile_definitions(APP_DATA_DIR="${APP_DATA_DIR}")
|
|
||||||
endif()
|
endif()
|
||||||
add_compile_definitions(EXPORT_MD_CONSUMER="${EXPORT_MD_CONSUMER}")
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
|
add_compile_definitions(SHARED_MEMORY_PREFIX="spark")
|
||||||
|
add_compile_definitions(APP_DATA_DIR="\$\{APPDATA\}/bts/")
|
||||||
# subdirs
|
# subdirs
|
||||||
add_subdirectory(src/lib_spark)
|
add_subdirectory(src/lib)
|
||||||
else()
|
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/$<CONFIG>")
|
set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/install")
|
||||||
|
set(SPARK_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/$<CONFIG>")
|
||||||
|
|
||||||
|
if(BUILD_API_SERVER)
|
||||||
|
add_compile_definitions(APP_DATA_DIR="\$\{HOME\}/spark_api/")
|
||||||
|
add_compile_definitions(SHARED_MEMORY_PREFIX="spark_api")
|
||||||
|
elseif(BUILD_SPARKD)
|
||||||
|
add_compile_definitions(SHARED_MEMORY_PREFIX="sparkd")
|
||||||
|
add_compile_definitions(APP_DATA_DIR="\$\{HOME\}/sparkdata/")
|
||||||
|
|
||||||
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
|
||||||
# read by their code). We override some below.
|
# read by their code). We override some below.
|
||||||
add_compile_definitions(SPARK_ENABLE_CCAPI)
|
add_compile_definitions(SPARK_ENABLE_CCAPI)
|
||||||
@@ -109,12 +112,10 @@ else()
|
|||||||
|
|
||||||
# subdirs
|
# subdirs
|
||||||
if (BUILD_SPARKD)
|
if (BUILD_SPARKD)
|
||||||
add_subdirectory(src/app_sparkd)
|
add_subdirectory(src/server/sparkd)
|
||||||
add_subdirectory(src/data_files)
|
add_subdirectory(src/data_files)
|
||||||
add_subdirectory(src/lib_py_market_data)
|
|
||||||
# add_subdirectory(src/py_market_data_providers)
|
|
||||||
endif()
|
endif()
|
||||||
add_subdirectory(src/lib_spark)
|
add_subdirectory(src/lib)
|
||||||
if (BUILD_ADMIN_WEB_APP)
|
if (BUILD_ADMIN_WEB_APP)
|
||||||
add_subdirectory(src/Spark.Admin.WebApp)
|
add_subdirectory(src/Spark.Admin.WebApp)
|
||||||
endif()
|
endif()
|
||||||
@@ -124,4 +125,32 @@ else()
|
|||||||
if(BUILD_SDK)
|
if(BUILD_SDK)
|
||||||
add_subdirectory(src/sdk)
|
add_subdirectory(src/sdk)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(BUILD_SPARKD)
|
||||||
|
add_custom_command(
|
||||||
|
OUTPUT ${CMAKE_BINARY_DIR}/server
|
||||||
|
COMMAND mkdir -p ${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}/src/lib/libspark.so ${CMAKE_BINARY_DIR}/server
|
||||||
|
COMMAND
|
||||||
|
ln ARGS -sf
|
||||||
|
${EXTERNALS_ROOT}/lib/Release/libOnixS.IceImpactMulticastPriceFeedHandlerCpp.so.3.16.0.0
|
||||||
|
${CMAKE_BINARY_DIR}/server
|
||||||
|
COMMAND ln ARGS -sf ${EXTERNALS_ROOT}/lib/Release/libACE-5.7.5.so ${CMAKE_BINARY_DIR}/server
|
||||||
|
COMMAND mkdir ARGS -p ${CMAKE_BINARY_DIR}/server/plugins
|
||||||
|
COMMENT "Creating server runtime layout"
|
||||||
|
DEPENDS sparkd data_files_dir)
|
||||||
|
|
||||||
|
add_custom_target(server_layout ALL DEPENDS ${CMAKE_BINARY_DIR}/server)
|
||||||
|
|
||||||
|
install(
|
||||||
|
DIRECTORY "${CMAKE_BINARY_DIR}/server/plugins"
|
||||||
|
DESTINATION "${SPARK_INSTALL_PREFIX}/bin")
|
||||||
|
install(
|
||||||
|
FILES
|
||||||
|
"${SPARK_LIB}/libACE-5.7.5.so"
|
||||||
|
"${SPARK_LIB}/libOnixS.IceImpactMulticastPriceFeedHandlerCpp.so.3.16.0.0"
|
||||||
|
DESTINATION "${SPARK_INSTALL_PREFIX}/bin")
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
+83
-107
@@ -15,7 +15,7 @@
|
|||||||
"rhs": "Windows"
|
"rhs": "Windows"
|
||||||
},
|
},
|
||||||
"generator": "Visual Studio 17 2022",
|
"generator": "Visual Studio 17 2022",
|
||||||
"binaryDir": "${sourceDir}/build/${presetName}",
|
"binaryDir": "${sourceDir}/build",
|
||||||
"environment": {
|
"environment": {
|
||||||
"SPARK_CMAKE_CXX_FLAGS": "/MP /WX /wd4250 /wd4251 /wd4244 /wd4267 /wd4355 /wd4275 /wd4345 /bigobj /EHsc /DCURL_STATICLIB /D_WINSOCK_DEPRECATED_NO_WARNINGS /D__TBB_NO_IMPLICIT_LINKAGE /DBOOST_ALL_NO_LIB /std:c++20 /D_SCL_SECURE_NO_WARNINGS /D_CRT_SECURE_NO_WARNINGS /D_WIN32_WINNT=0x0600"
|
"SPARK_CMAKE_CXX_FLAGS": "/MP /WX /wd4250 /wd4251 /wd4244 /wd4267 /wd4355 /wd4275 /wd4345 /bigobj /EHsc /DCURL_STATICLIB /D_WINSOCK_DEPRECATED_NO_WARNINGS /D__TBB_NO_IMPLICIT_LINKAGE /DBOOST_ALL_NO_LIB /std:c++20 /D_SCL_SECURE_NO_WARNINGS /D_CRT_SECURE_NO_WARNINGS /D_WIN32_WINNT=0x0600"
|
||||||
},
|
},
|
||||||
@@ -29,11 +29,8 @@
|
|||||||
"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;${sourceDir}/build/$<CONFIG>/bin/net7.0-windows",
|
"DOTNET_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net7.0",
|
||||||
"EXPORT_MD_CONSUMER": {
|
"DOTNET_WINDOWS_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net7.0-windows"
|
||||||
"type": "BOOL",
|
|
||||||
"value": "ON"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -49,9 +46,13 @@
|
|||||||
"binaryDir": "${sourceDir}/build/${presetName}",
|
"binaryDir": "${sourceDir}/build/${presetName}",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"platform": "",
|
"platform": "",
|
||||||
|
"CMAKE_BUILD_WITH_INSTALL_RPATH": {
|
||||||
|
"type": "BOOL",
|
||||||
|
"value": "ON"
|
||||||
|
},
|
||||||
"CMAKE_CXX_STANDARD": "20",
|
"CMAKE_CXX_STANDARD": "20",
|
||||||
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
|
"CMAKE_INSTALL_RPATH": ".",
|
||||||
"CMAKE_PREFIX_PATH": "${sourceDir}/cmake/;${sourceDir}/.venv/lib/python3.10/site-packages/pybind11/share/cmake/pybind11",
|
"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": {
|
||||||
@@ -94,67 +95,98 @@
|
|||||||
{
|
{
|
||||||
"name": "sparkd-debug-clang",
|
"name": "sparkd-debug-clang",
|
||||||
"inherits": "sparkd-debug",
|
"inherits": "sparkd-debug",
|
||||||
"displayName": "Sparkd (Debug | Clang)",
|
"displayName": "Debug (clang)",
|
||||||
"description": "Debug build compiled w/ clang",
|
"description": "Debug build compiled w/ clang",
|
||||||
|
"binaryDir": "${sourceDir}/build/clang/debug",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"CMAKE_C_COMPILER": "clang",
|
"CMAKE_C_COMPILER": "clang",
|
||||||
"CMAKE_CXX_COMPILER": "clang++",
|
"CMAKE_CXX_COMPILER": "clang++",
|
||||||
"CMAKE_CXX_FLAGS_DEBUG": "-g -fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -DDEBUG"
|
"CMAKE_CXX_FLAGS_DEBUG": "-g -fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -DDEBUG",
|
||||||
|
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install/clang/debug/sparkd"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "sparkd-debug-gcc",
|
"name": "sparkd-debug-gcc",
|
||||||
"inherits": "sparkd-debug",
|
"inherits": "sparkd-debug",
|
||||||
"displayName": "Sparkd (Debug | Gcc)",
|
"displayName": "Debug (gcc)",
|
||||||
"description": "Debug build compiled w/ gcc",
|
"description": "Debug build compiled w/ gcc",
|
||||||
|
"binaryDir": "${sourceDir}/build/gcc/debug",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"CMAKE_C_COMPILER": "gcc",
|
"CMAKE_C_COMPILER": "gcc-12",
|
||||||
"CMAKE_CXX_COMPILER": "g++",
|
"CMAKE_CXX_COMPILER": "g++-12",
|
||||||
"CMAKE_CXX_FLAGS_DEBUG": "-g -fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -Wno-stringop-overread -DDEBUG"
|
"CMAKE_CXX_FLAGS_DEBUG": "-g -fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -Wno-stringop-overread -DDEBUG",
|
||||||
|
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install/gcc/debug/sparkd"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "sparkd-release-clang",
|
"name": "sparkd-release-clang",
|
||||||
"inherits": "sparkd-release",
|
"inherits": "sparkd-release",
|
||||||
"displayName": "Sparkd (Release | Clang)",
|
"displayName": "Release (clang)",
|
||||||
"description": "Release build compiled w/ clang",
|
"description": "Release build compiled w/ clang",
|
||||||
|
"binaryDir": "${sourceDir}/build/clang/release",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"CMAKE_C_COMPILER": "clang",
|
"CMAKE_C_COMPILER": "clang",
|
||||||
"CMAKE_CXX_COMPILER": "clang++",
|
"CMAKE_CXX_COMPILER": "clang++",
|
||||||
"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/clang/release/sparkd"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "sparkd-release-gcc",
|
"name": "sparkd-release-gcc",
|
||||||
"inherits": "sparkd-release",
|
"inherits": "sparkd-release",
|
||||||
"displayName": "Sparkd (Release | Gcc)",
|
"displayName": "Release (gcc)",
|
||||||
"description": "Release build compiled w/ gcc",
|
"description": "Release build compiled w/ gcc",
|
||||||
|
"binaryDir": "${sourceDir}/build/gcc/release",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"CMAKE_C_COMPILER": "gcc",
|
"CMAKE_C_COMPILER": "gcc",
|
||||||
"CMAKE_CXX_COMPILER": "g++",
|
"CMAKE_CXX_COMPILER": "g++",
|
||||||
"CMAKE_CXX_FLAGS_RELEASE": "-fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers -Wno-stringop-overflow --std=c++20 -fdiagnostics-color -Wno-stringop-overread -Wno-maybe-uninitialized -fno-omit-frame-pointer -DNDEBUG -O3"
|
"CMAKE_CXX_FLAGS_RELEASE": "-fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers -Wno-stringop-overflow --std=c++20 -fdiagnostics-color -Wno-stringop-overread -Wno-maybe-uninitialized -fno-omit-frame-pointer -DNDEBUG -O3",
|
||||||
|
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install/gcc/release/sparkd"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "spark-api-server-base",
|
||||||
|
"hidden": true,
|
||||||
|
"binaryDir": "${sourceDir}/build/${presetName}",
|
||||||
|
"cacheVariables": {
|
||||||
|
"BUILD_API_SERVER": {
|
||||||
|
"type": "bool",
|
||||||
|
"value": "ON"
|
||||||
|
},
|
||||||
|
"CONFIG_DEFAULTS_PATH": "config/profiles/md_dev/*.conf;config/profiles/default/*.conf"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "spark-api-server-windows",
|
"name": "spark-api-server-windows",
|
||||||
"inherits": "spark",
|
"inherits": "spark",
|
||||||
"displayName": "Spark Api Server (Windows)"
|
"displayName": "Spark Api Server",
|
||||||
|
"cacheVariables": {
|
||||||
|
"BUILD_API_SERVER": {
|
||||||
|
"type": "bool",
|
||||||
|
"value": "ON"
|
||||||
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "spark-api-server-linux",
|
"name": "spark-api-server-linux",
|
||||||
"inherits": "sparkd",
|
"inherits": "sparkd",
|
||||||
"displayName": "Spark Api Server (Linux)",
|
"displayName": "Spark Api Server",
|
||||||
"generator": "Ninja Multi-Config",
|
"generator": "Ninja Multi-Config",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"BUILD_ADMIN_WEB_APP": {
|
"BUILD_ADMIN_WEB_APP": {
|
||||||
"type": "BOOL",
|
"type": "BOOL",
|
||||||
"value": "OFF"
|
"value": "OFF"
|
||||||
},
|
},
|
||||||
|
"BUILD_API_SERVER": {
|
||||||
|
"type": "bool",
|
||||||
|
"value": "ON"
|
||||||
|
},
|
||||||
"BUILD_SPARKD": {
|
"BUILD_SPARKD": {
|
||||||
"type": "BOOL",
|
"type": "BOOL",
|
||||||
"value": "OFF"
|
"value": "OFF"
|
||||||
@@ -163,16 +195,9 @@
|
|||||||
"CMAKE_CXX_COMPILER": "clang++",
|
"CMAKE_CXX_COMPILER": "clang++",
|
||||||
"CMAKE_CXX_FLAGS_DEBUG": "-g -fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -DDEBUG",
|
"CMAKE_CXX_FLAGS_DEBUG": "-g -fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -DDEBUG",
|
||||||
"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_EXPORT_COMPILE_COMMANDS": {
|
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
|
||||||
"type": "BOOL",
|
|
||||||
"value": "ON"
|
|
||||||
},
|
|
||||||
"CONFIG_DEFAULTS_PATH": "config/profiles/default/*.conf",
|
"CONFIG_DEFAULTS_PATH": "config/profiles/default/*.conf",
|
||||||
"DOTNET_BINARY_DIR": "${sourceDir}/build/Spark.Api.Server/$<CONFIG>/bin/net7.0",
|
"DOTNET_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net7.0"
|
||||||
"EXPORT_MD_CONSUMER": {
|
|
||||||
"type": "BOOL",
|
|
||||||
"value": "ON"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -195,57 +220,13 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "data-stream-suite-windows",
|
"name": "data-stream-suite",
|
||||||
"condition": {
|
|
||||||
"type": "equals",
|
|
||||||
"lhs": "${hostSystemName}",
|
|
||||||
"rhs": "Windows"
|
|
||||||
},
|
|
||||||
"inherits": "spark",
|
"inherits": "spark",
|
||||||
"displayName": "Data Stream Suite (Windows)",
|
"displayName": "Data Stream Suite",
|
||||||
"description": "Data Stream utils ported over from Edge",
|
"description": "Data Stream utils ported over from Edge",
|
||||||
"binaryDir": "${sourceDir}/build/${presetName}",
|
"binaryDir": "${sourceDir}/build/${presetName}",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"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"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "data-stream-suite-linux",
|
|
||||||
"displayName": "Data Stream Suite (Linux)",
|
|
||||||
"description": "Data Stream utils ported over from Edge",
|
|
||||||
"condition": {
|
|
||||||
"type": "equals",
|
|
||||||
"lhs": "${hostSystemName}",
|
|
||||||
"rhs": "Linux"
|
|
||||||
},
|
|
||||||
"inherits": "sparkd",
|
|
||||||
"generator": "Ninja Multi-Config",
|
|
||||||
"cacheVariables": {
|
|
||||||
"BUILD_ADMIN_WEB_APP": {
|
|
||||||
"type": "BOOL",
|
|
||||||
"value": "OFF"
|
|
||||||
},
|
|
||||||
"BUILD_SDK": {
|
|
||||||
"type": "BOOL",
|
|
||||||
"value": "OFF"
|
|
||||||
},
|
|
||||||
"BUILD_SPARKD": {
|
|
||||||
"type": "BOOL",
|
|
||||||
"value": "OFF"
|
|
||||||
},
|
|
||||||
"CMAKE_C_COMPILER": "clang",
|
|
||||||
"CMAKE_CXX_COMPILER": "clang++",
|
|
||||||
"CMAKE_CXX_FLAGS_DEBUG": "-g -fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -DDEBUG",
|
|
||||||
"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",
|
|
||||||
"CONFIG_DEFAULTS_PATH": "config/profiles/default/*.conf;config/profiles/data_stream/*.conf",
|
|
||||||
"CONFIG_PROFILES": "default;data_stream",
|
|
||||||
"DOTNET_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net7.0;${sourceDir}/build/$<CONFIG>/bin/net8.0",
|
|
||||||
"EXPORT_MD_CONSUMER": {
|
|
||||||
"type": "BOOL",
|
|
||||||
"value": "ON"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
@@ -263,7 +244,7 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
"name": "spark-debug",
|
"name": "spark-debug",
|
||||||
"displayName": "Spark (Debug)",
|
"displayName": "Debug",
|
||||||
"inherits": "spark",
|
"inherits": "spark",
|
||||||
"configurePreset": "spark",
|
"configurePreset": "spark",
|
||||||
"configuration": "Debug"
|
"configuration": "Debug"
|
||||||
@@ -271,7 +252,7 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
"name": "spark-release",
|
"name": "spark-release",
|
||||||
"displayName": "Spark (Release)",
|
"displayName": "Release",
|
||||||
"inherits": "spark",
|
"inherits": "spark",
|
||||||
"configurePreset": "spark",
|
"configurePreset": "spark",
|
||||||
"configuration": "Release"
|
"configuration": "Release"
|
||||||
@@ -284,34 +265,43 @@
|
|||||||
"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"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "sparkd-debug-clang",
|
"name": "sparkd-debug-clang",
|
||||||
"configurePreset": "sparkd-debug-clang",
|
"configurePreset": "sparkd-debug-clang",
|
||||||
"displayName": "Sparkd (Debug | Clang)",
|
"displayName": "Debug (clang)",
|
||||||
"inherits": "sparkd"
|
"inherits": "sparkd"
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "sparkd-debug-gcc",
|
"name": "sparkd-debug-gcc",
|
||||||
"configurePreset": "sparkd-debug-gcc",
|
"configurePreset": "sparkd-debug-gcc",
|
||||||
"displayName": "Sparkd (Debug | Gcc)",
|
"displayName": "Debug (gcc)",
|
||||||
"inherits": "sparkd"
|
"inherits": "sparkd"
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "sparkd-release-clang",
|
"name": "sparkd-release-clang",
|
||||||
"configurePreset": "sparkd-release-clang",
|
"configurePreset": "sparkd-release-clang",
|
||||||
"displayName": "Sparkd (Release | Clang)",
|
"displayName": "Release (clang)",
|
||||||
"inherits": "sparkd"
|
"inherits": "sparkd"
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "sparkd-release-gcc",
|
"name": "sparkd-release-gcc",
|
||||||
"configurePreset": "sparkd-release-gcc",
|
"configurePreset": "sparkd-release-gcc",
|
||||||
"displayName": "Sparkd (Release | Gcc)",
|
"displayName": "Release (gcc)",
|
||||||
"inherits": "sparkd"
|
"inherits": "sparkd"
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -328,14 +318,14 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
"name": "spark-api-server-windows-debug",
|
"name": "spark-api-server-windows-debug",
|
||||||
"displayName": "Spark Api Server (Windows | Debug)",
|
"displayName": "Spark Api Server (Debug)",
|
||||||
"inherits": "spark-api-server-windows",
|
"inherits": "spark-api-server-windows",
|
||||||
"configuration": "Debug"
|
"configuration": "Debug"
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "spark-api-server-windows-release",
|
"name": "spark-api-server-windows-release",
|
||||||
"displayName": "Spark Api Server (Windows | Release)",
|
"displayName": "Spark Api Server (Debug)",
|
||||||
"inherits": "spark-api-server-windows",
|
"inherits": "spark-api-server-windows",
|
||||||
"configuration": "Release"
|
"configuration": "Release"
|
||||||
},
|
},
|
||||||
@@ -354,14 +344,14 @@
|
|||||||
{
|
{
|
||||||
"name": "spark-api-server-linux-debug",
|
"name": "spark-api-server-linux-debug",
|
||||||
"inherits": "spark-api-server-linux",
|
"inherits": "spark-api-server-linux",
|
||||||
"displayName": "Spark Api Server (Linux | Debug)",
|
"displayName": "Spark Api Server (Debug)",
|
||||||
"configuration": "Debug"
|
"configuration": "Debug"
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "spark-api-server-linux-release",
|
"name": "spark-api-server-linux-release",
|
||||||
"inherits": "spark-api-server-linux",
|
"inherits": "spark-api-server-linux",
|
||||||
"displayName": "Spark Api Server (Linux | Release)",
|
"displayName": "Spark Api Server (Release)",
|
||||||
"configuration": "Release"
|
"configuration": "Release"
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -381,30 +371,16 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "data-stream-suite-windows-debug",
|
"name": "data-stream-suite-debug",
|
||||||
"displayName": "Data Stream Suite (Windows | Debug)",
|
"displayName": "DataStreamSuite (Debug)",
|
||||||
"configurePreset": "data-stream-suite-windows",
|
"configurePreset": "data-stream-suite",
|
||||||
"configuration": "Debug"
|
"configuration": "Debug"
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "data-stream-suite-windows-release",
|
"name": "data-stream-suite-release",
|
||||||
"displayName": "Data Stream Suite (Windows | Release)",
|
"displayName": "DataStreamSuite (Release)",
|
||||||
"configurePreset": "data-stream-suite-windows",
|
"configurePreset": "data-stream-suite",
|
||||||
"configuration": "Release"
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "data-stream-suite-linux-debug",
|
|
||||||
"displayName": "Data Stream Suite (Linux | Debug)",
|
|
||||||
"configurePreset": "data-stream-suite-linux",
|
|
||||||
"configuration": "Debug"
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "data-stream-suite-linux-release",
|
|
||||||
"displayName": "Data Stream Suite (Linux | Release)",
|
|
||||||
"configurePreset": "data-stream-suite-linux",
|
|
||||||
"configuration": "Release"
|
"configuration": "Release"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -1,66 +0,0 @@
|
|||||||
function(init_executable)
|
|
||||||
set(source_dir)
|
|
||||||
if (${ARGC} EQUAL 0)
|
|
||||||
set(source_dir ${PROJECT_NAME})
|
|
||||||
elseif(${ARGC} GREATER 1)
|
|
||||||
message(FATAL_ERROR "init_shared_library received invalid arguments. Usage: init_shared_library(<OPTIONAL:source_dir>)")
|
|
||||||
else()
|
|
||||||
set(source_dir ${ARGV})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(_options)
|
|
||||||
set(_one_value_args CXX_SOURCES CXX_HEADERS CXX_OUT_DIR)
|
|
||||||
set(_multi_value_args PROTO_INCLUDE_DIRS PROTO_SOURCES)
|
|
||||||
cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
|
|
||||||
if (${_ARGS_PROTO_SOURCES} EQUAL "GLOB_RECURSIVE")
|
|
||||||
file(
|
|
||||||
GLOB_RECURSE ${PROJECT_NAME}_PROTO_SOURCES
|
|
||||||
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
|
|
||||||
*.proto
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(${PROJECT_NAME}_SOURCES PARENT_SCOPE)
|
|
||||||
file(
|
|
||||||
GLOB_RECURSE ${PROJECT_NAME}_SOURCES
|
|
||||||
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
|
|
||||||
${source_dir}/*.cpp
|
|
||||||
)
|
|
||||||
set(${PROJECT_NAME}_SOURCES ${${PROJECT_NAME}_SOURCES} PARENT_SCOPE)
|
|
||||||
# set(${PROJECT_NAME}_Sources ${${PROJECT_NAME}_Sources} PARENT_SCOPE)
|
|
||||||
# Note: cpp files inside 'tests' dir(s) are considered tests.
|
|
||||||
# Remove tests from main sources, and add them to test sources
|
|
||||||
set(${PROJECT_NAME}_TEST_SOURCES)
|
|
||||||
foreach(item ${${PROJECT_NAME}_SOURCES})
|
|
||||||
if(${item} MATCHES "tests/*.cpp")
|
|
||||||
list(REMOVE_ITEM ${PROJECT_NAME}_SOURCES ${item})
|
|
||||||
list(APPEND ${PROJECT_NAME}_TEST_SOURCES ${item})
|
|
||||||
endif()
|
|
||||||
set(${PROJECT_NAME}_TEST_SOURCES ${${PROJECT_NAME}_TEST_SOURCES} PARENT_SCOPE)
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
# Add executable
|
|
||||||
add_executable(${PROJECT_NAME} ${${PROJECT_NAME}_SOURCES})
|
|
||||||
target_include_directories(
|
|
||||||
${PROJECT_NAME}
|
|
||||||
PUBLIC
|
|
||||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
|
|
||||||
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
|
|
||||||
)
|
|
||||||
|
|
||||||
target_link_directories(
|
|
||||||
${PROJECT_NAME}
|
|
||||||
PUBLIC
|
|
||||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
|
|
||||||
$<INSTALL_INTERFACE:${CMAKE_INSTALL_LIBDIR}>
|
|
||||||
)
|
|
||||||
|
|
||||||
# Add tests executable (if there are any)
|
|
||||||
if (${PROJECT_NAME}_TEST_SOURCES)
|
|
||||||
add_executable(${PROJECT_NAME}-tests ${${PROJECT_NAME}_TEST_SOURCEs})
|
|
||||||
target_link_libraries(${PROJECT_NAME}-tests PRIVATE ${PROJECT_NAME})
|
|
||||||
# Catch2
|
|
||||||
find_package(Catch2 CONFIG REQUIRED COMPONENTS Catch2WithMain)
|
|
||||||
target_link_libraries(${PROJECT_NAME}-tests PRIVATE Catch2::Catch2WithMain)
|
|
||||||
endif()
|
|
||||||
endfunction()
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
function(init_shared_library)
|
|
||||||
set(source_dir)
|
|
||||||
if (${ARGC} EQUAL 0)
|
|
||||||
set(source_dir ${PROJECT_NAME})
|
|
||||||
elseif(${ARGC} GREATER 1)
|
|
||||||
message(FATAL_ERROR "init_shared_library received invalid arguments. Usage: init_shared_library(<OPTIONAL:source_dir>)")
|
|
||||||
else()
|
|
||||||
set(source_dir ${ARGV})
|
|
||||||
endif()
|
|
||||||
set(${PROJECT_NAME}_Sources PARENT_SCOPE)
|
|
||||||
file(
|
|
||||||
GLOB_RECURSE ${PROJECT_NAME}_Sources
|
|
||||||
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
|
|
||||||
${source_dir}/*.cpp)
|
|
||||||
set(${PROJECT_NAME}_Sources ${${PROJECT_NAME}_Sources} PARENT_SCOPE)
|
|
||||||
# set(${PROJECT_NAME}_Sources ${${PROJECT_NAME}_Sources} PARENT_SCOPE)
|
|
||||||
# Note: cpp files inside 'tests' dir(s) are considered tests.
|
|
||||||
# Remove tests from main sources, and add them to test sources
|
|
||||||
set(${PROJECT_NAME}_Test_Sources)
|
|
||||||
foreach(item ${${PROJECT_NAME}_Sources})
|
|
||||||
if(${item} MATCHES "tests/*.cpp")
|
|
||||||
list(REMOVE_ITEM ${PROJECT_NAME}_Sources ${item})
|
|
||||||
list(APPEND ${PROJECT_NAME}_Test_Sources ${item})
|
|
||||||
endif()
|
|
||||||
set(${PROJECT_NAME}_Test_Sources ${${PROJECT_NAME}_Test_Sources} PARENT_SCOPE)
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
# Add main library
|
|
||||||
add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}_Sources})
|
|
||||||
target_include_directories(
|
|
||||||
${PROJECT_NAME}
|
|
||||||
PUBLIC
|
|
||||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
|
|
||||||
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
|
|
||||||
)
|
|
||||||
|
|
||||||
target_link_directories(
|
|
||||||
${PROJECT_NAME}
|
|
||||||
PUBLIC
|
|
||||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
|
|
||||||
$<INSTALL_INTERFACE:${CMAKE_INSTALL_LIBDIR}>
|
|
||||||
)
|
|
||||||
|
|
||||||
# Add tests executable (if there are any)
|
|
||||||
if (${PROJECT_NAME}_Test_Sources)
|
|
||||||
add_executable(${PROJECT_NAME}-tests ${${PROJECT_NAME}_Test_Sources})
|
|
||||||
target_link_libraries(${PROJECT_NAME}-tests PRIVATE ${PROJECT_NAME})
|
|
||||||
# Catch2
|
|
||||||
find_package(Catch2 CONFIG REQUIRED COMPONENTS Catch2WithMain)
|
|
||||||
target_link_libraries(${PROJECT_NAME}-tests PRIVATE Catch2::Catch2WithMain)
|
|
||||||
endif()
|
|
||||||
endfunction(init_shared_library)
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
include(${CMAKE_SOURCE_DIR}/cmake/PackBasic.cmake)
|
|
||||||
|
|
||||||
function(install_basic_config)
|
|
||||||
file(
|
|
||||||
GLOB_RECURSE ${PROJECT_NAME}_HEADERS
|
|
||||||
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
|
|
||||||
*.h)
|
|
||||||
|
|
||||||
target_sources(${PROJECT_NAME}
|
|
||||||
PUBLIC
|
|
||||||
FILE_SET HEADERS FILES ${${PROJECT_NAME}_HEADERS})
|
|
||||||
|
|
||||||
install(
|
|
||||||
TARGETS ${PROJECT_NAME}
|
|
||||||
EXPORT ${PROJECT_NAME}Targets
|
|
||||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
||||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
||||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
||||||
FILE_SET HEADERS DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
|
|
||||||
)
|
|
||||||
|
|
||||||
install(
|
|
||||||
EXPORT ${PROJECT_NAME}Targets
|
|
||||||
FILE ${PROJECT_NAME}Targets.cmake
|
|
||||||
NAMESPACE ${PROJECT_NAME}::
|
|
||||||
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
|
|
||||||
|
|
||||||
pack_basic()
|
|
||||||
endfunction()
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
include(CMakePackageConfigHelpers)
|
|
||||||
|
|
||||||
function(pack_basic)
|
|
||||||
write_basic_package_version_file(
|
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
|
|
||||||
VERSION ${PROJECT_VERSION}
|
|
||||||
COMPATIBILITY AnyNewerVersion
|
|
||||||
)
|
|
||||||
|
|
||||||
configure_package_config_file(
|
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in"
|
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
|
|
||||||
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
|
|
||||||
)
|
|
||||||
|
|
||||||
install(
|
|
||||||
FILES
|
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
|
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
|
|
||||||
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
|
|
||||||
endfunction()
|
|
||||||
+63
-85
@@ -1,23 +1,12 @@
|
|||||||
set(Protobuf_PROTOC_EXECUTABLE "${EXTERNALS_BIN}/protoc")
|
set(Protobuf_PROTOC_EXECUTABLE "${SPARK_BIN}/protoc")
|
||||||
set(PROTOBUF_INCLUDE_DIRS "${EXTERNALS_INCLUDE}")
|
set(PROTOBUF_INCLUDE_DIRS "${SPARK_INCLUDE}")
|
||||||
set(PROTOBUF_STATIC_LIB "libprotobuf")
|
set(PROTOBUF_STATIC_LIB "libprotobuf")
|
||||||
set(_protobuf_src_dir ${CMAKE_SOURCE_DIR}/src/lib_spark)
|
|
||||||
set(_protobuf_bin_dir ${CMAKE_BINARY_DIR}/src/lib_spark)
|
|
||||||
|
|
||||||
function(Protobuf_Generate_Cpp)
|
function(Protobuf_Generate_Cpp SRCS HDRS)
|
||||||
set(_options)
|
set(${SRCS})
|
||||||
set(_one_value_args CXX_SOURCES CXX_HEADERS CXX_OUT_DIR)
|
set(${HDRS})
|
||||||
set(_multi_value_args PROTO_INCLUDE_DIRS PROTO_SOURCES)
|
|
||||||
cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
|
|
||||||
set(${_ARGS_CXX_SOURCES})
|
|
||||||
set(${_ARGS_CXX_HEADERS})
|
|
||||||
|
|
||||||
set(_proto_include_cli_args)
|
foreach(FIL ${ARGN})
|
||||||
foreach(_dir ${_ARGS_PROTO_INCLUDE_DIRS})
|
|
||||||
list(APPEND _proto_include_cli_args -I ${_dir})
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
foreach(FIL ${_ARGS_PROTO_SOURCES})
|
|
||||||
get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
|
get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
|
||||||
get_filename_component(FIL_WE ${FIL} NAME_WE)
|
get_filename_component(FIL_WE ${FIL} NAME_WE)
|
||||||
get_filename_component(FIL_DIR ${FIL} DIRECTORY)
|
get_filename_component(FIL_DIR ${FIL} DIRECTORY)
|
||||||
@@ -25,59 +14,48 @@ set(_options)
|
|||||||
set(FIL_WE "${FIL_DIR}/${FIL_WE}")
|
set(FIL_WE "${FIL_DIR}/${FIL_WE}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc")
|
list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc")
|
||||||
list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h")
|
list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h")
|
||||||
|
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT
|
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc"
|
||||||
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc"
|
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h"
|
||||||
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h"
|
|
||||||
COMMAND
|
COMMAND
|
||||||
${Protobuf_PROTOC_EXECUTABLE}
|
${Protobuf_PROTOC_EXECUTABLE} ARGS --cpp_out=${CMAKE_BINARY_DIR}/src -I
|
||||||
ARGS
|
${PROTOBUF_INCLUDE_DIRS} -I ${CMAKE_SOURCE_DIR}/src ${ABS_FIL}
|
||||||
--cpp_out=${_ARGS_CXX_OUT_DIR} ${_proto_include_cli_args} ${ABS_FIL}
|
|
||||||
DEPENDS ${ABS_FIL}
|
DEPENDS ${ABS_FIL}
|
||||||
COMMENT "Running C++ protocol buffer compiler on ${FIL}"
|
COMMENT "Running C++ protocol buffer compiler on ${FIL}"
|
||||||
VERBATIM)
|
VERBATIM)
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
set_source_files_properties(${${_ARGS_CXX_SOURCES}} ${${_ARGS_CXX_HEADERS}} PROPERTIES GENERATED TRUE)
|
set_source_files_properties(${${SRCS}} ${${HDRS}} PROPERTIES GENERATED TRUE)
|
||||||
|
|
||||||
# remove some warnings from protobuf generated files
|
# remove some warnings from protobuf generated files
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
set_source_files_properties(${${_ARGS_CXX_SOURCES}} PROPERTIES COMPILE_FLAGS
|
set_source_files_properties(${${SRCS}} PROPERTIES COMPILE_FLAGS
|
||||||
"/wd4309 /wd4838")
|
"/wd4309 /wd4838")
|
||||||
else()
|
else()
|
||||||
set_source_files_properties(
|
set_source_files_properties(
|
||||||
${${_ARGS_CXX_SOURCES}}
|
${${SRCS}}
|
||||||
PROPERTIES
|
PROPERTIES
|
||||||
COMPILE_FLAGS
|
COMPILE_FLAGS
|
||||||
"-Wno-unused-parameter -Wno-effc++ -Wno-pedantic -Wno-sign-compare -Wno-uninitialized"
|
"-Wno-unused-parameter -Wno-effc++ -Wno-pedantic -Wno-sign-compare -Wno-uninitialized"
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(${_ARGS_CXX_SOURCES}
|
set(${SRCS}
|
||||||
${${_ARGS_CXX_SOURCES}}
|
${${SRCS}}
|
||||||
PARENT_SCOPE)
|
PARENT_SCOPE)
|
||||||
set(${_ARGS_CXX_HEADERS}
|
set(${HDRS}
|
||||||
${${_ARGS_CXX_HEADERS}}
|
${${HDRS}}
|
||||||
PARENT_SCOPE)
|
PARENT_SCOPE)
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
function(Service_Compiler_Generate_Cpp)
|
function(Service_Compiler_Generate_Cpp SRCS HDRS)
|
||||||
set(_options)
|
set(${SRCS})
|
||||||
set(_one_value_args CXX_SOURCES CXX_HEADERS CXX_OUT_DIR)
|
set(${HDRS})
|
||||||
set(_multi_value_args PROTO_INCLUDE_DIRS PROTO_SOURCES)
|
|
||||||
cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
|
|
||||||
set(${_ARGS_CXX_SOURCES})
|
|
||||||
set(${_ARGS_CXX_HEADERS})
|
|
||||||
|
|
||||||
set(_proto_include_cli_args)
|
foreach(FIL ${ARGN})
|
||||||
foreach(_dir ${_ARGS_PROTO_INCLUDE_DIRS})
|
|
||||||
list(APPEND _proto_include_cli_args -I ${_dir})
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
foreach(FIL ${_ARGS_PROTO_SOURCES})
|
|
||||||
get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
|
get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
|
||||||
get_filename_component(FIL_WE ${FIL} NAME_WE)
|
get_filename_component(FIL_WE ${FIL} NAME_WE)
|
||||||
get_filename_component(FIL_DIR ${FIL} DIRECTORY)
|
get_filename_component(FIL_DIR ${FIL} DIRECTORY)
|
||||||
@@ -85,58 +63,58 @@ function(Service_Compiler_Generate_Cpp)
|
|||||||
set(FIL_WE "${FIL_DIR}/${FIL_WE}")
|
set(FIL_WE "${FIL_DIR}/${FIL_WE}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc")
|
list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc")
|
||||||
list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h")
|
list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h")
|
||||||
|
|
||||||
list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.cc")
|
list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.cc")
|
||||||
list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.h")
|
list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.h")
|
||||||
|
|
||||||
list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.cc")
|
list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.cc")
|
||||||
list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.h")
|
list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.h")
|
||||||
|
|
||||||
set(TEMPLATES
|
set(TEMPLATES
|
||||||
${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/templates/cpp/client.pb.cc
|
${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/client.pb.cc
|
||||||
${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/templates/cpp/client.pb.h
|
${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/client.pb.h
|
||||||
${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/templates/cpp/server.pb.cc
|
${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/server.pb.cc
|
||||||
${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/templates/cpp/server.pb.h
|
${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/server.pb.h
|
||||||
)
|
)
|
||||||
|
|
||||||
set(_plugin_py ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/plugin.py)
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
set(_plugin_cmd ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/plugin.cmd)
|
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc"
|
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc"
|
||||||
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h"
|
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h"
|
||||||
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.cc"
|
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.cc"
|
||||||
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.h"
|
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.h"
|
||||||
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.cc"
|
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.cc"
|
||||||
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.h"
|
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.h"
|
||||||
COMMAND SET PYTHONPATH=${SPARK_PYTHON}
|
COMMAND SET PYTHONPATH=${SPARK_PYTHON}
|
||||||
COMMAND ${CMAKE_SOURCE_DIR}/.venv/Scripts/activate.bat
|
COMMAND ${CMAKE_SOURCE_DIR}/.venv/Scripts/activate.bat
|
||||||
COMMAND
|
COMMAND
|
||||||
${Protobuf_PROTOC_EXECUTABLE} ARGS --cpp_out=${_ARGS_CXX_OUT_DIR}
|
${Protobuf_PROTOC_EXECUTABLE} ARGS --cpp_out=${CMAKE_BINARY_DIR}/src
|
||||||
--plugin=protoc-gen-service=${_plugin_cmd}
|
--plugin=protoc-gen-service=${CMAKE_SOURCE_DIR}/src/lib/api/service_compiler/plugin.cmd
|
||||||
--service_out=lang=cpp:${_ARGS_CXX_OUT_DIR} -I
|
--service_out=lang=cpp:${CMAKE_BINARY_DIR}/src -I
|
||||||
${PROTOBUF_INCLUDE_DIRS} -I ${_protobuf_src_dir} ${ABS_FIL}
|
${PROTOBUF_INCLUDE_DIRS} -I ${CMAKE_SOURCE_DIR}/src ${ABS_FIL}
|
||||||
DEPENDS ${ABS_FIL} ${TEMPLATES} ${_plugin_cmd} ${_plugin_py}
|
DEPENDS ${ABS_FIL} ${TEMPLATES}
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/plugin.py
|
||||||
COMMENT "Running C++ service compiler on ${FIL}"
|
COMMENT "Running C++ service compiler on ${FIL}"
|
||||||
VERBATIM)
|
VERBATIM)
|
||||||
else()
|
else()
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc"
|
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc"
|
||||||
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h"
|
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h"
|
||||||
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.cc"
|
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.cc"
|
||||||
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.h"
|
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.h"
|
||||||
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.cc"
|
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.cc"
|
||||||
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.h"
|
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.h"
|
||||||
COMMAND ${CMAKE_SOURCE_DIR}/tools/venv_exec.sh
|
COMMAND ${CMAKE_SOURCE_DIR}/tools/venv_exec.sh
|
||||||
ARGS
|
ARGS
|
||||||
${Protobuf_PROTOC_EXECUTABLE}
|
${Protobuf_PROTOC_EXECUTABLE}
|
||||||
--cpp_out=${_ARGS_CXX_OUT_DIR}
|
--cpp_out=${CMAKE_BINARY_DIR}/src
|
||||||
--plugin=protoc-gen-service=${_plugin_py}
|
--plugin=protoc-gen-service=${CMAKE_SOURCE_DIR}/src/lib/api/service_compiler/plugin.py
|
||||||
--service_out=lang=cpp,make_file_name=${ABS_FIL}:${_ARGS_CXX_OUT_DIR}
|
--service_out=lang=cpp,make_file_name=${ABS_FIL}:${CMAKE_BINARY_DIR}/src
|
||||||
${_proto_include_cli_args} ${ABS_FIL}
|
-I ${PROTOBUF_INCLUDE_DIRS} -I ${CMAKE_SOURCE_DIR}/src ${ABS_FIL}
|
||||||
DEPENDS ${ABS_FIL} ${TEMPLATES} ${_plugin_py}
|
DEPENDS ${ABS_FIL} ${TEMPLATES}
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/plugin.py
|
||||||
COMMENT "Running C++ service compiler on ${FIL}"
|
COMMENT "Running C++ service compiler on ${FIL}"
|
||||||
VERBATIM)
|
VERBATIM)
|
||||||
endif()
|
endif()
|
||||||
@@ -145,22 +123,22 @@ function(Service_Compiler_Generate_Cpp)
|
|||||||
|
|
||||||
# remove some warnings from protobuf generated files
|
# remove some warnings from protobuf generated files
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
set_source_files_properties(${${_ARGS_CXX_SOURCES}} PROPERTIES COMPILE_FLAGS
|
set_source_files_properties(${${SRCS}} PROPERTIES COMPILE_FLAGS
|
||||||
"/wd4309 /wd4838")
|
"/wd4309 /wd4838")
|
||||||
else()
|
else()
|
||||||
set_source_files_properties(
|
set_source_files_properties(
|
||||||
${${_ARGS_CXX_SOURCES}}
|
${${SRCS}}
|
||||||
PROPERTIES
|
PROPERTIES
|
||||||
COMPILE_FLAGS
|
COMPILE_FLAGS
|
||||||
"-Wno-unused-parameter -Wno-effc++ -Wno-pedantic -Wno-sign-compare -Wno-uninitialized"
|
"-Wno-unused-parameter -Wno-effc++ -Wno-pedantic -Wno-sign-compare -Wno-uninitialized"
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(${_ARGS_CXX_SOURCES}
|
set(${SRCS}
|
||||||
${${_ARGS_CXX_SOURCES}}
|
${${SRCS}}
|
||||||
PARENT_SCOPE)
|
PARENT_SCOPE)
|
||||||
set(${_ARGS_CXX_HEADERS}
|
set(${HDRS}
|
||||||
${${_ARGS_CXX_HEADERS}}
|
${${HDRS}}
|
||||||
PARENT_SCOPE)
|
PARENT_SCOPE)
|
||||||
|
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
macro(set_first_defined RESULT CANDIDATE_VARS)
|
|
||||||
foreach(_candidate_var ${CANDIDATE_VARS})
|
|
||||||
if (DEFINED _candidate_var)
|
|
||||||
set(${RESULT} ${_candidate_var})
|
|
||||||
break()
|
|
||||||
endif()
|
|
||||||
endforeach()
|
|
||||||
endmacro()
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
function(sym_link_dir TARGET_NAME SOURCE DEST)
|
|
||||||
add_custom_command(
|
|
||||||
OUTPUT ${DEST}
|
|
||||||
COMMAND ln ARGS -sf ${SOURCE} ${DEST}
|
|
||||||
)
|
|
||||||
add_custom_target(
|
|
||||||
${TARGET_NAME} ALL
|
|
||||||
DEPENDS ${DEST}
|
|
||||||
)
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
function(sym_link_file)
|
|
||||||
set(_options)
|
|
||||||
set(_one_value_args TARGET_NAME SOURCE DEST INSTALL_DEST)
|
|
||||||
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 -s ${_ARGS_SOURCE} ${_ARGS_DEST}
|
|
||||||
)
|
|
||||||
add_custom_target(
|
|
||||||
${_ARGS_TARGET_NAME} ALL
|
|
||||||
DEPENDS ${_ARGS_DEST}
|
|
||||||
)
|
|
||||||
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,7 +0,0 @@
|
|||||||
macro(set_ternary RESULT CONDITION TRUE_VALUE FALSE_VALUE)
|
|
||||||
if(${CONDITION})
|
|
||||||
set(${RESULT} ${TRUE_VALUE})
|
|
||||||
else()
|
|
||||||
set(${RESULT} ${FALSE_VALUE})
|
|
||||||
endif()
|
|
||||||
endmacro()
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
services:
|
|
||||||
sparkd:
|
|
||||||
build:
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
context: ./sparkd
|
|
||||||
command: [ "./sparkd", "run" ]
|
|
||||||
ports: [ "8000:8000", "8001:8001", "8002:8002" ]
|
|
||||||
|
|
||||||
pubsub:
|
|
||||||
build:
|
|
||||||
dockerfile: pubsub.Dockerfile
|
|
||||||
context: ./DataStream
|
|
||||||
command: [ "./PubSubServer" ]
|
|
||||||
environment:
|
|
||||||
- DOTNET_ENVIRONMENT=Production
|
|
||||||
ports:
|
|
||||||
- 22019:22019
|
|
||||||
|
|
||||||
md-publisher:
|
|
||||||
build:
|
|
||||||
dockerfile: md-publisher.Dockerfile
|
|
||||||
context: ./DataStream
|
|
||||||
depends_on:
|
|
||||||
- pubsub
|
|
||||||
- sparkd
|
|
||||||
command:
|
|
||||||
[
|
|
||||||
"dockerize",
|
|
||||||
"-wait",
|
|
||||||
"tcp://pubsub:22019",
|
|
||||||
"-wait",
|
|
||||||
"tcp://sparkd:8000",
|
|
||||||
"-timeout",
|
|
||||||
"10s",
|
|
||||||
"./DataStreamPublisher"
|
|
||||||
]
|
|
||||||
environment:
|
|
||||||
- DOTNET_ENVIRONMENT=MarketData
|
|
||||||
|
|
||||||
webapp:
|
|
||||||
ports:
|
|
||||||
- 8080:8080
|
|
||||||
- 8443:8443
|
|
||||||
build:
|
|
||||||
dockerfile: webapp.Dockerfile
|
|
||||||
context: ./DataStream
|
|
||||||
command: [ "./Bts.DataStreamWebApp.Server" ]
|
|
||||||
environment:
|
|
||||||
- ASPNETCORE_HTTP_PORT=8080
|
|
||||||
- ASPNETCORE_HTTPS_PORT=8443
|
|
||||||
- ASPNETCORE_ENVIRONMENT=Staging
|
|
||||||
@@ -1,72 +0,0 @@
|
|||||||
services:
|
|
||||||
sparkd:
|
|
||||||
build:
|
|
||||||
dockerfile: src/server/sparkd/Dockerfile
|
|
||||||
command: [ "./sparkd", "run" ]
|
|
||||||
ports: [ "8000:8000", "8001:8001", "8002:8002" ]
|
|
||||||
|
|
||||||
pubsub:
|
|
||||||
environment:
|
|
||||||
- DOTNET_ENVIRONMENT=Staging
|
|
||||||
build:
|
|
||||||
dockerfile: src/DataStreamSuite/PubSubServer/Dockerfile
|
|
||||||
ports:
|
|
||||||
- 22019:22019
|
|
||||||
command: [ "./PubSubServer" ]
|
|
||||||
|
|
||||||
md-publisher:
|
|
||||||
build:
|
|
||||||
dockerfile: src/DataStreamSuite/DataStreamPublisher/Dockerfile
|
|
||||||
depends_on:
|
|
||||||
- pubsub
|
|
||||||
- sparkd
|
|
||||||
command:
|
|
||||||
[
|
|
||||||
"dockerize",
|
|
||||||
"-wait",
|
|
||||||
"tcp://pubsub:22019",
|
|
||||||
"-wait",
|
|
||||||
"tcp://sparkd:8000",
|
|
||||||
"-timeout",
|
|
||||||
"10s",
|
|
||||||
"./DataStreamPublisher"
|
|
||||||
]
|
|
||||||
environment:
|
|
||||||
- DOTNET_ENVIRONMENT=MarketData
|
|
||||||
|
|
||||||
webapp:
|
|
||||||
ports:
|
|
||||||
- 8080:8080
|
|
||||||
- 8443:8443
|
|
||||||
build:
|
|
||||||
dockerfile: src/DataStreamSuite/Bts.DataStreamWebApp.Server/Dockerfile
|
|
||||||
command: [ "./Bts.DataStreamWebApp.Server" ]
|
|
||||||
environment:
|
|
||||||
- ASPNETCORE_ENVIRONMENT=Staging
|
|
||||||
|
|
||||||
api-server:
|
|
||||||
profiles:
|
|
||||||
- api-server
|
|
||||||
depends_on:
|
|
||||||
- sparkd
|
|
||||||
ports:
|
|
||||||
- 8008:8008
|
|
||||||
- 9443:9443
|
|
||||||
build:
|
|
||||||
dockerfile: src/client/spark_api_server/Dockerfile
|
|
||||||
command: [ "./spark_api_server", "run" ]
|
|
||||||
environment:
|
|
||||||
- ASPNETCORE_ENVIRONMENT=Staging
|
|
||||||
|
|
||||||
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" ]
|
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
FROM ubuntu:22.04
|
|
||||||
|
|
||||||
ARG DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN apt-get update \
|
|
||||||
&& apt-get install -y pkg-config \
|
|
||||||
&& apt-get install -y locales \
|
|
||||||
&& apt-get install -y ca-certificates \
|
|
||||||
&& apt-get install -y libssh2-1-dev \
|
|
||||||
&& apt-get install -y software-properties-common \
|
|
||||||
&& 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"
|
|
||||||
# ARG entrypoint
|
|
||||||
|
|
||||||
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: cae5fd20da...1166db1211.
@@ -8,6 +8,7 @@
|
|||||||
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;
|
||||||
|
|||||||
File diff suppressed because it is too large.
Load diff
@@ -1,22 +1,41 @@
|
|||||||
using System.Diagnostics;
|
using mbts.spark;
|
||||||
|
|
||||||
namespace BCG.Utilities.General;
|
using System;
|
||||||
|
using System.Runtime;
|
||||||
|
|
||||||
/// <summary>
|
namespace BCG.Utilities.General
|
||||||
/// Summary description for Crono.
|
{
|
||||||
/// </summary>
|
/// <summary>
|
||||||
public class Crono {
|
/// Summary description for Crono.
|
||||||
readonly Stopwatch myTimer = new();
|
/// </summary>
|
||||||
|
public class Crono
|
||||||
|
{
|
||||||
|
public Crono()
|
||||||
|
{
|
||||||
|
myTimer = new HighPerformanceTimer();
|
||||||
|
}
|
||||||
|
|
||||||
public void start() =>
|
public void start()
|
||||||
myTimer.Start();
|
{myTimer.start();}
|
||||||
|
|
||||||
public void stop() =>
|
public void stop()
|
||||||
myTimer.Stop();
|
{myTimer.stop();}
|
||||||
|
|
||||||
public TimeSpan time =>
|
public TimeSpan time
|
||||||
myTimer.Elapsed;
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return new TimeSpan((long) (myTimer.totalMilliseconds * TimeSpan.TicksPerMillisecond));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public double miliseconds
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{return myTimer.totalMilliseconds;}
|
||||||
|
}
|
||||||
|
|
||||||
|
private HighPerformanceTimer myTimer;
|
||||||
|
}
|
||||||
|
|
||||||
public double miliseconds =>
|
|
||||||
myTimer.Elapsed.TotalMilliseconds;
|
|
||||||
}
|
}
|
||||||
@@ -1,192 +1,192 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Collections.Concurrent;
|
using System.Collections.Concurrent;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using Microsoft.Win32;
|
using Microsoft.Win32;
|
||||||
|
|
||||||
namespace BCG
|
namespace BCG
|
||||||
{
|
{
|
||||||
public enum RegistryRoot { HKCU, HKLM }
|
public enum RegistryRoot { HKCU, HKLM }
|
||||||
|
|
||||||
[Serializable]
|
[Serializable]
|
||||||
public class BlueRegistry
|
public class BlueRegistry
|
||||||
{
|
{
|
||||||
public const string BlueSubKey = @"Software\Blue Capital Group\";
|
public const string BlueSubKey = @"Software\Blue Capital Group\";
|
||||||
public static readonly string ApplicationPrefix;
|
public static readonly string ApplicationPrefix;
|
||||||
protected string myFullPath;
|
protected string myFullPath;
|
||||||
|
|
||||||
public BlueRegistry(string subPath)
|
public BlueRegistry(string subPath)
|
||||||
{
|
{
|
||||||
myFullPath = string.Concat(BlueRegistry.ApplicationPrefix, @"\", subPath);
|
myFullPath = string.Concat(BlueRegistry.ApplicationPrefix, @"\", subPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
public BlueRegistry(BlueRegistry parent, string subPath)
|
public BlueRegistry(BlueRegistry parent, string subPath)
|
||||||
{
|
{
|
||||||
myFullPath = string.Concat(parent.myFullPath, @"\", subPath);
|
myFullPath = string.Concat(parent.myFullPath, @"\", subPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
static BlueRegistry()
|
static BlueRegistry()
|
||||||
{
|
{
|
||||||
string app = "Applications";
|
string app = "Applications";
|
||||||
|
|
||||||
Assembly ass = Assembly.GetEntryAssembly();
|
Assembly ass = Assembly.GetEntryAssembly();
|
||||||
if (ass != null)
|
if (ass != null)
|
||||||
{
|
{
|
||||||
app = ass.GetName().Name;
|
app = ass.GetName().Name;
|
||||||
|
|
||||||
object[] attrs = ass.GetCustomAttributes(
|
object[] attrs = ass.GetCustomAttributes(
|
||||||
Type.GetType("System.Reflection.AssemblyTitleAttribute"), true);
|
Type.GetType("System.Reflection.AssemblyTitleAttribute"), true);
|
||||||
|
|
||||||
if (attrs.Length > 0 && ((AssemblyTitleAttribute)attrs[0]).Title != string.Empty)
|
if (attrs.Length > 0 && ((AssemblyTitleAttribute)attrs[0]).Title != string.Empty)
|
||||||
{
|
{
|
||||||
app = ((AssemblyTitleAttribute)attrs[0]).Title;
|
app = ((AssemblyTitleAttribute)attrs[0]).Title;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ApplicationPrefix = string.Concat(BlueRegistry.BlueSubKey, app);
|
ApplicationPrefix = string.Concat(BlueRegistry.BlueSubKey, app);
|
||||||
}
|
}
|
||||||
|
|
||||||
public object getValue(string name)
|
public object getValue(string name)
|
||||||
{
|
{
|
||||||
return getValue(RegistryRoot.HKCU, name);
|
return getValue(RegistryRoot.HKCU, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
public object getValue(string name, object defaultValue)
|
public object getValue(string name, object defaultValue)
|
||||||
{
|
{
|
||||||
return getValue(RegistryRoot.HKCU, name, defaultValue);
|
return getValue(RegistryRoot.HKCU, name, defaultValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setValue(string name, object value)
|
public void setValue(string name, object value)
|
||||||
{
|
{
|
||||||
setValue(RegistryRoot.HKCU, name, value);
|
setValue(RegistryRoot.HKCU, name, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void deleteValue(string name)
|
public void deleteValue(string name)
|
||||||
{
|
{
|
||||||
deleteValue(RegistryRoot.HKCU, name);
|
deleteValue(RegistryRoot.HKCU, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
private RegistryKey myGetRegistryKey(RegistryRoot root)
|
private RegistryKey myGetRegistryKey(RegistryRoot root)
|
||||||
{
|
{
|
||||||
if (root == RegistryRoot.HKCU)
|
if (root == RegistryRoot.HKCU)
|
||||||
return Registry.CurrentUser.CreateSubKey(myFullPath);
|
return Registry.CurrentUser.CreateSubKey(myFullPath);
|
||||||
else
|
else
|
||||||
return Registry.LocalMachine.CreateSubKey(myFullPath);
|
return Registry.LocalMachine.CreateSubKey(myFullPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
#region Generic Methods
|
#region Generic Methods
|
||||||
public virtual void setValue(RegistryRoot root, string name, object value)
|
internal virtual void setValue(RegistryRoot root, string name, object value)
|
||||||
{
|
{
|
||||||
using (RegistryKey rk = myGetRegistryKey(root))
|
using (RegistryKey rk = myGetRegistryKey(root))
|
||||||
{
|
{
|
||||||
rk.SetValue(name, value);
|
rk.SetValue(name, value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
internal virtual object getValue(RegistryRoot root, string name)
|
internal virtual object getValue(RegistryRoot root, string name)
|
||||||
{
|
{
|
||||||
using (RegistryKey rk = myGetRegistryKey(root))
|
using (RegistryKey rk = myGetRegistryKey(root))
|
||||||
{
|
{
|
||||||
return rk.GetValue(name);
|
return rk.GetValue(name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
internal virtual void deleteValue(RegistryRoot root, string name)
|
internal virtual void deleteValue(RegistryRoot root, string name)
|
||||||
{
|
{
|
||||||
using (RegistryKey rk = myGetRegistryKey(root))
|
using (RegistryKey rk = myGetRegistryKey(root))
|
||||||
{
|
{
|
||||||
rk.DeleteValue(name);
|
rk.DeleteValue(name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual object getValue(RegistryRoot root, string name, object defaultValue)
|
internal virtual object getValue(RegistryRoot root, string name, object defaultValue)
|
||||||
{
|
{
|
||||||
using (RegistryKey rk = myGetRegistryKey(root))
|
using (RegistryKey rk = myGetRegistryKey(root))
|
||||||
{
|
{
|
||||||
return rk.GetValue(name, defaultValue);
|
return rk.GetValue(name, defaultValue);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Double
|
#region Double
|
||||||
internal virtual void setDouble(RegistryRoot root, string name, double value)
|
internal virtual void setDouble(RegistryRoot root, string name, double value)
|
||||||
{
|
{
|
||||||
using (RegistryKey rk = myGetRegistryKey(root))
|
using (RegistryKey rk = myGetRegistryKey(root))
|
||||||
{
|
{
|
||||||
DoubleRegistryHandler.setValue(rk, name, value);
|
DoubleRegistryHandler.setValue(rk, name, value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
internal virtual double getDouble(RegistryRoot root, string name)
|
internal virtual double getDouble(RegistryRoot root, string name)
|
||||||
{
|
{
|
||||||
using (RegistryKey rk = myGetRegistryKey(root))
|
using (RegistryKey rk = myGetRegistryKey(root))
|
||||||
{
|
{
|
||||||
return DoubleRegistryHandler.getValue(rk, name);
|
return DoubleRegistryHandler.getValue(rk, name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Enum
|
#region Enum
|
||||||
internal virtual void setEnum(RegistryRoot root, string name, Enum value)
|
internal virtual void setEnum(RegistryRoot root, string name, Enum value)
|
||||||
{
|
{
|
||||||
using (RegistryKey rk = myGetRegistryKey(root))
|
using (RegistryKey rk = myGetRegistryKey(root))
|
||||||
{
|
{
|
||||||
EnumRegistryHandler.setValue(rk, name, value);
|
EnumRegistryHandler.setValue(rk, name, value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
internal virtual Enum getEnum(RegistryRoot root, string name, Type enumType)
|
internal virtual Enum getEnum(RegistryRoot root, string name, Type enumType)
|
||||||
{
|
{
|
||||||
using (RegistryKey rk = myGetRegistryKey(root))
|
using (RegistryKey rk = myGetRegistryKey(root))
|
||||||
{
|
{
|
||||||
return EnumRegistryHandler.getValue(rk, name, enumType);
|
return EnumRegistryHandler.getValue(rk, name, enumType);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Array
|
#region Array
|
||||||
internal virtual void setArray(RegistryRoot root, string name, Array array)
|
internal virtual void setArray(RegistryRoot root, string name, Array array)
|
||||||
{
|
{
|
||||||
using (RegistryKey rk = myGetRegistryKey(root))
|
using (RegistryKey rk = myGetRegistryKey(root))
|
||||||
{
|
{
|
||||||
ArrayRegistryHandler.setValue(rk, name, array);
|
ArrayRegistryHandler.setValue(rk, name, array);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
internal virtual Array getArray(RegistryRoot root, string name, Type elementType)
|
internal virtual Array getArray(RegistryRoot root, string name, Type elementType)
|
||||||
{
|
{
|
||||||
using (RegistryKey rk = myGetRegistryKey(root))
|
using (RegistryKey rk = myGetRegistryKey(root))
|
||||||
{
|
{
|
||||||
return ArrayRegistryHandler.getValue(rk, name, elementType);
|
return ArrayRegistryHandler.getValue(rk, name, elementType);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region SortedList
|
#region SortedList
|
||||||
internal virtual void setSortedList(RegistryRoot root, string name, SortedList slist)
|
internal virtual void setSortedList(RegistryRoot root, string name, SortedList slist)
|
||||||
{
|
{
|
||||||
using (RegistryKey rk = myGetRegistryKey(root))
|
using (RegistryKey rk = myGetRegistryKey(root))
|
||||||
{
|
{
|
||||||
SortedListRegistryHandler.setValue(rk, name, slist);
|
SortedListRegistryHandler.setValue(rk, name, slist);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
internal virtual SortedList getSortedList(RegistryRoot root, string name)
|
internal virtual SortedList getSortedList(RegistryRoot root, string name)
|
||||||
{
|
{
|
||||||
using (RegistryKey rk = myGetRegistryKey(root))
|
using (RegistryKey rk = myGetRegistryKey(root))
|
||||||
{
|
{
|
||||||
return SortedListRegistryHandler.getValue(rk, name);
|
return SortedListRegistryHandler.getValue(rk, name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
internal virtual void deleteSortedList(RegistryRoot root, string name)
|
internal virtual void deleteSortedList(RegistryRoot root, string name)
|
||||||
{
|
{
|
||||||
using (RegistryKey rk = myGetRegistryKey(root))
|
using (RegistryKey rk = myGetRegistryKey(root))
|
||||||
{
|
{
|
||||||
SortedListRegistryHandler.deleteValue(rk, name);
|
SortedListRegistryHandler.deleteValue(rk, name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,9 +1,10 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net7.0</TargetFramework>
|
<TargetFramework>net7.0-windows</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
|
<UseWindowsForms>true</UseWindowsForms>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
@@ -1,6 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Runtime.Versioning;
|
|
||||||
|
|
||||||
using Microsoft.Win32;
|
using Microsoft.Win32;
|
||||||
|
|
||||||
namespace BCG
|
namespace BCG
|
||||||
@@ -12,7 +10,6 @@ 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);
|
object v = rk.GetValue (name);
|
||||||
|
|||||||
+166
-166
@@ -1,166 +1,166 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using System.Windows.Forms;
|
using System.Windows.Forms;
|
||||||
using System.Drawing;
|
using System.Drawing;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using Microsoft.Win32;
|
using Microsoft.Win32;
|
||||||
|
|
||||||
namespace BCG
|
namespace BCG
|
||||||
{
|
{
|
||||||
public class PersistWindowState
|
public class PersistWindowState
|
||||||
{
|
{
|
||||||
// event info that allows form to persist extra window state data
|
// event info that allows form to persist extra window state data
|
||||||
public delegate void WindowStateHandler (object sender, BlueRegistry bluereg);
|
public delegate void WindowStateHandler (object sender, BlueRegistry bluereg);
|
||||||
public event WindowStateHandler LoadState;
|
public event WindowStateHandler LoadState;
|
||||||
public event WindowStateHandler SaveState;
|
public event WindowStateHandler SaveState;
|
||||||
|
|
||||||
private Form myParent;
|
private Form myParent;
|
||||||
private BlueRegistry myRegistry;
|
private BlueRegistry myRegistry;
|
||||||
|
|
||||||
private int myNormalLeft;
|
private int myNormalLeft;
|
||||||
private int myNormalTop;
|
private int myNormalTop;
|
||||||
private int myNormalWidth;
|
private int myNormalWidth;
|
||||||
private int myNormalHeight;
|
private int myNormalHeight;
|
||||||
private bool myResizable = true;
|
private bool myResizable = true;
|
||||||
private FormWindowState myWindowState;
|
private FormWindowState myWindowState;
|
||||||
private bool myAllowSaveMinimized = false;
|
private bool myAllowSaveMinimized = false;
|
||||||
private bool mySavePosition = true;
|
private bool mySavePosition = true;
|
||||||
private bool mySaveState = true;
|
private bool mySaveState = true;
|
||||||
|
|
||||||
public PersistWindowState (bool savePosition)
|
public PersistWindowState (bool savePosition)
|
||||||
{
|
{
|
||||||
mySavePosition = savePosition;
|
mySavePosition = savePosition;
|
||||||
}
|
}
|
||||||
|
|
||||||
public PersistWindowState ()
|
public PersistWindowState ()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool saveState
|
public bool saveState
|
||||||
{
|
{
|
||||||
[DebuggerStepThrough]
|
[DebuggerStepThrough]
|
||||||
set { mySaveState = value; }
|
set { mySaveState = value; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public Form parent
|
public Form parent
|
||||||
{
|
{
|
||||||
[DebuggerStepThrough]
|
[DebuggerStepThrough]
|
||||||
get { return myParent; }
|
get { return myParent; }
|
||||||
set
|
set
|
||||||
{
|
{
|
||||||
myParent = value;
|
myParent = value;
|
||||||
myRegistry = new BlueRegistry (myParent.Text);
|
myRegistry = new BlueRegistry (myParent.Text);
|
||||||
|
|
||||||
// subscribe to parent form's events
|
// subscribe to parent form's events
|
||||||
myParent.Closing += new System.ComponentModel.CancelEventHandler(myOnClosing);
|
myParent.Closing += new System.ComponentModel.CancelEventHandler(myOnClosing);
|
||||||
myParent.Resize += new System.EventHandler(myOnResize);
|
myParent.Resize += new System.EventHandler(myOnResize);
|
||||||
myParent.Move += new System.EventHandler(myOnMove);
|
myParent.Move += new System.EventHandler(myOnMove);
|
||||||
myParent.Load += new System.EventHandler(myOnLoad);
|
myParent.Load += new System.EventHandler(myOnLoad);
|
||||||
|
|
||||||
// get initial width and height in case form is never resized
|
// get initial width and height in case form is never resized
|
||||||
myNormalWidth = myParent.Width;
|
myNormalWidth = myParent.Width;
|
||||||
myNormalHeight = myParent.Height;
|
myNormalHeight = myParent.Height;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public BlueRegistry blueRegistry
|
public BlueRegistry blueRegistry
|
||||||
{
|
{
|
||||||
[DebuggerStepThrough]
|
[DebuggerStepThrough]
|
||||||
get { return myRegistry; }
|
get { return myRegistry; }
|
||||||
[DebuggerStepThrough]
|
[DebuggerStepThrough]
|
||||||
set { myRegistry = value; }
|
set { myRegistry = value; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool resizable
|
public bool resizable
|
||||||
{
|
{
|
||||||
[DebuggerStepThrough]
|
[DebuggerStepThrough]
|
||||||
set { myResizable = value; }
|
set { myResizable = value; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool allowSaveMinimized
|
public bool allowSaveMinimized
|
||||||
{
|
{
|
||||||
[DebuggerStepThrough]
|
[DebuggerStepThrough]
|
||||||
set { myAllowSaveMinimized = value; }
|
set { myAllowSaveMinimized = value; }
|
||||||
}
|
}
|
||||||
|
|
||||||
private void myOnResize(object sender, System.EventArgs e)
|
private void myOnResize(object sender, System.EventArgs e)
|
||||||
{
|
{
|
||||||
// save width and height
|
// save width and height
|
||||||
if (myParent.WindowState == FormWindowState.Normal && myResizable)
|
if (myParent.WindowState == FormWindowState.Normal && myResizable)
|
||||||
{
|
{
|
||||||
myNormalWidth = myParent.Width;
|
myNormalWidth = myParent.Width;
|
||||||
myNormalHeight = myParent.Height;
|
myNormalHeight = myParent.Height;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void myOnMove(object sender, System.EventArgs e)
|
private void myOnMove(object sender, System.EventArgs e)
|
||||||
{
|
{
|
||||||
// save position
|
// save position
|
||||||
if(myParent.WindowState == FormWindowState.Normal)
|
if(myParent.WindowState == FormWindowState.Normal)
|
||||||
{
|
{
|
||||||
myNormalLeft = myParent.Left;
|
myNormalLeft = myParent.Left;
|
||||||
myNormalTop = myParent.Top;
|
myNormalTop = myParent.Top;
|
||||||
}
|
}
|
||||||
// save state
|
// save state
|
||||||
myWindowState = myParent.WindowState;
|
myWindowState = myParent.WindowState;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void myOnClosing(object sender, System.ComponentModel.CancelEventArgs e)
|
private void myOnClosing(object sender, System.ComponentModel.CancelEventArgs e)
|
||||||
{
|
{
|
||||||
// save position, size and state
|
// save position, size and state
|
||||||
if (mySavePosition)
|
if (mySavePosition)
|
||||||
{
|
{
|
||||||
myRegistry.setValue (RegistryRoot.HKCU, "Left", myNormalLeft);
|
myRegistry.setValue (RegistryRoot.HKCU, "Left", myNormalLeft);
|
||||||
myRegistry.setValue (RegistryRoot.HKCU, "Top", myNormalTop);
|
myRegistry.setValue (RegistryRoot.HKCU, "Top", myNormalTop);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (myResizable)
|
if (myResizable)
|
||||||
{
|
{
|
||||||
myRegistry.setValue (RegistryRoot.HKCU, "Width", myNormalWidth);
|
myRegistry.setValue (RegistryRoot.HKCU, "Width", myNormalWidth);
|
||||||
myRegistry.setValue (RegistryRoot.HKCU, "Height", myNormalHeight);
|
myRegistry.setValue (RegistryRoot.HKCU, "Height", myNormalHeight);
|
||||||
}
|
}
|
||||||
|
|
||||||
// check if we are allowed to save the state as minimized (not normally)
|
// check if we are allowed to save the state as minimized (not normally)
|
||||||
if (!myAllowSaveMinimized)
|
if (!myAllowSaveMinimized)
|
||||||
{
|
{
|
||||||
if(myWindowState == FormWindowState.Minimized)
|
if(myWindowState == FormWindowState.Minimized)
|
||||||
myWindowState = FormWindowState.Normal;
|
myWindowState = FormWindowState.Normal;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mySaveState)
|
if (mySaveState)
|
||||||
myRegistry.setValue (RegistryRoot.HKCU, "WindowState", (int) myWindowState);
|
myRegistry.setValue (RegistryRoot.HKCU, "WindowState", (int) myWindowState);
|
||||||
|
|
||||||
// fire SaveState event
|
// fire SaveState event
|
||||||
if (SaveState != null)
|
if (SaveState != null)
|
||||||
SaveState (this, myRegistry);
|
SaveState (this, myRegistry);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void myOnLoad (object sender, System.EventArgs e)
|
private void myOnLoad (object sender, System.EventArgs e)
|
||||||
{
|
{
|
||||||
if (mySavePosition)
|
if (mySavePosition)
|
||||||
{
|
{
|
||||||
int left = (int) myRegistry.getValue (RegistryRoot.HKCU, "Left", myParent.Left);
|
int left = (int) myRegistry.getValue (RegistryRoot.HKCU, "Left", myParent.Left);
|
||||||
int top = (int) myRegistry.getValue (RegistryRoot.HKCU, "Top", myParent.Top);
|
int top = (int) myRegistry.getValue (RegistryRoot.HKCU, "Top", myParent.Top);
|
||||||
myParent.Location = new Point (left, top);
|
myParent.Location = new Point (left, top);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (myResizable)
|
if (myResizable)
|
||||||
{
|
{
|
||||||
int width = (int) myRegistry.getValue (RegistryRoot.HKCU, "Width", myParent.Width);
|
int width = (int) myRegistry.getValue (RegistryRoot.HKCU, "Width", myParent.Width);
|
||||||
int height = (int) myRegistry.getValue (RegistryRoot.HKCU, "Height", myParent.Height);
|
int height = (int) myRegistry.getValue (RegistryRoot.HKCU, "Height", myParent.Height);
|
||||||
myParent.Size = new Size (width, height);
|
myParent.Size = new Size (width, height);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mySaveState)
|
if (mySaveState)
|
||||||
{
|
{
|
||||||
FormWindowState windowState = (FormWindowState) myRegistry.getValue (RegistryRoot.HKCU, "WindowState",
|
FormWindowState windowState = (FormWindowState) myRegistry.getValue (RegistryRoot.HKCU, "WindowState",
|
||||||
(int) myParent.WindowState);
|
(int) myParent.WindowState);
|
||||||
myParent.WindowState = windowState;
|
myParent.WindowState = windowState;
|
||||||
}
|
}
|
||||||
|
|
||||||
// fire LoadState event
|
// fire LoadState event
|
||||||
if(LoadState != null)
|
if(LoadState != null)
|
||||||
LoadState (this, myRegistry);
|
LoadState (this, myRegistry);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,11 +1,19 @@
|
|||||||
namespace Bts.BooleanExpressions;
|
namespace Bts.BooleanExpressions;
|
||||||
|
|
||||||
|
using bts;
|
||||||
|
|
||||||
class BooleanExpression : IBooleanExpression {
|
class BooleanExpression : IBooleanExpression {
|
||||||
readonly Func<IDictionary<string, object?>, bool> evaluate;
|
readonly Func<IDictionary<string, object?>, bool> evaluate;
|
||||||
|
|
||||||
public BooleanExpression(Func<IDictionary<string, object?>, bool> evaluate) =>
|
public BooleanExpression(Func<IDictionary<string, object?>, bool> evaluate) =>
|
||||||
this.evaluate = evaluate;
|
this.evaluate = evaluate;
|
||||||
|
|
||||||
public bool Evaluate(IDictionary<string, object?> env) =>
|
public bool Evaluate(IDictionary<string, object?> env) {
|
||||||
evaluate(env);
|
try {
|
||||||
|
return evaluate(env);
|
||||||
|
} catch (Exception ex) {
|
||||||
|
Log.assert(false, $"BooleanExpression.Evaluate failed: {ex}");
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -47,6 +47,11 @@ IsOfType '/'
|
|||||||
|
|
||||||
%%
|
%%
|
||||||
|
|
||||||
|
{StringConstant} {
|
||||||
|
yylval.String = yytext.Substring(1, yytext.Length - 2).Replace(@"\'", "'");
|
||||||
|
return (int)Token.STRING_CONSTANT;
|
||||||
|
}
|
||||||
|
|
||||||
{BooleanConstant} {
|
{BooleanConstant} {
|
||||||
yylval.Boolean = yytext.ToLower() switch {
|
yylval.Boolean = yytext.ToLower() switch {
|
||||||
"true" => true,
|
"true" => true,
|
||||||
@@ -57,11 +62,6 @@ IsOfType '/'
|
|||||||
return (int)Token.BOOLEAN_CONSTANT;
|
return (int)Token.BOOLEAN_CONSTANT;
|
||||||
}
|
}
|
||||||
|
|
||||||
{StringConstant} {
|
|
||||||
yylval.String = yytext.Substring(1, yytext.Length - 2).Replace(@"\'", "'");
|
|
||||||
return (int)Token.STRING_CONSTANT;
|
|
||||||
}
|
|
||||||
|
|
||||||
{NullConstant} {
|
{NullConstant} {
|
||||||
yylval.Null = DBNull.Value;
|
yylval.Null = DBNull.Value;
|
||||||
return (int)Token.NULL_CONSTANT;
|
return (int)Token.NULL_CONSTANT;
|
||||||
|
|||||||
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
@@ -1 +0,0 @@
|
|||||||
VITE_DATASTREAM_WEBSOCKET_URL=wss://localhost:443
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
VITE_DATASTREAM_WEBSOCKET_URL=wss://localhost:443
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
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: {
|
|
||||||
"import/order": [
|
|
||||||
"error",
|
|
||||||
{
|
|
||||||
"groups": [
|
|
||||||
"builtin",
|
|
||||||
"external",
|
|
||||||
"internal",
|
|
||||||
["parent", "sibling", "index"]
|
|
||||||
],
|
|
||||||
"newlines-between": "always"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
'react-refresh/only-export-components': [
|
|
||||||
'warn',
|
|
||||||
{ allowConstantExport: true },
|
|
||||||
],
|
|
||||||
},
|
|
||||||
}
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
# 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?
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<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>
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
# 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
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
<!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>
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
<?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
@@ -1,44 +0,0 @@
|
|||||||
{
|
|
||||||
"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",
|
|
||||||
"classnames": "^2.5.1",
|
|
||||||
"react": "^18.3.1",
|
|
||||||
"react-data-grid": "^7.0.0-beta.44",
|
|
||||||
"react-data-table-component": "^7.6.2",
|
|
||||||
"react-dom": "^18.3.1",
|
|
||||||
"react-json-view-lite": "^1.4.0",
|
|
||||||
"react-pro-sidebar": "^1.1.0",
|
|
||||||
"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-import": "^2.29.1",
|
|
||||||
"eslint-plugin-react": "^7.34.2",
|
|
||||||
"eslint-plugin-react-hooks": "^4.6.2",
|
|
||||||
"eslint-plugin-react-refresh": "^0.4.7",
|
|
||||||
"react-mui-sidebar": "^1.3.5",
|
|
||||||
"vite": "^5.2.13"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 8.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 107 KiB |
@@ -1 +0,0 @@
|
|||||||
<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>
|
|
||||||
|
Before Width: | Height: | Size: 1.5 KiB |
@@ -1,40 +0,0 @@
|
|||||||
import { Sidebar, Menu, MenuItem, Submenu, Logo } from "react-mui-sidebar";
|
|
||||||
import './App.css';
|
|
||||||
|
|
||||||
const AnimatedSideBar = () => {
|
|
||||||
return (
|
|
||||||
<Sidebar className={"sidebar-container"} width={"270px"}>
|
|
||||||
<Logo img="https://adminmart.com/wp-content/uploads/2024/03/logo-admin-mart-news.png">
|
|
||||||
AdminMart
|
|
||||||
</Logo>
|
|
||||||
<Menu subHeading="HOME">
|
|
||||||
<MenuItem link="/" badge="true">
|
|
||||||
Modern
|
|
||||||
</MenuItem>
|
|
||||||
<MenuItem>eCommerce</MenuItem>
|
|
||||||
<MenuItem>Analytical</MenuItem>
|
|
||||||
</Menu>
|
|
||||||
<Menu subHeading="APPS">
|
|
||||||
<MenuItem>Chat</MenuItem>
|
|
||||||
<MenuItem>Calendar</MenuItem>
|
|
||||||
</Menu>
|
|
||||||
<Menu subHeading="OTHERS">
|
|
||||||
<Submenu title="Menu Level">
|
|
||||||
<MenuItem>Post</MenuItem>
|
|
||||||
<MenuItem>Details</MenuItem>
|
|
||||||
<Submenu title="Level 2">
|
|
||||||
<MenuItem>new</MenuItem>
|
|
||||||
<MenuItem>Hello</MenuItem>
|
|
||||||
</Submenu>
|
|
||||||
</Submenu>
|
|
||||||
|
|
||||||
<MenuItem>Chip</MenuItem>
|
|
||||||
<MenuItem target="_blank" link="google.com">
|
|
||||||
External Link
|
|
||||||
</MenuItem>
|
|
||||||
</Menu>
|
|
||||||
</Sidebar>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default AnimatedSideBar;
|
|
||||||
@@ -1,101 +0,0 @@
|
|||||||
@use "@material/checkbox";
|
|
||||||
@use "@material/icon-button";
|
|
||||||
@use "@material/data-table/data-table";
|
|
||||||
|
|
||||||
.root-div {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: row;
|
|
||||||
align-items: flex-start;
|
|
||||||
}
|
|
||||||
|
|
||||||
.main-content-div {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: row;
|
|
||||||
}
|
|
||||||
|
|
||||||
.title-div {
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container {
|
|
||||||
display: flex;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container-column {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
}
|
|
||||||
|
|
||||||
.container-row {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: row;
|
|
||||||
align-items: stretch;
|
|
||||||
}
|
|
||||||
|
|
||||||
box.query-input-form {
|
|
||||||
/* p: 2, display: "flex", flexFlow: "column", alignItems: "stretch" */
|
|
||||||
display: flex;
|
|
||||||
flex-flow: column;
|
|
||||||
align-items: stretch;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* li.ps-menuitem-root:hover {
|
|
||||||
background-color: #ff9922;
|
|
||||||
} */
|
|
||||||
|
|
||||||
.container-row-centered {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: row;
|
|
||||||
justify-content: center;
|
|
||||||
align-items: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Sidebar.css */
|
|
||||||
/* .sidebar-container {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
}
|
|
||||||
|
|
||||||
.sidebar {
|
|
||||||
position: relative;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
height: 100vh;
|
|
||||||
background-color: #333;
|
|
||||||
color: white;
|
|
||||||
overflow: hidden;
|
|
||||||
transition: transform 0.3s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.sidebar.closed {
|
|
||||||
width: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.sidebar.open {
|
|
||||||
width: 250px;
|
|
||||||
} */
|
|
||||||
@@ -1,173 +0,0 @@
|
|||||||
import { ThemeProvider, CssBaseline, GlobalStyles } from '@mui/material';
|
|
||||||
import QueryStatusView from './QueryStatusView';
|
|
||||||
import useMediaQuery from '@mui/material/useMediaQuery';
|
|
||||||
import QueryControl from './QueryControl';
|
|
||||||
import DataTable from './DataTable';
|
|
||||||
import { useState, useEffect, useMemo } from 'react';
|
|
||||||
import useWebSocket, { ReadyState } from 'react-use-websocket';
|
|
||||||
import Sidebar from './SideBar';
|
|
||||||
import getTheme from './Theme';
|
|
||||||
|
|
||||||
import '@fontsource/noto-sans';
|
|
||||||
import './App.css';
|
|
||||||
import './SideBar.css';
|
|
||||||
|
|
||||||
const webSocketUrl = import.meta.env.VITE_DATASTREAM_WEBSOCKET_URL;
|
|
||||||
// Always use the same subscription id (1), because we only show 1 table at a time.
|
|
||||||
// The server will automatically dispose the previous subscription and start a new one
|
|
||||||
// if we're currently subscribed to another query.
|
|
||||||
const subscriptionId = "1";
|
|
||||||
|
|
||||||
var rpcReqIdCounter = 1;
|
|
||||||
|
|
||||||
function subscribeReq(query) {
|
|
||||||
return {
|
|
||||||
jsonrpc: "2.0",
|
|
||||||
id: rpcReqIdCounter++,
|
|
||||||
method: "subscribe",
|
|
||||||
params: {
|
|
||||||
subscription_id: subscriptionId,
|
|
||||||
query: query
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
function unsubscribeReq() {
|
|
||||||
return {
|
|
||||||
jsonrpc: "2.0",
|
|
||||||
id: rpcReqIdCounter++,
|
|
||||||
method: "unsubscribe",
|
|
||||||
params: {
|
|
||||||
subscription_id: subscriptionId,
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
const App = () => {
|
|
||||||
const prefersDarkMode = useMediaQuery('(prefers-color-scheme: dark)');
|
|
||||||
const theme = getTheme({ mode: prefersDarkMode ? 'dark' : 'light' });
|
|
||||||
const globalStyles = {
|
|
||||||
':root': {
|
|
||||||
'--primary-color': theme.palette.primary.main,
|
|
||||||
'--primary-dark-color': theme.palette.primary.dark,
|
|
||||||
'--secondary-color': theme.palette.secondary.main,
|
|
||||||
'--secondary-dark-color': theme.palette.secondary.dark,
|
|
||||||
'--background-color': theme.palette.background.default,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
const [blueTable, setBlueTable] = useState({ columns: null, rows: null });
|
|
||||||
const [queryError, setQueryError] = useState(null);
|
|
||||||
const [queryState, setQueryState] = useState("Unsubscribed");
|
|
||||||
const queryStateDetails = useMemo(() => {
|
|
||||||
if (queryState == "Unsubscribed") {
|
|
||||||
return "Enter query above, then click the play button to subscribe";
|
|
||||||
}
|
|
||||||
if (queryState == "Subscribed") {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}, [queryState]);
|
|
||||||
const [sidebarIsOpen, setSidebarIsOpen] = useState(false);
|
|
||||||
const [cannedQuery, setCannedQuery] = useState(null);
|
|
||||||
|
|
||||||
const onCannedQueryClicked = (cannedQuery) => {
|
|
||||||
console.info(`Executing canned query: ${JSON.stringify(cannedQuery)}`);
|
|
||||||
const queryText = cannedQuery.query.join("\n");
|
|
||||||
setCannedQuery({ queryText: queryText, clickTime: Date.now() });
|
|
||||||
subscribe(queryText);
|
|
||||||
};
|
|
||||||
|
|
||||||
const { sendJsonMessage, getWebSocket, readyState } = useWebSocket(
|
|
||||||
webSocketUrl,
|
|
||||||
{
|
|
||||||
onOpen: (e) => console.info(`WebSocket open. ${JSON.stringify(e)}`),
|
|
||||||
onClose: (e) => console.info(`WebSocket closed. ${JSON.stringify(e)}`),
|
|
||||||
onError: (e) => console.error(`WebSocket error: ${JSON.stringify(e)}`),
|
|
||||||
shouldReconnect: () => true,
|
|
||||||
});
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
console.info(`WebSocket readyState: ${readyState}`)
|
|
||||||
if (readyState != ReadyState.OPEN) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const ws = getWebSocket();
|
|
||||||
ws.onmessage = e => {
|
|
||||||
console.info(`Received message: ${e.data}`);
|
|
||||||
const msg = JSON.parse(e.data);
|
|
||||||
setQueryError(msg.error);
|
|
||||||
if (msg.error != null) {
|
|
||||||
setQueryState("Error");
|
|
||||||
} else if (msg.id != null) {
|
|
||||||
setQueryState(msg.result.status);
|
|
||||||
} else {
|
|
||||||
console.assert(msg.params.subscription_id == subscriptionId);
|
|
||||||
console.info(`Received rows: ${msg.params.table.all}`);
|
|
||||||
setBlueTable({ columns: msg.params.table.columns, rows: msg.params.table.all });
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}, [getWebSocket, readyState]);
|
|
||||||
|
|
||||||
const subscribe = (query) => {
|
|
||||||
const req = subscribeReq(query);
|
|
||||||
console.info(`Subscribing: ${JSON.stringify(subscribeReq(query))}`);
|
|
||||||
sendJsonMessage(req);
|
|
||||||
};
|
|
||||||
|
|
||||||
const unsubscribe = () => {
|
|
||||||
const req = unsubscribeReq();
|
|
||||||
console.info(`Unsubscribing: ${JSON.stringify(req)}`);
|
|
||||||
sendJsonMessage(req);
|
|
||||||
};
|
|
||||||
|
|
||||||
const onOpened = () => {
|
|
||||||
setSidebarIsOpen(true);
|
|
||||||
};
|
|
||||||
|
|
||||||
const onClosed = () => {
|
|
||||||
setSidebarIsOpen(false);
|
|
||||||
};
|
|
||||||
|
|
||||||
const sidebarWidth = sidebarIsOpen ? '250px' : '65px';
|
|
||||||
return (
|
|
||||||
<ThemeProvider theme={theme}>
|
|
||||||
<CssBaseline />
|
|
||||||
<GlobalStyles styles={globalStyles} />
|
|
||||||
<div className='root-div'>
|
|
||||||
<div style={{
|
|
||||||
display: 'flex',
|
|
||||||
flexDirection: 'column',
|
|
||||||
alignItems: 'flex-start',
|
|
||||||
flexWrap: 'nowrap',
|
|
||||||
width: sidebarWidth,
|
|
||||||
transition: 'width 0.3s ease',
|
|
||||||
}}>
|
|
||||||
<Sidebar onSelection={onCannedQueryClicked} onOpened={onOpened} onClosed={onClosed} />
|
|
||||||
</div>
|
|
||||||
<div style={{
|
|
||||||
display: 'flex',
|
|
||||||
flexDirection: 'column',
|
|
||||||
left: sidebarWidth,
|
|
||||||
width: '100%',
|
|
||||||
transition: 'width 0.3s ease',
|
|
||||||
}}>
|
|
||||||
<div style={{ width: '100%', display: 'flex', flexDirection: 'column', alignItems: 'flex-start', margin: theme.spacing(2, 0, 0, 0) }}>
|
|
||||||
<div style={{ width: '90%', rightMargin: '100px' }}>
|
|
||||||
<QueryControl
|
|
||||||
queryState={queryState}
|
|
||||||
queryText={cannedQuery?.queryText}
|
|
||||||
queryTextResetTime={cannedQuery?.clickTime}
|
|
||||||
subscribe={subscribe}
|
|
||||||
unsubscribe={unsubscribe} />
|
|
||||||
</div>
|
|
||||||
<div style={{ width: '90%', rightMargin: '100px' }}>
|
|
||||||
<QueryStatusView queryState={queryState} details={queryStateDetails} error={queryError} />
|
|
||||||
<DataTable columns={blueTable?.columns ?? []} rows={blueTable?.rows ?? []} />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</ThemeProvider>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default App;
|
|
||||||
@@ -1,53 +0,0 @@
|
|||||||
@use "@material/checkbox";
|
|
||||||
@use "@material/icon-button";
|
|
||||||
@use "@material/data-table/data-table";
|
|
||||||
|
|
||||||
.data-grid-container {
|
|
||||||
overflow: auto;
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
.data-grid {
|
|
||||||
max-height: 1000px;
|
|
||||||
}
|
|
||||||
|
|
||||||
div[role=columnheader] {
|
|
||||||
border-top: 0px;
|
|
||||||
border-bottom: 0px;
|
|
||||||
background-color: var(--primary-dark-color);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* div[role=columnheader] {
|
|
||||||
border-top: 0px;
|
|
||||||
border-bottom: 0px;
|
|
||||||
background-color: var(--primary-dark-color);
|
|
||||||
}
|
|
||||||
|
|
||||||
.rdg-row {
|
|
||||||
border: 0px;
|
|
||||||
border-top: 0px;
|
|
||||||
border-bottom: 0px;
|
|
||||||
background-color: rgba(var(--primary-dark-color), 0.8);
|
|
||||||
color: var(--primary-color);
|
|
||||||
}
|
|
||||||
|
|
||||||
.rdg-row-odd {
|
|
||||||
border: 0px;
|
|
||||||
border-top: 0px;
|
|
||||||
border-bottom: 0px;
|
|
||||||
background-color: var(--primary-dark-color);
|
|
||||||
color: var(--primary-color);
|
|
||||||
}
|
|
||||||
|
|
||||||
.rdg-cell {
|
|
||||||
border-bottom: 0px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.rdg-cell.even {
|
|
||||||
border-bottom: 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.rdg-cell.odd {
|
|
||||||
border-bottom: 5px;
|
|
||||||
} */
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
@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;
|
|
||||||
}
|
|
||||||
@@ -1,74 +0,0 @@
|
|||||||
import PropTypes from 'prop-types';
|
|
||||||
import { useTheme } from '@mui/material/styles';
|
|
||||||
import { DataGrid } from '@mui/x-data-grid';
|
|
||||||
import './DataGrid.css'
|
|
||||||
import { useMemo, useState } from 'react';
|
|
||||||
|
|
||||||
export default function DataTable({ columns, rows }) {
|
|
||||||
const theme = useTheme();
|
|
||||||
const [columnWidths, setColumnWidths] = useState({});
|
|
||||||
|
|
||||||
const handleColumnResize = (params) => {
|
|
||||||
const newWidth = params.width;
|
|
||||||
setColumnWidths((prevWidths) => ({
|
|
||||||
...prevWidths,
|
|
||||||
[params.colDef.field]: params.width,
|
|
||||||
}));
|
|
||||||
};
|
|
||||||
|
|
||||||
const getGridColDef = useMemo(() => {
|
|
||||||
return col => {
|
|
||||||
return {
|
|
||||||
field: col.name,
|
|
||||||
headerName: col.name,
|
|
||||||
width: columnWidths[col.name],
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}, [columnWidths]);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<DataGrid
|
|
||||||
className='data-grid-container'
|
|
||||||
autosizeOnMount={false}
|
|
||||||
columns={columns?.map(getGridColDef) ?? []}
|
|
||||||
onColumnResize={handleColumnResize}
|
|
||||||
rows={rows ?? []}
|
|
||||||
sx={{
|
|
||||||
margin: theme.spacing(2, 0, 0, 0),
|
|
||||||
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,
|
|
||||||
apiRef: PropTypes.object,
|
|
||||||
};
|
|
||||||
@@ -1,119 +0,0 @@
|
|||||||
import PropTypes from 'prop-types';
|
|
||||||
import DataTable from './DataTable';
|
|
||||||
import { useRef, useState, useEffect } from 'react';
|
|
||||||
import { useGridApiRef } from '@mui/x-data-grid';
|
|
||||||
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 StopIcon from '@mui/icons-material/Stop';
|
|
||||||
import TextField from '@mui/material/TextField';
|
|
||||||
import Tooltip from '@mui/material/Tooltip';
|
|
||||||
|
|
||||||
const QueryControl = (props) => {
|
|
||||||
const { queryState, queryText, queryTextResetTime, subscribe, unsubscribe } = props;
|
|
||||||
// const theme = useTheme();
|
|
||||||
let textInput = useRef();
|
|
||||||
const [queryTextChangeTime, setQueryTextChangeTime] = useState(null);
|
|
||||||
useEffect(() => {
|
|
||||||
if (queryText == null || textInput.current == null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
// Init text field (unless a non-empty string is already present, or the user has modified
|
|
||||||
// the query - we don't want to overwrite their changes).
|
|
||||||
if (queryTextChangeTime == null || queryTextResetTime > queryTextChangeTime) {
|
|
||||||
console.info(`Initializing query text: ${queryText}`)
|
|
||||||
textInput.current.value = queryText;
|
|
||||||
}
|
|
||||||
}, [queryText, queryTextChangeTime, queryTextResetTime]);
|
|
||||||
const onClearClick = () => {
|
|
||||||
textInput.current.value = '';
|
|
||||||
};
|
|
||||||
|
|
||||||
const onRunClick = () => {
|
|
||||||
subscribe(textInput.current.value);
|
|
||||||
};
|
|
||||||
|
|
||||||
const onStopClick = () => {
|
|
||||||
unsubscribe();
|
|
||||||
};
|
|
||||||
|
|
||||||
const onKeyDown = (e) => {
|
|
||||||
// Detect keyboard shortcuts.
|
|
||||||
// Ctrl+Enter : Run
|
|
||||||
if (e.ctrlKey && e.key === 'Enter') {
|
|
||||||
onRunClick();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const onChange = (e) => {
|
|
||||||
// So we know not to overwrite the changes with the canned query on re-render
|
|
||||||
setQueryTextChangeTime(Date.now());
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Box sx={{ display: "flex", flexFlow: "column" }}>
|
|
||||||
<Paper elevation={3} sx={{ color: 'primary.main' }}>
|
|
||||||
<Box sx={{ p: 2 }}>
|
|
||||||
<TextField
|
|
||||||
fullWidth
|
|
||||||
multiline
|
|
||||||
rows={10}
|
|
||||||
variant="outlined"
|
|
||||||
onChange={onChange}
|
|
||||||
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: `queryStartButton.${queryState}.color`,
|
|
||||||
bgcolor: `queryStartButton.${queryState}.backgroundColor`,
|
|
||||||
padding: '11px'
|
|
||||||
}}>
|
|
||||||
<PlayArrowIcon />
|
|
||||||
</Button>
|
|
||||||
</Tooltip>
|
|
||||||
</Grid>
|
|
||||||
<Grid item>
|
|
||||||
<Tooltip title="Stop">
|
|
||||||
<Button onClick={onStopClick} sx={{
|
|
||||||
color: `queryStopButton.${queryState}.color`,
|
|
||||||
bgcolor: `queryStopButton.${queryState}.backgroundColor`,
|
|
||||||
padding: '11px'
|
|
||||||
}}>
|
|
||||||
<StopIcon />
|
|
||||||
</Button>
|
|
||||||
</Tooltip>
|
|
||||||
</Grid>
|
|
||||||
</Grid>
|
|
||||||
</Box>
|
|
||||||
</Paper>
|
|
||||||
</Box>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
QueryControl.propTypes = {
|
|
||||||
columns: PropTypes.array,
|
|
||||||
rows: PropTypes.array,
|
|
||||||
isRunning: PropTypes.bool,
|
|
||||||
queryText: PropTypes.string,
|
|
||||||
queryTextResetTime: PropTypes.number,
|
|
||||||
queryState: PropTypes.string,
|
|
||||||
subscribe: PropTypes.func,
|
|
||||||
unsubscribe: PropTypes.func,
|
|
||||||
};
|
|
||||||
|
|
||||||
export default QueryControl;
|
|
||||||
@@ -1,73 +0,0 @@
|
|||||||
import { useState } from 'react';
|
|
||||||
import PropTypes from 'prop-types';
|
|
||||||
import { Box, Typography, Collapse } from '@mui/material';
|
|
||||||
import Alert from '@mui/material/Alert';
|
|
||||||
import AlertTitle from '@mui/material/AlertTitle';
|
|
||||||
import { useTheme } from '@mui/material/styles';
|
|
||||||
import { alpha } from '@mui/system';
|
|
||||||
|
|
||||||
const QueryStatusView = ({ queryState, details, error }) => {
|
|
||||||
const theme = useTheme();
|
|
||||||
const [open, setOpen] = useState(false);
|
|
||||||
|
|
||||||
let header = queryState;
|
|
||||||
let headerContent = null;
|
|
||||||
let detailElements = [];
|
|
||||||
let severity = queryState == "Subscribed" ? "success" : "info";
|
|
||||||
let cursor = details == null ? "default" : "pointer";
|
|
||||||
if (error != null) {
|
|
||||||
severity = "error";
|
|
||||||
cursor = "pointer";
|
|
||||||
header = `Error Code: ${error.code}`;
|
|
||||||
headerContent = error.message;
|
|
||||||
detailElements.push(<Typography variant="body1">{error.data.error_message}</Typography>);
|
|
||||||
detailElements.push(<Typography variant="subtitle1">Stack Trace:</Typography>);
|
|
||||||
(error.data.stack_trace ?? []).forEach(line => detailElements.push(
|
|
||||||
<Typography variant="body2" component="pre" sx={{ whiteSpace: 'pre-wrap' }}>
|
|
||||||
{line}
|
|
||||||
</Typography>));
|
|
||||||
} else if (details != null) {
|
|
||||||
detailElements.push(<Typography variant="body1">{details}</Typography>);
|
|
||||||
}
|
|
||||||
return (
|
|
||||||
<Box sx={{ margin: theme.spacing(2, 0, 0, 0) }}>
|
|
||||||
<Alert
|
|
||||||
severity={severity}
|
|
||||||
onClick={() => setOpen(!open)}
|
|
||||||
sx={{
|
|
||||||
margin: theme.spacing(2, 0, 0, 0),
|
|
||||||
cursor: cursor,
|
|
||||||
}}>
|
|
||||||
<AlertTitle>{header}</AlertTitle>
|
|
||||||
{headerContent}
|
|
||||||
</Alert>
|
|
||||||
{detailElements.length == 0
|
|
||||||
? null
|
|
||||||
: <Collapse in={open}>
|
|
||||||
<Box
|
|
||||||
sx={{
|
|
||||||
backgroundColor: alpha(theme.palette[severity].light, 0.75),
|
|
||||||
color: theme.palette[severity].contrastText,
|
|
||||||
padding: theme.spacing(2),
|
|
||||||
marginTop: theme.spacing(0),
|
|
||||||
borderRadius: theme.shape.borderRadius,
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{detailElements}
|
|
||||||
</Box>
|
|
||||||
</Collapse>}
|
|
||||||
</Box>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
QueryStatusView.propTypes = {
|
|
||||||
queryState: PropTypes.string,
|
|
||||||
details: PropTypes.string,
|
|
||||||
error: PropTypes.shape({
|
|
||||||
code: PropTypes.number,
|
|
||||||
message: PropTypes.string,
|
|
||||||
data: PropTypes.object,
|
|
||||||
})
|
|
||||||
};
|
|
||||||
|
|
||||||
export default QueryStatusView;
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
import 'react-data-grid/lib/styles.css';
|
|
||||||
import PropTypes from 'prop-types';
|
|
||||||
import DataGrid from 'react-data-grid';
|
|
||||||
import './DataGrid.css';
|
|
||||||
|
|
||||||
function getGridColDef(col) {
|
|
||||||
return {
|
|
||||||
key: col.name,
|
|
||||||
name: col.name,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function ReactDataGrid({columns, rows}) {
|
|
||||||
return (
|
|
||||||
<DataGrid className={"data-grid"} rows={rows} columns={columns.map(getGridColDef)} />
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
ReactDataGrid.propTypes = {
|
|
||||||
columns: PropTypes.arrayOf(
|
|
||||||
PropTypes.shape({
|
|
||||||
name: PropTypes.string.isRequired,
|
|
||||||
type: PropTypes.string.isRequired,
|
|
||||||
})
|
|
||||||
).isRequired,
|
|
||||||
rows: PropTypes.arrayOf(PropTypes.array).isRequired,
|
|
||||||
};
|
|
||||||
@@ -1,98 +0,0 @@
|
|||||||
/* Sidebar.css */
|
|
||||||
.app-container {
|
|
||||||
display: flex;
|
|
||||||
width: 100%;
|
|
||||||
overflow: hidden;
|
|
||||||
flex-direction: row;
|
|
||||||
justify-content: flex-start;
|
|
||||||
align-items: flex-start;
|
|
||||||
}
|
|
||||||
|
|
||||||
.sidebar {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: row;
|
|
||||||
justify-content: flex-start;
|
|
||||||
align-items: flex-start;
|
|
||||||
background-color: transparent;
|
|
||||||
color: white;
|
|
||||||
overflow: hidden;
|
|
||||||
transition: width 0.3s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.sidebar.open {
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.sidebar.closed {
|
|
||||||
width: 0%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.sidebar-toggle-button {
|
|
||||||
border: 0px;
|
|
||||||
border-radius: 50%;
|
|
||||||
box-shadow: rgba(9, 30, 66, 0.08) 0px 0px 0px 1px, rgba(9, 30, 66, 0.08) 0px 2px 4px 1px;
|
|
||||||
color: var(--primary-color);
|
|
||||||
cursor: pointer;
|
|
||||||
height: 24px;
|
|
||||||
opacity: 1;
|
|
||||||
outline: 0px;
|
|
||||||
padding: 0px;
|
|
||||||
background-color: transparent;
|
|
||||||
transition: background-color 100ms linear 0s, color 100ms linear 0s, opacity 300ms cubic-bezier(0.2, 0, 0, 1) 0s, transform 300ms cubic-bezier(0.2, 0, 0, 1) 0s;
|
|
||||||
width: 20%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.sidebar-toggle-button:hover {
|
|
||||||
transition: background-color 100ms linear 0s, color 100ms linear 0s, opacity 300ms cubic-bezier(0.2, 0, 0, 1) 0s, transform 300ms cubic-bezier(0.2, 0, 0, 1) 0s;
|
|
||||||
}
|
|
||||||
|
|
||||||
.main-content.open {
|
|
||||||
width: 165px;
|
|
||||||
transition: width 0.3s ease;
|
|
||||||
background-color: transparent;
|
|
||||||
}
|
|
||||||
|
|
||||||
.main-content.closed {
|
|
||||||
width: 0%;
|
|
||||||
/* min-width: 25px; */
|
|
||||||
transition: width 0.3s ease;
|
|
||||||
background-color: transparent;
|
|
||||||
}
|
|
||||||
|
|
||||||
.sidebar-menu-item {
|
|
||||||
width: 100%;
|
|
||||||
box-sizing: border-box;
|
|
||||||
}
|
|
||||||
|
|
||||||
.sidebar-menu-item.open {
|
|
||||||
width: 100%;
|
|
||||||
/* justify-content: flex-start; */
|
|
||||||
transition: width 0.3s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.sidebar-menu-item.closed {
|
|
||||||
width: 0%;
|
|
||||||
min-width: 0px;
|
|
||||||
/* justify-content: flex-start; */
|
|
||||||
transition: width 0.3s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.sidebar-menu-item-content.open {
|
|
||||||
width: 100%;
|
|
||||||
/* justify-content: flex-start; */
|
|
||||||
transition: width 0.3s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.sidebar-menu-item-content.closed {
|
|
||||||
width: 0px;
|
|
||||||
/* justify-content: flex-start; */
|
|
||||||
transition: width 0.3s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Ensure span can shrink */
|
|
||||||
.button-text {
|
|
||||||
display: block; /* Make span a block element */
|
|
||||||
width: 100%; /* Ensure it takes the full width of its parent */
|
|
||||||
overflow: hidden; /* Hide any overflow content */
|
|
||||||
white-space: nowrap; /* Prevent text wrapping */
|
|
||||||
}
|
|
||||||
@@ -1,109 +0,0 @@
|
|||||||
import { useState, useEffect } from 'react';
|
|
||||||
import Button from '@mui/material/Button';
|
|
||||||
import { useTheme } from '@mui/material/styles';
|
|
||||||
import PropTypes from 'prop-types';
|
|
||||||
import Tooltip from '@mui/material/Tooltip';
|
|
||||||
import ChevronLeftRounded from "@mui/icons-material/ChevronLeftRounded"
|
|
||||||
import ChevronRightRounded from '@mui/icons-material/ChevronRightRounded';
|
|
||||||
import FileCopyIcon from '@mui/icons-material/FileCopy';
|
|
||||||
import './SideBar.css';
|
|
||||||
|
|
||||||
const Sidebar = ({ onSelection, onOpened, onClosed }) => {
|
|
||||||
const theme = useTheme();
|
|
||||||
const [isOpen, setIsOpen] = useState(false);
|
|
||||||
const [cannedQueries, setCannedQueries] = useState([]);
|
|
||||||
const Icon = isOpen ? ChevronLeftRounded : ChevronRightRounded;
|
|
||||||
|
|
||||||
const toggleIsOpen = () => {
|
|
||||||
if (isOpen) {
|
|
||||||
setIsOpen(false);
|
|
||||||
if (onClosed != null) {
|
|
||||||
onClosed();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
setIsOpen(true);
|
|
||||||
if (onOpened != null) {
|
|
||||||
onOpened();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const onMenuItemClick = (event, cannedQuery) => {
|
|
||||||
console.info(`menu item clicked: ${cannedQuery.name}`);
|
|
||||||
onSelection(cannedQuery);
|
|
||||||
};
|
|
||||||
|
|
||||||
// const onMenuItemClick = async (event, cannedQuery) => {
|
|
||||||
// try {
|
|
||||||
// await navigator.clipboard.writeText(cannedQuery.query.join("\n"));
|
|
||||||
// alert(`Copied ${cannedQuery.name} to clipboard`);
|
|
||||||
// } catch (err) {
|
|
||||||
// console.error('Failed to copy query text: ', err);
|
|
||||||
// }
|
|
||||||
// };
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const fetchCannedQueries = async () => {
|
|
||||||
try {
|
|
||||||
const response = await fetch('api/cannedqueries');
|
|
||||||
const data = await response.json();
|
|
||||||
setCannedQueries(data);
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Error fetching WebSocket config:', error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
fetchCannedQueries();
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
const mainContentClass = `main-content ${isOpen ? 'open' : 'closed'}`;
|
|
||||||
const menuItemClass = `sidebar-menu-item ${isOpen ? 'open' : 'closed'}`;
|
|
||||||
const menuItemContentClass = `sidebar-menu-item-content ${isOpen ? 'open' : 'closed'}`;
|
|
||||||
const toggleButtonTitle = `${isOpen ? 'Hide' : 'Show'} Common Queries`;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
className={"sidebar"}
|
|
||||||
style={{
|
|
||||||
display: 'flex',
|
|
||||||
flexDirection: 'row',
|
|
||||||
justifyContent: 'flexStart',
|
|
||||||
alignItems: 'flexStart',
|
|
||||||
margin: theme.spacing(2, 0, 0, 0)
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<div className={mainContentClass}>
|
|
||||||
{cannedQueries.map(cq =>
|
|
||||||
<Button key={cq.name} className={menuItemClass} onClick={(event) => onMenuItemClick(event, cq)}>
|
|
||||||
<div className={menuItemContentClass}>
|
|
||||||
<span className='button-text'>{cq.name}</span>
|
|
||||||
</div>
|
|
||||||
</Button>)
|
|
||||||
}
|
|
||||||
{/* {cannedQueries.map(cq =>
|
|
||||||
<Button
|
|
||||||
variant="contained"
|
|
||||||
color="primary"
|
|
||||||
startIcon={<FileCopyIcon />}
|
|
||||||
onClick={onMenuItemClick}
|
|
||||||
>
|
|
||||||
<div className={menuItemContentClass}>
|
|
||||||
<span className='button-text'>{cq.name}</span>
|
|
||||||
</div>
|
|
||||||
</Button>)} */}
|
|
||||||
</div>
|
|
||||||
<Tooltip title={toggleButtonTitle}>
|
|
||||||
<Button onClick={toggleIsOpen}>
|
|
||||||
<Icon className="w-5 h-5" />
|
|
||||||
</Button>
|
|
||||||
</Tooltip>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default Sidebar;
|
|
||||||
|
|
||||||
Sidebar.propTypes = {
|
|
||||||
onSelection: PropTypes.func,
|
|
||||||
onOpened: PropTypes.func,
|
|
||||||
onClosed: PropTypes.func,
|
|
||||||
};
|
|
||||||
@@ -1,112 +0,0 @@
|
|||||||
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',
|
|
||||||
},
|
|
||||||
action: {
|
|
||||||
hoverOpacity: 0.08
|
|
||||||
},
|
|
||||||
text: {
|
|
||||||
primary: '#eaf8f8',
|
|
||||||
dark: '#eaf8f8a0'
|
|
||||||
},
|
|
||||||
queryStartButton: {
|
|
||||||
Subscribed: {
|
|
||||||
color: '#33baf9',
|
|
||||||
backgroundColor: '#ffffff40',
|
|
||||||
},
|
|
||||||
Unsubscribed: {
|
|
||||||
color: '#ffffff40',
|
|
||||||
backgroundColor: '#ffffff00',
|
|
||||||
}
|
|
||||||
},
|
|
||||||
queryStopButton: {
|
|
||||||
Subscribed: {
|
|
||||||
color: '#ff4444a0',
|
|
||||||
backgroundColor: '#ffffff40',
|
|
||||||
},
|
|
||||||
Unsubscribed: {
|
|
||||||
color: '#ff444450',
|
|
||||||
backgroundColor: '#ffffff00',
|
|
||||||
}
|
|
||||||
},
|
|
||||||
error: {
|
|
||||||
light: '#e57373',
|
|
||||||
main: '#f44336',
|
|
||||||
dark: '#d32f2f',
|
|
||||||
contrastText: '#fff',
|
|
||||||
},
|
|
||||||
warning: {
|
|
||||||
light: '#ffb74d',
|
|
||||||
main: '#ff9800',
|
|
||||||
dark: '#f57c00',
|
|
||||||
contrastText: '#000',
|
|
||||||
},
|
|
||||||
info: {
|
|
||||||
light: '#64b5f6',
|
|
||||||
main: '#2196f3',
|
|
||||||
dark: '#303030',
|
|
||||||
contrastText: '#fff',
|
|
||||||
},
|
|
||||||
success: {
|
|
||||||
light: '#81c784',
|
|
||||||
main: '#4caf50',
|
|
||||||
dark: '#388e3c',
|
|
||||||
contrastText: '#000',
|
|
||||||
},
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
const getTheme = ({ mode }) => {
|
|
||||||
return createTheme({
|
|
||||||
typography: {
|
|
||||||
fontFamily: '"Helvetica"'
|
|
||||||
},
|
|
||||||
palette: mode == 'dark' ? getDarkPalette() : getLightPalette()
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
export default getTheme;
|
|
||||||
|
|
||||||
getTheme.propTypes = {
|
|
||||||
mode: PropTypes.string.isRequired,
|
|
||||||
};
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
<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>
|
|
||||||
|
Before Width: | Height: | Size: 4.0 KiB |
@@ -1,51 +0,0 @@
|
|||||||
.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);
|
|
||||||
}
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
.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);
|
|
||||||
}
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
.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);
|
|
||||||
}
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
.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);
|
|
||||||
}
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
.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);
|
|
||||||
}
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
.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);
|
|
||||||
}
|
|
||||||
@@ -1,107 +0,0 @@
|
|||||||
:root {
|
|
||||||
font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
|
|
||||||
line-height: 1.5;
|
|
||||||
font-weight: 400;
|
|
||||||
|
|
||||||
color-scheme: light dark;
|
|
||||||
color: rgba(255, 255, 255, 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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
import React from 'react';
|
|
||||||
import ReactDOM from 'react-dom/client';
|
|
||||||
import App from './App';
|
|
||||||
|
|
||||||
ReactDOM.createRoot(document.getElementById('root')).render(
|
|
||||||
<App />
|
|
||||||
)
|
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
import { fileURLToPath, URL } from 'node:url';
|
|
||||||
import { defineConfig, loadEnv } 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.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export default defineConfig(({ $$command, mode, $$isSsrBuild, $$isPreview }) => {
|
|
||||||
const target = env.ASPNETCORE_HTTPS_PORT
|
|
||||||
? `https://localhost:${env.ASPNETCORE_HTTPS_PORT}`
|
|
||||||
: env.ASPNETCORE_URLS
|
|
||||||
? env.ASPNETCORE_URLS.split(';')[0]
|
|
||||||
: 'https://localhost:8443';
|
|
||||||
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),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
});
|
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<TargetFramework>net7.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="7.0.20" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="7.0.20" />
|
|
||||||
<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" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<ConfigurationProfile Include="appsettings.Development.json" />
|
|
||||||
<ConfigurationProfile Include="appsettings.Production.json" />
|
|
||||||
<ConfigurationProfile Include="appsettings.ProductionAws.json" />
|
|
||||||
<ConfigurationProfile Include="appsettings.Staging.json" />
|
|
||||||
<ConfigurationProfile Include="appsettings.json" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
namespace Bts.DataStreamWebApp.Server;
|
|
||||||
|
|
||||||
public class CannedQueriesConfig {
|
|
||||||
public List<CannedQuery>? Items { get; set; }
|
|
||||||
}
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
namespace Bts.DataStreamWebApp.Server;
|
|
||||||
|
|
||||||
public class CannedQuery {
|
|
||||||
public string? Name { get; set; }
|
|
||||||
public List<string>? Query { get; set; }
|
|
||||||
}
|
|
||||||
-18
@@ -1,18 +0,0 @@
|
|||||||
namespace Bts.DataStreamWebApp.Server;
|
|
||||||
|
|
||||||
using Microsoft.AspNetCore.Mvc;
|
|
||||||
|
|
||||||
[ApiController]
|
|
||||||
[Route("api/[controller]")]
|
|
||||||
public class CannedQueriesController : ControllerBase {
|
|
||||||
readonly IConfiguration config;
|
|
||||||
|
|
||||||
public CannedQueriesController(IConfiguration config) =>
|
|
||||||
this.config = config;
|
|
||||||
|
|
||||||
[HttpGet(Name = "GetCannedQueries")]
|
|
||||||
public IEnumerable<CannedQuery>? Get() {
|
|
||||||
var cannedQueries = config.GetSection("CannedQueries").Get<List<CannedQuery>>()?.ToArray() ?? Array.Empty<CannedQuery>();
|
|
||||||
return cannedQueries;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-22
@@ -1,22 +0,0 @@
|
|||||||
// using Bts.DataStreamWebApp.Server;
|
|
||||||
|
|
||||||
// using Microsoft.AspNetCore.Mvc;
|
|
||||||
|
|
||||||
// [ApiController]
|
|
||||||
// [Route("api/[controller]")]
|
|
||||||
// public class ConfigController : ControllerBase {
|
|
||||||
// private readonly IConfiguration _configuration;
|
|
||||||
|
|
||||||
// public ConfigController(IConfiguration configuration) {
|
|
||||||
// _configuration = configuration;
|
|
||||||
// }
|
|
||||||
|
|
||||||
// [HttpGet("websocket")]
|
|
||||||
// public ActionResult<DataStreamWebSocketConfig> GetWebSocketConfig() {
|
|
||||||
// var endpoint = $"{_configuration["Kestrel:Endpoints:Http:Url"]}/ws";
|
|
||||||
// var webSocketConfig = new DataStreamWebSocketConfig {
|
|
||||||
// Endpoint = endpoint // or Https based on your setup
|
|
||||||
// };
|
|
||||||
// return Ok(webSocketConfig);
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
-30
@@ -1,30 +0,0 @@
|
|||||||
namespace Bts.DataStreamWebApp.Server.Controllers;
|
|
||||||
|
|
||||||
using Microsoft.AspNetCore.Mvc;
|
|
||||||
|
|
||||||
[Route("/ws")]
|
|
||||||
public class DataStreamSubscriptionController : ControllerBase {
|
|
||||||
readonly ILogger logger;
|
|
||||||
|
|
||||||
public DataStreamSubscriptionController(ILogger<DataStreamSubscriptionController> logger) {
|
|
||||||
this.logger = logger;
|
|
||||||
logger.LogInformation("Creating {ControllerType}", GetType().Name);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Route("/ws")]
|
|
||||||
public async Task Get(CancellationToken cancellationToken) {
|
|
||||||
if (!HttpContext.WebSockets.IsWebSocketRequest) {
|
|
||||||
logger.LogError("Expected websocket request on path '{}'", HttpContext.Request.Path);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
logger.LogInformation("Establishing websocket connection...");
|
|
||||||
try {
|
|
||||||
using var webSocket = await HttpContext.WebSockets.AcceptWebSocketAsync();
|
|
||||||
logger.LogInformation("Websocket connection established.");
|
|
||||||
using var server = new DataStreamWebSocketServer(webSocket, logger);
|
|
||||||
await server.Run(cancellationToken);
|
|
||||||
} catch (Exception ex) {
|
|
||||||
logger.LogError("DataStreamSubscriptionController.Run threw exception: {Exception}", ex);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,133 +0,0 @@
|
|||||||
namespace Bts.DataStreamWebApp.Server.Controllers;
|
|
||||||
|
|
||||||
using BCG;
|
|
||||||
|
|
||||||
using bts.websocket_core.json_rpc;
|
|
||||||
|
|
||||||
using Bts.DataStreamCore;
|
|
||||||
using Bts.DataStreamWebApp.Server.Messages;
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Net.WebSockets;
|
|
||||||
using System.Text;
|
|
||||||
using System.Text.Json;
|
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
|
||||||
class DataStreamSubscription : IDisposable, IHostedService {
|
|
||||||
public readonly ViewStream ViewStream;
|
|
||||||
public DataPacket? LastFired;
|
|
||||||
|
|
||||||
readonly ILogger logger;
|
|
||||||
readonly WebSocket webSocket;
|
|
||||||
|
|
||||||
public DataStreamSubscription(string id, JsonRpcId requestId, ViewStream viewStream, WebSocket webSocket, ILogger logger) {
|
|
||||||
ViewStream = viewStream;
|
|
||||||
RequestId = requestId;
|
|
||||||
Id = id;
|
|
||||||
this.webSocket = webSocket;
|
|
||||||
this.logger = logger;
|
|
||||||
}
|
|
||||||
|
|
||||||
public string Id { get; }
|
|
||||||
public JsonRpcId RequestId { get; }
|
|
||||||
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 StartAsync(CancellationToken cancellationToken) {
|
|
||||||
cancellationToken.ThrowIfCancellationRequested();
|
|
||||||
Start();
|
|
||||||
return Task.CompletedTask;
|
|
||||||
}
|
|
||||||
|
|
||||||
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 Task StopAsync(CancellationToken cancellationToken) {
|
|
||||||
cancellationToken.ThrowIfCancellationRequested();
|
|
||||||
Stop();
|
|
||||||
return Task.CompletedTask;
|
|
||||||
}
|
|
||||||
|
|
||||||
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, new DataStreamSubscriptionUpdate() {
|
|
||||||
SubscriptionId = Id,
|
|
||||||
Table = 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);
|
|
||||||
try {
|
|
||||||
await webSocket.SendAsync(bytes, WebSocketMessageType.Text, true, CancellationToken.None);
|
|
||||||
LastFired = dp;
|
|
||||||
} catch (WebSocketException ex) {
|
|
||||||
logger.LogError($"sendDataPacket failed on webSocket.SendAsync: {ex}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
namespace Bts.DataStreamWebApp.Server;
|
|
||||||
|
|
||||||
using BCG;
|
|
||||||
|
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
|
||||||
public class DataStreamSubscriptionUpdate {
|
|
||||||
[JsonPropertyName("subscription_id")]
|
|
||||||
public string? SubscriptionId { get; set; }
|
|
||||||
|
|
||||||
[JsonPropertyName("table")]
|
|
||||||
public DataPacket? Table { get; set; }
|
|
||||||
}
|
|
||||||
@@ -1,89 +0,0 @@
|
|||||||
namespace Bts.DataStreamWebApp.Server;
|
|
||||||
|
|
||||||
using Bts.PubSub;
|
|
||||||
|
|
||||||
using CommandLine;
|
|
||||||
|
|
||||||
using System.Text.Json;
|
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
|
||||||
class DataStreamWebAppServerConfig {
|
|
||||||
/// <summary>
|
|
||||||
/// The login user for sparkd
|
|
||||||
/// </summary>
|
|
||||||
[JsonPropertyName("user")]
|
|
||||||
[Option("user", HelpText = "The sparkd login user")]
|
|
||||||
public string? User { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The login password for sparkd
|
|
||||||
/// </summary>
|
|
||||||
[JsonPropertyName("password")]
|
|
||||||
[Option("pass", HelpText = "The sparkd login password")]
|
|
||||||
public string? Password { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// The config server url for sparkd
|
|
||||||
/// </summary>
|
|
||||||
[JsonPropertyName("sparkd")]
|
|
||||||
[Option("sparkd", HelpText = "The sparkd config server")]
|
|
||||||
public string? Sparkd { get; set; }
|
|
||||||
|
|
||||||
[JsonPropertyName("pubsub")]
|
|
||||||
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(
|
|
||||||
"config",
|
|
||||||
MetaValue = "PATH",
|
|
||||||
HelpText = "Path to json file representing these options (DataStreamPublisherConfig)")]
|
|
||||||
[JsonIgnore]
|
|
||||||
public string? ConfigFile { get; set; }
|
|
||||||
|
|
||||||
public static DataStreamWebAppServerConfig Default() =>
|
|
||||||
new() {
|
|
||||||
User = "bts",
|
|
||||||
PubSub = PubSubConfig.Default(),
|
|
||||||
};
|
|
||||||
|
|
||||||
public void MergeWith(DataStreamWebAppServerConfig other) {
|
|
||||||
User ??= other.User;
|
|
||||||
Password ??= other.Password;
|
|
||||||
PubSub ??= other.PubSub;
|
|
||||||
Sparkd ??= other.Sparkd;
|
|
||||||
ContentRootPath ??= other.ContentRootPath;
|
|
||||||
WebRootPath ??= other.WebRootPath;
|
|
||||||
ConfigFile ??= other.ConfigFile;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Merges options with those defined in `ConfigFile` (does not overwrite
|
|
||||||
/// non-null existing values).
|
|
||||||
/// </summary>
|
|
||||||
/// <exception cref="InvalidOperationException">
|
|
||||||
/// JsonSerializer.Deserialize returns null
|
|
||||||
/// </exception>
|
|
||||||
public void MergeWithConfigFile() {
|
|
||||||
if (ConfigFile is null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
var cfgString = File.ReadAllText(ConfigFile);
|
|
||||||
var parsedCfg = JsonSerializer.Deserialize<DataStreamWebAppServerConfig>(cfgString) ??
|
|
||||||
throw new InvalidOperationException($"Failed to parse json from {ConfigFile}");
|
|
||||||
MergeWith(parsedCfg);
|
|
||||||
ConfigFile = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
namespace Bts.DataStreamWebApp.Server;
|
|
||||||
|
|
||||||
public class DataStreamWebSocketConfig {
|
|
||||||
public string? Endpoint { get; set; }
|
|
||||||
}
|
|
||||||
@@ -1,148 +0,0 @@
|
|||||||
namespace Bts.DataStreamWebApp.Server.Controllers;
|
|
||||||
|
|
||||||
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 : IDisposable, IAsyncDisposable {
|
|
||||||
readonly ILogger logger;
|
|
||||||
readonly WebSocket webSocket;
|
|
||||||
readonly Dictionary<string, DataStreamSubscription> subscriptions = new();
|
|
||||||
|
|
||||||
public DataStreamWebSocketServer(WebSocket webSocket, ILogger logger) {
|
|
||||||
this.webSocket = webSocket;
|
|
||||||
this.logger = logger;
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<int> Run(CancellationToken cancellationToken) {
|
|
||||||
logger.LogInformation("DataStreamWebSocketServer running");
|
|
||||||
await foreach (var req in JsonRpcRequestAsyncEnumerable.Create(webSocket, logger, cancellationToken)) {
|
|
||||||
await (req.Method switch {
|
|
||||||
"subscribe" => onSubscribe(req, cancellationToken),
|
|
||||||
"unsubscribe" => onUnsubscribe(req.Deserialize<UnsubscribeRequest>(), cancellationToken),
|
|
||||||
_ => Task.CompletedTask,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
logger.LogInformation("DataStreamWebSocketServer stopped");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Disposes internal subscriptions. To additionally notify the client of the subscription status
|
|
||||||
/// change(s), use <see cref="DisposeAsync"/>.
|
|
||||||
/// </summary>
|
|
||||||
public void Dispose() {
|
|
||||||
GC.SuppressFinalize(this);
|
|
||||||
disposeSubscriptions();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Disposes internal subscriptions (like <see cref="Dispose"/>), then sends 'subscription status change'
|
|
||||||
/// notifications to the client (unlike <see cref="Dispose"/>).
|
|
||||||
/// </summary>
|
|
||||||
public async ValueTask DisposeAsync() {
|
|
||||||
GC.SuppressFinalize(this);
|
|
||||||
var finalSubs = subscriptions.Values.Select(s => (s.RequestId, s.Id)).ToList();
|
|
||||||
disposeSubscriptions();
|
|
||||||
// Send a 'subscription status change' msg to the client for each one.
|
|
||||||
foreach (var (requestId, id) in finalSubs) {
|
|
||||||
await sendSubscriptionStatus(requestId, id, "unsubscribe", SubscriptionStatus.Unsubscribed, CancellationToken.None);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async Task onSubscribe(JsonRpcRequest<JsonNode> req, CancellationToken cancellationToken) {
|
|
||||||
ArgumentNullException.ThrowIfNull(req.Id);
|
|
||||||
ArgumentException.ThrowIfNullOrEmpty(req.Method);
|
|
||||||
if (!SubscribeRequest.Parse(req, out var subReq, out var parseErr, out var errCode)) {
|
|
||||||
logger.LogError("Invalid 'subscribe' request: {Reason}", parseErr);
|
|
||||||
var rpcError = JsonRpcResponse.CreateError<SubscriptionError>(
|
|
||||||
req.Id, new() { Code = (long)errCode, Message = "Failed to parse subscription request", Data = parseErr });
|
|
||||||
await send(rpcError, cancellationToken);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
var subId = subReq.SubscriptionId ?? throw new InvalidOperationException("SubscriptionId is null (parse false)");
|
|
||||||
disposeSubscription(subId);
|
|
||||||
if (!subReq.ParseQuery(out var vs, out parseErr, out errCode)) {
|
|
||||||
logger.LogError("Invalid 'subscribe' request: {Reason}", parseErr);
|
|
||||||
var rpcError = JsonRpcResponse.CreateError<SubscriptionError>(
|
|
||||||
req.Id, new() { Code = (long)errCode, Message = "Failed to parse subscription request", Data = parseErr });
|
|
||||||
await send(rpcError, cancellationToken);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (subscriptions.TryGetValue(subId, out var oldSub)) {
|
|
||||||
logger.LogInformation("Disposing existing subscription with id {SubscriptionId}", subId);
|
|
||||||
oldSub.Dispose();
|
|
||||||
}
|
|
||||||
var sub = new DataStreamSubscription(subId, req.Id.Value, vs, webSocket, logger);
|
|
||||||
subscriptions[subId] = sub;
|
|
||||||
await sendSubscriptionStatus(req.Id.Value, subId, req.Method, SubscriptionStatus.Subscribed, cancellationToken);
|
|
||||||
vs.ErrorChanged += OnStreamError;
|
|
||||||
await sub.StartAsync(cancellationToken);
|
|
||||||
|
|
||||||
async void OnStreamError(Exception exception) {
|
|
||||||
logger.LogError("Error in ViewStream (disposing subscription): {Exception}", exception);
|
|
||||||
subscriptions.Remove(sub.Id);
|
|
||||||
sub.Dispose();
|
|
||||||
var error = new SubscriptionError() {
|
|
||||||
ErrorMessage = "Error in ViewStream (disposing subscription)"
|
|
||||||
};
|
|
||||||
if (exception is not null) {
|
|
||||||
error.ErrorMessage += ". " + exception.Message;
|
|
||||||
error.StackTrace = exception.StackTrace?.Split("\n")?.ToList();
|
|
||||||
}
|
|
||||||
var rpcError = JsonRpcResponse.CreateError<SubscriptionError>(
|
|
||||||
req.Id, new() { Code = (long)ErrorCode.ViewStreamError, Message = "Error in ViewStream (disposing subscription)", Data = error });
|
|
||||||
await send(rpcError, cancellationToken);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async Task onUnsubscribe(JsonRpcRequest<UnsubscribeRequest> req, CancellationToken cancellationToken) {
|
|
||||||
ArgumentNullException.ThrowIfNull(req.Id);
|
|
||||||
ArgumentException.ThrowIfNullOrEmpty(req.Method);
|
|
||||||
var subId = req.Params?.SubscriptionId ?? string.Empty;
|
|
||||||
if (!disposeSubscription(subId)) {
|
|
||||||
logger.LogInformation("Unable to dispose subscription. Subscription with id {Id} not found.", subId);
|
|
||||||
}
|
|
||||||
await sendSubscriptionStatus(req.Id.Value, subId, "unsubscribe", SubscriptionStatus.Unsubscribed, cancellationToken);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool disposeSubscription(string subId) {
|
|
||||||
if (!subscriptions.TryGetValue(subId, out var sub)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
logger.LogInformation("Disposing subscription with id {Id}", subId);
|
|
||||||
sub.Dispose();
|
|
||||||
subscriptions.Remove(subId);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
Task sendSubscriptionStatus(JsonRpcId reqId, string subId, string method, SubscriptionStatus status, CancellationToken cancellationToken) {
|
|
||||||
logger.LogInformation("Sending {Method} ack. SubscriptionId = {SubscriptionId}", method, subId);
|
|
||||||
var response = JsonRpcResponse.Create(reqId, new SubscriptionStatusMessage() {
|
|
||||||
SubscriptionId = subId,
|
|
||||||
Status = status,
|
|
||||||
});
|
|
||||||
return send(response, cancellationToken);
|
|
||||||
}
|
|
||||||
|
|
||||||
Task send<T>(T message, CancellationToken cancellationToken) {
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
|
|
||||||
void disposeSubscriptions() {
|
|
||||||
logger.LogInformation("Disposing DataStreamWebSocketServer subscriptions. Count: {Count}", subscriptions.Count);
|
|
||||||
subscriptions.Values.DisposeAll();
|
|
||||||
subscriptions.Clear();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
FROM bluetradingsystems/linux_dotnet7
|
|
||||||
|
|
||||||
RUN dotnet dev-certs https --trust
|
|
||||||
COPY --chown=bts:bts "build/Release/bin/net7.0/linux-x64/publish" "bin"
|
|
||||||
COPY --chown=bts:bts "build/Bts.DataStreamWebApp.Client/production/dist" "bin/wwwroot"
|
|
||||||
COPY --chown=bts:bts "src/DataStreamSuite/Bts.DataStreamWebApp.Server/spark.conf" ".local/share/bts/Bts.DataStreamWebApp.Server/conf/spark.conf"
|
|
||||||
WORKDIR "/home/bts/bin"
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
namespace Bts.DataStreamWebApp.Server;
|
|
||||||
|
|
||||||
public class CannedQueriesResponse {
|
|
||||||
public List<CannedQuery>? Items { get; set; }
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
namespace Bts.DataStreamWebApp.Server.Messages;
|
|
||||||
|
|
||||||
enum ErrorCode {
|
|
||||||
None = 0,
|
|
||||||
InvalidSubscriptionRequest,
|
|
||||||
ViewStreamError,
|
|
||||||
}
|
|
||||||
@@ -1,72 +0,0 @@
|
|||||||
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 Parse(JsonRpcRequest<JsonNode> req, [NotNullWhen(true)]out SubscribeRequest? subscription, [NotNullWhen(false)]out SubscriptionError? error, out ErrorCode errorCode) {
|
|
||||||
subscription = null;
|
|
||||||
errorCode = ErrorCode.None;
|
|
||||||
var paramsJsonObj = req.Params?.AsObject();
|
|
||||||
error = null;
|
|
||||||
if (paramsJsonObj is null) {
|
|
||||||
errorCode = ErrorCode.InvalidSubscriptionRequest;
|
|
||||||
error = new() { ErrorMessage = "'params' object not found" };
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
subscription = paramsJsonObj.Deserialize<SubscribeRequest>();
|
|
||||||
if (subscription is null) {
|
|
||||||
errorCode = ErrorCode.InvalidSubscriptionRequest;
|
|
||||||
error = new() { ErrorMessage = "'params' object invalid" };
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
internal bool ParseQuery([NotNullWhen(true)] out ViewStream? stream, [NotNullWhen(false)] out SubscriptionError? error, out ErrorCode errorCode) {
|
|
||||||
stream = null;
|
|
||||||
errorCode = ErrorCode.None;
|
|
||||||
error = null;
|
|
||||||
if (Query is null) {
|
|
||||||
errorCode = ErrorCode.InvalidSubscriptionRequest;
|
|
||||||
error = new() { ErrorMessage = "'params.query' field not found (expected a string)" };
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
var exp = DataStreamExpressionsInterpreter.Evaluate(Query);
|
|
||||||
if (exp is null) {
|
|
||||||
errorCode = ErrorCode.InvalidSubscriptionRequest;
|
|
||||||
error = new() { ErrorMessage = "'params.query' expression has invalid syntax" };
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
Exception? exception = null;
|
|
||||||
try {
|
|
||||||
stream = exp.getView(new Dictionary<string, StatementExpression>(0));
|
|
||||||
} catch (Exception ex) {
|
|
||||||
exception = ex;
|
|
||||||
}
|
|
||||||
if (stream is null) {
|
|
||||||
errorCode = ErrorCode.InvalidSubscriptionRequest;
|
|
||||||
error = new() { ErrorMessage = "Failed to create ViewStream from 'params.query' expression (check for typos in arguments/typenames)" };
|
|
||||||
if (exception is not null) {
|
|
||||||
error.ErrorMessage += ". " + exception.Message;
|
|
||||||
error.StackTrace = exception.StackTrace?.Split("\n")?.ToList();
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
namespace Bts.DataStreamWebApp.Server.Messages;
|
|
||||||
|
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
|
||||||
public class SubscriptionError {
|
|
||||||
[JsonPropertyName("error_message")]
|
|
||||||
public string? ErrorMessage { get; set; }
|
|
||||||
|
|
||||||
[JsonPropertyName("stack_trace")]
|
|
||||||
public List<string>? StackTrace { get; set; }
|
|
||||||
}
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
namespace Bts.DataStreamWebApp.Server.Messages;
|
|
||||||
|
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
|
||||||
public class UnsubscribeRequest {
|
|
||||||
[JsonPropertyName("subscription_id")]
|
|
||||||
public string? SubscriptionId { get; set; }
|
|
||||||
}
|
|
||||||
@@ -1,82 +0,0 @@
|
|||||||
using Bts.DataStreamCore.Services;
|
|
||||||
using Bts.PubSub.Services;
|
|
||||||
|
|
||||||
using Spark.Api.Services;
|
|
||||||
using Spark.Core.Services;
|
|
||||||
|
|
||||||
using System.Reactive.Linq;
|
|
||||||
using System.Reflection;
|
|
||||||
|
|
||||||
var builder = WebApplication.CreateBuilder(new WebApplicationOptions {
|
|
||||||
Args = args,
|
|
||||||
ApplicationName = "Bts.DataStreamWebApp.Server",
|
|
||||||
});
|
|
||||||
ConfigureApp(builder.Configuration, builder.Environment.EnvironmentName);
|
|
||||||
ConfigureServices(builder.Services, builder.Configuration);
|
|
||||||
|
|
||||||
var app = builder.Build();
|
|
||||||
var wsOpts = new WebSocketOptions {
|
|
||||||
KeepAliveInterval = TimeSpan.FromMinutes(2)
|
|
||||||
};
|
|
||||||
if (app.Environment.IsDevelopment()) {
|
|
||||||
app.UseDirectoryBrowser("/browse");
|
|
||||||
app.UseSwagger();
|
|
||||||
app.UseSwaggerUI();
|
|
||||||
}
|
|
||||||
app.UseHttpsRedirection();
|
|
||||||
app.UseWebSockets(wsOpts);
|
|
||||||
app.UseDefaultFiles();
|
|
||||||
app.UseStaticFiles();
|
|
||||||
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, string environment) {
|
|
||||||
// We prefix appsettings with the exe name because multiple exes will usually be in the build dir
|
|
||||||
// (this way, each exe can still load its own appsettings files from the current directory).
|
|
||||||
var exeName = Assembly.GetCallingAssembly().GetName().Name;
|
|
||||||
AddJsonFile($"{exeName}.appsettings.json");
|
|
||||||
AddJsonFile($"{exeName}.appsettings.{environment}.json");
|
|
||||||
|
|
||||||
var cfg = configBuilder.GetSection("config")?.Value;
|
|
||||||
if (!SetBasePath(cfg)) {
|
|
||||||
AddJsonFile(cfg);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool SetBasePath(string? path) {
|
|
||||||
if (!Directory.Exists(path)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
configBuilder.SetBasePath(path);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool AddJsonFile(string? path) {
|
|
||||||
if (!File.Exists(path)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
configBuilder.AddJsonFile(path);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void ConfigureServices(IServiceCollection services, IConfiguration config) {
|
|
||||||
services.AddDirectoryBrowser()
|
|
||||||
.AddControllers().Services
|
|
||||||
.AddEndpointsApiExplorer()
|
|
||||||
.AddSwaggerGen();
|
|
||||||
services.AddSpaStaticFiles();
|
|
||||||
services.AddSpark(config.GetSection("Spark"))
|
|
||||||
.AddSparkApi(config.GetSection("SparkApi"))
|
|
||||||
.AddMasterWorker(config.GetSection("MasterWorker"))
|
|
||||||
.AddViewStreamDatabase()
|
|
||||||
.AddPubSubClient(config.GetSection("PubSub"));
|
|
||||||
}
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
{
|
|
||||||
"$schema": "http://json.schemastore.org/launchsettings.json",
|
|
||||||
"profiles": {
|
|
||||||
"http": {
|
|
||||||
"commandName": "Project",
|
|
||||||
"dotnetRunMessages": true,
|
|
||||||
"launchBrowser": true,
|
|
||||||
"launchUrl": "swagger",
|
|
||||||
"applicationUrl": "http://localhost:8080",
|
|
||||||
"environmentVariables": {
|
|
||||||
"ASPNETCORE_HTTP_PORT": "8080",
|
|
||||||
"ASPNETCORE_ENVIRONMENT": "Development",
|
|
||||||
"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy",
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"https": {
|
|
||||||
"commandName": "Project",
|
|
||||||
"dotnetRunMessages": true,
|
|
||||||
"launchBrowser": true,
|
|
||||||
"applicationUrl": "http://localhost:8080;https://localhost:8443",
|
|
||||||
"environmentVariables": {
|
|
||||||
"ASPNETCORE_HTTP_PORT": "8080",
|
|
||||||
"ASPNETCORE_HTTPS_PORT": "8443",
|
|
||||||
"ASPNETCORE_ENVIRONMENT": "Development",
|
|
||||||
"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy",
|
|
||||||
}
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
@@ -1,62 +0,0 @@
|
|||||||
{
|
|
||||||
"Kestrel": {
|
|
||||||
"Endpoints": {
|
|
||||||
"Http": {
|
|
||||||
"Url": "http://localhost:8080"
|
|
||||||
},
|
|
||||||
"Https": {
|
|
||||||
"Url": "https://localhost:8443"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"PubSub": {
|
|
||||||
"Routing": {
|
|
||||||
"PublisherRoutes": [
|
|
||||||
{
|
|
||||||
"Name": "default",
|
|
||||||
"ServerAddress": "bts-cloud://localhost:22019",
|
|
||||||
"TagRegExp": ".*"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"SubscriberRoutes": [
|
|
||||||
{
|
|
||||||
"Name": "default",
|
|
||||||
"ServerAddress": "bts-cloud://localhost:22019",
|
|
||||||
"TagRegExp": ".*"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"CannedQueries": [
|
|
||||||
{
|
|
||||||
"Name": "BBO",
|
|
||||||
"Query": [
|
|
||||||
"bbo"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Name": "Trades",
|
|
||||||
"Query": [
|
|
||||||
"timesales"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Name": "Instruments",
|
|
||||||
"Query": [
|
|
||||||
"instruments"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Name": "Books",
|
|
||||||
"Query": [
|
|
||||||
"books"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Name": "Benzinga News",
|
|
||||||
"Query": [
|
|
||||||
"benzinga_news"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
{
|
|
||||||
"Spark": {
|
|
||||||
"ConfigServer": "http://sparkd:8000/config"
|
|
||||||
},
|
|
||||||
"SparkApi": {
|
|
||||||
"IsEnabled": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,115 +0,0 @@
|
|||||||
{
|
|
||||||
"MasterWorker": {
|
|
||||||
"Interval": "00:00:00.1"
|
|
||||||
},
|
|
||||||
"ViewStreamDatabase": {
|
|
||||||
"Interval": "00:00:00.1"
|
|
||||||
},
|
|
||||||
"Spark": {
|
|
||||||
"ConfigServer": "http://172.30.2.181:8000/config"
|
|
||||||
},
|
|
||||||
"SparkApi": {
|
|
||||||
"Credentials": {
|
|
||||||
"User": "bts",
|
|
||||||
"Password": ""
|
|
||||||
},
|
|
||||||
"EnableAdmin": true,
|
|
||||||
"EnableOrders": true,
|
|
||||||
"EnablePosition": true
|
|
||||||
},
|
|
||||||
"PubSub": {
|
|
||||||
"HeartbeatInterval": 15000,
|
|
||||||
"MissingHeartbeatsBeforeGc": 50,
|
|
||||||
"ServerPort": 22019,
|
|
||||||
"Routing": {
|
|
||||||
"PublisherRoutes": [
|
|
||||||
{
|
|
||||||
"Name": "default",
|
|
||||||
"ServerAddress": "bts-cloud://172.30.2.181:22019",
|
|
||||||
"TagRegExp": ".*"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"SubscriberRoutes": [
|
|
||||||
{
|
|
||||||
"Name": "default",
|
|
||||||
"ServerAddress": "bts-cloud://172.30.2.181:22019",
|
|
||||||
"TagRegExp": ".*"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"TagTypeToAssemblyMap": {
|
|
||||||
"Entries": [
|
|
||||||
{
|
|
||||||
"HandlerClass": "BCG.PubSubServerTagHandler",
|
|
||||||
"Assembly": "DataStreamCore.dll"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"TagHandlerFactory": {
|
|
||||||
"Handlers": [
|
|
||||||
{
|
|
||||||
"TagType": "DataStream",
|
|
||||||
"Assembly": "DataStreamCore",
|
|
||||||
"Class": "bts.PubsubServerStreamTagHandler"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TagType": "System_Sub",
|
|
||||||
"Assembly": "PubSub",
|
|
||||||
"Class": "BCG.SystemSubscriptionMapPublisher"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TagType": "System_Stats",
|
|
||||||
"Assembly": "PubSub",
|
|
||||||
"Class": "BCG.SystemStatsPublisher"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TagType": ".*",
|
|
||||||
"Assembly": "DataStreamCore",
|
|
||||||
"Class": "bts.PubsubServerGenericDataHandler"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Kestrel": {
|
|
||||||
"Endpoints": {
|
|
||||||
"Http": {
|
|
||||||
"Url": "http://172.30.2.181:8080"
|
|
||||||
},
|
|
||||||
"Https": {
|
|
||||||
"Url": "https://172.30.2.181:8443"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"CannedQueries": [
|
|
||||||
{
|
|
||||||
"Name": "BBO",
|
|
||||||
"Query": [
|
|
||||||
"bbo"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Name": "Trades",
|
|
||||||
"Query": [
|
|
||||||
"timesales"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Name": "Instruments",
|
|
||||||
"Query": [
|
|
||||||
"instruments"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Name": "Books",
|
|
||||||
"Query": [
|
|
||||||
"books"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Name": "Benzinga News",
|
|
||||||
"Query": [
|
|
||||||
"benzinga_news"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
{
|
|
||||||
"CannedQueries": [
|
|
||||||
{
|
|
||||||
"Name": "BBO",
|
|
||||||
"Query": [
|
|
||||||
"bbo"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Name": "Trades",
|
|
||||||
"Query": [
|
|
||||||
"timesales"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Name": "Instruments",
|
|
||||||
"Query": [
|
|
||||||
"instruments"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Name": "Books",
|
|
||||||
"Query": [
|
|
||||||
"books"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Name": "Benzinga News",
|
|
||||||
"Query": [
|
|
||||||
"benzinga_news"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1,85 +0,0 @@
|
|||||||
{
|
|
||||||
"Logging": {
|
|
||||||
"LogLevel": {
|
|
||||||
"Default": "Information",
|
|
||||||
"Microsoft.AspNetCore": "Warning"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"AllowedHosts": "*",
|
|
||||||
"Kestrel": {
|
|
||||||
"Endpoints": {
|
|
||||||
"Http": {
|
|
||||||
"Url": "http://0.0.0.0:8080"
|
|
||||||
},
|
|
||||||
"Https": {
|
|
||||||
"Url": "https://0.0.0.0:8443"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"MasterWorker": {
|
|
||||||
"Interval": "00:00:00.1"
|
|
||||||
},
|
|
||||||
"ViewStreamDatabase": {
|
|
||||||
"Interval": "00:00:00.1"
|
|
||||||
},
|
|
||||||
"SparkApi": {
|
|
||||||
"IsEnabled": false,
|
|
||||||
"Credentials": {
|
|
||||||
"User": "bts",
|
|
||||||
"Password": ""
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"PubSub": {
|
|
||||||
"HeartbeatInterval": 15000,
|
|
||||||
"MissingHeartbeatsBeforeGc": 50,
|
|
||||||
"ServerPort": 22019,
|
|
||||||
"Routing": {
|
|
||||||
"PublisherRoutes": [
|
|
||||||
{
|
|
||||||
"Name": "default",
|
|
||||||
"ServerAddress": "bts-cloud://pubsub:22019",
|
|
||||||
"TagRegExp": ".*"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"SubscriberRoutes": [
|
|
||||||
{
|
|
||||||
"Name": "default",
|
|
||||||
"ServerAddress": "bts-cloud://pubsub:22019",
|
|
||||||
"TagRegExp": ".*"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"TagTypeToAssemblyMap": {
|
|
||||||
"Entries": [
|
|
||||||
{
|
|
||||||
"HandlerClass": "BCG.PubSubServerTagHandler",
|
|
||||||
"Assembly": "DataStreamCore.dll"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"TagHandlerFactory": {
|
|
||||||
"Handlers": [
|
|
||||||
{
|
|
||||||
"TagType": "DataStream",
|
|
||||||
"Assembly": "DataStreamCore",
|
|
||||||
"Class": "bts.PubsubServerStreamTagHandler"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TagType": "System_Sub",
|
|
||||||
"Assembly": "PubSub",
|
|
||||||
"Class": "BCG.SystemSubscriptionMapPublisher"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TagType": "System_Stats",
|
|
||||||
"Assembly": "PubSub",
|
|
||||||
"Class": "BCG.SystemStatsPublisher"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"TagType": ".*",
|
|
||||||
"Assembly": "DataStreamCore",
|
|
||||||
"Class": "bts.PubsubServerGenericDataHandler"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
FROM bluetradingsystems/linux_dotnet7
|
|
||||||
|
|
||||||
RUN dotnet dev-certs https --trust
|
|
||||||
COPY --chown=bts:bts "bin" "bin"
|
|
||||||
COPY --chown=bts:bts "webapp.spark.conf" ".local/share/DataStream/conf/spark.conf"
|
|
||||||
WORKDIR "/home/bts/bin"
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
Logging {
|
|
||||||
value {
|
|
||||||
console {
|
|
||||||
default_level: "Info"
|
|
||||||
}
|
|
||||||
syslog {
|
|
||||||
default_level: "Info"
|
|
||||||
}
|
|
||||||
file {
|
|
||||||
default_level: "Info"
|
|
||||||
}
|
|
||||||
initial_queue_size: 120001
|
|
||||||
max_queue_growth: 4
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,168 +0,0 @@
|
|||||||
<!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.
|
Before Width: | Height: | Size: 8.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 KiB |
@@ -1,176 +0,0 @@
|
|||||||
<!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>
|
|
||||||
Loaded 100 of 2350 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user