Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(preview): queue Vite module fan-out instead of refusing as text/plain (#7175)

Wolf Mermelstein51575cb3ec90
diff --git a/crates/agent_preview/src/domain/service.rs b/crates/agent_preview/src/domain/service.rs
index 0eb03ce1a8..7cd6d47980 100644
--- a/crates/agent_preview/src/domain/service.rs
+++ b/crates/agent_preview/src/domain/service.rs
@@ -323,7 +323,10 @@ impl PreviewService {
activity: Mutex::new(Instant::now()),
tunnel: Mutex::new(None),
cancel: CancellationToken::new(),
- requests: Arc::new(Semaphore::new(512)),
+ // Large enough for a Vite cold load's module fan-out; the HTTP
+ // inbound queues on this semaphore instead of rejecting, so the
+ // number bounds file descriptors rather than aborting the page.
+ requests: Arc::new(Semaphore::new(4096)),
upgrades: Arc::new(Semaphore::new(8)),
});
let old = {
@@ -565,17 +568,6 @@ impl PreviewService {
if !lease.live() {
return Err(PreviewError::Offline);
}
- let _authorization_slot = if activity {
- Some(
- lease
- .requests
- .clone()
- .try_acquire_owned()
- .map_err(|_| PreviewError::Limited)?,
- )
- } else {
- None
- };
self.authority
.viewer(lease.preview().agent_session_id, &user)
.await?;
diff --git a/crates/agent_preview/src/inbound/http.rs b/crates/agent_preview/src/inbound/http.rs
index 6952a72b4e..385e1b611d 100644
--- a/crates/agent_preview/src/inbound/http.rs
+++ b/crates/agent_preview/src/inbound/http.rs
@@ -141,21 +141,23 @@ async fn handle(
}
let cookie = cookie_value(request.headers()).ok_or(PreviewError::Denied)?;
let lease = service.viewer(&id, &cookie, true).await?;
- let permit = Arc::new(
- lease
- .requests
- .clone()
- .try_acquire_owned()
- .map_err(|_| PreviewError::Limited)?,
- );
+ // Queue for a stream slot instead of refusing with a text/plain body.
+ // Vite cold loads fan out thousands of modules; try_acquire turned that
+ // spike into NS_ERROR_CORRUPTED_CONTENT / "disallowed MIME type" in the
+ // browser whenever more than `requests` were in flight (see b7a5c2b23d).
+ let permit = Arc::new(tokio::select! {
+ permit = lease.requests.clone().acquire_owned() => {
+ permit.map_err(|_| PreviewError::Offline)?
+ }
+ _ = lease.cancel.cancelled() => return Err(PreviewError::Offline),
+ });
let upgrade_permit = if upgrade {
- Some(
- lease
- .upgrades
- .clone()
- .try_acquire_owned()
- .map_err(|_| PreviewError::Limited)?,
- )
+ Some(tokio::select! {
+ permit = lease.upgrades.clone().acquire_owned() => {
+ permit.map_err(|_| PreviewError::Offline)?
+ }
+ _ = lease.cancel.cancelled() => return Err(PreviewError::Offline),
+ })
} else {
None
};
diff --git a/services/preview_gateway/README.md b/services/preview_gateway/README.md
index 6230689f41..c600eea8c8 100644
--- a/services/preview_gateway/README.md
+++ b/services/preview_gateway/README.md
@@ -67,8 +67,10 @@ and every 30 seconds, so missed events and gateway restarts recover automaticall
lease replacement accumulated across reloads until every stream was cut.
Expiry, idle timeout and one-preview-per-session are the controls that bound
cost.
-- Per preview: 512 concurrent HTTP streams and eight WebSockets; 16 MiB request
- bodies, 30-second upstream response-header timeout. Traffic is streamed.
+- Per preview: 4096 concurrent HTTP streams (queued, not refused) and eight
+ WebSockets; 16 MiB request bodies, 30-second upstream response-header timeout.
+ Traffic is streamed. Excess HTTP streams wait for a slot so a Vite cold load
+ is not served `text/plain` refusals that browsers report as corrupted modules.
- 1,024 SSH connections, bounded SSH authentication time, 128 concurrent control
requests, 64 KiB control bodies, 15-second control timeout. Tickets and browser
credentials also have bounded registries and expiry.