Compare commits

...

2 Commits

Author SHA1 Message Date
ab 27ee56c5b7 CORE: added prom metrics on /metrics
Build and Publish / Build and Publish Docker Image (push) Successful in 2m2s
2026-06-01 16:08:49 +03:00
ab 88b5c7f7d1 UI: fixed some ui issues
Build and Publish / Build and Publish Docker Image (push) Successful in 3m23s
2026-06-01 14:53:51 +03:00
19 changed files with 1444 additions and 223 deletions
Generated
+2 -1
View File
@@ -1418,7 +1418,7 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
[[package]]
name = "furumusic"
version = "0.2.10"
version = "0.2.11"
dependencies = [
"anyhow",
"async-trait",
@@ -1441,6 +1441,7 @@ dependencies = [
"symphonia",
"tokio",
"tokio-cron-scheduler",
"tower",
"tracing",
"tracing-subscriber",
"uuid",
+2 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "furumusic"
version = "0.2.10"
version = "0.2.12"
edition = "2024"
description = "Reusable web-app boilerplate: auth, OIDC/SSO, admin panel, user management, i18n, PostgreSQL"
@@ -11,6 +11,7 @@ serde = { version = "1", features = ["derive"] }
openidconnect = "4.0"
reqwest = { version = "0.12", default-features = false, features = ["rustls-tls", "json"] }
tokio = { version = "1", features = ["sync", "fs", "io-util"] }
tower = "0.5"
base64 = "0.22"
serde_json = "1"
tracing = "0.1"
+201 -6
View File
@@ -1,4 +1,5 @@
use std::collections::{HashMap, HashSet};
use std::path::Path;
use cot::db::{Database, Model};
use cot::html::Html;
@@ -150,6 +151,7 @@ struct AdminDashboardDto {
user: AdminUserDto,
build: BuildDto,
stats: OverviewStatsDto,
runtime: RuntimeOverviewDto,
reviews: ReviewPageDto,
jobs: Vec<JobDto>,
recent_runs: Vec<JobRunDto>,
@@ -167,6 +169,40 @@ struct OverviewStatsDto {
hidden_artists: i64,
}
#[derive(Debug, Serialize, JsonSchema)]
struct RuntimeOverviewDto {
agent: AgentStatusDto,
storage: Vec<StoragePathDto>,
node: NodeStatsDto,
}
#[derive(Debug, Serialize, JsonSchema)]
struct AgentStatusDto {
status: String,
enabled: bool,
llm_configured: bool,
model: String,
concurrency: u64,
}
#[derive(Debug, Serialize, JsonSchema)]
struct StoragePathDto {
label: String,
path: String,
exists: bool,
free_bytes: Option<u64>,
total_bytes: Option<u64>,
}
#[derive(Debug, Serialize, JsonSchema)]
struct NodeStatsDto {
hostname: String,
os: &'static str,
arch: &'static str,
pid: u32,
cpu_count: usize,
}
#[derive(Debug, Serialize, JsonSchema)]
struct StatusCountDto {
status: String,
@@ -565,6 +601,8 @@ pub async fn dashboard(
limit: Some(80),
offset: Some(0),
};
let (config, _) = AppConfig::load_with_db(&db).await;
let runtime = load_runtime_overview(&config);
let (reviews, stats, jobs, recent_runs, library) = tokio::try_join!(
load_review_page(pool, reviews_query),
load_overview_stats(pool),
@@ -582,6 +620,7 @@ pub async fn dashboard(
},
build: build_dto(),
stats,
runtime,
reviews,
jobs,
recent_runs,
@@ -965,7 +1004,9 @@ pub async fn run_metadata_backfill(
let duration_ms = start.elapsed().as_millis() as i64;
match result {
Ok(()) => {
let _ = run.set_completed(&db_for_task, duration_ms, &log.output()).await;
let _ = run
.set_completed(&db_for_task, duration_ms, &log.output())
.await;
}
Err(err) => {
let _ = run
@@ -1233,11 +1274,13 @@ pub async fn update_library_item(
.map_err(|e| cot::Error::internal(e.to_string()))?;
}
} else {
sqlx::query("DELETE FROM furumusic__track_artist WHERE track_id = $1 AND role = 'main'")
.bind(body.id)
.execute(pool)
.await
.map_err(|e| cot::Error::internal(e.to_string()))?;
sqlx::query(
"DELETE FROM furumusic__track_artist WHERE track_id = $1 AND role = 'main'",
)
.bind(body.id)
.execute(pool)
.await
.map_err(|e| cot::Error::internal(e.to_string()))?;
for (position, artist_id) in artist_ids.iter().enumerate() {
sqlx::query(
"INSERT INTO furumusic__track_artist (track_id, artist_id, role, position) VALUES ($1, $2, 'main', $3)",
@@ -1511,6 +1554,158 @@ async fn load_overview_stats(pool: &PgPool) -> anyhow::Result<OverviewStatsDto>
})
}
fn load_runtime_overview(config: &AppConfig) -> RuntimeOverviewDto {
let llm_configured = !config.agent_llm_url.trim().is_empty();
let agent_status = if !config.agent_enabled {
"disabled"
} else if !llm_configured {
"not_configured"
} else {
"enabled"
};
RuntimeOverviewDto {
agent: AgentStatusDto {
status: agent_status.to_owned(),
enabled: config.agent_enabled,
llm_configured,
model: config.agent_llm_model.clone(),
concurrency: config.agent_concurrency,
},
storage: vec![
storage_path_dto("Inbox", &config.agent_inbox_dir),
storage_path_dto("Library", &config.agent_storage_dir),
],
node: NodeStatsDto {
hostname: node_hostname(),
os: std::env::consts::OS,
arch: std::env::consts::ARCH,
pid: std::process::id(),
cpu_count: std::thread::available_parallelism()
.map(|count| count.get())
.unwrap_or(1),
},
}
}
fn storage_path_dto(label: &str, raw_path: &str) -> StoragePathDto {
let path = raw_path.trim();
let path_ref = Path::new(path);
let usage = if path.is_empty() {
None
} else {
disk_usage(path_ref).or_else(|| {
path_ref
.parent()
.filter(|parent| !parent.as_os_str().is_empty())
.and_then(disk_usage)
})
};
StoragePathDto {
label: label.to_owned(),
path: path.to_owned(),
exists: !path.is_empty() && path_ref.exists(),
free_bytes: usage.map(|value| value.free_bytes),
total_bytes: usage.map(|value| value.total_bytes),
}
}
fn node_hostname() -> String {
std::env::var("HOSTNAME")
.or_else(|_| std::env::var("COMPUTERNAME"))
.unwrap_or_else(|_| "unknown".to_owned())
}
#[derive(Debug, Clone, Copy)]
struct DiskUsage {
free_bytes: u64,
total_bytes: u64,
}
#[cfg(windows)]
fn disk_usage(path: &Path) -> Option<DiskUsage> {
use std::os::windows::ffi::OsStrExt;
#[link(name = "kernel32")]
unsafe extern "system" {
fn GetDiskFreeSpaceExW(
lpDirectoryName: *const u16,
lpFreeBytesAvailableToCaller: *mut u64,
lpTotalNumberOfBytes: *mut u64,
lpTotalNumberOfFreeBytes: *mut u64,
) -> i32;
}
let mut wide: Vec<u16> = path.as_os_str().encode_wide().collect();
wide.push(0);
let mut free_available = 0_u64;
let mut total = 0_u64;
let mut total_free = 0_u64;
let ok = unsafe {
GetDiskFreeSpaceExW(
wide.as_ptr(),
&mut free_available,
&mut total,
&mut total_free,
)
};
(ok != 0).then_some(DiskUsage {
free_bytes: free_available,
total_bytes: total,
})
}
#[cfg(any(target_os = "linux", target_os = "android"))]
fn disk_usage(path: &Path) -> Option<DiskUsage> {
use std::ffi::CString;
use std::os::unix::ffi::OsStrExt;
#[repr(C)]
struct Statvfs {
f_bsize: std::ffi::c_ulong,
f_frsize: std::ffi::c_ulong,
f_blocks: std::ffi::c_ulong,
f_bfree: std::ffi::c_ulong,
f_bavail: std::ffi::c_ulong,
f_files: std::ffi::c_ulong,
f_ffree: std::ffi::c_ulong,
f_favail: std::ffi::c_ulong,
f_fsid: std::ffi::c_ulong,
f_flag: std::ffi::c_ulong,
f_namemax: std::ffi::c_ulong,
__f_spare: [std::ffi::c_int; 6],
}
unsafe extern "C" {
fn statvfs(path: *const std::ffi::c_char, buf: *mut Statvfs) -> std::ffi::c_int;
}
let c_path = CString::new(path.as_os_str().as_bytes()).ok()?;
let mut stat = std::mem::MaybeUninit::<Statvfs>::uninit();
let ok = unsafe { statvfs(c_path.as_ptr(), stat.as_mut_ptr()) };
if ok != 0 {
return None;
}
let stat = unsafe { stat.assume_init() };
let fragment_size = if stat.f_frsize > 0 {
stat.f_frsize as u64
} else {
stat.f_bsize as u64
};
Some(DiskUsage {
free_bytes: stat.f_bavail as u64 * fragment_size,
total_bytes: stat.f_blocks as u64 * fragment_size,
})
}
#[cfg(not(any(windows, target_os = "linux", target_os = "android")))]
fn disk_usage(_path: &Path) -> Option<DiskUsage> {
None
}
async fn load_library_overview(pool: &PgPool) -> anyhow::Result<LibraryOverviewDto> {
let stats = load_overview_stats(pool).await?;
Ok(LibraryOverviewDto {
+11 -1
View File
@@ -128,13 +128,21 @@ pub async fn find_best_cover(folder: &Path, audio_files: &[PathBuf]) -> Option<C
match tokio::fs::read(img_path).await {
Ok(data) if !data.is_empty() => {
let mime = mime_for_image(img_path);
crate::metrics::record_agent_cover_lookup("folder", "ok", data.len());
return Some(CoverImage {
data,
mime_type: mime,
source: CoverSource::FolderFile(img_path.clone()),
});
}
_ => continue,
Ok(_) => {
crate::metrics::record_agent_cover_lookup("folder", "empty", 0);
continue;
}
Err(_) => {
crate::metrics::record_agent_cover_lookup("folder", "error", 0);
continue;
}
}
}
@@ -143,10 +151,12 @@ pub async fn find_best_cover(folder: &Path, audio_files: &[PathBuf]) -> Option<C
let path = audio_path.to_path_buf();
let result = tokio::task::spawn_blocking(move || extract_embedded_cover(&path)).await;
if let Ok(Some(cover)) = result {
crate::metrics::record_agent_cover_lookup("embedded", "ok", cover.data.len());
return Some(cover);
}
}
crate::metrics::record_agent_cover_lookup("none", "not_found", 0);
None
}
+18 -2
View File
@@ -74,6 +74,7 @@ fn generate_missing_variants_sync(
let mut created = 0usize;
for variant in variants {
let start = std::time::Instant::now();
let path = variant_path(original_path, *variant);
if path.exists() {
continue;
@@ -88,12 +89,27 @@ fn generate_missing_variants_sync(
.to_rgb8();
let mut output = Vec::new();
let mut encoder = JpegEncoder::new_with_quality(&mut output, variant.quality);
encoder.encode(
let result = encoder.encode(
&resized,
resized.width(),
resized.height(),
image::ExtendedColorType::Rgb8,
)?;
);
match result {
Ok(()) => crate::metrics::record_agent_cover_variant(
variant.name,
"ok",
start.elapsed(),
),
Err(err) => {
crate::metrics::record_agent_cover_variant(
variant.name,
"error",
start.elapsed(),
);
return Err(err.into());
}
}
std::fs::write(path, output)?;
created += 1;
}
+30 -2
View File
@@ -330,6 +330,7 @@ pub async fn normalize_batch(
// If over 80% of context limit and more than 1 file, split
let limit_80 = context_limit * 80 / 100;
if estimated > limit_80 && files.len() > 1 {
crate::metrics::record_agent_llm_split("estimated_context");
tracing::info!(
estimated_tokens = estimated,
context_limit,
@@ -419,6 +420,7 @@ pub async fn normalize_batch(
|| err_str.contains("length")
|| err_str.contains("token");
if is_context_error {
crate::metrics::record_agent_llm_split("context_error");
tracing::warn!(
file_count = files.len(),
"LLM error suggests context overflow, splitting batch: {e}"
@@ -466,14 +468,40 @@ pub async fn normalize_batch(
}
return Err(e);
}
Err(e) => return Err(e),
Err(e) => {
crate::metrics::record_agent_llm(
llm_model,
"error",
std::time::Duration::from_millis(duration_ms),
0,
0,
files.len(),
Some(estimated),
);
return Err(e);
}
};
let prompt_tokens = usage.prompt_tokens.unwrap_or(0) as u64;
let completion_tokens = usage.completion_tokens.unwrap_or(0) as u64;
crate::metrics::record_agent_llm(
&resp_model,
"ok",
std::time::Duration::from_millis(duration_ms),
prompt_tokens,
completion_tokens,
files.len(),
Some(estimated),
);
// Parse batch response
let results = parse_batch_response(&response_text, &files)?;
let results = match parse_batch_response(&response_text, &files) {
Ok(results) => results,
Err(error) => {
crate::metrics::record_agent_llm_parse_failure(&resp_model);
return Err(error);
}
};
Ok(BatchNormalizeResult {
results,
+4
View File
@@ -61,6 +61,7 @@ pub async fn get_session_user(session: &Session, db: &Database) -> Option<Authen
display
}
};
crate::metrics::record_active_user(user.id_val());
Some(AuthenticatedUser {
id: user.id_val(),
name,
@@ -75,9 +76,11 @@ pub async fn require_admin_or_redirect(
db: &Database,
) -> Result<AuthenticatedUser, cot::response::Response> {
let Some(user) = get_session_user(session, db).await else {
crate::metrics::record_authorization_denied("unauthenticated");
return Err(redirect("/login"));
};
if user.role != Role::Admin {
crate::metrics::record_authorization_denied("forbidden");
return Err("Forbidden"
.with_status(cot::http::StatusCode::FORBIDDEN)
.into_response()
@@ -96,6 +99,7 @@ pub async fn login(session: &Session, user_id: i64) -> cot::Result<()> {
.insert(SESSION_USER_ID, user_id)
.await
.map_err(|e| cot::Error::internal(e.to_string()))?;
crate::metrics::record_active_user(user_id);
Ok(())
}
+34 -2
View File
@@ -29,6 +29,8 @@ impl Job for InboxDiscoverJob {
}
async fn run(&self, ctx: &JobContext, log: &mut JobLog) -> anyhow::Result<()> {
let run_start = std::time::Instant::now();
let run_outcome = "completed";
// Prevent overlapping discover runs
if DISCOVER_RUNNING
.compare_exchange(false, true, Ordering::SeqCst, Ordering::SeqCst)
@@ -44,6 +46,19 @@ impl Job for InboxDiscoverJob {
}
}
let _guard = Guard;
struct MetricsGuard {
start: std::time::Instant,
outcome: &'static str,
}
impl Drop for MetricsGuard {
fn drop(&mut self) {
crate::metrics::record_agent_discover_run(self.outcome, self.start.elapsed());
}
}
let mut metrics_guard = MetricsGuard {
start: run_start,
outcome: run_outcome,
};
let config = &ctx.config;
@@ -97,6 +112,7 @@ impl Job for InboxDiscoverJob {
// Compute SHA-256 hash
let path_clone = file_path.to_path_buf();
let hash_start = std::time::Instant::now();
let (hash, file_size) =
match tokio::task::spawn_blocking(move || -> anyhow::Result<(String, i64)> {
let data = std::fs::read(&path_clone)?;
@@ -107,8 +123,12 @@ impl Job for InboxDiscoverJob {
})
.await?
{
Ok(v) => v,
Ok(v) => {
crate::metrics::record_agent_file_hash(hash_start.elapsed(), v.1, "ok");
v
}
Err(e) => {
crate::metrics::record_agent_file_hash(hash_start.elapsed(), 0, "error");
log.warn(&format!("Failed to hash {}: {e}", file_path.display()));
continue;
}
@@ -125,13 +145,18 @@ impl Job for InboxDiscoverJob {
// Extract raw metadata
let path_for_meta = file_path.to_path_buf();
let metadata_start = std::time::Instant::now();
let raw_meta = match tokio::task::spawn_blocking(move || {
crate::agent::metadata::extract(&path_for_meta)
})
.await?
{
Ok(m) => m,
Ok(m) => {
crate::metrics::record_agent_metadata(metadata_start.elapsed(), "ok");
m
}
Err(e) => {
crate::metrics::record_agent_metadata(metadata_start.elapsed(), "error");
log.warn(&format!(
"Failed to extract metadata from {}: {e}",
file_path.display()
@@ -189,6 +214,12 @@ impl Job for InboxDiscoverJob {
"Discovered {} new files, skipped {} (hash known), skipped {} (already queued)",
discovered, skipped_hash, skipped_existing
));
crate::metrics::record_agent_discover_files(
audio_files.len() as u64,
discovered,
skipped_hash,
skipped_existing,
);
// Trigger inbox_process in background if new files were discovered
// and no orchestrator is already running
@@ -219,6 +250,7 @@ impl Job for InboxDiscoverJob {
}
}
metrics_guard.outcome = run_outcome;
Ok(())
}
}
+41 -5
View File
@@ -307,12 +307,18 @@ async fn process_folder_batch(
// Extract metadata (with 60s timeout)
let path_for_meta = file_path.to_path_buf();
let metadata_start = std::time::Instant::now();
let meta_future =
tokio::task::spawn_blocking(move || crate::agent::metadata::extract(&path_for_meta));
let raw_meta =
match tokio::time::timeout(std::time::Duration::from_secs(60), meta_future).await {
Ok(Ok(Ok(m))) => m,
Ok(Ok(Ok(m))) => {
crate::metrics::record_agent_metadata(metadata_start.elapsed(), "ok");
m
}
Ok(Ok(Err(e))) => {
crate::metrics::record_agent_metadata(metadata_start.elapsed(), "error");
crate::metrics::record_agent_failed("metadata");
let msg = format!("{filename}: metadata error: {e}");
log.error(&msg);
let _ = review.set_failed(db, &msg).await;
@@ -320,6 +326,8 @@ async fn process_folder_batch(
continue;
}
Ok(Err(e)) => {
crate::metrics::record_agent_metadata(metadata_start.elapsed(), "panic");
crate::metrics::record_agent_failed("metadata");
let msg = format!("{filename}: metadata panic: {e}");
log.error(&msg);
let _ = review.set_failed(db, &msg).await;
@@ -327,6 +335,8 @@ async fn process_folder_batch(
continue;
}
Err(_) => {
crate::metrics::record_agent_metadata(metadata_start.elapsed(), "timeout");
crate::metrics::record_agent_failed("metadata");
let msg = format!("{filename}: metadata timeout (60s)");
log.error(&msg);
let _ = review.set_failed(db, &msg).await;
@@ -416,6 +426,7 @@ async fn process_folder_batch(
// Lookup all unique artist queries
let mut all_similar_artists = Vec::new();
for q in &artist_queries {
let rag_start = std::time::Instant::now();
match tokio::time::timeout(
std::time::Duration::from_secs(30),
crate::agent::rag::find_similar_artists(pool, q, 5),
@@ -423,6 +434,7 @@ async fn process_folder_batch(
.await
{
Ok(Ok(results)) => {
crate::metrics::record_agent_rag("artist", "ok", rag_start.elapsed(), results.len());
for a in results {
if !all_similar_artists
.iter()
@@ -432,13 +444,20 @@ async fn process_folder_batch(
}
}
}
Ok(Err(e)) => log.warn(&format!("RAG artist lookup failed for \"{q}\": {e}")),
Err(_) => log.warn(&format!("RAG artist lookup timed out for \"{q}\"")),
Ok(Err(e)) => {
crate::metrics::record_agent_rag("artist", "error", rag_start.elapsed(), 0);
log.warn(&format!("RAG artist lookup failed for \"{q}\": {e}"))
}
Err(_) => {
crate::metrics::record_agent_rag("artist", "timeout", rag_start.elapsed(), 0);
log.warn(&format!("RAG artist lookup timed out for \"{q}\""))
}
}
}
let mut all_similar_releases = Vec::new();
for q in &album_queries {
let rag_start = std::time::Instant::now();
match tokio::time::timeout(
std::time::Duration::from_secs(30),
crate::agent::rag::find_similar_releases(pool, q, 5),
@@ -446,6 +465,7 @@ async fn process_folder_batch(
.await
{
Ok(Ok(results)) => {
crate::metrics::record_agent_rag("release", "ok", rag_start.elapsed(), results.len());
for r in results {
if !all_similar_releases
.iter()
@@ -455,8 +475,14 @@ async fn process_folder_batch(
}
}
}
Ok(Err(e)) => log.warn(&format!("RAG release lookup failed for \"{q}\": {e}")),
Err(_) => log.warn(&format!("RAG release lookup timed out for \"{q}\"")),
Ok(Err(e)) => {
crate::metrics::record_agent_rag("release", "error", rag_start.elapsed(), 0);
log.warn(&format!("RAG release lookup failed for \"{q}\": {e}"))
}
Err(_) => {
crate::metrics::record_agent_rag("release", "timeout", rag_start.elapsed(), 0);
log.warn(&format!("RAG release lookup timed out for \"{q}\""))
}
}
}
@@ -547,11 +573,14 @@ async fn process_folder_batch(
let batch_result = match llm_result {
Ok(r) => r,
Err(e) => {
crate::metrics::record_agent_failed("llm");
crate::metrics::record_agent_folder_batch("failed", file_count, batch_start.elapsed());
let err_msg = format!("Batch LLM call failed: {e}");
log.error(&err_msg);
// Mark all files as failed
for mut p in prepared {
let _ = p.review.set_failed(db, &err_msg).await;
crate::metrics::record_agent_file_processed("failed", "failed");
}
let total_fail_count = failed_reviews.len() as u64 + file_count as u64;
let duration_ms = batch_start.elapsed().as_millis() as i64;
@@ -612,6 +641,7 @@ async fn process_folder_batch(
let result_json = serde_json::to_string(normalized).unwrap_or_default();
let confidence = normalized.confidence.unwrap_or(0.0);
crate::metrics::observe_agent_confidence(confidence);
let feat = if normalized.featured_artists.is_empty() {
String::new()
@@ -655,9 +685,12 @@ async fn process_folder_batch(
{
Ok(()) => {
let _ = p.review.set_auto_approved(db).await;
crate::metrics::record_agent_file_processed("ok", "auto_approved");
ok_count += 1;
}
Err(e) => {
crate::metrics::record_agent_failed("finalize");
crate::metrics::record_agent_file_processed("failed", "failed");
let msg = format!("{filename}: finalize failed: {e}");
log.error(&msg);
let _ = p.review.set_failed(db, &msg).await;
@@ -671,6 +704,7 @@ async fn process_folder_batch(
)
.unwrap();
let _ = p.review.save(db).await;
crate::metrics::record_agent_file_processed("ok", "pending_review");
log.info(&format!(
"{filename}: manual review (confidence {confidence} < {})",
config.agent_confidence_threshold,
@@ -682,9 +716,11 @@ async fn process_folder_batch(
let duration_ms = batch_start.elapsed().as_millis() as i64;
if fail_count == 0 {
let _ = run.set_completed(db, duration_ms, &log.output()).await;
crate::metrics::record_agent_folder_batch("completed", file_count, batch_start.elapsed());
} else {
let msg = format!("{fail_count} file(s) failed");
let _ = run.set_failed(db, duration_ms, &log.output(), &msg).await;
crate::metrics::record_agent_folder_batch("failed", file_count, batch_start.elapsed());
}
(ok_count, fail_count)
+59
View File
@@ -7,6 +7,7 @@ mod i18n;
mod jobs;
mod lastfm;
mod media_paths;
mod metrics;
mod music;
mod oidc;
mod player;
@@ -139,12 +140,41 @@ async fn logout_handler(session: Session) -> cot::Result<cot::response::Response
Ok(auth::redirect("/login"))
}
async fn metrics_handler(
config: Arc<AppConfig>,
pool: Arc<tokio::sync::OnceCell<sqlx::PgPool>>,
) -> cot::Result<cot::http::Response<Body>> {
if config.database_url.is_empty() {
return Ok(cot::http::Response::builder()
.status(cot::http::StatusCode::SERVICE_UNAVAILABLE)
.header(cot::http::header::CONTENT_TYPE, "text/plain; version=0.0.4")
.body(Body::fixed("furumusic_metrics_unavailable 1\n"))
.expect("valid response"));
}
let pg_pool = pool
.get_or_init(|| async {
sqlx::postgres::PgPoolOptions::new()
.max_connections(2)
.connect(&config.database_url)
.await
.expect("metrics pool")
})
.await;
let body = metrics::render(pg_pool, &config).await;
Ok(cot::http::Response::builder()
.status(cot::http::StatusCode::OK)
.header(cot::http::header::CONTENT_TYPE, "text/plain; version=0.0.4")
.body(Body::fixed(body))
.expect("valid response"))
}
// ---------------------------------------------------------------------------
// App
// ---------------------------------------------------------------------------
struct FuruApp {
config: Arc<AppConfig>,
pool: Arc<tokio::sync::OnceCell<sqlx::PgPool>>,
}
impl App for FuruApp {
@@ -171,6 +201,19 @@ impl App for FuruApp {
},
"index",
),
Route::with_handler_and_name(
"/metrics",
get({
let config = Arc::clone(&self.config);
let pool = Arc::clone(&self.pool);
move || {
let config = Arc::clone(&config);
let pool = Arc::clone(&pool);
async move { metrics_handler(config, pool).await }
}
}),
"metrics",
),
Route::with_handler_and_name(
"/login",
get({
@@ -200,6 +243,11 @@ impl App for FuruApp {
let data = match result {
FormResult::Ok(data) => data,
FormResult::ValidationError(_) => {
metrics::record_auth_attempt(
"password",
"failure",
"validation_error",
);
let msg = i18n.t.login_invalid.to_owned();
return login_page_handler(i18n, &config, db, msg)
.await?
@@ -216,6 +264,10 @@ impl App for FuruApp {
PasswordVerificationResult::Ok
| PasswordVerificationResult::OkObsolete(_) => {
auth::login(&session, user.id_val()).await?;
metrics::record_auth_attempt(
"password", "success", "ok",
);
metrics::record_session_created("password");
return Ok(auth::redirect("/"));
}
PasswordVerificationResult::Invalid => {}
@@ -223,6 +275,11 @@ impl App for FuruApp {
}
}
metrics::record_auth_attempt(
"password",
"failure",
"bad_credentials",
);
let msg = i18n.t.login_invalid.to_owned();
login_page_handler(i18n, &config, db, msg)
.await?
@@ -332,6 +389,7 @@ impl Project for FuruProject {
context: &cot::project::MiddlewareContext,
) -> cot::project::RootHandler {
handler
.middleware(metrics::MetricsLayer)
.middleware(StaticFilesMiddleware::from_context(context))
.middleware(SessionMiddleware::from_context(context))
.build()
@@ -361,6 +419,7 @@ impl Project for FuruProject {
apps.register_with_views(
FuruApp {
config: Arc::clone(&self.app_config),
pool: Arc::new(tokio::sync::OnceCell::new()),
},
"",
);
+843
View File
@@ -0,0 +1,843 @@
use std::collections::{BTreeMap, HashMap};
use std::future::Future;
use std::path::Path;
use std::pin::Pin;
use std::sync::{LazyLock, Mutex};
use std::task::{Context, Poll};
use std::time::{Duration, Instant};
use cot::http::header::CONTENT_LENGTH;
use cot::http::Method;
use cot::request::Request;
use cot::response::Response;
use cot::Error;
use sqlx::PgPool;
use tower::{Layer, Service};
use crate::config::AppConfig;
const HTTP_BUCKETS: &[f64] = &[
0.005, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1.0, 2.5, 5.0, 10.0,
];
const JOB_BUCKETS: &[f64] = &[0.1, 0.5, 1.0, 2.5, 5.0, 10.0, 30.0, 60.0, 300.0, 600.0];
const FILE_BUCKETS: &[f64] = &[
0.001, 0.005, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1.0, 2.5, 5.0, 15.0, 60.0,
];
static REGISTRY: LazyLock<Registry> = LazyLock::new(Registry::default);
static ACTIVE_USERS: LazyLock<Mutex<HashMap<i64, Instant>>> =
LazyLock::new(|| Mutex::new(HashMap::new()));
#[derive(Default)]
struct Registry {
counters: Mutex<BTreeMap<MetricKey, f64>>,
gauges: Mutex<BTreeMap<MetricKey, f64>>,
histograms: Mutex<BTreeMap<MetricKey, HistogramState>>,
}
#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
struct MetricKey {
name: &'static str,
labels: Vec<(&'static str, String)>,
}
#[derive(Debug, Clone)]
struct HistogramState {
buckets: Vec<f64>,
counts: Vec<u64>,
sum: f64,
count: u64,
}
#[derive(Debug, Clone, Copy)]
pub struct MetricsLayer;
#[derive(Debug, Clone)]
pub struct MetricsService<S> {
inner: S,
}
impl<S> Layer<S> for MetricsLayer {
type Service = MetricsService<S>;
fn layer(&self, inner: S) -> Self::Service {
MetricsService { inner }
}
}
impl<S> Service<Request> for MetricsService<S>
where
S: Service<Request, Response = Response, Error = Error> + Send + 'static,
S::Future: Send + 'static,
{
type Response = Response;
type Error = Error;
type Future = Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>> + Send>>;
fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
self.inner.poll_ready(cx)
}
fn call(&mut self, request: Request) -> Self::Future {
let method = request.method().clone();
let route = normalize_route(request.uri().path());
let request_bytes = request
.headers()
.get(CONTENT_LENGTH)
.and_then(|value| value.to_str().ok())
.and_then(|value| value.parse::<f64>().ok())
.unwrap_or(0.0);
let labels = http_labels(&method, &route, "in_flight");
REGISTRY.inc_gauge("furumusic_http_in_flight_requests", labels, 1.0);
REGISTRY.inc_counter(
"furumusic_http_request_body_bytes_total",
vec![
("method", method.as_str().to_owned()),
("route", route.clone()),
],
request_bytes,
);
let start = Instant::now();
let fut = self.inner.call(request);
Box::pin(async move {
let result = fut.await;
let elapsed = start.elapsed().as_secs_f64();
REGISTRY.inc_gauge(
"furumusic_http_in_flight_requests",
http_labels(&method, &route, "in_flight"),
-1.0,
);
match result {
Ok(response) => {
let status = response.status().as_u16().to_string();
let labels = http_labels(&method, &route, &status);
REGISTRY.inc_counter("furumusic_http_requests_total", labels.clone(), 1.0);
REGISTRY.observe_histogram(
"furumusic_http_request_duration_seconds",
labels,
elapsed,
HTTP_BUCKETS,
);
if let Some(length) = response
.headers()
.get(CONTENT_LENGTH)
.and_then(|value| value.to_str().ok())
.and_then(|value| value.parse::<f64>().ok())
{
REGISTRY.inc_counter(
"furumusic_http_response_body_bytes_total",
vec![
("method", method.as_str().to_owned()),
("route", route.clone()),
("status", status),
],
length,
);
}
Ok(response)
}
Err(error) => {
let labels = http_labels(&method, &route, "500");
REGISTRY.inc_counter("furumusic_http_requests_total", labels.clone(), 1.0);
REGISTRY.observe_histogram(
"furumusic_http_request_duration_seconds",
labels,
elapsed,
HTTP_BUCKETS,
);
Err(error)
}
}
})
}
}
pub fn record_active_user(user_id: i64) {
let mut users = ACTIVE_USERS.lock().expect("active user lock");
users.insert(user_id, Instant::now());
}
pub fn record_auth_attempt(method: &'static str, outcome: &'static str, reason: &'static str) {
REGISTRY.inc_counter(
"furumusic_auth_login_attempts_total",
vec![
("method", method.to_owned()),
("outcome", outcome.to_owned()),
("reason", reason.to_owned()),
],
1.0,
);
}
pub fn record_session_created(method: &'static str) {
REGISTRY.inc_counter(
"furumusic_auth_sessions_created_total",
vec![("method", method.to_owned())],
1.0,
);
}
pub fn record_authorization_denied(kind: &'static str) {
REGISTRY.inc_counter(
"furumusic_auth_denied_total",
vec![("kind", kind.to_owned())],
1.0,
);
}
pub fn record_play_history(duration_listened: Option<i32>, completed: bool) {
REGISTRY.inc_counter(
"furumusic_listens_total",
vec![(
"completed",
if completed { "true" } else { "false" }.to_owned(),
)],
1.0,
);
if let Some(seconds) = duration_listened {
REGISTRY.inc_counter(
"furumusic_listened_seconds_total",
Vec::new(),
seconds.max(0) as f64,
);
}
}
pub fn record_stream_request(range: bool, bytes: u64) {
REGISTRY.inc_counter(
"furumusic_stream_requests_total",
vec![("range", if range { "true" } else { "false" }.to_owned())],
1.0,
);
REGISTRY.inc_counter("furumusic_stream_bytes_total", Vec::new(), bytes as f64);
}
pub fn record_agent_discover_run(outcome: &'static str, duration: Duration) {
REGISTRY.inc_counter(
"furumusic_agent_discover_runs_total",
vec![("outcome", outcome.to_owned())],
1.0,
);
REGISTRY.observe_histogram(
"furumusic_agent_discover_duration_seconds",
vec![("outcome", outcome.to_owned())],
duration.as_secs_f64(),
JOB_BUCKETS,
);
}
pub fn record_agent_discover_files(seen: u64, queued: u64, skipped_hash: u64, skipped_existing: u64) {
REGISTRY.inc_counter("furumusic_agent_discover_files_seen_total", Vec::new(), seen as f64);
REGISTRY.inc_counter(
"furumusic_agent_discover_files_queued_total",
Vec::new(),
queued as f64,
);
REGISTRY.inc_counter(
"furumusic_agent_discover_files_skipped_total",
vec![("reason", "hash_known".to_owned())],
skipped_hash as f64,
);
REGISTRY.inc_counter(
"furumusic_agent_discover_files_skipped_total",
vec![("reason", "already_queued".to_owned())],
skipped_existing as f64,
);
}
pub fn record_agent_file_hash(duration: Duration, bytes: i64, outcome: &'static str) {
REGISTRY.observe_histogram(
"furumusic_agent_discover_hash_duration_seconds",
vec![("outcome", outcome.to_owned())],
duration.as_secs_f64(),
FILE_BUCKETS,
);
if bytes > 0 {
REGISTRY.inc_counter(
"furumusic_agent_discover_file_bytes_total",
vec![("outcome", outcome.to_owned())],
bytes as f64,
);
}
}
pub fn record_agent_metadata(duration: Duration, outcome: &'static str) {
REGISTRY.observe_histogram(
"furumusic_agent_discover_metadata_duration_seconds",
vec![("outcome", outcome.to_owned())],
duration.as_secs_f64(),
FILE_BUCKETS,
);
}
pub fn record_agent_folder_batch(outcome: &'static str, size: usize, duration: Duration) {
REGISTRY.inc_counter(
"furumusic_agent_folder_batches_total",
vec![("outcome", outcome.to_owned())],
1.0,
);
REGISTRY.observe_histogram(
"furumusic_agent_folder_batch_duration_seconds",
vec![("outcome", outcome.to_owned())],
duration.as_secs_f64(),
JOB_BUCKETS,
);
REGISTRY.observe_histogram(
"furumusic_agent_folder_batch_size",
vec![("outcome", outcome.to_owned())],
size as f64,
&[1.0, 2.0, 5.0, 10.0, 20.0, 50.0, 100.0],
);
}
pub fn record_agent_file_processed(outcome: &'static str, decision: &'static str) {
REGISTRY.inc_counter(
"furumusic_agent_files_processed_total",
vec![
("outcome", outcome.to_owned()),
("decision", decision.to_owned()),
],
1.0,
);
}
pub fn record_agent_failed(stage: &'static str) {
REGISTRY.inc_counter(
"furumusic_agent_failed_total",
vec![("stage", stage.to_owned())],
1.0,
);
}
pub fn observe_agent_confidence(confidence: f64) {
REGISTRY.observe_histogram(
"furumusic_agent_confidence",
Vec::new(),
confidence,
&[0.1, 0.2, 0.4, 0.6, 0.75, 0.85, 0.95, 1.0],
);
}
pub fn record_agent_llm(
model: &str,
outcome: &'static str,
duration: Duration,
prompt_tokens: u64,
completion_tokens: u64,
batch_size: usize,
estimated_tokens: Option<u64>,
) {
let model = normalize_model_label(model);
REGISTRY.inc_counter(
"furumusic_agent_llm_requests_total",
vec![
("model", model.clone()),
("outcome", outcome.to_owned()),
],
1.0,
);
REGISTRY.observe_histogram(
"furumusic_agent_llm_duration_seconds",
vec![
("model", model.clone()),
("outcome", outcome.to_owned()),
],
duration.as_secs_f64(),
JOB_BUCKETS,
);
REGISTRY.inc_counter(
"furumusic_agent_llm_tokens_total",
vec![("model", model.clone()), ("type", "prompt".to_owned())],
prompt_tokens as f64,
);
REGISTRY.inc_counter(
"furumusic_agent_llm_tokens_total",
vec![
("model", model.clone()),
("type", "completion".to_owned()),
],
completion_tokens as f64,
);
REGISTRY.observe_histogram(
"furumusic_agent_llm_batch_size",
vec![("model", model.clone())],
batch_size as f64,
&[1.0, 2.0, 5.0, 10.0, 20.0, 50.0, 100.0],
);
if let Some(estimated) = estimated_tokens {
REGISTRY.observe_histogram(
"furumusic_agent_llm_context_estimated_tokens",
vec![("model", model)],
estimated as f64,
&[512.0, 1024.0, 2048.0, 4096.0, 8192.0, 16384.0, 32768.0],
);
}
}
pub fn record_agent_llm_split(reason: &'static str) {
REGISTRY.inc_counter(
"furumusic_agent_llm_batch_splits_total",
vec![("reason", reason.to_owned())],
1.0,
);
}
pub fn record_agent_llm_parse_failure(model: &str) {
REGISTRY.inc_counter(
"furumusic_agent_llm_parse_failures_total",
vec![("model", normalize_model_label(model))],
1.0,
);
}
pub fn record_agent_rag(kind: &'static str, outcome: &'static str, duration: Duration, results: usize) {
REGISTRY.inc_counter(
"furumusic_agent_rag_queries_total",
vec![("kind", kind.to_owned()), ("outcome", outcome.to_owned())],
1.0,
);
REGISTRY.observe_histogram(
"furumusic_agent_rag_duration_seconds",
vec![("kind", kind.to_owned()), ("outcome", outcome.to_owned())],
duration.as_secs_f64(),
FILE_BUCKETS,
);
REGISTRY.observe_histogram(
"furumusic_agent_rag_results",
vec![("kind", kind.to_owned())],
results as f64,
&[0.0, 1.0, 2.0, 5.0, 10.0],
);
}
pub fn record_agent_cover_lookup(source: &'static str, outcome: &'static str, bytes: usize) {
REGISTRY.inc_counter(
"furumusic_agent_cover_lookup_total",
vec![("source", source.to_owned()), ("outcome", outcome.to_owned())],
1.0,
);
REGISTRY.inc_counter(
"furumusic_agent_cover_bytes_total",
vec![("source", source.to_owned())],
bytes as f64,
);
}
pub fn record_agent_cover_variant(variant: &'static str, outcome: &'static str, duration: Duration) {
REGISTRY.inc_counter(
"furumusic_agent_cover_variant_generation_total",
vec![
("variant", variant.to_owned()),
("outcome", outcome.to_owned()),
],
1.0,
);
REGISTRY.observe_histogram(
"furumusic_agent_cover_variant_duration_seconds",
vec![
("variant", variant.to_owned()),
("outcome", outcome.to_owned()),
],
duration.as_secs_f64(),
FILE_BUCKETS,
);
}
pub fn record_scheduler_job(job: &str, trigger: &str, outcome: &'static str, duration_ms: i64) {
let labels = vec![
("job", job.to_owned()),
("trigger", trigger.to_owned()),
("outcome", outcome.to_owned()),
];
REGISTRY.inc_counter("furumusic_scheduler_job_runs_total", labels.clone(), 1.0);
REGISTRY.observe_histogram(
"furumusic_scheduler_job_duration_seconds",
labels,
(duration_ms.max(0) as f64) / 1000.0,
JOB_BUCKETS,
);
}
pub fn record_torrent_download(outcome: &'static str, selected_bytes: u64, duration: Duration) {
REGISTRY.inc_counter(
"furumusic_torrent_downloads_total",
vec![("outcome", outcome.to_owned())],
1.0,
);
REGISTRY.inc_counter(
"furumusic_torrent_selected_bytes_total",
vec![("outcome", outcome.to_owned())],
selected_bytes as f64,
);
REGISTRY.observe_histogram(
"furumusic_torrent_download_duration_seconds",
vec![("outcome", outcome.to_owned())],
duration.as_secs_f64(),
JOB_BUCKETS,
);
}
pub async fn render(pool: &PgPool, config: &AppConfig) -> String {
let mut out = String::new();
emit_static_gauge(&mut out, "furumusic_build_info", &[("version", env!("CARGO_PKG_VERSION"))], 1.0);
render_active_users(&mut out);
render_storage(&mut out, config);
render_db_metrics(&mut out, pool).await;
out.push_str(&REGISTRY.render());
out
}
fn render_active_users(out: &mut String) {
let mut users = ACTIVE_USERS.lock().expect("active user lock");
let now = Instant::now();
users.retain(|_, seen| now.duration_since(*seen) <= Duration::from_secs(3600));
for (window, seconds) in [("5m", 300), ("15m", 900), ("1h", 3600)] {
let count = users
.values()
.filter(|seen| now.duration_since(**seen) <= Duration::from_secs(seconds))
.count();
emit_static_gauge(
out,
"furumusic_active_users",
&[("window", window)],
count as f64,
);
}
}
fn render_storage(out: &mut String, config: &AppConfig) {
for (kind, path) in [
("inbox", config.agent_inbox_dir.as_str()),
("library", config.agent_storage_dir.as_str()),
] {
if let Some(usage) = disk_usage(Path::new(path.trim())) {
emit_static_gauge(
out,
"furumusic_storage_free_bytes",
&[("path_kind", kind)],
usage.free_bytes as f64,
);
emit_static_gauge(
out,
"furumusic_storage_total_bytes",
&[("path_kind", kind)],
usage.total_bytes as f64,
);
}
}
}
async fn render_db_metrics(out: &mut String, pool: &PgPool) {
render_group_counts(out, pool, "furumusic_users_total", "SELECT role::text AS label, COUNT(*) AS count FROM furumusic__user GROUP BY role", "role").await;
render_single_count(out, pool, "furumusic_library_tracks_total", "SELECT COUNT(*) FROM furumusic__track").await;
render_single_count(out, pool, "furumusic_library_releases_total", "SELECT COUNT(*) FROM furumusic__release").await;
render_single_count(out, pool, "furumusic_library_artists_total", "SELECT COUNT(*) FROM furumusic__artist").await;
render_single_count(out, pool, "furumusic_library_playlists_total", "SELECT COUNT(*) FROM furumusic__playlist").await;
render_group_counts(out, pool, "furumusic_media_files_total", "SELECT file_type::text AS label, COUNT(*) AS count FROM furumusic__media_file GROUP BY file_type", "type").await;
render_group_sums(out, pool, "furumusic_media_file_bytes_total", "SELECT file_type::text AS label, COALESCE(SUM(file_size_bytes), 0)::bigint AS value FROM furumusic__media_file GROUP BY file_type", "type").await;
render_group_counts(out, pool, "furumusic_agent_reviews_total", "SELECT status::text AS label, COUNT(*) AS count FROM furumusic__pending_review GROUP BY status", "status").await;
render_group_counts(out, pool, "furumusic_agent_queue_depth", "SELECT status::text AS label, COUNT(*) AS count FROM furumusic__pending_review GROUP BY status", "status").await;
render_group_counts(out, pool, "furumusic_scheduler_job_running", "SELECT job_name::text AS label, COUNT(*) AS count FROM furumusic__job_run WHERE status = 'running' GROUP BY job_name", "job").await;
render_group_sums(out, pool, "furumusic_scheduler_job_enabled", "SELECT name::text AS label, (CASE WHEN enabled THEN 1 ELSE 0 END)::bigint AS value FROM furumusic__scheduled_job", "job").await;
render_group_counts(out, pool, "furumusic_torrent_sessions_total", "SELECT status::text AS label, COUNT(*) AS count FROM furumusic__torrent_session GROUP BY status", "status").await;
render_single_count(out, pool, "furumusic_play_history_total", "SELECT COUNT(*) FROM furumusic__play_history").await;
}
async fn render_single_count(out: &mut String, pool: &PgPool, metric: &'static str, sql: &str) {
if let Ok(value) = sqlx::query_scalar::<_, i64>(sql).fetch_one(pool).await {
emit_static_gauge(out, metric, &[], value as f64);
}
}
async fn render_group_counts(
out: &mut String,
pool: &PgPool,
metric: &'static str,
sql: &str,
label_name: &'static str,
) {
if let Ok(rows) = sqlx::query_as::<_, (String, i64)>(sql).fetch_all(pool).await {
for (label, count) in rows {
emit_static_gauge(out, metric, &[(label_name, label.as_str())], count as f64);
}
}
}
async fn render_group_sums(
out: &mut String,
pool: &PgPool,
metric: &'static str,
sql: &str,
label_name: &'static str,
) {
if let Ok(rows) = sqlx::query_as::<_, (String, i64)>(sql).fetch_all(pool).await {
for (label, value) in rows {
emit_static_gauge(out, metric, &[(label_name, label.as_str())], value as f64);
}
}
}
impl Registry {
fn inc_counter(&self, name: &'static str, labels: Vec<(&'static str, String)>, value: f64) {
if value <= 0.0 {
return;
}
let mut counters = self.counters.lock().expect("counter lock");
*counters.entry(MetricKey::new(name, labels)).or_default() += value;
}
fn inc_gauge(&self, name: &'static str, labels: Vec<(&'static str, String)>, value: f64) {
let mut gauges = self.gauges.lock().expect("gauge lock");
*gauges.entry(MetricKey::new(name, labels)).or_default() += value;
}
fn observe_histogram(
&self,
name: &'static str,
labels: Vec<(&'static str, String)>,
value: f64,
buckets: &[f64],
) {
let mut histograms = self.histograms.lock().expect("histogram lock");
let state = histograms
.entry(MetricKey::new(name, labels))
.or_insert_with(|| HistogramState {
buckets: buckets.to_vec(),
counts: vec![0; buckets.len()],
sum: 0.0,
count: 0,
});
for (index, bucket) in state.buckets.iter().enumerate() {
if value <= *bucket {
state.counts[index] += 1;
}
}
state.sum += value;
state.count += 1;
}
fn render(&self) -> String {
let mut out = String::new();
for (key, value) in self.counters.lock().expect("counter lock").iter() {
emit_type(&mut out, key.name, "counter");
emit_metric(&mut out, key.name, &key.labels, *value);
}
for (key, value) in self.gauges.lock().expect("gauge lock").iter() {
emit_type(&mut out, key.name, "gauge");
emit_metric(&mut out, key.name, &key.labels, (*value).max(0.0));
}
for (key, state) in self.histograms.lock().expect("histogram lock").iter() {
emit_type(&mut out, key.name, "histogram");
for (bucket, count) in state.buckets.iter().zip(state.counts.iter()) {
let mut labels = key.labels.clone();
labels.push(("le", bucket.to_string()));
emit_metric(&mut out, &format!("{}_bucket", key.name), &labels, *count as f64);
}
let mut inf_labels = key.labels.clone();
inf_labels.push(("le", "+Inf".to_owned()));
emit_metric(
&mut out,
&format!("{}_bucket", key.name),
&inf_labels,
state.count as f64,
);
emit_metric(
&mut out,
&format!("{}_sum", key.name),
&key.labels,
state.sum,
);
emit_metric(
&mut out,
&format!("{}_count", key.name),
&key.labels,
state.count as f64,
);
}
out
}
}
impl MetricKey {
fn new(name: &'static str, mut labels: Vec<(&'static str, String)>) -> Self {
labels.sort_by(|a, b| a.0.cmp(b.0));
Self { name, labels }
}
}
fn http_labels(method: &Method, route: &str, status: &str) -> Vec<(&'static str, String)> {
vec![
("method", method.as_str().to_owned()),
("route", route.to_owned()),
("status", status.to_owned()),
]
}
fn normalize_route(path: &str) -> String {
let mut route = String::with_capacity(path.len());
for segment in path.split('/') {
if segment.is_empty() {
continue;
}
route.push('/');
if segment.parse::<i64>().is_ok() || looks_like_uuid(segment) {
route.push_str("{id}");
} else {
route.push_str(segment);
}
}
if route.is_empty() {
"/".to_owned()
} else {
route
}
}
fn looks_like_uuid(value: &str) -> bool {
value.len() == 36
&& value
.chars()
.all(|ch| ch.is_ascii_hexdigit() || ch == '-')
}
fn normalize_model_label(value: &str) -> String {
let trimmed = value.trim();
if trimmed.is_empty() {
"unknown".to_owned()
} else {
trimmed.chars().take(80).collect()
}
}
fn emit_static_gauge(out: &mut String, name: &str, labels: &[(&str, &str)], value: f64) {
emit_type(out, name, "gauge");
let labels = labels
.iter()
.map(|(key, value)| (*key, (*value).to_owned()))
.collect::<Vec<_>>();
emit_metric(out, name, &labels, value);
}
fn emit_type(out: &mut String, name: &str, metric_type: &str) {
let _ = (out, name, metric_type);
}
fn emit_metric(out: &mut String, name: &str, labels: &[(&str, String)], value: f64) {
out.push_str(name);
if !labels.is_empty() {
out.push('{');
for (index, (key, value)) in labels.iter().enumerate() {
if index > 0 {
out.push(',');
}
out.push_str(key);
out.push_str("=\"");
escape_label(out, value);
out.push('"');
}
out.push('}');
}
out.push(' ');
out.push_str(&format!("{value:.6}"));
out.push('\n');
}
fn escape_label(out: &mut String, value: &str) {
for ch in value.chars() {
match ch {
'\\' => out.push_str("\\\\"),
'"' => out.push_str("\\\""),
'\n' => out.push_str("\\n"),
_ => out.push(ch),
}
}
}
#[derive(Debug, Clone, Copy)]
struct DiskUsage {
free_bytes: u64,
total_bytes: u64,
}
#[cfg(windows)]
fn disk_usage(path: &Path) -> Option<DiskUsage> {
use std::os::windows::ffi::OsStrExt;
#[link(name = "kernel32")]
unsafe extern "system" {
fn GetDiskFreeSpaceExW(
lpDirectoryName: *const u16,
lpFreeBytesAvailableToCaller: *mut u64,
lpTotalNumberOfBytes: *mut u64,
lpTotalNumberOfFreeBytes: *mut u64,
) -> i32;
}
let mut wide: Vec<u16> = path.as_os_str().encode_wide().collect();
wide.push(0);
let mut free_available = 0_u64;
let mut total = 0_u64;
let mut total_free = 0_u64;
let ok = unsafe {
GetDiskFreeSpaceExW(
wide.as_ptr(),
&mut free_available,
&mut total,
&mut total_free,
)
};
(ok != 0).then_some(DiskUsage {
free_bytes: free_available,
total_bytes: total,
})
}
#[cfg(any(target_os = "linux", target_os = "android"))]
fn disk_usage(path: &Path) -> Option<DiskUsage> {
use std::ffi::CString;
use std::os::unix::ffi::OsStrExt;
#[repr(C)]
struct Statvfs {
f_bsize: std::ffi::c_ulong,
f_frsize: std::ffi::c_ulong,
f_blocks: std::ffi::c_ulong,
f_bfree: std::ffi::c_ulong,
f_bavail: std::ffi::c_ulong,
f_files: std::ffi::c_ulong,
f_ffree: std::ffi::c_ulong,
f_favail: std::ffi::c_ulong,
f_fsid: std::ffi::c_ulong,
f_flag: std::ffi::c_ulong,
f_namemax: std::ffi::c_ulong,
__f_spare: [std::ffi::c_int; 6],
}
unsafe extern "C" {
fn statvfs(path: *const std::ffi::c_char, buf: *mut Statvfs) -> std::ffi::c_int;
}
let c_path = CString::new(path.as_os_str().as_bytes()).ok()?;
let mut stat = std::mem::MaybeUninit::<Statvfs>::uninit();
let ok = unsafe { statvfs(c_path.as_ptr(), stat.as_mut_ptr()) };
if ok != 0 {
return None;
}
let stat = unsafe { stat.assume_init() };
let fragment_size = if stat.f_frsize > 0 {
stat.f_frsize as u64
} else {
stat.f_bsize as u64
};
Some(DiskUsage {
free_bytes: stat.f_bavail as u64 * fragment_size,
total_bytes: stat.f_blocks as u64 * fragment_size,
})
}
#[cfg(not(any(windows, target_os = "linux", target_os = "android")))]
fn disk_usage(_path: &Path) -> Option<DiskUsage> {
None
}
+15
View File
@@ -172,6 +172,7 @@ pub async fn oidc_start_handler(
|| config.oidc_client_secret.is_empty()
{
tracing::warn!("OIDC start requested but SSO is not configured");
crate::metrics::record_auth_attempt("oidc", "failure", "not_configured");
return redirect_login_with_error(i18n.t.login_sso_disabled);
}
@@ -180,6 +181,7 @@ pub async fn oidc_start_handler(
Ok(c) => c,
Err(e) => {
tracing::error!("OIDC provider error: {e}");
crate::metrics::record_auth_attempt("oidc", "failure", "provider_error");
return redirect_login_with_error(i18n.t.login_oidc_error);
}
};
@@ -276,19 +278,23 @@ pub async fn oidc_callback_handler(
// Validate CSRF state.
let Some(saved_csrf) = saved_csrf else {
tracing::warn!("OIDC callback: no CSRF state in session");
crate::metrics::record_auth_attempt("oidc", "failure", "missing_state");
return redirect_login_with_error(i18n.t.login_oidc_error);
};
if query.state != saved_csrf {
tracing::warn!("OIDC callback: CSRF state mismatch");
crate::metrics::record_auth_attempt("oidc", "failure", "csrf");
return redirect_login_with_error(i18n.t.login_oidc_error);
}
let Some(nonce_str) = saved_nonce else {
tracing::warn!("OIDC callback: no nonce in session");
crate::metrics::record_auth_attempt("oidc", "failure", "missing_nonce");
return redirect_login_with_error(i18n.t.login_oidc_error);
};
let Some(pkce_str) = saved_pkce else {
tracing::warn!("OIDC callback: no PKCE verifier in session");
crate::metrics::record_auth_attempt("oidc", "failure", "missing_pkce");
return redirect_login_with_error(i18n.t.login_oidc_error);
};
@@ -300,6 +306,7 @@ pub async fn oidc_callback_handler(
Ok(c) => c,
Err(e) => {
tracing::error!("OIDC provider error during callback: {e}");
crate::metrics::record_auth_attempt("oidc", "failure", "provider_error");
return redirect_login_with_error(i18n.t.login_oidc_error);
}
};
@@ -318,6 +325,7 @@ pub async fn oidc_callback_handler(
Ok(req) => req,
Err(e) => {
tracing::error!("OIDC token endpoint not configured: {e}");
crate::metrics::record_auth_attempt("oidc", "failure", "token_config");
return redirect_login_with_error(i18n.t.login_oidc_error);
}
};
@@ -330,6 +338,7 @@ pub async fn oidc_callback_handler(
Ok(t) => t,
Err(e) => {
tracing::error!("OIDC token exchange failed: {e}");
crate::metrics::record_auth_attempt("oidc", "failure", "token_exchange");
return redirect_login_with_error(i18n.t.login_oidc_error);
}
};
@@ -340,6 +349,7 @@ pub async fn oidc_callback_handler(
Some(t) => t,
None => {
tracing::error!("OIDC response missing ID token");
crate::metrics::record_auth_attempt("oidc", "failure", "missing_id_token");
return redirect_login_with_error(i18n.t.login_oidc_error);
}
};
@@ -348,6 +358,7 @@ pub async fn oidc_callback_handler(
Ok(c) => c,
Err(e) => {
tracing::error!("OIDC ID token verification failed: {e}");
crate::metrics::record_auth_attempt("oidc", "failure", "id_token_verify");
return redirect_login_with_error(i18n.t.login_oidc_error);
}
};
@@ -395,6 +406,7 @@ pub async fn oidc_callback_handler(
config.oidc_user_groups,
config.oidc_admin_groups,
);
crate::metrics::record_auth_attempt("oidc", "failure", "not_in_group");
return redirect_login_with_error(i18n.t.login_access_denied);
}
@@ -413,12 +425,15 @@ pub async fn oidc_callback_handler(
Ok(u) => u,
Err(e) => {
tracing::error!("OIDC user provisioning failed: {e}");
crate::metrics::record_auth_attempt("oidc", "failure", "provisioning");
return redirect_login_with_error(i18n.t.login_oidc_error);
}
};
// Log the user in.
auth::login(&session, user.id_val()).await?;
crate::metrics::record_auth_attempt("oidc", "success", "ok");
crate::metrics::record_session_created("oidc");
// Clear OIDC session keys.
let _: Option<String> = session
+3
View File
@@ -3571,6 +3571,7 @@ async fn stream_handler(
let chunk_size = end - start + 1;
let data = read_file_range(&full_path, start, chunk_size).await?;
crate::metrics::record_stream_request(true, chunk_size);
let response = cot::http::Response::builder()
.status(StatusCode::PARTIAL_CONTENT)
@@ -3589,6 +3590,7 @@ async fn stream_handler(
let data = tokio::fs::read(&full_path)
.await
.map_err(|e| cot::Error::internal(e.to_string()))?;
crate::metrics::record_stream_request(false, file_size);
let response = cot::http::Response::builder()
.status(StatusCode::OK)
@@ -4491,6 +4493,7 @@ async fn history_handler(
.execute(pool)
.await
.map_err(|e| cot::Error::internal(e.to_string()))?;
crate::metrics::record_play_history(entry.duration_listened, entry.completed);
if let Some(listened_seconds) = entry.duration_listened {
let (config, _) = AppConfig::load_with_db(&db).await;
+12
View File
@@ -200,6 +200,12 @@ impl JobRun {
duration_ms: i64,
log: &str,
) -> cot::db::Result<()> {
crate::metrics::record_scheduler_job(
self.job_name.as_str(),
self.trigger.as_str(),
"completed",
duration_ms,
);
self.status = LimitedString::new("completed").unwrap();
self.finished_at = Some(now_iso().to_string());
self.duration_ms = Some(duration_ms);
@@ -214,6 +220,12 @@ impl JobRun {
log: &str,
error: &str,
) -> cot::db::Result<()> {
crate::metrics::record_scheduler_job(
self.job_name.as_str(),
self.trigger.as_str(),
"failed",
duration_ms,
);
self.status = LimitedString::new("failed").unwrap();
self.finished_at = Some(now_iso().to_string());
self.duration_ms = Some(duration_ms);
+23 -2
View File
@@ -777,7 +777,7 @@ impl TorrentService {
self.ensure_memory_job(pool, uploader_user_id, id).await?;
let (torrent_bytes, output_dir) = {
let (torrent_bytes, output_dir, selected_size) = {
let mut jobs = self.jobs.lock().await;
let job = jobs.get_mut(id).context("torrent job not found")?;
if job.user_id != uploader_user_id {
@@ -800,7 +800,11 @@ impl TorrentService {
job.error = None;
job.completed_at = None;
job.updated_at = now_string();
(job.torrent_bytes.clone(), job.output_dir.clone())
(
job.torrent_bytes.clone(),
job.output_dir.clone(),
job.selected_size(),
)
};
tokio::fs::create_dir_all(&output_dir).await?;
@@ -846,6 +850,7 @@ impl TorrentService {
let service = Arc::clone(self);
let pool = pool.clone();
let id = id.to_string();
let download_start = std::time::Instant::now();
tokio::spawn(async move {
if let Err(err) = handle.wait_until_completed().await {
if service.is_paused(&id).await {
@@ -853,6 +858,11 @@ impl TorrentService {
}
service.stop_torrent(&handle).await;
service.fail_job(&pool, &id, err.to_string()).await;
crate::metrics::record_torrent_download(
"failed",
selected_size,
download_start.elapsed(),
);
return;
}
service.stop_torrent(&handle).await;
@@ -861,6 +871,17 @@ impl TorrentService {
.await
{
service.fail_job(&pool, &id, err.to_string()).await;
crate::metrics::record_torrent_download(
"failed",
selected_size,
download_start.elapsed(),
);
} else {
crate::metrics::record_torrent_download(
"completed",
selected_size,
download_start.elapsed(),
);
}
});
+53 -6
View File
@@ -185,7 +185,7 @@ button {
.stats-strip {
display: grid;
grid-template-columns: repeat(7, minmax(104px, 1fr));
grid-template-columns: repeat(auto-fit, minmax(132px, 1fr));
gap: 8px;
margin-bottom: 14px;
}
@@ -201,12 +201,18 @@ button {
.stat-value {
font-size: 18px;
font-weight: 800;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.stat-label {
margin-top: 2px;
color: var(--text-subdued);
font-size: 11px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.panel {
@@ -1355,8 +1361,8 @@ tbody tr:hover {
<div class="content" x-show="activeView === 'reviews'">
<section class="stats-strip">
<template x-for="cell in statCells()" :key="cell.label">
<div class="stat-cell">
<div class="stat-value" x-text="fmt(cell.value)"></div>
<div class="stat-cell" :title="cell.title || ''">
<div class="stat-value" x-text="cell.display || fmt(cell.value)"></div>
<div class="stat-label" x-text="cell.label"></div>
</div>
</template>
@@ -2298,6 +2304,7 @@ function adminV2() {
libraryLoading: false,
toastMessage: '',
stats: {},
runtime: { agent: {}, storage: [], node: {} },
libraryOverview: {},
reviews: { items: [], total: 0, limit: 80, offset: 0, status_counts: [] },
reviewFilter: { status: null, search: '' },
@@ -2419,6 +2426,7 @@ function adminV2() {
try {
const data = await this.request(`${this.apiBase}/dashboard`);
this.stats = data.stats || {};
this.runtime = data.runtime || this.runtime;
this.libraryOverview = data.library || {};
this.reviews = data.reviews || this.reviews;
this.jobs = data.jobs || [];
@@ -3406,17 +3414,56 @@ function adminV2() {
},
statCells() {
const agent = (this.runtime && this.runtime.agent) || {};
const storage = (this.runtime && this.runtime.storage) || [];
const node = (this.runtime && this.runtime.node) || {};
const inbox = storage.find(item => item.label === 'Inbox') || {};
const library = storage.find(item => item.label === 'Library') || {};
return [
{ label: 'Tracks', value: this.stats.tracks || 0 },
{ label: 'Releases', value: this.stats.releases || 0 },
{ label: 'Artists', value: this.stats.artists || 0 },
{ label: 'Playlists', value: this.stats.playlists || 0 },
{ label: 'Hidden tracks', value: this.stats.hidden_tracks || 0 },
{ label: 'Hidden releases', value: this.stats.hidden_releases || 0 },
{ label: 'Hidden artists', value: this.stats.hidden_artists || 0 }
{
label: agent.model ? `AI agent · ${agent.model}` : 'AI agent',
display: agent.status || 'unknown',
title: `enabled: ${agent.enabled ? 'yes' : 'no'} · llm: ${agent.llm_configured ? 'configured' : 'missing'} · concurrency: ${agent.concurrency || 0}`
},
this.storageStatCell(inbox, 'Inbox disk'),
this.storageStatCell(library, 'Library disk'),
{
label: `${node.hostname || 'node'} · pid ${node.pid || '?'}`,
display: `${node.cpu_count || '?'} CPU`,
title: `${node.os || 'unknown'} / ${node.arch || 'unknown'}`
}
];
},
storageStatCell(item, fallbackLabel) {
const free = item && item.free_bytes != null ? item.free_bytes : null;
const total = item && item.total_bytes != null ? item.total_bytes : null;
const suffix = item && item.exists === false ? ' · missing' : '';
return {
label: `${item.label || fallbackLabel}${suffix}`,
display: free != null ? `${this.formatBytes(free)} free` : 'n/a',
title: `${item.path || 'not configured'}${total != null ? ` · ${this.formatBytes(total)} total` : ''}`
};
},
formatBytes(bytes) {
const value = Number(bytes || 0);
if (!Number.isFinite(value) || value <= 0) return '0 B';
const units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB'];
let size = value;
let unit = 0;
while (size >= 1024 && unit < units.length - 1) {
size /= 1024;
unit += 1;
}
const digits = size >= 10 || unit === 0 ? 0 : 1;
return `${size.toFixed(digits)} ${units[unit]}`;
},
pageTitle() {
if (this.activeView === 'library') return 'Library Workbench';
if (this.activeView === 'jobs') return 'Tasks';
+13 -114
View File
@@ -168,18 +168,6 @@ document.addEventListener('alpine:init', () => {
Alpine.store('mobile', {
libraryOpen: false,
playerExpanded: false,
playerDragging: false,
playerDragOffset: 0,
playerCloseOffset: 0,
_playerDragStartY: 0,
_playerDragStartX: 0,
_playerDragTracking: false,
_playerDragMode: null,
_playerDragPointerId: null,
_playerDragElement: null,
_playerDragMove: null,
_playerDragEnd: null,
_playerSuppressClickUntil: 0,
toggleLibrary() {
this.libraryOpen = !this.libraryOpen;
if (this.libraryOpen) Alpine.store('user').menuOpen = false;
@@ -188,119 +176,30 @@ document.addEventListener('alpine:init', () => {
this.libraryOpen = false;
},
isMobilePlayer() {
return window.matchMedia && window.matchMedia('(max-width: 720px)').matches;
if (!window.matchMedia) return false;
return window.matchMedia('(max-width: 900px)').matches
|| window.matchMedia('(pointer: coarse) and (max-width: 1024px)').matches;
},
openPlayerFullscreen() {
if (!this.isMobilePlayer() || !Alpine.store('player').currentTrack) return;
this.playerExpanded = true;
this.playerDragging = false;
this.playerDragOffset = 0;
this.playerCloseOffset = 0;
Alpine.store('queue').visible = false;
Alpine.store('devices').open = false;
this.resetPlayerFullscreenScroll();
},
closePlayerFullscreen() {
this.playerExpanded = false;
this.playerDragging = false;
this.playerDragOffset = 0;
this.playerCloseOffset = 0;
Alpine.store('queue').visible = false;
Alpine.store('devices').open = false;
},
playerDragStyle() {
return `--mobile-player-drag:${this.playerDragOffset}px; --mobile-player-close-drag:${this.playerCloseOffset}px;`;
},
handlePlayerClick(event) {
if (Date.now() <= this._playerSuppressClickUntil) {
event.preventDefault();
event.stopPropagation();
this._playerSuppressClickUntil = 0;
}
},
startPlayerDrag(event, force = false) {
if (!this.isMobilePlayer() || !Alpine.store('player').currentTrack) return;
if (event.button && event.button !== 0) return;
const target = event.target;
const isDragBlocked = target.closest('input, select, textarea, .volume-slider, .device-popover, .mobile-expanded-queue');
if (!force) {
if (this.playerExpanded) {
const isCloseHandle = target.closest('.player-now-playing');
const scroller = event.currentTarget?.classList?.contains('player-bar') ? event.currentTarget : null;
if (!isCloseHandle || isDragBlocked || (scroller && scroller.scrollTop > 4)) return;
} else if (isDragBlocked) {
return;
resetPlayerFullscreenScroll() {
requestAnimationFrame(() => {
const full = document.querySelector('.player-bar .mobile-full-player');
if (full) {
full.scrollTop = 0;
full.scrollLeft = 0;
}
}
if (this._playerDragTracking) this.endPlayerDrag({ type: 'pointercancel' });
this.playerDragging = false;
this._playerDragTracking = true;
this._playerDragMode = this.playerExpanded ? 'close' : 'open';
this._playerDragStartY = event.clientY;
this._playerDragStartX = event.clientX;
this._playerDragPointerId = event.pointerId;
this._playerDragElement = event.currentTarget;
this.playerDragOffset = 0;
this.playerCloseOffset = 0;
this._playerDragMove = e => this.movePlayerDrag(e);
this._playerDragEnd = e => this.endPlayerDrag(e);
window.addEventListener('pointermove', this._playerDragMove, { passive: false });
window.addEventListener('pointerup', this._playerDragEnd, { passive: false });
window.addEventListener('pointercancel', this._playerDragEnd, { passive: false });
},
movePlayerDrag(event) {
if (!this._playerDragTracking) return;
const delta = this._playerDragStartY - event.clientY;
const absDelta = Math.abs(delta);
if (!this.playerDragging) {
const horizontalDelta = Math.abs(event.clientX - this._playerDragStartX);
const wantsOpen = this._playerDragMode === 'open' && delta > 0;
const wantsClose = this._playerDragMode === 'close' && delta < 0;
if (absDelta < 8 || absDelta < horizontalDelta * 1.15 || (!wantsOpen && !wantsClose)) return;
this.playerDragging = true;
try {
this._playerDragElement?.setPointerCapture?.(this._playerDragPointerId);
} catch (_) {}
}
event.preventDefault();
if (this._playerDragMode === 'close') {
this.playerCloseOffset = Math.max(0, Math.min(window.innerHeight, -delta));
} else {
const max = Math.max(0, window.innerHeight - 132);
this.playerDragOffset = Math.max(0, Math.min(max, delta));
}
},
endPlayerDrag(event) {
const openThreshold = Math.min(180, Math.max(90, window.innerHeight * 0.18));
const closeThreshold = Math.min(110, Math.max(64, window.innerHeight * 0.1));
const wasCancelled = event?.type === 'pointercancel';
const wasDragging = this.playerDragging;
if (wasDragging) this._playerSuppressClickUntil = Date.now() + 450;
if (this._playerDragMode === 'close') {
if (!wasCancelled && this.playerCloseOffset > closeThreshold) this.closePlayerFullscreen();
else {
this.playerCloseOffset = 0;
this.playerDragging = false;
}
} else if (this._playerDragMode === 'open' && !wasCancelled && this.playerDragOffset > openThreshold) {
this.openPlayerFullscreen();
} else {
this.playerDragOffset = 0;
this.playerDragging = false;
}
try {
if (this._playerDragPointerId !== null && this._playerDragElement?.hasPointerCapture?.(this._playerDragPointerId)) {
this._playerDragElement.releasePointerCapture(this._playerDragPointerId);
}
} catch (_) {}
if (this._playerDragMove) window.removeEventListener('pointermove', this._playerDragMove);
if (this._playerDragEnd) {
window.removeEventListener('pointerup', this._playerDragEnd);
window.removeEventListener('pointercancel', this._playerDragEnd);
}
this._playerDragTracking = false;
this._playerDragMode = null;
this._playerDragPointerId = null;
this._playerDragElement = null;
this._playerDragMove = null;
this._playerDragEnd = null;
});
},
});
+15 -16
View File
@@ -958,16 +958,14 @@
<!-- Player Bar -->
<div class="player-bar"
:class="{ 'mobile-expanded': $store.mobile.playerExpanded, 'mobile-dragging': $store.mobile.playerDragging }"
:style="$store.mobile.playerDragStyle()"
@click.capture="$store.mobile.handlePlayerClick($event)"
@pointerdown="$store.mobile.startPlayerDrag($event)">
<button class="mobile-player-collapse-btn" type="button" @click.stop="$store.mobile.closePlayerFullscreen()" title="{{ t.player_close }}" aria-label="{{ t.player_close }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.4">
<path d="M6 9l6 6 6-6"/>
</svg>
</button>
<div class="player-now-playing">
:class="{ 'mobile-expanded': $store.mobile.playerExpanded }">
<div class="mobile-full-player">
<button class="mobile-player-collapse-btn" type="button" @click.stop="$store.mobile.closePlayerFullscreen()" title="{{ t.player_close }}" aria-label="{{ t.player_close }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.4">
<path d="M6 9l6 6 6-6"/>
</svg>
</button>
<div class="player-now-playing">
<template x-if="$store.player.currentTrack">
<div style="display:flex;align-items:center;gap:12px;overflow:hidden">
<div class="player-cover"
@@ -1007,9 +1005,9 @@
</div>
</div>
</template>
</div>
</div>
<div class="player-controls">
<div class="player-controls">
<div class="player-buttons">
<button class="player-btn" :class="{ active: $store.player.shuffle }" @click="$store.player.toggleShuffle()" title="{{ t.player_shuffle }}">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polyline points="16 3 21 3 21 8"/><line x1="4" y1="20" x2="21" y2="3"/><polyline points="21 16 21 21 16 21"/><line x1="15" y1="15" x2="21" y2="21"/><line x1="4" y1="4" x2="9" y2="9"/></svg>
@@ -1049,9 +1047,9 @@
<span class="player-time" x-text="formatTime($store.player.duration)"></span>
</div>
<div class="player-version-chip">v{{ t.app_version() }}</div>
</div>
</div>
<div class="player-right">
<div class="player-right">
<div class="volume-control">
<button class="volume-btn" @click="$store.player.toggleMute()">
<template x-if="$store.player.volume === 0">
@@ -1199,8 +1197,8 @@
</div>
</div>
</div>
</div>
<div class="mobile-expanded-queue">
</div>
<div class="mobile-expanded-queue">
<div class="mobile-expanded-queue-title">{{ t.player_queue }}</div>
<template x-if="$store.queue.upcoming().length === 0">
<div class="mobile-expanded-queue-empty">{{ t.player_queue_empty }}</div>
@@ -1233,5 +1231,6 @@
<span class="mobile-expanded-queue-time" x-text="formatTime(track.duration_seconds)"></span>
</button>
</template>
</div>
</div>
</div>
+65 -65
View File
@@ -3644,6 +3644,10 @@ button.user-stat:hover {
display: none;
}
.mobile-full-player {
display: contents;
}
.playlist-action-btn {
background: none;
border: none;
@@ -3696,7 +3700,7 @@ button.user-stat:hover {
.release-meta .release-title { font-size: 32px; }
}
@media (max-width: 900px) {
@media (max-width: 900px), (pointer: coarse) and (max-width: 1024px) {
:root {
--player-height: 168px;
--player-bar-space: calc(var(--player-height) + var(--safe-bottom));
@@ -3879,7 +3883,7 @@ button.user-stat:hover {
gap: 4px 10px;
align-items: center;
padding: 34px 12px calc(9px + var(--safe-bottom));
touch-action: none;
touch-action: auto;
user-select: none;
}
@@ -4115,20 +4119,32 @@ button.user-stat:hover {
height: 21px;
}
.player-bar.mobile-dragging:not(.mobile-expanded) {
.player-bar.mobile-expanded {
position: fixed;
left: 0;
right: 0;
bottom: 0;
height: calc(var(--player-bar-space) + var(--mobile-player-drag, 0px));
z-index: 70;
border-radius: 18px 18px 0 0;
box-shadow: 0 -18px 54px rgba(0,0,0,0.5);
top: 0;
bottom: auto;
height: 100dvh;
display: block;
padding: 0;
border-top: 0;
border-radius: 0;
background: var(--bg-primary);
box-shadow: none;
overflow: hidden;
overscroll-behavior: contain;
z-index: 80;
touch-action: auto;
user-select: auto;
transform: translateZ(0);
}
.player-bar.mobile-expanded {
position: fixed;
inset: 0;
.player-bar.mobile-expanded .mobile-full-player {
position: absolute;
left: 0;
right: 0;
bottom: 0;
height: 100dvh;
display: flex;
flex-direction: column;
@@ -4136,26 +4152,14 @@ button.user-stat:hover {
gap: 16px;
align-items: center;
padding: calc(18px + env(safe-area-inset-top)) 18px calc(16px + var(--safe-bottom));
border-top: 0;
border-radius: 0;
background: var(--bg-primary);
box-shadow: none;
overflow-y: auto;
overscroll-behavior: contain;
z-index: 80;
transform: translateY(var(--mobile-player-close-drag, 0px));
transition: transform 0.18s ease, height 0.18s ease;
touch-action: pan-y;
user-select: auto;
z-index: 3;
}
.player-bar.mobile-dragging {
transition: none;
}
.player-bar.mobile-expanded .mobile-player-collapse-btn {
.player-bar.mobile-expanded .mobile-full-player .mobile-player-collapse-btn {
display: flex;
position: absolute;
position: fixed;
top: calc(12px + env(safe-area-inset-top));
right: 12px;
width: 42px;
@@ -4174,7 +4178,7 @@ button.user-stat:hover {
height: 22px;
}
.player-bar.mobile-expanded .player-now-playing {
.player-bar.mobile-expanded .mobile-full-player .player-now-playing {
justify-content: center;
align-self: stretch;
width: 100%;
@@ -4182,11 +4186,11 @@ button.user-stat:hover {
flex: 0 0 auto;
overflow: visible;
padding-top: 38px;
touch-action: none;
cursor: grab;
touch-action: auto;
cursor: default;
}
.player-bar.mobile-expanded .player-now-playing > div {
.player-bar.mobile-expanded .mobile-full-player .player-now-playing > div {
width: 100%;
flex-direction: column;
justify-content: center;
@@ -4195,60 +4199,56 @@ button.user-stat:hover {
text-align: center;
}
.player-bar.mobile-expanded.mobile-dragging .player-now-playing {
cursor: grabbing;
}
.player-bar.mobile-expanded .player-cover {
.player-bar.mobile-expanded .mobile-full-player .player-cover {
width: min(76vw, 38dvh, 360px);
height: auto;
aspect-ratio: 1;
border-radius: 14px;
box-shadow: 0 22px 62px rgba(0,0,0,0.48);
touch-action: none;
touch-action: manipulation;
}
.player-bar.mobile-expanded .player-cover svg {
.player-bar.mobile-expanded .mobile-full-player .player-cover svg {
width: 96px;
height: 96px;
}
.player-bar.mobile-expanded .player-track-info {
.player-bar.mobile-expanded .mobile-full-player .player-track-info {
width: min(100%, 520px);
overflow: visible;
}
.player-bar.mobile-expanded .player-track-title-row {
.player-bar.mobile-expanded .mobile-full-player .player-track-title-row {
justify-content: center;
}
.player-bar.mobile-expanded .player-track-title {
.player-bar.mobile-expanded .mobile-full-player .player-track-title {
font-size: 22px;
font-weight: 800;
white-space: normal;
text-align: center;
}
.player-bar.mobile-expanded .player-track-artist {
.player-bar.mobile-expanded .mobile-full-player .player-track-artist {
margin-top: 5px;
font-size: 14px;
white-space: normal;
text-align: center;
}
.player-bar.mobile-expanded .player-current-like {
.player-bar.mobile-expanded .mobile-full-player .player-current-like {
display: flex;
width: 38px;
height: 38px;
}
.player-bar.mobile-expanded .player-track-release {
.player-bar.mobile-expanded .mobile-full-player .player-track-release {
margin-top: 4px;
font-size: 13px;
white-space: normal;
}
.player-bar.mobile-expanded .player-controls {
.player-bar.mobile-expanded .mobile-full-player .player-controls {
display: flex;
width: 100%;
flex: 0 0 auto;
@@ -4257,32 +4257,32 @@ button.user-stat:hover {
gap: 14px;
}
.player-bar.mobile-expanded .player-version-chip {
.player-bar.mobile-expanded .mobile-full-player .player-version-chip {
display: none;
}
.player-bar.mobile-expanded .player-buttons {
.player-bar.mobile-expanded .mobile-full-player .player-buttons {
justify-self: center;
gap: 18px;
order: 2;
}
.player-bar.mobile-expanded .player-btn {
.player-bar.mobile-expanded .mobile-full-player .player-btn {
min-width: 56px;
min-height: 56px;
}
.player-bar.mobile-expanded .player-btn svg {
.player-bar.mobile-expanded .mobile-full-player .player-btn svg {
width: 28px;
height: 28px;
}
.player-bar.mobile-expanded .player-btn-play {
.player-bar.mobile-expanded .mobile-full-player .player-btn-play {
width: 72px;
height: 72px;
}
.player-bar.mobile-expanded .player-timeline {
.player-bar.mobile-expanded .mobile-full-player .player-timeline {
width: 100%;
max-width: none;
justify-self: center;
@@ -4291,16 +4291,16 @@ button.user-stat:hover {
order: 1;
}
.player-bar.mobile-expanded .progress-bar {
.player-bar.mobile-expanded .mobile-full-player .progress-bar {
height: 7px;
border-radius: 999px;
}
.player-bar.mobile-expanded .progress-bar-thumb {
.player-bar.mobile-expanded .mobile-full-player .progress-bar-thumb {
opacity: 1;
}
.player-bar.mobile-expanded .player-right {
.player-bar.mobile-expanded .mobile-full-player .player-right {
position: static;
grid-area: actions;
justify-self: center;
@@ -4313,28 +4313,28 @@ button.user-stat:hover {
background: transparent;
}
.player-bar.mobile-expanded .volume-control {
.player-bar.mobile-expanded .mobile-full-player .volume-control {
grid-template-columns: 44px minmax(0, 1fr);
gap: 8px;
}
.player-bar.mobile-expanded .volume-btn,
.player-bar.mobile-expanded .queue-toggle-btn {
.player-bar.mobile-expanded .mobile-full-player .volume-btn,
.player-bar.mobile-expanded .mobile-full-player .queue-toggle-btn {
min-width: 48px;
min-height: 48px;
padding: 10px;
}
.player-bar.mobile-expanded .volume-btn {
.player-bar.mobile-expanded .mobile-full-player .volume-btn {
min-width: 44px;
}
.player-bar.mobile-expanded .volume-slider {
.player-bar.mobile-expanded .mobile-full-player .volume-slider {
display: block;
height: 7px;
}
.player-bar.mobile-expanded .device-popover {
.player-bar.mobile-expanded .mobile-full-player .device-popover {
position: fixed;
top: auto;
bottom: calc(90px + var(--safe-bottom));
@@ -4345,7 +4345,7 @@ button.user-stat:hover {
max-height: 42dvh;
}
.player-bar.mobile-expanded .mobile-expanded-queue {
.player-bar.mobile-expanded .mobile-full-player .mobile-expanded-queue {
display: block;
width: 100%;
max-height: none;
@@ -4991,26 +4991,26 @@ button.user-stat:hover {
height: 24px;
}
.player-bar.mobile-expanded {
.player-bar.mobile-expanded .mobile-full-player {
gap: 14px;
padding-left: 14px;
padding-right: 14px;
}
.player-bar.mobile-expanded .player-cover {
.player-bar.mobile-expanded .mobile-full-player .player-cover {
width: min(82vw, 36dvh, 340px);
}
.player-bar.mobile-expanded .player-buttons {
.player-bar.mobile-expanded .mobile-full-player .player-buttons {
gap: 12px;
}
.player-bar.mobile-expanded .player-btn {
.player-bar.mobile-expanded .mobile-full-player .player-btn {
min-width: 52px;
min-height: 52px;
}
.player-bar.mobile-expanded .player-btn-play {
.player-bar.mobile-expanded .mobile-full-player .player-btn-play {
width: 68px;
height: 68px;
}