mirror of
https://github.com/openai/codex.git
synced 2026-08-29 14:09:35 +00:00
## What changed - Replace pending WebSocket URL registration with deferred Noise environment registration that gates connection attempts on an explicit readiness signal. - Reuse the Noise rendezvous transport after readiness so reconnects request a fresh connection bundle. - Preserve terminal errors for failed or dropped registrations and keep late completion isolated from replacement environments. ## Testing - Add coverage for readiness gating, registration failure and replacement, eager Noise connections, and reconnection through a fresh rendezvous bundle. GitOrigin-RevId: 83e23fa03a02e3b2bdf1a83fe26d7ac461f55cf3
181 lines
6.2 KiB
Rust
181 lines
6.2 KiB
Rust
use std::collections::HashMap;
|
|
use std::path::PathBuf;
|
|
use std::sync::Arc;
|
|
use std::time::Duration;
|
|
|
|
use futures::future::BoxFuture;
|
|
use futures::future::Shared;
|
|
use tokio::sync::oneshot;
|
|
|
|
use crate::ExecServerError;
|
|
use crate::HttpRequestParams;
|
|
use crate::HttpRequestResponse;
|
|
use crate::HttpResponseBodyStream;
|
|
use crate::NoiseChannelIdentity;
|
|
use crate::NoiseChannelPublicKey;
|
|
|
|
pub(crate) const DEFAULT_REMOTE_EXEC_SERVER_CONNECT_TIMEOUT: Duration = Duration::from_secs(10);
|
|
pub(crate) const DEFAULT_REMOTE_EXEC_SERVER_INITIALIZE_TIMEOUT: Duration = Duration::from_secs(10);
|
|
|
|
/// Connection options for any exec-server client transport.
|
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
pub struct ExecServerClientConnectOptions {
|
|
pub client_name: String,
|
|
pub initialize_timeout: Duration,
|
|
pub resume_session_id: Option<String>,
|
|
}
|
|
|
|
/// WebSocket connection arguments for a remote exec-server.
|
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
pub struct RemoteExecServerConnectArgs {
|
|
pub websocket_url: String,
|
|
pub client_name: String,
|
|
pub connect_timeout: Duration,
|
|
pub initialize_timeout: Duration,
|
|
pub resume_session_id: Option<String>,
|
|
}
|
|
|
|
/// Registry-authorized material for one Noise rendezvous connection attempt.
|
|
///
|
|
/// Treat this as an atomic, single-use bundle. The URL authorization, executor
|
|
/// registration, pinned executor key, and harness-key authorization describe one
|
|
/// physical connection attempt and must not be mixed with values from another
|
|
/// registry response.
|
|
pub struct NoiseRendezvousConnectBundle {
|
|
pub websocket_url: String,
|
|
pub environment_id: String,
|
|
pub executor_registration_id: String,
|
|
pub executor_public_key: NoiseChannelPublicKey,
|
|
pub harness_key_authorization: String,
|
|
}
|
|
|
|
/// Connection arguments for an authenticated Noise rendezvous exec-server.
|
|
///
|
|
/// `harness_identity` identifies the logical harness endpoint and may be reused
|
|
/// across reconnects. In contrast, callers must supply a fresh
|
|
/// [`NoiseRendezvousConnectBundle`] for each physical connection attempt.
|
|
pub struct NoiseRendezvousConnectArgs {
|
|
pub bundle: NoiseRendezvousConnectBundle,
|
|
pub harness_identity: NoiseChannelIdentity,
|
|
pub client_name: String,
|
|
pub connect_timeout: Duration,
|
|
pub initialize_timeout: Duration,
|
|
pub resume_session_id: Option<String>,
|
|
}
|
|
|
|
/// Supplies fresh registry-authorized material for Noise rendezvous connections.
|
|
pub trait NoiseRendezvousConnectProvider: Send + Sync {
|
|
/// Fetch a bundle authorizing this harness key for one physical connection.
|
|
fn connect_bundle(
|
|
&self,
|
|
harness_public_key: NoiseChannelPublicKey,
|
|
) -> BoxFuture<'_, Result<NoiseRendezvousConnectBundle, ExecServerError>>;
|
|
}
|
|
|
|
/// Stdio connection arguments for a command-backed exec-server.
|
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
pub(crate) struct StdioExecServerConnectArgs {
|
|
pub command: StdioExecServerCommand,
|
|
pub client_name: String,
|
|
pub initialize_timeout: Duration,
|
|
pub resume_session_id: Option<String>,
|
|
}
|
|
|
|
/// Structured process command used to start an exec-server over stdio.
|
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
pub(crate) struct StdioExecServerCommand {
|
|
pub program: String,
|
|
pub args: Vec<String>,
|
|
pub env: HashMap<String, String>,
|
|
pub cwd: Option<PathBuf>,
|
|
}
|
|
|
|
pub(crate) type DeferredEnvironmentReadiness = Shared<oneshot::Receiver<Result<(), String>>>;
|
|
|
|
#[derive(Clone)]
|
|
pub(crate) struct Deferred<T> {
|
|
pub readiness: DeferredEnvironmentReadiness,
|
|
pub transport: T,
|
|
}
|
|
|
|
/// Parameters used to connect to a remote exec-server environment.
|
|
#[derive(Clone)]
|
|
pub(crate) enum ExecServerTransportParams {
|
|
Deferred(Box<Deferred<ExecServerTransportParams>>),
|
|
WebSocketUrl {
|
|
websocket_url: String,
|
|
connect_timeout: Duration,
|
|
initialize_timeout: Duration,
|
|
},
|
|
NoiseRendezvous {
|
|
provider: Arc<dyn NoiseRendezvousConnectProvider>,
|
|
identity: NoiseChannelIdentity,
|
|
},
|
|
#[allow(dead_code)]
|
|
StdioCommand {
|
|
command: StdioExecServerCommand,
|
|
initialize_timeout: Duration,
|
|
},
|
|
}
|
|
|
|
impl std::fmt::Debug for ExecServerTransportParams {
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
match self {
|
|
Self::Deferred(deferred) => f
|
|
.debug_struct("Deferred")
|
|
.field("transport", &deferred.transport)
|
|
.finish_non_exhaustive(),
|
|
Self::WebSocketUrl {
|
|
websocket_url,
|
|
connect_timeout,
|
|
initialize_timeout,
|
|
} => f
|
|
.debug_struct("WebSocketUrl")
|
|
.field("websocket_url", websocket_url)
|
|
.field("connect_timeout", connect_timeout)
|
|
.field("initialize_timeout", initialize_timeout)
|
|
.finish(),
|
|
Self::NoiseRendezvous { .. } => {
|
|
f.debug_struct("NoiseRendezvous").finish_non_exhaustive()
|
|
}
|
|
Self::StdioCommand {
|
|
command,
|
|
initialize_timeout,
|
|
} => f
|
|
.debug_struct("StdioCommand")
|
|
.field("command", command)
|
|
.field("initialize_timeout", initialize_timeout)
|
|
.finish(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl ExecServerTransportParams {
|
|
pub(crate) fn websocket_url(websocket_url: String, connect_timeout: Duration) -> Self {
|
|
Self::WebSocketUrl {
|
|
websocket_url,
|
|
connect_timeout,
|
|
initialize_timeout: DEFAULT_REMOTE_EXEC_SERVER_INITIALIZE_TIMEOUT,
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Sends HTTP requests through a runtime-selected transport.
|
|
///
|
|
/// This is the HTTP capability counterpart to [`crate::ExecBackend`]. Callers
|
|
/// use it when they need environment-owned network requests but should not
|
|
/// depend on the concrete connection type or how that connection is established.
|
|
pub trait HttpClient: Send + Sync {
|
|
/// Perform an HTTP request and buffer the response body.
|
|
fn http_request(
|
|
&self,
|
|
params: HttpRequestParams,
|
|
) -> BoxFuture<'_, Result<HttpRequestResponse, ExecServerError>>;
|
|
|
|
/// Perform an HTTP request and return a streamed body handle.
|
|
fn http_request_stream(
|
|
&self,
|
|
params: HttpRequestParams,
|
|
) -> BoxFuture<'_, Result<(HttpRequestResponse, HttpResponseBodyStream), ExecServerError>>;
|
|
}
|