Add bot instance
This commit is contained in:
parent
b9c4c2a003
commit
feacde16aa
6 changed files with 471 additions and 2 deletions
|
|
@ -1,6 +1,6 @@
|
||||||
[workspace]
|
[workspace]
|
||||||
resolver = "2"
|
resolver = "2"
|
||||||
members = ["euphoxide"]
|
members = ["euphoxide", "euphoxide-bot"]
|
||||||
|
|
||||||
[workspace.package]
|
[workspace.package]
|
||||||
version = "0.5.1"
|
version = "0.5.1"
|
||||||
|
|
@ -8,6 +8,7 @@ edition = "2021"
|
||||||
|
|
||||||
[workspace.dependencies]
|
[workspace.dependencies]
|
||||||
caseless = "0.2.1"
|
caseless = "0.2.1"
|
||||||
|
cookie = "0.18.1"
|
||||||
futures-util = "0.3.31"
|
futures-util = "0.3.31"
|
||||||
jiff = { version = "0.1.15", default-features = false, features = ["std"] }
|
jiff = { version = "0.1.15", default-features = false, features = ["std"] }
|
||||||
log = "0.4.22"
|
log = "0.4.22"
|
||||||
|
|
|
||||||
14
euphoxide-bot/Cargo.toml
Normal file
14
euphoxide-bot/Cargo.toml
Normal file
|
|
@ -0,0 +1,14 @@
|
||||||
|
[package]
|
||||||
|
name = "euphoxide-bot"
|
||||||
|
version = { workspace = true }
|
||||||
|
edition = { workspace = true }
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
cookie = { workspace = true }
|
||||||
|
euphoxide = { path = "../euphoxide" }
|
||||||
|
log = { workspace = true }
|
||||||
|
tokio = { workspace = true, features = ["rt"] }
|
||||||
|
tokio-tungstenite = { workspace = true }
|
||||||
|
|
||||||
|
[lints]
|
||||||
|
workspace = true
|
||||||
68
euphoxide-bot/src/config.rs
Normal file
68
euphoxide-bot/src/config.rs
Normal file
|
|
@ -0,0 +1,68 @@
|
||||||
|
use std::{
|
||||||
|
sync::{Arc, Mutex},
|
||||||
|
time::Duration,
|
||||||
|
};
|
||||||
|
|
||||||
|
use cookie::CookieJar;
|
||||||
|
use euphoxide::client::conn::ClientConnConfig;
|
||||||
|
|
||||||
|
#[derive(Debug, Clone)]
|
||||||
|
pub struct ServerConfig {
|
||||||
|
pub client: ClientConnConfig,
|
||||||
|
pub cookies: Arc<Mutex<CookieJar>>,
|
||||||
|
pub join_attempts: usize,
|
||||||
|
pub reconnect_delay: Duration,
|
||||||
|
pub cmd_channel_bufsize: usize,
|
||||||
|
pub event_channel_bufsize: usize,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for ServerConfig {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
client: ClientConnConfig::default(),
|
||||||
|
cookies: Arc::new(Mutex::new(CookieJar::new())),
|
||||||
|
join_attempts: 5,
|
||||||
|
reconnect_delay: Duration::from_secs(30),
|
||||||
|
cmd_channel_bufsize: 1,
|
||||||
|
event_channel_bufsize: 10,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone)]
|
||||||
|
pub struct InstanceConfig {
|
||||||
|
pub server: ServerConfig,
|
||||||
|
pub room: String,
|
||||||
|
pub human: bool,
|
||||||
|
pub username: Option<String>,
|
||||||
|
pub force_username: bool,
|
||||||
|
pub password: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl InstanceConfig {
|
||||||
|
pub fn new(room: impl ToString) -> Self {
|
||||||
|
Self {
|
||||||
|
server: ServerConfig::default(),
|
||||||
|
room: room.to_string(),
|
||||||
|
human: false,
|
||||||
|
username: None,
|
||||||
|
force_username: false,
|
||||||
|
password: None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn with_username(mut self, username: impl ToString) -> Self {
|
||||||
|
self.username = Some(username.to_string());
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn with_force_username(mut self, enabled: bool) -> Self {
|
||||||
|
self.force_username = enabled;
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn with_password(mut self, password: impl ToString) -> Self {
|
||||||
|
self.password = Some(password.to_string());
|
||||||
|
self
|
||||||
|
}
|
||||||
|
}
|
||||||
382
euphoxide-bot/src/instance.rs
Normal file
382
euphoxide-bot/src/instance.rs
Normal file
|
|
@ -0,0 +1,382 @@
|
||||||
|
use std::{fmt, result, str::FromStr};
|
||||||
|
|
||||||
|
use cookie::Cookie;
|
||||||
|
use euphoxide::{
|
||||||
|
api::{Auth, AuthOption, BounceEvent, Data, Nick, ParsedPacket},
|
||||||
|
client::{
|
||||||
|
conn::{ClientConn, ClientConnHandle},
|
||||||
|
state::State,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
use log::warn;
|
||||||
|
use tokio::{
|
||||||
|
select,
|
||||||
|
sync::{mpsc, oneshot},
|
||||||
|
};
|
||||||
|
use tokio_tungstenite::tungstenite::{
|
||||||
|
self,
|
||||||
|
http::{HeaderValue, StatusCode},
|
||||||
|
};
|
||||||
|
|
||||||
|
use crate::InstanceConfig;
|
||||||
|
|
||||||
|
enum Error {
|
||||||
|
Stopped,
|
||||||
|
NoReferences,
|
||||||
|
AuthRequired,
|
||||||
|
InvalidPassword,
|
||||||
|
OutOfJoinAttempts,
|
||||||
|
Euphoxide(euphoxide::Error),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Error {
|
||||||
|
fn is_fatal(&self) -> bool {
|
||||||
|
match self {
|
||||||
|
Self::Stopped => true,
|
||||||
|
Self::NoReferences => true,
|
||||||
|
Self::AuthRequired => true,
|
||||||
|
Self::InvalidPassword => true,
|
||||||
|
Self::OutOfJoinAttempts => true,
|
||||||
|
Self::Euphoxide(euphoxide::Error::Tungstenite(tungstenite::Error::Http(response))) => {
|
||||||
|
response.status() == StatusCode::NOT_FOUND
|
||||||
|
}
|
||||||
|
_ => false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl fmt::Display for Error {
|
||||||
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
|
match self {
|
||||||
|
Self::Stopped => write!(f, "the instance was stopped manually"),
|
||||||
|
Self::NoReferences => write!(f, "all references to the instance were dropped"),
|
||||||
|
Self::AuthRequired => write!(f, "authentication required but no credentials found"),
|
||||||
|
Self::InvalidPassword => write!(f, "authentication required but password is invalid"),
|
||||||
|
Self::OutOfJoinAttempts => write!(f, "failed to join within attempt limit"),
|
||||||
|
Self::Euphoxide(error) => write!(f, "{error}"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<euphoxide::Error> for Error {
|
||||||
|
fn from(value: euphoxide::Error) -> Self {
|
||||||
|
Self::Euphoxide(value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type Result<T> = result::Result<T, Error>;
|
||||||
|
|
||||||
|
enum Command {
|
||||||
|
GetConn(oneshot::Sender<ClientConnHandle>),
|
||||||
|
Stop,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub enum InstanceEvent<I> {
|
||||||
|
Started {
|
||||||
|
id: I,
|
||||||
|
},
|
||||||
|
Connecting {
|
||||||
|
id: I,
|
||||||
|
},
|
||||||
|
Connected {
|
||||||
|
id: I,
|
||||||
|
conn: ClientConnHandle,
|
||||||
|
state: State,
|
||||||
|
},
|
||||||
|
Joined {
|
||||||
|
id: I,
|
||||||
|
conn: ClientConnHandle,
|
||||||
|
state: State,
|
||||||
|
},
|
||||||
|
Packet {
|
||||||
|
id: I,
|
||||||
|
conn: ClientConnHandle,
|
||||||
|
state: State,
|
||||||
|
packet: ParsedPacket,
|
||||||
|
},
|
||||||
|
Disconnected {
|
||||||
|
id: I,
|
||||||
|
},
|
||||||
|
Stopped {
|
||||||
|
id: I,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
struct InstanceTask<I> {
|
||||||
|
id: I,
|
||||||
|
config: InstanceConfig,
|
||||||
|
|
||||||
|
cmd_rx: mpsc::Receiver<Command>,
|
||||||
|
event_tx: mpsc::Sender<InstanceEvent<I>>,
|
||||||
|
|
||||||
|
attempts: usize,
|
||||||
|
never_joined: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<I: Clone + fmt::Debug> InstanceTask<I> {
|
||||||
|
fn get_cookies(&self) -> Option<HeaderValue> {
|
||||||
|
self.config
|
||||||
|
.server
|
||||||
|
.cookies
|
||||||
|
.lock()
|
||||||
|
.unwrap()
|
||||||
|
.iter()
|
||||||
|
.map(|c| c.stripped().to_string())
|
||||||
|
.collect::<Vec<_>>()
|
||||||
|
.join("; ")
|
||||||
|
.try_into()
|
||||||
|
.ok()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn set_cookies(&mut self, cookies: &[HeaderValue]) {
|
||||||
|
let mut guard = self.config.server.cookies.lock().unwrap();
|
||||||
|
for cookie in cookies {
|
||||||
|
if let Ok(cookie) = cookie.to_str() {
|
||||||
|
if let Ok(cookie) = Cookie::from_str(cookie) {
|
||||||
|
guard.add(cookie);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn connect(&mut self) -> Result<ClientConn> {
|
||||||
|
let (conn, cookies) = ClientConn::connect_with_config(
|
||||||
|
&self.config.room,
|
||||||
|
self.get_cookies(),
|
||||||
|
&self.config.server.client,
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
self.set_cookies(&cookies);
|
||||||
|
|
||||||
|
Ok(conn)
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn on_joined(&mut self, conn: &ClientConn) {
|
||||||
|
self.never_joined = false;
|
||||||
|
|
||||||
|
let _ = self
|
||||||
|
.event_tx
|
||||||
|
.send(InstanceEvent::Joined {
|
||||||
|
id: self.id.clone(),
|
||||||
|
conn: conn.handle(),
|
||||||
|
state: conn.state().clone(),
|
||||||
|
})
|
||||||
|
.await;
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn on_packet(&mut self, conn: &mut ClientConn, packet: ParsedPacket) -> Result<()> {
|
||||||
|
let _ = self
|
||||||
|
.event_tx
|
||||||
|
.send(InstanceEvent::Packet {
|
||||||
|
id: self.id.clone(),
|
||||||
|
conn: conn.handle(),
|
||||||
|
state: conn.state().clone(),
|
||||||
|
packet: packet.clone(),
|
||||||
|
})
|
||||||
|
.await;
|
||||||
|
|
||||||
|
match packet.into_data()? {
|
||||||
|
// Attempting to authenticate
|
||||||
|
Data::BounceEvent(BounceEvent {
|
||||||
|
auth_options: Some(auth_options),
|
||||||
|
..
|
||||||
|
}) if auth_options.contains(&AuthOption::Passcode) => {
|
||||||
|
if let Some(password) = &self.config.password {
|
||||||
|
conn.send(Auth {
|
||||||
|
r#type: AuthOption::Passcode,
|
||||||
|
passcode: Some(password.clone()),
|
||||||
|
})
|
||||||
|
.await?;
|
||||||
|
} else {
|
||||||
|
return Err(Error::AuthRequired);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Auth attempt failed :(
|
||||||
|
Data::AuthReply(ev) if !ev.success => return Err(Error::InvalidPassword),
|
||||||
|
|
||||||
|
// Just joined
|
||||||
|
Data::SnapshotEvent(ev) => {
|
||||||
|
if let Some(username) = &self.config.username {
|
||||||
|
if ev.nick.is_none() || self.config.force_username {
|
||||||
|
conn.send(Nick {
|
||||||
|
name: username.clone(),
|
||||||
|
})
|
||||||
|
.await?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Maybe we should only count this as joining if we successfully
|
||||||
|
// updated the nick instead of just sending a Nick command? And
|
||||||
|
// maybe we should ensure that we're in the State::Joined state?
|
||||||
|
// Both of these would probably complicate the code a lot. On
|
||||||
|
// the other hand, InstanceEvent::Joined::state would contain
|
||||||
|
// the actual nick after joining, which feels like the right
|
||||||
|
// thing to do™. Probably not worth the increase in code
|
||||||
|
// complexity though.
|
||||||
|
|
||||||
|
self.on_joined(conn).await;
|
||||||
|
}
|
||||||
|
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn on_cmd(&mut self, conn: &ClientConn, cmd: Command) -> Result<()> {
|
||||||
|
match cmd {
|
||||||
|
Command::GetConn(sender) => {
|
||||||
|
let _ = sender.send(conn.handle());
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
Command::Stop => Err(Error::Stopped),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn run_once(&mut self) -> Result<()> {
|
||||||
|
// If we try to connect too many times without managing to join at least
|
||||||
|
// once, the room is probably not accessible for one reason or another
|
||||||
|
// and the instance should stop.
|
||||||
|
self.attempts += 1;
|
||||||
|
if self.never_joined && self.attempts > self.config.server.join_attempts {
|
||||||
|
return Err(Error::OutOfJoinAttempts);
|
||||||
|
}
|
||||||
|
|
||||||
|
let _ = self
|
||||||
|
.event_tx
|
||||||
|
.send(InstanceEvent::Connecting {
|
||||||
|
id: self.id.clone(),
|
||||||
|
})
|
||||||
|
.await;
|
||||||
|
|
||||||
|
let mut conn = match self.connect().await {
|
||||||
|
Ok(conn) => conn,
|
||||||
|
Err(err) => {
|
||||||
|
// When we fail to connect, we want to wait a bit before
|
||||||
|
// reconnecting in order not to spam the server. However, when
|
||||||
|
// we are connected successfully and then disconnect for
|
||||||
|
// whatever reason, we want to try to reconnect immediately. We
|
||||||
|
// might, for example, be disconnected from the server because
|
||||||
|
// we just logged in.
|
||||||
|
tokio::time::sleep(self.config.server.reconnect_delay).await;
|
||||||
|
Err(err)?
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
let _ = self
|
||||||
|
.event_tx
|
||||||
|
.send(InstanceEvent::Connected {
|
||||||
|
id: self.id.clone(),
|
||||||
|
conn: conn.handle(),
|
||||||
|
state: conn.state().clone(),
|
||||||
|
})
|
||||||
|
.await;
|
||||||
|
|
||||||
|
let result = loop {
|
||||||
|
let received = select! {
|
||||||
|
r = conn.recv() => Ok(r?),
|
||||||
|
r = self.cmd_rx.recv() => Err(r),
|
||||||
|
};
|
||||||
|
|
||||||
|
match received {
|
||||||
|
// We received a packet
|
||||||
|
Ok(None) => break Ok(()), // Connection closed
|
||||||
|
Ok(Some(packet)) => self.on_packet(&mut conn, packet).await?,
|
||||||
|
// We received a command
|
||||||
|
Err(None) => break Err(Error::NoReferences),
|
||||||
|
Err(Some(cmd)) => self.on_cmd(&conn, cmd).await?,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
let _ = self
|
||||||
|
.event_tx
|
||||||
|
.send(InstanceEvent::Disconnected {
|
||||||
|
id: self.id.clone(),
|
||||||
|
})
|
||||||
|
.await;
|
||||||
|
|
||||||
|
result
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn run(mut self) {
|
||||||
|
let _ = self
|
||||||
|
.event_tx
|
||||||
|
.send(InstanceEvent::Started {
|
||||||
|
id: self.id.clone(),
|
||||||
|
})
|
||||||
|
.await;
|
||||||
|
|
||||||
|
loop {
|
||||||
|
if let Err(err) = self.run_once().await {
|
||||||
|
warn!("instance {:?}: {err}", self.id);
|
||||||
|
if err.is_fatal() {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let _ = self
|
||||||
|
.event_tx
|
||||||
|
.send(InstanceEvent::Stopped {
|
||||||
|
id: self.id.clone(),
|
||||||
|
})
|
||||||
|
.await;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct Instance<I> {
|
||||||
|
id: I,
|
||||||
|
cmd_tx: mpsc::Sender<Command>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<I: fmt::Debug> fmt::Debug for Instance<I> {
|
||||||
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
|
f.debug_struct("Instance")
|
||||||
|
.field("id", &self.id)
|
||||||
|
.finish_non_exhaustive()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<I: Clone + fmt::Debug + Send + 'static> Instance<I> {
|
||||||
|
pub fn new(id: I, config: InstanceConfig) -> (Self, mpsc::Receiver<InstanceEvent<I>>) {
|
||||||
|
let (cmd_tx, cmd_rx) = mpsc::channel(config.server.cmd_channel_bufsize);
|
||||||
|
let (event_tx, event_rx) = mpsc::channel(config.server.event_channel_bufsize);
|
||||||
|
|
||||||
|
let task = InstanceTask {
|
||||||
|
id: id.clone(),
|
||||||
|
config,
|
||||||
|
attempts: 0,
|
||||||
|
never_joined: false,
|
||||||
|
cmd_rx,
|
||||||
|
event_tx,
|
||||||
|
};
|
||||||
|
|
||||||
|
tokio::task::spawn(task.run());
|
||||||
|
|
||||||
|
(Self { id, cmd_tx }, event_rx)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<I> Instance<I> {
|
||||||
|
pub fn id(&self) -> &I {
|
||||||
|
&self.id
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn stopped(&self) -> bool {
|
||||||
|
self.cmd_tx.is_closed()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn stop(&self) {
|
||||||
|
let _ = self.cmd_tx.send(Command::Stop).await;
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn handle(&self) -> Option<ClientConnHandle> {
|
||||||
|
let (tx, rx) = oneshot::channel();
|
||||||
|
let _ = self.cmd_tx.send(Command::GetConn(tx)).await;
|
||||||
|
rx.await.ok()
|
||||||
|
}
|
||||||
|
}
|
||||||
4
euphoxide-bot/src/lib.rs
Normal file
4
euphoxide-bot/src/lib.rs
Normal file
|
|
@ -0,0 +1,4 @@
|
||||||
|
mod config;
|
||||||
|
mod instance;
|
||||||
|
|
||||||
|
pub use crate::{config::*, instance::*};
|
||||||
|
|
@ -22,7 +22,7 @@ pub struct AccountView {
|
||||||
/// Mode of authentication.
|
/// Mode of authentication.
|
||||||
///
|
///
|
||||||
/// <https://euphoria.leet.nu/heim/api#authoption>
|
/// <https://euphoria.leet.nu/heim/api#authoption>
|
||||||
#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
#[serde(rename_all = "kebab-case")]
|
#[serde(rename_all = "kebab-case")]
|
||||||
pub enum AuthOption {
|
pub enum AuthOption {
|
||||||
/// Authentication with a passcode, where a key is derived from the passcode
|
/// Authentication with a passcode, where a key is derived from the passcode
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue