diff --git a/src/components/ServerDetailOverview.tsx b/src/components/ServerDetailOverview.tsx index 33aab61..140e579 100644 --- a/src/components/ServerDetailOverview.tsx +++ b/src/components/ServerDetailOverview.tsx @@ -38,10 +38,25 @@ export default function ServerDetailOverview({ return ; } - const { name, online, uptime, version } = formatNezhaInfo( - nezhaWsData.now, - server, - ); + const { + name, + online, + uptime, + version, + arch, + mem_total, + disk_total, + country_code, + platform, + platform_version, + cpu_info, + gpu_info, + load_1, + load_5, + load_15, + net_out_transfer, + net_in_transfer, + } = formatNezhaInfo(nezhaWsData.now, server); return (
@@ -105,7 +120,7 @@ export default function ServerDetailOverview({ {t("serverDetail.arch")}

- {server.host.arch || t("serverDetail.unknown")}{" "} + {arch || t("serverDetail.unknown")}{" "}
@@ -116,9 +131,7 @@ export default function ServerDetailOverview({

{t("serverDetail.mem")}

-
- {formatBytes(server.host.mem_total)} -
+
{formatBytes(mem_total)}
@@ -128,9 +141,7 @@ export default function ServerDetailOverview({

{t("serverDetail.disk")}

-
- {formatBytes(server.host.disk_total)} -
+
{formatBytes(disk_total)}
@@ -142,13 +153,12 @@ export default function ServerDetailOverview({

- {server.country_code?.toUpperCase() || - t("serverDetail.unknown")} + {country_code?.toUpperCase() || t("serverDetail.unknown")}
- {server.country_code && ( + {country_code && ( )}
@@ -163,11 +173,10 @@ export default function ServerDetailOverview({

{t("serverDetail.system")}

- {server.host.platform ? ( + {platform ? (
{" "} - {server.host.platform || t("serverDetail.unknown")} -{" "} - {server.host.platform_version}{" "} + {platform || t("serverDetail.unknown")} - {platform_version}{" "}
) : (
{t("serverDetail.unknown")}
@@ -179,8 +188,8 @@ export default function ServerDetailOverview({

{"CPU"}

- {server.host.cpu.length > 0 ? ( -
{server.host.cpu.join(", ")}
+ {cpu_info.length > 0 ? ( +
{cpu_info.join(", ")}
) : (
{t("serverDetail.unknown")}
)} @@ -191,8 +200,8 @@ export default function ServerDetailOverview({

{"GPU"}

- {server.host.gpu.length > 0 ? ( -
{server.host.gpu.join(", ")}
+ {gpu_info.length > 0 ? ( +
{gpu_info.join(", ")}
) : (
{t("serverDetail.unknown")}
)} @@ -205,15 +214,10 @@ export default function ServerDetailOverview({

{"Load"}

- {server.state.load_1 ? ( -
- {server.state.load_1.toFixed(2)} /{" "} - {server.state.load_5.toFixed(2)} /{" "} - {server.state.load_15.toFixed(2)} -
- ) : ( -
{t("serverDetail.unknown")}
- )} + +
+ {load_1} / {load_5} / {load_15} +
@@ -223,11 +227,8 @@ export default function ServerDetailOverview({

{t("serverDetail.upload")}

- {server.state.net_out_transfer ? ( -
- {" "} - {formatBytes(server.state.net_out_transfer)}{" "} -
+ {net_out_transfer ? ( +
{formatBytes(net_out_transfer)}
) : (
{t("serverDetail.unknown")}
)} @@ -240,11 +241,8 @@ export default function ServerDetailOverview({

{t("serverDetail.download")}

- {server.state.net_in_transfer ? ( -
- {" "} - {formatBytes(server.state.net_in_transfer)}{" "} -
+ {net_in_transfer ? ( +
{formatBytes(net_in_transfer)}
) : (
{t("serverDetail.unknown")}
)} diff --git a/src/lib/utils.ts b/src/lib/utils.ts index eb00a23..17ecbfc 100644 --- a/src/lib/utils.ts +++ b/src/lib/utils.ts @@ -27,6 +27,17 @@ export function formatNezhaInfo(now: number, serverInfo: NezhaServer) { platform: serverInfo.host.platform || "", net_out_transfer: serverInfo.state.net_out_transfer || 0, net_in_transfer: serverInfo.state.net_in_transfer || 0, + arch: serverInfo.host.arch || "", + mem_total: serverInfo.host.mem_total || 0, + swap_total: serverInfo.host.swap_total || 0, + disk_total: serverInfo.host.disk_total || 0, + boot_time: serverInfo.host.boot_time || 0, + platform_version: serverInfo.host.platform_version || "", + cpu_info: serverInfo.host.cpu || [], + gpu_info: serverInfo.host.gpu || [], + load_1: serverInfo.state.load_1?.toFixed(2) || 0.0, + load_5: serverInfo.state.load_5?.toFixed(2) || 0.0, + load_15: serverInfo.state.load_15?.toFixed(2) || 0.0, }; }