-
- @if (type !== 'core' && host.hashes?.[type]) {
+
+ |
+ @if (type !== 'core' && type !== 'os' && host.hashes?.[type]) {
{{ host.hashes[type].slice(0, 8) || '?' }}
} @else if (host.hashes?.[type]) {
{{ host.hashes[type] || '?' }}
- {{ host.hashes[type]?.slice(9) || '?' }}
+ {{ shortenVersion(host.hashes[type]) || '?' }}
} @else {
?
}
diff --git a/frontend/src/app/components/server-health/server-health.component.scss b/frontend/src/app/components/server-health/server-health.component.scss
index 883ef22dc..bb5fd1a84 100644
--- a/frontend/src/app/components/server-health/server-health.component.scss
+++ b/frontend/src/app/components/server-health/server-health.component.scss
@@ -13,10 +13,12 @@
margin: auto;
padding: 1em;
background: var(--box-bg);
+ overflow-x: auto;
}
.status-table {
- width: 100%;
+ width: max-content;
+ min-width: 100%;
td, th {
padding: 0.25em;
@@ -45,6 +47,7 @@
&.host {
width: 100%;
max-width: 0;
+ min-width: 130px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
diff --git a/frontend/src/app/components/server-health/server-health.component.ts b/frontend/src/app/components/server-health/server-health.component.ts
index 7c5ed75ba..399e42d2e 100644
--- a/frontend/src/app/components/server-health/server-health.component.ts
+++ b/frontend/src/app/components/server-health/server-health.component.ts
@@ -1,6 +1,6 @@
import { Component, OnInit, ChangeDetectionStrategy, SecurityContext, ChangeDetectorRef } from '@angular/core';
import { WebsocketService } from '@app/services/websocket.service';
-import { Observable, Subject, map, tap } from 'rxjs';
+import { Observable, map, tap } from 'rxjs';
import { StateService } from '@app/services/state.service';
import { HealthCheckHost } from '@interfaces/websocket.interface';
import { DomSanitizer } from '@angular/platform-browser';
@@ -17,6 +17,7 @@ export class ServerHealthComponent implements OnInit {
maxHeight: number;
interval: number;
now: number = Date.now();
+ colors: Record> = {};
repoMap = {
frontend: 'mempool',
@@ -59,6 +60,31 @@ export class ServerHealthComponent implements OnInit {
for (const host of hosts) {
newMaxHeight = Math.max(newMaxHeight, host.latestHeight);
}
+
+ const sortedCoreVersions = [...new Set(
+ hosts.map(h => this.parseVersion(h.hashes?.core)).filter(Boolean)
+ )].sort((a, b) => this.compareVersions(a, b));
+
+ const sortedOsVersions = [...new Set(
+ hosts.map(h => this.parseOsVersion(h.hashes?.os)).filter(Boolean)
+ )].sort((a, b) => this.compareVersions(a, b));
+
+ this.colors = {};
+ for (const host of hosts) {
+ this.colors[host.host] = {};
+ for (const type of ['hybrid', 'frontend', 'backend', 'electrs', 'ssr', 'core', 'os']) {
+ if (type === 'core') {
+ const version = this.parseVersion(host.hashes?.core);
+ this.colors[host.host][type] = version ? this.getVersionColor(version, sortedCoreVersions) : '';
+ } else if (type === 'os') {
+ const version = this.parseOsVersion(host.hashes?.os);
+ this.colors[host.host][type] = version ? this.getVersionColor(version, sortedOsVersions) : '';
+ } else {
+ const hash = host.hashes?.[type];
+ this.colors[host.host][type] = hash ? '#' + hash.slice(0, 6) : '';
+ }
+ }
+ }
})
);
this.websocketService.want(['mempool-blocks', 'stats', 'blocks', 'tomahawk']);
@@ -99,4 +125,50 @@ export class ServerHealthComponent implements OnInit {
return '';
}
}
+
+ private parseVersion(subver: string): string | undefined {
+ if (subver) {
+ const match = subver.match(/:(\d+\.\d+\.\d+)/);
+ return match ? match[1] : null;
+ }
+ }
+
+ private parseOsVersion(osVersion: string): string | undefined {
+ if (osVersion) {
+ const match = osVersion.match(/(\d+)\.(\d+)(?:\.(\d+))?/);
+ return match ? `${match[1]}.${match[2]}.${match[3] ?? 0}` : null;
+ }
+ }
+
+ public shortenVersion(version: string): string {
+ return version.match(/\d+\.\d+(?:\.\d+)?/)?.[0] ?? '';
+ }
+
+ private compareVersions(a: string, b: string): number {
+ const partsA = a.split('.').map(Number);
+ const partsB = b.split('.').map(Number);
+ for (let i = 0; i < 3; i++) {
+ if (partsA[i] !== partsB[i]) {
+ return partsA[i] - partsB[i];
+ }
+ }
+ return 0;
+ }
+
+ private getVersionColor(version: string, sortedVersions: string[]): string {
+ if (!version || sortedVersions.length === 0) {
+ return '';
+ }
+ const index = sortedVersions.indexOf(version);
+ if (index === -1) {
+ return '';
+ }
+
+ if (sortedVersions.length === 1) {
+ return 'hsl(120, 70%, 35%)';
+ }
+
+ const hue = (index / (sortedVersions.length - 1)) * 120;
+ return `hsl(${hue}, 70%, 35%)`;
+ }
}
diff --git a/frontend/src/app/interfaces/websocket.interface.ts b/frontend/src/app/interfaces/websocket.interface.ts
index 9281f0fc7..d22061259 100644
--- a/frontend/src/app/interfaces/websocket.interface.ts
+++ b/frontend/src/app/interfaces/websocket.interface.ts
@@ -151,7 +151,11 @@ export interface HealthCheckHost {
frontend?: string;
backend?: string;
electrs?: string;
- }
+ hybrid?: string;
+ ssr?: string;
+ core?: string;
+ os?: string;
+ };
}
export interface StratumJob {
diff --git a/frontend/src/resources/liquid/liquid-network-preview.png b/frontend/src/resources/liquid/liquid-network-preview.png
index a66e9bb7a..9b076eda6 100644
Binary files a/frontend/src/resources/liquid/liquid-network-preview.png and b/frontend/src/resources/liquid/liquid-network-preview.png differ
diff --git a/production/nginx-cache-warmer-ssr b/production/nginx-cache-warmer-ssr
index 4907e4e12..29ebc9883 100755
--- a/production/nginx-cache-warmer-ssr
+++ b/production/nginx-cache-warmer-ssr
@@ -1,7 +1,7 @@
#!/usr/bin/env zsh
delay=0.15
hostname=$(hostname)
-services_host=""
+#services_host=""
protocol="https"
base_domain="mempool.space"
list_refresh_interval=60
| |