refactor: ⚡ move websocket into existing webserver and folder structure

keeps things consistent and avoids having 2 webservers running under actix, can be reverted if its not desirable however i think this is the best option

src/api/v1/servers/uuid/channels/uuid/mod.rs

@@ -1,4 +1,5 @@
 pub mod messages;
+pub mod socket;
 
 use actix_web::{delete, get, web, Error, HttpRequest, HttpResponse};
 use crate::{api::v1::auth::check_access_token, structs::{Channel, Member}, utils::get_auth_header, Data};

src/api/v1/servers/uuid/channels/uuid/socket.rs

@@ -1,7 +1,8 @@
-use actix_web::{rt, web, Error, HttpRequest, HttpResponse};
+use actix_web::{get, rt, web, Error, HttpRequest, HttpResponse};
 use actix_ws::AggregatedMessage;
 use futures_util::StreamExt as _;
 
+#[get("{uuid}/channels/{channel_uuid}/socket")]
 pub async fn echo(req: HttpRequest, stream: web::Payload) -> Result<HttpResponse, Error> {
     let (res, mut session, stream) = actix_ws::handle(&req, stream)?;
 

src/api/v1/servers/uuid/mod.rs

@@ -17,6 +17,7 @@ pub fn web() -> Scope {
         .service(channels::uuid::get)
         .service(channels::uuid::delete)
         .service(channels::uuid::messages::get)
+        .service(channels::uuid::socket::echo)
         // Roles
         .service(roles::get)
         .service(roles::create)

src/main.rs

@@ -2,15 +2,12 @@ use actix_cors::Cors;
 use actix_web::{web, App, HttpServer};
 use argon2::Argon2;
 use clap::Parser;
-use futures::try_join;
 use simple_logger::SimpleLogger;
 use sqlx::{PgPool, Pool, Postgres};
-use wss::echo;
 use std::time::SystemTime;
 mod config;
 use config::{Config, ConfigBuilder};
 mod api;
-mod wss;
 
 pub mod utils;
 pub mod structs;
@@ -173,7 +170,6 @@ async fn main() -> Result<(), Error> {
         start_time: SystemTime::now(),
     };
     
-    try_join!(
     HttpServer::new(move || {
         // Set CORS headers
         let cors = Cors::default()
@@ -208,16 +204,8 @@ async fn main() -> Result<(), Error> {
             .service(api::web())
     })
     .bind((web.url, web.port))?
-        .run(),
-    
-        HttpServer::new(|| {
-            App::new()
-                .route("/servers/{server_id}/channels/{channel_id}",
-                    web::get().to(echo))
-        })
-        .bind(("0.0.0.0", 4382))?
     .run()
-    )?;
+    .await?;
 
     Ok(())
 }