Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d6df0b3
fix(browser): carry typed free-space refusals to the page
andersalm Nov 5, 2026
dc9c146
test(browser): keep refusal checks with the private parser
andersalm Nov 5, 2026
10ed570
fix(browser): preserve engine failure status when hiding diagnostics
andersalm Nov 5, 2026
f04b239
fix(browser): keep overlay capacity checks on Linux
andersalm Nov 5, 2026
fc0b12e
test(browser): keep missing-transport diagnostics private
andersalm Nov 5, 2026
5dc8304
fix(browser): keep engine diagnostics private and test refusal transport
andersalm Nov 5, 2026
0494d7c
fix(browser): preserve transfer guidance and private open diagnostics
andersalm Nov 6, 2026
1540c86
fix(browser): project open diagnostics at one response boundary
andersalm Nov 6, 2026
13445f1
fix(browser): retain open failure results through resource cleanup
andersalm Nov 6, 2026
3e24f3f
fix(browser): retain provider causes through open projection
andersalm Nov 6, 2026
48379fe
test(browser): import provider cause guard helpers explicitly
andersalm Nov 6, 2026
8444794
fix(browser): keep public policy errors to the requested host
andersalm Nov 6, 2026
d84ff4e
fix(browser): scope host extraction to the public policy error
andersalm Nov 6, 2026
5d71010
test(browser): assert typed admission conflict responses
andersalm Nov 6, 2026
9ac8c94
fix(browser): preserve open failure recovery and ownership
andersalm Nov 6, 2026
fb0c75e
Merge origin/develop into fix/201-browser-open-reason
andersalm Nov 6, 2026
50f0306
fix(browser): retain Runtime fault diagnostics and Exit refusal
andersalm Nov 6, 2026
6c00ad6
Merge remote-tracking branch 'origin/develop' into fix/201-browser-op…
andersalm Nov 6, 2026
81b77ff
Merge origin/develop into fix/201-browser-open-reason
andersalm Nov 6, 2026
801cd98
Merge remote-tracking branch 'origin/develop' into fix/201-browser-op…
andersalm Nov 6, 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
4 changes: 4 additions & 0 deletions capsules/browser-engine-adapter/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,8 @@ enum Response {
adapter: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
launch_settlement_result: Option<Value>,
#[serde(skip_serializing_if = "Option::is_none")]
refusal: Option<elastos_common::browser_protocol::BrowserLaunchRefusal>,
},
}

Expand All @@ -173,6 +175,7 @@ impl Response {
message: message.into(),
adapter: None,
launch_settlement_result: None,
refusal: None,
}
}

Expand All @@ -182,6 +185,7 @@ impl Response {
message: error.message,
adapter: Some(adapter.id.clone()),
launch_settlement_result: error.launch_settlement_result,
refusal: error.refusal,
}
}
}
Expand Down
44 changes: 44 additions & 0 deletions capsules/browser-engine-adapter/src/supervisor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ pub(super) struct SupervisorLaunchError {
pub(super) code: String,
pub(super) message: String,
pub(super) launch_settlement_result: Option<Value>,
pub(super) refusal: Option<elastos_common::browser_protocol::BrowserLaunchRefusal>,
}

impl SupervisorLaunchError {
Expand All @@ -33,6 +34,7 @@ impl SupervisorLaunchError {
code: "engine_process_unavailable".to_string(),
message: message.into(),
launch_settlement_result: None,
refusal: None,
}
}
}
Expand All @@ -45,6 +47,8 @@ struct TypedSupervisorLaunchError {
message: String,
#[serde(default)]
launch_settlement_result: Option<Value>,
#[serde(default)]
refusal: Option<Value>,
}

fn supervisor_launch_error(
Expand All @@ -67,6 +71,10 @@ fn supervisor_launch_error(
code: error.code,
message: error.message,
launch_settlement_result,
refusal: error
.refusal
.as_ref()
.and_then(elastos_common::browser_protocol::BrowserLaunchRefusal::from_value),
};
}
SupervisorLaunchError::process(format!(
Expand Down Expand Up @@ -846,3 +854,39 @@ mod private_request_tests {
let _ = fs::remove_file(marker);
}
}

#[cfg(test)]
mod refusal_tests {
use super::*;

#[test]
fn supervisor_space_refusal_reaches_the_adapter_response() {
use std::os::unix::process::ExitStatusExt;
let adapter: AdapterConfig = serde_json::from_value(json!({
"id": "browser-vm-product", "kind": "chromium_microvm",
"display_modes": ["webrtc_remote_display"],
}))
.unwrap();
for (code, available, valid) in [
("insufficient_free_space", json!(8589934591_u64), true),
("unknown", json!(8589934591_u64), false),
("insufficient_free_space", json!(-1), false),
] {
let refusal = json!({"code": code, "required_bytes": 8589934592_u64, "available_bytes": available});
let stderr = json!({
"schema": "elastos.browser.engine.launch-error/v1", "code": "launch_refused",
"message": "private engine text", "refusal": refusal,
})
.to_string();
let error =
supervisor_launch_error(std::process::ExitStatus::from_raw(42 << 8), &stderr, None);
let response =
serde_json::to_value(Response::supervisor_error(&adapter, error)).unwrap();
if valid {
assert_eq!(response["refusal"], refusal);
} else {
assert!(response.get("refusal").is_none());
}
}
}
}
14 changes: 14 additions & 0 deletions capsules/browser/browser/browser-status.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,20 @@ export function friendlyOpenError(error) {
return "Browser session expired. Reopening from Home...";
}
const outcome = runtimeOpenOutcome(error);
const refusal = error?.payload?.refusal;
if (
["terminal_pre_effect_failure", "terminal_post_effect_cleanup"].includes(outcome?.state) &&
outcome.effects.page_acquired === false && outcome.effects.vm_acquired === false &&
outcome.effects.stream_acquired === false &&
refusal && Object.keys(refusal).length === 3 &&
refusal.code === "insufficient_free_space" &&
Number.isSafeInteger(refusal.required_bytes) && Number.isSafeInteger(refusal.available_bytes) &&
refusal.available_bytes >= 0 && refusal.available_bytes < refusal.required_bytes
) {
const required = (Math.ceil(refusal.required_bytes / 100_000_000) / 10).toFixed(1);
const available = (Math.floor(refusal.available_bytes / 100_000_000) / 10).toFixed(1);
return `Browser needs ${required} GB free on this computer to open; ${available} GB are free. Free some space, then open Browser again.`;
}
if (outcome?.state === "terminal_pre_effect_failure" && error?.payload?.stage === "viewer_compatibility") {
return error.payload.code === "unsupported_viewer_display_mode"
? "This Browser view needs a streamed display. Open Browser from Home with its default display."
Expand Down
36 changes: 36 additions & 0 deletions capsules/browser/browser/browser-status.test.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,42 @@ function openError(state, effects) {
return error;
}

test("space refusal reports required and available decimal GB after safe cleanup", () => {
for (const state of ["terminal_pre_effect_failure", "terminal_post_effect_cleanup"]) {
const error = openError(state);
error.payload.refusal = {
code: "insufficient_free_space", required_bytes: 8589934592, available_bytes: 8589934591,
};
error.payload.message = "private engine error text";
assert.equal(friendlyOpenError(error), "Browser needs 8.6 GB free on this computer to open; 8.5 GB are free. Free some space, then open Browser again.");
}
});

test("invalid, unknown and pending refusals keep the generic failure", () => {
const error = openError("terminal_post_effect_cleanup");
const generic = friendlyOpenError(error);
error.message = "Browser needs 8.6 GB free on this computer to open; 8.5 GB are free. Free some space, then open Browser again.";
assert.equal(friendlyOpenError(error), generic, "message text grants no refusal code");
for (const refusal of [
undefined,
{ code: "unknown", required_bytes: 20, available_bytes: 10 },
{ code: "insufficient_free_space", required_bytes: "20", available_bytes: 10 },
{ code: "insufficient_free_space", required_bytes: 10, available_bytes: 20 },
{ code: "insufficient_free_space", required_bytes: 20, available_bytes: -1 },
{ code: "insufficient_free_space", required_bytes: 2 ** 53, available_bytes: 10 },
{ code: "insufficient_free_space", required_bytes: 20, available_bytes: 10, message: "private" },
]) {
error.payload.refusal = refusal;
assert.equal(friendlyOpenError(error), generic);
}
error.payload.refusal = { code: "insufficient_free_space", required_bytes: 20, available_bytes: 10 };
error.payload.outcome.state = "cleanup_pending";
assert.match(friendlyOpenError(error), /finishing cleanup/);
error.payload.outcome.state = "terminal_post_effect_cleanup";
error.payload.outcome.effects.vm_acquired = true;
assert.equal(friendlyOpenError(error), generic);
});

test("pre-effect open failure never claims a missing terminal close", () => {
const error = openError("terminal_pre_effect_failure");

Expand Down
1 change: 1 addition & 0 deletions elastos/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ release's Added, Changed, Fixed, Removed and Security bullets before you update;

### Fixed

- When Browser cannot open because the computer is short of space, it says how much space it needs.
- On a Jetson, Browser uses more of the processor, so scrolling is about twice as smooth.
- On Linux, Browser is turned on when you choose it, not during install.
- Open apps, including Chat, stay connected while Home runs, and reconnect by themselves after a network drop or a restart.
Expand Down
26 changes: 26 additions & 0 deletions elastos/crates/elastos-common/src/browser_protocol.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,32 @@ pub const BROWSER_ENGINE_CLEANUP_BINDING_SCHEMA: &str = "elastos.browser.engine-
pub const BROWSER_ENGINE_CLEANUP_RESULT_SCHEMA: &str = "elastos.browser.engine-cleanup-result/v2";
pub const MAX_BROWSER_ENGINE_ADAPTERS: usize = 64;

/// Person-actionable launch refusals. Runtime exposes only this closed set;
/// engine diagnostics stay with the Engine.
#[derive(Debug, Clone, Copy, Deserialize, Serialize, PartialEq, Eq)]
#[serde(tag = "code", rename_all = "snake_case", deny_unknown_fields)]
pub enum BrowserLaunchRefusal {
InsufficientFreeSpace {
required_bytes: u64,
available_bytes: u64,
},
}

impl BrowserLaunchRefusal {
pub fn from_value(value: &Value) -> Option<Self> {
let refusal: Self = serde_json::from_value(value.clone()).ok()?;
match refusal {
Self::InsufficientFreeSpace {
required_bytes,
available_bytes,
} if available_bytes < required_bytes && required_bytes < (1_u64 << 53) => {
Some(refusal)
}
_ => None,
}
}
}

#[derive(Debug, Clone, Copy, Deserialize, Serialize, PartialEq, Eq)]
#[serde(rename_all = "snake_case")]
pub enum BrowserDisplayMode {
Expand Down
21 changes: 21 additions & 0 deletions elastos/crates/elastos-common/src/browser_protocol/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -261,3 +261,24 @@ fn readiness_accepts_only_the_declared_state_and_reason_fields() {
assert!(serde_json::from_value::<BrowserEngineReadiness>(value).is_err());
}
}

#[test]
fn launch_refusal_accepts_only_known_codes_and_safe_byte_counts() {
let good = json!({"code": "insufficient_free_space", "required_bytes": 8589934592_u64, "available_bytes": 8589934591_u64});
assert_eq!(
serde_json::to_value(BrowserLaunchRefusal::from_value(&good).unwrap()).unwrap(),
good
);
for (key, value) in [
("code", json!("unknown")),
("required_bytes", json!("8589934592")),
("available_bytes", json!(-1)),
("available_bytes", json!(8589934592_u64)),
("required_bytes", json!(1_u64 << 53)),
("message", json!("private")),
] {
let mut bad = good.clone();
bad[key] = value;
assert!(BrowserLaunchRefusal::from_value(&bad).is_none());
}
}
9 changes: 6 additions & 3 deletions elastos/crates/elastos-server/src/api/gateway.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1388,6 +1388,10 @@ fn gateway_provider_error_response(scheme: &str, err: anyhow::Error) -> Response
}

fn gateway_provider_error_tuple(scheme: &str, err: anyhow::Error) -> (StatusCode, String) {
(gateway_provider_error_status(scheme, &err), err.to_string())
}

fn gateway_provider_error_status(scheme: &str, err: &anyhow::Error) -> StatusCode {
let text = err.to_string();
let unavailable = format!("{scheme} provider unavailable");
let forbidden = text.contains("home launch token")
Expand All @@ -1397,7 +1401,7 @@ fn gateway_provider_error_tuple(scheme: &str, err: anyhow::Error) -> (StatusCode
|| text.contains("private host blocked")
|| text.contains("private IP blocked")
|| text.contains("private network");
let status = if forbidden {
if forbidden {
StatusCode::FORBIDDEN
} else if text.contains(&unavailable) {
StatusCode::SERVICE_UNAVAILABLE
Expand All @@ -1412,8 +1416,7 @@ fn gateway_provider_error_tuple(scheme: &str, err: anyhow::Error) -> (StatusCode
StatusCode::BAD_REQUEST
} else {
StatusCode::INTERNAL_SERVER_ERROR
};
(status, text)
}
}

fn inbox_error_response(err: anyhow::Error) -> Response {
Expand Down
Loading
Loading