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

Simplify Discord interactions endpoint for better compatibility

Browse source 
cgen-635fdd60ec7c4b3891b5982be658adf5
This commit is contained in:
Builder.io 2025-11-05 20:18:59 +00:00
parent 80cc9a5fe5
commit 43f293c081
1 changed files with 32 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
server/index.ts
View file

@ -10,6 +10,7 @@ const handleDiscordInteractions = (
req: express.Request, req: express.Request,
res: express.Response, res: express.Response,
) => { ) => {
try {
const signature = req.get("x-signature-ed25519"); const signature = req.get("x-signature-ed25519");
const timestamp = req.get("x-signature-timestamp"); const timestamp = req.get("x-signature-timestamp");
const rawBody = req.body instanceof Buffer ? req.body : Buffer.from(JSON.stringify(req.body), "utf8"); const rawBody = req.body instanceof Buffer ? req.body : Buffer.from(JSON.stringify(req.body), "utf8");
@ -17,73 +18,47 @@ const handleDiscordInteractions = (
const publicKey = process.env.DISCORD_PUBLIC_KEY; const publicKey = process.env.DISCORD_PUBLIC_KEY;
console.log("[Discord] ===== Interaction Request ====="); console.log("[Discord] Interaction received at", new Date().toISOString());
console.log("[Discord] Signature present:", !!signature);
console.log("[Discord] Timestamp present:", !!timestamp);
console.log("[Discord] Public key configured:", !!publicKey);
console.log("[Discord] Body length:", bodyString.length);
if (!publicKey) { if (!publicKey) {
console.error("[Discord] DISCORD_PUBLIC_KEY not configured"); console.error("[Discord] DISCORD_PUBLIC_KEY not set");
return res.status(401).json({ error: "Public key not configured" }); return res.status(401).json({ error: "Server not configured" });
} }
if (!signature || !timestamp) { if (!signature || !timestamp) {
console.error("[Discord] Missing signature or timestamp headers"); console.error("[Discord] Missing headers - signature:", !!signature, "timestamp:", !!timestamp);
return res.status(401).json({ error: "Missing signature or timestamp" }); return res.status(401).json({ error: "Invalid request" });
} }
// Verify request signature using Ed25519 // Verify signature
try {
const message = `${timestamp}${bodyString}`; const message = `${timestamp}${bodyString}`;
const signatureBuffer = Buffer.from(signature, "hex"); const signatureBuffer = Buffer.from(signature, "hex");
console.log("[Discord] Creating verifier for ed25519...");
const verifier = createVerify("ed25519"); const verifier = createVerify("ed25519");
verifier.update(message); verifier.update(message);
const isValid = verifier.verify(publicKey, signatureBuffer); const isValid = verifier.verify(publicKey, signatureBuffer);
console.log("[Discord] Signature valid:", isValid);
if (!isValid) { if (!isValid) {
console.warn("[Discord] Invalid signature for interaction"); console.error("[Discord] Signature verification failed");
return res.status(401).json({ error: "Invalid signature" }); return res.status(401).json({ error: "Invalid signature" });
} }
} catch (e: any) {
console.error("[Discord] Signature verification error:", e?.message);
console.error("[Discord] Stack:", e?.stack);
return res.status(401).json({ error: "Signature verification failed: " + e?.message });
}
// Parse the interaction
try {
const interaction = JSON.parse(bodyString); const interaction = JSON.parse(bodyString);
console.log("[Discord] Valid interaction type:", interaction.type);
// Handle PING interaction (Discord Activity verification) // Discord sends a PING to verify the endpoint
if (interaction.type === 1) { if (interaction.type === 1) {
console.log("[Discord] ✓ PING received, responding with PONG"); console.log("[Discord] ✓ PING verified");
return res.json({ type: 1 }); return res.json({ type: 1 });
} }
// Handle other interaction types // For all other interactions, acknowledge them
if (
interaction.type === 2 ||
interaction.type === 3 ||
interaction.type === 4 ||
interaction.type === 5
) {
console.log("[Discord] Interaction received:", interaction.type);
return res.json({ return res.json({
type: 4, type: 4,
data: { content: "Activity received your interaction" }, data: { content: "Interaction received" },
}); });
} } catch (err: any) {
console.error("[Discord] Error:", err?.message);
console.warn("[Discord] Unknown interaction type:", interaction.type); return res.status(500).json({ error: "Server error" });
return res.status(400).json({ error: "Unknown interaction type" });
} catch (e: any) {
console.error("[Discord] Failed to parse interaction:", e?.message);
return res.status(400).json({ error: "Invalid JSON" });
} }
}; };