ErrorNoInternet/ErrorNoWatcher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: minor improvements

Browse Source
This commit is contained in:
Ryan 2025-02-25 17:57:47 -05:00
parent 5691afaf2d
commit 2b9bf1987b
Signed by: ErrorNoInternet
GPG Key ID: 2486BFB7B1E6A4A3
3 changed files with 44 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/events.rs
View File

@ -96,32 +96,34 @@ pub async fn handle_event(client: Client, event: Event, state: State) -> anyhow:
)?;
call_listeners(&state, "init", ()).await;
if let Some(address) = state.http_address {
let listener = TcpListener::bind(address).await.map_err(|error| {
error!("failed to listen on {address}: {error:?}");
error
})?;
debug!("http server listening on {address}");
let Some(address) = state.http_address else {
return Ok(());
};
loop {
let (stream, peer) = listener.accept().await?;
trace!("http server got connection from {peer}");
let listener = TcpListener::bind(address).await.map_err(|error| {
error!("failed to listen on {address}: {error:?}");
error
})?;
debug!("http server listening on {address}");
let conn_state = state.clone();
let service = service_fn(move |request| {
let request_state = conn_state.clone();
async move { serve(request, request_state).await }
});
loop {
let (stream, peer) = listener.accept().await?;
trace!("http server got connection from {peer}");
tokio::spawn(async move {
if let Err(error) = http1::Builder::new()
.serve_connection(TokioIo::new(stream), service)
.await
{
error!("failed to serve connection: {error:?}");
}
});
}
let conn_state = state.clone();
let service = service_fn(move |request| {
let request_state = conn_state.clone();
async move { serve(request, request_state).await }
});
tokio::spawn(async move {
if let Err(error) = http1::Builder::new()
.serve_connection(TokioIo::new(stream), service)
.await
{
error!("failed to serve connection: {error:?}");
}
});
}
}
_ => (),
@ -132,9 +134,9 @@ pub async fn handle_event(client: Client, event: Event, state: State) -> anyhow:
async fn call_listeners<T: Clone + IntoLuaMulti>(state: &State, event_type: &str, data: T) {
if let Some(listeners) = state.event_listeners.read().await.get(event_type) {
for (_, listener) in listeners {
if let Err(error) = listener.call_async::<()>(data.clone()).await {
error!("failed to call lua event listener for {event_type}: {error:?}");
for (id, callback) in listeners {
if let Err(error) = callback.call_async::<()>(data.clone()).await {
error!("failed to call lua event listener {id} for {event_type}: {error:?}");
}
}
}

26
src/lua/events.rs
View File

@ -8,19 +8,23 @@ pub fn register_functions(lua: &Lua, globals: &Table, event_listeners: ListenerM
globals.set(
"add_listener",
lua.create_function(
move |_, (event_type, callback, id): (String, Function, Option<String>)| {
move |_, (event_type, callback, optional_id): (String, Function, Option<String>)| {
let m = m.clone();
let id = optional_id.unwrap_or_else(|| {
callback.info().name.unwrap_or(format!(
"anonymous @ {}",
SystemTime::now()
.duration_since(UNIX_EPOCH)
.unwrap_or_default()
.as_millis()
))
});
tokio::spawn(async move {
m.write().await.entry(event_type).or_default().push((
id.unwrap_or(callback.info().name.unwrap_or(format!(
"anonymous @ {}",
SystemTime::now()
.duration_since(UNIX_EPOCH)
.unwrap_or_default()
.as_millis()
))),
callback,
));
m.write()
.await
.entry(event_type)
.or_default()
.push((id, callback));
});
Ok(())
},

2
src/main.rs
View File

@ -75,7 +75,7 @@ async fn main() -> anyhow::Result<()> {
.append(true)
.create(true)
.open(log_file)
.expect("should have been able to open log file"),
.expect("log file should be accessible"),
)
.boxed()
})