From b82df13082869dc4d455e15c2955e20de0b55675 Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Tue, 7 Jun 2022 12:38:59 +0200 Subject: Refactor --- src/connection.rs | 41 --------------------------------- src/instance.rs | 34 ---------------------------- src/main.rs | 3 +-- src/server.rs | 4 ++-- src/service.rs | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 71 insertions(+), 79 deletions(-) delete mode 100644 src/connection.rs delete mode 100644 src/instance.rs create mode 100644 src/service.rs diff --git a/src/connection.rs b/src/connection.rs deleted file mode 100644 index 335caaa..0000000 --- a/src/connection.rs +++ /dev/null @@ -1,41 +0,0 @@ -use std::sync::Arc; -use std::task::{Context, Poll}; - -use boitalettres::errors::Error as BalError; -use boitalettres::proto::{Request, Response}; -use futures::future::BoxFuture; -use imap_codec::types::command::CommandBody; -use tower::Service; - -use crate::command; -use crate::mailstore::Mailstore; - -pub struct Connection { - pub mailstore: Arc, -} -impl Connection { - pub fn new(mailstore: Arc) -> Self { - Self { mailstore } - } -} -impl Service for Connection { - type Response = Response; - type Error = BalError; - type Future = BoxFuture<'static, Result>; - - fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll> { - Poll::Ready(Ok(())) - } - - fn call(&mut self, req: Request) -> Self::Future { - tracing::debug!("Got request: {:#?}", req); - let cmd = command::Command::new(self.mailstore.clone()); - Box::pin(async move { - match req.body { - CommandBody::Capability => cmd.capability().await, - CommandBody::Login { username, password } => cmd.login(username, password).await, - _ => Response::bad("Error in IMAP command received by server."), - } - }) - } -} diff --git a/src/instance.rs b/src/instance.rs deleted file mode 100644 index 6e11be5..0000000 --- a/src/instance.rs +++ /dev/null @@ -1,34 +0,0 @@ -use std::sync::Arc; -use std::task::{Context, Poll}; - -use anyhow::Result; -use boitalettres::server::accept::addr::AddrStream; -use futures::future::BoxFuture; -use tower::Service; - -use crate::connection::Connection; -use crate::mailstore::Mailstore; - -pub struct Instance { - pub mailstore: Arc, -} -impl Instance { - pub fn new(mailstore: Arc) -> Self { - Self { mailstore } - } -} -impl<'a> Service<&'a AddrStream> for Instance { - type Response = Connection; - type Error = anyhow::Error; - type Future = BoxFuture<'static, Result>; - - fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll> { - Poll::Ready(Ok(())) - } - - fn call(&mut self, addr: &'a AddrStream) -> Self::Future { - tracing::info!(remote_addr = %addr.remote_addr, local_addr = %addr.local_addr, "accept"); - let ms = self.mailstore.clone(); - Box::pin(async { Ok(Connection::new(ms)) }) - } -} diff --git a/src/main.rs b/src/main.rs index 62a5d81..8f7d1e5 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,13 +1,12 @@ mod bayou; mod command; mod config; -mod connection; mod cryptoblob; -mod instance; mod login; mod mailbox; mod mailstore; mod server; +mod service; mod time; mod uidindex; diff --git a/src/server.rs b/src/server.rs index 57ce048..2bbdc2b 100644 --- a/src/server.rs +++ b/src/server.rs @@ -2,7 +2,7 @@ use anyhow::Result; use std::sync::Arc; use crate::config::*; -use crate::instance; +use crate::service; use crate::mailstore; use boitalettres::server::accept::addr::AddrIncoming; @@ -32,7 +32,7 @@ impl Server { //mailbox.test().await?; let server = - ImapServer::new(self.incoming).serve(instance::Instance::new(self.mailstore.clone())); + ImapServer::new(self.incoming).serve(service::Instance::new(self.mailstore.clone())); let _ = server.await?; Ok(()) diff --git a/src/service.rs b/src/service.rs new file mode 100644 index 0000000..888a217 --- /dev/null +++ b/src/service.rs @@ -0,0 +1,68 @@ +use std::sync::Arc; +use std::task::{Context, Poll}; + +use anyhow::Result; +use boitalettres::server::accept::addr::AddrStream; +use boitalettres::errors::Error as BalError; +use boitalettres::proto::{Request, Response}; +use futures::future::BoxFuture; +use imap_codec::types::command::CommandBody; +use tower::Service; + +use crate::command; +use crate::mailstore::Mailstore; + +pub struct Instance { + pub mailstore: Arc, +} +impl Instance { + pub fn new(mailstore: Arc) -> Self { + Self { mailstore } + } +} +impl<'a> Service<&'a AddrStream> for Instance { + type Response = Connection; + type Error = anyhow::Error; + type Future = BoxFuture<'static, Result>; + + fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll> { + Poll::Ready(Ok(())) + } + + fn call(&mut self, addr: &'a AddrStream) -> Self::Future { + tracing::info!(remote_addr = %addr.remote_addr, local_addr = %addr.local_addr, "accept"); + let ms = self.mailstore.clone(); + Box::pin(async { Ok(Connection::new(ms)) }) + } +} + +pub struct Connection { + pub mailstore: Arc, +} +impl Connection { + pub fn new(mailstore: Arc) -> Self { + Self { mailstore } + } +} +impl Service for Connection { + type Response = Response; + type Error = BalError; + type Future = BoxFuture<'static, Result>; + + fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll> { + Poll::Ready(Ok(())) + } + + fn call(&mut self, req: Request) -> Self::Future { + tracing::debug!("Got request: {:#?}", req); + let cmd = command::Command::new(self.mailstore.clone()); + Box::pin(async move { + match req.body { + CommandBody::Capability => cmd.capability().await, + CommandBody::Login { username, password } => cmd.login(username, password).await, + _ => Response::bad("Error in IMAP command received by server."), + } + }) + } +} + -- cgit v1.2.3