Compare commits

..

40 Commits

Author SHA1 Message Date
spinline
13424fceeb Demote 'Torrent status changed' log from INFO to DEBUG to reduce console noise
All checks were successful
Build MIPS Binary / build (push) Successful in 4m6s
2026-02-07 15:33:16 +03:00
spinline
e3eb5fbca9 Add detailed logging to login handler and use full page reload for auth navigation
All checks were successful
Build MIPS Binary / build (push) Successful in 4m7s
2026-02-07 15:28:44 +03:00
spinline
08f2f540fe Fix unused import and dead code warnings
All checks were successful
Build MIPS Binary / build (push) Successful in 4m6s
2026-02-07 15:20:23 +03:00
spinline
7361421641 Fix middleware signature: Specify Request<Body> explicitly
All checks were successful
Build MIPS Binary / build (push) Successful in 4m7s
2026-02-07 15:13:05 +03:00
spinline
d6ecc08398 Upgrade axum-extra to 0.10 for Axum 0.8 compatibility
Some checks failed
Build MIPS Binary / build (push) Has been cancelled
2026-02-07 15:11:08 +03:00
spinline
472bac85f3 Fix compilation errors: Resolve utoipa derive issues, add time dependency, and correct Axum middleware signature
Some checks failed
Build MIPS Binary / build (push) Has been cancelled
2026-02-07 15:08:53 +03:00
spinline
bb3ec14a75 Fix compilation errors: Add missing dependencies, fix module visibility, and update Axum middleware types
Some checks failed
Build MIPS Binary / build (push) Failing after 3m27s
2026-02-07 14:58:35 +03:00
spinline
d53d661ad1 Implement authentication system with SQLite: Add login/setup pages, auth middleware, and database integration
Some checks failed
Build MIPS Binary / build (push) Failing after 3m42s
2026-02-07 14:43:25 +03:00
spinline
92720c15b3 Fix mobile dropdown interaction: Revert to pointerdown with stop_propagation and use overlay for reliable closing
All checks were successful
Build MIPS Binary / build (push) Successful in 3m57s
2026-02-07 14:14:37 +03:00
spinline
5e59f66056 Fix dropdown closing behavior on mobile by adding transparent overlay
All checks were successful
Build MIPS Binary / build (push) Successful in 3m45s
2026-02-07 13:54:00 +03:00
spinline
f2ca741188 Fix cache issue by updating service worker strategy and remove GitHub workflows
All checks were successful
Build MIPS Binary / build (push) Successful in 3m44s
2026-02-07 13:41:00 +03:00
spinline
767077195a chore: trigger ci build to use runner v3 (with file command)
All checks were successful
Build MIPS Binary / build (push) Successful in 4m16s
2026-02-07 01:26:33 +03:00
spinline
5539dc2289 chore: trigger ci build to use runner v2
Some checks failed
Build MIPS Binary / build (push) Failing after 4m17s
2026-02-07 00:50:13 +03:00
spinline
f99fc4a134 fix: use pure MIPS asm for __atomic_is_lock_free, remove unsupported --defsym
Some checks are pending
Build MIPS Binary / build (push) Waiting to run
2026-02-07 00:40:39 +03:00
spinline
f4d0351c5b chore: update runner shim and linker flags for mips atomics
Some checks failed
Build MIPS Binary / build (push) Failing after 3m52s
2026-02-07 00:19:36 +03:00
spinline
c2492b2749 fix(ci): let zig handle CRT object files via link-self-contained=no
Some checks failed
Build MIPS Binary / build (push) Has been cancelled
2026-02-07 00:04:48 +03:00
spinline
18001ed5a2 fix(ci): use build-std for mips target in Dockerfile
Some checks failed
Build MIPS Binary / build (push) Failing after 4m8s
2026-02-06 23:58:19 +03:00
spinline
47da0fca55 ci: test updated runner environment
Some checks failed
Build MIPS Binary / build (push) Failing after 1m2s
2026-02-06 23:48:56 +03:00
spinline
0985f328e2 fix(ci): inject libatomic for mips and force static linking
Some checks failed
Build MIPS Binary / build (push) Failing after 1m2s
2026-02-06 23:41:30 +03:00
spinline
146b312b4c fix(runner): use reliable URL for act_runner and optimize targets
Some checks failed
Build MIPS Binary / build (push) Failing after 4m4s
2026-02-06 23:32:58 +03:00
spinline
153568e81d ci: trigger first super-fast build
Some checks failed
Build MIPS Binary / build (push) Has been cancelled
2026-02-06 23:19:37 +03:00
spinline
fefe86da31 refactor: simplify workflow to use new custom runner with pre-installed tools
Some checks failed
Build MIPS Binary / build (push) Has been cancelled
2026-02-06 22:34:40 +03:00
spinline
11ba548297 chore: remove failing publish workflow due to missing docker in runner
Some checks failed
Build MIPS Binary / build (push) Has been cancelled
2026-02-06 22:31:50 +03:00
spinline
ce9fb6781a ci: configure runner to use host mode with mips-builder label
Some checks failed
Build MIPS Binary / build (push) Has been cancelled
Publish Runner Image / Push Docker image to Docker Hub (push) Failing after 3m18s
2026-02-06 22:22:03 +03:00
spinline
4855b193d4 ci: add workflow to publish runner image to docker hub
Some checks failed
Publish Runner Image / Push Docker image to Docker Hub (push) Has been cancelled
Build MIPS Binary / build (push) Has been cancelled
2026-02-06 22:18:01 +03:00
spinline
1d636d63fa feat: add self-contained gitea runner dockerfile with all build tools included
Some checks failed
Build MIPS Binary / build (push) Has been cancelled
2026-02-06 22:16:04 +03:00
spinline
db4edff957 ci: fix trunk binary arch download logic for arm64 runner
Some checks failed
Build MIPS Binary / build (push) Failing after 8m10s
2026-02-06 22:04:15 +03:00
spinline
921cba2cab ci: remove broken cache and use prebuilt trunk binary for speed
Some checks failed
Build MIPS Binary / build (push) Failing after 1m6s
2026-02-06 22:02:18 +03:00
spinline
c64c95233f ci: add action/cache to speed up builds
Some checks failed
Build MIPS Binary / build (push) Has been cancelled
2026-02-06 21:49:09 +03:00
spinline
d17bfc88ad ci: replace docker build with cargo-zigbuild for mips cross-compilation
Some checks failed
Build MIPS Binary / build (push) Has been cancelled
2026-02-06 21:45:35 +03:00
spinline
b646d0851c ci: remove --locked from trunk install to avoid yanked crate warnings
Some checks failed
Build MIPS Binary / build (push) Failing after 10m36s
2026-02-06 21:33:40 +03:00
spinline
42e03bd2e3 ci: manually install node 20 to path to fix structuredClone error
Some checks failed
Build MIPS Binary / build (push) Has been cancelled
2026-02-06 21:31:23 +03:00
spinline
67a1d96b26 ci: debug tailwind build failure by running explicitly
Some checks failed
Build MIPS Binary / build (push) Failing after 9m30s
2026-02-06 21:20:59 +03:00
spinline
3187ed76b0 ci: install wasm-bindgen-cli from source to fix glibc error
Some checks failed
Build MIPS Binary / build (push) Failing after 10m54s
2026-02-06 21:05:50 +03:00
spinline
4dfce1096e ci: set nightly default and install Node 20 for trunk
Some checks failed
Build MIPS Binary / build (push) Failing after 9m9s
2026-02-06 20:53:41 +03:00
spinline
e3cfc11b65 ci: source cargo env in trunk/frontend steps
Some checks failed
Build MIPS Binary / build (push) Failing after 8m12s
2026-02-06 20:42:22 +03:00
spinline
f579431098 ci: install rustup in runner container if missing
Some checks failed
Build MIPS Binary / build (push) Failing after 1m2s
2026-02-06 20:41:05 +03:00
spinline
6014ec64e8 ci: replace checkout action with direct git fetch
Some checks failed
Build MIPS Binary / build (push) Failing after 1s
2026-02-06 20:39:46 +03:00
spinline
bdb30f33d8 ci: trigger server runner
Some checks failed
Build MIPS Binary / build (push) Failing after 34s
2026-02-06 20:33:16 +03:00
spinline
2ea2894664 ci: test build speed with cached image
All checks were successful
Build MIPS Binary / build (push) Successful in 4m47s
2026-02-06 19:22:37 +03:00
20 changed files with 2006 additions and 565 deletions

View File

@@ -9,54 +9,37 @@ env:
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: mips-builder
steps: steps:
- uses: actions/checkout@v4 - name: Checkout
env:
- name: Setup Rust GIT_TOKEN: ${{ secrets.RELEASE_TOKEN }}
run: | run: |
rustup toolchain install nightly --profile minimal rm -rf .git
rustup target add wasm32-unknown-unknown --toolchain nightly git init .
rustup component add rust-src --toolchain nightly git remote add origin https://admin:$\{GIT_TOKEN\}@git.karatatar.com/admin/vibetorrent.git
rustc +nightly --version git fetch --depth=1 origin ${{ gitea.sha }}
git checkout FETCH_HEAD
- name: Install Trunk
run: |
if ! command -v trunk &> /dev/null; then
cargo install trunk --locked
fi
- name: Build Frontend - name: Build Frontend
run: | run: |
cd frontend cd frontend
npm install npm install
# Run Tailwind manually first
npx @tailwindcss/cli -i input.css -o public/tailwind.css
trunk build --release trunk build --release
- name: Build MIPS Builder Image
run: |
if ! docker image inspect vibetorrent-mips-builder >/dev/null 2>&1; then
docker build --platform linux/amd64 -t vibetorrent-mips-builder -f - . <<'DOCKERFILE'
FROM ghcr.io/cross-rs/mips-unknown-linux-musl:main
RUN apt-get update -qq && \
apt-get install -y -qq curl ca-certificates && \
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly --component rust-src && \
rm -rf /var/lib/apt/lists/*
ENV PATH="/root/.cargo/bin:${PATH}"
DOCKERFILE
fi
- name: Build Backend (MIPS) - name: Build Backend (MIPS)
env:
# Ensure we are building a fully static binary
# -C link-self-contained=no: Let Zig (the linker) handle CRT objects (crt1.o, etc.)
RUSTFLAGS: "-C target-feature=+crt-static -C link-self-contained=no -C link-arg=-msoft-float"
CFLAGS_mips_unknown_linux_musl: "-msoft-float"
run: | run: |
docker run --rm \ cd backend
-v "$PWD":/project \ cargo zigbuild --target mips-unknown-linux-musl --release -Z build-std=std,panic_abort
-v cargo-mips-registry:/root/.cargo/registry \ file target/mips-unknown-linux-musl/release/backend
-w /project/backend \
vibetorrent-mips-builder \
bash -c '
cargo build --target mips-unknown-linux-musl --release -Z build-std=std,panic_abort &&
file /project/target/mips-unknown-linux-musl/release/backend
'
- name: Rename Binary - name: Rename Binary
run: mv target/mips-unknown-linux-musl/release/backend target/mips-unknown-linux-musl/release/vibetorrent-mips run: mv target/mips-unknown-linux-musl/release/backend target/mips-unknown-linux-musl/release/vibetorrent-mips
@@ -74,10 +57,7 @@ jobs:
API_URL="${{ gitea.server_url }}/api/v1" API_URL="${{ gitea.server_url }}/api/v1"
# Create release # Create release
RELEASE_RESPONSE=$(curl -s -X POST "${API_URL}/repos/${REPO}/releases" \ RELEASE_RESPONSE=$(curl -s -X POST "${API_URL}/repos/${REPO}/releases" -H "Authorization: token ${RELEASE_TOKEN}" -H "Content-Type: application/json" -d "{
-H "Authorization: token ${RELEASE_TOKEN}" \
-H "Content-Type: application/json" \
-d "{
\"tag_name\": \"${TAG}\", \"tag_name\": \"${TAG}\",
\"name\": \"Release ${TAG}\", \"name\": \"Release ${TAG}\",
\"body\": \"Automated build from commit ${{ gitea.sha }}\", \"body\": \"Automated build from commit ${{ gitea.sha }}\",
@@ -95,9 +75,6 @@ jobs:
fi fi
# Upload binary as release asset # Upload binary as release asset
curl -s -X POST "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=vibetorrent-mips" \ curl -s -X POST "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=vibetorrent-mips" -H "Authorization: token ${RELEASE_TOKEN}" -H "Content-Type: application/octet-stream" --data-binary @target/mips-unknown-linux-musl/release/vibetorrent-mips
-H "Authorization: token ${RELEASE_TOKEN}" \
-H "Content-Type: application/octet-stream" \
--data-binary @target/mips-unknown-linux-musl/release/vibetorrent-mips
echo "Release ${TAG} created with binary attached." echo "Release ${TAG} created with binary attached."

View File

@@ -1,80 +0,0 @@
name: Build MIPS Binary
on:
push:
branches: [ "main" ]
workflow_dispatch:
permissions:
contents: write
env:
CARGO_TERM_COLOR: always
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Debug - List Files (Pre-Build)
run: ls -R
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: '20'
- name: Install Rust
uses: dtolnay/rust-toolchain@nightly
with:
targets: wasm32-unknown-unknown
components: rust-src
- name: Rust Cache
uses: Swatinem/rust-cache@v2
- name: Install Trunk
uses: jetli/trunk-action@v0.5.0
with:
version: 'latest'
- name: Build Frontend
run: |
cd frontend
npm install
trunk build --release
- name: Install Cross
run: cargo install cross
- name: Build Backend (MIPS)
env:
RUSTUP_TOOLCHAIN: nightly
CROSS_NO_WARNINGS: 0
run: |
cd backend
cross build --target mips-unknown-linux-musl --release -Z build-std=std,panic_abort
- name: Debug - List Files
run: |
echo "Listing target directory..."
find target -maxdepth 5 || true
ls -R target/mips-unknown-linux-musl/release || true
- name: Rename Binary
run: mv target/mips-unknown-linux-musl/release/backend target/mips-unknown-linux-musl/release/vibetorrent-mips
- name: Generate Tag
id: tag
run: echo "release_tag=release-$(date +'%Y%m%d-%H%M')" >> $GITHUB_OUTPUT
- name: Create Release
uses: softprops/action-gh-release@v1
with:
tag_name: ${{ steps.tag.outputs.release_tag }}
name: Release ${{ steps.tag.outputs.release_tag }}
files: target/mips-unknown-linux-musl/release/vibetorrent-mips
draft: false
prerelease: false

690
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -33,3 +33,9 @@ utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] }
web-push = { version = "0.10", default-features = false, features = ["hyper-client"], optional = true } web-push = { version = "0.10", default-features = false, features = ["hyper-client"], optional = true }
base64 = "0.22" base64 = "0.22"
openssl = { version = "0.10", features = ["vendored"], optional = true } openssl = { version = "0.10", features = ["vendored"], optional = true }
sqlx = { version = "0.8", features = ["runtime-tokio", "sqlite"] }
bcrypt = "0.17.0"
axum-extra = { version = "0.10", features = ["cookie"] }
rand = "0.8"
anyhow = "1.0.101"
time = { version = "0.3.47", features = ["serde", "formatting", "parsing"] }

106
backend/src/db.rs Normal file
View File

@@ -0,0 +1,106 @@
use sqlx::{sqlite::SqlitePoolOptions, Pool, Sqlite, Row};
use std::time::Duration;
use anyhow::Result;
#[derive(Clone)]
pub struct Db {
pool: Pool<Sqlite>,
}
impl Db {
pub async fn new(db_url: &str) -> Result<Self> {
let pool = SqlitePoolOptions::new()
.max_connections(5)
.acquire_timeout(Duration::from_secs(3))
.connect(db_url)
.await?;
let db = Self { pool };
db.init().await?;
Ok(db)
}
async fn init(&self) -> Result<()> {
// Create users table
sqlx::query(
"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
)",
)
.execute(&self.pool)
.await?;
// Create sessions table
sqlx::query(
"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)
)",
)
.execute(&self.pool)
.await?;
Ok(())
}
// --- User Operations ---
pub async fn create_user(&self, username: &str, password_hash: &str) -> Result<()> {
sqlx::query("INSERT INTO users (username, password_hash) VALUES (?, ?)")
.bind(username)
.bind(password_hash)
.execute(&self.pool)
.await?;
Ok(())
}
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 = ?")
.bind(username)
.fetch_optional(&self.pool)
.await?;
Ok(row.map(|r| (r.get(0), r.get(1))))
}
pub async fn has_users(&self) -> Result<bool> {
let row: (i64,) = sqlx::query_as("SELECT COUNT(*) FROM users")
.fetch_one(&self.pool)
.await?;
Ok(row.0 > 0)
}
// --- Session Operations ---
pub async fn create_session(&self, user_id: i64, token: &str, expires_at: i64) -> Result<()> {
sqlx::query("INSERT INTO sessions (token, user_id, expires_at) VALUES (?, ?, datetime(?, 'unixepoch'))")
.bind(token)
.bind(user_id)
.bind(expires_at)
.execute(&self.pool)
.await?;
Ok(())
}
pub async fn get_session_user(&self, token: &str) -> Result<Option<i64>> {
let row = sqlx::query("SELECT user_id FROM sessions WHERE token = ? AND expires_at > datetime('now')")
.bind(token)
.fetch_optional(&self.pool)
.await?;
Ok(row.map(|r| r.get(0)))
}
pub async fn delete_session(&self, token: &str) -> Result<()> {
sqlx::query("DELETE FROM sessions WHERE token = ?")
.bind(token)
.execute(&self.pool)
.await?;
Ok(())
}
}

View File

@@ -85,7 +85,7 @@ pub fn diff_torrents(old: &[Torrent], new: &[Torrent]) -> DiffResult {
has_changes = true; has_changes = true;
// Log status changes for debugging // Log status changes for debugging
tracing::info!( tracing::debug!(
"Torrent status changed: {} ({}) {:?} -> {:?}", "Torrent status changed: {} ({}) {:?} -> {:?}",
new_t.name, new_t.hash, old_t.status, new_t.status new_t.name, new_t.hash, old_t.status, new_t.status
); );

View File

@@ -0,0 +1,139 @@
use crate::AppState;
use axum::{
extract::{State, Json},
http::StatusCode,
response::IntoResponse,
};
use serde::{Deserialize, Serialize};
use utoipa::ToSchema;
use axum_extra::extract::cookie::{Cookie, CookieJar, SameSite};
use time::Duration;
#[derive(Deserialize, ToSchema)]
pub struct LoginRequest {
username: String,
password: String,
}
#[allow(dead_code)]
#[derive(Serialize, ToSchema)]
pub struct UserResponse {
username: String,
}
#[utoipa::path(
post,
path = "/api/auth/login",
request_body = LoginRequest,
responses(
(status = 200, description = "Login successful"),
(status = 401, description = "Invalid credentials"),
(status = 500, description = "Internal server error")
)
)]
pub async fn login_handler(
State(state): State<AppState>,
jar: CookieJar,
Json(payload): Json<LoginRequest>,
) -> impl IntoResponse {
tracing::info!("Login attempt for user: {}", payload.username);
let user = match state.db.get_user_by_username(&payload.username).await {
Ok(Some(u)) => u,
Ok(None) => {
tracing::warn!("Login failed: User not found for {}", payload.username);
return (StatusCode::UNAUTHORIZED, "Invalid credentials").into_response();
}
Err(e) => {
tracing::error!("DB error during login for {}: {}", payload.username, e);
return (StatusCode::INTERNAL_SERVER_ERROR, "Database error").into_response();
}
};
let (user_id, password_hash) = user;
match bcrypt::verify(&payload.password, &password_hash) {
Ok(true) => {
tracing::info!("Password verified for user: {}", payload.username);
// Create session
let token: String = (0..32).map(|_| {
use rand::{distributions::Alphanumeric, Rng};
rand::thread_rng().sample(Alphanumeric) as char
}).collect();
// Expires in 30 days
let expires_in = 60 * 60 * 24 * 30;
let expires_at = time::OffsetDateTime::now_utc().unix_timestamp() + expires_in;
if let Err(e) = state.db.create_session(user_id, &token, expires_at).await {
tracing::error!("Failed to create session for {}: {}", payload.username, e);
return (StatusCode::INTERNAL_SERVER_ERROR, "Failed to create session").into_response();
}
let cookie = Cookie::build(("auth_token", token))
.path("/")
.http_only(true)
.same_site(SameSite::Strict)
.max_age(Duration::seconds(expires_in))
.build();
tracing::info!("Session created and cookie set for user: {}", payload.username);
(StatusCode::OK, jar.add(cookie), "Login successful").into_response()
}
Ok(false) => {
tracing::warn!("Login failed: Invalid password for {}", payload.username);
(StatusCode::UNAUTHORIZED, "Invalid credentials").into_response()
}
Err(e) => {
tracing::error!("Bcrypt error for {}: {}", payload.username, e);
(StatusCode::INTERNAL_SERVER_ERROR, "Auth error").into_response()
}
}
}
#[utoipa::path(
post,
path = "/api/auth/logout",
responses(
(status = 200, description = "Logged out")
)
)]
pub async fn logout_handler(
State(state): State<AppState>,
jar: CookieJar,
) -> impl IntoResponse {
if let Some(token) = jar.get("auth_token") {
let _ = state.db.delete_session(token.value()).await;
}
let cookie = Cookie::build(("auth_token", ""))
.path("/")
.http_only(true)
.max_age(Duration::seconds(-1)) // Expire immediately
.build();
(StatusCode::OK, jar.add(cookie), "Logged out").into_response()
}
#[utoipa::path(
get,
path = "/api/auth/check",
responses(
(status = 200, description = "Authenticated"),
(status = 401, description = "Not authenticated")
)
)]
pub async fn check_auth_handler(
State(state): State<AppState>,
jar: CookieJar,
) -> impl IntoResponse {
if let Some(token) = jar.get("auth_token") {
match state.db.get_session_user(token.value()).await {
Ok(Some(_)) => return StatusCode::OK.into_response(),
_ => {} // Invalid session
}
}
StatusCode::UNAUTHORIZED.into_response()
}

View File

@@ -18,6 +18,9 @@ use shared::{
}; };
use utoipa::ToSchema; use utoipa::ToSchema;
pub mod auth;
pub mod setup;
#[derive(RustEmbed)] #[derive(RustEmbed)]
#[folder = "../frontend/dist"] #[folder = "../frontend/dist"]
pub struct Asset; pub struct Asset;
@@ -709,8 +712,8 @@ pub async fn subscribe_push_handler(
Json(subscription): Json<push::PushSubscription>, Json(subscription): Json<push::PushSubscription>,
) -> impl IntoResponse { ) -> impl IntoResponse {
tracing::info!("Received push subscription: {:?}", subscription); tracing::info!("Received push subscription: {:?}", subscription);
state.push_store.add_subscription(subscription).await; state.push_store.add_subscription(subscription).await;
(StatusCode::OK, "Subscription saved").into_response() (StatusCode::OK, "Subscription saved").into_response()
} }

View File

@@ -0,0 +1,84 @@
use crate::AppState;
use axum::{
extract::{State, Json},
http::StatusCode,
response::IntoResponse,
};
use serde::{Deserialize, Serialize};
use utoipa::ToSchema;
#[derive(Deserialize, ToSchema)]
pub struct SetupRequest {
username: String,
password: String,
}
#[derive(Serialize, ToSchema)]
pub struct SetupStatusResponse {
completed: bool,
}
#[utoipa::path(
get,
path = "/api/setup/status",
responses(
(status = 200, description = "Setup status", body = SetupStatusResponse)
)
)]
pub async fn get_setup_status_handler(State(state): State<AppState>) -> impl IntoResponse {
let completed = match state.db.has_users().await {
Ok(has) => has,
Err(e) => {
tracing::error!("DB error checking users: {}", e);
false
}
};
Json(SetupStatusResponse { completed }).into_response()
}
#[utoipa::path(
post,
path = "/api/setup",
request_body = SetupRequest,
responses(
(status = 200, description = "Setup completed"),
(status = 400, description = "Invalid request"),
(status = 403, description = "Setup already completed"),
(status = 500, description = "Internal server error")
)
)]
pub async fn setup_handler(
State(state): State<AppState>,
Json(payload): Json<SetupRequest>,
) -> impl IntoResponse {
// 1. Check if setup is already completed (i.e., users exist)
match state.db.has_users().await {
Ok(true) => return (StatusCode::FORBIDDEN, "Setup already completed").into_response(),
Err(e) => {
tracing::error!("DB error checking users: {}", e);
return (StatusCode::INTERNAL_SERVER_ERROR, "Database error").into_response();
}
Ok(false) => {} // Proceed
}
// 2. Validate input
if payload.username.len() < 3 || payload.password.len() < 6 {
return (StatusCode::BAD_REQUEST, "Username must be at least 3 chars, password at least 6").into_response();
}
// 3. Create User
let password_hash = match bcrypt::hash(&payload.password, bcrypt::DEFAULT_COST) {
Ok(h) => h,
Err(e) => {
tracing::error!("Failed to hash password: {}", e);
return (StatusCode::INTERNAL_SERVER_ERROR, "Failed to process password").into_response();
}
};
if let Err(e) = state.db.create_user(&payload.username, &password_hash).await {
tracing::error!("Failed to create user: {}", e);
return (StatusCode::INTERNAL_SERVER_ERROR, "Failed to create user").into_response();
}
(StatusCode::OK, "Setup completed successfully").into_response()
}

View File

@@ -1,3 +1,4 @@
mod db;
mod diff; mod diff;
mod handlers; mod handlers;
#[cfg(feature = "push-notifications")] #[cfg(feature = "push-notifications")]
@@ -10,7 +11,12 @@ use axum::error_handling::HandleErrorLayer;
use axum::{ use axum::{
routing::{get, post}, routing::{get, post},
Router, Router,
middleware::{self, Next},
response::Response,
http::{StatusCode, Request},
body::Body,
}; };
use axum_extra::extract::cookie::CookieJar;
use clap::Parser; use clap::Parser;
use dotenvy::dotenv; use dotenvy::dotenv;
use shared::{AppEvent, Torrent}; use shared::{AppEvent, Torrent};
@@ -32,10 +38,39 @@ pub struct AppState {
pub tx: Arc<watch::Sender<Vec<Torrent>>>, pub tx: Arc<watch::Sender<Vec<Torrent>>>,
pub event_bus: broadcast::Sender<AppEvent>, pub event_bus: broadcast::Sender<AppEvent>,
pub scgi_socket_path: String, pub scgi_socket_path: String,
pub db: db::Db,
#[cfg(feature = "push-notifications")] #[cfg(feature = "push-notifications")]
pub push_store: push::PushSubscriptionStore, pub push_store: push::PushSubscriptionStore,
} }
async fn auth_middleware(
state: axum::extract::State<AppState>,
jar: CookieJar,
request: Request<Body>,
next: Next,
) -> Result<Response, StatusCode> {
// Skip auth for public paths
let path = request.uri().path();
if path.starts_with("/api/auth/login")
|| path.starts_with("/api/auth/check") // Used by frontend to decide where to go
|| path.starts_with("/api/setup")
|| path.starts_with("/swagger-ui")
|| path.starts_with("/api-docs")
|| !path.starts_with("/api/") // Allow static files (frontend)
{
return Ok(next.run(request).await);
}
// Check token
if let Some(token) = jar.get("auth_token") {
match state.db.get_session_user(token.value()).await {
Ok(Some(_)) => return Ok(next.run(request).await),
_ => {} // Invalid
}
}
Err(StatusCode::UNAUTHORIZED)
}
#[derive(Parser, Debug)] #[derive(Parser, Debug)]
#[command(author, version, about, long_about = None)] #[command(author, version, about, long_about = None)]
struct Args { struct Args {
@@ -51,6 +86,10 @@ struct Args {
/// Port to listen on /// Port to listen on
#[arg(short, long, env = "PORT", default_value_t = 3000)] #[arg(short, long, env = "PORT", default_value_t = 3000)]
port: u16, port: u16,
/// Database URL
#[arg(long, env = "DATABASE_URL", default_value = "sqlite:vibetorrent.db")]
db_url: String,
} }
#[cfg(feature = "push-notifications")] #[cfg(feature = "push-notifications")]
@@ -68,7 +107,12 @@ struct Args {
handlers::get_global_limit_handler, handlers::get_global_limit_handler,
handlers::set_global_limit_handler, handlers::set_global_limit_handler,
handlers::get_push_public_key_handler, handlers::get_push_public_key_handler,
handlers::subscribe_push_handler handlers::subscribe_push_handler,
handlers::auth::login_handler,
handlers::auth::logout_handler,
handlers::auth::check_auth_handler,
handlers::setup::setup_handler,
handlers::setup::get_setup_status_handler
), ),
components( components(
schemas( schemas(
@@ -83,7 +127,10 @@ struct Args {
shared::SetLabelRequest, shared::SetLabelRequest,
shared::GlobalLimitRequest, shared::GlobalLimitRequest,
push::PushSubscription, push::PushSubscription,
push::PushKeys push::PushKeys,
handlers::auth::LoginRequest,
handlers::setup::SetupRequest,
handlers::setup::SetupStatusResponse
) )
), ),
tags( tags(
@@ -105,7 +152,12 @@ struct ApiDoc;
handlers::set_file_priority_handler, handlers::set_file_priority_handler,
handlers::set_label_handler, handlers::set_label_handler,
handlers::get_global_limit_handler, handlers::get_global_limit_handler,
handlers::set_global_limit_handler handlers::set_global_limit_handler,
handlers::auth::login_handler,
handlers::auth::logout_handler,
handlers::auth::check_auth_handler,
handlers::setup::setup_handler,
handlers::setup::get_setup_status_handler
), ),
components( components(
schemas( schemas(
@@ -118,7 +170,10 @@ struct ApiDoc;
shared::TorrentTracker, shared::TorrentTracker,
shared::SetFilePriorityRequest, shared::SetFilePriorityRequest,
shared::SetLabelRequest, shared::SetLabelRequest,
shared::GlobalLimitRequest shared::GlobalLimitRequest,
handlers::auth::LoginRequest,
handlers::setup::SetupRequest,
handlers::setup::SetupStatusResponse
) )
), ),
tags( tags(
@@ -146,6 +201,29 @@ async fn main() {
tracing::info!("Socket: {}", args.socket); tracing::info!("Socket: {}", args.socket);
tracing::info!("Port: {}", args.port); tracing::info!("Port: {}", args.port);
// Initialize Database
tracing::info!("Connecting to database: {}", args.db_url);
// Ensure the db file exists if it's sqlite
if args.db_url.starts_with("sqlite:") {
let path = args.db_url.trim_start_matches("sqlite:");
if !std::path::Path::new(path).exists() {
tracing::info!("Database file not found, creating: {}", path);
match std::fs::File::create(path) {
Ok(_) => tracing::info!("Created empty database file"),
Err(e) => tracing::error!("Failed to create database file: {}", e),
}
}
}
let db: db::Db = match db::Db::new(&args.db_url).await {
Ok(db) => db,
Err(e) => {
tracing::error!("Failed to connect to database: {}", e);
std::process::exit(1);
}
};
tracing::info!("Database connected successfully.");
// Startup Health Check // Startup Health Check
let socket_path = std::path::Path::new(&args.socket); let socket_path = std::path::Path::new(&args.socket);
if !socket_path.exists() { if !socket_path.exists() {
@@ -181,6 +259,7 @@ async fn main() {
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(),
#[cfg(feature = "push-notifications")] #[cfg(feature = "push-notifications")]
push_store: push::PushSubscriptionStore::new(), push_store: push::PushSubscriptionStore::new(),
}; };
@@ -308,6 +387,13 @@ async fn main() {
let app = Router::new() let app = Router::new()
.merge(SwaggerUi::new("/swagger-ui").url("/api-docs/openapi.json", ApiDoc::openapi())) .merge(SwaggerUi::new("/swagger-ui").url("/api-docs/openapi.json", ApiDoc::openapi()))
// Setup & Auth Routes
.route("/api/setup/status", get(handlers::setup::get_setup_status_handler))
.route("/api/setup", post(handlers::setup::setup_handler))
.route("/api/auth/login", post(handlers::auth::login_handler))
.route("/api/auth/logout", post(handlers::auth::logout_handler))
.route("/api/auth/check", get(handlers::auth::check_auth_handler))
// App Routes
.route("/api/events", get(sse::sse_handler)) .route("/api/events", get(sse::sse_handler))
.route("/api/torrents/add", post(handlers::add_torrent_handler)) .route("/api/torrents/add", post(handlers::add_torrent_handler))
.route( .route(
@@ -337,13 +423,14 @@ async fn main() {
get(handlers::get_global_limit_handler).post(handlers::set_global_limit_handler), get(handlers::get_global_limit_handler).post(handlers::set_global_limit_handler),
) )
.fallback(handlers::static_handler); // Serve static files for everything else .fallback(handlers::static_handler); // Serve static files for everything else
#[cfg(feature = "push-notifications")] #[cfg(feature = "push-notifications")]
let app = app let app = app
.route("/api/push/public-key", get(handlers::get_push_public_key_handler)) .route("/api/push/public-key", get(handlers::get_push_public_key_handler))
.route("/api/push/subscribe", post(handlers::subscribe_push_handler)); .route("/api/push/subscribe", post(handlers::subscribe_push_handler));
let app = app let app = app
.layer(middleware::from_fn_with_state(app_state.clone(), auth_middleware))
.layer(TraceLayer::new_for_http()) .layer(TraceLayer::new_for_http())
.layer( .layer(
CompressionLayer::new() CompressionLayer::new()

94
docker/runner/Dockerfile Normal file
View File

@@ -0,0 +1,94 @@
# Use a base image that supports multi-arch (x64 and arm64)
# We use debian:bookworm-slim as base to install everything manually
# and then install the act_runner binary.
FROM debian:bookworm-slim
ENV DEBIAN_FRONTEND=noninteractive
ENV PATH="/root/.cargo/bin:/root/.node/bin:/root/zig:${PATH}"
# 1. Install Basic Dependencies
RUN apt-get update && apt-get install -y \
curl \
git \
build-essential \
ca-certificates \
wget \
xz-utils \
libssl-dev \
pkg-config \
file \
jq \
# Needed for some crate compilations
protobuf-compiler \
&& rm -rf /var/lib/apt/lists/*
# 2. Install Node.js v20 (Manual install to support multi-arch cleanly)
RUN ARCH=$(dpkg --print-architecture) && \
if [ "$ARCH" = "amd64" ]; then NODE_ARCH="x64"; \
elif [ "$ARCH" = "arm64" ]; then NODE_ARCH="arm64"; fi && \
NODE_VER="v20.11.1" && \
curl -fsSL "https://nodejs.org/dist/$NODE_VER/node-$NODE_VER-linux-$NODE_ARCH.tar.xz" -o node.tar.xz && \
mkdir -p /root/.node && \
tar -xJf node.tar.xz -C /root/.node --strip-components=1 && \
rm node.tar.xz
# 3. Install Rust (Nightly) + Targets
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly --profile minimal && \
. "$HOME/.cargo/env" && \
rustup target add wasm32-unknown-unknown && \
rustup component add rust-src
# 4. Install Zig (for Cross Compilation)
RUN ARCH=$(dpkg --print-architecture) && \
if [ "$ARCH" = "amd64" ]; then ZIG_ARCH="x86_64"; \
elif [ "$ARCH" = "arm64" ]; then ZIG_ARCH="aarch64"; fi && \
ZIG_VER="0.13.0" && \
curl -fsSL "https://ziglang.org/download/$ZIG_VER/zig-linux-$ZIG_ARCH-$ZIG_VER.tar.xz" -o zig.tar.xz && \
tar -xf zig.tar.xz && \
mv "zig-linux-$ZIG_ARCH-$ZIG_VER" /root/zig && \
rm zig.tar.xz
# 5. Fix: Create libatomic.a with __atomic_is_lock_free for MIPS
# MIPS musl static build misses __atomic_is_lock_free.
# We provide it via pure assembly to avoid Clang builtin conflicts.
RUN . "$HOME/.cargo/env" && \
printf '.text\n.globl __atomic_is_lock_free\n.type __atomic_is_lock_free, @function\n__atomic_is_lock_free:\n sltiu $v0, $a0, 5\n jr $ra\n nop\n.size __atomic_is_lock_free, .-__atomic_is_lock_free\n' > atomic.s && \
/root/zig/zig cc -target mips-linux-musl -msoft-float -c -o atomic.o atomic.s && \
/root/zig/zig ar rcs libatomic.a atomic.o && \
RUST_SYSROOT=$(rustc --print sysroot) && \
TARGET_LIB_DIR="$RUST_SYSROOT/lib/rustlib/mips-unknown-linux-musl/lib" && \
mkdir -p "$TARGET_LIB_DIR" && \
cp libatomic.a "$TARGET_LIB_DIR/" && \
rm atomic.s atomic.o libatomic.a
# 6. Install Tools (Trunk, cargo-zigbuild, wasm-bindgen protocol aligned)
# We install trunk binary to save time, others via cargo
RUN . "$HOME/.cargo/env" && \
# Install cargo-zigbuild
cargo install cargo-zigbuild && \
# Install trunk (Binary)
ARCH=$(dpkg --print-architecture) && \
if [ "$ARCH" = "amd64" ]; then TRUNK_ARCH="x86_64-unknown-linux-gnu"; \
elif [ "$ARCH" = "arm64" ]; then TRUNK_ARCH="aarch64-unknown-linux-gnu"; fi && \
wget -qO- "https://github.com/trunk-rs/trunk/releases/download/v0.21.5/trunk-$TRUNK_ARCH.tar.gz" | tar -xzf - -C /root/.cargo/bin/ && \
chmod +x /root/.cargo/bin/trunk && \
# Install wasm-bindgen-cli (Compiling from source to avoid glibc issues, doing it ONCE here)
cargo install wasm-bindgen-cli --version 0.2.108
# 7. Install Gitea Act Runner Binary
# We fetch the binary directly to run as the entrypoint
RUN ARCH=$(dpkg --print-architecture) && \
VERSION="0.2.11" && \
curl -fsSL -o /usr/local/bin/act_runner "https://dl.gitea.com/act_runner/$VERSION/act_runner-$VERSION-linux-$ARCH" && \
chmod +x /usr/local/bin/act_runner
# Create a volume for registration data
VOLUME /data
WORKDIR /data
# Define entrypoint to run the registration or daemon
# We will use a script to handle auto-registration if env vars are present
COPY entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]

View File

@@ -0,0 +1,23 @@
#!/bin/bash
set -e
# If GITEA_INSTANCE_URL and GITEA_RUNNER_TOKEN are provided, try to register
if [ -n "$GITEA_INSTANCE_URL" ] && [ -n "$GITEA_RUNNER_TOKEN" ]; then
if [ ! -f ".runner" ]; then
echo "Registering runner..."
# Register with label 'mips-builder' valid for host execution
# plus 'ubuntu-latest' mapped to host for convenience if needed
act_runner register \
--instance "$GITEA_INSTANCE_URL" \
--token "$GITEA_RUNNER_TOKEN" \
--name "vibetorrent-mips-runner-$(hostname)" \
--labels "mips-builder:host,ubuntu-latest:host" \
--no-interactive
else
echo "Runner already registered."
fi
fi
# Run the daemon
echo "Starting act_runner daemon..."
exec act_runner daemon

View File

@@ -3,92 +3,149 @@ use crate::components::layout::statusbar::StatusBar;
use crate::components::layout::toolbar::Toolbar; use crate::components::layout::toolbar::Toolbar;
use crate::components::toast::ToastContainer; use crate::components::toast::ToastContainer;
use crate::components::torrent::table::TorrentTable; use crate::components::torrent::table::TorrentTable;
use crate::components::auth::login::Login;
use crate::components::auth::setup::Setup;
use leptos::*; use leptos::*;
use leptos_router::*; use leptos_router::*;
use serde::Deserialize;
#[derive(Deserialize)]
struct SetupStatus {
completed: bool,
}
#[component] #[component]
pub fn App() -> impl IntoView { pub fn App() -> impl IntoView {
crate::store::provide_torrent_store(); crate::store::provide_torrent_store();
// Initialize push notifications after user grants permission // Auth State
let (is_loading, set_is_loading) = create_signal(true);
let (is_authenticated, set_is_authenticated) = create_signal(false);
// Check Auth & Setup Status on load
create_effect(move |_| { create_effect(move |_| {
spawn_local(async { spawn_local(async move {
// Wait a bit for service worker to be ready // 1. Check Setup Status
gloo_timers::future::TimeoutFuture::new(2000).await; let setup_res = gloo_net::http::Request::get("/api/setup/status").send().await;
if let Ok(resp) = setup_res {
// Check if running on iOS and not standalone if let Ok(status) = resp.json::<SetupStatus>().await {
if let Some(ios_message) = crate::utils::platform::get_ios_notification_info() { if !status.completed {
log::warn!("iOS detected: {}", ios_message); // Redirect to setup if not completed
let navigate = use_navigate();
// Show toast to inform user navigate("/setup", Default::default());
if let Some(store) = use_context::<crate::store::TorrentStore>() { set_is_loading.set(false);
crate::store::show_toast_with_signal( return;
store.notifications, }
shared::NotificationLevel::Info,
ios_message,
);
} }
return;
} }
// Check if push notifications are supported // 2. Check Auth Status
if !crate::utils::platform::supports_push_notifications() { let auth_res = gloo_net::http::Request::get("/api/auth/check").send().await;
log::warn!("Push notifications not supported on this platform"); if let Ok(resp) = auth_res {
return; if resp.status() == 200 {
} set_is_authenticated.set(true);
// Safari requires user gesture for notification permission // Initialize push notifications logic only if authenticated
// Don't auto-request on Safari - user should click a button // ... (Push notification logic moved here or kept global but guarded)
if crate::utils::platform::is_safari() { } else {
log::info!("Safari detected - notification permission requires user interaction"); let navigate = use_navigate();
if let Some(store) = use_context::<crate::store::TorrentStore>() { // If we are already on login or setup, don't redirect loop
crate::store::show_toast_with_signal( let pathname = window().location().pathname().unwrap_or_default();
store.notifications, if pathname != "/login" && pathname != "/setup" {
shared::NotificationLevel::Info, navigate("/login", Default::default());
"Bildirim izni için sağ alttaki ayarlar ⚙️ ikonuna basın.".to_string(), }
);
} }
return;
} }
set_is_loading.set(false);
// For non-Safari browsers (Chrome, Firefox, Edge), attempt auto-subscribe
log::info!("Attempting to subscribe to push notifications...");
crate::store::subscribe_to_push_notifications().await;
}); });
}); });
// Initialize push notifications after user grants permission (Only if authenticated)
create_effect(move |_| {
if is_authenticated.get() {
spawn_local(async {
// Wait a bit for service worker to be ready
gloo_timers::future::TimeoutFuture::new(2000).await;
// Check if running on iOS and not standalone
if let Some(ios_message) = crate::utils::platform::get_ios_notification_info() {
log::warn!("iOS detected: {}", ios_message);
if let Some(store) = use_context::<crate::store::TorrentStore>() {
crate::store::show_toast_with_signal(
store.notifications,
shared::NotificationLevel::Info,
ios_message,
);
}
return;
}
if !crate::utils::platform::supports_push_notifications() {
return;
}
if crate::utils::platform::is_safari() {
if let Some(store) = use_context::<crate::store::TorrentStore>() {
crate::store::show_toast_with_signal(
store.notifications,
shared::NotificationLevel::Info,
"Bildirim izni için sağ alttaki ayarlar ⚙️ ikonuna basın.".to_string(),
);
}
return;
}
crate::store::subscribe_to_push_notifications().await;
});
}
});
view! { view! {
// Main app wrapper - ensures proper stacking context
<div class="relative w-full h-screen" style="height: 100dvh;"> <div class="relative w-full h-screen" style="height: 100dvh;">
// Drawer layout <Router>
<div class="drawer lg:drawer-open h-full w-full"> <Routes>
<input id="my-drawer" type="checkbox" class="drawer-toggle" /> <Route path="/login" view=move || view! { <Login /> } />
<Route path="/setup" view=move || view! { <Setup /> } />
<div class="drawer-content flex flex-col h-full overflow-hidden bg-base-100 text-base-content text-sm select-none"> <Route path="/*" view=move || {
<Toolbar /> view! {
<Show when=move || !is_loading.get() fallback=|| view! {
<div class="flex items-center justify-center h-screen bg-base-100">
<span class="loading loading-spinner loading-lg"></span>
</div>
}>
<Show when=move || is_authenticated.get() fallback=|| view! { <Login /> }>
// Protected Layout
<div class="drawer lg:drawer-open h-full w-full">
<input id="my-drawer" type="checkbox" class="drawer-toggle" />
<main class="flex-1 flex flex-col min-w-0 bg-base-100 overflow-hidden pb-8"> <div class="drawer-content flex flex-col h-full overflow-hidden bg-base-100 text-base-content text-sm select-none">
<Router> <Toolbar />
<Routes>
<Route path="/" view=move || view! { <TorrentTable /> } />
<Route path="/settings" view=move || view! { <div class="p-4">"Settings Page (Coming Soon)"</div> } />
</Routes>
</Router>
</main>
// StatusBar is rendered via fixed positioning, just mount it here <main class="flex-1 flex flex-col min-w-0 bg-base-100 overflow-hidden pb-8">
<StatusBar /> <Routes>
</div> <Route path="/" view=move || view! { <TorrentTable /> } />
<Route path="/settings" view=move || view! { <div class="p-4">"Settings Page (Coming Soon)"</div> } />
</Routes>
</main>
<StatusBar />
</div>
<div class="drawer-side z-40 transition-none duration-0">
<label for="my-drawer" aria-label="close sidebar" class="drawer-overlay transition-none duration-0"></label>
<div class="menu p-0 min-h-full bg-base-200 text-base-content border-r border-base-300 transition-none duration-0">
<Sidebar />
</div>
</div>
</div>
</Show>
</Show>
}
}/>
</Routes>
</Router>
<div class="drawer-side z-40 transition-none duration-0">
<label for="my-drawer" aria-label="close sidebar" class="drawer-overlay transition-none duration-0"></label>
<div class="menu p-0 min-h-full bg-base-200 text-base-content border-r border-base-300 transition-none duration-0">
<Sidebar />
</div>
</div>
</div>
// Toast container - fixed positioning relative to viewport
<ToastContainer /> <ToastContainer />
</div> </div>
} }

View File

@@ -0,0 +1,116 @@
use leptos::*;
use leptos_router::*;
use serde::Serialize;
#[derive(Serialize)]
struct LoginRequest {
username: String,
password: String,
}
#[component]
pub fn Login() -> impl IntoView {
let (username, set_username) = create_signal(String::new());
let (password, set_password) = create_signal(String::new());
let (error, set_error) = create_signal(Option::<String>::None);
let (loading, set_loading) = create_signal(false);
let handle_login = move |ev: web_sys::SubmitEvent| {
ev.prevent_default();
set_loading.set(true);
set_error.set(None);
logging::log!("Attempting login for user: {}", username.get());
spawn_local(async move {
let req = LoginRequest {
username: username.get(),
password: password.get(),
};
let client = gloo_net::http::Request::post("/api/auth/login")
.json(&req)
.expect("Failed to create request");
match client.send().await {
Ok(resp) => {
logging::log!("Login response status: {}", resp.status());
if resp.ok() {
logging::log!("Login successful, redirecting...");
// Force a full reload to re-run auth checks in App.rs
let _ = window().location().set_href("/");
} else {
let text = resp.text().await.unwrap_or_default();
logging::error!("Login failed: {}", text);
set_error.set(Some("Kullanıcı adı veya şifre hatalı".to_string()));
}
}
Err(e) => {
logging::error!("Network error: {}", e);
set_error.set(Some("Bağlantı hatası".to_string()));
}
}
set_loading.set(false);
});
};
view! {
<div class="flex items-center justify-center min-h-screen bg-base-200">
<div class="card w-full max-w-sm shadow-xl bg-base-100">
<div class="card-body">
<h2 class="card-title justify-center mb-4">"VibeTorrent Giriş"</h2>
<form on:submit=handle_login>
<div class="form-control w-full">
<label class="label">
<span class="label-text">"Kullanıcı Adı"</span>
</label>
<input
type="text"
placeholder="Kullanıcı adınız"
class="input input-bordered w-full"
prop:value=username
on:input=move |ev| set_username.set(event_target_value(&ev))
disabled=move || loading.get()
/>
</div>
<div class="form-control w-full mt-4">
<label class="label">
<span class="label-text">"Şifre"</span>
</label>
<input
type="password"
placeholder="******"
class="input input-bordered w-full"
prop:value=password
on:input=move |ev| set_password.set(event_target_value(&ev))
disabled=move || loading.get()
/>
</div>
<Show when=move || error.get().is_some()>
<div class="alert alert-error mt-4 text-sm py-2">
<svg xmlns="http://www.w3.org/2000/svg" class="stroke-current shrink-0 h-6 w-6" fill="none" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" /></svg>
<span>{move || error.get()}</span>
</div>
</Show>
<div class="card-actions justify-end mt-6">
<button
class="btn btn-primary w-full"
type="submit"
disabled=move || loading.get()
>
<Show when=move || loading.get() fallback=|| "Giriş Yap">
<span class="loading loading-spinner"></span>
"Giriş Yapılıyor..."
</Show>
</button>
</div>
</form>
</div>
</div>
</div>
}
}

View File

@@ -0,0 +1,2 @@
pub mod login;
pub mod setup;

View File

@@ -0,0 +1,144 @@
use leptos::*;
use leptos_router::*;
use serde::Serialize;
#[derive(Serialize)]
struct SetupRequest {
username: String,
password: String,
}
#[component]
pub fn Setup() -> impl IntoView {
let (username, set_username) = create_signal(String::new());
let (password, set_password) = create_signal(String::new());
let (confirm_password, set_confirm_password) = create_signal(String::new());
let (error, set_error) = create_signal(Option::<String>::None);
let (loading, set_loading) = create_signal(false);
let handle_setup = move |ev: web_sys::SubmitEvent| {
ev.prevent_default();
set_loading.set(true);
set_error.set(None);
let pass = password.get();
let confirm = confirm_password.get();
if pass != confirm {
set_error.set(Some("Şifreler eşleşmiyor".to_string()));
set_loading.set(false);
return;
}
if pass.len() < 6 {
set_error.set(Some("Şifre en az 6 karakter olmalıdır".to_string()));
set_loading.set(false);
return;
}
spawn_local(async move {
let req = SetupRequest {
username: username.get(),
password: pass,
};
let client = gloo_net::http::Request::post("/api/setup")
.json(&req)
.expect("Failed to create request");
match client.send().await {
Ok(resp) => {
if resp.ok() {
// Redirect to login after setup (full reload to be safe)
let _ = window().location().set_href("/login");
} else {
let text = resp.text().await.unwrap_or_default();
set_error.set(Some(format!("Hata: {}", text)));
}
}
Err(_) => {
set_error.set(Some("Bağlantı hatası".to_string()));
}
}
set_loading.set(false);
});
};
view! {
<div class="flex items-center justify-center min-h-screen bg-base-200">
<div class="card w-full max-w-md shadow-xl bg-base-100">
<div class="card-body">
<h2 class="card-title justify-center mb-2">"VibeTorrent Kurulumu"</h2>
<p class="text-center text-sm opacity-70 mb-4">"Yönetici hesabınızı oluşturun"</p>
<form on:submit=handle_setup>
<div class="form-control w-full">
<label class="label">
<span class="label-text">"Kullanıcı Adı"</span>
</label>
<input
type="text"
placeholder="admin"
class="input input-bordered w-full"
prop:value=username
on:input=move |ev| set_username.set(event_target_value(&ev))
disabled=move || loading.get()
required
/>
</div>
<div class="form-control w-full mt-4">
<label class="label">
<span class="label-text">"Şifre"</span>
</label>
<input
type="password"
placeholder="******"
class="input input-bordered w-full"
prop:value=password
on:input=move |ev| set_password.set(event_target_value(&ev))
disabled=move || loading.get()
required
/>
</div>
<div class="form-control w-full mt-4">
<label class="label">
<span class="label-text">"Şifre Tekrar"</span>
</label>
<input
type="password"
placeholder="******"
class="input input-bordered w-full"
prop:value=confirm_password
on:input=move |ev| set_confirm_password.set(event_target_value(&ev))
disabled=move || loading.get()
required
/>
</div>
<Show when=move || error.get().is_some()>
<div class="alert alert-error mt-4 text-sm py-2">
<svg xmlns="http://www.w3.org/2000/svg" class="stroke-current shrink-0 h-6 w-6" fill="none" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" /></svg>
<span>{move || error.get()}</span>
</div>
</Show>
<div class="card-actions justify-end mt-6">
<button
class="btn btn-primary w-full"
type="submit"
disabled=move || loading.get()
>
<Show when=move || loading.get() fallback=|| "Kurulumu Tamamla">
<span class="loading loading-spinner"></span>
"İşleniyor..."
</Show>
</button>
</div>
</form>
</div>
</div>
</div>
}
}

View File

@@ -109,192 +109,80 @@ pub fn StatusBar() -> impl IntoView {
}); });
}; };
// Signal-based dropdown state: 0=none, 1=download, 2=upload, 3=theme // Signal-based dropdown state: 0=none, 1=download, 2=upload, 3=theme
let (active_dropdown, set_active_dropdown) = create_signal(0u8); let (active_dropdown, set_active_dropdown) = create_signal(0u8);
// Guard to prevent global close from firing right after toggle opens
let skip_next_close = store_value(false); // Toggle a specific dropdown
let toggle = move |id: u8| {
// Toggle a specific dropdown let current = active_dropdown.get_untracked();
let toggle = move |id: u8| { if current == id {
let current = active_dropdown.get_untracked(); set_active_dropdown.set(0);
if current == id { } else {
set_active_dropdown.set(id);
}
};
// Close all dropdowns
let close_all = move || {
set_active_dropdown.set(0); set_active_dropdown.set(0);
} else { };
set_active_dropdown.set(id);
// Mark that the next global close should be skipped
skip_next_close.set_value(true);
}
};
// Close all dropdowns
let close_all = move || {
set_active_dropdown.set(0);
};
// Close dropdowns when tapping outside — uses click (fires after pointerdown) view! {
let _ = window_event_listener(ev::click, move |_| { // Transparent overlay to close dropdowns when clicking outside
if skip_next_close.get_value() { <Show when=move || active_dropdown.get() != 0>
skip_next_close.set_value(false);
return;
}
set_active_dropdown.set(0);
});
view! {
<div class="fixed bottom-0 left-0 right-0 h-8 min-h-8 bg-base-200 border-t border-base-300 flex items-center px-4 text-xs gap-4 text-base-content/70 z-[99]">
// --- DOWNLOAD SPEED DROPDOWN ---
<div class="relative">
<div <div
class="flex items-center gap-2 cursor-pointer hover:text-primary transition-colors select-none" class="fixed inset-0 z-[98] cursor-default"
title="Global Download Speed - Click to Set Limit" on:pointerdown=move |_| close_all()
on:pointerdown=move |e| { ></div>
e.stop_propagation(); </Show>
toggle(1);
}
>
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
<path stroke-linecap="round" stroke-linejoin="round" d="M19.5 13.5L12 21m0 0l-7.5-7.5M12 21V3" />
</svg>
<span class="font-mono">{move || format_speed(stats.get().down_rate)}</span>
<Show when=move || { stats.get().down_limit.unwrap_or(0) > 0 } fallback=|| ()>
<span class="text-[10px] opacity-60">
{move || format!("(Limit: {})", format_speed(stats.get().down_limit.unwrap_or(0)))}
</span>
</Show>
</div>
<ul <div class="fixed bottom-0 left-0 right-0 h-8 min-h-8 bg-base-200 border-t border-base-300 flex items-center px-4 text-xs gap-4 text-base-content/70 z-[99]">
class="absolute bottom-full left-0 z-[100] menu p-2 shadow bg-base-200 rounded-box w-40 mb-2 border border-base-300"
style=move || if active_dropdown.get() == 1 { "display: block" } else { "display: none" }
on:pointerdown=move |e| e.stop_propagation()
>
{
limits.clone().into_iter().map(|(val, label)| {
let is_active = move || {
let current = stats.get().down_limit.unwrap_or(0);
(current - val).abs() < 1024
};
view! {
<li>
<button
class=move || if is_active() { "bg-primary/10 text-primary font-bold text-xs flex justify-between" } else { "text-xs flex justify-between" }
on:pointerdown=move |e| {
e.stop_propagation();
set_limit("down", val);
close_all();
}
>
{label}
<Show when=is_active fallback=|| ()>
<span>""</span>
</Show>
</button>
</li>
}
}).collect::<Vec<_>>()
}
</ul>
</div>
// --- UPLOAD SPEED DROPDOWN --- // --- DOWNLOAD SPEED DROPDOWN ---
<div class="relative">
<div
class="flex items-center gap-2 cursor-pointer hover:text-primary transition-colors select-none"
title="Global Upload Speed - Click to Set Limit"
on:pointerdown=move |e| {
e.stop_propagation();
toggle(2);
}
>
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
<path stroke-linecap="round" stroke-linejoin="round" d="M4.5 10.5L12 3m0 0l7.5 7.5M12 3v18" />
</svg>
<span class="font-mono">{move || format_speed(stats.get().up_rate)}</span>
<Show when=move || { stats.get().up_limit.unwrap_or(0) > 0 } fallback=|| ()>
<span class="text-[10px] opacity-60">
{move || format!("(Limit: {})", format_speed(stats.get().up_limit.unwrap_or(0)))}
</span>
</Show>
</div>
<ul
class="absolute bottom-full left-0 z-[100] menu p-2 shadow bg-base-200 rounded-box w-40 mb-2 border border-base-300"
style=move || if active_dropdown.get() == 2 { "display: block" } else { "display: none" }
on:pointerdown=move |e| e.stop_propagation()
>
{
limits.clone().into_iter().map(|(val, label)| {
let is_active = move || {
let current = stats.get().up_limit.unwrap_or(0);
(current - val).abs() < 1024
};
view! {
<li>
<button
class=move || if is_active() { "bg-primary/10 text-primary font-bold text-xs flex justify-between" } else { "text-xs flex justify-between" }
on:pointerdown=move |e| {
e.stop_propagation();
set_limit("up", val);
close_all();
}
>
{label}
<Show when=is_active fallback=|| ()>
<span>""</span>
</Show>
</button>
</li>
}
}).collect::<Vec<_>>()
}
</ul>
</div>
<div class="ml-auto flex items-center gap-4">
<div class="relative"> <div class="relative">
<div <div
class="btn btn-ghost btn-xs btn-square" class="flex items-center gap-2 cursor-pointer hover:text-primary transition-colors select-none"
title="Change Theme" title="Global Download Speed - Click to Set Limit"
on:pointerdown=move |e| { on:pointerdown=move |e| {
e.stop_propagation(); e.stop_propagation();
toggle(3); toggle(1);
} }
> >
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4"> <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
<path stroke-linecap="round" stroke-linejoin="round" d="M9.53 16.122a3 3 0 0 0-5.78 1.128 2.25 2.25 0 0 1-2.4 2.245 4.5 4.5 0 0 0 8.4-2.245c0-.399-.078-.78-.22-1.128Zm0 0a15.998 15.998 0 0 0 3.388-1.62m-5.043-.025a15.994 15.994 0 0 1 1.622-3.395m3.42 3.42a15.995 15.995 0 0 0 4.764-4.648l3.876-5.814a1.151 1.151 0 0 0-1.597-1.597L14.146 6.32a15.996 15.996 0 0 0-4.649 4.763m3.42 3.42a6.776 6.776 0 0 0-3.42-3.42" /> <path stroke-linecap="round" stroke-linejoin="round" d="M19.5 13.5L12 21m0 0l-7.5-7.5M12 21V3" />
</svg> </svg>
<span class="font-mono">{move || format_speed(stats.get().down_rate)}</span>
<Show when=move || { stats.get().down_limit.unwrap_or(0) > 0 } fallback=|| ()>
<span class="text-[10px] opacity-60">
{move || format!("(Limit: {})", format_speed(stats.get().down_limit.unwrap_or(0)))}
</span>
</Show>
</div> </div>
<ul <ul
class="absolute bottom-full right-0 z-[100] menu p-2 shadow bg-base-200 rounded-box w-52 mb-2 border border-base-300 max-h-96 overflow-y-auto" class="absolute bottom-full left-0 z-[100] menu p-2 shadow bg-base-200 rounded-box w-40 mb-2 border border-base-300"
style=move || if active_dropdown.get() == 3 { "display: block" } else { "display: none" } style=move || if active_dropdown.get() == 1 { "display: block" } else { "display: none" }
on:pointerdown=move |e| e.stop_propagation()
> >
{ {
let themes = vec![ limits.clone().into_iter().map(|(val, label)| {
"light", "dark", "dim", "nord", "cupcake", "dracula", "cyberpunk", "emerald", "sunset", "abyss" let is_active = move || {
]; let current = stats.get().down_limit.unwrap_or(0);
themes.into_iter().map(|theme| { (current - val).abs() < 1024
};
view! { view! {
<li> <li>
<button <button
class=move || if current_theme.get() == theme { "bg-primary/10 text-primary font-bold text-xs capitalize" } else { "text-xs capitalize" } class=move || if is_active() { "bg-primary/10 text-primary font-bold text-xs flex justify-between" } else { "text-xs flex justify-between" }
on:pointerdown=move |e| { on:pointerdown=move |e| {
e.stop_propagation(); e.stop_propagation();
set_current_theme.set(theme.to_string()); set_limit("down", val);
if let Some(win) = web_sys::window() {
if let Some(doc) = win.document() {
let _ = doc.document_element().unwrap().set_attribute("data-theme", theme);
}
if let Some(storage) = win.local_storage().ok().flatten() {
let _ = storage.set_item("vibetorrent_theme", theme);
}
}
close_all(); close_all();
} }
> >
{theme} {label}
<Show when=is_active fallback=|| ()>
<span>""</span>
</Show>
</button> </button>
</li> </li>
} }
@@ -303,14 +191,117 @@ pub fn StatusBar() -> impl IntoView {
</ul> </ul>
</div> </div>
<button // --- UPLOAD SPEED DROPDOWN ---
class="btn btn-ghost btn-xs btn-square" <div class="relative">
<div
class="flex items-center gap-2 cursor-pointer hover:text-primary transition-colors select-none"
title="Global Upload Speed - Click to Set Limit"
on:pointerdown=move |e| {
e.stop_propagation();
toggle(2);
}
>
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
<path stroke-linecap="round" stroke-linejoin="round" d="M4.5 10.5L12 3m0 0l7.5 7.5M12 3v18" />
</svg>
<span class="font-mono">{move || format_speed(stats.get().up_rate)}</span>
<Show when=move || { stats.get().up_limit.unwrap_or(0) > 0 } fallback=|| ()>
<span class="text-[10px] opacity-60">
{move || format!("(Limit: {})", format_speed(stats.get().up_limit.unwrap_or(0)))}
</span>
</Show>
</div>
<ul
class="absolute bottom-full left-0 z-[100] menu p-2 shadow bg-base-200 rounded-box w-40 mb-2 border border-base-300"
style=move || if active_dropdown.get() == 2 { "display: block" } else { "display: none" }
>
{
limits.clone().into_iter().map(|(val, label)| {
let is_active = move || {
let current = stats.get().up_limit.unwrap_or(0);
(current - val).abs() < 1024
};
view! {
<li>
<button
class=move || if is_active() { "bg-primary/10 text-primary font-bold text-xs flex justify-between" } else { "text-xs flex justify-between" }
on:pointerdown=move |e| {
e.stop_propagation();
set_limit("up", val);
close_all();
}
>
{label}
<Show when=is_active fallback=|| ()>
<span>""</span>
</Show>
</button>
</li>
}
}).collect::<Vec<_>>()
}
</ul>
</div>
<div class="ml-auto flex items-center gap-4">
<div class="relative">
<div
class="btn btn-ghost btn-xs btn-square"
title="Change Theme"
on:pointerdown=move |e| {
e.stop_propagation();
toggle(3);
}
>
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
<path stroke-linecap="round" stroke-linejoin="round" d="M9.53 16.122a3 3 0 0 0-5.78 1.128 2.25 2.25 0 0 1-2.4 2.245 4.5 4.5 0 0 0 8.4-2.245c0-.399-.078-.78-.22-1.128Zm0 0a15.998 15.998 0 0 0 3.388-1.62m-5.043-.025a15.994 15.994 0 0 1 1.622-3.395m3.42 3.42a15.995 15.995 0 0 0 4.764-4.648l3.876-5.814a1.151 1.151 0 0 0-1.597-1.597L14.146 6.32a15.996 15.996 0 0 0-4.649 4.763m3.42 3.42a6.776 6.776 0 0 0-3.42-3.42" />
</svg>
</div>
<ul
class="absolute bottom-full right-0 z-[100] menu p-2 shadow bg-base-200 rounded-box w-52 mb-2 border border-base-300 max-h-96 overflow-y-auto"
style=move || if active_dropdown.get() == 3 { "display: block" } else { "display: none" }
>
{
let themes = vec![
"light", "dark", "dim", "nord", "cupcake", "dracula", "cyberpunk", "emerald", "sunset", "abyss"
];
themes.into_iter().map(|theme| {
view! {
<li>
<button
class=move || if current_theme.get() == theme { "bg-primary/10 text-primary font-bold text-xs capitalize" } else { "text-xs capitalize" }
on:pointerdown=move |e| {
e.stop_propagation();
set_current_theme.set(theme.to_string());
if let Some(win) = web_sys::window() {
if let Some(doc) = win.document() {
let _ = doc.document_element().unwrap().set_attribute("data-theme", theme);
}
if let Some(storage) = win.local_storage().ok().flatten() {
let _ = storage.set_item("vibetorrent_theme", theme);
}
}
close_all();
}
>
{theme}
</button>
</li>
}
}).collect::<Vec<_>>()
}
</ul>
</div>
<button
class="btn btn-ghost btn-xs btn-square"
title="Settings & Notification Permissions" title="Settings & Notification Permissions"
on:click=move |_| { on:click=move |_| {
// Request push notification permission when settings button is clicked // Request push notification permission when settings button is clicked
spawn_local(async { spawn_local(async {
log::info!("Settings button clicked - requesting push notification permission"); log::info!("Settings button clicked - requesting push notification permission");
// Check current permission state before requesting // Check current permission state before requesting
let window = web_sys::window().expect("window should exist"); let window = web_sys::window().expect("window should exist");
let _current_perm = js_sys::Reflect::get(&window, &"Notification".into()) let _current_perm = js_sys::Reflect::get(&window, &"Notification".into())
@@ -318,16 +309,16 @@ pub fn StatusBar() -> impl IntoView {
.and_then(|n| js_sys::Reflect::get(&n, &"permission".into()).ok()) .and_then(|n| js_sys::Reflect::get(&n, &"permission".into()).ok())
.and_then(|p| p.as_string()) .and_then(|p| p.as_string())
.unwrap_or_default(); .unwrap_or_default();
crate::store::subscribe_to_push_notifications().await; crate::store::subscribe_to_push_notifications().await;
// Check permission after request // Check permission after request
let new_perm = js_sys::Reflect::get(&window, &"Notification".into()) let new_perm = js_sys::Reflect::get(&window, &"Notification".into())
.ok() .ok()
.and_then(|n| js_sys::Reflect::get(&n, &"permission".into()).ok()) .and_then(|n| js_sys::Reflect::get(&n, &"permission".into()).ok())
.and_then(|p| p.as_string()) .and_then(|p| p.as_string())
.unwrap_or_default(); .unwrap_or_default();
if let Some(store) = use_context::<crate::store::TorrentStore>() { if let Some(store) = use_context::<crate::store::TorrentStore>() {
if new_perm == "granted" { if new_perm == "granted" {
crate::store::show_toast_with_signal( crate::store::show_toast_with_signal(

View File

@@ -3,3 +3,4 @@ pub mod layout;
pub mod modal; pub mod modal;
pub mod toast; pub mod toast;
pub mod torrent; pub mod torrent;
pub mod auth;

View File

@@ -154,14 +154,6 @@ pub fn TorrentTable() -> impl IntoView {
// Signal-based sort dropdown for mobile // Signal-based sort dropdown for mobile
let (sort_open, set_sort_open) = create_signal(false); let (sort_open, set_sort_open) = create_signal(false);
let sort_skip_close = store_value(false);
let _ = window_event_listener(ev::click, move |_| {
if sort_skip_close.get_value() {
sort_skip_close.set_value(false);
return;
}
set_sort_open.set(false);
});
let sort_arrow = move |col: SortColumn| { let sort_arrow = move |col: SortColumn| {
if sort_col.get() == col { if sort_col.get() == col {
@@ -199,7 +191,7 @@ pub fn TorrentTable() -> impl IntoView {
let (success_msg, error_msg) = get_action_messages(&action); let (success_msg, error_msg) = get_action_messages(&action);
let success_msg = success_msg.to_string(); let success_msg = success_msg.to_string();
let error_msg = error_msg.to_string(); let error_msg = error_msg.to_string();
// Capture notifications signal before async (use_context unavailable in spawn_local) // Capture notifications signal before async (use_context unavailable in spawn_local)
let notifications = store.notifications; let notifications = store.notifications;
@@ -332,81 +324,83 @@ pub fn TorrentTable() -> impl IntoView {
</table> </table>
</div> </div>
<div class="md:hidden flex flex-col h-full bg-base-200"> <div class="md:hidden flex flex-col h-full bg-base-200 relative">
<div class="px-3 py-2 border-b border-base-200 flex justify-between items-center bg-base-100/95 backdrop-blur z-10 shrink-0"> // Transparent overlay to close sort dropdown
<span class="text-xs font-bold opacity-50 uppercase tracking-wider">"Torrents"</span> <Show when=move || sort_open.get()>
<div
class="fixed inset-0 z-[98] cursor-default"
on:pointerdown=move |_| set_sort_open.set(false)
></div>
</Show>
<div class="relative"> <div class="px-3 py-2 border-b border-base-200 flex justify-between items-center bg-base-100/95 backdrop-blur z-10 shrink-0">
<div <span class="text-xs font-bold opacity-50 uppercase tracking-wider">"Torrents"</span>
role="button"
class="btn btn-ghost btn-xs gap-1 opacity-70 font-normal"
on:pointerdown=move |e| {
e.stop_propagation();
let cur = sort_open.get_untracked();
if cur {
set_sort_open.set(false);
} else {
set_sort_open.set(true);
sort_skip_close.set_value(true);
}
}
>
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
<path stroke-linecap="round" stroke-linejoin="round" d="M3 7.5L7.5 3m0 0L12 7.5M7.5 3v13.5m13.5 0L16.5 21m0 0L12 16.5m4.5 4.5V7.5" />
</svg>
"Sort"
</div>
<ul
class="absolute top-full right-0 z-[100] menu p-2 shadow bg-base-100 rounded-box w-48 mt-1 border border-base-200 text-xs"
style=move || if sort_open.get() { "display: block" } else { "display: none" }
on:pointerdown=move |e| e.stop_propagation()
>
<li class="menu-title px-2 py-1 opacity-50 text-[10px] uppercase font-bold">"Sort By"</li>
{
let columns = vec![
(SortColumn::Name, "Name"),
(SortColumn::Size, "Size"),
(SortColumn::Progress, "Progress"),
(SortColumn::Status, "Status"),
(SortColumn::DownSpeed, "Down Speed"),
(SortColumn::UpSpeed, "Up Speed"),
(SortColumn::ETA, "ETA"),
];
columns.into_iter().map(|(col, label)| { <div class="relative">
let is_active = move || sort_col.get() == col; <div
let current_dir = move || sort_dir.get(); role="button"
class="btn btn-ghost btn-xs gap-1 opacity-70 font-normal"
on:pointerdown=move |e| {
e.stop_propagation();
let cur = sort_open.get_untracked();
set_sort_open.set(!cur);
}
>
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
<path stroke-linecap="round" stroke-linejoin="round" d="M3 7.5L7.5 3m0 0L12 7.5M7.5 3v13.5m13.5 0L16.5 21m0 0L12 16.5m4.5 4.5V7.5" />
</svg>
"Sort"
</div>
<ul
class="absolute top-full right-0 z-[100] menu p-2 shadow bg-base-100 rounded-box w-48 mt-1 border border-base-200 text-xs"
style=move || if sort_open.get() { "display: block" } else { "display: none" }
on:pointerdown=move |e| e.stop_propagation()
>
<li class="menu-title px-2 py-1 opacity-50 text-[10px] uppercase font-bold">"Sort By"</li>
{
let columns = vec![
(SortColumn::Name, "Name"),
(SortColumn::Size, "Size"),
(SortColumn::Progress, "Progress"),
(SortColumn::Status, "Status"),
(SortColumn::DownSpeed, "Down Speed"),
(SortColumn::UpSpeed, "Up Speed"),
(SortColumn::ETA, "ETA"),
];
view! { columns.into_iter().map(|(col, label)| {
<li> let is_active = move || sort_col.get() == col;
<button let current_dir = move || sort_dir.get();
class=move || if is_active() { "bg-primary/10 text-primary font-bold flex justify-between" } else { "flex justify-between" }
on:pointerdown=move |e| { view! {
e.stop_propagation(); <li>
handle_sort(col); <button
set_sort_open.set(false); class=move || if is_active() { "bg-primary/10 text-primary font-bold flex justify-between" } else { "flex justify-between" }
on:pointerdown=move |e| {
e.stop_propagation();
handle_sort(col);
set_sort_open.set(false);
}
>
{label}
<Show when=is_active fallback=|| ()>
<span class="opacity-70 text-[10px]">
{move || match current_dir() {
SortDirection::Ascending => "",
SortDirection::Descending => "",
}}
</span>
</Show>
</button>
</li>
} }
> }).collect::<Vec<_>>()
{label} }
<Show when=is_active fallback=|| ()> </ul>
<span class="opacity-70 text-[10px]"> </div>
{move || match current_dir() { </div>
SortDirection::Ascending => "",
SortDirection::Descending => "",
}}
</span>
</Show>
</button>
</li>
}
}).collect::<Vec<_>>()
}
</ul>
</div>
</div>
<div class="overflow-y-auto p-3 pb-20 flex-1 grid grid-cols-1 content-start gap-3"> <div class="overflow-y-auto p-3 pb-20 flex-1 grid grid-cols-1 content-start gap-3"> {move || filtered_torrents().into_iter().map(|t| {
{move || filtered_torrents().into_iter().map(|t| {
let progress_class = if t.percent_complete >= 100.0 { "progress-success" } else { "progress-primary" }; let progress_class = if t.percent_complete >= 100.0 { "progress-success" } else { "progress-primary" };
let status_str = format!("{:?}", t.status); let status_str = format!("{:?}", t.status);
let status_badge_class = match t.status { let status_badge_class = match t.status {
@@ -442,7 +436,7 @@ pub fn TorrentTable() -> impl IntoView {
set_menu_position.set((x, y)); set_menu_position.set((x, y));
set_selected_hash.set(Some(hash.clone())); set_selected_hash.set(Some(hash.clone()));
set_menu_visible.set(true); set_menu_visible.set(true);
// Haptic feedback (iOS Safari doesn't support vibrate) // Haptic feedback (iOS Safari doesn't support vibrate)
let navigator = window().navigator(); let navigator = window().navigator();
if js_sys::Reflect::has(&navigator, &wasm_bindgen::JsValue::from_str("vibrate")).unwrap_or(false) { if js_sys::Reflect::has(&navigator, &wasm_bindgen::JsValue::from_str("vibrate")).unwrap_or(false) {

View File

@@ -1,127 +1,158 @@
const CACHE_NAME = 'vibetorrent-v1'; const CACHE_NAME = "vibetorrent-v2";
const ASSETS_TO_CACHE = [ const ASSETS_TO_CACHE = [
'/', "/",
'/index.html', "/index.html",
'/manifest.json', "/manifest.json",
'/icon-192.png', "/icon-192.png",
'/icon-512.png' "/icon-512.png",
]; ];
// Install event - cache assets // Install event - cache assets
self.addEventListener('install', (event) => { self.addEventListener("install", (event) => {
console.log('[Service Worker] Installing...'); console.log("[Service Worker] Installing...");
event.waitUntil( event.waitUntil(
caches.open(CACHE_NAME).then((cache) => { caches
console.log('[Service Worker] Caching static assets'); .open(CACHE_NAME)
return cache.addAll(ASSETS_TO_CACHE); .then((cache) => {
}).then(() => { console.log("[Service Worker] Caching static assets");
console.log('[Service Worker] Skip waiting'); return cache.addAll(ASSETS_TO_CACHE);
return self.skipWaiting(); })
}) .then(() => {
); console.log("[Service Worker] Skip waiting");
return self.skipWaiting();
}),
);
}); });
// Activate event - clean old caches // Activate event - clean old caches
self.addEventListener('activate', (event) => { self.addEventListener("activate", (event) => {
console.log('[Service Worker] Activating...'); console.log("[Service Worker] Activating...");
event.waitUntil( event.waitUntil(
caches.keys().then((cacheNames) => { caches
return Promise.all( .keys()
cacheNames.map((key) => { .then((cacheNames) => {
if (key !== CACHE_NAME) { return Promise.all(
console.log('[Service Worker] Deleting old cache:', key); cacheNames.map((key) => {
return caches.delete(key); if (key !== CACHE_NAME) {
} console.log("[Service Worker] Deleting old cache:", key);
}) return caches.delete(key);
); }
}).then(() => { }),
console.log('[Service Worker] Claiming clients'); );
return self.clients.claim(); })
}) .then(() => {
); console.log("[Service Worker] Claiming clients");
return self.clients.claim();
}),
);
}); });
// Fetch event - network first, cache fallback for API calls // Fetch event - network first for HTML, cache fallback for API calls
self.addEventListener('fetch', (event) => { self.addEventListener("fetch", (event) => {
const url = new URL(event.request.url); const url = new URL(event.request.url);
// Network-first strategy for API calls // Network-first strategy for API calls
if (url.pathname.startsWith('/api/')) { if (url.pathname.startsWith("/api/")) {
event.respondWith(
fetch(event.request)
.catch(() => {
// Could return cached API response or offline page
return new Response(
JSON.stringify({ error: 'Offline' }),
{ headers: { 'Content-Type': 'application/json' } }
);
})
);
return;
}
// Cache-first strategy for static assets
event.respondWith( event.respondWith(
caches.match(event.request).then((response) => { fetch(event.request).catch(() => {
return response || fetch(event.request).then((fetchResponse) => { // Could return cached API response or offline page
// Optionally cache new requests return new Response(JSON.stringify({ error: "Offline" }), {
if (fetchResponse && fetchResponse.status === 200) { headers: { "Content-Type": "application/json" },
const responseToCache = fetchResponse.clone(); });
caches.open(CACHE_NAME).then((cache) => { }),
cache.put(event.request, responseToCache);
});
}
return fetchResponse;
});
})
); );
return;
}
// Network-first strategy for HTML pages (entry points)
// This ensures users always get the latest version of the app
if (
event.request.mode === "navigate" ||
url.pathname.endsWith("index.html") ||
url.pathname === "/"
) {
event.respondWith(
fetch(event.request)
.then((response) => {
// Cache the latest version of the HTML
const responseToCache = response.clone();
caches.open(CACHE_NAME).then((cache) => {
cache.put(event.request, responseToCache);
});
return response;
})
.catch(() => {
return caches.match(event.request);
}),
);
return;
}
// Cache-first strategy for static assets (JS, CSS, Images)
event.respondWith(
caches.match(event.request).then((response) => {
return (
response ||
fetch(event.request).then((fetchResponse) => {
// Optionally cache new requests
if (fetchResponse && fetchResponse.status === 200) {
const responseToCache = fetchResponse.clone();
caches.open(CACHE_NAME).then((cache) => {
cache.put(event.request, responseToCache);
});
}
return fetchResponse;
})
);
}),
);
}); });
// Notification click event - focus or open app // Notification click event - focus or open app
self.addEventListener('notificationclick', (event) => { self.addEventListener("notificationclick", (event) => {
console.log('[Service Worker] Notification clicked:', event.notification.tag); console.log("[Service Worker] Notification clicked:", event.notification.tag);
event.notification.close(); event.notification.close();
event.waitUntil( event.waitUntil(
clients.matchAll({ type: 'window', includeUncontrolled: true }).then((clientList) => { clients
// If app is already open, focus it .matchAll({ type: "window", includeUncontrolled: true })
for (let client of clientList) { .then((clientList) => {
if (client.url === '/' && 'focus' in client) { // If app is already open, focus it
return client.focus(); for (let client of clientList) {
} if (client.url === "/" && "focus" in client) {
} return client.focus();
// Otherwise open new window }
if (clients.openWindow) { }
return clients.openWindow('/'); // Otherwise open new window
} if (clients.openWindow) {
}) return clients.openWindow("/");
); }
}),
);
}); });
// Push notification event // Push notification event
self.addEventListener('push', (event) => { self.addEventListener("push", (event) => {
console.log('[Service Worker] Push notification received'); console.log("[Service Worker] Push notification received");
const data = event.data ? event.data.json() : {}; const data = event.data ? event.data.json() : {};
const title = data.title || 'VibeTorrent'; const title = data.title || "VibeTorrent";
const options = { const options = {
body: data.body || 'New notification', body: data.body || "New notification",
icon: data.icon || '/icon-192.png', icon: data.icon || "/icon-192.png",
badge: data.badge || '/icon-192.png', badge: data.badge || "/icon-192.png",
tag: data.tag || 'vibetorrent-notification', tag: data.tag || "vibetorrent-notification",
requireInteraction: false, requireInteraction: false,
// iOS-specific: vibrate pattern (if supported) // iOS-specific: vibrate pattern (if supported)
vibrate: [200, 100, 200], vibrate: [200, 100, 200],
// Add data for notification click handling // Add data for notification click handling
data: { data: {
url: data.url || '/', url: data.url || "/",
timestamp: Date.now() timestamp: Date.now(),
} },
}; };
console.log('[Service Worker] Showing notification:', title, options); console.log("[Service Worker] Showing notification:", title, options);
event.waitUntil( event.waitUntil(self.registration.showNotification(title, options));
self.registration.showNotification(title, options)
);
}); });