Compare commits
6 Commits
release-20
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2e36c28c0d | ||
|
|
6530e20af2 | ||
|
|
32f4946530 | ||
|
|
619951fa1c | ||
|
|
6d45e6773f | ||
|
|
2c8a2d5956 |
8
backend/.env
Normal file
8
backend/.env
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
# Database
|
||||||
|
DATABASE_URL=sqlite:vibetorrent.db
|
||||||
|
|
||||||
|
# VAPID Keys for Push Notifications
|
||||||
|
# Generate new keys for production using: cargo run --bin web-push --features web-push -- generate-vapid-keys
|
||||||
|
VAPID_PUBLIC_KEY=BEdPj6XQR7MGzM28Nev9wokF5upHoydNDahouJbQ9ZdBJpEFAN1iNfANSEvY0ItasNY5zcvvqN_tjUt64Rfd0gU
|
||||||
|
VAPID_PRIVATE_KEY=aUcCYJ7kUd9UClCaWwad0IVgbYJ6svwl19MjSX7GH10
|
||||||
|
VAPID_EMAIL=mailto:admin@vibetorrent.app
|
||||||
16
backend/migrations/001_init.sql
Normal file
16
backend/migrations/001_init.sql
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
-- 001_init.sql
|
||||||
|
-- Initial schema for users and sessions
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS users (
|
||||||
|
id INTEGER PRIMARY KEY,
|
||||||
|
username TEXT NOT NULL UNIQUE,
|
||||||
|
password_hash TEXT NOT NULL,
|
||||||
|
created_at DATETIME DEFAULT CURRENT_TIMESTAMP
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS sessions (
|
||||||
|
token TEXT PRIMARY KEY,
|
||||||
|
user_id INTEGER NOT NULL,
|
||||||
|
expires_at DATETIME NOT NULL,
|
||||||
|
FOREIGN KEY(user_id) REFERENCES users(id)
|
||||||
|
);
|
||||||
13
backend/migrations/002_push_subscriptions.sql
Normal file
13
backend/migrations/002_push_subscriptions.sql
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
-- 002_push_subscriptions.sql
|
||||||
|
-- Push notification subscriptions storage
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS push_subscriptions (
|
||||||
|
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||||
|
endpoint TEXT NOT NULL UNIQUE,
|
||||||
|
p256dh TEXT NOT NULL,
|
||||||
|
auth TEXT NOT NULL,
|
||||||
|
created_at DATETIME DEFAULT CURRENT_TIMESTAMP
|
||||||
|
);
|
||||||
|
|
||||||
|
-- Index for faster lookups by endpoint
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_push_subscriptions_endpoint ON push_subscriptions(endpoint);
|
||||||
@@ -16,35 +16,27 @@ impl Db {
|
|||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
let db = Self { pool };
|
let db = Self { pool };
|
||||||
db.init().await?;
|
db.run_migrations().await?;
|
||||||
Ok(db)
|
Ok(db)
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn init(&self) -> Result<()> {
|
async fn run_migrations(&self) -> Result<()> {
|
||||||
// Create users table
|
// WAL mode - enables concurrent reads while writing
|
||||||
sqlx::query(
|
sqlx::query("PRAGMA journal_mode=WAL")
|
||||||
"CREATE TABLE IF NOT EXISTS users (
|
.execute(&self.pool)
|
||||||
id INTEGER PRIMARY KEY,
|
.await?;
|
||||||
username TEXT NOT NULL UNIQUE,
|
|
||||||
password_hash TEXT NOT NULL,
|
|
||||||
created_at DATETIME DEFAULT CURRENT_TIMESTAMP
|
|
||||||
)",
|
|
||||||
)
|
|
||||||
.execute(&self.pool)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
// Create sessions table
|
// NORMAL synchronous - faster than FULL, still safe enough
|
||||||
sqlx::query(
|
sqlx::query("PRAGMA synchronous=NORMAL")
|
||||||
"CREATE TABLE IF NOT EXISTS sessions (
|
.execute(&self.pool)
|
||||||
token TEXT PRIMARY KEY,
|
.await?;
|
||||||
user_id INTEGER NOT NULL,
|
|
||||||
expires_at DATETIME NOT NULL,
|
|
||||||
FOREIGN KEY(user_id) REFERENCES users(id)
|
|
||||||
)",
|
|
||||||
)
|
|
||||||
.execute(&self.pool)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
|
// 5 second busy timeout - reduces "database locked" errors
|
||||||
|
sqlx::query("PRAGMA busy_timeout=5000")
|
||||||
|
.execute(&self.pool)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
sqlx::migrate!("./migrations").run(&self.pool).await?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -59,23 +51,24 @@ impl Db {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn get_user_by_username(&self, username: &str) -> Result<Option<(i64, String)>> {
|
pub async fn get_user_by_username(&self, username: &str) -> Result<Option<(i64, String)>> {
|
||||||
let row = sqlx::query("SELECT id, password_hash FROM users WHERE username = ?")
|
let row = sqlx::query("SELECT id, password_hash FROM users WHERE username = ?")
|
||||||
.bind(username)
|
.bind(username)
|
||||||
.fetch_optional(&self.pool)
|
.fetch_optional(&self.pool)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
Ok(row.map(|r| (r.get(0), r.get(1))))
|
Ok(row.map(|r| (r.get(0), r.get(1))))
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn get_username_by_id(&self, id: i64) -> Result<Option<String>> {
|
pub async fn get_username_by_id(&self, id: i64) -> Result<Option<String>> {
|
||||||
let row = sqlx::query("SELECT username FROM users WHERE id = ?")
|
let row = sqlx::query("SELECT username FROM users WHERE id = ?")
|
||||||
.bind(id)
|
.bind(id)
|
||||||
.fetch_optional(&self.pool)
|
.fetch_optional(&self.pool)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
|
Ok(row.map(|r| r.get(0)))
|
||||||
|
}
|
||||||
|
|
||||||
Ok(row.map(|r| r.get(0)))
|
|
||||||
}
|
|
||||||
pub async fn has_users(&self) -> Result<bool> {
|
pub async fn has_users(&self) -> Result<bool> {
|
||||||
let row: (i64,) = sqlx::query_as("SELECT COUNT(*) FROM users")
|
let row: (i64,) = sqlx::query_as("SELECT COUNT(*) FROM users")
|
||||||
.fetch_one(&self.pool)
|
.fetch_one(&self.pool)
|
||||||
@@ -128,4 +121,36 @@ impl Db {
|
|||||||
.await?;
|
.await?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// --- Push Subscription Operations ---
|
||||||
|
|
||||||
|
pub async fn save_push_subscription(&self, endpoint: &str, p256dh: &str, auth: &str) -> Result<()> {
|
||||||
|
sqlx::query(
|
||||||
|
"INSERT INTO push_subscriptions (endpoint, p256dh, auth) VALUES (?, ?, ?)
|
||||||
|
ON CONFLICT(endpoint) DO UPDATE SET p256dh = EXCLUDED.p256dh, auth = EXCLUDED.auth"
|
||||||
|
)
|
||||||
|
.bind(endpoint)
|
||||||
|
.bind(p256dh)
|
||||||
|
.bind(auth)
|
||||||
|
.execute(&self.pool)
|
||||||
|
.await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn remove_push_subscription(&self, endpoint: &str) -> Result<()> {
|
||||||
|
sqlx::query("DELETE FROM push_subscriptions WHERE endpoint = ?")
|
||||||
|
.bind(endpoint)
|
||||||
|
.execute(&self.pool)
|
||||||
|
.await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get_all_push_subscriptions(&self) -> Result<Vec<(String, String, String)>> {
|
||||||
|
let rows = sqlx::query_as::<_, (String, String, String)>(
|
||||||
|
"SELECT endpoint, p256dh, auth FROM push_subscriptions"
|
||||||
|
)
|
||||||
|
.fetch_all(&self.pool)
|
||||||
|
.await?;
|
||||||
|
Ok(rows)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -320,13 +320,25 @@ async fn main() {
|
|||||||
// Channel for Events (Diffs)
|
// Channel for Events (Diffs)
|
||||||
let (event_bus, _) = broadcast::channel::<AppEvent>(1024);
|
let (event_bus, _) = broadcast::channel::<AppEvent>(1024);
|
||||||
|
|
||||||
|
#[cfg(feature = "push-notifications")]
|
||||||
|
let push_store = match push::PushSubscriptionStore::with_db(&db).await {
|
||||||
|
Ok(store) => store,
|
||||||
|
Err(e) => {
|
||||||
|
tracing::error!("Failed to initialize push store: {}", e);
|
||||||
|
push::PushSubscriptionStore::new()
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
#[cfg(not(feature = "push-notifications"))]
|
||||||
|
let push_store = ();
|
||||||
|
|
||||||
let app_state = AppState {
|
let app_state = AppState {
|
||||||
tx: tx.clone(),
|
tx: tx.clone(),
|
||||||
event_bus: event_bus.clone(),
|
event_bus: event_bus.clone(),
|
||||||
scgi_socket_path: args.socket.clone(),
|
scgi_socket_path: args.socket.clone(),
|
||||||
db: db.clone(),
|
db: db.clone(),
|
||||||
#[cfg(feature = "push-notifications")]
|
#[cfg(feature = "push-notifications")]
|
||||||
push_store: push::PushSubscriptionStore::new(),
|
push_store,
|
||||||
};
|
};
|
||||||
|
|
||||||
// Spawn background task to poll rTorrent
|
// Spawn background task to poll rTorrent
|
||||||
|
|||||||
@@ -6,10 +6,7 @@ use web_push::{
|
|||||||
HyperWebPushClient, SubscriptionInfo, VapidSignatureBuilder, WebPushClient, WebPushMessageBuilder,
|
HyperWebPushClient, SubscriptionInfo, VapidSignatureBuilder, WebPushClient, WebPushMessageBuilder,
|
||||||
};
|
};
|
||||||
|
|
||||||
// VAPID keys - PRODUCTION'DA ENVIRONMENT VARIABLE'DAN ALINMALI!
|
use crate::db::Db;
|
||||||
const VAPID_PUBLIC_KEY: &str = "BEdPj6XQR7MGzM28Nev9wokF5upHoydNDahouJbQ9ZdBJpEFAN1iNfANSEvY0ItasNY5zcvvqN_tjUt64Rfd0gU";
|
|
||||||
const VAPID_PRIVATE_KEY: &str = "aUcCYJ7kUd9UClCaWwad0IVgbYJ6svwl19MjSX7GH10";
|
|
||||||
const VAPID_EMAIL: &str = "mailto:admin@vibetorrent.app";
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
||||||
pub struct PushSubscription {
|
pub struct PushSubscription {
|
||||||
@@ -23,34 +20,72 @@ pub struct PushKeys {
|
|||||||
pub auth: String,
|
pub auth: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// In-memory store for push subscriptions
|
#[derive(Clone)]
|
||||||
/// TODO: Replace with database in production
|
|
||||||
#[derive(Default, Clone)]
|
|
||||||
pub struct PushSubscriptionStore {
|
pub struct PushSubscriptionStore {
|
||||||
|
db: Option<Db>,
|
||||||
subscriptions: Arc<RwLock<Vec<PushSubscription>>>,
|
subscriptions: Arc<RwLock<Vec<PushSubscription>>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl PushSubscriptionStore {
|
impl PushSubscriptionStore {
|
||||||
pub fn new() -> Self {
|
pub fn new() -> Self {
|
||||||
Self {
|
Self {
|
||||||
|
db: None,
|
||||||
subscriptions: Arc::new(RwLock::new(Vec::new())),
|
subscriptions: Arc::new(RwLock::new(Vec::new())),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn with_db(db: &Db) -> Result<Self, Box<dyn std::error::Error>> {
|
||||||
|
let mut subscriptions_vec: Vec<PushSubscription> = Vec::new();
|
||||||
|
|
||||||
|
// Load existing subscriptions from DB
|
||||||
|
let subs = db.get_all_push_subscriptions().await?;
|
||||||
|
for (endpoint, p256dh, auth) in subs {
|
||||||
|
subscriptions_vec.push(PushSubscription {
|
||||||
|
endpoint,
|
||||||
|
keys: PushKeys { p256dh, auth },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
tracing::info!("Loaded {} push subscriptions from database", subscriptions_vec.len());
|
||||||
|
|
||||||
|
Ok(Self {
|
||||||
|
db: Some(db.clone()),
|
||||||
|
subscriptions: Arc::new(RwLock::new(subscriptions_vec)),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
pub async fn add_subscription(&self, subscription: PushSubscription) {
|
pub async fn add_subscription(&self, subscription: PushSubscription) {
|
||||||
|
// Add to memory
|
||||||
let mut subs = self.subscriptions.write().await;
|
let mut subs = self.subscriptions.write().await;
|
||||||
|
|
||||||
// Remove duplicate endpoint if exists
|
// Remove duplicate endpoint if exists
|
||||||
subs.retain(|s| s.endpoint != subscription.endpoint);
|
subs.retain(|s| s.endpoint != subscription.endpoint);
|
||||||
|
subs.push(subscription.clone());
|
||||||
subs.push(subscription);
|
|
||||||
tracing::info!("Added push subscription. Total: {}", subs.len());
|
tracing::info!("Added push subscription. Total: {}", subs.len());
|
||||||
|
|
||||||
|
// Save to DB if available
|
||||||
|
if let Some(db) = &self.db {
|
||||||
|
if let Err(e) = db.save_push_subscription(
|
||||||
|
&subscription.endpoint,
|
||||||
|
&subscription.keys.p256dh,
|
||||||
|
&subscription.keys.auth,
|
||||||
|
).await {
|
||||||
|
tracing::error!("Failed to save push subscription to DB: {}", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn remove_subscription(&self, endpoint: &str) {
|
pub async fn remove_subscription(&self, endpoint: &str) {
|
||||||
|
// Remove from memory
|
||||||
let mut subs = self.subscriptions.write().await;
|
let mut subs = self.subscriptions.write().await;
|
||||||
subs.retain(|s| s.endpoint != endpoint);
|
subs.retain(|s| s.endpoint != endpoint);
|
||||||
tracing::info!("Removed push subscription. Total: {}", subs.len());
|
tracing::info!("Removed push subscription. Total: {}", subs.len());
|
||||||
|
|
||||||
|
// Remove from DB if available
|
||||||
|
if let Some(db) = &self.db {
|
||||||
|
if let Err(e) = db.remove_push_subscription(endpoint).await {
|
||||||
|
tracing::error!("Failed to remove push subscription from DB: {}", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn get_all_subscriptions(&self) -> Vec<PushSubscription> {
|
pub async fn get_all_subscriptions(&self) -> Vec<PushSubscription> {
|
||||||
@@ -65,7 +100,7 @@ pub async fn send_push_notification(
|
|||||||
body: &str,
|
body: &str,
|
||||||
) -> Result<(), Box<dyn std::error::Error>> {
|
) -> Result<(), Box<dyn std::error::Error>> {
|
||||||
let subscriptions = store.get_all_subscriptions().await;
|
let subscriptions = store.get_all_subscriptions().await;
|
||||||
|
|
||||||
if subscriptions.is_empty() {
|
if subscriptions.is_empty() {
|
||||||
tracing::debug!("No push subscriptions to send to");
|
tracing::debug!("No push subscriptions to send to");
|
||||||
return Ok(());
|
return Ok(());
|
||||||
@@ -83,6 +118,9 @@ pub async fn send_push_notification(
|
|||||||
|
|
||||||
let client = HyperWebPushClient::new();
|
let client = HyperWebPushClient::new();
|
||||||
|
|
||||||
|
let vapid_private_key = std::env::var("VAPID_PRIVATE_KEY").expect("VAPID_PRIVATE_KEY must be set in .env");
|
||||||
|
let vapid_email = std::env::var("VAPID_EMAIL").expect("VAPID_EMAIL must be set in .env");
|
||||||
|
|
||||||
for subscription in subscriptions {
|
for subscription in subscriptions {
|
||||||
let subscription_info = SubscriptionInfo {
|
let subscription_info = SubscriptionInfo {
|
||||||
endpoint: subscription.endpoint.clone(),
|
endpoint: subscription.endpoint.clone(),
|
||||||
@@ -93,18 +131,18 @@ pub async fn send_push_notification(
|
|||||||
};
|
};
|
||||||
|
|
||||||
let mut sig_builder = VapidSignatureBuilder::from_base64(
|
let mut sig_builder = VapidSignatureBuilder::from_base64(
|
||||||
VAPID_PRIVATE_KEY,
|
&vapid_private_key,
|
||||||
web_push::URL_SAFE_NO_PAD,
|
web_push::URL_SAFE_NO_PAD,
|
||||||
&subscription_info,
|
&subscription_info,
|
||||||
)?;
|
)?;
|
||||||
|
|
||||||
sig_builder.add_claim("sub", VAPID_EMAIL);
|
sig_builder.add_claim("sub", vapid_email.as_str());
|
||||||
sig_builder.add_claim("aud", subscription.endpoint.clone());
|
sig_builder.add_claim("aud", subscription.endpoint.as_str());
|
||||||
let signature = sig_builder.build()?;
|
let signature = sig_builder.build()?;
|
||||||
|
|
||||||
let mut builder = WebPushMessageBuilder::new(&subscription_info);
|
let mut builder = WebPushMessageBuilder::new(&subscription_info);
|
||||||
builder.set_vapid_signature(signature);
|
builder.set_vapid_signature(signature);
|
||||||
|
|
||||||
let payload_str = payload.to_string();
|
let payload_str = payload.to_string();
|
||||||
builder.set_payload(web_push::ContentEncoding::Aes128Gcm, payload_str.as_bytes());
|
builder.set_payload(web_push::ContentEncoding::Aes128Gcm, payload_str.as_bytes());
|
||||||
|
|
||||||
@@ -122,6 +160,6 @@ pub async fn send_push_notification(
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_vapid_public_key() -> &'static str {
|
pub fn get_vapid_public_key() -> String {
|
||||||
VAPID_PUBLIC_KEY
|
std::env::var("VAPID_PUBLIC_KEY").expect("VAPID_PUBLIC_KEY must be set in .env")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -46,6 +46,9 @@ fn format_duration(seconds: i64) -> String {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn format_date(timestamp: i64) -> String {
|
fn format_date(timestamp: i64) -> String {
|
||||||
|
if timestamp <= 0 {
|
||||||
|
return "N/A".to_string();
|
||||||
|
}
|
||||||
let dt = chrono::DateTime::from_timestamp(timestamp, 0);
|
let dt = chrono::DateTime::from_timestamp(timestamp, 0);
|
||||||
match dt {
|
match dt {
|
||||||
Some(dt) => dt.format("%d/%m/%Y %H:%M").to_string(),
|
Some(dt) => dt.format("%d/%m/%Y %H:%M").to_string(),
|
||||||
|
|||||||
@@ -11,11 +11,15 @@ use app::App;
|
|||||||
#[wasm_bindgen(start)]
|
#[wasm_bindgen(start)]
|
||||||
pub fn main() {
|
pub fn main() {
|
||||||
console_error_panic_hook::set_once();
|
console_error_panic_hook::set_once();
|
||||||
console_log::init_with_level(log::Level::Debug).unwrap();
|
console_log::init_with_level(log::Level::Debug)
|
||||||
|
.expect("Failed to initialize logging");
|
||||||
|
|
||||||
let window = web_sys::window().unwrap();
|
let window = web_sys::window()
|
||||||
let document = window.document().unwrap();
|
.expect("Failed to access window - browser may not be fully loaded");
|
||||||
let body = document.body().unwrap();
|
let document = window.document()
|
||||||
|
.expect("Failed to access document");
|
||||||
|
let body = document.body()
|
||||||
|
.expect("Failed to access document body");
|
||||||
|
|
||||||
// Add app-loaded class to body to hide spinner via CSS
|
// Add app-loaded class to body to hide spinner via CSS
|
||||||
let _ = body.class_list().add_1("app-loaded");
|
let _ = body.class_list().add_1("app-loaded");
|
||||||
|
|||||||
Reference in New Issue
Block a user