fix: harden contextual log focus

This commit is contained in:
ajnart committed 2026-08-20 12:44:20 +02:00
1 parent 90bf147901
commit 55141e66be
2 files changed
+31 -21

No files matched your search

@@ -30,7 +30,7 @@ export async function generateMetadata() {
} }
interface LogsManagementPageProps { interface LogsManagementPageProps {
searchParams: Promise<{ focus?: string }>; searchParams: Promise<{ focus?: string | string[] }>;
} }
export default async function LogsManagementPage({ searchParams }: LogsManagementPageProps) { export default async function LogsManagementPage({ searchParams }: LogsManagementPageProps) {
@@ -39,9 +39,14 @@ export default async function LogsManagementPage({ searchParams }: LogsManagemen
notFound(); notFound();
} }
const parsedFocusTimestamp = Number((await searchParams).focus); const focus = (await searchParams).focus;
const focusTimestamp = let focusTimestamp: number | undefined;
Number.isSafeInteger(parsedFocusTimestamp) && parsedFocusTimestamp > 0 ? parsedFocusTimestamp : undefined; if (typeof focus === "string") {
const parsedFocusTimestamp = Number(focus);
if (Number.isSafeInteger(parsedFocusTimestamp) && parsedFocusTimestamp > 0) {
focusTimestamp = parsedFocusTimestamp;
}
}
return ( return (
<LogContextProvider defaultLevel={logsEnv.LEVEL}> <LogContextProvider defaultLevel={logsEnv.LEVEL}>
@@ -37,27 +37,21 @@ const getFocusMarker = (
}; };
}; };
const findMarkerLine = (terminal: Terminal, markerText: string) => { const findMarkerLine = (terminal: Terminal, linesFromEnd: number) => {
const buffer = terminal.buffer.active; const buffer = terminal.buffer.active;
let logicalLine = ""; const logicalLineStarts: number[] = [];
let logicalLineStart = 0; const cursorLine = buffer.baseY + buffer.cursorY;
for (let index = 0; index < buffer.length; index++) { for (let index = 0; index <= cursorLine; index++) {
const line = buffer.getLine(index); const line = buffer.getLine(index);
if (!line) continue; if (!line) continue;
if (!line.isWrapped) { if (!line.isWrapped) {
logicalLine = ""; logicalLineStarts.push(index);
logicalLineStart = index;
}
logicalLine += line.translateToString(true);
if (logicalLine.includes(markerText)) {
return logicalLineStart;
} }
} }
return null; return logicalLineStarts.at(-linesFromEnd) ?? null;
}; };
const renderMessages = ({ const renderMessages = ({
@@ -78,24 +72,35 @@ const renderMessages = ({
const activeLevelSet = new Set(activeLevels); const activeLevelSet = new Set(activeLevels);
const visibleMessages = messages.filter((message) => activeLevelSet.has(message.level)); const visibleMessages = messages.filter((message) => activeLevelSet.has(message.level));
const focusMarker = getFocusMarker(messages, visibleMessages, focusTimestamp, markerText, expiredMarkerText); const focusMarker = getFocusMarker(messages, visibleMessages, focusTimestamp, markerText, expiredMarkerText);
const output = visibleMessages.flatMap((message, index) => { const output: string[] = [];
let markerOutputIndex: number | null = null;
visibleMessages.forEach((message, index) => {
if (focusMarker?.index === index) { if (focusMarker?.index === index) {
return [`\x1b[33m--- ${focusMarker.text} ---\x1b[0m`, message.message]; markerOutputIndex = output.length;
output.push(`\x1b[33m--- ${focusMarker.text} ---\x1b[0m`);
} }
return [message.message]; output.push(message.message);
}); });
if (focusMarker?.index === visibleMessages.length) { if (focusMarker?.index === visibleMessages.length) {
markerOutputIndex = output.length;
output.push(`\x1b[33m--- ${focusMarker.text} ---\x1b[0m`); output.push(`\x1b[33m--- ${focusMarker.text} ---\x1b[0m`);
} }
let markerLinesFromEnd: number | null = null;
if (markerOutputIndex !== null) {
markerLinesFromEnd =
1 + output.slice(markerOutputIndex).reduce((lineCount, line) => lineCount + line.split(/\r?\n/).length, 0);
}
terminal.write(`\x1bc${output.join("\r\n")}${output.length > 0 ? "\r\n" : ""}`, () => { terminal.write(`\x1bc${output.join("\r\n")}${output.length > 0 ? "\r\n" : ""}`, () => {
if (!focusMarker) { if (markerLinesFromEnd === null) {
terminal.scrollToBottom(); terminal.scrollToBottom();
return; return;
} }
const markerLine = findMarkerLine(terminal, focusMarker.text); const markerLine = findMarkerLine(terminal, markerLinesFromEnd);
if (markerLine !== null) { if (markerLine !== null) {
terminal.scrollToLine(markerLine); terminal.scrollToLine(markerLine);
} }