Skip to content

reworked http functions #206

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.

Sign up for GitHub

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

Merged
raphael-goetz merged 4 commits into from
May 31, 2026
+29 −209
Merged

reworked http functions #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c32f09d
feat: new reworked http functions
raphael-goetz May 31, 2026
c880732
feat: adjusted tests to new agrument signature of http functions
raphael-goetz May 31, 2026
f036da1
fix: correct arg count
raphael-goetz May 31, 2026
34f4e0a
fix: removed dropped functions from tests
raphael-goetz May 31, 2026
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
14 changes: 4 additions & 10 deletions crates/taurus-core/src/runtime/engine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,24 +754,18 @@ mod tests {
events.borrow_mut().push(emit_type);
};

let create_response_node = node(
let respond_node = node(
1,
"http::response::create",
"rest::control::respond",
vec![
literal_param(100, "http_status_code", int_value(200)),
literal_param(101, "headers", empty_struct_value()),
literal_param(102, "payload", string_value("hello")),
],
Some(2),
);
let respond_node = node(
2,
"rest::control::respond",
vec![node_result_ref_param(200, "response", 1)],
Some(3),
);
let finish_node = node(
3,
2,
"std::number::add",
vec![
literal_param(300, "lhs", int_value(1)),
Expand All @@ -782,7 +776,7 @@ mod tests {

let (_signal, reason) = engine.execute_graph(
1,
vec![create_response_node, respond_node, finish_node],
vec![respond_node, finish_node],
None,
None,
Some(&emitter),
Expand Down
203 changes: 23 additions & 180 deletions crates/taurus-core/src/runtime/functions/http.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@ use ureq::http;
use ureq::{Body, RequestExt};

pub(crate) const FUNCTIONS: &[FunctionRegistration] = &[
FunctionRegistration::eager("http::request::create", create_request, 4),
FunctionRegistration::eager("http::request::send", send_request, 1),
FunctionRegistration::eager("http::response::create", create_response, 3),
FunctionRegistration::eager("rest::control::respond", respond, 1),
FunctionRegistration::eager("http::request::send", send_request, 4),
FunctionRegistration::eager("rest::control::respond", respond, 3),
];

fn fail(category: &str, message: impl Into<String>) -> Signal {
Expand All @@ -34,81 +32,20 @@ fn respond(
_ctx: &mut ValueStore,
_run: &mut crate::handler::registry::ThunkRunner<'_>,
) -> Signal {
args!(args => struct_val: Struct);

let fields = &struct_val.fields;

let Some(headers_val) = fields.get("headers") else {
return Signal::Failure(RuntimeError::new(
"T-STD-00001",
"InvalidArgumentRuntimeError",
"Missing 'headers' field".to_string(),
));
};

let Some(status_code_val) = fields.get("http_status_code") else {
return fail(
"InvalidArgumentRuntimeError",
"Missing 'http_status_code' field",
);
};

let Some(payload_val) = fields.get("payload") else {
return Signal::Failure(RuntimeError::new(
"T-STD-00001",
"InvalidArgumentRuntimeError",
"Missing 'payload' field".to_string(),
));
};

let Some(Kind::StructValue(_headers_struct)) = &headers_val.kind else {
return fail(
"InvalidArgumentRuntimeError",
"Expected 'headers' to be StructValue",
);
};

let Some(Kind::NumberValue(_status_code_str)) = &status_code_val.kind else {
return Signal::Failure(RuntimeError::new(
"T-STD-00001",
"InvalidArgumentRuntimeError",
"Expected 'status_code' to be NumberValue".to_string(),
));
};

let Some(_payload_kind) = &payload_val.kind else {
return Signal::Failure(RuntimeError::new(
"T-STD-00001",
"InvalidArgumentRuntimeError",
"Expected 'payload' to have a value".to_string(),
));
};

// `Respond` is a control signal; the executor can still continue with `next` if present.
Signal::Respond(Value {
kind: Some(Kind::StructValue(struct_val.clone())),
})
}

fn create_request(
args: &[Argument],
_ctx: &mut ValueStore,
_run: &mut crate::handler::registry::ThunkRunner<'_>,
) -> Signal {
args!(args => http_method: String, headers: Struct, http_url: String, payload: Value);
let mut fields = std::collections::HashMap::new();
args!(args => http_status_code: i64, headers: Struct, payload: Value);

fields.insert(String::from("http_method"), http_method.to_value());
fields.insert(String::from("url"), http_url.to_value());
fields.insert(String::from("payload"), payload.clone());
let mut fields = HashMap::new();
fields.insert("http_status_code".to_string(), http_status_code.to_value());
fields.insert(
String::from("headers"),
"headers".to_string(),
Value {
kind: Some(Kind::StructValue(headers.clone())),
kind: Some(Kind::StructValue(headers)),
},
);
fields.insert("payload".to_string(), payload);

Signal::Success(Value {
// `Respond` is a control signal; the executor can still continue with `next` if present.
Signal::Respond(Value {
kind: Some(Kind::StructValue(Struct { fields })),
})
}
Expand All @@ -118,31 +55,9 @@ fn send_request(
_ctx: &mut ValueStore,
_run: &mut crate::handler::registry::ThunkRunner<'_>,
) -> Signal {
args!(args => http_request: Struct);

let method = match expect_struct_string_field(&http_request, "http_method") {
Ok(value) => value,
Err(signal) => return signal,
};
let url = match expect_struct_string_field(&http_request, "url") {
Ok(value) => value,
Err(signal) => return signal,
};
let headers_struct = match expect_struct_struct_field(&http_request, "headers") {
Ok(value) => value,
Err(signal) => return signal,
};
let payload = match http_request.fields.get("payload") {
Some(value) => value.clone(),
None => {
return fail(
"InvalidArgumentRuntimeError",
"Missing 'payload' field in http_request",
);
}
};
args!(args => http_method: String, headers: Struct, http_url: String, payload: Value);

let mut headers = match encode_headers(&headers_struct) {
let mut headers = match encode_headers(&headers) {
Ok(headers) => headers,
Err(message) => return fail("InvalidArgumentRuntimeError", message),
};
Expand All @@ -160,17 +75,17 @@ fn send_request(
headers.insert("content-type".to_string(), default_content_type.to_string());
}

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

let mut request_builder = http::Request::builder().method(http_method).uri(&url);
let mut request_builder = http::Request::builder().method(http_method).uri(&http_url);
for (name, value) in &headers {
request_builder = request_builder.header(name, value);
}
Expand Down Expand Up @@ -244,66 +159,6 @@ fn send_request(
})
}

fn create_response(
args: &[Argument],
_ctx: &mut ValueStore,
_run: &mut crate::handler::registry::ThunkRunner<'_>,
) -> Signal {
args!(args => http_status_code: i64, headers: Struct, payload: Value);
let mut fields = std::collections::HashMap::new();

fields.insert(
String::from("http_status_code"),
http_status_code.to_value(),
);
fields.insert(String::from("payload"), payload.clone());

fields.insert(
String::from("headers"),
Value {
kind: Some(Kind::StructValue(headers.clone())),
},
);

Signal::Success(Value {
kind: Some(Kind::StructValue(Struct { fields })),
})
}

fn expect_struct_string_field(struct_val: &Struct, field: &str) -> Result<String, Signal> {
let Some(value) = struct_val.fields.get(field) else {
return Err(fail(
"InvalidArgumentRuntimeError",
format!("Missing '{}' field in http_request", field),
));
};

match &value.kind {
Some(Kind::StringValue(str_val)) => Ok(str_val.clone()),
_ => Err(fail(
"InvalidArgumentRuntimeError",
format!("Expected '{}' to be StringValue", field),
)),
}
}

fn expect_struct_struct_field(struct_val: &Struct, field: &str) -> Result<Struct, Signal> {
let Some(value) = struct_val.fields.get(field) else {
return Err(fail(
"InvalidArgumentRuntimeError",
format!("Missing '{}' field in http_request", field),
));
};

match &value.kind {
Some(Kind::StructValue(struct_val)) => Ok(struct_val.clone()),
_ => Err(fail(
"InvalidArgumentRuntimeError",
format!("Expected '{}' to be StructValue", field),
)),
}
}

fn encode_headers(headers: &Struct) -> Result<HashMap<String, String>, String> {
let mut out = HashMap::with_capacity(headers.fields.len());
for (name, value) in &headers.fields {
Expand Down Expand Up @@ -710,26 +565,14 @@ mod tests {
let request_headers = Struct {
fields: HashMap::from([("x-bool".to_string(), true.to_value())]),
};
let request = Struct {
fields: HashMap::from([
("http_method".to_string(), string_value("POST")),
(
"url".to_string(),
string_value(&format!("http://{}/echo?x=1", addr)),
),
(
"headers".to_string(),
Value {
kind: Some(Kind::StructValue(request_headers)),
},
),
("payload".to_string(), request_payload),
]),
};

let args = vec![Argument::Eval(Value {
kind: Some(Kind::StructValue(request)),
})];
let args = vec![
Argument::Eval(string_value("POST")),
Argument::Eval(Value {
kind: Some(Kind::StructValue(request_headers)),
}),
Argument::Eval(string_value(&format!("http://{}/echo?x=1", addr))),
Argument::Eval(request_payload),
];
let mut ctx = ValueStore::default();
let mut run = |_: &crate::handler::argument::Thunk, _: &mut ValueStore| Signal::Stop;

Expand Down
21 changes: 2 additions & 19 deletions flows/01_return_object.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,8 @@
"node_functions": [
{
"definition_source": "taurus",
"databaseId": "2",
"runtimeFunctionId": "rest::control::respond",
"parameters": [
{
"databaseId": "4",
"runtimeParameterId": "http_response",
"value": {
"referenceValue": {
"nodeId": "1"
}
}
}
]
},
{
"databaseId": "1",
"definition_source": "taurus",
"runtimeFunctionId": "http::response::create",
"runtimeFunctionId": "rest::control::respond",
"parameters": [
{
"databaseId": "1",
Expand Down Expand Up @@ -72,8 +56,7 @@
}
}
}
],
"nextNodeId": "2"
]
}
]
}
Expand Down