mirror of
https://github.com/Tencent/BrowserSkill.git
synced 2026-09-10 13:01:23 +08:00
drakezhangandCursor
ea03f36f3a
After a long idle the service worker is only revived on its next keepalive-alarm tick (up to 30s away), so the previous 5s wait made the first command after idle fail with `no_browser_connected` even though the extension was about to reconnect. - Raise the daemon's `EXTENSION_CONNECT_WAIT` (used by `session.start`) to 35s so it comfortably covers one alarm period plus handshake slack. - Bump the CLI `session start` IPC timeout to that window plus slack so it never gives up before the daemon answers, and print a one-line "waiting for browser extension to connect…" hint when it actually waits. - Keep `bsk status` / `browsers` on their own short 5s wait so quick informational commands are not slowed down. Co-authored-by: Cursor <cursoragent@cursor.com>
63 lines
2.4 KiB
Rust
63 lines
2.4 KiB
Rust
//! Shared browser-connect wait durations for status/doctor/browsers commands.
|
|
|
|
use std::time::Duration;
|
|
|
|
/// Default wait passed to daemon status/list RPCs when the registry is empty.
|
|
///
|
|
/// Deliberately shorter than the daemon's [`EXTENSION_CONNECT_WAIT`]
|
|
/// (used by `session.start`): `bsk status` / `bsk browsers` are quick
|
|
/// informational snapshots, so blocking them for a full keepalive-alarm
|
|
/// period would hurt more than it helps. The long wait is reserved for
|
|
/// the command path that actually needs the extension online.
|
|
///
|
|
/// [`EXTENSION_CONNECT_WAIT`]: crate::daemon::browsers::EXTENSION_CONNECT_WAIT
|
|
pub const DEFAULT_BROWSER_CONNECT_WAIT: Duration = Duration::from_secs(5);
|
|
/// Keep CLI-side waits aligned with the daemon's IPC clamp so a bad env value
|
|
/// cannot inflate read timeouts after the daemon has already returned.
|
|
const MAX_BROWSER_CONNECT_WAIT: Duration = Duration::from_secs(60);
|
|
|
|
/// Browser wait for `bsk status` / `bsk browsers`. Override in tests via
|
|
/// `BSK_BROWSER_WAIT_MS`.
|
|
pub fn browser_connect_wait() -> Duration {
|
|
wait_from_env("BSK_BROWSER_WAIT_MS").unwrap_or(DEFAULT_BROWSER_CONNECT_WAIT)
|
|
}
|
|
|
|
/// Browser wait for `bsk doctor`. Falls back to [`browser_connect_wait`] when
|
|
/// `BSK_DOCTOR_BROWSER_WAIT_MS` is unset so tests can shorten only doctor.
|
|
pub fn doctor_browser_connect_wait() -> Duration {
|
|
wait_from_env("BSK_DOCTOR_BROWSER_WAIT_MS").unwrap_or_else(browser_connect_wait)
|
|
}
|
|
|
|
/// Encodes a wait duration for protocol params. A zero duration preserves the
|
|
/// legacy immediate-snapshot semantics.
|
|
pub fn wait_for_browser_ms(wait: Duration) -> Option<u64> {
|
|
let wait = clamp_browser_wait(wait);
|
|
if wait.is_zero() {
|
|
None
|
|
} else {
|
|
Some(wait.as_millis() as u64)
|
|
}
|
|
}
|
|
|
|
/// IPC call budget: the command's normal timeout, or browser wait plus
|
|
/// scheduling slack when a wait is requested.
|
|
pub fn browser_query_ipc_timeout(wait: Duration, default_timeout: Duration) -> Duration {
|
|
let wait = clamp_browser_wait(wait);
|
|
if wait.is_zero() {
|
|
default_timeout
|
|
} else {
|
|
wait.saturating_add(Duration::from_secs(2))
|
|
}
|
|
}
|
|
|
|
fn wait_from_env(key: &str) -> Option<Duration> {
|
|
std::env::var(key)
|
|
.ok()
|
|
.and_then(|v| v.parse::<u64>().ok())
|
|
.map(|ms| clamp_browser_wait(Duration::from_millis(ms)))
|
|
}
|
|
|
|
fn clamp_browser_wait(wait: Duration) -> Duration {
|
|
wait.min(MAX_BROWSER_CONNECT_WAIT)
|
|
}
|