Replace custom web HTTP client with reqwest

This is more maintenance burden than we can take, and it is better
separation of concerns.

There was no good third-party wasm web HTTP client when we developed
ours, but now there is.

Note: the web example compiles, but graphql-hub, the public API we used, is now
down.

Author: tomhoule

.gitignore

@@ -5,3 +5,4 @@ Cargo.lock
 .idea
 scripts/*
 !scripts/*.sh
+/.vscode

Cargo.toml

@@ -3,7 +3,6 @@ members = [
     "graphql_client",
     "graphql_client_cli",
     "graphql_client_codegen",
-    "graphql_client_web",
     "graphql-introspection-query",
     "graphql_query_derive",
 

examples/web/Cargo.toml

@@ -4,21 +4,20 @@ version = "0.1.0"
 authors = ["Tom Houlé <tom@tomhoule.com>"]
 edition = "2018"
 
-# https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#profile-overrides
-#[profile.release]
-#lto = "thin"
+[lib]
+crate-type = ["cdylib", "rlib"]
 
-[dev-dependencies]
-graphql_client = { path = "../../graphql_client" }
-graphql_client_web = { path = "../../graphql_client_web" }
+[dependencies]
+graphql_client = { path = "../../graphql_client", features = ["reqwest"] }
 wasm-bindgen = "^0.2"
 serde = { version = "1.0.67", features = ["derive"] }
 lazy_static = "1.0.1"
 js-sys = "0.3.6"
 futures-util = "0.3.8"
 wasm-bindgen-futures = "0.4.18"
+reqwest = "0.11.3"
 
-[dev-dependencies.web-sys]
+[dependencies.web-sys]
 version = "0.3.6"
 features = [
     "console",
@@ -30,7 +29,3 @@ features = [
     "HtmlDocument",
     "HtmlElement",
 ]
-
-[[example]]
-name = "web"
-crate-type = ["cdylib"]

examples/web/examples/web.rs renamed to examples/web/src/lib.rs

@@ -1,4 +1,4 @@
-use graphql_client::GraphQLQuery;
+use graphql_client::{reqwest::post_graphql, GraphQLQuery};
 use lazy_static::*;
 use std::cell::RefCell;
 use std::sync::Mutex;
@@ -9,7 +9,7 @@ use wasm_bindgen_futures::future_to_promise;
 #[derive(GraphQLQuery)]
 #[graphql(
     schema_path = "schema.json",
-    query_path = "examples/puppy_smiles.graphql",
+    query_path = "src/puppy_smiles.graphql",
     response_derives = "Debug"
 )]
 struct PuppySmiles;
@@ -23,20 +23,22 @@ lazy_static! {
 }
 
 async fn load_more() -> Result<JsValue, JsValue> {
-    let client = graphql_client::web::Client::new("https://www.graphqlhub.com/graphql");
+    let url = "https://www.graphqlhub.com/graphql";
     let variables = puppy_smiles::Variables {
         after: LAST_ENTRY
             .lock()
             .ok()
             .and_then(|opt| opt.borrow().to_owned()),
     };
-    let response = client.call(PuppySmiles, variables).await.map_err(|err| {
-        log(&format!(
-            "Could not fetch puppies. graphql_client_web error: {:?}",
-            err
-        ));
-        JsValue::NULL
-    })?;
+
+    let client = reqwest::Client::new();
+
+    let response = post_graphql::<PuppySmiles, _>(&client, url, variables)
+        .await
+        .map_err(|err| {
+            log(&format!("Could not fetch puppies. error: {:?}", err));
+            JsValue::NULL
+        })?;
     render_response(response);
     Ok(JsValue::NULL)
 }
@@ -72,14 +74,14 @@ fn add_load_more_button() {
     on_click.forget();
 }
 
-fn render_response(response: graphql_client_web::Response<puppy_smiles::ResponseData>) {
+fn render_response(response: graphql_client::Response<puppy_smiles::ResponseData>) {
     use std::fmt::Write;
 
     log(&format!("response body\n\n{:?}", response));
 
     let parent = document().body().expect_throw("no body");
 
-    let json: graphql_client_web::Response<puppy_smiles::ResponseData> = response;
+    let json: graphql_client::Response<puppy_smiles::ResponseData> = response;
     let response = document()
         .create_element("div")
         .expect_throw("could not create div");

examples/web/examples/puppy_smiles.graphql renamed to examples/web/src/puppy_smiles.graphql

@@ -10,47 +10,10 @@ categories = ["network-programming", "web-programming", "wasm"]
 edition = "2018"
 
 [dependencies]
-doc-comment = "^0.3"
-anyhow = { version = "1.0", optional = true }
-thiserror = { version = "1.0", optional = true }
+reqwest = { version = "^0.11", features = ["json"], optional = true }
 graphql_query_derive = { path = "../graphql_query_derive", version = "0.9.0", optional = true }
-serde_json = "1.0"
 serde = { version = "^1.0.78", features = ["derive"] }
-
-[dependencies.js-sys]
-version = "^0.3"
-optional = true
-
-[dependencies.log]
-version = "^0.4"
-optional = true
-
-[dependencies.web-sys]
-version = "^0.3"
-optional = true
-features = ["Headers", "Request", "RequestInit", "Response", "Window"]
-
-[dependencies.wasm-bindgen]
-version = "^0.2"
-optional = true
-
-[dependencies.wasm-bindgen-futures]
-version = "^0.4"
-optional = true
-
-[dev-dependencies]
-# Note: If we bumpup wasm-bindge-test version, we should change CI setting.
-wasm-bindgen-test = "^0.3"
-reqwest = { version = "^0.10", features = ["json", "blocking"] }
+serde_json = "1.0"
 
 [features]
 default = ["graphql_query_derive"]
-web = [
-    "anyhow",
-    "thiserror",
-    "js-sys",
-    "log",
-    "wasm-bindgen",
-    "wasm-bindgen-futures",
-    "web-sys",
-]

graphql_client/Cargo.toml

@@ -14,16 +14,13 @@ extern crate graphql_query_derive;
 #[doc(hidden)]
 pub use graphql_query_derive::*;
 
-use serde::*;
-
-#[cfg(feature = "web")]
-pub mod web;
+#[cfg(feature = "reqwest")]
+pub mod reqwest;
 
+use serde::*;
 use std::collections::HashMap;
 use std::fmt::{self, Display};
 
-doc_comment::doctest!("../../README.md");
-
 /// A convenience trait that can be used to build a GraphQL request body.
 ///
 /// This will be implemented for you by codegen in the normal case. It is implemented on the struct you place the derive on.

graphql_client/src/lib.rs

@@ -0,0 +1,15 @@
+//! A concrete client implementation over HTTP with reqwest.
+
+use crate::GraphQLQuery;
+
+/// Use the provided reqwest::Client to post a GraphQL request.
+pub async fn post_graphql<Q: GraphQLQuery, U: reqwest::IntoUrl>(
+    client: &reqwest::Client,
+    url: U,
+    variables: Q::Variables,
+) -> Result<crate::Response<Q::ResponseData>, reqwest::Error> {
+    let body = Q::build_query(variables);
+    let reqwest_response = client.post(url).json(&body).send().await?;
+
+    Ok(reqwest_response.json().await?)
+}