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

Make rendering return Result, and handle infinite recursion

Browse Source
This commit is contained in:
Gregory Schier
2025-03-05 13:49:45 -08:00
parent 7a1a0689b0
commit fbf4d3c11e
25 changed files with 348 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src-tauri/yaak-ws/src/render.rs
View File

@@ -1,3 +1,4 @@
use crate::error::Result;
use std::collections::BTreeMap;
use yaak_models::models::{Environment, HttpRequestHeader, WebsocketRequest};
use yaak_models::render::make_vars_hashmap;
@@ -8,33 +9,33 @@ pub async fn render_request<T: TemplateCallback>(
base_environment: &Environment,
environment: Option<&Environment>,
cb: &T,
) -> WebsocketRequest {
) -> Result<WebsocketRequest> {
let vars = &make_vars_hashmap(base_environment, environment);
let mut headers = Vec::new();
for p in r.headers.clone() {
headers.push(HttpRequestHeader {
enabled: p.enabled,
name: parse_and_render(&p.name, vars, cb).await,
value: parse_and_render(&p.value, vars, cb).await,
name: parse_and_render(&p.name, vars, cb).await?,
value: parse_and_render(&p.value, vars, cb).await?,
id: p.id,
})
}
let mut authentication = BTreeMap::new();
for (k, v) in r.authentication.clone() {
authentication.insert(k, render_json_value_raw(v, vars, cb).await);
authentication.insert(k, render_json_value_raw(v, vars, cb).await?);
}
let url = parse_and_render(r.url.as_str(), vars, cb).await;
let url = parse_and_render(r.url.as_str(), vars, cb).await?;
let message = parse_and_render(&r.message.clone(), vars, cb).await;
let message = parse_and_render(&r.message.clone(), vars, cb).await?;
WebsocketRequest {
Ok(WebsocketRequest {
url,
headers,
authentication,
message,
..r.to_owned()
}
})
}