feat: add server-sent events for logging and activity tracking
- Implemented a custom tracing layer (`AppLogLayer`) to capture log events and broadcast them to SSE clients. - Created admin routes for streaming server logs and listing recent activity logs. - Added an activity log repository interface and SQLite implementation for persisting activity events. - Integrated activity logging into user authentication and channel CRUD operations. - Developed frontend components for displaying server logs and activity logs in the admin panel. - Enhanced the video player with a stats overlay for monitoring streaming metrics.
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,2 +1,3 @@
|
|||||||
transcode/
|
transcode/
|
||||||
.worktrees/
|
.worktrees/
|
||||||
|
.superpowers/
|
||||||
3
k-tv-backend/Cargo.lock
generated
3
k-tv-backend/Cargo.lock
generated
@@ -90,10 +90,12 @@ dependencies = [
|
|||||||
"thiserror 2.0.17",
|
"thiserror 2.0.17",
|
||||||
"time",
|
"time",
|
||||||
"tokio",
|
"tokio",
|
||||||
|
"tokio-stream",
|
||||||
"tokio-util",
|
"tokio-util",
|
||||||
"tower",
|
"tower",
|
||||||
"tower-http",
|
"tower-http",
|
||||||
"tracing",
|
"tracing",
|
||||||
|
"tracing-subscriber",
|
||||||
"uuid",
|
"uuid",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -3546,6 +3548,7 @@ dependencies = [
|
|||||||
"futures-core",
|
"futures-core",
|
||||||
"pin-project-lite",
|
"pin-project-lite",
|
||||||
"tokio",
|
"tokio",
|
||||||
|
"tokio-util",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|||||||
@@ -56,6 +56,8 @@ uuid = { version = "1.19.0", features = ["v4", "serde"] }
|
|||||||
|
|
||||||
# Logging
|
# Logging
|
||||||
tracing = "0.1"
|
tracing = "0.1"
|
||||||
|
tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt"] }
|
||||||
|
tokio-stream = { version = "0.1", features = ["sync"] }
|
||||||
|
|
||||||
reqwest = { version = "0.12", features = ["json"] }
|
reqwest = { version = "0.12", features = ["json"] }
|
||||||
handlebars = "6"
|
handlebars = "6"
|
||||||
|
|||||||
@@ -59,6 +59,32 @@ pub struct ConfigResponse {
|
|||||||
pub provider_capabilities: domain::ProviderCapabilities,
|
pub provider_capabilities: domain::ProviderCapabilities,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// Admin DTOs
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
/// An activity log entry returned by GET /admin/activity.
|
||||||
|
#[derive(Debug, Serialize)]
|
||||||
|
pub struct ActivityEventResponse {
|
||||||
|
pub id: Uuid,
|
||||||
|
pub timestamp: DateTime<Utc>,
|
||||||
|
pub event_type: String,
|
||||||
|
pub detail: String,
|
||||||
|
pub channel_id: Option<Uuid>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<domain::ActivityEvent> for ActivityEventResponse {
|
||||||
|
fn from(e: domain::ActivityEvent) -> Self {
|
||||||
|
Self {
|
||||||
|
id: e.id,
|
||||||
|
timestamp: e.timestamp,
|
||||||
|
event_type: e.event_type,
|
||||||
|
detail: e.detail,
|
||||||
|
channel_id: e.channel_id,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
// Channel DTOs
|
// Channel DTOs
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|||||||
72
k-tv-backend/api/src/log_layer.rs
Normal file
72
k-tv-backend/api/src/log_layer.rs
Normal file
@@ -0,0 +1,72 @@
|
|||||||
|
//! Custom tracing layer that captures log events and broadcasts them to SSE clients.
|
||||||
|
|
||||||
|
use chrono::Utc;
|
||||||
|
use serde::Serialize;
|
||||||
|
use std::collections::VecDeque;
|
||||||
|
use std::sync::{Arc, Mutex};
|
||||||
|
use tokio::sync::broadcast;
|
||||||
|
use tracing::Event;
|
||||||
|
use tracing_subscriber::Layer;
|
||||||
|
|
||||||
|
/// A single structured log line sent to SSE clients.
|
||||||
|
#[derive(Debug, Clone, Serialize)]
|
||||||
|
pub struct LogLine {
|
||||||
|
pub level: String,
|
||||||
|
pub target: String,
|
||||||
|
pub message: String,
|
||||||
|
pub timestamp: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Tracing layer that fans log events out to a broadcast channel + ring buffer.
|
||||||
|
pub struct AppLogLayer {
|
||||||
|
tx: broadcast::Sender<LogLine>,
|
||||||
|
history: Arc<Mutex<VecDeque<LogLine>>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl AppLogLayer {
|
||||||
|
pub fn new(
|
||||||
|
tx: broadcast::Sender<LogLine>,
|
||||||
|
history: Arc<Mutex<VecDeque<LogLine>>>,
|
||||||
|
) -> Self {
|
||||||
|
Self { tx, history }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<S: tracing::Subscriber> Layer<S> for AppLogLayer {
|
||||||
|
fn on_event(&self, event: &Event<'_>, _ctx: tracing_subscriber::layer::Context<'_, S>) {
|
||||||
|
let mut visitor = MsgVisitor(String::new());
|
||||||
|
event.record(&mut visitor);
|
||||||
|
|
||||||
|
let line = LogLine {
|
||||||
|
level: event.metadata().level().to_string(),
|
||||||
|
target: event.metadata().target().to_string(),
|
||||||
|
message: visitor.0,
|
||||||
|
timestamp: Utc::now().to_rfc3339(),
|
||||||
|
};
|
||||||
|
|
||||||
|
if let Ok(mut history) = self.history.lock() {
|
||||||
|
if history.len() >= 200 {
|
||||||
|
history.pop_front();
|
||||||
|
}
|
||||||
|
history.push_back(line.clone());
|
||||||
|
}
|
||||||
|
|
||||||
|
let _ = self.tx.send(line);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
struct MsgVisitor(String);
|
||||||
|
|
||||||
|
impl tracing::field::Visit for MsgVisitor {
|
||||||
|
fn record_str(&mut self, field: &tracing::field::Field, value: &str) {
|
||||||
|
if field.name() == "message" {
|
||||||
|
self.0 = value.to_owned();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn record_debug(&mut self, field: &tracing::field::Field, value: &dyn std::fmt::Debug) {
|
||||||
|
if field.name() == "message" {
|
||||||
|
self.0 = format!("{value:?}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,27 +2,30 @@
|
|||||||
//!
|
//!
|
||||||
//! Configures and starts the HTTP server with JWT-based authentication.
|
//! Configures and starts the HTTP server with JWT-based authentication.
|
||||||
|
|
||||||
|
use std::collections::VecDeque;
|
||||||
use std::net::SocketAddr;
|
use std::net::SocketAddr;
|
||||||
|
use std::sync::{Arc, Mutex};
|
||||||
use std::time::Duration as StdDuration;
|
use std::time::Duration as StdDuration;
|
||||||
|
|
||||||
use axum::Router;
|
use axum::Router;
|
||||||
use axum::http::{HeaderName, HeaderValue};
|
use axum::http::{HeaderName, HeaderValue};
|
||||||
use std::sync::Arc;
|
use tokio::sync::broadcast;
|
||||||
use tower_http::cors::{AllowHeaders, AllowMethods, AllowOrigin, CorsLayer};
|
use tower_http::cors::{AllowHeaders, AllowMethods, AllowOrigin, CorsLayer};
|
||||||
|
use tracing::info;
|
||||||
|
use tracing_subscriber::{EnvFilter, fmt, layer::SubscriberExt, util::SubscriberInitExt};
|
||||||
|
|
||||||
use domain::{ChannelService, IMediaProvider, IProviderRegistry, ProviderCapabilities, ScheduleEngineService, StreamingProtocol, UserService};
|
use domain::{ChannelService, IMediaProvider, IProviderRegistry, ProviderCapabilities, ScheduleEngineService, StreamingProtocol, UserService};
|
||||||
use infra::factory::{build_channel_repository, build_schedule_repository, build_user_repository};
|
use infra::factory::{build_activity_log_repository, build_channel_repository, build_schedule_repository, build_user_repository};
|
||||||
use infra::run_migrations;
|
use infra::run_migrations;
|
||||||
use k_core::http::server::{ServerConfig, apply_standard_middleware};
|
use k_core::http::server::{ServerConfig, apply_standard_middleware};
|
||||||
use k_core::logging;
|
|
||||||
use tokio::net::TcpListener;
|
use tokio::net::TcpListener;
|
||||||
use tracing::info;
|
|
||||||
|
|
||||||
mod config;
|
mod config;
|
||||||
mod dto;
|
mod dto;
|
||||||
mod error;
|
mod error;
|
||||||
mod events;
|
mod events;
|
||||||
mod extractors;
|
mod extractors;
|
||||||
|
mod log_layer;
|
||||||
mod poller;
|
mod poller;
|
||||||
mod routes;
|
mod routes;
|
||||||
mod scheduler;
|
mod scheduler;
|
||||||
@@ -34,7 +37,16 @@ use crate::state::AppState;
|
|||||||
|
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
async fn main() -> anyhow::Result<()> {
|
async fn main() -> anyhow::Result<()> {
|
||||||
logging::init("api");
|
// Set up broadcast channel + ring buffer for SSE log streaming.
|
||||||
|
let (log_tx, _) = broadcast::channel::<log_layer::LogLine>(512);
|
||||||
|
let log_history = Arc::new(Mutex::new(VecDeque::<log_layer::LogLine>::new()));
|
||||||
|
|
||||||
|
// Initialize tracing with our custom layer in addition to the fmt layer.
|
||||||
|
tracing_subscriber::registry()
|
||||||
|
.with(EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("info")))
|
||||||
|
.with(fmt::layer())
|
||||||
|
.with(log_layer::AppLogLayer::new(log_tx.clone(), Arc::clone(&log_history)))
|
||||||
|
.init();
|
||||||
|
|
||||||
let config = Config::from_env();
|
let config = Config::from_env();
|
||||||
|
|
||||||
@@ -71,6 +83,7 @@ async fn main() -> anyhow::Result<()> {
|
|||||||
let user_repo = build_user_repository(&db_pool).await?;
|
let user_repo = build_user_repository(&db_pool).await?;
|
||||||
let channel_repo = build_channel_repository(&db_pool).await?;
|
let channel_repo = build_channel_repository(&db_pool).await?;
|
||||||
let schedule_repo = build_schedule_repository(&db_pool).await?;
|
let schedule_repo = build_schedule_repository(&db_pool).await?;
|
||||||
|
let activity_log_repo = build_activity_log_repository(&db_pool).await?;
|
||||||
|
|
||||||
let user_service = UserService::new(user_repo);
|
let user_service = UserService::new(user_repo);
|
||||||
let channel_service = ChannelService::new(channel_repo.clone());
|
let channel_service = ChannelService::new(channel_repo.clone());
|
||||||
@@ -177,6 +190,9 @@ async fn main() -> anyhow::Result<()> {
|
|||||||
registry,
|
registry,
|
||||||
config.clone(),
|
config.clone(),
|
||||||
event_tx.clone(),
|
event_tx.clone(),
|
||||||
|
log_tx,
|
||||||
|
log_history,
|
||||||
|
activity_log_repo,
|
||||||
)
|
)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
|
|||||||
95
k-tv-backend/api/src/routes/admin.rs
Normal file
95
k-tv-backend/api/src/routes/admin.rs
Normal file
@@ -0,0 +1,95 @@
|
|||||||
|
//! Admin routes: SSE log stream + activity log.
|
||||||
|
|
||||||
|
use axum::{
|
||||||
|
Json,
|
||||||
|
extract::State,
|
||||||
|
response::{
|
||||||
|
IntoResponse,
|
||||||
|
sse::{Event, KeepAlive, Sse},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
use tokio_stream::{StreamExt, wrappers::BroadcastStream};
|
||||||
|
|
||||||
|
use crate::{
|
||||||
|
dto::ActivityEventResponse,
|
||||||
|
error::ApiError,
|
||||||
|
extractors::OptionalCurrentUser,
|
||||||
|
state::AppState,
|
||||||
|
};
|
||||||
|
|
||||||
|
use axum::Router;
|
||||||
|
use axum::routing::get;
|
||||||
|
|
||||||
|
pub fn router() -> Router<AppState> {
|
||||||
|
Router::new()
|
||||||
|
.route("/logs", get(stream_logs))
|
||||||
|
.route("/activity", get(list_activity))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Stream server log lines as Server-Sent Events.
|
||||||
|
///
|
||||||
|
/// Auth: requires a valid JWT passed as `?token=<jwt>` (EventSource cannot set headers).
|
||||||
|
/// On connect: flushes the recent history ring buffer, then streams live events.
|
||||||
|
pub async fn stream_logs(
|
||||||
|
State(state): State<AppState>,
|
||||||
|
OptionalCurrentUser(user): OptionalCurrentUser,
|
||||||
|
) -> Result<impl IntoResponse, ApiError> {
|
||||||
|
if user.is_none() {
|
||||||
|
return Err(ApiError::Unauthorized(
|
||||||
|
"Authentication required for log stream".to_string(),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Snapshot history and subscribe before releasing the lock so we don't miss events.
|
||||||
|
let rx = state.log_tx.subscribe();
|
||||||
|
let history: Vec<_> = state
|
||||||
|
.log_history
|
||||||
|
.lock()
|
||||||
|
.map(|h| h.iter().cloned().collect())
|
||||||
|
.unwrap_or_default();
|
||||||
|
|
||||||
|
let history_stream = tokio_stream::iter(history).map(|line| {
|
||||||
|
let data = serde_json::to_string(&line).unwrap_or_default();
|
||||||
|
Ok::<Event, String>(Event::default().data(data))
|
||||||
|
});
|
||||||
|
|
||||||
|
let live_stream = BroadcastStream::new(rx).filter_map(|result| match result {
|
||||||
|
Ok(line) => {
|
||||||
|
let data = serde_json::to_string(&line).unwrap_or_default();
|
||||||
|
Some(Ok::<Event, String>(Event::default().data(data)))
|
||||||
|
}
|
||||||
|
Err(tokio_stream::wrappers::errors::BroadcastStreamRecvError::Lagged(n)) => {
|
||||||
|
let data = format!(
|
||||||
|
r#"{{"level":"WARN","target":"sse","message":"[{n} log lines dropped — buffer overrun]","timestamp":""}}"#
|
||||||
|
);
|
||||||
|
Some(Ok(Event::default().data(data)))
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
let combined = history_stream.chain(live_stream);
|
||||||
|
|
||||||
|
Ok(Sse::new(combined).keep_alive(KeepAlive::default()))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Return recent activity log entries.
|
||||||
|
///
|
||||||
|
/// Auth: requires a valid JWT (Authorization: Bearer or ?token=).
|
||||||
|
pub async fn list_activity(
|
||||||
|
State(state): State<AppState>,
|
||||||
|
OptionalCurrentUser(user): OptionalCurrentUser,
|
||||||
|
) -> Result<impl IntoResponse, ApiError> {
|
||||||
|
if user.is_none() {
|
||||||
|
return Err(ApiError::Unauthorized(
|
||||||
|
"Authentication required".to_string(),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
let events = state
|
||||||
|
.activity_log_repo
|
||||||
|
.recent(50)
|
||||||
|
.await
|
||||||
|
.map_err(ApiError::from)?;
|
||||||
|
|
||||||
|
let response: Vec<ActivityEventResponse> = events.into_iter().map(Into::into).collect();
|
||||||
|
Ok(Json(response))
|
||||||
|
}
|
||||||
@@ -35,6 +35,7 @@ pub(super) async fn login(
|
|||||||
}
|
}
|
||||||
|
|
||||||
let token = create_jwt(&user, &state)?;
|
let token = create_jwt(&user, &state)?;
|
||||||
|
let _ = state.activity_log_repo.log("user_login", user.email.as_ref(), None).await;
|
||||||
|
|
||||||
Ok((
|
Ok((
|
||||||
StatusCode::OK,
|
StatusCode::OK,
|
||||||
|
|||||||
@@ -69,6 +69,7 @@ pub(super) async fn create_channel(
|
|||||||
}
|
}
|
||||||
|
|
||||||
let _ = state.event_tx.send(domain::DomainEvent::ChannelCreated { channel: channel.clone() });
|
let _ = state.event_tx.send(domain::DomainEvent::ChannelCreated { channel: channel.clone() });
|
||||||
|
let _ = state.activity_log_repo.log("channel_created", &channel.name, Some(channel.id)).await;
|
||||||
Ok((StatusCode::CREATED, Json(ChannelResponse::from(channel))))
|
Ok((StatusCode::CREATED, Json(ChannelResponse::from(channel))))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -144,6 +145,7 @@ pub(super) async fn update_channel(
|
|||||||
|
|
||||||
let channel = state.channel_service.update(channel).await?;
|
let channel = state.channel_service.update(channel).await?;
|
||||||
let _ = state.event_tx.send(domain::DomainEvent::ChannelUpdated { channel: channel.clone() });
|
let _ = state.event_tx.send(domain::DomainEvent::ChannelUpdated { channel: channel.clone() });
|
||||||
|
let _ = state.activity_log_repo.log("channel_updated", &channel.name, Some(channel.id)).await;
|
||||||
Ok(Json(ChannelResponse::from(channel)))
|
Ok(Json(ChannelResponse::from(channel)))
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -155,5 +157,6 @@ pub(super) async fn delete_channel(
|
|||||||
// ChannelService::delete enforces ownership internally
|
// ChannelService::delete enforces ownership internally
|
||||||
state.channel_service.delete(channel_id, user.id).await?;
|
state.channel_service.delete(channel_id, user.id).await?;
|
||||||
let _ = state.event_tx.send(domain::DomainEvent::ChannelDeleted { channel_id });
|
let _ = state.event_tx.send(domain::DomainEvent::ChannelDeleted { channel_id });
|
||||||
|
let _ = state.activity_log_repo.log("channel_deleted", &channel_id.to_string(), Some(channel_id)).await;
|
||||||
Ok(StatusCode::NO_CONTENT)
|
Ok(StatusCode::NO_CONTENT)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,6 +37,8 @@ pub(super) async fn generate_schedule(
|
|||||||
channel_id,
|
channel_id,
|
||||||
schedule: schedule.clone(),
|
schedule: schedule.clone(),
|
||||||
});
|
});
|
||||||
|
let detail = format!("{} slots", schedule.slots.len());
|
||||||
|
let _ = state.activity_log_repo.log("schedule_generated", &detail, Some(channel_id)).await;
|
||||||
Ok((StatusCode::CREATED, Json(ScheduleResponse::from(schedule))))
|
Ok((StatusCode::CREATED, Json(ScheduleResponse::from(schedule))))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
use crate::state::AppState;
|
use crate::state::AppState;
|
||||||
use axum::Router;
|
use axum::Router;
|
||||||
|
|
||||||
|
pub mod admin;
|
||||||
pub mod auth;
|
pub mod auth;
|
||||||
pub mod channels;
|
pub mod channels;
|
||||||
pub mod config;
|
pub mod config;
|
||||||
@@ -15,6 +16,7 @@ pub mod library;
|
|||||||
/// Construct the API v1 router
|
/// Construct the API v1 router
|
||||||
pub fn api_v1_router() -> Router<AppState> {
|
pub fn api_v1_router() -> Router<AppState> {
|
||||||
Router::new()
|
Router::new()
|
||||||
|
.nest("/admin", admin::router())
|
||||||
.nest("/auth", auth::router())
|
.nest("/auth", auth::router())
|
||||||
.nest("/channels", channels::router())
|
.nest("/channels", channels::router())
|
||||||
.nest("/config", config::router())
|
.nest("/config", config::router())
|
||||||
|
|||||||
@@ -8,11 +8,14 @@ use axum_extra::extract::cookie::Key;
|
|||||||
use infra::auth::jwt::{JwtConfig, JwtValidator};
|
use infra::auth::jwt::{JwtConfig, JwtValidator};
|
||||||
#[cfg(feature = "auth-oidc")]
|
#[cfg(feature = "auth-oidc")]
|
||||||
use infra::auth::oidc::OidcService;
|
use infra::auth::oidc::OidcService;
|
||||||
use std::sync::Arc;
|
use std::collections::VecDeque;
|
||||||
|
use std::sync::{Arc, Mutex};
|
||||||
|
use tokio::sync::broadcast;
|
||||||
|
|
||||||
use crate::config::Config;
|
use crate::config::Config;
|
||||||
use crate::events::EventBus;
|
use crate::events::EventBus;
|
||||||
use domain::{ChannelService, ScheduleEngineService, UserService};
|
use crate::log_layer::LogLine;
|
||||||
|
use domain::{ActivityLogRepository, ChannelService, ScheduleEngineService, UserService};
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
pub struct AppState {
|
pub struct AppState {
|
||||||
@@ -27,6 +30,12 @@ pub struct AppState {
|
|||||||
pub jwt_validator: Option<Arc<JwtValidator>>,
|
pub jwt_validator: Option<Arc<JwtValidator>>,
|
||||||
pub config: Arc<Config>,
|
pub config: Arc<Config>,
|
||||||
pub event_tx: EventBus,
|
pub event_tx: EventBus,
|
||||||
|
/// Broadcast channel for streaming log lines to SSE clients.
|
||||||
|
pub log_tx: broadcast::Sender<LogLine>,
|
||||||
|
/// Ring buffer of recent log lines sent to new SSE clients on connect.
|
||||||
|
pub log_history: Arc<Mutex<VecDeque<LogLine>>>,
|
||||||
|
/// Repository for persisted in-app activity events.
|
||||||
|
pub activity_log_repo: Arc<dyn ActivityLogRepository>,
|
||||||
/// Index for the local-files provider, used by the rescan route.
|
/// Index for the local-files provider, used by the rescan route.
|
||||||
#[cfg(feature = "local-files")]
|
#[cfg(feature = "local-files")]
|
||||||
pub local_index: Option<Arc<infra::LocalIndex>>,
|
pub local_index: Option<Arc<infra::LocalIndex>>,
|
||||||
@@ -46,6 +55,9 @@ impl AppState {
|
|||||||
provider_registry: Arc<infra::ProviderRegistry>,
|
provider_registry: Arc<infra::ProviderRegistry>,
|
||||||
config: Config,
|
config: Config,
|
||||||
event_tx: EventBus,
|
event_tx: EventBus,
|
||||||
|
log_tx: broadcast::Sender<LogLine>,
|
||||||
|
log_history: Arc<Mutex<VecDeque<LogLine>>>,
|
||||||
|
activity_log_repo: Arc<dyn ActivityLogRepository>,
|
||||||
) -> anyhow::Result<Self> {
|
) -> anyhow::Result<Self> {
|
||||||
let cookie_key = Key::derive_from(config.cookie_secret.as_bytes());
|
let cookie_key = Key::derive_from(config.cookie_secret.as_bytes());
|
||||||
|
|
||||||
@@ -118,6 +130,9 @@ impl AppState {
|
|||||||
jwt_validator,
|
jwt_validator,
|
||||||
config: Arc::new(config),
|
config: Arc::new(config),
|
||||||
event_tx,
|
event_tx,
|
||||||
|
log_tx,
|
||||||
|
log_history,
|
||||||
|
activity_log_repo,
|
||||||
#[cfg(feature = "local-files")]
|
#[cfg(feature = "local-files")]
|
||||||
local_index: None,
|
local_index: None,
|
||||||
#[cfg(feature = "local-files")]
|
#[cfg(feature = "local-files")]
|
||||||
|
|||||||
@@ -12,6 +12,16 @@ use crate::entities::{Channel, GeneratedSchedule, PlaybackRecord, User};
|
|||||||
use crate::errors::DomainResult;
|
use crate::errors::DomainResult;
|
||||||
use crate::value_objects::{ChannelId, UserId};
|
use crate::value_objects::{ChannelId, UserId};
|
||||||
|
|
||||||
|
/// An in-app activity event stored in the database for the admin log view.
|
||||||
|
#[derive(Debug, Clone)]
|
||||||
|
pub struct ActivityEvent {
|
||||||
|
pub id: Uuid,
|
||||||
|
pub timestamp: DateTime<Utc>,
|
||||||
|
pub event_type: String,
|
||||||
|
pub detail: String,
|
||||||
|
pub channel_id: Option<Uuid>,
|
||||||
|
}
|
||||||
|
|
||||||
/// Repository port for User persistence
|
/// Repository port for User persistence
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
pub trait UserRepository: Send + Sync {
|
pub trait UserRepository: Send + Sync {
|
||||||
@@ -71,3 +81,15 @@ pub trait ScheduleRepository: Send + Sync {
|
|||||||
|
|
||||||
async fn save_playback_record(&self, record: &PlaybackRecord) -> DomainResult<()>;
|
async fn save_playback_record(&self, record: &PlaybackRecord) -> DomainResult<()>;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Repository port for activity log persistence.
|
||||||
|
#[async_trait]
|
||||||
|
pub trait ActivityLogRepository: Send + Sync {
|
||||||
|
async fn log(
|
||||||
|
&self,
|
||||||
|
event_type: &str,
|
||||||
|
detail: &str,
|
||||||
|
channel_id: Option<Uuid>,
|
||||||
|
) -> DomainResult<()>;
|
||||||
|
async fn recent(&self, limit: u32) -> DomainResult<Vec<ActivityEvent>>;
|
||||||
|
}
|
||||||
|
|||||||
5
k-tv-backend/infra/src/activity_log_repository/mod.rs
Normal file
5
k-tv-backend/infra/src/activity_log_repository/mod.rs
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
#[cfg(feature = "sqlite")]
|
||||||
|
mod sqlite;
|
||||||
|
|
||||||
|
#[cfg(feature = "sqlite")]
|
||||||
|
pub use sqlite::SqliteActivityLogRepository;
|
||||||
71
k-tv-backend/infra/src/activity_log_repository/sqlite.rs
Normal file
71
k-tv-backend/infra/src/activity_log_repository/sqlite.rs
Normal file
@@ -0,0 +1,71 @@
|
|||||||
|
use async_trait::async_trait;
|
||||||
|
use chrono::Utc;
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
use domain::{ActivityEvent, ActivityLogRepository, DomainError, DomainResult};
|
||||||
|
|
||||||
|
pub struct SqliteActivityLogRepository {
|
||||||
|
pool: sqlx::SqlitePool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl SqliteActivityLogRepository {
|
||||||
|
pub fn new(pool: sqlx::SqlitePool) -> Self {
|
||||||
|
Self { pool }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[async_trait]
|
||||||
|
impl ActivityLogRepository for SqliteActivityLogRepository {
|
||||||
|
async fn log(
|
||||||
|
&self,
|
||||||
|
event_type: &str,
|
||||||
|
detail: &str,
|
||||||
|
channel_id: Option<Uuid>,
|
||||||
|
) -> DomainResult<()> {
|
||||||
|
let id = Uuid::new_v4().to_string();
|
||||||
|
let timestamp = Utc::now().to_rfc3339();
|
||||||
|
let channel_id_str = channel_id.map(|id| id.to_string());
|
||||||
|
|
||||||
|
sqlx::query(
|
||||||
|
"INSERT INTO activity_log (id, timestamp, event_type, detail, channel_id) VALUES (?, ?, ?, ?, ?)",
|
||||||
|
)
|
||||||
|
.bind(&id)
|
||||||
|
.bind(×tamp)
|
||||||
|
.bind(event_type)
|
||||||
|
.bind(detail)
|
||||||
|
.bind(&channel_id_str)
|
||||||
|
.execute(&self.pool)
|
||||||
|
.await
|
||||||
|
.map_err(|e| DomainError::RepositoryError(e.to_string()))?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn recent(&self, limit: u32) -> DomainResult<Vec<ActivityEvent>> {
|
||||||
|
let rows: Vec<(String, String, String, String, Option<String>)> = sqlx::query_as(
|
||||||
|
"SELECT id, timestamp, event_type, detail, channel_id FROM activity_log ORDER BY timestamp DESC LIMIT ?",
|
||||||
|
)
|
||||||
|
.bind(limit)
|
||||||
|
.fetch_all(&self.pool)
|
||||||
|
.await
|
||||||
|
.map_err(|e| DomainError::RepositoryError(e.to_string()))?;
|
||||||
|
|
||||||
|
let events = rows
|
||||||
|
.into_iter()
|
||||||
|
.filter_map(|(id, timestamp, event_type, detail, channel_id)| {
|
||||||
|
let id = Uuid::parse_str(&id).ok()?;
|
||||||
|
let timestamp = timestamp.parse().ok()?;
|
||||||
|
let channel_id = channel_id.and_then(|s| Uuid::parse_str(&s).ok());
|
||||||
|
Some(ActivityEvent {
|
||||||
|
id,
|
||||||
|
timestamp,
|
||||||
|
event_type,
|
||||||
|
detail,
|
||||||
|
channel_id,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
Ok(events)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|
||||||
use crate::db::DatabasePool;
|
use crate::db::DatabasePool;
|
||||||
use domain::{ChannelRepository, ScheduleRepository, UserRepository};
|
use domain::{ActivityLogRepository, ChannelRepository, ScheduleRepository, UserRepository};
|
||||||
|
|
||||||
#[derive(Debug, thiserror::Error)]
|
#[derive(Debug, thiserror::Error)]
|
||||||
pub enum FactoryError {
|
pub enum FactoryError {
|
||||||
@@ -51,6 +51,25 @@ pub async fn build_channel_repository(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn build_activity_log_repository(
|
||||||
|
pool: &DatabasePool,
|
||||||
|
) -> FactoryResult<Arc<dyn ActivityLogRepository>> {
|
||||||
|
match pool {
|
||||||
|
#[cfg(feature = "sqlite")]
|
||||||
|
DatabasePool::Sqlite(pool) => Ok(Arc::new(
|
||||||
|
crate::activity_log_repository::SqliteActivityLogRepository::new(pool.clone()),
|
||||||
|
)),
|
||||||
|
#[cfg(feature = "postgres")]
|
||||||
|
DatabasePool::Postgres(_pool) => Err(FactoryError::NotImplemented(
|
||||||
|
"ActivityLogRepository not yet implemented for Postgres".to_string(),
|
||||||
|
)),
|
||||||
|
#[allow(unreachable_patterns)]
|
||||||
|
_ => Err(FactoryError::NotImplemented(
|
||||||
|
"No database feature enabled".to_string(),
|
||||||
|
)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub async fn build_schedule_repository(
|
pub async fn build_schedule_repository(
|
||||||
pool: &DatabasePool,
|
pool: &DatabasePool,
|
||||||
) -> FactoryResult<Arc<dyn ScheduleRepository>> {
|
) -> FactoryResult<Arc<dyn ScheduleRepository>> {
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ pub mod db;
|
|||||||
pub mod factory;
|
pub mod factory;
|
||||||
pub mod jellyfin;
|
pub mod jellyfin;
|
||||||
pub mod provider_registry;
|
pub mod provider_registry;
|
||||||
|
mod activity_log_repository;
|
||||||
mod channel_repository;
|
mod channel_repository;
|
||||||
mod schedule_repository;
|
mod schedule_repository;
|
||||||
mod user_repository;
|
mod user_repository;
|
||||||
@@ -29,6 +30,8 @@ pub mod local_files;
|
|||||||
pub use db::run_migrations;
|
pub use db::run_migrations;
|
||||||
pub use provider_registry::ProviderRegistry;
|
pub use provider_registry::ProviderRegistry;
|
||||||
|
|
||||||
|
#[cfg(feature = "sqlite")]
|
||||||
|
pub use activity_log_repository::SqliteActivityLogRepository;
|
||||||
#[cfg(feature = "sqlite")]
|
#[cfg(feature = "sqlite")]
|
||||||
pub use user_repository::SqliteUserRepository;
|
pub use user_repository::SqliteUserRepository;
|
||||||
#[cfg(feature = "sqlite")]
|
#[cfg(feature = "sqlite")]
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
CREATE TABLE IF NOT EXISTS activity_log (
|
||||||
|
id TEXT PRIMARY KEY NOT NULL,
|
||||||
|
timestamp TEXT NOT NULL,
|
||||||
|
event_type TEXT NOT NULL,
|
||||||
|
detail TEXT NOT NULL,
|
||||||
|
channel_id TEXT
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_activity_log_timestamp ON activity_log(timestamp DESC);
|
||||||
@@ -0,0 +1,73 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import type { ActivityEvent } from "@/lib/types";
|
||||||
|
|
||||||
|
const eventColors: Record<string, string> = {
|
||||||
|
channel_created: "bg-green-900/40 text-green-400",
|
||||||
|
channel_updated: "bg-blue-900/40 text-blue-400",
|
||||||
|
channel_deleted: "bg-red-900/40 text-red-400",
|
||||||
|
schedule_generated: "bg-violet-900/40 text-violet-400",
|
||||||
|
user_login: "bg-zinc-800 text-zinc-400",
|
||||||
|
};
|
||||||
|
|
||||||
|
function fmtTs(ts: string) {
|
||||||
|
try {
|
||||||
|
const d = new Date(ts);
|
||||||
|
return d.toLocaleTimeString(undefined, { hour12: false });
|
||||||
|
} catch {
|
||||||
|
return ts;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
interface ActivityLogPanelProps {
|
||||||
|
events: ActivityEvent[];
|
||||||
|
isLoading: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function ActivityLogPanel({ events, isLoading }: ActivityLogPanelProps) {
|
||||||
|
return (
|
||||||
|
<div className="flex h-full flex-col">
|
||||||
|
<div className="border-b border-zinc-800 px-4 py-2.5">
|
||||||
|
<span className="text-xs font-semibold uppercase tracking-widest text-violet-400">
|
||||||
|
Activity
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="flex-1 overflow-y-auto p-3">
|
||||||
|
{isLoading && events.length === 0 ? (
|
||||||
|
<p className="mt-8 text-center text-xs text-zinc-600">Loading…</p>
|
||||||
|
) : events.length === 0 ? (
|
||||||
|
<p className="mt-8 text-center text-xs text-zinc-600">No activity yet.</p>
|
||||||
|
) : (
|
||||||
|
<div className="flex flex-col gap-2">
|
||||||
|
{events.map((event) => (
|
||||||
|
<div
|
||||||
|
key={event.id}
|
||||||
|
className="rounded-md border border-zinc-800 bg-zinc-900 p-3"
|
||||||
|
>
|
||||||
|
<div className="mb-1 flex items-center gap-2">
|
||||||
|
<span
|
||||||
|
className={`rounded px-1.5 py-0.5 text-[10px] font-medium ${
|
||||||
|
eventColors[event.event_type] ?? "bg-zinc-800 text-zinc-400"
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
{event.event_type.replace(/_/g, " ")}
|
||||||
|
</span>
|
||||||
|
<span className="ml-auto font-mono text-[10px] text-zinc-600">
|
||||||
|
{fmtTs(event.timestamp)}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<p className="text-xs text-zinc-300">{event.detail}</p>
|
||||||
|
{event.channel_id && (
|
||||||
|
<p className="mt-0.5 font-mono text-[10px] text-zinc-600">
|
||||||
|
ch: {event.channel_id.slice(0, 8)}…
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
129
k-tv-frontend/app/(main)/admin/components/server-logs-panel.tsx
Normal file
129
k-tv-frontend/app/(main)/admin/components/server-logs-panel.tsx
Normal file
@@ -0,0 +1,129 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useEffect, useRef, useState } from "react";
|
||||||
|
import type { LogLine } from "@/lib/types";
|
||||||
|
|
||||||
|
const LEVELS = ["DEBUG", "INFO", "WARN", "ERROR"] as const;
|
||||||
|
|
||||||
|
const levelColor: Record<string, string> = {
|
||||||
|
DEBUG: "text-zinc-500",
|
||||||
|
INFO: "text-zinc-300",
|
||||||
|
WARN: "text-yellow-400",
|
||||||
|
ERROR: "text-red-400",
|
||||||
|
};
|
||||||
|
|
||||||
|
interface ServerLogsPanelProps {
|
||||||
|
lines: LogLine[];
|
||||||
|
connected: boolean;
|
||||||
|
onClear: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function ServerLogsPanel({ lines, connected, onClear }: ServerLogsPanelProps) {
|
||||||
|
const scrollRef = useRef<HTMLDivElement>(null);
|
||||||
|
const [autoScroll, setAutoScroll] = useState(true);
|
||||||
|
const [levelFilter, setLevelFilter] = useState<Set<string>>(
|
||||||
|
new Set(["DEBUG", "INFO", "WARN", "ERROR"]),
|
||||||
|
);
|
||||||
|
|
||||||
|
const filtered = lines.filter((l) => levelFilter.has(l.level.toUpperCase()));
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!autoScroll) return;
|
||||||
|
scrollRef.current?.scrollTo({ top: scrollRef.current.scrollHeight });
|
||||||
|
}, [filtered.length, autoScroll]);
|
||||||
|
|
||||||
|
const toggleLevel = (level: string) => {
|
||||||
|
setLevelFilter((prev) => {
|
||||||
|
const next = new Set(prev);
|
||||||
|
if (next.has(level)) next.delete(level);
|
||||||
|
else next.add(level);
|
||||||
|
return next;
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleScroll = () => {
|
||||||
|
const el = scrollRef.current;
|
||||||
|
if (!el) return;
|
||||||
|
const atBottom = el.scrollHeight - el.scrollTop - el.clientHeight < 40;
|
||||||
|
setAutoScroll(atBottom);
|
||||||
|
};
|
||||||
|
|
||||||
|
const fmtTime = (ts: string) => {
|
||||||
|
if (!ts) return "";
|
||||||
|
try {
|
||||||
|
return new Date(ts).toLocaleTimeString(undefined, { hour12: false });
|
||||||
|
} catch {
|
||||||
|
return ts;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="flex h-full flex-col">
|
||||||
|
{/* Header */}
|
||||||
|
<div className="flex items-center gap-2 border-b border-zinc-800 px-4 py-2.5">
|
||||||
|
<span className="text-xs font-semibold uppercase tracking-widest text-violet-400">
|
||||||
|
Server Logs
|
||||||
|
</span>
|
||||||
|
<span
|
||||||
|
className={`rounded px-1.5 py-0.5 text-[10px] font-medium ${
|
||||||
|
connected
|
||||||
|
? "bg-green-900/40 text-green-400"
|
||||||
|
: "bg-zinc-800 text-zinc-500"
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
{connected ? "● live" : "○ disconnected"}
|
||||||
|
</span>
|
||||||
|
|
||||||
|
<div className="ml-auto flex items-center gap-1">
|
||||||
|
{LEVELS.map((lvl) => (
|
||||||
|
<button
|
||||||
|
key={lvl}
|
||||||
|
onClick={() => toggleLevel(lvl)}
|
||||||
|
className={`rounded px-2 py-0.5 text-[10px] font-medium transition-opacity ${
|
||||||
|
levelFilter.has(lvl) ? "opacity-100" : "opacity-30"
|
||||||
|
} ${levelColor[lvl] ?? "text-zinc-400"}`}
|
||||||
|
>
|
||||||
|
{lvl}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
<button
|
||||||
|
onClick={() => {
|
||||||
|
onClear();
|
||||||
|
setAutoScroll(true);
|
||||||
|
}}
|
||||||
|
className="ml-2 rounded px-2 py-0.5 text-[10px] text-zinc-500 hover:text-zinc-300"
|
||||||
|
>
|
||||||
|
Clear
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Log lines */}
|
||||||
|
<div
|
||||||
|
ref={scrollRef}
|
||||||
|
onScroll={handleScroll}
|
||||||
|
className="flex-1 overflow-y-auto bg-zinc-950 px-4 py-2 font-mono text-[11px] leading-relaxed"
|
||||||
|
>
|
||||||
|
{filtered.length === 0 ? (
|
||||||
|
<p className="mt-8 text-center text-zinc-600">
|
||||||
|
{connected ? "Waiting for log events…" : "Connecting to server…"}
|
||||||
|
</p>
|
||||||
|
) : (
|
||||||
|
filtered.map((line, i) => (
|
||||||
|
<div key={i} className="flex gap-3">
|
||||||
|
<span className="shrink-0 text-zinc-600">{fmtTime(line.timestamp)}</span>
|
||||||
|
<span
|
||||||
|
className={`w-10 shrink-0 font-semibold ${levelColor[line.level?.toUpperCase()] ?? "text-zinc-400"}`}
|
||||||
|
>
|
||||||
|
{line.level?.toUpperCase()}
|
||||||
|
</span>
|
||||||
|
<span className="shrink-0 text-zinc-500">{line.target}</span>
|
||||||
|
<span className="text-zinc-200">{line.message}</span>
|
||||||
|
</div>
|
||||||
|
))
|
||||||
|
)}
|
||||||
|
<div className="text-violet-400">{connected && lines.length > 0 ? "▋" : ""}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
58
k-tv-frontend/app/(main)/admin/page.tsx
Normal file
58
k-tv-frontend/app/(main)/admin/page.tsx
Normal file
@@ -0,0 +1,58 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useState, useEffect } from "react";
|
||||||
|
import { useRouter } from "next/navigation";
|
||||||
|
import { useAuthContext } from "@/context/auth-context";
|
||||||
|
import { useActivityLog, useServerLogs } from "@/hooks/use-admin";
|
||||||
|
import { ServerLogsPanel } from "./components/server-logs-panel";
|
||||||
|
import { ActivityLogPanel } from "./components/activity-log-panel";
|
||||||
|
|
||||||
|
export default function AdminPage() {
|
||||||
|
const { token, isLoaded } = useAuthContext();
|
||||||
|
const router = useRouter();
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (isLoaded && !token) {
|
||||||
|
router.replace("/login");
|
||||||
|
}
|
||||||
|
}, [isLoaded, token, router]);
|
||||||
|
|
||||||
|
const { lines, connected } = useServerLogs(token);
|
||||||
|
const [localLines, setLocalLines] = useState(lines);
|
||||||
|
|
||||||
|
// Sync external lines into local state so Clear can reset without clearing the hook
|
||||||
|
useEffect(() => {
|
||||||
|
setLocalLines(lines);
|
||||||
|
}, [lines]);
|
||||||
|
|
||||||
|
const { data: events = [], isLoading } = useActivityLog(token);
|
||||||
|
|
||||||
|
if (!isLoaded || !token) return null;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="flex flex-1 flex-col overflow-hidden">
|
||||||
|
{/* Page header */}
|
||||||
|
<div className="flex items-center gap-3 border-b border-zinc-800 px-6 py-4">
|
||||||
|
<h1 className="text-base font-semibold text-zinc-100">Admin</h1>
|
||||||
|
<span className="text-xs text-zinc-500">System monitoring & logs</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Two-column layout */}
|
||||||
|
<div className="flex min-h-0 flex-1 overflow-hidden">
|
||||||
|
{/* Left: server logs */}
|
||||||
|
<div className="flex min-w-0 flex-1 flex-col overflow-hidden border-r border-zinc-800">
|
||||||
|
<ServerLogsPanel
|
||||||
|
lines={localLines}
|
||||||
|
connected={connected}
|
||||||
|
onClear={() => setLocalLines([])}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Right: activity log */}
|
||||||
|
<div className="flex w-80 shrink-0 flex-col overflow-hidden">
|
||||||
|
<ActivityLogPanel events={events} isLoading={isLoading} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -6,6 +6,7 @@ const NAV_LINKS = [
|
|||||||
{ href: "/tv", label: "TV" },
|
{ href: "/tv", label: "TV" },
|
||||||
{ href: "/guide", label: "Guide" },
|
{ href: "/guide", label: "Guide" },
|
||||||
{ href: "/dashboard", label: "Dashboard" },
|
{ href: "/dashboard", label: "Dashboard" },
|
||||||
|
{ href: "/admin", label: "Admin" },
|
||||||
{ href: "/docs", label: "Docs" },
|
{ href: "/docs", label: "Docs" },
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
150
k-tv-frontend/app/(main)/tv/components/stats-panel.tsx
Normal file
150
k-tv-frontend/app/(main)/tv/components/stats-panel.tsx
Normal file
@@ -0,0 +1,150 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import type Hls from "hls.js";
|
||||||
|
import type { CurrentBroadcastResponse } from "@/lib/types";
|
||||||
|
|
||||||
|
interface StatsPanelProps {
|
||||||
|
videoRef: React.RefObject<HTMLVideoElement | null>;
|
||||||
|
hlsRef: React.RefObject<Hls | null>;
|
||||||
|
streamingProtocol?: "hls" | "direct_file";
|
||||||
|
broadcast?: CurrentBroadcastResponse | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface Stats {
|
||||||
|
protocol: string;
|
||||||
|
resolution: string;
|
||||||
|
bitrate: string;
|
||||||
|
bandwidth: string;
|
||||||
|
buffer: string;
|
||||||
|
offset: string;
|
||||||
|
slotEnds: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
function fmtSecs(s: number) {
|
||||||
|
const h = Math.floor(s / 3600);
|
||||||
|
const m = Math.floor((s % 3600) / 60);
|
||||||
|
const sec = Math.floor(s % 60);
|
||||||
|
if (h > 0) return `${h}:${String(m).padStart(2, "0")}:${String(sec).padStart(2, "0")}`;
|
||||||
|
return `${String(m).padStart(2, "0")}:${String(sec).padStart(2, "0")}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function fmtKbps(bps: number) {
|
||||||
|
if (!bps) return "--";
|
||||||
|
return `${Math.round(bps / 1000).toLocaleString()} kbps`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function getBufferAhead(video: HTMLVideoElement) {
|
||||||
|
const ct = video.currentTime;
|
||||||
|
for (let i = 0; i < video.buffered.length; i++) {
|
||||||
|
if (video.buffered.start(i) <= ct && ct <= video.buffered.end(i)) {
|
||||||
|
return video.buffered.end(i) - ct;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function StatsPanel({ videoRef, hlsRef, streamingProtocol, broadcast }: StatsPanelProps) {
|
||||||
|
const [stats, setStats] = useState<Stats>({
|
||||||
|
protocol: "--",
|
||||||
|
resolution: "--",
|
||||||
|
bitrate: "--",
|
||||||
|
bandwidth: "--",
|
||||||
|
buffer: "--",
|
||||||
|
offset: "--",
|
||||||
|
slotEnds: "--",
|
||||||
|
});
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const update = () => {
|
||||||
|
const video = videoRef.current;
|
||||||
|
const hls = hlsRef.current;
|
||||||
|
|
||||||
|
const protocol =
|
||||||
|
streamingProtocol === "direct_file"
|
||||||
|
? "Direct file"
|
||||||
|
: hls
|
||||||
|
? "HLS (hls.js)"
|
||||||
|
: "HLS (native)";
|
||||||
|
|
||||||
|
let resolution = "--";
|
||||||
|
let bitrate = "--";
|
||||||
|
let bandwidth = "--";
|
||||||
|
|
||||||
|
if (hls) {
|
||||||
|
const level = hls.currentLevel >= 0 ? hls.levels[hls.currentLevel] : null;
|
||||||
|
if (level) {
|
||||||
|
resolution = `${level.width}×${level.height}`;
|
||||||
|
bitrate = fmtKbps(level.bitrate);
|
||||||
|
}
|
||||||
|
if (hls.bandwidthEstimate > 0) {
|
||||||
|
bandwidth = fmtKbps(hls.bandwidthEstimate);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const buffer = video ? `${getBufferAhead(video).toFixed(1)} s` : "--";
|
||||||
|
const offset = video ? fmtSecs(video.currentTime) : "--";
|
||||||
|
|
||||||
|
let slotEnds = "--";
|
||||||
|
if (broadcast?.slot.end_at) {
|
||||||
|
const secsLeft = (new Date(broadcast.slot.end_at).getTime() - Date.now()) / 1000;
|
||||||
|
if (secsLeft > 0) {
|
||||||
|
slotEnds = `in ${fmtSecs(secsLeft)}`;
|
||||||
|
} else {
|
||||||
|
slotEnds = "ending…";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
setStats({ protocol, resolution, bitrate, bandwidth, buffer, offset, slotEnds });
|
||||||
|
};
|
||||||
|
|
||||||
|
update();
|
||||||
|
const id = setInterval(update, 1000);
|
||||||
|
return () => clearInterval(id);
|
||||||
|
}, [videoRef, hlsRef, streamingProtocol, broadcast]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="pointer-events-none absolute bottom-20 left-4 z-30 min-w-56 rounded-lg border border-white/10 bg-black/75 px-4 py-3 backdrop-blur-sm">
|
||||||
|
<div className="mb-2.5 flex items-center gap-2">
|
||||||
|
<span className="text-[10px] font-bold uppercase tracking-widest text-violet-400">
|
||||||
|
Stats for nerds
|
||||||
|
</span>
|
||||||
|
<span className="rounded bg-green-900/50 px-1.5 py-0.5 text-[9px] text-green-400">
|
||||||
|
LIVE
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<table className="w-full border-collapse font-mono text-[11px]">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td className="pr-4 text-zinc-500">Protocol</td>
|
||||||
|
<td className="text-zinc-200">{stats.protocol}</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td className="pr-4 text-zinc-500">Resolution</td>
|
||||||
|
<td className="text-zinc-200">{stats.resolution}</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td className="pr-4 text-zinc-500">Bitrate</td>
|
||||||
|
<td className="text-zinc-200">{stats.bitrate}</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td className="pr-4 text-zinc-500">Bandwidth est.</td>
|
||||||
|
<td className="text-green-400">{stats.bandwidth}</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td className="pr-4 text-zinc-500">Buffer</td>
|
||||||
|
<td className="text-zinc-200">{stats.buffer}</td>
|
||||||
|
</tr>
|
||||||
|
<tr className="border-t border-white/10">
|
||||||
|
<td className="pr-4 pt-2 text-zinc-500">Offset</td>
|
||||||
|
<td className="pt-2 text-zinc-200">{stats.offset}</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td className="pr-4 text-zinc-500">Slot ends</td>
|
||||||
|
<td className="text-zinc-200">{stats.slotEnds}</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
import { forwardRef, useEffect, useRef, useState } from "react";
|
import { forwardRef, useEffect, useRef, useState } from "react";
|
||||||
import Hls from "hls.js";
|
import Hls from "hls.js";
|
||||||
import { Loader2 } from "lucide-react";
|
import { Loader2 } from "lucide-react";
|
||||||
|
import type { CurrentBroadcastResponse } from "@/lib/types";
|
||||||
|
import { StatsPanel } from "./stats-panel";
|
||||||
|
|
||||||
export interface SubtitleTrack {
|
export interface SubtitleTrack {
|
||||||
id: number;
|
id: number;
|
||||||
@@ -19,6 +21,10 @@ interface VideoPlayerProps {
|
|||||||
muted?: boolean;
|
muted?: boolean;
|
||||||
/** Force direct-file mode (skips hls.js even for .m3u8 URLs). */
|
/** Force direct-file mode (skips hls.js even for .m3u8 URLs). */
|
||||||
streamingProtocol?: "hls" | "direct_file";
|
streamingProtocol?: "hls" | "direct_file";
|
||||||
|
/** When true, renders the Stats for Nerds overlay. */
|
||||||
|
showStats?: boolean;
|
||||||
|
/** Current broadcast data passed to the stats panel for slot timing. */
|
||||||
|
broadcast?: CurrentBroadcastResponse | null;
|
||||||
onStreamError?: () => void;
|
onStreamError?: () => void;
|
||||||
onSubtitleTracksChange?: (tracks: SubtitleTrack[]) => void;
|
onSubtitleTracksChange?: (tracks: SubtitleTrack[]) => void;
|
||||||
/** Called when the browser blocks autoplay and user interaction is required. */
|
/** Called when the browser blocks autoplay and user interaction is required. */
|
||||||
@@ -37,6 +43,8 @@ const VideoPlayer = forwardRef<HTMLVideoElement, VideoPlayerProps>(
|
|||||||
subtitleTrack = -1,
|
subtitleTrack = -1,
|
||||||
muted = false,
|
muted = false,
|
||||||
streamingProtocol,
|
streamingProtocol,
|
||||||
|
showStats = false,
|
||||||
|
broadcast,
|
||||||
onStreamError,
|
onStreamError,
|
||||||
onSubtitleTracksChange,
|
onSubtitleTracksChange,
|
||||||
onNeedsInteraction,
|
onNeedsInteraction,
|
||||||
@@ -162,6 +170,16 @@ const VideoPlayer = forwardRef<HTMLVideoElement, VideoPlayerProps>(
|
|||||||
<Loader2 className="h-10 w-10 animate-spin text-zinc-500" />
|
<Loader2 className="h-10 w-10 animate-spin text-zinc-500" />
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* Stats for Nerds overlay */}
|
||||||
|
{showStats && (
|
||||||
|
<StatsPanel
|
||||||
|
videoRef={internalRef}
|
||||||
|
hlsRef={hlsRef}
|
||||||
|
streamingProtocol={streamingProtocol}
|
||||||
|
broadcast={broadcast}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ import type { SubtitleTrack } from "./components/video-player";
|
|||||||
import type { LogoPosition } from "@/lib/types";
|
import type { LogoPosition } from "@/lib/types";
|
||||||
import {
|
import {
|
||||||
Cast,
|
Cast,
|
||||||
|
Info,
|
||||||
Maximize2,
|
Maximize2,
|
||||||
Minimize2,
|
Minimize2,
|
||||||
Volume1,
|
Volume1,
|
||||||
@@ -101,6 +102,7 @@ function TvPageContent() {
|
|||||||
// Overlay / idle state
|
// Overlay / idle state
|
||||||
const [showOverlays, setShowOverlays] = useState(true);
|
const [showOverlays, setShowOverlays] = useState(true);
|
||||||
const [showSchedule, setShowSchedule] = useState(false);
|
const [showSchedule, setShowSchedule] = useState(false);
|
||||||
|
const [showStats, setShowStats] = useState(false);
|
||||||
const idleTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
|
const idleTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
|
||||||
|
|
||||||
// Video ref — used to resume playback if autoplay was blocked on load
|
// Video ref — used to resume playback if autoplay was blocked on load
|
||||||
@@ -411,6 +413,10 @@ function TvPageContent() {
|
|||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
prevChannel();
|
prevChannel();
|
||||||
break;
|
break;
|
||||||
|
case "s":
|
||||||
|
case "S":
|
||||||
|
setShowStats((v) => !v);
|
||||||
|
break;
|
||||||
case "g":
|
case "g":
|
||||||
case "G":
|
case "G":
|
||||||
toggleSchedule();
|
toggleSchedule();
|
||||||
@@ -623,6 +629,8 @@ function TvPageContent() {
|
|||||||
}
|
}
|
||||||
subtitleTrack={activeSubtitleTrack}
|
subtitleTrack={activeSubtitleTrack}
|
||||||
muted={isMuted}
|
muted={isMuted}
|
||||||
|
showStats={showStats}
|
||||||
|
broadcast={broadcast}
|
||||||
onSubtitleTracksChange={setSubtitleTracks}
|
onSubtitleTracksChange={setSubtitleTracks}
|
||||||
onStreamError={handleStreamError}
|
onStreamError={handleStreamError}
|
||||||
onEnded={handleVideoEnded}
|
onEnded={handleVideoEnded}
|
||||||
@@ -850,6 +858,14 @@ function TvPageContent() {
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<button
|
||||||
|
className={`pointer-events-auto rounded-md bg-black/50 p-1.5 backdrop-blur transition-colors hover:bg-black/70 hover:text-white ${showStats ? "text-violet-400" : "text-zinc-400"}`}
|
||||||
|
onClick={() => setShowStats((v) => !v)}
|
||||||
|
title="Stats for nerds [S]"
|
||||||
|
>
|
||||||
|
<Info className="h-4 w-4" />
|
||||||
|
</button>
|
||||||
|
|
||||||
<button
|
<button
|
||||||
className="pointer-events-auto rounded-md bg-black/50 px-3 py-1.5 text-xs text-zinc-400 backdrop-blur transition-colors hover:bg-black/70 hover:text-white"
|
className="pointer-events-auto rounded-md bg-black/50 px-3 py-1.5 text-xs text-zinc-400 backdrop-blur transition-colors hover:bg-black/70 hover:text-white"
|
||||||
onClick={toggleSchedule}
|
onClick={toggleSchedule}
|
||||||
|
|||||||
52
k-tv-frontend/hooks/use-admin.ts
Normal file
52
k-tv-frontend/hooks/use-admin.ts
Normal file
@@ -0,0 +1,52 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import { useQuery } from "@tanstack/react-query";
|
||||||
|
import { api } from "@/lib/api";
|
||||||
|
import type { ActivityEvent, LogLine } from "@/lib/types";
|
||||||
|
|
||||||
|
const API_BASE =
|
||||||
|
process.env.NEXT_PUBLIC_API_URL ?? "http://localhost:4000/api/v1";
|
||||||
|
|
||||||
|
export function useActivityLog(token: string | null) {
|
||||||
|
return useQuery<ActivityEvent[]>({
|
||||||
|
queryKey: ["activity-log"],
|
||||||
|
queryFn: () => api.admin.activity(token!),
|
||||||
|
enabled: !!token,
|
||||||
|
refetchInterval: 10_000,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useServerLogs(token: string | null) {
|
||||||
|
const [lines, setLines] = useState<LogLine[]>([]);
|
||||||
|
const [connected, setConnected] = useState(false);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!token) return;
|
||||||
|
|
||||||
|
const url = `${API_BASE}/admin/logs?token=${encodeURIComponent(token)}`;
|
||||||
|
const es = new EventSource(url);
|
||||||
|
|
||||||
|
es.onopen = () => setConnected(true);
|
||||||
|
|
||||||
|
es.onmessage = (e) => {
|
||||||
|
try {
|
||||||
|
const line = JSON.parse(e.data) as LogLine;
|
||||||
|
setLines((prev) => [...prev.slice(-999), line]);
|
||||||
|
} catch {
|
||||||
|
// ignore malformed lines
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
es.onerror = () => {
|
||||||
|
setConnected(false);
|
||||||
|
};
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
es.close();
|
||||||
|
setConnected(false);
|
||||||
|
};
|
||||||
|
}, [token]);
|
||||||
|
|
||||||
|
return { lines, connected };
|
||||||
|
}
|
||||||
@@ -14,6 +14,7 @@ import type {
|
|||||||
MediaFilter,
|
MediaFilter,
|
||||||
TranscodeSettings,
|
TranscodeSettings,
|
||||||
TranscodeStats,
|
TranscodeStats,
|
||||||
|
ActivityEvent,
|
||||||
} from "@/lib/types";
|
} from "@/lib/types";
|
||||||
|
|
||||||
const API_BASE =
|
const API_BASE =
|
||||||
@@ -175,6 +176,11 @@ export const api = {
|
|||||||
request<void>("/files/transcode-cache", { method: "DELETE", token }),
|
request<void>("/files/transcode-cache", { method: "DELETE", token }),
|
||||||
},
|
},
|
||||||
|
|
||||||
|
admin: {
|
||||||
|
activity: (token: string) =>
|
||||||
|
request<ActivityEvent[]>("/admin/activity", { token }),
|
||||||
|
},
|
||||||
|
|
||||||
schedule: {
|
schedule: {
|
||||||
generate: (channelId: string, token: string) =>
|
generate: (channelId: string, token: string) =>
|
||||||
request<ScheduleResponse>(`/channels/${channelId}/schedule`, {
|
request<ScheduleResponse>(`/channels/${channelId}/schedule`, {
|
||||||
|
|||||||
@@ -1,5 +1,20 @@
|
|||||||
// API response and request types matching the backend DTOs
|
// API response and request types matching the backend DTOs
|
||||||
|
|
||||||
|
export interface ActivityEvent {
|
||||||
|
id: string;
|
||||||
|
timestamp: string;
|
||||||
|
event_type: string;
|
||||||
|
detail: string;
|
||||||
|
channel_id?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface LogLine {
|
||||||
|
level: string;
|
||||||
|
target: string;
|
||||||
|
message: string;
|
||||||
|
timestamp: string;
|
||||||
|
}
|
||||||
|
|
||||||
export type ContentType = "movie" | "episode" | "short";
|
export type ContentType = "movie" | "episode" | "short";
|
||||||
|
|
||||||
export type AccessMode = "public" | "password_protected" | "account_required" | "owner_only";
|
export type AccessMode = "public" | "password_protected" | "account_required" | "owner_only";
|
||||||
|
|||||||
Reference in New Issue
Block a user