AeThex-Corporation/aethex-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Validate response is JSON before parsing to avoid HTML error pages

Browse source 
cgen-eca2821a12b748e7ab2dcd509a60ab77
This commit is contained in:
Builder.io 2025-11-09 22:02:34 +00:00
parent c9dfe98bc7
commit 3a8e5006c3
1 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
server/index.ts
View file

@ -1445,9 +1445,31 @@ export function createServer() {
timeout: 5000, timeout: 5000,
}); });
if (response.ok) { const contentType = response.headers.get("content-type") || "";
const responseBody = await response.text();
console.log(
`[Discord Bot Health] Response from ${url}: Status ${response.status}, Content-Type: ${contentType}, Body start: ${responseBody.substring(0, 100)}`,
);
if (response.ok && contentType.includes("application/json")) {
console.log(`[Discord Bot Health] Success from ${url}`); console.log(`[Discord Bot Health] Success from ${url}`);
break; const data = JSON.parse(responseBody);
res.setHeader("Content-Type", "application/json");
return res.json({
status: data.status || "online",
guilds: data.guilds || 0,
commands: data.commands || 0,
uptime: data.uptime || 0,
timestamp: data.timestamp || new Date().toISOString(),
});
}
if (response.ok && !contentType.includes("application/json")) {
lastError = new Error(
`Got non-JSON response (${contentType}): ${responseBody.substring(0, 100)}`,
);
continue;
} }
} catch (err) { } catch (err) {
lastError = err instanceof Error ? err : new Error(String(err)); lastError = err instanceof Error ? err : new Error(String(err));
@ -1458,14 +1480,10 @@ export function createServer() {
} }
} }
if (!response?.ok) { return res.status(503).json({
return res.status(503).json({ status: "offline",
status: "offline", error: `Could not reach bot health endpoint. Last error: ${lastError?.message || "Unknown error"}`,
error: `Could not reach bot health endpoint. Last error: ${lastError?.message || "Unknown error"}`, });
});
}
const data = await response.json();
res.setHeader("Content-Type", "application/json"); res.setHeader("Content-Type", "application/json");
return res.json({ return res.json({
status: data.status || "online", status: data.status || "online",