mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-02-13 03:53:23 +02:00
0869e0e08a
- Remove all [ConEMU OSC commands](https://conemu.github.io/en/AnsiEscapeCodes.html#ConEmu_specific_OSC) from the output of Forgejo action logs when rendering. - The regex is constructed as followed: Match the prefix `ESC ] 9 ;`. Then matches any number of digits, then match everything up to and including `ST` (this is either `ESC\` or `BELL`). - Resolves forgejo/forgejo#9244 Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/9875 Reviewed-by: Mathieu Fenniak <mfenniak@noreply.codeberg.org> Co-authored-by: Gusted <postmaster@gusted.xyz> Co-committed-by: Gusted <postmaster@gusted.xyz>
48 lines
1.5 KiB
JavaScript
48 lines
1.5 KiB
JavaScript
import {AnsiUp} from 'ansi_up';
|
|
|
|
const replacements = [
|
|
[/\x1b\[\d+[A-H]/g, ''], // Move cursor, treat them as no-op
|
|
[/\x1bM/g, ''], // Move cursor one line up, threat them as no-op.
|
|
[/\x1b\[\d?[JK]/g, '\r'], // Erase display/line, treat them as a Carriage Return
|
|
[/\x1b\]9;\d+.*?(\x07|\x1b\\)/g, ''], // ConEmu, treat them as no-op.
|
|
];
|
|
|
|
// render ANSI to HTML
|
|
export function renderAnsi(line) {
|
|
// create a fresh ansi_up instance because otherwise previous renders can influence
|
|
// the output of future renders, because ansi_up is stateful and remembers things like
|
|
// unclosed opening tags for colors.
|
|
const ansi_up = new AnsiUp();
|
|
ansi_up.use_classes = true;
|
|
|
|
if (line.endsWith('\r\n')) {
|
|
line = line.substring(0, line.length - 2);
|
|
} else if (line.endsWith('\n')) {
|
|
line = line.substring(0, line.length - 1);
|
|
}
|
|
|
|
if (line.includes('\x1b')) {
|
|
for (const [regex, replacement] of replacements) {
|
|
line = line.replace(regex, replacement);
|
|
}
|
|
}
|
|
|
|
if (!line.includes('\r')) {
|
|
return ansi_up.ansi_to_html(line);
|
|
}
|
|
|
|
// handle "\rReading...1%\rReading...5%\rReading...100%",
|
|
// convert it into a multiple-line string: "Reading...1%\nReading...5%\nReading...100%"
|
|
const lines = [];
|
|
for (const part of line.split('\r')) {
|
|
if (part === '') continue;
|
|
const partHtml = ansi_up.ansi_to_html(part);
|
|
if (partHtml !== '') {
|
|
lines.push(partHtml);
|
|
}
|
|
}
|
|
|
|
// the log message element is with "white-space: break-spaces;", so use "\n" to break lines
|
|
return lines.join('\n');
|
|
}
|