Skip to content

Reduce workload for web browser by removing all inline style #2129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 29, 2025
Merged

Reduce workload for web browser by removing all inline style #2129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
90d15e5
unminify ansi_up source code
GuillaumeGomez Jul 29, 2025
57a9819
Use CSS classes for text styling too
GuillaumeGomez Jul 29, 2025
abf5612
Improve inline JS and make AnsiUp use classes instead of inline style
GuillaumeGomez Jul 29, 2025
dbb74ad
Rename ansi_up script file
GuillaumeGomez Jul 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 53 additions & 32 deletions src/gha_logs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use std::str::FromStr;
use std::sync::Arc;
use uuid::Uuid;

pub const ANSI_UP_URL: &str = "/gha_logs/ansi_up@6.0.6.min.js";
pub const ANSI_UP_URL: &str = "/gha_logs/ansi_up@0.0.1-custom.js";
pub const SUCCESS_URL: &str = "/gha_logs/[email protected]";
pub const FAILURE_URL: &str = "/gha_logs/[email protected]";

Expand Down Expand Up @@ -243,36 +243,58 @@ async fn process_logs(
<title>{job_name} - {owner}/{repo}@{short_sha}</title>
{icon_status}
<style>
body {{
font: 14px SFMono-Regular, Consolas, Liberation Mono, Menlo, monospace;
background: #0C0C0C;
color: #CCCCCC;
white-space: pre;
}}
.timestamp {{
color: #848484;
text-decoration: none;
}}
.timestamp:hover {{
text-decoration: underline;
}}
.error-marker {{
scroll-margin-bottom: 15vh;
color: #e5534b;
}}
.warning-marker {{
color: #c69026;
}}
.path-marker {{
color: #26c6a8;
}}
body {{
font: 14px SFMono-Regular, Consolas, Liberation Mono, Menlo, monospace;
background: #0C0C0C;
color: #CCC;
white-space: pre;
}}
.timestamp {{
color: #848484;
text-decoration: none;
}}
.timestamp:hover {{
text-decoration: underline;
}}
.error-marker {{
scroll-margin-bottom: 15vh;
color: #e5534b;
}}
.warning-marker {{
color: #c69026;
}}
.path-marker {{
color: #26c6a8;
}}
.ansi-black-fg {{ color: rgb(0, 0, 0); }}
.ansi-red-fg {{ color: rgb(187, 0, 0); }}
.ansi-green-fg {{ color: rgb(0, 187, 0); }}
.ansi-yellow-fg {{ color: rgb(187, 187, 0); }}
.ansi-blue-fg {{ color: rgb(0, 0, 187); }}
.ansi-magenta-fg {{ color: rgb(187, 0, 187); }}
.ansi-cyan-fg {{ color: rgb(0, 187, 187); }}
.ansi-white-fg {{ color: rgb(255, 255, 255); }}
.ansi-bright-black-fg {{ color: rgb(85, 85, 85); }}
.ansi-bright-red-fg {{ color: rgb(255, 85, 85); }}
.ansi-bright-green-fg {{ color: rgb(0, 255, 0); }}
.ansi-bright-yellow-fg {{ color: rgb(255, 255, 85); }}
.ansi-bright-blue-fg {{ color: rgb(85, 85, 255); }}
.ansi-bright-magenta-fg {{ color: rgb(255, 85, 255); }}
.ansi-bright-cyan-fg {{ color: rgb(85, 255, 255); }}
.ansi-bright-white-fg {{ color: rgb(255, 255, 255); }}

.bold {{ font-weight: bold; }}
.faint {{ opacity: 0.7; }}
.italic {{ font-style: italic; }}
.underline {{ text-decoration: underline; }}
</style>
<script type="module" nonce="{nonce}">
import {{ AnsiUp }} from '{ANSI_UP_URL}'

var logs = {logs};
var tree_roots = {tree_roots};
var ansi_up = new AnsiUp();
const logs = {logs};
const tree_roots = {tree_roots};
const ansi_up = new AnsiUp();
ansi_up.use_classes = true;

// 1. Tranform the ANSI escape codes to HTML
var html = ansi_up.ansi_to_html(logs);
Expand Down Expand Up @@ -324,9 +346,8 @@ async fn process_logs(
}});

// 6. Add the html to the DOM
var cdiv = document.getElementById("console");
cdiv.innerHTML = html;

document.body.innerHTML = html;

// 7. If no anchor is given, scroll to the last error
if (location.hash === "" && errorCounter >= 0) {{
const hasSmallViewport = window.innerWidth <= 750;
Expand All @@ -338,7 +359,7 @@ async fn process_logs(
}}
</script>
</head>
<body id="console">
<body>
</body>
</html>"###,
);
Expand All @@ -358,7 +379,7 @@ async fn process_logs(
}

pub fn ansi_up_min_js() -> anyhow::Result<Response<Body>, hyper::Error> {
const ANSI_UP_MIN_JS: &str = include_str!("gha_logs/ansi_up@6.0.6.min.js");
const ANSI_UP_MIN_JS: &str = include_str!("gha_logs/ansi_up@0.0.1-custom.js");

Ok(Response::builder()
.status(StatusCode::OK)
Expand Down
Loading