check core for wasm (Azure#228)

Author: ctaggart

.github/workflows/build.yml

@@ -1,6 +1,6 @@
 name: Build and Test
 
-on: 
+on:
   pull_request:
   push:
 
@@ -11,8 +11,8 @@ env:
 jobs:
   test:
     runs-on: ubuntu-latest
-    strategy: 
-      matrix: 
+    strategy:
+      matrix:
         rust: [stable]
     steps:
     - uses: actions/checkout@v2
@@ -22,6 +22,7 @@ jobs:
         profile: minimal
         override: true
         components: rustfmt
+        target: wasm32-unknown-unknown
 
     - name: fmt
       run: |
@@ -30,11 +31,17 @@ jobs:
         cargo fmt --manifest-path services/Cargo.toml --all -- --check
       if: matrix.rust == 'stable'
 
-    - name: sdk tests 
+    - name: check core for wasm
+      run: cargo check -p azure_core --target=wasm32-unknown-unknown
+
+    - name: check core for hyper
+      run: cargo check -p azure_core --no-default-features --features enable_hyper
+
+    - name: sdk tests
       run: cargo test --all
 
     - name: services tests
-      run: cargo build --manifest-path services/Cargo.toml --all 
+      run: cargo build --manifest-path services/Cargo.toml --all
 
     - name: e2e tests build
       run: |

sdk/core/Cargo.toml

@@ -18,21 +18,21 @@ base64 = "0.13"
 chrono = "0.4"
 http = "0.2"
 futures = "0.3"
-hyper = "0.14"
+hyper = { version = "0.14", optional = true }
 log = "0.4"
 quick-error = "1.2"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
 serde-xml-rs = "0.4"
 url = "2.2"
-uuid = { version = "0.8", features = ["v4"] }
+uuid = { version = "0.8" }
 bytes = "1.0"
-hyper-rustls = "0.22"
+hyper-rustls = { version = "0.22", optional = true }
 failure = "0.1"
 async-trait = "0.1"
-oauth2 = "=4.0.0-alpha.3"
-reqwest = "0.11"
+oauth2 = "=4.0.0-beta.1"
+reqwest = { version = "0.11", optional = true }
 paste = "1.0"
 md5 = "0.7"
 
@@ -41,5 +41,8 @@ tokio = "1.0"
 env_logger = "0.8"
 
 [features]
+default = ["enable_reqwest"]
+enable_reqwest = ["reqwest"]
+enable_hyper = ["hyper", "hyper-rustls"]
 test_e2e = []
 azurite_workaround = []

sdk/core/src/errors.rs

@@ -1,5 +1,7 @@
 use http::header::ToStrError;
-use hyper::{self, body, Body, StatusCode};
+use http::StatusCode;
+#[cfg(feature = "enable_hyper")]
+use hyper::{self, body, Body};
 use std::io::Error as IOError;
 use std::num;
 use std::num::ParseIntError;
@@ -191,10 +193,10 @@ quick_error! {
             display("json error: {}", err)
             cause(err)
         }
-        HyperError(err: hyper::Error) {
+        HyperError(err: Box<dyn std::error::Error + Sync + Send>) {
             from()
             display("Hyper error: {}", err)
-            cause(err)
+            cause(&**err)
         }
         PermissionError(err: PermissionError) {
             from()
@@ -281,7 +283,7 @@ quick_error! {
             display("uuid error: {}", err)
             cause(err)
         }
-       ChronoParserError(err: chrono::ParseError) {
+        ChronoParserError(err: chrono::ParseError) {
             from()
             display("Chrono parser error: {}", err)
             cause(err)
@@ -373,6 +375,14 @@ impl From<failure::Error> for AzureError {
     }
 }
 
+#[cfg(feature = "enable_hyper")]
+impl From<hyper::Error> for AzureError {
+    fn from(error: hyper::Error) -> AzureError {
+        AzureError::HyperError(error.into())
+    }
+}
+
+#[cfg(feature = "enable_hyper")]
 #[inline]
 pub async fn extract_status_headers_and_body(
     resp: hyper::client::ResponseFuture,
@@ -386,6 +396,7 @@ pub async fn extract_status_headers_and_body(
     Ok((status, headers, body))
 }
 
+#[cfg(feature = "enable_hyper")]
 #[inline]
 pub async fn extract_status_and_body(
     resp: hyper::client::ResponseFuture,
@@ -396,6 +407,7 @@ pub async fn extract_status_and_body(
     Ok((status, str::from_utf8(&body)?.to_owned()))
 }
 
+#[cfg(feature = "enable_hyper")]
 #[inline]
 pub async fn extract_location_status_and_body(
     resp: hyper::client::ResponseFuture,
@@ -410,6 +422,7 @@ pub async fn extract_location_status_and_body(
     Ok((status, location, str::from_utf8(&body)?.to_owned()))
 }
 
+#[cfg(feature = "enable_hyper")]
 #[inline]
 pub async fn check_status_extract_body(
     resp: hyper::client::ResponseFuture,
@@ -427,6 +440,7 @@ pub async fn check_status_extract_body(
     }
 }
 
+#[cfg(feature = "enable_hyper")]
 pub async fn check_status_extract_body_2(
     resp: hyper::Response<Body>,
     expected_status: StatusCode,

sdk/core/src/headers/mod.rs

@@ -2,7 +2,7 @@ mod utilities;
 
 use http::request::Builder;
 
-pub use hyper::header::{IF_MODIFIED_SINCE, USER_AGENT};
+pub use http::header::{IF_MODIFIED_SINCE, USER_AGENT};
 pub use utilities::*;
 
 pub const MS_DATE: &str = "x-ms-date";

sdk/core/src/headers/utilities.rs

@@ -1,12 +1,14 @@
 use super::*;
-use crate::errors::{check_status_extract_body_2, AzureError};
+use crate::errors::*;
 use crate::request_options::LeaseId;
 use crate::util::HeaderMapExt;
 use crate::{Consistency, RequestId, SessionToken};
 use chrono::{DateTime, Utc};
+use http::header::{HeaderName, DATE, ETAG, LAST_MODIFIED};
+#[cfg(feature = "enable_hyper")]
 use http::status::StatusCode;
 use http::HeaderMap;
-use hyper::header::{HeaderName, DATE, ETAG, LAST_MODIFIED};
+#[cfg(feature = "enable_hyper")]
 use hyper::{Body, Client, Request};
 use std::str::FromStr;
 use uuid::Uuid;
@@ -317,6 +319,7 @@ pub fn content_type_from_headers(headers: &HeaderMap) -> Result<&str, AzureError
         .to_str()?)
 }
 
+#[cfg(feature = "enable_hyper")]
 pub async fn perform_http_request(
     client: &Client<hyper_rustls::HttpsConnector<hyper::client::HttpConnector>>,
     req: Request<Body>,

sdk/core/src/http_client.rs

@@ -1,11 +1,13 @@
-use crate::errors::{AzureError, UnexpectedHTTPResult};
+use crate::errors::*;
 use async_trait::async_trait;
 use bytes::Bytes;
 use http::{Request, Response, StatusCode};
+#[cfg(feature = "enable_hyper")]
 use hyper_rustls::HttpsConnector;
 use serde::Serialize;
 
-#[async_trait]
+#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
+#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
 pub trait HttpClient: Send + Sync + std::fmt::Debug {
     async fn execute_request(
         &self,
@@ -60,7 +62,9 @@ pub trait HttpClient: Send + Sync + std::fmt::Debug {
     }
 }
 
-#[async_trait]
+#[cfg(feature = "enable_hyper")]
+#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
+#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
 impl HttpClient for hyper::Client<HttpsConnector<hyper::client::HttpConnector>> {
     async fn execute_request(
         &self,
@@ -92,7 +96,9 @@ impl HttpClient for hyper::Client<HttpsConnector<hyper::client::HttpConnector>>
     }
 }
 
-#[async_trait]
+#[cfg(feature = "enable_reqwest")]
+#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
+#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
 impl HttpClient for reqwest::Client {
     async fn execute_request(
         &self,
@@ -108,9 +114,11 @@ impl HttpClient for reqwest::Client {
 
         let reqwest_response = self.execute(reqwest_request).await?;
 
-        let mut response = Response::builder()
-            .status(reqwest_response.status())
-            .version(reqwest_response.version());
+        let mut response = Response::builder().status(reqwest_response.status());
+
+        if let Some(version) = get_version(&reqwest_response) {
+            response = response.version(version);
+        }
 
         for (key, value) in reqwest_response.headers() {
             response = response.header(key, value);
@@ -122,6 +130,19 @@ impl HttpClient for reqwest::Client {
     }
 }
 
+// wasm can not get the http version
+#[cfg(feature = "enable_reqwest")]
+#[cfg(target_arch = "wasm32")]
+fn get_version(_response: &reqwest::Response) -> Option<http::Version> {
+    None
+}
+
+#[cfg(feature = "enable_reqwest")]
+#[cfg(not(target_arch = "wasm32"))]
+fn get_version(response: &reqwest::Response) -> Option<http::Version> {
+    Some(response.version())
+}
+
 /// Serialize to json
 pub fn to_json<T>(value: &T) -> Result<Bytes, Box<dyn std::error::Error + Sync + Send>>
 where

sdk/core/src/util.rs

@@ -1,6 +1,6 @@
 use bytes::Bytes;
+use http::header::{AsHeaderName, HeaderMap, HeaderName, HeaderValue};
 use http::{self, request::Builder};
-use hyper::header::{AsHeaderName, HeaderMap, HeaderName, HeaderValue};
 use std::{
     convert::TryFrom,
     fmt::Display,

sdk/cosmos/examples/get_database.rs

@@ -1,6 +1,5 @@
 use azure_core::HttpClient;
 use azure_cosmos::prelude::*;
-use hyper_rustls::HttpsConnector;
 use std::error::Error;
 use std::sync::Arc;
 
@@ -18,27 +17,13 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
 
     let authorization_token = AuthorizationToken::primary_from_base64(&master_key)?;
 
-    // use reqwest
     let http_client: Arc<Box<dyn HttpClient>> = Arc::new(Box::new(reqwest::Client::new()));
     let client = CosmosClient::new(http_client, account.clone(), authorization_token);
 
     let database_client = client.into_database_client(database_name.clone());
 
     let response = database_client.get_database().execute().await?;
-    println!("from reqwest == {:?}", response);
-
-    // use hyper
-    let authorization_token = AuthorizationToken::primary_from_base64(&master_key)?;
-
-    let http_client: Box<dyn HttpClient> =
-        Box::new(hyper::Client::builder().build(HttpsConnector::with_native_roots()));
-    let http_client = Arc::new(http_client);
-
-    let client = CosmosClient::new(http_client, account, authorization_token);
-    let database_client = client.into_database_client(database_name);
-
-    let response = database_client.get_database().execute().await?;
-    println!("from hyper == {:?}", response);
+    println!("response == {:?}", response);
 
     Ok(())
 }

sdk/event_grid/Cargo.toml

@@ -13,7 +13,7 @@ categories = ["api-bindings"]
 edition = "2018"
 
 [dependencies]
-azure_core = { path = "../core", version = "0.1.0" }
+azure_core = { path = "../core", version = "0.1.0", features = ["enable_hyper"] }
 chrono = { version = "0.4", features = ["serde"] }
 http = "0.2"
 hyper = "0.14"

sdk/event_grid/src/event_grid_response.rs

@@ -1,4 +1,4 @@
-use azure_core::errors::{AzureError, UnexpectedHTTPResult};
+use azure_core::errors::*;
 use hyper::{
     body::{self, Bytes},
     client::ResponseFuture,