diff --git a/images/preview.jpg b/images/preview.jpg index bf41c85..c22a885 100644 Binary files a/images/preview.jpg and b/images/preview.jpg differ diff --git a/server/.gitignore b/server/.gitignore new file mode 100644 index 0000000..1e96583 --- /dev/null +++ b/server/.gitignore @@ -0,0 +1,131 @@ +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +lerna-debug.log* +.pnpm-debug.log* + +# Diagnostic reports (https://nodejs.org/api/report.html) +report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage +*.lcov + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (https://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ +package-lock.json + +# Snowpack dependency directory (https://snowpack.dev/) +web_modules/ + +# TypeScript cache +*.tsbuildinfo + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Optional stylelint cache +.stylelintcache + +# Microbundle cache +.rpt2_cache/ +.rts2_cache_cjs/ +.rts2_cache_es/ +.rts2_cache_umd/ + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variable files +.env +.env.development.local +.env.test.local +.env.production.local +.env.local + +# parcel-bundler cache (https://parceljs.org/) +.cache +.parcel-cache + +# Next.js build output +.next +out + +# Nuxt.js build / generate output +.nuxt +dist + +# Gatsby files +.cache/ +# Comment in the public line in if your project uses Gatsby and not Next.js +# https://nextjs.org/blog/next-9-1#public-directory-support +# public + +# vuepress build output +.vuepress/dist + +# vuepress v2.x temp and cache directory +.temp +.cache + +# Docusaurus cache and generated files +.docusaurus + +# Serverless directories +.serverless/ + +# FuseBox cache +.fusebox/ + +# DynamoDB Local files +.dynamodb/ + +# TernJS port file +.tern-port + +# Stores VSCode versions used for testing VSCode extensions +.vscode-test + +# yarn v2 +.yarn/cache +.yarn/unplugged +.yarn/build-state.yml +.yarn/install-state.gz +.pnp.* diff --git a/server/package.json b/server/package.json index f52d3d9..a019d2a 100644 --- a/server/package.json +++ b/server/package.json @@ -18,7 +18,11 @@ "pkg": { "scripts": "main.js", "assets": "www/**", - "targets": ["node14-windows-x64", "node14-linux-x64", "node14-linux-armv7" ], + "targets": [ + "node14-windows-x64", + "node14-linux-x64", + "node14-linux-armv7" + ], "outputPath": "build" } } diff --git a/server/www/classes/DataSerie.js b/server/www/classes/DataSerie.js index c2735d6..898a11e 100644 --- a/server/www/classes/DataSerie.js +++ b/server/www/classes/DataSerie.js @@ -188,6 +188,7 @@ function getSerieInstanceFromTelemetry(telemetryName) throw new Error(`Trying to instanciate a DataSerie from a non existant telemetry name : ${telemetryName}`); serie.name = telemetryName; + serie.colored_name = ansi_coloring.ansi_to_html(telemetryName); serie.values = telemetry.values; // this way, serie.values always equals telemetry.values serie.unit = telemetry.unit; serie.type = telemetry.type; diff --git a/server/www/classes/Telemetry.js b/server/www/classes/Telemetry.js index e124766..dcd8f5e 100644 --- a/server/www/classes/Telemetry.js +++ b/server/www/classes/Telemetry.js @@ -2,6 +2,7 @@ class Telemetry{ constructor(_name, unit = undefined, type = "number"){ this.type = type; // either "number", "text", "3D" or "xy" this.name = _name; + this.colored_name = ansi_coloring.ansi_to_html(_name); this.unit = ( unit != "" ) ? unit : undefined; this.usageCount = 0; @@ -22,7 +23,7 @@ class Telemetry{ // this is what will be displayed on the left pannel next to the telem name, // it is either the current value of the telem (number), or its text or the type of the shape ... this.values_formatted = ""; - + this.colored_values_formatted =""; if (this.type == "3D") this.setShapeTypeDelay(); @@ -94,6 +95,6 @@ class Telemetry{ { this.values_formatted = ""; } - + this.colored_values_formatted = ansi_coloring.ansi_to_html(this.values_formatted); } } \ No newline at end of file diff --git a/server/www/classes/communication/serverMessageReading.js b/server/www/classes/communication/serverMessageReading.js index ac1744f..261d6f3 100644 --- a/server/www/classes/communication/serverMessageReading.js +++ b/server/www/classes/communication/serverMessageReading.js @@ -103,10 +103,20 @@ function parseVariablesData(msg, now) } // Extract values array - let values = msg.substring(startIdx+1, endIdx).split(';') let xArray = []; let yArray = []; let zArray = []; + + //If it contains the text flag (singleValue or |t), then ignore ; + let values; + if(isTextFormatTelem) + { + values = msg.substring(startIdx+1, endIdx).split() + + }else{ + values = msg.substring(startIdx+1, endIdx).split(';') + } + for(let value of values) { /* All possibilities : diff --git a/server/www/classes/view/logs/LogConsole.js b/server/www/classes/view/logs/LogConsole.js index 1099c82..0e74b95 100644 --- a/server/www/classes/view/logs/LogConsole.js +++ b/server/www/classes/view/logs/LogConsole.js @@ -61,7 +61,7 @@ class LogConsole if (currLog == undefined) return; - el.innerHTML = currLog.text; + el.innerHTML = ansi_coloring.ansi_to_html(currLog.text); el.addEventListener("mouseover", function () { diff --git a/server/www/components/singleValue/singleValue.js b/server/www/components/singleValue/singleValue.js index 620c6d4..456fb6e 100644 --- a/server/www/components/singleValue/singleValue.js +++ b/server/www/components/singleValue/singleValue.js @@ -26,7 +26,6 @@ computed: { else return "Click to change precision"; } - }, methods: { onContainerResized() @@ -40,6 +39,9 @@ methods: { if (this.$refs.value_responsive_text2 != undefined) this.$refs.value_responsive_text2.triggerTextResize(); this.$refs.unit_responsive_text.triggerTextResize(); + }, + ansi_to_html(txt){ + return ansi_coloring.ansi_to_html(txt); } }, mounted() { @@ -61,17 +63,18 @@ updated() { unmounted(){ resizeObserverForSingleValue.unobserve(singleValueContainer); }, + template:'\
\
\ - {{telem}}\ + \
\
\
\ - {{value1}}\ + \
\
\ - {{value2}}\ + \
\
\
\ diff --git a/server/www/components/vueResponsiveText/vue-responsive-text.js b/server/www/components/vueResponsiveText/vue-responsive-text.js index dffdd06..6d30d09 100644 --- a/server/www/components/vueResponsiveText/vue-responsive-text.js +++ b/server/www/components/vueResponsiveText/vue-responsive-text.js @@ -65,7 +65,7 @@ Vue.component('vue-responsive-text', { template:' \ - \ + \ ' }); diff --git a/server/www/index.html b/server/www/index.html index da191a4..ecea6f8 100644 --- a/server/www/index.html +++ b/server/www/index.html @@ -180,10 +180,10 @@ T 3D - {{telem.name}} + ({{telem.unit}})
-
{{telem.values_formatted}}
+
Drag on chart for
multi-series
@@ -213,7 +213,7 @@ {{serie.values_formatted}} - {{serie.name}} + ({{serie.unit}})
@@ -313,6 +313,7 @@
+ diff --git a/server/www/lib/ansi_up/LICENSE b/server/www/lib/ansi_up/LICENSE new file mode 100644 index 0000000..6bf63c2 --- /dev/null +++ b/server/www/lib/ansi_up/LICENSE @@ -0,0 +1,22 @@ +(The MIT License) + +Copyright (c) 2011 Dru Nelson + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +'Software'), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/server/www/lib/ansi_up/ansi_up.js b/server/www/lib/ansi_up/ansi_up.js new file mode 100644 index 0000000..4e563e8 --- /dev/null +++ b/server/www/lib/ansi_up/ansi_up.js @@ -0,0 +1,437 @@ +"use strict"; +var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cooked, raw) { + if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; } + return cooked; +}; +var PacketKind; +(function (PacketKind) { + PacketKind[PacketKind["EOS"] = 0] = "EOS"; + PacketKind[PacketKind["Text"] = 1] = "Text"; + PacketKind[PacketKind["Incomplete"] = 2] = "Incomplete"; + PacketKind[PacketKind["ESC"] = 3] = "ESC"; + PacketKind[PacketKind["Unknown"] = 4] = "Unknown"; + PacketKind[PacketKind["SGR"] = 5] = "SGR"; + PacketKind[PacketKind["OSCURL"] = 6] = "OSCURL"; +})(PacketKind || (PacketKind = {})); +class AnsiUp { + constructor() { + this.VERSION = "6.0.2"; + this.setup_palettes(); + this._use_classes = false; + this.bold = false; + this.faint = false; + this.italic = false; + this.underline = false; + this.fg = this.bg = null; + this._buffer = ''; + this._url_allowlist = { 'http': 1, 'https': 1 }; + this._escape_html = true; + this.boldStyle = 'font-weight:bold'; + this.faintStyle = 'opacity:0.7'; + this.italicStyle = 'font-style:italic'; + this.underlineStyle = 'text-decoration:underline'; + } + set use_classes(arg) { + this._use_classes = arg; + } + get use_classes() { + return this._use_classes; + } + set url_allowlist(arg) { + this._url_allowlist = arg; + } + get url_allowlist() { + return this._url_allowlist; + } + set escape_html(arg) { + this._escape_html = arg; + } + get escape_html() { + return this._escape_html; + } + set boldStyle(arg) { this._boldStyle = arg; } + get boldStyle() { return this._boldStyle; } + set faintStyle(arg) { this._faintStyle = arg; } + get faintStyle() { return this._faintStyle; } + set italicStyle(arg) { this._italicStyle = arg; } + get italicStyle() { return this._italicStyle; } + set underlineStyle(arg) { this._underlineStyle = arg; } + get underlineStyle() { return this._underlineStyle; } + setup_palettes() { + this.ansi_colors = + [ + [ + { rgb: [0, 0, 0], class_name: "ansi-black" }, + { rgb: [187, 0, 0], class_name: "ansi-red" }, + { rgb: [0, 187, 0], class_name: "ansi-green" }, + { rgb: [187, 187, 0], class_name: "ansi-yellow" }, + { rgb: [0, 0, 187], class_name: "ansi-blue" }, + { rgb: [187, 0, 187], class_name: "ansi-magenta" }, + { rgb: [0, 187, 187], class_name: "ansi-cyan" }, + { rgb: [255, 255, 255], class_name: "ansi-white" } + ], + [ + { rgb: [85, 85, 85], class_name: "ansi-bright-black" }, + { rgb: [255, 85, 85], class_name: "ansi-bright-red" }, + { rgb: [0, 255, 0], class_name: "ansi-bright-green" }, + { rgb: [255, 255, 85], class_name: "ansi-bright-yellow" }, + { rgb: [85, 85, 255], class_name: "ansi-bright-blue" }, + { rgb: [255, 85, 255], class_name: "ansi-bright-magenta" }, + { rgb: [85, 255, 255], class_name: "ansi-bright-cyan" }, + { rgb: [255, 255, 255], class_name: "ansi-bright-white" } + ] + ]; + this.palette_256 = []; + this.ansi_colors.forEach(palette => { + palette.forEach(rec => { + this.palette_256.push(rec); + }); + }); + let levels = [0, 95, 135, 175, 215, 255]; + for (let r = 0; r < 6; ++r) { + for (let g = 0; g < 6; ++g) { + for (let b = 0; b < 6; ++b) { + let col = { rgb: [levels[r], levels[g], levels[b]], class_name: 'truecolor' }; + this.palette_256.push(col); + } + } + } + let grey_level = 8; + for (let i = 0; i < 24; ++i, grey_level += 10) { + let gry = { rgb: [grey_level, grey_level, grey_level], class_name: 'truecolor' }; + this.palette_256.push(gry); + } + } + escape_txt_for_html(txt) { + if (!this._escape_html) + return txt; + return txt.replace(/[&<>"']/gm, (str) => { + if (str === "&") + return "&"; + if (str === "<") + return "<"; + if (str === ">") + return ">"; + if (str === "\"") + return """; + if (str === "'") + return "'"; + }); + } + append_buffer(txt) { + var str = this._buffer + txt; + this._buffer = str; + } + get_next_packet() { + var pkt = { + kind: PacketKind.EOS, + text: '', + url: '' + }; + var len = this._buffer.length; + if (len == 0) + return pkt; + var pos = this._buffer.indexOf("\x1B"); + if (pos == -1) { + pkt.kind = PacketKind.Text; + pkt.text = this._buffer; + this._buffer = ''; + return pkt; + } + if (pos > 0) { + pkt.kind = PacketKind.Text; + pkt.text = this._buffer.slice(0, pos); + this._buffer = this._buffer.slice(pos); + return pkt; + } + if (pos == 0) { + if (len < 3) { + pkt.kind = PacketKind.Incomplete; + return pkt; + } + var next_char = this._buffer.charAt(1); + if ((next_char != '[') && (next_char != ']') && (next_char != '(')) { + pkt.kind = PacketKind.ESC; + pkt.text = this._buffer.slice(0, 1); + this._buffer = this._buffer.slice(1); + return pkt; + } + if (next_char == '[') { + if (!this._csi_regex) { + this._csi_regex = rgx(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n ^ # beginning of line\n #\n # First attempt\n (?: # legal sequence\n \u001B[ # CSI\n ([<-?]?) # private-mode char\n ([d;]*) # any digits or semicolons\n ([ -/]? # an intermediate modifier\n [@-~]) # the command\n )\n | # alternate (second attempt)\n (?: # illegal sequence\n \u001B[ # CSI\n [ -~]* # anything legal\n ([\0-\u001F:]) # anything illegal\n )\n "], ["\n ^ # beginning of line\n #\n # First attempt\n (?: # legal sequence\n \\x1b\\[ # CSI\n ([\\x3c-\\x3f]?) # private-mode char\n ([\\d;]*) # any digits or semicolons\n ([\\x20-\\x2f]? # an intermediate modifier\n [\\x40-\\x7e]) # the command\n )\n | # alternate (second attempt)\n (?: # illegal sequence\n \\x1b\\[ # CSI\n [\\x20-\\x7e]* # anything legal\n ([\\x00-\\x1f:]) # anything illegal\n )\n "]))); + } + let match = this._buffer.match(this._csi_regex); + if (match === null) { + pkt.kind = PacketKind.Incomplete; + return pkt; + } + if (match[4]) { + pkt.kind = PacketKind.ESC; + pkt.text = this._buffer.slice(0, 1); + this._buffer = this._buffer.slice(1); + return pkt; + } + if ((match[1] != '') || (match[3] != 'm')) + pkt.kind = PacketKind.Unknown; + else + pkt.kind = PacketKind.SGR; + pkt.text = match[2]; + var rpos = match[0].length; + this._buffer = this._buffer.slice(rpos); + return pkt; + } + else if (next_char == ']') { + if (len < 4) { + pkt.kind = PacketKind.Incomplete; + return pkt; + } + if ((this._buffer.charAt(2) != '8') + || (this._buffer.charAt(3) != ';')) { + pkt.kind = PacketKind.ESC; + pkt.text = this._buffer.slice(0, 1); + this._buffer = this._buffer.slice(1); + return pkt; + } + if (!this._osc_st) { + this._osc_st = rgxG(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n (?: # legal sequence\n (\u001B\\) # ESC | # alternate\n (\u0007) # BEL (what xterm did)\n )\n | # alternate (second attempt)\n ( # illegal sequence\n [\0-\u0006] # anything illegal\n | # alternate\n [\b-\u001A] # anything illegal\n | # alternate\n [\u001C-\u001F] # anything illegal\n )\n "], ["\n (?: # legal sequence\n (\\x1b\\\\) # ESC \\\n | # alternate\n (\\x07) # BEL (what xterm did)\n )\n | # alternate (second attempt)\n ( # illegal sequence\n [\\x00-\\x06] # anything illegal\n | # alternate\n [\\x08-\\x1a] # anything illegal\n | # alternate\n [\\x1c-\\x1f] # anything illegal\n )\n "]))); + } + this._osc_st.lastIndex = 0; + { + let match = this._osc_st.exec(this._buffer); + if (match === null) { + pkt.kind = PacketKind.Incomplete; + return pkt; + } + if (match[3]) { + pkt.kind = PacketKind.ESC; + pkt.text = this._buffer.slice(0, 1); + this._buffer = this._buffer.slice(1); + return pkt; + } + } + { + let match = this._osc_st.exec(this._buffer); + if (match === null) { + pkt.kind = PacketKind.Incomplete; + return pkt; + } + if (match[3]) { + pkt.kind = PacketKind.ESC; + pkt.text = this._buffer.slice(0, 1); + this._buffer = this._buffer.slice(1); + return pkt; + } + } + if (!this._osc_regex) { + this._osc_regex = rgx(templateObject_3 || (templateObject_3 = __makeTemplateObject(["\n ^ # beginning of line\n #\n \u001B]8; # OSC Hyperlink\n [ -:<-~]* # params (excluding ;)\n ; # end of params\n ([!-~]{0,512}) # URL capture\n (?: # ST\n (?:\u001B\\) # ESC | # alternate\n (?:\u0007) # BEL (what xterm did)\n )\n ([ -~]+) # TEXT capture\n \u001B]8;; # OSC Hyperlink End\n (?: # ST\n (?:\u001B\\) # ESC | # alternate\n (?:\u0007) # BEL (what xterm did)\n )\n "], ["\n ^ # beginning of line\n #\n \\x1b\\]8; # OSC Hyperlink\n [\\x20-\\x3a\\x3c-\\x7e]* # params (excluding ;)\n ; # end of params\n ([\\x21-\\x7e]{0,512}) # URL capture\n (?: # ST\n (?:\\x1b\\\\) # ESC \\\n | # alternate\n (?:\\x07) # BEL (what xterm did)\n )\n ([\\x20-\\x7e]+) # TEXT capture\n \\x1b\\]8;; # OSC Hyperlink End\n (?: # ST\n (?:\\x1b\\\\) # ESC \\\n | # alternate\n (?:\\x07) # BEL (what xterm did)\n )\n "]))); + } + let match = this._buffer.match(this._osc_regex); + if (match === null) { + pkt.kind = PacketKind.ESC; + pkt.text = this._buffer.slice(0, 1); + this._buffer = this._buffer.slice(1); + return pkt; + } + pkt.kind = PacketKind.OSCURL; + pkt.url = match[1]; + pkt.text = match[2]; + var rpos = match[0].length; + this._buffer = this._buffer.slice(rpos); + return pkt; + } + else if (next_char == '(') { + pkt.kind = PacketKind.Unknown; + this._buffer = this._buffer.slice(3); + return pkt; + } + } + } + ansi_to_html(txt) { + this.bold = false; + this.faint = false; + this.italic = false; + this.underline = false; + this.fg = this.bg = null; + + this.append_buffer(txt); + var blocks = []; + while (true) { + var packet = this.get_next_packet(); + if ((packet.kind == PacketKind.EOS) + || (packet.kind == PacketKind.Incomplete)) + break; + if ((packet.kind == PacketKind.ESC) + || (packet.kind == PacketKind.Unknown)) + continue; + if (packet.kind == PacketKind.Text) + blocks.push(this.transform_to_html(this.with_state(packet))); + else if (packet.kind == PacketKind.SGR) + this.process_ansi(packet); + else if (packet.kind == PacketKind.OSCURL) + blocks.push(this.process_hyperlink(packet)); + } + return blocks.join(""); + } + with_state(pkt) { + return { bold: this.bold, faint: this.faint, italic: this.italic, underline: this.underline, fg: this.fg, bg: this.bg, text: pkt.text }; + } + process_ansi(pkt) { + let sgr_cmds = pkt.text.split(';'); + while (sgr_cmds.length > 0) { + let sgr_cmd_str = sgr_cmds.shift(); + let num = parseInt(sgr_cmd_str, 10); + if (isNaN(num) || num === 0) { + this.fg = null; + this.bg = null; + this.bold = false; + this.faint = false; + this.italic = false; + this.underline = false; + } + else if (num === 1) { + this.bold = true; + } + else if (num === 2) { + this.faint = true; + } + else if (num === 3) { + this.italic = true; + } + else if (num === 4) { + this.underline = true; + } + else if (num === 21) { + this.bold = false; + } + else if (num === 22) { + this.faint = false; + this.bold = false; + } + else if (num === 23) { + this.italic = false; + } + else if (num === 24) { + this.underline = false; + } + else if (num === 39) { + this.fg = null; + } + else if (num === 49) { + this.bg = null; + } + else if ((num >= 30) && (num < 38)) { + this.fg = this.ansi_colors[0][(num - 30)]; + } + else if ((num >= 40) && (num < 48)) { + this.bg = this.ansi_colors[0][(num - 40)]; + } + else if ((num >= 90) && (num < 98)) { + this.fg = this.ansi_colors[1][(num - 90)]; + } + else if ((num >= 100) && (num < 108)) { + this.bg = this.ansi_colors[1][(num - 100)]; + } + else if (num === 38 || num === 48) { + if (sgr_cmds.length > 0) { + let is_foreground = (num === 38); + let mode_cmd = sgr_cmds.shift(); + if (mode_cmd === '5' && sgr_cmds.length > 0) { + let palette_index = parseInt(sgr_cmds.shift(), 10); + if (palette_index >= 0 && palette_index <= 255) { + if (is_foreground) + this.fg = this.palette_256[palette_index]; + else + this.bg = this.palette_256[palette_index]; + } + } + if (mode_cmd === '2' && sgr_cmds.length > 2) { + let r = parseInt(sgr_cmds.shift(), 10); + let g = parseInt(sgr_cmds.shift(), 10); + let b = parseInt(sgr_cmds.shift(), 10); + if ((r >= 0 && r <= 255) && (g >= 0 && g <= 255) && (b >= 0 && b <= 255)) { + let c = { rgb: [r, g, b], class_name: 'truecolor' }; + if (is_foreground) + this.fg = c; + else + this.bg = c; + } + } + } + } + } + } + transform_to_html(fragment) { + let txt = fragment.text; + if (txt.length === 0) + return txt; + txt = this.escape_txt_for_html(txt); + if (!fragment.bold && !fragment.italic && !fragment.underline && fragment.fg === null && fragment.bg === null) + return txt; + let styles = []; + let classes = []; + let fg = fragment.fg; + let bg = fragment.bg; + if (fragment.bold) + styles.push(this._boldStyle); + if (fragment.faint) + styles.push(this._faintStyle); + if (fragment.italic) + styles.push(this._italicStyle); + if (fragment.underline) + styles.push(this._underlineStyle); + if (!this._use_classes) { + if (fg) + styles.push(`color:rgb(${fg.rgb.join(',')})`); + if (bg) + styles.push(`background-color:rgb(${bg.rgb})`); + } + else { + if (fg) { + if (fg.class_name !== 'truecolor') { + classes.push(`${fg.class_name}-fg`); + } + else { + styles.push(`color:rgb(${fg.rgb.join(',')})`); + } + } + if (bg) { + if (bg.class_name !== 'truecolor') { + classes.push(`${bg.class_name}-bg`); + } + else { + styles.push(`background-color:rgb(${bg.rgb.join(',')})`); + } + } + } + let class_string = ''; + let style_string = ''; + if (classes.length) + class_string = ` class="${classes.join(' ')}"`; + if (styles.length) + style_string = ` style="${styles.join(';')}"`; + return `${txt}`; + } + ; + process_hyperlink(pkt) { + let parts = pkt.url.split(':'); + if (parts.length < 1) + return ''; + if (!this._url_allowlist[parts[0]]) + return ''; + let result = `${this.escape_txt_for_html(pkt.text)}`; + return result; + } +} +function rgx(tmplObj, ...subst) { + let regexText = tmplObj.raw[0]; + let wsrgx = /^\s+|\s+\n|\s*#[\s\S]*?\n|\n/gm; + let txt2 = regexText.replace(wsrgx, ''); + return new RegExp(txt2); +} +function rgxG(tmplObj, ...subst) { + let regexText = tmplObj.raw[0]; + let wsrgx = /^\s+|\s+\n|\s*#[\s\S]*?\n|\n/gm; + let txt2 = regexText.replace(wsrgx, ''); + return new RegExp(txt2, 'g'); +} +var templateObject_1, templateObject_2, templateObject_3; diff --git a/server/www/main.js b/server/www/main.js index ad87cee..670371a 100644 --- a/server/www/main.js +++ b/server/www/main.js @@ -4,6 +4,7 @@ var vscode = null; if("acquireVsCodeApi" in window) vscode = acquireVsCodeApi(); var app = initializeAppView(); +var ansi_coloring = new AnsiUp(); //Init refresh rate setInterval(updateView, 1000 / widgetFPS);