Mirror/brk
1
0
Fork 0
mirror of https://github.com/bitcoinresearchkit/brk.git synced 2026-07-17 05:58:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

ci: outdated

Browse Source
This commit is contained in:
nym21
2026-01-27 17:52:40 +01:00
parent 88145d08e5
commit 730e83472a
12 changed files with 500 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/brk_server/src/api/metrics/bulk.rs
+5 -3
View File
@@ -1,6 +1,7 @@
use std::time::Duration;
use std::{net::SocketAddr, time::Duration};
use axum::{
Extension,
body::Body,
extract::{Query, State},
http::{HeaderMap, StatusCode, Uri},
@@ -11,7 +12,7 @@ use quick_cache::sync::GuardResult;
use crate::{
Result,
api::metrics::{CACHE_CONTROL, MAX_WEIGHT},
api::metrics::{CACHE_CONTROL, max_weight},
extended::HeaderMapExtended,
};
@@ -20,11 +21,12 @@ use super::AppState;
pub async fn handler(
uri: Uri,
headers: HeaderMap,
Extension(addr): Extension<SocketAddr>,
Query(params): Query<MetricSelection>,
State(AppState { query, cache, .. }): State<AppState>,
) -> Result<Response> {
// Phase 1: Search and resolve metadata (cheap)
let resolved = query.run(move |q| q.resolve(params, MAX_WEIGHT)).await?;
let resolved = query.run(move |q| q.resolve(params, max_weight(&addr))).await?;
let format = resolved.format();
let etag = resolved.etag();
crates/brk_server/src/api/metrics/data.rs
+5 -3
View File
@@ -1,6 +1,7 @@
use std::time::Duration;
use std::{net::SocketAddr, time::Duration};
use axum::{
Extension,
body::Body,
extract::{Query, State},
http::{HeaderMap, StatusCode, Uri},
@@ -11,7 +12,7 @@ use quick_cache::sync::GuardResult;
use crate::{
Result,
api::metrics::{CACHE_CONTROL, MAX_WEIGHT},
api::metrics::{CACHE_CONTROL, max_weight},
extended::HeaderMapExtended,
};
@@ -20,11 +21,12 @@ use super::AppState;
pub async fn handler(
uri: Uri,
headers: HeaderMap,
Extension(addr): Extension<SocketAddr>,
Query(params): Query<MetricSelection>,
State(AppState { query, cache, .. }): State<AppState>,
) -> Result<Response> {
// Phase 1: Search and resolve metadata (cheap)
let resolved = query.run(move |q| q.resolve(params, MAX_WEIGHT)).await?;
let resolved = query.run(move |q| q.resolve(params, max_weight(&addr))).await?;
let format = resolved.format();
let etag = resolved.etag();
crates/brk_server/src/api/metrics/legacy.rs
+5 -3
View File
@@ -1,6 +1,7 @@
use std::time::Duration;
use std::{net::SocketAddr, time::Duration};
use axum::{
Extension,
body::Body,
extract::{Query, State},
http::{HeaderMap, StatusCode, Uri},
@@ -11,7 +12,7 @@ use quick_cache::sync::GuardResult;
use crate::{
Result,
api::metrics::{CACHE_CONTROL, MAX_WEIGHT},
api::metrics::{CACHE_CONTROL, max_weight},
extended::HeaderMapExtended,
};
@@ -20,11 +21,12 @@ use super::AppState;
pub async fn handler(
uri: Uri,
headers: HeaderMap,
Extension(addr): Extension<SocketAddr>,
Query(params): Query<MetricSelection>,
State(AppState { query, cache, .. }): State<AppState>,
) -> Result<Response> {
// Phase 1: Search and resolve metadata (cheap)
let resolved = query.run(move |q| q.resolve(params, MAX_WEIGHT)).await?;
let resolved = query.run(move |q| q.resolve(params, max_weight(&addr))).await?;
let format = resolved.format();
let etag = resolved.etag();
crates/brk_server/src/api/metrics/mod.rs
+21 -4
View File
@@ -1,5 +1,8 @@
use std::net::SocketAddr;
use aide::axum::{ApiRouter, routing::get_with};
use axum::{
Extension,
extract::{Path, Query, State},
http::{HeaderMap, Uri},
response::{IntoResponse, Response},
@@ -23,6 +26,16 @@ const MAX_WEIGHT: usize = 65 * 10_000;
/// Cache control header for metric data responses
const CACHE_CONTROL: &str = "public, max-age=1, must-revalidate";
/// Returns the max weight for a request based on the client address.
/// Localhost requests have no weight limit.
fn max_weight(addr: &SocketAddr) -> usize {
if addr.ip().is_loopback() {
usize::MAX
} else {
MAX_WEIGHT
}
}
pub trait ApiMetricsRoutes {
fn add_metrics_routes(self) -> Self;
}
@@ -159,6 +172,7 @@ impl ApiMetricsRoutes for ApiRouter<AppState> {
get_with(
async |uri: Uri,
headers: HeaderMap,
addr: Extension<SocketAddr>,
state: State<AppState>,
Path(path): Path<MetricWithIndex>,
Query(range): Query<DataRangeFormat>|
@@ -166,6 +180,7 @@ impl ApiMetricsRoutes for ApiRouter<AppState> {
data::handler(
uri,
headers,
addr,
Query(MetricSelection::from((path.index, path.metric, range))),
state,
)
@@ -189,8 +204,8 @@ impl ApiMetricsRoutes for ApiRouter<AppState> {
.api_route(
"/api/metrics/bulk",
get_with(
|uri, headers, query, state| async move {
bulk::handler(uri, headers, query, state).await.into_response()
|uri, headers, addr, query, state| async move {
bulk::handler(uri, headers, addr, query, state).await.into_response()
},
|op| op
.id("get_metrics")
@@ -210,6 +225,7 @@ impl ApiMetricsRoutes for ApiRouter<AppState> {
get_with(
async |uri: Uri,
headers: HeaderMap,
addr: Extension<SocketAddr>,
Path(variant): Path<String>,
Query(range): Query<DataRangeFormat>,
state: State<AppState>|
@@ -228,7 +244,7 @@ impl ApiMetricsRoutes for ApiRouter<AppState> {
Metrics::from(split.collect::<Vec<_>>().join(separator)),
range,
));
legacy::handler(uri, headers, Query(params), state)
legacy::handler(uri, headers, addr, Query(params), state)
.await
.into_response()
},
@@ -251,11 +267,12 @@ impl ApiMetricsRoutes for ApiRouter<AppState> {
get_with(
async |uri: Uri,
headers: HeaderMap,
addr: Extension<SocketAddr>,
Query(params): Query<MetricSelectionLegacy>,
state: State<AppState>|
-> Response {
let params: MetricSelection = params.into();
legacy::handler(uri, headers, Query(params), state)
legacy::handler(uri, headers, addr, Query(params), state)
.await
.into_response()
},
crates/brk_server/src/lib.rs
+16 -6
View File
@@ -1,6 +1,7 @@
#![doc = include_str!("../README.md")]
use std::{
net::SocketAddr,
path::PathBuf,
sync::Arc,
time::{Duration, Instant},
@@ -8,7 +9,7 @@ use std::{
use aide::axum::ApiRouter;
use axum::{
Extension, ServiceExt,
Extension,
body::Body,
http::{Request, Response, StatusCode, Uri},
middleware::Next,
@@ -24,7 +25,6 @@ use tower_http::{
compression::CompressionLayer, cors::CorsLayer, normalize_path::NormalizePathLayer,
timeout::TimeoutLayer, trace::TraceLayer,
};
use tower_layer::Layer;
use tracing::{error, info};
mod api;
@@ -66,6 +66,16 @@ impl Server {
let compression_layer = CompressionLayer::new().br(true).gzip(true).zstd(true);
let connect_info_layer = axum::middleware::from_fn(
async |connect_info: axum::extract::ConnectInfo<SocketAddr>,
mut request: Request<Body>,
next: Next|
-> Response<Body> {
request.extensions_mut().insert(connect_info.0);
next.run(request).await
},
);
let response_uri_layer = axum::middleware::from_fn(
async |request: Request<Body>, next: Next| -> Response<Body> {
let uri = request.uri().clone();
@@ -114,7 +124,9 @@ impl Server {
StatusCode::GATEWAY_TIMEOUT,
Duration::from_secs(5),
))
.layer(CorsLayer::permissive());
.layer(CorsLayer::permissive())
.layer(connect_info_layer)
.layer(NormalizePathLayer::trim_trailing_slash());
let (listener, port) = match port {
Some(port) => {
@@ -173,11 +185,9 @@ impl Server {
.layer(Extension(Arc::new(openapi)))
.layer(Extension(api_json));
let service = NormalizePathLayer::trim_trailing_slash().layer(router);
serve(
listener,
ServiceExt::<Request<Body>>::into_make_service(service),
router.into_make_service_with_connect_info::<SocketAddr>(),
)
.await?;