diff --git a/Cargo.lock b/Cargo.lock index 2cea973082716e761ef6f5dd5886acc08ff9aac0..8c43fb75c472b102e6e1d3b837dce3355be898f2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,6 +17,28 @@ version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" +[[package]] +name = "async-stream" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "async-trait" version = "0.1.89" @@ -1242,9 +1264,11 @@ dependencies = [ name = "sorter2-server" version = "0.0.1" dependencies = [ + "async-stream", "axum", "axum-extra", "dotenvy", + "futures-util", "maud", "reqwest", "serde", diff --git a/server/Cargo.toml b/server/Cargo.toml index bd600138b613bd0f546bdec217a5334cdcb20aa5..c940acb687fb141d21760a3d6656172013cf6f41 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -18,6 +18,8 @@ tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["env-filter"] } reqwest = { version = "0.12", features = ["json"] } dotenvy = "0.15" +async-stream = "0.3" +futures-util = { version = "0.3", default-features = false, features = ["std"] } [dev-dependencies] reqwest = { version = "0.12", features = ["json"] } diff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs index b33a84e8bb5e817b26592868d88090e6d664d950..7af6527d03c483f33f3469ce6766c01a554c5fe3 100644 --- a/server/src/api/ui_html.rs +++ b/server/src/api/ui_html.rs @@ -6,7 +6,8 @@ use axum::{ use std::collections::HashMap; use crate::{ - html::{entity_section, input_panel, js_string_literal, ranking_panel, JsBuilder}, + fetch, + html::{input_panel, js_string_literal, ranking_panel, JsBuilder}, parser::parse_reddit_url, path_types::ItemId, reddit::ensure_partial_tree, @@ -89,18 +90,8 @@ pub async fn post_ui_html( }, HtmlUiAction::FetchEntity { item } => { let id = parse_item_param(&item); - if id.is_root() { - return ui_js_warn("nothing to fetch for the root").into_response(); - } - state.queue_entity_fetch(id.clone()); - let tree = state.tree.read().await; - let empty = crate::reducer::NodeState::default(); - let node = tree.get(&id).unwrap_or(&empty); - let panel = entity_section(&id, node, true); - JsBuilder::new() - .morph_selector("#entity-section", panel) - .into_response() - }, + fetch::fetch_entity_stream(state, id).into_response() + } } } diff --git a/server/src/fetch/html.rs b/server/src/fetch/html.rs new file mode 100644 index 0000000000000000000000000000000000000000..63634508496e224c38b9ec0308b7a6086462f925 --- /dev/null +++ b/server/src/fetch/html.rs @@ -0,0 +1,67 @@ +//! Markup for entity import / “Fetch from Reddit” (`POST /ui`, SSE response). + +use maud::{html, Markup}; + +use crate::{ + form_template::template_json_compact, + path_types::ItemId, + reddit::is_fetchable, + reducer::NodeState, + ui_action::UI_RPC_FIELD, +}; + +fn entity_panel(node: &NodeState) -> Markup { + html! { + @if let Some(data) = &node.data { + div id="entity-panel" class="entity-card" { + h2 { (data.title) } + @if let Some(author) = &data.author { + p class="muted small" { "by " (author) } + } + @if let Some(body) = &data.body_html { + div class="entity-body" { (maud::PreEscaped(body)) } + } + } + } + } +} + +/// Reddit/API import — `POST /ui` with `fetch_entity` returns an SSE stream. +pub fn fetch_entity_panel(item: &ItemId, has_data: bool, fetching: bool) -> Markup { + if !is_fetchable(item) { + return html! {}; + } + let label = if fetching { + "Fetching…" + } else if has_data { + "Fetch more" + } else { + "Fetch from Reddit" + }; + let rpc = template_json_compact(&serde_json::json!({ + "action": "fetch_entity", + "item": item.as_str(), + })) + .expect("fetch_entity rpc template"); + html! { + form method="post" action="/ui" id="fetch-entity-form" class="fetch-entity-form" { + input type="hidden" name=(UI_RPC_FIELD) value=(rpc); + @if fetching { + button type="submit" class="btn-secondary" disabled { (label) } + } @else { + button type="submit" class="btn-secondary" { (label) } + } + } + } +} + +/// Entity card + fetch control (target `#entity-section` for Idiomorph / SSE). +pub fn entity_section(item: &ItemId, node: &NodeState, fetching: bool) -> Markup { + let has_data = node.data.is_some(); + html! { + section id="entity-section" class="demo-panel" { + (entity_panel(node)) + (fetch_entity_panel(item, has_data, fetching)) + } + } +} diff --git a/server/src/fetch/mod.rs b/server/src/fetch/mod.rs new file mode 100644 index 0000000000000000000000000000000000000000..2290f9d3a0f1cbf1806c6339f82a4515c11cc3d3 --- /dev/null +++ b/server/src/fetch/mod.rs @@ -0,0 +1,115 @@ +//! Entity import over `POST /ui` as SSE (Reddit worker in [`crate::reddit`]). + +pub mod html; + +use std::convert::Infallible; +use std::time::Duration; + +use async_stream::stream; +use axum::response::sse::{Event, KeepAlive, Sse}; +use futures_util::Stream; +use serde::Serialize; +use tokio::sync::oneshot; + +use crate::{ + path_types::ItemId, + reddit::FetchJobResult, + reducer::NodeState, + state::AppState, +}; + +pub fn now_ms() -> i64 { + let t = std::time::SystemTime::now() + .duration_since(std::time::UNIX_EPOCH) + .unwrap_or_default(); + t.as_millis() as i64 +} + +#[derive(Serialize)] +struct SseMorphPayload { + selector: &'static str, + html: String, +} + +fn morph_complete_event(html: maud::Markup) -> Event { + let payload = SseMorphPayload { + selector: "#entity-section", + html: html.into_string(), + }; + let data = serde_json::to_string(&payload).unwrap_or_else(|_| "{}".into()); + Event::default().event("complete").data(data) +} + +/// Stream `fetching` → `complete` / `error` for [`crate::ui_action::HtmlUiAction::FetchEntity`]. +pub fn fetch_entity_stream( + state: AppState, + id: ItemId, +) -> Sse>> { + tracing::debug!(item = %id, "fetch entity stream opened"); + + let stream = stream! { + if id.is_root() { + yield Ok(Event::default().event("error").data("{\"message\":\"nothing to fetch for the root\"}")); + return; + } + + if !crate::reddit::is_fetchable(&id) { + tracing::debug!(item = %id, "fetch stream: not fetchable"); + yield Ok(Event::default().event("error").data("{\"message\":\"this page cannot be fetched from Reddit\"}")); + return; + } + + let fetching_html = { + let tree = state.tree.read().await; + let empty = NodeState::default(); + let node = tree.get(&id).unwrap_or(&empty); + html::entity_section(&id, node, true).into_string() + }; + let fetching_payload = serde_json::json!({ + "selector": "#entity-section", + "html": fetching_html, + }); + yield Ok(Event::default().event("fetching").data(fetching_payload.to_string())); + + let (tx, rx) = oneshot::channel(); + state.reddit.request_fetch(id.clone(), true, Some(tx)); + tracing::debug!(item = %id, "fetch stream: queued reddit job"); + + let result = match rx.await { + Ok(r) => r, + Err(_) => { + tracing::warn!(item = %id, "fetch stream: worker dropped oneshot"); + FetchJobResult::Failed("reddit worker stopped".into()) + } + }; + + tracing::debug!(item = %id, ?result, "fetch stream: job finished"); + + match result { + FetchJobResult::Imported | FetchJobResult::NotFound => { + let tree = state.tree.read().await; + let empty = NodeState::default(); + let node = tree.get(&id).unwrap_or(&empty); + yield Ok(morph_complete_event(html::entity_section(&id, node, false))); + } + FetchJobResult::SkippedCached | FetchJobResult::SkippedDuplicate => { + let tree = state.tree.read().await; + let empty = NodeState::default(); + let node = tree.get(&id).unwrap_or(&empty); + yield Ok(morph_complete_event(html::entity_section(&id, node, false))); + } + FetchJobResult::RateLimited { reset_secs } => { + yield Ok(Event::default().event("error").data( + serde_json::json!({"message": format!("Reddit rate limit — retry in {reset_secs}s")}).to_string(), + )); + } + FetchJobResult::Failed(msg) => { + yield Ok(Event::default().event("error").data( + serde_json::json!({"message": msg}).to_string(), + )); + } + } + }; + + Sse::new(stream).keep_alive(KeepAlive::new().interval(Duration::from_secs(15))) +} diff --git a/server/src/html/mod.rs b/server/src/html/mod.rs index db5b4c7f06b0be64603981166835cde268234f67..9314a7556306ddab969b896dbf4126b542a46722 100644 --- a/server/src/html/mod.rs +++ b/server/src/html/mod.rs @@ -7,10 +7,10 @@ use axum::{ use maud::{html, Markup, DOCTYPE}; use crate::{ + fetch::html::entity_section, form_template::template_json_compact, path_types::ItemId, ranking::{top_bottom, RankedItem}, - reddit::is_fetchable, reducer::{GroupState, NodeState}, state::AppState, ui_action::UI_RPC_FIELD, @@ -149,62 +149,6 @@ pub fn breadcrumb_path(item: &ItemId) -> Markup { } } -fn entity_panel(node: &NodeState) -> Markup { - html! { - @if let Some(data) = &node.data { - div id="entity-panel" class="entity-card" { - h2 { (data.title) } - @if let Some(author) = &data.author { - p class="muted small" { "by " (author) } - } - @if let Some(body) = &data.body_html { - div class="entity-body" { (maud::PreEscaped(body)) } - } - } - } - } -} - -/// Reddit/API import control — only shown on fetchable pages; never auto-fires. -pub fn fetch_entity_panel(item: &ItemId, has_data: bool, fetching: bool) -> Markup { - if !is_fetchable(item) { - return html! {}; - } - let label = if fetching { - "Fetching…" - } else if has_data { - "Fetch more" - } else { - "Fetch from Reddit" - }; - let rpc = template_json_compact(&serde_json::json!({ - "action": "fetch_entity", - "item": item.as_str(), - })) - .expect("fetch_entity rpc template"); - html! { - form method="post" action="/ui" id="fetch-entity-form" class="fetch-entity-form" { - input type="hidden" name=(UI_RPC_FIELD) value=(rpc); - @if fetching { - button type="submit" class="btn-secondary" disabled { (label) } - } @else { - button type="submit" class="btn-secondary" { (label) } - } - } - } -} - -/// Entity card + explicit fetch control (morphed as `#entity-section`). -pub fn entity_section(item: &ItemId, node: &NodeState, fetching: bool) -> Markup { - let has_data = node.data.is_some(); - html! { - section id="entity-section" class="demo-panel" { - (entity_panel(node)) - (fetch_entity_panel(item, has_data, fetching)) - } - } -} - fn rank_list(label: &str, items: &[RankedItem], start_rank: usize) -> Markup { html! { @if !items.is_empty() { diff --git a/server/src/lib.rs b/server/src/lib.rs index 79b173f391a96ae5d0d96fd656e1e8d2dd070d09..0677363e0ed21d244bfa065f7ec728549ddd9e50 100644 --- a/server/src/lib.rs +++ b/server/src/lib.rs @@ -1,6 +1,7 @@ pub mod api; pub mod event_log; pub mod events; +pub mod fetch; pub mod form_template; pub mod html; pub mod parser; diff --git a/server/src/reddit.rs b/server/src/reddit.rs index ff0f01e57b18af878eb5be3efc47204a7673589d..0e6ce32720951a58456852b67fb76a85dd9f4aad 100644 --- a/server/src/reddit.rs +++ b/server/src/reddit.rs @@ -7,12 +7,12 @@ use std::time::{Duration, Instant}; use reqwest::{header, Client, StatusCode}; use serde::Deserialize; use serde_json::Value; -use tokio::sync::{mpsc, RwLock}; +use tokio::sync::{mpsc, oneshot, RwLock}; use crate::{ event_log::EventLog, events::Event, - html::now_ms, + fetch::now_ms, path_types::ItemId, reducer::GlobalTree, }; @@ -22,10 +22,21 @@ pub fn ensure_partial_tree(tree: &mut GlobalTree, id: &ItemId) { tree.ensure_path(id); } +#[derive(Debug, Clone, PartialEq, Eq)] +pub enum FetchJobResult { + Imported, + NotFound, + SkippedDuplicate, + SkippedCached, + RateLimited { reset_secs: u64 }, + Failed(String), +} + pub struct RedditCommand { pub id: ItemId, /// User-initiated fetch bypasses the in-memory "recently fetched" cache. pub force: bool, + pub done: Option>, } #[derive(Clone)] @@ -72,14 +83,29 @@ impl RedditBroker { .build() .expect("reqwest client"); + tracing::debug!( + api_base = %config.api_base, + oauth_base = %config.oauth_base, + oauth = config.creds.is_some(), + "reddit worker started" + ); + tokio::spawn(reddit_worker(rx, tree, event_log, client, config)); Self { tx } } /// Queue a fetch; drops when the channel is full (backpressure). - pub fn request_fetch(&self, id: ItemId, force: bool) { - let _ = self.tx.try_send(RedditCommand { id, force }); + pub fn request_fetch( + &self, + id: ItemId, + force: bool, + done: Option>, + ) { + match self.tx.try_send(RedditCommand { id: id.clone(), force, done }) { + Ok(()) => tracing::debug!(item = %id, force, "reddit fetch queued"), + Err(_) => tracing::warn!(item = %id, "reddit fetch queue full, dropped"), + } } } @@ -95,8 +121,6 @@ impl RedditApiConfig { } impl RedditCredentials { - /// Reddit's OAuth docs call these "client id" and "client secret"; the app - /// registration UI often labels them "app id" / "app secret" — same values. fn from_env() -> Option { let client_id = std::env::var("REDDIT_CLIENT_ID") .or_else(|_| std::env::var("REDDIT_APP_ID")) @@ -128,12 +152,10 @@ pub fn default_user_agent() -> String { }) } -/// True when this node can be loaded from the Reddit JSON API. pub fn is_fetchable(id: &ItemId) -> bool { !map_item_to_reddit_api(id, "https://example.com").is_empty() } -/// Derive UI-facing fields from a stored payload (Reddit-specific when under reddit.com). pub fn entity_view_from_payload(id: &ItemId, payload: &Value) -> Option { if id.as_str().starts_with("reddit.com") { return parse_reddit_view(id, payload); @@ -141,12 +163,17 @@ pub fn entity_view_from_payload(id: &ItemId, payload: &Value) -> Option>, result: FetchJobResult) { + if let Some(tx) = done { + let _ = tx.send(result); + } +} + async fn reddit_worker( mut rx: mpsc::Receiver, tree: Arc>, @@ -168,15 +195,25 @@ async fn reddit_worker( recently_fetched.retain(|_, t| now.duration_since(*t) < cache_ttl); if in_flight.contains(&cmd.id) { + tracing::debug!(item = %cmd.id, "reddit fetch skipped: already in flight"); + notify(cmd.done, FetchJobResult::SkippedDuplicate); continue; } if !cmd.force && recently_fetched.contains_key(&cmd.id) { + tracing::debug!(item = %cmd.id, "reddit fetch skipped: recently fetched cache"); + notify(cmd.done, FetchJobResult::SkippedCached); continue; } in_flight.insert(cmd.id.clone()); let fetch_id = cmd.id.clone(); + let done = cmd.done; + tracing::debug!( + item = %fetch_id, + delay_ms = current_delay.as_millis(), + "reddit fetch starting after delay" + ); tokio::time::sleep(current_delay).await; if let Some(c) = &creds { @@ -184,8 +221,18 @@ async fn reddit_worker( } let token = oauth.as_ref().map(|t| t.access_token.as_str()); + if token.is_some() { + tracing::debug!(item = %fetch_id, "reddit fetch using OAuth bearer"); + } + + let fetch_base = if token.is_some() { + &oauth_base + } else { + &api_base + }; + let outcome = do_fetch(&client, fetch_base, &fetch_id, token).await; - match do_fetch(&client, &api_base, &fetch_id, token).await { + match outcome { Ok(FetchOutcome::Payload(payload)) => { let ts = now_ms(); let event = Event::EntityImported { @@ -193,30 +240,49 @@ async fn reddit_worker( ts, payload: payload.clone(), }; - if let Err(e) = event_log.append(&event).await { - tracing::warn!("event log append failed for {}: {}", fetch_id, e); - } else { - apply_entity_import(&mut *tree.write().await, &fetch_id, payload); - recently_fetched.insert(fetch_id.clone(), Instant::now()); - current_delay = Duration::from_millis(600); + tracing::debug!( + item = %fetch_id, + ts, + payload_keys = ?payload.as_object().map(|o| o.len()), + "reddit fetch got JSON payload, appending event" + ); + match event_log.append(&event).await { + Err(e) => { + tracing::warn!( + item = %fetch_id, + err = %e, + "reddit event log append failed" + ); + notify(done, FetchJobResult::Failed(e.to_string())); + } + Ok(()) => { + apply_entity_import(&mut *tree.write().await, &fetch_id, payload); + recently_fetched.insert(fetch_id.clone(), Instant::now()); + current_delay = Duration::from_millis(600); + tracing::info!(item = %fetch_id, "reddit entity imported"); + notify(done, FetchJobResult::Imported); + } } } Ok(FetchOutcome::NotFound) => { + tracing::debug!(item = %fetch_id, "reddit fetch: not found (no event written)"); recently_fetched.insert(fetch_id.clone(), Instant::now()); + notify(done, FetchJobResult::NotFound); } Ok(FetchOutcome::RateLimited { reset_secs }) => { - let wait = Duration::from_secs(reset_secs.max(1)); tracing::warn!( - "Reddit rate limit for {}; sleeping {}s", - fetch_id, - wait.as_secs() + item = %fetch_id, + reset_secs, + "reddit rate limited" ); - tokio::time::sleep(wait).await; + tokio::time::sleep(Duration::from_secs(reset_secs.max(1))).await; current_delay = (current_delay * 2).min(Duration::from_secs(60)); + notify(done, FetchJobResult::RateLimited { reset_secs }); } Err(e) => { - tracing::warn!("Reddit fetch failed for {}: {}", fetch_id, e); + tracing::warn!(item = %fetch_id, err = %e, "reddit fetch failed"); current_delay = (current_delay * 2).min(Duration::from_secs(60)); + notify(done, FetchJobResult::Failed(e)); } } @@ -238,6 +304,7 @@ async fn ensure_oauth_token( ) -> Option { if let Some(t) = existing { if Instant::now() < t.expires_at - Duration::from_secs(60) { + tracing::debug!("reddit OAuth token still valid"); return Some(t); } } @@ -246,6 +313,7 @@ async fn ensure_oauth_token( "{}/api/v1/access_token", oauth_base.trim_end_matches('/') ); + tracing::debug!(%url, "reddit OAuth token request"); let resp = client .post(&url) @@ -257,13 +325,13 @@ async fn ensure_oauth_token( let resp = match resp { Ok(r) => r, Err(e) => { - tracing::warn!("Reddit OAuth token request failed: {e}"); + tracing::warn!("reddit OAuth token request failed: {e}"); return None; } }; if !resp.status().is_success() { - tracing::warn!("Reddit OAuth token HTTP {}", resp.status()); + tracing::warn!("reddit OAuth token HTTP {}", resp.status()); return None; } @@ -276,11 +344,12 @@ async fn ensure_oauth_token( let body: TokenResponse = match resp.json().await { Ok(b) => b, Err(e) => { - tracing::warn!("Reddit OAuth token parse failed: {e}"); + tracing::warn!("reddit OAuth token parse failed: {e}"); return None; } }; + tracing::debug!(expires_in = body.expires_in, "reddit OAuth token acquired"); Some(OAuthToken { access_token: body.access_token, expires_at: Instant::now() + Duration::from_secs(body.expires_in), @@ -295,35 +364,72 @@ async fn do_fetch( ) -> Result { let url = map_item_to_reddit_api(id, api_base); if url.is_empty() { + tracing::debug!(item = %id, "reddit do_fetch: no API URL for item"); return Ok(FetchOutcome::NotFound); } + tracing::debug!(item = %id, %url, bearer = bearer.is_some(), "reddit HTTP GET"); + let mut req = client.get(&url); if let Some(token) = bearer { req = req.bearer_auth(token); } - let resp = req.send().await.map_err(|e| e.to_string())?; + let resp = req.send().await.map_err(|e| { + tracing::debug!(item = %id, %url, err = %e, "reddit HTTP transport error"); + e.to_string() + })?; + + let status = resp.status(); + tracing::debug!( + item = %id, + %url, + %status, + remaining = ?rate_limit_remaining(&resp), + reset = ?rate_limit_reset_secs(&resp), + "reddit HTTP response" + ); - if resp.status() == StatusCode::TOO_MANY_REQUESTS { + if status == StatusCode::TOO_MANY_REQUESTS { let reset = rate_limit_reset_secs(&resp); return Ok(FetchOutcome::RateLimited { reset_secs: reset }); } - if resp.status() == StatusCode::SERVICE_UNAVAILABLE { - return Err("Reddit unavailable (503)".to_string()); + if status == StatusCode::SERVICE_UNAVAILABLE { + return Err("Reddit unavailable (503)".into()); } - if !resp.status().is_success() { + if !status.is_success() { + let body = resp.text().await.unwrap_or_default(); + tracing::debug!( + item = %id, + %status, + body_len = body.len(), + body_prefix = %body.chars().take(240).collect::(), + "reddit non-success body" + ); return Ok(FetchOutcome::NotFound); } if rate_limit_remaining(&resp) == Some(0) { let reset = rate_limit_reset_secs(&resp); + tracing::debug!(item = %id, reset_secs = reset, "reddit headers: rate limit exhausted"); return Ok(FetchOutcome::RateLimited { reset_secs: reset }); } - let payload: Value = resp.json().await.map_err(|e| e.to_string())?; + let text = resp.text().await.map_err(|e| e.to_string())?; + tracing::debug!(item = %id, bytes = text.len(), "reddit response body received"); + + let payload: Value = serde_json::from_str(&text).map_err(|e| { + tracing::debug!( + item = %id, + err = %e, + body_prefix = %text.chars().take(240).collect::(), + "reddit JSON parse failed" + ); + format!("invalid JSON: {e}") + })?; + Ok(FetchOutcome::Payload(payload)) } @@ -344,7 +450,6 @@ fn rate_limit_reset_secs(resp: &reqwest::Response) -> u64 { .unwrap_or(5) } -/// Map canonical item id to a Reddit JSON API URL under `api_base`. pub fn map_item_to_reddit_api(id: &ItemId, api_base: &str) -> String { let path = id.as_str(); if !path.starts_with("reddit.com/") && path != "reddit.com" { @@ -445,26 +550,6 @@ mod tests { map_item_to_reddit_api(&id, "https://www.reddit.com"), "https://www.reddit.com/r/rust/about.json?raw_json=1" ); - assert_eq!( - map_item_to_reddit_api(&id, "http://127.0.0.1:9999"), - "http://127.0.0.1:9999/r/rust/about.json?raw_json=1" - ); - } - - #[test] - fn map_post_url() { - let id = ItemId::parse("reddit.com/r/amitheasshole/comments/1trnvdl").unwrap(); - assert_eq!( - map_item_to_reddit_api(&id, "https://www.reddit.com"), - "https://www.reddit.com/r/amitheasshole/comments/1trnvdl.json?raw_json=1" - ); - } - - #[test] - fn is_fetchable_reddit_sub() { - let id = ItemId::parse("reddit.com/r/rust").unwrap(); - assert!(is_fetchable(&id)); - assert!(!is_fetchable(&ItemId::opaque("example.com/x"))); } #[test] @@ -477,19 +562,5 @@ mod tests { ) .unwrap(); assert_eq!(entity.title, "The Rust Programming Language"); - assert!(entity.body_html.as_ref().is_some_and(|b| b.contains("Rust"))); - } - - #[test] - fn parse_post_fixture() { - let json = r#"[{"kind":"Listing","data":{"children":[{"kind":"t3","data":{"title":"AITA","author":"op","selftext_html":"<p>hi</p>","thumbnail":"https://b.thumbs.redditmedia.com/x.jpg"}}]}}]"#; - let v: Value = serde_json::from_str(json).unwrap(); - let entity = entity_view_from_payload( - &ItemId::parse("reddit.com/r/x/comments/abc").unwrap(), - &v, - ) - .unwrap(); - assert_eq!(entity.title, "AITA"); - assert_eq!(entity.author.as_deref(), Some("op")); } } diff --git a/server/src/state.rs b/server/src/state.rs index d71d1079a8f486cdab15795384aef0b81b32544d..e7ff9f663e45b5e168d6a3869948e3bd890966d4 100644 --- a/server/src/state.rs +++ b/server/src/state.rs @@ -143,9 +143,9 @@ impl AppState { Ok(()) } - /// User-initiated Reddit/API import (via "Fetch more" — never on paste or navigate). - pub fn queue_entity_fetch(&self, id: ItemId) { - self.reddit.request_fetch(id, true); + /// User-initiated Reddit/API import (SSE / fetch module only). + pub fn queue_entity_fetch(&self, id: ItemId, done: Option>) { + self.reddit.request_fetch(id, true, done); } pub async fn record_vote( diff --git a/server/src/ui_action.rs b/server/src/ui_action.rs index 3d6a49a2a3fb950752827efe1f5a049308f09baf..ef9ac873fc0442e0b960f144309c8e91124d7884 100644 --- a/server/src/ui_action.rs +++ b/server/src/ui_action.rs @@ -26,7 +26,7 @@ pub enum HtmlUiAction { ParseQuery { query: String, }, - /// Fetch upstream entity data for the current page (explicit user action only). + /// Import entity data; `POST /ui` responds with `text/event-stream` (not JS). FetchEntity { item: String, }, diff --git a/server/static/sorter_ui.js b/server/static/sorter_ui.js index d9b016f197547f37ca4b2bcdd7ee6b673d0fb3f0..fe7bfc657c0fccae5c596d005b0e807abefec677 100644 --- a/server/static/sorter_ui.js +++ b/server/static/sorter_ui.js @@ -1,5 +1,5 @@ /** - * sorter2 web UI: fetch/eval for POST /ui. No product logic here. + * sorter2 web UI: POST /ui returns JS (morph) or SSE (entity fetch). */ (function () { function evalJs(js) { @@ -8,15 +8,98 @@ } } + function morphSelector(selector, html) { + var el = document.querySelector(selector); + if (el && typeof Idiomorph !== 'undefined') { + Idiomorph.morph(el, html); + } + } + + function handleSseEvent(eventType, data, form) { + if (eventType === 'fetching' || eventType === 'complete') { + try { + var msg = JSON.parse(data); + morphSelector(msg.selector || '#entity-section', msg.html); + } catch (err) { + console.warn('fetch morph parse', err); + } + } + if (eventType === 'complete' || eventType === 'error') { + var btn = form && form.querySelector('button[type="submit"]'); + if (btn) btn.disabled = false; + } + if (eventType === 'error') { + try { + var err = JSON.parse(data); + console.warn('fetch error:', err.message || data); + } catch (_e) { + console.warn('fetch error:', data); + } + } + } + + function consumeSseStream(response, form) { + var reader = response.body.getReader(); + var decoder = new TextDecoder(); + var buffer = ''; + var eventType = ''; + var dataLines = []; + + function dispatch() { + if (!eventType && dataLines.length === 0) return; + handleSseEvent(eventType || 'message', dataLines.join('\n'), form); + eventType = ''; + dataLines = []; + } + + function pump() { + return reader.read().then(function (chunk) { + if (chunk.done) { + dispatch(); + return; + } + buffer += decoder.decode(chunk.value, { stream: true }); + var parts = buffer.split('\n'); + buffer = parts.pop() || ''; + for (var i = 0; i < parts.length; i++) { + var line = parts[i].replace(/\r$/, ''); + if (line === '') { + dispatch(); + } else if (line.indexOf('event:') === 0) { + eventType = line.slice(6).trim(); + } else if (line.indexOf('data:') === 0) { + dataLines.push(line.slice(5).trim()); + } + } + return pump(); + }); + } + + return pump(); + } + function postUiForm(form) { + var btn = form.querySelector('button[type="submit"]'); + if (form.id === 'fetch-entity-form' && btn) { + btn.disabled = true; + } return fetch(form.action, { method: 'POST', body: new URLSearchParams(new FormData(form)), headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, credentials: 'same-origin', }).then(function (resp) { - return resp.text(); - }).then(evalJs); + var ct = resp.headers.get('content-type') || ''; + if (ct.indexOf('text/event-stream') !== -1) { + return consumeSseStream(resp, form); + } + return resp.text().then(evalJs); + }).catch(function (err) { + if (form.id === 'fetch-entity-form' && btn) { + btn.disabled = false; + } + console.warn('POST /ui failed', err); + }); } function initSorterUi() { diff --git a/test/reddit_import.clj b/test/reddit_import.clj index 54edaedeef08718c8f184d6aa468d8e6415068c7..17f2ee39e1498b0b6bb6a9d8a7e35608b0bd1b32 100644 --- a/test/reddit_import.clj +++ b/test/reddit_import.clj @@ -44,10 +44,12 @@ (do (Thread/sleep 200) (recur)) false)))))) -(defn- curl-post-ui [base rpc-json] +(defn- curl-fetch-ui-sse [base item] (process/shell {:out :string :err :string} - "curl" "-sf" "-X" "POST" (str base "/ui") - "--data-urlencode" (str "__rpc__=" rpc-json))) + "curl" "-sfN" "--max-time" "20" + "-X" "POST" (str base "/ui") + "--data-urlencode" + (str "__rpc__={\"action\":\"fetch_entity\",\"item\":\"" item "\"}"))) (defn- wait-event-log [path ms] (let [deadline (+ (System/currentTimeMillis) ms)] @@ -98,11 +100,12 @@ "curl" "-sf" browse-url))] (is (str/includes? before "Fetch from Reddit")) (is (not (str/includes? before "The Rust Programming Language"))) - (let [rpc "{\"action\":\"fetch_entity\",\"item\":\"reddit.com/r/rust\"}" - post (curl-post-ui app-base rpc) - log-path (str data-dir "/events.jsonl")] - (is (zero? (:exit post)) "fetch_entity POST succeeds") - (is (wait-event-log log-path 10000) "event log written") + (let [log-path (str data-dir "/events.jsonl") + sse (curl-fetch-ui-sse app-base "reddit.com/r/rust")] + (is (zero? (:exit sse)) "POST /ui fetch_entity SSE succeeds") + (is (str/includes? (:out sse) "event: complete")) + (is (str/includes? (:out sse) "The Rust Programming Language")) + (is (wait-event-log log-path 2000) "event log written") (let [after (:out (process/shell {:out :string :err :string} "curl" "-sf" browse-url)) log (slurp (io/file log-path))]