Compare commits
22 Commits
release-20
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
37d13f14d8 | ||
|
|
e23585dfea | ||
|
|
9d5092649f | ||
|
|
9f009bc18b | ||
|
|
643b83ac21 | ||
|
|
90b65240b2 | ||
|
|
69243a5590 | ||
|
|
10262142fc | ||
|
|
858a1c9b63 | ||
|
|
edfb7458f8 | ||
|
|
575cfa4b38 | ||
|
|
9b18b97c49 | ||
|
|
88723352fd | ||
|
|
4231e0b3a7 | ||
|
|
1177412c87 | ||
|
|
aed753c64f | ||
|
|
9d0eb11f16 | ||
|
|
3c13f99652 | ||
|
|
a948215538 | ||
|
|
13424fceeb | ||
|
|
e3eb5fbca9 | ||
|
|
08f2f540fe |
234
Cargo.lock
generated
234
Cargo.lock
generated
@@ -316,6 +316,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 +802,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 +1099,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 +1129,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 +1245,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 +1374,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 +1408,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 +1452,7 @@ checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"allocator-api2",
|
"allocator-api2",
|
||||||
"equivalent",
|
"equivalent",
|
||||||
"foldhash",
|
"foldhash 0.1.5",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -1381,6 +1460,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 +1653,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 +1663,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 +1699,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 +2333,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 +2816,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 +2937,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 +3336,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 +3515,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 +4066,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 +4119,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 +4169,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 +4602,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 +4622,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 +4647,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"
|
||||||
|
|||||||
@@ -39,3 +39,4 @@ 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"
|
||||||
|
|||||||
@@ -59,15 +59,23 @@ impl Db {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn get_user_by_username(&self, username: &str) -> Result<Option<(i64, String)>> {
|
pub async fn get_user_by_username(&self, username: &str) -> Result<Option<(i64, String)>> {
|
||||||
let row = sqlx::query("SELECT id, password_hash FROM users WHERE username = ?")
|
let row = sqlx::query("SELECT id, password_hash FROM users WHERE username = ?")
|
||||||
.bind(username)
|
.bind(username)
|
||||||
.fetch_optional(&self.pool)
|
.fetch_optional(&self.pool)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
Ok(row.map(|r| (r.get(0), r.get(1))))
|
Ok(row.map(|r| (r.get(0), r.get(1))))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn get_username_by_id(&self, id: i64) -> Result<Option<String>> {
|
||||||
|
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 +111,21 @@ 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(())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -85,7 +85,7 @@ pub fn diff_torrents(old: &[Torrent], new: &[Torrent]) -> DiffResult {
|
|||||||
has_changes = true;
|
has_changes = true;
|
||||||
|
|
||||||
// Log status changes for debugging
|
// Log status changes for debugging
|
||||||
tracing::info!(
|
tracing::debug!(
|
||||||
"Torrent status changed: {} ({}) {:?} -> {:?}",
|
"Torrent status changed: {} ({}) {:?} -> {:?}",
|
||||||
new_t.name, new_t.hash, old_t.status, new_t.status
|
new_t.name, new_t.hash, old_t.status, new_t.status
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
use crate::{db::Db, AppState};
|
use crate::AppState;
|
||||||
use axum::{
|
use axum::{
|
||||||
extract::{State, Json},
|
extract::{State, Json},
|
||||||
http::StatusCode,
|
http::StatusCode,
|
||||||
@@ -13,6 +13,8 @@ use time::Duration;
|
|||||||
pub struct LoginRequest {
|
pub struct LoginRequest {
|
||||||
username: String,
|
username: String,
|
||||||
password: String,
|
password: String,
|
||||||
|
#[serde(default)]
|
||||||
|
remember_me: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Serialize, ToSchema)]
|
#[derive(Serialize, ToSchema)]
|
||||||
@@ -35,11 +37,16 @@ pub async fn login_handler(
|
|||||||
jar: CookieJar,
|
jar: CookieJar,
|
||||||
Json(payload): Json<LoginRequest>,
|
Json(payload): Json<LoginRequest>,
|
||||||
) -> impl IntoResponse {
|
) -> impl IntoResponse {
|
||||||
|
tracing::info!("Login attempt for user: {}", payload.username);
|
||||||
|
|
||||||
let user = match state.db.get_user_by_username(&payload.username).await {
|
let user = match state.db.get_user_by_username(&payload.username).await {
|
||||||
Ok(Some(u)) => u,
|
Ok(Some(u)) => u,
|
||||||
Ok(None) => return (StatusCode::UNAUTHORIZED, "Invalid credentials").into_response(),
|
Ok(None) => {
|
||||||
|
tracing::warn!("Login failed: User not found for {}", payload.username);
|
||||||
|
return (StatusCode::UNAUTHORIZED, "Invalid credentials").into_response();
|
||||||
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
tracing::error!("DB error during login: {}", e);
|
tracing::error!("DB error during login for {}: {}", payload.username, e);
|
||||||
return (StatusCode::INTERNAL_SERVER_ERROR, "Database error").into_response();
|
return (StatusCode::INTERNAL_SERVER_ERROR, "Database error").into_response();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -48,31 +55,47 @@ pub async fn login_handler(
|
|||||||
|
|
||||||
match bcrypt::verify(&payload.password, &password_hash) {
|
match bcrypt::verify(&payload.password, &password_hash) {
|
||||||
Ok(true) => {
|
Ok(true) => {
|
||||||
|
tracing::info!("Password verified for user: {}", payload.username);
|
||||||
|
|
||||||
// Create session
|
// Create session
|
||||||
let token: String = (0..32).map(|_| {
|
let token: String = (0..32).map(|_| {
|
||||||
use rand::{distributions::Alphanumeric, Rng};
|
use rand::{distributions::Alphanumeric, Rng};
|
||||||
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 {
|
||||||
tracing::error!("Failed to create session: {}", e);
|
tracing::error!("Failed to create session for {}: {}", payload.username, e);
|
||||||
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::Strict)
|
.same_site(SameSite::Lax)
|
||||||
.max_age(Duration::seconds(expires_in))
|
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
(StatusCode::OK, jar.add(cookie), "Login successful").into_response()
|
cookie.set_max_age(Duration::seconds(expires_in));
|
||||||
|
|
||||||
|
tracing::info!("Session created and cookie set for user: {}", payload.username);
|
||||||
|
(StatusCode::OK, jar.add(cookie), Json(UserResponse { username: payload.username })).into_response()
|
||||||
|
}
|
||||||
|
Ok(false) => {
|
||||||
|
tracing::warn!("Login failed: Invalid password for {}", payload.username);
|
||||||
|
(StatusCode::UNAUTHORIZED, "Invalid credentials").into_response()
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
tracing::error!("Bcrypt error for {}: {}", payload.username, e);
|
||||||
|
(StatusCode::INTERNAL_SERVER_ERROR, "Auth error").into_response()
|
||||||
}
|
}
|
||||||
_ => (StatusCode::UNAUTHORIZED, "Invalid credentials").into_response(),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -104,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")
|
||||||
)
|
)
|
||||||
)]
|
)]
|
||||||
@@ -114,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
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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)
|
||||||
@@ -67,7 +70,8 @@ pub async fn setup_handler(
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 3. Create User
|
// 3. Create User
|
||||||
let password_hash = match bcrypt::hash(&payload.password, bcrypt::DEFAULT_COST) {
|
// Lower cost for faster login on low-power devices (MIPS routers etc.)
|
||||||
|
let password_hash = match bcrypt::hash(&payload.password, 6) {
|
||||||
Ok(h) => h,
|
Ok(h) => h,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
tracing::error!("Failed to hash password: {}", e);
|
tracing::error!("Failed to hash password: {}", e);
|
||||||
@@ -80,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()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ use tower_http::{
|
|||||||
};
|
};
|
||||||
use utoipa::OpenApi;
|
use utoipa::OpenApi;
|
||||||
use utoipa_swagger_ui::SwaggerUi;
|
use utoipa_swagger_ui::SwaggerUi;
|
||||||
|
use tower_governor::{governor::GovernorConfigBuilder, GovernorLayer};
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
pub struct AppState {
|
pub struct AppState {
|
||||||
@@ -90,6 +91,10 @@ 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 = "push-notifications")]
|
#[cfg(feature = "push-notifications")]
|
||||||
@@ -130,7 +135,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(
|
||||||
@@ -173,7 +179,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 +204,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 +228,68 @@ 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 (using a direct query since db.rs doesn't have update_password yet)
|
||||||
|
// We should add `update_password` to db.rs for cleaner code, but for now direct query is fine or we can extend Db.
|
||||||
|
// Let's extend Db.rs first to be clean.
|
||||||
|
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() {
|
||||||
@@ -385,12 +451,27 @@ async fn main() {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Rate Limit Configuration for Login
|
||||||
|
// Allow 5 login attempts per IP, regenerating 1 token every second (effectively 5 attempts burst, then 1/sec)
|
||||||
|
let governor_conf = Box::new(
|
||||||
|
GovernorConfigBuilder::default()
|
||||||
|
.per_second(1)
|
||||||
|
.burst_size(5)
|
||||||
|
.finish()
|
||||||
|
.unwrap(),
|
||||||
|
);
|
||||||
|
|
||||||
let app = Router::new()
|
let app = Router::new()
|
||||||
.merge(SwaggerUi::new("/swagger-ui").url("/api-docs/openapi.json", ApiDoc::openapi()))
|
.merge(SwaggerUi::new("/swagger-ui").url("/api-docs/openapi.json", ApiDoc::openapi()))
|
||||||
// Setup & Auth Routes
|
// Setup & Auth Routes
|
||||||
.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 {
|
||||||
|
config: Box::leak(governor_conf),
|
||||||
|
})
|
||||||
|
)
|
||||||
.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
|
||||||
|
|||||||
@@ -1,6 +1,4 @@
|
|||||||
use crate::components::layout::sidebar::Sidebar;
|
use crate::components::layout::protected::Protected;
|
||||||
use crate::components::layout::statusbar::StatusBar;
|
|
||||||
use crate::components::layout::toolbar::Toolbar;
|
|
||||||
use crate::components::toast::ToastContainer;
|
use crate::components::toast::ToastContainer;
|
||||||
use crate::components::torrent::table::TorrentTable;
|
use crate::components::torrent::table::TorrentTable;
|
||||||
use crate::components::auth::login::Login;
|
use crate::components::auth::login::Login;
|
||||||
@@ -14,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();
|
||||||
@@ -25,77 +28,80 @@ pub fn App() -> impl IntoView {
|
|||||||
// Check Auth & Setup Status on load
|
// Check Auth & Setup Status on load
|
||||||
create_effect(move |_| {
|
create_effect(move |_| {
|
||||||
spawn_local(async move {
|
spawn_local(async move {
|
||||||
|
logging::log!("App initialization started...");
|
||||||
|
|
||||||
// 1. Check Setup Status
|
// 1. Check Setup Status
|
||||||
let setup_res = gloo_net::http::Request::get("/api/setup/status").send().await;
|
let setup_res = gloo_net::http::Request::get("/api/setup/status").send().await;
|
||||||
if let Ok(resp) = setup_res {
|
|
||||||
if let Ok(status) = resp.json::<SetupStatus>().await {
|
match setup_res {
|
||||||
if !status.completed {
|
Ok(resp) => {
|
||||||
// Redirect to setup if not completed
|
if resp.ok() {
|
||||||
let navigate = use_navigate();
|
match resp.json::<SetupStatus>().await {
|
||||||
navigate("/setup", Default::default());
|
Ok(status) => {
|
||||||
set_is_loading.set(false);
|
if !status.completed {
|
||||||
return;
|
logging::log!("Setup not completed, redirecting to /setup");
|
||||||
|
let navigate = use_navigate();
|
||||||
|
navigate("/setup", Default::default());
|
||||||
|
set_is_loading.set(false);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(e) => logging::error!("Failed to parse setup status: {}", e),
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Err(e) => logging::error!("Network error checking setup status: {}", e),
|
||||||
}
|
}
|
||||||
|
|
||||||
// 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;
|
||||||
if let Ok(resp) = auth_res {
|
|
||||||
if resp.status() == 200 {
|
|
||||||
set_is_authenticated.set(true);
|
|
||||||
|
|
||||||
// Initialize push notifications logic only if authenticated
|
match auth_res {
|
||||||
// ... (Push notification logic moved here or kept global but guarded)
|
Ok(resp) => {
|
||||||
} else {
|
if resp.status() == 200 {
|
||||||
let navigate = use_navigate();
|
logging::log!("Authenticated!");
|
||||||
// If we are already on login or setup, don't redirect loop
|
|
||||||
let pathname = window().location().pathname().unwrap_or_default();
|
// Parse user info
|
||||||
if pathname != "/login" && pathname != "/setup" {
|
if let Ok(user_info) = resp.json::<UserResponse>().await {
|
||||||
navigate("/login", Default::default());
|
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 after user grants permission (Only if authenticated)
|
|
||||||
create_effect(move |_| {
|
create_effect(move |_| {
|
||||||
if is_authenticated.get() {
|
if is_authenticated.get() {
|
||||||
spawn_local(async {
|
spawn_local(async {
|
||||||
|
// ... (Push notification logic kept same, shortened for brevity in this replace)
|
||||||
// Wait a bit for service worker to be ready
|
// Wait a bit for service worker to be ready
|
||||||
gloo_timers::future::TimeoutFuture::new(2000).await;
|
gloo_timers::future::TimeoutFuture::new(2000).await;
|
||||||
|
|
||||||
// Check if running on iOS and not standalone
|
if crate::utils::platform::supports_push_notifications() && !crate::utils::platform::is_safari() {
|
||||||
if let Some(ios_message) = crate::utils::platform::get_ios_notification_info() {
|
crate::store::subscribe_to_push_notifications().await;
|
||||||
log::warn!("iOS detected: {}", ios_message);
|
|
||||||
if let Some(store) = use_context::<crate::store::TorrentStore>() {
|
|
||||||
crate::store::show_toast_with_signal(
|
|
||||||
store.notifications,
|
|
||||||
shared::NotificationLevel::Info,
|
|
||||||
ios_message,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if !crate::utils::platform::supports_push_notifications() {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if crate::utils::platform::is_safari() {
|
|
||||||
if let Some(store) = use_context::<crate::store::TorrentStore>() {
|
|
||||||
crate::store::show_toast_with_signal(
|
|
||||||
store.notifications,
|
|
||||||
shared::NotificationLevel::Info,
|
|
||||||
"Bildirim izni için sağ alttaki ayarlar ⚙️ ikonuna basın.".to_string(),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
crate::store::subscribe_to_push_notifications().await;
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -107,38 +113,29 @@ pub fn App() -> impl IntoView {
|
|||||||
<Route path="/login" view=move || view! { <Login /> } />
|
<Route path="/login" view=move || view! { <Login /> } />
|
||||||
<Route path="/setup" view=move || view! { <Setup /> } />
|
<Route path="/setup" view=move || view! { <Setup /> } />
|
||||||
|
|
||||||
<Route path="/*" view=move || {
|
<Route path="/" view=move || {
|
||||||
view! {
|
view! {
|
||||||
<Show when=move || !is_loading.get() fallback=|| view! {
|
<Show when=move || !is_loading.get() fallback=|| view! {
|
||||||
<div class="flex items-center justify-center h-screen bg-base-100">
|
<div class="flex items-center justify-center h-screen bg-base-100">
|
||||||
<span class="loading loading-spinner loading-lg"></span>
|
<span class="loading loading-spinner loading-lg"></span>
|
||||||
</div>
|
</div>
|
||||||
}>
|
}>
|
||||||
<Show when=move || is_authenticated.get() fallback=|| view! { <Login /> }>
|
<Show when=move || is_authenticated.get() fallback=|| ()>
|
||||||
// Protected Layout
|
<Protected>
|
||||||
<div class="drawer lg:drawer-open h-full w-full">
|
<TorrentTable />
|
||||||
<input id="my-drawer" type="checkbox" class="drawer-toggle" />
|
</Protected>
|
||||||
|
</Show>
|
||||||
|
</Show>
|
||||||
|
}
|
||||||
|
}/>
|
||||||
|
|
||||||
<div class="drawer-content flex flex-col h-full overflow-hidden bg-base-100 text-base-content text-sm select-none">
|
<Route path="/settings" view=move || {
|
||||||
<Toolbar />
|
view! {
|
||||||
|
<Show when=move || !is_loading.get() fallback=|| ()>
|
||||||
<main class="flex-1 flex flex-col min-w-0 bg-base-100 overflow-hidden pb-8">
|
<Show when=move || is_authenticated.get() fallback=|| ()>
|
||||||
<Routes>
|
<Protected>
|
||||||
<Route path="/" view=move || view! { <TorrentTable /> } />
|
<div class="p-4">"Settings Page (Coming Soon)"</div>
|
||||||
<Route path="/settings" view=move || view! { <div class="p-4">"Settings Page (Coming Soon)"</div> } />
|
</Protected>
|
||||||
</Routes>
|
|
||||||
</main>
|
|
||||||
|
|
||||||
<StatusBar />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="drawer-side z-40 transition-none duration-0">
|
|
||||||
<label for="my-drawer" aria-label="close sidebar" class="drawer-overlay transition-none duration-0"></label>
|
|
||||||
<div class="menu p-0 min-h-full bg-base-200 text-base-content border-r border-base-300 transition-none duration-0">
|
|
||||||
<Sidebar />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</Show>
|
</Show>
|
||||||
</Show>
|
</Show>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,17 +1,18 @@
|
|||||||
use leptos::*;
|
use leptos::*;
|
||||||
use leptos_router::*;
|
use serde::Serialize;
|
||||||
use serde::{Deserialize, 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);
|
||||||
|
|
||||||
@@ -20,10 +21,13 @@ pub fn Login() -> impl IntoView {
|
|||||||
set_loading.set(true);
|
set_loading.set(true);
|
||||||
set_error.set(None);
|
set_error.set(None);
|
||||||
|
|
||||||
|
logging::log!("Attempting login for user: {}", username.get());
|
||||||
|
|
||||||
spawn_local(async move {
|
spawn_local(async move {
|
||||||
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")
|
||||||
@@ -32,15 +36,19 @@ pub fn Login() -> impl IntoView {
|
|||||||
|
|
||||||
match client.send().await {
|
match client.send().await {
|
||||||
Ok(resp) => {
|
Ok(resp) => {
|
||||||
|
logging::log!("Login response status: {}", resp.status());
|
||||||
if resp.ok() {
|
if resp.ok() {
|
||||||
// Redirect to home on success
|
logging::log!("Login successful, redirecting...");
|
||||||
let navigate = use_navigate();
|
// Force a full reload to re-run auth checks in App.rs
|
||||||
navigate("/", Default::default());
|
let _ = window().location().set_href("/");
|
||||||
} else {
|
} else {
|
||||||
|
let text = resp.text().await.unwrap_or_default();
|
||||||
|
logging::error!("Login failed: {}", text);
|
||||||
set_error.set(Some("Kullanıcı adı veya şifre hatalı".to_string()));
|
set_error.set(Some("Kullanıcı adı veya şifre hatalı".to_string()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Err(_) => {
|
Err(e) => {
|
||||||
|
logging::error!("Network error: {}", e);
|
||||||
set_error.set(Some("Bağlantı hatası".to_string()));
|
set_error.set(Some("Bağlantı hatası".to_string()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -83,6 +91,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,6 +1,5 @@
|
|||||||
use leptos::*;
|
use leptos::*;
|
||||||
use leptos_router::*;
|
use serde::Serialize;
|
||||||
use serde::{Deserialize, Serialize};
|
|
||||||
|
|
||||||
#[derive(Serialize)]
|
#[derive(Serialize)]
|
||||||
struct SetupRequest {
|
struct SetupRequest {
|
||||||
@@ -49,9 +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
|
// Redirect to home after setup (auto-login handled by backend)
|
||||||
let navigate = use_navigate();
|
// Full reload to ensure auth state is refreshed
|
||||||
navigate("/login", Default::default());
|
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,3 +1,4 @@
|
|||||||
pub mod sidebar;
|
pub mod sidebar;
|
||||||
pub mod toolbar;
|
|
||||||
pub mod statusbar;
|
pub mod statusbar;
|
||||||
|
pub mod toolbar;
|
||||||
|
pub mod protected;
|
||||||
|
|||||||
30
frontend/src/components/layout/protected.rs
Normal file
30
frontend/src/components/layout/protected.rs
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
use leptos::*;
|
||||||
|
use crate::components::layout::sidebar::Sidebar;
|
||||||
|
use crate::components::layout::statusbar::StatusBar;
|
||||||
|
use crate::components::layout::toolbar::Toolbar;
|
||||||
|
|
||||||
|
#[component]
|
||||||
|
pub fn Protected(children: Children) -> impl IntoView {
|
||||||
|
view! {
|
||||||
|
<div class="drawer lg:drawer-open h-full w-full">
|
||||||
|
<input id="my-drawer" type="checkbox" class="drawer-toggle" />
|
||||||
|
|
||||||
|
<div class="drawer-content flex flex-col h-full overflow-hidden bg-base-100 text-base-content text-sm select-none">
|
||||||
|
<Toolbar />
|
||||||
|
|
||||||
|
<main class="flex-1 flex flex-col min-w-0 bg-base-100 overflow-hidden pb-8">
|
||||||
|
{children()}
|
||||||
|
</main>
|
||||||
|
|
||||||
|
<StatusBar />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="drawer-side z-40 transition-none duration-0">
|
||||||
|
<label for="my-drawer" aria-label="close sidebar" class="drawer-overlay transition-none duration-0"></label>
|
||||||
|
<div class="menu p-0 min-h-full bg-base-200 text-base-content border-r border-base-300 transition-none duration-0">
|
||||||
|
<Sidebar />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -74,69 +74,202 @@ pub fn Sidebar() -> impl IntoView {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
view! {
|
let handle_logout = move |_| {
|
||||||
<div class="w-64 h-full flex flex-col bg-base-200 border-r border-base-300" style="padding-top: env(safe-area-inset-top);">
|
spawn_local(async move {
|
||||||
<div class="p-2">
|
let client = gloo_net::http::Request::post("/api/auth/logout");
|
||||||
<ul class="menu w-full rounded-box gap-1">
|
if let Ok(resp) = client.send().await {
|
||||||
<li class="menu-title text-primary uppercase font-bold px-4">"Filters"</li>
|
if resp.ok() {
|
||||||
<li>
|
// Force full reload to clear state
|
||||||
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::All))} on:click=move |_| set_filter(crate::store::FilterStatus::All)>
|
let _ = window().location().set_href("/login");
|
||||||
<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>
|
});
|
||||||
"All"
|
};
|
||||||
<span class="badge badge-sm badge-ghost ml-auto">{total_count}</span>
|
|
||||||
</button>
|
let username = move || {
|
||||||
</li>
|
|
||||||
<li>
|
store.user.get().unwrap_or_else(|| "User".to_string())
|
||||||
<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" />
|
|
||||||
</svg>
|
|
||||||
"Downloading"
|
|
||||||
<span class="badge badge-sm badge-ghost ml-auto">{downloading_count}</span>
|
|
||||||
</button>
|
|
||||||
</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>
|
|
||||||
}
|
let first_letter = move || {
|
||||||
}
|
|
||||||
|
username().chars().next().unwrap_or('?').to_uppercase().to_string()
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
view! {
|
||||||
|
|
||||||
|
<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">
|
||||||
|
|
||||||
|
<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>
|
||||||
|
|
||||||
|
"All"
|
||||||
|
|
||||||
|
<span class="badge badge-sm badge-ghost ml-auto">{total_count}</span>
|
||||||
|
|
||||||
|
</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" />
|
||||||
|
|
||||||
|
</svg>
|
||||||
|
|
||||||
|
"Downloading"
|
||||||
|
|
||||||
|
<span class="badge badge-sm badge-ghost ml-auto">{downloading_count}</span>
|
||||||
|
|
||||||
|
</button>
|
||||||
|
|
||||||
|
</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>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
}}
|
||||||
|
|||||||
@@ -45,6 +45,22 @@ fn format_duration(seconds: i64) -> String {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn format_date(timestamp: i64) -> String {
|
||||||
|
if timestamp <= 0 {
|
||||||
|
return "-".to_string();
|
||||||
|
}
|
||||||
|
let date = js_sys::Date::new(&wasm_bindgen::JsValue::from_f64((timestamp * 1000) as f64));
|
||||||
|
|
||||||
|
// Simple formatting: YYYY-MM-DD HH:mm
|
||||||
|
let year = date.get_full_year();
|
||||||
|
let month = date.get_month() + 1; // 0-based
|
||||||
|
let day = date.get_date();
|
||||||
|
let hours = date.get_hours();
|
||||||
|
let minutes = date.get_minutes();
|
||||||
|
|
||||||
|
format!("{:04}-{:02}-{:02} {:02}:{:02}", year, month, day, hours, minutes)
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||||
enum SortColumn {
|
enum SortColumn {
|
||||||
Name,
|
Name,
|
||||||
@@ -54,6 +70,7 @@ enum SortColumn {
|
|||||||
DownSpeed,
|
DownSpeed,
|
||||||
UpSpeed,
|
UpSpeed,
|
||||||
ETA,
|
ETA,
|
||||||
|
Added,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||||
@@ -66,8 +83,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::Added);
|
||||||
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 +144,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::Added => a.added_date.cmp(&b.added_date),
|
||||||
};
|
};
|
||||||
if dir == SortDirection::Descending {
|
if dir == SortDirection::Descending {
|
||||||
cmp.reverse()
|
cmp.reverse()
|
||||||
@@ -264,6 +282,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::Added)>
|
||||||
|
<div class="flex items-center">"Added" {move || sort_arrow(SortColumn::Added)}</div>
|
||||||
|
</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
@@ -317,6 +338,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-60 whitespace-nowrap">{format_date(t.added_date)}</td>
|
||||||
</tr>
|
</tr>
|
||||||
}
|
}
|
||||||
}).collect::<Vec<_>>()}
|
}).collect::<Vec<_>>()}
|
||||||
@@ -324,83 +346,85 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
</table>
|
</table>
|
||||||
</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
|
// Transparent overlay to close sort dropdown
|
||||||
<Show when=move || sort_open.get()>
|
<Show when=move || sort_open.get()>
|
||||||
<div
|
<div
|
||||||
class="fixed inset-0 z-[98] cursor-default"
|
class="fixed inset-0 z-[98] cursor-default"
|
||||||
on:pointerdown=move |_| set_sort_open.set(false)
|
on:pointerdown=move |_| set_sort_open.set(false)
|
||||||
></div>
|
></div>
|
||||||
</Show>
|
</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">
|
||||||
<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:pointerdown=move |e| {
|
||||||
e.stop_propagation();
|
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);
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<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="M3 7.5L7.5 3m0 0L12 7.5M7.5 3v13.5m13.5 0L16.5 21m0 0L12 16.5m4.5 4.5V7.5" />
|
<path stroke-linecap="round" stroke-linejoin="round" d="M3 7.5L7.5 3m0 0L12 7.5M7.5 3v13.5m13.5 0L16.5 21m0 0L12 16.5m4.5 4.5V7.5" />
|
||||||
</svg>
|
</svg>
|
||||||
"Sort"
|
"Sort"
|
||||||
</div>
|
</div>
|
||||||
<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()
|
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::Added, "Date Added"),
|
||||||
(SortColumn::Size, "Size"),
|
(SortColumn::Name, "Name"),
|
||||||
(SortColumn::Progress, "Progress"),
|
(SortColumn::Size, "Size"),
|
||||||
(SortColumn::Status, "Status"),
|
(SortColumn::Progress, "Progress"),
|
||||||
(SortColumn::DownSpeed, "Down Speed"),
|
(SortColumn::Status, "Status"),
|
||||||
(SortColumn::UpSpeed, "Up Speed"),
|
(SortColumn::DownSpeed, "Down Speed"),
|
||||||
(SortColumn::ETA, "ETA"),
|
(SortColumn::UpSpeed, "Up Speed"),
|
||||||
];
|
(SortColumn::ETA, "ETA"),
|
||||||
|
];
|
||||||
|
|
||||||
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" }
|
class=move || if is_active() { "bg-primary/10 text-primary font-bold flex justify-between" } else { "flex justify-between" }
|
||||||
on:pointerdown=move |e| {
|
on:pointerdown=move |e| {
|
||||||
e.stop_propagation();
|
e.stop_propagation();
|
||||||
handle_sort(col);
|
handle_sort(col);
|
||||||
set_sort_open.set(false);
|
set_sort_open.set(false);
|
||||||
}
|
|
||||||
>
|
|
||||||
{label}
|
|
||||||
<Show when=is_active fallback=|| ()>
|
|
||||||
<span class="opacity-70 text-[10px]">
|
|
||||||
{move || match current_dir() {
|
|
||||||
SortDirection::Ascending => "▲",
|
|
||||||
SortDirection::Descending => "▼",
|
|
||||||
}}
|
|
||||||
</span>
|
|
||||||
</Show>
|
|
||||||
</button>
|
|
||||||
</li>
|
|
||||||
}
|
}
|
||||||
}).collect::<Vec<_>>()
|
>
|
||||||
}
|
{label}
|
||||||
</ul>
|
<Show when=is_active fallback=|| ()>
|
||||||
</div>
|
<span class="opacity-70 text-[10px]">
|
||||||
</div>
|
{move || match current_dir() {
|
||||||
|
SortDirection::Ascending => "▲",
|
||||||
|
SortDirection::Descending => "▼",
|
||||||
|
}}
|
||||||
|
</span>
|
||||||
|
</Show>
|
||||||
|
</button>
|
||||||
|
</li>
|
||||||
|
}
|
||||||
|
}).collect::<Vec<_>>()
|
||||||
|
}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="overflow-y-auto p-3 pb-20 flex-1 grid grid-cols-1 content-start gap-3"> {move || filtered_torrents().into_iter().map(|t| {
|
<div class="overflow-y-auto p-3 pb-20 flex-1 grid grid-cols-1 content-start gap-3">
|
||||||
|
{move || filtered_torrents().into_iter().map(|t| {
|
||||||
let progress_class = if t.percent_complete >= 100.0 { "progress-success" } else { "progress-primary" };
|
let progress_class = if t.percent_complete >= 100.0 { "progress-success" } else { "progress-primary" };
|
||||||
let status_str = format!("{:?}", t.status);
|
let status_str = format!("{:?}", t.status);
|
||||||
let status_badge_class = match t.status {
|
let status_badge_class = match t.status {
|
||||||
|
|||||||
@@ -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,6 +137,7 @@ pub fn provide_torrent_store() {
|
|||||||
search_query,
|
search_query,
|
||||||
global_stats,
|
global_stats,
|
||||||
notifications,
|
notifications,
|
||||||
|
user,
|
||||||
};
|
};
|
||||||
provide_context(store);
|
provide_context(store);
|
||||||
|
|
||||||
@@ -149,7 +152,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 +166,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 +228,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 +240,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,7 +319,7 @@ 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()) {
|
let permission_granted = if let Ok(notification_class) = js_sys::Reflect::get(&window, &"Notification".into()) {
|
||||||
@@ -324,13 +327,13 @@ pub async fn subscribe_to_push_notifications() {
|
|||||||
log::error!("Notification API not available");
|
log::error!("Notification API not available");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check current permission
|
// Check current permission
|
||||||
let current_permission = js_sys::Reflect::get(¬ification_class, &"permission".into())
|
let current_permission = js_sys::Reflect::get(¬ification_class, &"permission".into())
|
||||||
.ok()
|
.ok()
|
||||||
.and_then(|p| p.as_string())
|
.and_then(|p| p.as_string())
|
||||||
.unwrap_or_default();
|
.unwrap_or_default();
|
||||||
|
|
||||||
if current_permission == "granted" {
|
if current_permission == "granted" {
|
||||||
log::info!("Notification permission already granted");
|
log::info!("Notification permission already granted");
|
||||||
true
|
true
|
||||||
@@ -376,14 +379,14 @@ pub async fn subscribe_to_push_notifications() {
|
|||||||
log::error!("Cannot access Notification class");
|
log::error!("Cannot access Notification class");
|
||||||
return;
|
return;
|
||||||
};
|
};
|
||||||
|
|
||||||
if !permission_granted {
|
if !permission_granted {
|
||||||
log::warn!("Notification permission not granted, cannot subscribe to push");
|
log::warn!("Notification permission not granted, cannot subscribe to push");
|
||||||
return;
|
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 +395,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 +403,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 +411,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 +425,12 @@ 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 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 +438,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 +448,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 +461,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 +473,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,11 +483,11 @@ 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
|
// Get subscription JSON using toJSON() method
|
||||||
let json_result = match js_sys::Reflect::get(&push_subscription, &"toJSON".into()) {
|
let json_result = match js_sys::Reflect::get(&push_subscription, &"toJSON".into()) {
|
||||||
Ok(func) if func.is_function() => {
|
Ok(func) if func.is_function() => {
|
||||||
@@ -502,7 +505,7 @@ pub async fn subscribe_to_push_notifications() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let json_value = match js_sys::JSON::stringify(&json_result) {
|
let json_value = match js_sys::JSON::stringify(&json_result) {
|
||||||
Ok(val) => val,
|
Ok(val) => val,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
@@ -510,11 +513,11 @@ pub async fn subscribe_to_push_notifications() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let subscription_json_str = json_value.as_string().expect("should be string");
|
let subscription_json_str = json_value.as_string().expect("should be string");
|
||||||
|
|
||||||
log::info!("Push subscription: {}", subscription_json_str);
|
log::info!("Push subscription: {}", subscription_json_str);
|
||||||
|
|
||||||
// Parse and send to backend
|
// Parse and send to backend
|
||||||
let subscription_data: serde_json::Value = match serde_json::from_str(&subscription_json_str) {
|
let subscription_data: serde_json::Value = match serde_json::from_str(&subscription_json_str) {
|
||||||
Ok(data) => data,
|
Ok(data) => data,
|
||||||
@@ -523,35 +526,35 @@ pub async fn subscribe_to_push_notifications() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// Extract endpoint and keys
|
// Extract endpoint and keys
|
||||||
let endpoint = subscription_data
|
let endpoint = subscription_data
|
||||||
.get("endpoint")
|
.get("endpoint")
|
||||||
.and_then(|v| v.as_str())
|
.and_then(|v| v.as_str())
|
||||||
.expect("endpoint should exist")
|
.expect("endpoint should exist")
|
||||||
.to_string();
|
.to_string();
|
||||||
|
|
||||||
let keys_obj = subscription_data
|
let keys_obj = subscription_data
|
||||||
.get("keys")
|
.get("keys")
|
||||||
.expect("keys should exist");
|
.expect("keys should exist");
|
||||||
|
|
||||||
let p256dh = keys_obj
|
let p256dh = keys_obj
|
||||||
.get("p256dh")
|
.get("p256dh")
|
||||||
.and_then(|v| v.as_str())
|
.and_then(|v| v.as_str())
|
||||||
.expect("p256dh should exist")
|
.expect("p256dh should exist")
|
||||||
.to_string();
|
.to_string();
|
||||||
|
|
||||||
let auth = keys_obj
|
let auth = keys_obj
|
||||||
.get("auth")
|
.get("auth")
|
||||||
.and_then(|v| v.as_str())
|
.and_then(|v| v.as_str())
|
||||||
.expect("auth should exist")
|
.expect("auth should exist")
|
||||||
.to_string();
|
.to_string();
|
||||||
|
|
||||||
let push_data = PushSubscriptionData {
|
let push_data = PushSubscriptionData {
|
||||||
endpoint,
|
endpoint,
|
||||||
keys: PushKeys { p256dh, auth },
|
keys: PushKeys { p256dh, auth },
|
||||||
};
|
};
|
||||||
|
|
||||||
// Send to backend
|
// Send to backend
|
||||||
let response = match Request::post("/api/push/subscribe")
|
let response = match Request::post("/api/push/subscribe")
|
||||||
.json(&push_data)
|
.json(&push_data)
|
||||||
@@ -565,7 +568,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 {
|
||||||
@@ -580,10 +583,10 @@ fn url_base64_to_uint8array(base64_string: &str) -> Result<js_sys::Uint8Array, J
|
|||||||
let padding = (4 - (base64_string.len() % 4)) % 4;
|
let padding = (4 - (base64_string.len() % 4)) % 4;
|
||||||
let mut padded = base64_string.to_string();
|
let mut padded = base64_string.to_string();
|
||||||
padded.push_str(&"=".repeat(padding));
|
padded.push_str(&"=".repeat(padding));
|
||||||
|
|
||||||
// Replace URL-safe characters
|
// Replace URL-safe characters
|
||||||
let standard_base64 = padded.replace('-', "+").replace('_', "/");
|
let standard_base64 = padded.replace('-', "+").replace('_', "/");
|
||||||
|
|
||||||
// Decode using JavaScript to avoid UTF-8 encoding issues
|
// Decode using JavaScript to avoid UTF-8 encoding issues
|
||||||
// Create a JavaScript function to decode the base64 and convert to Uint8Array
|
// Create a JavaScript function to decode the base64 and convert to Uint8Array
|
||||||
let js_code = format!(
|
let js_code = format!(
|
||||||
@@ -599,9 +602,9 @@ fn url_base64_to_uint8array(base64_string: &str) -> Result<js_sys::Uint8Array, J
|
|||||||
"#,
|
"#,
|
||||||
standard_base64
|
standard_base64
|
||||||
);
|
);
|
||||||
|
|
||||||
let result = js_sys::eval(&js_code)?;
|
let result = js_sys::eval(&js_code)?;
|
||||||
let array = result.dyn_into::<js_sys::Uint8Array>()?;
|
let array = result.dyn_into::<js_sys::Uint8Array>()?;
|
||||||
|
|
||||||
Ok(array)
|
Ok(array)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user