11use super::rate_limit::MAX_IMAGE_RETRY_AFTER;
22use super::{
3- apply_image_result, declares_animation, extract_favicon_url, extract_image_url ,
4- extract_link_preview_metadata, fetch_link_preview_metadata, fetch_sanitized_image_using ,
5- is_html_response, read_bytes_prefix, retry_after_duration, retryable_image_cooldown ,
6- sanitize_image, ImageFetchError, LinkPreviewImageFetchState, LinkPreviewMetadata ,
7- MAX_INLINE_IMAGE_COOLDOWN, MAX_METADATA_DESCRIPTION_CHARS,
3+ apply_image_result, cancel_link_preview_metadata, declares_animation, extract_favicon_url ,
4+ extract_image_url, extract_link_preview_metadata, fetch_link_preview_metadata ,
5+ fetch_sanitized_image_using, is_html_response, read_bytes_prefix, retry_after_duration,
6+ retryable_image_cooldown, sanitize_image, ImageFetchError, LinkPreviewImageFetchState,
7+ LinkPreviewMetadata, MAX_INLINE_IMAGE_COOLDOWN, MAX_METADATA_DESCRIPTION_CHARS,
88};
99use axum::{body::Body, http::Response, routing::get, Router};
1010use base64::Engine as _;
@@ -66,7 +66,7 @@ async fn metadata_pipeline_remains_pending_beyond_former_aggregate_deadline() {
6666 .await;
6767 let fetch = tokio::spawn(super::METADATA_TEST_SERVER.scope(
6868 address,
69- fetch_link_preview_metadata("https://user-paced.example/preview".to_string()),
69+ fetch_link_preview_metadata("https://user-paced.example/preview".to_string(), None ),
7070 ));
7171
7272 request_started_rx.await.unwrap();
@@ -78,6 +78,53 @@ async fn metadata_pipeline_remains_pending_beyond_former_aggregate_deadline() {
7878 assert_eq!(metadata.title, "User-paced metadata");
7979}
8080
81+ #[tokio::test]
82+ async fn metadata_command_cancellation_drops_an_in_flight_response() {
83+ let (request_started_tx, request_started_rx) = oneshot::channel::<()>();
84+ let request_started_tx = Arc::new(Mutex::new(Some(request_started_tx)));
85+ let (_release_response_tx, release_response_rx) = oneshot::channel::<()>();
86+ let release_response_rx = Arc::new(Mutex::new(Some(release_response_rx)));
87+ let address = start_test_server(Router::new().route(
88+ "/preview",
89+ get(move || {
90+ let request_started_tx = Arc::clone(&request_started_tx);
91+ let release_response_rx = Arc::clone(&release_response_rx);
92+ async move {
93+ request_started_tx
94+ .lock()
95+ .unwrap()
96+ .take()
97+ .unwrap()
98+ .send(())
99+ .unwrap();
100+ let release_response_rx = release_response_rx.lock().unwrap().take().unwrap();
101+ let _ = release_response_rx.await;
102+ Response::builder()
103+ .header("content-type", "text/html")
104+ .body(Body::from("<title>Too late</title>"))
105+ .unwrap()
106+ }
107+ }),
108+ ))
109+ .await;
110+ let request_id = "cancel-in-flight".to_string();
111+ let fetch = tokio::spawn(super::METADATA_TEST_SERVER.scope(
112+ address,
113+ fetch_link_preview_metadata(
114+ "https://cancel.example/preview".to_string(),
115+ Some(request_id.clone()),
116+ ),
117+ ));
118+
119+ request_started_rx.await.unwrap();
120+ cancel_link_preview_metadata(request_id);
121+
122+ assert_eq!(
123+ fetch.await.unwrap(),
124+ Err("link preview request cancelled".to_string())
125+ );
126+ }
127+
81128#[tokio::test(start_paused = true)]
82129async fn first_rate_limit_and_queued_host_request_share_one_cooldown_boundary() {
83130 let cooldown = std::time::Duration::from_secs(20);
0 commit comments