add tokio (0.2) as dependency to further async-ify our FromData code

i'm using this opportunity to also update reqwest (0.10), but it's
turning out to be a little trickier, as it requires more modern async
setup, and that appears to need a lot of thinking…

plume-common/Cargo.toml

@@ -10,18 +10,19 @@ activitystreams-derive = "0.1.1"
 activitystreams-traits = "0.1.0"
 array_tool = "1.0"
 base64 = "0.10"
+futures-util = "*"
 heck = "0.3.0"
 hex = "0.3"
-hyper = "0.12.33"
+hyper = "0.13"
 openssl = "0.10.22"
 rocket = { git = "https://github.com/SergioBenitez/Rocket", rev = "async" }
-reqwest = "0.9"
+reqwest = "0.10"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
 shrinkwraprs = "0.2.1"
 syntect = "3.3"
-tokio = "0.1.22"
+tokio = "0.2"
 regex-syntax = { version = "0.6.17", default-features = false, features = ["unicode-perl"] }
 
 [dependencies.chrono]

plume-common/src/activity_pub/inbox.rs

@@ -280,7 +280,7 @@ pub trait FromId<C>: Sized {
     /// Dereferences an ID
     fn deref(id: &str) -> Result<Self::Object, (Option<serde_json::Value>, Self::Error)> {
         reqwest::ClientBuilder::new()
-            .connect_timeout(Some(std::time::Duration::from_secs(5)))
+            .connect_timeout(std::time::Duration::from_secs(5))
             .build()
             .map_err(|_| (None, InboxError::DerefError.into()))?
             .get(id)

plume-common/src/activity_pub/mod.rs

@@ -1,6 +1,6 @@
 use activitypub::{Activity, Link, Object};
 use array_tool::vec::Uniq;
-use reqwest::r#async::ClientBuilder;
+use reqwest::ClientBuilder;
 use rocket::{
     http::Status,
     request::{FromRequestFuture, FromRequestAsync, Request},
@@ -118,9 +118,10 @@ impl<'a, 'r> FromRequestAsync<'a, 'r> for ApRequest {
         })
     }
 }
-pub fn broadcast<S, A, T, C>(sender: &S, act: A, to: Vec<T>)
+pub fn broadcast<S, A, T, C>(sender: &'static S, act: A, to: Vec<T>)
 where
     S: sign::Signer,
+    S: std::marker::Sync,
     A: Activity,
     T: inbox::AsActor<C>,
 {
@@ -140,7 +141,9 @@ where
         .sign(sender)
         .expect("activity_pub::broadcast: signature error");
 
-    let mut rt = tokio::runtime::current_thread::Runtime::new()
+    let mut rt = tokio::runtime::Builder::new()
+        .threaded_scheduler()
+        .build()
         .expect("Error while initializing tokio runtime for federation");
     let client = ClientBuilder::new()
         .connect_timeout(std::time::Duration::from_secs(5))
@@ -150,7 +153,7 @@ where
         let body = signed.to_string();
         let mut headers = request::headers();
         headers.insert("Digest", request::Digest::digest(&body));
-        rt.spawn(
+        rt.spawn(async move{
             client
                 .post(&inbox)
                 .headers(headers.clone())
@@ -161,15 +164,17 @@ where
                 )
                 .body(body)
                 .send()
-                .and_then(|r| r.into_body().concat2())
+                .await
+                .unwrap()
+                .text()
+                .await
                 .map(move |response| {
                     println!("Successfully sent activity to inbox ({})", inbox);
                     println!("Response: \"{:?}\"\n", response)
                 })
-                .map_err(|e| println!("Error while sending to inbox ({:?})", e)),
-        );
+                .map_err(|e| println!("Error while sending to inbox ({:?})", e))
+        });
     }
-    rt.run().unwrap();
 }
 
 #[derive(Shrinkwrap, Clone, Serialize, Deserialize)]