Compare commits

...

3 Commits

Author SHA1 Message Date
be5c3f7a34 fix: pass explicit locale to date formatting to prevent hydration mismatch
All checks were successful
Deploy with Docker Compose / deploy (push) Successful in 41s
Server and client could use different default locales for
toLocaleDateString/toLocaleString, causing React hydration errors.
Pass the user locale explicitly in JobsList and SettingsPage.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-21 13:36:35 +01:00
caa9922ff9 chore: bump version to 1.21.0 2026-03-21 13:34:47 +01:00
135f000c71 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>
2026-03-21 13:33:58 +01:00
7 changed files with 69 additions and 51 deletions

8
Cargo.lock generated
View File

@@ -64,7 +64,7 @@ checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
[[package]] [[package]]
name = "api" name = "api"
version = "1.20.1" version = "1.21.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"argon2", "argon2",
@@ -1232,7 +1232,7 @@ dependencies = [
[[package]] [[package]]
name = "indexer" name = "indexer"
version = "1.20.1" version = "1.21.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"axum", "axum",
@@ -1771,7 +1771,7 @@ dependencies = [
[[package]] [[package]]
name = "parsers" name = "parsers"
version = "1.20.1" version = "1.21.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"flate2", "flate2",
@@ -2906,7 +2906,7 @@ dependencies = [
[[package]] [[package]]
name = "stripstream-core" name = "stripstream-core"
version = "1.20.1" version = "1.21.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"serde", "serde",

View File

@@ -9,7 +9,7 @@ resolver = "2"
[workspace.package] [workspace.package]
edition = "2021" edition = "2021"
version = "1.20.1" version = "1.21.0"
license = "MIT" license = "MIT"
[workspace.dependencies] [workspace.dependencies]

View File

@@ -11,6 +11,7 @@ export async function GET(request: NextRequest) {
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,23 +26,28 @@ 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);
} }
@@ -49,22 +55,18 @@ export async function GET(request: NextRequest) {
} }
}; };
// Initial fetch const restartInterval = (ms: number) => {
await fetchJobs(); if (intervalId !== null) clearInterval(intervalId);
intervalId = setInterval(fetchJobs, ms);
};
// Poll every 2 seconds // Initial fetch + start polling
const interval = setInterval(async () => { await fetchJobs();
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();
}); });
}, },

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);
}; };
}, []); }, []);

View File

@@ -57,13 +57,13 @@ function getDateParts(dateStr: string): { mins: number; hours: number; useDate:
} }
export function JobsList({ initialJobs, libraries, highlightJobId }: JobsListProps) { export function JobsList({ initialJobs, libraries, highlightJobId }: JobsListProps) {
const { t } = useTranslation(); const { t, locale } = useTranslation();
const [jobs, setJobs] = useState(initialJobs); const [jobs, setJobs] = useState(initialJobs);
const formatDate = (dateStr: string): string => { const formatDate = (dateStr: string): string => {
const parts = getDateParts(dateStr); const parts = getDateParts(dateStr);
if (parts.useDate) { if (parts.useDate) {
return parts.date.toLocaleDateString(); return parts.date.toLocaleDateString(locale);
} }
if (parts.mins < 1) return t("time.justNow"); if (parts.mins < 1) return t("time.justNow");
if (parts.hours > 0) return t("time.hoursAgo", { count: parts.hours }); if (parts.hours > 0) return t("time.hoursAgo", { count: parts.hours });

View File

@@ -734,7 +734,7 @@ export default function SettingsPage({ initialSettings, initialCacheStats, initi
> >
<div className="flex items-center justify-between"> <div className="flex items-center justify-between">
<span className="text-sm font-medium text-foreground"> <span className="text-sm font-medium text-foreground">
{new Date(r.created_at).toLocaleString()} {new Date(r.created_at).toLocaleString(locale)}
</span> </span>
<span className="text-xs text-muted-foreground truncate ml-2" title={r.komga_url}> <span className="text-xs text-muted-foreground truncate ml-2" title={r.komga_url}>
{r.komga_url} {r.komga_url}

View File

@@ -1,6 +1,6 @@
{ {
"name": "stripstream-backoffice", "name": "stripstream-backoffice",
"version": "1.20.1", "version": "1.21.0",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "next dev -p 7082", "dev": "next dev -p 7082",