v1.0.1 changes #11

Manually merged
Raven merged 54 commits from betterauth into main 2025-03-21 23:36:08 -04:00
3 changed files with 171 additions and 162 deletions
Showing only changes of commit c0e8dba715 - Show all commits

View File

@@ -128,6 +128,16 @@
volumes: volumes:
- service_ids:/services - service_ids:/services
cache:
image: valkey/valkey:alpine
env_file:
- .env
restart: on-failure
ports:
- "6379:6379"
volumes:
- cache_data:/data
db: db:
image: postgres:17 image: postgres:17
env_file: env_file:
@@ -150,4 +160,5 @@
volumes: volumes:
db_data: db_data:
cache_data:
service_ids: service_ids:

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};

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::*;