- add: utils library

- add: packet-service to handle game client packets
- fix: health check for database-service
- fix: health check for auth-service

packet-service/src/main.rs

@@ -1,13 +1,67 @@
 use std::env;
+use std::error::Error;
+use std::net::ToSocketAddrs;
 use std::str::FromStr;
+use std::sync::Arc;
 use dotenv::dotenv;
-use tokio::net::TcpListener;
+use tokio::net::{TcpListener, TcpStream};
 use tokio::io::{AsyncReadExt};
-use tracing::{info, error};
+use tokio::{select, signal};
+use tokio::sync::{Mutex, Semaphore};
+use tracing::{info, error, debug, warn};
 use tracing::Level;
+use utils::consul_registration;
+use utils::service_discovery::get_service_address;
+use warp::Filter;
+use crate::auth_client::AuthClient;
+use crate::bufferpool::BufferPool;
+use crate::metrics::{ACTIVE_CONNECTIONS, PACKETS_RECEIVED};
+use crate::packet::Packet;
 
+mod packet_type;
 mod packet;
 mod router;
+mod packets;
+mod enums;
+mod dataconsts;
+mod types;
+mod handlers;
+mod bufferpool;
+mod metrics;
+mod auth_client;
+pub mod auth {
+    tonic::include_proto!("auth"); // Path matches the package name in auth.proto
+}
+
+const BUFFER_POOL_SIZE: usize = 1000;
+const MAX_CONCURRENT_CONNECTIONS: usize = 100;
+
+
+async fn handle_connection(stream: &mut TcpStream, pool: Arc<BufferPool>, auth_client: Arc<Mutex<AuthClient>>) -> Result<(), Box<dyn Error + Send + Sync>> {
+    ACTIVE_CONNECTIONS.inc();
+    while let Some(mut buffer) = pool.acquire().await {
+        // Read data into the buffer
+        let n = stream.read(&mut buffer).await?;
+        if n == 0 {
+            break; // Connection closed
+        }
+        PACKETS_RECEIVED.inc();
+
+        // Process the packet
+        match Packet::from_raw(&buffer[..n]) {
+            Ok(packet) => {
+                debug!("Parsed Packet: {:?}", packet);
+                // Handle the parsed packet (route it, process it, etc.)
+                router::route_packet(stream, packet, auth_client.clone()).await?;
+            }
+            Err(e) => warn!("Failed to parse packet: {}", e),
+        }
+
+        pool.release(buffer).await;
+    }
+    ACTIVE_CONNECTIONS.dec();
+    Ok(())
+}
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
@@ -16,25 +70,73 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         .with_max_level(Level::from_str(&env::var("LOG_LEVEL").unwrap_or_else(|_| "info".to_string())).unwrap_or_else(|_| Level::INFO))
         .init();
 
-    let listener = TcpListener::bind("127.0.0.1:4000").await?;
-    info!("Packet service listening on 127.0.0.1:4000");
+    // Set the gRPC server address
+    let addr = env::var("PACKET_SERVICE_ADDR").unwrap_or_else(|_| "127.0.0.1".to_string());
+    let port = env::var("PACKET_SERVICE_PORT").unwrap_or_else(|_| "4000".to_string());
+    let health_port = env::var("HEALTH_CHECK_PORT").unwrap_or_else(|_| "8082".to_string());
 
-    loop {
-        let (mut socket, addr) = listener.accept().await?;
-        info!("New connection from {}", addr);
+    let consul_url = env::var("CONSUL_URL").unwrap_or_else(|_| "http://127.0.0.1:8500".to_string());
+    let service_name = env::var("SERVICE_NAME").unwrap_or_else(|_| "packet-service".to_string());
+    let service_address = addr.as_str();
+    let service_port = port.clone();
+    let health_check_url = format!("http://{}:{}/health", service_address, health_port);
+    let health_check_endpoint_addr = format!("{}:{}", service_address, health_port);
+    let auth_address = get_service_address(&consul_url, "auth-service").await?;
 
-        tokio::spawn(async move {
-            let mut buffer = vec![0u8; 1024];
+    // Register service with Consul
+    consul_registration::register_service(
+        &consul_url,
+        service_name.as_str(),
+        service_address,
+        service_port.parse().unwrap_or(50052),
+        &health_check_url,
+    )
+        .await?;
 
-            match socket.read(&mut buffer).await {
-                Ok(n) if n > 0 => {
-                    if let Err(e) = router::route_packet(&buffer[..n]).await {
-                        error!("Failed to route packet: {}", e);
-                    }
+    // Start health-check endpoint
+    let health_route = warp::path!("health")
+        .map(|| warp::reply::with_status("OK", warp::http::StatusCode::OK));
+
+    tokio::spawn(warp::serve(health_route).run(health_check_endpoint_addr.to_socket_addrs()?.next().unwrap()));
+
+    let auth_url = format!("http://{}:{}", auth_address.Address, auth_address.Port);
+    let auth_client = Arc::new(Mutex::new(AuthClient::connect(&auth_url).await?));
+
+    let full_addr = format!("{}:{}", &addr, port);
+    // let address = full_addr.parse().expect("Invalid address");
+
+
+
+    tokio::spawn(async move {
+        let semaphore = Arc::new(Semaphore::new(MAX_CONCURRENT_CONNECTIONS));
+        let listener = TcpListener::bind(full_addr.clone()).await.unwrap();
+        let buffer_pool = BufferPool::new(BUFFER_POOL_SIZE);
+
+        info!("Packet service listening on {}", full_addr);
+
+        loop {
+            let (mut socket, addr) = listener.accept().await.unwrap();
+            let auth_client = auth_client.clone();
+            info!("New connection from {}", addr);
+
+            let pool = buffer_pool.clone();
+            let permit = semaphore.clone().acquire_owned().await.unwrap();
+
+            // Spawn a new task for each connection
+            tokio::spawn(async move {
+                let _permit = permit;
+                if let Err(e) = handle_connection(&mut socket, pool, auth_client).await {
+                    error!("Error handling connection: {}", e);
                 }
-                Ok(_) => info!("Connection closed by {}", addr),
-                Err(e) => error!("Failed to read from socket: {}", e),
-            }
-        });
+            });
+        }
+    });
+
+    select! {
+        _ = signal::ctrl_c() => {},
     }
+
+    consul_registration::deregister_service(&consul_url, service_name.as_str()).await.expect("");
+    info!("service {} deregistered", service_name);
+    Ok(())
 }