From e68b9d00a6e05b3a941f63ffb696f91e554ac5ec Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 18 Oct 2024 20:33:49 +0200 Subject: Adding upstream version 9.0.3. Signed-off-by: Daniel Baumann --- web_src/js/render/ansi.js | 45 ++++++++++++++++++++++++++++++++++++++++++ web_src/js/render/ansi.test.js | 20 +++++++++++++++++++ web_src/js/render/pdf.js | 19 ++++++++++++++++++ 3 files changed, 84 insertions(+) create mode 100644 web_src/js/render/ansi.js create mode 100644 web_src/js/render/ansi.test.js create mode 100644 web_src/js/render/pdf.js (limited to 'web_src/js/render') diff --git a/web_src/js/render/ansi.js b/web_src/js/render/ansi.js new file mode 100644 index 0000000..bb622dd --- /dev/null +++ b/web_src/js/render/ansi.js @@ -0,0 +1,45 @@ +import {AnsiUp} from 'ansi_up'; + +const replacements = [ + [/\x1b\[\d+[A-H]/g, ''], // Move cursor, treat them as no-op + [/\x1b\[\d?[JK]/g, '\r'], // Erase display/line, treat them as a Carriage Return +]; + +// 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'); +} diff --git a/web_src/js/render/ansi.test.js b/web_src/js/render/ansi.test.js new file mode 100644 index 0000000..5afff71 --- /dev/null +++ b/web_src/js/render/ansi.test.js @@ -0,0 +1,20 @@ +import {renderAnsi} from './ansi.js'; + +test('renderAnsi', () => { + expect(renderAnsi('abc')).toEqual('abc'); + expect(renderAnsi('abc\n')).toEqual('abc'); + expect(renderAnsi('abc\r\n')).toEqual('abc'); + expect(renderAnsi('\r')).toEqual(''); + expect(renderAnsi('\rx\rabc')).toEqual('x\nabc'); + expect(renderAnsi('\rabc\rx\r')).toEqual('abc\nx'); + expect(renderAnsi('\x1b[30mblack\x1b[37mwhite')).toEqual('blackwhite'); // unclosed + expect(renderAnsi('