tranquil.farm
Currently, the endpoint only returns a plain text message depending on the state of the PDS. This is behaviour that is not congruent with most other PDSes, which provide a basic JSON response containing the version number and (on third-party implementation) a prefix for the implementation's name. The result is that tools such as atproto-scraping and PDSwatch are unable to recognize tranquil or the version number. This PR fixes the behaviour (and is also my first PR with Rust so let me know if there are any changes that need to be made).
+14
-3
crates/tranquil-pds/src/api/server/meta.rs
+14
-3
crates/tranquil-pds/src/api/server/meta.rs
···
1
+
use crate::BUILD_VERSION;
1
2
use crate::state::AppState;
2
3
use crate::util::{discord_app_id, discord_bot_username, telegram_bot_username};
3
4
use axum::{Json, extract::State, http::StatusCode, response::IntoResponse};
···
55
56
"did": format!("did:web:{}", pds_hostname),
56
57
"links": links,
57
58
"contact": contact,
58
-
"version": env!("CARGO_PKG_VERSION"),
59
+
"version": BUILD_VERSION,
59
60
"availableCommsChannels": get_available_comms_channels(),
60
61
"selfHostedDidWebEnabled": is_self_hosted_did_web_enabled()
61
62
});
···
72
73
}
73
74
pub async fn health(State(state): State<AppState>) -> impl IntoResponse {
74
75
match state.infra_repo.health_check().await {
75
-
Ok(true) => (StatusCode::OK, "OK"),
76
-
_ => (StatusCode::SERVICE_UNAVAILABLE, "Service Unavailable"),
76
+
Ok(true) => (
77
+
StatusCode::OK,
78
+
Json(json!({
79
+
"version": format!("tranquil {}", BUILD_VERSION)
80
+
})),
81
+
),
82
+
_ => (
83
+
StatusCode::SERVICE_UNAVAILABLE,
84
+
Json(json!({
85
+
"error": "Service Unavailable"
86
+
})),
87
+
),
77
88
}
78
89
}
+10
crates/tranquil-pds/src/lib.rs
+10
crates/tranquil-pds/src/lib.rs
···
43
43
pub use tranquil_db_traits::AccountStatus;
44
44
pub use types::{AccountState, AtIdentifier, AtUri, Did, Handle, Nsid, Rkey};
45
45
46
+
#[cfg(debug_assertions)]
47
+
pub const BUILD_VERSION: &str = concat!(
48
+
env!("CARGO_PKG_VERSION"),
49
+
" (built ",
50
+
env!("BUILD_TIMESTAMP"),
51
+
")"
52
+
);
53
+
#[cfg(not(debug_assertions))]
54
+
pub const BUILD_VERSION: &str = env!("CARGO_PKG_VERSION");
55
+
46
56
pub fn app(state: AppState) -> Router {
47
57
let xrpc_router = Router::new()
48
58
.route("/_health", get(api::server::health))
+1
-10
crates/tranquil-pds/src/main.rs
+1
-10
crates/tranquil-pds/src/main.rs
···
5
5
use std::sync::Arc;
6
6
use tokio_util::sync::CancellationToken;
7
7
use tracing::{error, info, warn};
8
+
use tranquil_pds::BUILD_VERSION;
8
9
use tranquil_pds::comms::{CommsService, DiscordSender, EmailSender, SignalSender, TelegramSender};
9
10
10
-
#[cfg(debug_assertions)]
11
-
const BUILD_VERSION: &str = concat!(
12
-
env!("CARGO_PKG_VERSION"),
13
-
" (built ",
14
-
env!("BUILD_TIMESTAMP"),
15
-
")"
16
-
);
17
-
#[cfg(not(debug_assertions))]
18
-
const BUILD_VERSION: &str = env!("CARGO_PKG_VERSION");
19
-
20
11
use tranquil_pds::crawlers::{Crawlers, start_crawlers_service};
21
12
use tranquil_pds::scheduled::{
22
13
backfill_genesis_commit_blocks, backfill_record_blobs, backfill_repo_rev, backfill_user_blocks,
History
4 rounds
7 comments
diddyfo.id
submitted
#3
1 commit
expand
collapse
e567d169
feat: add version information to _health endpoint
expand 2 comments
okay yea that patch looks muuuch better. thanks!
pull request successfully merged
diddyfo.id
submitted
#2
3 commits
expand
collapse
68058306
feat: send version information on _health
7406f4e8
move and utilize BUILD_VERSION variable
98d44072
relocate BUILD_VERSION to lib.rs
expand 2 comments
This probably needs to be squashed when merging lol
oookay yea i think ... tangled is really hating this for whatever reason. knowing tangled its maybe because your branch is made off of one commit older than the current main branch? maybe rebasing (and maybe squashing) onto current main and resubmitting will fix it?
otherwise i might merge this manually and not through tangled because this ... doesnt look great. knowing that tangled uses the generated patches to do the merge i dont want to try and merge it with tangled when the patches are this messy ...
code itself looks fine when looking directly at the repo tho so! thank you!
diddyfo.id
submitted
#1
2 commits
expand
collapse
68058306
feat: send version information on _health
7406f4e8
move and utilize BUILD_VERSION variable
expand 2 comments
I couldn't figure out how to make the BUILD_VERSION constant public(crate) without getting an error about it being private so I moved it to the meta file and used it from there. If this isn't the right way to do it please let me know
ah right i forgot. its because the health endpoint handler is defined in the lib crate of that cargo package and the main.rs is the bin crate of that package. so pub(crate) makes it available to the bin crate but not the lib crate. and a plain pub wont work either since bin depends on lib so lib cant depend on bin.
putting BUILD_VERSION in meta.rs isnt a bad solution but i think id prefer it in lib.rs itself (right above the app function). so its at the top level of the lib crate just like it was at the top level of the bin crate. im a bit nitpicky heh 馃槄
diddyfo.id
submitted
#0
1 commit
expand
collapse
68058306
feat: send version information on _health
expand 1 comment
hmm i think instead of reading CARGO_PKG_VERSION here make the BUILD_VERSION const in tranquil-pds/src/main.rs pub(crate) and then use that for the version here. so we keep one source of truth for the version. otherwise good! thank you!
took a while but it should be ready to merge now!