BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2026-04-04 06:46:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

man the download protocol sucks

Browse Source
This commit is contained in:
Luuk van Oijen
2023-11-15 21:25:57 +01:00
parent 8735824495
commit 596a7234ed
2 changed files with 65 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/server/client.rs
View File

@@ -24,10 +24,6 @@ use super::packet::*;
static ATOMIC_ID_COUNTER: AtomicU8 = AtomicU8::new(0);
lazy_static! {
static ref CLIENT_MOD_PROGRESS: Mutex<HashMap<usize, usize>> = Mutex::new(HashMap::new());
}
#[derive(PartialEq)]
pub enum ClientState {
None,
@@ -179,11 +175,6 @@ impl Client {
// }
// }
// We now delete existing data for this client ID, just in case.
// TODO: This seems like a recipe for disaster
let mut lock = CLIENT_MOD_PROGRESS.lock().await;
lock.remove(&(self.id as usize));
// TODO: Check client version
trace!("Client version packet");
self.socket.readable().await?;
@@ -251,23 +242,23 @@ impl Client {
match packet.data[0] as char {
'S' if packet.data.len() > 1 => match packet.data[1] as char {
'R' => {
// let file_packet = if config.mods.len() == 0 {
// RawPacket::from_code('-')
// } else {
// let mut file_data = String::new();
// for (name, size) in &config.mods {
// let mut mod_name = name.clone();
// if mod_name.starts_with("/") == false {
// mod_name = format!("/{mod_name}");
// }
// file_data.push_str(&format!("{mod_name};"));
// }
// for (name, size) in &config.mods {
// file_data.push_str(&format!("{size};"));
// }
// RawPacket::from_str(&file_data)
// };
let file_packet = RawPacket::from_code('-');
let file_packet = if config.mods.len() == 0 {
RawPacket::from_code('-')
} else {
let mut file_data = String::new();
for (name, size) in &config.mods {
let mut mod_name = name.clone();
if mod_name.starts_with("/") == false {
mod_name = format!("/{mod_name}");
}
file_data.push_str(&format!("{mod_name};"));
}
for (name, size) in &config.mods {
file_data.push_str(&format!("{size};"));
}
RawPacket::from_str(&file_data)
};
// let file_packet = RawPacket::from_code('-');
self.write_packet(Packet::Raw(file_packet))
.await?;
}

51
src/server/mod.rs
View File

@@ -175,8 +175,53 @@ impl Server {
},
'D' => {
// Download connection (for old protocol)
// New protocol should use HTTP for downloads, so
// I will leave this unimplemented for now.
// This crashes the client after sending over all mods
// Probably related to it not waiting until a new mod is requested!
socket.readable().await;
let mut tmp = [0u8; 1];
socket.read_exact(&mut tmp).await;
let id = tmp[0] as usize;
debug!("[D] HandleDownload connection for client id: {}", id);
let mut mod_id = 0;
'download: while let Ok(_) = socket.writable().await {
debug!("[D] Starting download!");
let mut mod_name = {
if mod_id >= cfg_ref.mods.len() {
break 'download;
}
let bmod = &cfg_ref.mods[mod_id]; // TODO: This is a bit uhh yeah
debug!("[D] Mod name: {}", bmod.0);
mod_id += 1;
bmod.0.clone()
};
if mod_name.starts_with("/") == false {
mod_name = format!("/{mod_name}");
}
debug!("[D] Starting transfer of mod {mod_name}!");
let mod_path = format!("Resources/Client{mod_name}");
if let Ok(file_data) = std::fs::read(mod_path) {
let packet = RawPacket::from_data(file_data[(file_data.len()/2)..].to_vec());
{
trace!("[D] Sending packets!");
let real_packet = Packet::Raw(packet);
let mut raw_data: Vec<u8> = real_packet.get_header().to_le_bytes().to_vec();
raw_data.extend_from_slice(real_packet.get_data());
if let Err(e) = socket.write(&raw_data).await {
error!("{:?}", e);
}
trace!("[D] Packets sent!");
}
}
}
debug!("[D] Done!");
},
'G' => {
// This is probably an HTTP GET request!
@@ -201,7 +246,7 @@ impl Server {
// so at worst this client acceptance loop blocks for N duration
tokio::select!(
_ = set.join_next() => {},
_ = tokio::time::sleep(tokio::time::Duration::from_secs(1)) => {},
_ = tokio::time::sleep(tokio::time::Duration::from_millis(10)) => {},
)
}
}