Compare commits
21 Commits
release-20
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cffc88443a | ||
|
|
129a4c7586 | ||
|
|
f2dfa7963e | ||
|
|
d3792e78e0 | ||
|
|
384165a958 | ||
|
|
7169e44f4e | ||
|
|
51fb85c2d8 | ||
|
|
46882caea0 | ||
|
|
e339ca1c49 | ||
|
|
a08fd9698f | ||
|
|
7d46dbd437 | ||
|
|
5f107299e3 | ||
|
|
c34133ded1 | ||
|
|
0d059cbbd3 | ||
|
|
fc83a1cc65 | ||
|
|
4e81af0599 | ||
|
|
74c3c5c17e | ||
|
|
3632a578e1 | ||
|
|
8a9905fc56 | ||
|
|
1e39cbb0c5 | ||
|
|
40be58f2fc |
@@ -26,34 +26,22 @@ jobs:
|
||||
run: |
|
||||
cd frontend
|
||||
npm install
|
||||
# Run Tailwind manually first
|
||||
npx @tailwindcss/cli -i input.css -o public/tailwind.css
|
||||
# Trunk'ın optimizasyonunu kapalı (0) tutuyoruz çünkü Cargo.toml'daki opt-level='z' zaten o işi yapıyor.
|
||||
trunk build --release
|
||||
|
||||
# Manuel WASM Optimizasyonu
|
||||
WASM_FILE=$(ls dist/*.wasm | head -n 1)
|
||||
BEFORE=$(du -h "$WASM_FILE" | cut -f1)
|
||||
echo "Before optimization: $BEFORE"
|
||||
|
||||
wasm-opt --all-features -Oz "$WASM_FILE" -o "$WASM_FILE"
|
||||
|
||||
AFTER=$(du -h "$WASM_FILE" | cut -f1)
|
||||
echo "After optimization: $AFTER"
|
||||
echo "Optimization complete!"
|
||||
|
||||
- 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"
|
||||
# -s ve -w ile binary içindeki gereksiz tüm yükleri siliyoruz.
|
||||
RUSTFLAGS: "-C target-feature=+crt-static -C link-self-contained=no -C link-arg=-msoft-float -C link-arg=-s -C link-arg=-w"
|
||||
CFLAGS_mips_unknown_linux_musl: "-msoft-float"
|
||||
run: |
|
||||
cd backend
|
||||
cargo zigbuild --target mips-unknown-linux-musl --release -Z build-std=std,panic_abort
|
||||
file target/mips-unknown-linux-musl/release/backend
|
||||
# Sadece gerekli özellikleri derliyoruz (Boyut tasarrufu için swagger kapalı)
|
||||
cargo zigbuild -p backend --target mips-unknown-linux-musl --release -Z build-std=std,panic_abort --no-default-features --features push-notifications
|
||||
|
||||
- name: Rename Binary
|
||||
run: mv target/mips-unknown-linux-musl/release/backend target/mips-unknown-linux-musl/release/vibetorrent-mips
|
||||
- name: Create Release Assets
|
||||
run: |
|
||||
mv target/mips-unknown-linux-musl/release/backend target/mips-unknown-linux-musl/release/vibetorrent-mips
|
||||
|
||||
- name: Generate Release Tag
|
||||
id: tag
|
||||
@@ -67,8 +55,10 @@ jobs:
|
||||
REPO="admin/vibetorrent"
|
||||
API_URL="${{ gitea.server_url }}/api/v1"
|
||||
|
||||
# Create release
|
||||
RELEASE_RESPONSE=$(curl -s -X POST "${API_URL}/repos/${REPO}/releases" -H "Authorization: token ${RELEASE_TOKEN}" -H "Content-Type: application/json" -d "{
|
||||
RELEASE_RESPONSE=$(curl -s -X POST "${API_URL}/repos/${REPO}/releases" \
|
||||
-H "Authorization: token ${RELEASE_TOKEN}" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "{
|
||||
\"tag_name\": \"${TAG}\",
|
||||
\"name\": \"Release ${TAG}\",
|
||||
\"body\": \"Automated build from commit ${{ gitea.sha }}\",
|
||||
@@ -77,15 +67,9 @@ jobs:
|
||||
}")
|
||||
|
||||
RELEASE_ID=$(echo "$RELEASE_RESPONSE" | jq -r '.id')
|
||||
echo "Release ID: $RELEASE_ID"
|
||||
if [ "$RELEASE_ID" = "null" ] || [ -z "$RELEASE_ID" ]; then exit 1; fi
|
||||
|
||||
if [ "$RELEASE_ID" = "null" ] || [ -z "$RELEASE_ID" ]; then
|
||||
echo "Failed to create release:"
|
||||
echo "$RELEASE_RESPONSE"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Upload binary as release asset
|
||||
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
|
||||
|
||||
echo "Release ${TAG} created with binary attached."
|
||||
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
|
||||
111
Cargo.lock
generated
111
Cargo.lock
generated
@@ -566,6 +566,15 @@ dependencies = [
|
||||
"wasm-bindgen",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "codee"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5d3ad3122b0001c7f140cf4d605ef9a9e2c24d96ab0b4fb4347b76de2425f445"
|
||||
dependencies = [
|
||||
"thiserror 1.0.69",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "collection_literals"
|
||||
version = "1.0.3"
|
||||
@@ -790,6 +799,41 @@ version = "1.1.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9b10589d1a5e400d61f9f38f12f884cfd080ff345de8f17efda36fe0e4a02aa8"
|
||||
|
||||
[[package]]
|
||||
name = "darling"
|
||||
version = "0.20.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
|
||||
dependencies = [
|
||||
"darling_core",
|
||||
"darling_macro",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "darling_core"
|
||||
version = "0.20.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
|
||||
dependencies = [
|
||||
"fnv",
|
||||
"ident_case",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"strsim",
|
||||
"syn 2.0.114",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "darling_macro"
|
||||
version = "0.20.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
|
||||
dependencies = [
|
||||
"darling_core",
|
||||
"quote",
|
||||
"syn 2.0.114",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "dashmap"
|
||||
version = "5.5.3"
|
||||
@@ -823,6 +867,18 @@ version = "2.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea"
|
||||
|
||||
[[package]]
|
||||
name = "default-struct-builder"
|
||||
version = "0.5.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e0df63c21a4383f94bd5388564829423f35c316aed85dc4f8427aded372c7c0d"
|
||||
dependencies = [
|
||||
"darling",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.114",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "der"
|
||||
version = "0.4.5"
|
||||
@@ -1144,7 +1200,9 @@ dependencies = [
|
||||
name = "frontend"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"base64 0.22.1",
|
||||
"chrono",
|
||||
"codee",
|
||||
"console_error_panic_hook",
|
||||
"console_log",
|
||||
"futures",
|
||||
@@ -1152,12 +1210,15 @@ dependencies = [
|
||||
"gloo-timers",
|
||||
"js-sys",
|
||||
"leptos",
|
||||
"leptos-use",
|
||||
"leptos_router",
|
||||
"log",
|
||||
"serde",
|
||||
"serde-wasm-bindgen",
|
||||
"serde_json",
|
||||
"shared",
|
||||
"tailwind_fuse",
|
||||
"thiserror 2.0.18",
|
||||
"uuid",
|
||||
"wasm-bindgen",
|
||||
"wasm-bindgen-futures",
|
||||
@@ -1819,6 +1880,12 @@ dependencies = [
|
||||
"zerovec",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ident_case"
|
||||
version = "1.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
|
||||
|
||||
[[package]]
|
||||
name = "idna"
|
||||
version = "1.1.0"
|
||||
@@ -1986,6 +2053,30 @@ dependencies = [
|
||||
"web-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "leptos-use"
|
||||
version = "0.13.13"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "789bf9f4337e6ebd8f1b407e3f762fdc538d48dc145f9d1dce2338014b38f4dd"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"chrono",
|
||||
"codee",
|
||||
"cookie",
|
||||
"default-struct-builder",
|
||||
"futures-util",
|
||||
"gloo-timers",
|
||||
"js-sys",
|
||||
"lazy_static",
|
||||
"leptos",
|
||||
"paste",
|
||||
"thiserror 1.0.69",
|
||||
"unic-langid",
|
||||
"wasm-bindgen",
|
||||
"wasm-bindgen-futures",
|
||||
"web-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "leptos_config"
|
||||
version = "0.6.15"
|
||||
@@ -3934,6 +4025,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
|
||||
dependencies = [
|
||||
"displaydoc",
|
||||
"serde_core",
|
||||
"zerovec",
|
||||
]
|
||||
|
||||
@@ -4298,6 +4390,24 @@ version = "1.19.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
|
||||
|
||||
[[package]]
|
||||
name = "unic-langid"
|
||||
version = "0.9.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a28ba52c9b05311f4f6e62d5d9d46f094bd6e84cb8df7b3ef952748d752a7d05"
|
||||
dependencies = [
|
||||
"unic-langid-impl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "unic-langid-impl"
|
||||
version = "0.9.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dce1bf08044d4b7a94028c93786f8566047edc11110595914de93362559bc658"
|
||||
dependencies = [
|
||||
"tinystr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "unicase"
|
||||
version = "2.9.0"
|
||||
@@ -5055,6 +5165,7 @@ version = "0.11.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
|
||||
dependencies = [
|
||||
"serde",
|
||||
"yoke",
|
||||
"zerofrom",
|
||||
"zerovec-derive",
|
||||
|
||||
10
Cargo.toml
10
Cargo.toml
@@ -2,13 +2,19 @@
|
||||
members = ["backend", "frontend", "shared"]
|
||||
resolver = "2"
|
||||
|
||||
# Optimize for size (aggressive)
|
||||
[profile.release]
|
||||
# En küçük binary boyutu
|
||||
opt-level = "z"
|
||||
lto = true
|
||||
# En derin kod temizliği (dead code elimination)
|
||||
lto = "fat"
|
||||
# En iyi optimizasyon için tek birim derleme
|
||||
codegen-units = 1
|
||||
# Hata izleme kodlarını atarak yer kazan
|
||||
panic = "abort"
|
||||
# Sembolleri ve hata ayıklama bilgilerini kesin sil
|
||||
strip = true
|
||||
# Artık (incremental) build'i kapat ki optimizasyon tam olsun
|
||||
incremental = false
|
||||
|
||||
[patch.crates-io]
|
||||
coarsetime = { path = "third_party/coarsetime" }
|
||||
@@ -4,8 +4,9 @@ version = "0.1.0"
|
||||
edition = "2021"
|
||||
|
||||
[features]
|
||||
default = ["push-notifications"]
|
||||
default = ["push-notifications", "swagger"]
|
||||
push-notifications = ["web-push", "openssl"]
|
||||
swagger = ["utoipa-swagger-ui"]
|
||||
|
||||
[dependencies]
|
||||
axum = { version = "0.8", features = ["macros", "ws"] }
|
||||
@@ -29,7 +30,7 @@ shared = { path = "../shared" }
|
||||
thiserror = "2.0.18"
|
||||
dotenvy = "0.15.7"
|
||||
utoipa = { version = "5.4.0", features = ["axum_extras"] }
|
||||
utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] }
|
||||
utoipa-swagger-ui = { version = "9.0.2", features = ["axum"], optional = true }
|
||||
web-push = { version = "0.10", default-features = false, features = ["hyper-client"], optional = true }
|
||||
base64 = "0.22"
|
||||
openssl = { version = "0.10", features = ["vendored"], optional = true }
|
||||
|
||||
@@ -11,12 +11,10 @@ use axum::{
|
||||
BoxError,
|
||||
};
|
||||
use rust_embed::RustEmbed;
|
||||
use serde::Deserialize;
|
||||
use shared::{
|
||||
GlobalLimitRequest, SetFilePriorityRequest, SetLabelRequest, TorrentActionRequest, TorrentFile,
|
||||
TorrentPeer, TorrentTracker,
|
||||
AddTorrentRequest, GlobalLimitRequest, SetFilePriorityRequest, SetLabelRequest, TorrentActionRequest,
|
||||
TorrentFile, TorrentPeer, TorrentTracker,
|
||||
};
|
||||
use utoipa::ToSchema;
|
||||
|
||||
pub mod auth;
|
||||
pub mod setup;
|
||||
@@ -25,13 +23,6 @@ pub mod setup;
|
||||
#[folder = "../frontend/dist"]
|
||||
pub struct Asset;
|
||||
|
||||
#[derive(Deserialize, ToSchema)]
|
||||
pub struct AddTorrentRequest {
|
||||
/// Magnet link or Torrent file URL
|
||||
#[schema(example = "magnet:?xt=urn:btih:...")]
|
||||
uri: String,
|
||||
}
|
||||
|
||||
pub async fn static_handler(uri: Uri) -> impl IntoResponse {
|
||||
let mut path = uri.path().trim_start_matches('/').to_string();
|
||||
|
||||
|
||||
@@ -32,7 +32,9 @@ use tower_http::{
|
||||
cors::CorsLayer,
|
||||
trace::TraceLayer,
|
||||
};
|
||||
#[cfg(feature = "swagger")]
|
||||
use utoipa::OpenApi;
|
||||
#[cfg(feature = "swagger")]
|
||||
use utoipa_swagger_ui::SwaggerUi;
|
||||
|
||||
#[derive(Clone)]
|
||||
@@ -98,6 +100,7 @@ struct Args {
|
||||
reset_password: Option<String>,
|
||||
}
|
||||
|
||||
#[cfg(feature = "swagger")]
|
||||
#[cfg(feature = "push-notifications")]
|
||||
#[derive(OpenApi)]
|
||||
#[openapi(
|
||||
@@ -122,7 +125,7 @@ struct Args {
|
||||
),
|
||||
components(
|
||||
schemas(
|
||||
handlers::AddTorrentRequest,
|
||||
shared::AddTorrentRequest,
|
||||
shared::TorrentActionRequest,
|
||||
shared::Torrent,
|
||||
shared::TorrentStatus,
|
||||
@@ -146,6 +149,7 @@ struct Args {
|
||||
)]
|
||||
struct ApiDoc;
|
||||
|
||||
#[cfg(feature = "swagger")]
|
||||
#[cfg(not(feature = "push-notifications"))]
|
||||
#[derive(OpenApi)]
|
||||
#[openapi(
|
||||
@@ -168,7 +172,7 @@ struct ApiDoc;
|
||||
),
|
||||
components(
|
||||
schemas(
|
||||
handlers::AddTorrentRequest,
|
||||
shared::AddTorrentRequest,
|
||||
shared::TorrentActionRequest,
|
||||
shared::Torrent,
|
||||
shared::TorrentStatus,
|
||||
@@ -462,9 +466,13 @@ async fn main() {
|
||||
}
|
||||
});
|
||||
|
||||
let app = Router::new()
|
||||
.merge(SwaggerUi::new("/swagger-ui").url("/api-docs/openapi.json", ApiDoc::openapi()))
|
||||
let app = Router::new();
|
||||
|
||||
#[cfg(feature = "swagger")]
|
||||
let app = app.merge(SwaggerUi::new("/swagger-ui").url("/api-docs/openapi.json", ApiDoc::openapi()));
|
||||
|
||||
// Setup & Auth Routes
|
||||
let app = app
|
||||
.route("/api/setup/status", get(handlers::setup::get_setup_status_handler))
|
||||
.route("/api/setup", post(handlers::setup::setup_handler))
|
||||
.route(
|
||||
|
||||
@@ -22,33 +22,12 @@ wasm-bindgen-futures = "0.4"
|
||||
uuid = { version = "1", features = ["v4", "js"] }
|
||||
futures = "0.3"
|
||||
chrono = { version = "0.4", features = ["serde", "wasm-bindgen"] }
|
||||
web-sys = { version = "0.3", features = [
|
||||
"HtmlDivElement",
|
||||
"HtmlUListElement",
|
||||
"HtmlLiElement",
|
||||
"HtmlAnchorElement",
|
||||
"MouseEvent",
|
||||
"Event",
|
||||
"Window",
|
||||
"Document",
|
||||
"Element",
|
||||
"DomTokenList",
|
||||
"CssStyleDeclaration",
|
||||
"Storage",
|
||||
"TouchEvent",
|
||||
"TouchList",
|
||||
"Touch",
|
||||
"Navigator",
|
||||
"Notification",
|
||||
"NotificationOptions",
|
||||
"NotificationPermission",
|
||||
"ServiceWorkerContainer",
|
||||
"ServiceWorkerRegistration",
|
||||
"PushManager",
|
||||
"PushSubscription",
|
||||
"PushSubscriptionOptions",
|
||||
"PushSubscriptionOptionsInit"
|
||||
] }
|
||||
web-sys = { version = "0.3", features = ["HtmlDivElement", "HtmlUListElement", "HtmlLiElement", "HtmlAnchorElement", "MouseEvent", "Event", "Window", "Document", "Element", "DomTokenList", "CssStyleDeclaration", "Storage", "TouchEvent", "TouchList", "Touch", "Navigator", "Notification", "NotificationOptions", "NotificationPermission", "ServiceWorkerContainer", "ServiceWorkerRegistration", "PushManager", "PushSubscription", "PushSubscriptionOptions", "PushSubscriptionOptionsInit", "HtmlDetailsElement"] }
|
||||
shared = { path = "../shared" }
|
||||
tailwind_fuse = "0.3.2"
|
||||
js-sys = "0.3.85"
|
||||
base64 = "0.22.1"
|
||||
serde-wasm-bindgen = "0.6.5"
|
||||
leptos-use = "0.13"
|
||||
codee = "0.2"
|
||||
thiserror = "2.0"
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<meta charset="utf-8" />
|
||||
<meta
|
||||
name="viewport"
|
||||
content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover"
|
||||
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover"
|
||||
/>
|
||||
<title>VibeTorrent</title>
|
||||
|
||||
@@ -81,7 +81,7 @@
|
||||
</script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<body style="cursor: pointer;">
|
||||
<div
|
||||
id="app-loading"
|
||||
style="
|
||||
@@ -142,6 +142,19 @@
|
||||
body.app-loaded #app-loading {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
/* iOS Safari Click Fixes */
|
||||
body {
|
||||
cursor: pointer;
|
||||
-webkit-tap-highlight-color: transparent;
|
||||
}
|
||||
|
||||
summary {
|
||||
list-style: none;
|
||||
}
|
||||
summary::-webkit-details-marker {
|
||||
display: none;
|
||||
}
|
||||
</style>
|
||||
|
||||
<script>
|
||||
@@ -174,6 +187,17 @@
|
||||
|
||||
<!-- Service Worker Registration & PWA Setup -->
|
||||
<script>
|
||||
// Global Dropdown Closer for iOS/Mobile
|
||||
document.addEventListener('click', function(event) {
|
||||
const details = document.querySelectorAll('details[open]');
|
||||
details.forEach(detail => {
|
||||
// Eğer tıklanan yer bu details'in içinde değilse kapat
|
||||
if (!detail.contains(event.target)) {
|
||||
detail.removeAttribute('open');
|
||||
}
|
||||
});
|
||||
}, true); // Use capture phase for better mobile support
|
||||
|
||||
if ("serviceWorker" in navigator) {
|
||||
window.addEventListener("load", () => {
|
||||
navigator.serviceWorker
|
||||
|
||||
243
frontend/src/api/mod.rs
Normal file
243
frontend/src/api/mod.rs
Normal file
@@ -0,0 +1,243 @@
|
||||
use gloo_net::http::Request;
|
||||
use shared::{AddTorrentRequest, TorrentActionRequest};
|
||||
use thiserror::Error;
|
||||
|
||||
#[derive(Debug, Error)]
|
||||
pub enum ApiError {
|
||||
#[error("Network error")]
|
||||
Network,
|
||||
#[error("Server error: {status}")]
|
||||
Server { status: u16 },
|
||||
#[error("Login failed")]
|
||||
LoginFailed,
|
||||
#[error("Unauthorized")]
|
||||
Unauthorized,
|
||||
#[error("Too many requests")]
|
||||
RateLimited,
|
||||
}
|
||||
|
||||
fn base_url() -> String {
|
||||
"/api".to_string()
|
||||
}
|
||||
|
||||
pub mod auth {
|
||||
use super::*;
|
||||
|
||||
#[derive(serde::Serialize)]
|
||||
pub struct LoginRequest {
|
||||
pub username: String,
|
||||
pub password: String,
|
||||
pub remember_me: bool,
|
||||
}
|
||||
|
||||
pub async fn login(
|
||||
username: &str,
|
||||
password: &str,
|
||||
remember_me: bool,
|
||||
) -> Result<(), ApiError> {
|
||||
let req = LoginRequest {
|
||||
username: username.to_string(),
|
||||
password: password.to_string(),
|
||||
remember_me,
|
||||
};
|
||||
let resp = Request::post(&format!("{}/auth/login", base_url()))
|
||||
.json(&req)
|
||||
.map_err(|_| ApiError::Network)?
|
||||
.send()
|
||||
.await
|
||||
.map_err(|_| ApiError::Network)?;
|
||||
|
||||
if resp.ok() {
|
||||
Ok(())
|
||||
} else if resp.status() == 429 {
|
||||
Err(ApiError::RateLimited)
|
||||
} else {
|
||||
Err(ApiError::LoginFailed)
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn logout() -> Result<(), ApiError> {
|
||||
Request::post(&format!("{}/auth/logout", base_url()))
|
||||
.send()
|
||||
.await
|
||||
.map_err(|_| ApiError::Network)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn check_auth() -> Result<bool, ApiError> {
|
||||
let resp = Request::get(&format!("{}/auth/check", base_url()))
|
||||
.send()
|
||||
.await
|
||||
.map_err(|_| ApiError::Network)?;
|
||||
Ok(resp.ok())
|
||||
}
|
||||
|
||||
#[derive(serde::Deserialize)]
|
||||
pub struct UserResponse {
|
||||
pub username: String,
|
||||
}
|
||||
|
||||
pub async fn get_user() -> Result<UserResponse, ApiError> {
|
||||
let resp = Request::get(&format!("{}/auth/check", base_url()))
|
||||
.send()
|
||||
.await
|
||||
.map_err(|_| ApiError::Network)?;
|
||||
let user = resp.json().await.map_err(|_| ApiError::Network)?;
|
||||
Ok(user)
|
||||
}
|
||||
}
|
||||
|
||||
pub mod setup {
|
||||
use super::*;
|
||||
|
||||
#[derive(serde::Serialize)]
|
||||
pub struct SetupRequest {
|
||||
pub username: String,
|
||||
pub password: String,
|
||||
}
|
||||
|
||||
#[derive(serde::Deserialize)]
|
||||
pub struct SetupStatusResponse {
|
||||
pub completed: bool,
|
||||
}
|
||||
|
||||
pub async fn get_status() -> Result<SetupStatusResponse, ApiError> {
|
||||
let resp = Request::get(&format!("{}/setup/status", base_url()))
|
||||
.send()
|
||||
.await
|
||||
.map_err(|_| ApiError::Network)?;
|
||||
let status = resp.json().await.map_err(|_| ApiError::Network)?;
|
||||
Ok(status)
|
||||
}
|
||||
|
||||
pub async fn setup(username: &str, password: &str) -> Result<(), ApiError> {
|
||||
let req = SetupRequest {
|
||||
username: username.to_string(),
|
||||
password: password.to_string(),
|
||||
};
|
||||
Request::post(&format!("{}/setup", base_url()))
|
||||
.json(&req)
|
||||
.map_err(|_| ApiError::Network)?
|
||||
.send()
|
||||
.await
|
||||
.map_err(|_| ApiError::Network)?;
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
pub mod settings {
|
||||
use super::*;
|
||||
use shared::GlobalLimitRequest;
|
||||
|
||||
pub async fn set_global_limits(req: &GlobalLimitRequest) -> Result<(), ApiError> {
|
||||
Request::post(&format!("{}/settings/global-limits", base_url()))
|
||||
.json(req)
|
||||
.map_err(|_| ApiError::Network)?
|
||||
.send()
|
||||
.await
|
||||
.map_err(|_| ApiError::Network)?;
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
pub mod push {
|
||||
use super::*;
|
||||
use crate::store::PushSubscriptionData;
|
||||
|
||||
pub async fn get_public_key() -> Result<String, ApiError> {
|
||||
let resp = Request::get(&format!("{}/push/public-key", base_url()))
|
||||
.send()
|
||||
.await
|
||||
.map_err(|_| ApiError::Network)?;
|
||||
let key = resp.text().await.map_err(|_| ApiError::Network)?;
|
||||
Ok(key)
|
||||
}
|
||||
|
||||
pub async fn subscribe(req: &PushSubscriptionData) -> Result<(), ApiError> {
|
||||
Request::post(&format!("{}/push/subscribe", base_url()))
|
||||
.json(req)
|
||||
.map_err(|_| ApiError::Network)?
|
||||
.send()
|
||||
.await
|
||||
.map_err(|_| ApiError::Network)?;
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
pub mod torrent {
|
||||
use super::*;
|
||||
|
||||
pub async fn add(uri: &str) -> Result<(), ApiError> {
|
||||
let req = AddTorrentRequest {
|
||||
uri: uri.to_string(),
|
||||
};
|
||||
Request::post(&format!("{}/torrents/add", base_url()))
|
||||
.json(&req)
|
||||
.map_err(|_| ApiError::Network)?
|
||||
.send()
|
||||
.await
|
||||
.map_err(|_| ApiError::Network)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn action(hash: &str, action: &str) -> Result<(), ApiError> {
|
||||
let req = TorrentActionRequest {
|
||||
hash: hash.to_string(),
|
||||
action: action.to_string(),
|
||||
};
|
||||
Request::post(&format!("{}/torrents/action", base_url()))
|
||||
.json(&req)
|
||||
.map_err(|_| ApiError::Network)?
|
||||
.send()
|
||||
.await
|
||||
.map_err(|_| ApiError::Network)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn delete(hash: &str) -> Result<(), ApiError> {
|
||||
action(hash, "delete").await
|
||||
}
|
||||
|
||||
pub async fn delete_with_data(hash: &str) -> Result<(), ApiError> {
|
||||
action(hash, "delete_with_data").await
|
||||
}
|
||||
|
||||
pub async fn start(hash: &str) -> Result<(), ApiError> {
|
||||
action(hash, "start").await
|
||||
}
|
||||
|
||||
pub async fn stop(hash: &str) -> Result<(), ApiError> {
|
||||
action(hash, "stop").await
|
||||
}
|
||||
|
||||
pub async fn set_label(hash: &str, label: &str) -> Result<(), ApiError> {
|
||||
use shared::SetLabelRequest;
|
||||
let req = SetLabelRequest {
|
||||
hash: hash.to_string(),
|
||||
label: label.to_string(),
|
||||
};
|
||||
Request::post(&format!("{}/torrents/set_label", base_url()))
|
||||
.json(&req)
|
||||
.map_err(|_| ApiError::Network)?
|
||||
.send()
|
||||
.await
|
||||
.map_err(|_| ApiError::Network)?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn set_priority(hash: &str, file_index: u32, priority: u8) -> Result<(), ApiError> {
|
||||
use shared::SetFilePriorityRequest;
|
||||
let req = SetFilePriorityRequest {
|
||||
hash: hash.to_string(),
|
||||
file_index,
|
||||
priority,
|
||||
};
|
||||
Request::post(&format!("{}/torrents/set_priority", base_url()))
|
||||
.json(&req)
|
||||
.map_err(|_| ApiError::Network)?
|
||||
.send()
|
||||
.await
|
||||
.map_err(|_| ApiError::Network)?;
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
@@ -3,40 +3,24 @@ use crate::components::toast::ToastContainer;
|
||||
use crate::components::torrent::table::TorrentTable;
|
||||
use crate::components::auth::login::Login;
|
||||
use crate::components::auth::setup::Setup;
|
||||
use crate::api;
|
||||
use leptos::*;
|
||||
use leptos_router::*;
|
||||
use serde::Deserialize;
|
||||
|
||||
#[derive(Deserialize)]
|
||||
struct SetupStatus {
|
||||
completed: bool,
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
struct UserResponse {
|
||||
username: String,
|
||||
}
|
||||
|
||||
#[component]
|
||||
pub fn App() -> impl IntoView {
|
||||
crate::store::provide_torrent_store();
|
||||
|
||||
// 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 |_| {
|
||||
spawn_local(async move {
|
||||
logging::log!("App initialization started...");
|
||||
|
||||
// 1. Check Setup Status
|
||||
let setup_res = gloo_net::http::Request::get("/api/setup/status").send().await;
|
||||
let setup_res = api::setup::get_status().await;
|
||||
|
||||
match setup_res {
|
||||
Ok(resp) => {
|
||||
if resp.ok() {
|
||||
match resp.json::<SetupStatus>().await {
|
||||
Ok(status) => {
|
||||
if !status.completed {
|
||||
logging::log!("Setup not completed, redirecting to /setup");
|
||||
@@ -46,23 +30,16 @@ pub fn App() -> impl IntoView {
|
||||
return;
|
||||
}
|
||||
}
|
||||
Err(e) => logging::error!("Failed to parse setup status: {}", e),
|
||||
}
|
||||
}
|
||||
}
|
||||
Err(e) => logging::error!("Network error checking setup status: {}", e),
|
||||
Err(e) => logging::error!("Failed to get setup status: {:?}", e),
|
||||
}
|
||||
|
||||
// 2. Check Auth Status
|
||||
let auth_res = gloo_net::http::Request::get("/api/auth/check").send().await;
|
||||
let auth_res = api::auth::check_auth().await;
|
||||
|
||||
match auth_res {
|
||||
Ok(resp) => {
|
||||
if resp.status() == 200 {
|
||||
Ok(true) => {
|
||||
logging::log!("Authenticated!");
|
||||
|
||||
// Parse user info
|
||||
if let Ok(user_info) = resp.json::<UserResponse>().await {
|
||||
if let Ok(user_info) = api::auth::get_user().await {
|
||||
if let Some(store) = use_context::<crate::store::TorrentStore>() {
|
||||
store.user.set(Some(user_info.username));
|
||||
}
|
||||
@@ -70,33 +47,36 @@ pub fn App() -> impl IntoView {
|
||||
|
||||
set_is_authenticated.set(true);
|
||||
|
||||
// If user is already authenticated but on login/setup page, redirect to home
|
||||
let pathname = window().location().pathname().unwrap_or_default();
|
||||
if pathname == "/login" || pathname == "/setup" {
|
||||
logging::log!("Already authenticated, redirecting to home");
|
||||
let navigate = use_navigate();
|
||||
navigate("/", Default::default());
|
||||
}
|
||||
} else {
|
||||
logging::log!("Not authenticated, redirecting to /login");
|
||||
let navigate = use_navigate();
|
||||
}
|
||||
Ok(false) => {
|
||||
logging::log!("Not authenticated");
|
||||
|
||||
let pathname = window().location().pathname().unwrap_or_default();
|
||||
if pathname != "/login" && pathname != "/setup" {
|
||||
let navigate = use_navigate();
|
||||
navigate("/login", Default::default());
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
logging::error!("Auth check failed: {:?}", e);
|
||||
let navigate = use_navigate();
|
||||
navigate("/login", Default::default());
|
||||
}
|
||||
Err(e) => logging::error!("Network error checking auth status: {}", e),
|
||||
}
|
||||
|
||||
set_is_loading.set(false);
|
||||
});
|
||||
});
|
||||
// Initialize push notifications (Only if authenticated)
|
||||
|
||||
create_effect(move |_| {
|
||||
if is_authenticated.get() {
|
||||
spawn_local(async {
|
||||
// ... (Push notification logic kept same, shortened for brevity in this replace)
|
||||
// Wait a bit for service worker to be ready
|
||||
gloo_timers::future::TimeoutFuture::new(2000).await;
|
||||
|
||||
if crate::utils::platform::supports_push_notifications() && !crate::utils::platform::is_safari() {
|
||||
|
||||
@@ -1,12 +1,5 @@
|
||||
use leptos::*;
|
||||
use serde::Serialize;
|
||||
|
||||
#[derive(Serialize)]
|
||||
struct LoginRequest {
|
||||
username: String,
|
||||
password: String,
|
||||
remember_me: bool,
|
||||
}
|
||||
use crate::api;
|
||||
|
||||
#[component]
|
||||
pub fn Login() -> impl IntoView {
|
||||
@@ -23,35 +16,31 @@ pub fn Login() -> impl IntoView {
|
||||
|
||||
logging::log!("Attempting login for user: {}", username.get());
|
||||
|
||||
let username = username.get();
|
||||
let password = password.get();
|
||||
let remember_me = remember_me.get();
|
||||
|
||||
spawn_local(async move {
|
||||
let req = LoginRequest {
|
||||
username: username.get(),
|
||||
password: password.get(),
|
||||
remember_me: remember_me.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() {
|
||||
match api::auth::login(&username, &password, remember_me).await {
|
||||
Ok(_) => {
|
||||
logging::log!("Login successful, redirecting...");
|
||||
// Force a full reload to re-run auth checks in App.rs
|
||||
let _ = window().location().set_href("/");
|
||||
} else if resp.status() == 429 {
|
||||
set_error.set(Some("Çok fazla başarısız deneme yaptınız. Lütfen bir süre bekleyip tekrar deneyin.".to_string()));
|
||||
} 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()));
|
||||
logging::error!("Login failed: {:?}", e);
|
||||
let msg = match e {
|
||||
crate::api::ApiError::RateLimited => {
|
||||
"Çok fazla başarısız deneme yaptınız. Lütfen bir süre bekleyip tekrar deneyin.".to_string()
|
||||
}
|
||||
crate::api::ApiError::Unauthorized | crate::api::ApiError::LoginFailed => {
|
||||
"Kullanıcı adı veya şifre hatalı".to_string()
|
||||
}
|
||||
crate::api::ApiError::Network => {
|
||||
"Bağlantı hatası".to_string()
|
||||
}
|
||||
_ => "Bir hata oluştu".to_string()
|
||||
};
|
||||
set_error.set(Some(msg));
|
||||
}
|
||||
}
|
||||
set_loading.set(false);
|
||||
|
||||
@@ -1,11 +1,5 @@
|
||||
use leptos::*;
|
||||
use serde::Serialize;
|
||||
|
||||
#[derive(Serialize)]
|
||||
struct SetupRequest {
|
||||
username: String,
|
||||
password: String,
|
||||
}
|
||||
use crate::api;
|
||||
|
||||
#[component]
|
||||
pub fn Setup() -> impl IntoView {
|
||||
@@ -35,29 +29,18 @@ pub fn Setup() -> impl IntoView {
|
||||
return;
|
||||
}
|
||||
|
||||
let username = username.get();
|
||||
let password = pass;
|
||||
|
||||
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 home after setup (auto-login handled by backend)
|
||||
// Full reload to ensure auth state is refreshed
|
||||
match api::setup::setup(&username, &password).await {
|
||||
Ok(_) => {
|
||||
logging::log!("Setup completed successfully, redirecting...");
|
||||
let _ = window().location().set_href("/");
|
||||
} 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()));
|
||||
Err(e) => {
|
||||
logging::error!("Setup failed: {:?}", e);
|
||||
set_error.set(Some("Kurulum başarısız oldu".to_string()));
|
||||
}
|
||||
}
|
||||
set_loading.set(false);
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
use leptos::*;
|
||||
use leptos_use::on_click_outside;
|
||||
|
||||
#[component]
|
||||
pub fn ContextMenu(
|
||||
@@ -8,6 +9,10 @@ pub fn ContextMenu(
|
||||
on_close: Callback<()>,
|
||||
on_action: Callback<(String, String)>, // (Action, Hash)
|
||||
) -> impl IntoView {
|
||||
let container_ref = create_node_ref::<html::Div>();
|
||||
|
||||
let _ = on_click_outside(container_ref, move |_| on_close.call(()));
|
||||
|
||||
let handle_action = move |action: &str| {
|
||||
let hash = torrent_hash.clone();
|
||||
let action_str = action.to_string();
|
||||
@@ -22,16 +27,8 @@ pub fn ContextMenu(
|
||||
}
|
||||
|
||||
view! {
|
||||
// Backdrop to catch clicks outside
|
||||
<div
|
||||
class="fixed inset-0 z-[99] cursor-default"
|
||||
role="button"
|
||||
tabindex="-1"
|
||||
on:click=move |_| on_close.call(())
|
||||
on:contextmenu=move |e| e.prevent_default()
|
||||
></div>
|
||||
|
||||
<div
|
||||
node_ref=container_ref
|
||||
class="fixed z-[100] min-w-[200px] animate-in fade-in zoom-in-95 duration-100"
|
||||
style=format!("left: {}px; top: {}px", position.0, position.1)
|
||||
on:contextmenu=move |e| e.prevent_default()
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
use leptos::wasm_bindgen::JsCast;
|
||||
use leptos::*;
|
||||
use crate::api;
|
||||
|
||||
#[component]
|
||||
pub fn Sidebar() -> impl IntoView {
|
||||
@@ -76,13 +77,9 @@ pub fn Sidebar() -> impl IntoView {
|
||||
|
||||
let handle_logout = move |_| {
|
||||
spawn_local(async move {
|
||||
let client = gloo_net::http::Request::post("/api/auth/logout");
|
||||
if let Ok(resp) = client.send().await {
|
||||
if resp.ok() {
|
||||
// Force full reload to clear state
|
||||
if api::auth::logout().await.is_ok() {
|
||||
let _ = window().location().set_href("/login");
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
use leptos::*;
|
||||
use leptos_use::storage::use_local_storage;
|
||||
use codee::string::FromToStringCodec;
|
||||
use shared::GlobalLimitRequest;
|
||||
use crate::api;
|
||||
|
||||
fn format_bytes(bytes: i64) -> String {
|
||||
const UNITS: [&str; 6] = ["B", "KB", "MB", "GB", "TB", "PB"];
|
||||
@@ -26,34 +29,19 @@ pub fn StatusBar() -> impl IntoView {
|
||||
let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
|
||||
let stats = store.global_stats;
|
||||
|
||||
let initial_theme = if let Some(win) = web_sys::window() {
|
||||
if let Some(doc) = win.document() {
|
||||
doc.document_element()
|
||||
.and_then(|el| el.get_attribute("data-theme"))
|
||||
.unwrap_or_else(|| "dark".to_string())
|
||||
} else {
|
||||
"dark".to_string()
|
||||
// Use leptos-use for reactive localStorage management
|
||||
let (current_theme, set_current_theme, _) = use_local_storage::<String, FromToStringCodec>("vibetorrent_theme");
|
||||
|
||||
// Initialize with default if empty
|
||||
if current_theme.get_untracked().is_empty() {
|
||||
set_current_theme.set("dark".to_string());
|
||||
}
|
||||
} else {
|
||||
"dark".to_string()
|
||||
};
|
||||
|
||||
let (current_theme, set_current_theme) = create_signal(initial_theme);
|
||||
|
||||
// Automatically sync theme to document attribute
|
||||
create_effect(move |_| {
|
||||
if let Some(win) = web_sys::window() {
|
||||
if let Some(storage) = win.local_storage().ok().flatten() {
|
||||
if let Ok(Some(stored_theme)) = storage.get_item("vibetorrent_theme") {
|
||||
let theme = stored_theme.to_lowercase();
|
||||
set_current_theme.set(theme.clone());
|
||||
if let Some(doc) = win.document() {
|
||||
let _ = doc
|
||||
.document_element()
|
||||
.unwrap()
|
||||
.set_attribute("data-theme", &theme);
|
||||
}
|
||||
}
|
||||
}
|
||||
let theme = current_theme.get().to_lowercase();
|
||||
if let Some(doc) = document().document_element() {
|
||||
let _ = doc.set_attribute("data-theme", &theme);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -73,8 +61,7 @@ pub fn StatusBar() -> impl IntoView {
|
||||
let limit_type = limit_type.to_string();
|
||||
logging::log!("Setting {} limit to {}", limit_type, val);
|
||||
|
||||
spawn_local(async move {
|
||||
let req_body = if limit_type == "down" {
|
||||
let req = if limit_type == "down" {
|
||||
GlobalLimitRequest {
|
||||
max_download_rate: Some(val),
|
||||
max_upload_rate: None,
|
||||
@@ -86,68 +73,33 @@ pub fn StatusBar() -> impl IntoView {
|
||||
}
|
||||
};
|
||||
|
||||
let client =
|
||||
gloo_net::http::Request::post("/api/settings/global-limits").json(&req_body);
|
||||
|
||||
match client {
|
||||
Ok(req) => match req.send().await {
|
||||
Ok(resp) => {
|
||||
if !resp.ok() {
|
||||
logging::error!(
|
||||
"Failed to set limit: {} {}",
|
||||
resp.status(),
|
||||
resp.status_text()
|
||||
);
|
||||
spawn_local(async move {
|
||||
if let Err(e) = api::settings::set_global_limits(&req).await {
|
||||
logging::error!("Failed to set limit: {:?}", e);
|
||||
} else {
|
||||
logging::log!("Limit set successfully");
|
||||
}
|
||||
}
|
||||
Err(e) => logging::error!("Network error setting limit: {}", e),
|
||||
},
|
||||
Err(e) => logging::error!("Failed to create request: {}", e),
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
// Signal-based dropdown state: 0=none, 1=download, 2=upload, 3=theme
|
||||
let (active_dropdown, set_active_dropdown) = create_signal(0u8);
|
||||
// Refs for click outside detection (Handled globally via JS in index.html for better iOS support)
|
||||
let down_details_ref = create_node_ref::<html::Details>();
|
||||
let up_details_ref = create_node_ref::<html::Details>();
|
||||
let theme_details_ref = create_node_ref::<html::Details>();
|
||||
|
||||
// Toggle a specific dropdown
|
||||
let toggle = move |id: u8| {
|
||||
let current = active_dropdown.get_untracked();
|
||||
if current == id {
|
||||
set_active_dropdown.set(0);
|
||||
} else {
|
||||
set_active_dropdown.set(id);
|
||||
// Helper to close a details element
|
||||
let close_details = |node_ref: NodeRef<html::Details>| {
|
||||
if let Some(el) = node_ref.get_untracked() {
|
||||
el.set_open(false);
|
||||
}
|
||||
};
|
||||
|
||||
// Close all dropdowns
|
||||
let close_all = move || {
|
||||
set_active_dropdown.set(0);
|
||||
};
|
||||
|
||||
view! {
|
||||
// Transparent overlay to close dropdowns when clicking outside
|
||||
<Show when=move || active_dropdown.get() != 0>
|
||||
<div
|
||||
class="fixed inset-0 z-[98] cursor-default"
|
||||
on:pointerdown=move |_| close_all()
|
||||
></div>
|
||||
</Show>
|
||||
|
||||
<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]">
|
||||
<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] cursor-pointer">
|
||||
|
||||
// --- DOWNLOAD SPEED DROPDOWN ---
|
||||
<div class="relative">
|
||||
<div
|
||||
class="flex items-center gap-2 cursor-pointer hover:text-primary transition-colors select-none"
|
||||
title="Global Download Speed - Click to Set Limit"
|
||||
on:pointerdown=move |e| {
|
||||
e.stop_propagation();
|
||||
toggle(1);
|
||||
}
|
||||
>
|
||||
<details class="dropdown dropdown-top" node_ref=down_details_ref>
|
||||
<summary class="flex items-center gap-2 cursor-pointer hover:text-primary transition-colors select-none list-none [&::-webkit-details-marker]:hidden outline-none">
|
||||
<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>
|
||||
@@ -157,12 +109,9 @@ pub fn StatusBar() -> impl IntoView {
|
||||
{move || format!("(Limit: {})", format_speed(stats.get().down_limit.unwrap_or(0)))}
|
||||
</span>
|
||||
</Show>
|
||||
</div>
|
||||
</summary>
|
||||
|
||||
<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() == 1 { "display: block" } else { "display: none" }
|
||||
>
|
||||
<ul class="dropdown-content z-[100] menu p-2 shadow bg-base-200 rounded-box w-40 mb-2 border border-base-300">
|
||||
{
|
||||
limits.clone().into_iter().map(|(val, label)| {
|
||||
let is_active = move || {
|
||||
@@ -173,10 +122,9 @@ pub fn StatusBar() -> impl IntoView {
|
||||
<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();
|
||||
on:click=move |_| {
|
||||
set_limit("down", val);
|
||||
close_all();
|
||||
close_details(down_details_ref);
|
||||
}
|
||||
>
|
||||
{label}
|
||||
@@ -189,18 +137,11 @@ pub fn StatusBar() -> impl IntoView {
|
||||
}).collect::<Vec<_>>()
|
||||
}
|
||||
</ul>
|
||||
</div>
|
||||
</details>
|
||||
|
||||
// --- UPLOAD 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);
|
||||
}
|
||||
>
|
||||
<details class="dropdown dropdown-top" node_ref=up_details_ref>
|
||||
<summary class="flex items-center gap-2 cursor-pointer hover:text-primary transition-colors select-none list-none [&::-webkit-details-marker]:hidden outline-none">
|
||||
<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>
|
||||
@@ -210,12 +151,9 @@ pub fn StatusBar() -> impl IntoView {
|
||||
{move || format!("(Limit: {})", format_speed(stats.get().up_limit.unwrap_or(0)))}
|
||||
</span>
|
||||
</Show>
|
||||
</div>
|
||||
</summary>
|
||||
|
||||
<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" }
|
||||
>
|
||||
<ul class="dropdown-content z-[100] menu p-2 shadow bg-base-200 rounded-box w-40 mb-2 border border-base-300">
|
||||
{
|
||||
limits.clone().into_iter().map(|(val, label)| {
|
||||
let is_active = move || {
|
||||
@@ -226,10 +164,9 @@ pub fn StatusBar() -> impl IntoView {
|
||||
<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();
|
||||
on:click=move |_| {
|
||||
set_limit("up", val);
|
||||
close_all();
|
||||
close_details(up_details_ref);
|
||||
}
|
||||
>
|
||||
{label}
|
||||
@@ -242,27 +179,17 @@ pub fn StatusBar() -> impl IntoView {
|
||||
}).collect::<Vec<_>>()
|
||||
}
|
||||
</ul>
|
||||
</div>
|
||||
</details>
|
||||
|
||||
<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);
|
||||
}
|
||||
>
|
||||
<details class="dropdown dropdown-top dropdown-end" node_ref=theme_details_ref>
|
||||
<summary class="btn btn-ghost btn-xs btn-square cursor-pointer outline-none list-none [&::-webkit-details-marker]:hidden">
|
||||
<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>
|
||||
</summary>
|
||||
|
||||
<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" }
|
||||
>
|
||||
<ul class="dropdown-content 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">
|
||||
{
|
||||
let themes = vec![
|
||||
"light", "dark", "dim", "nord", "cupcake", "dracula", "cyberpunk", "emerald", "sunset", "abyss"
|
||||
@@ -272,18 +199,9 @@ pub fn StatusBar() -> impl IntoView {
|
||||
<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();
|
||||
on:click=move |_| {
|
||||
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();
|
||||
close_details(theme_details_ref);
|
||||
}
|
||||
>
|
||||
{theme}
|
||||
@@ -293,7 +211,7 @@ pub fn StatusBar() -> impl IntoView {
|
||||
}).collect::<Vec<_>>()
|
||||
}
|
||||
</ul>
|
||||
</div>
|
||||
</details>
|
||||
<button
|
||||
class="btn btn-ghost btn-xs btn-square"
|
||||
title="Settings & Notification Permissions"
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
use leptos::*;
|
||||
use leptos::html::Dialog;
|
||||
use crate::store::{show_toast_with_signal, TorrentStore};
|
||||
use crate::api;
|
||||
use shared::NotificationLevel;
|
||||
|
||||
|
||||
@@ -17,7 +18,6 @@ pub fn AddTorrentModal(
|
||||
let (is_loading, set_loading) = create_signal(false);
|
||||
let (error_msg, set_error_msg) = create_signal(Option::<String>::None);
|
||||
|
||||
// Effect to open the dialog when the component mounts/renders
|
||||
create_effect(move |_| {
|
||||
if let Some(dialog) = dialog_ref.get() {
|
||||
let _ = dialog.show_modal();
|
||||
@@ -35,18 +35,10 @@ pub fn AddTorrentModal(
|
||||
set_loading.set(true);
|
||||
set_error_msg.set(None);
|
||||
|
||||
let uri_val = uri_val;
|
||||
spawn_local(async move {
|
||||
let req_body = serde_json::json!({
|
||||
"uri": uri_val
|
||||
});
|
||||
|
||||
match gloo_net::http::Request::post("/api/torrents/add")
|
||||
.json(&req_body)
|
||||
{
|
||||
Ok(req) => {
|
||||
match req.send().await {
|
||||
Ok(resp) => {
|
||||
if resp.ok() {
|
||||
match api::torrent::add(&uri_val).await {
|
||||
Ok(_) => {
|
||||
logging::log!("Torrent added successfully");
|
||||
show_toast_with_signal(notifications, NotificationLevel::Success, "Torrent eklendi");
|
||||
set_loading.set(false);
|
||||
@@ -54,27 +46,11 @@ pub fn AddTorrentModal(
|
||||
dialog.close();
|
||||
}
|
||||
on_close.call(());
|
||||
} else {
|
||||
let status = resp.status();
|
||||
let text = resp.text().await.unwrap_or_default();
|
||||
logging::error!("Failed to add torrent: {} - {}", status, text);
|
||||
}
|
||||
Err(e) => {
|
||||
logging::error!("Failed to add torrent: {:?}", e);
|
||||
show_toast_with_signal(notifications, NotificationLevel::Error, "Torrent eklenemedi");
|
||||
set_error_msg.set(Some(format!("Error {}: {}", status, text)));
|
||||
set_loading.set(false);
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
logging::error!("Network error: {}", e);
|
||||
show_toast_with_signal(notifications, NotificationLevel::Error, "Bağlantı hatası");
|
||||
set_error_msg.set(Some(format!("Network Error: {}", e)));
|
||||
set_loading.set(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
logging::error!("Serialization error: {}", e);
|
||||
show_toast_with_signal(notifications, NotificationLevel::Error, "İstek hatası");
|
||||
set_error_msg.set(Some(format!("Request Error: {}", e)));
|
||||
set_error_msg.set(Some(format!("Error: {:?}", e)));
|
||||
set_loading.set(false);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
use leptos::*;
|
||||
use wasm_bindgen::closure::Closure;
|
||||
use wasm_bindgen::JsCast;
|
||||
use leptos_use::{on_click_outside, use_timeout_fn};
|
||||
use crate::store::{get_action_messages, show_toast_with_signal};
|
||||
use crate::api;
|
||||
use shared::NotificationLevel;
|
||||
|
||||
fn format_bytes(bytes: i64) -> String {
|
||||
@@ -165,8 +165,13 @@ pub fn TorrentTable() -> impl IntoView {
|
||||
}
|
||||
};
|
||||
|
||||
// Signal-based sort dropdown for mobile
|
||||
let (sort_open, set_sort_open) = create_signal(false);
|
||||
// Refs for click outside detection
|
||||
let sort_details_ref = create_node_ref::<html::Details>();
|
||||
let _ = on_click_outside(sort_details_ref, move |_| {
|
||||
if let Some(el) = sort_details_ref.get_untracked() {
|
||||
el.set_open(false);
|
||||
}
|
||||
});
|
||||
|
||||
let sort_arrow = move |col: SortColumn| {
|
||||
if sort_col.get() == col {
|
||||
@@ -197,54 +202,33 @@ pub fn TorrentTable() -> impl IntoView {
|
||||
|
||||
let on_action = move |(action, hash): (String, String)| {
|
||||
logging::log!("TorrentTable Action: {} on {}", action, hash);
|
||||
// Note: Don't close menu here - ContextMenu's on_close handles it
|
||||
// Closing here would dispose ContextMenu while still in callback chain
|
||||
|
||||
// Get action messages for toast (Clean Code: DRY)
|
||||
let (success_msg, error_msg) = get_action_messages(&action);
|
||||
let success_msg = success_msg.to_string();
|
||||
let error_msg = error_msg.to_string();
|
||||
|
||||
// Capture notifications signal before async (use_context unavailable in spawn_local)
|
||||
let notifications = store.notifications;
|
||||
|
||||
let hash = hash.clone();
|
||||
let action = action.clone();
|
||||
|
||||
spawn_local(async move {
|
||||
let action_req = if action == "delete_with_data" {
|
||||
"delete_with_data"
|
||||
} else {
|
||||
&action
|
||||
let result = match action.as_str() {
|
||||
"delete" => api::torrent::delete(&hash).await,
|
||||
"delete_with_data" => api::torrent::delete_with_data(&hash).await,
|
||||
"start" => api::torrent::start(&hash).await,
|
||||
"stop" => api::torrent::stop(&hash).await,
|
||||
_ => api::torrent::action(&hash, &action).await,
|
||||
};
|
||||
|
||||
let req_body = shared::TorrentActionRequest {
|
||||
hash: hash.clone(),
|
||||
action: action_req.to_string(),
|
||||
};
|
||||
|
||||
let client = gloo_net::http::Request::post("/api/torrents/action").json(&req_body);
|
||||
|
||||
match client {
|
||||
Ok(req) => match req.send().await {
|
||||
Ok(resp) => {
|
||||
if !resp.ok() {
|
||||
logging::error!(
|
||||
"Failed to execute action: {} {}",
|
||||
resp.status(),
|
||||
resp.status_text()
|
||||
);
|
||||
show_toast_with_signal(notifications, NotificationLevel::Error, error_msg);
|
||||
} else {
|
||||
match result {
|
||||
Ok(_) => {
|
||||
logging::log!("Action {} executed successfully", action);
|
||||
show_toast_with_signal(notifications, NotificationLevel::Success, success_msg);
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
logging::error!("Network error executing action: {}", e);
|
||||
show_toast_with_signal(notifications, NotificationLevel::Error, format!("{}: Bağlantı hatası", error_msg));
|
||||
}
|
||||
},
|
||||
Err(e) => {
|
||||
logging::error!("Failed to serialize request: {}", e);
|
||||
show_toast_with_signal(notifications, NotificationLevel::Error, error_msg);
|
||||
logging::error!("Action failed: {:?}", e);
|
||||
show_toast_with_signal(notifications, NotificationLevel::Error, format!("{}: {:?}", error_msg, e));
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -341,29 +325,18 @@ pub fn TorrentTable() -> impl IntoView {
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<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">
|
||||
<div class="md:hidden flex flex-col h-full bg-base-200 relative cursor-pointer">
|
||||
<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 cursor-default">
|
||||
<span class="text-xs font-bold opacity-50 uppercase tracking-wider">"Torrents"</span>
|
||||
|
||||
<div class="relative">
|
||||
<div
|
||||
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">
|
||||
<details class="dropdown dropdown-end" node_ref=sort_details_ref>
|
||||
<summary class="btn btn-ghost btn-xs gap-1 opacity-70 font-normal list-none [&::-webkit-details-marker]:hidden cursor-pointer">
|
||||
<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 pointer-events-none">
|
||||
<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" }
|
||||
>
|
||||
<span class="pointer-events-none">"Sort"</span>
|
||||
</summary>
|
||||
<ul class="dropdown-content z-[100] menu p-2 shadow bg-base-100 rounded-box w-48 mt-1 border border-base-200 text-xs cursor-default">
|
||||
<li class="menu-title px-2 py-1 opacity-50 text-[10px] uppercase font-bold">"Sort By"</li>
|
||||
{
|
||||
let columns = vec![
|
||||
@@ -386,10 +359,11 @@ pub fn TorrentTable() -> impl IntoView {
|
||||
<button
|
||||
type="button"
|
||||
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();
|
||||
on:click=move |_| {
|
||||
handle_sort(col);
|
||||
set_sort_open.set(false);
|
||||
if let Some(el) = sort_details_ref.get_untracked() {
|
||||
el.set_open(false);
|
||||
}
|
||||
}
|
||||
>
|
||||
{label}
|
||||
@@ -407,10 +381,10 @@ pub fn TorrentTable() -> impl IntoView {
|
||||
}).collect::<Vec<_>>()
|
||||
}
|
||||
</ul>
|
||||
</div>
|
||||
</details>
|
||||
</div>
|
||||
|
||||
<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| {
|
||||
<div class="overflow-y-auto p-3 pb-20 flex-1 grid grid-cols-1 content-start gap-3 cursor-pointer"> {move || filtered_torrents().into_iter().map(|t| {
|
||||
let progress_class = if t.percent_complete >= 100.0 { "progress-success" } else { "progress-primary" };
|
||||
let status_str = format!("{:?}", t.status);
|
||||
let status_badge_class = match t.status {
|
||||
@@ -423,62 +397,49 @@ pub fn TorrentTable() -> impl IntoView {
|
||||
let _t_hash = t.hash.clone();
|
||||
let t_hash_click = t.hash.clone();
|
||||
|
||||
let (timer_id, set_timer_id) = create_signal(Option::<i32>::None);
|
||||
let t_hash_long = t.hash.clone();
|
||||
|
||||
let clear_timer = move || {
|
||||
if let Some(id) = timer_id.get_untracked() {
|
||||
window().clear_timeout_with_handle(id);
|
||||
set_timer_id.set(None);
|
||||
}
|
||||
};
|
||||
|
||||
let handle_touchstart = {
|
||||
let t_hash = t_hash_long.clone();
|
||||
move |e: web_sys::TouchEvent| {
|
||||
clear_timer();
|
||||
if let Some(touch) = e.touches().get(0) {
|
||||
let x = touch.client_x();
|
||||
let y = touch.client_y();
|
||||
let hash = t_hash.clone();
|
||||
|
||||
let closure = Closure::wrap(Box::new(move || {
|
||||
set_menu_position.set((x, y));
|
||||
set_selected_hash.set(Some(hash.clone()));
|
||||
let leptos_use::UseTimeoutFnReturn { start, stop, .. } = use_timeout_fn(
|
||||
move |pos: (i32, i32)| {
|
||||
set_menu_position.set(pos);
|
||||
set_selected_hash.set(Some(t_hash_long.clone()));
|
||||
set_menu_visible.set(true);
|
||||
|
||||
// Haptic feedback (iOS Safari doesn't support vibrate)
|
||||
// Haptic feedback
|
||||
let navigator = window().navigator();
|
||||
if js_sys::Reflect::has(&navigator, &wasm_bindgen::JsValue::from_str("vibrate")).unwrap_or(false) {
|
||||
if let Ok(vibrate) = js_sys::Reflect::get(&navigator, &"vibrate".into()) {
|
||||
if vibrate.is_function() {
|
||||
let _ = navigator.vibrate_with_duration(50);
|
||||
}
|
||||
}) as Box<dyn Fn()>);
|
||||
}
|
||||
},
|
||||
600.0,
|
||||
);
|
||||
|
||||
let id = window()
|
||||
.set_timeout_with_callback_and_timeout_and_arguments_0(
|
||||
closure.as_ref().unchecked_ref(),
|
||||
600
|
||||
)
|
||||
.unwrap_or(0);
|
||||
|
||||
closure.forget();
|
||||
set_timer_id.set(Some(id));
|
||||
let handle_touchstart = {
|
||||
let start = start.clone();
|
||||
move |e: web_sys::TouchEvent| {
|
||||
if let Some(touch) = e.touches().get(0) {
|
||||
start((touch.client_x(), touch.client_y()));
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
let handle_touchmove = move |_| {
|
||||
clear_timer();
|
||||
let handle_touchmove = {
|
||||
let stop = stop.clone();
|
||||
move |_| stop()
|
||||
};
|
||||
|
||||
let handle_touchend = move |_| {
|
||||
clear_timer();
|
||||
let handle_touchend = {
|
||||
let stop = stop.clone();
|
||||
move |_| stop()
|
||||
};
|
||||
|
||||
let handle_touchcancel = move |_| stop();
|
||||
|
||||
view! {
|
||||
<div
|
||||
class=move || {
|
||||
"card card-compact bg-base-100 shadow-sm border border-base-200 transition-transform active:scale-[0.99] select-none"
|
||||
"card card-compact bg-base-100 shadow-sm border border-base-200 transition-transform active:scale-[0.99] select-none cursor-pointer"
|
||||
}
|
||||
style="user-select: none; -webkit-user-select: none; -webkit-touch-callout: none;"
|
||||
on:contextmenu={
|
||||
@@ -492,7 +453,7 @@ pub fn TorrentTable() -> impl IntoView {
|
||||
on:touchstart=handle_touchstart
|
||||
on:touchmove=handle_touchmove
|
||||
on:touchend=handle_touchend
|
||||
on:touchcancel=handle_touchend
|
||||
on:touchcancel=handle_touchcancel
|
||||
>
|
||||
<div class="card-body gap-3">
|
||||
<div class="flex justify-between items-start gap-2">
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
mod app;
|
||||
// mod models; // Removed
|
||||
mod components;
|
||||
pub mod utils;
|
||||
pub mod store;
|
||||
pub mod api;
|
||||
|
||||
use leptos::*;
|
||||
use wasm_bindgen::prelude::*;
|
||||
|
||||
@@ -131,6 +131,9 @@ pub fn provide_torrent_store() {
|
||||
let notifications = create_rw_signal(Vec::<NotificationItem>::new());
|
||||
let user = create_rw_signal(Option::<String>::None);
|
||||
|
||||
// Browser notification hook
|
||||
let show_browser_notification = crate::utils::notification::use_app_notification();
|
||||
|
||||
let store = TorrentStore {
|
||||
torrents,
|
||||
filter,
|
||||
@@ -149,6 +152,7 @@ pub fn provide_torrent_store() {
|
||||
return;
|
||||
}
|
||||
|
||||
let show_browser_notification = show_browser_notification.clone();
|
||||
spawn_local(async move {
|
||||
let mut backoff_ms: u32 = 1000; // Start with 1 second
|
||||
let max_backoff_ms: u32 = 30000; // Max 30 seconds
|
||||
@@ -247,7 +251,7 @@ pub fn provide_torrent_store() {
|
||||
shared::NotificationLevel::Info => "ℹ️ VibeTorrent",
|
||||
};
|
||||
|
||||
crate::utils::notification::show_notification_if_enabled(
|
||||
show_browser_notification(
|
||||
title,
|
||||
&n.message
|
||||
);
|
||||
@@ -310,118 +314,52 @@ use serde::{Deserialize, Serialize};
|
||||
use wasm_bindgen::prelude::*;
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug)]
|
||||
struct PushSubscriptionData {
|
||||
endpoint: String,
|
||||
keys: PushKeys,
|
||||
pub struct PushSubscriptionData {
|
||||
pub endpoint: String,
|
||||
pub keys: PushKeys,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug)]
|
||||
struct PushKeys {
|
||||
p256dh: String,
|
||||
auth: String,
|
||||
pub struct PushKeys {
|
||||
pub p256dh: String,
|
||||
pub auth: String,
|
||||
}
|
||||
|
||||
/// Subscribe user to push notifications
|
||||
/// Requests notification permission if needed, then subscribes to push
|
||||
pub async fn subscribe_to_push_notifications() {
|
||||
use gloo_net::http::Request;
|
||||
use crate::api;
|
||||
|
||||
// First, request notification permission if not already granted
|
||||
let window = web_sys::window().expect("window should exist");
|
||||
let permission_granted = if let Ok(notification_class) = js_sys::Reflect::get(&window, &"Notification".into()) {
|
||||
if notification_class.is_undefined() {
|
||||
log::error!("Notification API not available");
|
||||
return;
|
||||
}
|
||||
|
||||
// Check current permission
|
||||
let current_permission = js_sys::Reflect::get(¬ification_class, &"permission".into())
|
||||
.ok()
|
||||
.and_then(|p| p.as_string())
|
||||
.unwrap_or_default();
|
||||
|
||||
if current_permission == "granted" {
|
||||
log::info!("Notification permission already granted");
|
||||
true
|
||||
} else if current_permission == "denied" {
|
||||
log::warn!("Notification permission was denied");
|
||||
return;
|
||||
} else {
|
||||
// Permission is "default" - need to request
|
||||
let permission = crate::utils::notification::get_notification_permission();
|
||||
if permission == "default" {
|
||||
log::info!("Requesting notification permission...");
|
||||
if let Ok(request_fn) = js_sys::Reflect::get(¬ification_class, &"requestPermission".into()) {
|
||||
if request_fn.is_function() {
|
||||
let request_fn_typed = js_sys::Function::from(request_fn);
|
||||
match request_fn_typed.call0(¬ification_class) {
|
||||
Ok(promise_val) => {
|
||||
let request_future = wasm_bindgen_futures::JsFuture::from(
|
||||
js_sys::Promise::from(promise_val)
|
||||
);
|
||||
match request_future.await {
|
||||
Ok(result) => {
|
||||
let result_str = result.as_string().unwrap_or_default();
|
||||
log::info!("Permission request result: {}", result_str);
|
||||
result_str == "granted"
|
||||
}
|
||||
Err(e) => {
|
||||
log::error!("Failed to request notification permission: {:?}", e);
|
||||
false
|
||||
}
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
log::error!("Failed to call requestPermission: {:?}", e);
|
||||
false
|
||||
}
|
||||
}
|
||||
} else {
|
||||
false
|
||||
}
|
||||
} else {
|
||||
false
|
||||
}
|
||||
}
|
||||
} else {
|
||||
log::error!("Cannot access Notification class");
|
||||
if !crate::utils::notification::request_notification_permission().await {
|
||||
log::warn!("Notification permission denied by user");
|
||||
return;
|
||||
};
|
||||
|
||||
if !permission_granted {
|
||||
log::warn!("Notification permission not granted, cannot subscribe to push");
|
||||
}
|
||||
} else if permission == "denied" {
|
||||
log::warn!("Notification permission was denied");
|
||||
return;
|
||||
}
|
||||
|
||||
log::info!("Notification permission granted! Proceeding with push subscription...");
|
||||
|
||||
// Get VAPID public key from backend
|
||||
let public_key_response = match Request::get("/api/push/public-key").send().await {
|
||||
Ok(resp) => resp,
|
||||
let public_key = match api::push::get_public_key().await {
|
||||
Ok(key) => key,
|
||||
Err(e) => {
|
||||
log::error!("Failed to get VAPID public key: {:?}", e);
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
let public_key_data: serde_json::Value = match public_key_response.json().await {
|
||||
Ok(data) => data,
|
||||
Err(e) => {
|
||||
log::error!("Failed to parse VAPID public key: {:?}", e);
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
let public_key = match public_key_data.get("publicKey").and_then(|v| v.as_str()) {
|
||||
Some(key) => key,
|
||||
None => {
|
||||
log::error!("Missing publicKey in response");
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
log::info!("VAPID public key from backend: {} (len: {})", public_key, public_key.len());
|
||||
|
||||
// Convert VAPID public key to Uint8Array
|
||||
let public_key_array = match url_base64_to_uint8array(public_key) {
|
||||
let public_key_array = match url_base64_to_uint8array(&public_key) {
|
||||
Ok(arr) => {
|
||||
log::info!("VAPID key converted to Uint8Array (length: {})", arr.length());
|
||||
arr
|
||||
@@ -433,7 +371,6 @@ pub async fn subscribe_to_push_notifications() {
|
||||
};
|
||||
|
||||
// Get service worker registration
|
||||
let window = web_sys::window().expect("window should exist");
|
||||
let navigator = window.navigator();
|
||||
let service_worker = navigator.service_worker();
|
||||
|
||||
@@ -494,12 +431,14 @@ pub async fn subscribe_to_push_notifications() {
|
||||
.dyn_into::<web_sys::PushSubscription>()
|
||||
.expect("should be PushSubscription");
|
||||
|
||||
// Get subscription JSON using toJSON() method
|
||||
let json_result = match js_sys::Reflect::get(&push_subscription, &"toJSON".into()) {
|
||||
// PushSubscription objects can be serialized directly via JSON.stringify which calls their toJSON method internally.
|
||||
// Or we can use Reflect to call toJSON if we want the object directly.
|
||||
// Let's use the robust way: call toJSON via Reflect but handle it gracefully.
|
||||
let json_val = match js_sys::Reflect::get(&push_subscription, &"toJSON".into()) {
|
||||
Ok(func) if func.is_function() => {
|
||||
let json_func = js_sys::Function::from(func);
|
||||
match json_func.call0(&push_subscription) {
|
||||
Ok(result) => result,
|
||||
Ok(res) => res,
|
||||
Err(e) => {
|
||||
log::error!("Failed to call toJSON: {:?}", e);
|
||||
return;
|
||||
@@ -507,25 +446,30 @@ pub async fn subscribe_to_push_notifications() {
|
||||
}
|
||||
}
|
||||
_ => {
|
||||
log::error!("toJSON method not found on PushSubscription");
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
let json_value = match js_sys::JSON::stringify(&json_result) {
|
||||
Ok(val) => val,
|
||||
// Fallback: try to stringify the object directly
|
||||
// log::warn!("toJSON not found, trying JSON.stringify");
|
||||
let json_str = match js_sys::JSON::stringify(&push_subscription) {
|
||||
Ok(s) => s,
|
||||
Err(e) => {
|
||||
log::error!("Failed to stringify subscription: {:?}", e);
|
||||
return;
|
||||
}
|
||||
};
|
||||
// Parse back to object to match our expected flow (slightly inefficient but safe)
|
||||
match js_sys::JSON::parse(&String::from(json_str)) {
|
||||
Ok(v) => v,
|
||||
Err(e) => {
|
||||
log::error!("Failed to parse stringified subscription: {:?}", e);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
let subscription_json_str = json_value.as_string().expect("should be string");
|
||||
|
||||
log::info!("Push subscription: {}", subscription_json_str);
|
||||
|
||||
// Parse and send to backend
|
||||
let subscription_data: serde_json::Value = match serde_json::from_str(&subscription_json_str) {
|
||||
// Convert JsValue (JSON object) to PushSubscriptionJSON struct via serde
|
||||
// Note: web_sys::PushSubscriptionJSON is not a struct we can directly use with serde_json usually,
|
||||
// but we can use serde-wasm-bindgen to convert JsValue -> Rust Struct
|
||||
let subscription_data: PushSubscriptionData = match serde_wasm_bindgen::from_value(json_val) {
|
||||
Ok(data) => data,
|
||||
Err(e) => {
|
||||
log::error!("Failed to parse subscription JSON: {:?}", e);
|
||||
@@ -533,84 +477,22 @@ pub async fn subscribe_to_push_notifications() {
|
||||
}
|
||||
};
|
||||
|
||||
// Extract endpoint and keys
|
||||
let endpoint = subscription_data
|
||||
.get("endpoint")
|
||||
.and_then(|v| v.as_str())
|
||||
.expect("endpoint should exist")
|
||||
.to_string();
|
||||
|
||||
let keys_obj = subscription_data
|
||||
.get("keys")
|
||||
.expect("keys should exist");
|
||||
|
||||
let p256dh = keys_obj
|
||||
.get("p256dh")
|
||||
.and_then(|v| v.as_str())
|
||||
.expect("p256dh should exist")
|
||||
.to_string();
|
||||
|
||||
let auth = keys_obj
|
||||
.get("auth")
|
||||
.and_then(|v| v.as_str())
|
||||
.expect("auth should exist")
|
||||
.to_string();
|
||||
|
||||
let push_data = PushSubscriptionData {
|
||||
endpoint,
|
||||
keys: PushKeys { p256dh, auth },
|
||||
};
|
||||
|
||||
// Send to backend
|
||||
let response = match Request::post("/api/push/subscribe")
|
||||
.json(&push_data)
|
||||
.expect("serialization should succeed")
|
||||
.send()
|
||||
.await
|
||||
{
|
||||
Ok(resp) => resp,
|
||||
Err(e) => {
|
||||
// Send to backend (subscription_data is already the struct we need)
|
||||
if let Err(e) = api::push::subscribe(&subscription_data).await {
|
||||
log::error!("Failed to send subscription to backend: {:?}", e);
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
if response.ok() {
|
||||
log::info!("Successfully subscribed to push notifications");
|
||||
} else {
|
||||
log::error!("Backend rejected push subscription: {:?}", response.status());
|
||||
}
|
||||
}
|
||||
|
||||
/// Helper to convert URL-safe base64 string to Uint8Array
|
||||
/// Uses JavaScript to properly decode binary data (avoids UTF-8 encoding issues)
|
||||
/// Uses pure Rust base64 crate for better safety and performance
|
||||
fn url_base64_to_uint8array(base64_string: &str) -> Result<js_sys::Uint8Array, JsValue> {
|
||||
// Add padding
|
||||
let padding = (4 - (base64_string.len() % 4)) % 4;
|
||||
let mut padded = base64_string.to_string();
|
||||
padded.push_str(&"=".repeat(padding));
|
||||
use base64::{engine::general_purpose, Engine as _};
|
||||
|
||||
// Replace URL-safe characters
|
||||
let standard_base64 = padded.replace('-', "+").replace('_', "/");
|
||||
// VAPID keys are URL-safe base64. Try both NO_PAD and padded for robustness.
|
||||
let bytes = general_purpose::URL_SAFE_NO_PAD
|
||||
.decode(base64_string)
|
||||
.or_else(|_| general_purpose::URL_SAFE.decode(base64_string))
|
||||
.map_err(|e| JsValue::from_str(&format!("Base64 decode error: {}", e)))?;
|
||||
|
||||
// Decode using JavaScript to avoid UTF-8 encoding issues
|
||||
// Create a JavaScript function to decode the base64 and convert to Uint8Array
|
||||
let js_code = format!(
|
||||
r#"
|
||||
(function() {{
|
||||
const binaryString = atob('{}');
|
||||
const bytes = new Uint8Array(binaryString.length);
|
||||
for (let i = 0; i < binaryString.length; i++) {{
|
||||
bytes[i] = binaryString.charCodeAt(i);
|
||||
}}
|
||||
return bytes;
|
||||
}})()
|
||||
"#,
|
||||
standard_base64
|
||||
);
|
||||
|
||||
let result = js_sys::eval(&js_code)?;
|
||||
let array = result.dyn_into::<js_sys::Uint8Array>()?;
|
||||
|
||||
Ok(array)
|
||||
Ok(js_sys::Uint8Array::from(&bytes[..]))
|
||||
}
|
||||
|
||||
@@ -1,37 +1,19 @@
|
||||
use wasm_bindgen::prelude::*;
|
||||
use web_sys::{Notification, NotificationOptions};
|
||||
use leptos::*;
|
||||
use leptos_use::{use_web_notification, UseWebNotificationReturn, NotificationPermission};
|
||||
|
||||
/// Request browser notification permission from user
|
||||
pub async fn request_notification_permission() -> bool {
|
||||
let window = web_sys::window().expect("no global window");
|
||||
|
||||
// Check if Notification API is available
|
||||
if js_sys::Reflect::has(&window, &JsValue::from_str("Notification")).unwrap_or(false) {
|
||||
let notification = js_sys::Reflect::get(&window, &JsValue::from_str("Notification"))
|
||||
.expect("Notification should exist");
|
||||
|
||||
// Request permission
|
||||
let promise = js_sys::Reflect::get(¬ification, &JsValue::from_str("requestPermission"))
|
||||
.expect("requestPermission should exist");
|
||||
|
||||
if let Ok(function) = promise.dyn_into::<js_sys::Function>() {
|
||||
if let Ok(promise) = function.call0(¬ification) {
|
||||
if let Ok(promise) = promise.dyn_into::<js_sys::Promise>() {
|
||||
let result = wasm_bindgen_futures::JsFuture::from(promise).await;
|
||||
|
||||
if let Ok(permission) = result {
|
||||
let permission_str = permission.as_string().unwrap_or_default();
|
||||
return permission_str == "granted";
|
||||
if let Ok(promise) = Notification::request_permission() {
|
||||
if let Ok(result) = wasm_bindgen_futures::JsFuture::from(promise).await {
|
||||
return result.as_string().unwrap_or_default() == "granted";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
false
|
||||
}
|
||||
|
||||
/// Check if browser notifications are supported and permitted
|
||||
/// Check if browser notifications are supported
|
||||
pub fn is_notification_supported() -> bool {
|
||||
let window = web_sys::window().expect("no global window");
|
||||
js_sys::Reflect::has(&window, &JsValue::from_str("Notification")).unwrap_or(false)
|
||||
@@ -39,67 +21,61 @@ pub fn is_notification_supported() -> bool {
|
||||
|
||||
/// Get current notification permission status
|
||||
pub fn get_notification_permission() -> String {
|
||||
if !is_notification_supported() {
|
||||
return "unsupported".to_string();
|
||||
match Notification::permission() {
|
||||
web_sys::NotificationPermission::Granted => "granted".to_string(),
|
||||
web_sys::NotificationPermission::Denied => "denied".to_string(),
|
||||
web_sys::NotificationPermission::Default => "default".to_string(),
|
||||
_ => "default".to_string(),
|
||||
}
|
||||
|
||||
let window = web_sys::window().expect("no global window");
|
||||
let notification = js_sys::Reflect::get(&window, &JsValue::from_str("Notification"))
|
||||
.expect("Notification should exist");
|
||||
|
||||
let permission = js_sys::Reflect::get(¬ification, &JsValue::from_str("permission"))
|
||||
.unwrap_or(JsValue::from_str("default"));
|
||||
|
||||
permission.as_string().unwrap_or("default".to_string())
|
||||
}
|
||||
|
||||
/// Show a browser notification
|
||||
/// Returns true if notification was shown successfully
|
||||
pub fn show_browser_notification(title: &str, body: &str, icon: Option<&str>) -> bool {
|
||||
// Check permission first
|
||||
let permission = get_notification_permission();
|
||||
if permission != "granted" {
|
||||
log::warn!("Notification permission not granted: {}", permission);
|
||||
/// Hook for using browser notifications within Leptos components or effects.
|
||||
/// This uses leptos-use for reactive permission tracking.
|
||||
pub fn use_app_notification() -> impl Fn(&str, &str) + Clone {
|
||||
let UseWebNotificationReturn { permission, .. } = use_web_notification();
|
||||
|
||||
move |title: &str, body: &str| {
|
||||
// Check user preference from localStorage
|
||||
let window = web_sys::window().expect("no global window");
|
||||
let storage = window.local_storage().ok().flatten();
|
||||
let enabled = storage
|
||||
.and_then(|s| s.get_item("vibetorrent_browser_notifications").ok().flatten())
|
||||
.unwrap_or_else(|| "true".to_string());
|
||||
|
||||
// Use the reactive permission signal from leptos-use
|
||||
if enabled == "true" && permission.get() == NotificationPermission::Granted {
|
||||
show_browser_notification(title, body);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Show a browser notification (non-reactive version)
|
||||
pub fn show_browser_notification(title: &str, body: &str) -> bool {
|
||||
if get_notification_permission() != "granted" {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Create notification options
|
||||
let opts = NotificationOptions::new();
|
||||
opts.set_body(body);
|
||||
opts.set_icon(icon.unwrap_or("/icon-192.png"));
|
||||
opts.set_badge("/icon-192.png");
|
||||
opts.set_icon("/icon-192.png");
|
||||
opts.set_tag("vibetorrent");
|
||||
opts.set_require_interaction(false);
|
||||
opts.set_silent(Some(false));
|
||||
|
||||
// Create and show notification
|
||||
match Notification::new_with_options(title, &opts) {
|
||||
Ok(_notification) => {
|
||||
true
|
||||
}
|
||||
Err(e) => {
|
||||
log::error!("Failed to create notification: {:?}", e);
|
||||
false
|
||||
}
|
||||
Ok(_) => true,
|
||||
Err(_) => false,
|
||||
}
|
||||
}
|
||||
|
||||
/// Show notification only if enabled in settings and permission granted
|
||||
/// Legacy helper for showing notification if enabled in settings
|
||||
pub fn show_notification_if_enabled(title: &str, body: &str) -> bool {
|
||||
// Check localStorage for user preference
|
||||
let window = web_sys::window().expect("no global window");
|
||||
let storage = window.local_storage().ok().flatten();
|
||||
|
||||
if let Some(storage) = storage {
|
||||
let enabled = storage
|
||||
.get_item("vibetorrent_browser_notifications")
|
||||
.ok()
|
||||
.flatten()
|
||||
.unwrap_or("true".to_string());
|
||||
.and_then(|s| s.get_item("vibetorrent_browser_notifications").ok().flatten())
|
||||
.unwrap_or_else(|| "true".to_string());
|
||||
|
||||
if enabled == "true" {
|
||||
return show_browser_notification(title, body, None);
|
||||
}
|
||||
return show_browser_notification(title, body);
|
||||
}
|
||||
|
||||
false
|
||||
|
||||
@@ -130,3 +130,9 @@ pub struct SetLabelRequest {
|
||||
pub hash: String,
|
||||
pub label: String,
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize, Clone, ToSchema)]
|
||||
pub struct AddTorrentRequest {
|
||||
#[schema(example = "magnet:?xt=urn:btih:...")]
|
||||
pub uri: String,
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user