From a16dd290a7c745787a927a8178ef2e1dc5ac4f0f Mon Sep 17 00:00:00 2001 From: hamster1963 <1410514192@qq.com> Date: Sun, 28 Jul 2024 23:58:14 +0800 Subject: [PATCH] refactor: data retrieval function --- .../ClientComponents/ServerListClient.tsx | 3 +- app/(main)/header.tsx | 10 +-- app/(main)/page.tsx | 3 +- app/api/server/route.ts | 53 +--------------- app/types/nezha-api.ts | 1 + bun.lockb | Bin 407644 -> 407604 bytes components/ServerCard.tsx | 10 +-- components/ui/popover.tsx | 20 +++--- lib/prefetch.tsx | 54 ---------------- lib/serverFetch.tsx | 58 ++++++++++++++++++ lib/utils.ts | 20 +++--- 11 files changed, 93 insertions(+), 139 deletions(-) delete mode 100644 lib/prefetch.tsx create mode 100644 lib/serverFetch.tsx diff --git a/app/(main)/ClientComponents/ServerListClient.tsx b/app/(main)/ClientComponents/ServerListClient.tsx index 81f8e8e..0d3186b 100644 --- a/app/(main)/ClientComponents/ServerListClient.tsx +++ b/app/(main)/ClientComponents/ServerListClient.tsx @@ -11,12 +11,11 @@ export default function ServerListClient() { }); if (!data) return null; const sortedResult = data.result.sort((a, b) => a.id - b.id); - const timestamp = Date.now() / 1000; return (
{sortedResult.map((serverInfo) => ( - + ))}
); diff --git a/app/(main)/header.tsx b/app/(main)/header.tsx index 65702ba..d61da36 100644 --- a/app/(main)/header.tsx +++ b/app/(main)/header.tsx @@ -38,7 +38,7 @@ function Header() { // https://github.com/streamich/react-use/blob/master/src/useInterval.ts const useInterval = (callback: Function, delay?: number | null) => { - const savedCallback = useRef(() => { }); + const savedCallback = useRef(() => {}); useEffect(() => { savedCallback.current = callback; @@ -61,7 +61,9 @@ function Overview() { }, []); const timeOption = DateTime.TIME_SIMPLE; timeOption.hour12 = true; - const [timeString, setTimeString] = useState(DateTime.now().setLocale("en-US").toLocaleString(timeOption)); + const [timeString, setTimeString] = useState( + DateTime.now().setLocale("en-US").toLocaleString(timeOption), + ); useInterval(() => { setTimeString(DateTime.now().setLocale("en-US").toLocaleString(timeOption)); @@ -73,9 +75,7 @@ function Overview() {

where the time is

{mouted && ( -

- {timeString} -

+

{timeString}

)}
diff --git a/app/(main)/page.tsx b/app/(main)/page.tsx index e7dcb53..24a1a48 100644 --- a/app/(main)/page.tsx +++ b/app/(main)/page.tsx @@ -1,6 +1,7 @@ import ServerList from "@/components/ServerList"; import ServerOverview from "@/components/ServerOverview"; -import { GetNezhaData } from "@/lib/prefetch"; +import { GetNezhaData } from "@/lib/serverFetch"; + import { SWRConfig } from "swr"; export default function Home() { diff --git a/app/api/server/route.ts b/app/api/server/route.ts index 08789e0..f99bc10 100644 --- a/app/api/server/route.ts +++ b/app/api/server/route.ts @@ -1,57 +1,10 @@ -import { NezhaAPI, ServerApi } from "@/app/types/nezha-api"; -import { MakeOptional } from "@/app/types/utils"; +import { GetNezhaData } from "@/lib/serverFetch"; import { NextResponse } from "next/server"; export async function GET(_: Request) { - if (!process.env.NezhaBaseUrl) { - return NextResponse.json( - { error: "NezhaBaseUrl is not set" }, - { status: 400 }, - ); - } - - // Remove trailing slash - var nezhaBaseUrl = process.env.NezhaBaseUrl; - - if (process.env.NezhaBaseUrl[process.env.NezhaBaseUrl.length - 1] === "/") { - nezhaBaseUrl = process.env.NezhaBaseUrl.slice(0, -1); - } - try { - const response = await fetch(nezhaBaseUrl + "/api/v1/server/details", { - headers: { - Authorization: process.env.NezhaAuth as string, - }, - next: { - revalidate: 0, - }, - }); - const nezhaData = (await response.json()).result as NezhaAPI[]; - const data: ServerApi = { - live_servers: 0, - offline_servers: 0, - total_bandwidth: 0, - result: [], - }; - const timestamp = Date.now() / 1000; - data.result = nezhaData.map( - (element: MakeOptional) => { - if (timestamp - element.last_active > 300) { - data.offline_servers += 1; - } else { - data.live_servers += 1; - } - data.total_bandwidth += element.status.NetOutTransfer; - - delete element.ipv4; - delete element.ipv6; - delete element.valid_ip; - - return element; - }, - ); - - return NextResponse.json(data, { status: 200 }); + const response = await GetNezhaData(); + return NextResponse.json(response, { status: 200 }); } catch (error) { return NextResponse.json({ error: error }, { status: 200 }); } diff --git a/app/types/nezha-api.ts b/app/types/nezha-api.ts index dd1f356..59679c5 100644 --- a/app/types/nezha-api.ts +++ b/app/types/nezha-api.ts @@ -12,6 +12,7 @@ export interface NezhaAPI { name: string; tag: string; last_active: number; + online_status: boolean; ipv4: string; ipv6: string; valid_ip: string; diff --git a/bun.lockb b/bun.lockb index d1e58451ead1b8b0f59b8a0b5dd89fe21ce4e995..3474d360ca251a9dd389801d32f6cc87cd9c6125 100755 GIT binary patch delta 7749 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 delta 7763 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 z, @@ -20,12 +20,12 @@ const PopoverContent = React.forwardRef< sideOffset={sideOffset} className={cn( "z-50 w-72 rounded-md border bg-popover p-4 text-popover-foreground shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2", - className + className, )} {...props} /> -)) -PopoverContent.displayName = PopoverPrimitive.Content.displayName +)); +PopoverContent.displayName = PopoverPrimitive.Content.displayName; -export { Popover, PopoverTrigger, PopoverContent } +export { Popover, PopoverTrigger, PopoverContent }; diff --git a/lib/prefetch.tsx b/lib/prefetch.tsx deleted file mode 100644 index 911edbb..0000000 --- a/lib/prefetch.tsx +++ /dev/null @@ -1,54 +0,0 @@ -import { NezhaAPI, ServerApi } from "@/app/types/nezha-api"; -import { MakeOptional } from "@/app/types/utils"; -import { error } from "console"; - -export async function GetNezhaData() { - if (!process.env.NezhaBaseUrl) { - error("NezhaBaseUrl is not set"); - return; - } - // Remove trailing slash - var nezhaBaseUrl = process.env.NezhaBaseUrl; - - if (process.env.NezhaBaseUrl[process.env.NezhaBaseUrl.length - 1] === "/") { - nezhaBaseUrl = process.env.NezhaBaseUrl.slice(0, -1); - } - try { - const response = await fetch(nezhaBaseUrl + "/api/v1/server/details", { - headers: { - Authorization: process.env.NezhaAuth as string, - }, - next: { - revalidate: 1, - }, - }); - const nezhaData = (await response.json()).result as NezhaAPI[]; - const data: ServerApi = { - live_servers: 0, - offline_servers: 0, - total_bandwidth: 0, - result: [], - }; - const timestamp = Date.now() / 1000; - data.result = nezhaData.map( - (element: MakeOptional) => { - if (timestamp - element.last_active > 300) { - data.offline_servers += 1; - } else { - data.live_servers += 1; - } - data.total_bandwidth += element.status.NetOutTransfer; - - delete element.ipv4; - delete element.ipv6; - delete element.valid_ip; - - return element; - }, - ); - - return data; - } catch (error) { - return error; - } -} \ No newline at end of file diff --git a/lib/serverFetch.tsx b/lib/serverFetch.tsx new file mode 100644 index 0000000..6058678 --- /dev/null +++ b/lib/serverFetch.tsx @@ -0,0 +1,58 @@ +"use server"; + +import { NezhaAPI, ServerApi } from "@/app/types/nezha-api"; +import { MakeOptional } from "@/app/types/utils"; +import { error } from "console"; + +export async function GetNezhaData() { + if (!process.env.NezhaBaseUrl) { + error("NezhaBaseUrl is not set"); + return; + } + // Remove trailing slash + var nezhaBaseUrl = process.env.NezhaBaseUrl; + + if (process.env.NezhaBaseUrl[process.env.NezhaBaseUrl.length - 1] === "/") { + nezhaBaseUrl = process.env.NezhaBaseUrl.slice(0, -1); + } + try { + const response = await fetch(nezhaBaseUrl + "/api/v1/server/details", { + headers: { + Authorization: process.env.NezhaAuth as string, + }, + next: { + revalidate: 1, + }, + }); + const nezhaData = (await response.json()).result as NezhaAPI[]; + const data: ServerApi = { + live_servers: 0, + offline_servers: 0, + total_bandwidth: 0, + result: [], + }; + const timestamp = Date.now() / 1000; + data.result = nezhaData.map( + (element: MakeOptional) => { + if (timestamp - element.last_active > 300) { + data.offline_servers += 1; + element.online_status = false; + } else { + data.live_servers += 1; + element.online_status = true; + } + data.total_bandwidth += element.status.NetOutTransfer; + + delete element.ipv4; + delete element.ipv6; + delete element.valid_ip; + + return element; + }, + ); + + return data; + } catch (error) { + return error; + } +} diff --git a/lib/utils.ts b/lib/utils.ts index e3a7514..2512031 100644 --- a/lib/utils.ts +++ b/lib/utils.ts @@ -6,16 +6,16 @@ export function cn(...inputs: ClassValue[]) { return twMerge(clsx(inputs)); } -export function formatNezhaInfo(timestamp: number, serverInfo: NezhaAPISafe) { - return { - ...serverInfo, - cpu: serverInfo.status.CPU, - up: serverInfo.status.NetOutSpeed / 1024 / 1024, - down: serverInfo.status.NetInSpeed / 1024 / 1024, - online: timestamp - serverInfo.last_active > 300 ? "offline" : "online", - mem: (serverInfo.status.MemUsed / serverInfo.host.MemTotal) * 100, - stg: (serverInfo.status.DiskUsed / serverInfo.host.DiskTotal) * 100, - } +export function formatNezhaInfo(serverInfo: NezhaAPISafe) { + return { + ...serverInfo, + cpu: serverInfo.status.CPU, + up: serverInfo.status.NetOutSpeed / 1024 / 1024, + down: serverInfo.status.NetInSpeed / 1024 / 1024, + online: serverInfo.online_status, + mem: (serverInfo.status.MemUsed / serverInfo.host.MemTotal) * 100, + stg: (serverInfo.status.DiskUsed / serverInfo.host.DiskTotal) * 100, + }; } export function formatBytes(bytes: number, decimals: number = 2) {