Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update hyper requirement from 0.14.7 to 1.0.0 #1217

Merged
merged 9 commits into from
Nov 17, 2023
Merged

Update hyper requirement from 0.14.7 to 1.0.0 #1217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f6d025f
Update hyper requirement from 0.14.7 to 1.0.0
dependabot[bot] Nov 16, 2023
d96543c
Merge branch 'master' into dependabot/cargo/hyper-1.0.0
tyranron Nov 16, 2023
9c788e6
Update hyper requirement from 0.14.7 to 1.0.0
dependabot[bot] Nov 16, 2023
c154505
Merge remote-tracking branch 'origin/dependabot/cargo/hyper-1.0.0' in…
tyranron Nov 16, 2023
a75263f
Revert `juniper_axum`
tyranron Nov 16, 2023
6589900
Mention in CHANGELOG
tyranron Nov 16, 2023
83b1137
Update `juniper_hyper` integration
tyranron Nov 16, 2023
9b8ebcd
Fix example
tyranron Nov 17, 2023
097e7df
Fix integration test
tyranron Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions juniper_hyper/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@ All user visible changes to `juniper_hyper` crate will be documented in this fil
### BC Breaks

- Switched to 0.16 version of [`juniper` crate].
- Switched to 1 version of [`hyper` crate]. ([#1217])
- Changed return type of all functions from `Response<Body>` to `Response<String>`. ([#1101], [#1096])

[#1096]: /../../issues/1096
[#1101]: /../../pull/1101
[#1217]: /../../pull/1217



Expand All @@ -27,4 +29,5 @@ See [old CHANGELOG](/../../blob/juniper_hyper-v0.8.0/juniper_hyper/CHANGELOG.md)


[`juniper` crate]: https://docs.rs/juniper
[`hyper` crate]: https://docs.rs/hyper
[Semantic Versioning 2.0.0]: https://semver.org
12 changes: 6 additions & 6 deletions juniper_hyper/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ exclude = ["/examples/", "/release.toml"]

[dependencies]
futures = "0.3.22"
hyper = { version = "0.14.7", features = ["server", "runtime"] }
http-body-util = "0.1"
hyper = { version = "1.0", features = ["server"] }
juniper = { version = "0.16.0-dev", path = "../juniper", default-features = false }
serde_json = "1.0.18"
tokio = "1.0"
url = "2.0"

# Fixes for `minimal-versions` check.
# TODO: Try remove on upgrade of `hyper` crate.
http-body = "0.4.5"

[dev-dependencies]
hyper = { version = "1.0", features = ["http1"] }
hyper-util = { version = "0.1", features = ["tokio"] }
juniper = { version = "0.16.0-dev", path = "../juniper", features = ["expose-test-schema"] }
log = "0.4"
pretty_env_logger = "0.5"
reqwest = { version = "0.11", features = ["blocking", "rustls-tls"], default-features = false }
tokio = { version = "1.0", features = ["macros", "rt-multi-thread"] }
tokio = { version = "1.0", features = ["macros", "net", "rt-multi-thread"] }
81 changes: 45 additions & 36 deletions juniper_hyper/examples/hyper_server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,57 +1,66 @@
use std::{convert::Infallible, sync::Arc};
use std::{convert::Infallible, env, error::Error, net::SocketAddr, sync::Arc};

use hyper::{
server::Server,
service::{make_service_fn, service_fn},
Method, Response, StatusCode,
};
use hyper::{server::conn::http1, service::service_fn, Method, Response, StatusCode};
use hyper_util::rt::TokioIo;
use juniper::{
tests::fixtures::starwars::schema::{Database, Query},
EmptyMutation, EmptySubscription, RootNode,
};
use juniper_hyper::{graphiql, graphql, playground};
use tokio::net::TcpListener;

#[tokio::main]
async fn main() {
async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
env::set_var("RUST_LOG", "info");
pretty_env_logger::init();

let addr = ([127, 0, 0, 1], 3000).into();

let db = Arc::new(Database::new());
let root_node = Arc::new(RootNode::new(
Query,
EmptyMutation::<Database>::new(),
EmptySubscription::<Database>::new(),
));

let new_service = make_service_fn(move |_| {
let root_node = root_node.clone();
let ctx = db.clone();
let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
let listener = TcpListener::bind(addr).await?;
log::info!("Listening on http://{addr}");
loop {
let (stream, _) = listener.accept().await?;
let io = TokioIo::new(stream);

async {
Ok::<_, hyper::Error>(service_fn(move |req| {
let root_node = root_node.clone();
let ctx = ctx.clone();
async {
Ok::<_, Infallible>(match (req.method(), req.uri().path()) {
(&Method::GET, "/") => juniper_hyper::graphiql("/graphql", None).await,
(&Method::GET, "/graphql") | (&Method::POST, "/graphql") => {
juniper_hyper::graphql(root_node, ctx, req).await
}
_ => {
let mut response = Response::new(String::new());
*response.status_mut() = StatusCode::NOT_FOUND;
response
}
})
}
}))
}
});
let root_node = root_node.clone();
let db = db.clone();

let server = Server::bind(&addr).serve(new_service);
println!("Listening on http://{addr}");
tokio::spawn(async move {
let root_node = root_node.clone();
let db = db.clone();

if let Err(e) = server.await {
eprintln!("server error: {e}")
if let Err(e) = http1::Builder::new()
.serve_connection(
io,
service_fn(move |req| {
let root_node = root_node.clone();
let db = db.clone();
async {
Ok::<_, Infallible>(match (req.method(), req.uri().path()) {
(&Method::GET, "/graphql") | (&Method::POST, "/graphql") => {
graphql(root_node, db, req).await
}
(&Method::GET, "/graphiql") => graphiql("/graphql", None).await,
(&Method::GET, "/playground") => playground("/graphql", None).await,
_ => {
let mut resp = Response::new(String::new());
*resp.status_mut() = StatusCode::NOT_FOUND;
resp
}
})
}
}),
)
.await
{
log::error!("Error serving connection: {e}");
}
});
}
}
146 changes: 83 additions & 63 deletions juniper_hyper/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@

use std::{error::Error, fmt, string::FromUtf8Error, sync::Arc};

use http_body_util::BodyExt as _;
use hyper::{
body,
header::{self, HeaderValue},
Body, Method, Request, Response, StatusCode,
Method, Request, Response, StatusCode,
};
use juniper::{
http::{GraphQLBatchRequest, GraphQLRequest as JuniperGraphQLRequest, GraphQLRequest},
Expand All @@ -16,7 +18,7 @@ use url::form_urlencoded;
pub async fn graphql_sync<CtxT, QueryT, MutationT, SubscriptionT, S>(
root_node: Arc<RootNode<'static, QueryT, MutationT, SubscriptionT, S>>,
context: Arc<CtxT>,
req: Request<Body>,
req: Request<body::Incoming>,
) -> Response<String>
where
QueryT: GraphQLType<S, Context = CtxT>,
Expand All @@ -37,7 +39,7 @@ where
pub async fn graphql<CtxT, QueryT, MutationT, SubscriptionT, S>(
root_node: Arc<RootNode<'static, QueryT, MutationT, SubscriptionT, S>>,
context: Arc<CtxT>,
req: Request<Body>,
req: Request<body::Incoming>,
) -> Response<String>
where
QueryT: GraphQLTypeAsync<S, Context = CtxT>,
Expand All @@ -56,7 +58,7 @@ where
}

async fn parse_req<S: ScalarValue>(
req: Request<Body>,
req: Request<body::Incoming>,
) -> Result<GraphQLBatchRequest<S>, Response<String>> {
match *req.method() {
Method::GET => parse_get_req(req),
Expand All @@ -77,7 +79,7 @@ async fn parse_req<S: ScalarValue>(
}

fn parse_get_req<S: ScalarValue>(
req: Request<Body>,
req: Request<body::Incoming>,
) -> Result<GraphQLBatchRequest<S>, GraphQLRequestError> {
req.uri()
.query()
Expand All @@ -90,27 +92,29 @@ fn parse_get_req<S: ScalarValue>(
}

async fn parse_post_json_req<S: ScalarValue>(
body: Body,
body: body::Incoming,
) -> Result<GraphQLBatchRequest<S>, GraphQLRequestError> {
let chunk = hyper::body::to_bytes(body)
let chunk = body
.collect()
.await
.map_err(GraphQLRequestError::BodyHyper)?;

let input = String::from_utf8(chunk.iter().cloned().collect())
let input = String::from_utf8(chunk.to_bytes().iter().cloned().collect())
.map_err(GraphQLRequestError::BodyUtf8)?;

serde_json::from_str::<GraphQLBatchRequest<S>>(&input)
.map_err(GraphQLRequestError::BodyJSONError)
}

async fn parse_post_graphql_req<S: ScalarValue>(
body: Body,
body: body::Incoming,
) -> Result<GraphQLBatchRequest<S>, GraphQLRequestError> {
let chunk = hyper::body::to_bytes(body)
let chunk = body
.collect()
.await
.map_err(GraphQLRequestError::BodyHyper)?;

let query = String::from_utf8(chunk.iter().cloned().collect())
let query = String::from_utf8(chunk.to_bytes().iter().cloned().collect())
.map_err(GraphQLRequestError::BodyUtf8)?;

Ok(GraphQLBatchRequest::Single(GraphQLRequest::new(
Expand Down Expand Up @@ -306,18 +310,19 @@ impl Error for GraphQLRequestError {

#[cfg(test)]
mod tests {
use hyper::{
server::Server,
service::{make_service_fn, service_fn},
Method, Response, StatusCode,
use std::{
convert::Infallible, error::Error, net::SocketAddr, panic, sync::Arc, time::Duration,
};

use hyper::{server::conn::http1, service::service_fn, Method, Response, StatusCode};
use hyper_util::rt::TokioIo;
use juniper::{
http::tests as http_tests,
tests::fixtures::starwars::schema::{Database, Query},
EmptyMutation, EmptySubscription, RootNode,
};
use reqwest::{self, blocking::Response as ReqwestResponse};
use std::{convert::Infallible, net::SocketAddr, sync::Arc, thread, time::Duration};
use reqwest::blocking::Response as ReqwestResponse;
use tokio::{net::TcpListener, task, time::sleep};

struct TestHyperIntegration {
port: u16,
Expand Down Expand Up @@ -373,7 +378,7 @@ mod tests {

async fn run_hyper_integration(is_sync: bool) {
let port = if is_sync { 3002 } else { 3001 };
let addr: SocketAddr = ([127, 0, 0, 1], port).into();
let addr = SocketAddr::from(([127, 0, 0, 1], port));

let db = Arc::new(Database::new());
let root_node = Arc::new(RootNode::new(
Expand All @@ -382,59 +387,74 @@ mod tests {
EmptySubscription::<Database>::new(),
));

let new_service = make_service_fn(move |_| {
let root_node = root_node.clone();
let ctx = db.clone();
let server: task::JoinHandle<Result<(), Box<dyn Error + Send + Sync>>> =
task::spawn(async move {
let listener = TcpListener::bind(addr).await?;

loop {
let (stream, _) = listener.accept().await?;
let io = TokioIo::new(stream);

async move {
Ok::<_, hyper::Error>(service_fn(move |req| {
let root_node = root_node.clone();
let ctx = ctx.clone();
let matches = {
let path = req.uri().path();
match req.method() {
&Method::POST | &Method::GET => {
path == "/graphql" || path == "/graphql/"
}
_ => false,
let db = db.clone();

_ = task::spawn(async move {
let root_node = root_node.clone();
let db = db.clone();

if let Err(e) = http1::Builder::new()
.serve_connection(
io,
service_fn(move |req| {
let root_node = root_node.clone();
let db = db.clone();
let matches = {
let path = req.uri().path();
match req.method() {
&Method::POST | &Method::GET => {
path == "/graphql" || path == "/graphql/"
}
_ => false,
}
};
async move {
Ok::<_, Infallible>(if matches {
if is_sync {
super::graphql_sync(root_node, db, req).await
} else {
super::graphql(root_node, db, req).await
}
} else {
let mut resp = Response::new(String::new());
*resp.status_mut() = StatusCode::NOT_FOUND;
resp
})
}
}),
)
.await
{
eprintln!("server error: {e}");
}
};
async move {
Ok::<_, Infallible>(if matches {
if is_sync {
super::graphql_sync(root_node, ctx, req).await
} else {
super::graphql(root_node, ctx, req).await
}
} else {
let mut resp = Response::new(String::new());
*resp.status_mut() = StatusCode::NOT_FOUND;
resp
})
}
}))
}
});

let (shutdown_fut, shutdown) = futures::future::abortable(async {
tokio::time::sleep(Duration::from_secs(60)).await;
});

let server = Server::bind(&addr)
.serve(new_service)
.with_graceful_shutdown(async {
shutdown_fut.await.unwrap_err();
});
}
});

tokio::task::spawn_blocking(move || {
thread::sleep(Duration::from_millis(10)); // wait 10ms for server to bind
sleep(Duration::from_secs(10)).await; // wait 10ms for `server` to bind

match task::spawn_blocking(move || {
let integration = TestHyperIntegration { port };
http_tests::run_http_test_suite(&integration);
shutdown.abort();
});
})
.await
{
Err(f) if f.is_panic() => panic::resume_unwind(f.into_panic()),
Ok(()) | Err(_) => {}
}

if let Err(e) = server.await {
eprintln!("server error: {e}");
server.abort();
if let Ok(Err(e)) = server.await {
panic!("server failed: {e}");
}
}

Expand Down