aboutsummaryrefslogtreecommitdiff
path: root/src/imap/session.rs
diff options
context:
space:
mode:
authorQuentin Dufour <quentin@deuxfleurs.fr>2024-01-18 17:33:57 +0100
committerQuentin Dufour <quentin@deuxfleurs.fr>2024-01-18 17:33:57 +0100
commit185033c462b92854117bc57258bf33b3579a7ca5 (patch)
tree172ce596ddbae14950a49bd1893b8cd032e28783 /src/imap/session.rs
parente1161cab0e71ec604e376d2d87f7d1226f3f0244 (diff)
downloadaerogramme-185033c462b92854117bc57258bf33b3579a7ca5.tar.gz
aerogramme-185033c462b92854117bc57258bf33b3579a7ca5.zip
idling works!!!
Diffstat (limited to 'src/imap/session.rs')
-rw-r--r--src/imap/session.rs38
1 files changed, 25 insertions, 13 deletions
diff --git a/src/imap/session.rs b/src/imap/session.rs
index 1d473ed..f4e3d0f 100644
--- a/src/imap/session.rs
+++ b/src/imap/session.rs
@@ -1,4 +1,4 @@
-use anyhow::anyhow;
+use anyhow::{Result, anyhow, bail};
use crate::imap::capability::{ClientCapability, ServerCapability};
use crate::imap::command::{anonymous, authenticated, selected};
use crate::imap::flow;
@@ -27,28 +27,40 @@ impl Instance {
pub async fn request(&mut self, req: Request) -> ResponseOrIdle {
match req {
- Request::Idle => ResponseOrIdle::Response(self.idle().await),
+ Request::Idle => self.idle().await,
Request::ImapCommand(cmd) => self.command(cmd).await,
}
}
- pub async fn idle(&mut self) -> Response<'static> {
- let (user, mbx, perm, stop) = match &mut self.state {
- flow::State::Idle(ref user, ref mut mailbox, ref perm, ref stop) => (user, mailbox, perm, stop),
- _ => unreachable!(),
+ pub async fn idle(&mut self) -> ResponseOrIdle {
+ match self.idle_happy().await {
+ Ok(r) => r,
+ Err(e) => {
+ tracing::error!(err=?e, "something bad happened in idle");
+ ResponseOrIdle::Response(Response::bye().unwrap())
+ }
+ }
+ }
+
+ pub async fn idle_happy(&mut self) -> Result<ResponseOrIdle> {
+ let (mbx, tag, stop) = match &mut self.state {
+ flow::State::Idle(_, ref mut mbx, _, tag, stop) => (mbx, tag.clone(), stop.clone()),
+ _ => bail!("Invalid session state, can't idle"),
};
tokio::select! {
_ = stop.notified() => {
- return Response::build()
- .tag(imap_codec::imap_types::core::Tag::try_from("FIXME").unwrap())
+ self.state.apply(flow::Transition::UnIdle)?;
+ return Ok(ResponseOrIdle::Response(Response::build()
+ .tag(tag.clone())
.message("IDLE completed")
- .ok()
- .unwrap()
+ .ok()?))
+ },
+ change = mbx.idle_sync() => {
+ tracing::debug!("idle event");
+ return Ok(ResponseOrIdle::IdleEvent(change?));
}
}
-
- unimplemented!();
}
@@ -119,7 +131,7 @@ impl Instance {
}
match &self.state {
- flow::State::Idle(_, _, _, n) => ResponseOrIdle::StartIdle(n.clone()),
+ flow::State::Idle(_, _, _, _, n) => ResponseOrIdle::StartIdle(n.clone()),
_ => ResponseOrIdle::Response(resp),
}
}