mirror of
https://github.com/mountain-loop/yaak.git
synced 2026-11-21 07:51:39 +01:00
Two users on 2026.7.x reported the app going half-dead: local editing kept
working, but Send did nothing and every encrypted secret rendered blank until
they restarted. The webview console carried a Rust task panic —
Delete task failed: task 1314 panicked with message
"Failed to get new DB connection from the pool: Error(None)"
`Error(None)` is r2d2's acquire timeout. `QueryManager::connect` and `with_tx`
turned that timeout into `expect`, so a pool that was momentarily full took down
whatever task asked for a connection instead of reporting a failure the caller
could show, retry, or ignore. Every DB-backed path shares those two functions,
which is why one stalled pool reads as "Send is dead and the secrets are gone".
Acquisition is now fallible end to end: `connect()` and `BlobManager::connect()`
return `Result`, and so do the `db()`/`blobs()` accessors on every host. Call
sites propagate with `?` where they already returned a result; the fire-and-forget
writers (streaming events, the model-change poller) log and carry on. `with_conn`
had no callers and only added a third panic, so it is gone.
Two places held a pooled connection across work that has nothing to do with the
database and can block for a long time — the OS keyring in
`EncryptionManager::get_workspace_key`, and the sync directory walk in
`cmd_sync_calculate`. Both now hand the connection back first. Those are the
paths behind the two visible symptoms.
Not fixed here: the gRPC streaming block in yaak-app-client still `.unwrap()`s
its database writes, as it did before, so acquisition failures panic there too.
`ProxyQueryManager` in the separate proxy app keeps its own `expect`.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
44 lines
1.2 KiB
Rust
44 lines
1.2 KiB
Rust
use crate::cli::{CookieJarArgs, CookieJarCommands};
|
|
use crate::context::CliContext;
|
|
use crate::utils::workspace::resolve_workspace_id;
|
|
|
|
type CommandResult<T = ()> = std::result::Result<T, String>;
|
|
|
|
pub fn run(ctx: &CliContext, args: CookieJarArgs) -> i32 {
|
|
let result = match args.command {
|
|
CookieJarCommands::List { workspace_id } => list(ctx, workspace_id.as_deref()),
|
|
};
|
|
|
|
match result {
|
|
Ok(()) => 0,
|
|
Err(error) => {
|
|
eprintln!("Error: {error}");
|
|
1
|
|
}
|
|
}
|
|
}
|
|
|
|
fn list(ctx: &CliContext, workspace_id: Option<&str>) -> CommandResult {
|
|
let workspace_id = resolve_workspace_id(ctx, workspace_id, "cookie-jar list")?;
|
|
let cookie_jars = ctx
|
|
.db()
|
|
.map_err(|e| e.to_string())?
|
|
.list_cookie_jars(&workspace_id)
|
|
.map_err(|e| format!("Failed to list cookie jars: {e}"))?;
|
|
|
|
if cookie_jars.is_empty() {
|
|
println!("No cookie jars found in workspace {}", workspace_id);
|
|
} else {
|
|
for cookie_jar in cookie_jars {
|
|
println!(
|
|
"{} - {} ({} cookies)",
|
|
cookie_jar.id,
|
|
cookie_jar.name,
|
|
cookie_jar.cookies.len()
|
|
);
|
|
}
|
|
}
|
|
|
|
Ok(())
|
|
}
|