Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/browser/lifecycle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,18 +93,24 @@ fn get_session_status(session: &Value) -> Option<String> {

/// Extract session timeout (milliseconds) from API response.
/// The API may return it as `timeout`, `sessionTimeout`, or `timeoutMs`.
/// Self-hosted servers may encode "no timeout" as 0, which we normalize to `None`.
pub fn get_session_timeout(session: &Value) -> Option<u64> {
let keys = ["timeout", "sessionTimeout", "timeoutMs"];
for key in &keys {
if let Some(v) = session.get(key) {
if let Some(n) = v.as_u64() {
return Some(n);
if n > 0 {
return Some(n);
}
continue;
}
// Handle string numbers
if let Some(s) = v.as_str()
&& let Ok(n) = s.trim().parse::<u64>()
{
return Some(n);
if n > 0 {
return Some(n);
}
}
}
}
Expand Down Expand Up @@ -512,6 +518,12 @@ mod tests {
);
}

#[test]
fn session_timeout_zero_means_unset() {
assert_eq!(get_session_timeout(&json!({"timeout": 0})), None);
assert_eq!(get_session_timeout(&json!({"timeoutMs": "0"})), None);
}

#[test]
fn session_timeout_missing() {
assert_eq!(get_session_timeout(&json!({"id": "s1"})), None);
Expand Down
Loading