Some more updates to juniper_rocket

This commit is contained in:
Graeme Coupar 2019-08-21 10:22:16 +01:00 committed by Christian Legnitto
parent 8033deba12
commit 65a641c7d6
2 changed files with 58 additions and 3 deletions

View file

@ -11,13 +11,16 @@ documentation = "https://docs.rs/juniper_rocket"
repository = "https://github.com/graphql-rust/juniper"
edition = "2018"
[features]
async = [ "juniper/async", "futures03" ]
[dependencies]
serde = { version = "1.0.2" }
serde_json = { version = "1.0.2" }
serde_derive = { version = "1.0.2" }
juniper = { version = "0.14.0", default-features = false, path = "../juniper"}
futures-preview = { version = "0.3.0-alpha.18", features = ["compat"] }
futures03 = { version = "0.3.0-alpha.18", optional = true, package = "futures-preview", features = ["compat"] }
rocket = { git = "https://github.com/SergioBenitez/Rocket", branch = "async" }
[dev-dependencies.juniper]

View file

@ -37,7 +37,9 @@ Check the LICENSE file for details.
*/
#![doc(html_root_url = "https://docs.rs/juniper_rocket/0.2.0")]
#![feature(decl_macro, proc_macro_hygiene, async_await)]
#![feature(decl_macro, proc_macro_hygiene)]
#![cfg_attr(feature = "async", feature(async_await, async_closure))]
use std::{
error::Error,
@ -61,6 +63,9 @@ use juniper::{
ScalarValue,
};
#[cfg(feature = "async")]
use futures03::future::{FutureExt, TryFutureExt};
#[derive(Debug, serde_derive::Deserialize, PartialEq)]
#[serde(untagged)]
#[serde(bound = "InputValue<S>: Deserialize<'de>")]
@ -109,6 +114,31 @@ where
}
}
#[cfg(feature = "async")]
pub async fn execute_async<'a, CtxT, QueryT, MutationT>(
&'a self,
root_node: &'a RootNode<QueryT, MutationT, S>,
context: &CtxT,
) -> GraphQLBatchResponse<'a, S>
where
QueryT: GraphQLType<S, Context = CtxT>,
MutationT: GraphQLType<S, Context = CtxT>,
{
match self {
&GraphQLBatchRequest::Single(ref request) => {
GraphQLBatchResponse::Single(request.execute_async(root_node, context).await)
}
&GraphQLBatchRequest::Batch(ref requests) => GraphQLBatchResponse::Batch(
let futures = requests
.iter()
.map(|request| request.execute(root_node, context))
.collect::<Vec<_>>(),
let responses = futures03::future::join_all(futures).await;
),
}
}
pub fn operation_names(&self) -> Vec<Option<&str>> {
match self {
GraphQLBatchRequest::Single(req) => vec![req.operation_name()],
@ -184,6 +214,28 @@ where
GraphQLResponse(status, json)
}
/// Asynchronously execute an incoming GraphQL query
#[cfg(feature = "async")]
pub async fn execute_async<CtxT, QueryT, MutationT>(
&self,
root_node: &RootNode<QueryT, MutationT, S>,
context: &CtxT,
) -> GraphQLResponse
where
QueryT: GraphQLType<S, Context = CtxT>,
MutationT: GraphQLType<S, Context = CtxT>,
{
let response = self.0.execute_async(root_node, context).await;
let status = if response.is_ok() {
Status::Ok
} else {
Status::BadRequest
};
let json = serde_json::to_string(&response).unwrap();
GraphQLResponse(status, json)
}
/// Returns the operation names associated with this request.
///
/// For batch requests there will be multiple names.
@ -340,7 +392,7 @@ where
type Error = String;
fn from_data(request: &Request, data: Data) -> FromDataFuture<'static, Self, Self::Error> {
use futures::io::AsyncReadExt;
use futures03::io::AsyncReadExt;
use rocket::AsyncReadExt as _;
if !request.content_type().map_or(false, |ct| ct.is_json()) {
return Box::pin(async move { Forward(data) });