-
Notifications
You must be signed in to change notification settings - Fork 121
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* init wasm client Signed-off-by: Yoshua Wuyts <yoshuawuyts@gmail.com> * wasm32 cfg flags Signed-off-by: Yoshua Wuyts <yoshuawuyts@gmail.com> * sort deps alphabetically Signed-off-by: Yoshua Wuyts <yoshuawuyts@gmail.com> * init cross platform by default Signed-off-by: Yoshua Wuyts <yoshuawuyts@gmail.com> * finish compile Signed-off-by: Yoshua Wuyts <yoshuawuyts@gmail.com> * wasm ci Signed-off-by: Yoshua Wuyts <yoshuawuyts@gmail.com> * move over cfg statements Signed-off-by: Yoshua Wuyts <yoshuawuyts@gmail.com> * make fetch Signed-off-by: Yoshua Wuyts <yoshuawuyts@gmail.com> * wasmify logging middleware Signed-off-by: Yoshua Wuyts <yoshuawuyts@gmail.com> * wip Signed-off-by: Yoshua Wuyts <yoshuawuyts@gmail.com> * add wasm kv logging Signed-off-by: Yoshua Wuyts <yoshuawuyts@gmail.com> * wasm compiles Signed-off-by: Yoshua Wuyts <yoshuawuyts@gmail.com> * update safety notice Signed-off-by: Yoshua Wuyts <yoshuawuyts@gmail.com> * requests work! Signed-off-by: Yoshua Wuyts <yoshuawuyts@gmail.com> * wasm req method Signed-off-by: Yoshua Wuyts <yoshuawuyts@gmail.com> * split out fetch code to separate block Signed-off-by: Yoshua Wuyts <yoshuawuyts@gmail.com> * fix all warnings Signed-off-by: Yoshua Wuyts <yoshuawuyts@gmail.com> * finalize header extraction Signed-off-by: Yoshua Wuyts <yoshuawuyts@gmail.com>
- Loading branch information
1 parent
94d2bc6
commit 00e5351
Showing
16 changed files
with
459 additions
and
79 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,3 +5,4 @@ dist/ | |
| npm-debug.log* | ||
| Cargo.lock | ||
| .DS_Store | ||
| wasm-pack.log | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| use surf; | ||
| use wasm_bindgen::prelude::*; | ||
|
|
||
| #[wasm_bindgen(start)] | ||
| pub fn main() { | ||
| println!("Hello wasm"); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| #[cfg(all(feature = "chttp-client", not(target_arch = "wasm32")))] | ||
| pub(crate) use super::chttp::ChttpClient as NativeClient; | ||
|
|
||
| #[cfg(all( | ||
| feature = "wasm-client", | ||
| target_arch = "wasm32" | ||
| ))] | ||
| pub(crate) use super::wasm::WasmClient as NativeClient; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,201 @@ | ||
| use super::{Body, HttpClient, Request, Response}; | ||
|
|
||
| use futures::future::BoxFuture; | ||
| use futures::prelude::*; | ||
|
|
||
| use std::pin::Pin; | ||
| use std::task::{Context, Poll}; | ||
| use std::io; | ||
|
|
||
| /// WebAssembly HTTP Client. | ||
| #[derive(Debug)] | ||
| pub struct WasmClient { | ||
| _priv: (), | ||
| } | ||
|
|
||
| impl WasmClient { | ||
| /// Create a new instance. | ||
| pub fn new() -> Self { | ||
| Self { _priv: () } | ||
| } | ||
| } | ||
|
|
||
| impl Clone for WasmClient { | ||
| fn clone(&self) -> Self { | ||
| Self { _priv: () } | ||
| } | ||
| } | ||
|
|
||
| impl HttpClient for WasmClient { | ||
| type Error = std::io::Error; | ||
|
|
||
| fn send(&self, req: Request) -> BoxFuture<'static, Result<Response, Self::Error>> { | ||
| let fut = Box::pin(async move { | ||
| let url = format!("{}", req.uri()); | ||
| let req = fetch::new(req.method().as_str(), &url); | ||
| let mut res = req.send().await?; | ||
|
|
||
| let body = res.body_bytes(); | ||
| let mut response = Response::new(Body::from(body)); | ||
| *response.status_mut() = http::StatusCode::from_u16(res.status()).unwrap(); | ||
|
|
||
| for (name, value) in res.headers() { | ||
| let name: http::header::HeaderName = name.parse().unwrap(); | ||
| response.headers_mut().insert(name, value.parse().unwrap()); | ||
| } | ||
|
|
||
| Ok(response) | ||
| }); | ||
|
|
||
| Box::pin(InnerFuture { fut }) | ||
| } | ||
| } | ||
|
|
||
| // This type e | ||
| struct InnerFuture { | ||
| fut: Pin<Box<dyn Future<Output = Result<Response, io::Error>> + 'static>>, | ||
| } | ||
|
|
||
| // This is safe because WASM doesn't have threads yet. Once WASM supports threads we should use a | ||
| // thread to park the blocking implementation until it's been completed. | ||
| unsafe impl Send for InnerFuture {} | ||
|
|
||
| impl Future for InnerFuture { | ||
| type Output = Result<Response, io::Error>; | ||
|
|
||
| fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> { | ||
| // This is safe because we're only using this future as a pass-through for the inner | ||
| // future, in order to implement `Send`. If it's safe to poll the inner future, it's safe | ||
| // to proxy it too. | ||
| unsafe { Pin::new_unchecked(&mut self.fut).poll(cx) } | ||
| } | ||
| } | ||
|
|
||
| mod fetch { | ||
| use js_sys::{Array, ArrayBuffer, Uint8Array, Reflect}; | ||
| use wasm_bindgen::JsCast; | ||
| use wasm_bindgen_futures::futures_0_3::JsFuture; | ||
| use web_sys::window; | ||
| use web_sys::RequestInit; | ||
|
|
||
| use std::iter::{Iterator, IntoIterator}; | ||
| use std::io; | ||
|
|
||
| /// Create a new fetch request. | ||
| pub(crate) fn new(method: impl AsRef<str>, url: impl AsRef<str>) -> Request { | ||
| Request::new(method, url) | ||
| } | ||
|
|
||
| /// An HTTP Fetch Request. | ||
| pub(crate) struct Request { | ||
| init: RequestInit, | ||
| url: String, | ||
| } | ||
|
|
||
| impl Request { | ||
| /// Create a new instance. | ||
| pub(crate) fn new(method: impl AsRef<str>, url: impl AsRef<str>) -> Self { | ||
| let mut init = web_sys::RequestInit::new(); | ||
| init.method(method.as_ref()); | ||
| Self { | ||
| init, | ||
| url: url.as_ref().to_owned(), | ||
| } | ||
| } | ||
|
|
||
| /// Submit a request | ||
| // TODO(yoshuawuyts): turn this into a `Future` impl on `Request` instead. | ||
| pub(crate) async fn send(self) -> Result<Response, io::Error> { | ||
| // Send the request. | ||
| let window = window().expect("A global window object could not be found"); | ||
| let request = web_sys::Request::new_with_str_and_init(&self.url, &self.init).unwrap(); | ||
| let promise = window.fetch_with_request(&request); | ||
| let resp = JsFuture::from(promise).await.unwrap(); | ||
| debug_assert!(resp.is_instance_of::<web_sys::Response>()); | ||
| let res: web_sys::Response = resp.dyn_into().unwrap(); | ||
|
|
||
| // Get the request body. | ||
| let promise = res.array_buffer().unwrap(); | ||
| let resp = JsFuture::from(promise).await.unwrap(); | ||
| debug_assert!(resp.is_instance_of::<js_sys::ArrayBuffer>()); | ||
| let buf: ArrayBuffer = resp.dyn_into().unwrap(); | ||
| let slice = Uint8Array::new(&buf); | ||
| let mut body: Vec<u8> = vec![0; slice.length() as usize]; | ||
| slice.copy_to(&mut body); | ||
|
|
||
| Ok(Response::new(res, body)) | ||
| } | ||
| } | ||
|
|
||
| /// An HTTP Fetch Response. | ||
| pub(crate) struct Response { | ||
| res: web_sys::Response, | ||
| body: Option<Vec<u8>>, | ||
| } | ||
|
|
||
| impl Response { | ||
| fn new(res: web_sys::Response, body: Vec<u8>) -> Self { | ||
| Self { | ||
| res, | ||
| body: Some(body), | ||
| } | ||
| } | ||
|
|
||
| /// Access the HTTP headers. | ||
| pub(crate) fn headers(&self) -> Headers { | ||
| Headers { | ||
| headers: self.res.headers() | ||
| } | ||
| } | ||
|
|
||
| /// Get the request body as a byte vector. | ||
| /// | ||
| /// Returns an empty vector if the body has already been consumed. | ||
| pub(crate) fn body_bytes(&mut self) -> Vec<u8> { | ||
| self.body.take().unwrap_or_else(|| vec![]) | ||
| } | ||
|
|
||
| /// Get the HTTP return status code. | ||
| pub(crate) fn status(&self) -> u16 { | ||
| self.res.status() | ||
| } | ||
| } | ||
|
|
||
| /// HTTP Headers. | ||
| pub(crate) struct Headers { | ||
| headers: web_sys::Headers, | ||
| } | ||
|
|
||
| impl IntoIterator for Headers { | ||
| type Item = (String, String); | ||
| type IntoIter = HeadersIter; | ||
|
|
||
| fn into_iter(self) -> Self::IntoIter { | ||
| HeadersIter { | ||
| iter: js_sys::try_iter(&self.headers).unwrap().unwrap(), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /// HTTP Headers Iterator. | ||
| pub(crate) struct HeadersIter { | ||
| iter: js_sys::IntoIter, | ||
| } | ||
|
|
||
| impl Iterator for HeadersIter { | ||
| type Item = (String, String); | ||
|
|
||
| fn next(&mut self) -> Option<Self::Item> { | ||
| let pair = self.iter.next()?; | ||
|
|
||
| let array: Array = pair.unwrap().into(); | ||
| let vals = array.values(); | ||
|
|
||
| let prop = String::from("value").into(); | ||
| let key = Reflect::get(&vals.next().unwrap(), &prop).unwrap(); | ||
| let value = Reflect::get(&vals.next().unwrap(), &prop).unwrap(); | ||
|
|
||
| Some((key.as_string().to_owned().unwrap(), value.as_string().to_owned().unwrap())) | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.