Bump deps

Cargo.toml

@@ -29,15 +29,17 @@ members = [
 ]
 
 [workspace.dependencies]
-sea-orm = { version = "1.1.2", features = ["sqlx-sqlite", "sqlx-postgres", "sqlx-mysql", "runtime-tokio-native-tls", "macros"] }
-reqwest = { version = "0.12.9", default-features = false, features = ["json", "native-tls", "native-tls-alpn", "charset", "http2", "multipart", "stream"] }
-axum = { version = "0.7.9", features = ["macros"] }
+sea-orm = { version = "1.1.3", features = ["sqlx-sqlite", "sqlx-postgres", "sqlx-mysql", "runtime-tokio-native-tls", "macros"] }
+reqwest = { version = "0.12.12", default-features = false, features = ["json", "native-tls", "native-tls-alpn", "charset", "http2", "multipart", "stream"] }
+axum = { version = "0.8.1", features = ["macros"] }
 clap = { version = "4.5.23", features = ["derive", "color", "usage", "env"] }
 url = { version = "2.5.4", features = ["serde"] }
+utoipa = { git = "https://github.com/juhaku/utoipa.git", features = ["axum_extras", "uuid"] }
+utoipa-swagger-ui = { git = "https://github.com/juhaku/utoipa.git", features = ["axum", "vendored"] }
 uuid = { version = "1.11.0", features = ["serde", "v7"] }
 
 [workspace.dependencies.sea-orm-migration]
-version = "1.1.2"
+version = "1.1.3"
 features = [
     # Enable at least one `ASYNC_RUNTIME` and `DATABASE_DRIVER` feature if you want to run migration via CLI.
     # View the list of supported features at https://www.sea-ql.org/SeaORM/docs/install-and-config/database-and-async-runtime.

notifico-app/Cargo.toml

@@ -13,8 +13,8 @@ notifico-dbpipeline = { path = "../notifico-dbpipeline" }
 notifico-project = { path = "../notifico-project" }
 notifico-attachment = { path = "../notifico-attachment" }
 
-anyhow = "1.0.94"
-async-trait = "0.1.83"
+anyhow = "1.0.95"
+async-trait = "0.1.84"
 axum = { workspace = true }
 backoff = { version = "0.4.0", features = ["tokio"] }
 clap = { workspace = true }
@@ -25,14 +25,13 @@ jsonwebtoken = "9.3.0"
 log = "0.4.22"
 rust-embed = { version = "8.5.0", features = ["mime-guess"] }
 sea-orm = { workspace = true }
-serde = { version = "1.0.215", features = ["derive"] }
-serde_json = "1.0.133"
+serde = { version = "1.0.217", features = ["derive"] }
+serde_json = "1.0.134"
 tokio = { version = "1.42", features = ["macros", "rt", "sync", "rt-multi-thread", "signal"] }
 tower-http = { version = "0.6.2", features = ["cors"] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3.19", features = ["env-filter", "fmt"] }
 url = { workspace = true }
-utoipa = { version = "5.2.0", features = ["axum_extras"] }
-utoipa-redoc = { version = "5.0.0", features = ["axum"] }
-utoipa-swagger-ui = { version = "8", features = ["axum", "vendored"] }
+utoipa = { workspace = true }
+utoipa-swagger-ui = { workspace = true }
 uuid = { workspace = true }

notifico-app/src/ingest/http.rs

@@ -10,8 +10,6 @@ use std::net::SocketAddr;
 use std::sync::Arc;
 use tokio::net::TcpListener;
 use utoipa::{IntoParams, OpenApi};
-use utoipa_redoc::Redoc;
-use utoipa_redoc::Servable;
 use utoipa_swagger_ui::SwaggerUi;
 use uuid::Uuid;
 
@@ -36,7 +34,6 @@ pub async fn start(serviceapi_bind: SocketAddr, ext: HttpIngestExtensions) {
 
     let app =
         app.merge(SwaggerUi::new("/swagger-ui").url("/api-docs/openapi.json", ApiDoc::openapi()));
-    let app = app.merge(Redoc::with_url("/redoc", ApiDoc::openapi()));
 
     tokio::spawn(async { axum::serve(listener, app).await.unwrap() });
 }

notifico-app/src/public/http/mod.rs

@@ -8,8 +8,6 @@ use std::net::SocketAddr;
 use std::sync::Arc;
 use tokio::net::TcpListener;
 use utoipa::OpenApi;
-use utoipa_redoc::Redoc;
-use utoipa_redoc::Servable;
 use utoipa_swagger_ui::SwaggerUi;
 
 #[derive(Clone)]
@@ -31,7 +29,6 @@ pub(crate) async fn start(bind: SocketAddr, ext: HttpPublicExtensions) {
 
     let app =
         app.merge(SwaggerUi::new("/swagger-ui").url("/api-docs/openapi.json", ApiDoc::openapi()));
-    let app = app.merge(Redoc::with_url("/redoc", ApiDoc::openapi()));
 
     tokio::spawn(async { axum::serve(listener, app).await.unwrap() });
 }

notifico-app/src/public/http/recipient.rs

@@ -4,9 +4,6 @@ use axum::{Extension, Router};
 
 pub(crate) fn get_router(ext: HttpPublicExtensions) -> Router {
     Router::new()
-        .nest(
-            "/",
-            subscription_get_router(ext.subscription_controller.clone()),
-        )
+        .merge(subscription_get_router(ext.subscription_controller.clone()))
         .layer(Extension(ext.subscription_controller.clone()))
 }

notifico-app/src/ui/http/admin/mod.rs

@@ -16,57 +16,57 @@ pub(crate) fn get_router(ext: HttpUiExtensions) -> Router {
     Router::new()
         // Subscriptions
         .route("/v1/subscriptions", get(subscription::list))
-        .route("/v1/subscriptions/:id", get(subscription::get))
+        .route("/v1/subscriptions/{id}", get(subscription::get))
         // Recipients
         .route(
             "/v1/recipients",
             get(recipients::list).post(recipients::create),
         )
         .route(
-            "/v1/recipients/:id",
+            "/v1/recipients/{id}",
             get(recipients::get)
                 .put(recipients::update)
                 .delete(recipients::delete),
         )
         // Contacts
         .route("/v1/contacts", get(contacts::list).post(contacts::create))
         .route(
-            "/v1/contacts/:id",
+            "/v1/contacts/{id}",
             get(contacts::get)
                 .delete(contacts::delete)
                 .put(contacts::update),
         )
         // Contacts
         .route("/v1/groups", get(group::list).post(group::create))
         .route(
-            "/v1/groups/:id",
+            "/v1/groups/{id}",
             get(group::get).delete(group::delete).put(group::update),
         )
         // Pipelines
         .route("/v1/pipelines", get(pipeline::list).post(pipeline::create))
         .route(
-            "/v1/pipelines/:id",
+            "/v1/pipelines/{id}",
             get(pipeline::get)
                 .put(pipeline::update)
                 .delete(pipeline::delete),
         )
         // Events
         .route("/v1/events", get(event::list).post(event::create))
         .route(
-            "/v1/events/:id",
+            "/v1/events/{id}",
             get(event::get).put(event::update).delete(event::delete),
         )
         // Projects
         .route("/v1/projects", get(project::list).post(project::create))
         .route(
-            "/v1/projects/:id",
+            "/v1/projects/{id}",
             get(project::get)
                 .put(project::update)
                 .delete(project::delete),
         )
         .route("/v1/templates", get(template::list).post(template::create))
         .route(
-            "/v1/templates/:id",
+            "/v1/templates/{id}",
             get(template::get)
                 .put(template::update)
                 .delete(template::delete),

notifico-attachment/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 notifico-core = { path = "../notifico-core" }
 
-serde = { version = "1.0.216", features = ["derive"] }
-async-trait = "0.1.83"
+serde = { version = "1.0.217", features = ["derive"] }
+async-trait = "0.1.84"
 tokio = { version = "1.42.0", features = ["fs", "sync"] }
 mime_guess = "2.0.5"

notifico-core/Cargo.toml

@@ -4,19 +4,19 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-async-trait = "0.1.83"
-serde = { version = "1.0.215", features = ["derive"] }
-serde_json = "1.0.133"
+async-trait = "0.1.84"
+serde = { version = "1.0.217", features = ["derive"] }
+serde_json = "1.0.134"
 uuid = { workspace = true }
 tracing = "0.1.41"
 tokio = "1.42.0"
 axum = { workspace = true }
 url = { workspace = true }
 sea-orm = { workspace = true }
-anyhow = "1.0.94"
-utoipa = { version = "5", features = ["uuid"] }
+anyhow = "1.0.95"
+utoipa = { workspace = true }
 flume = "0.11.1"
-thiserror = "2.0.6"
+thiserror = "2.0.9"
 regex = "1.11.1"
-serde_with = "3.11.0"
+serde_with = "3.12.0"
 futures = "0.3.31"

notifico-dbpipeline/Cargo.toml

@@ -8,7 +8,7 @@ notifico-core = { path = "../notifico-core" }
 notifico-dbpipeline-migration = { path = "migration" }
 
 sea-orm = { workspace = true }
-async-trait = "0.1.83"
-serde = "1.0.215"
-serde_json = "1.0.133"
-anyhow = "1.0.94"
+async-trait = "0.1.84"
+serde = "1.0.217"
+serde_json = "1.0.134"
+anyhow = "1.0.95"

notifico-project/Cargo.toml

@@ -9,5 +9,5 @@ notifico-core = { path = "../notifico-core" }
 
 sea-orm = { workspace = true }
 uuid = { workspace = true }
-serde = { version = "1.0.215", features = ["derive"] }
-async-trait = "0.1.83"
+serde = { version = "1.0.217", features = ["derive"] }
+async-trait = "0.1.84"

notifico-subscription/Cargo.toml

@@ -9,11 +9,11 @@ notifico-subcription-migration = { path = "migration" }
 
 url = { workspace = true }
 uuid = { workspace = true }
-serde_json = "1.0.133"
+serde_json = "1.0.134"
 sea-orm = { workspace = true }
 tracing = "0.1.41"
-serde = { version = "1.0.215", features = ["derive"] }
+serde = { version = "1.0.217", features = ["derive"] }
 jsonwebtoken = "9.3.0"
-anyhow = "1.0.94"
-async-trait = "0.1.83"
+anyhow = "1.0.95"
+async-trait = "0.1.84"
 futures = "0.3.31"

notifico-template/Cargo.toml

@@ -6,14 +6,14 @@ edition = "2021"
 [dependencies]
 notifico-core = { path = "../notifico-core" }
 minijinja = { version = "2.5.0", default-features = false, features = ["builtins", "unicode", "serde", "debug", "urlencode", "speedups"] }
-serde = { version = "1.0.215", features = ["derive"] }
-serde_json = "1.0.133"
-async-trait = "0.1.83"
+serde = { version = "1.0.217", features = ["derive"] }
+serde_json = "1.0.134"
+async-trait = "0.1.84"
 tracing = "0.1.41"
 notifico-template-migration = { path = "migration" }
 sea-orm = { workspace = true }
 uuid = { workspace = true }
-anyhow = "1.0.94"
-thiserror = "2.0.6"
+anyhow = "1.0.95"
+thiserror = "2.0.9"
 tokio = { version = "1.42.0", features = ["fs"] }
 toml = "0.8.19"

notificox/Cargo.toml

@@ -9,8 +9,8 @@ notifico-template = { path = "../notifico-template" }
 notifico-transports = { path = "../notifico-transports" }
 notifico-attachment = { path = "../notifico-attachment" }
 # Other deps
-serde = { version = "1.0.215", features = ["derive"] }
-serde_json = { version = "1.0.133", features = ["preserve_order"] }
+serde = { version = "1.0.217", features = ["derive"] }
+serde_json = { version = "1.0.134", features = ["preserve_order"] }
 tokio = { version = "1.42.0", features = ["rt"] }
 clap = { workspace = true }
 json5 = "0.4.1"

transports/notifico-gotify/Cargo.toml

@@ -7,6 +7,6 @@ edition = "2021"
 notifico-core = { path = "../../notifico-core" }
 reqwest = { workspace = true }
 url = { workspace = true }
-serde_json = "1.0.133"
-serde = { version = "1.0.215", features = ["derive"] }
-async-trait = "0.1.83"
+serde_json = "1.0.134"
+serde = { version = "1.0.217", features = ["derive"] }
+async-trait = "0.1.84"

transports/notifico-ntfy/Cargo.toml

@@ -8,7 +8,7 @@ notifico-core = { path = "../../notifico-core" }
 notifico-attachment = { path = "../../notifico-attachment" }
 reqwest = { workspace = true }
 url = { workspace = true }
-serde = { version = "1.0.158", features = ["derive"] }
-serde_json = "1.0.93"
-async-trait = "0.1.83"
+serde = { version = "1.0.217", features = ["derive"] }
+serde_json = "1.0.134"
+async-trait = "0.1.84"
 base64 = "0.22.1"

transports/notifico-pushover/Cargo.toml

@@ -8,6 +8,6 @@ notifico-core = { path = "../../notifico-core" }
 notifico-attachment = { path = "../../notifico-attachment" }
 
 reqwest = { workspace = true }
-async-trait = "0.1.83"
-serde = "1.0.215"
+async-trait = "0.1.84"
+serde = "1.0.217"
 url = "2.5.4"

transports/notifico-slack/Cargo.toml

@@ -8,9 +8,9 @@ notifico-core = { path = "../../notifico-core" }
 notifico-attachment = { path = "../../notifico-attachment" }
 
 reqwest = { workspace = true }
-serde = "1.0.215"
-async-trait = "0.1.83"
-thiserror = "2.0.6"
+serde = "1.0.217"
+async-trait = "0.1.84"
+thiserror = "2.0.9"
 tokio = { version = "1.42.0", features = ["fs"] }
 tokio-util = "0.7.13"
 url = { workspace = true }

transports/notifico-smpp/Cargo.toml

@@ -10,8 +10,8 @@ tokio-util = { version = "0.7.13", features = ["full"] }
 tracing = "0.1.41"
 
 notifico-core = { path = "../../notifico-core" }
-serde = { version = "1.0.215", features = ["derive"] }
-serde_json = "1.0.133"
-async-trait = "0.1.83"
+serde = { version = "1.0.217", features = ["derive"] }
+serde_json = "1.0.134"
+async-trait = "0.1.84"
 futures-util = "0.3.31"
 url = "2.5.4"

transports/notifico-smtp/Cargo.toml

@@ -4,17 +4,17 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-async-trait = "0.1.83"
-serde_json = "1.0.133"
+async-trait = "0.1.84"
+serde_json = "1.0.134"
 tracing = "0.1.41"
 lettre = { version = "0.11.11", default-features = false, features = [
     "smtp-transport", "pool", "hostname", "builder",
     "serde", "tokio1-native-tls", "tracing"
 ] }
-serde = { version = "1.0.215", features = ["derive"] }
+serde = { version = "1.0.217", features = ["derive"] }
 uuid = { workspace = true }
 url = "2.5.4"
-moka = { version = "0.12.8", features = ["future"] }
+moka = { version = "0.12.9", features = ["future"] }
 mime = "0.3.17"
 
 notifico-core = { path = "../../notifico-core" }

transports/notifico-telegram/Cargo.toml

@@ -4,9 +4,9 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-async-trait = "0.1.83"
-serde = { version = "1.0.215", features = ["derive"] }
-serde_json = "1.0.133"
+async-trait = "0.1.84"
+serde = { version = "1.0.217", features = ["derive"] }
+serde_json = "1.0.134"
 reqwest = { workspace = true }
 
 notifico-core = { path = "../../notifico-core" }

transports/notifico-whatsapp/Cargo.toml

@@ -4,10 +4,10 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-serde = { version = "1.0.215", features = ["derive"] }
+serde = { version = "1.0.217", features = ["derive"] }
 uuid = { workspace = true }
-serde_json = "1.0.133"
-async-trait = "0.1.83"
+serde_json = "1.0.134"
+async-trait = "0.1.84"
 reqwest = { workspace = true }
 tracing = "0.1.41"
 regex = "1.11.1"