Make rendering return Result, and handle infinite recursion

src-tauri/yaak-ws/src/commands.rs

@@ -116,7 +116,7 @@ pub(crate) async fn send<R: Runtime>(
             RenderPurpose::Send,
         ),
     )
-    .await;
+    .await?;
 
     let mut ws_manager = ws_manager.lock().await;
     ws_manager.send(&connection.id, Message::Text(request.message.clone().into())).await?;
@@ -214,7 +214,7 @@ pub(crate) async fn connect<R: Runtime>(
             RenderPurpose::Send,
         ),
     )
-    .await;
+    .await?;
 
     let mut headers = HeaderMap::new();
     if let Some(auth_name) = request.authentication_type.clone() {

src-tauri/yaak-ws/src/error.rs

@@ -13,6 +13,9 @@ pub enum Error {
     #[error("Plugin error: {0}")]
     PluginError(#[from] yaak_plugins::error::Error),
 
+    #[error("Render error: {0}")]
+    TemplateError(#[from] yaak_templates::error::Error),
+
     #[error("WebSocket error: {0}")]
     GenericError(String),
 }

src-tauri/yaak-ws/src/lib.rs

@@ -1,6 +1,6 @@
 mod commands;
 mod connect;
-mod error;
+pub mod error;
 mod manager;
 mod render;
 

src-tauri/yaak-ws/src/render.rs

@@ -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()
-    }
+    })
 }