Compare commits
481
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ddcc85bbc0 | ||
|
|
1b9c4fba2f | ||
|
|
49c7683d58 | ||
|
|
a8a474dd7f | ||
|
|
19450f4029 | ||
|
|
86d54fdd68 | ||
|
|
b413f519b5 | ||
|
|
9f3e0898b9 | ||
|
|
7709f250f6 | ||
|
|
dc31b4919d | ||
|
|
0f8f7f3adc | ||
|
|
eae4f571ee | ||
|
|
e85cdcb453 | ||
|
|
2c7f47ef17 | ||
|
|
b9f7d0b1a2 | ||
|
|
7feed957a3 | ||
|
|
14031da8eb | ||
|
|
6fee0d99d9 | ||
|
|
5db7a20a41 | ||
|
|
250f7d4b6d | ||
|
|
dd02b83bc1 | ||
|
|
26c3af44e0 | ||
|
|
90a59b764e | ||
|
|
df750c4dd0 | ||
|
|
c35d7c90f6 | ||
|
|
1c2dc2c39c | ||
|
|
3faffbe22a | ||
|
|
7864c3238c | ||
|
|
cf4a8599e7 | ||
|
|
7459a4f224 | ||
|
|
f1451b102d | ||
|
|
23b2758a05 | ||
|
|
5c3a57ceb5 | ||
|
|
888a6bc536 | ||
|
|
0514d8f434 | ||
|
|
cf0adfd910 | ||
|
|
bfc87bfdf0 | ||
|
|
d9c8c61e47 | ||
|
|
3398f44b33 | ||
|
|
f4cef5aadb | ||
|
|
e12769df8e | ||
|
|
6e5ddb734f | ||
|
|
b4345cfa24 | ||
|
|
54566ade60 | ||
|
|
06a80040ff | ||
|
|
2e9b4c78f3 | ||
|
|
2b62668df8 | ||
|
|
17ca432f87 | ||
|
|
2c8833bdfe | ||
|
|
e0ab5713b6 | ||
|
|
c31b52e1df | ||
|
|
2e7478629f | ||
|
|
3afc447538 | ||
|
|
56887327e1 | ||
|
|
6c89cd6717 | ||
|
|
5243490d5f | ||
|
|
0d04eea483 | ||
|
|
3abfac1a20 | ||
|
|
574694e06e | ||
|
|
c30bba7d5c | ||
|
|
48695d3f7f | ||
|
|
3ef40387f3 | ||
|
|
776625891e | ||
|
|
fcdd869831 | ||
|
|
6a7efacac9 | ||
|
|
489b289a6d | ||
|
|
e75cc05137 | ||
|
|
f75fe665c1 | ||
|
|
58bd35be01 | ||
|
|
89143b25c7 | ||
|
|
aec005505f | ||
|
|
103725887f | ||
|
|
1ce7ddd252 | ||
|
|
3e1000e8e7 | ||
|
|
5561c54345 | ||
|
|
c7269176ca | ||
|
|
ec34e8b2f2 | ||
|
|
a54f9530b9 | ||
|
|
53850044c0 | ||
|
|
8e91091e3c | ||
|
|
92ffade5da | ||
|
|
b636cf76f2 | ||
|
|
ac001b65c6 | ||
|
|
bc3869f087 | ||
|
|
66583356ac | ||
|
|
ef11c6e418 | ||
|
|
361e4bdd48 | ||
|
|
44ad5861fc | ||
|
|
0ea6563ddb | ||
|
|
ff7f8fce49 | ||
|
|
cc28ba41d1 | ||
|
|
6fcec2c370 | ||
|
|
76393216c1 | ||
|
|
3e792a41e0 | ||
|
|
298273de91 | ||
|
|
d256ec508b | ||
|
|
8293f1764e | ||
|
|
0a119b3f03 | ||
|
|
e4940bba40 | ||
|
|
6b2a86f4f1 | ||
|
|
01b9d49df2 | ||
|
|
f3d7a9210d | ||
|
|
32e766f56c | ||
|
|
58557311d4 | ||
|
|
412a2576e0 | ||
|
|
06de560169 | ||
|
|
80b62a5a33 | ||
|
|
f05cff4ada | ||
|
|
b2d04363b6 | ||
|
|
d9d2f70917 | ||
|
|
3d07e8cf3d | ||
|
|
68f75a6f44 | ||
|
|
ad0b6968ad | ||
|
|
fdaff5dcf5 | ||
|
|
ffa92ea4ae | ||
|
|
dd305b9c3f | ||
|
|
07b581e980 | ||
|
|
79fadf3dba | ||
|
|
c05d90fd26 | ||
|
|
51f60188f5 | ||
|
|
cf93176991 | ||
|
|
6aa9307a3c | ||
|
|
3eb3cfbf9f | ||
|
|
501671c9c5 | ||
|
|
9d62fcde3d | ||
|
|
50b4c8807e | ||
|
|
c6f6dc8bf4 | ||
|
|
fb528d4683 | ||
|
|
f1b2206577 | ||
|
|
68d1865f36 | ||
|
|
3c8431837b | ||
|
|
e0d413b884 | ||
|
|
ff8ebaa326 | ||
|
|
370b84b6dd | ||
|
|
715246c9c7 | ||
|
|
a1f195721a | ||
|
|
d7de423e35 | ||
|
|
244b3de513 | ||
|
|
0683abbda6 | ||
|
|
9d2886fe67 | ||
|
|
2ac815949c | ||
|
|
046f451e76 | ||
|
|
36f191d49a | ||
|
|
f55237029f | ||
|
|
6fcf096924 | ||
|
|
547383c8d9 | ||
|
|
dc74b62304 | ||
|
|
8907681bb2 | ||
|
|
f16b921630 | ||
|
|
614e9c69e1 | ||
|
|
5a59303dd4 | ||
|
|
d427538cd9 | ||
|
|
46888af8fb | ||
|
|
efaef11e7c | ||
|
|
c095614c67 | ||
|
|
f41114ee13 | ||
|
|
39c33f082f | ||
|
|
a3c0bc977e | ||
|
|
3a39b3c516 | ||
|
|
9265746198 | ||
|
|
0236e3a47a | ||
|
|
71d52c2dc9 | ||
|
|
ce0b4872ff | ||
|
|
b686159cf3 | ||
|
|
ee7c8c393e | ||
|
|
7c4191289f | ||
|
|
f18949a1e3 | ||
|
|
f3b9cb2d62 | ||
|
|
faeb10cf9d | ||
|
|
e5f1039671 | ||
|
|
39de6bdb2d | ||
|
|
e93f970706 | ||
|
|
844677dae0 | ||
|
|
3541feef87 | ||
|
|
776a589945 | ||
|
|
396f72d7c1 | ||
|
|
62a9917a48 | ||
|
|
a3dd7c3815 | ||
|
|
e669cf6b77 | ||
|
|
c5e3c4aa18 | ||
|
|
be35ed120b | ||
|
|
9846bf3936 | ||
|
|
cb5fcee2ce | ||
|
|
08319cfd38 | ||
|
|
777c276437 | ||
|
|
5ab0e1f886 | ||
|
|
a90896f606 | ||
|
|
3f6f5ab0e0 | ||
|
|
24e5683ad2 | ||
|
|
34999d0a5a | ||
|
|
ace7ae2695 | ||
|
|
f9016907e6 | ||
|
|
0913fe28d4 | ||
|
|
400b4ff848 | ||
|
|
5a36a5f4d4 | ||
|
|
0f6539ed00 | ||
|
|
475bf1effc | ||
|
|
ec1e657687 | ||
|
|
284c84dfe6 | ||
|
|
b78c61bf44 | ||
|
|
09a41775bb | ||
|
|
b9ef3ddf91 | ||
|
|
e516496fe8 | ||
|
|
a55705db75 | ||
|
|
e39ad91e1c | ||
|
|
658472b2a8 | ||
|
|
1ad94cfe49 | ||
|
|
22a5a9a4c1 | ||
|
|
e5bbc26da5 | ||
|
|
6a628a3070 | ||
|
|
ac120658eb | ||
|
|
85a36384ce | ||
|
|
563833bc67 | ||
|
|
d77ac1600b | ||
|
|
3b41a2065a | ||
|
|
f993f01634 | ||
|
|
e7067a708b | ||
|
|
04ac2b9d3d | ||
|
|
66c6b0bf8c | ||
|
|
03dd4000fe | ||
|
|
e928295e71 | ||
|
|
b94c5823e9 | ||
|
|
467e81b543 | ||
|
|
8f7409b3e7 | ||
|
|
0d19702e12 | ||
|
|
466fa265fe | ||
|
|
ebd1852221 | ||
|
|
f1130160b1 | ||
|
|
99fba0b3ce | ||
|
|
89afbbd00a | ||
|
|
9e4af550f8 | ||
|
|
ea67280252 | ||
|
|
8c06d84a8b | ||
|
|
941186a12a | ||
|
|
0984007c6e | ||
|
|
2bb7a89777 | ||
|
|
15fc3cb785 | ||
|
|
725396589e | ||
|
|
6fc1ec4d67 | ||
|
|
0496b299dd | ||
|
|
b55c4103df | ||
|
|
6604eaaea7 | ||
|
|
29e5c72969 | ||
|
|
21e07e1b2e | ||
|
|
74afdde8de | ||
|
|
0a92ad2eb1 | ||
|
|
56d207c3f1 | ||
|
|
9172e752e3 | ||
|
|
adc9f2acfc | ||
|
|
41d17e67d2 | ||
|
|
5cacff073b | ||
|
|
c8da92c250 | ||
|
|
c4e76076e3 | ||
|
|
6a715b9a68 | ||
|
|
1f28940c95 | ||
|
|
ebff40b88f | ||
|
|
a6d14a3ac3 | ||
|
|
af96bcb9e3 | ||
|
|
619702cb04 | ||
|
|
5baec19aff | ||
|
|
39ef30c1e3 | ||
|
|
c2f2d28914 | ||
|
|
e06bc3bdf5 | ||
|
|
e19c19c013 | ||
|
|
8f324bc507 | ||
|
|
12107c42ce | ||
|
|
91c6fb4e52 | ||
|
|
7044355547 | ||
|
|
583ae65fb2 | ||
|
|
552fec0edc | ||
|
|
fcf6927fbf | ||
|
|
23f6d827d5 | ||
|
|
f083d0abab | ||
|
|
a895e36922 | ||
|
|
59d7a72288 | ||
|
|
7731f2f4d1 | ||
|
|
41ae5897c0 | ||
|
|
c7949ccfba | ||
|
|
567af79c7f | ||
|
|
6bb4a7b25c | ||
|
|
bc7cef4c34 | ||
|
|
ab9dc361d6 | ||
|
|
39da0a4dde | ||
|
|
44e864d697 | ||
|
|
0a02da3aba | ||
|
|
836771a7f0 | ||
|
|
f386badcfb | ||
|
|
1d43a484db | ||
|
|
91042cb41e | ||
|
|
10c0e4247d | ||
|
|
8e34264e6d | ||
|
|
0a840d256b | ||
|
|
8a69c51cac | ||
|
|
0262fd40bc | ||
|
|
859dfe3544 | ||
|
|
9c624a2f79 | ||
|
|
dec1061b40 | ||
|
|
be4895faa6 | ||
|
|
3c9755f0dd | ||
|
|
61ed847d7d | ||
|
|
fc9094fea8 | ||
|
|
e36c0efc4b | ||
|
|
4158a14cff | ||
|
|
201a45cba0 | ||
|
|
ab31b9b253 | ||
|
|
780ddc79a7 | ||
|
|
d5a2adaed6 | ||
|
|
008ab3f068 | ||
|
|
7d926f588d | ||
|
|
707cd07876 | ||
|
|
f7ecb9090c | ||
|
|
a19e8a7315 | ||
|
|
cf189ecf81 | ||
|
|
4405b7adcb | ||
|
|
e51ee7b7b9 | ||
|
|
dfaa74f426 | ||
|
|
1d2ce59009 | ||
|
|
3602cc05bb | ||
|
|
ac88a81ac6 | ||
|
|
01fa8e0c63 | ||
|
|
59547e0f37 | ||
|
|
3ce100a9cf | ||
|
|
6513fb0cd5 | ||
|
|
fd0fb1f760 | ||
|
|
5cf7eacd82 | ||
|
|
087d8ab8c9 | ||
|
|
b69b7b3350 | ||
|
|
5620f33524 | ||
|
|
f3e33fa390 | ||
|
|
3b631e0d5f | ||
|
|
f93d28ee76 | ||
|
|
23d7d3775d | ||
|
|
4940771166 | ||
|
|
c1967a8f6a | ||
|
|
8c797ee76b | ||
|
|
ce80957d07 | ||
|
|
c60018b59e | ||
|
|
3a27af87d1 | ||
|
|
068c1c6973 | ||
|
|
645a58c97d | ||
|
|
b7f455b29a | ||
|
|
4a2735839e | ||
|
|
d2e9fe8237 | ||
|
|
cfc60766d8 | ||
|
|
b03fec7f79 | ||
|
|
fb8e7c5b81 | ||
|
|
e44601d1b1 | ||
|
|
07bade53c0 | ||
|
|
fac0a9c25b | ||
|
|
1d1de3dd18 | ||
|
|
cfcbf004ba | ||
|
|
78c7dadbbe | ||
|
|
7b5a6031af | ||
|
|
c13a7782c8 | ||
|
|
45f02391d1 | ||
|
|
a3ca06addc | ||
|
|
32869e54ec | ||
|
|
ca73220a2e | ||
|
|
9fc3c2618e | ||
|
|
e72e0c0a30 | ||
|
|
a5bfc75278 | ||
|
|
261a184d25 | ||
|
|
54e96a06cb | ||
|
|
17e60df32b | ||
|
|
c99d5fe24c | ||
|
|
6049826e90 | ||
|
|
672149dd89 | ||
|
|
8c99147f04 | ||
|
|
4d4b0b7ae3 | ||
|
|
1a7955c1b1 | ||
|
|
f8fc2a1d96 | ||
|
|
9a7b3cb77c | ||
|
|
8a3e4edb4d | ||
|
|
e59183bb1e | ||
|
|
dd4d4e8dc6 | ||
|
|
f1744450ca | ||
|
|
3a7827a75b | ||
|
|
8d22e91c0d | ||
|
|
c425145fc9 | ||
|
|
4855935ae0 | ||
|
|
65f412ec9f | ||
|
|
40681c6093 | ||
|
|
ab2d36e523 | ||
|
|
b1ab3a66d2 | ||
|
|
5e7e7e8ef4 | ||
|
|
9291d30ae9 | ||
|
|
549708fcc2 | ||
|
|
1d5551f301 | ||
|
|
283db0f9ea | ||
|
|
9fb04b2db9 | ||
|
|
ceca96e10a | ||
|
|
fc48cc64af | ||
|
|
015d846941 | ||
|
|
e39108bbda | ||
|
|
6240d89a08 | ||
|
|
c76700e5e5 | ||
|
|
a8a0e8dea0 | ||
|
|
d65a2d6ed6 | ||
|
|
1824d5f9a4 | ||
|
|
d3eb29087b | ||
|
|
d6fae238f9 | ||
|
|
44b46033e3 | ||
|
|
5741ec9ab2 | ||
|
|
596975b309 | ||
|
|
9050318ceb | ||
|
|
7ee6933789 | ||
|
|
306c572b53 | ||
|
|
63306173b1 | ||
|
|
df1b45ca3e | ||
|
|
c31a1f1bf3 | ||
|
|
e95997ea17 | ||
|
|
12a070fd8d | ||
|
|
e0459c54fd | ||
|
|
15262a5a95 | ||
|
|
90ec64d25c | ||
|
|
061481419e | ||
|
|
8035255868 | ||
|
|
7feaf869dc | ||
|
|
7104e90fc9 | ||
|
|
52c1e500e6 | ||
|
|
07274f897a | ||
|
|
f626e53415 | ||
|
|
5a7b2965be | ||
|
|
0aab1628bc | ||
|
|
b9649e1d8e | ||
|
|
3bc9bf2207 | ||
|
|
888c06262b | ||
|
|
03e80dabcb | ||
|
|
54184d0875 | ||
|
|
90bcf5a455 | ||
|
|
d32d5ef40c | ||
|
|
2e0e0658c6 | ||
|
|
bbdb50a41e | ||
|
|
90705cac83 | ||
|
|
b91cdd6d91 | ||
|
|
64f2bd7a88 | ||
|
|
3e32f684e3 | ||
|
|
ff73756a55 | ||
|
|
1e64811d93 | ||
|
|
2488597cf2 | ||
|
|
2d8047ba80 | ||
|
|
3cb602b77e | ||
|
|
51e1005e79 | ||
|
|
ef7ea64973 | ||
|
|
0267c16e5a | ||
|
|
ca40e278ff | ||
|
|
1c5da7ad48 | ||
|
|
9bb3d5c569 | ||
|
|
92ba43bfad | ||
|
|
ddeb5e59f0 | ||
|
|
6b0b3e31cc | ||
|
|
3f6c904ccc | ||
|
|
d433919f1b | ||
|
|
75da9af39d | ||
|
|
22eff44926 | ||
|
|
cd6a052d0c | ||
|
|
3b6cf0b187 | ||
|
|
c170dd7a9e | ||
|
|
154775bc70 | ||
|
|
7f936f3ba9 | ||
|
|
9b30a947a8 | ||
|
|
2ee58d8f99 | ||
|
|
0537b3e9c7 | ||
|
|
8ae940bcbc | ||
|
|
966ccb5f2c | ||
|
|
fae9c3e59e | ||
|
|
cb1dfb257d | ||
|
|
76c3fe86c2 | ||
|
|
7e3b1de70f | ||
|
|
2a07e3cf3c | ||
|
|
6d0249825d | ||
|
|
63810e3966 | ||
|
|
4c013a8886 | ||
|
|
9509818978 | ||
|
|
4fdf3b8b60 | ||
|
|
ee9a58486d | ||
|
|
75d6939c8b | ||
|
|
fb1697b571 | ||
|
|
4080d606d8 | ||
|
|
7655fd47dd | ||
|
|
d029b0fce7 |
No files matched your search
@@ -0,0 +1,133 @@
|
|||||||
|
FROM ubuntu:22.04
|
||||||
|
|
||||||
|
ARG DEBIAN_FRONTEND=noninteractive
|
||||||
|
|
||||||
|
# Note installations that take a while (more than 10s)
|
||||||
|
|
||||||
|
RUN apt-get update
|
||||||
|
RUN apt-get install -y ca-certificates
|
||||||
|
RUN apt-get install -y ccache
|
||||||
|
RUN apt-get install -y curl
|
||||||
|
RUN apt-get install -y fish
|
||||||
|
RUN apt-get install -y gdb
|
||||||
|
# git-all: ~250s
|
||||||
|
RUN apt-get install -y git-all
|
||||||
|
RUN apt-get install -y gnupg
|
||||||
|
# liblttng-ust-dev: ~30s
|
||||||
|
RUN apt-get install -y liblttng-ust-dev
|
||||||
|
RUN apt-get install -y libssh2-1-dev
|
||||||
|
RUN apt-get install -y locales
|
||||||
|
RUN apt-get install -y ninja-build
|
||||||
|
# openssh-server: ~40s
|
||||||
|
RUN apt-get install -y openssh-server
|
||||||
|
RUN apt-get install -y pkg-config
|
||||||
|
RUN apt-get install -y software-properties-common
|
||||||
|
RUN apt-get install -y sudo
|
||||||
|
RUN apt-get install -y tzdata
|
||||||
|
RUN apt-get install -y vim
|
||||||
|
RUN apt-get install -y zip
|
||||||
|
|
||||||
|
# Python: ~30s
|
||||||
|
RUN apt-get install -y \
|
||||||
|
python3-pip \
|
||||||
|
python3-venv \
|
||||||
|
&& python3 -m pip install --upgrade pip
|
||||||
|
|
||||||
|
# GCC
|
||||||
|
ARG gcc_major=13
|
||||||
|
RUN \
|
||||||
|
add-apt-repository ppa:ubuntu-toolchain-r/test \
|
||||||
|
&& apt-get update \
|
||||||
|
&& apt-get install -y g++-$gcc_major
|
||||||
|
|
||||||
|
# Clang
|
||||||
|
ARG clang_major=17
|
||||||
|
RUN \
|
||||||
|
curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key 2> /dev/null \
|
||||||
|
| gpg --dearmor - \
|
||||||
|
| tee /usr/share/keyrings/llvm-snapshot.gpg > /dev/null \
|
||||||
|
&& echo "deb [signed-by=/usr/share/keyrings/llvm-snapshot.gpg] http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-$clang_major main" \
|
||||||
|
| tee -a "/etc/apt/sources.list.d/llvm.list" \
|
||||||
|
&& apt-get update \
|
||||||
|
&& apt-get install -y \
|
||||||
|
clang-$clang_major \
|
||||||
|
clang-format-$clang_major \
|
||||||
|
clangd-$clang_major
|
||||||
|
|
||||||
|
# CMake
|
||||||
|
RUN \
|
||||||
|
curl -fsSL https://apt.kitware.com/keys/kitware-archive-latest.asc 2> /dev/null \
|
||||||
|
| gpg --dearmor - \
|
||||||
|
| tee /usr/share/keyrings/kitware-archive-keyring.gpg > /dev/null \
|
||||||
|
&& echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" \
|
||||||
|
| tee /etc/apt/sources.list.d/kitware.list > /dev/null \
|
||||||
|
&& apt-get update \
|
||||||
|
&& apt-get install -y cmake
|
||||||
|
|
||||||
|
# Dotnet
|
||||||
|
RUN apt-get update && apt-get install -y dotnet7
|
||||||
|
|
||||||
|
# Node
|
||||||
|
ARG node_major=18
|
||||||
|
RUN mkdir -p /etc/apt/keyrings \
|
||||||
|
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key \
|
||||||
|
| gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
|
||||||
|
&& echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$node_major.x nodistro main" \
|
||||||
|
| tee /etc/apt/sources.list.d/nodesource.list \
|
||||||
|
&& apt-get update \
|
||||||
|
&& apt-get install -y nodejs
|
||||||
|
|
||||||
|
# Emumba (deps)
|
||||||
|
RUN apt-get update && apt-get -y install rapidjson-dev
|
||||||
|
# Emumba
|
||||||
|
COPY emumba /emumba
|
||||||
|
RUN dpkg -i /emumba/emumba-deribit-connector-3.3.1-Linux.LICENSE_DISABLED.deb \
|
||||||
|
&& rm -r /emumba
|
||||||
|
|
||||||
|
# Pcap
|
||||||
|
RUN apt-get update && apt-get install -y libpcap0.8-dev
|
||||||
|
|
||||||
|
# Databento (deps)
|
||||||
|
RUN apt-get update && apt-get -y install libzstd-dev
|
||||||
|
|
||||||
|
# Docker in Docker
|
||||||
|
RUN apt-get update && apt-get install -y \
|
||||||
|
docker.io \
|
||||||
|
docker-compose \
|
||||||
|
docker-compose-v2
|
||||||
|
|
||||||
|
# Set up default executables (update-alternatives)
|
||||||
|
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; \
|
||||||
|
update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-$clang_major 100; \
|
||||||
|
update-alternatives --install /usr/bin/clangd clangd /usr/bin/clangd-$clang_major 100; \
|
||||||
|
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-$gcc_major 100; \
|
||||||
|
update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-$gcc_major 100
|
||||||
|
|
||||||
|
# Add compiler symlinks for ccache
|
||||||
|
RUN \
|
||||||
|
ln -s /usr/bin/ccache /usr/local/bin/clang; \
|
||||||
|
ln -s /usr/bin/ccache /usr/local/bin/clang++; \
|
||||||
|
ln -s /usr/bin/ccache /usr/local/bin/clang-$clang_major; \
|
||||||
|
ln -s /usr/bin/ccache /usr/local/bin/clang++-$clang_major; \
|
||||||
|
ln -s /usr/bin/ccache /usr/local/bin/gcc; \
|
||||||
|
ln -s /usr/bin/ccache /usr/local/bin/g++
|
||||||
|
|
||||||
|
RUN locale-gen en_US.UTF-8
|
||||||
|
|
||||||
|
ARG docker_user="bts"
|
||||||
|
ARG docker_uid="1000"
|
||||||
|
ARG docker_pass="bts"
|
||||||
|
|
||||||
|
RUN \
|
||||||
|
groupadd -g "$docker_uid" "$docker_user" \
|
||||||
|
&& useradd \
|
||||||
|
-m \
|
||||||
|
-u "$docker_uid" \
|
||||||
|
-g "$docker_uid" \
|
||||||
|
-G sudo \
|
||||||
|
--password "$(openssl passwd -1 "$docker_pass")" \
|
||||||
|
"$docker_user"
|
||||||
|
|
||||||
|
RUN usermod -aG docker "$docker_user"
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
{
|
||||||
|
"dockerFile": "Dockerfile",
|
||||||
|
// Creates local dir to mount to HOME in docker
|
||||||
|
"initializeCommand": "mkdir -p ${localEnv:HOME}/.bts/devcontainer-mounts/${devcontainerId}",
|
||||||
|
"hostRequirements": {
|
||||||
|
"memory": "4gb",
|
||||||
|
"storage": "6gb"
|
||||||
|
},
|
||||||
|
"postCreateCommand": "/home/bts/spark/docker/sparkd/dev/devcontainer_post_create.sh",
|
||||||
|
"containerUser": "bts",
|
||||||
|
"workspaceMount": "source=${localWorkspaceFolder},target=/home/bts/spark,type=bind",
|
||||||
|
"workspaceFolder": "/home/bts/spark",
|
||||||
|
"updateRemoteUserUID": true,
|
||||||
|
"shutdownAction": "none",
|
||||||
|
// Note: If running multiple containers on the same host, each must use a
|
||||||
|
// unique set of ports. Usually we just add 1000 to each port as needed. For
|
||||||
|
// example, if 8000-8003 is taken, go with 9000-9003, then 10000-10003, etc.
|
||||||
|
"runArgs": [
|
||||||
|
"--shm-size",
|
||||||
|
"2gb",
|
||||||
|
"--network",
|
||||||
|
"host"
|
||||||
|
],
|
||||||
|
"mounts": [
|
||||||
|
"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": {
|
||||||
|
"vscode": {
|
||||||
|
"settings": {
|
||||||
|
"clangd.arguments": [
|
||||||
|
"--compile-commands-dir=${workspaceFolder}/build/clang/debug"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"extensions": [
|
||||||
|
"eamodio.gitlens",
|
||||||
|
"llvm-vs-code-extensions.vscode-clangd",
|
||||||
|
"ms-vscode.cmake-tools",
|
||||||
|
"ms-vscode.cpptools"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Binary file not shown.
@@ -0,0 +1,4 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
this_dir="$(realpath "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")")"
|
||||||
|
sudo dpkg -i "$this_dir/emumba-deribit-connector-3.3.1-Linux.LICENSE_DISABLED.deb"
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
*.cmd text=auto eol=crlf
|
||||||
|
*.cs text=auto eol=crlf
|
||||||
|
*.sh text=auto eol=lf
|
||||||
|
*.py text=auto eol=lf
|
||||||
+4
-2
@@ -8,7 +8,9 @@ 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
|
||||||
@@ -54,6 +56,6 @@ trace_data/
|
|||||||
/src/Spark.Admin.WebApp/src/bin/
|
/src/Spark.Admin.WebApp/src/bin/
|
||||||
**/CMakeDeps.cmake
|
**/CMakeDeps.cmake
|
||||||
**/CMakeDeps_win.cmake
|
**/CMakeDeps_win.cmake
|
||||||
**/.devcontainer
|
.devcontainer/
|
||||||
*.Generated.cs
|
*.Generated.cs
|
||||||
*.lst
|
*.lst
|
||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[submodule "externals"]
|
[submodule "externals"]
|
||||||
path = externals
|
path = externals
|
||||||
url = git@bitbucket.org:bluetradesys/externals.git
|
url = https://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
@@ -0,0 +1,312 @@
|
|||||||
|
{
|
||||||
|
"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/src/app_sparkd/sparkd",
|
||||||
|
},
|
||||||
|
"args": [
|
||||||
|
"run"
|
||||||
|
],
|
||||||
|
"cwd": "${workspaceFolder}/build/sparkd-debug-clang/src/app_sparkd",
|
||||||
|
"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/src/app_sparkd/sparkd",
|
||||||
|
},
|
||||||
|
"args": [
|
||||||
|
"test-py-md-provider"
|
||||||
|
],
|
||||||
|
"cwd": "${workspaceFolder}/build/sparkd-debug-clang/src/app_sparkd",
|
||||||
|
"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
+23
-55
@@ -14,12 +14,17 @@ 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")
|
|
||||||
set(SPARK_INCLUDE "${EXTERNALS_ROOT}/include")
|
# SHARED_MEMORY_PREFIX serves as a kind of namespace so multiple applications
|
||||||
set(SPARK_LIB "${EXTERNALS_ROOT}/lib/$<CONFIG>")
|
# can run simultaneously without fighting over the same shm files (e.g., sparkd,
|
||||||
set(BUILD_API_SERVER OFF CACHE BOOL "Build the api server")
|
# api server, etc.).
|
||||||
|
set(SHARED_MEMORY_PREFIX "\${BTS_SHARED_MEMORY_PREFIX}" 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")
|
||||||
@@ -28,32 +33,19 @@ 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 ${SPARK_INCLUDE} ${EXTERNALS_ROOT}/include/zlib)
|
include_directories(BEFORE SYSTEM ${EXTERNALS_INCLUDE} ${EXTERNALS_ROOT}/include/zlib)
|
||||||
link_directories(${SPARK_LIB})
|
link_directories(${EXTERNALS_LIB})
|
||||||
|
|
||||||
if(BUILD_API_SERVER)
|
add_compile_definitions(SHARED_MEMORY_PREFIX="${SHARED_MEMORY_PREFIX}")
|
||||||
add_compile_definitions(SPARK_ENABLE_API_SERVER)
|
if(DEFINED APP_DATA_DIR)
|
||||||
|
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)
|
add_subdirectory(src/lib_spark)
|
||||||
else()
|
else()
|
||||||
# make sparkd look for libspark.so in its directory
|
if(BUILD_SPARKD)
|
||||||
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
|
|
||||||
set(CMAKE_INSTALL_RPATH ".")
|
|
||||||
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/")
|
|
||||||
|
|
||||||
# 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)
|
||||||
@@ -112,10 +104,14 @@ else()
|
|||||||
|
|
||||||
# subdirs
|
# subdirs
|
||||||
if (BUILD_SPARKD)
|
if (BUILD_SPARKD)
|
||||||
add_subdirectory(src/server/sparkd)
|
add_subdirectory(src/lib_system)
|
||||||
|
add_subdirectory(src/lib_domain)
|
||||||
|
add_subdirectory(src/lib_python_md)
|
||||||
|
add_subdirectory(src/lib_logging)
|
||||||
|
add_subdirectory(src/app_sparkd)
|
||||||
add_subdirectory(src/data_files)
|
add_subdirectory(src/data_files)
|
||||||
endif()
|
endif()
|
||||||
add_subdirectory(src/lib)
|
add_subdirectory(src/lib_spark)
|
||||||
if (BUILD_ADMIN_WEB_APP)
|
if (BUILD_ADMIN_WEB_APP)
|
||||||
add_subdirectory(src/Spark.Admin.WebApp)
|
add_subdirectory(src/Spark.Admin.WebApp)
|
||||||
endif()
|
endif()
|
||||||
@@ -125,32 +121,4 @@ 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()
|
||||||
+113
-81
@@ -15,7 +15,7 @@
|
|||||||
"rhs": "Windows"
|
"rhs": "Windows"
|
||||||
},
|
},
|
||||||
"generator": "Visual Studio 17 2022",
|
"generator": "Visual Studio 17 2022",
|
||||||
"binaryDir": "${sourceDir}/build",
|
"binaryDir": "${sourceDir}/build/${presetName}",
|
||||||
"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,8 +29,11 @@
|
|||||||
"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/net8.0",
|
"DOTNET_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net7.0;${sourceDir}/build/$<CONFIG>/bin/net7.0-windows",
|
||||||
"DOTNET_WINDOWS_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net8.0-windows"
|
"EXPORT_MD_CONSUMER": {
|
||||||
|
"type": "BOOL",
|
||||||
|
"value": "ON"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -46,13 +49,9 @@
|
|||||||
"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_RPATH": ".",
|
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
|
||||||
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}/sparkd",
|
"CMAKE_PREFIX_PATH": "${sourceDir}/cmake/;${sourceDir}/.venv/lib/python3.10/site-packages/pybind11/share/cmake/pybind11",
|
||||||
"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": {
|
||||||
@@ -95,98 +94,67 @@
|
|||||||
{
|
{
|
||||||
"name": "sparkd-debug-clang",
|
"name": "sparkd-debug-clang",
|
||||||
"inherits": "sparkd-debug",
|
"inherits": "sparkd-debug",
|
||||||
"displayName": "Debug (clang)",
|
"displayName": "Sparkd (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": "Debug (gcc)",
|
"displayName": "Sparkd (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",
|
||||||
"CMAKE_CXX_COMPILER": "g++",
|
"CMAKE_CXX_COMPILER": "g++",
|
||||||
"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": "Release (clang)",
|
"displayName": "Sparkd (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": "Release (gcc)",
|
"displayName": "Sparkd (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",
|
"displayName": "Spark Api Server (Windows)"
|
||||||
"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",
|
"displayName": "Spark Api Server (Linux)",
|
||||||
"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"
|
||||||
@@ -195,9 +163,16 @@
|
|||||||
"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_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
|
"CMAKE_EXPORT_COMPILE_COMMANDS": {
|
||||||
|
"type": "BOOL",
|
||||||
|
"value": "ON"
|
||||||
|
},
|
||||||
"CONFIG_DEFAULTS_PATH": "config/profiles/default/*.conf",
|
"CONFIG_DEFAULTS_PATH": "config/profiles/default/*.conf",
|
||||||
"DOTNET_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net8.0"
|
"DOTNET_BINARY_DIR": "${sourceDir}/build/Spark.Api.Server/$<CONFIG>/bin/net7.0",
|
||||||
|
"EXPORT_MD_CONSUMER": {
|
||||||
|
"type": "BOOL",
|
||||||
|
"value": "ON"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -220,13 +195,57 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "data-stream-suite",
|
"name": "data-stream-suite-windows",
|
||||||
|
"condition": {
|
||||||
|
"type": "equals",
|
||||||
|
"lhs": "${hostSystemName}",
|
||||||
|
"rhs": "Windows"
|
||||||
|
},
|
||||||
"inherits": "spark",
|
"inherits": "spark",
|
||||||
"displayName": "Data Stream Suite",
|
"displayName": "Data Stream Suite (Windows)",
|
||||||
"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"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
@@ -244,7 +263,7 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
"name": "spark-debug",
|
"name": "spark-debug",
|
||||||
"displayName": "Debug",
|
"displayName": "Spark (Debug)",
|
||||||
"inherits": "spark",
|
"inherits": "spark",
|
||||||
"configurePreset": "spark",
|
"configurePreset": "spark",
|
||||||
"configuration": "Debug"
|
"configuration": "Debug"
|
||||||
@@ -252,7 +271,7 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
"name": "spark-release",
|
"name": "spark-release",
|
||||||
"displayName": "Release",
|
"displayName": "Spark (Release)",
|
||||||
"inherits": "spark",
|
"inherits": "spark",
|
||||||
"configurePreset": "spark",
|
"configurePreset": "spark",
|
||||||
"configuration": "Release"
|
"configuration": "Release"
|
||||||
@@ -265,43 +284,42 @@
|
|||||||
"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": "Debug (clang)",
|
"displayName": "Sparkd (Debug | Clang)",
|
||||||
"inherits": "sparkd"
|
"inherits": "sparkd"
|
||||||
},
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "sparkd-debug-clang-j6",
|
||||||
|
"configurePreset": "sparkd-debug-clang",
|
||||||
|
"displayName": "Sparkd (Debug | Clang | jobs=6)",
|
||||||
|
"inherits": "sparkd",
|
||||||
|
"jobs": 6
|
||||||
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "sparkd-debug-gcc",
|
"name": "sparkd-debug-gcc",
|
||||||
"configurePreset": "sparkd-debug-gcc",
|
"configurePreset": "sparkd-debug-gcc",
|
||||||
"displayName": "Debug (gcc)",
|
"displayName": "Sparkd (Debug | Gcc)",
|
||||||
"inherits": "sparkd"
|
"inherits": "sparkd"
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "sparkd-release-clang",
|
"name": "sparkd-release-clang",
|
||||||
"configurePreset": "sparkd-release-clang",
|
"configurePreset": "sparkd-release-clang",
|
||||||
"displayName": "Release (clang)",
|
"displayName": "Sparkd (Release | Clang)",
|
||||||
"inherits": "sparkd"
|
"inherits": "sparkd"
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "sparkd-release-gcc",
|
"name": "sparkd-release-gcc",
|
||||||
"configurePreset": "sparkd-release-gcc",
|
"configurePreset": "sparkd-release-gcc",
|
||||||
"displayName": "Release (gcc)",
|
"displayName": "Sparkd (Release | Gcc)",
|
||||||
"inherits": "sparkd"
|
"inherits": "sparkd"
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -318,14 +336,14 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
"name": "spark-api-server-windows-debug",
|
"name": "spark-api-server-windows-debug",
|
||||||
"displayName": "Spark Api Server (Debug)",
|
"displayName": "Spark Api Server (Windows | 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 (Debug)",
|
"displayName": "Spark Api Server (Windows | Release)",
|
||||||
"inherits": "spark-api-server-windows",
|
"inherits": "spark-api-server-windows",
|
||||||
"configuration": "Release"
|
"configuration": "Release"
|
||||||
},
|
},
|
||||||
@@ -344,14 +362,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 (Debug)",
|
"displayName": "Spark Api Server (Linux | 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 (Release)",
|
"displayName": "Spark Api Server (Linux | Release)",
|
||||||
"configuration": "Release"
|
"configuration": "Release"
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -371,16 +389,30 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "data-stream-suite-debug",
|
"name": "data-stream-suite-windows-debug",
|
||||||
"displayName": "DataStreamSuite (Debug)",
|
"displayName": "Data Stream Suite (Windows | Debug)",
|
||||||
"configurePreset": "data-stream-suite",
|
"configurePreset": "data-stream-suite-windows",
|
||||||
"configuration": "Debug"
|
"configuration": "Debug"
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "data-stream-suite-release",
|
"name": "data-stream-suite-windows-release",
|
||||||
"displayName": "DataStreamSuite (Release)",
|
"displayName": "Data Stream Suite (Windows | Release)",
|
||||||
"configurePreset": "data-stream-suite",
|
"configurePreset": "data-stream-suite-windows",
|
||||||
|
"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"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
macro(export_to_parent)
|
||||||
|
foreach(var IN ITEMS ${ARGN})
|
||||||
|
set(${var} ${${var}} PARENT_SCOPE)
|
||||||
|
endforeach()
|
||||||
|
endmacro()
|
||||||
@@ -0,0 +1,66 @@
|
|||||||
|
include_guard(DIRECTORY)
|
||||||
|
include(${CMAKE_SOURCE_DIR}/cmake/ExportToParent.cmake)
|
||||||
|
include(${CMAKE_SOURCE_DIR}/cmake/TernaryOperator.cmake)
|
||||||
|
|
||||||
|
function(init_library)
|
||||||
|
set(_options SHARED STATIC)
|
||||||
|
set(_one_value_args SOURCE_DIR)
|
||||||
|
set(_multi_value_args)
|
||||||
|
cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
|
||||||
|
|
||||||
|
if (_ARGS_SHARED AND _ARGS_STATIC)
|
||||||
|
message(FATAL_ERROR "Invalid args passed to init_library: cannot specify STATIC and SHARED")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set_ternary(_source_dir _ARGS_SOURCE_DIR _ARGS_SOURCE_DIR ${PROJECT_NAME})
|
||||||
|
# Glob cpp sources
|
||||||
|
file(
|
||||||
|
GLOB_RECURSE ${PROJECT_NAME}_SOURCES
|
||||||
|
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
|
${_source_dir}/*.cpp
|
||||||
|
)
|
||||||
|
# Note: cpp files inside 'tests' dir(s) are considered tests.
|
||||||
|
# Remove tests from main sources, and add them to 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()
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
export_to_parent(
|
||||||
|
${PROJECT_NAME}_SOURCES
|
||||||
|
${PROJECT_NAME}_TEST_SOURCES
|
||||||
|
)
|
||||||
|
|
||||||
|
# Add main library
|
||||||
|
if (_ARGS_STATIC)
|
||||||
|
add_library(${PROJECT_NAME} STATIC ${${PROJECT_NAME}_SOURCES})
|
||||||
|
elseif(_ARGS_SHARED)
|
||||||
|
add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}_SOURCES})
|
||||||
|
else()
|
||||||
|
add_library(${PROJECT_NAME} ${${PROJECT_NAME}_SOURCES})
|
||||||
|
endif()
|
||||||
|
|
||||||
|
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()
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
function(init_shared_library)
|
||||||
|
include(${CMAKE_SOURCE_DIR}/cmake/ExportToParent.cmake)
|
||||||
|
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()
|
||||||
|
|
||||||
|
# Glob cpp sources
|
||||||
|
file(
|
||||||
|
GLOB_RECURSE ${PROJECT_NAME}_SOURCES
|
||||||
|
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
|
${source_dir}/*.cpp
|
||||||
|
)
|
||||||
|
# Note: cpp files inside 'tests' dir(s) are considered tests.
|
||||||
|
# Remove tests from main sources, and add them to 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()
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
export_to_parent(
|
||||||
|
${PROJECT_NAME}_SOURCES
|
||||||
|
${PROJECT_NAME}_TEST_SOURCES
|
||||||
|
)
|
||||||
|
|
||||||
|
# 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)
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
include(${CMAKE_SOURCE_DIR}/cmake/PackBasic.cmake)
|
||||||
|
include(GNUInstallDirs)
|
||||||
|
|
||||||
|
function(install_basic)
|
||||||
|
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()
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
include(CMakePackageConfigHelpers)
|
||||||
|
|
||||||
|
function(pack_basic)
|
||||||
|
find_package(Git QUIET)
|
||||||
|
|
||||||
|
if(GIT_FOUND)
|
||||||
|
execute_process(
|
||||||
|
COMMAND ${GIT_EXECUTABLE} describe --tags --always --dirty
|
||||||
|
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
||||||
|
OUTPUT_VARIABLE PROJECT_VERSION
|
||||||
|
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(NOT GIT_FOUND OR PROJECT_VERSION STREQUAL "")
|
||||||
|
set(PROJECT_VERSION "0.0.0")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
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()
|
||||||
@@ -1,145 +0,0 @@
|
|||||||
set(Protobuf_PROTOC_EXECUTABLE "${SPARK_BIN}/protoc")
|
|
||||||
set(PROTOBUF_INCLUDE_DIRS "${SPARK_INCLUDE}")
|
|
||||||
set(PROTOBUF_STATIC_LIB "libprotobuf")
|
|
||||||
|
|
||||||
function(Protobuf_Generate_Cpp SRCS HDRS)
|
|
||||||
set(${SRCS})
|
|
||||||
set(${HDRS})
|
|
||||||
|
|
||||||
foreach(FIL ${ARGN})
|
|
||||||
get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
|
|
||||||
get_filename_component(FIL_WE ${FIL} NAME_WE)
|
|
||||||
get_filename_component(FIL_DIR ${FIL} DIRECTORY)
|
|
||||||
if(FIL_DIR)
|
|
||||||
set(FIL_WE "${FIL_DIR}/${FIL_WE}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc")
|
|
||||||
list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h")
|
|
||||||
|
|
||||||
add_custom_command(
|
|
||||||
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc"
|
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h"
|
|
||||||
COMMAND
|
|
||||||
${Protobuf_PROTOC_EXECUTABLE} ARGS --cpp_out=${CMAKE_BINARY_DIR}/src -I
|
|
||||||
${PROTOBUF_INCLUDE_DIRS} -I ${CMAKE_SOURCE_DIR}/src ${ABS_FIL}
|
|
||||||
DEPENDS ${ABS_FIL}
|
|
||||||
COMMENT "Running C++ protocol buffer compiler on ${FIL}"
|
|
||||||
VERBATIM)
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
set_source_files_properties(${${SRCS}} ${${HDRS}} PROPERTIES GENERATED TRUE)
|
|
||||||
|
|
||||||
# remove some warnings from protobuf generated files
|
|
||||||
if(WIN32)
|
|
||||||
set_source_files_properties(${${SRCS}} PROPERTIES COMPILE_FLAGS
|
|
||||||
"/wd4309 /wd4838")
|
|
||||||
else()
|
|
||||||
set_source_files_properties(
|
|
||||||
${${SRCS}}
|
|
||||||
PROPERTIES
|
|
||||||
COMPILE_FLAGS
|
|
||||||
"-Wno-unused-parameter -Wno-effc++ -Wno-pedantic -Wno-sign-compare -Wno-uninitialized"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(${SRCS}
|
|
||||||
${${SRCS}}
|
|
||||||
PARENT_SCOPE)
|
|
||||||
set(${HDRS}
|
|
||||||
${${HDRS}}
|
|
||||||
PARENT_SCOPE)
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
function(Service_Compiler_Generate_Cpp SRCS HDRS)
|
|
||||||
set(${SRCS})
|
|
||||||
set(${HDRS})
|
|
||||||
|
|
||||||
foreach(FIL ${ARGN})
|
|
||||||
get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
|
|
||||||
get_filename_component(FIL_WE ${FIL} NAME_WE)
|
|
||||||
get_filename_component(FIL_DIR ${FIL} DIRECTORY)
|
|
||||||
if(FIL_DIR)
|
|
||||||
set(FIL_WE "${FIL_DIR}/${FIL_WE}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc")
|
|
||||||
list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h")
|
|
||||||
|
|
||||||
list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.cc")
|
|
||||||
list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.h")
|
|
||||||
|
|
||||||
list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.cc")
|
|
||||||
list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.h")
|
|
||||||
|
|
||||||
set(TEMPLATES
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/client.pb.cc
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/client.pb.h
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/server.pb.cc
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/server.pb.h
|
|
||||||
)
|
|
||||||
|
|
||||||
if(WIN32)
|
|
||||||
add_custom_command(
|
|
||||||
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc"
|
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h"
|
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.cc"
|
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.h"
|
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.cc"
|
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.h"
|
|
||||||
COMMAND SET PYTHONPATH=${SPARK_PYTHON}
|
|
||||||
COMMAND ${CMAKE_SOURCE_DIR}/.venv/Scripts/activate.bat
|
|
||||||
COMMAND
|
|
||||||
${Protobuf_PROTOC_EXECUTABLE} ARGS --cpp_out=${CMAKE_BINARY_DIR}/src
|
|
||||||
--plugin=protoc-gen-service=${CMAKE_SOURCE_DIR}/src/lib/api/service_compiler/plugin.cmd
|
|
||||||
--service_out=lang=cpp:${CMAKE_BINARY_DIR}/src -I
|
|
||||||
${PROTOBUF_INCLUDE_DIRS} -I ${CMAKE_SOURCE_DIR}/src ${ABS_FIL}
|
|
||||||
DEPENDS ${ABS_FIL} ${TEMPLATES}
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/plugin.py
|
|
||||||
COMMENT "Running C++ service compiler on ${FIL}"
|
|
||||||
VERBATIM)
|
|
||||||
else()
|
|
||||||
add_custom_command(
|
|
||||||
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc"
|
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h"
|
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.cc"
|
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.h"
|
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.cc"
|
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.h"
|
|
||||||
COMMAND ${CMAKE_SOURCE_DIR}/tools/venv_exec.sh
|
|
||||||
ARGS
|
|
||||||
${Protobuf_PROTOC_EXECUTABLE}
|
|
||||||
--cpp_out=${CMAKE_BINARY_DIR}/src
|
|
||||||
--plugin=protoc-gen-service=${CMAKE_SOURCE_DIR}/src/lib/api/service_compiler/plugin.py
|
|
||||||
--service_out=lang=cpp,make_file_name=${ABS_FIL}:${CMAKE_BINARY_DIR}/src
|
|
||||||
-I ${PROTOBUF_INCLUDE_DIRS} -I ${CMAKE_SOURCE_DIR}/src ${ABS_FIL}
|
|
||||||
DEPENDS ${ABS_FIL} ${TEMPLATES}
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/plugin.py
|
|
||||||
COMMENT "Running C++ service compiler on ${FIL}"
|
|
||||||
VERBATIM)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
# remove some warnings from protobuf generated files
|
|
||||||
if(WIN32)
|
|
||||||
set_source_files_properties(${${SRCS}} PROPERTIES COMPILE_FLAGS
|
|
||||||
"/wd4309 /wd4838")
|
|
||||||
else()
|
|
||||||
set_source_files_properties(
|
|
||||||
${${SRCS}}
|
|
||||||
PROPERTIES
|
|
||||||
COMPILE_FLAGS
|
|
||||||
"-Wno-unused-parameter -Wno-effc++ -Wno-pedantic -Wno-sign-compare -Wno-uninitialized"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(${SRCS}
|
|
||||||
${${SRCS}}
|
|
||||||
PARENT_SCOPE)
|
|
||||||
set(${HDRS}
|
|
||||||
${${HDRS}}
|
|
||||||
PARENT_SCOPE)
|
|
||||||
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
include_guard(GLOBAL)
|
||||||
|
|
||||||
|
function(protobuf_generate_cpp)
|
||||||
|
set(_options)
|
||||||
|
set(_one_value_args CXX_SOURCES CXX_HEADERS CXX_OUT_DIR PROTOC)
|
||||||
|
set(_multi_value_args PROTO_INCLUDE_DIRS PROTO_SOURCES)
|
||||||
|
cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
|
||||||
|
|
||||||
|
if (NOT DEFINED _ARGS_PROTOC)
|
||||||
|
set(_ARGS_PROTOC "${EXTERNALS_BIN}/protoc")
|
||||||
|
endif()
|
||||||
|
set(${_ARGS_CXX_SOURCES})
|
||||||
|
set(${_ARGS_CXX_HEADERS})
|
||||||
|
|
||||||
|
set(_proto_include_cli_args)
|
||||||
|
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(_fil_we ${_fil} NAME_WE)
|
||||||
|
get_filename_component(_fil_dir ${_fil} DIRECTORY)
|
||||||
|
if(_fil_dir)
|
||||||
|
set(_fil_we "${_fil_dir}/${_fil_we}")
|
||||||
|
endif()
|
||||||
|
list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${_fil_we}.pb.cc")
|
||||||
|
list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${_fil_we}.pb.h")
|
||||||
|
add_custom_command(
|
||||||
|
OUTPUT
|
||||||
|
"${_ARGS_CXX_OUT_DIR}/${_fil_we}.pb.cc"
|
||||||
|
"${_ARGS_CXX_OUT_DIR}/${_fil_we}.pb.h"
|
||||||
|
COMMAND
|
||||||
|
${_ARGS_PROTOC}
|
||||||
|
ARGS
|
||||||
|
--cpp_out=${_ARGS_CXX_OUT_DIR} ${_proto_include_cli_args} ${_abs_fil}
|
||||||
|
DEPENDS ${_abs_fil}
|
||||||
|
COMMENT "Running C++ protocol buffer compiler on ${_fil}"
|
||||||
|
VERBATIM
|
||||||
|
)
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
set_source_files_properties(
|
||||||
|
${${_ARGS_CXX_SOURCES}}
|
||||||
|
${${_ARGS_CXX_HEADERS}}
|
||||||
|
PROPERTIES
|
||||||
|
GENERATED TRUE
|
||||||
|
)
|
||||||
|
|
||||||
|
# remove some warnings from protobuf generated files
|
||||||
|
if(WIN32)
|
||||||
|
set_source_files_properties(
|
||||||
|
${${_ARGS_CXX_SOURCES}}
|
||||||
|
PROPERTIES
|
||||||
|
COMPILE_FLAGS "/wd4309 /wd4838"
|
||||||
|
)
|
||||||
|
else()
|
||||||
|
set_source_files_properties(
|
||||||
|
${${_ARGS_CXX_SOURCES}}
|
||||||
|
PROPERTIES
|
||||||
|
COMPILE_FLAGS "-Wno-unused-parameter -Wno-effc++ -Wno-pedantic -Wno-sign-compare -Wno-uninitialized"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set(${_ARGS_CXX_SOURCES} ${${_ARGS_CXX_SOURCES}} PARENT_SCOPE)
|
||||||
|
set(${_ARGS_CXX_HEADERS} ${${_ARGS_CXX_HEADERS}} PARENT_SCOPE)
|
||||||
|
endfunction()
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
include_guard(DIRECTORY)
|
||||||
|
|
||||||
|
function(protobuf_generate_fs)
|
||||||
|
set(_options)
|
||||||
|
set(_one_value_args TARGET_NAME OUT_DIR PROTOC)
|
||||||
|
set(_multi_value_args PROTO_INCLUDE_DIRS PROTO_SOURCES)
|
||||||
|
cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
|
||||||
|
|
||||||
|
if (NOT DEFINED _ARGS_TARGET_NAME)
|
||||||
|
set(_ARGS_TARGET_NAME "${PROJECT_NAME}_generate_fs_protos")
|
||||||
|
endif()
|
||||||
|
if (NOT DEFINED _ARGS_PROTOC)
|
||||||
|
set(_ARGS_PROTOC "${EXTERNALS_BIN}/protoc")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set(_proto_include_cli_args)
|
||||||
|
foreach(_dir ${_ARGS_PROTO_INCLUDE_DIRS})
|
||||||
|
list(APPEND _proto_include_cli_args -I ${_dir})
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
set(_outputs)
|
||||||
|
foreach(_proto_source ${_ARGS_PROTO_SOURCES})
|
||||||
|
# get_filename_component(_abs_proto_source ${_proto_source} ABSOLUTE)
|
||||||
|
get_filename_component(_proto_source_we ${_proto_source} NAME_WE)
|
||||||
|
# get_filename_component(_proto_source_dir ${_proto_source} DIRECTORY)
|
||||||
|
list(APPEND _outputs ${_ARGS_OUT_DIR}/${_proto_source_we}.fable.fs)
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
set(_venv_exec ${CMAKE_SOURCE_DIR}/tools/venv_exec.sh)
|
||||||
|
set(_plugin_py ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/plugin.py)
|
||||||
|
set(_template_fs ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/templates/fs/fable.fs)
|
||||||
|
add_custom_command(
|
||||||
|
OUTPUT ${_outputs}
|
||||||
|
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
|
COMMAND ${_venv_exec}
|
||||||
|
${_ARGS_PROTOC}
|
||||||
|
--plugin=protoc-gen-service=${_plugin_py}
|
||||||
|
--service_out=lang=fs,strip_out_path=1:${_ARGS_OUT_DIR}
|
||||||
|
${_proto_include_cli_args}
|
||||||
|
${_ARGS_PROTO_SOURCES}
|
||||||
|
DEPENDS
|
||||||
|
${_venv_exec}
|
||||||
|
${_plugin_py}
|
||||||
|
${_template_fs}
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json
|
||||||
|
${_ARGS_PROTO_SOURCES}
|
||||||
|
)
|
||||||
|
add_custom_target(${_ARGS_TARGET_NAME} ALL DEPENDS "${_outputs}")
|
||||||
|
endfunction()
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
include_guard(DIRECTORY)
|
||||||
|
|
||||||
|
function(protobuf_generate_js)
|
||||||
|
set(_options)
|
||||||
|
set(_one_value_args TARGET_NAME OUTPUT)
|
||||||
|
set(_multi_value_args PROTO_INCLUDE_DIRS PROTO_SOURCES)
|
||||||
|
cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
|
||||||
|
|
||||||
|
if (NOT DEFINED _ARGS_TARGET_NAME)
|
||||||
|
set(_ARGS_TARGET_NAME "${PROJECT_NAME}_generate_js_protos")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set(_proto_include_cli_args)
|
||||||
|
foreach(_dir ${_ARGS_PROTO_INCLUDE_DIRS})
|
||||||
|
list(APPEND _proto_include_cli_args -p ${_dir})
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
add_custom_command(
|
||||||
|
OUTPUT ${_ARGS_OUTPUT}
|
||||||
|
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
|
COMMAND npx
|
||||||
|
--no-install pbjs
|
||||||
|
-t json-module
|
||||||
|
-w commonjs
|
||||||
|
-o ${_ARGS_OUTPUT}
|
||||||
|
${_proto_include_cli_args}
|
||||||
|
${_ARGS_PROTO_SOURCES}
|
||||||
|
DEPENDS
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json
|
||||||
|
${_ARGS_PROTO_SOURCES}
|
||||||
|
)
|
||||||
|
add_custom_target(${_ARGS_TARGET_NAME} ALL DEPENDS ${_ARGS_OUTPUT})
|
||||||
|
endfunction()
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
include_guard(DIRECTORY)
|
||||||
|
include(${CMAKE_SOURCE_DIR}/cmake/TernaryOperator.cmake)
|
||||||
|
|
||||||
|
function(sym_link_dir)
|
||||||
|
set(_options)
|
||||||
|
set(_one_value_args TARGET_NAME SOURCE DEST COMMENT)
|
||||||
|
set(_multi_value_args)
|
||||||
|
cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
|
||||||
|
add_custom_command(
|
||||||
|
OUTPUT ${_ARGS_DEST}
|
||||||
|
COMMAND ln ARGS -sf ${_ARGS_SOURCE} ${_ARGS_DEST}
|
||||||
|
)
|
||||||
|
set_ternary(_comment _ARGS_COMMENT "${_ARGS_COMMENT}" "linking dir ${_ARGS_SOURCE} -> ${_ARGS_DEST}")
|
||||||
|
add_custom_target(
|
||||||
|
${_ARGS_TARGET_NAME} ALL
|
||||||
|
DEPENDS ${_ARGS_DEST}
|
||||||
|
COMMENT "${_comment}"
|
||||||
|
)
|
||||||
|
endfunction()
|
||||||
|
|
||||||
|
function(sym_link_file)
|
||||||
|
set(_options)
|
||||||
|
set(_one_value_args 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()
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
include_guard(GLOBAL)
|
||||||
|
|
||||||
|
macro(set_ternary RESULT CONDITION TRUE_VALUE FALSE_VALUE)
|
||||||
|
if(${CONDITION})
|
||||||
|
set(${RESULT} ${TRUE_VALUE})
|
||||||
|
else()
|
||||||
|
set(${RESULT} ${FALSE_VALUE})
|
||||||
|
endif()
|
||||||
|
endmacro()
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
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
|
||||||
@@ -0,0 +1,72 @@
|
|||||||
|
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" ]
|
||||||
@@ -53,7 +53,7 @@ The status callback is called when the market for this security opens, closes, o
|
|||||||
// Subscribe to security trading status
|
// Subscribe to security trading status
|
||||||
void IAlgoServices::subscribe_status(SecurityKey);
|
void IAlgoServices::subscribe_status(SecurityKey);
|
||||||
// You implement
|
// You implement
|
||||||
virtual void on_status(SecurityKey, co2::TradingStatus) override;
|
virtual void on_status(SecurityKey, domain::protobufs::TradingStatus) override;
|
||||||
```
|
```
|
||||||
|
|
||||||
# Child Orders
|
# Child Orders
|
||||||
|
|||||||
@@ -1,74 +1,65 @@
|
|||||||
FROM ubuntu:22.04
|
FROM ubuntu:latest
|
||||||
|
|
||||||
ARG DEBIAN_FRONTEND=noninteractive
|
ARG DEBIAN_FRONTEND=noninteractive
|
||||||
|
ENV TZ=America/New_York
|
||||||
|
|
||||||
# Note installations that take a while (more than 10s)
|
# light deps (should be quick to download/install)
|
||||||
|
RUN apt-get update && apt-get install -y \
|
||||||
|
ca-certificates \
|
||||||
|
curl \
|
||||||
|
gnupg \
|
||||||
|
liblttng-ust-dev \
|
||||||
|
libpcap0.8-dev \
|
||||||
|
locales \
|
||||||
|
ninja-build \
|
||||||
|
software-properties-common \
|
||||||
|
sqlite3 \
|
||||||
|
tzdata
|
||||||
|
|
||||||
RUN apt-get update
|
# clang
|
||||||
RUN apt-get install -y ca-certificates
|
RUN apt-get update && apt-get install -y \
|
||||||
RUN apt-get install -y ccache
|
clang-13 \
|
||||||
RUN apt-get install -y curl
|
clang-format-13 \
|
||||||
RUN apt-get install -y fish
|
clangd-13 \
|
||||||
RUN apt-get install -y gdb
|
clang-15 \
|
||||||
# git-all: ~250s
|
clang-format-15 \
|
||||||
RUN apt-get install -y git-all
|
clangd-15
|
||||||
RUN apt-get install -y gnupg
|
|
||||||
# liblttng-ust-dev: ~30s
|
|
||||||
RUN apt-get install -y liblttng-ust-dev
|
|
||||||
RUN apt-get install -y libssh2-1-dev
|
|
||||||
RUN apt-get install -y locales
|
|
||||||
RUN apt-get install -y ninja-build
|
|
||||||
# openssh-server: ~40s
|
|
||||||
RUN apt-get install -y openssh-server
|
|
||||||
RUN apt-get install -y pkg-config
|
|
||||||
RUN apt-get install -y software-properties-common
|
|
||||||
RUN apt-get install -y sudo
|
|
||||||
RUN apt-get install -y tzdata
|
|
||||||
RUN apt-get install -y vim
|
|
||||||
RUN apt-get install -y zip
|
|
||||||
|
|
||||||
# Python: ~30s
|
# g++
|
||||||
RUN apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
|
g++-11 \
|
||||||
|
g++-12
|
||||||
|
|
||||||
|
# python
|
||||||
|
RUN apt-get update && apt-get install -y \
|
||||||
python3-pip \
|
python3-pip \
|
||||||
python3-venv \
|
python3-venv \
|
||||||
&& python3 -m pip install --upgrade pip
|
&& python3 -m pip install --upgrade pip
|
||||||
|
|
||||||
# GCC
|
# dotnet
|
||||||
ARG gcc_major=13
|
RUN apt-get update && apt-get install -y \
|
||||||
RUN add-apt-repository ppa:ubuntu-toolchain-r/test \
|
dotnet7
|
||||||
&& apt-get update \
|
|
||||||
&& apt-get install -y g++-$gcc_major
|
|
||||||
|
|
||||||
# Clang
|
# ssh
|
||||||
ARG clang_major=17
|
RUN apt-get update && apt-get install -y \
|
||||||
RUN curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key 2> /dev/null \
|
libssh2-1-dev \
|
||||||
| gpg --dearmor - \
|
openssh-server
|
||||||
| tee /usr/share/keyrings/llvm-snapshot.gpg > /dev/null \
|
|
||||||
&& echo "deb [signed-by=/usr/share/keyrings/llvm-snapshot.gpg] http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-$clang_major main" \
|
|
||||||
| tee -a "/etc/apt/sources.list.d/llvm.list" \
|
|
||||||
&& apt-get update \
|
|
||||||
&& apt-get install -y \
|
|
||||||
clang-$clang_major \
|
|
||||||
clang-format-$clang_major \
|
|
||||||
clangd-$clang_major
|
|
||||||
|
|
||||||
# CMake
|
# cmake
|
||||||
RUN curl -fsSL https://apt.kitware.com/keys/kitware-archive-latest.asc 2> /dev/null \
|
RUN \
|
||||||
|
curl -fsSL https://apt.kitware.com/keys/kitware-archive-latest.asc 2> /dev/null \
|
||||||
| gpg --dearmor - \
|
| gpg --dearmor - \
|
||||||
| tee /usr/share/keyrings/kitware-archive-keyring.gpg > /dev/null \
|
| tee /usr/share/keyrings/kitware-archive-keyring.gpg > /dev/null \
|
||||||
&& echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" \
|
&& echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" \
|
||||||
| tee /etc/apt/sources.list.d/kitware.list > /dev/null \
|
| tee /etc/apt/sources.list.d/kitware.list > /dev/null \
|
||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
|
&& rm /usr/share/keyrings/kitware-archive-keyring.gpg \
|
||||||
|
&& apt-get install -y kitware-archive-keyring \
|
||||||
|
&& echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $(lsb_release -cs)-rc main" \
|
||||||
|
| tee -a /etc/apt/sources.list.d/kitware.list >/dev/null \
|
||||||
&& apt-get install -y cmake
|
&& apt-get install -y cmake
|
||||||
|
|
||||||
# Dotnet
|
# node
|
||||||
RUN curl -fsSLO "https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/packages-microsoft-prod.deb" \
|
|
||||||
&& dpkg -i packages-microsoft-prod.deb \
|
|
||||||
&& rm packages-microsoft-prod.deb \
|
|
||||||
&& apt-get update \
|
|
||||||
&& apt-get install -y dotnet-sdk-8.0
|
|
||||||
|
|
||||||
# Node
|
|
||||||
ARG node_major=18
|
ARG node_major=18
|
||||||
RUN mkdir -p /etc/apt/keyrings \
|
RUN mkdir -p /etc/apt/keyrings \
|
||||||
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key \
|
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key \
|
||||||
@@ -78,35 +69,60 @@ RUN mkdir -p /etc/apt/keyrings \
|
|||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
&& apt-get install -y nodejs
|
&& apt-get install -y nodejs
|
||||||
|
|
||||||
# Emumba deps
|
# ccache is done here so that ccache sees clang++ installed, not clang-10
|
||||||
|
RUN apt-get update && apt-get install -y \
|
||||||
|
ccache
|
||||||
|
|
||||||
|
# emumba (light deps)
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
build-essential \
|
build-essential \
|
||||||
doxygen \
|
doxygen \
|
||||||
|
python3-sphinx \
|
||||||
graphviz \
|
graphviz \
|
||||||
libgtest-dev \
|
libgtest-dev \
|
||||||
libssl-dev \
|
libssl-dev \
|
||||||
pkg-config \
|
|
||||||
python3-sphinx \
|
|
||||||
rapidjson-dev \
|
rapidjson-dev \
|
||||||
zlib1g-dev
|
zlib1g-dev \
|
||||||
|
pkg-config
|
||||||
|
|
||||||
# Set up default executables (update-alternatives)
|
# emumba (boost)
|
||||||
RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-$clang_major 100; \
|
RUN apt-get update && apt-get install -y \
|
||||||
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-$clang_major 100; \
|
libboost-filesystem-dev \
|
||||||
update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-$clang_major 100; \
|
libboost-program-options-dev \
|
||||||
update-alternatives --install /usr/bin/clangd clangd /usr/bin/clangd-$clang_major 100; \
|
libboost-test-dev \
|
||||||
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-$gcc_major 100; \
|
libboost-date-time-dev
|
||||||
update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-$gcc_major 100
|
|
||||||
|
# dev utils
|
||||||
|
RUN apt-get update && apt-get install -y \
|
||||||
|
fish \
|
||||||
|
git-all \
|
||||||
|
sudo \
|
||||||
|
vim \
|
||||||
|
wget
|
||||||
|
|
||||||
|
# set up default executables (update-alternatives)
|
||||||
|
RUN \
|
||||||
|
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-13 100; \
|
||||||
|
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-13 100; \
|
||||||
|
update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-13 100; \
|
||||||
|
update-alternatives --install /usr/bin/clangd clangd /usr/bin/clangd-13 100; \
|
||||||
|
update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 100; \
|
||||||
|
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100
|
||||||
|
|
||||||
# Add compiler symlinks for ccache
|
# Add compiler symlinks for ccache
|
||||||
RUN ln -s /usr/bin/ccache /usr/local/bin/clang; \
|
RUN \
|
||||||
|
ln -s /usr/bin/ccache /usr/local/bin/clang; \
|
||||||
ln -s /usr/bin/ccache /usr/local/bin/clang++; \
|
ln -s /usr/bin/ccache /usr/local/bin/clang++; \
|
||||||
ln -s /usr/bin/ccache /usr/local/bin/clang-$clang_major; \
|
ln -s /usr/bin/ccache /usr/local/bin/clang-13; \
|
||||||
ln -s /usr/bin/ccache /usr/local/bin/clang++-$clang_major; \
|
ln -s /usr/bin/ccache /usr/local/bin/clang++-13; \
|
||||||
|
ln -s /usr/bin/ccache /usr/local/bin/clang-15; \
|
||||||
|
ln -s /usr/bin/ccache /usr/local/bin/clang++-15; \
|
||||||
ln -s /usr/bin/ccache /usr/local/bin/gcc; \
|
ln -s /usr/bin/ccache /usr/local/bin/gcc; \
|
||||||
ln -s /usr/bin/ccache /usr/local/bin/g++; \
|
ln -s /usr/bin/ccache /usr/local/bin/g++; \
|
||||||
ln -s /usr/bin/ccache /usr/local/bin/gcc-$gcc_major; \
|
ln -s /usr/bin/ccache /usr/local/bin/gcc-11; \
|
||||||
ln -s /usr/bin/ccache /usr/local/bin/g++-$gcc_major
|
ln -s /usr/bin/ccache /usr/local/bin/g++-11; \
|
||||||
|
ln -s /usr/bin/ccache /usr/local/bin/gcc-12; \
|
||||||
|
ln -s /usr/bin/ccache /usr/local/bin/g++-12
|
||||||
|
|
||||||
RUN locale-gen en_US.UTF-8
|
RUN locale-gen en_US.UTF-8
|
||||||
|
|
||||||
@@ -114,7 +130,8 @@ ARG docker_user="bts"
|
|||||||
ARG docker_uid="1000"
|
ARG docker_uid="1000"
|
||||||
ARG docker_pass="bts"
|
ARG docker_pass="bts"
|
||||||
|
|
||||||
RUN groupadd -g "$docker_uid" "$docker_user" \
|
RUN \
|
||||||
|
groupadd -g "$docker_uid" "$docker_user" \
|
||||||
&& useradd \
|
&& useradd \
|
||||||
-m \
|
-m \
|
||||||
-u "$docker_uid" \
|
-u "$docker_uid" \
|
||||||
|
|||||||
@@ -0,0 +1,40 @@
|
|||||||
|
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...ff5f02bbde.
@@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
"sdk": {
|
||||||
|
"version": "6.0.200",
|
||||||
|
"rollForward": "latestMajor"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
/* global use, db */
|
|
||||||
// MongoDB Playground
|
|
||||||
// To disable this template go to Settings | MongoDB | Use Default Template For Playground.
|
|
||||||
// Make sure you are connected to enable completions and to be able to run a playground.
|
|
||||||
// Use Ctrl+Space inside a snippet or a string literal to trigger completions.
|
|
||||||
// The result of the last command run in a playground is shown on the results panel.
|
|
||||||
// By default the first 20 documents will be returned with a cursor.
|
|
||||||
// Use 'console.log()' to print to the debug output.
|
|
||||||
// For more documentation on playgrounds please refer to
|
|
||||||
// https://www.mongodb.com/docs/mongodb-vscode/playgrounds/
|
|
||||||
|
|
||||||
// Select the database to use.
|
|
||||||
use('mongodbVSCodePlaygroundDB');
|
|
||||||
|
|
||||||
// Insert a few documents into the sales collection.
|
|
||||||
db.getCollection('sales').insertMany([
|
|
||||||
{ 'item': 'abc', 'price': 10, 'quantity': 2, 'date': new Date('2014-03-01T08:00:00Z') },
|
|
||||||
{ 'item': 'jkl', 'price': 20, 'quantity': 1, 'date': new Date('2014-03-01T09:00:00Z') },
|
|
||||||
{ 'item': 'xyz', 'price': 5, 'quantity': 10, 'date': new Date('2014-03-15T09:00:00Z') },
|
|
||||||
{ 'item': 'xyz', 'price': 5, 'quantity': 20, 'date': new Date('2014-04-04T11:21:39.736Z') },
|
|
||||||
{ 'item': 'abc', 'price': 10, 'quantity': 10, 'date': new Date('2014-04-04T21:23:13.331Z') },
|
|
||||||
{ 'item': 'def', 'price': 7.5, 'quantity': 5, 'date': new Date('2015-06-04T05:08:13Z') },
|
|
||||||
{ 'item': 'def', 'price': 7.5, 'quantity': 10, 'date': new Date('2015-09-10T08:43:00Z') },
|
|
||||||
{ 'item': 'abc', 'price': 10, 'quantity': 5, 'date': new Date('2016-02-06T20:20:13Z') },
|
|
||||||
]);
|
|
||||||
|
|
||||||
// Run a find command to view items sold on April 4th, 2014.
|
|
||||||
const salesOnApril4th = db.getCollection('sales').find({
|
|
||||||
date: { $gte: new Date('2014-04-04'), $lt: new Date('2014-04-05') }
|
|
||||||
}).count();
|
|
||||||
|
|
||||||
// Print a message to the output window.
|
|
||||||
console.log(`${salesOnApril4th} sales occurred in 2014.`);
|
|
||||||
|
|
||||||
// Here we run an aggregation and open a cursor to the results.
|
|
||||||
// Use '.toArray()' to exhaust the cursor to return the whole result set.
|
|
||||||
// You can use '.hasNext()/.next()' to iterate through the cursor page by page.
|
|
||||||
db.getCollection('sales').aggregate([
|
|
||||||
// Find all of the sales that occurred in 2014.
|
|
||||||
{ $match: { date: { $gte: new Date('2014-01-01'), $lt: new Date('2015-01-01') } } },
|
|
||||||
// Group the total sales for each product.
|
|
||||||
{ $group: { _id: '$item', totalSaleAmount: { $sum: { $multiply: ['$price', '$quantity'] } } } }
|
|
||||||
]);
|
|
||||||
|
|
||||||
|
|
||||||
@@ -8,7 +8,6 @@
|
|||||||
public int Integer;
|
public int Integer;
|
||||||
public double Real;
|
public double Real;
|
||||||
public string Identifier;
|
public string Identifier;
|
||||||
public DateTime DateTime;
|
|
||||||
public ImmutableList<IArithmeticExpression> Arguments;
|
public ImmutableList<IArithmeticExpression> Arguments;
|
||||||
public ImmutableList<Assignment> Assignments;
|
public ImmutableList<Assignment> Assignments;
|
||||||
public IArithmeticExpression Argument;
|
public IArithmeticExpression Argument;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
<TargetFramework>net7.0</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
File diff suppressed because it is too large.
Load diff
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
<TargetFramework>net7.0</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -1,41 +1,22 @@
|
|||||||
using mbts.spark;
|
using System.Diagnostics;
|
||||||
|
|
||||||
using System;
|
namespace BCG.Utilities.General;
|
||||||
using System.Runtime;
|
|
||||||
|
|
||||||
namespace BCG.Utilities.General
|
/// <summary>
|
||||||
{
|
/// Summary description for Crono.
|
||||||
/// <summary>
|
/// </summary>
|
||||||
/// Summary description for Crono.
|
public class Crono {
|
||||||
/// </summary>
|
readonly Stopwatch myTimer = new();
|
||||||
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
|
||||||
internal virtual void setValue(RegistryRoot root, string name, object value)
|
public 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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
internal virtual object getValue(RegistryRoot root, string name, object defaultValue)
|
public 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,10 +1,9 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net8.0-windows</TargetFramework>
|
<TargetFramework>net7.0</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<UseWindowsForms>true</UseWindowsForms>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
@@ -1,4 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
|
using System.Runtime.Versioning;
|
||||||
|
|
||||||
using Microsoft.Win32;
|
using Microsoft.Win32;
|
||||||
|
|
||||||
namespace BCG
|
namespace BCG
|
||||||
@@ -10,6 +12,7 @@ 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);
|
||||||
|
|||||||
@@ -1,19 +1,11 @@
|
|||||||
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) =>
|
||||||
try {
|
evaluate(env);
|
||||||
return evaluate(env);
|
|
||||||
} catch (Exception ex) {
|
|
||||||
Log.assert(false, $"BooleanExpression.Evaluate failed: {ex}");
|
|
||||||
throw;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -42,15 +42,11 @@ OpenParenthesis \(
|
|||||||
CloseParenthesis \)
|
CloseParenthesis \)
|
||||||
Comma ,
|
Comma ,
|
||||||
Negate '!'
|
Negate '!'
|
||||||
|
MapsTo ':'
|
||||||
IsOfType '/'
|
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,
|
||||||
@@ -61,6 +57,11 @@ 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;
|
||||||
@@ -97,6 +98,10 @@ IsOfType '/'
|
|||||||
return (int)Token.NEGATE;
|
return (int)Token.NEGATE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
{MapsTo} {
|
||||||
|
return (int)Token.MAPS_TO;
|
||||||
|
}
|
||||||
|
|
||||||
{Equal} {
|
{Equal} {
|
||||||
return (int)Token.EQUAL;
|
return (int)Token.EQUAL;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
<TargetFramework>net7.0</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
File diff suppressed because it is too large.
Load diff
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
<TargetFramework>net7.0</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
File diff suppressed because it is too large.
Load diff
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
<TargetFramework>net7.0</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
File diff suppressed because it is too large.
Load diff
@@ -1,15 +0,0 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
|
||||||
<Nullable>enable</Nullable>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="..\..\client\spark_websocket\spark_websocket.csproj" />
|
|
||||||
<ProjectReference Include="..\DataStreamExpressions\DataStreamExpressions.csproj" />
|
|
||||||
<ProjectReference Include="..\..\client\spark_core\spark_core.csproj" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
namespace Bts.DataStream.Websocket;
|
|
||||||
|
|
||||||
class ClientSubscription(WebsocketClientID id, SubscriptionParams @params, IDisposable dispose) : IDisposable {
|
|
||||||
public SubscriptionParams Params => @params;
|
|
||||||
public WebsocketClientID Id => id;
|
|
||||||
|
|
||||||
public void Dispose() =>
|
|
||||||
dispose.Dispose();
|
|
||||||
}
|
|
||||||
@@ -1,301 +0,0 @@
|
|||||||
namespace Bts.DataStream.Websocket;
|
|
||||||
|
|
||||||
using BCG;
|
|
||||||
|
|
||||||
using bts;
|
|
||||||
using bts.api.core;
|
|
||||||
using bts.collections;
|
|
||||||
using bts.websocket_core.json_rpc;
|
|
||||||
|
|
||||||
using Bts.DataStreamExpressions;
|
|
||||||
|
|
||||||
using mbts.utils;
|
|
||||||
|
|
||||||
using Spark.Core.Disposables;
|
|
||||||
using Spark.Core.Json;
|
|
||||||
|
|
||||||
using System.Buffers;
|
|
||||||
using System.Reactive.Subjects;
|
|
||||||
using System.Text;
|
|
||||||
using System.Text.Json;
|
|
||||||
using System.Text.Json.Nodes;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Represents an I/O model (<see cref="ISubject{TSource, TResult}"/>), that accepts websocket
|
|
||||||
/// requests (from clients) as input, and emits data/notifications (to clients) as output.
|
|
||||||
/// This class's chief role is managing data subscriptions to sparkd on the clients' behalf.
|
|
||||||
/// </summary>
|
|
||||||
public class DataSync(JsonSerializerOptions? serializerOpts = null) :
|
|
||||||
ISubject<WebsocketConnectionUpdate, IEnumerable<WebsocketOutgoingMessage>> {
|
|
||||||
protected readonly object lockObj = new();
|
|
||||||
readonly JsonSerializerOptions serializerOpts = serializerOpts ?? JsonSerializerOptions.Default;
|
|
||||||
readonly Dictionary<WebsocketClientID, List<ClientSubscription>> clients = [];
|
|
||||||
|
|
||||||
event Action<IEnumerable<WebsocketOutgoingMessage>>? requestSend;
|
|
||||||
|
|
||||||
public void OnCompleted() =>
|
|
||||||
Log.Api.info("DataSync incoming request stream has completed.");
|
|
||||||
|
|
||||||
public void OnError(Exception error) =>
|
|
||||||
Log.Api.error($"DataSync error: {error}");
|
|
||||||
|
|
||||||
public void OnNext(WebsocketConnectionUpdate value) {
|
|
||||||
switch (value.Type) {
|
|
||||||
case WebsocketConnectionUpdateType.IncomingMessage:
|
|
||||||
onIncomingMessage(value.IncomingMessage);
|
|
||||||
break;
|
|
||||||
case WebsocketConnectionUpdateType.Connect:
|
|
||||||
onConnect(value.Connect);
|
|
||||||
break;
|
|
||||||
case WebsocketConnectionUpdateType.Disconnect:
|
|
||||||
onDisconnect(value.Disconnect);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
Log.assert(false, $"Unexpected WebsocketConnectionUpdate type: {value.Type}");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public IDisposable Subscribe(IObserver<IEnumerable<WebsocketOutgoingMessage>> observer) {
|
|
||||||
lock (lockObj) {
|
|
||||||
requestSend += observer.OnNext;
|
|
||||||
return Disposable.Create(Dispose);
|
|
||||||
}
|
|
||||||
void Dispose() {
|
|
||||||
lock (lockObj) {
|
|
||||||
requestSend -= observer.OnNext;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static JsonRpcId? extractRpcId(string messageBody) {
|
|
||||||
try {
|
|
||||||
return JsonNode.Parse(messageBody)
|
|
||||||
?.AsObject()
|
|
||||||
?.GetValueOrDefault("id")
|
|
||||||
?.Deserialize<JsonRpcId>();
|
|
||||||
} catch {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static string getRpcNotification(DataPacket dp) {
|
|
||||||
using (var buffer = new MemoryStream())
|
|
||||||
using (var writer = new Utf8JsonWriter(buffer))
|
|
||||||
using (writer.WriteObject()) {
|
|
||||||
writer.WriteString("method", "subscription");
|
|
||||||
using (writer.WriteObject("params")) {
|
|
||||||
writer.Write("tableName", dp.schema.tableName);
|
|
||||||
writer.Write("columns", dp.schema.columnInfo);
|
|
||||||
var cellJsonFactories = dp.schema.columnInfo.Select(getCellJsonFactory).ToList();
|
|
||||||
using (writer.WriteArray("added")) {
|
|
||||||
foreach (IBlueRow row in (dp.addedRows?.Cast<IBlueRow>()).empty_if_null()) {
|
|
||||||
using (writer.WriteObject()) {
|
|
||||||
for (int i = 0; i < cellJsonFactories.Count; i++) {
|
|
||||||
writer.Write(dp.schema.columnInfo[i].colName, cellJsonFactories[i](row));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
using (writer.WriteArray("deleted")) {
|
|
||||||
foreach (IBlueRow row in (dp.deletedRows?.Cast<IBlueRow>()).empty_if_null()) {
|
|
||||||
using (writer.WriteObject()) {
|
|
||||||
for (int i = 0; i < cellJsonFactories.Count; i++) {
|
|
||||||
writer.Write(dp.schema.columnInfo[i].colName, cellJsonFactories[i](row));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
writer.WriteString("jsonrpc", "2.0");
|
|
||||||
writer.Flush();
|
|
||||||
return Encoding.UTF8.GetString(buffer.ToArray());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static Func<IBlueRow, JsonNode?> getCellJsonFactory(ColumnInfo colInfo) {
|
|
||||||
var t = colInfo.colType;
|
|
||||||
if (t == typeof(int)) {
|
|
||||||
return NullCheckWrapper(v => (int)v);
|
|
||||||
}
|
|
||||||
if (t == typeof(uint)) {
|
|
||||||
return NullCheckWrapper(v => (uint)v);
|
|
||||||
}
|
|
||||||
if (t == typeof(long)) {
|
|
||||||
return NullCheckWrapper(v => (long)v);
|
|
||||||
}
|
|
||||||
if (t == typeof(ulong)) {
|
|
||||||
return NullCheckWrapper(v => (ulong)v);
|
|
||||||
}
|
|
||||||
if (t == typeof(short)) {
|
|
||||||
return NullCheckWrapper(v => (short)v);
|
|
||||||
}
|
|
||||||
if (t == typeof(ushort)) {
|
|
||||||
return NullCheckWrapper(v => (ushort)v);
|
|
||||||
}
|
|
||||||
if (t == typeof(double)) {
|
|
||||||
return NullCheckWrapper(v => (double)v);
|
|
||||||
}
|
|
||||||
if (t == typeof(float)) {
|
|
||||||
return NullCheckWrapper(v => (float)v);
|
|
||||||
}
|
|
||||||
if (t == typeof(bool)) {
|
|
||||||
return NullCheckWrapper(v => (bool)v);
|
|
||||||
}
|
|
||||||
return NullCheckWrapper(v => (string)v);
|
|
||||||
|
|
||||||
Func<IBlueRow, JsonNode?> NullCheckWrapper(Func<object, JsonNode> toJson) =>
|
|
||||||
r => {
|
|
||||||
var obj = r[colInfo.colNo];
|
|
||||||
if (obj is null) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return toJson(obj);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
void onConnect(WebsocketConnectNotification notification) {
|
|
||||||
var id = notification.Id;
|
|
||||||
lock (lockObj) {
|
|
||||||
clients.Add(id, []);
|
|
||||||
}
|
|
||||||
Log.Api.info($"DataStreamWebsocketDataSync client connected. clientId: {notification.Id}");
|
|
||||||
if (notification.Message is not null) {
|
|
||||||
onIncomingMessage(notification.Message);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void onDisconnect(WebsocketDisconnectNotification notification) {
|
|
||||||
Log.Api.warn($"DataStreamWebsocketDataSync client disconnected. clientId: {notification.Id}");
|
|
||||||
unsubscribeAll(notification.Id);
|
|
||||||
clients.Remove(notification.Id);
|
|
||||||
}
|
|
||||||
|
|
||||||
void onIncomingMessage(WebsocketIncomingMessage message) {
|
|
||||||
var id = message.sender_client_id;
|
|
||||||
if (!JsonRpcRequest.TryDeserialize(message, out var req, out var err)) {
|
|
||||||
onBadRequest(message, err);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
switch (req.Method!.ToLower()) {
|
|
||||||
case "subscribe":
|
|
||||||
subscribe(id, req);
|
|
||||||
break;
|
|
||||||
case "publish":
|
|
||||||
Log.Api.error("DataStreamWebsocket api 'publish' not implemented.");
|
|
||||||
// TODO
|
|
||||||
break;
|
|
||||||
case "unsubscribe":
|
|
||||||
unsubscribe(id, req);
|
|
||||||
break;
|
|
||||||
case "unsubscribe_all":
|
|
||||||
unsubscribeAll(id);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
Log.Api.error($"Received request of unknown type: {req}");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void sendResponse<T>(WebsocketClientID id, JsonRpcId rpcId, T rpcParams) {
|
|
||||||
var rpcRes = JsonRpcResponse.Create(rpcId, rpcParams);
|
|
||||||
var rpcResStr = JsonSerializer.Serialize(rpcRes, serializerOpts);
|
|
||||||
send([new(id, rpcResStr)]);
|
|
||||||
}
|
|
||||||
|
|
||||||
void sendError<T>(WebsocketClientID id, JsonRpcId rpcId, JsonRpcError<T> error) {
|
|
||||||
var rpcRes = JsonRpcResponse.CreateError(rpcId, error);
|
|
||||||
var rpcResStr = JsonSerializer.Serialize(rpcRes, serializerOpts);
|
|
||||||
send([new(id, rpcResStr)]);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool send(IEnumerable<WebsocketOutgoingMessage> messages) {
|
|
||||||
lock (lockObj) {
|
|
||||||
if (requestSend is null) {
|
|
||||||
Log.Api.warn(
|
|
||||||
$"Unable to send message(s) because '{nameof(requestSend)}' handler is null");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
requestSend(messages);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void subscribe(WebsocketClientID id, JsonRpcRequest<JsonObject?> req) {
|
|
||||||
var subParams = req.Params!.Deserialize<SubscriptionParams>()!;
|
|
||||||
var exp = DataStreamExpressionsInterpreter.Evaluate(subParams.Query!);
|
|
||||||
var stream = exp.getView(new Dictionary<string, StatementExpression>(0));
|
|
||||||
var sub = new ClientSubscription(id, subParams, Disposable.Create(Dispose));
|
|
||||||
lock (lockObj) {
|
|
||||||
clients[id].Add(sub);
|
|
||||||
sendResponse(id, req.Id!.Value, req.Params);
|
|
||||||
stream.onChange += OnChange;
|
|
||||||
}
|
|
||||||
|
|
||||||
void OnChange(object? newValue) {
|
|
||||||
var dp = ExceptionAssert.of_type<DataPacket>(newValue);
|
|
||||||
var notif = getRpcNotification(dp);
|
|
||||||
send([new(id, notif)]);
|
|
||||||
}
|
|
||||||
|
|
||||||
void Dispose() =>
|
|
||||||
stream.onChange -= OnChange;
|
|
||||||
}
|
|
||||||
|
|
||||||
void unsubscribe(WebsocketClientID id, JsonRpcRequest<JsonObject?> req) {
|
|
||||||
var subParams = req.Params!.Deserialize<SubscriptionParams>();
|
|
||||||
var subParamsStr = JsonSerializer.Serialize(subParams, serializerOpts);
|
|
||||||
// Minimize amount of code inside lock (just need it to find/remove the subscription)
|
|
||||||
List<ClientSubscription>? subs = null;
|
|
||||||
ClientSubscription? sub = null;
|
|
||||||
lock (lockObj) {
|
|
||||||
subs = clients.GetValueOrDefault(id);
|
|
||||||
subs?.TryRemoveFirst(s => s!.Params.Equals(subParams), out sub);
|
|
||||||
}
|
|
||||||
if (subs is null) {
|
|
||||||
// Didn't find client (log/throw).
|
|
||||||
var msg = $"Unable to unsubscribe: did not find client. Id: {id}.\nParams:\n{subParamsStr}";
|
|
||||||
Log.Api.error(msg);
|
|
||||||
throw new Exception(msg);
|
|
||||||
}
|
|
||||||
if (sub is null) {
|
|
||||||
// Found client, but didn't find subscription (log/throw).
|
|
||||||
var msg = $"Unable to unsubscribe: did not find the specified subscription. " +
|
|
||||||
$"Id: {id}. Request:\n{subParams}";
|
|
||||||
Log.Api.error(msg);
|
|
||||||
throw new Exception(msg);
|
|
||||||
}
|
|
||||||
// Found client and subscription (dispose/remove subscription).
|
|
||||||
Log.Api.info($"Unsubscribing client. Id: {id}.\nParams:\n{subParamsStr}");
|
|
||||||
sub.Dispose();
|
|
||||||
}
|
|
||||||
|
|
||||||
void unsubscribeAll(WebsocketClientID id) {
|
|
||||||
lock (lockObj) {
|
|
||||||
if (!clients.TryGetValue(id, out var subs)) {
|
|
||||||
throw new Exception(
|
|
||||||
$"Unable to unsubscribe: did not find client with id {id}");
|
|
||||||
}
|
|
||||||
subs.DisposeAll();
|
|
||||||
subs.Clear();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void onBadRequest(WebsocketIncomingMessage req, string? errorMsg) {
|
|
||||||
var rpcId = extractRpcId(req.message_body);
|
|
||||||
var logMsg = $"Recieved invalid request:\n{req.message_body}";
|
|
||||||
if (errorMsg is not null) {
|
|
||||||
logMsg += $"\n\n**Exception**\n{errorMsg}";
|
|
||||||
}
|
|
||||||
Log.Api.error(logMsg);
|
|
||||||
if (rpcId is null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
// Send error back to client
|
|
||||||
var rpcErr = JsonRpcError.Create(
|
|
||||||
(long)JsonRpcErrorCode.InvalidRequest,
|
|
||||||
$"Received invalid request: {errorMsg ?? "unknown error"}",
|
|
||||||
req.message_body);
|
|
||||||
sendError(req.sender_client_id, rpcId.Value, rpcErr);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
namespace Bts.DataStream.Websocket;
|
|
||||||
|
|
||||||
using Newtonsoft.Json.Linq;
|
|
||||||
|
|
||||||
using System.Diagnostics.CodeAnalysis;
|
|
||||||
|
|
||||||
public static class JObjectExtensions {
|
|
||||||
public static bool TryParse<T>(
|
|
||||||
this JObject filter, string key, [MaybeNull] out T obj, [NotNullWhen(false)] out string? error) {
|
|
||||||
obj = default;
|
|
||||||
var value = filter.GetValueOrDefault(key)?.ToString();
|
|
||||||
if (value == null) {
|
|
||||||
error = $"{key} not present";
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return WebsocketJsonParsers.TryParse(value, key, out obj, out error);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static bool TryParse<T>(
|
|
||||||
this JObject filter, string key, out T result, [NotNullWhen(false)] out string? error, T defaultValue) {
|
|
||||||
var value = filter.GetValueOrDefault(key)?.ToString();
|
|
||||||
if (value == null) {
|
|
||||||
result = defaultValue;
|
|
||||||
error = $"{key} not present";
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
if (WebsocketJsonParsers.TryParse<T>(value, key, out var maybeRes, out error)) {
|
|
||||||
result = maybeRes ?? defaultValue;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
result = defaultValue;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
namespace Bts.DataStream.Websocket;
|
|
||||||
|
|
||||||
using Spark.Core;
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Text.Json;
|
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
|
||||||
class MultilineStringJsonConverter : JsonConverter<string> {
|
|
||||||
public override string? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
|
|
||||||
if (typeToConvert != typeof(string)) {
|
|
||||||
throw new ArgumentException($"Unable to parse {typeToConvert}", nameof(typeToConvert));
|
|
||||||
}
|
|
||||||
return reader.TokenType switch {
|
|
||||||
JsonTokenType.String => StringImpl(ref reader),
|
|
||||||
JsonTokenType.StartArray => ArrayImpl(ref reader),
|
|
||||||
_ => throw new ArgumentException(
|
|
||||||
$"Unable to parse {typeof(SubscriptionParams)} from {reader.TokenType}"),
|
|
||||||
};
|
|
||||||
|
|
||||||
static string? StringImpl(ref Utf8JsonReader reader) =>
|
|
||||||
new(reader.GetString()!);
|
|
||||||
|
|
||||||
static string? ArrayImpl(ref Utf8JsonReader reader) {
|
|
||||||
var lines = new List<string>(2);
|
|
||||||
while (reader.Read()) {
|
|
||||||
switch (reader.TokenType) {
|
|
||||||
case JsonTokenType.String:
|
|
||||||
lines.Add(reader.GetString()!);
|
|
||||||
break;
|
|
||||||
case JsonTokenType.EndArray:
|
|
||||||
return string.Join("\n", lines);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
throw new JsonException(
|
|
||||||
$"Failed to parse {typeof(SubscriptionParams)} (did not reach end of array)");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void Write(Utf8JsonWriter writer, string value, JsonSerializerOptions options) {
|
|
||||||
var lines = value.Split("\n");
|
|
||||||
if (lines.Length < 2) {
|
|
||||||
writer.WriteRawValue(value);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
writer.WriteRawValue($"[{", ".join(lines)}]");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
namespace Bts.DataStream.Websocket;
|
|
||||||
|
|
||||||
public enum RequestType {
|
|
||||||
Unspecified,
|
|
||||||
Subscribe,
|
|
||||||
Unsubscribe,
|
|
||||||
UnsubscribeAll,
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
namespace Bts.DataStream.Websocket;
|
|
||||||
|
|
||||||
using bts;
|
|
||||||
|
|
||||||
using Google.Protobuf;
|
|
||||||
|
|
||||||
using System.Text.Json;
|
|
||||||
|
|
||||||
public static class Session {
|
|
||||||
static int sessionIdCounter;
|
|
||||||
|
|
||||||
public static async Task Start(
|
|
||||||
WebsocketServerConfig config, JsonSerializerOptions? opts) {
|
|
||||||
opts ??= JsonSerializerOptions.Default;
|
|
||||||
var sessionId = Interlocked.Increment(ref sessionIdCounter);
|
|
||||||
var gateway = new WebsocketClient(config);
|
|
||||||
var sync = new DataSync(opts);
|
|
||||||
using (gateway.Subscribe(sync))
|
|
||||||
using (sync.Subscribe(gateway)) {
|
|
||||||
Log.Api.info($"Starting DataStream Websocket Session {sessionId}");
|
|
||||||
Log.Api.info($"DataStream Websocket Session {sessionId} config:\n{JsonFormatter.Default.Format(config)}");
|
|
||||||
await gateway.ConnectAsync();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,112 +0,0 @@
|
|||||||
namespace Bts.DataStream.Websocket;
|
|
||||||
|
|
||||||
using bts.utils;
|
|
||||||
|
|
||||||
using Spark.Core;
|
|
||||||
using Spark.Core.Json;
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Diagnostics.CodeAnalysis;
|
|
||||||
using System.Text.Json;
|
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
|
||||||
public class SubscriptionParams(string? query = null) : IEquatable<SubscriptionParams> {
|
|
||||||
static class PropNames {
|
|
||||||
public const string QUERY = "query";
|
|
||||||
}
|
|
||||||
|
|
||||||
// Serializer supports plain string, or an array of lines for convenience
|
|
||||||
[MaybeNull]
|
|
||||||
[JsonPropertyName(PropNames.QUERY)]
|
|
||||||
[JsonConverter(typeof(MultilineStringJsonConverter))]
|
|
||||||
public string? Query { get; set; } = query;
|
|
||||||
|
|
||||||
public bool Equals(SubscriptionParams? other) =>
|
|
||||||
other is not null &&
|
|
||||||
// Not the most elegant equals impl, but it'll work
|
|
||||||
Query.safe_equals(other.Query, (a, b) => a?.ToString() == b?.ToString());
|
|
||||||
|
|
||||||
class SubscriptionParamsConverter : JsonConverter<SubscriptionParams> {
|
|
||||||
public override bool CanConvert(Type typeToConvert) =>
|
|
||||||
typeToConvert == typeof(SubscriptionParams);
|
|
||||||
|
|
||||||
public override SubscriptionParams Read(
|
|
||||||
ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
|
|
||||||
if (typeToConvert != typeof(SubscriptionParams)) {
|
|
||||||
throw new ArgumentException($"Unable to parse {typeToConvert}", nameof(typeToConvert));
|
|
||||||
}
|
|
||||||
return read(ref reader);
|
|
||||||
}
|
|
||||||
|
|
||||||
static SubscriptionParams read(ref Utf8JsonReader reader) {
|
|
||||||
return reader.TokenType switch {
|
|
||||||
JsonTokenType.String => StringImpl(ref reader),
|
|
||||||
JsonTokenType.StartArray => ArrayImpl(ref reader),
|
|
||||||
JsonTokenType.StartObject => ObjectImpl(ref reader),
|
|
||||||
_ => throw new ArgumentException(
|
|
||||||
$"Unable to parse {typeof(SubscriptionParams)} from {reader.TokenType}"),
|
|
||||||
};
|
|
||||||
|
|
||||||
static SubscriptionParams StringImpl(ref Utf8JsonReader reader) =>
|
|
||||||
new(reader.GetString()!);
|
|
||||||
|
|
||||||
static SubscriptionParams ArrayImpl(ref Utf8JsonReader reader) {
|
|
||||||
var lines = new List<string>(2);
|
|
||||||
while (reader.Read()) {
|
|
||||||
switch (reader.TokenType) {
|
|
||||||
case JsonTokenType.String:
|
|
||||||
lines.Add(reader.GetString()!);
|
|
||||||
break;
|
|
||||||
case JsonTokenType.EndArray:
|
|
||||||
return new("\n".join(lines));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
throw new JsonException(
|
|
||||||
$"Failed to parse {typeof(SubscriptionParams)} (did not reach end of array)");
|
|
||||||
}
|
|
||||||
|
|
||||||
static SubscriptionParams ObjectImpl(ref Utf8JsonReader reader) {
|
|
||||||
var lines = new List<string>(2);
|
|
||||||
while (reader.Read()) {
|
|
||||||
switch (reader.TokenType) {
|
|
||||||
case JsonTokenType.PropertyName:
|
|
||||||
var propName = reader.GetString()!;
|
|
||||||
if (propName == PropNames.QUERY) {
|
|
||||||
switch (reader.TokenType) {
|
|
||||||
case JsonTokenType.StartArray:
|
|
||||||
return ArrayImpl(ref reader);
|
|
||||||
case JsonTokenType.String:
|
|
||||||
return StringImpl(ref reader);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case JsonTokenType.String:
|
|
||||||
lines.Add(reader.GetString()!);
|
|
||||||
break;
|
|
||||||
case JsonTokenType.EndArray:
|
|
||||||
return new("\n".join(lines));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
throw new JsonException(
|
|
||||||
$"Failed to parse {typeof(SubscriptionParams)} (did not reach end of array)");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public override void Write(
|
|
||||||
Utf8JsonWriter writer, SubscriptionParams value, JsonSerializerOptions options) {
|
|
||||||
var q = value.Query;
|
|
||||||
var lines = q?.Split("\n");
|
|
||||||
if (lines is null || lines.Length < 2) {
|
|
||||||
writer.WriteString(PropNames.QUERY, value.Query);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
writer.WriteArray(PropNames.QUERY, lines);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public override bool Equals(object? obj) =>
|
|
||||||
Equals(obj as SubscriptionParams);
|
|
||||||
|
|
||||||
public override int GetHashCode() =>
|
|
||||||
Query?.Length ?? typeof(SubscriptionParams).GetHashCode();
|
|
||||||
}
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
global using bts.websocket_core;
|
|
||||||
|
|
||||||
global using System;
|
|
||||||
|
|
||||||
global using System.Collections.Immutable;
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
#nullable enable
|
|
||||||
using BCG;
|
|
||||||
|
|
||||||
using Spark.Core.Json;
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text.Json;
|
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
|
||||||
namespace Bts.DataStreamCore;
|
|
||||||
|
|
||||||
class ViewStreamUpdate {
|
|
||||||
[JsonPropertyName("tableName")]
|
|
||||||
public string? TableName { get; set; }
|
|
||||||
|
|
||||||
[JsonPropertyName("columns")]
|
|
||||||
public List<ColumnInfo>? Columns { get; set; }
|
|
||||||
|
|
||||||
[JsonPropertyName("addedRows")]
|
|
||||||
public List<Dictionary<string, object?>>? AddedRows { get; set; }
|
|
||||||
|
|
||||||
[JsonPropertyName("deletedRows")]
|
|
||||||
public List<Dictionary<string, object?>>? DeletedRows { get; set; }
|
|
||||||
|
|
||||||
public DataPacket ToDataPacket(BlueTable state, bool applyChanges = true) {
|
|
||||||
var schema = new BlueTableSchema([.. Columns!], TableName);
|
|
||||||
var addedRowsTable = new BlueTable(schema);
|
|
||||||
var deletedRowsTable = new BlueTable(schema);
|
|
||||||
if (applyChanges) {
|
|
||||||
state.deleteRows(deletedRowsTable);
|
|
||||||
state.addRows(addedRowsTable);
|
|
||||||
}
|
|
||||||
return new(state, addedRowsTable, deletedRowsTable);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static string ToJson() {
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-18
@@ -1,18 +0,0 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<OutputType>Exe</OutputType>
|
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
|
||||||
<Nullable>enable</Nullable>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="..\Bts.DataStream.Websocket\Bts.DataStream.Websocket.csproj" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
{
|
|
||||||
"host": "localhost",
|
|
||||||
"port": 8080,
|
|
||||||
"scheme": "ws",
|
|
||||||
"default_end_point": "/",
|
|
||||||
"keep_alive_interval_secs": 1
|
|
||||||
}
|
|
||||||
@@ -1,76 +0,0 @@
|
|||||||
using bts.api.core;
|
|
||||||
|
|
||||||
using Bts.DataStream.Websocket;
|
|
||||||
|
|
||||||
using Google.Protobuf;
|
|
||||||
|
|
||||||
using System.CommandLine.Parsing;
|
|
||||||
using System.Text.Json;
|
|
||||||
|
|
||||||
static WebsocketServerConfig readConfigFile(string path) {
|
|
||||||
using var fs = File.OpenRead(path);
|
|
||||||
using var sr = new StreamReader(fs);
|
|
||||||
return JsonParser.Default.Parse<WebsocketServerConfig>(sr);
|
|
||||||
}
|
|
||||||
|
|
||||||
static WebsocketServerConfig? readConfigArg(ArgumentResult result) {
|
|
||||||
var path = result.Tokens.Select(t => t.Value).FirstOrDefault() ?? string.Empty;
|
|
||||||
return readConfigFile(path);
|
|
||||||
}
|
|
||||||
|
|
||||||
static WebsocketServerConfig getDefaultConfig() {
|
|
||||||
const string defaultCfgPath = "DataStreamWebsocketServer.conf";
|
|
||||||
if (File.Exists(defaultCfgPath)) {
|
|
||||||
return readConfigFile(defaultCfgPath);
|
|
||||||
}
|
|
||||||
return new() {
|
|
||||||
Scheme = "http",
|
|
||||||
Host = "localhost",
|
|
||||||
Port = 8080,
|
|
||||||
DefaultEndPoint = "/",
|
|
||||||
KeepAliveIntervalSecs = 1
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
static async Task run(
|
|
||||||
WebsocketServerConfig? wssConfig, string user, string password, string? sparkdConfigSource) {
|
|
||||||
var opts = new JsonSerializerOptions(JsonSerializerDefaults.Web);
|
|
||||||
wssConfig ??= getDefaultConfig();
|
|
||||||
Console.WriteLine("Starting DataStreamWebsocketServer...");
|
|
||||||
var serviceCtx = ServiceContext.create(sparkdConfigSource);
|
|
||||||
await serviceCtx.login(user, password);
|
|
||||||
await Session.Start(wssConfig, opts);
|
|
||||||
// if (sparkdConfigSource is not null && sparkdConfigSource.Length > 9999) {
|
|
||||||
// } else {
|
|
||||||
// await ChatGptSession.Start();
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
|
|
||||||
var userOpt = new Option<string>("--user", () => "bts");
|
|
||||||
var passOpt = new Option<string>("--password", () => string.Empty);
|
|
||||||
var sparkdConfigSourceOpt = new Option<string>(
|
|
||||||
"--sparkd", description: "The sparkd config server url");
|
|
||||||
// var bling = new ParseArgument<WebsocketServerConfig?>(parseWsConfig);
|
|
||||||
|
|
||||||
// WebsocketServerConfig? parseWsConfig(ArgumentResult result) {
|
|
||||||
// Token t;
|
|
||||||
// TokenType tt;
|
|
||||||
// Symbol s;
|
|
||||||
// throw new NotImplementedException();
|
|
||||||
// }
|
|
||||||
|
|
||||||
var configOpt = new Option<WebsocketServerConfig?>(
|
|
||||||
"--config", readConfigArg, description: "WebsocketServerConfig file path");
|
|
||||||
configOpt.SetDefaultValue(new());
|
|
||||||
var rootCommand = new RootCommand("Starts a DataStream Websocket Server");
|
|
||||||
rootCommand.AddOption(configOpt);
|
|
||||||
rootCommand.AddOption(userOpt);
|
|
||||||
rootCommand.AddOption(passOpt);
|
|
||||||
rootCommand.SetHandler(run, configOpt, userOpt, passOpt, sparkdConfigSourceOpt);
|
|
||||||
|
|
||||||
try {
|
|
||||||
return await rootCommand.InvokeAsync(args);
|
|
||||||
} catch (Exception ex) {
|
|
||||||
Console.WriteLine($"Error: {ex}");
|
|
||||||
}
|
|
||||||
return 1;
|
|
||||||
Whitespace-only changes.
@@ -1,6 +0,0 @@
|
|||||||
global using bts.websocket_core;
|
|
||||||
global using bts.websocket_core.json_rpc;
|
|
||||||
|
|
||||||
global using System.CommandLine;
|
|
||||||
|
|
||||||
global using System.Collections.Immutable;
|
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
VITE_DATASTREAM_WEBSOCKET_URL=wss://localhost:443
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
VITE_DATASTREAM_WEBSOCKET_URL=wss://localhost:443
|
||||||
@@ -9,9 +9,21 @@ module.exports = {
|
|||||||
],
|
],
|
||||||
ignorePatterns: ['dist', '.eslintrc.cjs'],
|
ignorePatterns: ['dist', '.eslintrc.cjs'],
|
||||||
parserOptions: { ecmaVersion: 'latest', sourceType: 'module' },
|
parserOptions: { ecmaVersion: 'latest', sourceType: 'module' },
|
||||||
settings: { react: { version: '18.2' } },
|
settings: { react: { version: '18.3.1' } },
|
||||||
plugins: ['react-refresh'],
|
plugins: ['react-refresh'],
|
||||||
rules: {
|
rules: {
|
||||||
|
"import/order": [
|
||||||
|
"error",
|
||||||
|
{
|
||||||
|
"groups": [
|
||||||
|
"builtin",
|
||||||
|
"external",
|
||||||
|
"internal",
|
||||||
|
["parent", "sibling", "index"]
|
||||||
|
],
|
||||||
|
"newlines-between": "always"
|
||||||
|
}
|
||||||
|
],
|
||||||
'react-refresh/only-export-components': [
|
'react-refresh/only-export-components': [
|
||||||
'warn',
|
'warn',
|
||||||
{ allowConstantExport: true },
|
{ allowConstantExport: true },
|
||||||
|
|||||||
@@ -4,8 +4,8 @@
|
|||||||
<JavaScriptTestRoot>src\</JavaScriptTestRoot>
|
<JavaScriptTestRoot>src\</JavaScriptTestRoot>
|
||||||
<JavaScriptTestFramework>Jest</JavaScriptTestFramework>
|
<JavaScriptTestFramework>Jest</JavaScriptTestFramework>
|
||||||
<!-- Allows the build (or compile) script located on package.json to run on Build -->
|
<!-- Allows the build (or compile) script located on package.json to run on Build -->
|
||||||
<ShouldRunBuildScript>false</ShouldRunBuildScript>
|
<ShouldRunBuildScript>true</ShouldRunBuildScript>
|
||||||
<!-- Folder where production build objects will be placed -->
|
<!-- Folder where production build objects will be placed -->
|
||||||
<PublishAssetsDirectory>$(MSBuildProjectDirectory)\dist</PublishAssetsDirectory>
|
<PublishAssetsDirectory>$(MSBuildProjectDirectory)\distill</PublishAssetsDirectory>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
||||||
@@ -2,9 +2,9 @@
|
|||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
|
<link rel="icon" type="image/ico" href="/logo.ico" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
<title>Vite + React</title>
|
<title>BTS Cloud Streams</title>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="root"></div>
|
<div id="root"></div>
|
||||||
|
|||||||
+4141
-3579
File diff suppressed because it is too large.
Load diff
@@ -10,18 +10,35 @@
|
|||||||
"preview": "vite preview"
|
"preview": "vite preview"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"react": "^18.2.0",
|
"@angular/material": "^18.0.4",
|
||||||
"react-dom": "^18.2.0",
|
"@emotion/react": "^11.11.4",
|
||||||
"react-use-websocket": "^4.5.0"
|
"@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": {
|
"devDependencies": {
|
||||||
"@types/react": "^18.2.43",
|
"@types/react": "^18.3.3",
|
||||||
"@types/react-dom": "^18.2.17",
|
"@types/react-dom": "^18.3.0",
|
||||||
"@vitejs/plugin-react": "^4.2.1",
|
"@vitejs/plugin-react": "^4.3.1",
|
||||||
"eslint": "^8.55.0",
|
"eslint": "^8.57.0",
|
||||||
"eslint-plugin-react": "^7.33.2",
|
"eslint-plugin-import": "^2.29.1",
|
||||||
"eslint-plugin-react-hooks": "^4.6.0",
|
"eslint-plugin-react": "^7.34.2",
|
||||||
"eslint-plugin-react-refresh": "^0.4.5",
|
"eslint-plugin-react-hooks": "^4.6.2",
|
||||||
"vite": "^5.0.8"
|
"eslint-plugin-react-refresh": "^0.4.7",
|
||||||
|
"react-mui-sidebar": "^1.3.5",
|
||||||
|
"vite": "^5.2.13"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 8.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 107 KiB |
@@ -0,0 +1,40 @@
|
|||||||
|
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,44 +1,101 @@
|
|||||||
#root {
|
@use "@material/checkbox";
|
||||||
max-width: 1280px;
|
@use "@material/icon-button";
|
||||||
margin: 0 auto;
|
@use "@material/data-table/data-table";
|
||||||
padding: 2rem;
|
|
||||||
text-align: center;
|
.root-div {
|
||||||
--cell-background-color: #293136;
|
display: flex;
|
||||||
--cell-color: #cbe3ef;
|
flex-direction: row;
|
||||||
|
align-items: flex-start;
|
||||||
}
|
}
|
||||||
|
|
||||||
tr:nth-child(even) {
|
.main-content-div {
|
||||||
background: #F2F2F2;
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
}
|
}
|
||||||
|
|
||||||
tr:nth-child(odd) {
|
.title-div {
|
||||||
background: #FFF;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
th, td {
|
.container {
|
||||||
padding-left: 1rem;
|
display: flex;
|
||||||
padding-right: 1rem;
|
|
||||||
background-color: var(--cell-background-color);
|
|
||||||
color: var(--cell-color);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
textarea#query-input {
|
.container-column {
|
||||||
height: 5em;
|
display: flex;
|
||||||
width: 50em;
|
flex-direction: column;
|
||||||
}
|
}
|
||||||
|
|
||||||
button#query-button {
|
.container-row {
|
||||||
height: 5em;
|
display: flex;
|
||||||
vertical-align: top;
|
flex-direction: row;
|
||||||
|
align-items: stretch;
|
||||||
}
|
}
|
||||||
|
|
||||||
table#query-output {
|
box.query-input-form {
|
||||||
float: none;
|
/* p: 2, display: "flex", flexFlow: "column", alignItems: "stretch" */
|
||||||
clear: both;
|
display: flex;
|
||||||
|
flex-flow: column;
|
||||||
|
align-items: stretch;
|
||||||
}
|
}
|
||||||
|
|
||||||
p#footer {
|
/* li.ps-menuitem-root:hover {
|
||||||
float: none;
|
background-color: #ff9922;
|
||||||
clear: both;
|
} */
|
||||||
vertical-align: bottom;
|
|
||||||
|
.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,88 +1,173 @@
|
|||||||
import { Component } from "react";
|
import { ThemeProvider, CssBaseline, GlobalStyles } from '@mui/material';
|
||||||
import "./App.css";
|
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';
|
||||||
|
|
||||||
export class Home extends Component {
|
import '@fontsource/noto-sans';
|
||||||
static displayName = Home.name;
|
import './App.css';
|
||||||
static sparkdHost = "localhost";
|
import './SideBar.css';
|
||||||
|
|
||||||
render() {
|
const webSocketUrl = import.meta.env.VITE_DATASTREAM_WEBSOCKET_URL;
|
||||||
let socket = null;
|
// Always use the same subscription id (1), because we only show 1 table at a time.
|
||||||
const wsUrl = `ws://localhost:5268/ws`;
|
// The server will automatically dispose the previous subscription and start a new one
|
||||||
|
// if we're currently subscribed to another query.
|
||||||
|
const subscriptionId = "1";
|
||||||
|
|
||||||
function connectToSparkd() {
|
var rpcReqIdCounter = 1;
|
||||||
if (socket == null) {
|
|
||||||
socket = new WebSocket(wsUrl);
|
|
||||||
}
|
|
||||||
if (socket && socket.readyState === WebSocket.OPEN) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const output = document.getElementById("query-output");
|
function subscribeReq(query) {
|
||||||
socket.onopen = (event) => {
|
return {
|
||||||
console.log(`Connected to ${wsUrl}`);
|
jsonrpc: "2.0",
|
||||||
};
|
id: rpcReqIdCounter++,
|
||||||
|
method: "subscribe",
|
||||||
socket.onmessage = (event) => {
|
params: {
|
||||||
console.log(`Received message: ${event.data}`);
|
subscription_id: subscriptionId,
|
||||||
output.innerHTML = event.data;
|
query: query
|
||||||
};
|
|
||||||
|
|
||||||
socket.onerror = (error) => {
|
|
||||||
console.log(`Error on websocket ${wsUrl}: ${error}`);
|
|
||||||
};
|
|
||||||
|
|
||||||
socket.onclose = (event) => {
|
|
||||||
if (event.wasClean) {
|
|
||||||
const msg = `Connection to ${wsUrl} closed cleanly, code=${event.code}, reason=${event.reason}`;
|
|
||||||
console.log(msg);
|
|
||||||
} else {
|
|
||||||
const msg = `Connection to ${wsUrl} abruptly closed`;
|
|
||||||
console.log(msg);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
};
|
||||||
function executeQuery() {
|
|
||||||
if (socket == null || !socket) {
|
|
||||||
connectToSparkd();
|
|
||||||
}
|
|
||||||
if (socket == null || !socket) {
|
|
||||||
console.log("Failed to connect to websocket server");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (socket.readyState === WebSocket.OPEN) {
|
|
||||||
const queryInput = document.getElementById("query-input");
|
|
||||||
const rpcReq = {
|
|
||||||
jsonrpc: "2.0",
|
|
||||||
method: "subscribe",
|
|
||||||
params: {
|
|
||||||
query: queryInput.value,
|
|
||||||
},
|
|
||||||
id: 1,
|
|
||||||
};
|
|
||||||
socket.send(JSON.stringify(rpcReq));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div>
|
|
||||||
<h1>Data Stream Query Analyzer</h1>
|
|
||||||
<p>Run queries against the BTS Cloud</p>
|
|
||||||
<div>
|
|
||||||
<textarea id="query-input" placeholder="Enter Query"></textarea>
|
|
||||||
<button id="query-button" onClick={executeQuery}>
|
|
||||||
Execute
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<table id="query-output"></table>
|
|
||||||
<p id="footer">
|
|
||||||
The <code>ClientApp</code> subdirectory is a standard React
|
|
||||||
application based on the <code>create-react-app</code> template. If
|
|
||||||
you open a command prompt in that directory, you can run{" "}
|
|
||||||
<code>npm</code> commands such as <code>npm test</code> or{" "}
|
|
||||||
<code>npm install</code>.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
@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;
|
||||||
|
} */
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
@use "@material/checkbox";
|
||||||
|
@use "@material/icon-button";
|
||||||
|
@use "@material/data-table/data-table";
|
||||||
|
|
||||||
|
th {
|
||||||
|
font-size: large;
|
||||||
|
padding: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
td {
|
||||||
|
padding: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
td:hover {
|
||||||
|
background-color: cadetblue;
|
||||||
|
}
|
||||||
|
|
||||||
|
td#cell-decimal {
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
||||||
|
td#cell-integer {
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
||||||
|
td#cell-string {
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
td#cell-date-time {
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
@@ -0,0 +1,74 @@
|
|||||||
|
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,
|
||||||
|
};
|
||||||
@@ -0,0 +1,119 @@
|
|||||||
|
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;
|
||||||
@@ -0,0 +1,73 @@
|
|||||||
|
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;
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
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,
|
||||||
|
};
|
||||||
@@ -0,0 +1,98 @@
|
|||||||
|
/* 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 */
|
||||||
|
}
|
||||||
@@ -0,0 +1,109 @@
|
|||||||
|
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,
|
||||||
|
};
|
||||||
@@ -0,0 +1,112 @@
|
|||||||
|
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,
|
||||||
|
};
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
.dark-high-contrast {
|
||||||
|
--md-sys-color-primary: rgb(251 250 255);
|
||||||
|
--md-sys-color-surface-tint: rgb(165 200 255);
|
||||||
|
--md-sys-color-on-primary: rgb(0 0 0);
|
||||||
|
--md-sys-color-primary-container: rgb(173 204 255);
|
||||||
|
--md-sys-color-on-primary-container: rgb(0 0 0);
|
||||||
|
--md-sys-color-secondary: rgb(250 250 255);
|
||||||
|
--md-sys-color-on-secondary: rgb(0 0 0);
|
||||||
|
--md-sys-color-secondary-container: rgb(159 208 255);
|
||||||
|
--md-sys-color-on-secondary-container: rgb(0 0 0);
|
||||||
|
--md-sys-color-tertiary: rgb(255 249 251);
|
||||||
|
--md-sys-color-on-tertiary: rgb(0 0 0);
|
||||||
|
--md-sys-color-tertiary-container: rgb(222 193 231);
|
||||||
|
--md-sys-color-on-tertiary-container: rgb(0 0 0);
|
||||||
|
--md-sys-color-error: rgb(255 249 249);
|
||||||
|
--md-sys-color-on-error: rgb(0 0 0);
|
||||||
|
--md-sys-color-error-container: rgb(255 186 177);
|
||||||
|
--md-sys-color-on-error-container: rgb(0 0 0);
|
||||||
|
--md-sys-color-background: rgb(17 19 24);
|
||||||
|
--md-sys-color-on-background: rgb(225 226 233);
|
||||||
|
--md-sys-color-surface: rgb(17 19 24);
|
||||||
|
--md-sys-color-on-surface: rgb(255 255 255);
|
||||||
|
--md-sys-color-surface-variant: rgb(67 71 78);
|
||||||
|
--md-sys-color-on-surface-variant: rgb(251 250 255);
|
||||||
|
--md-sys-color-outline: rgb(200 202 212);
|
||||||
|
--md-sys-color-outline-variant: rgb(200 202 212);
|
||||||
|
--md-sys-color-shadow: rgb(0 0 0);
|
||||||
|
--md-sys-color-scrim: rgb(0 0 0);
|
||||||
|
--md-sys-color-inverse-surface: rgb(225 226 233);
|
||||||
|
--md-sys-color-inverse-on-surface: rgb(0 0 0);
|
||||||
|
--md-sys-color-inverse-primary: rgb(0 42 83);
|
||||||
|
--md-sys-color-primary-fixed: rgb(219 231 255);
|
||||||
|
--md-sys-color-on-primary-fixed: rgb(0 0 0);
|
||||||
|
--md-sys-color-primary-fixed-dim: rgb(173 204 255);
|
||||||
|
--md-sys-color-on-primary-fixed-variant: rgb(0 22 49);
|
||||||
|
--md-sys-color-secondary-fixed: rgb(214 233 255);
|
||||||
|
--md-sys-color-on-secondary-fixed: rgb(0 0 0);
|
||||||
|
--md-sys-color-secondary-fixed-dim: rgb(159 208 255);
|
||||||
|
--md-sys-color-on-secondary-fixed-variant: rgb(0 24 42);
|
||||||
|
--md-sys-color-tertiary-fixed: rgb(249 222 255);
|
||||||
|
--md-sys-color-on-tertiary-fixed: rgb(0 0 0);
|
||||||
|
--md-sys-color-tertiary-fixed-dim: rgb(222 193 231);
|
||||||
|
--md-sys-color-on-tertiary-fixed-variant: rgb(33 14 42);
|
||||||
|
--md-sys-color-surface-dim: rgb(17 19 24);
|
||||||
|
--md-sys-color-surface-bright: rgb(55 57 62);
|
||||||
|
--md-sys-color-surface-container-lowest: rgb(12 14 19);
|
||||||
|
--md-sys-color-surface-container-low: rgb(25 28 32);
|
||||||
|
--md-sys-color-surface-container: rgb(29 32 36);
|
||||||
|
--md-sys-color-surface-container-high: rgb(40 42 47);
|
||||||
|
--md-sys-color-surface-container-highest: rgb(50 53 58);
|
||||||
|
}
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
.dark-medium-contrast {
|
||||||
|
--md-sys-color-primary: rgb(173 204 255);
|
||||||
|
--md-sys-color-surface-tint: rgb(165 200 255);
|
||||||
|
--md-sys-color-on-primary: rgb(0 22 49);
|
||||||
|
--md-sys-color-primary-container: rgb(112 146 198);
|
||||||
|
--md-sys-color-on-primary-container: rgb(0 0 0);
|
||||||
|
--md-sys-color-secondary: rgb(159 208 255);
|
||||||
|
--md-sys-color-on-secondary: rgb(0 24 42);
|
||||||
|
--md-sys-color-secondary-container: rgb(100 149 193);
|
||||||
|
--md-sys-color-on-secondary-container: rgb(0 0 0);
|
||||||
|
--md-sys-color-tertiary: rgb(222 193 231);
|
||||||
|
--md-sys-color-on-tertiary: rgb(33 14 42);
|
||||||
|
--md-sys-color-tertiary-container: rgb(162 136 171);
|
||||||
|
--md-sys-color-on-tertiary-container: rgb(0 0 0);
|
||||||
|
--md-sys-color-error: rgb(255 186 177);
|
||||||
|
--md-sys-color-on-error: rgb(55 0 1);
|
||||||
|
--md-sys-color-error-container: rgb(255 84 73);
|
||||||
|
--md-sys-color-on-error-container: rgb(0 0 0);
|
||||||
|
--md-sys-color-background: rgb(17 19 24);
|
||||||
|
--md-sys-color-on-background: rgb(225 226 233);
|
||||||
|
--md-sys-color-surface: rgb(17 19 24);
|
||||||
|
--md-sys-color-on-surface: rgb(251 250 255);
|
||||||
|
--md-sys-color-surface-variant: rgb(67 71 78);
|
||||||
|
--md-sys-color-on-surface-variant: rgb(200 202 212);
|
||||||
|
--md-sys-color-outline: rgb(160 163 171);
|
||||||
|
--md-sys-color-outline-variant: rgb(128 131 139);
|
||||||
|
--md-sys-color-shadow: rgb(0 0 0);
|
||||||
|
--md-sys-color-scrim: rgb(0 0 0);
|
||||||
|
--md-sys-color-inverse-surface: rgb(225 226 233);
|
||||||
|
--md-sys-color-inverse-on-surface: rgb(40 42 47);
|
||||||
|
--md-sys-color-inverse-primary: rgb(35 73 120);
|
||||||
|
--md-sys-color-primary-fixed: rgb(212 227 255);
|
||||||
|
--md-sys-color-on-primary-fixed: rgb(0 17 40);
|
||||||
|
--md-sys-color-primary-fixed-dim: rgb(165 200 255);
|
||||||
|
--md-sys-color-on-primary-fixed-variant: rgb(10 55 100);
|
||||||
|
--md-sys-color-secondary-fixed: rgb(206 229 255);
|
||||||
|
--md-sys-color-on-secondary-fixed: rgb(0 18 34);
|
||||||
|
--md-sys-color-secondary-fixed-dim: rgb(154 203 250);
|
||||||
|
--md-sys-color-on-secondary-fixed-variant: rgb(0 57 91);
|
||||||
|
--md-sys-color-tertiary-fixed: rgb(247 216 255);
|
||||||
|
--md-sys-color-on-tertiary-fixed: rgb(28 9 37);
|
||||||
|
--md-sys-color-tertiary-fixed-dim: rgb(218 189 226);
|
||||||
|
--md-sys-color-on-tertiary-fixed-variant: rgb(67 46 76);
|
||||||
|
--md-sys-color-surface-dim: rgb(17 19 24);
|
||||||
|
--md-sys-color-surface-bright: rgb(55 57 62);
|
||||||
|
--md-sys-color-surface-container-lowest: rgb(12 14 19);
|
||||||
|
--md-sys-color-surface-container-low: rgb(25 28 32);
|
||||||
|
--md-sys-color-surface-container: rgb(29 32 36);
|
||||||
|
--md-sys-color-surface-container-high: rgb(40 42 47);
|
||||||
|
--md-sys-color-surface-container-highest: rgb(50 53 58);
|
||||||
|
}
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
.dark {
|
||||||
|
--md-sys-color-primary: rgb(165 200 255);
|
||||||
|
--md-sys-color-surface-tint: rgb(165 200 255);
|
||||||
|
--md-sys-color-on-primary: rgb(0 49 94);
|
||||||
|
--md-sys-color-primary-container: rgb(34 72 118);
|
||||||
|
--md-sys-color-on-primary-container: rgb(212 227 255);
|
||||||
|
--md-sys-color-secondary: rgb(154 203 250);
|
||||||
|
--md-sys-color-on-secondary: rgb(0 51 83);
|
||||||
|
--md-sys-color-secondary-container: rgb(12 74 114);
|
||||||
|
--md-sys-color-on-secondary-container: rgb(206 229 255);
|
||||||
|
--md-sys-color-tertiary: rgb(218 189 226);
|
||||||
|
--md-sys-color-on-tertiary: rgb(61 41 70);
|
||||||
|
--md-sys-color-tertiary-container: rgb(85 63 93);
|
||||||
|
--md-sys-color-on-tertiary-container: rgb(247 216 255);
|
||||||
|
--md-sys-color-error: rgb(255 180 171);
|
||||||
|
--md-sys-color-on-error: rgb(105 0 5);
|
||||||
|
--md-sys-color-error-container: rgb(147 0 10);
|
||||||
|
--md-sys-color-on-error-container: rgb(255 218 214);
|
||||||
|
--md-sys-color-background: rgb(17 19 24);
|
||||||
|
--md-sys-color-on-background: rgb(225 226 233);
|
||||||
|
--md-sys-color-surface: rgb(17 19 24);
|
||||||
|
--md-sys-color-on-surface: rgb(225 226 233);
|
||||||
|
--md-sys-color-surface-variant: rgb(67 71 78);
|
||||||
|
--md-sys-color-on-surface-variant: rgb(195 198 207);
|
||||||
|
--md-sys-color-outline: rgb(141 145 153);
|
||||||
|
--md-sys-color-outline-variant: rgb(67 71 78);
|
||||||
|
--md-sys-color-shadow: rgb(0 0 0);
|
||||||
|
--md-sys-color-scrim: rgb(0 0 0);
|
||||||
|
--md-sys-color-inverse-surface: rgb(225 226 233);
|
||||||
|
--md-sys-color-inverse-on-surface: rgb(46 48 53);
|
||||||
|
--md-sys-color-inverse-primary: rgb(60 96 144);
|
||||||
|
--md-sys-color-primary-fixed: rgb(212 227 255);
|
||||||
|
--md-sys-color-on-primary-fixed: rgb(0 28 58);
|
||||||
|
--md-sys-color-primary-fixed-dim: rgb(165 200 255);
|
||||||
|
--md-sys-color-on-primary-fixed-variant: rgb(34 72 118);
|
||||||
|
--md-sys-color-secondary-fixed: rgb(206 229 255);
|
||||||
|
--md-sys-color-on-secondary-fixed: rgb(0 29 50);
|
||||||
|
--md-sys-color-secondary-fixed-dim: rgb(154 203 250);
|
||||||
|
--md-sys-color-on-secondary-fixed-variant: rgb(12 74 114);
|
||||||
|
--md-sys-color-tertiary-fixed: rgb(247 216 255);
|
||||||
|
--md-sys-color-on-tertiary-fixed: rgb(39 20 48);
|
||||||
|
--md-sys-color-tertiary-fixed-dim: rgb(218 189 226);
|
||||||
|
--md-sys-color-on-tertiary-fixed-variant: rgb(85 63 93);
|
||||||
|
--md-sys-color-surface-dim: rgb(17 19 24);
|
||||||
|
--md-sys-color-surface-bright: rgb(55 57 62);
|
||||||
|
--md-sys-color-surface-container-lowest: rgb(12 14 19);
|
||||||
|
--md-sys-color-surface-container-low: rgb(25 28 32);
|
||||||
|
--md-sys-color-surface-container: rgb(29 32 36);
|
||||||
|
--md-sys-color-surface-container-high: rgb(40 42 47);
|
||||||
|
--md-sys-color-surface-container-highest: rgb(50 53 58);
|
||||||
|
}
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
.light-high-contrast {
|
||||||
|
--md-sys-color-primary: rgb(0 34 70);
|
||||||
|
--md-sys-color-surface-tint: rgb(60 96 144);
|
||||||
|
--md-sys-color-on-primary: rgb(255 255 255);
|
||||||
|
--md-sys-color-primary-container: rgb(29 68 114);
|
||||||
|
--md-sys-color-on-primary-container: rgb(255 255 255);
|
||||||
|
--md-sys-color-secondary: rgb(0 36 61);
|
||||||
|
--md-sys-color-on-secondary: rgb(255 255 255);
|
||||||
|
--md-sys-color-secondary-container: rgb(3 70 110);
|
||||||
|
--md-sys-color-on-secondary-container: rgb(255 255 255);
|
||||||
|
--md-sys-color-tertiary: rgb(46 26 55);
|
||||||
|
--md-sys-color-on-tertiary: rgb(255 255 255);
|
||||||
|
--md-sys-color-tertiary-container: rgb(81 59 89);
|
||||||
|
--md-sys-color-on-tertiary-container: rgb(255 255 255);
|
||||||
|
--md-sys-color-error: rgb(78 0 2);
|
||||||
|
--md-sys-color-on-error: rgb(255 255 255);
|
||||||
|
--md-sys-color-error-container: rgb(140 0 9);
|
||||||
|
--md-sys-color-on-error-container: rgb(255 255 255);
|
||||||
|
--md-sys-color-background: rgb(249 249 255);
|
||||||
|
--md-sys-color-on-background: rgb(25 28 32);
|
||||||
|
--md-sys-color-surface: rgb(249 249 255);
|
||||||
|
--md-sys-color-on-surface: rgb(0 0 0);
|
||||||
|
--md-sys-color-surface-variant: rgb(224 226 236);
|
||||||
|
--md-sys-color-on-surface-variant: rgb(32 36 43);
|
||||||
|
--md-sys-color-outline: rgb(63 67 74);
|
||||||
|
--md-sys-color-outline-variant: rgb(63 67 74);
|
||||||
|
--md-sys-color-shadow: rgb(0 0 0);
|
||||||
|
--md-sys-color-scrim: rgb(0 0 0);
|
||||||
|
--md-sys-color-inverse-surface: rgb(46 48 53);
|
||||||
|
--md-sys-color-inverse-on-surface: rgb(255 255 255);
|
||||||
|
--md-sys-color-inverse-primary: rgb(228 236 255);
|
||||||
|
--md-sys-color-primary-fixed: rgb(29 68 114);
|
||||||
|
--md-sys-color-on-primary-fixed: rgb(255 255 255);
|
||||||
|
--md-sys-color-primary-fixed-dim: rgb(0 45 88);
|
||||||
|
--md-sys-color-on-primary-fixed-variant: rgb(255 255 255);
|
||||||
|
--md-sys-color-secondary-fixed: rgb(3 70 110);
|
||||||
|
--md-sys-color-on-secondary-fixed: rgb(255 255 255);
|
||||||
|
--md-sys-color-secondary-fixed-dim: rgb(0 47 77);
|
||||||
|
--md-sys-color-on-secondary-fixed-variant: rgb(255 255 255);
|
||||||
|
--md-sys-color-tertiary-fixed: rgb(81 59 89);
|
||||||
|
--md-sys-color-on-tertiary-fixed: rgb(255 255 255);
|
||||||
|
--md-sys-color-tertiary-fixed-dim: rgb(57 37 66);
|
||||||
|
--md-sys-color-on-tertiary-fixed-variant: rgb(255 255 255);
|
||||||
|
--md-sys-color-surface-dim: rgb(217 218 224);
|
||||||
|
--md-sys-color-surface-bright: rgb(249 249 255);
|
||||||
|
--md-sys-color-surface-container-lowest: rgb(255 255 255);
|
||||||
|
--md-sys-color-surface-container-low: rgb(243 243 250);
|
||||||
|
--md-sys-color-surface-container: rgb(237 237 244);
|
||||||
|
--md-sys-color-surface-container-high: rgb(231 232 238);
|
||||||
|
--md-sys-color-surface-container-highest: rgb(225 226 233);
|
||||||
|
}
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
.light-medium-contrast {
|
||||||
|
--md-sys-color-primary: rgb(29 68 114);
|
||||||
|
--md-sys-color-surface-tint: rgb(60 96 144);
|
||||||
|
--md-sys-color-on-primary: rgb(255 255 255);
|
||||||
|
--md-sys-color-primary-container: rgb(83 118 167);
|
||||||
|
--md-sys-color-on-primary-container: rgb(255 255 255);
|
||||||
|
--md-sys-color-secondary: rgb(3 70 110);
|
||||||
|
--md-sys-color-on-secondary: rgb(255 255 255);
|
||||||
|
--md-sys-color-secondary-container: rgb(71 121 163);
|
||||||
|
--md-sys-color-on-secondary-container: rgb(255 255 255);
|
||||||
|
--md-sys-color-tertiary: rgb(81 59 89);
|
||||||
|
--md-sys-color-on-tertiary: rgb(255 255 255);
|
||||||
|
--md-sys-color-tertiary-container: rgb(133 108 141);
|
||||||
|
--md-sys-color-on-tertiary-container: rgb(255 255 255);
|
||||||
|
--md-sys-color-error: rgb(140 0 9);
|
||||||
|
--md-sys-color-on-error: rgb(255 255 255);
|
||||||
|
--md-sys-color-error-container: rgb(218 52 46);
|
||||||
|
--md-sys-color-on-error-container: rgb(255 255 255);
|
||||||
|
--md-sys-color-background: rgb(249 249 255);
|
||||||
|
--md-sys-color-on-background: rgb(25 28 32);
|
||||||
|
--md-sys-color-surface: rgb(249 249 255);
|
||||||
|
--md-sys-color-on-surface: rgb(25 28 32);
|
||||||
|
--md-sys-color-surface-variant: rgb(224 226 236);
|
||||||
|
--md-sys-color-on-surface-variant: rgb(63 67 74);
|
||||||
|
--md-sys-color-outline: rgb(91 95 103);
|
||||||
|
--md-sys-color-outline-variant: rgb(119 123 131);
|
||||||
|
--md-sys-color-shadow: rgb(0 0 0);
|
||||||
|
--md-sys-color-scrim: rgb(0 0 0);
|
||||||
|
--md-sys-color-inverse-surface: rgb(46 48 53);
|
||||||
|
--md-sys-color-inverse-on-surface: rgb(240 240 247);
|
||||||
|
--md-sys-color-inverse-primary: rgb(165 200 255);
|
||||||
|
--md-sys-color-primary-fixed: rgb(83 118 167);
|
||||||
|
--md-sys-color-on-primary-fixed: rgb(255 255 255);
|
||||||
|
--md-sys-color-primary-fixed-dim: rgb(58 93 141);
|
||||||
|
--md-sys-color-on-primary-fixed-variant: rgb(255 255 255);
|
||||||
|
--md-sys-color-secondary-fixed: rgb(71 121 163);
|
||||||
|
--md-sys-color-on-secondary-fixed: rgb(255 255 255);
|
||||||
|
--md-sys-color-secondary-fixed-dim: rgb(43 96 137);
|
||||||
|
--md-sys-color-on-secondary-fixed-variant: rgb(255 255 255);
|
||||||
|
--md-sys-color-tertiary-fixed: rgb(133 108 141);
|
||||||
|
--md-sys-color-on-tertiary-fixed: rgb(255 255 255);
|
||||||
|
--md-sys-color-tertiary-fixed-dim: rgb(107 84 116);
|
||||||
|
--md-sys-color-on-tertiary-fixed-variant: rgb(255 255 255);
|
||||||
|
--md-sys-color-surface-dim: rgb(217 218 224);
|
||||||
|
--md-sys-color-surface-bright: rgb(249 249 255);
|
||||||
|
--md-sys-color-surface-container-lowest: rgb(255 255 255);
|
||||||
|
--md-sys-color-surface-container-low: rgb(243 243 250);
|
||||||
|
--md-sys-color-surface-container: rgb(237 237 244);
|
||||||
|
--md-sys-color-surface-container-high: rgb(231 232 238);
|
||||||
|
--md-sys-color-surface-container-highest: rgb(225 226 233);
|
||||||
|
}
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
.light {
|
||||||
|
--md-sys-color-primary: rgb(60 96 144);
|
||||||
|
--md-sys-color-surface-tint: rgb(60 96 144);
|
||||||
|
--md-sys-color-on-primary: rgb(255 255 255);
|
||||||
|
--md-sys-color-primary-container: rgb(212 227 255);
|
||||||
|
--md-sys-color-on-primary-container: rgb(0 28 58);
|
||||||
|
--md-sys-color-secondary: rgb(46 98 140);
|
||||||
|
--md-sys-color-on-secondary: rgb(255 255 255);
|
||||||
|
--md-sys-color-secondary-container: rgb(206 229 255);
|
||||||
|
--md-sys-color-on-secondary-container: rgb(0 29 50);
|
||||||
|
--md-sys-color-tertiary: rgb(110 86 118);
|
||||||
|
--md-sys-color-on-tertiary: rgb(255 255 255);
|
||||||
|
--md-sys-color-tertiary-container: rgb(247 216 255);
|
||||||
|
--md-sys-color-on-tertiary-container: rgb(39 20 48);
|
||||||
|
--md-sys-color-error: rgb(186 26 26);
|
||||||
|
--md-sys-color-on-error: rgb(255 255 255);
|
||||||
|
--md-sys-color-error-container: rgb(255 218 214);
|
||||||
|
--md-sys-color-on-error-container: rgb(65 0 2);
|
||||||
|
--md-sys-color-background: rgb(249 249 255);
|
||||||
|
--md-sys-color-on-background: rgb(25 28 32);
|
||||||
|
--md-sys-color-surface: rgb(249 249 255);
|
||||||
|
--md-sys-color-on-surface: rgb(25 28 32);
|
||||||
|
--md-sys-color-surface-variant: rgb(224 226 236);
|
||||||
|
--md-sys-color-on-surface-variant: rgb(67 71 78);
|
||||||
|
--md-sys-color-outline: rgb(116 119 127);
|
||||||
|
--md-sys-color-outline-variant: rgb(195 198 207);
|
||||||
|
--md-sys-color-shadow: rgb(0 0 0);
|
||||||
|
--md-sys-color-scrim: rgb(0 0 0);
|
||||||
|
--md-sys-color-inverse-surface: rgb(46 48 53);
|
||||||
|
--md-sys-color-inverse-on-surface: rgb(240 240 247);
|
||||||
|
--md-sys-color-inverse-primary: rgb(165 200 255);
|
||||||
|
--md-sys-color-primary-fixed: rgb(212 227 255);
|
||||||
|
--md-sys-color-on-primary-fixed: rgb(0 28 58);
|
||||||
|
--md-sys-color-primary-fixed-dim: rgb(165 200 255);
|
||||||
|
--md-sys-color-on-primary-fixed-variant: rgb(34 72 118);
|
||||||
|
--md-sys-color-secondary-fixed: rgb(206 229 255);
|
||||||
|
--md-sys-color-on-secondary-fixed: rgb(0 29 50);
|
||||||
|
--md-sys-color-secondary-fixed-dim: rgb(154 203 250);
|
||||||
|
--md-sys-color-on-secondary-fixed-variant: rgb(12 74 114);
|
||||||
|
--md-sys-color-tertiary-fixed: rgb(247 216 255);
|
||||||
|
--md-sys-color-on-tertiary-fixed: rgb(39 20 48);
|
||||||
|
--md-sys-color-tertiary-fixed-dim: rgb(218 189 226);
|
||||||
|
--md-sys-color-on-tertiary-fixed-variant: rgb(85 63 93);
|
||||||
|
--md-sys-color-surface-dim: rgb(217 218 224);
|
||||||
|
--md-sys-color-surface-bright: rgb(249 249 255);
|
||||||
|
--md-sys-color-surface-container-lowest: rgb(255 255 255);
|
||||||
|
--md-sys-color-surface-container-low: rgb(243 243 250);
|
||||||
|
--md-sys-color-surface-container: rgb(237 237 244);
|
||||||
|
--md-sys-color-surface-container-high: rgb(231 232 238);
|
||||||
|
--md-sys-color-surface-container-highest: rgb(225 226 233);
|
||||||
|
}
|
||||||
@@ -30,11 +30,6 @@ body {
|
|||||||
min-height: 100vh;
|
min-height: 100vh;
|
||||||
}
|
}
|
||||||
|
|
||||||
h1 {
|
|
||||||
font-size: 3.2em;
|
|
||||||
line-height: 1.1;
|
|
||||||
}
|
|
||||||
|
|
||||||
button {
|
button {
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
border: 1px solid transparent;
|
border: 1px solid transparent;
|
||||||
@@ -54,6 +49,50 @@ button:focus-visible {
|
|||||||
outline: 4px auto -webkit-focus-ring-color;
|
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) {
|
@media (prefers-color-scheme: light) {
|
||||||
:root {
|
:root {
|
||||||
color: #213547;
|
color: #213547;
|
||||||
|
|||||||
@@ -1,10 +1,7 @@
|
|||||||
import React from 'react'
|
import React from 'react';
|
||||||
import ReactDOM from 'react-dom/client'
|
import ReactDOM from 'react-dom/client';
|
||||||
import {Home} from './App.jsx'
|
import App from './App';
|
||||||
import './index.css'
|
|
||||||
|
|
||||||
ReactDOM.createRoot(document.getElementById('root')).render(
|
ReactDOM.createRoot(document.getElementById('root')).render(
|
||||||
<React.StrictMode>
|
<App />
|
||||||
<Home />
|
|
||||||
</React.StrictMode>,
|
|
||||||
)
|
)
|
||||||
@@ -1,60 +1,68 @@
|
|||||||
import { fileURLToPath, URL } from 'node:url';
|
import { fileURLToPath, URL } from 'node:url';
|
||||||
|
import { defineConfig, loadEnv } from 'vite';
|
||||||
import { defineConfig } from 'vite';
|
|
||||||
import plugin from '@vitejs/plugin-react';
|
import plugin from '@vitejs/plugin-react';
|
||||||
import fs from 'fs';
|
import fs from 'fs';
|
||||||
import path from 'path';
|
import path from 'path';
|
||||||
import child_process from 'child_process';
|
import child_process from 'child_process';
|
||||||
|
import process, { env } from 'process';
|
||||||
|
|
||||||
const baseFolder =
|
const baseFolder =
|
||||||
process.env.APPDATA !== undefined && process.env.APPDATA !== ''
|
process.env.APPDATA !== undefined && process.env.APPDATA !== ''
|
||||||
? `${process.env.APPDATA}/ASP.NET/https`
|
? `${process.env.APPDATA}/ASP.NET/https`
|
||||||
: `${process.env.HOME}/.aspnet/https`;
|
: `${process.env.HOME}/.aspnet/https`;
|
||||||
|
|
||||||
const certificateArg = process.argv.map(arg => arg.match(/--name=(?<value>.+)/i)).filter(Boolean)[0];
|
|
||||||
const certificateName = certificateArg ? certificateArg.groups.value : "bts.datastreamwebapp.client";
|
|
||||||
|
|
||||||
if (!certificateName) {
|
|
||||||
console.error('Invalid certificate name. Run this script in the context of an npm/yarn script or pass --name=<<app>> explicitly.')
|
|
||||||
process.exit(-1);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
const certificateName = "bts.datastreamwebapp.client";
|
||||||
const certFilePath = path.join(baseFolder, `${certificateName}.pem`);
|
const certFilePath = path.join(baseFolder, `${certificateName}.pem`);
|
||||||
const keyFilePath = path.join(baseFolder, `${certificateName}.key`);
|
const keyFilePath = path.join(baseFolder, `${certificateName}.key`);
|
||||||
|
|
||||||
if (!fs.existsSync(certFilePath) || !fs.existsSync(keyFilePath)) {
|
if (!fs.existsSync(certFilePath) || !fs.existsSync(keyFilePath)) {
|
||||||
if (0 !== child_process.spawnSync('dotnet', [
|
if (0 !== child_process.spawnSync('dotnet', [
|
||||||
'dev-certs',
|
'dev-certs',
|
||||||
'https',
|
'https',
|
||||||
'--export-path',
|
'--export-path',
|
||||||
certFilePath,
|
certFilePath,
|
||||||
'--format',
|
'--format',
|
||||||
'Pem',
|
'Pem',
|
||||||
'--no-password',
|
'--no-password',
|
||||||
], { stdio: 'inherit', }).status) {
|
], { stdio: 'inherit', }).status) {
|
||||||
throw new Error("Could not create certificate.");
|
throw new Error("Could not create certificate.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// https://vitejs.dev/config/
|
export default defineConfig(({ $$command, mode, $$isSsrBuild, $$isPreview }) => {
|
||||||
export default defineConfig({
|
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()],
|
plugins: [plugin()],
|
||||||
resolve: {
|
resolve: {
|
||||||
alias: {
|
alias: {
|
||||||
'@': fileURLToPath(new URL('./src', import.meta.url))
|
'@': fileURLToPath(new URL('./src', import.meta.url))
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
build: {
|
||||||
|
minify: false,
|
||||||
|
sourcemap: true,
|
||||||
|
outDir: `../../../build/Bts.DataStreamWebApp.Client/${mode}/dist`
|
||||||
},
|
},
|
||||||
server: {
|
server: {
|
||||||
proxy: {
|
proxy: {
|
||||||
'^/weatherforecast': {
|
'^/api': {
|
||||||
target: 'https://localhost:7128/',
|
target,
|
||||||
secure: false
|
secure: false
|
||||||
}
|
|
||||||
},
|
},
|
||||||
port: 5173,
|
'^/ws': {
|
||||||
https: {
|
target,
|
||||||
key: fs.readFileSync(keyFilePath),
|
secure: false
|
||||||
cert: fs.readFileSync(certFilePath),
|
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
port: 5173,
|
||||||
|
https: {
|
||||||
|
key: fs.readFileSync(keyFilePath),
|
||||||
|
cert: fs.readFileSync(certFilePath),
|
||||||
|
}
|
||||||
}
|
}
|
||||||
})
|
};
|
||||||
|
});
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
<TargetFramework>net7.0</TargetFramework>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<InvariantGlobalization>true</InvariantGlobalization>
|
<InvariantGlobalization>true</InvariantGlobalization>
|
||||||
@@ -12,9 +12,8 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="CommandLineParser" Version="2.9.1" />
|
<PackageReference Include="CommandLineParser" Version="2.9.1" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.SpaProxy">
|
<PackageReference Include="Microsoft.AspNetCore.SpaProxy" Version="7.0.20" />
|
||||||
<Version>8.*-*</Version>
|
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="7.0.20" />
|
||||||
</PackageReference>
|
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
|
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
@@ -26,10 +25,16 @@
|
|||||||
<ProjectReference Include="..\DataStream\DataStream.csproj" />
|
<ProjectReference Include="..\DataStream\DataStream.csproj" />
|
||||||
<ProjectReference Include="..\SharedStreams\SharedStreams.csproj" />
|
<ProjectReference Include="..\SharedStreams\SharedStreams.csproj" />
|
||||||
<ProjectReference Include="..\..\client\spark_api\spark_api.csproj" />
|
<ProjectReference Include="..\..\client\spark_api\spark_api.csproj" />
|
||||||
|
<ProjectReference Include="..\..\client\spark_core\spark_core.csproj" />
|
||||||
<ProjectReference Include="..\..\client\spark_websocket\spark_websocket.csproj" />
|
<ProjectReference Include="..\..\client\spark_websocket\spark_websocket.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<!-- <ItemGroup>
|
<ItemGroup>
|
||||||
<Content Update="wwwroot\alt-index.html" CopyToPublishDirectory="Never" />
|
<ConfigurationProfile Include="appsettings.Development.json" />
|
||||||
</ItemGroup> -->
|
<ConfigurationProfile Include="appsettings.Production.json" />
|
||||||
|
<ConfigurationProfile Include="appsettings.ProductionAws.json" />
|
||||||
|
<ConfigurationProfile Include="appsettings.Staging.json" />
|
||||||
|
<ConfigurationProfile Include="appsettings.json" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
@Bts.DataStreamWebApp.Server_HostAddress = http://localhost:5268
|
|
||||||
|
|
||||||
GET {{Bts.DataStreamWebApp.Server_HostAddress}}/weatherforecast/
|
|
||||||
Accept: application/json
|
|
||||||
|
|
||||||
###
|
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
namespace Bts.DataStreamWebApp.Server;
|
||||||
|
|
||||||
|
public class CannedQueriesConfig {
|
||||||
|
public List<CannedQuery>? Items { get; set; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
namespace Bts.DataStreamWebApp.Server;
|
||||||
|
|
||||||
|
public class CannedQuery {
|
||||||
|
public string? Name { get; set; }
|
||||||
|
public List<string>? Query { get; set; }
|
||||||
|
}
|
||||||
+18
@@ -0,0 +1,18 @@
|
|||||||
|
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
@@ -0,0 +1,22 @@
|
|||||||
|
// 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);
|
||||||
|
// }
|
||||||
|
// }
|
||||||
+14
-91
@@ -1,107 +1,30 @@
|
|||||||
namespace Bts.DataStreamWebApp.Server.Controllers;
|
namespace Bts.DataStreamWebApp.Server.Controllers;
|
||||||
|
|
||||||
using BCG;
|
|
||||||
|
|
||||||
using bts.api.core;
|
|
||||||
using bts.websocket_core.json_rpc;
|
|
||||||
|
|
||||||
using Bts.DataStreamExpressions;
|
|
||||||
|
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
|
||||||
using Spark.Core.Disposables;
|
|
||||||
|
|
||||||
using System.Net.WebSockets;
|
|
||||||
using System.Text;
|
|
||||||
using System.Text.Json;
|
|
||||||
|
|
||||||
[Route("/ws")]
|
[Route("/ws")]
|
||||||
public class DataStreamSubscriptionController(ILogger<DataStreamSubscriptionController> logger) : ControllerBase {
|
public class DataStreamSubscriptionController : ControllerBase {
|
||||||
readonly ILogger<DataStreamSubscriptionController> logger = logger;
|
readonly ILogger logger;
|
||||||
IDisposable? streamSubscription;
|
|
||||||
|
public DataStreamSubscriptionController(ILogger<DataStreamSubscriptionController> logger) {
|
||||||
|
this.logger = logger;
|
||||||
|
logger.LogInformation("Creating {ControllerType}", GetType().Name);
|
||||||
|
}
|
||||||
|
|
||||||
[Route("/ws")]
|
[Route("/ws")]
|
||||||
public async Task Get() {
|
public async Task Get(CancellationToken cancellationToken) {
|
||||||
if (!HttpContext.WebSockets.IsWebSocketRequest) {
|
if (!HttpContext.WebSockets.IsWebSocketRequest) {
|
||||||
logger.LogError("Expected websocket request on path '{}'", HttpContext.Request.Path);
|
logger.LogError("Expected websocket request on path '{}'", HttpContext.Request.Path);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Console.WriteLine("Establishing websocket connection...");
|
logger.LogInformation("Establishing websocket connection...");
|
||||||
using var webSocket = await HttpContext.WebSockets.AcceptWebSocketAsync();
|
|
||||||
Console.WriteLine($"Websocket connection established.");
|
|
||||||
await runWebSocketServer(null, "bts", string.Empty, webSocket);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static async Task Echo(WebSocket webSocket) {
|
|
||||||
var buffer = new byte[1024 * 4];
|
|
||||||
var receiveResult = await webSocket.ReceiveAsync(
|
|
||||||
new ArraySegment<byte>(buffer), CancellationToken.None);
|
|
||||||
|
|
||||||
while (!receiveResult.CloseStatus.HasValue) {
|
|
||||||
await webSocket.SendAsync(
|
|
||||||
new ArraySegment<byte>(buffer, 0, receiveResult.Count),
|
|
||||||
receiveResult.MessageType,
|
|
||||||
receiveResult.EndOfMessage,
|
|
||||||
CancellationToken.None);
|
|
||||||
|
|
||||||
receiveResult = await webSocket.ReceiveAsync(
|
|
||||||
new ArraySegment<byte>(buffer), CancellationToken.None);
|
|
||||||
}
|
|
||||||
|
|
||||||
await webSocket.CloseAsync(
|
|
||||||
receiveResult.CloseStatus.Value,
|
|
||||||
receiveResult.CloseStatusDescription,
|
|
||||||
CancellationToken.None);
|
|
||||||
}
|
|
||||||
|
|
||||||
async Task<int> runWebSocketServer(string? sparkd, string user, string password, WebSocket webSocket) {
|
|
||||||
var context = ServiceContext.create(sparkd);
|
|
||||||
await context.login(user, password);
|
|
||||||
var buffer = new byte[1024 * 4];
|
|
||||||
var receiveResult = await webSocket.ReceiveAsync(
|
|
||||||
new ArraySegment<byte>(buffer), CancellationToken.None);
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
while (!receiveResult.CloseStatus.HasValue) {
|
using var webSocket = await HttpContext.WebSockets.AcceptWebSocketAsync();
|
||||||
receiveResult = await webSocket.ReceiveAsync(
|
logger.LogInformation("Websocket connection established.");
|
||||||
new ArraySegment<byte>(buffer), CancellationToken.None);
|
using var server = new DataStreamWebSocketServer(webSocket, logger);
|
||||||
var msg = Encoding.UTF8.GetString(buffer, 0, receiveResult.Count);
|
await server.Run(cancellationToken);
|
||||||
var rpcReq = JsonSerializer.Deserialize<JsonRpcRequest<DataStreamSubscription>>(msg);
|
|
||||||
var query = rpcReq?.Params?.Query ?? throw new InvalidOperationException(
|
|
||||||
"Failed to parse JsonRpcRequest.Params");
|
|
||||||
var exp = DataStreamExpressionsInterpreter.Evaluate(query);
|
|
||||||
if (exp is null) {
|
|
||||||
Console.WriteLine($"Invalid query expression: {query}.");
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
var vs = exp.getView(new Dictionary<string, StatementExpression>(0));
|
|
||||||
Disposable.dispose(ref streamSubscription);
|
|
||||||
vs.onChange += OnStreamChanged;
|
|
||||||
streamSubscription = Disposable.Create(() => vs.onChange -= OnStreamChanged);
|
|
||||||
}
|
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
Console.WriteLine($"Exception on WebsocketServer thread: {ex}");
|
logger.LogError("DataStreamSubscriptionController.Run threw exception: {Exception}", ex);
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
async void OnStreamChanged(object newValue) {
|
|
||||||
if (newValue is not DataPacket dp) {
|
|
||||||
Console.WriteLine(
|
|
||||||
$"OnStreamChanged delegate expected DataPacket (actually received {newValue?.GetType()}.");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
Console.WriteLine("Received stream update.");
|
|
||||||
var added_rows_str = dp.addedRows.get_printed_rows(val => val.Length);
|
|
||||||
var msg = $"Received new rows:\n{added_rows_str}";
|
|
||||||
var encoded = Encoding.UTF8.GetBytes(msg);
|
|
||||||
var payload = new ArraySegment<byte>(encoded, 0, encoded.Length);
|
|
||||||
await webSocket.SendAsync(
|
|
||||||
payload,
|
|
||||||
receiveResult.MessageType,
|
|
||||||
receiveResult.EndOfMessage,
|
|
||||||
CancellationToken.None);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
-22
@@ -1,22 +0,0 @@
|
|||||||
namespace Bts.DataStreamWebApp.Server.Controllers;
|
|
||||||
using Microsoft.AspNetCore.Mvc;
|
|
||||||
|
|
||||||
[ApiController]
|
|
||||||
[Route("[controller]")]
|
|
||||||
public class WeatherForecastController(ILogger<WeatherForecastController> logger) : ControllerBase {
|
|
||||||
static readonly string[] Summaries = [
|
|
||||||
"Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
|
|
||||||
];
|
|
||||||
|
|
||||||
readonly ILogger<WeatherForecastController> _logger = logger;
|
|
||||||
|
|
||||||
[HttpGet(Name = "GetWeatherForecast")]
|
|
||||||
public IEnumerable<WeatherForecast> Get() {
|
|
||||||
return Enumerable.Range(1, 5).Select(index => new WeatherForecast {
|
|
||||||
Date = DateOnly.FromDateTime(DateTime.Now.AddDays(index)),
|
|
||||||
TemperatureC = Random.Shared.Next(-20, 55),
|
|
||||||
Summary = Summaries[Random.Shared.Next(Summaries.Length)]
|
|
||||||
})
|
|
||||||
.ToArray();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,8 +1,133 @@
|
|||||||
namespace Bts.DataStreamWebApp.Server;
|
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;
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
public class DataStreamSubscription {
|
class DataStreamSubscription : IDisposable, IHostedService {
|
||||||
[JsonPropertyName("query")]
|
public readonly ViewStream ViewStream;
|
||||||
public string? Query { get; set; }
|
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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Loaded 100 of 2583 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user