diff --git a/apps/backend/Cargo.lock b/apps/backend/Cargo.lock index b492d78..49b3224 100644 --- a/apps/backend/Cargo.lock +++ b/apps/backend/Cargo.lock @@ -1421,7 +1421,7 @@ dependencies = [ [[package]] name = "mtp" version = "0.3.0" -source = "git+https://git.methanium.net/methanium/mtp.git?rev=188caf56cc994910bd05ea437ee45bd45d3e3027#188caf56cc994910bd05ea437ee45bd45d3e3027" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=e939714557ce82e2cdaf7fdb93b4f949551ab6d1#e939714557ce82e2cdaf7fdb93b4f949551ab6d1" dependencies = [ "mtp-client", "mtp-codec", @@ -1436,7 +1436,7 @@ dependencies = [ [[package]] name = "mtp-client" version = "0.3.0" -source = "git+https://git.methanium.net/methanium/mtp.git?rev=188caf56cc994910bd05ea437ee45bd45d3e3027#188caf56cc994910bd05ea437ee45bd45d3e3027" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=e939714557ce82e2cdaf7fdb93b4f949551ab6d1#e939714557ce82e2cdaf7fdb93b4f949551ab6d1" dependencies = [ "mtp-codec", "mtp-common", @@ -1449,7 +1449,7 @@ dependencies = [ [[package]] name = "mtp-codec" version = "0.3.0" -source = "git+https://git.methanium.net/methanium/mtp.git?rev=188caf56cc994910bd05ea437ee45bd45d3e3027#188caf56cc994910bd05ea437ee45bd45d3e3027" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=e939714557ce82e2cdaf7fdb93b4f949551ab6d1#e939714557ce82e2cdaf7fdb93b4f949551ab6d1" dependencies = [ "base64 0.23.1", "byteorder", @@ -1463,7 +1463,7 @@ dependencies = [ [[package]] name = "mtp-common" version = "0.3.0" -source = "git+https://git.methanium.net/methanium/mtp.git?rev=188caf56cc994910bd05ea437ee45bd45d3e3027#188caf56cc994910bd05ea437ee45bd45d3e3027" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=e939714557ce82e2cdaf7fdb93b4f949551ab6d1#e939714557ce82e2cdaf7fdb93b4f949551ab6d1" dependencies = [ "quinn", "rustls", @@ -1474,7 +1474,7 @@ dependencies = [ [[package]] name = "mtp-crypto" version = "0.3.0" -source = "git+https://git.methanium.net/methanium/mtp.git?rev=188caf56cc994910bd05ea437ee45bd45d3e3027#188caf56cc994910bd05ea437ee45bd45d3e3027" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=e939714557ce82e2cdaf7fdb93b4f949551ab6d1#e939714557ce82e2cdaf7fdb93b4f949551ab6d1" dependencies = [ "base64 0.22.1", "chacha20poly1305", @@ -1496,7 +1496,7 @@ dependencies = [ [[package]] name = "mtp-host" version = "0.3.0" -source = "git+https://git.methanium.net/methanium/mtp.git?rev=188caf56cc994910bd05ea437ee45bd45d3e3027#188caf56cc994910bd05ea437ee45bd45d3e3027" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=e939714557ce82e2cdaf7fdb93b4f949551ab6d1#e939714557ce82e2cdaf7fdb93b4f949551ab6d1" dependencies = [ "mtp-codec", "mtp-common", @@ -1511,7 +1511,7 @@ dependencies = [ [[package]] name = "mtp-transport" version = "0.3.0" -source = "git+https://git.methanium.net/methanium/mtp.git?rev=188caf56cc994910bd05ea437ee45bd45d3e3027#188caf56cc994910bd05ea437ee45bd45d3e3027" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=e939714557ce82e2cdaf7fdb93b4f949551ab6d1#e939714557ce82e2cdaf7fdb93b4f949551ab6d1" dependencies = [ "async-trait", "mtp-codec", @@ -1531,7 +1531,7 @@ dependencies = [ [[package]] name = "mtp-type-map" version = "0.3.0" -source = "git+https://git.methanium.net/methanium/mtp.git?rev=188caf56cc994910bd05ea437ee45bd45d3e3027#188caf56cc994910bd05ea437ee45bd45d3e3027" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=e939714557ce82e2cdaf7fdb93b4f949551ab6d1#e939714557ce82e2cdaf7fdb93b4f949551ab6d1" dependencies = [ "serde", "serde_yaml", @@ -1540,7 +1540,7 @@ dependencies = [ [[package]] name = "mtp-webserver" version = "0.3.0" -source = "git+https://git.methanium.net/methanium/mtp.git?rev=188caf56cc994910bd05ea437ee45bd45d3e3027#188caf56cc994910bd05ea437ee45bd45d3e3027" +source = "git+https://git.methanium.net/methanium/mtp.git?rev=e939714557ce82e2cdaf7fdb93b4f949551ab6d1#e939714557ce82e2cdaf7fdb93b4f949551ab6d1" dependencies = [ "async-trait", "bytes", @@ -1557,6 +1557,7 @@ dependencies = [ "mtp-host", "mtp-transport", "quinn", + "rand", "rustls", "thiserror 2.0.20", "tokio", diff --git a/apps/backend/Cargo.toml b/apps/backend/Cargo.toml index d902570..7ff705a 100644 --- a/apps/backend/Cargo.toml +++ b/apps/backend/Cargo.toml @@ -8,7 +8,7 @@ axum = "0.8" base64 = "0.23" chrono = { version = "0.4", features = ["serde"] } http = "1" -mtp = { git = "https://git.methanium.net/methanium/mtp.git", rev = "188caf56cc994910bd05ea437ee45bd45d3e3027", features = ["crypto", "web-server"] } +mtp = { git = "https://git.methanium.net/methanium/mtp.git", rev = "e939714557ce82e2cdaf7fdb93b4f949551ab6d1", features = ["crypto", "web-server"] } reqwest = { version = "0.12", default-features = false, features = ["rustls-tls"] } serde = { version = "1", features = ["derive"] } serde_json = "1" diff --git a/apps/frontend/src/components/layout/Header.tsx b/apps/frontend/src/components/layout/Header.tsx index 6eb1ab2..88173e2 100644 --- a/apps/frontend/src/components/layout/Header.tsx +++ b/apps/frontend/src/components/layout/Header.tsx @@ -46,7 +46,7 @@ export function Header() {
+
{snapshot?.generatedAt ? `Updated ${formatTime(snapshot.generatedAt)}` : (error?.message ?? "Waiting for data")} diff --git a/apps/frontend/src/routes/index.tsx b/apps/frontend/src/routes/index.tsx index 18e5f90..776306a 100644 --- a/apps/frontend/src/routes/index.tsx +++ b/apps/frontend/src/routes/index.tsx @@ -252,7 +252,7 @@ function ServiceRow({ return (
+
{service.error ?? (service.latencyMs !== null ? `${service.latencyMs} ms${service.checkHttp3 ? " (HTTP/3 verified)" : ""}` diff --git a/config.toml b/config.toml deleted file mode 100644 index 52b1467..0000000 --- a/config.toml +++ /dev/null @@ -1,72 +0,0 @@ -public_address = "0.0.0.0" -public_port = 4433 -admin_address = "127.0.0.1" -admin_port = 8091 -check_interval_seconds = 300 -timeout_seconds = 15 -certificate = ".dev/cert.pem" -private_key = ".dev/key.pem" -frontend_dir = "apps/frontend/dist" -state_dir = ".dev/state" -curl = "curl" - -[[categories]] -id = "methanium" -name = "Methanium" -logo = "apps/frontend/public/methanium.svg" - -[[categories.services]] -id = "methanium-homepage" -name = "Homepage" -url = "https://methanium.net" - -[[categories.services]] -id = "methanium-ui" -name = "Methanium UI" -url = "https://ui.methanium.net" - -[[categories.services]] -id = "vector-verdict" -name = "Vector Verdict" -url = "https://vv.methanium.net" - -[[categories.services]] -id = "methanium-git" -name = "Git" -url = "https://git.methanium.net" - -[[categories.services]] -id = "methanium-legal" -name = "Legal Page" -url = "https://legal.methanium.net" - -[[categories]] -id = "tensamin" -name = "Tensamin" -logo = "apps/frontend/public/tensamin.svg" - -[[categories.services]] -id = "tensamin-homepage" -name = "Homepage" -url = "https://tensamin.net" - -[[categories.services]] -id = "tensamin-app" -name = "Web App" -url = "https://app.tensamin.net" - -[[categories.services]] -id = "tensamin-dev" -name = "Web App (Dev)" -url = "https://dev.tensamin.net" - -[[categories.services]] -id = "tensamin-docs" -name = "Docs" -url = "https://docs.tensamin.net" - -[[categories.services]] -id = "tensamin-omega" -name = "Omega" -url = "https://omega.tensamin.net" -check_http3 = true diff --git a/package.json b/package.json index 801c169..88c5687 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "packageManager": "pnpm@11.17.0", "scripts": { "dev": "pnpm dev:cert && concurrently --kill-others --success first --names frontend,backend --prefix-colors cyan,magenta \"pnpm --filter @methanium/status-frontend dev\" \"pnpm dev:backend\"", - "dev:cert": "mkdir -p .dev && if [ ! -f .dev/cert.pem ] || [ ! -f .dev/key.pem ] || ! openssl x509 -in .dev/cert.pem -checkend 0 -noout >/dev/null 2>&1 || ! openssl x509 -in .dev/cert.pem -noout -text | grep -q 'Public Key Algorithm: id-ecPublicKey'; then openssl req -x509 -newkey ec -pkeyopt ec_paramgen_curve:prime256v1 -nodes -keyout .dev/key.pem -out .dev/cert.pem -days 10 -subj /CN=localhost -addext subjectAltName=DNS:localhost,IP:127.0.0.1; fi && printf 'VITE_MTP_URL=https://127.0.0.1:4433/\\nVITE_MTP_CERT_HASH=%s\\n' \"$(openssl x509 -in .dev/cert.pem -outform DER | openssl dgst -sha256 -r | cut -d ' ' -f1)\" > apps/frontend/.env.local", + "dev:cert": "mkdir -p .dev && if [ ! -f .dev/cert.pem ] || [ ! -f .dev/key.pem ] || ! openssl x509 -in .dev/cert.pem -checkend 0 -noout >/dev/null 2>&1 || ! openssl x509 -in .dev/cert.pem -noout -text | grep -q 'Public Key Algorithm: id-ecPublicKey'; then openssl req -x509 -newkey ec -pkeyopt ec_paramgen_curve:prime256v1 -nodes -keyout .dev/key.pem -out .dev/cert.pem -days 10 -subj /CN=localhost -addext subjectAltName=DNS:localhost,IP:127.0.0.1; fi && printf 'VITE_MTP_URL=https://127.0.0.1:4433/mtp\\nVITE_MTP_CERT_HASH=%s\\n' \"$(openssl x509 -in .dev/cert.pem -outform DER | openssl dgst -sha256 -r | cut -d ' ' -f1)\" > apps/frontend/.env.local", "dev:backend": "cargo run --manifest-path apps/backend/Cargo.toml -- config.example.toml", "build": "pnpm --filter @methanium/status-frontend build", "check": "tsc -p tsconfig.json && cargo check --manifest-path apps/backend/Cargo.toml",