cleanup and refactor

This commit is contained in:
Timur Gordon
2025-11-13 14:41:30 +01:00
parent 4b516d9d7e
commit 2625534152
29 changed files with 2662 additions and 3276 deletions

210
ui/Cargo.lock generated
View File

@@ -103,6 +103,12 @@ version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c"
[[package]]
name = "arc-swap"
version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
[[package]]
name = "async-trait"
version = "0.1.89"
@@ -426,6 +432,7 @@ checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
dependencies = [
"futures-channel",
"futures-core",
"futures-executor",
"futures-io",
"futures-sink",
"futures-task",
@@ -448,6 +455,17 @@ version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
[[package]]
name = "futures-executor"
version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
dependencies = [
"futures-core",
"futures-task",
"futures-util",
]
[[package]]
name = "futures-io"
version = "0.3.31"
@@ -1029,14 +1047,42 @@ dependencies = [
"hyper-util",
"jsonrpsee",
"log",
"osiris-client",
"redis",
"serde",
"serde_json",
"thiserror",
"tokio",
"toml",
"tower",
"tower-http",
"tower 0.4.13",
"tower-http 0.5.2",
"uuid",
]
[[package]]
name = "hero-supervisor"
version = "0.1.0"
source = "git+https://git.ourworld.tf/herocode/supervisor.git#4b516d9d7e38167d7c72feb070c325cd8136752a"
dependencies = [
"anyhow",
"async-trait",
"chrono",
"clap",
"env_logger 0.10.2",
"hero-job",
"hero-job-client",
"hyper",
"hyper-util",
"jsonrpsee",
"log",
"redis",
"serde",
"serde_json",
"thiserror",
"tokio",
"toml",
"tower 0.4.13",
"tower-http 0.5.2",
"uuid",
]
@@ -1050,7 +1096,37 @@ dependencies = [
"getrandom 0.2.16",
"hero-job",
"hero-job-client",
"hero-supervisor",
"hero-supervisor 0.1.0",
"hex",
"indexmap",
"js-sys",
"jsonrpsee",
"log",
"secp256k1 0.29.1",
"serde",
"serde-wasm-bindgen 0.6.5",
"serde_json",
"sha2",
"thiserror",
"tokio",
"uuid",
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
]
[[package]]
name = "hero-supervisor-openrpc-client"
version = "0.1.0"
source = "git+https://git.ourworld.tf/herocode/supervisor.git#4b516d9d7e38167d7c72feb070c325cd8136752a"
dependencies = [
"chrono",
"console_log",
"env_logger 0.11.8",
"getrandom 0.2.16",
"hero-job",
"hero-job-client",
"hero-supervisor 0.1.0 (git+https://git.ourworld.tf/herocode/supervisor.git)",
"hex",
"indexmap",
"js-sys",
@@ -1184,6 +1260,7 @@ version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d9b05277c7e8da2c93a568989bb6207bef0112e8d17df7a6eda4a3cf143bc5e"
dependencies = [
"base64",
"bytes",
"futures-channel",
"futures-core",
@@ -1191,7 +1268,9 @@ dependencies = [
"http 1.3.1",
"http-body",
"hyper",
"ipnet",
"libc",
"percent-encoding",
"pin-project-lite",
"socket2 0.6.0",
"tokio",
@@ -1371,6 +1450,22 @@ dependencies = [
"libc",
]
[[package]]
name = "ipnet"
version = "2.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
[[package]]
name = "iri-string"
version = "0.7.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4f867b9d1d896b67beb18518eda36fdb77a32ea590de864f1325b294a6d14397"
dependencies = [
"memchr",
"serde",
]
[[package]]
name = "is-terminal"
version = "0.4.16"
@@ -1508,7 +1603,7 @@ dependencies = [
"serde_json",
"thiserror",
"tokio",
"tower",
"tower 0.4.13",
"tracing",
"url",
]
@@ -1549,7 +1644,7 @@ dependencies = [
"tokio",
"tokio-stream",
"tokio-util",
"tower",
"tower 0.4.13",
"tracing",
]
@@ -1665,6 +1760,21 @@ version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
[[package]]
name = "osiris-client"
version = "0.1.0"
dependencies = [
"anyhow",
"chrono",
"getrandom 0.2.16",
"hero-supervisor-openrpc-client 0.1.0 (git+https://git.ourworld.tf/herocode/supervisor.git)",
"reqwest",
"serde",
"serde_json",
"thiserror",
"uuid",
]
[[package]]
name = "parking_lot"
version = "0.12.4"
@@ -1900,9 +2010,11 @@ version = "0.25.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e0d7a6955c7511f60f3ba9e86c6d02b3c3f144f8c24b288d1f4e18074ab8bbec"
dependencies = [
"arc-swap",
"async-trait",
"bytes",
"combine",
"futures",
"futures-util",
"itoa",
"percent-encoding",
@@ -1911,6 +2023,7 @@ dependencies = [
"sha1_smol",
"socket2 0.5.10",
"tokio",
"tokio-retry",
"tokio-util",
"url",
]
@@ -1953,6 +2066,38 @@ version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
[[package]]
name = "reqwest"
version = "0.12.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f"
dependencies = [
"base64",
"bytes",
"futures-core",
"http 1.3.1",
"http-body",
"http-body-util",
"hyper",
"hyper-util",
"js-sys",
"log",
"percent-encoding",
"pin-project-lite",
"serde",
"serde_json",
"serde_urlencoded",
"sync_wrapper",
"tokio",
"tower 0.5.2",
"tower-http 0.6.6",
"tower-service",
"url",
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
]
[[package]]
name = "ring"
version = "0.17.14"
@@ -2345,7 +2490,7 @@ version = "0.1.0"
dependencies = [
"chrono",
"gloo 0.11.0",
"hero-supervisor-openrpc-client",
"hero-supervisor-openrpc-client 0.1.0",
"js-sys",
"log",
"serde",
@@ -2380,6 +2525,15 @@ dependencies = [
"unicode-ident",
]
[[package]]
name = "sync_wrapper"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
dependencies = [
"futures-core",
]
[[package]]
name = "synstructure"
version = "0.13.2"
@@ -2461,6 +2615,17 @@ dependencies = [
"syn 2.0.106",
]
[[package]]
name = "tokio-retry"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f"
dependencies = [
"pin-project",
"rand",
"tokio",
]
[[package]]
name = "tokio-rustls"
version = "0.26.2"
@@ -2564,6 +2729,21 @@ dependencies = [
"tracing",
]
[[package]]
name = "tower"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
dependencies = [
"futures-core",
"futures-util",
"pin-project-lite",
"sync_wrapper",
"tokio",
"tower-layer",
"tower-service",
]
[[package]]
name = "tower-http"
version = "0.5.2"
@@ -2580,6 +2760,24 @@ dependencies = [
"tower-service",
]
[[package]]
name = "tower-http"
version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
dependencies = [
"bitflags",
"bytes",
"futures-util",
"http 1.3.1",
"http-body",
"iri-string",
"pin-project-lite",
"tower 0.5.2",
"tower-layer",
"tower-service",
]
[[package]]
name = "tower-layer"
version = "0.3.3"