From 4bceaa5edeac3785f0692811800097faf66a0ecf Mon Sep 17 00:00:00 2001 From: Cynthia Foxwell Date: Thu, 9 Oct 2025 17:14:01 -0600 Subject: [PATCH] sourcequery: fix timeout --- src/modules/misc/sourcequery.js | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/modules/misc/sourcequery.js b/src/modules/misc/sourcequery.js index 758e399..0a60831 100644 --- a/src/modules/misc/sourcequery.js +++ b/src/modules/misc/sourcequery.js @@ -32,16 +32,17 @@ sourcequery.callback = async function (msg, line) { await msg.addReaction("\uD83C\uDFD3"); let data; + let timeout = false; try { - const timeout = setTimeout(() => { - throw "timeout"; - }, 5000); + const doTimeout = setTimeout(() => { + timeout = true; + }, 60000); const query = new SourceQuery(ip, port); const info = await query.getInfo(); const players = await query.getPlayers(); const rules = await query.getRules(); - clearTimeout(timeout); + clearTimeout(doTimeout); data = { info, players, @@ -49,15 +50,13 @@ sourcequery.callback = async function (msg, line) { }; } catch (err) { await msg.removeReaction("\uD83C\uDFD3"); - if (err == "timeout") { - return "Failed to query server after 5 seconds."; - } else { - return `:warning: An error occured while querying:\n\`\`\`\n${err.message}\n\`\`\``; - } + return `:warning: An error occured while querying:\n\`\`\`\n${err.message}\n\`\`\``; } await msg.removeReaction("\uD83C\uDFD3"); - if (data?.info == null) { + if (timeout) { + return "Failed to query server after 1 minute."; + } else if (data?.info == null) { return "Failed to query any data."; }