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

closing tui no longer crashes + onShutdown event

Browse Source
This commit is contained in:
Luuk van Oijen
2023-11-22 11:02:53 +01:00
parent 669e061fdf
commit 6ed714b863
7 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Resources/Server/TestPlugin/main.lua
View File

@@ -5,6 +5,10 @@ function onPluginLoaded()
print("HI!")
end
function onShutdown()
print("BYE!")
end
function onPlayerAuthenticated(joined_name, role, is_guest, identifiers)
print("hi welcome mista " .. joined_name)
print("u a guest? " .. tostring(is_guest))
@@ -36,5 +40,6 @@ function onPlayerDisconnect(pid, name, identifiers)
end
MP.RegisterEventHandler("onInit", "onPluginLoaded")
MP.RegisterEventHandler("onShutdown", "onShutdown")
MP.RegisterEventHandler("onPlayerAuth", "onPlayerAuthenticated")
MP.RegisterEventHandler("onPlayerDisconnect", "onPlayerDisconnect")

7
src/main.rs
View File

@@ -72,7 +72,7 @@ async fn server_main(user_config: Arc<config::Config>, mut cmd_rx: mpsc::Receive
let mut status = server.get_server_status();
hb_tx.send(status.clone()).await;
loop {
'server: loop {
// TODO: Error handling
if server.clients.len() > 0 {
tokio::select! {
@@ -111,7 +111,10 @@ async fn server_main(user_config: Arc<config::Config>, mut cmd_rx: mpsc::Receive
match cmd_rx.try_recv() {
Ok(cmd) => if cmd.len() > 0 {
match cmd[0].as_str() {
"exit" => break,
"exit" => {
server.close().await;
break 'server;
},
_ => info!("Unknown command!"),
}
} else {

4
src/server/client.rs
View File

@@ -212,14 +212,14 @@ impl Client {
Some(v) => "/".to_string() + v.to_str().unwrap(),
None => {
error!("Client requests invalid mod. Disconnecting");
self.kick("Invalid mod request");
self.kick("Invalid mod request").await;
return Ok(());
}, // client requested path (fResources/Client/) or nothing at all (f) - invalid
};
let mod_path = format!("Resources/Client{mod_name}");
if !std::path::Path::new(&mod_path).exists() {
error!("Client requests inexistent mod. Disconnecting");
self.kick("Invalid mod request");
self.kick("Invalid mod request").await;
return Ok(()) // client requested mod that doesnt exists within "Resources/Client/*"
}

33
src/server/mod.rs
View File

@@ -327,29 +327,18 @@ impl Server {
}
}
pub async fn process_tcp(&mut self, index: usize, raw_packet: RawPacket) -> anyhow::Result<()> {
// if self.clients.len() > 0 {
// let (result, index, _) = futures::future::select_all(
// self.clients.iter_mut().map(|client| Box::pin(client.process_blocking()))
// ).await;
//
// match result {
// Ok(packet_opt) => {
// if let Some(raw_packet) = packet_opt {
// self.parse_packet(index, raw_packet).await?;
// }
// },
// Err(e) => {
// if let Some(client) = self.clients.get_mut(index) {
// client.kick(&format!("Kicked: {:?}", e)).await;
// }
// }
// }
// } else {
// // TODO: Find a better solution than this lol
// tokio::time::sleep(tokio::time::Duration::from_millis(20)).await;
// }
pub async fn close(mut self) {
self.connect_runtime_handle.abort();
for mut client in self.clients.drain(..) {
client.kick("Server is closing!").await;
}
// TODO: We can probably race these with futures::future::select_all?
for plugin in self.plugins.drain(..) {
plugin.close().await;
}
}
pub async fn process_tcp(&mut self, index: usize, raw_packet: RawPacket) -> anyhow::Result<()> {
self.parse_packet(index, raw_packet).await?;
Ok(())

1
src/server/plugins/backend_lua.rs
View File

@@ -137,6 +137,7 @@ impl Backend for BackendLua {
fn call_event_handler(&mut self, event: ScriptEvent, resp: Option<oneshot::Sender<Argument>>) {
let (event_name, args) = match event {
ScriptEvent::OnPluginLoaded => ("onInit", vec![]),
ScriptEvent::OnShutdown => ("onShutdown", vec![]),
ScriptEvent::OnPlayerAuthenticated { name, role, is_guest, identifiers } => ("onPlayerAuth", vec![Argument::String(name), Argument::String(role), Argument::Boolean(is_guest), Argument::Table(identifiers.to_map())]),
ScriptEvent::OnPlayerDisconnect { pid, name } => ("onPlayerDisconnect", vec![Argument::Number(pid as f32), Argument::String(name)]),
};

8
src/server/plugins/mod.rs
View File

@@ -45,6 +45,7 @@ impl PlayerIdentifiers {
#[derive(Debug)]
pub enum ScriptEvent {
OnPluginLoaded,
OnShutdown,
OnPlayerAuthenticated { name: String, role: String, is_guest: bool, identifiers: PlayerIdentifiers },
@@ -114,6 +115,13 @@ impl Plugin {
})
}
pub async fn close(mut self) {
let (tx, mut rx) = oneshot::channel();
self.send_event(PluginBoundPluginEvent::CallEventHandler((ScriptEvent::OnShutdown, Some(tx)))).await;
let _ = rx.await; // We just wait for it to finish shutting down
self.runtime.shutdown_background();
}
// TODO: For performance I think we can turn this into an iterator instead of first allocating
// a full vector?
pub fn get_events(&mut self) -> Vec<ServerBoundPluginEvent> {

14
src/tui.rs
View File

@@ -109,17 +109,17 @@ impl Tui {
let mut lines = Vec::new();
for (i, (level, msg)) in self.log_buffer.iter().enumerate() {
if i >= (area.height as usize - 5) { break; }
let level_style = match level {
Level::Info => Style::default().green(),
Level::Warn => Style::default().yellow(),
Level::Error => Style::default().red(),
Level::Debug => Style::default().gray(),
Level::Trace => Style::default().cyan(),
let (level_style, spacer) = match level {
Level::Info => (Style::default().green(), " "),
Level::Warn => (Style::default().yellow(), " "),
Level::Error => (Style::default().red(), ""),
Level::Debug => (Style::default().gray(), ""),
Level::Trace => (Style::default().cyan(), ""),
};
lines.push(Line::from(vec![
Span::styled("[", Style::default()),
Span::styled(format!("{}", level), level_style),
Span::styled(format!("] {}", msg), Style::default()),
Span::styled(format!("]{} {}", spacer, msg), Style::default()),
]));
}
lines.reverse();