Skip to content

armgit / moli

Public Imported from GitHub
0

Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust

fix(cdp): publish a real default discovery target

ldm05f753d36bffe
diff --git a/moli-protocol-server/src/cdp_frontend.rs b/moli-protocol-server/src/cdp_frontend.rs
index 38d10513f..441ee8c59 100644
--- a/moli-protocol-server/src/cdp_frontend.rs
+++ b/moli-protocol-server/src/cdp_frontend.rs
@@ -48,6 +48,9 @@ pub(crate) enum CdpFrontendControlRequest {
target_url: String,
completion_tx: oneshot::Sender<Result<CdpCreatedTarget>>,
},
+ EnsureDefaultTarget {
+ completion_tx: oneshot::Sender<Result<()>>,
+ },
Shutdown,
}
@@ -209,6 +212,22 @@ impl CdpFrontendEndpoint {
}
}
+ pub(crate) async fn ensure_default_target(&self) -> Result<()> {
+ if self.is_shutting_down() {
+ bail!("CDP target owner is shutting down");
+ }
+ let (completion_tx, completion_rx) = oneshot::channel();
+ self.control_tx
+ .send(CdpFrontendControlRequest::EnsureDefaultTarget { completion_tx })
+ .context("CDP owner is no longer available")?;
+ tokio::select! {
+ biased;
+ _ = self.wait_for_shutdown() => bail!("CDP owner stopped before default target creation"),
+ completion = completion_rx => completion
+ .context("CDP owner stopped before default target creation")?,
+ }
+ }
+
pub(crate) fn shutdown(&self) {
let _ = self.shutdown_tx.send(true);
let _ = self.control_tx.send(CdpFrontendControlRequest::Shutdown);
diff --git a/moli-protocol-server/src/cdp_scheduler/frontend_control.rs b/moli-protocol-server/src/cdp_scheduler/frontend_control.rs
index 612d8e7fa..c20de2ba8 100644
--- a/moli-protocol-server/src/cdp_scheduler/frontend_control.rs
+++ b/moli-protocol-server/src/cdp_scheduler/frontend_control.rs
@@ -202,6 +202,14 @@ impl CdpFrontendControlState {
send_cookie_checkpoint(scheduler, owner_lifecycle);
true
}
+ CdpFrontendControlRequest::EnsureDefaultTarget { completion_tx } => {
+ let result = self
+ .target_control
+ .ensure_default_target_is_materialized(scheduler, frontend_router)
+ .await;
+ let _ = completion_tx.send(result);
+ true
+ }
CdpFrontendControlRequest::Shutdown => false,
}
}
diff --git a/moli-protocol-server/src/cdp_scheduler/frontend_control/target_control.rs b/moli-protocol-server/src/cdp_scheduler/frontend_control/target_control.rs
index 357b05387..9aa7b64a9 100644
--- a/moli-protocol-server/src/cdp_scheduler/frontend_control/target_control.rs
+++ b/moli-protocol-server/src/cdp_scheduler/frontend_control/target_control.rs
@@ -201,7 +201,7 @@ impl CdpFrontendTargetControl {
Ok(session_id)
}
- async fn ensure_default_target_is_materialized(
+ pub(super) async fn ensure_default_target_is_materialized(
&mut self,
scheduler: &mut CdpScheduler,
frontend_router: &CdpFrontendRouter,
diff --git a/moli-protocol-server/src/protocol_server/cdp.rs b/moli-protocol-server/src/protocol_server/cdp.rs
index c0d481ab4..1858ec865 100644
--- a/moli-protocol-server/src/protocol_server/cdp.rs
+++ b/moli-protocol-server/src/protocol_server/cdp.rs
@@ -32,30 +32,20 @@ pub(super) async fn json_version(State(state): State<AppState>) -> impl IntoResp
}
pub(super) async fn json_list(State(state): State<AppState>, uri: Uri) -> impl IntoResponse {
+ if let Err(error) = ensure_default_target_is_published(&state).await {
+ tracing::warn!(
+ ?error,
+ "failed to publish the default CDP target for discovery"
+ );
+ }
let include_tab_targets = requests_tab_targets(&uri);
let target_infos = state
.cdp_agent_host_directory
.remote_debugging_target_infos(include_tab_targets);
- let targets = if target_infos.is_empty() {
- let mut targets = vec![default_target_json(
- &state,
- DEFAULT_TARGET_URL,
- DevToolsTargetKind::Page,
- )];
- if include_tab_targets {
- targets.push(default_target_json(
- &state,
- DEFAULT_TARGET_URL,
- DevToolsTargetKind::Tab,
- ));
- }
- targets
- } else {
- target_infos
- .into_iter()
- .filter_map(|target_info| target_json(&state, target_info))
- .collect()
- };
+ let targets = target_infos
+ .into_iter()
+ .filter_map(|target_info| target_json(&state, target_info))
+ .collect::<Vec<_>>();
axum::Json(json!(targets))
}
@@ -132,10 +122,20 @@ pub(super) async fn json_activate_target(
Path(target_id): Path<String>,
State(state): State<AppState>,
) -> Response {
- let route = state.cdp_agent_host_directory.lookup_target(&target_id);
- if is_default_target_id(&target_id) && route.is_none() {
- return (StatusCode::OK, "Target activated").into_response();
+ if is_default_target_id(&target_id)
+ && state
+ .cdp_agent_host_directory
+ .lookup_target(&target_id)
+ .is_none()
+ && let Err(error) = ensure_default_target_is_published(&state).await
+ {
+ return (
+ StatusCode::SERVICE_UNAVAILABLE,
+ format!("Unable to create default target: {error}"),
+ )
+ .into_response();
}
+ let route = state.cdp_agent_host_directory.lookup_target(&target_id);
let Some(route) = route else {
return no_such_target_response(&target_id);
};
@@ -153,8 +153,18 @@ pub(super) async fn json_close_target(
Path(target_id): Path<String>,
State(state): State<AppState>,
) -> Response {
- if is_default_target_id(&target_id) {
- return (StatusCode::OK, "Target is closing").into_response();
+ if is_default_target_id(&target_id)
+ && state
+ .cdp_agent_host_directory
+ .lookup_target(&target_id)
+ .is_none()
+ && let Err(error) = ensure_default_target_is_published(&state).await
+ {
+ return (
+ StatusCode::SERVICE_UNAVAILABLE,
+ format!("Unable to create default target: {error}"),
+ )
+ .into_response();
}
let Some(route) = state.cdp_agent_host_directory.lookup_target(&target_id) else {
return no_such_target_response(&target_id);
@@ -177,29 +187,6 @@ fn no_such_target_response(target_id: &str) -> Response {
.into_response()
}
-fn default_target_json(
- state: &AppState,
- target_url: &str,
- kind: DevToolsTargetKind,
-) -> serde_json::Value {
- let (target_id, target_type) = match kind {
- DevToolsTargetKind::Page => (DEFAULT_CDP_PAGE_TARGET_ID, "page"),
- DevToolsTargetKind::Tab => (DEFAULT_CDP_TAB_TARGET_ID, "tab"),
- _ => unreachable!("remote debugging discovery only selects page or tab targets"),
- };
- let (devtools_frontend_url, websocket_debugger_url) =
- target_endpoint_urls(state, target_id).expect("default target URL prefixes must be valid");
- json!({
- "description": "",
- "devtoolsFrontendUrl": devtools_frontend_url,
- "id": target_id,
- "title": target_url,
- "type": target_type,
- "url": target_url,
- "webSocketDebuggerUrl": websocket_debugger_url,
- })
-}
-
fn target_json(state: &AppState, target_info: DevToolsTargetInfo) -> Option<serde_json::Value> {
let target_id = target_info.target_id.as_ref()?.as_str();
let target_type = match target_info.kind {
@@ -219,6 +206,17 @@ fn target_json(state: &AppState, target_info: DevToolsTargetInfo) -> Option<serd
}))
}
+async fn ensure_default_target_is_published(state: &AppState) -> Result<(), String> {
+ let endpoint = state
+ .cdp_owner_registry
+ .shared_owner()
+ .map_err(|error| error.to_string())?;
+ endpoint
+ .ensure_default_target()
+ .await
+ .map_err(|error| error.to_string())
+}
+
fn target_endpoint_urls(state: &AppState, target_id: &str) -> Option<(String, String)> {
let websocket_prefix = state.page_ws_url.strip_suffix(DEFAULT_CDP_PAGE_TARGET_ID)?;
let frontend_prefix = state
@@ -286,15 +284,14 @@ pub(super) async fn ws_target_upgrade_handler(
ws: WebSocketUpgrade,
State(state): State<AppState>,
) -> Response {
- if is_default_target_id(&target_id) {
- let owner_registry = state.cdp_owner_registry;
- return ws.on_upgrade(move |socket| {
- run_shared_frontend_socket(
- socket,
- owner_registry,
- CdpFrontendSocketKind::Target { target_id },
- )
- });
+ if is_default_target_id(&target_id)
+ && state
+ .cdp_agent_host_directory
+ .lookup_target(&target_id)
+ .is_none()
+ && ensure_default_target_is_published(&state).await.is_err()
+ {
+ return StatusCode::SERVICE_UNAVAILABLE.into_response();
}
let Some(route) = state.cdp_agent_host_directory.lookup_target(&target_id) else {
return StatusCode::NOT_FOUND.into_response();
diff --git a/moli-protocol-server/src/protocol_server/tests/misc.rs b/moli-protocol-server/src/protocol_server/tests/misc.rs
index 2fb753890..d2012b9dc 100644
--- a/moli-protocol-server/src/protocol_server/tests/misc.rs
+++ b/moli-protocol-server/src/protocol_server/tests/misc.rs
@@ -243,7 +243,7 @@ async fn discovery_endpoints_accept_trailing_slashes() {
json!("/devtools/inspector.html?ws=127.0.0.1:9222/devtools/page/moli-default")
);
assert_eq!(list[0]["id"], json!(DEFAULT_TARGET_ID));
- assert_eq!(list[0]["title"], json!(DEFAULT_TARGET_URL));
+ assert_eq!(list[0]["title"], json!(""));
assert_eq!(list[0]["type"], json!("page"));
assert_eq!(list[0]["url"], json!(DEFAULT_TARGET_URL));
@@ -610,3 +610,61 @@ async fn chromium_devtools_activate_and_close_return_text_payloads() {
assert_eq!(status, StatusCode::NOT_FOUND);
assert_eq!(body, "No such target id: missing");
}
+
+#[tokio::test]
+async fn closed_default_target_is_not_readvertised_by_discovery() {
+ let app = build_router(test_state());
+ let first_list = app
+ .clone()
+ .oneshot(
+ Request::builder()
+ .uri("/json/list?for_tab")
+ .body(Body::empty())
+ .expect("list request"),
+ )
+ .await
+ .expect("first list response");
+ let first_list = serde_json::from_slice::<serde_json::Value>(
+ &to_bytes(first_list.into_body(), usize::MAX)
+ .await
+ .expect("first list body"),
+ )
+ .expect("first list JSON");
+ assert!(first_list.as_array().is_some_and(|targets| {
+ targets
+ .iter()
+ .any(|target| target["id"] == json!(DEFAULT_TARGET_ID))
+ && targets
+ .iter()
+ .any(|target| target["id"] == json!(DEFAULT_TAB_TARGET_ID))
+ }));
+
+ let close = app
+ .clone()
+ .oneshot(
+ Request::builder()
+ .uri("/json/close/moli-default")
+ .body(Body::empty())
+ .expect("close request"),
+ )
+ .await
+ .expect("close response");
+ assert_eq!(close.status(), StatusCode::OK);
+
+ let second_list = app
+ .oneshot(
+ Request::builder()
+ .uri("/json/list?for_tab")
+ .body(Body::empty())
+ .expect("second list request"),
+ )
+ .await
+ .expect("second list response");
+ let second_list = serde_json::from_slice::<serde_json::Value>(
+ &to_bytes(second_list.into_body(), usize::MAX)
+ .await
+ .expect("second list body"),
+ )
+ .expect("second list JSON");
+ assert_eq!(second_list, json!([]));
+}