Skip to content

Commit 542d206

Browse files
authored
chore: hoist pty-multiplex to run module (#888)
Hoists pty-multiplex to aspect-extensions/run since it does not belong with core. Explicit redirect follow up to 10 times and propagate http errors to callsite.
1 parent 055e4f2 commit 542d206

File tree

4 files changed

+45
-5
lines changed

4 files changed

+45
-5
lines changed

Cargo.lock

Lines changed: 33 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/axl-runtime/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ starlark_map = "0.13.0"
2222
anyhow = "1.0.98"
2323
thiserror = "2.0.12"
2424

25-
reqwest = { version="0.12.22", features = ["stream"] }
25+
reqwest = { version="0.12.22", features = ["stream", "gzip", "zstd"] }
2626
prost = "0.14.1"
2727
zstd = "0.13.3"
2828

crates/axl-runtime/src/engine/http.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ use allocative::Allocative;
22
use derive_more::Display;
33
use futures::FutureExt;
44
use futures::TryStreamExt;
5+
use reqwest::redirect::Policy;
56
use starlark::environment::{Methods, MethodsBuilder, MethodsStatic};
67
use starlark::values::dict::UnpackDictEntries;
78
use starlark::values::AllocValue;
@@ -24,7 +25,12 @@ pub struct Http {
2425
impl Http {
2526
pub fn new() -> Self {
2627
Self {
27-
client: reqwest::Client::new(),
28+
client: reqwest::Client::builder()
29+
.user_agent("AXL-Runtime")
30+
// This is the default but lets be explicit.
31+
.redirect(Policy::limited(10))
32+
.build()
33+
.expect("failed to build the http client"),
2834
}
2935
}
3036
}
@@ -56,7 +62,7 @@ pub(crate) fn http_methods(registry: &mut MethodsBuilder) {
5662
}
5763

5864
let fut = async move {
59-
let res = req.send().await?;
65+
let res = req.send().await?.error_for_status()?;
6066
let mut file = OpenOptions::new()
6167
.create(true)
6268
.write(true)

crates/axl-runtime/src/engine/wasm.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,16 +136,17 @@ impl<'v> values::StarlarkValue<'v> for WasmCallable {
136136
let mut outputs: Vec<wasmi::Val> = vec![];
137137
let heap = eval.heap();
138138

139-
let positionals = if ty.params().is_empty() {
139+
let positionals = if !ty.params().is_empty() {
140140
use starlark::__derive_refs::{
141141
parse_args::{check_required, parse_signature},
142142
sig::parameter_spec,
143143
};
144144
let __args: [_; 1] = parse_signature(
145-
&parameter_spec("get_memory", &[], &[], true, &[], false),
145+
&parameter_spec("args", &[], &[], true, &[], false),
146146
args,
147147
eval.heap(),
148148
)?;
149+
149150
let positionals: UnpackTuple<Value<'v>> = check_required("args", __args[0])?;
150151

151152
positionals.items

0 commit comments

Comments
 (0)