Split web and xmpp parts into different tasks
Signed-off-by: pep <pep@bouah.net>
This commit is contained in:
parent
fc0b13079f
commit
d16ead8bc9
2 changed files with 40 additions and 28 deletions
18
src/bot.rs
18
src/bot.rs
|
@ -20,6 +20,7 @@ use xmpp::jid::{BareJid, Jid};
|
||||||
use xmpp::parsers::message::MessageType;
|
use xmpp::parsers::message::MessageType;
|
||||||
use xmpp::tokio_xmpp::connect::StartTlsServerConnector;
|
use xmpp::tokio_xmpp::connect::StartTlsServerConnector;
|
||||||
use xmpp::{Agent, ClientBuilder, ClientFeature, ClientType, Event};
|
use xmpp::{Agent, ClientBuilder, ClientFeature, ClientType, Event};
|
||||||
|
use tokio::sync::mpsc;
|
||||||
|
|
||||||
pub struct XmppClient {
|
pub struct XmppClient {
|
||||||
is_online: bool,
|
is_online: bool,
|
||||||
|
@ -75,8 +76,22 @@ impl XmppClient {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn receive(&mut self, mut rx: mpsc::UnboundedReceiver<Hook>) {
|
||||||
|
loop {
|
||||||
|
tokio::select! {
|
||||||
|
_ = self.next() => (),
|
||||||
|
wh = rx.recv() => {
|
||||||
|
if let Some(hook) = wh {
|
||||||
|
debug!("XMPP Bot Received Hook");
|
||||||
|
self.hook(hook).await
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub async fn hook(&mut self, wh: Hook) {
|
pub async fn hook(&mut self, wh: Hook) {
|
||||||
debug!("Received Hook");
|
debug!("XMPP Bot Processing Hook");
|
||||||
if let Some(display) = format_hook(&wh) {
|
if let Some(display) = format_hook(&wh) {
|
||||||
debug!("Hook: {}", display);
|
debug!("Hook: {}", display);
|
||||||
for room in &self.rooms {
|
for room in &self.rooms {
|
||||||
|
@ -89,6 +104,7 @@ impl XmppClient {
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
debug!("XMPP Bot Processed Hook");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
22
src/main.rs
22
src/main.rs
|
@ -28,6 +28,7 @@ use crate::error::Error;
|
||||||
use crate::hooks::Hook;
|
use crate::hooks::Hook;
|
||||||
use crate::web::hooks;
|
use crate::web::hooks;
|
||||||
|
|
||||||
|
use log::error;
|
||||||
use camino::Utf8PathBuf;
|
use camino::Utf8PathBuf;
|
||||||
use clap::{command, value_parser, Arg};
|
use clap::{command, value_parser, Arg};
|
||||||
use hyper::{server::conn::http1, service::service_fn};
|
use hyper::{server::conn::http1, service::service_fn};
|
||||||
|
@ -50,25 +51,27 @@ async fn main() -> Result<!, Error> {
|
||||||
|
|
||||||
let config = Config::from_arg(matches.get_one::<Utf8PathBuf>("config")).await?;
|
let config = Config::from_arg(matches.get_one::<Utf8PathBuf>("config")).await?;
|
||||||
|
|
||||||
let (value_tx, mut value_rx) = mpsc::unbounded_channel::<Hook>();
|
let (value_tx, value_rx) = mpsc::unbounded_channel::<Hook>();
|
||||||
|
|
||||||
let mut client = XmppClient::new(
|
let mut bot = XmppClient::new(
|
||||||
config.jid,
|
config.jid,
|
||||||
config.password.as_str(),
|
config.password.as_str(),
|
||||||
config.rooms,
|
config.rooms,
|
||||||
config.nickname,
|
config.nickname,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
tokio::task::spawn(async move {
|
||||||
|
bot.receive(value_rx).await;
|
||||||
|
error!("XMPP client exited early");
|
||||||
|
});
|
||||||
|
|
||||||
let tcp_bind = TcpListener::bind(config.addr).await?;
|
let tcp_bind = TcpListener::bind(config.addr).await?;
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
let value_tx = value_tx.clone();
|
let value_tx = value_tx.clone();
|
||||||
let secret = config.secret.clone();
|
let secret = config.secret.clone();
|
||||||
|
|
||||||
tokio::select! {
|
if let Ok((tcp, _)) = tcp_bind.accept().await {
|
||||||
_ = client.next() => (),
|
|
||||||
accept = tcp_bind.accept() => {
|
|
||||||
if let Ok((tcp, _)) = accept {
|
|
||||||
let io = TokioIo::new(tcp);
|
let io = TokioIo::new(tcp);
|
||||||
tokio::task::spawn(async move {
|
tokio::task::spawn(async move {
|
||||||
if let Err(err) = http1::Builder::new()
|
if let Err(err) = http1::Builder::new()
|
||||||
|
@ -87,11 +90,4 @@ async fn main() -> Result<!, Error> {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
wh = value_rx.recv() => {
|
|
||||||
if let Some(hook) = wh {
|
|
||||||
client.hook(hook).await
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue