refactor: switch JobsIndicator from polling to SSE and fix stream endpoint

Replace fetch polling in JobsIndicator with EventSource connected to
/api/jobs/stream. Fix the SSE route to return all jobs (via
/index/status) instead of only active ones, since JobsList also
consumes this stream for the full job history. JobsIndicator now
filters active jobs client-side. SSE server-side uses adaptive
interval (2s active, 15s idle) and only sends when data changes.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
2026-03-21 13:33:58 +01:00
parent d9e50a4235
commit 135f000c71
2 changed files with 60 additions and 42 deletions

View File

@@ -7,10 +7,11 @@ export async function GET(request: NextRequest) {
const stream = new ReadableStream({ const stream = new ReadableStream({
async start(controller) { async start(controller) {
controller.enqueue(new TextEncoder().encode("")); controller.enqueue(new TextEncoder().encode(""));
let lastData: string | null = null; let lastData: string | null = null;
let isActive = true; let isActive = true;
let consecutiveErrors = 0; let consecutiveErrors = 0;
let intervalId: ReturnType<typeof setInterval> | null = null;
const fetchJobs = async () => { const fetchJobs = async () => {
if (!isActive) return; if (!isActive) return;
@@ -25,51 +26,52 @@ export async function GET(request: NextRequest) {
const data = await response.json(); const data = await response.json();
const dataStr = JSON.stringify(data); const dataStr = JSON.stringify(data);
// Send if data changed // Send only if data changed
if (dataStr !== lastData && isActive) { if (dataStr !== lastData && isActive) {
lastData = dataStr; lastData = dataStr;
try { try {
controller.enqueue( controller.enqueue(
new TextEncoder().encode(`data: ${dataStr}\n\n`) new TextEncoder().encode(`data: ${dataStr}\n\n`)
); );
} catch (err) { } catch {
// Controller closed, ignore
isActive = false; isActive = false;
} }
} }
// Adapt interval: 2s when active jobs exist, 15s when idle
const hasActiveJobs = data.some((j: { status: string }) =>
j.status === "running" || j.status === "pending" || j.status === "extracting_pages" || j.status === "generating_thumbnails"
);
const nextInterval = hasActiveJobs ? 2000 : 15000;
restartInterval(nextInterval);
} }
} catch (error) { } catch (error) {
if (isActive) { if (isActive) {
consecutiveErrors++; consecutiveErrors++;
// Only log first failure and every 30th to avoid spam
if (consecutiveErrors === 1 || consecutiveErrors % 30 === 0) { if (consecutiveErrors === 1 || consecutiveErrors % 30 === 0) {
console.warn(`SSE fetch error (${consecutiveErrors} consecutive):`, error); console.warn(`SSE fetch error (${consecutiveErrors} consecutive):`, error);
} }
} }
} }
}; };
// Initial fetch const restartInterval = (ms: number) => {
if (intervalId !== null) clearInterval(intervalId);
intervalId = setInterval(fetchJobs, ms);
};
// Initial fetch + start polling
await fetchJobs(); await fetchJobs();
// Poll every 2 seconds
const interval = setInterval(async () => {
if (!isActive) {
clearInterval(interval);
return;
}
await fetchJobs();
}, 2000);
// Cleanup // Cleanup
request.signal.addEventListener("abort", () => { request.signal.addEventListener("abort", () => {
isActive = false; isActive = false;
clearInterval(interval); if (intervalId !== null) clearInterval(intervalId);
controller.close(); controller.close();
}); });
}, },
}); });
return new Response(stream, { return new Response(stream, {
headers: { headers: {
"Content-Type": "text/event-stream", "Content-Type": "text/event-stream",

View File

@@ -54,44 +54,60 @@ export function JobsIndicator() {
const [popinStyle, setPopinStyle] = useState<React.CSSProperties>({}); const [popinStyle, setPopinStyle] = useState<React.CSSProperties>({});
useEffect(() => { useEffect(() => {
let intervalId: ReturnType<typeof setInterval> | null = null; let eventSource: EventSource | null = null;
let reconnectTimeout: ReturnType<typeof setTimeout> | null = null;
const fetchActiveJobs = async () => { const connect = () => {
try { if (eventSource) {
const response = await fetch("/api/jobs/active"); eventSource.close();
if (response.ok) {
const jobs: Job[] = await response.json();
setActiveJobs(jobs);
// Adapt polling interval: 2s when jobs are active, 30s when idle
restartInterval(jobs.length > 0 ? 2000 : 30000);
}
} catch (error) {
console.error("Failed to fetch jobs:", error);
} }
eventSource = new EventSource("/api/jobs/stream");
eventSource.onmessage = (event) => {
try {
const allJobs: Job[] = JSON.parse(event.data);
const active = allJobs.filter(j =>
j.status === "running" || j.status === "pending" ||
j.status === "extracting_pages" || j.status === "generating_thumbnails"
);
setActiveJobs(active);
} catch {
// ignore malformed data
}
};
eventSource.onerror = () => {
eventSource?.close();
eventSource = null;
// Reconnect after 5s on error
reconnectTimeout = setTimeout(connect, 5000);
};
}; };
const restartInterval = (ms: number) => { const disconnect = () => {
if (intervalId !== null) clearInterval(intervalId); if (reconnectTimeout) {
intervalId = setInterval(fetchActiveJobs, ms); clearTimeout(reconnectTimeout);
reconnectTimeout = null;
}
if (eventSource) {
eventSource.close();
eventSource = null;
}
}; };
const handleVisibilityChange = () => { const handleVisibilityChange = () => {
if (document.hidden) { if (document.hidden) {
if (intervalId !== null) { disconnect();
clearInterval(intervalId);
intervalId = null;
}
} else { } else {
// Refetch immediately when tab becomes visible, then resume polling connect();
fetchActiveJobs();
} }
}; };
fetchActiveJobs(); connect();
document.addEventListener("visibilitychange", handleVisibilityChange); document.addEventListener("visibilitychange", handleVisibilityChange);
return () => { return () => {
if (intervalId !== null) clearInterval(intervalId); disconnect();
document.removeEventListener("visibilitychange", handleVisibilityChange); document.removeEventListener("visibilitychange", handleVisibilityChange);
}; };
}, []); }, []);