mirrors/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-05-01 20:02:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

rm run_remote_control_websocket_loop

Browse Source
This commit is contained in:
Ruslan Nigmatullin
2026-03-27 13:43:50 -07:00
parent f2623f20f3
commit 457fabc409
2 changed files with 22 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
codex-rs/app-server/src/transport/remote_control/mod.rs
View File

@@ -3,12 +3,12 @@ mod enroll;
mod protocol;
mod websocket;
use crate::transport::remote_control::websocket::RemoteControlWebsocket;
use crate::transport::remote_control::websocket::load_remote_control_auth;
pub use self::protocol::ClientId;
use self::protocol::ServerEvent;
use self::protocol::normalize_remote_control_url;
use self::websocket::run_remote_control_websocket_loop;
use super::CHANNEL_CAPACITY;
use super::TransportEvent;
use super::next_connection_id;
@@ -38,13 +38,14 @@ pub(crate) async fn start_remote_control(
validate_remote_control_auth(&auth_manager).await?;
Ok(tokio::spawn(async move {
run_remote_control_websocket_loop(
RemoteControlWebsocket::new(
remote_control_target,
state_db,
auth_manager,
transport_event_tx,
shutdown_token.child_token(),
shutdown_token,
)
.run()
.await;
}))
}

46
codex-rs/app-server/src/transport/remote_control/websocket.rs
View File

@@ -106,7 +106,7 @@ struct WebsocketState {
next_seq_id: u64,
}
struct RemoteControlWebsocket {
pub(crate) struct RemoteControlWebsocket {
remote_control_target: RemoteControlTarget,
state_db: Option<Arc<StateRuntime>>,
auth_manager: Arc<AuthManager>,
@@ -121,13 +121,14 @@ struct RemoteControlWebsocket {
}
impl RemoteControlWebsocket {
fn new(
pub(crate) fn new(
remote_control_target: RemoteControlTarget,
state_db: Option<Arc<StateRuntime>>,
auth_manager: Arc<AuthManager>,
transport_event_tx: mpsc::Sender<TransportEvent>,
shutdown_token: CancellationToken,
) -> Self {
let shutdown_token = shutdown_token.child_token();
let (server_event_tx, server_event_rx) = mpsc::channel(super::CHANNEL_CAPACITY);
let client_tracker =
ClientTracker::new(server_event_tx, transport_event_tx, &shutdown_token);
@@ -153,7 +154,7 @@ impl RemoteControlWebsocket {
}
}
async fn run(mut self) {
pub(crate) async fn run(mut self) {
loop {
let shutdown_token = self.shutdown_token.child_token();
let websocket_connection = match self.connect(&shutdown_token).await {
@@ -469,24 +470,6 @@ impl RemoteControlWebsocket {
}
}
pub(super) async fn run_remote_control_websocket_loop(
remote_control_target: RemoteControlTarget,
state_db: Option<Arc<StateRuntime>>,
auth_manager: Arc<AuthManager>,
transport_event_tx: mpsc::Sender<TransportEvent>,
shutdown_token: CancellationToken,
) {
RemoteControlWebsocket::new(
remote_control_target,
state_db,
auth_manager,
transport_event_tx,
shutdown_token,
)
.run()
.await;
}
fn remote_control_message_starts_connection(event: &ClientEvent) -> bool {
matches!(
event,
@@ -1023,13 +1006,20 @@ mod tests {
let (transport_event_tx, transport_event_rx) = mpsc::channel(1);
drop(transport_event_rx);
let shutdown_token = CancellationToken::new();
let websocket_task = tokio::spawn(run_remote_control_websocket_loop(
remote_control_target,
None,
remote_control_auth_manager(),
transport_event_tx,
shutdown_token.clone(),
));
let websocket_task = tokio::spawn({
let shutdown_token = shutdown_token.clone();
async move {
RemoteControlWebsocket::new(
remote_control_target,
None,
remote_control_auth_manager(),
transport_event_tx,
shutdown_token,
)
.run()
.await
}
});
tokio::time::sleep(Duration::from_millis(50)).await;
shutdown_token.cancel();