Replace gRPC Backend #10
203
Cargo.lock
generated
203
Cargo.lock
generated
@@ -251,6 +251,18 @@ version = "1.0.100"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
|
checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "api"
|
||||||
|
version = "0.1.0"
|
||||||
|
dependencies = [
|
||||||
|
"chrono",
|
||||||
|
"derive_more",
|
||||||
|
"log",
|
||||||
|
"serde",
|
||||||
|
"thiserror",
|
||||||
|
"uuid",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "async-stream"
|
name = "async-stream"
|
||||||
version = "0.3.6"
|
version = "0.3.6"
|
||||||
@@ -417,9 +429,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bytes"
|
name = "bytes"
|
||||||
version = "1.7.2"
|
version = "1.11.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
|
checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bytestring"
|
name = "bytestring"
|
||||||
@@ -456,6 +468,7 @@ dependencies = [
|
|||||||
"iana-time-zone",
|
"iana-time-zone",
|
||||||
"js-sys",
|
"js-sys",
|
||||||
"num-traits",
|
"num-traits",
|
||||||
|
"serde",
|
||||||
"wasm-bindgen",
|
"wasm-bindgen",
|
||||||
"windows-link",
|
"windows-link",
|
||||||
]
|
]
|
||||||
@@ -505,6 +518,16 @@ dependencies = [
|
|||||||
"libc",
|
"libc",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "core-foundation"
|
||||||
|
version = "0.10.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6"
|
||||||
|
dependencies = [
|
||||||
|
"core-foundation-sys",
|
||||||
|
"libc",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "core-foundation-sys"
|
name = "core-foundation-sys"
|
||||||
version = "0.8.7"
|
version = "0.8.7"
|
||||||
@@ -569,6 +592,12 @@ dependencies = [
|
|||||||
"typenum",
|
"typenum",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "data-encoding"
|
||||||
|
version = "2.9.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "der"
|
name = "der"
|
||||||
version = "0.7.10"
|
version = "0.7.10"
|
||||||
@@ -819,6 +848,17 @@ version = "0.3.31"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
|
checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "futures-macro"
|
||||||
|
version = "0.3.31"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"syn",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "futures-sink"
|
name = "futures-sink"
|
||||||
version = "0.3.31"
|
version = "0.3.31"
|
||||||
@@ -839,6 +879,7 @@ checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"futures-core",
|
"futures-core",
|
||||||
"futures-io",
|
"futures-io",
|
||||||
|
"futures-macro",
|
||||||
"futures-sink",
|
"futures-sink",
|
||||||
"futures-task",
|
"futures-task",
|
||||||
"memchr",
|
"memchr",
|
||||||
@@ -1443,10 +1484,10 @@ dependencies = [
|
|||||||
"libc",
|
"libc",
|
||||||
"log",
|
"log",
|
||||||
"openssl",
|
"openssl",
|
||||||
"openssl-probe",
|
"openssl-probe 0.1.6",
|
||||||
"openssl-sys",
|
"openssl-sys",
|
||||||
"schannel",
|
"schannel",
|
||||||
"security-framework",
|
"security-framework 2.11.1",
|
||||||
"security-framework-sys",
|
"security-framework-sys",
|
||||||
"tempfile",
|
"tempfile",
|
||||||
]
|
]
|
||||||
@@ -1541,6 +1582,12 @@ version = "0.1.6"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
|
checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "openssl-probe"
|
||||||
|
version = "0.2.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "9f50d9b3dabb09ecd771ad0aa242ca6894994c130308ca3d7684634df8037391"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "openssl-sys"
|
name = "openssl-sys"
|
||||||
version = "0.9.111"
|
version = "0.9.111"
|
||||||
@@ -1892,6 +1939,20 @@ version = "0.8.5"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
|
checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "ring"
|
||||||
|
version = "0.17.9"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e75ec5e92c4d8aede845126adc388046234541629e76029599ed35a003c7ed24"
|
||||||
|
dependencies = [
|
||||||
|
"cc",
|
||||||
|
"cfg-if",
|
||||||
|
"getrandom 0.2.15",
|
||||||
|
"libc",
|
||||||
|
"untrusted",
|
||||||
|
"windows-sys 0.52.0",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rsa"
|
name = "rsa"
|
||||||
version = "0.9.9"
|
version = "0.9.9"
|
||||||
@@ -1934,6 +1995,51 @@ dependencies = [
|
|||||||
"windows-sys 0.52.0",
|
"windows-sys 0.52.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rustls"
|
||||||
|
version = "0.23.35"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f"
|
||||||
|
dependencies = [
|
||||||
|
"once_cell",
|
||||||
|
"rustls-pki-types",
|
||||||
|
"rustls-webpki",
|
||||||
|
"subtle",
|
||||||
|
"zeroize",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rustls-native-certs"
|
||||||
|
version = "0.8.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63"
|
||||||
|
dependencies = [
|
||||||
|
"openssl-probe 0.2.0",
|
||||||
|
"rustls-pki-types",
|
||||||
|
"schannel",
|
||||||
|
"security-framework 3.5.1",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rustls-pki-types"
|
||||||
|
version = "1.13.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "21e6f2ab2928ca4291b86736a8bd920a277a399bba1589409d72154ff87c1282"
|
||||||
|
dependencies = [
|
||||||
|
"zeroize",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rustls-webpki"
|
||||||
|
version = "0.103.8"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52"
|
||||||
|
dependencies = [
|
||||||
|
"ring",
|
||||||
|
"rustls-pki-types",
|
||||||
|
"untrusted",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rustversion"
|
name = "rustversion"
|
||||||
version = "1.0.18"
|
version = "1.0.18"
|
||||||
@@ -1968,7 +2074,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
|
checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags",
|
"bitflags",
|
||||||
"core-foundation",
|
"core-foundation 0.9.4",
|
||||||
|
"core-foundation-sys",
|
||||||
|
"libc",
|
||||||
|
"security-framework-sys",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "security-framework"
|
||||||
|
version = "3.5.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags",
|
||||||
|
"core-foundation 0.10.1",
|
||||||
"core-foundation-sys",
|
"core-foundation-sys",
|
||||||
"libc",
|
"libc",
|
||||||
"security-framework-sys",
|
"security-framework-sys",
|
||||||
@@ -2062,6 +2181,7 @@ dependencies = [
|
|||||||
"actix-web",
|
"actix-web",
|
||||||
"actix-ws",
|
"actix-ws",
|
||||||
"anyhow",
|
"anyhow",
|
||||||
|
"api",
|
||||||
"chrono",
|
"chrono",
|
||||||
"derive_more",
|
"derive_more",
|
||||||
"fern",
|
"fern",
|
||||||
@@ -2146,12 +2266,17 @@ dependencies = [
|
|||||||
name = "simple_producer"
|
name = "simple_producer"
|
||||||
version = "0.0.0"
|
version = "0.0.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"anyhow",
|
||||||
|
"api",
|
||||||
"chrono",
|
"chrono",
|
||||||
|
"futures-util",
|
||||||
"num-traits",
|
"num-traits",
|
||||||
"server",
|
"serde_json",
|
||||||
"tokio",
|
"tokio",
|
||||||
|
"tokio-stream",
|
||||||
|
"tokio-tungstenite",
|
||||||
"tokio-util",
|
"tokio-util",
|
||||||
"tonic",
|
"uuid",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -2575,16 +2700,42 @@ dependencies = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tokio-stream"
|
name = "tokio-rustls"
|
||||||
version = "0.1.16"
|
version = "0.26.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
|
checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
|
||||||
|
dependencies = [
|
||||||
|
"rustls",
|
||||||
|
"tokio",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "tokio-stream"
|
||||||
|
version = "0.1.17"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"futures-core",
|
"futures-core",
|
||||||
"pin-project-lite",
|
"pin-project-lite",
|
||||||
"tokio",
|
"tokio",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "tokio-tungstenite"
|
||||||
|
version = "0.28.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "d25a406cddcc431a75d3d9afc6a7c0f7428d4891dd973e4d54c56b46127bf857"
|
||||||
|
dependencies = [
|
||||||
|
"futures-util",
|
||||||
|
"log",
|
||||||
|
"rustls",
|
||||||
|
"rustls-native-certs",
|
||||||
|
"rustls-pki-types",
|
||||||
|
"tokio",
|
||||||
|
"tokio-rustls",
|
||||||
|
"tungstenite",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tokio-util"
|
name = "tokio-util"
|
||||||
version = "0.7.17"
|
version = "0.7.17"
|
||||||
@@ -2726,6 +2877,25 @@ version = "0.2.5"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
|
checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "tungstenite"
|
||||||
|
version = "0.28.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "8628dcc84e5a09eb3d8423d6cb682965dea9133204e8fb3efee74c2a0c259442"
|
||||||
|
dependencies = [
|
||||||
|
"bytes",
|
||||||
|
"data-encoding",
|
||||||
|
"http 1.1.0",
|
||||||
|
"httparse",
|
||||||
|
"log",
|
||||||
|
"rand 0.9.0",
|
||||||
|
"rustls",
|
||||||
|
"rustls-pki-types",
|
||||||
|
"sha1",
|
||||||
|
"thiserror",
|
||||||
|
"utf-8",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "typenum"
|
name = "typenum"
|
||||||
version = "1.17.0"
|
version = "1.17.0"
|
||||||
@@ -2771,6 +2941,12 @@ version = "0.2.6"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
|
checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "untrusted"
|
||||||
|
version = "0.9.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "url"
|
name = "url"
|
||||||
version = "2.5.7"
|
version = "2.5.7"
|
||||||
@@ -2783,6 +2959,12 @@ dependencies = [
|
|||||||
"serde",
|
"serde",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "utf-8"
|
||||||
|
version = "0.7.6"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "utf8_iter"
|
name = "utf8_iter"
|
||||||
version = "1.0.4"
|
version = "1.0.4"
|
||||||
@@ -2797,6 +2979,7 @@ checksum = "e2e054861b4bd027cd373e18e8d8d8e6548085000e41290d95ce0c373a654b4a"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"getrandom 0.3.1",
|
"getrandom 0.3.1",
|
||||||
"js-sys",
|
"js-sys",
|
||||||
|
"serde_core",
|
||||||
"wasm-bindgen",
|
"wasm-bindgen",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
[workspace]
|
[workspace]
|
||||||
members = ["server", "examples/simple_producer", "examples/simple_command"]
|
members = ["api", "server", "examples/simple_producer", "examples/simple_command"]
|
||||||
resolver = "2"
|
resolver = "2"
|
||||||
|
|
||||||
[profile.dev.package.sqlx-macros]
|
[profile.dev.package.sqlx-macros]
|
||||||
|
|||||||
14
api/Cargo.toml
Normal file
14
api/Cargo.toml
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
|
||||||
|
[package]
|
||||||
|
name = "api"
|
||||||
|
edition = "2021"
|
||||||
|
version = "0.1.0"
|
||||||
|
authors = ["Sergey <me@sergeysav.com>"]
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
log = "0.4.29"
|
||||||
|
thiserror = "2.0.17"
|
||||||
|
serde = { version = "1.0.228", features = ["derive"] }
|
||||||
|
derive_more = { version = "2.1.0", features = ["from", "try_into"] }
|
||||||
|
uuid = { version = "1.19.0", features = ["v4", "serde"] }
|
||||||
|
chrono = { version = "0.4.39", features = ["serde"] }
|
||||||
8
api/src/data_type.rs
Normal file
8
api/src/data_type.rs
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
pub enum DataType {
|
||||||
|
Float32,
|
||||||
|
Float64,
|
||||||
|
Boolean,
|
||||||
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
|
||||||
pub enum TelemetryDataValue {
|
pub enum DataValue {
|
||||||
Float32(f32),
|
Float32(f32),
|
||||||
Float64(f64),
|
Float64(f64),
|
||||||
Boolean(bool),
|
Boolean(bool),
|
||||||
4
api/src/lib.rs
Normal file
4
api/src/lib.rs
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
pub mod data_type;
|
||||||
|
pub mod data_value;
|
||||||
|
pub mod request;
|
||||||
|
pub mod response;
|
||||||
32
api/src/request.rs
Normal file
32
api/src/request.rs
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
use crate::data_type::DataType;
|
||||||
|
use crate::data_value::DataValue;
|
||||||
|
use chrono::{DateTime, Utc};
|
||||||
|
use derive_more::From;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
|
pub struct TelemetryDefinitionRequest {
|
||||||
|
pub name: String,
|
||||||
|
pub data_type: DataType,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
|
pub struct TelemetryEntry {
|
||||||
|
pub uuid: Uuid,
|
||||||
|
pub value: DataValue,
|
||||||
|
pub timestamp: DateTime<Utc>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, From)]
|
||||||
|
pub enum RequestMessagePayload {
|
||||||
|
TelemetryDefinitionRequest(TelemetryDefinitionRequest),
|
||||||
|
TelemetryEntry(TelemetryEntry),
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
|
pub struct RequestMessage {
|
||||||
|
pub uuid: Uuid,
|
||||||
|
#[serde(flatten)]
|
||||||
|
pub payload: RequestMessagePayload,
|
||||||
|
}
|
||||||
20
api/src/response.rs
Normal file
20
api/src/response.rs
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
use derive_more::{From, TryInto};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
|
pub struct TelemetryDefinitionResponse {
|
||||||
|
pub uuid: Uuid,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, From, TryInto)]
|
||||||
|
pub enum ResponseMessagePayload {
|
||||||
|
TelemetryDefinitionResponse(TelemetryDefinitionResponse),
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
|
pub struct ResponseMessage {
|
||||||
|
pub uuid: Uuid,
|
||||||
|
#[serde(flatten)]
|
||||||
|
pub payload: ResponseMessagePayload,
|
||||||
|
}
|
||||||
@@ -4,9 +4,14 @@ name = "simple_producer"
|
|||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
server = { path = "../../server" }
|
api = { path = "../../api" }
|
||||||
tonic = "0.12.3"
|
tokio = { version = "1.43.0", features = ["rt-multi-thread", "signal", "time", "macros"] }
|
||||||
tokio = { version = "1.43.0", features = ["rt-multi-thread", "signal"] }
|
|
||||||
chrono = "0.4.39"
|
chrono = "0.4.39"
|
||||||
tokio-util = "0.7.13"
|
|
||||||
num-traits = "0.2.19"
|
num-traits = "0.2.19"
|
||||||
|
tokio-tungstenite = { version = "0.28.0", features = ["rustls-tls-native-roots"] }
|
||||||
|
anyhow = "1.0.100"
|
||||||
|
futures-util = "0.3.31"
|
||||||
|
serde_json = "1.0.145"
|
||||||
|
uuid = { version = "1.19.0", features = ["v4"] }
|
||||||
|
tokio-util = "0.7.17"
|
||||||
|
tokio-stream = "0.1.17"
|
||||||
|
|||||||
@@ -1,110 +1,247 @@
|
|||||||
use chrono::DateTime;
|
use anyhow::anyhow;
|
||||||
use num_traits::float::FloatConst;
|
use api::data_type::DataType;
|
||||||
use server::core::telemetry_service_client::TelemetryServiceClient;
|
use api::data_value::DataValue;
|
||||||
use server::core::telemetry_value::Value;
|
use api::request::{
|
||||||
use server::core::{
|
RequestMessage, RequestMessagePayload, TelemetryDefinitionRequest, TelemetryEntry,
|
||||||
TelemetryDataType, TelemetryDefinitionRequest, TelemetryItem, TelemetryValue, Timestamp, Uuid,
|
|
||||||
};
|
};
|
||||||
use std::error::Error;
|
use api::response::{ResponseMessage, ResponseMessagePayload, TelemetryDefinitionResponse};
|
||||||
|
use chrono::{DateTime, TimeDelta, Utc};
|
||||||
|
use futures_util::future::join_all;
|
||||||
|
use futures_util::{SinkExt, StreamExt};
|
||||||
|
use num_traits::FloatConst;
|
||||||
|
use std::collections::HashMap;
|
||||||
|
use std::sync::atomic::{AtomicBool, Ordering};
|
||||||
|
use std::sync::Arc;
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
use tokio::select;
|
use tokio::net::TcpStream;
|
||||||
use tokio::sync::mpsc;
|
use tokio::sync::mpsc;
|
||||||
use tokio::sync::mpsc::Sender;
|
use tokio::sync::mpsc::channel;
|
||||||
use tokio::time::Instant;
|
use tokio::time::{sleep, sleep_until, Instant};
|
||||||
|
use tokio::{pin, select};
|
||||||
|
use tokio_tungstenite::tungstenite::client::IntoClientRequest;
|
||||||
|
use tokio_tungstenite::tungstenite::Message;
|
||||||
|
use tokio_tungstenite::{connect_async, MaybeTlsStream, WebSocketStream};
|
||||||
use tokio_util::sync::CancellationToken;
|
use tokio_util::sync::CancellationToken;
|
||||||
use tonic::codegen::tokio_stream::wrappers::ReceiverStream;
|
use uuid::Uuid;
|
||||||
use tonic::codegen::tokio_stream::StreamExt;
|
|
||||||
use tonic::codegen::StdError;
|
|
||||||
use tonic::transport::Channel;
|
|
||||||
use tonic::Request;
|
|
||||||
|
|
||||||
struct Telemetry {
|
struct Telemetry {
|
||||||
client: TelemetryServiceClient<Channel>,
|
is_connected: Arc<AtomicBool>,
|
||||||
tx: Sender<TelemetryItem>,
|
tx: mpsc::Sender<RequestMessage>,
|
||||||
|
callback_new: mpsc::Sender<(Uuid, mpsc::Sender<ResponseMessagePayload>)>,
|
||||||
|
callback_delete: mpsc::Sender<Uuid>,
|
||||||
cancel: CancellationToken,
|
cancel: CancellationToken,
|
||||||
}
|
}
|
||||||
|
|
||||||
struct TelemetryItemHandle {
|
struct TelemetryItemHandle<'a> {
|
||||||
uuid: String,
|
uuid: Uuid,
|
||||||
tx: Sender<TelemetryItem>,
|
tlm: &'a Telemetry,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Telemetry {
|
impl Telemetry {
|
||||||
pub async fn new<D>(dst: D) -> Result<Self, Box<dyn Error>>
|
async fn connect<R>(request: R) -> anyhow::Result<WebSocketStream<MaybeTlsStream<TcpStream>>>
|
||||||
where
|
where
|
||||||
D: TryInto<tonic::transport::Endpoint>,
|
R: IntoClientRequest + Unpin,
|
||||||
D::Error: Into<StdError>,
|
{
|
||||||
|
let (client, _) = match connect_async(request).await {
|
||||||
|
Ok(o) => o,
|
||||||
|
Err(e) => {
|
||||||
|
sleep(Duration::from_secs(1)).await;
|
||||||
|
return Err(e.into());
|
||||||
|
}
|
||||||
|
};
|
||||||
|
Ok(client)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn new<R>(request: R) -> anyhow::Result<Self>
|
||||||
|
where
|
||||||
|
R: IntoClientRequest + Unpin + Clone + Send + 'static,
|
||||||
{
|
{
|
||||||
let mut client = TelemetryServiceClient::connect(dst).await?;
|
|
||||||
let client_stored = client.clone();
|
|
||||||
let cancel = CancellationToken::new();
|
let cancel = CancellationToken::new();
|
||||||
let cancel_stored = cancel.clone();
|
let cancel_stored = cancel.clone();
|
||||||
let (local_tx, mut local_rx) = mpsc::channel(16);
|
let (tx_tx, mut tx_rx) = channel(128);
|
||||||
|
let (callback_new_tx, mut callback_new_rx) = channel(16);
|
||||||
|
let (callback_delete_tx, mut callback_delete_rx) = channel(16);
|
||||||
|
|
||||||
|
let is_connected = Arc::new(AtomicBool::new(false));
|
||||||
|
let connected = is_connected.clone();
|
||||||
|
|
||||||
tokio::spawn(async move {
|
tokio::spawn(async move {
|
||||||
while !cancel.is_cancelled() {
|
while !cancel.is_cancelled() {
|
||||||
let (server_tx, server_rx) = mpsc::channel(16);
|
let client = Self::connect(request.clone());
|
||||||
let response_stream = client
|
pin!(client);
|
||||||
.insert_telemetry(ReceiverStream::new(server_rx))
|
let mut client = match loop {
|
||||||
.await;
|
break select! {
|
||||||
if let Ok(response_stream) = response_stream {
|
c = &mut client => {
|
||||||
let mut response_stream = response_stream.into_inner();
|
c
|
||||||
loop {
|
},
|
||||||
select! {
|
Some(_) = tx_rx.recv() => {continue;},
|
||||||
_ = cancel.cancelled() => {
|
Some(_) = callback_new_rx.recv() => {continue;},
|
||||||
break;
|
Some(_) = callback_delete_rx.recv() => {continue;},
|
||||||
},
|
};
|
||||||
Some(item) = local_rx.recv() => {
|
} {
|
||||||
match server_tx.send(item).await {
|
Ok(c) => c,
|
||||||
Ok(_) => {}
|
Err(e) => {
|
||||||
Err(_) => break,
|
println!("Connect Error: {e}");
|
||||||
}
|
continue;
|
||||||
},
|
}
|
||||||
Some(response) = response_stream.next() => {
|
};
|
||||||
match response {
|
|
||||||
Ok(_) => {}
|
let mut close_connection = true;
|
||||||
Err(_) => {
|
let mut callbacks = HashMap::<Uuid, mpsc::Sender<ResponseMessagePayload>>::new();
|
||||||
break;
|
connected.store(true, Ordering::SeqCst);
|
||||||
|
|
||||||
|
loop {
|
||||||
|
select! {
|
||||||
|
biased;
|
||||||
|
_ = cancel.cancelled() => { break; },
|
||||||
|
Some(msg) = callback_new_rx.recv() => {
|
||||||
|
let (uuid, callback) = msg;
|
||||||
|
callbacks.insert(uuid, callback);
|
||||||
|
},
|
||||||
|
Some(msg) = callback_delete_rx.recv() => {
|
||||||
|
callbacks.remove(&msg);
|
||||||
|
},
|
||||||
|
Some(msg) = client.next() => {
|
||||||
|
match msg {
|
||||||
|
Ok(msg) => {
|
||||||
|
match msg {
|
||||||
|
Message::Text(msg) => {
|
||||||
|
let msg: ResponseMessage = match serde_json::from_str(&msg) {
|
||||||
|
Ok(m) => m,
|
||||||
|
Err(e) => {
|
||||||
|
println!("Failed to deserialize {e}");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
if let Some(cb) = callbacks.get_mut(&msg.uuid) {
|
||||||
|
if let Err(e) = cb.send(msg.payload).await {
|
||||||
|
println!("Failed to call callback {e}");
|
||||||
|
callbacks.remove(&msg.uuid);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
unimplemented!("Unexpected Message: {msg:?}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Message::Binary(_) => unimplemented!("Binary Unsupported"),
|
||||||
|
Message::Ping(data) => {
|
||||||
|
if let Err(e) = client.send(Message::Pong(data)).await {
|
||||||
|
println!("Failed to send Pong {e}");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Message::Pong(_) => {
|
||||||
|
// Intentionally Left Empty
|
||||||
|
}
|
||||||
|
Message::Close(_) => {
|
||||||
|
println!("Websocket Closed");
|
||||||
|
close_connection = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
Message::Frame(_) => unreachable!("Not Possible"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
Err(e) => {
|
||||||
else => break,
|
println!("Receive Error {e}");
|
||||||
}
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
Some(msg) = tx_rx.recv() => {
|
||||||
|
let msg = match serde_json::to_string(&msg) {
|
||||||
|
Ok(m) => m,
|
||||||
|
Err(e) => {
|
||||||
|
println!("Encode Error {e}");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
if let Err(e) = client.send(Message::Text(msg.into())).await {
|
||||||
|
println!("Send Error {e}");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
else => { break; },
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
tokio::time::sleep(Duration::from_secs(1)).await;
|
|
||||||
}
|
}
|
||||||
|
connected.store(false, Ordering::SeqCst);
|
||||||
|
if close_connection {
|
||||||
|
if let Err(e) = client.close(None).await {
|
||||||
|
println!("Close Error {e}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Callbacks gets dropped here - closing all listeners automatically
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
Ok(Self {
|
Ok(Self {
|
||||||
client: client_stored,
|
tx: tx_tx,
|
||||||
tx: local_tx,
|
callback_new: callback_new_tx,
|
||||||
|
callback_delete: callback_delete_tx,
|
||||||
cancel: cancel_stored,
|
cancel: cancel_stored,
|
||||||
|
is_connected,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn register(
|
pub async fn wait_connected(&self) {
|
||||||
&mut self,
|
while !self.is_connected.load(Ordering::Relaxed) {
|
||||||
name: String,
|
sleep(Duration::from_millis(10)).await;
|
||||||
data_type: TelemetryDataType,
|
}
|
||||||
) -> Result<TelemetryItemHandle, Box<dyn Error>> {
|
}
|
||||||
let response = self
|
|
||||||
.client
|
|
||||||
.new_telemetry(Request::new(TelemetryDefinitionRequest {
|
|
||||||
name,
|
|
||||||
data_type: data_type.into(),
|
|
||||||
}))
|
|
||||||
.await?
|
|
||||||
.into_inner();
|
|
||||||
|
|
||||||
let Some(uuid) = response.uuid else {
|
/// Send a message and don't expect a response
|
||||||
return Err("UUID Missing".into());
|
pub async fn send_message<P: Into<RequestMessagePayload>>(
|
||||||
};
|
&self,
|
||||||
|
payload: P,
|
||||||
|
) -> anyhow::Result<()> {
|
||||||
|
self.tx
|
||||||
|
.send(RequestMessage {
|
||||||
|
uuid: Uuid::new_v4(),
|
||||||
|
payload: payload.into(),
|
||||||
|
})
|
||||||
|
.await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn send_request<
|
||||||
|
P: Into<RequestMessagePayload>,
|
||||||
|
R: TryFrom<ResponseMessagePayload, Error = impl std::error::Error + Send + Sync + 'static>,
|
||||||
|
>(
|
||||||
|
&self,
|
||||||
|
payload: P,
|
||||||
|
) -> anyhow::Result<R> {
|
||||||
|
let uuid = Uuid::new_v4();
|
||||||
|
let (tx, mut rx) = channel(1);
|
||||||
|
|
||||||
|
self.wait_connected().await;
|
||||||
|
self.callback_new.send((uuid, tx)).await?;
|
||||||
|
self.tx
|
||||||
|
.send(RequestMessage {
|
||||||
|
uuid,
|
||||||
|
payload: payload.into(),
|
||||||
|
})
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
let response = rx.recv().await.ok_or(anyhow!("No Response Received"))?;
|
||||||
|
|
||||||
|
let response = R::try_from(response)?;
|
||||||
|
|
||||||
|
self.callback_delete.send(uuid).await?;
|
||||||
|
|
||||||
|
Ok(response)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn register(
|
||||||
|
&self,
|
||||||
|
name: String,
|
||||||
|
data_type: DataType,
|
||||||
|
) -> anyhow::Result<TelemetryItemHandle<'_>> {
|
||||||
|
let response: TelemetryDefinitionResponse = self
|
||||||
|
.send_request(TelemetryDefinitionRequest { name, data_type })
|
||||||
|
.await?;
|
||||||
|
|
||||||
Ok(TelemetryItemHandle {
|
Ok(TelemetryItemHandle {
|
||||||
uuid: uuid.value,
|
uuid: response.uuid,
|
||||||
tx: self.tx.clone(),
|
tlm: self,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -115,24 +252,13 @@ impl Drop for Telemetry {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl TelemetryItemHandle {
|
impl<'a> TelemetryItemHandle<'a> {
|
||||||
pub async fn publish(
|
pub async fn publish(&self, value: DataValue, timestamp: DateTime<Utc>) -> anyhow::Result<()> {
|
||||||
&self,
|
self.tlm
|
||||||
value: Value,
|
.send_message(TelemetryEntry {
|
||||||
timestamp: DateTime<chrono::Utc>,
|
uuid: self.uuid,
|
||||||
) -> Result<(), Box<dyn Error>> {
|
value,
|
||||||
let offset_from_unix_epoch =
|
timestamp,
|
||||||
timestamp - DateTime::from_timestamp(0, 0).expect("Could not get Unix epoch");
|
|
||||||
self.tx
|
|
||||||
.send(TelemetryItem {
|
|
||||||
uuid: Some(Uuid {
|
|
||||||
value: self.uuid.clone(),
|
|
||||||
}),
|
|
||||||
value: Some(TelemetryValue { value: Some(value) }),
|
|
||||||
timestamp: Some(Timestamp {
|
|
||||||
secs: offset_from_unix_epoch.num_seconds(),
|
|
||||||
nanos: offset_from_unix_epoch.subsec_nanos(),
|
|
||||||
}),
|
|
||||||
})
|
})
|
||||||
.await?;
|
.await?;
|
||||||
Ok(())
|
Ok(())
|
||||||
@@ -140,164 +266,162 @@ impl TelemetryItemHandle {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
async fn main() -> Result<(), Box<dyn Error>> {
|
async fn main() -> anyhow::Result<()> {
|
||||||
let mut tlm = Telemetry::new("http://[::1]:50051").await?;
|
let tlm = Telemetry::new("ws://[::1]:8080/backend").await?;
|
||||||
|
|
||||||
let index_handle = tlm
|
|
||||||
.register(
|
|
||||||
"simple_producer/time_offset".into(),
|
|
||||||
TelemetryDataType::Float64,
|
|
||||||
)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
let publish_offset = tlm
|
|
||||||
.register(
|
|
||||||
"simple_producer/publish_offset".into(),
|
|
||||||
TelemetryDataType::Float64,
|
|
||||||
)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
let await_offset = tlm
|
|
||||||
.register(
|
|
||||||
"simple_producer/await_offset".into(),
|
|
||||||
TelemetryDataType::Float64,
|
|
||||||
)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
let sin_tlm_handle = tlm
|
|
||||||
.register("simple_producer/sin".into(), TelemetryDataType::Float32)
|
|
||||||
.await?;
|
|
||||||
let cos_tlm_handle = tlm
|
|
||||||
.register("simple_producer/cos".into(), TelemetryDataType::Float64)
|
|
||||||
.await?;
|
|
||||||
let bool_tlm_handle = tlm
|
|
||||||
.register("simple_producer/bool".into(), TelemetryDataType::Boolean)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
let sin2_tlm_handle = tlm
|
|
||||||
.register("simple_producer/sin2".into(), TelemetryDataType::Float32)
|
|
||||||
.await?;
|
|
||||||
let cos2_tlm_handle = tlm
|
|
||||||
.register("simple_producer/cos2".into(), TelemetryDataType::Float64)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
let sin3_tlm_handle = tlm
|
|
||||||
.register("simple_producer/sin3".into(), TelemetryDataType::Float32)
|
|
||||||
.await?;
|
|
||||||
let cos3_tlm_handle = tlm
|
|
||||||
.register("simple_producer/cos3".into(), TelemetryDataType::Float64)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
let sin4_tlm_handle = tlm
|
|
||||||
.register("simple_producer/sin4".into(), TelemetryDataType::Float32)
|
|
||||||
.await?;
|
|
||||||
let cos4_tlm_handle = tlm
|
|
||||||
.register("simple_producer/cos4".into(), TelemetryDataType::Float64)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
let sin5_tlm_handle = tlm
|
|
||||||
.register("simple_producer/sin5".into(), TelemetryDataType::Float32)
|
|
||||||
.await?;
|
|
||||||
let cos5_tlm_handle = tlm
|
|
||||||
.register("simple_producer/cos5".into(), TelemetryDataType::Float64)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
let sin6_tlm_handle = tlm
|
|
||||||
.register("simple_producer/sin6".into(), TelemetryDataType::Float32)
|
|
||||||
.await?;
|
|
||||||
let cos6_tlm_handle = tlm
|
|
||||||
.register("simple_producer/cos6".into(), TelemetryDataType::Float64)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
let cancellation_token = CancellationToken::new();
|
|
||||||
{
|
{
|
||||||
let cancellation_token = cancellation_token.clone();
|
let time_offset = tlm
|
||||||
tokio::spawn(async move {
|
.register("simple_producer/time_offset".into(), DataType::Float64)
|
||||||
let _ = tokio::signal::ctrl_c().await;
|
.await?;
|
||||||
cancellation_token.cancel();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
let start_time = chrono::Utc::now();
|
let publish_offset = tlm
|
||||||
let start_instant = Instant::now();
|
.register("simple_producer/publish_offset".into(), DataType::Float64)
|
||||||
let mut next_time = start_instant;
|
.await?;
|
||||||
let mut index = 0;
|
|
||||||
let mut tasks = vec![];
|
|
||||||
while !cancellation_token.is_cancelled() {
|
|
||||||
next_time += Duration::from_millis(10);
|
|
||||||
index += 1;
|
|
||||||
tokio::time::sleep_until(next_time).await;
|
|
||||||
let publish_time =
|
|
||||||
start_time + chrono::TimeDelta::from_std(next_time - start_instant).unwrap();
|
|
||||||
let actual_time = Instant::now();
|
|
||||||
tasks.push(index_handle.publish(
|
|
||||||
Value::Float64((actual_time - next_time).as_secs_f64()),
|
|
||||||
chrono::Utc::now(),
|
|
||||||
));
|
|
||||||
tasks.push(sin_tlm_handle.publish(
|
|
||||||
Value::Float32((f32::TAU() * (index as f32) / (1000.0_f32)).sin()),
|
|
||||||
publish_time,
|
|
||||||
));
|
|
||||||
tasks.push(cos_tlm_handle.publish(
|
|
||||||
Value::Float64((f64::TAU() * (index as f64) / (1000.0_f64)).cos()),
|
|
||||||
publish_time,
|
|
||||||
));
|
|
||||||
tasks.push(bool_tlm_handle.publish(Value::Boolean(index % 1000 > 500), publish_time));
|
|
||||||
tasks.push(sin2_tlm_handle.publish(
|
|
||||||
Value::Float32((f32::TAU() * (index as f32) / (500.0_f32)).sin()),
|
|
||||||
publish_time,
|
|
||||||
));
|
|
||||||
tasks.push(cos2_tlm_handle.publish(
|
|
||||||
Value::Float64((f64::TAU() * (index as f64) / (500.0_f64)).cos()),
|
|
||||||
publish_time,
|
|
||||||
));
|
|
||||||
tasks.push(sin3_tlm_handle.publish(
|
|
||||||
Value::Float32((f32::TAU() * (index as f32) / (333.0_f32)).sin()),
|
|
||||||
publish_time,
|
|
||||||
));
|
|
||||||
tasks.push(cos3_tlm_handle.publish(
|
|
||||||
Value::Float64((f64::TAU() * (index as f64) / (333.0_f64)).cos()),
|
|
||||||
publish_time,
|
|
||||||
));
|
|
||||||
tasks.push(sin4_tlm_handle.publish(
|
|
||||||
Value::Float32((f32::TAU() * (index as f32) / (250.0_f32)).sin()),
|
|
||||||
publish_time,
|
|
||||||
));
|
|
||||||
tasks.push(cos4_tlm_handle.publish(
|
|
||||||
Value::Float64((f64::TAU() * (index as f64) / (250.0_f64)).cos()),
|
|
||||||
publish_time,
|
|
||||||
));
|
|
||||||
tasks.push(sin5_tlm_handle.publish(
|
|
||||||
Value::Float32((f32::TAU() * (index as f32) / (200.0_f32)).sin()),
|
|
||||||
publish_time,
|
|
||||||
));
|
|
||||||
tasks.push(cos5_tlm_handle.publish(
|
|
||||||
Value::Float64((f64::TAU() * (index as f64) / (200.0_f64)).cos()),
|
|
||||||
publish_time,
|
|
||||||
));
|
|
||||||
tasks.push(sin6_tlm_handle.publish(
|
|
||||||
Value::Float32((f32::TAU() * (index as f32) / (166.0_f32)).sin()),
|
|
||||||
publish_time,
|
|
||||||
));
|
|
||||||
tasks.push(cos6_tlm_handle.publish(
|
|
||||||
Value::Float64((f64::TAU() * (index as f64) / (166.0_f64)).cos()),
|
|
||||||
publish_time,
|
|
||||||
));
|
|
||||||
|
|
||||||
tasks.push(publish_offset.publish(
|
let await_offset = tlm
|
||||||
Value::Float64((Instant::now() - actual_time).as_secs_f64()),
|
.register("simple_producer/await_offset".into(), DataType::Float64)
|
||||||
chrono::Utc::now(),
|
.await?;
|
||||||
));
|
|
||||||
|
|
||||||
for task in tasks.drain(..) {
|
let sin_tlm_handle = tlm
|
||||||
task.await?;
|
.register("simple_producer/sin".into(), DataType::Float32)
|
||||||
|
.await?;
|
||||||
|
let cos_tlm_handle = tlm
|
||||||
|
.register("simple_producer/cos".into(), DataType::Float64)
|
||||||
|
.await?;
|
||||||
|
let bool_tlm_handle = tlm
|
||||||
|
.register("simple_producer/bool".into(), DataType::Boolean)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
let sin2_tlm_handle = tlm
|
||||||
|
.register("simple_producer/sin2".into(), DataType::Float32)
|
||||||
|
.await?;
|
||||||
|
let cos2_tlm_handle = tlm
|
||||||
|
.register("simple_producer/cos2".into(), DataType::Float64)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
let sin3_tlm_handle = tlm
|
||||||
|
.register("simple_producer/sin3".into(), DataType::Float32)
|
||||||
|
.await?;
|
||||||
|
let cos3_tlm_handle = tlm
|
||||||
|
.register("simple_producer/cos3".into(), DataType::Float64)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
let sin4_tlm_handle = tlm
|
||||||
|
.register("simple_producer/sin4".into(), DataType::Float32)
|
||||||
|
.await?;
|
||||||
|
let cos4_tlm_handle = tlm
|
||||||
|
.register("simple_producer/cos4".into(), DataType::Float64)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
let sin5_tlm_handle = tlm
|
||||||
|
.register("simple_producer/sin5".into(), DataType::Float32)
|
||||||
|
.await?;
|
||||||
|
let cos5_tlm_handle = tlm
|
||||||
|
.register("simple_producer/cos5".into(), DataType::Float64)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
let sin6_tlm_handle = tlm
|
||||||
|
.register("simple_producer/sin6".into(), DataType::Float32)
|
||||||
|
.await?;
|
||||||
|
let cos6_tlm_handle = tlm
|
||||||
|
.register("simple_producer/cos6".into(), DataType::Float64)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
let cancellation_token = CancellationToken::new();
|
||||||
|
{
|
||||||
|
let cancellation_token = cancellation_token.clone();
|
||||||
|
tokio::spawn(async move {
|
||||||
|
let _ = tokio::signal::ctrl_c().await;
|
||||||
|
cancellation_token.cancel();
|
||||||
|
println!("Cancellation Token Cancelled");
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.push(await_offset.publish(
|
let start_time = Utc::now();
|
||||||
Value::Float64((Instant::now() - actual_time).as_secs_f64()),
|
let start_instant = Instant::now();
|
||||||
chrono::Utc::now(),
|
let mut next_time = start_instant;
|
||||||
));
|
let mut index = 0;
|
||||||
|
let mut tasks = vec![];
|
||||||
|
while !cancellation_token.is_cancelled() {
|
||||||
|
next_time += Duration::from_millis(10);
|
||||||
|
index += 1;
|
||||||
|
sleep_until(next_time).await;
|
||||||
|
let publish_time = start_time + TimeDelta::from_std(next_time - start_instant).unwrap();
|
||||||
|
let actual_time = Instant::now();
|
||||||
|
tasks.push(time_offset.publish(
|
||||||
|
DataValue::Float64((actual_time - next_time).as_secs_f64()),
|
||||||
|
Utc::now(),
|
||||||
|
));
|
||||||
|
tasks.push(sin_tlm_handle.publish(
|
||||||
|
DataValue::Float32((f32::TAU() * (index as f32) / (1000.0_f32)).sin()),
|
||||||
|
publish_time,
|
||||||
|
));
|
||||||
|
tasks.push(cos_tlm_handle.publish(
|
||||||
|
DataValue::Float64((f64::TAU() * (index as f64) / (1000.0_f64)).cos()),
|
||||||
|
publish_time,
|
||||||
|
));
|
||||||
|
tasks.push(
|
||||||
|
bool_tlm_handle.publish(DataValue::Boolean(index % 1000 > 500), publish_time),
|
||||||
|
);
|
||||||
|
tasks.push(sin2_tlm_handle.publish(
|
||||||
|
DataValue::Float32((f32::TAU() * (index as f32) / (500.0_f32)).sin()),
|
||||||
|
publish_time,
|
||||||
|
));
|
||||||
|
tasks.push(cos2_tlm_handle.publish(
|
||||||
|
DataValue::Float64((f64::TAU() * (index as f64) / (500.0_f64)).cos()),
|
||||||
|
publish_time,
|
||||||
|
));
|
||||||
|
tasks.push(sin3_tlm_handle.publish(
|
||||||
|
DataValue::Float32((f32::TAU() * (index as f32) / (333.0_f32)).sin()),
|
||||||
|
publish_time,
|
||||||
|
));
|
||||||
|
tasks.push(cos3_tlm_handle.publish(
|
||||||
|
DataValue::Float64((f64::TAU() * (index as f64) / (333.0_f64)).cos()),
|
||||||
|
publish_time,
|
||||||
|
));
|
||||||
|
tasks.push(sin4_tlm_handle.publish(
|
||||||
|
DataValue::Float32((f32::TAU() * (index as f32) / (250.0_f32)).sin()),
|
||||||
|
publish_time,
|
||||||
|
));
|
||||||
|
tasks.push(cos4_tlm_handle.publish(
|
||||||
|
DataValue::Float64((f64::TAU() * (index as f64) / (250.0_f64)).cos()),
|
||||||
|
publish_time,
|
||||||
|
));
|
||||||
|
tasks.push(sin5_tlm_handle.publish(
|
||||||
|
DataValue::Float32((f32::TAU() * (index as f32) / (200.0_f32)).sin()),
|
||||||
|
publish_time,
|
||||||
|
));
|
||||||
|
tasks.push(cos5_tlm_handle.publish(
|
||||||
|
DataValue::Float64((f64::TAU() * (index as f64) / (200.0_f64)).cos()),
|
||||||
|
publish_time,
|
||||||
|
));
|
||||||
|
tasks.push(sin6_tlm_handle.publish(
|
||||||
|
DataValue::Float32((f32::TAU() * (index as f32) / (166.0_f32)).sin()),
|
||||||
|
publish_time,
|
||||||
|
));
|
||||||
|
tasks.push(cos6_tlm_handle.publish(
|
||||||
|
DataValue::Float64((f64::TAU() * (index as f64) / (166.0_f64)).cos()),
|
||||||
|
publish_time,
|
||||||
|
));
|
||||||
|
|
||||||
|
tasks.push(publish_offset.publish(
|
||||||
|
DataValue::Float64((Instant::now() - actual_time).as_secs_f64()),
|
||||||
|
Utc::now(),
|
||||||
|
));
|
||||||
|
|
||||||
|
// Join the tasks so they all run in parallel
|
||||||
|
for task in join_all(tasks.drain(..)).await {
|
||||||
|
task?;
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.push(await_offset.publish(
|
||||||
|
DataValue::Float64((Instant::now() - actual_time).as_secs_f64()),
|
||||||
|
Utc::now(),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
println!("Exiting Loop");
|
||||||
}
|
}
|
||||||
|
drop(tlm);
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ derive_more = { version = "2.1.0", features = ["from"] }
|
|||||||
anyhow = "1.0.100"
|
anyhow = "1.0.100"
|
||||||
sqlx = { version = "0.8.6", features = [ "runtime-tokio", "tls-native-tls", "sqlite" ] }
|
sqlx = { version = "0.8.6", features = [ "runtime-tokio", "tls-native-tls", "sqlite" ] }
|
||||||
uuid = { version = "1.19.0", features = ["v4"] }
|
uuid = { version = "1.19.0", features = ["v4"] }
|
||||||
|
api = { path = "../api" }
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
tonic-build = "0.12.3"
|
tonic-build = "0.12.3"
|
||||||
|
|||||||
@@ -26,29 +26,6 @@ message Timestamp {
|
|||||||
sfixed32 nanos = 2;
|
sfixed32 nanos = 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
message TelemetryDefinitionRequest {
|
|
||||||
string name = 1;
|
|
||||||
TelemetryDataType data_type = 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
message TelemetryDefinitionResponse {
|
|
||||||
UUID uuid = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
message TelemetryItem {
|
|
||||||
UUID uuid = 1;
|
|
||||||
TelemetryValue value = 2;
|
|
||||||
Timestamp timestamp = 3;
|
|
||||||
}
|
|
||||||
|
|
||||||
message TelemetryInsertResponse {
|
|
||||||
}
|
|
||||||
|
|
||||||
service TelemetryService {
|
|
||||||
rpc NewTelemetry (TelemetryDefinitionRequest) returns (TelemetryDefinitionResponse);
|
|
||||||
rpc InsertTelemetry (stream TelemetryItem) returns (stream TelemetryInsertResponse);
|
|
||||||
}
|
|
||||||
|
|
||||||
message CommandParameterDefinition {
|
message CommandParameterDefinition {
|
||||||
string name = 1;
|
string name = 1;
|
||||||
TelemetryDataType data_type = 2;
|
TelemetryDataType data_type = 2;
|
||||||
|
|||||||
@@ -135,11 +135,14 @@ impl CommandService for CoreCommandService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (key, sender) in in_progress.drain() {
|
for (key, sender) in in_progress.drain() {
|
||||||
if sender.send(CommandResponse {
|
if sender
|
||||||
uuid: Some(Uuid::from(key)),
|
.send(CommandResponse {
|
||||||
success: false,
|
uuid: Some(Uuid::from(key)),
|
||||||
response: "Command Handler Shut Down".to_string(),
|
success: false,
|
||||||
}).is_err() {
|
response: "Command Handler Shut Down".to_string(),
|
||||||
|
})
|
||||||
|
.is_err()
|
||||||
|
{
|
||||||
error!("Failed to send command response on shutdown");
|
error!("Failed to send command response on shutdown");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,8 @@
|
|||||||
mod cmd;
|
mod cmd;
|
||||||
mod tlm;
|
|
||||||
|
|
||||||
use crate::command::service::CommandManagementService;
|
use crate::command::service::CommandManagementService;
|
||||||
use crate::core::command_service_server::CommandServiceServer;
|
use crate::core::command_service_server::CommandServiceServer;
|
||||||
use crate::core::telemetry_service_server::TelemetryServiceServer;
|
|
||||||
use crate::grpc::cmd::CoreCommandService;
|
use crate::grpc::cmd::CoreCommandService;
|
||||||
use crate::grpc::tlm::CoreTelemetryService;
|
|
||||||
use crate::telemetry::management_service::TelemetryManagementService;
|
|
||||||
use log::{error, info};
|
use log::{error, info};
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use tokio::task::JoinHandle;
|
use tokio::task::JoinHandle;
|
||||||
@@ -15,16 +11,10 @@ use tonic::transport::Server;
|
|||||||
|
|
||||||
pub fn setup(
|
pub fn setup(
|
||||||
token: CancellationToken,
|
token: CancellationToken,
|
||||||
telemetry_management_service: Arc<TelemetryManagementService>,
|
|
||||||
command_service: Arc<CommandManagementService>,
|
command_service: Arc<CommandManagementService>,
|
||||||
) -> anyhow::Result<JoinHandle<()>> {
|
) -> anyhow::Result<JoinHandle<()>> {
|
||||||
let addr = "[::1]:50051".parse()?;
|
let addr = "[::1]:50051".parse()?;
|
||||||
Ok(tokio::spawn(async move {
|
Ok(tokio::spawn(async move {
|
||||||
let tlm_service = CoreTelemetryService {
|
|
||||||
tlm_management: telemetry_management_service,
|
|
||||||
cancellation_token: token.clone(),
|
|
||||||
};
|
|
||||||
|
|
||||||
let cmd_service = CoreCommandService {
|
let cmd_service = CoreCommandService {
|
||||||
command_service,
|
command_service,
|
||||||
cancellation_token: token.clone(),
|
cancellation_token: token.clone(),
|
||||||
@@ -32,7 +22,6 @@ pub fn setup(
|
|||||||
|
|
||||||
info!("Starting gRPC Server");
|
info!("Starting gRPC Server");
|
||||||
let result = Server::builder()
|
let result = Server::builder()
|
||||||
.add_service(TelemetryServiceServer::new(tlm_service))
|
|
||||||
.add_service(CommandServiceServer::new(cmd_service))
|
.add_service(CommandServiceServer::new(cmd_service))
|
||||||
.serve_with_shutdown(addr, token.cancelled_owned())
|
.serve_with_shutdown(addr, token.cancelled_owned())
|
||||||
.await;
|
.await;
|
||||||
|
|||||||
@@ -1,141 +0,0 @@
|
|||||||
use crate::core::telemetry_service_server::TelemetryService;
|
|
||||||
use crate::core::telemetry_value::Value;
|
|
||||||
use crate::core::{
|
|
||||||
TelemetryDataType, TelemetryDefinitionRequest, TelemetryDefinitionResponse,
|
|
||||||
TelemetryInsertResponse, TelemetryItem, TelemetryValue, Uuid,
|
|
||||||
};
|
|
||||||
use crate::telemetry::data_item::TelemetryDataItem;
|
|
||||||
use crate::telemetry::data_value::TelemetryDataValue;
|
|
||||||
use crate::telemetry::history::TelemetryHistory;
|
|
||||||
use crate::telemetry::management_service::TelemetryManagementService;
|
|
||||||
use chrono::{DateTime, SecondsFormat};
|
|
||||||
use log::trace;
|
|
||||||
use std::pin::Pin;
|
|
||||||
use std::sync::Arc;
|
|
||||||
use tokio::select;
|
|
||||||
use tokio::sync::mpsc;
|
|
||||||
use tokio_util::sync::CancellationToken;
|
|
||||||
use tonic::codegen::tokio_stream::wrappers::ReceiverStream;
|
|
||||||
use tonic::codegen::tokio_stream::{Stream, StreamExt};
|
|
||||||
use tonic::{Request, Response, Status, Streaming};
|
|
||||||
|
|
||||||
pub struct CoreTelemetryService {
|
|
||||||
pub tlm_management: Arc<TelemetryManagementService>,
|
|
||||||
pub cancellation_token: CancellationToken,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tonic::async_trait]
|
|
||||||
impl TelemetryService for CoreTelemetryService {
|
|
||||||
async fn new_telemetry(
|
|
||||||
&self,
|
|
||||||
request: Request<TelemetryDefinitionRequest>,
|
|
||||||
) -> Result<Response<TelemetryDefinitionResponse>, Status> {
|
|
||||||
trace!("CoreTelemetryService::new_telemetry");
|
|
||||||
self.tlm_management
|
|
||||||
.register(request.into_inner())
|
|
||||||
.map(|uuid| {
|
|
||||||
Response::new(TelemetryDefinitionResponse {
|
|
||||||
uuid: Some(Uuid { value: uuid }),
|
|
||||||
})
|
|
||||||
})
|
|
||||||
.map_err(|err| Status::already_exists(err.to_string()))
|
|
||||||
}
|
|
||||||
|
|
||||||
type InsertTelemetryStream =
|
|
||||||
Pin<Box<dyn Stream<Item = Result<TelemetryInsertResponse, Status>> + Send>>;
|
|
||||||
|
|
||||||
async fn insert_telemetry(
|
|
||||||
&self,
|
|
||||||
request: Request<Streaming<TelemetryItem>>,
|
|
||||||
) -> Result<Response<Self::InsertTelemetryStream>, Status> {
|
|
||||||
trace!("CoreTelemetryService::insert_telemetry");
|
|
||||||
|
|
||||||
let cancel_token = self.cancellation_token.clone();
|
|
||||||
let tlm_management = self.tlm_management.clone();
|
|
||||||
let mut in_stream = request.into_inner();
|
|
||||||
let (tx, rx) = mpsc::channel(128);
|
|
||||||
|
|
||||||
tokio::spawn(async move {
|
|
||||||
loop {
|
|
||||||
select! {
|
|
||||||
_ = cancel_token.cancelled() => {
|
|
||||||
break;
|
|
||||||
},
|
|
||||||
Some(message) = in_stream.next() => {
|
|
||||||
match message {
|
|
||||||
Ok(tlm_item) => {
|
|
||||||
tx
|
|
||||||
.send(Self::handle_new_tlm_item(&tlm_management, &tlm_item))
|
|
||||||
.await
|
|
||||||
.expect("working rx");
|
|
||||||
}
|
|
||||||
Err(err) => {
|
|
||||||
let _ = tx.send(Err(err)).await;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
else => break,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
Ok(Response::new(Box::pin(ReceiverStream::new(rx))))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl CoreTelemetryService {
|
|
||||||
#[allow(clippy::result_large_err)]
|
|
||||||
fn handle_new_tlm_item(
|
|
||||||
tlm_management: &Arc<TelemetryManagementService>,
|
|
||||||
tlm_item: &TelemetryItem,
|
|
||||||
) -> Result<TelemetryInsertResponse, Status> {
|
|
||||||
trace!("CoreTelemetryService::handle_new_tlm_item {:?}", tlm_item);
|
|
||||||
let Some(ref uuid) = tlm_item.uuid else {
|
|
||||||
return Err(Status::failed_precondition("UUID Missing"));
|
|
||||||
};
|
|
||||||
let tlm_management_pin = tlm_management.pin();
|
|
||||||
let Some(tlm_data) = tlm_management_pin.get_by_uuid(&uuid.value) else {
|
|
||||||
return Err(Status::not_found("Telemetry Item Not Found"));
|
|
||||||
};
|
|
||||||
|
|
||||||
let Some(TelemetryValue { value: Some(value) }) = tlm_item.value else {
|
|
||||||
return Err(Status::failed_precondition("Value Missing"));
|
|
||||||
};
|
|
||||||
|
|
||||||
let Some(timestamp) = tlm_item.timestamp else {
|
|
||||||
return Err(Status::failed_precondition("Timestamp Missing"));
|
|
||||||
};
|
|
||||||
|
|
||||||
let expected_type = match value {
|
|
||||||
Value::Float32(_) => TelemetryDataType::Float32,
|
|
||||||
Value::Float64(_) => TelemetryDataType::Float64,
|
|
||||||
Value::Boolean(_) => TelemetryDataType::Boolean,
|
|
||||||
};
|
|
||||||
if expected_type != tlm_data.data.definition.data_type {
|
|
||||||
return Err(Status::failed_precondition("Data Type Mismatch"));
|
|
||||||
};
|
|
||||||
|
|
||||||
let Some(timestamp) = DateTime::from_timestamp(timestamp.secs, timestamp.nanos as u32)
|
|
||||||
else {
|
|
||||||
return Err(Status::invalid_argument("Failed to construct UTC DateTime"));
|
|
||||||
};
|
|
||||||
|
|
||||||
let value = match value {
|
|
||||||
Value::Float32(x) => TelemetryDataValue::Float32(x),
|
|
||||||
Value::Float64(x) => TelemetryDataValue::Float64(x),
|
|
||||||
Value::Boolean(x) => TelemetryDataValue::Boolean(x),
|
|
||||||
};
|
|
||||||
let _ = tlm_data.data.data.send_replace(Some(TelemetryDataItem {
|
|
||||||
value: value.clone(),
|
|
||||||
timestamp: timestamp.to_rfc3339_opts(SecondsFormat::Millis, true),
|
|
||||||
}));
|
|
||||||
TelemetryHistory::insert_sync(
|
|
||||||
tlm_data.clone(),
|
|
||||||
tlm_management.history_service(),
|
|
||||||
value,
|
|
||||||
timestamp,
|
|
||||||
);
|
|
||||||
|
|
||||||
Ok(TelemetryInsertResponse {})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -7,6 +7,7 @@ use serde::Deserialize;
|
|||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
use tokio::time::timeout;
|
use tokio::time::timeout;
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
#[get("/tlm/info/{name:[\\w\\d/_-]+}")]
|
#[get("/tlm/info/{name:[\\w\\d/_-]+}")]
|
||||||
pub(super) async fn get_tlm_definition(
|
pub(super) async fn get_tlm_definition(
|
||||||
@@ -36,13 +37,17 @@ struct HistoryQuery {
|
|||||||
resolution: i64,
|
resolution: i64,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[get("/tlm/history/{uuid:[0-9a-f]+}")]
|
#[get("/tlm/history/{uuid:[0-9a-f-]+}")]
|
||||||
pub(super) async fn get_tlm_history(
|
pub(super) async fn get_tlm_history(
|
||||||
data_arc: web::Data<Arc<TelemetryManagementService>>,
|
data_arc: web::Data<Arc<TelemetryManagementService>>,
|
||||||
uuid: web::Path<String>,
|
uuid: web::Path<String>,
|
||||||
info: web::Query<HistoryQuery>,
|
info: web::Query<HistoryQuery>,
|
||||||
) -> Result<impl Responder, HttpServerResultError> {
|
) -> Result<impl Responder, HttpServerResultError> {
|
||||||
let uuid = uuid.to_string();
|
let Ok(uuid) = Uuid::parse_str(&uuid) else {
|
||||||
|
return Err(HttpServerResultError::InvalidUuid {
|
||||||
|
uuid: uuid.to_string(),
|
||||||
|
});
|
||||||
|
};
|
||||||
trace!(
|
trace!(
|
||||||
"get_tlm_history {} from {} to {} resolution {}",
|
"get_tlm_history {} from {} to {} resolution {}",
|
||||||
uuid,
|
uuid,
|
||||||
|
|||||||
81
server/src/http/backend/connection.rs
Normal file
81
server/src/http/backend/connection.rs
Normal file
@@ -0,0 +1,81 @@
|
|||||||
|
use crate::telemetry::management_service::TelemetryManagementService;
|
||||||
|
use actix_ws::{AggregatedMessage, ProtocolError, Session};
|
||||||
|
use anyhow::bail;
|
||||||
|
use api::request::{RequestMessage, RequestMessagePayload};
|
||||||
|
use api::response::ResponseMessage;
|
||||||
|
use std::sync::Arc;
|
||||||
|
use tokio::sync::mpsc::{Receiver, Sender};
|
||||||
|
|
||||||
|
pub(super) struct BackendConnection {
|
||||||
|
session: Session,
|
||||||
|
tlm_management: Arc<TelemetryManagementService>,
|
||||||
|
tx: Sender<ResponseMessage>,
|
||||||
|
pub rx: Receiver<ResponseMessage>,
|
||||||
|
pub should_close: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl BackendConnection {
|
||||||
|
pub fn new(session: Session, tlm_management: Arc<TelemetryManagementService>) -> Self {
|
||||||
|
let (tx, rx) = tokio::sync::mpsc::channel::<ResponseMessage>(128);
|
||||||
|
Self {
|
||||||
|
session,
|
||||||
|
tlm_management,
|
||||||
|
tx,
|
||||||
|
rx,
|
||||||
|
should_close: false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn handle_request(&mut self, msg: RequestMessage) -> anyhow::Result<()> {
|
||||||
|
match msg.payload {
|
||||||
|
RequestMessagePayload::TelemetryDefinitionRequest(tlm_def) => {
|
||||||
|
self.tx
|
||||||
|
.send(ResponseMessage {
|
||||||
|
uuid: msg.uuid,
|
||||||
|
payload: self.tlm_management.register(tlm_def)?.into(),
|
||||||
|
})
|
||||||
|
.await?;
|
||||||
|
}
|
||||||
|
RequestMessagePayload::TelemetryEntry(tlm_entry) => {
|
||||||
|
self.tlm_management.add_tlm_item(tlm_entry)?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn handle_request_message(
|
||||||
|
&mut self,
|
||||||
|
msg: Result<AggregatedMessage, ProtocolError>,
|
||||||
|
) -> anyhow::Result<()> {
|
||||||
|
let msg = msg?;
|
||||||
|
match msg {
|
||||||
|
AggregatedMessage::Text(data) => {
|
||||||
|
self.handle_request(serde_json::from_str(&data)?).await?;
|
||||||
|
}
|
||||||
|
AggregatedMessage::Binary(_) => {
|
||||||
|
bail!("Binary Messages Unsupported");
|
||||||
|
}
|
||||||
|
AggregatedMessage::Ping(bytes) => {
|
||||||
|
self.session.pong(&bytes).await?;
|
||||||
|
}
|
||||||
|
AggregatedMessage::Pong(_) => {
|
||||||
|
// Intentionally Ignore
|
||||||
|
}
|
||||||
|
AggregatedMessage::Close(_) => {
|
||||||
|
self.should_close = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn handle_response(&mut self, msg: ResponseMessage) -> anyhow::Result<()> {
|
||||||
|
let msg_json = serde_json::to_string(&msg)?;
|
||||||
|
self.session.text(msg_json).await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn cleanup(mut self) {
|
||||||
|
self.rx.close();
|
||||||
|
let _ = self.session.close(None).await;
|
||||||
|
}
|
||||||
|
}
|
||||||
57
server/src/http/backend/mod.rs
Normal file
57
server/src/http/backend/mod.rs
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
mod connection;
|
||||||
|
|
||||||
|
use crate::http::backend::connection::BackendConnection;
|
||||||
|
use crate::telemetry::management_service::TelemetryManagementService;
|
||||||
|
use actix_web::{rt, web, HttpRequest, HttpResponse};
|
||||||
|
use log::{error, trace};
|
||||||
|
use std::sync::Arc;
|
||||||
|
use tokio::select;
|
||||||
|
use tokio_util::sync::CancellationToken;
|
||||||
|
use tonic::codegen::tokio_stream::StreamExt;
|
||||||
|
|
||||||
|
async fn backend_connect(
|
||||||
|
req: HttpRequest,
|
||||||
|
stream: web::Payload,
|
||||||
|
cancel_token: web::Data<CancellationToken>,
|
||||||
|
telemetry_management_service: web::Data<Arc<TelemetryManagementService>>,
|
||||||
|
) -> Result<HttpResponse, actix_web::Error> {
|
||||||
|
trace!("backend_connect");
|
||||||
|
let (res, session, stream) = actix_ws::handle(&req, stream)?;
|
||||||
|
|
||||||
|
let mut stream = stream
|
||||||
|
.aggregate_continuations()
|
||||||
|
// up to 1 MiB
|
||||||
|
.max_continuation_size(2_usize.pow(20));
|
||||||
|
|
||||||
|
let cancel_token = cancel_token.get_ref().clone();
|
||||||
|
let tlm_management = telemetry_management_service.get_ref().clone();
|
||||||
|
|
||||||
|
rt::spawn(async move {
|
||||||
|
let mut connection = BackendConnection::new(session, tlm_management);
|
||||||
|
while !connection.should_close {
|
||||||
|
let result = select! {
|
||||||
|
_ = cancel_token.cancelled() => {
|
||||||
|
connection.should_close = true;
|
||||||
|
Ok(())
|
||||||
|
},
|
||||||
|
Some(msg) = connection.rx.recv() => connection.handle_response(msg).await,
|
||||||
|
Some(msg) = stream.next() => connection.handle_request_message(msg).await,
|
||||||
|
else => {
|
||||||
|
connection.should_close = true;
|
||||||
|
Ok(())
|
||||||
|
},
|
||||||
|
};
|
||||||
|
if let Err(e) = result {
|
||||||
|
error!("backend socket error: {e}");
|
||||||
|
connection.should_close = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
connection.cleanup().await;
|
||||||
|
});
|
||||||
|
|
||||||
|
Ok(res)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn setup_backend(cfg: &mut web::ServiceConfig) {
|
||||||
|
cfg.route("", web::get().to(backend_connect));
|
||||||
|
}
|
||||||
@@ -3,13 +3,16 @@ use actix_web::http::header::ContentType;
|
|||||||
use actix_web::http::StatusCode;
|
use actix_web::http::StatusCode;
|
||||||
use actix_web::HttpResponse;
|
use actix_web::HttpResponse;
|
||||||
use thiserror::Error;
|
use thiserror::Error;
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
#[derive(Error, Debug)]
|
#[derive(Error, Debug)]
|
||||||
pub enum HttpServerResultError {
|
pub enum HttpServerResultError {
|
||||||
#[error("Telemetry Name Not Found: {tlm}")]
|
#[error("Telemetry Name Not Found: {tlm}")]
|
||||||
TlmNameNotFound { tlm: String },
|
TlmNameNotFound { tlm: String },
|
||||||
|
#[error("Invalid Uuid: {uuid}")]
|
||||||
|
InvalidUuid { uuid: String },
|
||||||
#[error("Telemetry Uuid Not Found: {uuid}")]
|
#[error("Telemetry Uuid Not Found: {uuid}")]
|
||||||
TlmUuidNotFound { uuid: String },
|
TlmUuidNotFound { uuid: Uuid },
|
||||||
#[error("DateTime Parsing Error: {date_time}")]
|
#[error("DateTime Parsing Error: {date_time}")]
|
||||||
InvalidDateTime { date_time: String },
|
InvalidDateTime { date_time: String },
|
||||||
#[error("Timed out")]
|
#[error("Timed out")]
|
||||||
@@ -26,6 +29,7 @@ impl ResponseError for HttpServerResultError {
|
|||||||
fn status_code(&self) -> StatusCode {
|
fn status_code(&self) -> StatusCode {
|
||||||
match self {
|
match self {
|
||||||
HttpServerResultError::TlmNameNotFound { .. } => StatusCode::NOT_FOUND,
|
HttpServerResultError::TlmNameNotFound { .. } => StatusCode::NOT_FOUND,
|
||||||
|
HttpServerResultError::InvalidUuid { .. } => StatusCode::BAD_REQUEST,
|
||||||
HttpServerResultError::TlmUuidNotFound { .. } => StatusCode::NOT_FOUND,
|
HttpServerResultError::TlmUuidNotFound { .. } => StatusCode::NOT_FOUND,
|
||||||
HttpServerResultError::InvalidDateTime { .. } => StatusCode::BAD_REQUEST,
|
HttpServerResultError::InvalidDateTime { .. } => StatusCode::BAD_REQUEST,
|
||||||
HttpServerResultError::Timeout => StatusCode::GATEWAY_TIMEOUT,
|
HttpServerResultError::Timeout => StatusCode::GATEWAY_TIMEOUT,
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
mod api;
|
mod api;
|
||||||
|
mod backend;
|
||||||
mod error;
|
mod error;
|
||||||
mod websocket;
|
mod websocket;
|
||||||
|
|
||||||
use crate::command::service::CommandManagementService;
|
use crate::command::service::CommandManagementService;
|
||||||
use crate::http::api::setup_api;
|
use crate::http::api::setup_api;
|
||||||
|
use crate::http::backend::setup_backend;
|
||||||
use crate::http::websocket::setup_websocket;
|
use crate::http::websocket::setup_websocket;
|
||||||
use crate::panels::PanelService;
|
use crate::panels::PanelService;
|
||||||
use crate::telemetry::management_service::TelemetryManagementService;
|
use crate::telemetry::management_service::TelemetryManagementService;
|
||||||
@@ -31,6 +33,7 @@ pub async fn setup(
|
|||||||
.app_data(cancel_token.clone())
|
.app_data(cancel_token.clone())
|
||||||
.app_data(panel_service.clone())
|
.app_data(panel_service.clone())
|
||||||
.app_data(command_service.clone())
|
.app_data(command_service.clone())
|
||||||
|
.service(web::scope("/backend").configure(setup_backend))
|
||||||
.service(web::scope("/ws").configure(setup_websocket))
|
.service(web::scope("/ws").configure(setup_websocket))
|
||||||
.service(web::scope("/api").configure(setup_api))
|
.service(web::scope("/api").configure(setup_api))
|
||||||
.wrap(Logger::default())
|
.wrap(Logger::default())
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ use tokio::sync::mpsc::Sender;
|
|||||||
use tokio::time::{sleep_until, Instant};
|
use tokio::time::{sleep_until, Instant};
|
||||||
use tokio_util::sync::CancellationToken;
|
use tokio_util::sync::CancellationToken;
|
||||||
use tonic::codegen::tokio_stream::StreamExt;
|
use tonic::codegen::tokio_stream::StreamExt;
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
pub mod request;
|
pub mod request;
|
||||||
pub mod response;
|
pub mod response;
|
||||||
@@ -23,11 +24,11 @@ fn handle_register_tlm_listener(
|
|||||||
data: &Arc<TelemetryManagementService>,
|
data: &Arc<TelemetryManagementService>,
|
||||||
request: RegisterTlmListenerRequest,
|
request: RegisterTlmListenerRequest,
|
||||||
tx: &Sender<WebsocketResponse>,
|
tx: &Sender<WebsocketResponse>,
|
||||||
tlm_listeners: &mut HashMap<String, CancellationToken>,
|
tlm_listeners: &mut HashMap<Uuid, CancellationToken>,
|
||||||
) {
|
) {
|
||||||
if let Some(tlm_data) = data.get_by_uuid(&request.uuid) {
|
if let Some(tlm_data) = data.get_by_uuid(&request.uuid) {
|
||||||
let token = CancellationToken::new();
|
let token = CancellationToken::new();
|
||||||
if let Some(token) = tlm_listeners.insert(tlm_data.definition.uuid.clone(), token.clone()) {
|
if let Some(token) = tlm_listeners.insert(tlm_data.definition.uuid, token.clone()) {
|
||||||
token.cancel();
|
token.cancel();
|
||||||
}
|
}
|
||||||
let minimum_separation = Duration::from_millis(request.minimum_separation_ms as u64);
|
let minimum_separation = Duration::from_millis(request.minimum_separation_ms as u64);
|
||||||
@@ -46,7 +47,7 @@ fn handle_register_tlm_listener(
|
|||||||
ref_val.clone()
|
ref_val.clone()
|
||||||
};
|
};
|
||||||
let _ = tx.send(TlmValueResponse {
|
let _ = tx.send(TlmValueResponse {
|
||||||
uuid: request.uuid.clone(),
|
uuid: request.uuid,
|
||||||
value,
|
value,
|
||||||
}.into()).await;
|
}.into()).await;
|
||||||
now
|
now
|
||||||
@@ -65,7 +66,7 @@ fn handle_register_tlm_listener(
|
|||||||
|
|
||||||
fn handle_unregister_tlm_listener(
|
fn handle_unregister_tlm_listener(
|
||||||
request: UnregisterTlmListenerRequest,
|
request: UnregisterTlmListenerRequest,
|
||||||
tlm_listeners: &mut HashMap<String, CancellationToken>,
|
tlm_listeners: &mut HashMap<Uuid, CancellationToken>,
|
||||||
) {
|
) {
|
||||||
if let Some(token) = tlm_listeners.remove(&request.uuid) {
|
if let Some(token) = tlm_listeners.remove(&request.uuid) {
|
||||||
token.cancel();
|
token.cancel();
|
||||||
@@ -76,7 +77,7 @@ async fn handle_websocket_message(
|
|||||||
data: &Arc<TelemetryManagementService>,
|
data: &Arc<TelemetryManagementService>,
|
||||||
request: WebsocketRequest,
|
request: WebsocketRequest,
|
||||||
tx: &Sender<WebsocketResponse>,
|
tx: &Sender<WebsocketResponse>,
|
||||||
tlm_listeners: &mut HashMap<String, CancellationToken>,
|
tlm_listeners: &mut HashMap<Uuid, CancellationToken>,
|
||||||
) {
|
) {
|
||||||
match request {
|
match request {
|
||||||
WebsocketRequest::RegisterTlmListener(request) => {
|
WebsocketRequest::RegisterTlmListener(request) => {
|
||||||
@@ -110,7 +111,7 @@ async fn handle_websocket_incoming(
|
|||||||
data: &Arc<TelemetryManagementService>,
|
data: &Arc<TelemetryManagementService>,
|
||||||
session: &mut Session,
|
session: &mut Session,
|
||||||
tx: &Sender<WebsocketResponse>,
|
tx: &Sender<WebsocketResponse>,
|
||||||
tlm_listeners: &mut HashMap<String, CancellationToken>,
|
tlm_listeners: &mut HashMap<Uuid, CancellationToken>,
|
||||||
) -> anyhow::Result<bool> {
|
) -> anyhow::Result<bool> {
|
||||||
match msg {
|
match msg {
|
||||||
Ok(AggregatedMessage::Close(_)) => Ok(false),
|
Ok(AggregatedMessage::Close(_)) => Ok(false),
|
||||||
@@ -130,7 +131,7 @@ async fn handle_websocket_incoming(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn websocket_connect(
|
async fn websocket_connect(
|
||||||
req: HttpRequest,
|
req: HttpRequest,
|
||||||
stream: web::Payload,
|
stream: web::Payload,
|
||||||
data: web::Data<Arc<TelemetryManagementService>>,
|
data: web::Data<Arc<TelemetryManagementService>>,
|
||||||
|
|||||||
@@ -1,15 +1,16 @@
|
|||||||
use derive_more::From;
|
use derive_more::From;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
pub struct RegisterTlmListenerRequest {
|
pub struct RegisterTlmListenerRequest {
|
||||||
pub uuid: String,
|
pub uuid: Uuid,
|
||||||
pub minimum_separation_ms: u32,
|
pub minimum_separation_ms: u32,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
pub struct UnregisterTlmListenerRequest {
|
pub struct UnregisterTlmListenerRequest {
|
||||||
pub uuid: String,
|
pub uuid: Uuid,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize, From)]
|
#[derive(Debug, Clone, Serialize, Deserialize, From)]
|
||||||
|
|||||||
@@ -1,10 +1,11 @@
|
|||||||
use crate::telemetry::data_item::TelemetryDataItem;
|
use crate::telemetry::data_item::TelemetryDataItem;
|
||||||
use derive_more::From;
|
use derive_more::From;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
pub struct TlmValueResponse {
|
pub struct TlmValueResponse {
|
||||||
pub uuid: String,
|
pub uuid: Uuid,
|
||||||
pub value: Option<TelemetryDataItem>,
|
pub value: Option<TelemetryDataItem>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ pub async fn setup() -> anyhow::Result<()> {
|
|||||||
|
|
||||||
let cmd = Arc::new(CommandManagementService::new());
|
let cmd = Arc::new(CommandManagementService::new());
|
||||||
|
|
||||||
let grpc_server = grpc::setup(cancellation_token.clone(), tlm.clone(), cmd.clone())?;
|
let grpc_server = grpc::setup(cancellation_token.clone(), cmd.clone())?;
|
||||||
|
|
||||||
let panel_service = PanelService::new(sqlite.clone());
|
let panel_service = PanelService::new(sqlite.clone());
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
use crate::telemetry::data_value::TelemetryDataValue;
|
use api::data_value::DataValue;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
pub struct TelemetryDataItem {
|
pub struct TelemetryDataItem {
|
||||||
pub value: TelemetryDataValue,
|
pub value: DataValue,
|
||||||
pub timestamp: String,
|
pub timestamp: String,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,10 @@
|
|||||||
use crate::core::TelemetryDataType;
|
use api::data_type::DataType;
|
||||||
use crate::telemetry::data_type::tlm_data_type_deserializer;
|
|
||||||
use crate::telemetry::data_type::tlm_data_type_serializer;
|
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
pub struct TelemetryDefinition {
|
pub struct TelemetryDefinition {
|
||||||
pub uuid: String,
|
pub uuid: Uuid,
|
||||||
pub name: String,
|
pub name: String,
|
||||||
#[serde(serialize_with = "tlm_data_type_serializer")]
|
pub data_type: DataType,
|
||||||
#[serde(deserialize_with = "tlm_data_type_deserializer")]
|
|
||||||
pub data_type: TelemetryDataType,
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
use crate::core::TelemetryDataType;
|
|
||||||
use crate::serialization::file_ext::{ReadExt, WriteExt};
|
use crate::serialization::file_ext::{ReadExt, WriteExt};
|
||||||
use crate::telemetry::data::TelemetryData;
|
use crate::telemetry::data::TelemetryData;
|
||||||
use crate::telemetry::data_item::TelemetryDataItem;
|
use crate::telemetry::data_item::TelemetryDataItem;
|
||||||
use crate::telemetry::data_value::TelemetryDataValue;
|
|
||||||
use crate::telemetry::definition::TelemetryDefinition;
|
use crate::telemetry::definition::TelemetryDefinition;
|
||||||
use anyhow::{anyhow, ensure, Context};
|
use anyhow::{anyhow, ensure, Context};
|
||||||
|
use api::data_type::DataType;
|
||||||
|
use api::data_value::DataValue;
|
||||||
use chrono::{DateTime, DurationRound, SecondsFormat, TimeDelta, Utc};
|
use chrono::{DateTime, DurationRound, SecondsFormat, TimeDelta, Utc};
|
||||||
use log::{error, info};
|
use log::{error, info};
|
||||||
use std::cmp::min;
|
use std::cmp::min;
|
||||||
@@ -44,7 +44,7 @@ fn update_next_from(
|
|||||||
}
|
}
|
||||||
|
|
||||||
struct SegmentData {
|
struct SegmentData {
|
||||||
values: Vec<TelemetryDataValue>,
|
values: Vec<DataValue>,
|
||||||
timestamps: Vec<DateTime<Utc>>,
|
timestamps: Vec<DateTime<Utc>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -66,7 +66,7 @@ impl HistorySegmentRam {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn insert(&self, value: TelemetryDataValue, timestamp: DateTime<Utc>) {
|
fn insert(&self, value: DataValue, timestamp: DateTime<Utc>) {
|
||||||
if timestamp < self.start || timestamp >= self.end {
|
if timestamp < self.start || timestamp >= self.end {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -121,7 +121,7 @@ impl HistorySegmentRam {
|
|||||||
next_from,
|
next_from,
|
||||||
);
|
);
|
||||||
result.push(TelemetryDataItem {
|
result.push(TelemetryDataItem {
|
||||||
value: data.values[i].clone(),
|
value: data.values[i],
|
||||||
timestamp: t.to_rfc3339_opts(SecondsFormat::Millis, true),
|
timestamp: t.to_rfc3339_opts(SecondsFormat::Millis, true),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -196,9 +196,9 @@ impl HistorySegmentFile {
|
|||||||
// Write all the values
|
// Write all the values
|
||||||
for value in &data.values {
|
for value in &data.values {
|
||||||
match value {
|
match value {
|
||||||
TelemetryDataValue::Float32(value) => file.write_data::<f32>(*value)?,
|
DataValue::Float32(value) => file.write_data::<f32>(*value)?,
|
||||||
TelemetryDataValue::Float64(value) => file.write_data::<f64>(*value)?,
|
DataValue::Float64(value) => file.write_data::<f64>(*value)?,
|
||||||
TelemetryDataValue::Boolean(value) => file.write_data::<bool>(*value)?,
|
DataValue::Boolean(value) => file.write_data::<bool>(*value)?,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -215,10 +215,7 @@ impl HistorySegmentFile {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
fn load_to_ram(
|
fn load_to_ram(mut self, telemetry_data_type: DataType) -> anyhow::Result<HistorySegmentRam> {
|
||||||
mut self,
|
|
||||||
telemetry_data_type: TelemetryDataType,
|
|
||||||
) -> anyhow::Result<HistorySegmentRam> {
|
|
||||||
let mut segment_data = SegmentData {
|
let mut segment_data = SegmentData {
|
||||||
values: Vec::with_capacity(self.length as usize),
|
values: Vec::with_capacity(self.length as usize),
|
||||||
timestamps: Vec::with_capacity(self.length as usize),
|
timestamps: Vec::with_capacity(self.length as usize),
|
||||||
@@ -281,7 +278,7 @@ impl HistorySegmentFile {
|
|||||||
from: DateTime<Utc>,
|
from: DateTime<Utc>,
|
||||||
to: DateTime<Utc>,
|
to: DateTime<Utc>,
|
||||||
maximum_resolution: TimeDelta,
|
maximum_resolution: TimeDelta,
|
||||||
telemetry_data_type: TelemetryDataType,
|
telemetry_data_type: DataType,
|
||||||
) -> anyhow::Result<(DateTime<Utc>, Vec<TelemetryDataItem>)> {
|
) -> anyhow::Result<(DateTime<Utc>, Vec<TelemetryDataItem>)> {
|
||||||
self.file_position = 0;
|
self.file_position = 0;
|
||||||
self.file.seek(SeekFrom::Start(0))?;
|
self.file.seek(SeekFrom::Start(0))?;
|
||||||
@@ -334,22 +331,19 @@ impl HistorySegmentFile {
|
|||||||
self.read_date_time()
|
self.read_date_time()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn read_telemetry_item(
|
fn read_telemetry_item(&mut self, telemetry_data_type: DataType) -> anyhow::Result<DataValue> {
|
||||||
&mut self,
|
|
||||||
telemetry_data_type: TelemetryDataType,
|
|
||||||
) -> anyhow::Result<TelemetryDataValue> {
|
|
||||||
match telemetry_data_type {
|
match telemetry_data_type {
|
||||||
TelemetryDataType::Float32 => {
|
DataType::Float32 => {
|
||||||
self.file_position += 4;
|
self.file_position += 4;
|
||||||
Ok(TelemetryDataValue::Float32(self.file.read_data::<f32>()?))
|
Ok(DataValue::Float32(self.file.read_data::<f32>()?))
|
||||||
}
|
}
|
||||||
TelemetryDataType::Float64 => {
|
DataType::Float64 => {
|
||||||
self.file_position += 8;
|
self.file_position += 8;
|
||||||
Ok(TelemetryDataValue::Float64(self.file.read_data::<f64>()?))
|
Ok(DataValue::Float64(self.file.read_data::<f64>()?))
|
||||||
}
|
}
|
||||||
TelemetryDataType::Boolean => {
|
DataType::Boolean => {
|
||||||
self.file_position += 1;
|
self.file_position += 1;
|
||||||
Ok(TelemetryDataValue::Boolean(self.file.read_data::<bool>()?))
|
Ok(DataValue::Boolean(self.file.read_data::<bool>()?))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -357,12 +351,12 @@ impl HistorySegmentFile {
|
|||||||
fn get_telemetry_item(
|
fn get_telemetry_item(
|
||||||
&mut self,
|
&mut self,
|
||||||
index: u64,
|
index: u64,
|
||||||
telemetry_data_type: TelemetryDataType,
|
telemetry_data_type: DataType,
|
||||||
) -> anyhow::Result<TelemetryDataValue> {
|
) -> anyhow::Result<DataValue> {
|
||||||
let item_length = match telemetry_data_type {
|
let item_length = match telemetry_data_type {
|
||||||
TelemetryDataType::Float32 => 4,
|
DataType::Float32 => 4,
|
||||||
TelemetryDataType::Float64 => 8,
|
DataType::Float64 => 8,
|
||||||
TelemetryDataType::Boolean => 1,
|
DataType::Boolean => 1,
|
||||||
};
|
};
|
||||||
let desired_position =
|
let desired_position =
|
||||||
Self::HEADER_LENGTH + self.length * Self::TIMESTAMP_LENGTH + index * item_length;
|
Self::HEADER_LENGTH + self.length * Self::TIMESTAMP_LENGTH + index * item_length;
|
||||||
@@ -429,7 +423,7 @@ impl TelemetryHistory {
|
|||||||
history_segment_ram: HistorySegmentRam,
|
history_segment_ram: HistorySegmentRam,
|
||||||
) -> JoinHandle<()> {
|
) -> JoinHandle<()> {
|
||||||
let mut path = service.data_root_folder.clone();
|
let mut path = service.data_root_folder.clone();
|
||||||
path.push(&self.data.definition.uuid);
|
path.push(self.data.definition.uuid.as_hyphenated().to_string());
|
||||||
spawn_blocking(move || {
|
spawn_blocking(move || {
|
||||||
match HistorySegmentFile::save_to_disk(path, history_segment_ram) {
|
match HistorySegmentFile::save_to_disk(path, history_segment_ram) {
|
||||||
// Immediately drop the segment - now that we've saved it to disk we don't need to keep it in memory
|
// Immediately drop the segment - now that we've saved it to disk we don't need to keep it in memory
|
||||||
@@ -450,7 +444,7 @@ impl TelemetryHistory {
|
|||||||
start: DateTime<Utc>,
|
start: DateTime<Utc>,
|
||||||
) -> JoinHandle<anyhow::Result<HistorySegmentFile>> {
|
) -> JoinHandle<anyhow::Result<HistorySegmentFile>> {
|
||||||
let mut path = service.data_root_folder.clone();
|
let mut path = service.data_root_folder.clone();
|
||||||
path.push(&self.data.definition.uuid);
|
path.push(self.data.definition.uuid.as_hyphenated().to_string());
|
||||||
spawn_blocking(move || HistorySegmentFile::open(path, start))
|
spawn_blocking(move || HistorySegmentFile::open(path, start))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -458,7 +452,7 @@ impl TelemetryHistory {
|
|||||||
&self,
|
&self,
|
||||||
start: DateTime<Utc>,
|
start: DateTime<Utc>,
|
||||||
service: &TelemetryHistoryService,
|
service: &TelemetryHistoryService,
|
||||||
telemetry_data_type: TelemetryDataType,
|
telemetry_data_type: DataType,
|
||||||
) -> HistorySegmentRam {
|
) -> HistorySegmentRam {
|
||||||
let ram = self
|
let ram = self
|
||||||
.get_disk_segment(service, start)
|
.get_disk_segment(service, start)
|
||||||
@@ -480,7 +474,7 @@ impl TelemetryHistory {
|
|||||||
pub async fn insert(
|
pub async fn insert(
|
||||||
&self,
|
&self,
|
||||||
service: &TelemetryHistoryService,
|
service: &TelemetryHistoryService,
|
||||||
value: TelemetryDataValue,
|
value: DataValue,
|
||||||
timestamp: DateTime<Utc>,
|
timestamp: DateTime<Utc>,
|
||||||
) {
|
) {
|
||||||
let segments = self.segments.read().await;
|
let segments = self.segments.read().await;
|
||||||
@@ -531,7 +525,7 @@ impl TelemetryHistory {
|
|||||||
pub fn insert_sync(
|
pub fn insert_sync(
|
||||||
history: Arc<Self>,
|
history: Arc<Self>,
|
||||||
service: Arc<TelemetryHistoryService>,
|
service: Arc<TelemetryHistoryService>,
|
||||||
value: TelemetryDataValue,
|
value: DataValue,
|
||||||
timestamp: DateTime<Utc>,
|
timestamp: DateTime<Utc>,
|
||||||
) {
|
) {
|
||||||
tokio::spawn(async move {
|
tokio::spawn(async move {
|
||||||
@@ -579,7 +573,7 @@ impl TelemetryHistory {
|
|||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
let mut path = telemetry_history_service.data_root_folder.clone();
|
let mut path = telemetry_history_service.data_root_folder.clone();
|
||||||
path.push(&self.data.definition.uuid);
|
path.push(self.data.definition.uuid.as_hyphenated().to_string());
|
||||||
|
|
||||||
let mut start = start;
|
let mut start = start;
|
||||||
while start < end {
|
while start < end {
|
||||||
|
|||||||
@@ -1,7 +1,13 @@
|
|||||||
use crate::core::{TelemetryDefinitionRequest, Uuid};
|
|
||||||
use crate::telemetry::data::TelemetryData;
|
use crate::telemetry::data::TelemetryData;
|
||||||
|
use crate::telemetry::data_item::TelemetryDataItem;
|
||||||
use crate::telemetry::definition::TelemetryDefinition;
|
use crate::telemetry::definition::TelemetryDefinition;
|
||||||
use crate::telemetry::history::{TelemetryHistory, TelemetryHistoryService};
|
use crate::telemetry::history::{TelemetryHistory, TelemetryHistoryService};
|
||||||
|
use anyhow::bail;
|
||||||
|
use api::data_type::DataType;
|
||||||
|
use api::data_value::DataValue;
|
||||||
|
use api::request::{TelemetryDefinitionRequest, TelemetryEntry};
|
||||||
|
use api::response::TelemetryDefinitionResponse;
|
||||||
|
use chrono::SecondsFormat;
|
||||||
use log::{error, info, warn};
|
use log::{error, info, warn};
|
||||||
use papaya::{HashMap, HashMapRef, LocalGuard};
|
use papaya::{HashMap, HashMapRef, LocalGuard};
|
||||||
use std::fs;
|
use std::fs;
|
||||||
@@ -12,12 +18,13 @@ use std::sync::Arc;
|
|||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
use tokio::sync::Mutex;
|
use tokio::sync::Mutex;
|
||||||
use tokio::time::sleep;
|
use tokio::time::sleep;
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
const RELEASED_ATTEMPTS: usize = 5;
|
const RELEASED_ATTEMPTS: usize = 5;
|
||||||
|
|
||||||
pub struct TelemetryManagementService {
|
pub struct TelemetryManagementService {
|
||||||
uuid_index: HashMap<String, String>,
|
uuid_index: HashMap<String, Uuid>,
|
||||||
tlm_data: HashMap<String, Arc<TelemetryHistory>>,
|
tlm_data: HashMap<Uuid, Arc<TelemetryHistory>>,
|
||||||
telemetry_history_service: Arc<TelemetryHistoryService>,
|
telemetry_history_service: Arc<TelemetryHistoryService>,
|
||||||
metadata_file: Arc<Mutex<File>>,
|
metadata_file: Arc<Mutex<File>>,
|
||||||
}
|
}
|
||||||
@@ -49,8 +56,8 @@ impl TelemetryManagementService {
|
|||||||
// Skip invalid entries
|
// Skip invalid entries
|
||||||
match serde_json::from_str::<TelemetryDefinition>(line) {
|
match serde_json::from_str::<TelemetryDefinition>(line) {
|
||||||
Ok(tlm_def) => {
|
Ok(tlm_def) => {
|
||||||
let _ = uuid_index.insert(tlm_def.name.clone(), tlm_def.uuid.clone());
|
let _ = uuid_index.insert(tlm_def.name.clone(), tlm_def.uuid);
|
||||||
let _ = tlm_data.insert(tlm_def.uuid.clone(), Arc::new(tlm_def.into()));
|
let _ = tlm_data.insert(tlm_def.uuid, Arc::new(tlm_def.into()));
|
||||||
}
|
}
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
error!("Failed to parse metadata entry {err}");
|
error!("Failed to parse metadata entry {err}");
|
||||||
@@ -79,23 +86,20 @@ impl TelemetryManagementService {
|
|||||||
pub fn register(
|
pub fn register(
|
||||||
&self,
|
&self,
|
||||||
telemetry_definition_request: TelemetryDefinitionRequest,
|
telemetry_definition_request: TelemetryDefinitionRequest,
|
||||||
) -> anyhow::Result<String> {
|
) -> anyhow::Result<TelemetryDefinitionResponse> {
|
||||||
let uuid_index = self.uuid_index.pin();
|
let uuid_index = self.uuid_index.pin();
|
||||||
let tlm_data = self.tlm_data.pin();
|
let tlm_data = self.tlm_data.pin();
|
||||||
|
|
||||||
let uuid = uuid_index
|
let uuid =
|
||||||
.get_or_insert_with(telemetry_definition_request.name.clone(), || {
|
*uuid_index.get_or_insert_with(telemetry_definition_request.name.clone(), Uuid::new_v4);
|
||||||
Uuid::random().value
|
|
||||||
})
|
|
||||||
.clone();
|
|
||||||
|
|
||||||
let inserted = tlm_data.try_insert(
|
let inserted = tlm_data.try_insert(
|
||||||
uuid.clone(),
|
uuid,
|
||||||
Arc::new(
|
Arc::new(
|
||||||
TelemetryDefinition {
|
TelemetryDefinition {
|
||||||
uuid: uuid.clone(),
|
uuid,
|
||||||
name: telemetry_definition_request.name.clone(),
|
name: telemetry_definition_request.name.clone(),
|
||||||
data_type: telemetry_definition_request.data_type(),
|
data_type: telemetry_definition_request.data_type,
|
||||||
}
|
}
|
||||||
.into(),
|
.into(),
|
||||||
),
|
),
|
||||||
@@ -129,7 +133,38 @@ impl TelemetryManagementService {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(uuid)
|
Ok(TelemetryDefinitionResponse { uuid })
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn add_tlm_item(&self, tlm_item: TelemetryEntry) -> anyhow::Result<()> {
|
||||||
|
let tlm_management_pin = self.pin();
|
||||||
|
let Some(tlm_data) = tlm_management_pin.get_by_uuid(&tlm_item.uuid) else {
|
||||||
|
bail!("Telemetry Item Not Found");
|
||||||
|
};
|
||||||
|
|
||||||
|
let expected_type = match &tlm_item.value {
|
||||||
|
DataValue::Float32(_) => DataType::Float32,
|
||||||
|
DataValue::Float64(_) => DataType::Float64,
|
||||||
|
DataValue::Boolean(_) => DataType::Boolean,
|
||||||
|
};
|
||||||
|
if expected_type != tlm_data.data.definition.data_type {
|
||||||
|
bail!("Data Type Mismatch");
|
||||||
|
};
|
||||||
|
|
||||||
|
let _ = tlm_data.data.data.send_replace(Some(TelemetryDataItem {
|
||||||
|
value: tlm_item.value,
|
||||||
|
timestamp: tlm_item
|
||||||
|
.timestamp
|
||||||
|
.to_rfc3339_opts(SecondsFormat::Millis, true),
|
||||||
|
}));
|
||||||
|
TelemetryHistory::insert_sync(
|
||||||
|
tlm_data.clone(),
|
||||||
|
self.history_service(),
|
||||||
|
tlm_item.value,
|
||||||
|
tlm_item.timestamp,
|
||||||
|
);
|
||||||
|
|
||||||
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_by_name(&self, name: &String) -> Option<TelemetryData> {
|
pub fn get_by_name(&self, name: &String) -> Option<TelemetryData> {
|
||||||
@@ -138,7 +173,7 @@ impl TelemetryManagementService {
|
|||||||
self.get_by_uuid(uuid)
|
self.get_by_uuid(uuid)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_by_uuid(&self, uuid: &String) -> Option<TelemetryData> {
|
pub fn get_by_uuid(&self, uuid: &Uuid) -> Option<TelemetryData> {
|
||||||
let tlm_data = self.tlm_data.pin();
|
let tlm_data = self.tlm_data.pin();
|
||||||
tlm_data
|
tlm_data
|
||||||
.get(uuid)
|
.get(uuid)
|
||||||
@@ -200,11 +235,11 @@ impl TelemetryManagementService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub struct TelemetryManagementServicePin<'a> {
|
pub struct TelemetryManagementServicePin<'a> {
|
||||||
tlm_data: HashMapRef<'a, String, Arc<TelemetryHistory>, RandomState, LocalGuard<'a>>,
|
tlm_data: HashMapRef<'a, Uuid, Arc<TelemetryHistory>, RandomState, LocalGuard<'a>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a> TelemetryManagementServicePin<'a> {
|
impl<'a> TelemetryManagementServicePin<'a> {
|
||||||
pub fn get_by_uuid(&'a self, uuid: &String) -> Option<&'a Arc<TelemetryHistory>> {
|
pub fn get_by_uuid(&'a self, uuid: &Uuid) -> Option<&'a Arc<TelemetryHistory>> {
|
||||||
self.tlm_data.get(uuid)
|
self.tlm_data.get(uuid)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
pub mod data;
|
pub mod data;
|
||||||
pub mod data_item;
|
pub mod data_item;
|
||||||
pub mod data_type;
|
pub mod data_type;
|
||||||
pub mod data_value;
|
|
||||||
pub mod definition;
|
pub mod definition;
|
||||||
pub mod history;
|
pub mod history;
|
||||||
pub mod management_service;
|
pub mod management_service;
|
||||||
|
|||||||
Reference in New Issue
Block a user