бла бла бла

2026-10-28 15:50:34 +01:00
parent 2e8428de4e
commit fb27de5e7f
21 changed files with 858 additions and 541 deletions
@@ -68,6 +68,13 @@ tasks.register('buildFrontend', Exec) {

 tasks.register('copyFrontend', Copy) {
 	dependsOn 'buildFrontend'
+	outputs.upToDateWhen { false }
+
+	doFirst {
+		fileTree(springStaticDir).matching {
+			include 'main-*.js', 'polyfills-*.js', 'chunk-*.js', 'styles-*.css'
+		}.files.each { it.delete() }
+	}

 	from(frontendDistDir)
 	into(springStaticDir)
@@ -1,66 +1,89 @@

 package com.htopweb.system;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import oshi.SystemInfo;
 import oshi.hardware.CentralProcessor;
 import oshi.hardware.GlobalMemory;
 import oshi.hardware.HardwareAbstractionLayer;
 import oshi.software.os.OperatingSystem;
-
 import org.springframework.stereotype.Service;

+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
@Service
 public class SystemMetricsService {

-    private final SystemInfo _systemInfo;
-    private final HardwareAbstractionLayer _hardware;
+    private static final Path HOST_ROOT = Path.of("/host/root");
+    private static final Path HOST_PROC = HOST_ROOT.resolve("proc");
+
    private final OperatingSystem _operatingSystem;
    private final CentralProcessor _processor;
    private final GlobalMemory _memory;

-    private long[] _previousCpuTicks;
+    private CpuTicks _previousHostCpuTicks;
+
+    private static final Logger log =
+            LoggerFactory.getLogger(SystemMetricsService.class);

    public SystemMetricsService() {
-        _systemInfo = new SystemInfo();
-        _hardware = _systemInfo.getHardware();
-        _operatingSystem = _systemInfo.getOperatingSystem();
-        _processor = _hardware.getProcessor();
-        _memory = _hardware.getMemory();
+        SystemInfo systemInfo = new SystemInfo();
+        HardwareAbstractionLayer hardware = systemInfo.getHardware();

-        _previousCpuTicks = _processor.getSystemCpuLoadTicks();
+        _operatingSystem = systemInfo.getOperatingSystem();
+        _processor = hardware.getProcessor();
+        _memory = hardware.getMemory();
+
+        _previousHostCpuTicks = readHostCpuTicks();
    }

    public synchronized SystemMetricsResponse getMetrics() {
-        long[] currentCpuTicks = _processor.getSystemCpuLoadTicks();
+        CpuTicks currentTicks = readHostCpuTicks();
+        double cpuUsage = 0.0;

-        double cpuUsage = _processor.getSystemCpuLoadBetweenTicks(
-                _previousCpuTicks,
-                currentCpuTicks
-        );
+        if (currentTicks != null && _previousHostCpuTicks != null) {
+            long totalDelta = currentTicks.total() - _previousHostCpuTicks.total();
+            long idleDelta = currentTicks.idle() - _previousHostCpuTicks.idle();

-        _previousCpuTicks = currentCpuTicks;
-
-        if (Double.isNaN(cpuUsage) || Double.isInfinite(cpuUsage)) {
-            cpuUsage = 0.0;
+            if (totalDelta > 0 && idleDelta >= 0 && idleDelta <= totalDelta) {
+                cpuUsage = (double) (totalDelta - idleDelta) / totalDelta;
+            }
        }

-        // Task Manager displays system CPU usage in the 0–100% range.
-        cpuUsage = Math.max(0.0, Math.min(1.0, cpuUsage));
+        if (currentTicks != null) {
+            _previousHostCpuTicks = currentTicks;
+        }
+
+        Map<String, Long> hostMemory = readHostMemory();
+
+        long totalMemory = hostMemory.getOrDefault("MemTotal", _memory.getTotal());
+        long availableMemory = hostMemory.getOrDefault(
+                "MemAvailable",
+                _memory.getAvailable()
+        );
+
+        availableMemory = Math.max(0L, Math.min(totalMemory, availableMemory));

-        long totalMemory = _memory.getTotal();
-        long availableMemory = _memory.getAvailable();
        long usedMemory = Math.max(0L, totalMemory - availableMemory);

        double memoryUsage = totalMemory > 0
                ? (double) usedMemory / totalMemory * 100.0
                : 0.0;

+        Map<String, String> osRelease = readHostOsRelease();
+
        return new SystemMetricsResponse(
-                _operatingSystem.getFamily(),
-                _operatingSystem.getVersionInfo().getVersion(),
-                _operatingSystem.getNetworkParams().getHostName(),
+                getHostOsFamily(osRelease),
+                getHostOsVersion(osRelease),
+                readHostHostname(),
                _processor.getProcessorIdentifier().getName(),
-                _processor.getLogicalProcessorCount(),
+                getLogicalProcessorCount(),
                round(cpuUsage * 100.0),
                totalMemory,
                availableMemory,
@@ -69,7 +92,187 @@ public class SystemMetricsService {
        );
    }

+    private CpuTicks readHostCpuTicks() {
+        Path statFile = HOST_PROC.resolve("stat");
+
+        try {
+            if (!Files.isRegularFile(statFile)
+                    || !Files.isReadable(statFile)) {
+                log.warn("Host CPU statistics are unavailable: {}", statFile);
+                return null;
+            }
+
+            for (String line : Files.readAllLines(statFile)) {
+                if (!line.startsWith("cpu ")) {
+                    continue;
+                }
+
+                String[] fields = line.trim().split("\\s+");
+                if (fields.length < 5) {
+                    log.warn("Invalid host CPU statistics in {}", statFile);
+                    return null;
+                }
+
+                long total = 0L;
+
+                for (int i = 1; i < fields.length; i++) {
+                    total += Long.parseLong(fields[i]);
+                }
+
+                long idle = Long.parseLong(fields[4]);
+
+                if (fields.length > 5) {
+                    idle += Long.parseLong(fields[5]);
+                }
+
+                return new CpuTicks(total, idle);
+            }
+
+            log.warn("Aggregate CPU line not found in {}", statFile);
+        } catch (IOException | NumberFormatException e) {
+            log.warn("Failed to read host CPU statistics: {}", e.getMessage());
+        }
+
+        return null;
+    }
+
+    private Map<String, Long> readHostMemory() {
+        Map<String, Long> values = new HashMap<>();
+        Path meminfoFile = HOST_PROC.resolve("meminfo");
+
+        try {
+            if (!Files.isRegularFile(meminfoFile)) {
+                return values;
+            }
+
+            for (String line : Files.readAllLines(meminfoFile)) {
+                int separator = line.indexOf(':');
+
+                if (separator < 0) {
+                    continue;
+                }
+
+                String key = line.substring(0, separator).trim();
+
+                if (!key.equals("MemTotal") && !key.equals("MemAvailable")) {
+                    continue;
+                }
+
+                String[] parts = line.substring(separator + 1).trim().split("\\s+");
+
+                if (parts.length > 0) {
+                    // Linux meminfo values are reported in kB.
+                    values.put(key, Long.parseLong(parts[0]) * 1024L);
+                }
+            }
+        } catch (IOException | NumberFormatException ignored) {
+            // Use OSHI values when host meminfo is unavailable.
+        }
+
+        return values;
+    }
+
+    private int getLogicalProcessorCount() {
+        Path statFile = HOST_PROC.resolve("stat");
+
+        try {
+            if (Files.isRegularFile(statFile)) {
+                int count = 0;
+
+                for (String line : Files.readAllLines(statFile)) {
+                    if (line.matches("^cpu\\d+\\s+.*")) {
+                        count++;
+                    }
+                }
+
+                if (count > 0) {
+                    return count;
+                }
+            }
+        } catch (IOException ignored) {
+            // Fall back to OSHI.
+        }
+
+        return _processor.getLogicalProcessorCount();
+    }
+
+    private String readHostHostname() {
+        try {
+            Path file = HOST_ROOT.resolve("etc/hostname");
+
+            if (Files.isRegularFile(file)) {
+                String hostname = Files.readString(file).trim();
+
+                if (!hostname.isBlank()) {
+                    return hostname;
+                }
+            }
+        } catch (IOException ignored) {
+            // Fall back to OSHI.
+        }
+
+        return _operatingSystem.getNetworkParams().getHostName();
+    }
+
+    private Map<String, String> readHostOsRelease() {
+        Map<String, String> values = new HashMap<>();
+
+        try {
+            Path file = HOST_ROOT.resolve("etc/os-release");
+
+            if (!Files.isRegularFile(file)) {
+                return values;
+            }
+
+            for (String line : Files.readAllLines(file)) {
+                int separator = line.indexOf('=');
+
+                if (separator <= 0 || line.startsWith("#")) {
+                    continue;
+                }
+
+                String key = line.substring(0, separator).trim();
+                String value = line.substring(separator + 1).trim();
+
+                if (value.length() >= 2
+                        && ((value.startsWith("\"") && value.endsWith("\""))
+                        || (value.startsWith("'") && value.endsWith("'")))) {
+                    value = value.substring(1, value.length() - 1);
+                }
+
+                values.put(key, value);
+            }
+        } catch (IOException ignored) {
+            // Fall back to OSHI.
+        }
+
+        return values;
+    }
+
+    private String getHostOsFamily(Map<String, String> osRelease) {
+        String name = osRelease.get("NAME");
+
+        return name != null && !name.isBlank()
+                ? name
+                : _operatingSystem.getFamily();
+    }
+
+    private String getHostOsVersion(Map<String, String> osRelease) {
+        String version = osRelease.get("VERSION");
+
+        if (version == null || version.isBlank()) {
+            version = osRelease.get("VERSION_ID");
+        }
+
+        return version != null && !version.isBlank()
+                ? version
+                : _operatingSystem.getVersionInfo().getVersion();
+    }
+
    private double round(double value) {
        return Math.round(value * 10.0) / 10.0;
    }
+
+    private record CpuTicks(long total, long idle) {
+    }
 }
@@ -4,9 +4,14 @@ package com.htopweb.system;
 import oshi.SystemInfo;
 import oshi.software.os.OSProcess;
 import oshi.software.os.OperatingSystem;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
@@ -15,15 +20,24 @@ import java.util.Map;
@Service
 public class SystemProcessesService {

+    private static final Logger log =
+            LoggerFactory.getLogger(SystemProcessesService.class);
+
+    private static final Path HOST_PROC = Path.of("/host/root/proc");
+    private static final Path PROC = Path.of("/proc");
+
    private final OperatingSystem _operatingSystem;
    private final int _logicalProcessorCount;
+    private final long _clockTicksPerSecond;
+    private final long _pageSizeBytes;

-    private final Map<Integer, OSProcess> _previousProcesses =
+    private final Map<Integer, ProcessSnapshot> _previousProcesses =
            new HashMap<>();

+    private long _previousSampleNanos = System.nanoTime();
+
    public SystemProcessesService() {
        SystemInfo systemInfo = new SystemInfo();
-
        _operatingSystem = systemInfo.getOperatingSystem();
        _logicalProcessorCount = Math.max(
                1,
@@ -31,55 +45,246 @@ public class SystemProcessesService {
                        .getProcessor()
                        .getLogicalProcessorCount()
        );
+
+        _clockTicksPerSecond = readPositiveSystemValue(
+                "getconf CLK_TCK", 100L
+        );
+        _pageSizeBytes = readPositiveSystemValue(
+                "getconf PAGESIZE", 4096L
+        );
    }

    public synchronized List<ProcessInfoResponse> getProcesses() {
-        List<OSProcess> processes = _operatingSystem.getProcesses();
-        Map<Integer, OSProcess> currentProcesses = new HashMap<>();
+        Path procRoot = Files.isDirectory(HOST_PROC) ? HOST_PROC : PROC;

-        List<ProcessInfoResponse> result = processes.stream()
-                .map(process -> {
-                    int pid = process.getProcessID();
-                    currentProcesses.put(pid, process);
-
-                    OSProcess previous = _previousProcesses.get(pid);
-                    double cpuUsage = 0.0;
-
-                    if (pid != 0
-                            && previous != null
-                            && previous.getStartTime() == process.getStartTime()) {
-
-                        cpuUsage = process.getProcessCpuLoadBetweenTicks(previous)
-                                * 100.0 / _logicalProcessorCount;
-
-                        cpuUsage = Math.max(0.0, Math.min(100.0, cpuUsage));
+        if (!Files.isReadable(procRoot)) {
+            log.warn("Process information is unavailable: {}", procRoot);
+            return getProcessesFromOshi();
        }

-                    return new ProcessInfoResponse(
-                            pid,
-                            process.getName(),
-                            process.getState().name(),
-                            Math.round(cpuUsage * 10.0) / 10.0,
-                            process.getResidentMemory(),
-                            process.getVirtualSize(),
-                            Math.max(
-                                    0L,
-                                    (System.currentTimeMillis()
-                                            - process.getStartTime()) / 1000
-                            ),
-                            process.getThreadCount()
+        long nowNanos = System.nanoTime();
+        double elapsedSeconds =
+                (nowNanos - _previousSampleNanos) / 1_000_000_000.0;
+        _previousSampleNanos = nowNanos;
+
+        long bootTimeSeconds = readBootTime(procRoot);
+        Map<Integer, ProcessSnapshot> currentProcesses = new HashMap<>();
+        List<ProcessInfoResponse> result = new ArrayList<>();
+
+        try (var entries = Files.list(procRoot)) {
+            entries.filter(path ->
+                            path.getFileName().toString().matches("\\d+"))
+                    .forEach(path -> {
+                        try {
+                            int pid = Integer.parseInt(
+                                    path.getFileName().toString()
                            );
-                })
-                .sorted(
-                        Comparator.comparingDouble(
-                                ProcessInfoResponse::cpuUsagePercent
-                        ).reversed()
-                )
-                .toList();
+
+                            ProcessSnapshot current = readProcess(
+                                    path, pid, bootTimeSeconds
+                            );
+
+                            if (current == null) {
+                                return;
+                            }
+
+                            currentProcesses.put(pid, current);
+
+                            ProcessSnapshot previous =
+                                    _previousProcesses.get(pid);
+
+                            double cpuUsage = 0.0;
+
+                            if (previous != null
+                                    && previous.startTimeTicks()
+                                    == current.startTimeTicks()
+                                    && elapsedSeconds > 0.0) {
+                                long deltaTicks =
+                                        current.cpuTicks() - previous.cpuTicks();
+
+                                if (deltaTicks >= 0) {
+                                    cpuUsage = deltaTicks
+                                            / (double) _clockTicksPerSecond
+                                            / elapsedSeconds
+                                            * 100.0
+                                            / _logicalProcessorCount;
+                                }
+                            }
+
+                            cpuUsage = Math.max(
+                                    0.0, Math.min(100.0, cpuUsage)
+                            );
+
+                            result.add(new ProcessInfoResponse(
+                                    pid,
+                                    current.name(),
+                                    current.state(),
+                                    Math.round(cpuUsage * 10.0) / 10.0,
+                                    current.residentMemoryBytes(),
+                                    current.virtualMemoryBytes(),
+                                    current.uptimeSeconds(),
+                                    current.threadCount()
+                            ));
+                        } catch (IOException | NumberFormatException
+                                 | SecurityException ignored) {
+                            // A process may exit or become inaccessible.
+                        }
+                    });
+        } catch (IOException e) {
+            log.warn("Cannot read process list from {}: {}",
+                    procRoot, e.getMessage());
+            return getProcessesFromOshi();
+        }

        _previousProcesses.clear();
        _previousProcesses.putAll(currentProcesses);

+        result.sort(Comparator.comparingDouble(
+                ProcessInfoResponse::cpuUsagePercent
+        ).reversed());
+
        return result;
    }
+
+    private ProcessSnapshot readProcess(
+            Path processPath,
+            int pid,
+            long bootTimeSeconds
+    ) throws IOException {
+        String stat = Files.readString(processPath.resolve("stat")).trim();
+
+        int open = stat.indexOf('(');
+        int close = stat.lastIndexOf(')');
+
+        if (open < 0 || close <= open) {
+            return null;
+        }
+
+        String name = stat.substring(open + 1, close);
+        String[] fields = stat.substring(close + 2).trim().split("\\s+");
+
+        // Array begins at Linux stat field 3 (state).
+        if (fields.length < 22) {
+            return null;
+        }
+
+        String state = fields[0];
+        long userTicks = Long.parseLong(fields[11]); // field 14
+        long systemTicks = Long.parseLong(fields[12]); // field 15
+        long startTicks = Long.parseLong(fields[19]); // field 22
+        long virtualBytes = Long.parseLong(fields[20]); // field 23
+        long residentPages = Long.parseLong(fields[21]); // field 24
+
+        int threadCount = readThreadCount(processPath.resolve("status"));
+
+        long uptimeSeconds = 0L;
+
+        if (bootTimeSeconds > 0L) {
+            long processStartSeconds = bootTimeSeconds
+                    + startTicks / _clockTicksPerSecond;
+            uptimeSeconds = Math.max(
+                    0L, System.currentTimeMillis() / 1000L
+                            - processStartSeconds
+            );
+        }
+
+        return new ProcessSnapshot(
+                pid,
+                name,
+                state,
+                userTicks + systemTicks,
+                startTicks,
+                Math.max(0L, virtualBytes),
+                Math.max(0L, residentPages) * _pageSizeBytes,
+                uptimeSeconds,
+                threadCount
+        );
+    }
+
+    private int readThreadCount(Path statusFile) {
+        try {
+            for (String line : Files.readAllLines(statusFile)) {
+                if (line.startsWith("Threads:")) {
+                    return Integer.parseInt(
+                            line.substring("Threads:".length()).trim()
+                    );
+                }
+            }
+        } catch (IOException | NumberFormatException ignored) {
+            // The process may exit while status is being read.
+        }
+
+        return 0;
+    }
+
+    private long readBootTime(Path procRoot) {
+        try {
+            for (String line : Files.readAllLines(procRoot.resolve("stat"))) {
+                if (line.startsWith("btime ")) {
+                    return Long.parseLong(line.substring(6).trim());
+                }
+            }
+        } catch (IOException | NumberFormatException ignored) {
+            // Boot time unavailable.
+        }
+
+        return 0L;
+    }
+
+    private long readPositiveSystemValue(String command, long fallback) {
+        try {
+            Process process = new ProcessBuilder(
+                    "/bin/sh", "-c", command
+            ).redirectErrorStream(true).start();
+
+            String output = new String(
+                    process.getInputStream().readAllBytes()
+            ).trim();
+
+            if (process.waitFor() == 0) {
+                long value = Long.parseLong(output);
+
+                if (value > 0L) {
+                    return value;
+                }
+            }
+        } catch (Exception e) {
+            log.debug("Cannot read system value for {}: {}", command,
+                    e.getMessage());
+        }
+
+        return fallback;
+    }
+
+    private List<ProcessInfoResponse> getProcessesFromOshi() {
+        return _operatingSystem.getProcesses().stream()
+                .map(process -> new ProcessInfoResponse(
+                        process.getProcessID(),
+                        process.getName(),
+                        process.getState().name(),
+                        0.0,
+                        process.getResidentMemory(),
+                        process.getVirtualSize(),
+                        Math.max(0L, (System.currentTimeMillis()
+                                - process.getStartTime()) / 1000L),
+                        process.getThreadCount()
+                ))
+                .sorted(Comparator.comparingLong(
+                        ProcessInfoResponse::residentMemoryBytes
+                ).reversed())
+                .toList();
+    }
+
+    private record ProcessSnapshot(
+            int pid,
+            String name,
+            String state,
+            long cpuTicks,
+            long startTimeTicks,
+            long virtualMemoryBytes,
+            long residentMemoryBytes,
+            long uptimeSeconds,
+            int threadCount
+    ) {
+    }
 }
@@ -1,54 +1,131 @@
+
 package com.htopweb.system.linux;

-import oshi.SystemInfo;
-import oshi.software.os.OSFileStore;
-import oshi.software.os.OperatingSystem;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

+import java.io.IOException;
+import java.nio.file.FileStore;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Objects;
+import java.util.Set;

@Service
 public class LinuxDiskService {

-    private final OperatingSystem _operatingSystem;
+    private static final Logger log =
+            LoggerFactory.getLogger(LinuxDiskService.class);

-    public LinuxDiskService() {
-        SystemInfo systemInfo = new SystemInfo();
-        _operatingSystem = systemInfo.getOperatingSystem();
-    }
+    private static final Path HOST_ROOT = Path.of("/host/root");
+    private static final Path HOST_MOUNTS =
+            HOST_ROOT.resolve("proc/1/mounts");
+
+    private static final Set<String> EXCLUDED_TYPES = Set.of(
+            "proc", "sysfs", "devtmpfs", "devpts", "tmpfs",
+            "cgroup", "cgroup2", "overlay", "squashfs",
+            "tracefs", "securityfs", "debugfs", "pstore",
+            "configfs", "fusectl", "mqueue", "hugetlbfs",
+            "rpc_pipefs", "autofs"
+    );

    public List<LinuxDiskResponse> getDisks() {
-        return _operatingSystem.getFileSystem()
-                .getFileStores()
-                .stream()
-                .filter(store -> store.getMount().startsWith("/"))
-                .filter(store -> store.getTotalSpace() > 0)
-                .map(this::toResponse)
-                .sorted(Comparator.comparing(LinuxDiskResponse::mountPoint))
-                .toList();
+        if (!Files.isReadable(HOST_MOUNTS)) {
+            log.error("Host mounts file is not readable: {}", HOST_MOUNTS);
+            return List.of();
        }

-    private LinuxDiskResponse toResponse(OSFileStore store) {
+        try {
+            List<LinuxDiskResponse> disks = Files.readAllLines(HOST_MOUNTS)
+                    .stream()
+                    .map(line -> line.trim().split("\\s+"))
+                    .filter(fields -> fields.length >= 3)
+                    .filter(fields -> fields[0].startsWith("/dev/"))
+                    .filter(fields -> !EXCLUDED_TYPES.contains(fields[2]))
+                    .map(this::toHostResponse)
+                    .filter(Objects::nonNull)
+                    .collect(java.util.stream.Collectors.toMap(
+                            LinuxDiskResponse::mountPoint,
+                            disk -> disk,
+                            (first, second) -> first
+                    ))
+                    .values()
+                    .stream()
+                    .sorted(Comparator.comparing(
+                            LinuxDiskResponse::mountPoint
+                    ))
+                    .toList();
+
+            log.debug("Found {} host disks", disks.size());
+            return disks;
+        } catch (IOException e) {
+            log.error("Failed to read host mounts: {}", e.getMessage(), e);
+            return List.of();
+        }
+    }
+
+    private LinuxDiskResponse toHostResponse(String[] fields) {
+        String device = unescapeMountField(fields[0]);
+        String hostMount = unescapeMountField(fields[1]);
+        String type = fields[2];
+
+        Path accessiblePath = HOST_ROOT.resolve(
+                hostMount.startsWith("/")
+                        ? hostMount.substring(1)
+                        : hostMount
+        ).normalize();
+
+        if (!accessiblePath.startsWith(HOST_ROOT)
+                || !Files.exists(accessiblePath)) {
+            log.warn("Host mount path is unavailable: {}", accessiblePath);
+            return null;
+        }
+
+        try {
+            FileStore store = Files.getFileStore(accessiblePath);
+
            long total = Math.max(0L, store.getTotalSpace());
            long usable = Math.max(
                    0L,
                    Math.min(total, store.getUsableSpace())
            );
-        long used = Math.max(0L, total - usable);

-        double usage = total > 0
-                ? Math.round((double) used / total * 1000.0) / 10.0
-                : 0.0;
+            if (total == 0L) {
+                log.warn("Host disk has zero capacity: {}", hostMount);
+                return null;
+            }
+
+            long used = total - usable;
+            double usage = Math.round(
+                    (double) used / total * 1000.0
+            ) / 10.0;

            return new LinuxDiskResponse(
-                store.getName(),
-                store.getMount(),
-                store.getType(),
+                    device,
+                    hostMount,
+                    type,
                    total,
                    usable,
                    used,
                    usage
            );
+        } catch (IOException | SecurityException e) {
+            log.warn(
+                    "Cannot read capacity for host mount {}: {}",
+                    hostMount,
+                    e.getMessage()
+            );
+            return null;
+        }
+    }
+
+    private String unescapeMountField(String value) {
+        return value.replace("\\040", " ")
+                .replace("\\011", "\t")
+                .replace("\\012", "\n")
+                .replace("\\134", "\\");
    }
 }
@@ -1,14 +1,9 @@

 package com.htopweb.system.linux;

-import java.util.List;
-
 public record LinuxNetworkResponse(
        String name,
        String displayName,
-        String macAddress,
-        List<String> ipv4Addresses,
-        List<String> ipv6Addresses,
        long bytesReceived,
        long bytesSent,
        long packetsReceived,
@@ -1,86 +1,186 @@

 package com.htopweb.system.linux;

-import oshi.SystemInfo;
-import oshi.hardware.NetworkIF;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

-import java.util.Arrays;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
+import java.util.stream.Stream;

@Service
 public class LinuxNetworkService {

-    private final SystemInfo _systemInfo;
+    private static final Logger log =
+            LoggerFactory.getLogger(LinuxNetworkService.class);
+
+    private static final Path HOST_ROOT = Path.of("/host/root");
+
+    private static final Path HOST_NET_DEV =
+            HOST_ROOT.resolve("proc/1/net/dev");
+
+    private static final Path HOST_NET_CLASS =
+            HOST_ROOT.resolve("sys/class/net");
+
+    private static final Set<String> EXCLUDED_INTERFACES =
+            Set.of("lo", "docker0");

    private final ConcurrentMap<String, NetworkSnapshot> _previousSnapshots =
            new ConcurrentHashMap<>();

-    public LinuxNetworkService() {
-        _systemInfo = new SystemInfo();
-    }
-
    public List<LinuxNetworkResponse> getInterfaces() {
-        return _systemInfo.getHardware()
-                .getNetworkIFs()
-                .stream()
-                .map(this::toResponse)
-                .toList();
+        if (!Files.isReadable(HOST_NET_DEV)) {
+            log.error("Host network counters unavailable: {}", HOST_NET_DEV);
+            return List.of();
        }

-    private LinuxNetworkResponse toResponse(NetworkIF networkIF) {
-        networkIF.updateAttributes();
+        try {
+            List<LinuxNetworkResponse> result = new ArrayList<>();

-        String name = networkIF.getName();
-        long received = Math.max(0L, networkIF.getBytesRecv());
-        long sent = Math.max(0L, networkIF.getBytesSent());
+            for (String line : Files.readAllLines(HOST_NET_DEV)) {
+                int separator = line.indexOf(':');
+
+                if (separator < 0) {
+                    continue;
+                }
+
+                String name = line.substring(0, separator).trim();
+
+                if (name.isBlank() || !shouldIncludeInterface(name)) {
+                    continue;
+                }
+
+                String[] values = line.substring(separator + 1)
+                        .trim()
+                        .split("\\s+");
+
+                if (values.length < 16) {
+                    continue;
+                }
+
+                result.add(toResponse(
+                        name,
+                        parseCounter(values[0]),
+                        parseCounter(values[1]),
+                        parseCounter(values[2]),
+                        parseCounter(values[8]),
+                        parseCounter(values[9]),
+                        parseCounter(values[10])
+                ));
+            }
+
+            return result;
+        } catch (IOException | NumberFormatException e) {
+            log.error("Failed to read host network counters: {}",
+                    e.getMessage(), e);
+            return List.of();
+        }
+    }
+
+    private boolean shouldIncludeInterface(String name) {
+        if (EXCLUDED_INTERFACES.contains(name)
+                || name.startsWith("veth")
+                || name.startsWith("br-")
+                || name.startsWith("docker")) {
+            return false;
+        }
+
+        Path interfacePath = HOST_NET_CLASS.resolve(name);
+
+        // Physical network interfaces normally expose a "device" symlink.
+        if (Files.exists(interfacePath.resolve("device"))) {
+            return true;
+        }
+
+        // Keep useful virtual interfaces such as WireGuard and tunnels.
+        return Files.exists(interfacePath.resolve("wireless"))
+                || Files.exists(interfacePath.resolve("tun_flags"))
+                || name.startsWith("wg")
+                || name.startsWith("tun")
+                || name.startsWith("tap")
+                || name.startsWith("bond")
+                || name.startsWith("br");
+    }
+
+    private LinuxNetworkResponse toResponse(
+            String name,
+            long received,
+            long packetsReceived,
+            long inboundErrors,
+            long sent,
+            long packetsSent,
+            long outboundErrors
+    ) {
        long now = System.nanoTime();

-        NetworkSnapshot current = new NetworkSnapshot(received, sent, now);
-        NetworkSnapshot previous = _previousSnapshots.put(name, current);
+        NetworkSnapshot current =
+                new NetworkSnapshot(received, sent, now);
+
+        NetworkSnapshot previous =
+                _previousSnapshots.put(name, current);

        double receiveBytesPerSecond = 0.0;
        double sendBytesPerSecond = 0.0;

        if (previous != null && now > previous.timestampNanos()) {
-            double elapsedSeconds =
+            double elapsed =
                    (now - previous.timestampNanos()) / 1_000_000_000.0;

            if (received >= previous.bytesReceived()) {
                receiveBytesPerSecond =
-                        (received - previous.bytesReceived()) / elapsedSeconds;
+                        (received - previous.bytesReceived()) / elapsed;
            }

            if (sent >= previous.bytesSent()) {
                sendBytesPerSecond =
-                        (sent - previous.bytesSent()) / elapsedSeconds;
+                        (sent - previous.bytesSent()) / elapsed;
            }
        }

-        double receiveMbps = receiveBytesPerSecond * 8.0 / 1_000_000.0;
-        double sendMbps = sendBytesPerSecond * 8.0 / 1_000_000.0;
+        Path interfacePath = HOST_NET_CLASS.resolve(name);
+        String alias = readFirstLine(interfacePath.resolve("ifalias"));
+        String displayName = alias.isBlank() ? name : alias;

        return new LinuxNetworkResponse(
                name,
-                networkIF.getDisplayName(),
-                networkIF.getMacaddr(),
-                Arrays.asList(networkIF.getIPv4addr()),
-                Arrays.asList(networkIF.getIPv6addr()),
+                displayName,
                received,
                sent,
-                Math.max(0L, networkIF.getPacketsRecv()),
-                Math.max(0L, networkIF.getPacketsSent()),
-                Math.max(0L, networkIF.getInErrors()),
-                Math.max(0L, networkIF.getOutErrors()),
+                packetsReceived,
+                packetsSent,
+                inboundErrors,
+                outboundErrors,
                roundOne(receiveBytesPerSecond),
                roundOne(sendBytesPerSecond),
-                roundOne(receiveMbps),
-                roundOne(sendMbps)
+                roundOne(receiveBytesPerSecond * 8.0 / 1_000_000.0),
+                roundOne(sendBytesPerSecond * 8.0 / 1_000_000.0)
        );
    }

+    private long parseCounter(String value) {
+        return Math.max(0L, Long.parseLong(value));
+    }
+
+    private String readFirstLine(Path path) {
+        if (!Files.isReadable(path)) {
+            return "";
+        }
+
+        try (Stream<String> lines = Files.lines(path)) {
+            return lines.findFirst().orElse("").trim();
+        } catch (IOException e) {
+            log.debug("Cannot read {}: {}", path, e.getMessage());
+            return "";
+        }
+    }
+
    private double roundOne(double value) {
        return Math.round(value * 10.0) / 10.0;
    }
@@ -9,5 +9,5 @@
 <link rel="stylesheet" href="styles-5INURTSO.css"></head>
 <body>
  <app-root></app-root>
-<script src="main-Y67327X6.js" type="module"></script></body>
+<script src="main-WRDGP7C5.js" type="module"></script></body>
 </html>
@@ -7,5 +7,18 @@ services:
      dockerfile: Dockerfile
    container_name: htop-web
    restart: unless-stopped
-    ports:
-      - "8088:8080"
+#    ports:
+#      - "8088:8000"
+    pid: host
+    volumes:
+      - /sys:/host/sys:ro
+      - /:/host/root:ro
+    labels:
+      caddy: htop-web.jambotron.com
+      caddy.reverse_proxy: "{{upstreams 8080}}"
+    networks:
+      - jambotron-net
+
+networks:
+  jambotron-net:
+    external: true
@@ -2,7 +2,8 @@
  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
  "version": 1,
  "cli": {
-    "packageManager": "npm"
+    "packageManager": "npm",
+    "analytics": false
  },
  "newProjectRoot": "projects",
  "projects": {
@@ -1,346 +1 @@
 <app-dashboard />
-
-<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
-<!-- * * * * * * * * * * * The content below * * * * * * * * * * * -->
-<!-- * * * * * * * * * * is only a placeholder * * * * * * * * * * -->
-<!-- * * * * * * * * * * and can be replaced.  * * * * * * * * * * -->
-<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
-<!-- * * * * * * * * * Delete the template below * * * * * * * * * -->
-<!-- * * * * * * * to get started with your project! * * * * * * * -->
-<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
-
-<style>
-  :host {
-    --bright-blue: oklch(51.01% 0.274 263.83);
-    --electric-violet: oklch(53.18% 0.28 296.97);
-    --french-violet: oklch(47.66% 0.246 305.88);
-    --vivid-pink: oklch(69.02% 0.277 332.77);
-    --hot-red: oklch(61.42% 0.238 15.34);
-    --orange-red: oklch(63.32% 0.24 31.68);
-
-    --gray-900: oklch(19.37% 0.006 300.98);
-    --gray-700: oklch(36.98% 0.014 302.71);
-    --gray-400: oklch(70.9% 0.015 304.04);
-
-    --red-to-pink-to-purple-vertical-gradient: linear-gradient(
-      180deg,
-      var(--orange-red) 0%,
-      var(--vivid-pink) 50%,
-      var(--electric-violet) 100%
-    );
-
-    --red-to-pink-to-purple-horizontal-gradient: linear-gradient(
-      90deg,
-      var(--orange-red) 0%,
-      var(--vivid-pink) 50%,
-      var(--electric-violet) 100%
-    );
-
-    --pill-accent: var(--bright-blue);
-
-    font-family: "Inter", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
-      Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji",
-      "Segoe UI Symbol";
-    box-sizing: border-box;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-    display: block;
-    height: 100dvh;
-  }
-
-  h1 {
-    font-size: 3.125rem;
-    color: var(--gray-900);
-    font-weight: 500;
-    line-height: 100%;
-    letter-spacing: -0.125rem;
-    margin: 0;
-    font-family: "Inter Tight", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
-      Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji",
-      "Segoe UI Symbol";
-  }
-
-  p {
-    margin: 0;
-    color: var(--gray-700);
-  }
-
-  main {
-    width: 100%;
-    min-height: 100%;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    padding: 1rem;
-    box-sizing: inherit;
-    position: relative;
-  }
-
-  .angular-logo {
-    max-width: 9.2rem;
-  }
-
-  .content {
-    display: flex;
-    justify-content: space-around;
-    width: 100%;
-    max-width: 700px;
-    margin-bottom: 3rem;
-  }
-
-  .content h1 {
-    margin-top: 1.75rem;
-  }
-
-  .content p {
-    margin-top: 1.5rem;
-  }
-
-  .divider {
-    width: 1px;
-    background: var(--red-to-pink-to-purple-vertical-gradient);
-    margin-inline: 0.5rem;
-  }
-
-  .pill-group {
-    display: flex;
-    flex-direction: column;
-    align-items: start;
-    flex-wrap: wrap;
-    gap: 1.25rem;
-  }
-
-  .pill {
-    display: flex;
-    align-items: center;
-    --pill-accent: var(--bright-blue);
-    background: color-mix(in srgb, var(--pill-accent) 5%, transparent);
-    color: var(--pill-accent);
-    padding-inline: 0.75rem;
-    padding-block: 0.375rem;
-    border-radius: 2.75rem;
-    border: 0;
-    transition: background 0.3s ease;
-    font-family: var(--inter-font);
-    font-size: 0.875rem;
-    font-style: normal;
-    font-weight: 500;
-    line-height: 1.4rem;
-    letter-spacing: -0.00875rem;
-    text-decoration: none;
-    white-space: nowrap;
-  }
-
-  .pill:hover {
-    background: color-mix(in srgb, var(--pill-accent) 15%, transparent);
-  }
-
-  .pill-group .pill:nth-child(6n + 1) {
-    --pill-accent: var(--bright-blue);
-  }
-  .pill-group .pill:nth-child(6n + 2) {
-    --pill-accent: var(--electric-violet);
-  }
-  .pill-group .pill:nth-child(6n + 3) {
-    --pill-accent: var(--french-violet);
-  }
-
-  .pill-group .pill:nth-child(6n + 4),
-  .pill-group .pill:nth-child(6n + 5),
-  .pill-group .pill:nth-child(6n + 6) {
-    --pill-accent: var(--hot-red);
-  }
-
-  .pill-group svg {
-    margin-inline-start: 0.25rem;
-  }
-
-  .social-links {
-    display: flex;
-    align-items: center;
-    gap: 0.73rem;
-    margin-top: 1.5rem;
-  }
-
-  .social-links path {
-    transition: fill 0.3s ease;
-    fill: var(--gray-400);
-  }
-
-  .social-links a:hover svg path {
-    fill: var(--gray-900);
-  }
-
-  @media screen and (max-width: 650px) {
-    .content {
-      flex-direction: column;
-      width: max-content;
-    }
-
-    .divider {
-      height: 1px;
-      width: 100%;
-      background: var(--red-to-pink-to-purple-horizontal-gradient);
-      margin-block: 1.5rem;
-    }
-  }
-</style>
-
-<main class="main">
-  <div class="content">
-    <div class="left-side">
-      <svg
-        xmlns="http://www.w3.org/2000/svg"
-        viewBox="0 0 982 239"
-        fill="none"
-        class="angular-logo"
-      >
-        <g clip-path="url(#a)">
-          <path
-            fill="url(#b)"
-            d="M388.676 191.625h30.849L363.31 31.828h-35.758l-56.215 159.797h30.848l13.174-39.356h60.061l13.256 39.356Zm-65.461-62.675 21.602-64.311h1.227l21.602 64.311h-44.431Zm126.831-7.527v70.202h-28.23V71.839h27.002v20.374h1.392c2.782-6.71 7.2-12.028 13.255-15.956 6.056-3.927 13.584-5.89 22.503-5.89 8.264 0 15.465 1.8 21.684 5.318 6.137 3.518 10.964 8.673 14.319 15.382 3.437 6.71 5.074 14.81 4.992 24.383v76.175h-28.23v-71.92c0-8.019-2.046-14.237-6.219-18.819-4.173-4.5-9.819-6.791-17.102-6.791-4.91 0-9.328 1.063-13.174 3.272-3.846 2.128-6.792 5.237-9.001 9.328-2.046 4.009-3.191 8.918-3.191 14.728ZM589.233 239c-10.147 0-18.82-1.391-26.103-4.091-7.282-2.7-13.092-6.382-17.511-10.964-4.418-4.582-7.528-9.655-9.164-15.219l25.448-6.136c1.145 2.372 2.782 4.663 4.991 6.954 2.209 2.291 5.155 4.255 8.837 5.81 3.683 1.554 8.428 2.291 14.074 2.291 8.019 0 14.647-1.964 19.884-5.81 5.237-3.845 7.856-10.227 7.856-19.064v-22.665h-1.391c-1.473 2.946-3.601 5.892-6.383 9.001-2.782 3.109-6.464 5.645-10.965 7.691-4.582 2.046-10.228 3.109-17.101 3.109-9.165 0-17.511-2.209-25.039-6.545-7.446-4.337-13.42-10.883-17.757-19.474-4.418-8.673-6.628-19.473-6.628-32.565 0-13.091 2.21-24.301 6.628-33.383 4.419-9.082 10.311-15.955 17.839-20.7 7.528-4.746 15.874-7.037 25.039-7.037 7.037 0 12.846 1.145 17.347 3.518 4.582 2.373 8.182 5.236 10.883 8.51 2.7 3.272 4.746 6.382 6.137 9.327h1.554v-19.8h27.821v121.749c0 10.228-2.454 18.737-7.364 25.447-4.91 6.709-11.538 11.7-20.048 15.055-8.509 3.355-18.165 4.991-28.884 4.991Zm.245-71.266c5.974 0 11.047-1.473 15.302-4.337 4.173-2.945 7.446-7.118 9.573-12.519 2.21-5.482 3.274-12.027 3.274-19.637 0-7.609-1.064-14.155-3.274-19.8-2.127-5.646-5.318-10.064-9.491-13.255-4.174-3.11-9.329-4.746-15.384-4.746s-11.537 1.636-15.792 4.91c-4.173 3.272-7.365 7.772-9.492 13.418-2.128 5.727-3.191 12.191-3.191 19.392 0 7.2 1.063 13.745 3.273 19.228 2.127 5.482 5.318 9.736 9.573 12.764 4.174 3.027 9.41 4.582 15.629 4.582Zm141.56-26.51V71.839h28.23v119.786h-27.412v-21.273h-1.227c-2.7 6.709-7.119 12.191-13.338 16.446-6.137 4.255-13.747 6.382-22.748 6.382-7.855 0-14.81-1.718-20.783-5.237-5.974-3.518-10.72-8.591-14.075-15.382-3.355-6.709-5.073-14.891-5.073-24.464V71.839h28.312v71.921c0 7.609 2.046 13.664 6.219 18.083 4.173 4.5 9.655 6.709 16.365 6.709 4.173 0 8.183-.982 12.111-3.028 3.927-2.045 7.118-5.072 9.655-9.082 2.537-4.091 3.764-9.164 3.764-15.218Zm65.707-109.395v159.796h-28.23V31.828h28.23Zm44.841 162.169c-7.61 0-14.402-1.391-20.457-4.091-6.055-2.7-10.883-6.791-14.32-12.109-3.518-5.319-5.237-11.946-5.237-19.801 0-6.791 1.228-12.355 3.765-16.773 2.536-4.419 5.891-7.937 10.228-10.637 4.337-2.618 9.164-4.664 14.647-6.055 5.4-1.391 11.046-2.373 16.856-3.027 7.037-.737 12.683-1.391 17.102-1.964 4.337-.573 7.528-1.555 9.574-2.782 1.963-1.309 3.027-3.273 3.027-5.973v-.491c0-5.891-1.718-10.391-5.237-13.664-3.518-3.191-8.51-4.828-15.056-4.828-6.955 0-12.356 1.473-16.447 4.5-4.009 3.028-6.71 6.546-8.183 10.719l-26.348-3.764c2.046-7.282 5.483-13.336 10.31-18.328 4.746-4.909 10.638-8.59 17.511-11.045 6.955-2.455 14.565-3.682 22.912-3.682 5.809 0 11.537.654 17.265 2.045s10.965 3.6 15.711 6.71c4.746 3.109 8.51 7.282 11.455 12.6 2.864 5.318 4.337 11.946 4.337 19.883v80.184h-27.166v-16.446h-.9c-1.719 3.355-4.092 6.464-7.201 9.328-3.109 2.864-6.955 5.237-11.619 6.955-4.828 1.718-10.229 2.536-16.529 2.536Zm7.364-20.701c5.646 0 10.556-1.145 14.729-3.354 4.173-2.291 7.364-5.237 9.655-9.001 2.292-3.763 3.355-7.854 3.355-12.273v-14.155c-.9.737-2.373 1.391-4.5 2.046-2.128.654-4.419 1.145-7.037 1.636-2.619.491-5.155.9-7.692 1.227-2.537.328-4.746.655-6.628.901-4.173.572-8.019 1.472-11.292 2.781-3.355 1.31-5.973 3.11-7.855 5.401-1.964 2.291-2.864 5.318-2.864 8.918 0 5.237 1.882 9.164 5.728 11.782 3.682 2.782 8.51 4.091 14.401 4.091Zm64.643 18.328V71.839h27.412v19.965h1.227c2.21-6.955 5.974-12.274 11.292-16.038 5.319-3.763 11.456-5.645 18.329-5.645 1.555 0 3.355.082 5.237.163 1.964.164 3.601.328 4.91.573v25.938c-1.227-.41-3.109-.819-5.646-1.146a58.814 58.814 0 0 0-7.446-.49c-5.155 0-9.738 1.145-13.829 3.354-4.091 2.209-7.282 5.236-9.655 9.164-2.373 3.927-3.519 8.427-3.519 13.5v70.448h-28.312ZM222.077 39.192l-8.019 125.923L137.387 0l84.69 39.192Zm-53.105 162.825-57.933 33.056-57.934-33.056 11.783-28.556h92.301l11.783 28.556ZM111.039 62.675l30.357 73.803H80.681l30.358-73.803ZM7.937 165.115 0 39.192 84.69 0 7.937 165.115Z"
-          />
-          <path
-            fill="url(#c)"
-            d="M388.676 191.625h30.849L363.31 31.828h-35.758l-56.215 159.797h30.848l13.174-39.356h60.061l13.256 39.356Zm-65.461-62.675 21.602-64.311h1.227l21.602 64.311h-44.431Zm126.831-7.527v70.202h-28.23V71.839h27.002v20.374h1.392c2.782-6.71 7.2-12.028 13.255-15.956 6.056-3.927 13.584-5.89 22.503-5.89 8.264 0 15.465 1.8 21.684 5.318 6.137 3.518 10.964 8.673 14.319 15.382 3.437 6.71 5.074 14.81 4.992 24.383v76.175h-28.23v-71.92c0-8.019-2.046-14.237-6.219-18.819-4.173-4.5-9.819-6.791-17.102-6.791-4.91 0-9.328 1.063-13.174 3.272-3.846 2.128-6.792 5.237-9.001 9.328-2.046 4.009-3.191 8.918-3.191 14.728ZM589.233 239c-10.147 0-18.82-1.391-26.103-4.091-7.282-2.7-13.092-6.382-17.511-10.964-4.418-4.582-7.528-9.655-9.164-15.219l25.448-6.136c1.145 2.372 2.782 4.663 4.991 6.954 2.209 2.291 5.155 4.255 8.837 5.81 3.683 1.554 8.428 2.291 14.074 2.291 8.019 0 14.647-1.964 19.884-5.81 5.237-3.845 7.856-10.227 7.856-19.064v-22.665h-1.391c-1.473 2.946-3.601 5.892-6.383 9.001-2.782 3.109-6.464 5.645-10.965 7.691-4.582 2.046-10.228 3.109-17.101 3.109-9.165 0-17.511-2.209-25.039-6.545-7.446-4.337-13.42-10.883-17.757-19.474-4.418-8.673-6.628-19.473-6.628-32.565 0-13.091 2.21-24.301 6.628-33.383 4.419-9.082 10.311-15.955 17.839-20.7 7.528-4.746 15.874-7.037 25.039-7.037 7.037 0 12.846 1.145 17.347 3.518 4.582 2.373 8.182 5.236 10.883 8.51 2.7 3.272 4.746 6.382 6.137 9.327h1.554v-19.8h27.821v121.749c0 10.228-2.454 18.737-7.364 25.447-4.91 6.709-11.538 11.7-20.048 15.055-8.509 3.355-18.165 4.991-28.884 4.991Zm.245-71.266c5.974 0 11.047-1.473 15.302-4.337 4.173-2.945 7.446-7.118 9.573-12.519 2.21-5.482 3.274-12.027 3.274-19.637 0-7.609-1.064-14.155-3.274-19.8-2.127-5.646-5.318-10.064-9.491-13.255-4.174-3.11-9.329-4.746-15.384-4.746s-11.537 1.636-15.792 4.91c-4.173 3.272-7.365 7.772-9.492 13.418-2.128 5.727-3.191 12.191-3.191 19.392 0 7.2 1.063 13.745 3.273 19.228 2.127 5.482 5.318 9.736 9.573 12.764 4.174 3.027 9.41 4.582 15.629 4.582Zm141.56-26.51V71.839h28.23v119.786h-27.412v-21.273h-1.227c-2.7 6.709-7.119 12.191-13.338 16.446-6.137 4.255-13.747 6.382-22.748 6.382-7.855 0-14.81-1.718-20.783-5.237-5.974-3.518-10.72-8.591-14.075-15.382-3.355-6.709-5.073-14.891-5.073-24.464V71.839h28.312v71.921c0 7.609 2.046 13.664 6.219 18.083 4.173 4.5 9.655 6.709 16.365 6.709 4.173 0 8.183-.982 12.111-3.028 3.927-2.045 7.118-5.072 9.655-9.082 2.537-4.091 3.764-9.164 3.764-15.218Zm65.707-109.395v159.796h-28.23V31.828h28.23Zm44.841 162.169c-7.61 0-14.402-1.391-20.457-4.091-6.055-2.7-10.883-6.791-14.32-12.109-3.518-5.319-5.237-11.946-5.237-19.801 0-6.791 1.228-12.355 3.765-16.773 2.536-4.419 5.891-7.937 10.228-10.637 4.337-2.618 9.164-4.664 14.647-6.055 5.4-1.391 11.046-2.373 16.856-3.027 7.037-.737 12.683-1.391 17.102-1.964 4.337-.573 7.528-1.555 9.574-2.782 1.963-1.309 3.027-3.273 3.027-5.973v-.491c0-5.891-1.718-10.391-5.237-13.664-3.518-3.191-8.51-4.828-15.056-4.828-6.955 0-12.356 1.473-16.447 4.5-4.009 3.028-6.71 6.546-8.183 10.719l-26.348-3.764c2.046-7.282 5.483-13.336 10.31-18.328 4.746-4.909 10.638-8.59 17.511-11.045 6.955-2.455 14.565-3.682 22.912-3.682 5.809 0 11.537.654 17.265 2.045s10.965 3.6 15.711 6.71c4.746 3.109 8.51 7.282 11.455 12.6 2.864 5.318 4.337 11.946 4.337 19.883v80.184h-27.166v-16.446h-.9c-1.719 3.355-4.092 6.464-7.201 9.328-3.109 2.864-6.955 5.237-11.619 6.955-4.828 1.718-10.229 2.536-16.529 2.536Zm7.364-20.701c5.646 0 10.556-1.145 14.729-3.354 4.173-2.291 7.364-5.237 9.655-9.001 2.292-3.763 3.355-7.854 3.355-12.273v-14.155c-.9.737-2.373 1.391-4.5 2.046-2.128.654-4.419 1.145-7.037 1.636-2.619.491-5.155.9-7.692 1.227-2.537.328-4.746.655-6.628.901-4.173.572-8.019 1.472-11.292 2.781-3.355 1.31-5.973 3.11-7.855 5.401-1.964 2.291-2.864 5.318-2.864 8.918 0 5.237 1.882 9.164 5.728 11.782 3.682 2.782 8.51 4.091 14.401 4.091Zm64.643 18.328V71.839h27.412v19.965h1.227c2.21-6.955 5.974-12.274 11.292-16.038 5.319-3.763 11.456-5.645 18.329-5.645 1.555 0 3.355.082 5.237.163 1.964.164 3.601.328 4.91.573v25.938c-1.227-.41-3.109-.819-5.646-1.146a58.814 58.814 0 0 0-7.446-.49c-5.155 0-9.738 1.145-13.829 3.354-4.091 2.209-7.282 5.236-9.655 9.164-2.373 3.927-3.519 8.427-3.519 13.5v70.448h-28.312ZM222.077 39.192l-8.019 125.923L137.387 0l84.69 39.192Zm-53.105 162.825-57.933 33.056-57.934-33.056 11.783-28.556h92.301l11.783 28.556ZM111.039 62.675l30.357 73.803H80.681l30.358-73.803ZM7.937 165.115 0 39.192 84.69 0 7.937 165.115Z"
-          />
-        </g>
-        <defs>
-          <radialGradient
-            id="c"
-            cx="0"
-            cy="0"
-            r="1"
-            gradientTransform="rotate(118.122 171.182 60.81) scale(205.794)"
-            gradientUnits="userSpaceOnUse"
-          >
-            <stop stop-color="#FF41F8" />
-            <stop offset=".707" stop-color="#FF41F8" stop-opacity=".5" />
-            <stop offset="1" stop-color="#FF41F8" stop-opacity="0" />
-          </radialGradient>
-          <linearGradient
-            id="b"
-            x1="0"
-            x2="982"
-            y1="192"
-            y2="192"
-            gradientUnits="userSpaceOnUse"
-          >
-            <stop stop-color="#F0060B" />
-            <stop offset="0" stop-color="#F0070C" />
-            <stop offset=".526" stop-color="#CC26D5" />
-            <stop offset="1" stop-color="#7702FF" />
-          </linearGradient>
-          <clipPath id="a"><path fill="#fff" d="M0 0h982v239H0z" /></clipPath>
-        </defs>
-      </svg>
-      <h1>Hello, {{ title() }}</h1>
-      <p>Congratulations! Your app is running. 🎉</p>
-    </div>
-    <div class="divider" role="separator" aria-label="Divider"></div>
-    <div class="right-side">
-      <div class="pill-group">
-        @for (item of [
-          { title: 'Explore the Docs', link: 'https://angular.dev' },
-          { title: 'Learn with Tutorials', link: 'https://angular.dev/tutorials' },
-          { title: 'Prompt and best practices for AI', link: 'https://angular.dev/ai/develop-with-ai'},
-          { title: 'CLI Docs', link: 'https://angular.dev/tools/cli' },
-          { title: 'Angular Language Service', link: 'https://angular.dev/tools/language-service' },
-          { title: 'Angular DevTools', link: 'https://angular.dev/tools/devtools' },
-        ]; track item.title) {
-          <a
-            class="pill"
-            [href]="item.link"
-            target="_blank"
-            rel="noopener"
-          >
-            <span>{{ item.title }}</span>
-            <svg
-              xmlns="http://www.w3.org/2000/svg"
-              height="14"
-              viewBox="0 -960 960 960"
-              width="14"
-              fill="currentColor"
-            >
-              <path
-                d="M200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h280v80H200v560h560v-280h80v280q0 33-23.5 56.5T760-120H200Zm188-212-56-56 372-372H560v-80h280v280h-80v-144L388-332Z"
-              />
-            </svg>
-          </a>
-        }
-      </div>
-      <div class="social-links">
-        <a
-          href="https://github.com/angular/angular"
-          aria-label="Github"
-          target="_blank"
-          rel="noopener"
-        >
-          <svg
-            width="25"
-            height="24"
-            viewBox="0 0 25 24"
-            fill="none"
-            xmlns="http://www.w3.org/2000/svg"
-            alt="Github"
-          >
-            <path
-              d="M12.3047 0C5.50634 0 0 5.50942 0 12.3047C0 17.7423 3.52529 22.3535 8.41332 23.9787C9.02856 24.0946 9.25414 23.7142 9.25414 23.3871C9.25414 23.0949 9.24389 22.3207 9.23876 21.2953C5.81601 22.0377 5.09414 19.6444 5.09414 19.6444C4.53427 18.2243 3.72524 17.8449 3.72524 17.8449C2.61064 17.082 3.81137 17.0973 3.81137 17.0973C5.04697 17.1835 5.69604 18.3647 5.69604 18.3647C6.79321 20.2463 8.57636 19.7029 9.27978 19.3881C9.39052 18.5924 9.70736 18.0499 10.0591 17.7423C7.32641 17.4347 4.45429 16.3765 4.45429 11.6618C4.45429 10.3185 4.9311 9.22133 5.72065 8.36C5.58222 8.04931 5.16694 6.79833 5.82831 5.10337C5.82831 5.10337 6.85883 4.77319 9.2121 6.36459C10.1965 6.09082 11.2424 5.95546 12.2883 5.94931C13.3342 5.95546 14.3801 6.09082 15.3644 6.36459C17.7023 4.77319 18.7328 5.10337 18.7328 5.10337C19.3942 6.79833 18.9789 8.04931 18.8559 8.36C19.6403 9.22133 20.1171 10.3185 20.1171 11.6618C20.1171 16.3888 17.2409 17.4296 14.5031 17.7321C14.9338 18.1012 15.3337 18.8559 15.3337 20.0084C15.3337 21.6552 15.3183 22.978 15.3183 23.3779C15.3183 23.7009 15.5336 24.0854 16.1642 23.9623C21.0871 22.3484 24.6094 17.7341 24.6094 12.3047C24.6094 5.50942 19.0999 0 12.3047 0Z"
-            />
-          </svg>
-        </a>
-        <a
-          href="https://x.com/angular"
-          aria-label="X"
-          target="_blank"
-          rel="noopener"
-        >
-          <svg
-            width="24"
-            height="24"
-            viewBox="0 0 24 24"
-            fill="none"
-            xmlns="http://www.w3.org/2000/svg"
-            alt="X"
-          >
-            <path
-              d="M18.244 2.25h3.308l-7.227 8.26 8.502 11.24H16.17l-5.214-6.817L4.99 21.75H1.68l7.73-8.835L1.254 2.25H8.08l4.713 6.231zm-1.161 17.52h1.833L7.084 4.126H5.117z"
-            />
-          </svg>
-        </a>
-        <a
-          href="https://www.youtube.com/channel/UCbn1OgGei-DV7aSRo_HaAiw"
-          aria-label="Youtube"
-          target="_blank"
-          rel="noopener"
-        >
-          <svg
-            width="29"
-            height="20"
-            viewBox="0 0 29 20"
-            fill="none"
-            xmlns="http://www.w3.org/2000/svg"
-            alt="Youtube"
-          >
-            <path
-              fill-rule="evenodd"
-              clip-rule="evenodd"
-              d="M27.4896 1.52422C27.9301 1.96749 28.2463 2.51866 28.4068 3.12258C29.0004 5.35161 29.0004 10 29.0004 10C29.0004 10 29.0004 14.6484 28.4068 16.8774C28.2463 17.4813 27.9301 18.0325 27.4896 18.4758C27.0492 18.9191 26.5 19.2389 25.8972 19.4032C23.6778 20 14.8068 20 14.8068 20C14.8068 20 5.93586 20 3.71651 19.4032C3.11363 19.2389 2.56449 18.9191 2.12405 18.4758C1.68361 18.0325 1.36732 17.4813 1.20683 16.8774C0.613281 14.6484 0.613281 10 0.613281 10C0.613281 10 0.613281 5.35161 1.20683 3.12258C1.36732 2.51866 1.68361 1.96749 2.12405 1.52422C2.56449 1.08095 3.11363 0.76113 3.71651 0.596774C5.93586 0 14.8068 0 14.8068 0C14.8068 0 23.6778 0 25.8972 0.596774C26.5 0.76113 27.0492 1.08095 27.4896 1.52422ZM19.3229 10L11.9036 5.77905V14.221L19.3229 10Z"
-            />
-          </svg>
-        </a>
-      </div>
-    </div>
-  </div>
-</main>
-
-<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
-<!-- * * * * * * * * * * * The content above * * * * * * * * * * * * -->
-<!-- * * * * * * * * * * is only a placeholder * * * * * * * * * * * -->
-<!-- * * * * * * * * * * and can be replaced.  * * * * * * * * * * * -->
-<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
-<!-- * * * * * * * * * * End of Placeholder  * * * * * * * * * * * * -->
-<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
-
-
-<router-outlet />
@@ -1,9 +1,7 @@
+
 export interface LinuxNetwork {
  name: string;
  displayName: string;
-  macAddress: string;
-  ipv4Addresses: string[];
-  ipv6Addresses: string[];
  bytesReceived: number;
  bytesSent: number;
  packetsReceived: number;
@@ -15,3 +13,4 @@ export interface LinuxNetwork {
  receiveMbps: number;
  sendMbps: number;
 }
+
@@ -183,7 +183,7 @@
      </section>
    </section>
  } @else {
-    <!-- htop-original: styling follows the supplied reference -->
+    <!-- htop-original -->
    <section class="htop-original">
      @if (cpu$ | async; as cpu) {
        @if (memory$ | async; as memory) {
@@ -373,22 +373,78 @@
        </section>
      } @else {
        <section class="original-io-panel">
+
          <h3>Disks</h3>
+
          @if (disks$ | async; as disks) {
-            @for (disk of disks; track $index) {
-              <pre class="original-json-row">{{ disk | json }}</pre>
+            <div class="disk-table">
+              <div class="disk-row disk-heading">
+                <span>Device</span>
+                <span>Mount point</span>
+                <span>File system</span>
+                <span>Total</span>
+                <span>Used</span>
+                <span>Free</span>
+                <span>Usage</span>
+              </div>
+
+              @for (disk of disks; track disk.mountPoint) {
+                <div class="disk-row">
+                  <strong>{{ disk.name }}</strong>
+                  <span class="disk-mount">{{ disk.mountPoint }}</span>
+                  <span>{{ disk.fileSystem }}</span>
+                  <span>{{ formatBytes(disk.totalBytes) }}</span>
+                  <span>{{ formatBytes(disk.usedBytes) }}</span>
+                  <span>{{ formatBytes(disk.usableBytes) }}</span>
+                  <span class="disk-usage">
+          <span class="disk-usage-bar">
+            <span
+              class="disk-usage-fill"
+              [class.disk-usage-warning]="disk.usagePercent >= 70 && disk.usagePercent < 90"
+              [class.disk-usage-critical]="disk.usagePercent >= 90"
+              [style.width.%]="disk.usagePercent"
+            ></span>
+          </span>
+          <strong>{{ disk.usagePercent }}%</strong>
+        </span>
+                </div>
              } @empty {
                <p class="original-dim">No disk information available</p>
              }
+            </div>
+          } @else {
+            <p class="original-dim">Loading disk information...</p>
          }

-          <h3>Network</h3>
+
+          <h3>Network traffic</h3>
+
          @if (network$ | async; as networks) {
-            @for (network of networks; track $index) {
-              <pre class="original-json-row">{{ network | json }}</pre>
+            <div class="network-table">
+              <div class="network-row network-heading">
+                <span>Interface</span>
+                <span>Received</span>
+                <span>Sent</span>
+                <span>RX rate</span>
+                <span>TX rate</span>
+              </div>
+
+              @for (network of networks; track network.name) {
+                <div class="network-row">
+                  <strong>{{ network.displayName || network.name }}</strong>
+                  <span>{{ formatBytes(network.bytesReceived) }}</span>
+                  <span>{{ formatBytes(network.bytesSent) }}</span>
+                  <span class="original-green">
+                    {{ formatBytes(network.receiveBytesPerSecond) }}/s
+                  </span>
+                  <span class="original-teal">
+                    {{ formatBytes(network.sendBytesPerSecond) }}/s
+                  </span>
+                </div>
              } @empty {
                <p class="original-dim">No network information available</p>
              }
+            </div>
          }
        </section>
      }
@@ -318,7 +318,7 @@
  text-overflow: ellipsis;
 }

-/* htop-original: visual reference palette */
+/* htop-original */

 .htop-original-mode {
  gap: 6px;
@@ -481,6 +481,8 @@
  font-weight: 700;
 }

+/* Tabs */
+
 .htop-original-mode .original-tabs {
  display: flex;
  min-height: 26px;
@@ -528,6 +530,8 @@
  color: #fff;
 }

+/* Processes */
+
 .htop-original-mode .original-process-panel {
  display: flex;
  flex: 1;
@@ -613,6 +617,8 @@
  text-align: center;
 }

+/* Disk and network I/O */
+
 .htop-original-mode .original-io-panel {
  flex: 1;
  min-height: 0;
@@ -637,6 +643,35 @@
  font: inherit;
 }

+/* Network table */
+
+.htop-original-mode .network-table {
+  width: 100%;
+  overflow-x: auto;
+}
+
+.htop-original-mode .network-row {
+  display: grid;
+  grid-template-columns: minmax(90px, 1fr) repeat(4, minmax(90px, 1fr));
+  gap: 12px;
+  align-items: center;
+  padding: 7px 8px;
+  border-bottom: 1px solid #202020;
+  white-space: nowrap;
+}
+
+.htop-original-mode .network-heading {
+  background: #007777;
+  color: #000;
+  font-weight: 700;
+}
+
+.htop-original-mode .network-row strong {
+  color: #00aaaa;
+}
+
+/* Function keys */
+
 .htop-original-mode .original-function-keys {
  display: grid;
  grid-template-columns: repeat(10, minmax(0, 1fr));
@@ -745,4 +780,9 @@
  .htop-original-mode .original-filter-input {
    width: 120px;
  }
+
+  .htop-original-mode .network-row {
+    grid-template-columns: repeat(5, minmax(100px, 1fr));
+    gap: 8px;
+  }
 }