Miles WardandClaude Opus 4.7
eb3b191a71
Two real issues v0.4.6 left on the table: Asset caching: - index.html now interpolates the running OpenPXE version into every asset URL as `?v=<version>` (app.css, app.js, logo.svg). Combined with `Cache-Control: no-cache, must-revalidate` on the asset handlers, browsers and intermediary proxies are forced to fetch fresh on every upgrade. Without this, last release's bundled JS kept serving the old UI even after the operator pulled the new image — invisible to anyone who only checks the version chip in the footer (which is dynamic). - The Cache-Control header is also applied to logo.svg and loader.svg so a logo upload reflects immediately rather than after a hard refresh. Real-image PXE menu logo (matches iVentoy now): - New Dockerfile stage `ipxe-build` clones the iPXE source and compiles all four binaries (undionly.kpxe, snponly.efi for x86_64/i386, snponly.efi for arm64 via gcc-aarch64-linux-gnu) with IMAGE_PNG + CONSOLE_FRAMEBUFFER + CONSOLE_VESAFB enabled. Replaces the boot.ipxe.org fetch — those binaries are built without PNG support, which is why v0.4.6's `console --picture` line silently no-op'd. - `iso-store::pxe_logo::compose_pxe_logo` decodes any operator upload (PNG / JPEG / WebP / GIF), downscales-to-fit if larger than 600×200, and pastes it onto a transparent 1024×768 canvas centered horizontally with a 64-pixel top margin. iPXE paints the result at 1:1 on the typical VESA framebuffer, giving the iVentoy-style centered-logo look regardless of the operator's source dimensions. - GET /branding/pxe-logo now returns the composed PNG. wimboot still fetches from ipxe/wimboot's GitHub release (separately signed). - Dropped the ASCII OpenPXE wordmark from render_menu — once the real image paints, the banner would duplicate it visually. iPXE builds without PNG (none of ours after this release, but a third- party undionly might) simply show the menu without a logo, which is the right graceful-degradation outcome. Quality: - 142 tests passing (was 138 in v0.4.6): +4 pxe_logo unit tests covering canvas dimensions, centered-top placement, oversize downscale, and unsupported-bytes error handling; existing integration tests updated to verify the 1024×768 IHDR header from the composed PNG instead of round-tripping the raw upload. - cargo clippy --workspace --all-targets clean. - Image dependency: `image = "0.25"` with only `png/jpeg/webp/gif` features enabled. No new transitive C deps. Co-Authored-By: Claude Opus 4.7 (1M context) <[email protected]>
55 lines
1.8 KiB
Rust
55 lines
1.8 KiB
Rust
//! Offline-only web UI. Everything the browser needs (HTML, CSS, JS, SVG
|
|
//! logo) is embedded in the compiled binary via `include_str!` /
|
|
//! `include_bytes!`. No CDN, no external fonts, no remote images —
|
|
//! OpenPXE renders identically on an air-gapped network.
|
|
//!
|
|
//! Layout follows the Netbox Labs pattern: dark left sidebar with primary
|
|
//! nav, top bar with secondary tabs, card-dense content panels.
|
|
#![forbid(unsafe_code)]
|
|
|
|
/// Render the top-level page.
|
|
///
|
|
/// * `base_url` is interpolated into the footer so operators can see at
|
|
/// a glance what URL clients are PXE-booting from.
|
|
/// * `asset_version` is appended as `?v=…` to every asset URL so each
|
|
/// release ships with brand-new asset URLs — browsers (and any
|
|
/// intermediary proxy) can't keep serving last release's `app.js`
|
|
/// when we know the new one is incompatible. Combined with
|
|
/// `Cache-Control: no-cache, must-revalidate` on the asset handlers,
|
|
/// the worst-case caching window is one version.
|
|
#[must_use]
|
|
pub fn index_html(base_url: &str, asset_version: &str) -> String {
|
|
INDEX_HTML
|
|
.replace("{{BASE_URL}}", base_url)
|
|
.replace("{{ASSET_VERSION}}", asset_version)
|
|
}
|
|
|
|
#[must_use]
|
|
pub fn app_js() -> &'static str {
|
|
APP_JS
|
|
}
|
|
|
|
#[must_use]
|
|
pub fn app_css() -> &'static str {
|
|
APP_CSS
|
|
}
|
|
|
|
#[must_use]
|
|
pub fn logo_svg() -> &'static str {
|
|
LOGO_SVG
|
|
}
|
|
|
|
/// Larger, faster-cycling rainbow disc — used for the page-load
|
|
/// transition and the imaging-progress widget on Dashboard / Queue.
|
|
/// Pure SVG + SMIL, no JS, no GIF.
|
|
#[must_use]
|
|
pub fn loader_svg() -> &'static str {
|
|
LOADER_SVG
|
|
}
|
|
|
|
const INDEX_HTML: &str = include_str!("index.html");
|
|
const APP_CSS: &str = include_str!("app.css");
|
|
const APP_JS: &str = include_str!("app.js");
|
|
const LOGO_SVG: &str = include_str!("logo.svg");
|
|
const LOADER_SVG: &str = include_str!("loader.svg");
|