ospab
/
ostp
mirror of https://github.com/ospab/ostp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: ostp --update uses correct install URL; api returns name in user list

This commit is contained in:
ospab 2026-05-26 20:24:33 +03:00
parent 89380ef70b
commit 9c59cabfc7
3 changed files with 21 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ostp-server/src/api.rs
View File

@ -352,23 +352,25 @@ async fn handle_list_users(
let keys = state.access_keys.read().unwrap();
let stats = state.user_stats.read().unwrap();
let mut users: Vec<UserStatsSnapshot> = keys.keys().map(|key| {
let mut users: Vec<UserStatsSnapshot> = keys.iter().map(|(key, meta)| {
if let Some(us) = stats.get(key) {
UserStatsSnapshot {
access_key: key.clone(),
name: meta.name.clone(),
bytes_up: us.bytes_up.load(Ordering::Relaxed),
bytes_down: us.bytes_down.load(Ordering::Relaxed),
connections: us.connections.load(Ordering::Relaxed),
limit_bytes: us.limit_bytes,
online: true, // Simplified; real check requires session map
online: true,
}
} else {
UserStatsSnapshot {
access_key: key.clone(),
name: meta.name.clone(),
bytes_up: 0,
bytes_down: 0,
connections: 0,
limit_bytes: None,
limit_bytes: meta.limit_bytes,
online: false,
}
}
@ -389,14 +391,16 @@ async fn handle_get_user(
}
let keys = state.access_keys.read().unwrap();
if !keys.contains_key(&key) {
return api_error("user not found");
}
let meta = match keys.get(&key) {
Some(m) => m.clone(),
None => return api_error("user not found"),
};
let stats = state.user_stats.read().unwrap();
let snapshot = if let Some(us) = stats.get(&key) {
UserStatsSnapshot {
access_key: key.clone(),
name: meta.name.clone(),
bytes_up: us.bytes_up.load(Ordering::Relaxed),
bytes_down: us.bytes_down.load(Ordering::Relaxed),
connections: us.connections.load(Ordering::Relaxed),
@ -406,10 +410,11 @@ async fn handle_get_user(
} else {
UserStatsSnapshot {
access_key: key.clone(),
name: meta.name.clone(),
bytes_up: 0,
bytes_down: 0,
connections: 0,
limit_bytes: None,
limit_bytes: meta.limit_bytes,
online: false,
}
};

2
ostp-server/src/dispatcher.rs
View File

@ -55,6 +55,7 @@ impl UserStats {
#[derive(Debug, Clone, serde::Serialize)]
pub struct UserStatsSnapshot {
pub access_key: String,
pub name: Option<String>,
pub bytes_up: u64,
pub bytes_down: u64,
pub connections: u64,
@ -113,6 +114,7 @@ impl Dispatcher {
.collect();
stats.iter().map(|(key, us)| UserStatsSnapshot {
access_key: key.clone(),
name: None,
bytes_up: us.bytes_up.load(Ordering::Relaxed),
bytes_down: us.bytes_down.load(Ordering::Relaxed),
connections: us.connections.load(Ordering::Relaxed),

41
ostp/src/main.rs
View File

@ -978,42 +978,15 @@ fn cmd_uninstall() -> Result<()> {
fn cmd_update() -> Result<()> {
use std::process::Command;
// Prefer the install script next to the binary, then the well-known path.
let script_candidates = [
"/opt/ostp/install.sh",
"/tmp/ostp_install.sh",
];
println!("[ostp] Updating OSTP...");
let status = Command::new("bash")
.args(["-c", "bash <(curl -Ls https://raw.githubusercontent.com/ospab/ostp/master/scripts/install.sh)"])
.status()
.map_err(|e| anyhow!("Failed to run update: {e}"))?;
let script_path = script_candidates
.iter()
.find(|p| std::path::Path::new(p).exists())
.copied();
if let Some(path) = script_path {
println!("[ostp] Running update script: {}", path);
let status = Command::new("bash")
.arg(path)
.status()
.map_err(|e| anyhow!("Failed to execute install script: {e}"))?;
if !status.success() {
anyhow::bail!("Install script exited with status: {}", status);
}
println!("[ostp] Update complete.");
} else {
// Download and run the script on the fly
println!("[ostp] install.sh not found locally – downloading from GitHub...");
let status = Command::new("bash")
.args(["-c", "curl -fsSL https://raw.githubusercontent.com/ospab/ostp/main/scripts/install.sh | bash"])
.status()
.map_err(|e| anyhow!("Failed to download/run install script: {e}"))?;
if !status.success() {
anyhow::bail!("Update script exited with status: {}", status);
}
println!("[ostp] Update complete.");
if !status.success() {
anyhow::bail!("Update script exited with status: {}", status);
}
Ok(())
}