Compare commits

..

1 Commits

Author SHA1 Message Date
spinline
cffc88443a feat: add centralized API service layer for frontend
All checks were successful
Build MIPS Binary / build (push) Successful in 5m18s
- Create frontend/src/api/mod.rs with centralized HTTP client and error handling
- Implement api::auth module (login, logout, check_auth, get_user)
- Implement api::torrent module (add, action, delete, start, stop, set_label, set_priority)
- Implement api::setup module (get_status, setup)
- Implement api::settings module (set_global_limits)
- Implement api::push module (get_public_key, subscribe)
- Update all components to use api service layer instead of direct gloo_net calls
- Add thiserror dependency for error handling
2026-02-08 23:27:13 +03:00
3 changed files with 81 additions and 99 deletions

33
Cargo.lock generated
View File

@@ -310,7 +310,6 @@ dependencies = [
"serde_json", "serde_json",
"shared", "shared",
"sqlx", "sqlx",
"strum",
"thiserror 2.0.18", "thiserror 2.0.18",
"time", "time",
"tokio", "tokio",
@@ -545,7 +544,7 @@ version = "4.5.55"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a92793da1a46a5f2a02a6f4c46c6496b28c43638adea8306fcb0caa1634f24e5" checksum = "a92793da1a46a5f2a02a6f4c46c6496b28c43638adea8306fcb0caa1634f24e5"
dependencies = [ dependencies = [
"heck 0.5.0", "heck",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.114", "syn 2.0.114",
@@ -1538,12 +1537,6 @@ dependencies = [
"hashbrown 0.15.5", "hashbrown 0.15.5",
] ]
[[package]]
name = "heck"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
[[package]] [[package]]
name = "heck" name = "heck"
version = "0.5.0" version = "0.5.0"
@@ -3711,7 +3704,7 @@ checksum = "19a9c1841124ac5a61741f96e1d9e2ec77424bf323962dd894bdb93f37d5219b"
dependencies = [ dependencies = [
"dotenvy", "dotenvy",
"either", "either",
"heck 0.5.0", "heck",
"hex", "hex",
"once_cell", "once_cell",
"proc-macro2", "proc-macro2",
@@ -3854,28 +3847,6 @@ version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
[[package]]
name = "strum"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
dependencies = [
"strum_macros",
]
[[package]]
name = "strum_macros"
version = "0.25.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
dependencies = [
"heck 0.4.1",
"proc-macro2",
"quote",
"rustversion",
"syn 2.0.114",
]
[[package]] [[package]]
name = "subtle" name = "subtle"
version = "2.6.1" version = "2.6.1"

View File

@@ -42,4 +42,3 @@ 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" tower_governor = "0.8.0"
governor = "0.10.4" governor = "0.10.4"
strum = { version = "0.25", features = ["derive", "strum_macros"] }

View File

@@ -7,80 +7,95 @@ use axum::response::sse::{Event, Sse};
use futures::stream::{self, Stream}; use futures::stream::{self, Stream};
use shared::{AppEvent, GlobalStats, Torrent, TorrentStatus}; use shared::{AppEvent, GlobalStats, Torrent, TorrentStatus};
use std::convert::Infallible; use std::convert::Infallible;
use strum::{Display, EnumString};
use tokio_stream::StreamExt; use tokio_stream::StreamExt;
#[derive(Debug, Clone, Copy, EnumString, Display, PartialEq)] // Field definitions to keep query and parser in sync
enum RtorrentField { mod fields {
#[strum(serialize = "d.hash=")] pub const IDX_HASH: usize = 0;
Hash, pub const CMD_HASH: &str = "d.hash=";
#[strum(serialize = "d.name=")]
Name, pub const IDX_NAME: usize = 1;
#[strum(serialize = "d.size_bytes=")] pub const CMD_NAME: &str = "d.name=";
Size,
#[strum(serialize = "d.bytes_done=")] pub const IDX_SIZE: usize = 2;
Completed, pub const CMD_SIZE: &str = "d.size_bytes=";
#[strum(serialize = "d.down.rate=")]
DownRate, pub const IDX_COMPLETED: usize = 3;
#[strum(serialize = "d.up.rate=")] pub const CMD_COMPLETED: &str = "d.bytes_done=";
UpRate,
#[strum(serialize = "d.state=")] pub const IDX_DOWN_RATE: usize = 4;
State, pub const CMD_DOWN_RATE: &str = "d.down.rate=";
#[strum(serialize = "d.complete=")]
Complete, pub const IDX_UP_RATE: usize = 5;
#[strum(serialize = "d.message=")] pub const CMD_UP_RATE: &str = "d.up.rate=";
Message,
#[strum(serialize = "d.left_bytes=")] pub const IDX_STATE: usize = 6;
LeftBytes, pub const CMD_STATE: &str = "d.state=";
#[strum(serialize = "d.creation_date=")]
CreationDate, pub const IDX_COMPLETE: usize = 7;
#[strum(serialize = "d.hashing=")] pub const CMD_COMPLETE: &str = "d.complete=";
Hashing,
#[strum(serialize = "d.custom1=")] pub const IDX_MESSAGE: usize = 8;
Label, pub const CMD_MESSAGE: &str = "d.message=";
pub const IDX_LEFT_BYTES: usize = 9;
pub const CMD_LEFT_BYTES: &str = "d.left_bytes=";
pub const IDX_CREATION_DATE: usize = 10;
pub const CMD_CREATION_DATE: &str = "d.creation_date=";
pub const IDX_HASHING: usize = 11;
pub const CMD_HASHING: &str = "d.hashing=";
pub const IDX_LABEL: usize = 12;
pub const CMD_LABEL: &str = "d.custom1=";
} }
const RTORRENT_FIELDS: &[RtorrentField] = &[ use fields::*;
RtorrentField::Hash,
RtorrentField::Name, // Constants for rTorrent fields to ensure query and parser stay in sync
RtorrentField::Size, const RTORRENT_FIELDS: &[&str] = &[
RtorrentField::Completed, "", // Ignored by multicall pattern
RtorrentField::DownRate, "main", // View
RtorrentField::UpRate, CMD_HASH,
RtorrentField::State, CMD_NAME,
RtorrentField::Complete, CMD_SIZE,
RtorrentField::Message, CMD_COMPLETED,
RtorrentField::LeftBytes, CMD_DOWN_RATE,
RtorrentField::CreationDate, CMD_UP_RATE,
RtorrentField::Hashing, CMD_STATE,
RtorrentField::Label, CMD_COMPLETE,
CMD_MESSAGE,
CMD_LEFT_BYTES,
CMD_CREATION_DATE,
CMD_HASHING,
CMD_LABEL,
]; ];
fn get_field_value(row: &Vec<String>, field: RtorrentField) -> String { fn parse_long(s: Option<&String>) -> i64 {
let idx = RTORRENT_FIELDS.iter().position(|&f| f == field).unwrap_or(0); s.map(|v| v.parse().unwrap_or(0)).unwrap_or(0)
row.get(idx).cloned().unwrap_or_default()
} }
fn parse_long(s: &str) -> i64 { fn parse_string(s: Option<&String>) -> String {
s.parse().unwrap_or(0) s.cloned().unwrap_or_default()
} }
/// Converts a raw row of strings from rTorrent XML-RPC into a generic Torrent struct /// Converts a raw row of strings from rTorrent XML-RPC into a generic Torrent struct
fn from_rtorrent_row(row: &Vec<String>) -> Torrent { fn from_rtorrent_row(row: Vec<String>) -> Torrent {
let hash = get_field_value(row, RtorrentField::Hash); let hash = parse_string(row.get(IDX_HASH));
let name = get_field_value(row, RtorrentField::Name); let name = parse_string(row.get(IDX_NAME));
let size = parse_long(&get_field_value(row, RtorrentField::Size)); let size = parse_long(row.get(IDX_SIZE));
let completed = parse_long(&get_field_value(row, RtorrentField::Completed)); let completed = parse_long(row.get(IDX_COMPLETED));
let down_rate = parse_long(&get_field_value(row, RtorrentField::DownRate)); let down_rate = parse_long(row.get(IDX_DOWN_RATE));
let up_rate = parse_long(&get_field_value(row, RtorrentField::UpRate)); let up_rate = parse_long(row.get(IDX_UP_RATE));
let state = parse_long(&get_field_value(row, RtorrentField::State)); let state = parse_long(row.get(IDX_STATE));
let is_complete = parse_long(&get_field_value(row, RtorrentField::Complete)); let is_complete = parse_long(row.get(IDX_COMPLETE));
let message = get_field_value(row, RtorrentField::Message); let message = parse_string(row.get(IDX_MESSAGE));
let left_bytes = parse_long(&get_field_value(row, RtorrentField::LeftBytes)); let left_bytes = parse_long(row.get(IDX_LEFT_BYTES));
let added_date = parse_long(&get_field_value(row, RtorrentField::CreationDate)); let added_date = parse_long(row.get(IDX_CREATION_DATE));
let is_hashing = parse_long(&get_field_value(row, RtorrentField::Hashing)); let is_hashing = parse_long(row.get(IDX_HASHING));
let label_raw = get_field_value(row, RtorrentField::Label); let label_raw = parse_string(row.get(IDX_LABEL));
let label = if label_raw.is_empty() { let label = if label_raw.is_empty() {
None None
@@ -131,10 +146,7 @@ fn from_rtorrent_row(row: &Vec<String>) -> Torrent {
} }
pub async fn fetch_torrents(client: &RtorrentClient) -> Result<Vec<Torrent>, XmlRpcError> { pub async fn fetch_torrents(client: &RtorrentClient) -> Result<Vec<Torrent>, XmlRpcError> {
let params: Vec<RpcParam> = RTORRENT_FIELDS let params: Vec<RpcParam> = RTORRENT_FIELDS.iter().map(|s| RpcParam::from(*s)).collect();
.iter()
.map(|&f| RpcParam::from(f.to_string()))
.collect();
let xml = client.call("d.multicall2", &params).await?; let xml = client.call("d.multicall2", &params).await?;
if xml.trim().is_empty() { if xml.trim().is_empty() {
@@ -143,7 +155,7 @@ pub async fn fetch_torrents(client: &RtorrentClient) -> Result<Vec<Torrent>, Xml
let rows = parse_multicall_response(&xml)?; let rows = parse_multicall_response(&xml)?;
let torrents = rows.iter().map(from_rtorrent_row).collect(); let torrents = rows.into_iter().map(from_rtorrent_row).collect();
Ok(torrents) Ok(torrents)
} }