GeneralBots/botserver
2
1
Fork 0
Code Issues Pull requests Projects Releases 323 Packages Wiki Activity Actions

fix: USE_WEBSITE non-blocking - timeout 3s, never blocks start.bas
All checks were successful
BotServer CI / build (push) Successful in 11m43s
Details

Browse source
This commit is contained in:
Rodrigo Rodriguez (Pragmatismo) 2026-03-18 19:41:23 -03:00
parent 6e594d68dd
commit 2fcfb05fd6
1 changed files with 15 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/basic/keywords/use_website.rs
View file

@ -106,22 +106,13 @@ pub fn use_website_keyword(state: Arc<AppState>, user: UserSession, engine: &mut
}
});
match rx.recv_timeout(std::time::Duration::from_secs(10)) {
match rx.recv_timeout(std::time::Duration::from_secs(3)) {
Ok(Ok(message)) => Ok(Dynamic::from(message)),
Ok(Err(e)) => Err(Box::new(rhai::EvalAltResult::ErrorRuntime(
e.into(),
rhai::Position::NONE,
))),
Err(std::sync::mpsc::RecvTimeoutError::Timeout) => {
Err(Box::new(rhai::EvalAltResult::ErrorRuntime(
"USE WEBSITE timed out".into(),
rhai::Position::NONE,
)))
}
Err(e) => Err(Box::new(rhai::EvalAltResult::ErrorRuntime(
format!("USE WEBSITE failed: {}", e).into(),
rhai::Position::NONE,
))),
Err(_) => Ok(Dynamic::from("Website association scheduled.")),
}
},
)
@ -181,22 +172,13 @@ pub fn use_website_keyword(state: Arc<AppState>, user: UserSession, engine: &mut
}
});
match rx.recv_timeout(std::time::Duration::from_secs(10)) {
match rx.recv_timeout(std::time::Duration::from_secs(3)) {
Ok(Ok(message)) => Ok(Dynamic::from(message)),
Ok(Err(e)) => Err(Box::new(rhai::EvalAltResult::ErrorRuntime(
e.into(),
rhai::Position::NONE,
))),
Err(std::sync::mpsc::RecvTimeoutError::Timeout) => {
Err(Box::new(rhai::EvalAltResult::ErrorRuntime(
"USE WEBSITE timed out".into(),
rhai::Position::NONE,
)))
}
Err(e) => Err(Box::new(rhai::EvalAltResult::ErrorRuntime(
format!("USE WEBSITE failed: {}", e).into(),
rhai::Position::NONE,
))),
Err(_) => Ok(Dynamic::from("Website association scheduled.")),
}
},
)
@ -255,13 +237,10 @@ pub fn register_use_website_function(state: Arc<AppState>, user: UserSession, en
let _ = tx.send(result);
});
match rx.recv_timeout(std::time::Duration::from_secs(10)) {
match rx.recv_timeout(std::time::Duration::from_secs(3)) {
Ok(Ok(message)) => Dynamic::from(message),
Ok(Err(e)) => Dynamic::from(format!("ERROR: {}", e)),
Err(std::sync::mpsc::RecvTimeoutError::Timeout) => {
Dynamic::from("ERROR: USE_WEBSITE timed out")
}
Err(e) => Dynamic::from(format!("ERROR: USE_WEBSITE failed: {}", e)),
Err(_) => Dynamic::from("Website association scheduled."),
}
},
);
@ -315,11 +294,11 @@ pub fn register_use_website_function(state: Arc<AppState>, user: UserSession, en
let _ = tx.send(result);
});
match rx.recv_timeout(std::time::Duration::from_secs(10)) {
match rx.recv_timeout(std::time::Duration::from_secs(3)) {
Ok(Ok(message)) => Dynamic::from(message),
Ok(Err(e)) => Dynamic::from(format!("ERROR: {}", e)),
Err(std::sync::mpsc::RecvTimeoutError::Timeout) => {
Dynamic::from("ERROR: use_website timed out")
Err(_) => {
Dynamic::from("Website association scheduled.")
}
Err(e) => Dynamic::from(format!("ERROR: use_website failed: {}", e)),
}
@ -370,11 +349,11 @@ pub fn register_use_website_function(state: Arc<AppState>, user: UserSession, en
let _ = tx.send(result);
});
match rx.recv_timeout(std::time::Duration::from_secs(10)) {
match rx.recv_timeout(std::time::Duration::from_secs(3)) {
Ok(Ok(message)) => Dynamic::from(message),
Ok(Err(e)) => Dynamic::from(format!("ERROR: {}", e)),
Err(std::sync::mpsc::RecvTimeoutError::Timeout) => {
Dynamic::from("ERROR: USE_WEBSITE timed out")
Err(_) => {
Dynamic::from("Website association scheduled.")
}
Err(e) => Dynamic::from(format!("ERROR: USE_WEBSITE failed: {}", e)),
}
@ -424,11 +403,11 @@ pub fn register_use_website_function(state: Arc<AppState>, user: UserSession, en
let _ = tx.send(result);
});
match rx.recv_timeout(std::time::Duration::from_secs(10)) {
match rx.recv_timeout(std::time::Duration::from_secs(3)) {
Ok(Ok(message)) => Dynamic::from(message),
Ok(Err(e)) => Dynamic::from(format!("ERROR: {}", e)),
Err(std::sync::mpsc::RecvTimeoutError::Timeout) => {
Dynamic::from("ERROR: use_website timed out")
Err(_) => {
Dynamic::from("Website association scheduled.")
}
Err(e) => Dynamic::from(format!("ERROR: use_website failed: {}", e)),
}