starred/yaak-mountain-loop
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-03-25 02:41:07 +01:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Always update response if error

Browse Source 
https://feedback.yaak.app/p/cant-re-send-request-if-there-is-one-ongoing
This commit is contained in:
Gregory Schier
2025-07-10 12:51:04 -07:00
parent f745435d26
commit 840f15c997
2 changed files with 52 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src-tauri/src/http_request.rs
View File

@@ -167,9 +167,9 @@ pub async fn send_http_request<R: Runtime>(
let cookies = cj
.cookies
.iter()
.map(|cookie| {
let json_cookie = serde_json::to_value(cookie).unwrap();
serde_json::from_value(json_cookie).expect("Failed to deserialize cookie")
.filter_map(|cookie| {
let json_cookie = serde_json::to_value(cookie).ok()?;
serde_json::from_value(json_cookie).ok()?
})
.map(|c| Ok(c))
.collect::<Vec<Result<_>>>();

64
src-tauri/src/lib.rs
View File

@@ -837,13 +837,18 @@ async fn cmd_call_http_request_action<R: Runtime>(
req: CallHttpRequestActionRequest,
plugin_manager: State<'_, PluginManager>,
) -> YaakResult<()> {
Ok(plugin_manager.call_http_request_action(&window, CallHttpRequestActionRequest {
args: CallHttpRequestActionArgs {
http_request: resolve_http_request(&window, &req.args.http_request)?.0,
..req.args
},
..req
}).await?)
Ok(plugin_manager
.call_http_request_action(
&window,
CallHttpRequestActionRequest {
args: CallHttpRequestActionArgs {
http_request: resolve_http_request(&window, &req.args.http_request)?.0,
..req.args
},
..req
},
)
.await?)
}
#[tauri::command]
@@ -852,13 +857,18 @@ async fn cmd_call_grpc_request_action<R: Runtime>(
req: CallGrpcRequestActionRequest,
plugin_manager: State<'_, PluginManager>,
) -> YaakResult<()> {
Ok(plugin_manager.call_grpc_request_action(&window, CallGrpcRequestActionRequest {
args: CallGrpcRequestActionArgs {
grpc_request: resolve_grpc_request(&window, &req.args.grpc_request)?.0,
..req.args
},
..req
}).await?)
Ok(plugin_manager
.call_grpc_request_action(
&window,
CallGrpcRequestActionRequest {
args: CallGrpcRequestActionArgs {
grpc_request: resolve_grpc_request(&window, &req.args.grpc_request)?.0,
..req.args
},
..req
},
)
.await?)
}
#[tauri::command]
@@ -980,7 +990,31 @@ async fn cmd_send_http_request<R: Runtime>(
None => None,
};
send_http_request(&window, &request, &response, environment, cookie_jar, &mut cancel_rx).await
let r = match send_http_request(
&window,
&request,
&response,
environment,
cookie_jar,
&mut cancel_rx,
)
.await
{
Ok(r) => r,
Err(e) => {
let resp = app_handle.db().get_http_response(&response.id)?;
app_handle.db().upsert_http_response(
&HttpResponse {
state: HttpResponseState::Closed,
error: Some(e.to_string()),
..resp
},
&UpdateSource::from_window(&window),
)?
}
};
Ok(r)
}
fn response_err<R: Runtime>(