diff --git a/core/src/main.rs b/core/src/main.rs index 89eb86df3..7f6fbc883 100644 --- a/core/src/main.rs +++ b/core/src/main.rs @@ -2,9 +2,9 @@ use ::helpers::{docker::DockerClient, get_socket_addr}; use auth::JwtClient; -use axum::{http::StatusCode, Router}; +use axum::{http::StatusCode, Router, routing::get}; use db::DbClient; -use ws::make_ws_sender_reciver; +use ws::{make_ws_sender_reciver, ws_handler}; mod api; mod auth; @@ -23,6 +23,7 @@ async fn main() { let app = Router::new() .nest("/api", api::router()) .nest("/auth", auth::router(&config)) + .route("/ws", get(ws_handler)) .layer(sender) .layer(reciever) .layer(DbClient::extension(config.mongo.clone()).await) diff --git a/core/src/ws/mod.rs b/core/src/ws/mod.rs index 63cc6fd12..630f34ccb 100644 --- a/core/src/ws/mod.rs +++ b/core/src/ws/mod.rs @@ -11,6 +11,7 @@ use axum::{ Extension, }; use db::{DbClient, DbExtension}; +use serde_json::Value; use crate::auth::{JwtClient, JwtExtension}; use tokio::sync::watch::{self, error::SendError, Receiver, Sender}; @@ -37,7 +38,8 @@ pub async fn ws_handler( Some((ws, user_id)) => { loop { reciever.changed().await; - let msg = reciever.borrow(); + let msg = serde_json::from_str::(&reciever.borrow()).unwrap(); + todo!() } } diff --git a/core/src/ws/update.rs b/core/src/ws/update.rs new file mode 100644 index 000000000..e69de29bb diff --git a/lib/types/src/lib.rs b/lib/types/src/lib.rs index d3e4181b1..3ad3e4d7f 100644 --- a/lib/types/src/lib.rs +++ b/lib/types/src/lib.rs @@ -429,4 +429,4 @@ impl Default for RestartMode { fn default() -> RestartMode { RestartMode::NoRestart } -} +} \ No newline at end of file