aboutsummaryrefslogtreecommitdiffstats
path: root/web_src/js/render
diff options
context:
space:
mode:
authorsilverwind <me@silverwind.io>2023-06-22 04:15:19 +0200
committerGitHub <noreply@github.com>2023-06-22 02:15:19 +0000
commit93cd579269717934b2b8e72d6258b712c1675eaa (patch)
tree9a8b11665bfa46f1a1a15bd15832c340a45a7ea5 /web_src/js/render
parent656d3cc71973c547b574866e30e5f3da5327ce25 (diff)
downloadgitea-93cd579269717934b2b8e72d6258b712c1675eaa.tar.gz
gitea-93cd579269717934b2b8e72d6258b712c1675eaa.zip
Switch to ansi_up for ansi rendering in actions (#25401)
Fixes: https://github.com/go-gitea/gitea/issues/24777
Diffstat (limited to 'web_src/js/render')
-rw-r--r--web_src/js/render/ansi.js44
-rw-r--r--web_src/js/render/ansi.test.js21
2 files changed, 65 insertions, 0 deletions
diff --git a/web_src/js/render/ansi.js b/web_src/js/render/ansi.js
new file mode 100644
index 0000000000..68e8f2c544
--- /dev/null
+++ b/web_src/js/render/ansi.js
@@ -0,0 +1,44 @@
+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.default || AnsiUp)();
+
+ 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 0000000000..7542ba0ede
--- /dev/null
+++ b/web_src/js/render/ansi.test.js
@@ -0,0 +1,21 @@
+import {expect, test} from 'vitest';
+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('<span style="color:rgb(0,0,0)">black</span><span style="color:rgb(255,255,255)">white</span>'); // unclosed
+ expect(renderAnsi('<script>')).toEqual('&lt;script&gt;');
+ expect(renderAnsi('\x1b[1A\x1b[2Ktest\x1b[1B\x1b[1A\x1b[2K')).toEqual('test');
+ expect(renderAnsi('\x1b[1A\x1b[2K\rtest\r\x1b[1B\x1b[1A\x1b[2K')).toEqual('test');
+ expect(renderAnsi('\x1b[1A\x1b[2Ktest\x1b[1B\x1b[1A\x1b[2K')).toEqual('test');
+ expect(renderAnsi('\x1b[1A\x1b[2K\rtest\r\x1b[1B\x1b[1A\x1b[2K')).toEqual('test');
+
+ // treat "\033[0K" and "\033[0J" (Erase display/line) as "\r", then it will be covered to "\n" finally.
+ expect(renderAnsi('a\x1b[Kb\x1b[2Jc')).toEqual('a\nb\nc');
+ expect(renderAnsi('\x1b[48;5;88ma\x1b[38;208;48;5;159mb\x1b[m')).toEqual(`<span style="background-color:rgb(135,0,0)">a</span><span style="background-color:rgb(175,255,255)">b</span>`);
+});