From dc7b8cbaddc6a44aa05b2d3f7c42dc98dd24f060 Mon Sep 17 00:00:00 2001 From: Jet Pham Date: Tue, 10 Mar 2026 19:43:24 -0700 Subject: [PATCH] feat: reorganize with remote --- .gitignore | 1 + README.md | 114 ++ remote/{discord-bot => }/Cargo.lock | 117 ++ remote/Cargo.toml | 3 + remote/cache-service/Cargo.lock | 1688 ------------------------- remote/cache-service/Cargo.toml | 2 + remote/cache-service/flake.nix | 47 - remote/cache-service/module.nix | 5 +- remote/cache-service/src/api.rs | 108 +- remote/cache-service/src/db.rs | 16 +- remote/cache-service/src/main.rs | 14 +- remote/cache-service/src/poller.rs | 143 ++- remote/cache-service/src/types.rs | 19 - remote/cache-service/src/webhook.rs | 17 +- remote/discord-bot/Cargo.toml | 4 +- remote/discord-bot/flake.lock | 64 - remote/discord-bot/flake.nix | 47 - remote/discord-bot/module.nix | 4 +- remote/discord-bot/src/main.rs | 80 +- remote/{cache-service => }/flake.lock | 0 remote/flake.nix | 71 +- remote/noisebell-common/Cargo.toml | 8 + remote/noisebell-common/src/lib.rs | 24 + remote/rss-service/Cargo.lock | 813 ------------ remote/rss-service/Cargo.toml | 5 +- remote/rss-service/flake.nix | 47 - remote/rss-service/module.nix | 20 +- remote/rss-service/src/main.rs | 165 +-- 28 files changed, 622 insertions(+), 3024 deletions(-) create mode 100644 .gitignore create mode 100644 README.md rename remote/{discord-bot => }/Cargo.lock (95%) create mode 100644 remote/Cargo.toml delete mode 100644 remote/cache-service/Cargo.lock delete mode 100644 remote/cache-service/flake.nix delete mode 100644 remote/discord-bot/flake.lock delete mode 100644 remote/discord-bot/flake.nix rename remote/{cache-service => }/flake.lock (100%) create mode 100644 remote/noisebell-common/Cargo.toml create mode 100644 remote/noisebell-common/src/lib.rs delete mode 100644 remote/rss-service/Cargo.lock delete mode 100644 remote/rss-service/flake.nix diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d95fae5 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +remote/target diff --git a/README.md b/README.md new file mode 100644 index 0000000..7ebd2e9 --- /dev/null +++ b/README.md @@ -0,0 +1,114 @@ +# Noisebell + +Door status monitor for [Noisebridge](https://www.noisebridge.net). A Raspberry Pi watches a door sensor and reports open/closed state; remote services cache the data and fan it out to Discord and an Atom feed. + +## Architecture + +``` +Pi (door sensor) ──webhook──▸ Cache Service ──webhook──▸ Discord Bot + │ │ + polls Pi ◂──┘ Atom feed ◂──┘ + RSS Service +``` + +The **Pi** runs a small HTTP service that reads GPIO and exposes `GET /` (status) and `GET /info`. It also pushes state changes to the cache service via webhook. + +The **Cache Service** is the central hub. It polls the Pi for status and info, stores everything in SQLite, and forwards state changes to downstream webhooks (Discord, etc.). It exposes a read API for consumers. + +The **Discord Bot** receives webhooks from the cache service and posts embeds to a Discord channel. + +The **RSS Service** fetches history from the cache service and serves an Atom feed of door events from the last 7 days. + +## Services + +| Service | Crate | Default Port | Description | +|---------|-------|-------------|-------------| +| Cache | `noisebell-cache` | 3000 | Polls Pi, caches state in SQLite, forwards webhooks | +| Discord | `noisebell-discord` | 3001 | Posts door status embeds to Discord | +| RSS | `noisebell-rss` | 3002 | Serves Atom feed of recent door events | + +## Cache API + +| Method | Path | Auth | Description | +|--------|------|------|-------------| +| `GET` | `/status` | None | Current door status (`status`, `timestamp`, `last_seen`) | +| `GET` | `/info` | None | Pi system info (JSON blob) | +| `GET` | `/history` | None | Last 100 state changes | +| `POST` | `/webhook` | Bearer token | Inbound webhook from Pi | +| `GET` | `/health` | None | Returns `200 OK` | + +## Building + +All remote services live in a Cargo workspace under `remote/`. + +```sh +cd remote +cargo build --release +``` + +Or with Nix: + +```sh +cd remote +nix build .#noisebell-cache +nix build .#noisebell-discord +nix build .#noisebell-rss +``` + +## NixOS Configuration + +The flake at `remote/flake.nix` exports NixOS modules. Example configuration: + +```nix +{ + inputs.noisebell.url = "git+https://git.extremist.software/jet/noisebell?dir=remote"; + + outputs = { self, nixpkgs, noisebell, ... }: { + nixosConfigurations.myhost = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + noisebell.nixosModules.default + ({ ... }: { + services.noisebell-cache = { + enable = true; + domain = "cache.noisebell.example.com"; + piAddress = "http://noisebell-pi:80"; + piApiKeyFile = "/run/secrets/noisebell-pi-api-key"; + inboundApiKeyFile = "/run/secrets/noisebell-inbound-api-key"; + outboundWebhooks = [ + { + url = "http://localhost:3001/webhook"; + secretFile = "/run/secrets/noisebell-discord-webhook-secret"; + } + ]; + }; + + services.noisebell-discord = { + enable = true; + domain = "discord.noisebell.example.com"; + discordTokenFile = "/run/secrets/noisebell-discord-token"; + channelId = "123456789012345678"; + webhookSecretFile = "/run/secrets/noisebell-discord-webhook-secret"; + }; + + services.noisebell-rss = { + enable = true; + domain = "rss.noisebell.example.com"; + cacheUrl = "http://localhost:3000"; + }; + }) + ]; + }; + }; +} +``` + +## Secrets + +| Secret | Used by | Description | +|--------|---------|-------------| +| `piApiKeyFile` | Cache | Bearer token for authenticating to Pi GET endpoints | +| `inboundApiKeyFile` | Cache | Bearer token the Pi uses when POSTing to `/webhook` | +| `outboundWebhooks[].secretFile` | Cache | Bearer token sent with outbound webhook POSTs | +| `discordTokenFile` | Discord | Discord bot token | +| `webhookSecretFile` | Discord | Must match the cache's outbound webhook secret | diff --git a/remote/discord-bot/Cargo.lock b/remote/Cargo.lock similarity index 95% rename from remote/discord-bot/Cargo.lock rename to remote/Cargo.lock index 0279688..a8f25db 100644 --- a/remote/discord-bot/Cargo.lock +++ b/remote/Cargo.lock @@ -237,6 +237,18 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "fallible-iterator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" + +[[package]] +name = "fallible-streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" + [[package]] name = "find-msvc-tools" version = "0.1.9" @@ -253,6 +265,12 @@ dependencies = [ "miniz_oxide", ] +[[package]] +name = "foldhash" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" + [[package]] name = "form_urlencoded" version = "1.2.2" @@ -375,6 +393,24 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "hashbrown" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" +dependencies = [ + "foldhash", +] + +[[package]] +name = "hashlink" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" +dependencies = [ + "hashbrown", +] + [[package]] name = "http" version = "1.4.0" @@ -628,6 +664,17 @@ version = "0.2.183" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d" +[[package]] +name = "libsqlite3-sys" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad8935b44e7c13394a179a438e0cebba0fe08fe01b54f152e29a93b5cf993fd4" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + [[package]] name = "litemap" version = "0.8.1" @@ -704,16 +751,59 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "noisebell-cache" +version = "0.1.0" +dependencies = [ + "anyhow", + "axum", + "noisebell-common", + "reqwest", + "rusqlite", + "serde", + "serde_json", + "tokio", + "tower-http", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "noisebell-common" +version = "0.1.0" +dependencies = [ + "axum", + "serde", +] + [[package]] name = "noisebell-discord" version = "0.1.0" dependencies = [ "anyhow", "axum", + "noisebell-common", "serde", "serde_json", "serenity", "tokio", + "tower-http", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "noisebell-rss" +version = "0.1.0" +dependencies = [ + "anyhow", + "axum", + "noisebell-common", + "reqwest", + "serde", + "time", + "tokio", + "tower-http", "tracing", "tracing-subscriber", ] @@ -757,6 +847,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkg-config" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" + [[package]] name = "potential_utf" version = "0.1.4" @@ -992,6 +1088,20 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "rusqlite" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c6d5e5acb6f6129fe3f7ba0a7fc77bca1942cb568535e18e7bc40262baf3110" +dependencies = [ + "bitflags", + "fallible-iterator", + "fallible-streaming-iterator", + "hashlink", + "libsqlite3-sys", + "smallvec", +] + [[package]] name = "rustc-hash" version = "2.1.1" @@ -1504,6 +1614,7 @@ dependencies = [ "tower", "tower-layer", "tower-service", + "tracing", ] [[package]] @@ -1668,6 +1779,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + [[package]] name = "version_check" version = "0.9.5" diff --git a/remote/Cargo.toml b/remote/Cargo.toml new file mode 100644 index 0000000..99fd2cb --- /dev/null +++ b/remote/Cargo.toml @@ -0,0 +1,3 @@ +[workspace] +members = ["noisebell-common", "cache-service", "discord-bot", "rss-service"] +resolver = "2" diff --git a/remote/cache-service/Cargo.lock b/remote/cache-service/Cargo.lock deleted file mode 100644 index 580bc98..0000000 --- a/remote/cache-service/Cargo.lock +++ /dev/null @@ -1,1688 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 4 - -[[package]] -name = "aho-corasick" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" -dependencies = [ - "memchr", -] - -[[package]] -name = "anyhow" -version = "1.0.102" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - -[[package]] -name = "axum" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b52af3cb4058c895d37317bb27508dccc8e5f2d39454016b297bf4a400597b8" -dependencies = [ - "axum-core", - "bytes", - "form_urlencoded", - "futures-util", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-util", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "serde_core", - "serde_json", - "serde_path_to_error", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "axum-core" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c78f31d7b1291f7ee735c1c6780ccde7785daae9a9206026862dab7d8792d1" -dependencies = [ - "bytes", - "futures-core", - "http", - "http-body", - "http-body-util", - "mime", - "pin-project-lite", - "sync_wrapper", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - -[[package]] -name = "bitflags" -version = "2.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" - -[[package]] -name = "bumpalo" -version = "3.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" - -[[package]] -name = "bytes" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" - -[[package]] -name = "cc" -version = "1.2.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aebf35691d1bfb0ac386a69bac2fde4dd276fb618cf8bf4f5318fe285e821bb2" -dependencies = [ - "find-msvc-tools", - "shlex", -] - -[[package]] -name = "cfg-if" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" - -[[package]] -name = "cfg_aliases" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" - -[[package]] -name = "displaydoc" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "errno" -version = "0.3.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" -dependencies = [ - "libc", - "windows-sys 0.61.2", -] - -[[package]] -name = "fallible-iterator" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" - -[[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" - -[[package]] -name = "find-msvc-tools" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" - -[[package]] -name = "foldhash" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" - -[[package]] -name = "form_urlencoded" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "futures-channel" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d" -dependencies = [ - "futures-core", -] - -[[package]] -name = "futures-core" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" - -[[package]] -name = "futures-task" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393" - -[[package]] -name = "futures-util" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" -dependencies = [ - "futures-core", - "futures-task", - "pin-project-lite", - "slab", -] - -[[package]] -name = "getrandom" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi", - "wasm-bindgen", -] - -[[package]] -name = "getrandom" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "r-efi", - "wasip2", - "wasm-bindgen", -] - -[[package]] -name = "hashbrown" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" -dependencies = [ - "foldhash", -] - -[[package]] -name = "hashlink" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" -dependencies = [ - "hashbrown", -] - -[[package]] -name = "http" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" -dependencies = [ - "bytes", - "itoa", -] - -[[package]] -name = "http-body" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" -dependencies = [ - "bytes", - "http", -] - -[[package]] -name = "http-body-util" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" -dependencies = [ - "bytes", - "futures-core", - "http", - "http-body", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "hyper" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11" -dependencies = [ - "atomic-waker", - "bytes", - "futures-channel", - "futures-core", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "pin-utils", - "smallvec", - "tokio", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.27.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" -dependencies = [ - "http", - "hyper", - "hyper-util", - "rustls", - "rustls-pki-types", - "tokio", - "tokio-rustls", - "tower-service", - "webpki-roots", -] - -[[package]] -name = "hyper-util" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0" -dependencies = [ - "base64", - "bytes", - "futures-channel", - "futures-util", - "http", - "http-body", - "hyper", - "ipnet", - "libc", - "percent-encoding", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", -] - -[[package]] -name = "icu_collections" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" -dependencies = [ - "displaydoc", - "potential_utf", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_locale_core" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" -dependencies = [ - "displaydoc", - "litemap", - "tinystr", - "writeable", - "zerovec", -] - -[[package]] -name = "icu_normalizer" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" -dependencies = [ - "icu_collections", - "icu_normalizer_data", - "icu_properties", - "icu_provider", - "smallvec", - "zerovec", -] - -[[package]] -name = "icu_normalizer_data" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" - -[[package]] -name = "icu_properties" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec" -dependencies = [ - "icu_collections", - "icu_locale_core", - "icu_properties_data", - "icu_provider", - "zerotrie", - "zerovec", -] - -[[package]] -name = "icu_properties_data" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af" - -[[package]] -name = "icu_provider" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" -dependencies = [ - "displaydoc", - "icu_locale_core", - "writeable", - "yoke", - "zerofrom", - "zerotrie", - "zerovec", -] - -[[package]] -name = "idna" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" -dependencies = [ - "idna_adapter", - "smallvec", - "utf8_iter", -] - -[[package]] -name = "idna_adapter" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" -dependencies = [ - "icu_normalizer", - "icu_properties", -] - -[[package]] -name = "ipnet" -version = "2.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2" - -[[package]] -name = "iri-string" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c91338f0783edbd6195decb37bae672fd3b165faffb89bf7b9e6942f8b1a731a" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "itoa" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" - -[[package]] -name = "js-sys" -version = "0.3.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b49715b7073f385ba4bc528e5747d02e66cb39c6146efb66b781f131f0fb399c" -dependencies = [ - "once_cell", - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - -[[package]] -name = "libc" -version = "0.2.183" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d" - -[[package]] -name = "libsqlite3-sys" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8935b44e7c13394a179a438e0cebba0fe08fe01b54f152e29a93b5cf993fd4" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "litemap" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" - -[[package]] -name = "log" -version = "0.4.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" - -[[package]] -name = "lru-slab" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" - -[[package]] -name = "matchers" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9" -dependencies = [ - "regex-automata", -] - -[[package]] -name = "matchit" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" - -[[package]] -name = "memchr" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "mio" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" -dependencies = [ - "libc", - "wasi", - "windows-sys 0.61.2", -] - -[[package]] -name = "noisebell-cache" -version = "0.1.0" -dependencies = [ - "anyhow", - "axum", - "reqwest", - "rusqlite", - "serde", - "serde_json", - "tokio", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "nu-ansi-term" -version = "0.50.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" -dependencies = [ - "windows-sys 0.61.2", -] - -[[package]] -name = "once_cell" -version = "1.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" - -[[package]] -name = "percent-encoding" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" - -[[package]] -name = "pin-project-lite" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" - -[[package]] -name = "potential_utf" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" -dependencies = [ - "zerovec", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" -dependencies = [ - "zerocopy", -] - -[[package]] -name = "proc-macro2" -version = "1.0.106" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quinn" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" -dependencies = [ - "bytes", - "cfg_aliases", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash", - "rustls", - "socket2", - "thiserror", - "tokio", - "tracing", - "web-time", -] - -[[package]] -name = "quinn-proto" -version = "0.11.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098" -dependencies = [ - "bytes", - "getrandom 0.3.4", - "lru-slab", - "rand", - "ring", - "rustc-hash", - "rustls", - "rustls-pki-types", - "slab", - "thiserror", - "tinyvec", - "tracing", - "web-time", -] - -[[package]] -name = "quinn-udp" -version = "0.5.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" -dependencies = [ - "cfg_aliases", - "libc", - "once_cell", - "socket2", - "tracing", - "windows-sys 0.60.2", -] - -[[package]] -name = "quote" -version = "1.0.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "r-efi" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" - -[[package]] -name = "rand" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" -dependencies = [ - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" -dependencies = [ - "getrandom 0.3.4", -] - -[[package]] -name = "regex-automata" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" - -[[package]] -name = "reqwest" -version = "0.12.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" -dependencies = [ - "base64", - "bytes", - "futures-core", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-rustls", - "hyper-util", - "js-sys", - "log", - "percent-encoding", - "pin-project-lite", - "quinn", - "rustls", - "rustls-pki-types", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tokio-rustls", - "tower", - "tower-http", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots", -] - -[[package]] -name = "ring" -version = "0.17.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" -dependencies = [ - "cc", - "cfg-if", - "getrandom 0.2.17", - "libc", - "untrusted", - "windows-sys 0.52.0", -] - -[[package]] -name = "rusqlite" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c6d5e5acb6f6129fe3f7ba0a7fc77bca1942cb568535e18e7bc40262baf3110" -dependencies = [ - "bitflags", - "fallible-iterator", - "fallible-streaming-iterator", - "hashlink", - "libsqlite3-sys", - "smallvec", -] - -[[package]] -name = "rustc-hash" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" - -[[package]] -name = "rustls" -version = "0.23.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "758025cb5fccfd3bc2fd74708fd4682be41d99e5dff73c377c0646c6012c73a4" -dependencies = [ - "once_cell", - "ring", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", -] - -[[package]] -name = "rustls-pki-types" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd" -dependencies = [ - "web-time", - "zeroize", -] - -[[package]] -name = "rustls-webpki" -version = "0.103.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53" -dependencies = [ - "ring", - "rustls-pki-types", - "untrusted", -] - -[[package]] -name = "rustversion" -version = "1.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" - -[[package]] -name = "ryu" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" - -[[package]] -name = "serde" -version = "1.0.228" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" -dependencies = [ - "serde_core", - "serde_derive", -] - -[[package]] -name = "serde_core" -version = "1.0.228" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.228" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.149" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" -dependencies = [ - "itoa", - "memchr", - "serde", - "serde_core", - "zmij", -] - -[[package]] -name = "serde_path_to_error" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a9ff822e371bb5403e391ecd83e182e0e77ba7f6fe0160b795797109d1b457" -dependencies = [ - "itoa", - "serde", - "serde_core", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "signal-hook-registry" -version = "1.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b" -dependencies = [ - "errno", - "libc", -] - -[[package]] -name = "slab" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" - -[[package]] -name = "smallvec" -version = "1.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" - -[[package]] -name = "socket2" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" -dependencies = [ - "libc", - "windows-sys 0.61.2", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" - -[[package]] -name = "subtle" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" - -[[package]] -name = "syn" -version = "2.0.117" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" -dependencies = [ - "proc-macro2", - "quote", - "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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "thiserror" -version = "2.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "2.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "thread_local" -version = "1.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "tinystr" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" -dependencies = [ - "displaydoc", - "zerovec", -] - -[[package]] -name = "tinyvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d" -dependencies = [ - "bytes", - "libc", - "mio", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys 0.61.2", -] - -[[package]] -name = "tokio-macros" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c55a2eff8b69ce66c84f85e1da1c233edc36ceb85a2058d11b0d6a3c7e7569c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tokio-rustls" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" -dependencies = [ - "rustls", - "tokio", -] - -[[package]] -name = "tower" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4" -dependencies = [ - "futures-core", - "futures-util", - "pin-project-lite", - "sync_wrapper", - "tokio", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-http" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" -dependencies = [ - "bitflags", - "bytes", - "futures-util", - "http", - "http-body", - "iri-string", - "pin-project-lite", - "tower", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-layer" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" - -[[package]] -name = "tower-service" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" - -[[package]] -name = "tracing" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" -dependencies = [ - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tracing-core" -version = "0.1.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex-automata", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "unicode-ident" -version = "1.0.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "url" -version = "2.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "utf8_iter" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" - -[[package]] -name = "valuable" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.11.1+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" - -[[package]] -name = "wasip2" -version = "1.0.2+wasi-0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" -dependencies = [ - "wit-bindgen", -] - -[[package]] -name = "wasm-bindgen" -version = "0.2.114" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6532f9a5c1ece3798cb1c2cfdba640b9b3ba884f5db45973a6f442510a87d38e" -dependencies = [ - "cfg-if", - "once_cell", - "rustversion", - "wasm-bindgen-macro", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9c5522b3a28661442748e09d40924dfb9ca614b21c00d3fd135720e48b67db8" -dependencies = [ - "cfg-if", - "futures-util", - "js-sys", - "once_cell", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.114" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18a2d50fcf105fb33bb15f00e7a77b772945a2ee45dcf454961fd843e74c18e6" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.114" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03ce4caeaac547cdf713d280eda22a730824dd11e6b8c3ca9e42247b25c631e3" -dependencies = [ - "bumpalo", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.114" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75a326b8c223ee17883a4251907455a2431acc2791c98c26279376490c378c16" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "web-sys" -version = "0.3.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854ba17bb104abfb26ba36da9729addc7ce7f06f5c0f90f3c391f8461cca21f9" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "web-time" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki-roots" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cfaf3c063993ff62e73cb4311efde4db1efb31ab78a3e5c457939ad5cc0bed" -dependencies = [ - "rustls-pki-types", -] - -[[package]] -name = "windows-link" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.60.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" -dependencies = [ - "windows-targets 0.53.5", -] - -[[package]] -name = "windows-sys" -version = "0.61.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" -dependencies = [ - "windows-link", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm 0.52.6", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.53.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" -dependencies = [ - "windows-link", - "windows_aarch64_gnullvm 0.53.1", - "windows_aarch64_msvc 0.53.1", - "windows_i686_gnu 0.53.1", - "windows_i686_gnullvm 0.53.1", - "windows_i686_msvc 0.53.1", - "windows_x86_64_gnu 0.53.1", - "windows_x86_64_gnullvm 0.53.1", - "windows_x86_64_msvc 0.53.1", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_i686_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" - -[[package]] -name = "wit-bindgen" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" - -[[package]] -name = "writeable" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" - -[[package]] -name = "yoke" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" -dependencies = [ - "stable_deref_trait", - "yoke-derive", - "zerofrom", -] - -[[package]] -name = "yoke-derive" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - -[[package]] -name = "zerocopy" -version = "0.8.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2578b716f8a7a858b7f02d5bd870c14bf4ddbbcf3a4c05414ba6503640505e3" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.8.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e6cc098ea4d3bd6246687de65af3f920c430e236bee1e3bf2e441463f08a02f" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "zerofrom" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" -dependencies = [ - "zerofrom-derive", -] - -[[package]] -name = "zerofrom-derive" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - -[[package]] -name = "zeroize" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" - -[[package]] -name = "zerotrie" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" -dependencies = [ - "displaydoc", - "yoke", - "zerofrom", -] - -[[package]] -name = "zerovec" -version = "0.11.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" -dependencies = [ - "yoke", - "zerofrom", - "zerovec-derive", -] - -[[package]] -name = "zerovec-derive" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "zmij" -version = "1.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" diff --git a/remote/cache-service/Cargo.toml b/remote/cache-service/Cargo.toml index 6a61390..ebaefba 100644 --- a/remote/cache-service/Cargo.toml +++ b/remote/cache-service/Cargo.toml @@ -6,10 +6,12 @@ edition = "2021" [dependencies] anyhow = "1.0" axum = "0.8" +noisebell-common = { path = "../noisebell-common" } reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] } rusqlite = { version = "0.33", features = ["bundled"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" tokio = { version = "1", features = ["rt-multi-thread", "macros", "net", "sync", "signal", "time"] } +tower-http = { version = "0.6", features = ["trace"] } tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["env-filter"] } diff --git a/remote/cache-service/flake.nix b/remote/cache-service/flake.nix deleted file mode 100644 index 1906a9e..0000000 --- a/remote/cache-service/flake.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - description = "Noisebell - cache service"; - - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - crane.url = "github:ipetkov/crane"; - rust-overlay = { - url = "github:oxalica/rust-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - }; - - outputs = { self, nixpkgs, crane, rust-overlay }: - let - system = "x86_64-linux"; - pkgs = import nixpkgs { - inherit system; - overlays = [ rust-overlay.overlays.default ]; - }; - - rustToolchain = pkgs.rust-bin.stable.latest.default; - craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain; - - src = craneLib.cleanCargoSource ./.; - - commonArgs = { - inherit src; - strictDeps = true; - doCheck = false; - }; - - cargoArtifacts = craneLib.buildDepsOnly commonArgs; - - noisebell-cache = craneLib.buildPackage (commonArgs // { - inherit cargoArtifacts; - }); - in - { - packages.${system}.default = noisebell-cache; - - nixosModules.default = import ./module.nix self; - - devShells.${system}.default = craneLib.devShell { - packages = [ pkgs.rust-analyzer ]; - }; - }; -} diff --git a/remote/cache-service/module.nix b/remote/cache-service/module.nix index ba4a1c5..5b157ec 100644 --- a/remote/cache-service/module.nix +++ b/remote/cache-service/module.nix @@ -1,9 +1,9 @@ -self: +pkg: { config, lib, ... }: let cfg = config.services.noisebell-cache; - bin = "${self.packages.x86_64-linux.default}/bin/noisebell-cache"; + bin = "${pkg}/bin/noisebell-cache"; in { options.services.noisebell-cache = { @@ -91,6 +91,7 @@ in users.groups.noisebell-cache = {}; services.caddy.virtualHosts.${cfg.domain}.extraConfig = '' + redir / https://git.extremist.software/jet/noisebell 302 reverse_proxy localhost:${toString cfg.port} ''; diff --git a/remote/cache-service/src/api.rs b/remote/cache-service/src/api.rs index d61f2d4..4a50a48 100644 --- a/remote/cache-service/src/api.rs +++ b/remote/cache-service/src/api.rs @@ -1,13 +1,14 @@ use std::sync::Arc; -use axum::extract::{Query, State}; +use axum::extract::State; use axum::http::{HeaderMap, StatusCode}; use axum::Json; +use noisebell_common::{validate_bearer, HistoryEntry, WebhookPayload}; use tokio::sync::Mutex; use tracing::{error, info}; use crate::db; -use crate::types::{DoorStatus, InboundWebhook, OutboundPayload, WebhookTarget}; +use crate::types::{DoorStatus, WebhookTarget}; use crate::webhook; pub struct AppState { @@ -26,18 +27,10 @@ fn unix_now() -> u64 { .as_secs() } -fn validate_bearer(headers: &HeaderMap, expected: &str) -> bool { - headers - .get("authorization") - .and_then(|v| v.to_str().ok()) - .map(|v| v.strip_prefix("Bearer ").unwrap_or("") == expected) - .unwrap_or(false) -} - pub async fn post_webhook( State(state): State>, headers: HeaderMap, - Json(body): Json, + Json(body): Json, ) -> StatusCode { if !validate_bearer(&headers, &state.inbound_api_key) { return StatusCode::UNAUTHORIZED; @@ -48,12 +41,18 @@ pub async fn post_webhook( }; let now = unix_now(); - { - let conn = state.db.lock().await; - if let Err(e) = db::update_state(&conn, status, body.timestamp, now) { - error!(error = %e, "failed to update state from webhook"); - return StatusCode::INTERNAL_SERVER_ERROR; - } + let db = state.db.clone(); + let timestamp = body.timestamp; + let result = tokio::task::spawn_blocking(move || { + let conn = db.blocking_lock(); + db::update_state(&conn, status, timestamp, now) + }) + .await + .expect("db task panicked"); + + if let Err(e) = result { + error!(error = %e, "failed to update state from webhook"); + return StatusCode::INTERNAL_SERVER_ERROR; } info!(status = status.as_str(), timestamp = body.timestamp, "state updated via webhook"); @@ -61,7 +60,7 @@ pub async fn post_webhook( webhook::forward( &state.client, &state.webhooks, - &OutboundPayload { + &WebhookPayload { status: status.as_str().to_string(), timestamp: body.timestamp, }, @@ -74,43 +73,56 @@ pub async fn post_webhook( } pub async fn get_status(State(state): State>) -> Result, StatusCode> { - let conn = state.db.lock().await; - match db::get_status(&conn) { - Ok(status) => Ok(Json(serde_json::to_value(status).unwrap())), - Err(e) => { - error!(error = %e, "failed to get status"); - Err(StatusCode::INTERNAL_SERVER_ERROR) - } - } + let db = state.db.clone(); + let status = tokio::task::spawn_blocking(move || { + let conn = db.blocking_lock(); + db::get_status(&conn) + }) + .await + .expect("db task panicked") + .map_err(|e| { + error!(error = %e, "failed to get status"); + StatusCode::INTERNAL_SERVER_ERROR + })?; + + Ok(Json(serde_json::to_value(status).unwrap())) } pub async fn get_info(State(state): State>) -> Result, StatusCode> { - let conn = state.db.lock().await; - match db::get_pi_info(&conn) { - Ok(info) => Ok(Json(info)), - Err(e) => { - error!(error = %e, "failed to get pi info"); - Err(StatusCode::INTERNAL_SERVER_ERROR) - } - } + let db = state.db.clone(); + let info = tokio::task::spawn_blocking(move || { + let conn = db.blocking_lock(); + db::get_pi_info(&conn) + }) + .await + .expect("db task panicked") + .map_err(|e| { + error!(error = %e, "failed to get pi info"); + StatusCode::INTERNAL_SERVER_ERROR + })?; + + Ok(Json(info)) } -#[derive(serde::Deserialize)] -pub struct HistoryQuery { - pub limit: Option, +pub async fn health() -> StatusCode { + StatusCode::OK } pub async fn get_history( State(state): State>, - Query(query): Query, -) -> Result>, StatusCode> { - let limit = query.limit.unwrap_or(50); - let conn = state.db.lock().await; - match db::get_history(&conn, limit) { - Ok(entries) => Ok(Json(entries)), - Err(e) => { - error!(error = %e, "failed to get history"); - Err(StatusCode::INTERNAL_SERVER_ERROR) - } - } +) -> Result>, StatusCode> { + let limit = 100u32; + let db = state.db.clone(); + let entries = tokio::task::spawn_blocking(move || { + let conn = db.blocking_lock(); + db::get_history(&conn, limit) + }) + .await + .expect("db task panicked") + .map_err(|e| { + error!(error = %e, "failed to get history"); + StatusCode::INTERNAL_SERVER_ERROR + })?; + + Ok(Json(entries)) } diff --git a/remote/cache-service/src/db.rs b/remote/cache-service/src/db.rs index a502f76..77964de 100644 --- a/remote/cache-service/src/db.rs +++ b/remote/cache-service/src/db.rs @@ -1,10 +1,11 @@ use anyhow::{Context, Result}; use rusqlite::Connection; -use crate::types::{DoorStatus, HistoryEntry, StatusResponse}; +use crate::types::{DoorStatus, StatusResponse}; pub fn init(path: &str) -> Result { let conn = Connection::open(path).context("failed to open SQLite database")?; + conn.execute_batch("PRAGMA journal_mode=WAL;")?; conn.execute_batch( " CREATE TABLE IF NOT EXISTS current_state ( @@ -96,16 +97,17 @@ pub fn get_current_status_str(conn: &Connection) -> Result> { Ok(status) } -pub fn get_history(conn: &Connection, limit: u32) -> Result> { +pub fn get_history(conn: &Connection, limit: u32) -> Result> { let mut stmt = conn.prepare( - "SELECT status, timestamp, recorded_at FROM state_log ORDER BY id DESC LIMIT ?1", + "SELECT id, status, timestamp, recorded_at FROM state_log ORDER BY id DESC LIMIT ?1", )?; let entries = stmt .query_map(rusqlite::params![limit], |row| { - Ok(HistoryEntry { - status: row.get(0)?, - timestamp: row.get(1)?, - recorded_at: row.get(2)?, + Ok(noisebell_common::HistoryEntry { + id: row.get(0)?, + status: row.get(1)?, + timestamp: row.get(2)?, + recorded_at: row.get(3)?, }) })? .collect::, _>>()?; diff --git a/remote/cache-service/src/main.rs b/remote/cache-service/src/main.rs index b848dd1..d2dc86d 100644 --- a/remote/cache-service/src/main.rs +++ b/remote/cache-service/src/main.rs @@ -5,7 +5,8 @@ use anyhow::{Context, Result}; use axum::routing::{get, post}; use axum::Router; use tokio::sync::Mutex; -use tracing::info; +use tower_http::trace::TraceLayer; +use tracing::{info, Level}; mod api; mod db; @@ -27,7 +28,9 @@ async fn main() -> Result<()> { .context("NOISEBELL_CACHE_PORT must be a valid u16")?; let pi_address = std::env::var("NOISEBELL_CACHE_PI_ADDRESS") - .context("NOISEBELL_CACHE_PI_ADDRESS is required")?; + .context("NOISEBELL_CACHE_PI_ADDRESS is required")? + .trim_end_matches('/') + .to_string(); let pi_api_key = std::env::var("NOISEBELL_CACHE_PI_API_KEY") .context("NOISEBELL_CACHE_PI_API_KEY is required")?; @@ -106,7 +109,6 @@ async fn main() -> Result<()> { offline_threshold, retry_attempts, retry_base_delay_secs, - http_timeout_secs, webhooks: webhooks.clone(), }); @@ -123,10 +125,16 @@ async fn main() -> Result<()> { }); let app = Router::new() + .route("/health", get(api::health)) .route("/webhook", post(api::post_webhook)) .route("/status", get(api::get_status)) .route("/info", get(api::get_info)) .route("/history", get(api::get_history)) + .layer( + TraceLayer::new_for_http() + .make_span_with(tower_http::trace::DefaultMakeSpan::new().level(Level::INFO)) + .on_response(tower_http::trace::DefaultOnResponse::new().level(Level::INFO)), + ) .with_state(app_state); let listener = tokio::net::TcpListener::bind(("0.0.0.0", port)) diff --git a/remote/cache-service/src/poller.rs b/remote/cache-service/src/poller.rs index 9dbd78a..aac7321 100644 --- a/remote/cache-service/src/poller.rs +++ b/remote/cache-service/src/poller.rs @@ -1,11 +1,12 @@ use std::sync::Arc; use std::time::Duration; +use noisebell_common::WebhookPayload; use tokio::sync::Mutex; use tracing::{error, info, warn}; use crate::db; -use crate::types::{DoorStatus, OutboundPayload, WebhookTarget}; +use crate::types::{DoorStatus, WebhookTarget}; use crate::webhook; pub struct PollerConfig { @@ -16,7 +17,6 @@ pub struct PollerConfig { pub offline_threshold: u32, pub retry_attempts: u32, pub retry_base_delay_secs: u64, - pub http_timeout_secs: u64, pub webhooks: Vec, } @@ -37,8 +37,6 @@ pub fn spawn_status_poller( let mut was_offline = false; loop { - tokio::time::sleep(config.status_poll_interval).await; - let result = client .get(format!("{}/", config.pi_address)) .bearer_auth(&config.pi_api_key) @@ -55,44 +53,53 @@ pub fn spawn_status_poller( let now = unix_now(); if let Ok(body) = resp.json::().await { - let conn = db.lock().await; - if let Err(e) = db::update_last_seen(&conn, now) { - error!(error = %e, "failed to update last_seen"); - } + let status_str = body.get("status").and_then(|s| s.as_str()).map(String::from); + let event_timestamp = body.get("timestamp").and_then(|t| t.as_u64()); - // Update state if it differs from current - if let Some(status_str) = body.get("status").and_then(|s| s.as_str()) { - if let Some(status) = DoorStatus::from_str(status_str) { - let current = db::get_current_status_str(&conn); - let changed = match ¤t { - Ok(Some(s)) => s != status.as_str(), - Ok(None) => true, // was offline - Err(_) => true, - }; - if changed { - let timestamp = body - .get("timestamp") - .and_then(|t| t.as_u64()) - .unwrap_or(now); - if let Err(e) = db::update_state(&conn, status, timestamp, now) { - error!(error = %e, "failed to update state from poll"); - } else { - info!(status = status.as_str(), "state updated from poll"); - drop(conn); - webhook::forward( - &client, - &config.webhooks, - &OutboundPayload { - status: status.as_str().to_string(), - timestamp, - }, - config.retry_attempts, - config.retry_base_delay_secs, - ) - .await; + let db = db.clone(); + let update_result = tokio::task::spawn_blocking(move || { + let conn = db.blocking_lock(); + if let Err(e) = db::update_last_seen(&conn, now) { + error!(error = %e, "failed to update last_seen"); + } + + if let Some(ref status_str) = status_str { + if let Some(status) = DoorStatus::from_str(status_str) { + let current = db::get_current_status_str(&conn); + let changed = match ¤t { + Ok(Some(s)) => s != status.as_str(), + Ok(None) => true, + Err(_) => true, + }; + if changed { + let timestamp = event_timestamp.unwrap_or(now); + if let Err(e) = db::update_state(&conn, status, timestamp, now) { + error!(error = %e, "failed to update state from poll"); + return None; + } + return Some((status, timestamp)); } } } + + None + }) + .await + .expect("db task panicked"); + + if let Some((status, timestamp)) = update_result { + info!(status = status.as_str(), "state updated from poll"); + webhook::forward( + &client, + &config.webhooks, + &WebhookPayload { + status: status.as_str().to_string(), + timestamp, + }, + config.retry_attempts, + config.retry_base_delay_secs, + ) + .await; } } } @@ -111,27 +118,38 @@ pub fn spawn_status_poller( if consecutive_failures >= config.offline_threshold && !was_offline { was_offline = true; let now = unix_now(); - let conn = db.lock().await; - if let Err(e) = db::mark_offline(&conn, now) { - error!(error = %e, "failed to mark Pi offline"); - } else { - info!("Pi marked offline after {} consecutive failures", consecutive_failures); - drop(conn); - webhook::forward( - &client, - &config.webhooks, - &OutboundPayload { - status: "offline".to_string(), - timestamp: now, - }, - config.retry_attempts, - config.retry_base_delay_secs, - ) - .await; + let db = db.clone(); + let marked = tokio::task::spawn_blocking(move || { + let conn = db.blocking_lock(); + db::mark_offline(&conn, now) + }) + .await + .expect("db task panicked"); + + match marked { + Ok(()) => { + info!("Pi marked offline after {} consecutive failures", consecutive_failures); + webhook::forward( + &client, + &config.webhooks, + &WebhookPayload { + status: "offline".to_string(), + timestamp: now, + }, + config.retry_attempts, + config.retry_base_delay_secs, + ) + .await; + } + Err(e) => { + error!(error = %e, "failed to mark Pi offline"); + } } } } } + + tokio::time::sleep(config.status_poll_interval).await; } }); } @@ -143,8 +161,6 @@ pub fn spawn_info_poller( ) { tokio::spawn(async move { loop { - tokio::time::sleep(config.info_poll_interval).await; - let result = client .get(format!("{}/info", config.pi_address)) .bearer_auth(&config.pi_api_key) @@ -155,8 +171,15 @@ pub fn spawn_info_poller( Ok(resp) if resp.status().is_success() => { if let Ok(data) = resp.json::().await { let now = unix_now(); - let conn = db.lock().await; - if let Err(e) = db::update_pi_info(&conn, &data, now) { + let db = db.clone(); + let result = tokio::task::spawn_blocking(move || { + let conn = db.blocking_lock(); + db::update_pi_info(&conn, &data, now) + }) + .await + .expect("db task panicked"); + + if let Err(e) = result { error!(error = %e, "failed to update pi_info"); } } @@ -169,6 +192,8 @@ pub fn spawn_info_poller( warn!(error = %err_msg, "info poll failed"); } } + + tokio::time::sleep(config.info_poll_interval).await; } }); } diff --git a/remote/cache-service/src/types.rs b/remote/cache-service/src/types.rs index f28c4c8..978fc16 100644 --- a/remote/cache-service/src/types.rs +++ b/remote/cache-service/src/types.rs @@ -31,25 +31,6 @@ pub struct StatusResponse { pub last_seen: Option, } -#[derive(Debug, Deserialize)] -pub struct InboundWebhook { - pub status: String, - pub timestamp: u64, -} - -#[derive(Debug, Clone, Serialize)] -pub struct OutboundPayload { - pub status: String, - pub timestamp: u64, -} - -#[derive(Debug, Clone, Serialize)] -pub struct HistoryEntry { - pub status: String, - pub timestamp: u64, - pub recorded_at: u64, -} - #[derive(Debug, Clone)] pub struct WebhookTarget { pub url: String, diff --git a/remote/cache-service/src/webhook.rs b/remote/cache-service/src/webhook.rs index 7310108..7799c01 100644 --- a/remote/cache-service/src/webhook.rs +++ b/remote/cache-service/src/webhook.rs @@ -1,25 +1,26 @@ use std::time::Duration; +use noisebell_common::WebhookPayload; use tracing::{error, info, warn}; -use crate::types::{OutboundPayload, WebhookTarget}; +use crate::types::WebhookTarget; pub async fn forward( client: &reqwest::Client, targets: &[WebhookTarget], - payload: &OutboundPayload, + payload: &WebhookPayload, retry_attempts: u32, retry_base_delay_secs: u64, ) { + let mut set = tokio::task::JoinSet::new(); + for target in targets { let payload = payload.clone(); let client = client.clone(); let url = target.url.clone(); let secret = target.secret.clone(); - let retry_attempts = retry_attempts; - let retry_base_delay_secs = retry_base_delay_secs; - tokio::spawn(async move { + set.spawn(async move { info!(url = %url, status = %payload.status, "forwarding to outbound webhook"); for attempt in 0..=retry_attempts { @@ -50,4 +51,10 @@ pub async fn forward( } }); } + + while let Some(result) = set.join_next().await { + if let Err(e) = result { + error!(error = %e, "webhook task panicked"); + } + } } diff --git a/remote/discord-bot/Cargo.toml b/remote/discord-bot/Cargo.toml index ad1ada2..a14b659 100644 --- a/remote/discord-bot/Cargo.toml +++ b/remote/discord-bot/Cargo.toml @@ -6,9 +6,11 @@ edition = "2021" [dependencies] anyhow = "1.0" axum = "0.8" +noisebell-common = { path = "../noisebell-common" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" serenity = { version = "0.12", default-features = false, features = ["client", "gateway", "model", "rustls_backend"] } -tokio = { version = "1", features = ["rt-multi-thread", "macros", "net", "sync", "signal"] } +tokio = { version = "1", features = ["rt-multi-thread", "macros", "net", "sync", "signal", "time"] } +tower-http = { version = "0.6", features = ["trace"] } tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["env-filter"] } diff --git a/remote/discord-bot/flake.lock b/remote/discord-bot/flake.lock deleted file mode 100644 index 5385057..0000000 --- a/remote/discord-bot/flake.lock +++ /dev/null @@ -1,64 +0,0 @@ -{ - "nodes": { - "crane": { - "locked": { - "lastModified": 1773115265, - "narHash": "sha256-5fDkKTYEgue2klksd52WvcXfZdY1EIlbk0QggAwpFog=", - "owner": "ipetkov", - "repo": "crane", - "rev": "27711550d109bf6236478dc9f53b9e29c1a374c5", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1772963539, - "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9dcb002ca1690658be4a04645215baea8b95f31d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "crane": "crane", - "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay" - } - }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1773115373, - "narHash": "sha256-bfK9FJFcQth6f3ydYggS5m0z2NRGF/PY6Y2XgZDJ6pg=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "1924b4672a2b8e4aee6e6652ec2e59a8d3c5648e", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/remote/discord-bot/flake.nix b/remote/discord-bot/flake.nix deleted file mode 100644 index f0fc982..0000000 --- a/remote/discord-bot/flake.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - description = "Noisebell - Discord bot"; - - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - crane.url = "github:ipetkov/crane"; - rust-overlay = { - url = "github:oxalica/rust-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - }; - - outputs = { self, nixpkgs, crane, rust-overlay }: - let - system = "x86_64-linux"; - pkgs = import nixpkgs { - inherit system; - overlays = [ rust-overlay.overlays.default ]; - }; - - rustToolchain = pkgs.rust-bin.stable.latest.default; - craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain; - - src = craneLib.cleanCargoSource ./.; - - commonArgs = { - inherit src; - strictDeps = true; - doCheck = false; - }; - - cargoArtifacts = craneLib.buildDepsOnly commonArgs; - - noisebell-discord = craneLib.buildPackage (commonArgs // { - inherit cargoArtifacts; - }); - in - { - packages.${system}.default = noisebell-discord; - - nixosModules.default = import ./module.nix self; - - devShells.${system}.default = craneLib.devShell { - packages = [ pkgs.rust-analyzer ]; - }; - }; -} diff --git a/remote/discord-bot/module.nix b/remote/discord-bot/module.nix index d33ebd1..3eff505 100644 --- a/remote/discord-bot/module.nix +++ b/remote/discord-bot/module.nix @@ -1,9 +1,9 @@ -self: +pkg: { config, lib, ... }: let cfg = config.services.noisebell-discord; - bin = "${self.packages.x86_64-linux.default}/bin/noisebell-discord"; + bin = "${pkg}/bin/noisebell-discord"; in { options.services.noisebell-discord = { diff --git a/remote/discord-bot/src/main.rs b/remote/discord-bot/src/main.rs index eb570da..b375293 100644 --- a/remote/discord-bot/src/main.rs +++ b/remote/discord-bot/src/main.rs @@ -1,34 +1,22 @@ use std::sync::Arc; +use std::time::Duration; use anyhow::{Context, Result}; use axum::extract::State; use axum::http::{HeaderMap, StatusCode}; -use axum::routing::post; +use axum::routing::{get, post}; use axum::{Json, Router}; -use serde::Deserialize; -use serenity::all::{ChannelId, Colour, CreateEmbed, CreateMessage, GatewayIntents, Http}; -use tracing::{error, info}; - -#[derive(Deserialize)] -struct WebhookPayload { - status: String, - timestamp: u64, -} +use noisebell_common::{validate_bearer, WebhookPayload}; +use serenity::all::{ChannelId, Colour, CreateEmbed, CreateMessage, GatewayIntents}; +use tower_http::trace::TraceLayer; +use tracing::{error, info, Level}; struct AppState { - http: Arc, + http: Arc, channel_id: ChannelId, webhook_secret: String, } -fn validate_bearer(headers: &HeaderMap, expected: &str) -> bool { - headers - .get("authorization") - .and_then(|v| v.to_str().ok()) - .map(|v| v.strip_prefix("Bearer ").unwrap_or("") == expected) - .unwrap_or(false) -} - fn build_embed(status: &str, timestamp: u64) -> CreateEmbed { let (colour, title, description) = match status { "open" => (Colour::from_rgb(87, 242, 135), "Door is open", "The door at Noisebridge is open."), @@ -98,12 +86,12 @@ async fn main() -> Result<()> { info!(port, channel_id, "starting noisebell-discord"); let intents = GatewayIntents::empty(); - let mut client = serenity::Client::builder(&discord_token, intents) + let mut initial_client = serenity::Client::builder(&discord_token, intents) .event_handler(Handler) .await .context("failed to create Discord client")?; - let http = client.http.clone(); + let http = initial_client.http.clone(); let app_state = Arc::new(AppState { http, @@ -112,7 +100,13 @@ async fn main() -> Result<()> { }); let app = Router::new() + .route("/health", get(|| async { StatusCode::OK })) .route("/webhook", post(post_webhook)) + .layer( + TraceLayer::new_for_http() + .make_span_with(tower_http::trace::DefaultMakeSpan::new().level(Level::INFO)) + .on_response(tower_http::trace::DefaultOnResponse::new().level(Level::INFO)), + ) .with_state(app_state); let listener = tokio::net::TcpListener::bind(("0.0.0.0", port)) @@ -121,21 +115,39 @@ async fn main() -> Result<()> { info!(port, "webhook listener ready"); + // Gateway reconnect loop — the Http client for sending messages is independent + let token_for_gateway = discord_token.clone(); + tokio::spawn(async move { + if let Err(e) = initial_client.start().await { + error!(error = %e, "Discord gateway disconnected"); + } + loop { + tokio::time::sleep(Duration::from_secs(5)).await; + info!("reconnecting to Discord gateway"); + match serenity::Client::builder(&token_for_gateway, GatewayIntents::empty()) + .event_handler(Handler) + .await + { + Ok(mut client) => { + if let Err(e) = client.start().await { + error!(error = %e, "Discord gateway disconnected"); + } + } + Err(e) => { + error!(error = %e, "failed to create Discord client"); + } + } + } + }); + let mut sigterm = tokio::signal::unix::signal(tokio::signal::unix::SignalKind::terminate()) .context("failed to register SIGTERM handler")?; - - tokio::select! { - result = client.start() => { - if let Err(e) = result { - error!(error = %e, "Discord client error"); - } - } - result = axum::serve(listener, app).with_graceful_shutdown(async move { sigterm.recv().await; }) => { - if let Err(e) = result { - error!(error = %e, "HTTP server error"); - } - } - } + axum::serve(listener, app) + .with_graceful_shutdown(async move { + sigterm.recv().await; + }) + .await + .context("server error")?; info!("shutdown complete"); Ok(()) diff --git a/remote/cache-service/flake.lock b/remote/flake.lock similarity index 100% rename from remote/cache-service/flake.lock rename to remote/flake.lock diff --git a/remote/flake.nix b/remote/flake.nix index f10d606..c1ea72a 100644 --- a/remote/flake.nix +++ b/remote/flake.nix @@ -3,21 +3,62 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - noisebell-cache.url = "path:./cache-service"; - noisebell-discord.url = "path:./discord-bot"; - noisebell-rss.url = "path:./rss-service"; - }; - - outputs = { self, nixpkgs, noisebell-cache, noisebell-discord, noisebell-rss }: { - nixosModules = { - cache = noisebell-cache.nixosModules.default; - discord = noisebell-discord.nixosModules.default; - rss = noisebell-rss.nixosModules.default; - default = { imports = [ - noisebell-cache.nixosModules.default - noisebell-discord.nixosModules.default - noisebell-rss.nixosModules.default - ]; }; + crane.url = "github:ipetkov/crane"; + rust-overlay = { + url = "github:oxalica/rust-overlay"; + inputs.nixpkgs.follows = "nixpkgs"; }; }; + + outputs = { self, nixpkgs, crane, rust-overlay }: + let + system = "x86_64-linux"; + pkgs = import nixpkgs { + inherit system; + overlays = [ rust-overlay.overlays.default ]; + }; + + rustToolchain = pkgs.rust-bin.stable.latest.default; + craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain; + + src = craneLib.cleanCargoSource ./.; + + commonArgs = { + inherit src; + strictDeps = true; + doCheck = false; + }; + + cargoArtifacts = craneLib.buildDepsOnly commonArgs; + + buildMember = name: craneLib.buildPackage (commonArgs // { + inherit cargoArtifacts; + cargoExtraArgs = "-p ${name}"; + }); + + noisebell-cache = buildMember "noisebell-cache"; + noisebell-discord = buildMember "noisebell-discord"; + noisebell-rss = buildMember "noisebell-rss"; + in + { + packages.${system} = { + inherit noisebell-cache noisebell-discord noisebell-rss; + default = noisebell-cache; + }; + + nixosModules = { + cache = import ./cache-service/module.nix noisebell-cache; + discord = import ./discord-bot/module.nix noisebell-discord; + rss = import ./rss-service/module.nix noisebell-rss; + default = { imports = [ + (import ./cache-service/module.nix noisebell-cache) + (import ./discord-bot/module.nix noisebell-discord) + (import ./rss-service/module.nix noisebell-rss) + ]; }; + }; + + devShells.${system}.default = craneLib.devShell { + packages = [ pkgs.rust-analyzer ]; + }; + }; } diff --git a/remote/noisebell-common/Cargo.toml b/remote/noisebell-common/Cargo.toml new file mode 100644 index 0000000..7f0eece --- /dev/null +++ b/remote/noisebell-common/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "noisebell-common" +version = "0.1.0" +edition = "2021" + +[dependencies] +axum = "0.8" +serde = { version = "1.0", features = ["derive"] } diff --git a/remote/noisebell-common/src/lib.rs b/remote/noisebell-common/src/lib.rs new file mode 100644 index 0000000..002214d --- /dev/null +++ b/remote/noisebell-common/src/lib.rs @@ -0,0 +1,24 @@ +use axum::http::HeaderMap; +use serde::{Deserialize, Serialize}; + +pub fn validate_bearer(headers: &HeaderMap, expected: &str) -> bool { + headers + .get("authorization") + .and_then(|v| v.to_str().ok()) + .map(|v| v.strip_prefix("Bearer ").unwrap_or("") == expected) + .unwrap_or(false) +} + +#[derive(Debug, Clone, Serialize, Deserialize)] +pub struct WebhookPayload { + pub status: String, + pub timestamp: u64, +} + +#[derive(Debug, Clone, Serialize, Deserialize)] +pub struct HistoryEntry { + pub id: i64, + pub status: String, + pub timestamp: u64, + pub recorded_at: u64, +} diff --git a/remote/rss-service/Cargo.lock b/remote/rss-service/Cargo.lock deleted file mode 100644 index 89bdfb1..0000000 --- a/remote/rss-service/Cargo.lock +++ /dev/null @@ -1,813 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 4 - -[[package]] -name = "aho-corasick" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" -dependencies = [ - "memchr", -] - -[[package]] -name = "anyhow" -version = "1.0.102" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - -[[package]] -name = "axum" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b52af3cb4058c895d37317bb27508dccc8e5f2d39454016b297bf4a400597b8" -dependencies = [ - "axum-core", - "bytes", - "form_urlencoded", - "futures-util", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-util", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "serde_core", - "serde_json", - "serde_path_to_error", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "axum-core" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c78f31d7b1291f7ee735c1c6780ccde7785daae9a9206026862dab7d8792d1" -dependencies = [ - "bytes", - "futures-core", - "http", - "http-body", - "http-body-util", - "mime", - "pin-project-lite", - "sync_wrapper", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "bitflags" -version = "2.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" - -[[package]] -name = "bytes" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" - -[[package]] -name = "cc" -version = "1.2.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aebf35691d1bfb0ac386a69bac2fde4dd276fb618cf8bf4f5318fe285e821bb2" -dependencies = [ - "find-msvc-tools", - "shlex", -] - -[[package]] -name = "cfg-if" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" - -[[package]] -name = "deranged" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "errno" -version = "0.3.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "fallible-iterator" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" - -[[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" - -[[package]] -name = "find-msvc-tools" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" - -[[package]] -name = "foldhash" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" - -[[package]] -name = "form_urlencoded" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "futures-channel" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d" -dependencies = [ - "futures-core", -] - -[[package]] -name = "futures-core" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" - -[[package]] -name = "futures-task" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393" - -[[package]] -name = "futures-util" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" -dependencies = [ - "futures-core", - "futures-task", - "pin-project-lite", - "slab", -] - -[[package]] -name = "hashbrown" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" -dependencies = [ - "foldhash", -] - -[[package]] -name = "hashlink" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" -dependencies = [ - "hashbrown", -] - -[[package]] -name = "http" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" -dependencies = [ - "bytes", - "itoa", -] - -[[package]] -name = "http-body" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" -dependencies = [ - "bytes", - "http", -] - -[[package]] -name = "http-body-util" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" -dependencies = [ - "bytes", - "futures-core", - "http", - "http-body", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "hyper" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11" -dependencies = [ - "atomic-waker", - "bytes", - "futures-channel", - "futures-core", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "pin-utils", - "smallvec", - "tokio", -] - -[[package]] -name = "hyper-util" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0" -dependencies = [ - "bytes", - "http", - "http-body", - "hyper", - "pin-project-lite", - "tokio", - "tower-service", -] - -[[package]] -name = "itoa" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" - -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - -[[package]] -name = "libc" -version = "0.2.183" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d" - -[[package]] -name = "libsqlite3-sys" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8935b44e7c13394a179a438e0cebba0fe08fe01b54f152e29a93b5cf993fd4" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "log" -version = "0.4.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" - -[[package]] -name = "matchers" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9" -dependencies = [ - "regex-automata", -] - -[[package]] -name = "matchit" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" - -[[package]] -name = "memchr" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "mio" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" -dependencies = [ - "libc", - "wasi", - "windows-sys", -] - -[[package]] -name = "noisebell-rss" -version = "0.1.0" -dependencies = [ - "anyhow", - "axum", - "rusqlite", - "serde", - "serde_json", - "time", - "tokio", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "nu-ansi-term" -version = "0.50.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "num-conv" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050" - -[[package]] -name = "once_cell" -version = "1.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" - -[[package]] -name = "percent-encoding" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" - -[[package]] -name = "pin-project-lite" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "proc-macro2" -version = "1.0.106" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "regex-automata" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" - -[[package]] -name = "rusqlite" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c6d5e5acb6f6129fe3f7ba0a7fc77bca1942cb568535e18e7bc40262baf3110" -dependencies = [ - "bitflags", - "fallible-iterator", - "fallible-streaming-iterator", - "hashlink", - "libsqlite3-sys", - "smallvec", -] - -[[package]] -name = "ryu" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" - -[[package]] -name = "serde" -version = "1.0.228" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" -dependencies = [ - "serde_core", - "serde_derive", -] - -[[package]] -name = "serde_core" -version = "1.0.228" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.228" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.149" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" -dependencies = [ - "itoa", - "memchr", - "serde", - "serde_core", - "zmij", -] - -[[package]] -name = "serde_path_to_error" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a9ff822e371bb5403e391ecd83e182e0e77ba7f6fe0160b795797109d1b457" -dependencies = [ - "itoa", - "serde", - "serde_core", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "signal-hook-registry" -version = "1.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b" -dependencies = [ - "errno", - "libc", -] - -[[package]] -name = "slab" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" - -[[package]] -name = "smallvec" -version = "1.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" - -[[package]] -name = "socket2" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "syn" -version = "2.0.117" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" - -[[package]] -name = "thread_local" -version = "1.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "time" -version = "0.3.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c" -dependencies = [ - "deranged", - "itoa", - "num-conv", - "powerfmt", - "serde_core", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca" - -[[package]] -name = "time-macros" -version = "0.2.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "tokio" -version = "1.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d" -dependencies = [ - "libc", - "mio", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys", -] - -[[package]] -name = "tokio-macros" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c55a2eff8b69ce66c84f85e1da1c233edc36ceb85a2058d11b0d6a3c7e7569c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tower" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4" -dependencies = [ - "futures-core", - "futures-util", - "pin-project-lite", - "sync_wrapper", - "tokio", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-layer" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" - -[[package]] -name = "tower-service" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" - -[[package]] -name = "tracing" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" -dependencies = [ - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tracing-core" -version = "0.1.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex-automata", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "unicode-ident" -version = "1.0.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" - -[[package]] -name = "valuable" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "wasi" -version = "0.11.1+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" - -[[package]] -name = "windows-link" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" - -[[package]] -name = "windows-sys" -version = "0.61.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" -dependencies = [ - "windows-link", -] - -[[package]] -name = "zmij" -version = "1.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" diff --git a/remote/rss-service/Cargo.toml b/remote/rss-service/Cargo.toml index 02d31a6..5f5c40e 100644 --- a/remote/rss-service/Cargo.toml +++ b/remote/rss-service/Cargo.toml @@ -6,10 +6,11 @@ edition = "2021" [dependencies] anyhow = "1.0" axum = "0.8" -rusqlite = { version = "0.33", features = ["bundled"] } +noisebell-common = { path = "../noisebell-common" } +reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] } serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0" time = { version = "0.3", features = ["formatting"] } tokio = { version = "1", features = ["rt-multi-thread", "macros", "net", "sync", "signal"] } +tower-http = { version = "0.6", features = ["trace"] } tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["env-filter"] } diff --git a/remote/rss-service/flake.nix b/remote/rss-service/flake.nix deleted file mode 100644 index 2e0984d..0000000 --- a/remote/rss-service/flake.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - description = "Noisebell - RSS/Atom feed service"; - - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - crane.url = "github:ipetkov/crane"; - rust-overlay = { - url = "github:oxalica/rust-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - }; - - outputs = { self, nixpkgs, crane, rust-overlay }: - let - system = "x86_64-linux"; - pkgs = import nixpkgs { - inherit system; - overlays = [ rust-overlay.overlays.default ]; - }; - - rustToolchain = pkgs.rust-bin.stable.latest.default; - craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain; - - src = craneLib.cleanCargoSource ./.; - - commonArgs = { - inherit src; - strictDeps = true; - doCheck = false; - }; - - cargoArtifacts = craneLib.buildDepsOnly commonArgs; - - noisebell-rss = craneLib.buildPackage (commonArgs // { - inherit cargoArtifacts; - }); - in - { - packages.${system}.default = noisebell-rss; - - nixosModules.default = import ./module.nix self; - - devShells.${system}.default = craneLib.devShell { - packages = [ pkgs.rust-analyzer ]; - }; - }; -} diff --git a/remote/rss-service/module.nix b/remote/rss-service/module.nix index 7ad58c2..4058baf 100644 --- a/remote/rss-service/module.nix +++ b/remote/rss-service/module.nix @@ -1,9 +1,9 @@ -self: +pkg: { config, lib, ... }: let cfg = config.services.noisebell-rss; - bin = "${self.packages.x86_64-linux.default}/bin/noisebell-rss"; + bin = "${pkg}/bin/noisebell-rss"; in { options.services.noisebell-rss = { @@ -19,14 +19,9 @@ in default = 3002; }; - webhookSecretFile = lib.mkOption { - type = lib.types.path; - description = "Path to file containing the webhook secret."; - }; - - dataDir = lib.mkOption { + cacheUrl = lib.mkOption { type = lib.types.str; - default = "/var/lib/noisebell-rss"; + description = "URL of the cache service (e.g. http://localhost:3000)."; }; }; @@ -44,16 +39,15 @@ in systemd.services.noisebell-rss = { description = "Noisebell RSS/Atom feed"; wantedBy = [ "multi-user.target" ]; - after = [ "network-online.target" ]; + after = [ "network-online.target" "noisebell-cache.service" ]; wants = [ "network-online.target" ]; environment = { NOISEBELL_RSS_PORT = toString cfg.port; - NOISEBELL_RSS_DATA_DIR = cfg.dataDir; + NOISEBELL_RSS_CACHE_URL = cfg.cacheUrl; NOISEBELL_RSS_SITE_URL = "https://${cfg.domain}"; RUST_LOG = "info"; }; script = '' - export NOISEBELL_RSS_WEBHOOK_SECRET="$(cat ${cfg.webhookSecretFile})" exec ${bin} ''; serviceConfig = { @@ -62,7 +56,6 @@ in RestartSec = 5; User = "noisebell-rss"; Group = "noisebell-rss"; - StateDirectory = "noisebell-rss"; NoNewPrivileges = true; ProtectSystem = "strict"; ProtectHome = true; @@ -71,7 +64,6 @@ in ProtectKernelModules = true; ProtectControlGroups = true; RestrictSUIDSGID = true; - ReadWritePaths = [ cfg.dataDir ]; }; }; }; diff --git a/remote/rss-service/src/main.rs b/remote/rss-service/src/main.rs index eac1296..ce4c298 100644 --- a/remote/rss-service/src/main.rs +++ b/remote/rss-service/src/main.rs @@ -1,38 +1,34 @@ use std::sync::Arc; use anyhow::{Context, Result}; -use axum::extract::{Query, State}; -use axum::http::{HeaderMap, StatusCode, header}; +use axum::extract::State; +use axum::http::{StatusCode, header}; use axum::response::IntoResponse; -use axum::routing::{get, post}; -use axum::{Json, Router}; -use rusqlite::Connection; -use serde::Deserialize; -use tokio::sync::Mutex; -use tracing::{error, info}; +use axum::routing::get; +use axum::Router; +use noisebell_common::HistoryEntry; +use tower_http::trace::TraceLayer; +use tracing::{error, info, Level}; struct AppState { - db: Arc>, - webhook_secret: String, + client: reqwest::Client, + cache_url: String, site_url: String, } -#[derive(Deserialize)] -struct WebhookPayload { - status: String, - timestamp: u64, -} - -#[derive(Deserialize)] -struct FeedQuery { - limit: Option, -} - fn unix_to_rfc3339(ts: u64) -> String { let dt = time::OffsetDateTime::from_unix_timestamp(ts as i64).unwrap_or(time::OffsetDateTime::UNIX_EPOCH); dt.format(&time::format_description::well_known::Rfc3339).unwrap_or_else(|_| "1970-01-01T00:00:00Z".to_string()) } +fn escape_xml(s: &str) -> String { + s.replace('&', "&") + .replace('<', "<") + .replace('>', ">") + .replace('"', """) + .replace('\'', "'") +} + fn status_description(status: &str) -> &str { match status { "open" => "The door at Noisebridge is open.", @@ -51,28 +47,6 @@ fn status_title(status: &str) -> &str { } } -fn validate_bearer(headers: &HeaderMap, expected: &str) -> bool { - headers - .get("authorization") - .and_then(|v| v.to_str().ok()) - .map(|v| v.strip_prefix("Bearer ").unwrap_or("") == expected) - .unwrap_or(false) -} - -fn init_db(path: &str) -> Result { - let conn = Connection::open(path).context("failed to open SQLite database")?; - conn.execute_batch( - "CREATE TABLE IF NOT EXISTS events ( - id INTEGER PRIMARY KEY AUTOINCREMENT, - status TEXT NOT NULL, - timestamp INTEGER NOT NULL, - received_at INTEGER NOT NULL - );", - ) - .context("failed to initialize database schema")?; - Ok(conn) -} - fn unix_now() -> u64 { std::time::SystemTime::now() .duration_since(std::time::UNIX_EPOCH) @@ -80,65 +54,37 @@ fn unix_now() -> u64 { .as_secs() } -async fn post_webhook( - State(state): State>, - headers: HeaderMap, - Json(body): Json, -) -> StatusCode { - if !validate_bearer(&headers, &state.webhook_secret) { - return StatusCode::UNAUTHORIZED; - } - - let now = unix_now(); - let conn = state.db.lock().await; - match conn.execute( - "INSERT INTO events (status, timestamp, received_at) VALUES (?1, ?2, ?3)", - rusqlite::params![body.status, body.timestamp, now], - ) { - Ok(_) => { - info!(status = %body.status, timestamp = body.timestamp, "event recorded"); - StatusCode::OK - } - Err(e) => { - error!(error = %e, "failed to insert event"); - StatusCode::INTERNAL_SERVER_ERROR - } - } -} - async fn get_feed( State(state): State>, - Query(query): Query, ) -> impl IntoResponse { - let limit = query.limit.unwrap_or(50); - let conn = state.db.lock().await; + let url = format!("{}/history", state.cache_url); - let mut stmt = match conn.prepare( - "SELECT status, timestamp FROM events ORDER BY id DESC LIMIT ?1", - ) { - Ok(s) => s, + let resp = match state.client.get(&url).send().await { + Ok(resp) if resp.status().is_success() => resp, + Ok(resp) => { + error!(status = %resp.status(), "cache service returned error"); + return (StatusCode::BAD_GATEWAY, "upstream error").into_response(); + } Err(e) => { - error!(error = %e, "failed to prepare query"); - return (StatusCode::INTERNAL_SERVER_ERROR, "internal error").into_response(); + error!(error = %e, "failed to reach cache service"); + return (StatusCode::BAD_GATEWAY, "upstream unavailable").into_response(); } }; - let entries: Vec<(String, u64)> = match stmt - .query_map(rusqlite::params![limit], |row| { - Ok((row.get::<_, String>(0)?, row.get::<_, u64>(1)?)) - }) { - Ok(rows) => rows.filter_map(|r| r.ok()).collect(), + let entries: Vec = match resp.json().await { + Ok(entries) => entries, Err(e) => { - error!(error = %e, "failed to query events"); - return (StatusCode::INTERNAL_SERVER_ERROR, "internal error").into_response(); + error!(error = %e, "failed to parse cache response"); + return (StatusCode::BAD_GATEWAY, "invalid upstream response").into_response(); } }; let updated = entries .first() - .map(|(_, ts)| unix_to_rfc3339(*ts)) + .map(|e| unix_to_rfc3339(e.timestamp)) .unwrap_or_else(|| unix_to_rfc3339(unix_now())); + let site_url = escape_xml(&state.site_url); let mut xml = format!( r#" @@ -148,24 +94,26 @@ async fn get_feed( urn:noisebell:door-status {updated} "#, - site_url = state.site_url, - updated = updated, ); - for (status, timestamp) in &entries { - let ts_rfc = unix_to_rfc3339(*timestamp); + let seven_days_ago = unix_now().saturating_sub(7 * 24 * 60 * 60); + for entry in &entries { + if entry.timestamp < seven_days_ago { + continue; + } + let ts_rfc = unix_to_rfc3339(entry.timestamp); xml.push_str(&format!( r#" {title} - urn:noisebell:event:{timestamp} + urn:noisebell:event:{id} {ts} {description} "#, - title = status_title(status), - timestamp = timestamp, + title = escape_xml(status_title(&entry.status)), + id = entry.id, ts = ts_rfc, - description = status_description(status), + description = escape_xml(status_description(&entry.status)), )); } @@ -190,30 +138,33 @@ async fn main() -> Result<()> { .parse() .context("NOISEBELL_RSS_PORT must be a valid u16")?; - let webhook_secret = std::env::var("NOISEBELL_RSS_WEBHOOK_SECRET") - .context("NOISEBELL_RSS_WEBHOOK_SECRET is required")?; - - let data_dir = - std::env::var("NOISEBELL_RSS_DATA_DIR").unwrap_or_else(|_| "/var/lib/noisebell-rss".into()); + let cache_url = std::env::var("NOISEBELL_RSS_CACHE_URL") + .context("NOISEBELL_RSS_CACHE_URL is required")?; let site_url = std::env::var("NOISEBELL_RSS_SITE_URL") - .unwrap_or_else(|_| format!("https://rss.noisebell.extremist.software")); + .unwrap_or_else(|_| "https://rss.noisebell.extremist.software".to_string()); - info!(port, "starting noisebell-rss"); + info!(port, %cache_url, "starting noisebell-rss"); - let db_path = format!("{data_dir}/rss.db"); - let conn = init_db(&db_path)?; - let db = Arc::new(Mutex::new(conn)); + let client = reqwest::Client::builder() + .timeout(std::time::Duration::from_secs(10)) + .build() + .context("failed to build HTTP client")?; let app_state = Arc::new(AppState { - db, - webhook_secret, + client, + cache_url, site_url, }); let app = Router::new() - .route("/webhook", post(post_webhook)) + .route("/health", get(|| async { StatusCode::OK })) .route("/feed", get(get_feed)) + .layer( + TraceLayer::new_for_http() + .make_span_with(tower_http::trace::DefaultMakeSpan::new().level(Level::INFO)) + .on_response(tower_http::trace::DefaultOnResponse::new().level(Level::INFO)), + ) .with_state(app_state); let listener = tokio::net::TcpListener::bind(("0.0.0.0", port))