- update: imports

- add: cache and cache data for docker-compose.yml

docker-compose.yml

@@ -1,153 +1,164 @@
-services:
-  frontend:
-    build:
-      context: ./frontend
-      dockerfile: Dockerfile
-    restart: on-failure
-    container_name: frontend
-    ports:
-      - "3000:80"
-    env_file:
-      - .env
-    depends_on:
-      - api-service
-      - consul
-
-  auth-service:
-    build:
-      context: ./
-      dockerfile: ./auth-service/Dockerfile
-    restart: on-failure
-    ports:
-      - "50051:50051"
-    env_file:
-      - ./auth-service/.env
-      - .env
-    environment:
-      - HEALTH_CHECK_PORT=8080
-    depends_on:
-      - session-service
-      - database-service
-      - consul
-    volumes:
-      - service_ids:/services
-
-  api-service:
-    build:
-      context: ./
-      dockerfile: ./api-service/Dockerfile
-    restart: on-failure
-    ports:
-      - "8080:8080"
-      - "8081:8081"
-    env_file:
-      - ./api-service/.env
-      - .env
-    depends_on:
-      - auth-service
-      - consul
-    volumes:
-      - service_ids:/services
-
-  database-service:
-    build:
-      context: ./
-      dockerfile: ./database-service/Dockerfile
-    restart: on-failure
-    ports:
-      - "50052:50052"
-    env_file:
-      - ./database-service/.env
-      - .env
-    depends_on:
-      - db
-      - consul
-    volumes:
-      - service_ids:/services
-
-  character-service:
-    build:
-      context: ./
-      dockerfile: ./character-service/Dockerfile
-    restart: on-failure
-    ports:
-      - "50053:50053"
-    env_file:
-      - ./character-service/.env
-      - .env
-    depends_on:
-      - auth-service
-      - consul
-    volumes:
-      - service_ids:/services
-
-  world-service:
-    build:
-      context: ./
-      dockerfile: ./world-service/Dockerfile
-    restart: on-failure
-    ports:
-      - "50054:50054"
-    env_file:
-      - ./world-service/.env
-      - .env
-    depends_on:
-      - auth-service
-      - consul
-    volumes:
-      - service_ids:/services
-
-  packet-service:
-    build:
-      context: ./
-      dockerfile: ./packet-service/Dockerfile
-    restart: on-failure
-    ports:
-      - "4000:4000"
-    env_file:
-      - ./packet-service/.env
-      - .env
-    depends_on:
-      - auth-service
-      - consul
-    volumes:
-      - service_ids:/services
-
-  session-service:
-    build:
-      context: ./
-      dockerfile: ./session-service/Dockerfile
-    restart: on-failure
-    ports:
-      - "50055:50055"
-    env_file:
-      - ./session-service/.env
-      - .env
-    depends_on:
-      - consul
-    volumes:
-      - service_ids:/services
-
-  db:
-    image: postgres:17
-    env_file:
-      - .env
-    restart: on-failure
-    ports:
-      - "5432:5432"
-    volumes:
-      - db_data:/var/lib/postgresql/data
-      - ./sql/schema.sql:/docker-entrypoint-initdb.d/schema.sql:ro
-
-  consul:
-    image: consul:1.15.4
-    command: agent -dev -client=0.0.0.0
-    restart: on-failure
-    ports:
-      - "8500:8500"
-    volumes:
-      - ./scripts/consul.json:/consul/config/cors.json
-
-volumes:
-  db_data:
-  service_ids:
+services:
+  frontend:
+    build:
+      context: ./frontend
+      dockerfile: Dockerfile
+    restart: on-failure
+    container_name: frontend
+    ports:
+      - "3000:80"
+    env_file:
+      - .env
+    depends_on:
+      - api-service
+      - consul
+
+  auth-service:
+    build:
+      context: ./
+      dockerfile: ./auth-service/Dockerfile
+    restart: on-failure
+    ports:
+      - "50051:50051"
+    env_file:
+      - ./auth-service/.env
+      - .env
+    environment:
+      - HEALTH_CHECK_PORT=8080
+    depends_on:
+      - session-service
+      - database-service
+      - consul
+    volumes:
+      - service_ids:/services
+
+  api-service:
+    build:
+      context: ./
+      dockerfile: ./api-service/Dockerfile
+    restart: on-failure
+    ports:
+      - "8080:8080"
+      - "8081:8081"
+    env_file:
+      - ./api-service/.env
+      - .env
+    depends_on:
+      - auth-service
+      - consul
+    volumes:
+      - service_ids:/services
+
+  database-service:
+    build:
+      context: ./
+      dockerfile: ./database-service/Dockerfile
+    restart: on-failure
+    ports:
+      - "50052:50052"
+    env_file:
+      - ./database-service/.env
+      - .env
+    depends_on:
+      - db
+      - consul
+    volumes:
+      - service_ids:/services
+
+  character-service:
+    build:
+      context: ./
+      dockerfile: ./character-service/Dockerfile
+    restart: on-failure
+    ports:
+      - "50053:50053"
+    env_file:
+      - ./character-service/.env
+      - .env
+    depends_on:
+      - auth-service
+      - consul
+    volumes:
+      - service_ids:/services
+
+  world-service:
+    build:
+      context: ./
+      dockerfile: ./world-service/Dockerfile
+    restart: on-failure
+    ports:
+      - "50054:50054"
+    env_file:
+      - ./world-service/.env
+      - .env
+    depends_on:
+      - auth-service
+      - consul
+    volumes:
+      - service_ids:/services
+
+  packet-service:
+    build:
+      context: ./
+      dockerfile: ./packet-service/Dockerfile
+    restart: on-failure
+    ports:
+      - "4000:4000"
+    env_file:
+      - ./packet-service/.env
+      - .env
+    depends_on:
+      - auth-service
+      - consul
+    volumes:
+      - service_ids:/services
+
+  session-service:
+    build:
+      context: ./
+      dockerfile: ./session-service/Dockerfile
+    restart: on-failure
+    ports:
+      - "50055:50055"
+    env_file:
+      - ./session-service/.env
+      - .env
+    depends_on:
+      - consul
+    volumes:
+      - service_ids:/services
+
+  cache:
+    image: valkey/valkey:alpine
+    env_file:
+      - .env
+    restart: on-failure
+    ports:
+      - "6379:6379"
+    volumes:
+      - cache_data:/data
+
+  db:
+    image: postgres:17
+    env_file:
+      - .env
+    restart: on-failure
+    ports:
+      - "5432:5432"
+    volumes:
+      - db_data:/var/lib/postgresql/data
+      - ./sql/schema.sql:/docker-entrypoint-initdb.d/schema.sql:ro
+
+  consul:
+    image: consul:1.15.4
+    command: agent -dev -client=0.0.0.0
+    restart: on-failure
+    ports:
+      - "8500:8500"
+    volumes:
+      - ./scripts/consul.json:/consul/config/cors.json
+
+volumes:
+  db_data:
+  cache_data:
+  service_ids:

packet-service/src/handlers/auth.rs

@@ -2,11 +2,9 @@ use crate::auth_client::AuthClient;
 use crate::connection_service::ConnectionService;
 use crate::packet::{send_packet, Packet, PacketPayload};
 use crate::packet_type::PacketType;
-use crate::packets::cli_accept_req::CliAcceptReq;
 use crate::packets::cli_channel_list_req::CliChannelListReq;
 use crate::packets::cli_join_server_token_req::CliJoinServerTokenReq;
 use crate::packets::cli_login_token_req::CliLoginTokenReq;
-use crate::packets::cli_logout_req::CliLogoutReq;
 use crate::packets::cli_srv_select_req::CliSrvSelectReq;
 use crate::packets::srv_accept_reply::SrvAcceptReply;
 use crate::packets::srv_channel_list_reply::{ChannelInfo, SrvChannelListReply};

packet-service/src/handlers/character.rs

@@ -5,13 +5,6 @@ use crate::dataconsts::*;
 use crate::enums;
 use crate::packet::{send_packet, Packet, PacketPayload};
 use crate::packet_type::PacketType;
-use crate::packets::cli_char_list_req::CliCharListReq;
-use crate::packets::cli_create_char_req::CliCreateCharReq;
-use crate::packets::cli_delete_char_req::CliDeleteCharReq;
-use crate::packets::cli_select_char_req::CliSelectCharReq;
-use crate::packets::srv_create_char_reply::SrvCreateCharReply;
-use crate::packets::srv_delete_char_reply::SrvDeleteCharReply;
-use crate::packets::srv_switch_server::SrvSwitchServer;
 use crate::packets::*;
 use std::collections::HashMap;
 use std::env;
@@ -39,6 +32,7 @@ pub(crate) fn convert_slot(slot: i32) -> srv_char_list_reply::EquippedPosition {
 
 pub(crate) async fn handle_char_list_req(stream: &mut TcpStream, packet: Packet, character_client: Arc<Mutex<CharacterClient>>, connection_service: Arc<ConnectionService>, connection_id: String) -> Result<(), Box<dyn Error + Send + Sync>> {
     use crate::packets::srv_char_list_reply::*;
+    use crate::packets::cli_char_list_req::*;
     let request = CliCharListReq::decode(packet.payload.as_slice());
     debug!("{:?}", request);
 
@@ -96,6 +90,8 @@ pub(crate) async fn handle_char_list_req(stream: &mut TcpStream, packet: Packet,
 }
 
 pub(crate) async fn handle_create_char_req(stream: &mut TcpStream, packet: Packet, character_client: Arc<Mutex<CharacterClient>>, connection_service: Arc<ConnectionService>, connection_id: String) -> Result<(), Box<dyn Error + Send + Sync>> {
+    use crate::packets::cli_create_char_req::*;
+    use crate::packets::srv_create_char_reply::*;
     let request = CliCreateCharReq::decode(packet.payload.as_slice())?;
     debug!("{:?}", request);
 
@@ -128,6 +124,8 @@ pub(crate) async fn handle_create_char_req(stream: &mut TcpStream, packet: Packe
 }
 
 pub(crate) async fn handle_delete_char_req(stream: &mut TcpStream, packet: Packet, character_client: Arc<Mutex<CharacterClient>>, connection_service: Arc<ConnectionService>, connection_id: String) -> Result<(), Box<dyn Error + Send + Sync>> {
+    use crate::packets::cli_delete_char_req::*;
+    use crate::packets::srv_delete_char_reply::*;
     let request = CliDeleteCharReq::decode(packet.payload.as_slice())?;
     debug!("{:?}", request);
 
@@ -156,6 +154,8 @@ pub(crate) async fn handle_delete_char_req(stream: &mut TcpStream, packet: Packe
 }
 
 pub(crate) async fn handle_select_char_req(stream: &mut TcpStream, packet: Packet, character_client: Arc<Mutex<CharacterClient>>, connection_service: Arc<ConnectionService>, connection_id: String) -> Result<(), Box<dyn Error + Send + Sync>> {
+    use crate::packets::cli_select_char_req::*;
+    use crate::packets::srv_switch_server::*;
     use crate::packets::srv_select_char_reply::*;
     use crate::packets::srv_inventory_data::*;
     use crate::packets::srv_quest_data::*;