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.

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

support http on wasm #106

Merged
merged 5 commits into from
Nov 19, 2024
Merged
Changes from 1 commit
Commits
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
Next Next commit
support http for wasm
crwen committed Nov 19, 2024
commit 799c0bf34ec70529023bec181e284951a19905b9
1 change: 1 addition & 0 deletions fusio/Cargo.toml
Original file line number Diff line number Diff line change
@@ -52,6 +52,7 @@ opfs = [
tokio = ["async-stream", "dep:tokio"]
tokio-http = ["dep:reqwest", "http"]
tokio-uring = ["async-stream", "completion-based", "dep:tokio-uring", "no-send"]
wasm-http = ["dep:reqwest", "http"]

[[bench]]
harness = false
6 changes: 6 additions & 0 deletions fusio/src/impls/remotes/aws/credential.rs
Original file line number Diff line number Diff line change
@@ -558,15 +558,19 @@ pub(crate) struct TemporaryToken<T> {
mod tests {
use std::time::Duration;

#[allow(unused)]
use bytes::Bytes;
use chrono::{DateTime, Utc};
#[allow(unused)]
use http::{header::AUTHORIZATION, Method, Request};
#[allow(unused)]
use http_body_util::Empty;
use url::Url;

use crate::remotes::aws::credential::{AwsAuthorizer, AwsCredential};

// Test generated using https://docs.aws.amazon.com/general/latest/gr/sigv4-signed-request-examples.html
#[cfg(feature = "tokio")]
#[tokio::test]
async fn test_sign_with_signed_payload() {
// Test credentials from https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html
@@ -610,6 +614,7 @@ mod tests {
)
}

#[cfg(feature = "tokio")]
#[tokio::test]
async fn test_sign_with_unsigned_payload() {
// Test credentials from https://docs.aws.amazon.com/AmazonS3/latest/userguide/RESTAuthentication.html
@@ -693,6 +698,7 @@ mod tests {
);
}

#[cfg(feature = "tokio")]
#[tokio::test]
async fn test_sign_port() {
let credential = AwsCredential {
2 changes: 1 addition & 1 deletion fusio/src/impls/remotes/http/error.rs
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ pub enum HttpError {
},
#[error(transparent)]
Http(#[from] http::Error),
#[cfg(feature = "tokio-http")]
#[cfg(any(feature = "tokio-http", feature = "wasm-http"))]
#[error(transparent)]
Reqwest(#[from] reqwest::Error),
#[error(transparent)]
2 changes: 2 additions & 0 deletions fusio/src/impls/remotes/http/mod.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
mod error;
#[cfg(all(feature = "tokio-http", not(feature = "completion-based")))]
pub mod tokio;
#[cfg(all(feature = "wasm-http", not(feature = "completion-based")))]
pub mod wasm;

use std::{future::Future, pin::Pin};

119 changes: 119 additions & 0 deletions fusio/src/impls/remotes/http/wasm.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
use std::str::FromStr;

use bytes::Bytes;
use http::{Request, Response};
use http_body::Body;
use http_body_util::BodyExt;

use super::{HttpClient, HttpError};
use crate::{error::BoxedError, MaybeSync};

pub struct WasmClient();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pub struct WasmClient;


impl Default for WasmClient {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#[derive(Default)]

fn default() -> Self {
Self()
}
}

impl WasmClient {
pub fn new() -> Self {
Self()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Default::default()

}
}

impl HttpClient for WasmClient {
type RespBody = http_body_util::Full<Bytes>;

async fn send_request<B>(
&self,
request: Request<B>,
) -> Result<Response<Self::RespBody>, HttpError>
where
B: Body + Send + MaybeSync + 'static,
B::Data: Into<Bytes>,
B::Error: Into<BoxedError>,
{
let uri = request.uri().clone();
let (parts, body) = request.into_parts();

let url = reqwest::Url::from_str(&uri.to_string())?;
let body = http_body_util::combinators::UnsyncBoxBody::new(body);

match body.collect().await {
Ok(body) => {
let client = reqwest::Client::new();

let mut builder = client.request(parts.method, url);
builder = builder.body(reqwest::Body::from(body.to_bytes()));
let response = builder.send().await?;
let bytes = response.bytes().await?;

Ok(Response::new(http_body_util::Full::new(bytes)))
}
Err(err) => Err(HttpError::Other(err.into())),
}
}
}

#[cfg(feature = "wasm-http")]
#[cfg(test)]
mod tests {
wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);

use wasm_bindgen_test::wasm_bindgen_test;

#[wasm_bindgen_test]
async fn test_wasm_client() {
use bytes::Bytes;
use http::{Request, StatusCode};
use http_body_util::Empty;

use super::{HttpClient, WasmClient};

let request = Request::get("https://jsonplaceholder.typicode.com/users")
.body(Empty::<Bytes>::new())
.unwrap();
let client = WasmClient::new();
let response = client.send_request(request).await.unwrap();
assert_eq!(response.status(), StatusCode::OK);
}

#[cfg(all(feature = "wasm-http", feature = "aws"))]
#[wasm_bindgen_test]
async fn list_and_remove_wasm() {
use std::{env, pin::pin};

use futures_util::StreamExt;

use crate::{
fs::Fs,
path::Path,
remotes::aws::{fs::AmazonS3Builder, AwsCredential},
};

if env::var("AWS_ACCESS_KEY_ID").is_err() {
eprintln!("skipping AWS s3 test");
return;
}
let key_id = env::var("AWS_ACCESS_KEY_ID").unwrap();
let secret_key = env::var("AWS_SECRET_ACCESS_KEY").unwrap();

let s3 = AmazonS3Builder::new("fusio-test".into())
.credential(AwsCredential {
key_id,
secret_key,
token: None,
})
.region("ap-southeast-1".into())
.sign_payload(true)
.build();

let path = Path::parse("test").unwrap();
let mut stream = pin!(s3.list(&path).await.unwrap());
while let Some(meta) = stream.next().await {
let meta = meta.unwrap();
s3.remove(&meta.path).await.unwrap();
}
}
}