spacebar/rust-nex
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages 50 Wiki Activity Actions

feat(account): add grpc to communicate with account server

Browse source
This commit is contained in:
DJMrTV 2025-02-02 00:46:04 +01:00
commit cb6a6f9028
15 changed files with 797 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/protocols/auth/method_login.rs
View file

@ -7,11 +7,11 @@ use crate::rmc::response::{ErrorCode, RMCResponseResult};
use crate::rmc::structures::any::Any;
use crate::rmc::structures::RmcSerialize;
pub fn login(rmcmessage: &RMCMessage, name: &str) -> RMCResponseResult{
pub async fn login(rmcmessage: &RMCMessage, name: &str) -> RMCResponseResult{
rmcmessage.error_result_with_code(ErrorCode::Core_NotImplemented)
}
pub fn login_raw_params(rmcmessage: &RMCMessage, account: &Account) -> RMCResponseResult{
pub async fn login_raw_params(rmcmessage: &RMCMessage, data: (&Account)) -> RMCResponseResult{
let mut reader = Cursor::new(&rmcmessage.rest_of_data);
let Ok(str) = String::deserialize(&mut reader) else {
@ -20,5 +20,5 @@ pub fn login_raw_params(rmcmessage: &RMCMessage, account: &Account) -> RMCRespon
};
login(rmcmessage, &str)
login(rmcmessage, &str).await
}

19
src/protocols/auth/method_login_ex.rs
View file

@ -1,20 +1,29 @@
use std::io::Cursor;
use log::{error, info};
use crate::grpc::account;
use crate::nex::account::Account;
use crate::rmc::message::RMCMessage;
use crate::rmc::response::{ErrorCode, RMCResponse, RMCResponseResult};
use crate::rmc::structures::{string, any, RmcSerialize};
use crate::rmc::structures::any::Any;
pub fn login_ex(rmcmessage: &RMCMessage, name: &str) -> RMCResponseResult{
pub async fn login_ex(rmcmessage: &RMCMessage, secure_server_account: &Account , pid: u32) -> RMCResponseResult{
// todo: figure out how the AuthenticationInfo struct works, parse it and validate login info
let Ok(mut client) = account::Client::new().await else {
return rmcmessage.error_result_with_code(ErrorCode::Core_Exception);
};
let Ok(passwd) = client.get_nex_password(pid).await else{
return rmcmessage.error_result_with_code(ErrorCode::Core_Exception);
};
return rmcmessage.error_result_with_code(ErrorCode::Core_InvalidArgument);
}
pub fn login_ex_raw_params(rmcmessage: &RMCMessage, account: &Account) -> RMCResponseResult{
pub async fn login_ex_raw_params(rmcmessage: &RMCMessage, (secure_server_account): (&Account)) -> RMCResponseResult{
let mut reader = Cursor::new(&rmcmessage.rest_of_data);
let Ok(str) = String::deserialize(&mut reader) else {
@ -37,5 +46,9 @@ pub fn login_ex_raw_params(rmcmessage: &RMCMessage, account: &Account) -> RMCRes
}
}
login_ex(rmcmessage, &str)
let Ok(pid) = str.parse() else {
return rmcmessage.error_result_with_code(ErrorCode::Core_InvalidArgument);
};
login_ex(rmcmessage, secure_server_account, pid).await
}

2
src/protocols/auth/mod.rs
View file

@ -11,7 +11,7 @@ use crate::rmc::response::{ErrorCode, RMCResponse, RMCResponseResult};
define_protocol!{
10<'a>(account: &'a Account) => {
10(secure_server_account: &'static Account) => {
0x01 => login_raw_params,
0x02 => login_ex_raw_params
}

24
src/protocols/mod.rs
View file

@ -2,15 +2,17 @@ pub mod auth;
pub mod server;
#[macro_export]
macro_rules! define_protocol {
($id:literal $( <$lifetime:lifetime> )?($($varname:ident : $ty:ty),*) => {$($func_id:literal => $func:path),*} ) => {
fn protocol $( <$lifetime> )? (rmcmessage: &RMCMessage, $($varname : $ty),*) -> Option<RMCResponse>{
($id:literal ($($varname:ident : $ty:ty),*) => {$($func_id:literal => $func:path),*} ) => {
async fn protocol (rmcmessage: &RMCMessage, $($varname : $ty),*) -> Option<RMCResponse>{
if rmcmessage.protocol_id != $id{
return None;
}
let response_function = match rmcmessage.method_id{
let self_data: ( $( $ty ),* ) = ($( $varname ),*);
let response_result = match rmcmessage.method_id{
$(
$func_id => $func,
$func_id => $func ( rmcmessage, self_data).await,
)*
_ => {
error!("invalid method id sent to protocol {}: {:?}", $id, rmcmessage.method_id);
@ -23,21 +25,21 @@ macro_rules! define_protocol {
}
};
let response_result = response_function(rmcmessage, $($varname),*);
Some(RMCResponse{
protocol_id: $id,
response_result
})
}
pub fn bound_protocol$(<$lifetime>)?($($varname : $ty,)*) -> Box<dyn Fn(&RMCMessage) -> Option<RMCResponse> + Send + Sync $( + $lifetime)?>{
pub fn bound_protocol($($varname : $ty,)*) -> Box<dyn for<'message_lifetime> Fn(&'message_lifetime RMCMessage) -> ::std::pin::Pin<Box<dyn ::std::future::Future<Output = Option<RMCResponse>> + Send + 'message_lifetime>> + Send + Sync>{
Box::new(
move |v| {
$(
let $varname = $varname.clone();
)*
protocol(v, $($varname,)*)
Box::pin(async move {
$(
let $varname = $varname.clone();
)*
protocol(v, $($varname,)*).await
})
}
)
}

6
src/protocols/server.rs
View file

@ -1,4 +1,6 @@
use std::future::Future;
use std::io::Cursor;
use std::pin::Pin;
use std::sync::Arc;
use log::error;
use crate::prudp::packet::PRUDPPacket;
@ -7,7 +9,7 @@ use crate::rmc::message::RMCMessage;
use crate::rmc::response::{RMCResponse, RMCResponseResult, send_response};
use crate::rmc::response::ErrorCode::Core_NotImplemented;
type ContainedProtocolList = Box<[Box<dyn Fn(&RMCMessage) -> Option<RMCResponse> + Send + Sync>]>;
type ContainedProtocolList = Box<[Box<dyn for<'a> Fn(&'a RMCMessage) -> Pin<Box<dyn Future<Output = Option<RMCResponse>> + Send + 'a>> + Send + Sync>]>;
pub struct RMCProtocolServer(ContainedProtocolList);
@ -25,7 +27,7 @@ impl RMCProtocolServer{
println!("recieved rmc message: {{ protocol: {}, method: {}}}", rmc.protocol_id, rmc.method_id);
for proto in &self.0 {
if let Some(response) = proto(&rmc) {
if let Some(response) = proto(&rmc).await {
send_response(&packet, &socket, connection, response).await;
return;
}