From 90af21aef4653e125ef018d39a60be0b3a1b7049 Mon Sep 17 00:00:00 2001 From: Karol Kosek Date: Tue, 29 Aug 2023 15:15:41 +0200 Subject: [PATCH] LibIMAP+Mail+test-imap: Let a Promise result type be non-optional The Empty type was used only when parsing a response failed. The failures will now go to Promise's error type. --- Userland/Applications/Mail/MailWidget.cpp | 14 +++--- Userland/Libraries/LibIMAP/Client.cpp | 59 +++++++++++------------ Userland/Libraries/LibIMAP/Client.h | 44 ++++++++--------- Userland/Utilities/test-imap.cpp | 26 +++++----- 4 files changed, 71 insertions(+), 72 deletions(-) diff --git a/Userland/Applications/Mail/MailWidget.cpp b/Userland/Applications/Mail/MailWidget.cpp index 2acdd288162..a6f60499cbe 100644 --- a/Userland/Applications/Mail/MailWidget.cpp +++ b/Userland/Applications/Mail/MailWidget.cpp @@ -137,7 +137,7 @@ ErrorOr MailWidget::connect_and_login() m_statusbar->set_text(String::formatted("Connected. Logging in as {}...", username).release_value_but_fixme_should_propagate_errors()); - auto response = TRY(m_imap_client->login(username, password)->await()).release_value(); + auto response = TRY(m_imap_client->login(username, password)->await()); if (response.status() != IMAP::ResponseStatus::OK) { dbgln("Failed to login. The server says: '{}'", response.response_text()); @@ -147,7 +147,7 @@ ErrorOr MailWidget::connect_and_login() } m_statusbar->set_text("Logged in. Loading mailboxes..."_string); - response = TRY(m_imap_client->list(""sv, "*"sv)->await()).release_value(); + response = TRY(m_imap_client->list(""sv, "*"sv)->await()); if (response.status() != IMAP::ResponseStatus::OK) { dbgln("Failed to retrieve mailboxes. The server says: '{}'", response.response_text()); @@ -174,7 +174,7 @@ void MailWidget::on_window_close() // User closed main window before a connection was established return; } - auto response = move(MUST(m_imap_client->send_simple_command(IMAP::CommandType::Logout)->await()).release_value().get()); + auto response = move(MUST(m_imap_client->send_simple_command(IMAP::CommandType::Logout)->await()).get()); VERIFY(response.status() == IMAP::ResponseStatus::OK); m_imap_client->close(); @@ -265,7 +265,7 @@ void MailWidget::selected_mailbox() if (mailbox.flags & (unsigned)IMAP::MailboxFlag::NoSelect) return; - auto response = MUST(m_imap_client->select(mailbox.name)->await()).release_value(); + auto response = MUST(m_imap_client->select(mailbox.name)->await()); if (response.status() != IMAP::ResponseStatus::OK) { dbgln("Failed to select mailbox. The server says: '{}'", response.response_text()); @@ -297,7 +297,7 @@ void MailWidget::selected_mailbox() }, }; - auto fetch_response = MUST(m_imap_client->fetch(fetch_command, false)->await()).release_value(); + auto fetch_response = MUST(m_imap_client->fetch(fetch_command, false)->await()); if (fetch_response.status() != IMAP::ResponseStatus::OK) { dbgln("Failed to retrieve subject/from for e-mails. The server says: '{}'", response.response_text()); m_statusbar->set_text(String::formatted("[{}]: Failed to fetch messages :^(", mailbox.name).release_value_but_fixme_should_propagate_errors()); @@ -452,7 +452,7 @@ void MailWidget::selected_email_to_load() }, }; - auto fetch_response = MUST(m_imap_client->fetch(fetch_command, false)->await()).release_value(); + auto fetch_response = MUST(m_imap_client->fetch(fetch_command, false)->await()); if (fetch_response.status() != IMAP::ResponseStatus::OK) { dbgln("Failed to retrieve the body structure of the selected e-mail. The server says: '{}'", fetch_response.response_text()); @@ -516,7 +516,7 @@ void MailWidget::selected_email_to_load() }, }; - fetch_response = MUST(m_imap_client->fetch(fetch_command, false)->await()).release_value(); + fetch_response = MUST(m_imap_client->fetch(fetch_command, false)->await()); if (fetch_response.status() != IMAP::ResponseStatus::OK) { dbgln("Failed to retrieve the body of the selected e-mail. The server says: '{}'", fetch_response.response_text()); diff --git a/Userland/Libraries/LibIMAP/Client.cpp b/Userland/Libraries/LibIMAP/Client.cpp index 4e7740d8d34..ad95e72bd25 100644 --- a/Userland/Libraries/LibIMAP/Client.cpp +++ b/Userland/Libraries/LibIMAP/Client.cpp @@ -171,12 +171,12 @@ ErrorOr Client::send_raw(StringView data) return {}; } -NonnullRefPtr>> Client::send_command(Command&& command) +NonnullRefPtr> Client::send_command(Command&& command) { m_command_queue.append(move(command)); m_current_command++; - auto promise = Promise>::construct(); + auto promise = Promise::construct(); m_pending_promises.append(promise); if (m_pending_promises.size() == 1) { @@ -189,22 +189,22 @@ NonnullRefPtr>> Client::send_command(Command&& comman } template -NonnullRefPtr>> cast_promise(NonnullRefPtr>> promise_variant) +NonnullRefPtr> cast_promise(NonnullRefPtr> promise_variant) { - auto new_promise = promise_variant->map>( - [](Optional& variant) { - return move(variant->get()); + auto new_promise = promise_variant->map( + [](Response& variant) { + return move(variant.get()); }); return new_promise; } -NonnullRefPtr>> Client::login(StringView username, StringView password) +NonnullRefPtr> Client::login(StringView username, StringView password) { auto command = Command { CommandType::Login, m_current_command, { serialize_astring(username), serialize_astring(password) } }; return cast_promise(send_command(move(command))); } -NonnullRefPtr>> Client::list(StringView reference_name, StringView mailbox) +NonnullRefPtr> Client::list(StringView reference_name, StringView mailbox) { auto command = Command { CommandType::List, m_current_command, { DeprecatedString::formatted("\"{}\"", reference_name), @@ -212,7 +212,7 @@ NonnullRefPtr>> Client::list(StringView referenc return cast_promise(send_command(move(command))); } -NonnullRefPtr>> Client::lsub(StringView reference_name, StringView mailbox) +NonnullRefPtr> Client::lsub(StringView reference_name, StringView mailbox) { auto command = Command { CommandType::ListSub, m_current_command, { DeprecatedString::formatted("\"{}\"", reference_name), @@ -220,19 +220,19 @@ NonnullRefPtr>> Client::lsub(StringView referenc return cast_promise(send_command(move(command))); } -NonnullRefPtr>> Client::fetch(FetchCommand request, bool uid) +NonnullRefPtr> Client::fetch(FetchCommand request, bool uid) { auto command = Command { uid ? CommandType::UIDFetch : CommandType::Fetch, m_current_command, { request.serialize() } }; return cast_promise(send_command(move(command))); } -NonnullRefPtr>> Client::send_simple_command(CommandType type) +NonnullRefPtr> Client::send_simple_command(CommandType type) { auto command = Command { type, m_current_command, {} }; return send_command(move(command)); } -NonnullRefPtr>> Client::select(StringView string) +NonnullRefPtr> Client::select(StringView string) { auto command = Command { CommandType::Select, m_current_command, { serialize_astring(string) } }; return cast_promise(send_command(move(command))); @@ -255,8 +255,7 @@ ErrorOr Client::handle_parsed_response(ParseStatus&& parse_status) if (parse_status.response.has_value()) { m_expecting_response = false; should_send_next = parse_status.response->has(); - m_pending_promises.first()->resolve(move(parse_status.response)); - m_pending_promises.remove(0); + m_pending_promises.take_first()->resolve(parse_status.response.release_value()); } if (should_send_next && !m_command_queue.is_empty()) { @@ -286,25 +285,25 @@ ErrorOr Client::send_next_command() return {}; } -NonnullRefPtr>> Client::examine(StringView string) +NonnullRefPtr> Client::examine(StringView string) { auto command = Command { CommandType::Examine, m_current_command, { serialize_astring(string) } }; return cast_promise(send_command(move(command))); } -NonnullRefPtr>> Client::create_mailbox(StringView name) +NonnullRefPtr> Client::create_mailbox(StringView name) { auto command = Command { CommandType::Create, m_current_command, { serialize_astring(name) } }; return cast_promise(send_command(move(command))); } -NonnullRefPtr>> Client::delete_mailbox(StringView name) +NonnullRefPtr> Client::delete_mailbox(StringView name) { auto command = Command { CommandType::Delete, m_current_command, { serialize_astring(name) } }; return cast_promise(send_command(move(command))); } -NonnullRefPtr>> Client::store(StoreMethod method, Sequence sequence_set, bool silent, Vector const& flags, bool uid) +NonnullRefPtr> Client::store(StoreMethod method, Sequence sequence_set, bool silent, Vector const& flags, bool uid) { StringBuilder data_item_name; switch (method) { @@ -330,7 +329,7 @@ NonnullRefPtr>> Client::store(StoreMethod method auto command = Command { uid ? CommandType::UIDStore : CommandType::Store, m_current_command, { sequence_set.serialize(), data_item_name.to_deprecated_string(), flags_builder.to_deprecated_string() } }; return cast_promise(send_command(move(command))); } -NonnullRefPtr>> Client::search(Optional charset, Vector&& keys, bool uid) +NonnullRefPtr> Client::search(Optional charset, Vector&& keys, bool uid) { Vector args; if (charset.has_value()) { @@ -344,21 +343,21 @@ NonnullRefPtr>> Client::search(Optional(send_command(move(command))); } -NonnullRefPtr>> Client::idle() +NonnullRefPtr> Client::idle() { auto promise = send_simple_command(CommandType::Idle); return cast_promise(promise); } -NonnullRefPtr>> Client::finish_idle() +NonnullRefPtr> Client::finish_idle() { - auto promise = Promise>::construct(); + auto promise = Promise::construct(); m_pending_promises.append(promise); MUST(send_raw("DONE"sv)); m_expecting_response = true; return cast_promise(promise); } -NonnullRefPtr>> Client::status(StringView mailbox, Vector const& types) +NonnullRefPtr> Client::status(StringView mailbox, Vector const& types) { Vector args; for (auto type : types) { @@ -388,7 +387,7 @@ NonnullRefPtr>> Client::status(StringView mailbo return cast_promise(send_command(move(command))); } -NonnullRefPtr>> Client::append(StringView mailbox, Message&& message, Optional> flags, Optional date_time) +NonnullRefPtr> Client::append(StringView mailbox, Message&& message, Optional> flags, Optional date_time) { Vector args = { mailbox }; if (flags.has_value()) { @@ -405,7 +404,7 @@ NonnullRefPtr>> Client::append(StringView mailbo auto continue_req = send_command(Command { CommandType::Append, m_current_command, args }); - auto response_promise = Promise>::construct(); + auto response_promise = Promise::construct(); m_pending_promises.append(response_promise); continue_req->on_resolution = [this, message2 { move(message) }](auto&) -> ErrorOr { @@ -420,27 +419,27 @@ NonnullRefPtr>> Client::append(StringView mailbo return cast_promise(response_promise); } -NonnullRefPtr>> Client::subscribe(StringView mailbox) +NonnullRefPtr> Client::subscribe(StringView mailbox) { auto command = Command { CommandType::Subscribe, m_current_command, { serialize_astring(mailbox) } }; return cast_promise(send_command(move(command))); } -NonnullRefPtr>> Client::unsubscribe(StringView mailbox) +NonnullRefPtr> Client::unsubscribe(StringView mailbox) { auto command = Command { CommandType::Unsubscribe, m_current_command, { serialize_astring(mailbox) } }; return cast_promise(send_command(move(command))); } -NonnullRefPtr>> Client::authenticate(StringView method) +NonnullRefPtr> Client::authenticate(StringView method) { auto command = Command { CommandType::Authenticate, m_current_command, { method } }; return send_command(move(command)); } -NonnullRefPtr>> Client::rename(StringView from, StringView to) +NonnullRefPtr> Client::rename(StringView from, StringView to) { auto command = Command { CommandType::Rename, m_current_command, { serialize_astring(from), serialize_astring(to) } }; return cast_promise(send_command(move(command))); } -NonnullRefPtr>> Client::copy(Sequence sequence_set, StringView name, bool uid) +NonnullRefPtr> Client::copy(Sequence sequence_set, StringView name, bool uid) { auto command = Command { uid ? CommandType::UIDCopy : CommandType::Copy, m_current_command, { sequence_set.serialize(), serialize_astring(name) } diff --git a/Userland/Libraries/LibIMAP/Client.h b/Userland/Libraries/LibIMAP/Client.h index d284b4feaac..1fd1ab85dbf 100644 --- a/Userland/Libraries/LibIMAP/Client.h +++ b/Userland/Libraries/LibIMAP/Client.h @@ -30,28 +30,28 @@ public: return m_connect_pending; } - NonnullRefPtr>> send_command(Command&&); - NonnullRefPtr>> send_simple_command(CommandType); + NonnullRefPtr> send_command(Command&&); + NonnullRefPtr> send_simple_command(CommandType); ErrorOr send_raw(StringView data); - NonnullRefPtr>> login(StringView username, StringView password); - NonnullRefPtr>> list(StringView reference_name, StringView mailbox_name); - NonnullRefPtr>> lsub(StringView reference_name, StringView mailbox_name); - NonnullRefPtr>> select(StringView string); - NonnullRefPtr>> examine(StringView string); - NonnullRefPtr>> search(Optional charset, Vector&& search_keys, bool uid); - NonnullRefPtr>> fetch(FetchCommand request, bool uid); - NonnullRefPtr>> store(StoreMethod, Sequence, bool silent, Vector const& flags, bool uid); - NonnullRefPtr>> copy(Sequence sequence_set, StringView name, bool uid); - NonnullRefPtr>> create_mailbox(StringView name); - NonnullRefPtr>> delete_mailbox(StringView name); - NonnullRefPtr>> subscribe(StringView mailbox); - NonnullRefPtr>> unsubscribe(StringView mailbox); - NonnullRefPtr>> rename(StringView from, StringView to); - NonnullRefPtr>> authenticate(StringView method); - NonnullRefPtr>> idle(); - NonnullRefPtr>> finish_idle(); - NonnullRefPtr>> status(StringView mailbox, Vector const& types); - NonnullRefPtr>> append(StringView mailbox, Message&& message, Optional> flags = {}, Optional date_time = {}); + NonnullRefPtr> login(StringView username, StringView password); + NonnullRefPtr> list(StringView reference_name, StringView mailbox_name); + NonnullRefPtr> lsub(StringView reference_name, StringView mailbox_name); + NonnullRefPtr> select(StringView string); + NonnullRefPtr> examine(StringView string); + NonnullRefPtr> search(Optional charset, Vector&& search_keys, bool uid); + NonnullRefPtr> fetch(FetchCommand request, bool uid); + NonnullRefPtr> store(StoreMethod, Sequence, bool silent, Vector const& flags, bool uid); + NonnullRefPtr> copy(Sequence sequence_set, StringView name, bool uid); + NonnullRefPtr> create_mailbox(StringView name); + NonnullRefPtr> delete_mailbox(StringView name); + NonnullRefPtr> subscribe(StringView mailbox); + NonnullRefPtr> unsubscribe(StringView mailbox); + NonnullRefPtr> rename(StringView from, StringView to); + NonnullRefPtr> authenticate(StringView method); + NonnullRefPtr> idle(); + NonnullRefPtr> finish_idle(); + NonnullRefPtr> status(StringView mailbox, Vector const& types); + NonnullRefPtr> append(StringView mailbox, Message&& message, Optional> flags = {}, Optional date_time = {}); bool is_open(); void close(); @@ -77,7 +77,7 @@ private: int m_current_command = 1; // Sent but response not received - Vector>>> m_pending_promises; + Vector>> m_pending_promises; // Not yet sent Vector m_command_queue {}; diff --git a/Userland/Utilities/test-imap.cpp b/Userland/Utilities/test-imap.cpp index 218a2ea6fb7..82b38855f7f 100644 --- a/Userland/Utilities/test-imap.cpp +++ b/Userland/Utilities/test-imap.cpp @@ -46,18 +46,18 @@ ErrorOr serenity_main(Main::Arguments arguments) auto client = TRY(tls ? IMAP::Client::connect_tls(host, port) : IMAP::Client::connect_plaintext(host, port)); TRY(client->connection_promise()->await()); - auto response = TRY(client->login(username, password.view())->await()).release_value(); + auto response = TRY(client->login(username, password.view())->await()); outln("[LOGIN] Login response: {}", response.response_text()); - response = move(TRY(client->send_simple_command(IMAP::CommandType::Capability)->await()).value().get()); + response = move(TRY(client->send_simple_command(IMAP::CommandType::Capability)->await()).get()); outln("[CAPABILITY] First capability: {}", response.data().capabilities().first()); bool idle_supported = !response.data().capabilities().find_if([](auto capability) { return capability.equals_ignoring_ascii_case("IDLE"sv); }).is_end(); - response = TRY(client->list(""sv, "*"sv)->await()).release_value(); + response = TRY(client->list(""sv, "*"sv)->await()); outln("[LIST] First mailbox: {}", response.data().list_items().first().name); auto mailbox = "Inbox"sv; - response = TRY(client->select(mailbox)->await()).release_value(); + response = TRY(client->select(mailbox)->await()); outln("[SELECT] Select response: {}", response.response_text()); auto message = Message { @@ -71,7 +71,7 @@ ErrorOr serenity_main(Main::Arguments arguments) "So, \"Hello\"." }; auto promise = client->append("INBOX"sv, move(message)); - response = TRY(promise->await()).release_value(); + response = TRY(promise->await()); outln("[APPEND] Response: {}", response.response_text()); Vector keys; @@ -79,13 +79,13 @@ ErrorOr serenity_main(Main::Arguments arguments) IMAP::SearchKey::From { "jdoe@machine.example" } }); keys.append(IMAP::SearchKey { IMAP::SearchKey::Subject { "Saying Hello" } }); - response = TRY(client->search({}, move(keys), false)->await()).release_value(); + response = TRY(client->search({}, move(keys), false)->await()); Vector search_results = move(response.data().search_results()); auto added_message = search_results.first(); outln("[SEARCH] Number of results: {}", search_results.size()); - response = TRY(client->status("INBOX"sv, { IMAP::StatusItemType::Recent, IMAP::StatusItemType::Messages })->await()).release_value(); + response = TRY(client->status("INBOX"sv, { IMAP::StatusItemType::Recent, IMAP::StatusItemType::Messages })->await()); outln("[STATUS] Recent items: {}", response.data().status_item().get(IMAP::StatusItemType::Recent)); for (auto item : search_results) { @@ -118,7 +118,7 @@ ErrorOr serenity_main(Main::Arguments arguments) }; // clang-format on - auto fetch_response = TRY(client->fetch(fetch_command, false)->await()).release_value(); + auto fetch_response = TRY(client->fetch(fetch_command, false)->await()); outln("[FETCH] Subject of search result: {}", fetch_response.data() .fetch_data() @@ -136,22 +136,22 @@ ErrorOr serenity_main(Main::Arguments arguments) // FIXME: There is a discrepancy between IMAP::Sequence wanting signed ints // and IMAP search results returning unsigned ones. Find which one is // more correct and fix this. - response = TRY(client->store(IMAP::StoreMethod::Add, { static_cast(added_message), static_cast(added_message) }, false, { "\\Deleted" }, false)->await()).release_value(); + response = TRY(client->store(IMAP::StoreMethod::Add, { static_cast(added_message), static_cast(added_message) }, false, { "\\Deleted" }, false)->await()); outln("[STORE] Store response: {}", response.response_text()); - response = move(TRY(client->send_simple_command(IMAP::CommandType::Expunge)->await()).release_value().get()); + response = move(TRY(client->send_simple_command(IMAP::CommandType::Expunge)->await()).get()); outln("[EXPUNGE] Number of expunged entries: {}", response.data().expunged().size()); if (idle_supported) { - VERIFY(TRY(client->idle()->await()).has_value()); + VERIFY(!client->idle()->await().is_error()); sleep(3); - response = TRY(client->finish_idle()->await()).release_value(); + response = TRY(client->finish_idle()->await()); outln("[IDLE] Idle response: {}", response.response_text()); } else { outln("[IDLE] Skipped. No IDLE support."); } - response = move(TRY(client->send_simple_command(IMAP::CommandType::Logout)->await()).release_value().get()); + response = move(TRY(client->send_simple_command(IMAP::CommandType::Logout)->await()).get()); outln("[LOGOUT] Bye: {}", response.data().bye_message().value()); client->close();