File size: 11,952 Bytes
ea39c0e | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 | mod common;
use std::collections::HashMap;
use std::sync::Arc;
use std::sync::atomic::AtomicUsize;
use std::sync::atomic::Ordering;
use std::time::Duration;
use anyhow::Context;
use codex_exec_server::EnvironmentManager;
use codex_exec_server::ExecutorCapabilityDiscoveryCache;
use codex_exec_server::REMOTE_ENVIRONMENT_ID;
use codex_exec_server::SelectedCapabilityRootsStatus;
use codex_exec_server_protocol::CAPABILITY_ROOTS_DISCOVER_METHOD;
use codex_http_client::HttpClientFactory;
use codex_http_client::OutboundProxyPolicy;
use codex_http_client::cache_system_proxy_route_for_test;
use codex_protocol::capabilities::CapabilityRootLocation;
use codex_protocol::capabilities::SelectedCapabilityRoot;
use codex_utils_path_uri::PathUri;
use common::exec_server::exec_server;
use futures::SinkExt;
use futures::StreamExt;
use pretty_assertions::assert_eq;
use tokio::io::AsyncReadExt;
use tokio::io::AsyncWriteExt;
use tokio::net::TcpListener;
use tokio::net::TcpStream;
use tokio::sync::oneshot;
use tokio::time::sleep;
use tokio::time::timeout;
use tokio_tungstenite::accept_async;
use tokio_tungstenite::connect_async;
use tokio_tungstenite::tungstenite::Message;
use tokio_util::task::AbortOnDropHandle;
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
#[serial_test::serial(remote_exec_server)]
async fn prepared_remote_environment_uses_configured_system_proxy() -> anyhow::Result<()> {
let server = exec_server().await?;
let upstream = server
.websocket_url()
.strip_prefix("ws://")
.context("exec-server websocket should use ws://")?
.to_string();
let proxy_listener = TcpListener::bind("127.0.0.1:0").await?;
let proxy_url = format!("http://{}", proxy_listener.local_addr()?);
let websocket_url = "ws://exec-server-system-proxy.invalid:8765/";
let proxy_resolution_url = "http://exec-server-system-proxy.invalid:8765/";
cache_system_proxy_route_for_test(proxy_resolution_url, proxy_url);
let (request_tx, request_rx) = oneshot::channel();
let _proxy_task = AbortOnDropHandle::new(tokio::spawn(async move {
let (mut client, _) = proxy_listener.accept().await?;
let mut request = Vec::new();
let mut byte = [0_u8; 1];
while !request.ends_with(b"\r\n\r\n") {
client.read_exact(&mut byte).await?;
request.push(byte[0]);
}
let request_line = String::from_utf8(request)?
.lines()
.next()
.context("system proxy should receive a CONNECT request")?
.to_string();
request_tx
.send(request_line)
.map_err(|_| anyhow::anyhow!("system proxy request receiver was dropped"))?;
let mut target = TcpStream::connect(upstream).await?;
client
.write_all(b"HTTP/1.1 200 Connection Established\r\n\r\n")
.await?;
tokio::io::copy_bidirectional(&mut client, &mut target).await?;
Ok::<(), anyhow::Error>(())
}));
let codex_home = tempfile::tempdir()?;
std::fs::write(
codex_home.path().join("environments.toml"),
format!(
"default = \"{REMOTE_ENVIRONMENT_ID}\"\ninclude_local = false\n\n[[environments]]\nid = \"{REMOTE_ENVIRONMENT_ID}\"\nurl = \"{websocket_url}\"\n"
),
)?;
let prepared = EnvironmentManager::prepare_from_codex_home(codex_home.path()).await?;
assert!(prepared.default_environment_is_remote());
let manager = prepared.build(
/*local_runtime_paths*/ None,
HttpClientFactory::new(OutboundProxyPolicy::RespectSystemProxy),
)?;
let request_line = timeout(Duration::from_secs(5), request_rx)
.await
.context("prepared environment did not connect through the system proxy")??;
assert_eq!(
request_line,
"CONNECT exec-server-system-proxy.invalid:8765 HTTP/1.1"
);
let environment = manager
.default_environment()
.context("prepared remote environment")?;
timeout(Duration::from_secs(5), environment.info())
.await
.context("prepared remote environment did not initialize through the system proxy")??;
Ok(())
}
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
#[serial_test::serial(remote_exec_server)]
async fn selected_capability_inspection_tracks_connection_recovery() -> anyhow::Result<()> {
let server = exec_server().await?;
let mut proxy = server.disconnectable_websocket_proxy().await?;
let manager = EnvironmentManager::create_for_tests(
Some(proxy.websocket_url().to_string()),
/*local_runtime_paths*/ None,
)
.await;
let environment = manager
.default_environment()
.context("remote environment")?;
environment.info().await?;
let skill_root_path = PathUri::parse("file:///plugins/demo")?;
let selected_root = SelectedCapabilityRoot {
id: "demo@1".to_string(),
location: CapabilityRootLocation::Environment {
environment_id: REMOTE_ENVIRONMENT_ID.to_string(),
path: skill_root_path.clone(),
},
};
assert_eq!(
manager.inspect_selected_capability_roots(std::slice::from_ref(&selected_root)),
SelectedCapabilityRootsStatus {
ready_roots: vec![selected_root.clone()],
warnings: Vec::new(),
}
);
let file_system = environment.get_filesystem_without_reconnect();
proxy.pause_and_disconnect().await?;
assert_eq!(
manager.inspect_selected_capability_roots(std::slice::from_ref(&selected_root)),
SelectedCapabilityRootsStatus::default()
);
let read_result = timeout(
Duration::from_secs(1),
file_system.read_directory(&skill_root_path, /*sandbox*/ None),
)
.await
.context("passive filesystem read waited for recovery")?;
assert!(read_result.is_err());
proxy.resume()?;
let recovered_status = timeout(Duration::from_secs(5), async {
loop {
let status =
manager.inspect_selected_capability_roots(std::slice::from_ref(&selected_root));
if !status.ready_roots.is_empty() {
break status;
}
sleep(Duration::from_millis(10)).await;
}
})
.await
.context("environment did not recover")?;
assert_eq!(
recovered_status,
SelectedCapabilityRootsStatus {
ready_roots: vec![selected_root],
warnings: Vec::new(),
}
);
Ok(())
}
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
#[serial_test::serial(remote_exec_server)]
async fn capability_discovery_retries_executor_disconnect_within_same_request() -> anyhow::Result<()>
{
let server = exec_server().await?;
let proxy_listener = TcpListener::bind("127.0.0.1:0").await?;
let proxy_websocket_url = format!("ws://{}", proxy_listener.local_addr()?);
let upstream_websocket_url = server.websocket_url().to_string();
let discovery_attempts = Arc::new(AtomicUsize::new(0));
let proxy_discovery_attempts = Arc::clone(&discovery_attempts);
let _proxy_task = AbortOnDropHandle::new(tokio::spawn(async move {
while let Ok((downstream, _)) = proxy_listener.accept().await {
let mut downstream = accept_async(downstream).await?;
let (mut upstream, _) = connect_async(&upstream_websocket_url).await?;
loop {
tokio::select! {
message = downstream.next() => {
let Some(message) = message.transpose()? else {
break;
};
if let Message::Text(message_text) = &message {
let request = serde_json::from_str::<serde_json::Value>(message_text.as_ref())?;
if request.get("method").and_then(serde_json::Value::as_str)
== Some(CAPABILITY_ROOTS_DISCOVER_METHOD)
{
let attempt = proxy_discovery_attempts.fetch_add(1, Ordering::SeqCst);
if attempt == 0 {
break;
}
sleep(Duration::from_secs(9)).await;
}
}
upstream.send(message).await?;
}
message = upstream.next() => {
let Some(message) = message.transpose()? else {
break;
};
downstream.send(message).await?;
}
}
}
}
Ok::<(), anyhow::Error>(())
}));
let manager = Arc::new(
EnvironmentManager::create_for_tests(
Some(proxy_websocket_url),
/*local_runtime_paths*/ None,
)
.await,
);
manager
.default_environment()
.context("remote environment")?
.info()
.await?;
let cache = Arc::new(ExecutorCapabilityDiscoveryCache::new(Arc::clone(&manager)));
let skill_root = tempfile::tempdir()?;
let selected_roots = vec![SelectedCapabilityRoot {
id: "recovering-skill".to_string(),
location: CapabilityRootLocation::Environment {
environment_id: REMOTE_ENVIRONMENT_ID.to_string(),
path: PathUri::from_host_native_path(skill_root.path())?,
},
}];
let snapshot = timeout(
Duration::from_secs(12),
cache.snapshot(&selected_roots, &HashMap::new()),
)
.await
.context("capability discovery did not retry within the same request")?;
let discovery = snapshot.roots()[0]
.result
.as_ref()
.map_err(|error| anyhow::anyhow!("{error}"))?;
assert_eq!(discovery.id, "recovering-skill");
assert_eq!(
2,
discovery_attempts.load(Ordering::SeqCst),
"same-request retry must issue a second capability discovery RPC"
);
Ok(())
}
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn capability_discovery_retries_after_executor_reconnects() -> anyhow::Result<()> {
let server = exec_server().await?;
let manager = Arc::new(EnvironmentManager::default_for_tests());
let cache = ExecutorCapabilityDiscoveryCache::new(Arc::clone(&manager));
let skill_root = tempfile::tempdir()?;
let refused_listener = TcpListener::bind("127.0.0.1:0").await?;
let refused_address = refused_listener.local_addr()?;
drop(refused_listener);
manager.upsert_environment(
"recovering".to_string(),
format!("ws://{refused_address}"),
Some(Duration::from_millis(100)),
)?;
let selected_roots = vec![SelectedCapabilityRoot {
id: "recovering-skill".to_string(),
location: CapabilityRootLocation::Environment {
environment_id: "recovering".to_string(),
path: PathUri::from_host_native_path(skill_root.path())?,
},
}];
let failed_snapshot = cache.snapshot(&selected_roots, &HashMap::new()).await;
assert!(failed_snapshot.roots()[0].result.is_err());
assert!(!cache.take_recovered_discovery());
manager.upsert_environment(
"recovering".to_string(),
server.websocket_url().to_string(),
/*connect_timeout*/ None,
)?;
manager
.get_environment("recovering")
.context("recovered environment")?
.wait_until_ready()
.await?;
let recovered_snapshot = cache.snapshot(&selected_roots, &HashMap::new()).await;
let discovery = recovered_snapshot.roots()[0]
.result
.as_ref()
.map_err(|error| anyhow::anyhow!("{error}"))?;
assert_eq!(discovery.id, "recovering-skill");
assert!(cache.take_recovered_discovery());
assert!(!cache.take_recovered_discovery());
Ok(())
}
|