diff --git a/src/components/ServerDetailOverview.tsx b/src/components/ServerDetailOverview.tsx index e1cd647..f5c3168 100644 --- a/src/components/ServerDetailOverview.tsx +++ b/src/components/ServerDetailOverview.tsx @@ -1,3 +1,4 @@ +import NumericText from "@numeric-text/react"; import countries from "i18n-iso-countries"; import enLocale from "i18n-iso-countries/langs/en.json"; import { useEffect, useState } from "react"; @@ -11,8 +12,6 @@ import { Card, CardContent } from "@/components/ui/card"; import { useWebSocketContext } from "@/hooks/use-websocket-context"; import { formatBytes } from "@/lib/format"; import { cn, formatNezhaInfo } from "@/lib/utils"; -import type { NezhaWebsocketResponse } from "@/types/nezha-api"; - import { Accordion, AccordionContent, @@ -43,9 +42,9 @@ export default function ServerDetailOverview({ } }, []); - const { lastMessage, connected } = useWebSocketContext(); + const { lastData, connected } = useWebSocketContext(); - if (!connected && !lastMessage) { + if (!connected && !lastData) { return ; } @@ -57,9 +56,7 @@ export default function ServerDetailOverview({ } }; - const nezhaWsData = lastMessage - ? (JSON.parse(lastMessage.data) as NezhaWebsocketResponse) - : null; + const nezhaWsData = lastData; if (!nezhaWsData) { return ; @@ -141,12 +138,14 @@ export default function ServerDetailOverview({

{t("serverDetail.uptime")}

-
- {" "} - {uptime / 86400 >= 1 - ? `${Math.floor(uptime / 86400)} ${t("serverDetail.days")} ${Math.floor((uptime % 86400) / 3600)} ${t("serverDetail.hours")}` - : `${Math.floor(uptime / 3600)} ${t("serverDetail.hours")}`} -
+ = 1 + ? `${Math.floor(uptime / 86400)} ${t("serverDetail.days")} ${Math.floor((uptime % 86400) / 3600)} ${t("serverDetail.hours")}` + : `${Math.floor(uptime / 3600)} ${t("serverDetail.hours")}` + } + className="text-xs" + /> @@ -276,8 +275,19 @@ export default function ServerDetailOverview({

{"Load"}

-
- {load_1} / {load_5} / {load_15} +
+ {[ + { label: "1m", value: load_1 }, + { label: "5m", value: load_5 }, + { label: "15m", value: load_15 }, + ].map(({ label, value }) => ( +
+ + {label} + + +
+ ))}
@@ -290,10 +300,10 @@ export default function ServerDetailOverview({ {t("serverDetail.upload")}

{net_out_transfer ? ( -
- {" "} - {formatBytes(net_out_transfer)}{" "} -
+ ) : (
{t("serverDetail.unknown")}
)} @@ -309,10 +319,10 @@ export default function ServerDetailOverview({ {t("serverDetail.download")}

{net_in_transfer ? ( -
- {" "} - {formatBytes(net_in_transfer)}{" "} -
+ ) : (
{t("serverDetail.unknown")}
)} @@ -365,9 +375,12 @@ export default function ServerDetailOverview({

{t("serverDetail.lastActive")}

-
- {last_active_time_string ? last_active_time_string : "N/A"} -
+