diff --git a/Cargo.lock b/Cargo.lock index 8ad1a93..745daae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -33,17 +33,6 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" -[[package]] -name = "aes" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - [[package]] name = "ahash" version = "0.7.8" @@ -382,15 +371,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block-padding" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" -dependencies = [ - "generic-array", -] - [[package]] name = "block2" version = "0.5.1" @@ -483,15 +463,6 @@ dependencies = [ "wayland-client", ] -[[package]] -name = "cbc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" -dependencies = [ - "cipher", -] - [[package]] name = "cc" version = "1.2.13" @@ -527,16 +498,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", -] - [[package]] name = "circular" version = "0.3.0" @@ -2076,16 +2037,6 @@ dependencies = [ "hashbrown 0.15.2", ] -[[package]] -name = "inout" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01" -dependencies = [ - "block-padding", - "generic-array", -] - [[package]] name = "instant" version = "0.1.13" @@ -2388,7 +2339,7 @@ dependencies = [ "jid", "keyring", "luz", - "secret-service", + "serde", "tokio", "tokio-stream", "tracing", @@ -3678,25 +3629,6 @@ dependencies = [ "tiny-skia", ] -[[package]] -name = "secret-service" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4d35ad99a181be0a60ffcbe85d680d98f87bdc4d7644ade319b87076b9dbfd4" -dependencies = [ - "aes", - "cbc", - "futures-util", - "generic-array", - "hkdf", - "num", - "once_cell", - "rand", - "serde", - "sha2", - "zbus", -] - [[package]] name = "security-framework" version = "2.11.1" @@ -3741,18 +3673,18 @@ checksum = "c2fdfc24bc566f839a2da4c4295b82db7d25a24253867d5c64355abb5799bdbe" [[package]] name = "serde" -version = "1.0.217" +version = "1.0.218" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" +checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.217" +version = "1.0.218" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" +checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b" dependencies = [ "proc-macro2", "quote", @@ -4475,7 +4407,6 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "tracing", "windows-sys 0.52.0", ] @@ -5701,7 +5632,6 @@ dependencies = [ "serde_repr", "sha1", "static_assertions", - "tokio", "tracing", "uds_windows", "windows-sys 0.52.0", diff --git a/Cargo.toml b/Cargo.toml index 03cba3f..f2c6a34 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,8 +11,8 @@ tokio = "1.43.0" tokio-stream = "0.1.17" tracing-subscriber = "0.3.19" tracing = "0.1.41" -secret-service = { version = "4.0.0", features = ["rt-tokio-crypto-rust"] } confy = "0.6.1" keyring = { version = "3", features = ["apple-native", "windows-native", "sync-secret-service"] } uuid = { version = "1.13.1", features = ["v4"] } indexmap = "2.7.1" +serde = { version = "1.0.218", features = ["derive"] } diff --git a/src/login_modal.rs b/src/login_modal.rs new file mode 100644 index 0000000..f4e556e --- /dev/null +++ b/src/login_modal.rs @@ -0,0 +1,147 @@ +use iced::{ + futures::StreamExt, + widget::{button, checkbox, column, container, text, text_input}, + Element, Task, +}; +use jid::JID; +use luz::{ + presence::{Offline, Presence}, + LuzHandle, +}; +use tokio_stream::wrappers::ReceiverStream; +use tracing::info; + +use crate::Client; + +#[derive(Default)] +pub struct LoginModal { + jid: String, + password: String, + remember_me: bool, + error: Option, +} + +#[derive(Debug, Clone)] +pub enum Message { + JID(String), + Password(String), + RememberMe, + Submit, + Error(Error), +} + +#[derive(Debug, Clone)] +pub enum Error { + InvalidJID(String), + DatabaseConnection, +} + +pub enum Action { + None, + ClientCreated(Task), +} + +impl LoginModal { + pub fn update(&mut self, message: Message) -> Action { + match message { + Message::JID(j) => { + self.jid = j; + Action::None + } + Message::Password(p) => { + self.password = p; + Action::None + } + Message::RememberMe => { + self.remember_me = !self.remember_me; + Action::None + } + Message::Submit => { + info!("submitting login"); + let jid_str = self.jid.clone(); + let password = self.password.clone(); + Action::ClientCreated( + Task::future(async move { + let jid: Result = jid_str.parse(); + match jid { + Ok(j) => { + let result = + LuzHandle::new(j.clone(), password.to_string(), "macaw.db") + .await; + match result { + Ok((luz_handle, receiver)) => { + let stream = ReceiverStream::new(receiver); + let stream = + stream.map(|message| crate::Message::Luz(message)); + vec![ + Task::done(crate::Message::ClientCreated(Client { + client: luz_handle, + jid: j, + connection_status: Presence::Offline( + Offline::default(), + ), + })), + Task::stream(stream), + ] + } + Err(_e) => { + tracing::error!("error (database probably)"); + return vec![Task::done(crate::Message::LoginModal( + Message::Error(Error::DatabaseConnection), + ))]; + } + } + } + Err(_) => { + tracing::error!("parsing jid"); + return vec![Task::done(crate::Message::LoginModal( + Message::Error(Error::InvalidJID(jid_str.to_string())), + ))]; + } + } + }) + .then(|tasks| Task::batch(tasks)), + ) + } + Message::Error(error) => { + self.error = Some(error); + Action::None + } + } + } + + pub fn view(&self) -> Element { + container( + column![ + text("Log In").size(24), + column![ + column![ + text("JID").size(12), + text_input("berry@macaw.chat", &self.jid) + .on_input(|j| Message::JID(j)) + .on_submit(Message::Submit) + .padding(5), + ] + .spacing(5), + column![ + text("Password").size(12), + text_input("", &self.password) + .on_input(|p| Message::Password(p)) + .on_submit(Message::Submit) + .secure(true) + .padding(5), + ] + .spacing(5), + checkbox("remember me", self.remember_me).on_toggle(|_| Message::RememberMe), + button(text("Submit")).on_press(Message::Submit), + ] + .spacing(10) + ] + .spacing(20), + ) + .width(300) + .padding(10) + .style(container::rounded_box) + .into() + } +} diff --git a/src/main.rs b/src/main.rs index e3d3332..d583293 100644 --- a/src/main.rs +++ b/src/main.rs @@ -7,7 +7,7 @@ use iced::futures::{SinkExt, Stream, StreamExt}; use iced::widget::button::Status; use iced::widget::text::{Fragment, IntoFragment}; use iced::widget::{ - button, center, column, container, mouse_area, opaque, row, scrollable, stack, text, + button, center, checkbox, column, container, mouse_area, opaque, row, scrollable, stack, text, text_input, Column, Text, Toggler, }; use iced::Length::Fill; @@ -15,15 +15,20 @@ use iced::{stream, Color, Element, Subscription, Task, Theme}; use indexmap::{indexmap, IndexMap}; use jid::JID; use keyring::Entry; +use login_modal::LoginModal; use luz::chat::{Chat, Message as ChatMessage}; use luz::presence::{Offline, Presence}; use luz::CommandMessage; use luz::{roster::Contact, user::User, LuzHandle, UpdateMessage}; +use serde::{Deserialize, Serialize}; use tokio::sync::{mpsc, oneshot}; use tokio_stream::wrappers::ReceiverStream; -use tracing::info; +use tracing::{error, info}; use uuid::Uuid; +mod login_modal; + +#[derive(Serialize, Deserialize)] pub struct Config { auto_connect: bool, } @@ -36,6 +41,7 @@ impl Default for Config { pub struct Macaw { client: Account, + config: Config, roster: HashMap, users: HashMap, presences: HashMap, @@ -58,20 +64,17 @@ pub struct Creds { } impl Macaw { - pub fn new(client: Option) -> Self { + pub fn new(client: Option, config: Config) -> Self { let account; if let Some(client) = client { account = Account::LoggedIn(client); } else { - account = Account::LoggedOut { - jid: "".to_string(), - password: "".to_string(), - error: None, - }; + account = Account::LoggedOut(LoginModal::default()); } Self { client: account, + config, roster: HashMap::new(), users: HashMap::new(), presences: HashMap::new(), @@ -85,17 +88,7 @@ impl Macaw { pub enum Account { LoggedIn(Client), - LoggedOut { - jid: String, - password: String, - error: Option, - }, -} - -#[derive(Debug, Clone)] -pub enum Error { - InvalidJID(String), - DatabaseConnection, + LoggedOut(LoginModal), } #[derive(Clone, Debug)] @@ -122,6 +115,7 @@ impl Deref for Client { fn main() -> iced::Result { tracing_subscriber::fmt::init(); + let cfg = confy::load("macaw", None).unwrap(); let client: Option<(JID, LuzHandle, mpsc::Receiver)> = None; if let Some((jid, luz_handle, update_recv)) = client { @@ -129,25 +123,28 @@ fn main() -> iced::Result { let stream = stream.map(|message| Message::Luz(message)); iced::application("Macaw", Macaw::update, Macaw::view).run_with(|| { ( - Macaw::new(Some(Client { - client: luz_handle, - // TODO: - jid, - connection_status: Presence::Offline(Offline::default()), - })), + Macaw::new( + Some(Client { + client: luz_handle, + // TODO: + jid, + connection_status: Presence::Offline(Offline::default()), + }), + cfg, + ), // TODO: autoconnect config Task::stream(stream), ) }) } else { iced::application("Macaw", Macaw::update, Macaw::view) - .run_with(|| (Macaw::new(None), Task::none())) + .run_with(|| (Macaw::new(None, cfg), Task::none())) } } #[derive(Debug, Clone)] -enum Message { - LoginModal(LoginModalMessage), +pub enum Message { + LoginModal(login_modal::Message), ClientCreated(Client), Luz(UpdateMessage), Roster(HashMap), @@ -161,14 +158,6 @@ enum Message { SendMessage(JID, String), } -#[derive(Debug, Clone)] -enum LoginModalMessage { - JID(String), - Password(String), - Submit, - Error(Error), -} - impl Macaw { fn update(&mut self, message: Message) -> Task { match message { @@ -187,11 +176,7 @@ impl Macaw { self.roster = roster; Task::none() } - Account::LoggedOut { - jid, - password, - error, - } => Task::none(), + Account::LoggedOut(login_modal) => Task::none(), }, UpdateMessage::Offline(offline) => { // TODO: update all contacts' presences to unknown (offline) @@ -200,11 +185,7 @@ impl Macaw { client.connection_status = Presence::Offline(offline); Task::none() } - Account::LoggedOut { - jid, - password, - error, - } => Task::none(), + Account::LoggedOut(login_modal) => Task::none(), } } UpdateMessage::FullRoster(vec) => { @@ -280,11 +261,7 @@ impl Macaw { }) .discard() } - Account::LoggedOut { - jid, - password, - error, - } => Task::none(), + Account::LoggedOut(login_modal) => Task::none(), }, Message::Disconnect => match &self.client { Account::LoggedIn(client) => { @@ -296,11 +273,7 @@ impl Macaw { }) .discard() } - Account::LoggedOut { - jid, - password, - error, - } => Task::none(), + Account::LoggedOut(login_modal) => Task::none(), }, Message::OpenChat(jid) => { self.open_chat = Some(OpenChat { @@ -309,105 +282,25 @@ impl Macaw { }); Task::none() } - Message::LoginModal(login_modal_message) => match login_modal_message { - LoginModalMessage::JID(j) => match &mut self.client { - Account::LoggedIn(_client) => Task::none(), - Account::LoggedOut { - jid, - password, - error, - } => { - *jid = j; - Task::none() + Message::LoginModal(login_modal_message) => match &mut self.client { + Account::LoggedIn(_client) => Task::none(), + Account::LoggedOut(login_modal) => { + let action = login_modal.update(login_modal_message); + match action { + login_modal::Action::None => Task::none(), + login_modal::Action::ClientCreated(task) => task, } - }, - LoginModalMessage::Password(p) => match &mut self.client { - Account::LoggedIn(_client) => Task::none(), - Account::LoggedOut { - jid, - password, - error, - } => { - *password = p; - Task::none() - } - }, - LoginModalMessage::Submit => match &self.client { - Account::LoggedIn(_client) => Task::none(), - Account::LoggedOut { - jid: jid_str, - password, - error, - } => { - info!("submitting login"); - let jid_str = jid_str.clone(); - let password = password.clone(); - Task::future(async move { - let jid: Result = jid_str.parse(); - match jid { - Ok(j) => { - let result = - LuzHandle::new(j.clone(), password.to_string(), "macaw.db") - .await; - match result { - Ok((luz_handle, receiver)) => { - let stream = ReceiverStream::new(receiver); - let stream = - stream.map(|message| Message::Luz(message)); - vec![ - Task::done(Message::ClientCreated(Client { - client: luz_handle, - jid: j, - connection_status: Presence::Offline( - Offline::default(), - ), - })), - Task::stream(stream), - ] - } - Err(e) => { - tracing::error!("error (database probably)"); - return vec![Task::done(Message::LoginModal( - LoginModalMessage::Error(Error::DatabaseConnection), - ))]; - } - } - } - Err(_) => { - tracing::error!("parsing jid"); - return vec![Task::done(Message::LoginModal( - LoginModalMessage::Error(Error::InvalidJID( - jid_str.to_string(), - )), - ))]; - } - } - }) - .then(|tasks| Task::batch(tasks)) - } - }, - LoginModalMessage::Error(e) => match &mut self.client { - Account::LoggedIn(_client) => Task::none(), - Account::LoggedOut { - jid, - password, - error, - } => { - tracing::error!("luz::new: {:?}", e); - *error = Some(e); - Task::none() - } - }, + } }, Message::GotChats(chats) => { let mut tasks = Vec::new(); let client = match &self.client { Account::LoggedIn(client) => client, - Account::LoggedOut { - jid, - password, - error, - } => panic!("no client"), + Account::LoggedOut(_) => { + // TODO: error into event tracing subscriber + error!("no client, cannot retreive chat history for chats"); + return Task::none(); + } }; for chat in chats { let client = client.clone(); @@ -455,11 +348,10 @@ impl Macaw { Message::SendMessage(jid, body) => { let client = match &self.client { Account::LoggedIn(client) => client.clone(), - Account::LoggedOut { - jid, - password, - error, - } => todo!(), + Account::LoggedOut(_) => { + error!("cannot send message when no client set up"); + return Task::none(); + } }; Task::future( async move { client.send_message(jid, luz::chat::Body { body }).await }, @@ -498,19 +390,11 @@ impl Macaw { Presence::Online(_online) => "online", Presence::Offline(_offline) => "disconnected", }, - Account::LoggedOut { - jid: _, - password: _, - error, - } => "disconnected", + Account::LoggedOut(_) => "disconnected", }; let client_jid: Cow<'_, str> = match &self.client { Account::LoggedIn(client) => (&client.jid).into(), - Account::LoggedOut { - jid: _, - password: _, - error, - } => Cow::from("no account"), + Account::LoggedOut(_) => Cow::from("no account"), // map(|client| (&client.jid).into()); }; let account_view = row![ @@ -568,7 +452,8 @@ impl Macaw { .into(); if let Some(new_chat) = &self.new_chat { - ui = modal(ui, text("new chat")); + // TODO: close new chat window + ui = modal(ui, text("new chat"), None); } // temporarily center to fill space // let ui = center(ui).into(); @@ -576,47 +461,9 @@ impl Macaw { match &self.client { Account::LoggedIn(_client) => ui.into(), - Account::LoggedOut { - jid, - password, - error, - } => { - let signup = container( - column![ - text("Log In").size(24), - column![ - column![ - text("JID").size(12), - text_input("berry@macaw.chat", &jid) - .on_input(|j| Message::LoginModal(LoginModalMessage::JID(j))) - .on_submit(Message::LoginModal(LoginModalMessage::Submit)) - .padding(5), - ] - .spacing(5), - column![ - text("Password").size(12), - text_input("", &password) - .on_input(|p| Message::LoginModal(LoginModalMessage::Password( - p - ))) - .on_submit(Message::LoginModal(LoginModalMessage::Submit)) - .secure(true) - .padding(5), - ] - .spacing(5), - button(text("Submit")) - .on_press(Message::LoginModal(LoginModalMessage::Submit)), - ] - .spacing(10) - ] - .spacing(20), - ) - .width(300) - .padding(10) - .style(container::rounded_box); - - // signup.into() - modal(ui, signup) + Account::LoggedOut(login_modal) => { + let signup = login_modal.view().map(Message::LoginModal); + modal(ui, signup, None) } } } @@ -629,27 +476,25 @@ impl Macaw { fn modal<'a, Message>( base: impl Into>, content: impl Into>, - // on_blur: Message, + on_blur: Option, ) -> Element<'a, Message> where Message: Clone + 'a, { - stack![ - base.into(), - opaque( - mouse_area(center(opaque(content)).style(|_theme| { - container::Style { - background: Some( - Color { - a: 0.8, - ..Color::BLACK - } - .into(), - ), - ..container::Style::default() + let mut mouse_area = mouse_area(center(opaque(content)).style(|_theme| { + container::Style { + background: Some( + Color { + a: 0.8, + ..Color::BLACK } - })) // .on_press(on_blur) - ) - ] - .into() + .into(), + ), + ..container::Style::default() + } + })); // .on_press(on_blur) + if let Some(on_blur) = on_blur { + mouse_area = mouse_area.on_press(on_blur) + } + stack![base.into(), opaque(mouse_area)].into() }