root/nezha_dash
1
0
Fork 0
mirror of https://github.com/hamster1963/nezha-dash.git synced 2025-04-24 21:10:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: route and server fetch

Browse Source
This commit is contained in:
hamster1963 2024-10-24 15:14:16 +08:00
parent 472cdce8ba
commit 50221b451c
4 changed files with 130 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/api/detail/route.ts
View File

@ -7,12 +7,6 @@ import { NextResponse } from "next/server";
export const dynamic = "force-dynamic"; export const dynamic = "force-dynamic";
interface NezhaDataResponse extends NezhaAPISafe {
error?: string;
cause?: string;
code?: string;
}
export const GET = auth(async function GET(req) { export const GET = auth(async function GET(req) {
if (!req.auth && getEnv("SitePassword")) { if (!req.auth && getEnv("SitePassword")) {
redirect("/"); redirect("/");
@ -20,32 +14,31 @@ export const GET = auth(async function GET(req) {
const { searchParams } = new URL(req.url); const { searchParams } = new URL(req.url);
const server_id = searchParams.get("server_id"); const server_id = searchParams.get("server_id");
if (!server_id) { if (!server_id) {
return NextResponse.json( return NextResponse.json(
{ error: "server_id is required" }, { error: "server_id is required" },
{ status: 400 }, { status: 400 },
); );
} }
const response = (await GetServerDetail({
server_id: parseInt(server_id), try {
})) as NezhaDataResponse; const serverIdNum = parseInt(server_id, 10);
if (response.error) { if (isNaN(serverIdNum)) {
console.log(response.error);
return NextResponse.json({ error: response.error }, { status: 400 });
}
if (response.cause) {
console.log("GetServerDetail error(cause):", response);
return NextResponse.json( return NextResponse.json(
{ cause: "server connect error" }, { error: "server_id must be a valid number" },
{ status: 400 }, { status: 400 },
); );
} }
if (response.code === "ConnectionRefused") {
console.log("GetServerDetail error(code):", response); const detailData = await GetServerDetail({ server_id: serverIdNum });
return NextResponse.json( return NextResponse.json(detailData, { status: 200 });
{ cause: "server connect error" }, } catch (error) {
{ status: 400 }, console.error("Error in GET handler:", error);
); // @ts-ignore
const statusCode = error.statusCode || 500;
// @ts-ignore
const message = error.message || "Internal Server Error";
return NextResponse.json({ error: message }, { status: statusCode });
} }
return NextResponse.json(response, { status: 200 });
}); });

41
app/api/monitor/route.ts
View File

@ -1,4 +1,3 @@
import { ServerMonitorChart } from "@/app/[locale]/types/nezha-api";
import { auth } from "@/auth"; import { auth } from "@/auth";
import getEnv from "@/lib/env-entry"; import getEnv from "@/lib/env-entry";
import { GetServerMonitor } from "@/lib/serverFetch"; import { GetServerMonitor } from "@/lib/serverFetch";
@ -7,12 +6,6 @@ import { NextResponse } from "next/server";
export const dynamic = "force-dynamic"; export const dynamic = "force-dynamic";
interface NezhaDataResponse {
error?: string;
cause?: string;
code?: string;
}
export const GET = auth(async function GET(req) { export const GET = auth(async function GET(req) {
if (!req.auth && getEnv("SitePassword")) { if (!req.auth && getEnv("SitePassword")) {
redirect("/"); redirect("/");
@ -26,26 +19,26 @@ export const GET = auth(async function GET(req) {
{ status: 400 }, { status: 400 },
); );
} }
const response = (await GetServerMonitor({
server_id: parseInt(server_id), try {
})) as NezhaDataResponse; const serverIdNum = parseInt(server_id, 10);
if (response.error) { if (isNaN(serverIdNum)) {
console.log(response.error);
return NextResponse.json({ error: response.error }, { status: 400 });
}
if (response.cause) {
console.log("GetServerMonitor error(cause):", response);
return NextResponse.json( return NextResponse.json(
{ cause: "server connect error" }, { error: "server_id must be a number" },
{ status: 400 }, { status: 400 },
); );
} }
if (response.code === "ConnectionRefused") {
console.log("GetServerMonitor error(code):", response); const monitorData = await GetServerMonitor({
return NextResponse.json( server_id: serverIdNum,
{ cause: "server connect error" }, });
{ status: 400 }, return NextResponse.json(monitorData, { status: 200 });
); } catch (error) {
console.error("Error in GET handler:", error);
// @ts-ignore
const statusCode = error.statusCode || 500;
// @ts-ignore
const message = error.message || "Internal Server Error";
return NextResponse.json({ error: message }, { status: statusCode });
} }
return NextResponse.json(response, { status: 200 });
}); });

38
app/api/server/route.ts
View File

@ -1,4 +1,3 @@
import { ServerApi } from "@/app/[locale]/types/nezha-api";
import { auth } from "@/auth"; import { auth } from "@/auth";
import getEnv from "@/lib/env-entry"; import getEnv from "@/lib/env-entry";
import { GetNezhaData } from "@/lib/serverFetch"; import { GetNezhaData } from "@/lib/serverFetch";
@ -7,37 +6,20 @@ import { NextResponse } from "next/server";
export const dynamic = "force-dynamic"; export const dynamic = "force-dynamic";
interface NezhaDataResponse extends ServerApi {
error?: string;
cause?: string;
code?: string;
}
export const GET = auth(async function GET(req) { export const GET = auth(async function GET(req) {
if (!req.auth && getEnv("SitePassword")) { if (!req.auth && getEnv("SitePassword")) {
redirect("/"); redirect("/");
} }
const response = (await GetNezhaData()) as NezhaDataResponse; try {
if (response.error) { const data = await GetNezhaData();
return NextResponse.json({ error: response.error }, { status: 400 }); return NextResponse.json(data, { status: 200 });
} catch (error) {
console.error("Error in GET handler:", error);
// @ts-ignore
const statusCode = error.statusCode || 500;
// @ts-ignore
const message = error.message || "Internal Server Error";
return NextResponse.json({ error: message }, { status: statusCode });
} }
if (response.cause) {
console.log("GetNezhaData error(cause):", response);
return NextResponse.json(
{ cause: "server connect error" },
{ status: 400 },
);
}
if (response.code === "ConnectionRefused") {
console.log("GetNezhaData error(code):", response);
return NextResponse.json(
{ cause: "server connect error" },
{ status: 400 },
);
}
if (!response.result) {
return NextResponse.json({ cause: "fetch data empty" }, { status: 400 });
}
return NextResponse.json(response, { status: 200 });
}); });

136
lib/serverFetch.tsx
View File

@ -8,18 +8,17 @@ import { unstable_noStore as noStore } from "next/cache";
export async function GetNezhaData() { export async function GetNezhaData() {
noStore(); noStore();
var nezhaBaseUrl = getEnv("NezhaBaseUrl"); let nezhaBaseUrl = getEnv("NezhaBaseUrl");
if (!nezhaBaseUrl) { if (!nezhaBaseUrl) {
console.log("NezhaBaseUrl is not set"); console.error("NezhaBaseUrl is not set");
return { error: "NezhaBaseUrl is not set" }; throw new Error("NezhaBaseUrl is not set");
} }
// Remove trailing slash // Remove trailing slash
if (nezhaBaseUrl[nezhaBaseUrl.length - 1] === "/") { nezhaBaseUrl = nezhaBaseUrl.replace(/\/$/, "");
nezhaBaseUrl = nezhaBaseUrl.slice(0, -1);
}
try { try {
const response = await fetch(nezhaBaseUrl + "/api/v1/server/details", { const response = await fetch(`${nezhaBaseUrl}/api/v1/server/details`, {
headers: { headers: {
Authorization: getEnv("NezhaAuth") as string, Authorization: getEnv("NezhaAuth") as string,
}, },
@ -27,12 +26,19 @@ export async function GetNezhaData() {
revalidate: 0, revalidate: 0,
}, },
}); });
const resData = await response.json();
const nezhaData = resData.result as NezhaAPI[]; if (!response.ok) {
if (!nezhaData) { const errorText = await response.text();
console.log(resData); throw new Error(`Failed to fetch data: ${response.status} ${errorText}`);
return { error: "NezhaData fetch failed" };
} }
const resData = await response.json();
if (!resData.result) {
throw new Error("NezhaData fetch failed: 'result' field is missing");
}
const nezhaData = resData.result as NezhaAPI[];
const data: ServerApi = { const data: ServerApi = {
live_servers: 0, live_servers: 0,
offline_servers: 0, offline_servers: 0,
@ -41,30 +47,27 @@ export async function GetNezhaData() {
result: [], result: [],
}; };
var forceShowAllServers = getEnv("ForceShowAllServers"); const forceShowAllServers = getEnv("ForceShowAllServers") === "true";
let nezhaDataFiltered: NezhaAPI[]; const nezhaDataFiltered = forceShowAllServers
if (forceShowAllServers === "true") { ? nezhaData
nezhaDataFiltered = nezhaData; : nezhaData.filter((element) => !element.hide_for_guest);
} else {
// remove hidden servers
nezhaDataFiltered = nezhaData.filter(
(element) => !element.hide_for_guest,
);
}
const timestamp = Date.now() / 1000; const timestamp = Date.now() / 1000;
data.result = nezhaDataFiltered.map( data.result = nezhaDataFiltered.map(
(element: MakeOptional<NezhaAPI, "ipv4" | "ipv6" | "valid_ip">) => { (element: MakeOptional<NezhaAPI, "ipv4" | "ipv6" | "valid_ip">) => {
if (timestamp - element.last_active > 300) { const isOnline = timestamp - element.last_active <= 300;
data.offline_servers += 1; element.online_status = isOnline;
element.online_status = false;
} else { if (isOnline) {
data.live_servers += 1; data.live_servers += 1;
element.online_status = true; } else {
data.offline_servers += 1;
} }
data.total_out_bandwidth += element.status.NetOutTransfer; data.total_out_bandwidth += element.status.NetOutTransfer;
data.total_in_bandwidth += element.status.NetInTransfer; data.total_in_bandwidth += element.status.NetInTransfer;
// Remove unwanted properties
delete element.ipv4; delete element.ipv4;
delete element.ipv6; delete element.ipv6;
delete element.valid_ip; delete element.valid_ip;
@ -75,26 +78,24 @@ export async function GetNezhaData() {
return data; return data;
} catch (error) { } catch (error) {
console.log("GetServerDetail error:", error); console.error("GetNezhaData error:", error);
return error; throw error; // Rethrow the error to be caught by the caller
} }
} }
export async function GetServerMonitor({ server_id }: { server_id: number }) { export async function GetServerMonitor({ server_id }: { server_id: number }) {
var nezhaBaseUrl = getEnv("NezhaBaseUrl"); let nezhaBaseUrl = getEnv("NezhaBaseUrl");
if (!nezhaBaseUrl) { if (!nezhaBaseUrl) {
console.log("NezhaBaseUrl is not set"); console.error("NezhaBaseUrl is not set");
return { error: "NezhaBaseUrl is not set" }; throw new Error("NezhaBaseUrl is not set");
} }
// Remove trailing slash // Remove trailing slash
if (nezhaBaseUrl[nezhaBaseUrl.length - 1] === "/") { nezhaBaseUrl = nezhaBaseUrl.replace(/\/$/, "");
nezhaBaseUrl = nezhaBaseUrl.slice(0, -1);
}
try { try {
const response = await fetch( const response = await fetch(
nezhaBaseUrl + `/api/v1/monitor/${server_id}`, `${nezhaBaseUrl}/api/v1/monitor/${server_id}`,
{ {
headers: { headers: {
Authorization: getEnv("NezhaAuth") as string, Authorization: getEnv("NezhaAuth") as string,
@ -104,34 +105,40 @@ export async function GetServerMonitor({ server_id }: { server_id: number }) {
}, },
}, },
); );
if (!response.ok) {
const errorText = await response.text();
throw new Error(`Failed to fetch data: ${response.status} ${errorText}`);
}
const resData = await response.json(); const resData = await response.json();
const monitorData = resData.result; const monitorData = resData.result;
if (!monitorData) { if (!monitorData) {
console.log(resData); console.error("MonitorData fetch failed:", resData);
return { error: "MonitorData fetch failed" }; throw new Error("MonitorData fetch failed: 'result' field is missing");
} }
return monitorData; return monitorData;
} catch (error) { } catch (error) {
console.error(error); console.error("GetServerMonitor error:", error);
return error; throw error;
} }
} }
export async function GetServerDetail({ server_id }: { server_id: number }) { export async function GetServerDetail({ server_id }: { server_id: number }) {
var nezhaBaseUrl = getEnv("NezhaBaseUrl"); let nezhaBaseUrl = getEnv("NezhaBaseUrl");
if (!nezhaBaseUrl) { if (!nezhaBaseUrl) {
console.log("NezhaBaseUrl is not set"); console.error("NezhaBaseUrl is not set");
return { error: "NezhaBaseUrl is not set" }; throw new Error("NezhaBaseUrl is not set");
} }
// Remove trailing slash // Remove trailing slash
if (nezhaBaseUrl[nezhaBaseUrl.length - 1] === "/") { nezhaBaseUrl = nezhaBaseUrl.replace(/\/$/, "");
nezhaBaseUrl = nezhaBaseUrl.slice(0, -1);
}
try { try {
const response = await fetch( const response = await fetch(
nezhaBaseUrl + `/api/v1/server/details?id=${server_id}`, `${nezhaBaseUrl}/api/v1/server/details?id=${server_id}`,
{ {
headers: { headers: {
Authorization: getEnv("NezhaAuth") as string, Authorization: getEnv("NezhaAuth") as string,
@ -141,31 +148,38 @@ export async function GetServerDetail({ server_id }: { server_id: number }) {
}, },
}, },
); );
if (!response.ok) {
const errorText = await response.text();
throw new Error(`Failed to fetch data: ${response.status} ${errorText}`);
}
const resData = await response.json(); const resData = await response.json();
const detailDataList = resData.result; const detailDataList = resData.result;
if (!detailDataList) {
console.log(resData); if (
return { error: "MonitorData fetch failed" }; !detailDataList ||
!Array.isArray(detailDataList) ||
detailDataList.length === 0
) {
console.error("MonitorData fetch failed:", resData);
throw new Error(
"MonitorData fetch failed: 'result' field is missing or empty",
);
} }
const timestamp = Date.now() / 1000; const timestamp = Date.now() / 1000;
const detailData = detailDataList.map( const detailData = detailDataList.map((element) => {
(element: MakeOptional<NezhaAPI, "ipv4" | "ipv6" | "valid_ip">) => { element.online_status = timestamp - element.last_active <= 300;
if (timestamp - element.last_active > 300) {
element.online_status = false;
} else {
element.online_status = true;
}
delete element.ipv4; delete element.ipv4;
delete element.ipv6; delete element.ipv6;
delete element.valid_ip; delete element.valid_ip;
return element; return element;
}, })[0];
)[0];
return detailData; return detailData;
} catch (error) { } catch (error) {
console.error(error); console.error("GetServerDetail error:", error);
return error; throw error; // Rethrow the error to be handled by the caller
} }
} }