v0.2.1

CHANGELOG.md

@@ -1,3 +1,8 @@
+jmap-client 0.2.1
+================================
+- Using maybe_async to reduce duplicate code.
+- Added `accept_invalid_certs` option to builder.
+
 jmap-client 0.2.0
 ================================
 - JMAP for Sieve Scripts support.

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "jmap-client"
 description = "JMAP client library for Rust"
-version = "0.2.0"
+version = "0.2.1"
 edition = "2018"
 authors = [ "Stalwart Labs Ltd. <hello@stalw.art>"]
 license = "Apache-2.0 OR MIT"
@@ -12,8 +12,8 @@ categories = ["email"]
 readme = "README.md"
 
 [dependencies]
-reqwest = { git = "https://github.com/stalwartlabs/reqwest.git", version = "0.11", default-features = false, features = ["rustls-tls"]}
-tokio-tungstenite = { version = "0.17", features = ["rustls-tls-webpki-roots"], optional = true}
+reqwest = { version = "0.11", default-features = false, features = ["rustls-tls"]}
+tokio-tungstenite = { version = "0.18", features = ["rustls-tls-webpki-roots"], optional = true}
 tokio = { version = "1.16", default-features = false, features = ["io-util"], optional = true }
 futures-util = { version = "0.3", optional = true}
 async-stream = { version = "0.3", optional = true}
@@ -23,13 +23,13 @@ chrono = { version = "0.4", features = ["serde"]}
 ahash = {version = "0.8", features = ["serde"]}
 parking_lot = "0.12"
 base64 = "0.13"
+maybe-async = "0.2"
 
 [features]
 default = ["async"]
 async = ["futures-util", "async-stream", "reqwest/stream"]
 websockets = ["tokio", "tokio-tungstenite"]
-blocking = ["reqwest/blocking"]
-follow-trusted = []
+blocking = ["reqwest/blocking", "maybe-async/is_sync"]
 debug = []
 
 [lib]

examples/eventsource.rs

@@ -13,9 +13,12 @@
  * except according to those terms.
  */
 
+#[cfg(feature = "async")]
 use futures_util::StreamExt;
+#[cfg(feature = "async")]
 use jmap_client::{client::Client, TypeState};
 
+#[cfg(feature = "async")]
 async fn event_source() {
     // Connect to the JMAP server using Basic authentication
     let client = Client::new()
@@ -58,5 +61,6 @@ async fn event_source() {
 }
 
 fn main() {
+    #[cfg(feature = "async")]
     let _c = event_source();
 }

examples/mailboxes.rs

@@ -13,11 +13,13 @@
  * except according to those terms.
  */
 
+#[cfg(feature = "async")]
 use jmap_client::{
     client::Client,
     mailbox::{query::Filter, Role},
 };
 
+#[cfg(feature = "async")]
 async fn mailboxes() {
     // Connect to the JMAP server using Basic authentication
     let client = Client::new()
@@ -65,5 +67,6 @@ async fn mailboxes() {
 }
 
 fn main() {
+    #[cfg(feature = "async")]
     let _c = mailboxes();
 }

examples/messages.rs

@@ -13,20 +13,23 @@
  * except according to those terms.
  */
 
+#[cfg(feature = "async")]
 use jmap_client::{
     client::Client,
     core::query::Filter,
     email::{self, Property},
     mailbox::{self, Role},
 };
 
+#[cfg(feature = "async")]
 const TEST_MESSAGE: &[u8; 90] = br#"From: john@example.org
 To: jane@example.org
 Subject: Testing JMAP client
 
 This is a test.
 "#;
 
+#[cfg(feature = "async")]
 async fn messages() {
     // Connect to the JMAP server using Basic authentication
     let client = Client::new()
@@ -116,5 +119,6 @@ async fn messages() {
 }
 
 fn main() {
+    #[cfg(feature = "async")]
     let _c = messages();
 }

examples/result_reference.rs

@@ -13,8 +13,10 @@
  * except according to those terms.
  */
 
+#[cfg(feature = "async")]
 use jmap_client::{client::Client, core::query, email, mailbox};
 
+#[cfg(feature = "async")]
 async fn result_reference() {
     // Connect to the JMAP server using Basic authentication
     let client = Client::new()
@@ -97,5 +99,6 @@ async fn result_reference() {
 }
 
 fn main() {
+    #[cfg(feature = "async")]
     let _c = result_reference();
 }

src/blob/helpers.rs

@@ -18,6 +18,7 @@ use crate::{
 use super::copy::{CopyBlobRequest, CopyBlobResponse};
 
 impl Client {
+    #[maybe_async::maybe_async]
     pub async fn blob_copy(
         &self,
         from_account_id: impl Into<String>,
@@ -34,6 +35,7 @@ impl Client {
 }
 
 impl Request<'_> {
+    #[maybe_async::maybe_async]
     pub fn copy_blob(&mut self, from_account_id: impl Into<String>) -> &mut CopyBlobRequest {
         self.add_method_call(
             Method::CopyBlob,
@@ -42,6 +44,7 @@ impl Request<'_> {
         .blob_copy_mut()
     }
 
+    #[maybe_async::maybe_async]
     pub async fn send_copy_blob(self) -> crate::Result<CopyBlobResponse> {
         self.send_single().await
     }

src/blob/mod.rs

@@ -13,10 +13,7 @@ use crate::core::session::URLParser;
 
 pub mod copy;
 pub mod download;
-#[cfg(feature = "async")]
 pub mod helpers;
-#[cfg(feature = "blocking")]
-pub mod helpers_blocking;
 pub mod upload;
 
 pub enum URLParameter {