Raven/osirose-new
SHA256
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 6 Releases Wiki Activity

v1.0.1 changes #11

Manually merged
Raven merged 54 commits from betterauth into main 2025-03-21 23:36:08 -04:00
Conversation 0 Commits 54 Files Changed 125 +171 -162
3 changed files with 171 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c0e8dba715 - Show all commits

317
docker-compose.yml
View File

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

2
packet-service/src/handlers/auth.rs
View File

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

14
packet-service/src/handlers/character.rs
View File

@@ -5,13 +5,6 @@ use crate::dataconsts::*;
use crate::enums; use crate::enums;
use crate::packet::{send_packet, Packet, PacketPayload}; use crate::packet::{send_packet, Packet, PacketPayload};
use crate::packet_type::PacketType; 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 crate::packets::*;
use std::collections::HashMap; use std::collections::HashMap;
use std::env; 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>> { 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::srv_char_list_reply::*;
use crate::packets::cli_char_list_req::*;
let request = CliCharListReq::decode(packet.payload.as_slice()); let request = CliCharListReq::decode(packet.payload.as_slice());
debug!("{:?}", request); 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>> { 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())?; let request = CliCreateCharReq::decode(packet.payload.as_slice())?;
debug!("{:?}", request); 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>> { 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())?; let request = CliDeleteCharReq::decode(packet.payload.as_slice())?;
debug!("{:?}", request); 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>> { 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_select_char_reply::*;
use crate::packets::srv_inventory_data::*; use crate::packets::srv_inventory_data::*;
use crate::packets::srv_quest_data::*; use crate::packets::srv_quest_data::*;