From e9c8b14ee65956e6de403442d247d98c988033ab Mon Sep 17 00:00:00 2001 From: Hermes CEO Date: Fri, 30 Oct 2026 06:12:00 +0000 Subject: [PATCH] =?UTF-8?q?fleet(tower):=200.20=20=E2=80=94=20Re-Dispatch-?= =?UTF-8?q?Provenienz=20sichtbar=20(Badge=20statt=20Doppel-Button)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dead-Letter-Zeile mit re_dispatched_to zeigt '↻ zugestellt ' statt des Aktions-Buttons; Spool-Zeilen mit re_dispatch_of tragen ein ↻ vor dem Topic. TaskEnvelope um re_dispatch_of/re_dispatched_to erweitert. --- app/components/fleet/TaskBrowser.tsx | 106 ++++++++++++++++++++++++++- app/lib/fleet/health.ts | 2 +- app/lib/fleet/taskSource.ts | 4 + 3 files changed, 109 insertions(+), 3 deletions(-) diff --git a/app/components/fleet/TaskBrowser.tsx b/app/components/fleet/TaskBrowser.tsx index d99c8d0..e43dc73 100644 --- a/app/components/fleet/TaskBrowser.tsx +++ b/app/components/fleet/TaskBrowser.tsx @@ -33,6 +33,8 @@ type TaskEnvelope = { vs: string claimed_at: string status_label: string + re_dispatched_to: string + re_dispatch_of: string file: string } @@ -116,6 +118,7 @@ export default function TaskBrowser() { const [detail, setDetail] = useState(null) const [detailLoading, setDetailLoading] = useState(false) const [detailError, setDetailError] = useState("") + const [redis, setRedis] = useState>({}) const modalRef = useRef(null) const load = useCallback(async () => { @@ -139,6 +142,46 @@ export default function TaskBrowser() { return () => clearInterval(t) }, [load]) + /** Dead-Letter-Re-Dispatch: neuer Envelope ueber den board-service (Tower schreibt nie selbst). */ + const redispatch = useCallback( + async (taskId: string) => { + setRedis((prev) => ({ ...prev, [taskId]: { state: "busy", msg: "stelle zu…" } })) + try { + const res = await fetch("/api/fleet/task-redispatch", { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ id: taskId }), + }) + const body = (await res.json()) as { + result?: string + new_task_id?: string + reason?: string + problems?: string[] + } + const result = String(body.result || `HTTP ${res.status}`) + let state = "err" + let msg = result + if (result === "OK_REDISPATCHED") { + state = "ok" + msg = `erneut zugestellt -> ${body.new_task_id}` + } else if (result === "OK_ALREADY") { + state = "already" + msg = `bereits re-dispatched -> ${body.new_task_id || "?"}` + } else if (body.reason || body.problems?.length) { + msg = `${result}: ${body.reason || body.problems?.join("; ")}` + } + setRedis((prev) => ({ ...prev, [taskId]: { state, msg } })) + await load() + } catch (e) { + setRedis((prev) => ({ + ...prev, + [taskId]: { state: "err", msg: e instanceof Error ? e.message : String(e) }, + })) + } + }, + [load] + ) + const openDetail = useCallback(async (id: string, kind: string) => { setDetailLoading(true) setDetailError("") @@ -267,7 +310,8 @@ export default function TaskBrowser() { Typ Prio Status - Thema + Thema + {tab === "dead-letter" && Aktion} @@ -290,13 +334,71 @@ export default function TaskBrowser() { {t.priority} {t.status_label} + {t.re_dispatch_of !== "-" && t.re_dispatch_of !== "" && ( + + ↻ + + )} {t.topic} + {tab === "dead-letter" && ( + + {t.re_dispatched_to !== "-" && t.re_dispatched_to !== "" ? ( + + ↻ zugestellt {t.re_dispatched_to.slice(0, 8)} + + ) : redis[t.task_id] ? ( + + {redis[t.task_id].state === "ok" + ? "✔ " + : redis[t.task_id].state === "already" + ? "✔ " + : redis[t.task_id].state === "busy" + ? "… " + : "✖ "} + {redis[t.task_id].msg.slice(0, 42)} + + ) : ( + + )} + + )} ))} {data && ((tab === "spool" ? data.spool : data.dead_letter).length === 0) && ( - + {tab === "spool" ? "Keine offenen Tasks — Spool leer." : "Keine fehlgeschlagenen Tasks in den letzten 7 Tagen."} diff --git a/app/lib/fleet/health.ts b/app/lib/fleet/health.ts index 4da285c..95ff465 100644 --- a/app/lib/fleet/health.ts +++ b/app/lib/fleet/health.ts @@ -10,7 +10,7 @@ * Beide Endpunkte sind fail-loud-lesend: eine tote Quelle macht den Endpunkt * NICHT 500, sondern sichtbar degraded (Uptime-Monitoring braucht eine Antwort). */ -export const TOWER_VERSION = process.env.FLEET_TOWER_VERSION || "0.18" +export const TOWER_VERSION = process.env.FLEET_TOWER_VERSION || "0.20" export const TOWER_STARTED_AT_MS = Date.now() export type SourceState = { diff --git a/app/lib/fleet/taskSource.ts b/app/lib/fleet/taskSource.ts index 9177294..ab9ebf7 100644 --- a/app/lib/fleet/taskSource.ts +++ b/app/lib/fleet/taskSource.ts @@ -55,6 +55,8 @@ export type TaskEnvelope = { vs: string claimed_at: string status_label: string + re_dispatched_to: string + re_dispatch_of: string file: string } @@ -136,6 +138,8 @@ function normalizeEnvelope(doc: Record, now: number, file: stri vs: str(doc.vs), claimed_at: claimedRaw === undefined || claimedRaw === null ? MISSING : iso(toEpoch(claimedRaw)), status_label: STATUS_LABEL[status] ?? (status || MISSING), + re_dispatched_to: str(doc.re_dispatched_to), + re_dispatch_of: str(doc.re_dispatch_of), file, } }