Move to rocket's async branch

Cargo.toml

@@ -7,7 +7,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-rocket = { git = "https://github.com/SergioBenitez/Rocket.git", features = ["tls"] }
+rocket = { git = "https://github.com/SergioBenitez/Rocket.git", branch = "async", features = ["tls"] }
 http = "0.2.1"
 ruma-client-api = "0.7.1"
 pretty_env_logger = "0.4.0"
@@ -21,4 +21,5 @@ js_int = "0.1.4"
 serde_json = "1.0.50"
 ruma-signatures = { git = "https://github.com/ruma/ruma-signatures.git" }
 ruma-federation-api = "0.0.1"
-serde = "1.0.105"
+serde = "1.0.106"
+tokio = "0.2.16"

src/main.rs

@@ -270,8 +270,8 @@ fn sync_route(
                     notification_count: None,
                 },
                 timeline: sync_events::Timeline {
-                    limited: None,
+                    limited: Some(false),
-                    prev_batch: None,
+                    prev_batch: Some("".to_owned()),
                     events: room_events,
                 },
                 state: sync_events::State { events: Vec::new() },
@@ -328,5 +328,6 @@ fn main() {
             ],
         )
         .manage(data)
-        .launch();
+        .launch()
+        .unwrap();
 }

src/ruma_wrapper.rs

@@ -1,7 +1,7 @@
 use rocket::{
-    data::{FromDataSimple, Outcome},
+    data::{Data, FromData, FromDataFuture, Transform, Transformed, TransformFuture},
     http::Status,
-    response::Responder,
+    response::{self, Responder},
     Outcome::*,
     Request, State,
 };
@@ -13,9 +13,10 @@ use ruma_client_api::error::Error;
 use ruma_identifiers::UserId;
 use std::{
     convert::{TryFrom, TryInto},
-    io::{Cursor, Read},
+    io::Cursor,
     ops::Deref,
 };
+use tokio::io::AsyncReadExt;
 
 const MESSAGE_LIMIT: u64 = 65535;
 
@@ -27,7 +28,7 @@ pub struct Ruma<T: Outgoing> {
     pub json_body: serde_json::Value,
 }
 
-impl<T: Endpoint> FromDataSimple for Ruma<T>
+impl<'a, T: Endpoint> FromData<'a> for Ruma<T>
 where
     // We need to duplicate Endpoint's where clauses because the compiler is not smart enough yet.
     // See https://github.com/rust-lang/rust/issues/54149
@@ -38,10 +39,22 @@ where
     >,
 {
     type Error = (); // TODO: Better error handling
+    type Owned = Data;
+    type Borrowed = Self::Owned;
+
+    fn transform<'r>(_req: &'r Request, data: Data) -> TransformFuture<'r, Self::Owned, Self::Error> {
+        Box::pin(async move { Transform::Owned(Success(data)) })
+    }
+
+    fn from_data(
+        request: &'a Request,
+        outcome: Transformed<'a, Self>,
+    ) -> FromDataFuture<'a, Self, Self::Error> {
+        Box::pin(async move {
+            let data = rocket::try_outcome!(outcome.owned());
 
-    fn from_data(request: &Request, data: rocket::Data) -> Outcome<Self, Self::Error> {
             let user_id = if T::METADATA.requires_authentication {
-            let data = request.guard::<State<crate::Data>>().unwrap();
+                let data = request.guard::<State<crate::Data>>().await.unwrap();
 
                 // Get token from header or query value
                 let token = match request
@@ -74,7 +87,7 @@ where
 
             let mut handle = data.open().take(MESSAGE_LIMIT);
             let mut body = Vec::new();
-        handle.read_to_end(&mut body).unwrap();
+            handle.read_to_end(&mut body).await.unwrap();
 
             let http_request = http_request.body(body.clone()).unwrap();
             log::info!("{:?}", http_request);
@@ -95,6 +108,7 @@ where
                     Failure((Status::InternalServerError, ()))
                 }
             }
+        })
     }
 }
 
@@ -108,7 +122,9 @@ impl<T: Outgoing> Deref for Ruma<T> {
 
 /// This struct converts ruma responses into rocket http responses.
 pub struct MatrixResult<T>(pub std::result::Result<T, Error>);
-impl<T: TryInto<http::Response<Vec<u8>>>> TryInto<http::Response<Vec<u8>>> for MatrixResult<T> {
+
+impl<T: TryInto<http::Response<Vec<u8>>>> TryInto<http::Response<Vec<u8>>> for MatrixResult<T>
+{
     type Error = T::Error;
 
     fn try_into(self) -> Result<http::Response<Vec<u8>>, T::Error> {
@@ -119,13 +135,14 @@ impl<T: TryInto<http::Response<Vec<u8>>>> TryInto<http::Response<Vec<u8>>> for M
     }
 }
 
-impl<'r, T: TryInto<http::Response<Vec<u8>>>> Responder<'r> for MatrixResult<T> {
+#[rocket::async_trait]
-    fn respond_to(self, _: &Request) -> rocket::response::Result<'r> {
+impl<'r, T: Send + TryInto<http::Response<Vec<u8>>>> Responder<'r> for MatrixResult<T> where T::Error: Send{
+    async fn respond_to(self, _: &'r Request<'_>) -> response::Result<'r> {
         let http_response: Result<http::Response<_>, _> = self.try_into();
         match http_response {
             Ok(http_response) => {
                 let mut response = rocket::response::Response::build();
-                response.sized_body(Cursor::new(http_response.body().clone()));
+                response.sized_body(Cursor::new(http_response.body().clone())).await;
 
                 for header in http_response.headers() {
                     response