Templater as a separate plugin.

Removed a huge amount of code.

Cargo.toml

@@ -24,6 +24,7 @@ notifico-telegram = { path = "notifico-telegram" }
 notifico-smtp = { path = "notifico-smtp" }
 notifico-subscription = { path = "notifico-subscription" }
 notifico-whatsapp = { path = "notifico-whatsapp" }
+notifico-templater = { path = "notifico-templater" }
 serde_yaml = "0.9.23"
 actix = "0.13.5"
 axum = "0.7.6"
@@ -38,7 +39,8 @@ lto = true
 codegen-units = 1
 
 [workspace]
-members = [".", "notifico-core", "notifico-smtp", "notifico-telegram", "notifico-subscription/migration", "notifico-subscription", "notifico-whatsapp"]
+members = [".", "notifico-core", "notifico-smtp", "notifico-telegram", "notifico-subscription/migration", "notifico-subscription", "notifico-whatsapp", "notifico-templater"]
 
 [workspace.dependencies]
 sea-orm = { version = "1.1.0-rc.1", features = ["sqlx-sqlite", "sqlx-postgres", "runtime-tokio-rustls", "macros"] }
+reqwest = "0.12.8"

notifico-core/Cargo.toml

@@ -7,10 +7,7 @@ edition = "2021"
 async-trait = "0.1.82"
 serde = { version = "1.0.210", features = ["derive"] }
 serde_json = "1.0.128"
-uuid = { version = "1.10.0", features = ["v4", "serde"] }
-reqwest = "0.12.7"
-url = "2.5.2"
+uuid = { version = "1.10.0", features = ["serde"] }
 tracing = "0.1.40"
 tokio = "1.40.0"
-reqwest-middleware = { version = "0.3.3", features = ["json"] }
-reqwest-tracing = "0.5.3"
+

notifico-core/src/credentials.rs

@@ -1,4 +1,5 @@
 use crate::error::EngineError;
+use async_trait::async_trait;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use uuid::Uuid;
@@ -26,16 +27,17 @@ pub trait TypedCredential: for<'de> Deserialize<'de> {
     const CREDENTIAL_TYPE: &'static str;
 }
 
+#[async_trait]
 pub trait Credentials: Send + Sync {
-    fn get_credential(
+    async fn get_credential(
         &self,
         project: Uuid,
         r#type: &str,
         name: &str,
     ) -> Result<Credential, EngineError>;
 }
 
-pub fn get_typed_credential<T>(
+pub async fn get_typed_credential<T>(
     credentials: &dyn Credentials,
     project: Uuid,
     name: &str,
@@ -45,5 +47,6 @@ where
 {
     credentials
         .get_credential(project, T::CREDENTIAL_TYPE, name)
+        .await
         .and_then(|c| c.into_typed())
 }

notifico-core/src/engine/mod.rs

@@ -2,6 +2,7 @@ use crate::engine::plugin::{EnginePlugin, StepOutput};
 use crate::error::EngineError;
 use crate::pipeline::SerializedStep;
 use crate::recipient::Recipient;
+use crate::templater::RenderResponse;
 use serde::{Deserialize, Serialize};
 use serde_json::{Map, Value};
 use std::borrow::Cow;
@@ -17,14 +18,14 @@ pub mod plugin;
 #[serde(transparent)]
 pub struct EventContext(pub Map<String, Value>);
 
-#[derive(Default, Debug)]
+#[derive(Default, Debug, Serialize, Deserialize)]
 pub struct PipelineContext {
     pub project_id: Uuid,
     pub recipient: Option<Recipient>,
     pub trigger_event: String,
     pub event_context: EventContext,
     pub plugin_contexts: Map<String, Value>,
-    pub messages: Vec<Map<String, Value>>,
+    pub messages: Vec<RenderResponse>,
     pub channel: String,
 }
 

notifico-core/src/engine/plugin.rs

@@ -6,7 +6,7 @@ use std::any::Any;
 use std::borrow::Cow;
 
 pub enum StepOutput {
-    None,
+    Continue,
     Interrupt,
 }
 

notifico-core/src/error.rs

@@ -1,4 +1,3 @@
-use crate::templater::TemplaterError;
 use std::borrow::Cow;
 use std::error::Error;
 use uuid::Uuid;
@@ -7,7 +6,6 @@ use uuid::Uuid;
 pub enum EngineError {
     InvalidCredentialFormat,
     CredentialNotFound(Cow<'static, str>, String),
-    TemplaterError(TemplaterError),
     PluginNotFound(String),
     ContactNotFound(String),
     InvalidContactFormat,
@@ -18,9 +16,3 @@ pub enum EngineError {
     InternalError(Box<dyn Error>),
     InvalidStep(serde_json::Error),
 }
-
-impl From<TemplaterError> for EngineError {
-    fn from(err: TemplaterError) -> Self {
-        EngineError::TemplaterError(err)
-    }
-}

notifico-core/src/pipeline.rs

@@ -115,7 +115,7 @@ impl PipelineRunner {
                 for step in pipeline.steps.iter() {
                     let result = engine.execute_step(&mut context, step).await;
                     match result {
-                        Ok(StepOutput::None) => continue,
+                        Ok(StepOutput::Continue) => continue,
                         Ok(StepOutput::Interrupt) => break,
                         Err(err) => {
                             error!("Error executing step: {:?}", err);

notifico-core/src/templater.rs

@@ -0,0 +1,6 @@
+use serde::{Deserialize, Serialize};
+use serde_json::{Map, Value};
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(transparent)]
+pub struct RenderResponse(pub Map<String, Value>);

notifico-smtp/src/context.rs

@@ -1,22 +1,7 @@
-use lettre::message::Mailbox;
 use serde::{Deserialize, Serialize};
 
-pub const EMAIL_FROM: &str = "email.from";
-pub const EMAIL_SUBJECT: &str = "email.subject";
-pub const EMAIL_BODY_HTML: &str = "email.body_html";
-pub const EMAIL_BODY_PLAINTEXT: &str = "email.body_plaintext";
-// pub const EMAIL_LIST_UNSUBSCRIBE: &str = "email.list_unsubscribe";
-
 #[derive(Serialize, Deserialize, Clone)]
-pub struct Email {
-    #[serde(rename = "email.from")]
-    pub from: Mailbox,
-    #[serde(rename = "email.subject")]
-    pub subject: String,
-    #[serde(rename = "email.body_html")]
-    pub body_html: String,
-    #[serde(rename = "email.body_plaintext")]
-    pub body_plaintext: String,
+pub struct PluginContext {
     #[serde(rename = "email.list_unsubscribe")]
     pub list_unsubscribe: Option<String>,
 }