Compare commits
61 Commits
release-20
...
release-20
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
46882caea0 | ||
|
|
e339ca1c49 | ||
|
|
a08fd9698f | ||
|
|
7d46dbd437 | ||
|
|
5f107299e3 | ||
|
|
c34133ded1 | ||
|
|
0d059cbbd3 | ||
|
|
fc83a1cc65 | ||
|
|
4e81af0599 | ||
|
|
74c3c5c17e | ||
|
|
3632a578e1 | ||
|
|
8a9905fc56 | ||
|
|
1e39cbb0c5 | ||
|
|
40be58f2fc | ||
|
|
3f08b5b54a | ||
|
|
bfec99ae35 | ||
|
|
d9afd3aa81 | ||
|
|
e72113d91d | ||
|
|
7c4ff619c1 | ||
|
|
9c4217f450 | ||
|
|
cc09002171 | ||
|
|
5d8cdd7760 | ||
|
|
145436eefc | ||
|
|
10c95c5ff3 | ||
|
|
329654cc4e | ||
|
|
22b592a652 | ||
|
|
817dc49db2 | ||
|
|
b2a60d3d1e | ||
|
|
520903fa3f | ||
|
|
c45f2f50e9 | ||
|
|
791eabe9bd | ||
|
|
12f93dd640 | ||
|
|
7306db8c2f | ||
|
|
ce0ecd62af | ||
|
|
f2379b67d8 | ||
|
|
755f35c94c | ||
|
|
175cac953e | ||
|
|
2c812fc4f6 | ||
|
|
08df851970 | ||
|
|
35faa6bfda | ||
|
|
328019e438 | ||
|
|
4f1c6326fd | ||
|
|
2e36c28c0d | ||
|
|
6530e20af2 | ||
|
|
32f4946530 | ||
|
|
619951fa1c | ||
|
|
6d45e6773f | ||
|
|
2c8a2d5956 | ||
|
|
6acb299fbe | ||
|
|
ab49c2ded5 | ||
|
|
e4957e930d | ||
|
|
ad2c6dc56e | ||
|
|
9f009bc18b | ||
|
|
643b83ac21 | ||
|
|
90b65240b2 | ||
|
|
69243a5590 | ||
|
|
10262142fc | ||
|
|
858a1c9b63 | ||
|
|
edfb7458f8 | ||
|
|
575cfa4b38 | ||
|
|
9b18b97c49 |
@@ -26,23 +26,22 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
cd frontend
|
cd frontend
|
||||||
npm install
|
npm install
|
||||||
# Run Tailwind manually first
|
|
||||||
npx @tailwindcss/cli -i input.css -o public/tailwind.css
|
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
|
trunk build --release
|
||||||
|
|
||||||
- name: Build Backend (MIPS)
|
- name: Build Backend (MIPS)
|
||||||
env:
|
env:
|
||||||
# Ensure we are building a fully static binary
|
# -s ve -w ile binary içindeki gereksiz tüm yükleri siliyoruz.
|
||||||
# -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 -C link-arg=-s -C link-arg=-w"
|
||||||
RUSTFLAGS: "-C target-feature=+crt-static -C link-self-contained=no -C link-arg=-msoft-float"
|
|
||||||
CFLAGS_mips_unknown_linux_musl: "-msoft-float"
|
CFLAGS_mips_unknown_linux_musl: "-msoft-float"
|
||||||
run: |
|
run: |
|
||||||
cd backend
|
# Sadece gerekli özellikleri derliyoruz (Boyut tasarrufu için swagger kapalı)
|
||||||
cargo zigbuild --target mips-unknown-linux-musl --release -Z build-std=std,panic_abort
|
cargo zigbuild -p backend --target mips-unknown-linux-musl --release -Z build-std=std,panic_abort --no-default-features --features push-notifications
|
||||||
file target/mips-unknown-linux-musl/release/backend
|
|
||||||
|
|
||||||
- name: Rename Binary
|
- name: Create Release Assets
|
||||||
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
|
||||||
|
|
||||||
- name: Generate Release Tag
|
- name: Generate Release Tag
|
||||||
id: tag
|
id: tag
|
||||||
@@ -56,8 +55,10 @@ jobs:
|
|||||||
REPO="admin/vibetorrent"
|
REPO="admin/vibetorrent"
|
||||||
API_URL="${{ gitea.server_url }}/api/v1"
|
API_URL="${{ gitea.server_url }}/api/v1"
|
||||||
|
|
||||||
# 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 }}\",
|
||||||
@@ -66,15 +67,9 @@ jobs:
|
|||||||
}")
|
}")
|
||||||
|
|
||||||
RELEASE_ID=$(echo "$RELEASE_RESPONSE" | jq -r '.id')
|
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
|
curl -s -X POST "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=vibetorrent-mips" \
|
||||||
echo "Failed to create release:"
|
-H "Authorization: token ${RELEASE_TOKEN}" \
|
||||||
echo "$RELEASE_RESPONSE"
|
-H "Content-Type: application/octet-stream" \
|
||||||
exit 1
|
--data-binary @target/mips-unknown-linux-musl/release/vibetorrent-mips
|
||||||
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."
|
|
||||||
2
.gitignore
vendored
2
.gitignore
vendored
@@ -6,3 +6,5 @@ result.xml
|
|||||||
frontend/dist
|
frontend/dist
|
||||||
backend.log
|
backend.log
|
||||||
.runner
|
.runner
|
||||||
|
.env
|
||||||
|
backend/.env
|
||||||
|
|||||||
235
Cargo.lock
generated
235
Cargo.lock
generated
@@ -300,6 +300,7 @@ dependencies = [
|
|||||||
"clap",
|
"clap",
|
||||||
"dotenvy",
|
"dotenvy",
|
||||||
"futures",
|
"futures",
|
||||||
|
"governor",
|
||||||
"mime_guess",
|
"mime_guess",
|
||||||
"openssl",
|
"openssl",
|
||||||
"quick-xml",
|
"quick-xml",
|
||||||
@@ -316,6 +317,7 @@ dependencies = [
|
|||||||
"tokio-util",
|
"tokio-util",
|
||||||
"tower 0.4.13",
|
"tower 0.4.13",
|
||||||
"tower-http",
|
"tower-http",
|
||||||
|
"tower_governor",
|
||||||
"tracing",
|
"tracing",
|
||||||
"tracing-subscriber",
|
"tracing-subscriber",
|
||||||
"utoipa",
|
"utoipa",
|
||||||
@@ -801,6 +803,20 @@ dependencies = [
|
|||||||
"parking_lot_core",
|
"parking_lot_core",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "dashmap"
|
||||||
|
version = "6.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
|
||||||
|
dependencies = [
|
||||||
|
"cfg-if",
|
||||||
|
"crossbeam-utils",
|
||||||
|
"hashbrown 0.14.5",
|
||||||
|
"lock_api",
|
||||||
|
"once_cell",
|
||||||
|
"parking_lot_core",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "data-encoding"
|
name = "data-encoding"
|
||||||
version = "2.10.0"
|
version = "2.10.0"
|
||||||
@@ -1084,6 +1100,12 @@ version = "0.1.5"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
|
checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "foldhash"
|
||||||
|
version = "0.2.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "foreign-types"
|
name = "foreign-types"
|
||||||
version = "0.3.2"
|
version = "0.3.2"
|
||||||
@@ -1108,6 +1130,16 @@ dependencies = [
|
|||||||
"percent-encoding",
|
"percent-encoding",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "forwarded-header-value"
|
||||||
|
version = "0.1.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "8835f84f38484cc86f110a805655697908257fb9a7af005234060891557198e9"
|
||||||
|
dependencies = [
|
||||||
|
"nonempty",
|
||||||
|
"thiserror 1.0.69",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "frontend"
|
name = "frontend"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
@@ -1214,6 +1246,12 @@ version = "0.3.31"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
|
checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "futures-timer"
|
||||||
|
version = "3.0.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "futures-util"
|
name = "futures-util"
|
||||||
version = "0.3.31"
|
version = "0.3.31"
|
||||||
@@ -1337,6 +1375,29 @@ dependencies = [
|
|||||||
"web-sys",
|
"web-sys",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "governor"
|
||||||
|
version = "0.10.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "9efcab3c1958580ff1f25a2a41be1668f7603d849bb63af523b208a3cc1223b8"
|
||||||
|
dependencies = [
|
||||||
|
"cfg-if",
|
||||||
|
"dashmap 6.1.0",
|
||||||
|
"futures-sink",
|
||||||
|
"futures-timer",
|
||||||
|
"futures-util",
|
||||||
|
"getrandom 0.3.4",
|
||||||
|
"hashbrown 0.16.1",
|
||||||
|
"nonzero_ext",
|
||||||
|
"parking_lot",
|
||||||
|
"portable-atomic",
|
||||||
|
"quanta",
|
||||||
|
"rand 0.9.2",
|
||||||
|
"smallvec",
|
||||||
|
"spinning_top",
|
||||||
|
"web-time",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "group"
|
name = "group"
|
||||||
version = "0.13.0"
|
version = "0.13.0"
|
||||||
@@ -1348,6 +1409,25 @@ dependencies = [
|
|||||||
"subtle",
|
"subtle",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "h2"
|
||||||
|
version = "0.4.13"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "2f44da3a8150a6703ed5d34e164b875fd14c2cdab9af1252a9a1020bde2bdc54"
|
||||||
|
dependencies = [
|
||||||
|
"atomic-waker",
|
||||||
|
"bytes",
|
||||||
|
"fnv",
|
||||||
|
"futures-core",
|
||||||
|
"futures-sink",
|
||||||
|
"http 1.4.0",
|
||||||
|
"indexmap",
|
||||||
|
"slab",
|
||||||
|
"tokio",
|
||||||
|
"tokio-util",
|
||||||
|
"tracing",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "half"
|
name = "half"
|
||||||
version = "2.7.1"
|
version = "2.7.1"
|
||||||
@@ -1373,7 +1453,7 @@ checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"allocator-api2",
|
"allocator-api2",
|
||||||
"equivalent",
|
"equivalent",
|
||||||
"foldhash",
|
"foldhash 0.1.5",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -1381,6 +1461,11 @@ name = "hashbrown"
|
|||||||
version = "0.16.1"
|
version = "0.16.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
|
checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
|
||||||
|
dependencies = [
|
||||||
|
"allocator-api2",
|
||||||
|
"equivalent",
|
||||||
|
"foldhash 0.2.0",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "hashlink"
|
name = "hashlink"
|
||||||
@@ -1569,6 +1654,7 @@ dependencies = [
|
|||||||
"bytes",
|
"bytes",
|
||||||
"futures-channel",
|
"futures-channel",
|
||||||
"futures-core",
|
"futures-core",
|
||||||
|
"h2",
|
||||||
"http 1.4.0",
|
"http 1.4.0",
|
||||||
"http-body 1.0.1",
|
"http-body 1.0.1",
|
||||||
"httparse",
|
"httparse",
|
||||||
@@ -1578,6 +1664,20 @@ dependencies = [
|
|||||||
"pin-utils",
|
"pin-utils",
|
||||||
"smallvec",
|
"smallvec",
|
||||||
"tokio",
|
"tokio",
|
||||||
|
"want",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "hyper-timeout"
|
||||||
|
version = "0.5.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0"
|
||||||
|
dependencies = [
|
||||||
|
"hyper 1.8.1",
|
||||||
|
"hyper-util",
|
||||||
|
"pin-project-lite",
|
||||||
|
"tokio",
|
||||||
|
"tower-service",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -1600,13 +1700,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "727805d60e7938b76b826a6ef209eb70eaa1812794f9424d4a4e2d740662df5f"
|
checksum = "727805d60e7938b76b826a6ef209eb70eaa1812794f9424d4a4e2d740662df5f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bytes",
|
"bytes",
|
||||||
|
"futures-channel",
|
||||||
"futures-core",
|
"futures-core",
|
||||||
|
"futures-util",
|
||||||
"http 1.4.0",
|
"http 1.4.0",
|
||||||
"http-body 1.0.1",
|
"http-body 1.0.1",
|
||||||
"hyper 1.8.1",
|
"hyper 1.8.1",
|
||||||
|
"libc",
|
||||||
"pin-project-lite",
|
"pin-project-lite",
|
||||||
|
"socket2 0.6.2",
|
||||||
"tokio",
|
"tokio",
|
||||||
"tower-service",
|
"tower-service",
|
||||||
|
"tracing",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -2229,6 +2334,18 @@ dependencies = [
|
|||||||
"minimal-lexical",
|
"minimal-lexical",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "nonempty"
|
||||||
|
version = "0.7.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e9e591e719385e6ebaeb5ce5d3887f7d5676fceca6411d1925ccc95745f3d6f7"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "nonzero_ext"
|
||||||
|
version = "0.3.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "nu-ansi-term"
|
name = "nu-ansi-term"
|
||||||
version = "0.50.3"
|
version = "0.50.3"
|
||||||
@@ -2700,6 +2817,21 @@ dependencies = [
|
|||||||
"yansi",
|
"yansi",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "quanta"
|
||||||
|
version = "0.12.6"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "f3ab5a9d756f0d97bdc89019bd2e4ea098cf9cde50ee7564dde6b81ccc8f06c7"
|
||||||
|
dependencies = [
|
||||||
|
"crossbeam-utils",
|
||||||
|
"libc",
|
||||||
|
"once_cell",
|
||||||
|
"raw-cpuid",
|
||||||
|
"wasi",
|
||||||
|
"web-sys",
|
||||||
|
"winapi",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "quick-xml"
|
name = "quick-xml"
|
||||||
version = "0.31.0"
|
version = "0.31.0"
|
||||||
@@ -2806,6 +2938,15 @@ dependencies = [
|
|||||||
"getrandom 0.3.4",
|
"getrandom 0.3.4",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "raw-cpuid"
|
||||||
|
version = "11.6.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "498cd0dc59d73224351ee52a95fee0f1a617a2eae0e7d9d720cc622c73a54186"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "redox_syscall"
|
name = "redox_syscall"
|
||||||
version = "0.5.18"
|
version = "0.5.18"
|
||||||
@@ -3196,7 +3337,7 @@ dependencies = [
|
|||||||
"bytes",
|
"bytes",
|
||||||
"ciborium",
|
"ciborium",
|
||||||
"const_format",
|
"const_format",
|
||||||
"dashmap",
|
"dashmap 5.5.3",
|
||||||
"futures",
|
"futures",
|
||||||
"gloo-net 0.6.0",
|
"gloo-net 0.6.0",
|
||||||
"http 1.4.0",
|
"http 1.4.0",
|
||||||
@@ -3375,6 +3516,15 @@ dependencies = [
|
|||||||
"lock_api",
|
"lock_api",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "spinning_top"
|
||||||
|
version = "0.3.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300"
|
||||||
|
dependencies = [
|
||||||
|
"lock_api",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "spki"
|
name = "spki"
|
||||||
version = "0.6.0"
|
version = "0.6.0"
|
||||||
@@ -3917,6 +4067,35 @@ version = "0.1.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
|
checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "tonic"
|
||||||
|
version = "0.14.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "a286e33f82f8a1ee2df63f4fa35c0becf4a85a0cb03091a15fd7bf0b402dc94a"
|
||||||
|
dependencies = [
|
||||||
|
"async-trait",
|
||||||
|
"axum",
|
||||||
|
"base64 0.22.1",
|
||||||
|
"bytes",
|
||||||
|
"h2",
|
||||||
|
"http 1.4.0",
|
||||||
|
"http-body 1.0.1",
|
||||||
|
"http-body-util",
|
||||||
|
"hyper 1.8.1",
|
||||||
|
"hyper-timeout",
|
||||||
|
"hyper-util",
|
||||||
|
"percent-encoding",
|
||||||
|
"pin-project",
|
||||||
|
"socket2 0.6.2",
|
||||||
|
"sync_wrapper",
|
||||||
|
"tokio",
|
||||||
|
"tokio-stream",
|
||||||
|
"tower 0.5.3",
|
||||||
|
"tower-layer",
|
||||||
|
"tower-service",
|
||||||
|
"tracing",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tower"
|
name = "tower"
|
||||||
version = "0.4.13"
|
version = "0.4.13"
|
||||||
@@ -3941,9 +4120,12 @@ checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"futures-core",
|
"futures-core",
|
||||||
"futures-util",
|
"futures-util",
|
||||||
|
"indexmap",
|
||||||
"pin-project-lite",
|
"pin-project-lite",
|
||||||
|
"slab",
|
||||||
"sync_wrapper",
|
"sync_wrapper",
|
||||||
"tokio",
|
"tokio",
|
||||||
|
"tokio-util",
|
||||||
"tower-layer",
|
"tower-layer",
|
||||||
"tower-service",
|
"tower-service",
|
||||||
"tracing",
|
"tracing",
|
||||||
@@ -3988,6 +4170,23 @@ version = "0.3.3"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
|
checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "tower_governor"
|
||||||
|
version = "0.8.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "44de9b94d849d3c46e06a883d72d408c2de6403367b39df2b1c9d9e7b6736fe6"
|
||||||
|
dependencies = [
|
||||||
|
"axum",
|
||||||
|
"forwarded-header-value",
|
||||||
|
"governor",
|
||||||
|
"http 1.4.0",
|
||||||
|
"pin-project",
|
||||||
|
"thiserror 2.0.18",
|
||||||
|
"tonic",
|
||||||
|
"tower 0.5.3",
|
||||||
|
"tracing",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tracing"
|
name = "tracing"
|
||||||
version = "0.1.44"
|
version = "0.1.44"
|
||||||
@@ -4404,6 +4603,16 @@ dependencies = [
|
|||||||
"wasm-bindgen",
|
"wasm-bindgen",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "web-time"
|
||||||
|
version = "1.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
|
||||||
|
dependencies = [
|
||||||
|
"js-sys",
|
||||||
|
"wasm-bindgen",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "whoami"
|
name = "whoami"
|
||||||
version = "1.6.1"
|
version = "1.6.1"
|
||||||
@@ -4414,6 +4623,22 @@ dependencies = [
|
|||||||
"wasite",
|
"wasite",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "winapi"
|
||||||
|
version = "0.3.9"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
|
||||||
|
dependencies = [
|
||||||
|
"winapi-i686-pc-windows-gnu",
|
||||||
|
"winapi-x86_64-pc-windows-gnu",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "winapi-i686-pc-windows-gnu"
|
||||||
|
version = "0.4.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "winapi-util"
|
name = "winapi-util"
|
||||||
version = "0.1.11"
|
version = "0.1.11"
|
||||||
@@ -4423,6 +4648,12 @@ dependencies = [
|
|||||||
"windows-sys 0.61.2",
|
"windows-sys 0.61.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "winapi-x86_64-pc-windows-gnu"
|
||||||
|
version = "0.4.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "windows-core"
|
name = "windows-core"
|
||||||
version = "0.62.2"
|
version = "0.62.2"
|
||||||
|
|||||||
12
Cargo.toml
12
Cargo.toml
@@ -2,13 +2,19 @@
|
|||||||
members = ["backend", "frontend", "shared"]
|
members = ["backend", "frontend", "shared"]
|
||||||
resolver = "2"
|
resolver = "2"
|
||||||
|
|
||||||
# Optimize for size (aggressive)
|
|
||||||
[profile.release]
|
[profile.release]
|
||||||
|
# En küçük binary boyutu
|
||||||
opt-level = "z"
|
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
|
codegen-units = 1
|
||||||
|
# Hata izleme kodlarını atarak yer kazan
|
||||||
panic = "abort"
|
panic = "abort"
|
||||||
|
# Sembolleri ve hata ayıklama bilgilerini kesin sil
|
||||||
strip = true
|
strip = true
|
||||||
|
# Artık (incremental) build'i kapat ki optimizasyon tam olsun
|
||||||
|
incremental = false
|
||||||
|
|
||||||
[patch.crates-io]
|
[patch.crates-io]
|
||||||
coarsetime = { path = "third_party/coarsetime" }
|
coarsetime = { path = "third_party/coarsetime" }
|
||||||
@@ -3,3 +3,12 @@ RTORRENT_SOCKET=/tmp/rtorrent.sock
|
|||||||
|
|
||||||
# Backend Listen Port
|
# Backend Listen Port
|
||||||
PORT=3000
|
PORT=3000
|
||||||
|
|
||||||
|
# Database URL
|
||||||
|
DATABASE_URL=sqlite:vibetorrent.db
|
||||||
|
|
||||||
|
# VAPID Keys for Push Notifications
|
||||||
|
# Generate new keys for production using: npx web-push generate-vapid-keys
|
||||||
|
VAPID_PUBLIC_KEY=YOUR_PUBLIC_VAPID_KEY
|
||||||
|
VAPID_PRIVATE_KEY=YOUR_PRIVATE_VAPID_KEY
|
||||||
|
VAPID_EMAIL=mailto:your-email@example.com
|
||||||
@@ -4,8 +4,9 @@ version = "0.1.0"
|
|||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
default = ["push-notifications"]
|
default = ["push-notifications", "swagger"]
|
||||||
push-notifications = ["web-push", "openssl"]
|
push-notifications = ["web-push", "openssl"]
|
||||||
|
swagger = ["utoipa-swagger-ui"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
axum = { version = "0.8", features = ["macros", "ws"] }
|
axum = { version = "0.8", features = ["macros", "ws"] }
|
||||||
@@ -29,7 +30,7 @@ shared = { path = "../shared" }
|
|||||||
thiserror = "2.0.18"
|
thiserror = "2.0.18"
|
||||||
dotenvy = "0.15.7"
|
dotenvy = "0.15.7"
|
||||||
utoipa = { version = "5.4.0", features = ["axum_extras"] }
|
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 }
|
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 }
|
||||||
@@ -39,3 +40,5 @@ axum-extra = { version = "0.10", features = ["cookie"] }
|
|||||||
rand = "0.8"
|
rand = "0.8"
|
||||||
anyhow = "1.0.101"
|
anyhow = "1.0.101"
|
||||||
time = { version = "0.3.47", features = ["serde", "formatting", "parsing"] }
|
time = { version = "0.3.47", features = ["serde", "formatting", "parsing"] }
|
||||||
|
tower_governor = "0.8.0"
|
||||||
|
governor = "0.10.4"
|
||||||
|
|||||||
16
backend/migrations/001_init.sql
Normal file
16
backend/migrations/001_init.sql
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
-- 001_init.sql
|
||||||
|
-- Initial schema for users and sessions
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS users (
|
||||||
|
id INTEGER PRIMARY KEY,
|
||||||
|
username TEXT NOT NULL UNIQUE,
|
||||||
|
password_hash TEXT NOT NULL,
|
||||||
|
created_at DATETIME DEFAULT CURRENT_TIMESTAMP
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS sessions (
|
||||||
|
token TEXT PRIMARY KEY,
|
||||||
|
user_id INTEGER NOT NULL,
|
||||||
|
expires_at DATETIME NOT NULL,
|
||||||
|
FOREIGN KEY(user_id) REFERENCES users(id)
|
||||||
|
);
|
||||||
13
backend/migrations/002_push_subscriptions.sql
Normal file
13
backend/migrations/002_push_subscriptions.sql
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
-- 002_push_subscriptions.sql
|
||||||
|
-- Push notification subscriptions storage
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS push_subscriptions (
|
||||||
|
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||||
|
endpoint TEXT NOT NULL UNIQUE,
|
||||||
|
p256dh TEXT NOT NULL,
|
||||||
|
auth TEXT NOT NULL,
|
||||||
|
created_at DATETIME DEFAULT CURRENT_TIMESTAMP
|
||||||
|
);
|
||||||
|
|
||||||
|
-- Index for faster lookups by endpoint
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_push_subscriptions_endpoint ON push_subscriptions(endpoint);
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
use sqlx::{sqlite::SqlitePoolOptions, Pool, Sqlite, Row};
|
use sqlx::{sqlite::SqlitePoolOptions, Pool, Sqlite, Row, sqlite::SqliteConnectOptions};
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
use anyhow::Result;
|
use anyhow::Result;
|
||||||
|
use std::str::FromStr;
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
pub struct Db {
|
pub struct Db {
|
||||||
@@ -9,42 +10,25 @@ pub struct Db {
|
|||||||
|
|
||||||
impl Db {
|
impl Db {
|
||||||
pub async fn new(db_url: &str) -> Result<Self> {
|
pub async fn new(db_url: &str) -> Result<Self> {
|
||||||
|
let options = SqliteConnectOptions::from_str(db_url)?
|
||||||
|
.create_if_missing(true)
|
||||||
|
.busy_timeout(Duration::from_secs(10)) // Bekleme süresini 10 saniyeye çıkardık
|
||||||
|
.journal_mode(sqlx::sqlite::SqliteJournalMode::Wal)
|
||||||
|
.synchronous(sqlx::sqlite::SqliteSynchronous::Normal);
|
||||||
|
|
||||||
let pool = SqlitePoolOptions::new()
|
let pool = SqlitePoolOptions::new()
|
||||||
.max_connections(5)
|
.max_connections(5)
|
||||||
.acquire_timeout(Duration::from_secs(3))
|
.acquire_timeout(Duration::from_secs(10))
|
||||||
.connect(db_url)
|
.connect_with(options)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
let db = Self { pool };
|
let db = Self { pool };
|
||||||
db.init().await?;
|
db.run_migrations().await?;
|
||||||
Ok(db)
|
Ok(db)
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn init(&self) -> Result<()> {
|
async fn run_migrations(&self) -> Result<()> {
|
||||||
// Create users table
|
sqlx::migrate!("./migrations").run(&self.pool).await?;
|
||||||
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(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -68,6 +52,15 @@ impl Db {
|
|||||||
Ok(row.map(|r| (r.get(0), r.get(1))))
|
Ok(row.map(|r| (r.get(0), r.get(1))))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn get_username_by_id(&self, id: i64) -> Result<Option<String>> {
|
||||||
|
let row = sqlx::query("SELECT username FROM users WHERE id = ?")
|
||||||
|
.bind(id)
|
||||||
|
.fetch_optional(&self.pool)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
Ok(row.map(|r| r.get(0)))
|
||||||
|
}
|
||||||
|
|
||||||
pub async fn has_users(&self) -> Result<bool> {
|
pub async fn has_users(&self) -> Result<bool> {
|
||||||
let row: (i64,) = sqlx::query_as("SELECT COUNT(*) FROM users")
|
let row: (i64,) = sqlx::query_as("SELECT COUNT(*) FROM users")
|
||||||
.fetch_one(&self.pool)
|
.fetch_one(&self.pool)
|
||||||
@@ -103,4 +96,53 @@ impl Db {
|
|||||||
.await?;
|
.await?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn update_password(&self, user_id: i64, password_hash: &str) -> Result<()> {
|
||||||
|
sqlx::query("UPDATE users SET password_hash = ? WHERE id = ?")
|
||||||
|
.bind(password_hash)
|
||||||
|
.bind(user_id)
|
||||||
|
.execute(&self.pool)
|
||||||
|
.await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn delete_all_sessions_for_user(&self, user_id: i64) -> Result<()> {
|
||||||
|
sqlx::query("DELETE FROM sessions WHERE user_id = ?")
|
||||||
|
.bind(user_id)
|
||||||
|
.execute(&self.pool)
|
||||||
|
.await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- Push Subscription Operations ---
|
||||||
|
|
||||||
|
pub async fn save_push_subscription(&self, endpoint: &str, p256dh: &str, auth: &str) -> Result<()> {
|
||||||
|
sqlx::query(
|
||||||
|
"INSERT INTO push_subscriptions (endpoint, p256dh, auth) VALUES (?, ?, ?)
|
||||||
|
ON CONFLICT(endpoint) DO UPDATE SET p256dh = EXCLUDED.p256dh, auth = EXCLUDED.auth"
|
||||||
|
)
|
||||||
|
.bind(endpoint)
|
||||||
|
.bind(p256dh)
|
||||||
|
.bind(auth)
|
||||||
|
.execute(&self.pool)
|
||||||
|
.await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn remove_push_subscription(&self, endpoint: &str) -> Result<()> {
|
||||||
|
sqlx::query("DELETE FROM push_subscriptions WHERE endpoint = ?")
|
||||||
|
.bind(endpoint)
|
||||||
|
.execute(&self.pool)
|
||||||
|
.await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get_all_push_subscriptions(&self) -> Result<Vec<(String, String, String)>> {
|
||||||
|
let rows = sqlx::query_as::<_, (String, String, String)>(
|
||||||
|
"SELECT endpoint, p256dh, auth FROM push_subscriptions"
|
||||||
|
)
|
||||||
|
.fetch_all(&self.pool)
|
||||||
|
.await?;
|
||||||
|
Ok(rows)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
use std::collections::HashMap;
|
||||||
use shared::{AppEvent, NotificationLevel, SystemNotification, Torrent, TorrentUpdate};
|
use shared::{AppEvent, NotificationLevel, SystemNotification, Torrent, TorrentUpdate};
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
@@ -8,24 +9,32 @@ pub enum DiffResult {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn diff_torrents(old: &[Torrent], new: &[Torrent]) -> DiffResult {
|
pub fn diff_torrents(old: &[Torrent], new: &[Torrent]) -> DiffResult {
|
||||||
// 1. Structural Check (Length or Order changed)
|
// 1. Structural Check: Eğer torrent sayısı değişmişse (yeni eklenen veya silinen),
|
||||||
|
// şimdilik basitlik adına FullUpdate gönderiyoruz.
|
||||||
if old.len() != new.len() {
|
if old.len() != new.len() {
|
||||||
return DiffResult::FullUpdate;
|
return DiffResult::FullUpdate;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i, t) in new.iter().enumerate() {
|
// 2. Hash Set Karşılaştırması:
|
||||||
if old[i].hash != t.hash {
|
// Sıralama değişmiş olabilir ama torrentler aynı mı?
|
||||||
|
let old_map: HashMap<&str, &Torrent> = old.iter().map(|t| (t.hash.as_str(), t)).collect();
|
||||||
|
|
||||||
|
// Eğer yeni listedeki bir hash eski listede yoksa, yapı değişmiş demektir.
|
||||||
|
for new_t in new {
|
||||||
|
if !old_map.contains_key(new_t.hash.as_str()) {
|
||||||
return DiffResult::FullUpdate;
|
return DiffResult::FullUpdate;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2. Field Updates
|
// 3. Alan Güncellemeleri (Partial Updates)
|
||||||
|
// Buraya geldiğimizde biliyoruz ki old ve new listelerindeki torrentler (hash olarak) aynı,
|
||||||
|
// sadece sıraları farklı olabilir veya içindeki veriler güncellenmiş olabilir.
|
||||||
let mut events = Vec::new();
|
let mut events = Vec::new();
|
||||||
|
|
||||||
for (i, new_t) in new.iter().enumerate() {
|
for new_t in new {
|
||||||
let old_t = &old[i];
|
// old_map'ten ilgili torrente hash ile ulaşalım (sıradan bağımsız)
|
||||||
|
let old_t = old_map.get(new_t.hash.as_str()).unwrap();
|
||||||
|
|
||||||
// Initialize with all None
|
|
||||||
let mut update = TorrentUpdate {
|
let mut update = TorrentUpdate {
|
||||||
hash: new_t.hash.clone(),
|
hash: new_t.hash.clone(),
|
||||||
name: None,
|
name: None,
|
||||||
@@ -42,7 +51,7 @@ pub fn diff_torrents(old: &[Torrent], new: &[Torrent]) -> DiffResult {
|
|||||||
|
|
||||||
let mut has_changes = false;
|
let mut has_changes = false;
|
||||||
|
|
||||||
// Compare fields
|
// Alanları karşılaştır
|
||||||
if old_t.name != new_t.name {
|
if old_t.name != new_t.name {
|
||||||
update.name = Some(new_t.name.clone());
|
update.name = Some(new_t.name.clone());
|
||||||
has_changes = true;
|
has_changes = true;
|
||||||
@@ -63,7 +72,7 @@ pub fn diff_torrents(old: &[Torrent], new: &[Torrent]) -> DiffResult {
|
|||||||
update.percent_complete = Some(new_t.percent_complete);
|
update.percent_complete = Some(new_t.percent_complete);
|
||||||
has_changes = true;
|
has_changes = true;
|
||||||
|
|
||||||
// Check for torrent completion: reached 100%
|
// Torrent tamamlanma kontrolü
|
||||||
if old_t.percent_complete < 100.0 && new_t.percent_complete >= 100.0 {
|
if old_t.percent_complete < 100.0 && new_t.percent_complete >= 100.0 {
|
||||||
tracing::info!("Torrent completed: {} ({})", new_t.name, new_t.hash);
|
tracing::info!("Torrent completed: {} ({})", new_t.name, new_t.hash);
|
||||||
events.push(AppEvent::Notification(SystemNotification {
|
events.push(AppEvent::Notification(SystemNotification {
|
||||||
@@ -83,8 +92,7 @@ pub fn diff_torrents(old: &[Torrent], new: &[Torrent]) -> DiffResult {
|
|||||||
if old_t.status != new_t.status {
|
if old_t.status != new_t.status {
|
||||||
update.status = Some(new_t.status.clone());
|
update.status = Some(new_t.status.clone());
|
||||||
has_changes = true;
|
has_changes = true;
|
||||||
|
|
||||||
// Log status changes for debugging
|
|
||||||
tracing::debug!(
|
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
|
||||||
@@ -110,4 +118,4 @@ pub fn diff_torrents(old: &[Torrent], new: &[Torrent]) -> DiffResult {
|
|||||||
tracing::debug!("Generated {} partial updates", events.len());
|
tracing::debug!("Generated {} partial updates", events.len());
|
||||||
DiffResult::Partial(events)
|
DiffResult::Partial(events)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -13,9 +13,10 @@ use time::Duration;
|
|||||||
pub struct LoginRequest {
|
pub struct LoginRequest {
|
||||||
username: String,
|
username: String,
|
||||||
password: String,
|
password: String,
|
||||||
|
#[serde(default)]
|
||||||
|
remember_me: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[allow(dead_code)]
|
|
||||||
#[derive(Serialize, ToSchema)]
|
#[derive(Serialize, ToSchema)]
|
||||||
pub struct UserResponse {
|
pub struct UserResponse {
|
||||||
username: String,
|
username: String,
|
||||||
@@ -62,8 +63,13 @@ pub async fn login_handler(
|
|||||||
rand::thread_rng().sample(Alphanumeric) as char
|
rand::thread_rng().sample(Alphanumeric) as char
|
||||||
}).collect();
|
}).collect();
|
||||||
|
|
||||||
// Expires in 30 days
|
// Expiration: 30 days if remember_me is true, else 1 day
|
||||||
let expires_in = 60 * 60 * 24 * 30;
|
let expires_in = if payload.remember_me {
|
||||||
|
60 * 60 * 24 * 30
|
||||||
|
} else {
|
||||||
|
60 * 60 * 24
|
||||||
|
};
|
||||||
|
|
||||||
let expires_at = time::OffsetDateTime::now_utc().unix_timestamp() + expires_in;
|
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 {
|
if let Err(e) = state.db.create_session(user_id, &token, expires_at).await {
|
||||||
@@ -71,15 +77,16 @@ pub async fn login_handler(
|
|||||||
return (StatusCode::INTERNAL_SERVER_ERROR, "Failed to create session").into_response();
|
return (StatusCode::INTERNAL_SERVER_ERROR, "Failed to create session").into_response();
|
||||||
}
|
}
|
||||||
|
|
||||||
let cookie = Cookie::build(("auth_token", token))
|
let mut cookie = Cookie::build(("auth_token", token))
|
||||||
.path("/")
|
.path("/")
|
||||||
.http_only(true)
|
.http_only(true)
|
||||||
.same_site(SameSite::Lax)
|
.same_site(SameSite::Lax)
|
||||||
.max_age(Duration::seconds(expires_in))
|
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
|
cookie.set_max_age(Duration::seconds(expires_in));
|
||||||
|
|
||||||
tracing::info!("Session created and cookie set for user: {}", payload.username);
|
tracing::info!("Session created and cookie set for user: {}", payload.username);
|
||||||
(StatusCode::OK, jar.add(cookie), "Login successful").into_response()
|
(StatusCode::OK, jar.add(cookie), Json(UserResponse { username: payload.username })).into_response()
|
||||||
}
|
}
|
||||||
Ok(false) => {
|
Ok(false) => {
|
||||||
tracing::warn!("Login failed: Invalid password for {}", payload.username);
|
tracing::warn!("Login failed: Invalid password for {}", payload.username);
|
||||||
@@ -120,7 +127,7 @@ pub async fn logout_handler(
|
|||||||
get,
|
get,
|
||||||
path = "/api/auth/check",
|
path = "/api/auth/check",
|
||||||
responses(
|
responses(
|
||||||
(status = 200, description = "Authenticated"),
|
(status = 200, description = "Authenticated", body = UserResponse),
|
||||||
(status = 401, description = "Not authenticated")
|
(status = 401, description = "Not authenticated")
|
||||||
)
|
)
|
||||||
)]
|
)]
|
||||||
@@ -130,7 +137,15 @@ pub async fn check_auth_handler(
|
|||||||
) -> impl IntoResponse {
|
) -> impl IntoResponse {
|
||||||
if let Some(token) = jar.get("auth_token") {
|
if let Some(token) = jar.get("auth_token") {
|
||||||
match state.db.get_session_user(token.value()).await {
|
match state.db.get_session_user(token.value()).await {
|
||||||
Ok(Some(_)) => return StatusCode::OK.into_response(),
|
Ok(Some(user_id)) => {
|
||||||
|
// Fetch username
|
||||||
|
// We need a helper in db.rs to get username by id, or we can use a direct query here if we don't want to change db.rs interface yet.
|
||||||
|
// But better to add `get_username_by_id` to db.rs
|
||||||
|
// For now let's query directly or via a new db method.
|
||||||
|
if let Ok(Some(username)) = state.db.get_username_by_id(user_id).await {
|
||||||
|
return (StatusCode::OK, Json(UserResponse { username })).into_response();
|
||||||
|
}
|
||||||
|
},
|
||||||
_ => {} // Invalid session
|
_ => {} // Invalid session
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -690,8 +690,10 @@ pub async fn handle_timeout_error(err: BoxError) -> (StatusCode, &'static str) {
|
|||||||
(status = 200, description = "VAPID public key", body = String)
|
(status = 200, description = "VAPID public key", body = String)
|
||||||
)
|
)
|
||||||
)]
|
)]
|
||||||
pub async fn get_push_public_key_handler() -> impl IntoResponse {
|
pub async fn get_push_public_key_handler(
|
||||||
let public_key = push::get_vapid_public_key();
|
State(state): State<AppState>,
|
||||||
|
) -> impl IntoResponse {
|
||||||
|
let public_key = state.push_store.get_public_key();
|
||||||
(StatusCode::OK, Json(serde_json::json!({ "publicKey": public_key }))).into_response()
|
(StatusCode::OK, Json(serde_json::json!({ "publicKey": public_key }))).into_response()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,8 @@ use axum::{
|
|||||||
};
|
};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use utoipa::ToSchema;
|
use utoipa::ToSchema;
|
||||||
|
use axum_extra::extract::cookie::{Cookie, CookieJar, SameSite};
|
||||||
|
use time::Duration;
|
||||||
|
|
||||||
#[derive(Deserialize, ToSchema)]
|
#[derive(Deserialize, ToSchema)]
|
||||||
pub struct SetupRequest {
|
pub struct SetupRequest {
|
||||||
@@ -41,7 +43,7 @@ pub async fn get_setup_status_handler(State(state): State<AppState>) -> impl Int
|
|||||||
path = "/api/setup",
|
path = "/api/setup",
|
||||||
request_body = SetupRequest,
|
request_body = SetupRequest,
|
||||||
responses(
|
responses(
|
||||||
(status = 200, description = "Setup completed"),
|
(status = 200, description = "Setup completed and logged in"),
|
||||||
(status = 400, description = "Invalid request"),
|
(status = 400, description = "Invalid request"),
|
||||||
(status = 403, description = "Setup already completed"),
|
(status = 403, description = "Setup already completed"),
|
||||||
(status = 500, description = "Internal server error")
|
(status = 500, description = "Internal server error")
|
||||||
@@ -49,6 +51,7 @@ pub async fn get_setup_status_handler(State(state): State<AppState>) -> impl Int
|
|||||||
)]
|
)]
|
||||||
pub async fn setup_handler(
|
pub async fn setup_handler(
|
||||||
State(state): State<AppState>,
|
State(state): State<AppState>,
|
||||||
|
jar: CookieJar,
|
||||||
Json(payload): Json<SetupRequest>,
|
Json(payload): Json<SetupRequest>,
|
||||||
) -> impl IntoResponse {
|
) -> impl IntoResponse {
|
||||||
// 1. Check if setup is already completed (i.e., users exist)
|
// 1. Check if setup is already completed (i.e., users exist)
|
||||||
@@ -68,7 +71,6 @@ pub async fn setup_handler(
|
|||||||
|
|
||||||
// 3. Create User
|
// 3. Create User
|
||||||
// Lower cost for faster login on low-power devices (MIPS routers etc.)
|
// Lower cost for faster login on low-power devices (MIPS routers etc.)
|
||||||
// Default is usually 12, which takes ~3s on slow CPUs. 6 should be much faster.
|
|
||||||
let password_hash = match bcrypt::hash(&payload.password, 6) {
|
let password_hash = match bcrypt::hash(&payload.password, 6) {
|
||||||
Ok(h) => h,
|
Ok(h) => h,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
@@ -82,5 +84,42 @@ pub async fn setup_handler(
|
|||||||
return (StatusCode::INTERNAL_SERVER_ERROR, "Failed to create user").into_response();
|
return (StatusCode::INTERNAL_SERVER_ERROR, "Failed to create user").into_response();
|
||||||
}
|
}
|
||||||
|
|
||||||
(StatusCode::OK, "Setup completed successfully").into_response()
|
// 4. Auto-Login (Create Session)
|
||||||
|
// Get the created user's ID
|
||||||
|
let user = match state.db.get_user_by_username(&payload.username).await {
|
||||||
|
Ok(Some(u)) => u,
|
||||||
|
Ok(None) => return (StatusCode::INTERNAL_SERVER_ERROR, "User created but not found").into_response(),
|
||||||
|
Err(e) => {
|
||||||
|
tracing::error!("DB error fetching new user: {}", e);
|
||||||
|
return (StatusCode::INTERNAL_SERVER_ERROR, "Database error").into_response();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
let (user_id, _) = user;
|
||||||
|
|
||||||
|
// Create session token
|
||||||
|
let token: String = (0..32).map(|_| {
|
||||||
|
use rand::{distributions::Alphanumeric, Rng};
|
||||||
|
rand::thread_rng().sample(Alphanumeric) as char
|
||||||
|
}).collect();
|
||||||
|
|
||||||
|
// Default expiration: 1 day (since it's not "remember me")
|
||||||
|
let expires_in = 60 * 60 * 24;
|
||||||
|
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 new user: {}", e);
|
||||||
|
// Even if session fails, setup is technically complete, but login failed.
|
||||||
|
// We return OK but user will have to login manually.
|
||||||
|
return (StatusCode::OK, "Setup completed, please login").into_response();
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut cookie = Cookie::build(("auth_token", token))
|
||||||
|
.path("/")
|
||||||
|
.http_only(true)
|
||||||
|
.same_site(SameSite::Lax)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
cookie.set_max_age(Duration::seconds(expires_in));
|
||||||
|
|
||||||
|
(StatusCode::OK, jar.add(cookie), "Setup completed and logged in").into_response()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ mod diff;
|
|||||||
mod handlers;
|
mod handlers;
|
||||||
#[cfg(feature = "push-notifications")]
|
#[cfg(feature = "push-notifications")]
|
||||||
mod push;
|
mod push;
|
||||||
|
mod rate_limit;
|
||||||
mod scgi;
|
mod scgi;
|
||||||
mod sse;
|
mod sse;
|
||||||
mod xmlrpc;
|
mod xmlrpc;
|
||||||
@@ -25,12 +26,15 @@ use std::sync::Arc;
|
|||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
use tokio::sync::{broadcast, watch};
|
use tokio::sync::{broadcast, watch};
|
||||||
use tower::ServiceBuilder;
|
use tower::ServiceBuilder;
|
||||||
|
use tower_governor::GovernorLayer;
|
||||||
use tower_http::{
|
use tower_http::{
|
||||||
compression::{CompressionLayer, CompressionLevel},
|
compression::{CompressionLayer, CompressionLevel},
|
||||||
cors::CorsLayer,
|
cors::CorsLayer,
|
||||||
trace::TraceLayer,
|
trace::TraceLayer,
|
||||||
};
|
};
|
||||||
|
#[cfg(feature = "swagger")]
|
||||||
use utoipa::OpenApi;
|
use utoipa::OpenApi;
|
||||||
|
#[cfg(feature = "swagger")]
|
||||||
use utoipa_swagger_ui::SwaggerUi;
|
use utoipa_swagger_ui::SwaggerUi;
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
@@ -90,8 +94,13 @@ struct Args {
|
|||||||
/// Database URL
|
/// Database URL
|
||||||
#[arg(long, env = "DATABASE_URL", default_value = "sqlite:vibetorrent.db")]
|
#[arg(long, env = "DATABASE_URL", default_value = "sqlite:vibetorrent.db")]
|
||||||
db_url: String,
|
db_url: String,
|
||||||
|
|
||||||
|
/// Reset password for the specified user
|
||||||
|
#[arg(long)]
|
||||||
|
reset_password: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(feature = "swagger")]
|
||||||
#[cfg(feature = "push-notifications")]
|
#[cfg(feature = "push-notifications")]
|
||||||
#[derive(OpenApi)]
|
#[derive(OpenApi)]
|
||||||
#[openapi(
|
#[openapi(
|
||||||
@@ -130,7 +139,8 @@ struct Args {
|
|||||||
push::PushKeys,
|
push::PushKeys,
|
||||||
handlers::auth::LoginRequest,
|
handlers::auth::LoginRequest,
|
||||||
handlers::setup::SetupRequest,
|
handlers::setup::SetupRequest,
|
||||||
handlers::setup::SetupStatusResponse
|
handlers::setup::SetupStatusResponse,
|
||||||
|
handlers::auth::UserResponse
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
tags(
|
tags(
|
||||||
@@ -139,6 +149,7 @@ struct Args {
|
|||||||
)]
|
)]
|
||||||
struct ApiDoc;
|
struct ApiDoc;
|
||||||
|
|
||||||
|
#[cfg(feature = "swagger")]
|
||||||
#[cfg(not(feature = "push-notifications"))]
|
#[cfg(not(feature = "push-notifications"))]
|
||||||
#[derive(OpenApi)]
|
#[derive(OpenApi)]
|
||||||
#[openapi(
|
#[openapi(
|
||||||
@@ -173,7 +184,8 @@ struct ApiDoc;
|
|||||||
shared::GlobalLimitRequest,
|
shared::GlobalLimitRequest,
|
||||||
handlers::auth::LoginRequest,
|
handlers::auth::LoginRequest,
|
||||||
handlers::setup::SetupRequest,
|
handlers::setup::SetupRequest,
|
||||||
handlers::setup::SetupStatusResponse
|
handlers::setup::SetupStatusResponse,
|
||||||
|
handlers::auth::UserResponse
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
tags(
|
tags(
|
||||||
@@ -197,9 +209,6 @@ async fn main() {
|
|||||||
|
|
||||||
// Parse CLI Args
|
// Parse CLI Args
|
||||||
let args = Args::parse();
|
let args = Args::parse();
|
||||||
tracing::info!("Starting VibeTorrent Backend...");
|
|
||||||
tracing::info!("Socket: {}", args.socket);
|
|
||||||
tracing::info!("Port: {}", args.port);
|
|
||||||
|
|
||||||
// Initialize Database
|
// Initialize Database
|
||||||
tracing::info!("Connecting to database: {}", args.db_url);
|
tracing::info!("Connecting to database: {}", args.db_url);
|
||||||
@@ -224,6 +233,66 @@ async fn main() {
|
|||||||
};
|
};
|
||||||
tracing::info!("Database connected successfully.");
|
tracing::info!("Database connected successfully.");
|
||||||
|
|
||||||
|
// Handle Password Reset
|
||||||
|
if let Some(username) = args.reset_password {
|
||||||
|
tracing::info!("Resetting password for user: {}", username);
|
||||||
|
|
||||||
|
// Check if user exists
|
||||||
|
let user_result = db.get_user_by_username(&username).await;
|
||||||
|
|
||||||
|
match user_result {
|
||||||
|
Ok(Some((user_id, _))) => {
|
||||||
|
// Generate random password
|
||||||
|
use rand::{distributions::Alphanumeric, Rng};
|
||||||
|
let new_password: String = rand::thread_rng()
|
||||||
|
.sample_iter(&Alphanumeric)
|
||||||
|
.take(12)
|
||||||
|
.map(char::from)
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
// Hash password (low cost for performance)
|
||||||
|
let password_hash = match bcrypt::hash(&new_password, 6) {
|
||||||
|
Ok(h) => h,
|
||||||
|
Err(e) => {
|
||||||
|
tracing::error!("Failed to hash password: {}", e);
|
||||||
|
std::process::exit(1);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Update in DB
|
||||||
|
if let Err(e) = db.update_password(user_id, &password_hash).await {
|
||||||
|
tracing::error!("Failed to update password in DB: {}", e);
|
||||||
|
std::process::exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
println!("--------------------------------------------------");
|
||||||
|
println!("Password reset successfully for user: {}", username);
|
||||||
|
println!("New Password: {}", new_password);
|
||||||
|
println!("--------------------------------------------------");
|
||||||
|
|
||||||
|
// Invalidate existing sessions for security
|
||||||
|
if let Err(e) = db.delete_all_sessions_for_user(user_id).await {
|
||||||
|
tracing::warn!("Failed to invalidate existing sessions: {}", e);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::process::exit(0);
|
||||||
|
},
|
||||||
|
Ok(None) => {
|
||||||
|
tracing::error!("User '{}' not found.", username);
|
||||||
|
std::process::exit(1);
|
||||||
|
},
|
||||||
|
Err(e) => {
|
||||||
|
tracing::error!("Database error: {}", e);
|
||||||
|
std::process::exit(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
tracing::info!("Starting VibeTorrent Backend...");
|
||||||
|
tracing::info!("Socket: {}", args.socket);
|
||||||
|
tracing::info!("Port: {}", args.port);
|
||||||
|
|
||||||
|
// ... rest of the main function ...
|
||||||
// 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() {
|
||||||
@@ -255,13 +324,25 @@ async fn main() {
|
|||||||
// Channel for Events (Diffs)
|
// Channel for Events (Diffs)
|
||||||
let (event_bus, _) = broadcast::channel::<AppEvent>(1024);
|
let (event_bus, _) = broadcast::channel::<AppEvent>(1024);
|
||||||
|
|
||||||
|
#[cfg(feature = "push-notifications")]
|
||||||
|
let push_store = match push::PushSubscriptionStore::with_db(&db).await {
|
||||||
|
Ok(store) => store,
|
||||||
|
Err(e) => {
|
||||||
|
tracing::error!("Failed to initialize push store: {}", e);
|
||||||
|
push::PushSubscriptionStore::new()
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
#[cfg(not(feature = "push-notifications"))]
|
||||||
|
let push_store = ();
|
||||||
|
|
||||||
let app_state = AppState {
|
let app_state = AppState {
|
||||||
tx: tx.clone(),
|
tx: tx.clone(),
|
||||||
event_bus: event_bus.clone(),
|
event_bus: event_bus.clone(),
|
||||||
scgi_socket_path: args.socket.clone(),
|
scgi_socket_path: args.socket.clone(),
|
||||||
db: db.clone(),
|
db: db.clone(),
|
||||||
#[cfg(feature = "push-notifications")]
|
#[cfg(feature = "push-notifications")]
|
||||||
push_store: push::PushSubscriptionStore::new(),
|
push_store,
|
||||||
};
|
};
|
||||||
|
|
||||||
// Spawn background task to poll rTorrent
|
// Spawn background task to poll rTorrent
|
||||||
@@ -385,12 +466,21 @@ async fn main() {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
let app = Router::new()
|
let app = Router::new();
|
||||||
.merge(SwaggerUi::new("/swagger-ui").url("/api-docs/openapi.json", ApiDoc::openapi()))
|
|
||||||
// Setup & Auth Routes
|
#[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/status", get(handlers::setup::get_setup_status_handler))
|
||||||
.route("/api/setup", post(handlers::setup::setup_handler))
|
.route("/api/setup", post(handlers::setup::setup_handler))
|
||||||
.route("/api/auth/login", post(handlers::auth::login_handler))
|
.route(
|
||||||
|
"/api/auth/login",
|
||||||
|
post(handlers::auth::login_handler).layer(GovernorLayer::new(Arc::new(
|
||||||
|
rate_limit::get_login_rate_limit_config(),
|
||||||
|
))),
|
||||||
|
)
|
||||||
.route("/api/auth/logout", post(handlers::auth::logout_handler))
|
.route("/api/auth/logout", post(handlers::auth::logout_handler))
|
||||||
.route("/api/auth/check", get(handlers::auth::check_auth_handler))
|
.route("/api/auth/check", get(handlers::auth::check_auth_handler))
|
||||||
// App Routes
|
// App Routes
|
||||||
@@ -459,7 +549,12 @@ async fn main() {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
tracing::info!("Backend listening on {}", addr);
|
tracing::info!("Backend listening on {}", addr);
|
||||||
if let Err(e) = axum::serve(listener, app).await {
|
if let Err(e) = axum::serve(
|
||||||
|
listener,
|
||||||
|
app.into_make_service_with_connect_info::<SocketAddr>(),
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
{
|
||||||
tracing::error!("Server error: {}", e);
|
tracing::error!("Server error: {}", e);
|
||||||
std::process::exit(1);
|
std::process::exit(1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,11 +5,9 @@ use utoipa::ToSchema;
|
|||||||
use web_push::{
|
use web_push::{
|
||||||
HyperWebPushClient, SubscriptionInfo, VapidSignatureBuilder, WebPushClient, WebPushMessageBuilder,
|
HyperWebPushClient, SubscriptionInfo, VapidSignatureBuilder, WebPushClient, WebPushMessageBuilder,
|
||||||
};
|
};
|
||||||
|
use futures::StreamExt;
|
||||||
|
|
||||||
// VAPID keys - PRODUCTION'DA ENVIRONMENT VARIABLE'DAN ALINMALI!
|
use crate::db::Db;
|
||||||
const VAPID_PUBLIC_KEY: &str = "BEdPj6XQR7MGzM28Nev9wokF5upHoydNDahouJbQ9ZdBJpEFAN1iNfANSEvY0ItasNY5zcvvqN_tjUt64Rfd0gU";
|
|
||||||
const VAPID_PRIVATE_KEY: &str = "aUcCYJ7kUd9UClCaWwad0IVgbYJ6svwl19MjSX7GH10";
|
|
||||||
const VAPID_EMAIL: &str = "mailto:admin@vibetorrent.app";
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
#[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
|
||||||
pub struct PushSubscription {
|
pub struct PushSubscription {
|
||||||
@@ -23,39 +21,107 @@ pub struct PushKeys {
|
|||||||
pub auth: String,
|
pub auth: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// In-memory store for push subscriptions
|
#[derive(Clone)]
|
||||||
/// TODO: Replace with database in production
|
pub struct VapidConfig {
|
||||||
#[derive(Default, Clone)]
|
pub private_key: String,
|
||||||
|
pub public_key: String,
|
||||||
|
pub email: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone)]
|
||||||
pub struct PushSubscriptionStore {
|
pub struct PushSubscriptionStore {
|
||||||
|
db: Option<Db>,
|
||||||
subscriptions: Arc<RwLock<Vec<PushSubscription>>>,
|
subscriptions: Arc<RwLock<Vec<PushSubscription>>>,
|
||||||
|
vapid_config: VapidConfig,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl PushSubscriptionStore {
|
impl PushSubscriptionStore {
|
||||||
pub fn new() -> Self {
|
pub fn new() -> Self {
|
||||||
|
let private_key = std::env::var("VAPID_PRIVATE_KEY").expect("VAPID_PRIVATE_KEY must be set in .env");
|
||||||
|
let public_key = std::env::var("VAPID_PUBLIC_KEY").expect("VAPID_PUBLIC_KEY must be set in .env");
|
||||||
|
let email = std::env::var("VAPID_EMAIL").expect("VAPID_EMAIL must be set in .env");
|
||||||
|
|
||||||
Self {
|
Self {
|
||||||
|
db: None,
|
||||||
subscriptions: Arc::new(RwLock::new(Vec::new())),
|
subscriptions: Arc::new(RwLock::new(Vec::new())),
|
||||||
|
vapid_config: VapidConfig {
|
||||||
|
private_key,
|
||||||
|
public_key,
|
||||||
|
email,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn with_db(db: &Db) -> Result<Self, Box<dyn std::error::Error>> {
|
||||||
|
let mut subscriptions_vec: Vec<PushSubscription> = Vec::new();
|
||||||
|
|
||||||
|
// Load existing subscriptions from DB
|
||||||
|
let subs = db.get_all_push_subscriptions().await?;
|
||||||
|
for (endpoint, p256dh, auth) in subs {
|
||||||
|
subscriptions_vec.push(PushSubscription {
|
||||||
|
endpoint,
|
||||||
|
keys: PushKeys { p256dh, auth },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
tracing::info!("Loaded {} push subscriptions from database", subscriptions_vec.len());
|
||||||
|
|
||||||
|
let private_key = std::env::var("VAPID_PRIVATE_KEY").expect("VAPID_PRIVATE_KEY must be set in .env");
|
||||||
|
let public_key = std::env::var("VAPID_PUBLIC_KEY").expect("VAPID_PUBLIC_KEY must be set in .env");
|
||||||
|
let email = std::env::var("VAPID_EMAIL").expect("VAPID_EMAIL must be set in .env");
|
||||||
|
|
||||||
|
Ok(Self {
|
||||||
|
db: Some(db.clone()),
|
||||||
|
subscriptions: Arc::new(RwLock::new(subscriptions_vec)),
|
||||||
|
vapid_config: VapidConfig {
|
||||||
|
private_key,
|
||||||
|
public_key,
|
||||||
|
email,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
pub async fn add_subscription(&self, subscription: PushSubscription) {
|
pub async fn add_subscription(&self, subscription: PushSubscription) {
|
||||||
|
// Add to memory
|
||||||
let mut subs = self.subscriptions.write().await;
|
let mut subs = self.subscriptions.write().await;
|
||||||
|
|
||||||
// Remove duplicate endpoint if exists
|
// Remove duplicate endpoint if exists
|
||||||
subs.retain(|s| s.endpoint != subscription.endpoint);
|
subs.retain(|s| s.endpoint != subscription.endpoint);
|
||||||
|
subs.push(subscription.clone());
|
||||||
subs.push(subscription);
|
|
||||||
tracing::info!("Added push subscription. Total: {}", subs.len());
|
tracing::info!("Added push subscription. Total: {}", subs.len());
|
||||||
|
|
||||||
|
// Save to DB if available
|
||||||
|
if let Some(db) = &self.db {
|
||||||
|
if let Err(e) = db.save_push_subscription(
|
||||||
|
&subscription.endpoint,
|
||||||
|
&subscription.keys.p256dh,
|
||||||
|
&subscription.keys.auth,
|
||||||
|
).await {
|
||||||
|
tracing::error!("Failed to save push subscription to DB: {}", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn remove_subscription(&self, endpoint: &str) {
|
pub async fn remove_subscription(&self, endpoint: &str) {
|
||||||
|
// Remove from memory
|
||||||
let mut subs = self.subscriptions.write().await;
|
let mut subs = self.subscriptions.write().await;
|
||||||
subs.retain(|s| s.endpoint != endpoint);
|
subs.retain(|s| s.endpoint != endpoint);
|
||||||
tracing::info!("Removed push subscription. Total: {}", subs.len());
|
tracing::info!("Removed push subscription. Total: {}", subs.len());
|
||||||
|
|
||||||
|
// Remove from DB if available
|
||||||
|
if let Some(db) = &self.db {
|
||||||
|
if let Err(e) = db.remove_push_subscription(endpoint).await {
|
||||||
|
tracing::error!("Failed to remove push subscription from DB: {}", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn get_all_subscriptions(&self) -> Vec<PushSubscription> {
|
pub async fn get_all_subscriptions(&self) -> Vec<PushSubscription> {
|
||||||
self.subscriptions.read().await.clone()
|
self.subscriptions.read().await.clone()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn get_public_key(&self) -> &str {
|
||||||
|
&self.vapid_config.public_key
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Send push notification to all subscribed clients
|
/// Send push notification to all subscribed clients
|
||||||
@@ -65,7 +131,7 @@ pub async fn send_push_notification(
|
|||||||
body: &str,
|
body: &str,
|
||||||
) -> Result<(), Box<dyn std::error::Error>> {
|
) -> Result<(), Box<dyn std::error::Error>> {
|
||||||
let subscriptions = store.get_all_subscriptions().await;
|
let subscriptions = store.get_all_subscriptions().await;
|
||||||
|
|
||||||
if subscriptions.is_empty() {
|
if subscriptions.is_empty() {
|
||||||
tracing::debug!("No push subscriptions to send to");
|
tracing::debug!("No push subscriptions to send to");
|
||||||
return Ok(());
|
return Ok(());
|
||||||
@@ -81,47 +147,68 @@ pub async fn send_push_notification(
|
|||||||
"tag": "vibetorrent"
|
"tag": "vibetorrent"
|
||||||
});
|
});
|
||||||
|
|
||||||
let client = HyperWebPushClient::new();
|
let client = Arc::new(HyperWebPushClient::new());
|
||||||
|
let vapid_config = store.vapid_config.clone();
|
||||||
|
let payload_str = payload.to_string();
|
||||||
|
|
||||||
for subscription in subscriptions {
|
// Send notifications concurrently
|
||||||
let subscription_info = SubscriptionInfo {
|
futures::stream::iter(subscriptions)
|
||||||
endpoint: subscription.endpoint.clone(),
|
.for_each_concurrent(10, |subscription| {
|
||||||
keys: web_push::SubscriptionKeys {
|
let client = client.clone();
|
||||||
p256dh: subscription.keys.p256dh.clone(),
|
let vapid_config = vapid_config.clone();
|
||||||
auth: subscription.keys.auth.clone(),
|
let payload_str = payload_str.clone();
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
let mut sig_builder = VapidSignatureBuilder::from_base64(
|
async move {
|
||||||
VAPID_PRIVATE_KEY,
|
let subscription_info = SubscriptionInfo {
|
||||||
web_push::URL_SAFE_NO_PAD,
|
endpoint: subscription.endpoint.clone(),
|
||||||
&subscription_info,
|
keys: web_push::SubscriptionKeys {
|
||||||
)?;
|
p256dh: subscription.keys.p256dh.clone(),
|
||||||
|
auth: subscription.keys.auth.clone(),
|
||||||
sig_builder.add_claim("sub", VAPID_EMAIL);
|
},
|
||||||
sig_builder.add_claim("aud", subscription.endpoint.clone());
|
};
|
||||||
let signature = sig_builder.build()?;
|
|
||||||
|
|
||||||
let mut builder = WebPushMessageBuilder::new(&subscription_info);
|
let sig_res = VapidSignatureBuilder::from_base64(
|
||||||
builder.set_vapid_signature(signature);
|
&vapid_config.private_key,
|
||||||
|
web_push::URL_SAFE_NO_PAD,
|
||||||
let payload_str = payload.to_string();
|
&subscription_info,
|
||||||
builder.set_payload(web_push::ContentEncoding::Aes128Gcm, payload_str.as_bytes());
|
);
|
||||||
|
|
||||||
match client.send(builder.build()?).await {
|
match sig_res {
|
||||||
Ok(_) => {
|
Ok(mut sig_builder) => {
|
||||||
tracing::debug!("Push notification sent to: {}", subscription.endpoint);
|
sig_builder.add_claim("sub", vapid_config.email.as_str());
|
||||||
|
sig_builder.add_claim("aud", subscription.endpoint.as_str());
|
||||||
|
|
||||||
|
match sig_builder.build() {
|
||||||
|
Ok(signature) => {
|
||||||
|
let mut builder = WebPushMessageBuilder::new(&subscription_info);
|
||||||
|
builder.set_vapid_signature(signature);
|
||||||
|
builder.set_payload(web_push::ContentEncoding::Aes128Gcm, payload_str.as_bytes());
|
||||||
|
|
||||||
|
match builder.build() {
|
||||||
|
Ok(msg) => {
|
||||||
|
match client.send(msg).await {
|
||||||
|
Ok(_) => {
|
||||||
|
tracing::debug!("Push notification sent to: {}", subscription.endpoint);
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
tracing::error!("Failed to send push notification to {}: {}", subscription.endpoint, e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(e) => tracing::error!("Failed to build push message: {}", e),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(e) => tracing::error!("Failed to build VAPID signature: {}", e),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(e) => tracing::error!("Failed to create VAPID signature builder: {}", e),
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Err(e) => {
|
})
|
||||||
tracing::error!("Failed to send push notification: {}", e);
|
.await;
|
||||||
// TODO: Remove invalid subscriptions
|
|
||||||
}
|
Ok(())
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn get_vapid_public_key() -> &'static str {
|
|
||||||
VAPID_PUBLIC_KEY
|
|
||||||
}
|
|
||||||
16
backend/src/rate_limit.rs
Normal file
16
backend/src/rate_limit.rs
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
use governor::clock::QuantaInstant;
|
||||||
|
use governor::middleware::NoOpMiddleware;
|
||||||
|
use tower_governor::governor::GovernorConfig;
|
||||||
|
use tower_governor::governor::GovernorConfigBuilder;
|
||||||
|
use tower_governor::key_extractor::SmartIpKeyExtractor;
|
||||||
|
|
||||||
|
pub fn get_login_rate_limit_config() -> GovernorConfig<SmartIpKeyExtractor, NoOpMiddleware<QuantaInstant>> {
|
||||||
|
// 5 yanlış denemeden sonra bloklanır.
|
||||||
|
// Her yeni hak için 60 saniye (1 dakika) bekleme süresi.
|
||||||
|
GovernorConfigBuilder::default()
|
||||||
|
.key_extractor(SmartIpKeyExtractor)
|
||||||
|
.per_second(60)
|
||||||
|
.burst_size(5)
|
||||||
|
.finish()
|
||||||
|
.unwrap()
|
||||||
|
}
|
||||||
@@ -20,6 +20,8 @@ RUN apt-get update && apt-get install -y \
|
|||||||
jq \
|
jq \
|
||||||
# Needed for some crate compilations
|
# Needed for some crate compilations
|
||||||
protobuf-compiler \
|
protobuf-compiler \
|
||||||
|
# Install binaryen to have wasm-opt available system-wide
|
||||||
|
binaryen \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# 2. Install Node.js v20 (Manual install to support multi-arch cleanly)
|
# 2. Install Node.js v20 (Manual install to support multi-arch cleanly)
|
||||||
@@ -70,7 +72,7 @@ RUN . "$HOME/.cargo/env" && \
|
|||||||
ARCH=$(dpkg --print-architecture) && \
|
ARCH=$(dpkg --print-architecture) && \
|
||||||
if [ "$ARCH" = "amd64" ]; then TRUNK_ARCH="x86_64-unknown-linux-gnu"; \
|
if [ "$ARCH" = "amd64" ]; then TRUNK_ARCH="x86_64-unknown-linux-gnu"; \
|
||||||
elif [ "$ARCH" = "arm64" ]; then TRUNK_ARCH="aarch64-unknown-linux-gnu"; fi && \
|
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/ && \
|
wget -qO- "https://github.com/trunk-rs/trunk/releases/download/v0.21.14/trunk-$TRUNK_ARCH.tar.gz" | tar -xzf - -C /root/.cargo/bin/ && \
|
||||||
chmod +x /root/.cargo/bin/trunk && \
|
chmod +x /root/.cargo/bin/trunk && \
|
||||||
# Install wasm-bindgen-cli (Compiling from source to avoid glibc issues, doing it ONCE here)
|
# Install wasm-bindgen-cli (Compiling from source to avoid glibc issues, doing it ONCE here)
|
||||||
cargo install wasm-bindgen-cli --version 0.2.108
|
cargo install wasm-bindgen-cli --version 0.2.108
|
||||||
|
|||||||
@@ -21,34 +21,12 @@ wasm-bindgen = "0.2"
|
|||||||
wasm-bindgen-futures = "0.4"
|
wasm-bindgen-futures = "0.4"
|
||||||
uuid = { version = "1", features = ["v4", "js"] }
|
uuid = { version = "1", features = ["v4", "js"] }
|
||||||
futures = "0.3"
|
futures = "0.3"
|
||||||
chrono = { version = "0.4", features = ["serde"] }
|
chrono = { version = "0.4", features = ["serde", "wasm-bindgen"] }
|
||||||
web-sys = { version = "0.3", features = [
|
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"] }
|
||||||
"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"
|
|
||||||
] }
|
|
||||||
shared = { path = "../shared" }
|
shared = { path = "../shared" }
|
||||||
tailwind_fuse = "0.3.2"
|
tailwind_fuse = "0.3.2"
|
||||||
js-sys = "0.3.85"
|
js-sys = "0.3.85"
|
||||||
|
base64 = "0.22.1"
|
||||||
|
serde-wasm-bindgen = "0.6.5"
|
||||||
|
leptos-use = "0.13"
|
||||||
|
codee = "0.2"
|
||||||
|
|||||||
@@ -86,12 +86,15 @@
|
|||||||
id="app-loading"
|
id="app-loading"
|
||||||
style="
|
style="
|
||||||
display: flex;
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
height: 100vh;
|
height: 100vh;
|
||||||
|
font-family: sans-serif;
|
||||||
"
|
"
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
|
id="app-loading-spinner"
|
||||||
style="
|
style="
|
||||||
width: 40px;
|
width: 40px;
|
||||||
height: 40px;
|
height: 40px;
|
||||||
@@ -102,6 +105,32 @@
|
|||||||
opacity: 0.5;
|
opacity: 0.5;
|
||||||
"
|
"
|
||||||
></div>
|
></div>
|
||||||
|
<div
|
||||||
|
id="app-loading-error"
|
||||||
|
style="display: none; text-align: center; margin-top: 20px; padding: 0 20px"
|
||||||
|
>
|
||||||
|
<p style="color: #ef4444; font-weight: bold; margin-bottom: 8px">
|
||||||
|
Uygulama yüklenemedi
|
||||||
|
</p>
|
||||||
|
<p style="font-size: 14px; opacity: 0.7">
|
||||||
|
Bağlantınız yavaş olabilir veya bir sistem hatası oluşmuş olabilir.
|
||||||
|
</p>
|
||||||
|
<button
|
||||||
|
onclick="location.reload()"
|
||||||
|
style="
|
||||||
|
margin-top: 16px;
|
||||||
|
padding: 8px 16px;
|
||||||
|
background: #3b82f6;
|
||||||
|
color: white;
|
||||||
|
border: none;
|
||||||
|
border-radius: 6px;
|
||||||
|
cursor: pointer;
|
||||||
|
font-weight: 500;
|
||||||
|
"
|
||||||
|
>
|
||||||
|
Sayfayı Yenile
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<style>
|
<style>
|
||||||
@keyframes spin {
|
@keyframes spin {
|
||||||
@@ -114,6 +143,34 @@
|
|||||||
display: none !important;
|
display: none !important;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
// App loading timeout handler
|
||||||
|
(function () {
|
||||||
|
var timeout = setTimeout(function () {
|
||||||
|
if (!document.body.classList.contains("app-loaded")) {
|
||||||
|
var spinner = document.getElementById("app-loading-spinner");
|
||||||
|
var error = document.getElementById("app-loading-error");
|
||||||
|
if (spinner) spinner.style.display = "none";
|
||||||
|
if (error) error.style.display = "block";
|
||||||
|
}
|
||||||
|
}, 15000); // 15 seconds timeout
|
||||||
|
|
||||||
|
// Clean up timeout if app loads
|
||||||
|
var observer = new MutationObserver(function (mutations) {
|
||||||
|
mutations.forEach(function (mutation) {
|
||||||
|
if (
|
||||||
|
mutation.attributeName === "class" &&
|
||||||
|
document.body.classList.contains("app-loaded")
|
||||||
|
) {
|
||||||
|
clearTimeout(timeout);
|
||||||
|
observer.disconnect();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
observer.observe(document.body, { attributes: true });
|
||||||
|
})();
|
||||||
|
</script>
|
||||||
|
|
||||||
<!-- Service Worker Registration & PWA Setup -->
|
<!-- Service Worker Registration & PWA Setup -->
|
||||||
<script>
|
<script>
|
||||||
|
|||||||
@@ -12,6 +12,11 @@ struct SetupStatus {
|
|||||||
completed: bool,
|
completed: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
struct UserResponse {
|
||||||
|
username: String,
|
||||||
|
}
|
||||||
|
|
||||||
#[component]
|
#[component]
|
||||||
pub fn App() -> impl IntoView {
|
pub fn App() -> impl IntoView {
|
||||||
crate::store::provide_torrent_store();
|
crate::store::provide_torrent_store();
|
||||||
@@ -51,27 +56,41 @@ pub fn App() -> impl IntoView {
|
|||||||
// 2. Check Auth Status
|
// 2. Check Auth Status
|
||||||
let auth_res = gloo_net::http::Request::get("/api/auth/check").send().await;
|
let auth_res = gloo_net::http::Request::get("/api/auth/check").send().await;
|
||||||
|
|
||||||
match auth_res {
|
match auth_res {
|
||||||
Ok(resp) => {
|
Ok(resp) => {
|
||||||
if resp.status() == 200 {
|
if resp.status() == 200 {
|
||||||
logging::log!("Authenticated!");
|
logging::log!("Authenticated!");
|
||||||
set_is_authenticated.set(true);
|
|
||||||
} else {
|
|
||||||
logging::log!("Not authenticated, redirecting to /login");
|
|
||||||
let navigate = use_navigate();
|
|
||||||
let pathname = window().location().pathname().unwrap_or_default();
|
|
||||||
if pathname != "/login" && pathname != "/setup" {
|
|
||||||
navigate("/login", Default::default());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Err(e) => logging::error!("Network error checking auth status: {}", e),
|
|
||||||
}
|
|
||||||
|
|
||||||
|
// Parse user info
|
||||||
|
if let Ok(user_info) = resp.json::<UserResponse>().await {
|
||||||
|
if let Some(store) = use_context::<crate::store::TorrentStore>() {
|
||||||
|
store.user.set(Some(user_info.username));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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();
|
||||||
|
let pathname = window().location().pathname().unwrap_or_default();
|
||||||
|
if pathname != "/login" && pathname != "/setup" {
|
||||||
|
navigate("/login", Default::default());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(e) => logging::error!("Network error checking auth status: {}", e),
|
||||||
|
}
|
||||||
set_is_loading.set(false);
|
set_is_loading.set(false);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// Initialize push notifications (Only if authenticated)
|
// Initialize push notifications (Only if authenticated)
|
||||||
create_effect(move |_| {
|
create_effect(move |_| {
|
||||||
if is_authenticated.get() {
|
if is_authenticated.get() {
|
||||||
|
|||||||
@@ -1,17 +1,18 @@
|
|||||||
use leptos::*;
|
use leptos::*;
|
||||||
use leptos_router::*;
|
|
||||||
use serde::Serialize;
|
use serde::Serialize;
|
||||||
|
|
||||||
#[derive(Serialize)]
|
#[derive(Serialize)]
|
||||||
struct LoginRequest {
|
struct LoginRequest {
|
||||||
username: String,
|
username: String,
|
||||||
password: String,
|
password: String,
|
||||||
|
remember_me: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[component]
|
#[component]
|
||||||
pub fn Login() -> impl IntoView {
|
pub fn Login() -> impl IntoView {
|
||||||
let (username, set_username) = create_signal(String::new());
|
let (username, set_username) = create_signal(String::new());
|
||||||
let (password, set_password) = create_signal(String::new());
|
let (password, set_password) = create_signal(String::new());
|
||||||
|
let (remember_me, set_remember_me) = create_signal(false);
|
||||||
let (error, set_error) = create_signal(Option::<String>::None);
|
let (error, set_error) = create_signal(Option::<String>::None);
|
||||||
let (loading, set_loading) = create_signal(false);
|
let (loading, set_loading) = create_signal(false);
|
||||||
|
|
||||||
@@ -26,6 +27,7 @@ pub fn Login() -> impl IntoView {
|
|||||||
let req = LoginRequest {
|
let req = LoginRequest {
|
||||||
username: username.get(),
|
username: username.get(),
|
||||||
password: password.get(),
|
password: password.get(),
|
||||||
|
remember_me: remember_me.get(),
|
||||||
};
|
};
|
||||||
|
|
||||||
let client = gloo_net::http::Request::post("/api/auth/login")
|
let client = gloo_net::http::Request::post("/api/auth/login")
|
||||||
@@ -39,6 +41,8 @@ pub fn Login() -> impl IntoView {
|
|||||||
logging::log!("Login successful, redirecting...");
|
logging::log!("Login successful, redirecting...");
|
||||||
// Force a full reload to re-run auth checks in App.rs
|
// Force a full reload to re-run auth checks in App.rs
|
||||||
let _ = window().location().set_href("/");
|
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 {
|
} else {
|
||||||
let text = resp.text().await.unwrap_or_default();
|
let text = resp.text().await.unwrap_or_default();
|
||||||
logging::error!("Login failed: {}", text);
|
logging::error!("Login failed: {}", text);
|
||||||
@@ -89,6 +93,19 @@ pub fn Login() -> impl IntoView {
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="form-control mt-4">
|
||||||
|
<label class="label cursor-pointer justify-start gap-3">
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
class="checkbox checkbox-primary checkbox-sm"
|
||||||
|
prop:checked=remember_me
|
||||||
|
on:change=move |ev| set_remember_me.set(event_target_checked(&ev))
|
||||||
|
disabled=move || loading.get()
|
||||||
|
/>
|
||||||
|
<span class="label-text">"Beni Hatırla"</span>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
<Show when=move || error.get().is_some()>
|
<Show when=move || error.get().is_some()>
|
||||||
<div class="alert alert-error mt-4 text-sm py-2">
|
<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>
|
<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>
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
use leptos::*;
|
use leptos::*;
|
||||||
use leptos_router::*;
|
|
||||||
use serde::Serialize;
|
use serde::Serialize;
|
||||||
|
|
||||||
#[derive(Serialize)]
|
#[derive(Serialize)]
|
||||||
@@ -49,8 +48,9 @@ pub fn Setup() -> impl IntoView {
|
|||||||
match client.send().await {
|
match client.send().await {
|
||||||
Ok(resp) => {
|
Ok(resp) => {
|
||||||
if resp.ok() {
|
if resp.ok() {
|
||||||
// Redirect to login after setup (full reload to be safe)
|
// Redirect to home after setup (auto-login handled by backend)
|
||||||
let _ = window().location().set_href("/login");
|
// Full reload to ensure auth state is refreshed
|
||||||
|
let _ = window().location().set_href("/");
|
||||||
} else {
|
} else {
|
||||||
let text = resp.text().await.unwrap_or_default();
|
let text = resp.text().await.unwrap_or_default();
|
||||||
set_error.set(Some(format!("Hata: {}", text)));
|
set_error.set(Some(format!("Hata: {}", text)));
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
use leptos::*;
|
use leptos::*;
|
||||||
|
use leptos_use::on_click_outside;
|
||||||
|
|
||||||
#[component]
|
#[component]
|
||||||
pub fn ContextMenu(
|
pub fn ContextMenu(
|
||||||
@@ -8,6 +9,10 @@ pub fn ContextMenu(
|
|||||||
on_close: Callback<()>,
|
on_close: Callback<()>,
|
||||||
on_action: Callback<(String, String)>, // (Action, Hash)
|
on_action: Callback<(String, String)>, // (Action, Hash)
|
||||||
) -> impl IntoView {
|
) -> 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 handle_action = move |action: &str| {
|
||||||
let hash = torrent_hash.clone();
|
let hash = torrent_hash.clone();
|
||||||
let action_str = action.to_string();
|
let action_str = action.to_string();
|
||||||
@@ -22,16 +27,8 @@ pub fn ContextMenu(
|
|||||||
}
|
}
|
||||||
|
|
||||||
view! {
|
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
|
<div
|
||||||
|
node_ref=container_ref
|
||||||
class="fixed z-[100] min-w-[200px] animate-in fade-in zoom-in-95 duration-100"
|
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)
|
style=format!("left: {}px; top: {}px", position.0, position.1)
|
||||||
on:contextmenu=move |e| e.prevent_default()
|
on:contextmenu=move |e| e.prevent_default()
|
||||||
|
|||||||
@@ -86,88 +86,190 @@ pub fn Sidebar() -> impl IntoView {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
view! {
|
let username = move || {
|
||||||
<div class="w-64 min-h-[100dvh] flex flex-col bg-base-200 border-r border-base-300 pb-8" style="padding-top: env(safe-area-inset-top);">
|
|
||||||
<div class="p-2 flex-1 overflow-y-auto"> <ul class="menu w-full rounded-box gap-1">
|
store.user.get().unwrap_or_else(|| "User".to_string())
|
||||||
<li class="menu-title text-primary uppercase font-bold px-4">"Filters"</li>
|
|
||||||
<li>
|
};
|
||||||
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::All))} on:click=move |_| set_filter(crate::store::FilterStatus::All)>
|
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
|
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" d="M3.75 6.75h16.5M3.75 12h16.5m-16.5 5.25h16.5" />
|
|
||||||
</svg>
|
let first_letter = move || {
|
||||||
"All"
|
|
||||||
<span class="badge badge-sm badge-ghost ml-auto">{total_count}</span>
|
username().chars().next().unwrap_or('?').to_uppercase().to_string()
|
||||||
</button>
|
|
||||||
</li>
|
};
|
||||||
<li>
|
|
||||||
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Downloading))} on:click=move |_| set_filter(crate::store::FilterStatus::Downloading)>
|
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
|
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" d="M3 16.5v2.25A2.25 2.25 0 005.25 21h13.5A2.25 2.25 0 0021 18.75V16.5M16.5 12L12 16.5m0 0L7.5 12m4.5 4.5V3" />
|
view! {
|
||||||
</svg>
|
|
||||||
"Downloading"
|
<div class="w-64 min-h-[100dvh] flex flex-col bg-base-200 border-r border-base-300 pb-8" style="padding-top: env(safe-area-inset-top);">
|
||||||
<span class="badge badge-sm badge-ghost ml-auto">{downloading_count}</span>
|
|
||||||
</button>
|
<div class="p-2 flex-1 overflow-y-auto">
|
||||||
</li>
|
|
||||||
<li>
|
<ul class="menu w-full rounded-box gap-1">
|
||||||
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Seeding))} on:click=move |_| set_filter(crate::store::FilterStatus::Seeding)>
|
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
|
<li class="menu-title text-primary uppercase font-bold px-4">"Filters"</li>
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" d="M3 16.5v2.25A2.25 2.25 0 005.25 21h13.5A2.25 2.25 0 0021 18.75V16.5m-13.5-9L12 3m0 0l4.5 4.5M12 3v13.5" />
|
|
||||||
</svg>
|
<li>
|
||||||
"Seeding"
|
|
||||||
<span class="badge badge-sm badge-ghost ml-auto">{seeding_count}</span>
|
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::All))} on:click=move |_| set_filter(crate::store::FilterStatus::All)>
|
||||||
</button>
|
|
||||||
</li>
|
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
|
||||||
<li>
|
|
||||||
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Completed))} on:click=move |_| set_filter(crate::store::FilterStatus::Completed)>
|
<path stroke-linecap="round" stroke-linejoin="round" d="M3.75 6.75h16.5M3.75 12h16.5m-16.5 5.25h16.5" />
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
|
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75L11.25 15 15 9.75M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
|
</svg>
|
||||||
</svg>
|
|
||||||
"Completed"
|
"All"
|
||||||
<span class="badge badge-sm badge-ghost ml-auto">{completed_count}</span>
|
|
||||||
</button>
|
<span class="badge badge-sm badge-ghost ml-auto">{total_count}</span>
|
||||||
</li>
|
|
||||||
<li>
|
</button>
|
||||||
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Paused))} on:click=move |_| set_filter(crate::store::FilterStatus::Paused)>
|
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
|
</li>
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" d="M15.75 5.25v13.5m-7.5-13.5v13.5" />
|
|
||||||
</svg>
|
<li>
|
||||||
"Paused"
|
|
||||||
<span class="badge badge-sm badge-ghost ml-auto">{paused_count}</span>
|
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Downloading))} on:click=move |_| set_filter(crate::store::FilterStatus::Downloading)>
|
||||||
</button>
|
|
||||||
</li>
|
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
|
||||||
<li>
|
|
||||||
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Inactive))} on:click=move |_| set_filter(crate::store::FilterStatus::Inactive)>
|
<path stroke-linecap="round" stroke-linejoin="round" d="M3 16.5v2.25A2.25 2.25 0 005.25 21h13.5A2.25 2.25 0 0021 18.75V16.5M16.5 12L12 16.5m0 0L7.5 12m4.5 4.5V3" />
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
|
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" d="M18.364 18.364A9 9 0 005.636 5.636m12.728 12.728A9 9 0 015.636 5.636m12.728 12.728L5.636 5.636" />
|
</svg>
|
||||||
</svg>
|
|
||||||
"Inactive"
|
"Downloading"
|
||||||
<span class="badge badge-sm badge-ghost ml-auto">{inactive_count}</span>
|
|
||||||
</button>
|
<span class="badge badge-sm badge-ghost ml-auto">{downloading_count}</span>
|
||||||
</li>
|
|
||||||
</ul>
|
</button>
|
||||||
</div>
|
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li>
|
||||||
|
|
||||||
|
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Seeding))} on:click=move |_| set_filter(crate::store::FilterStatus::Seeding)>
|
||||||
|
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
|
||||||
|
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" d="M3 16.5v2.25A2.25 2.25 0 005.25 21h13.5A2.25 2.25 0 0021 18.75V16.5m-13.5-9L12 3m0 0l4.5 4.5M12 3v13.5" />
|
||||||
|
|
||||||
|
</svg>
|
||||||
|
|
||||||
|
"Seeding"
|
||||||
|
|
||||||
|
<span class="badge badge-sm badge-ghost ml-auto">{seeding_count}</span>
|
||||||
|
|
||||||
|
</button>
|
||||||
|
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li>
|
||||||
|
|
||||||
|
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Completed))} on:click=move |_| set_filter(crate::store::FilterStatus::Completed)>
|
||||||
|
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
|
||||||
|
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75L11.25 15 15 9.75M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
|
||||||
|
|
||||||
|
</svg>
|
||||||
|
|
||||||
|
"Completed"
|
||||||
|
|
||||||
|
<span class="badge badge-sm badge-ghost ml-auto">{completed_count}</span>
|
||||||
|
|
||||||
|
</button>
|
||||||
|
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li>
|
||||||
|
|
||||||
|
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Paused))} on:click=move |_| set_filter(crate::store::FilterStatus::Paused)>
|
||||||
|
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
|
||||||
|
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" d="M15.75 5.25v13.5m-7.5-13.5v13.5" />
|
||||||
|
|
||||||
|
</svg>
|
||||||
|
|
||||||
|
"Paused"
|
||||||
|
|
||||||
|
<span class="badge badge-sm badge-ghost ml-auto">{paused_count}</span>
|
||||||
|
|
||||||
|
</button>
|
||||||
|
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li>
|
||||||
|
|
||||||
|
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Inactive))} on:click=move |_| set_filter(crate::store::FilterStatus::Inactive)>
|
||||||
|
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
|
||||||
|
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" d="M18.364 18.364A9 9 0 005.636 5.636m12.728 12.728A9 9 0 015.636 5.636m12.728 12.728L5.636 5.636" />
|
||||||
|
|
||||||
|
</svg>
|
||||||
|
|
||||||
|
"Inactive"
|
||||||
|
|
||||||
|
<span class="badge badge-sm badge-ghost ml-auto">{inactive_count}</span>
|
||||||
|
|
||||||
|
</button>
|
||||||
|
|
||||||
|
</li>
|
||||||
|
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<div class="p-4 border-t border-base-300 bg-base-200/50">
|
||||||
|
|
||||||
|
<div class="flex items-center gap-3">
|
||||||
|
|
||||||
|
<div class="avatar">
|
||||||
|
|
||||||
|
<div class="w-8 rounded-full bg-neutral text-neutral-content ring ring-primary ring-offset-base-100 ring-offset-1">
|
||||||
|
|
||||||
|
<span class="text-sm font-bold flex items-center justify-center h-full">{first_letter}</span>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="flex-1 overflow-hidden">
|
||||||
|
|
||||||
|
<div class="font-bold text-sm truncate">{username}</div>
|
||||||
|
|
||||||
|
<div class="text-[10px] text-base-content/60 truncate">"Online"</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<button
|
||||||
|
|
||||||
|
class="btn btn-ghost btn-xs btn-square text-error hover:bg-error/10"
|
||||||
|
|
||||||
|
title="Logout"
|
||||||
|
|
||||||
|
on:click=handle_logout
|
||||||
|
|
||||||
|
>
|
||||||
|
|
||||||
|
<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="M15.75 9V5.25A2.25 2.25 0 0013.5 3h-6a2.25 2.25 0 00-2.25 2.25v13.5A2.25 2.25 0 007.5 21h6a2.25 2.25 0 002.25-2.25V15M12 9l-3 3m0 0l3 3m-3-3h12.75" />
|
||||||
|
|
||||||
|
</svg>
|
||||||
|
|
||||||
|
</button>
|
||||||
|
|
||||||
<div class="p-4 border-t border-base-300 bg-base-200/50">
|
|
||||||
<div class="flex items-center gap-3">
|
|
||||||
<div class="avatar">
|
|
||||||
<div class="w-8 rounded-full bg-neutral text-neutral-content ring ring-primary ring-offset-base-100 ring-offset-1">
|
|
||||||
<span class="text-sm font-bold flex items-center justify-center h-full">"A"</span>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="flex-1 overflow-hidden">
|
|
||||||
<div class="font-bold text-sm truncate">"Admin User"</div>
|
|
||||||
<div class="text-[10px] text-base-content/60 truncate">"Online"</div>
|
|
||||||
</div>
|
|
||||||
<button
|
|
||||||
class="btn btn-ghost btn-xs btn-square text-error hover:bg-error/10"
|
|
||||||
title="Logout"
|
|
||||||
on:click=handle_logout
|
|
||||||
>
|
|
||||||
<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="M15.75 9V5.25A2.25 2.25 0 0013.5 3h-6a2.25 2.25 0 00-2.25 2.25v13.5A2.25 2.25 0 007.5 21h6a2.25 2.25 0 002.25-2.25V15M12 9l-3 3m0 0l3 3m-3-3h12.75" />
|
|
||||||
</svg>
|
|
||||||
</button>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
}}
|
||||||
}}
|
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
use leptos::*;
|
use leptos::*;
|
||||||
|
use leptos_use::on_click_outside;
|
||||||
|
use leptos_use::storage::use_local_storage;
|
||||||
|
use codee::string::FromToStringCodec;
|
||||||
use shared::GlobalLimitRequest;
|
use shared::GlobalLimitRequest;
|
||||||
|
|
||||||
fn format_bytes(bytes: i64) -> String {
|
fn format_bytes(bytes: i64) -> String {
|
||||||
@@ -26,34 +29,19 @@ pub fn StatusBar() -> impl IntoView {
|
|||||||
let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
|
let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
|
||||||
let stats = store.global_stats;
|
let stats = store.global_stats;
|
||||||
|
|
||||||
let initial_theme = if let Some(win) = web_sys::window() {
|
// Use leptos-use for reactive localStorage management
|
||||||
if let Some(doc) = win.document() {
|
let (current_theme, set_current_theme, _) = use_local_storage::<String, FromToStringCodec>("vibetorrent_theme");
|
||||||
doc.document_element()
|
|
||||||
.and_then(|el| el.get_attribute("data-theme"))
|
|
||||||
.unwrap_or_else(|| "dark".to_string())
|
|
||||||
} else {
|
|
||||||
"dark".to_string()
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
"dark".to_string()
|
|
||||||
};
|
|
||||||
|
|
||||||
let (current_theme, set_current_theme) = create_signal(initial_theme);
|
// Initialize with default if empty
|
||||||
|
if current_theme.get_untracked().is_empty() {
|
||||||
|
set_current_theme.set("dark".to_string());
|
||||||
|
}
|
||||||
|
|
||||||
|
// Automatically sync theme to document attribute
|
||||||
create_effect(move |_| {
|
create_effect(move |_| {
|
||||||
if let Some(win) = web_sys::window() {
|
let theme = current_theme.get().to_lowercase();
|
||||||
if let Some(storage) = win.local_storage().ok().flatten() {
|
if let Some(doc) = document().document_element() {
|
||||||
if let Ok(Some(stored_theme)) = storage.get_item("vibetorrent_theme") {
|
let _ = doc.set_attribute("data-theme", &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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -109,45 +97,28 @@ pub fn StatusBar() -> impl IntoView {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
// Signal-based dropdown state: 0=none, 1=download, 2=upload, 3=theme
|
// Refs for click outside detection
|
||||||
let (active_dropdown, set_active_dropdown) = create_signal(0u8);
|
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
|
// Helper to close a details element
|
||||||
let toggle = move |id: u8| {
|
let close_details = |node_ref: NodeRef<html::Details>| {
|
||||||
let current = active_dropdown.get_untracked();
|
if let Some(el) = node_ref.get_untracked() {
|
||||||
if current == id {
|
el.set_open(false);
|
||||||
set_active_dropdown.set(0);
|
|
||||||
} else {
|
|
||||||
set_active_dropdown.set(id);
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// Close all dropdowns
|
let _ = on_click_outside(down_details_ref, move |_| close_details(down_details_ref));
|
||||||
let close_all = move || {
|
let _ = on_click_outside(up_details_ref, move |_| close_details(up_details_ref));
|
||||||
set_active_dropdown.set(0);
|
let _ = on_click_outside(theme_details_ref, move |_| close_details(theme_details_ref));
|
||||||
};
|
|
||||||
|
|
||||||
view! {
|
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]">
|
||||||
|
|
||||||
// --- DOWNLOAD SPEED DROPDOWN ---
|
// --- DOWNLOAD SPEED DROPDOWN ---
|
||||||
<div class="relative">
|
<details class="dropdown dropdown-top" node_ref=down_details_ref>
|
||||||
<div
|
<summary class="flex items-center gap-2 cursor-pointer hover:text-primary transition-colors select-none list-none marker:hidden">
|
||||||
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);
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<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="M19.5 13.5L12 21m0 0l-7.5-7.5M12 21V3" />
|
<path stroke-linecap="round" stroke-linejoin="round" d="M19.5 13.5L12 21m0 0l-7.5-7.5M12 21V3" />
|
||||||
</svg>
|
</svg>
|
||||||
@@ -157,12 +128,9 @@ pub fn StatusBar() -> impl IntoView {
|
|||||||
{move || format!("(Limit: {})", format_speed(stats.get().down_limit.unwrap_or(0)))}
|
{move || format!("(Limit: {})", format_speed(stats.get().down_limit.unwrap_or(0)))}
|
||||||
</span>
|
</span>
|
||||||
</Show>
|
</Show>
|
||||||
</div>
|
</summary>
|
||||||
|
|
||||||
<ul
|
<ul class="dropdown-content z-[100] menu p-2 shadow bg-base-200 rounded-box w-40 mb-2 border border-base-300">
|
||||||
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" }
|
|
||||||
>
|
|
||||||
{
|
{
|
||||||
limits.clone().into_iter().map(|(val, label)| {
|
limits.clone().into_iter().map(|(val, label)| {
|
||||||
let is_active = move || {
|
let is_active = move || {
|
||||||
@@ -173,10 +141,9 @@ pub fn StatusBar() -> impl IntoView {
|
|||||||
<li>
|
<li>
|
||||||
<button
|
<button
|
||||||
class=move || if is_active() { "bg-primary/10 text-primary font-bold text-xs flex justify-between" } else { "text-xs flex justify-between" }
|
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:click=move |_| {
|
||||||
e.stop_propagation();
|
|
||||||
set_limit("down", val);
|
set_limit("down", val);
|
||||||
close_all();
|
close_details(down_details_ref);
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
{label}
|
{label}
|
||||||
@@ -189,18 +156,11 @@ pub fn StatusBar() -> impl IntoView {
|
|||||||
}).collect::<Vec<_>>()
|
}).collect::<Vec<_>>()
|
||||||
}
|
}
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</details>
|
||||||
|
|
||||||
// --- UPLOAD SPEED DROPDOWN ---
|
// --- UPLOAD SPEED DROPDOWN ---
|
||||||
<div class="relative">
|
<details class="dropdown dropdown-top" node_ref=up_details_ref>
|
||||||
<div
|
<summary class="flex items-center gap-2 cursor-pointer hover:text-primary transition-colors select-none list-none marker:hidden">
|
||||||
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">
|
<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" />
|
<path stroke-linecap="round" stroke-linejoin="round" d="M4.5 10.5L12 3m0 0l7.5 7.5M12 3v18" />
|
||||||
</svg>
|
</svg>
|
||||||
@@ -210,12 +170,9 @@ pub fn StatusBar() -> impl IntoView {
|
|||||||
{move || format!("(Limit: {})", format_speed(stats.get().up_limit.unwrap_or(0)))}
|
{move || format!("(Limit: {})", format_speed(stats.get().up_limit.unwrap_or(0)))}
|
||||||
</span>
|
</span>
|
||||||
</Show>
|
</Show>
|
||||||
</div>
|
</summary>
|
||||||
|
|
||||||
<ul
|
<ul class="dropdown-content z-[100] menu p-2 shadow bg-base-200 rounded-box w-40 mb-2 border border-base-300">
|
||||||
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)| {
|
limits.clone().into_iter().map(|(val, label)| {
|
||||||
let is_active = move || {
|
let is_active = move || {
|
||||||
@@ -226,10 +183,9 @@ pub fn StatusBar() -> impl IntoView {
|
|||||||
<li>
|
<li>
|
||||||
<button
|
<button
|
||||||
class=move || if is_active() { "bg-primary/10 text-primary font-bold text-xs flex justify-between" } else { "text-xs flex justify-between" }
|
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:click=move |_| {
|
||||||
e.stop_propagation();
|
|
||||||
set_limit("up", val);
|
set_limit("up", val);
|
||||||
close_all();
|
close_details(up_details_ref);
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
{label}
|
{label}
|
||||||
@@ -242,27 +198,17 @@ pub fn StatusBar() -> impl IntoView {
|
|||||||
}).collect::<Vec<_>>()
|
}).collect::<Vec<_>>()
|
||||||
}
|
}
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</details>
|
||||||
|
|
||||||
<div class="ml-auto flex items-center gap-4">
|
<div class="ml-auto flex items-center gap-4">
|
||||||
<div class="relative">
|
<details class="dropdown dropdown-top dropdown-end" node_ref=theme_details_ref>
|
||||||
<div
|
<summary class="btn btn-ghost btn-xs btn-square">
|
||||||
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">
|
<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="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>
|
</svg>
|
||||||
</div>
|
</summary>
|
||||||
|
|
||||||
<ul
|
<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">
|
||||||
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![
|
let themes = vec![
|
||||||
"light", "dark", "dim", "nord", "cupcake", "dracula", "cyberpunk", "emerald", "sunset", "abyss"
|
"light", "dark", "dim", "nord", "cupcake", "dracula", "cyberpunk", "emerald", "sunset", "abyss"
|
||||||
@@ -272,18 +218,9 @@ pub fn StatusBar() -> impl IntoView {
|
|||||||
<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 current_theme.get() == theme { "bg-primary/10 text-primary font-bold text-xs capitalize" } else { "text-xs capitalize" }
|
||||||
on:pointerdown=move |e| {
|
on:click=move |_| {
|
||||||
e.stop_propagation();
|
|
||||||
set_current_theme.set(theme.to_string());
|
set_current_theme.set(theme.to_string());
|
||||||
if let Some(win) = web_sys::window() {
|
close_details(theme_details_ref);
|
||||||
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}
|
{theme}
|
||||||
@@ -293,7 +230,7 @@ pub fn StatusBar() -> impl IntoView {
|
|||||||
}).collect::<Vec<_>>()
|
}).collect::<Vec<_>>()
|
||||||
}
|
}
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</details>
|
||||||
<button
|
<button
|
||||||
class="btn btn-ghost btn-xs btn-square"
|
class="btn btn-ghost btn-xs btn-square"
|
||||||
title="Settings & Notification Permissions"
|
title="Settings & Notification Permissions"
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
use leptos::*;
|
use leptos::*;
|
||||||
use wasm_bindgen::closure::Closure;
|
use leptos_use::{on_click_outside, use_timeout_fn};
|
||||||
use wasm_bindgen::JsCast;
|
|
||||||
use crate::store::{get_action_messages, show_toast_with_signal};
|
use crate::store::{get_action_messages, show_toast_with_signal};
|
||||||
use shared::NotificationLevel;
|
use shared::NotificationLevel;
|
||||||
|
|
||||||
@@ -45,6 +44,17 @@ fn format_duration(seconds: i64) -> String {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn format_date(timestamp: i64) -> String {
|
||||||
|
if timestamp <= 0 {
|
||||||
|
return "N/A".to_string();
|
||||||
|
}
|
||||||
|
let dt = chrono::DateTime::from_timestamp(timestamp, 0);
|
||||||
|
match dt {
|
||||||
|
Some(dt) => dt.format("%d/%m/%Y %H:%M").to_string(),
|
||||||
|
None => "N/A".to_string(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||||
enum SortColumn {
|
enum SortColumn {
|
||||||
Name,
|
Name,
|
||||||
@@ -54,6 +64,7 @@ enum SortColumn {
|
|||||||
DownSpeed,
|
DownSpeed,
|
||||||
UpSpeed,
|
UpSpeed,
|
||||||
ETA,
|
ETA,
|
||||||
|
AddedDate,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||||
@@ -66,8 +77,8 @@ enum SortDirection {
|
|||||||
pub fn TorrentTable() -> impl IntoView {
|
pub fn TorrentTable() -> impl IntoView {
|
||||||
let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
|
let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
|
||||||
|
|
||||||
let sort_col = create_rw_signal(SortColumn::Name);
|
let sort_col = create_rw_signal(SortColumn::AddedDate);
|
||||||
let sort_dir = create_rw_signal(SortDirection::Ascending);
|
let sort_dir = create_rw_signal(SortDirection::Descending);
|
||||||
|
|
||||||
let filtered_torrents = move || {
|
let filtered_torrents = move || {
|
||||||
let mut torrents = store
|
let mut torrents = store
|
||||||
@@ -127,6 +138,7 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
let b_eta = if b.eta <= 0 { i64::MAX } else { b.eta };
|
let b_eta = if b.eta <= 0 { i64::MAX } else { b.eta };
|
||||||
a_eta.cmp(&b_eta)
|
a_eta.cmp(&b_eta)
|
||||||
}
|
}
|
||||||
|
SortColumn::AddedDate => a.added_date.cmp(&b.added_date),
|
||||||
};
|
};
|
||||||
if dir == SortDirection::Descending {
|
if dir == SortDirection::Descending {
|
||||||
cmp.reverse()
|
cmp.reverse()
|
||||||
@@ -154,6 +166,8 @@ 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_menu_ref = create_node_ref::<html::Div>();
|
||||||
|
let _ = on_click_outside(sort_menu_ref, move |_| 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 {
|
||||||
@@ -264,6 +278,9 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
<th class="w-24 cursor-pointer hover:bg-base-300 group select-none" on:click=move |_| handle_sort(SortColumn::ETA)>
|
<th class="w-24 cursor-pointer hover:bg-base-300 group select-none" on:click=move |_| handle_sort(SortColumn::ETA)>
|
||||||
<div class="flex items-center">"ETA" {move || sort_arrow(SortColumn::ETA)}</div>
|
<div class="flex items-center">"ETA" {move || sort_arrow(SortColumn::ETA)}</div>
|
||||||
</th>
|
</th>
|
||||||
|
<th class="w-32 cursor-pointer hover:bg-base-300 group select-none" on:click=move |_| handle_sort(SortColumn::AddedDate)>
|
||||||
|
<div class="flex items-center">"Date" {move || sort_arrow(SortColumn::AddedDate)}</div>
|
||||||
|
</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
@@ -317,6 +334,7 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
<td class="text-right font-mono text-[11px] opacity-80 text-success">{format_speed(t.down_rate)}</td>
|
<td class="text-right font-mono text-[11px] opacity-80 text-success">{format_speed(t.down_rate)}</td>
|
||||||
<td class="text-right font-mono text-[11px] opacity-80 text-primary">{format_speed(t.up_rate)}</td>
|
<td class="text-right font-mono text-[11px] opacity-80 text-primary">{format_speed(t.up_rate)}</td>
|
||||||
<td class="text-right font-mono text-[11px] opacity-80">{format_duration(t.eta)}</td>
|
<td class="text-right font-mono text-[11px] opacity-80">{format_duration(t.eta)}</td>
|
||||||
|
<td class="text-right font-mono text-[11px] opacity-80 whitespace-nowrap">{format_date(t.added_date)}</td>
|
||||||
</tr>
|
</tr>
|
||||||
}
|
}
|
||||||
}).collect::<Vec<_>>()}
|
}).collect::<Vec<_>>()}
|
||||||
@@ -325,23 +343,14 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="md:hidden flex flex-col h-full bg-base-200 relative">
|
<div class="md:hidden flex flex-col h-full bg-base-200 relative">
|
||||||
// Transparent overlay to close sort dropdown
|
|
||||||
<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="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="px-3 py-2 border-b border-base-200 flex justify-between items-center bg-base-100/95 backdrop-blur z-10 shrink-0">
|
||||||
<span class="text-xs font-bold opacity-50 uppercase tracking-wider">"Torrents"</span>
|
<span class="text-xs font-bold opacity-50 uppercase tracking-wider">"Torrents"</span>
|
||||||
|
|
||||||
<div class="relative">
|
<div class="relative" node_ref=sort_menu_ref>
|
||||||
<div
|
<div
|
||||||
role="button"
|
role="button"
|
||||||
class="btn btn-ghost btn-xs gap-1 opacity-70 font-normal"
|
class="btn btn-ghost btn-xs gap-1 opacity-70 font-normal"
|
||||||
on:pointerdown=move |e| {
|
on:click=move |_| {
|
||||||
e.stop_propagation();
|
|
||||||
let cur = sort_open.get_untracked();
|
let cur = sort_open.get_untracked();
|
||||||
set_sort_open.set(!cur);
|
set_sort_open.set(!cur);
|
||||||
}
|
}
|
||||||
@@ -354,34 +363,34 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
<ul
|
<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"
|
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" }
|
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>
|
<li class="menu-title px-2 py-1 opacity-50 text-[10px] uppercase font-bold">"Sort By"</li>
|
||||||
{
|
{
|
||||||
let columns = vec![
|
let columns = vec![
|
||||||
(SortColumn::Name, "Name"),
|
(SortColumn::Name, "Name"),
|
||||||
(SortColumn::Size, "Size"),
|
(SortColumn::Size, "Size"),
|
||||||
(SortColumn::Progress, "Progress"),
|
(SortColumn::Progress, "Progress"),
|
||||||
(SortColumn::Status, "Status"),
|
(SortColumn::Status, "Status"),
|
||||||
(SortColumn::DownSpeed, "Down Speed"),
|
(SortColumn::DownSpeed, "Down Speed"),
|
||||||
(SortColumn::UpSpeed, "Up Speed"),
|
(SortColumn::UpSpeed, "Up Speed"),
|
||||||
(SortColumn::ETA, "ETA"),
|
(SortColumn::ETA, "ETA"),
|
||||||
];
|
(SortColumn::AddedDate, "Date"),
|
||||||
|
];
|
||||||
|
|
||||||
columns.into_iter().map(|(col, label)| {
|
columns.into_iter().map(|(col, label)| {
|
||||||
let is_active = move || sort_col.get() == col;
|
let is_active = move || sort_col.get() == col;
|
||||||
let current_dir = move || sort_dir.get();
|
let current_dir = move || sort_dir.get();
|
||||||
|
|
||||||
view! {
|
view! {
|
||||||
<li>
|
<li>
|
||||||
<button
|
<button
|
||||||
class=move || if is_active() { "bg-primary/10 text-primary font-bold flex justify-between" } else { "flex justify-between" }
|
type="button"
|
||||||
on:pointerdown=move |e| {
|
class=move || if is_active() { "bg-primary/10 text-primary font-bold flex justify-between" } else { "flex justify-between" }
|
||||||
e.stop_propagation();
|
on:click=move |_| {
|
||||||
handle_sort(col);
|
handle_sort(col);
|
||||||
set_sort_open.set(false);
|
set_sort_open.set(false);
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
{label}
|
{label}
|
||||||
<Show when=is_active fallback=|| ()>
|
<Show when=is_active fallback=|| ()>
|
||||||
<span class="opacity-70 text-[10px]">
|
<span class="opacity-70 text-[10px]">
|
||||||
@@ -413,58 +422,45 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
let _t_hash = t.hash.clone();
|
let _t_hash = t.hash.clone();
|
||||||
let t_hash_click = 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 t_hash_long = t.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);
|
||||||
|
|
||||||
let clear_timer = move || {
|
// Haptic feedback
|
||||||
if let Some(id) = timer_id.get_untracked() {
|
let navigator = window().navigator();
|
||||||
window().clear_timeout_with_handle(id);
|
if let Ok(vibrate) = js_sys::Reflect::get(&navigator, &"vibrate".into()) {
|
||||||
set_timer_id.set(None);
|
if vibrate.is_function() {
|
||||||
}
|
let _ = navigator.vibrate_with_duration(50);
|
||||||
};
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
600.0,
|
||||||
|
);
|
||||||
|
|
||||||
let handle_touchstart = {
|
let handle_touchstart = {
|
||||||
let t_hash = t_hash_long.clone();
|
let start = start.clone();
|
||||||
move |e: web_sys::TouchEvent| {
|
move |e: web_sys::TouchEvent| {
|
||||||
clear_timer();
|
|
||||||
if let Some(touch) = e.touches().get(0) {
|
if let Some(touch) = e.touches().get(0) {
|
||||||
let x = touch.client_x();
|
start((touch.client_x(), touch.client_y()));
|
||||||
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()));
|
|
||||||
set_menu_visible.set(true);
|
|
||||||
|
|
||||||
// Haptic feedback (iOS Safari doesn't support vibrate)
|
|
||||||
let navigator = window().navigator();
|
|
||||||
if js_sys::Reflect::has(&navigator, &wasm_bindgen::JsValue::from_str("vibrate")).unwrap_or(false) {
|
|
||||||
let _ = navigator.vibrate_with_duration(50);
|
|
||||||
}
|
|
||||||
}) as Box<dyn Fn()>);
|
|
||||||
|
|
||||||
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_touchmove = move |_| {
|
let handle_touchmove = {
|
||||||
clear_timer();
|
let stop = stop.clone();
|
||||||
|
move |_| stop()
|
||||||
};
|
};
|
||||||
|
|
||||||
let handle_touchend = move |_| {
|
let handle_touchend = {
|
||||||
clear_timer();
|
let stop = stop.clone();
|
||||||
|
move |_| stop()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let handle_touchcancel = move |_| stop();
|
||||||
|
|
||||||
view! {
|
view! {
|
||||||
<div
|
<div
|
||||||
class=move || {
|
class=move || {
|
||||||
@@ -482,7 +478,7 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
on:touchstart=handle_touchstart
|
on:touchstart=handle_touchstart
|
||||||
on:touchmove=handle_touchmove
|
on:touchmove=handle_touchmove
|
||||||
on:touchend=handle_touchend
|
on:touchend=handle_touchend
|
||||||
on:touchcancel=handle_touchend
|
on:touchcancel=handle_touchcancel
|
||||||
>
|
>
|
||||||
<div class="card-body gap-3">
|
<div class="card-body gap-3">
|
||||||
<div class="flex justify-between items-start gap-2">
|
<div class="flex justify-between items-start gap-2">
|
||||||
@@ -500,7 +496,7 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
<progress class={format!("progress w-full h-1.5 {}", progress_class)} value={t.percent_complete} max="100"></progress>
|
<progress class={format!("progress w-full h-1.5 {}", progress_class)} value={t.percent_complete} max="100"></progress>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="grid grid-cols-3 gap-2 text-[10px] font-mono opacity-80 pt-1 border-t border-base-200/50">
|
<div class="grid grid-cols-4 gap-2 text-[10px] font-mono opacity-80 pt-1 border-t border-base-200/50">
|
||||||
<div class="flex flex-col">
|
<div class="flex flex-col">
|
||||||
<span class="text-[9px] opacity-60 uppercase">"Down"</span>
|
<span class="text-[9px] opacity-60 uppercase">"Down"</span>
|
||||||
<span class="text-success">{format_speed(t.down_rate)}</span>
|
<span class="text-success">{format_speed(t.down_rate)}</span>
|
||||||
@@ -509,10 +505,14 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
<span class="text-[9px] opacity-60 uppercase">"Up"</span>
|
<span class="text-[9px] opacity-60 uppercase">"Up"</span>
|
||||||
<span class="text-primary">{format_speed(t.up_rate)}</span>
|
<span class="text-primary">{format_speed(t.up_rate)}</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex flex-col text-right">
|
<div class="flex flex-col text-center border-r border-base-200/50">
|
||||||
<span class="text-[9px] opacity-60 uppercase">"ETA"</span>
|
<span class="text-[9px] opacity-60 uppercase">"ETA"</span>
|
||||||
<span>{format_duration(t.eta)}</span>
|
<span>{format_duration(t.eta)}</span>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="flex flex-col text-right">
|
||||||
|
<span class="text-[9px] opacity-60 uppercase">"Date"</span>
|
||||||
|
<span>{format_date(t.added_date)}</span>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -11,11 +11,15 @@ use app::App;
|
|||||||
#[wasm_bindgen(start)]
|
#[wasm_bindgen(start)]
|
||||||
pub fn main() {
|
pub fn main() {
|
||||||
console_error_panic_hook::set_once();
|
console_error_panic_hook::set_once();
|
||||||
console_log::init_with_level(log::Level::Debug).unwrap();
|
console_log::init_with_level(log::Level::Debug)
|
||||||
|
.expect("Failed to initialize logging");
|
||||||
|
|
||||||
let window = web_sys::window().unwrap();
|
let window = web_sys::window()
|
||||||
let document = window.document().unwrap();
|
.expect("Failed to access window - browser may not be fully loaded");
|
||||||
let body = document.body().unwrap();
|
let document = window.document()
|
||||||
|
.expect("Failed to access document");
|
||||||
|
let body = document.body()
|
||||||
|
.expect("Failed to access document body");
|
||||||
|
|
||||||
// Add app-loaded class to body to hide spinner via CSS
|
// Add app-loaded class to body to hide spinner via CSS
|
||||||
let _ = body.class_list().add_1("app-loaded");
|
let _ = body.class_list().add_1("app-loaded");
|
||||||
|
|||||||
@@ -27,9 +27,9 @@ pub fn show_toast_with_signal(
|
|||||||
message: message.into(),
|
message: message.into(),
|
||||||
};
|
};
|
||||||
let item = NotificationItem { id, notification };
|
let item = NotificationItem { id, notification };
|
||||||
|
|
||||||
notifications.update(|list| list.push(item));
|
notifications.update(|list| list.push(item));
|
||||||
|
|
||||||
// Auto-remove after 5 seconds
|
// Auto-remove after 5 seconds
|
||||||
let _ = set_timeout(
|
let _ = set_timeout(
|
||||||
move || {
|
move || {
|
||||||
@@ -120,6 +120,7 @@ pub struct TorrentStore {
|
|||||||
pub search_query: RwSignal<String>,
|
pub search_query: RwSignal<String>,
|
||||||
pub global_stats: RwSignal<GlobalStats>,
|
pub global_stats: RwSignal<GlobalStats>,
|
||||||
pub notifications: RwSignal<Vec<NotificationItem>>,
|
pub notifications: RwSignal<Vec<NotificationItem>>,
|
||||||
|
pub user: RwSignal<Option<String>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn provide_torrent_store() {
|
pub fn provide_torrent_store() {
|
||||||
@@ -128,6 +129,7 @@ pub fn provide_torrent_store() {
|
|||||||
let search_query = create_rw_signal(String::new());
|
let search_query = create_rw_signal(String::new());
|
||||||
let global_stats = create_rw_signal(GlobalStats::default());
|
let global_stats = create_rw_signal(GlobalStats::default());
|
||||||
let notifications = create_rw_signal(Vec::<NotificationItem>::new());
|
let notifications = create_rw_signal(Vec::<NotificationItem>::new());
|
||||||
|
let user = create_rw_signal(Option::<String>::None);
|
||||||
|
|
||||||
let store = TorrentStore {
|
let store = TorrentStore {
|
||||||
torrents,
|
torrents,
|
||||||
@@ -135,11 +137,18 @@ pub fn provide_torrent_store() {
|
|||||||
search_query,
|
search_query,
|
||||||
global_stats,
|
global_stats,
|
||||||
notifications,
|
notifications,
|
||||||
|
user,
|
||||||
};
|
};
|
||||||
provide_context(store);
|
provide_context(store);
|
||||||
|
|
||||||
// Initialize SSE connection with auto-reconnect
|
// Initialize SSE connection with auto-reconnect
|
||||||
create_effect(move |_| {
|
create_effect(move |_| {
|
||||||
|
// Sadece kullanıcı giriş yapmışsa bağlantıyı başlat
|
||||||
|
if user.get().is_none() {
|
||||||
|
logging::log!("SSE: User not authenticated, skipping connection.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
spawn_local(async move {
|
spawn_local(async move {
|
||||||
let mut backoff_ms: u32 = 1000; // Start with 1 second
|
let mut backoff_ms: u32 = 1000; // Start with 1 second
|
||||||
let max_backoff_ms: u32 = 30000; // Max 30 seconds
|
let max_backoff_ms: u32 = 30000; // Max 30 seconds
|
||||||
@@ -149,7 +158,7 @@ pub fn provide_torrent_store() {
|
|||||||
|
|
||||||
loop {
|
loop {
|
||||||
let es_result = EventSource::new("/api/events");
|
let es_result = EventSource::new("/api/events");
|
||||||
|
|
||||||
match es_result {
|
match es_result {
|
||||||
Ok(mut es) => {
|
Ok(mut es) => {
|
||||||
match es.subscribe("message") {
|
match es.subscribe("message") {
|
||||||
@@ -163,7 +172,7 @@ pub fn provide_torrent_store() {
|
|||||||
if !got_first_message {
|
if !got_first_message {
|
||||||
got_first_message = true;
|
got_first_message = true;
|
||||||
backoff_ms = 1000; // Reset backoff on real data
|
backoff_ms = 1000; // Reset backoff on real data
|
||||||
|
|
||||||
if was_connected && disconnect_notified {
|
if was_connected && disconnect_notified {
|
||||||
// We were previously connected, lost connection, and now truly reconnected
|
// We were previously connected, lost connection, and now truly reconnected
|
||||||
show_toast_with_signal(
|
show_toast_with_signal(
|
||||||
@@ -225,11 +234,11 @@ pub fn provide_torrent_store() {
|
|||||||
AppEvent::Notification(n) => {
|
AppEvent::Notification(n) => {
|
||||||
// Show toast notification
|
// Show toast notification
|
||||||
show_toast_with_signal(notifications, n.level.clone(), n.message.clone());
|
show_toast_with_signal(notifications, n.level.clone(), n.message.clone());
|
||||||
|
|
||||||
// Show browser notification for critical events
|
// Show browser notification for critical events
|
||||||
let is_critical = n.message.contains("tamamlandı")
|
let is_critical = n.message.contains("tamamlandı")
|
||||||
|| n.level == shared::NotificationLevel::Error;
|
|| n.level == shared::NotificationLevel::Error;
|
||||||
|
|
||||||
if is_critical {
|
if is_critical {
|
||||||
let title = match n.level {
|
let title = match n.level {
|
||||||
shared::NotificationLevel::Success => "✅ VibeTorrent",
|
shared::NotificationLevel::Success => "✅ VibeTorrent",
|
||||||
@@ -237,7 +246,7 @@ pub fn provide_torrent_store() {
|
|||||||
shared::NotificationLevel::Warning => "⚠️ VibeTorrent",
|
shared::NotificationLevel::Warning => "⚠️ VibeTorrent",
|
||||||
shared::NotificationLevel::Info => "ℹ️ VibeTorrent",
|
shared::NotificationLevel::Info => "ℹ️ VibeTorrent",
|
||||||
};
|
};
|
||||||
|
|
||||||
crate::utils::notification::show_notification_if_enabled(
|
crate::utils::notification::show_notification_if_enabled(
|
||||||
title,
|
title,
|
||||||
&n.message
|
&n.message
|
||||||
@@ -316,74 +325,53 @@ struct PushKeys {
|
|||||||
/// Requests notification permission if needed, then subscribes to push
|
/// Requests notification permission if needed, then subscribes to push
|
||||||
pub async fn subscribe_to_push_notifications() {
|
pub async fn subscribe_to_push_notifications() {
|
||||||
use gloo_net::http::Request;
|
use gloo_net::http::Request;
|
||||||
|
|
||||||
// First, request notification permission if not already granted
|
// First, request notification permission if not already granted
|
||||||
let window = web_sys::window().expect("window should exist");
|
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() {
|
// Notification.permission is a static property, but web_sys exposes it via the Notification class instance or we check it manually.
|
||||||
log::error!("Notification API not available");
|
// Actually, Notification::permission() is a static method in web_sys.
|
||||||
return;
|
match web_sys::Notification::permission() {
|
||||||
}
|
web_sys::NotificationPermission::Granted => {
|
||||||
|
|
||||||
// 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");
|
log::info!("Notification permission already granted");
|
||||||
true
|
}
|
||||||
} else if current_permission == "denied" {
|
web_sys::NotificationPermission::Denied => {
|
||||||
log::warn!("Notification permission was denied");
|
log::warn!("Notification permission was denied");
|
||||||
return;
|
return;
|
||||||
} else {
|
}
|
||||||
// Permission is "default" - need to request
|
web_sys::NotificationPermission::Default => {
|
||||||
log::info!("Requesting notification permission...");
|
log::info!("Requesting notification permission...");
|
||||||
if let Ok(request_fn) = js_sys::Reflect::get(¬ification_class, &"requestPermission".into()) {
|
let permission_promise = match web_sys::Notification::request_permission() {
|
||||||
if request_fn.is_function() {
|
Ok(p) => p,
|
||||||
let request_fn_typed = js_sys::Function::from(request_fn);
|
Err(e) => {
|
||||||
match request_fn_typed.call0(¬ification_class) {
|
log::error!("Failed to request notification permission: {:?}", e);
|
||||||
Ok(promise_val) => {
|
return;
|
||||||
let request_future = wasm_bindgen_futures::JsFuture::from(
|
}
|
||||||
js_sys::Promise::from(promise_val)
|
};
|
||||||
);
|
|
||||||
match request_future.await {
|
match wasm_bindgen_futures::JsFuture::from(permission_promise).await {
|
||||||
Ok(result) => {
|
Ok(val) => {
|
||||||
let result_str = result.as_string().unwrap_or_default();
|
let permission = val.as_string().unwrap_or_default();
|
||||||
log::info!("Permission request result: {}", result_str);
|
if permission != "granted" {
|
||||||
result_str == "granted"
|
log::warn!("Notification permission denied by user");
|
||||||
}
|
return;
|
||||||
Err(e) => {
|
}
|
||||||
log::error!("Failed to request notification permission: {:?}", e);
|
log::info!("Notification permission granted by user");
|
||||||
false
|
}
|
||||||
}
|
Err(e) => {
|
||||||
}
|
log::error!("Failed to await notification permission: {:?}", e);
|
||||||
}
|
return;
|
||||||
Err(e) => {
|
|
||||||
log::error!("Failed to call requestPermission: {:?}", e);
|
|
||||||
false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
false
|
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
false
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
_ => {
|
||||||
log::error!("Cannot access Notification class");
|
log::warn!("Unknown notification permission status");
|
||||||
return;
|
return;
|
||||||
};
|
}
|
||||||
|
|
||||||
if !permission_granted {
|
|
||||||
log::warn!("Notification permission not granted, cannot subscribe to push");
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
log::info!("Notification permission granted! Proceeding with push subscription...");
|
log::info!("Notification permission granted! Proceeding with push subscription...");
|
||||||
|
|
||||||
// Get VAPID public key from backend
|
// Get VAPID public key from backend
|
||||||
let public_key_response = match Request::get("/api/push/public-key").send().await {
|
let public_key_response = match Request::get("/api/push/public-key").send().await {
|
||||||
Ok(resp) => resp,
|
Ok(resp) => resp,
|
||||||
@@ -392,7 +380,7 @@ pub async fn subscribe_to_push_notifications() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let public_key_data: serde_json::Value = match public_key_response.json().await {
|
let public_key_data: serde_json::Value = match public_key_response.json().await {
|
||||||
Ok(data) => data,
|
Ok(data) => data,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
@@ -400,7 +388,7 @@ pub async fn subscribe_to_push_notifications() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let public_key = match public_key_data.get("publicKey").and_then(|v| v.as_str()) {
|
let public_key = match public_key_data.get("publicKey").and_then(|v| v.as_str()) {
|
||||||
Some(key) => key,
|
Some(key) => key,
|
||||||
None => {
|
None => {
|
||||||
@@ -408,9 +396,9 @@ pub async fn subscribe_to_push_notifications() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
log::info!("VAPID public key from backend: {} (len: {})", public_key, public_key.len());
|
log::info!("VAPID public key from backend: {} (len: {})", public_key, public_key.len());
|
||||||
|
|
||||||
// Convert VAPID public key to Uint8Array
|
// 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) => {
|
Ok(arr) => {
|
||||||
@@ -422,12 +410,11 @@ pub async fn subscribe_to_push_notifications() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// Get service worker registration
|
// Get service worker registration
|
||||||
let window = web_sys::window().expect("window should exist");
|
|
||||||
let navigator = window.navigator();
|
let navigator = window.navigator();
|
||||||
let service_worker = navigator.service_worker();
|
let service_worker = navigator.service_worker();
|
||||||
|
|
||||||
let registration_promise = match service_worker.ready() {
|
let registration_promise = match service_worker.ready() {
|
||||||
Ok(promise) => promise,
|
Ok(promise) => promise,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
@@ -435,9 +422,9 @@ pub async fn subscribe_to_push_notifications() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let registration_future = wasm_bindgen_futures::JsFuture::from(registration_promise);
|
let registration_future = wasm_bindgen_futures::JsFuture::from(registration_promise);
|
||||||
|
|
||||||
let registration = match registration_future.await {
|
let registration = match registration_future.await {
|
||||||
Ok(reg) => reg,
|
Ok(reg) => reg,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
@@ -445,11 +432,11 @@ pub async fn subscribe_to_push_notifications() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let service_worker_registration = registration
|
let service_worker_registration = registration
|
||||||
.dyn_into::<web_sys::ServiceWorkerRegistration>()
|
.dyn_into::<web_sys::ServiceWorkerRegistration>()
|
||||||
.expect("should be ServiceWorkerRegistration");
|
.expect("should be ServiceWorkerRegistration");
|
||||||
|
|
||||||
// Subscribe to push
|
// Subscribe to push
|
||||||
let push_manager = match service_worker_registration.push_manager() {
|
let push_manager = match service_worker_registration.push_manager() {
|
||||||
Ok(pm) => pm,
|
Ok(pm) => pm,
|
||||||
@@ -458,11 +445,11 @@ pub async fn subscribe_to_push_notifications() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let subscribe_options = web_sys::PushSubscriptionOptionsInit::new();
|
let subscribe_options = web_sys::PushSubscriptionOptionsInit::new();
|
||||||
subscribe_options.set_user_visible_only(true);
|
subscribe_options.set_user_visible_only(true);
|
||||||
subscribe_options.set_application_server_key(&public_key_array);
|
subscribe_options.set_application_server_key(&public_key_array);
|
||||||
|
|
||||||
let subscribe_promise = match push_manager.subscribe_with_options(&subscribe_options) {
|
let subscribe_promise = match push_manager.subscribe_with_options(&subscribe_options) {
|
||||||
Ok(promise) => promise,
|
Ok(promise) => promise,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
@@ -470,9 +457,9 @@ pub async fn subscribe_to_push_notifications() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let subscription_future = wasm_bindgen_futures::JsFuture::from(subscribe_promise);
|
let subscription_future = wasm_bindgen_futures::JsFuture::from(subscribe_promise);
|
||||||
|
|
||||||
let subscription = match subscription_future.await {
|
let subscription = match subscription_future.await {
|
||||||
Ok(sub) => sub,
|
Ok(sub) => sub,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
@@ -480,81 +467,60 @@ pub async fn subscribe_to_push_notifications() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let push_subscription = subscription
|
let push_subscription = subscription
|
||||||
.dyn_into::<web_sys::PushSubscription>()
|
.dyn_into::<web_sys::PushSubscription>()
|
||||||
.expect("should be PushSubscription");
|
.expect("should be PushSubscription");
|
||||||
|
|
||||||
// Get subscription JSON using toJSON() method
|
// PushSubscription objects can be serialized directly via JSON.stringify which calls their toJSON method internally.
|
||||||
let json_result = match js_sys::Reflect::get(&push_subscription, &"toJSON".into()) {
|
// 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() => {
|
Ok(func) if func.is_function() => {
|
||||||
let json_func = js_sys::Function::from(func);
|
let json_func = js_sys::Function::from(func);
|
||||||
match json_func.call0(&push_subscription) {
|
match json_func.call0(&push_subscription) {
|
||||||
Ok(result) => result,
|
Ok(res) => res,
|
||||||
|
Err(e) => {
|
||||||
|
log::error!("Failed to call toJSON: {:?}", e);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
// 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) => {
|
Err(e) => {
|
||||||
log::error!("Failed to call toJSON: {:?}", 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;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
_ => {
|
|
||||||
log::error!("toJSON method not found on PushSubscription");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
let json_value = match js_sys::JSON::stringify(&json_result) {
|
// Convert JsValue (JSON object) to PushSubscriptionJSON struct via serde
|
||||||
Ok(val) => val,
|
// Note: web_sys::PushSubscriptionJSON is not a struct we can directly use with serde_json usually,
|
||||||
Err(e) => {
|
// but we can use serde-wasm-bindgen to convert JsValue -> Rust Struct
|
||||||
log::error!("Failed to stringify subscription: {:?}", e);
|
let subscription_data: PushSubscriptionData = match serde_wasm_bindgen::from_value(json_val) {
|
||||||
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) {
|
|
||||||
Ok(data) => data,
|
Ok(data) => data,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to parse subscription JSON: {:?}", e);
|
log::error!("Failed to parse subscription JSON: {:?}", e);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// Extract endpoint and keys
|
// Send to backend (subscription_data is already the struct we need)
|
||||||
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")
|
let response = match Request::post("/api/push/subscribe")
|
||||||
.json(&push_data)
|
.json(&subscription_data)
|
||||||
.expect("serialization should succeed")
|
.expect("serialization should succeed")
|
||||||
.send()
|
.send()
|
||||||
.await
|
.await
|
||||||
@@ -565,7 +531,7 @@ pub async fn subscribe_to_push_notifications() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
if response.ok() {
|
if response.ok() {
|
||||||
log::info!("Successfully subscribed to push notifications");
|
log::info!("Successfully subscribed to push notifications");
|
||||||
} else {
|
} else {
|
||||||
@@ -574,34 +540,15 @@ pub async fn subscribe_to_push_notifications() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Helper to convert URL-safe base64 string to Uint8Array
|
/// 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> {
|
fn url_base64_to_uint8array(base64_string: &str) -> Result<js_sys::Uint8Array, JsValue> {
|
||||||
// Add padding
|
use base64::{engine::general_purpose, Engine as _};
|
||||||
let padding = (4 - (base64_string.len() % 4)) % 4;
|
|
||||||
let mut padded = base64_string.to_string();
|
// VAPID keys are URL-safe base64. Try both NO_PAD and padded for robustness.
|
||||||
padded.push_str(&"=".repeat(padding));
|
let bytes = general_purpose::URL_SAFE_NO_PAD
|
||||||
|
.decode(base64_string)
|
||||||
// Replace URL-safe characters
|
.or_else(|_| general_purpose::URL_SAFE.decode(base64_string))
|
||||||
let standard_base64 = padded.replace('-', "+").replace('_', "/");
|
.map_err(|e| JsValue::from_str(&format!("Base64 decode error: {}", e)))?;
|
||||||
|
|
||||||
// Decode using JavaScript to avoid UTF-8 encoding issues
|
Ok(js_sys::Uint8Array::from(&bytes[..]))
|
||||||
// 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)
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user