Cynosphere/HiddenPhox
Cynosphere/HiddenPhox
1
2
Fork 0
Code Projects Releases Packages Wiki Activity

sourcequery: fix timeout

Browse source
This commit is contained in:
Cynthia Foxwell 2025-10-09 17:14:01 -06:00
parent bad6d45963
commit 4bceaa5ede
Signed by: Cynosphere
SSH key fingerprint: SHA256:H3SM8ufP/uxqLwKSH7xY89TDnbR9uOHzjLoBr0tlajk
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/modules/misc/sourcequery.js
View file

@ -32,16 +32,17 @@ sourcequery.callback = async function (msg, line) {
await msg.addReaction("\uD83C\uDFD3"); await msg.addReaction("\uD83C\uDFD3");
let data; let data;
let timeout = false;
try { try {
const timeout = setTimeout(() => { const doTimeout = setTimeout(() => {
throw "timeout"; timeout = true;
}, 5000); }, 60000);
const query = new SourceQuery(ip, port); const query = new SourceQuery(ip, port);
const info = await query.getInfo(); const info = await query.getInfo();
const players = await query.getPlayers(); const players = await query.getPlayers();
const rules = await query.getRules(); const rules = await query.getRules();
clearTimeout(timeout); clearTimeout(doTimeout);
data = { data = {
info, info,
players, players,
@ -49,15 +50,13 @@ sourcequery.callback = async function (msg, line) {
}; };
} catch (err) { } catch (err) {
await msg.removeReaction("\uD83C\uDFD3"); 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"); 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."; return "Failed to query any data.";
} }