Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
37 changes: 28 additions & 9 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ tonic = "0.14.1"
serde_json = "1.0.149"
serde = "1.0.228"
uuid = { version = "1.23.0", features = ["v4"] }
ureq = "2.12.1"
ureq = "3.0.0"

[workspace.dependencies.taurus-core]
path = "./crates/taurus-core"
Expand Down
76 changes: 61 additions & 15 deletions crates/taurus-core/src/runtime/functions/http.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ use std::io::Read;
use tucana::shared::helper::value::{ToValue, from_json_value, to_json_value};
use tucana::shared::value::Kind;
use tucana::shared::{Struct, Value};
use ureq::http;
use ureq::{Body, RequestExt};

pub(crate) const FUNCTIONS: &[FunctionRegistration] = &[
FunctionRegistration::eager("http::request::create", create_request, 4),
Expand Down Expand Up @@ -158,28 +160,69 @@ fn send_request(
headers.insert("content-type".to_string(), default_content_type.to_string());
}

let mut request = ureq::request(&method, &url);
let http_method = match http::Method::from_bytes(method.as_bytes()) {
Ok(value) => value,
Err(_) => {
return fail(
"InvalidArgumentRuntimeError",
format!("Invalid HTTP method '{}'", method),
);
}
};

let mut request_builder = http::Request::builder().method(http_method).uri(&url);
for (name, value) in &headers {
request = request.set(name, value);
request_builder = request_builder.header(name, value);
}

let response_result = match request_body {
Some(bytes) => request.send_bytes(bytes.as_slice()),
None => request.call(),
Some(bytes) => {
let request = match request_builder.body(bytes) {
Ok(request) => request,
Err(err) => {
return fail(
"InvalidArgumentRuntimeError",
format!("Invalid HTTP request: {}", err),
);
}
};
request
.with_default_agent()
.configure()
.http_status_as_error(false)
.allow_non_standard_methods(true)
.run()
}
None => {
let request = match request_builder.body(()) {
Ok(request) => request,
Err(err) => {
return fail(
"InvalidArgumentRuntimeError",
format!("Invalid HTTP request: {}", err),
);
}
};
request
.with_default_agent()
.configure()
.http_status_as_error(false)
.allow_non_standard_methods(true)
.run()
}
};

let response = match response_result {
Ok(response) => response,
Err(ureq::Error::Status(_, response)) => response,
Err(ureq::Error::Transport(err)) => {
Err(err) => {
return fail(
"HttpRequestRuntimeError",
format!("HTTP transport error while sending request: {}", err),
format!("HTTP request error while sending request: {}", err),
);
}
};

let status_code = response.status() as i64;
let status_code = response.status().as_u16() as i64;
let response_headers = decode_headers(&response);
let response_payload = match decode_response_payload(response) {
Ok(result) => result,
Expand Down Expand Up @@ -364,23 +407,26 @@ fn encode_request_payload(
}
}

fn decode_headers(response: &ureq::Response) -> Struct {
fn decode_headers(response: &http::Response<Body>) -> Struct {
let mut fields = HashMap::new();
for name in response.headers_names() {
if let Some(value) = response.header(&name) {
fields.insert(name, value.to_string().to_value());
for (name, value) in response.headers().iter() {
if let Ok(value) = value.to_str() {
fields.insert(name.as_str().to_string(), value.to_string().to_value());
}
}
Struct { fields }
}

fn decode_response_payload(response: ureq::Response) -> Result<Value, String> {
fn decode_response_payload(response: http::Response<Body>) -> Result<Value, String> {
let content_type = response
.header("content-type")
.headers()
.get(http::header::CONTENT_TYPE)
.and_then(|value| value.to_str().ok())
.map(|value| value.to_ascii_lowercase());

let mut bytes = Vec::new();
let mut reader = response.into_reader();
let (_, body) = response.into_parts();
let mut reader = body.into_reader();
reader
.read_to_end(&mut bytes)
.map_err(|err| format!("Unable to read HTTP response payload: {}", err))?;
Expand Down