Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 45 additions & 2 deletions src/lib/stores/telemetry.svelte.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ export interface TelemetryData {
ramUsage: number;
totalRam: number;
cpuUsage: number;
cpuModel: string;
cpuCores: number;
cpuThreads: number;
uptime: number;
onlinePlayers: number;
maxPlayers: number;
Expand Down Expand Up @@ -45,9 +48,12 @@ function createTelemetryStore() {
ramUsage: 0,
totalRam: 0,
cpuUsage: 0,
cpuModel: 'Unknown',
cpuCores: 0,
cpuThreads: 0,
uptime: 0,
onlinePlayers: 0,
maxPlayers: 100,
maxPlayers: 0,
tps: 20,
storageUsed: undefined,
tpsHistory: []
Expand Down Expand Up @@ -92,7 +98,10 @@ function createTelemetryStore() {
socket.onmessage = (event) => {
try {
const payload = JSON.parse(event.data);
if (payload.type === 'Metric') {
if (payload.type === 'Handshake') {
// Handshake: one-time system info and config
updateHandshake(payload.data);
} else if (payload.type === 'Metric') {
updateMetrics(payload.data);
}
} catch (e) {
Expand All @@ -113,13 +122,44 @@ function createTelemetryStore() {
};
}

function updateHandshake(data: {
system?: {
cpu_model?: string;
cpu_cores?: number;
cpu_threads?: number;
};
config?: {
max_players?: number;
};
}) {
// System info
if (data.system) {
if (data.system.cpu_model !== undefined) {
state.data.cpuModel = data.system.cpu_model;
}
if (data.system.cpu_cores !== undefined) {
state.data.cpuCores = data.system.cpu_cores;
}
if (data.system.cpu_threads !== undefined) {
state.data.cpuThreads = data.system.cpu_threads;
}
}
// Config
if (data.config) {
if (data.config.max_players !== undefined) {
state.data.maxPlayers = data.config.max_players;
}
}
}

function updateMetrics(data: {
ram_usage?: number;
total_ram?: number;
cpu_usage?: number;
uptime?: number;
online_players?: number;
max_players?: number;
player_count?: number;
tps?: number;
storage_used?: number;
disk_type?: string;
Expand All @@ -136,6 +176,9 @@ function createTelemetryStore() {
if (data.uptime !== undefined) {
state.data.uptime = data.uptime;
}
if (data.player_count !== undefined) {
state.data.onlinePlayers = data.player_count;
}
if (data.online_players !== undefined) {
state.data.onlinePlayers = data.online_players;
}
Expand Down
7 changes: 6 additions & 1 deletion src/routes/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,12 @@
style="width: {cpuPercent}%"
></div>
</div>
<p class="text-xs text-muted-foreground">System CPU</p>
<p class="text-xs text-muted-foreground truncate" title={telemetry.data.cpuModel}>
{telemetry.data.cpuModel}
</p>
<p class="text-xs text-muted-foreground/70">
{telemetry.data.cpuCores} cores / {telemetry.data.cpuThreads} threads
</p>
</div>

<!-- RAM Detail -->
Expand Down