diff --git a/src/components/ServerCard.tsx b/src/components/ServerCard.tsx index 8c6ba46..b8bff0e 100644 --- a/src/components/ServerCard.tsx +++ b/src/components/ServerCard.tsx @@ -18,8 +18,18 @@ export default function ServerCard({ }) { const { t } = useTranslation(); const navigate = useNavigate(); - const { name, country_code, online, cpu, up, down, mem, stg } = - formatNezhaInfo(now, serverInfo); + const { + name, + country_code, + online, + cpu, + up, + down, + mem, + stg, + net_in_transfer, + net_out_transfer, + } = formatNezhaInfo(now, serverInfo); const showFlag = true; @@ -108,15 +118,13 @@ export default function ServerCard({ variant="secondary" className="items-center flex-1 justify-center rounded-[8px] text-nowrap text-[11px] border-muted-50 shadow-md shadow-neutral-200/30 dark:shadow-none" > - {t("serverCard.upload")}: - {formatBytes(serverInfo.state.net_out_transfer)} + {t("serverCard.upload")}:{formatBytes(net_out_transfer)} - {t("serverCard.download")}: - {formatBytes(serverInfo.state.net_in_transfer)} + {t("serverCard.download")}:{formatBytes(net_in_transfer)} diff --git a/src/components/ServerCardInline.tsx b/src/components/ServerCardInline.tsx index 0ef37a3..f650105 100644 --- a/src/components/ServerCardInline.tsx +++ b/src/components/ServerCardInline.tsx @@ -22,8 +22,20 @@ export default function ServerCardInline({ }) { const { t } = useTranslation(); const navigate = useNavigate(); - const { name, country_code, online, cpu, up, down, mem, stg } = - formatNezhaInfo(now, serverInfo); + const { + name, + country_code, + online, + cpu, + up, + down, + mem, + stg, + platform, + uptime, + net_in_transfer, + net_out_transfer, + } = formatNezhaInfo(now, serverInfo); const showFlag = true; @@ -65,12 +77,10 @@ export default function ServerCardInline({ className={"items-center flex flex-row gap-2 whitespace-nowrap"} >
- {serverInfo.host.platform.includes("Windows") ? ( + {platform.includes("Windows") ? ( ) : ( -

+

)}

@@ -78,9 +88,9 @@ export default function ServerCardInline({ {t("serverCard.system")}

- {serverInfo.host.platform.includes("Windows") + {platform.includes("Windows") ? "Windows" - : GetOsName(serverInfo.host.platform)} + : GetOsName(platform)}
@@ -89,7 +99,7 @@ export default function ServerCardInline({ {t("serverCard.uptime")}

- {(serverInfo.state.uptime / 86400).toFixed(0)} {"Days"} + {(uptime / 86400).toFixed(0)} {"Days"}
@@ -142,7 +152,7 @@ export default function ServerCardInline({ {t("serverCard.totalUpload")}

- {formatBytes(serverInfo.state.net_out_transfer)} + {formatBytes(net_out_transfer)}
@@ -150,7 +160,7 @@ export default function ServerCardInline({ {t("serverCard.totalDownload")}

- {formatBytes(serverInfo.state.net_in_transfer)} + {formatBytes(net_in_transfer)}
diff --git a/src/lib/utils.ts b/src/lib/utils.ts index 0257c1b..eb00a23 100644 --- a/src/lib/utils.ts +++ b/src/lib/utils.ts @@ -24,6 +24,9 @@ export function formatNezhaInfo(now: number, serverInfo: NezhaServer) { disk: (serverInfo.state.disk_used / serverInfo.host.disk_total) * 100 || 0, stg: (serverInfo.state.disk_used / serverInfo.host.disk_total) * 100 || 0, country_code: serverInfo.country_code, + platform: serverInfo.host.platform || "", + net_out_transfer: serverInfo.state.net_out_transfer || 0, + net_in_transfer: serverInfo.state.net_in_transfer || 0, }; }