From 90aa59726914f2417f3cb4796c4185cb4cf0fb04 Mon Sep 17 00:00:00 2001 From: IrPgFKS0 <2511445@gmail.com> Date: Tue, 5 Sep 2023 14:22:23 -0700 Subject: [PATCH] Moved nitrado api back/cleaned up fetch errors --- package.json | 2 +- structures/DayzRBot.js | 6 +-- util/LogsHandler.js | 116 ++++++++++++++++++++------------------- util/NitradoAPI.js | 120 ++++++++++++++++++++++------------------- 4 files changed, 127 insertions(+), 117 deletions(-) diff --git a/package.json b/package.json index 845379f..421f6b1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dayzr-bot", - "version": "9.8.0", + "version": "9.8.1", "description": "A General Purpose Discord Bot for DayZ Nitrado Servers.", "main": "index.js", "nodemonConfig": { diff --git a/structures/DayzRBot.js b/structures/DayzRBot.js index c6b47a6..ecd1a4d 100644 --- a/structures/DayzRBot.js +++ b/structures/DayzRBot.js @@ -1,4 +1,4 @@ -const { RegisterGlobalCommands, RegisterGuildCommands} = require("../util/RegisterSlashCommands"); +const { RegisterGlobalCommands, RegisterGuildCommands } = require("../util/RegisterSlashCommands"); const { Collection, Client, EmbedBuilder, Routes } = require('discord.js'); const MongoClient = require('mongodb').MongoClient; const { REST } = require('@discordjs/rest'); @@ -127,7 +127,7 @@ class DayzRBot extends Client { lastLog: null }; } - + const rl = readline.createInterface({ input: fileStream, crlfDelay: Infinity @@ -142,7 +142,7 @@ class DayzRBot extends Client { let s = guild.playerstats; s.map(p => p.connected = false) // assume all players not connected - + for (let i = logIndex + 1; i < lines.length; i++) { if (lines[i].includes('| ####')) continue; if (lines[i].includes("(id=Unknown") || lines[i].includes("Player \"Unknown Entity\"")) continue; diff --git a/util/LogsHandler.js b/util/LogsHandler.js index 5200e5e..8923fc9 100644 --- a/util/LogsHandler.js +++ b/util/LogsHandler.js @@ -2,6 +2,9 @@ const { EmbedBuilder } = require('discord.js'); const { HandleAlarmsAndUAVs } = require('./AlarmsHandler'); const { SendConnectionLogs, DetectCombatLog } = require('./AdminLogsHandler'); +// custom util imports +const { FetchServerSettings } = require('../util/NitradoAPI'); + module.exports = { HandlePlayerLogs: async (client, guildId, stats, line) => { @@ -162,68 +165,63 @@ module.exports = { HandleActivePlayersList: async (client, guildId) => { client.activePlayersTick = 0; // reset hour tick - const res = await fetch(`https://api.nitrado.net/services/${client.config.Nitrado.ServerID}/gameservers`, { - headers: { - "Authorization": client.config.Nitrado.Auth + const data = await FetchServerSettings(client, 'HandleActivePlayersList'); // Fetch server status + + if (data && data != 1) { + let hostname = data.data.gameserver.settings.config.hostname; + let map = data.data.gameserver.settings.config.mission.slice(12); + let status = data.data.gameserver.status; + let slots = data.data.gameserver.slots; + + let statusEmoji; + let statusText; + if (status === "started") { + statusEmoji = "🟢"; + statusText = "Active"; + } else if (status === "stopped") { + statusEmoji = "🔴"; + statusText = "Stopped"; + } else if (status === "restarting") { + statusEmoji = "↻"; + statusText = "Restarting"; + } else { + statusEmoji = "❓"; // Unknown status + statusText = "Unknown Status"; } - }).then(response => - response.json().then(data => data) - ).then(res => res); - - - let hostname = res.data.gameserver.settings.config.hostname; - let map = res.data.gameserver.settings.config.mission.slice(12); - let status = res.data.gameserver.status; - let slots = res.data.gameserver.slots; - - let statusEmoji; - let statusText; - if (status === "started") { - statusEmoji = "🟢"; - statusText = "Active"; - } else if (status === "stopped") { - statusEmoji = "🔴"; - statusText = "Stopped"; - } else if (status === "restarting") { - statusEmoji = "↻"; - statusText = "Restarting"; - } else { - statusEmoji = "❓"; // Unknown status - statusText = "Unknown Status"; - } - - let guild = await client.GetGuild(guildId); - if (!client.exists(guild.playerstats)) guild.playerstats = []; - if (!client.exists(guild.activePlayersChannel)) return; + + let guild = await client.GetGuild(guildId); + if (!client.exists(guild.playerstats)) guild.playerstats = []; + if (!client.exists(guild.activePlayersChannel)) return; - const channel = client.GetChannel(guild.activePlayersChannel); - let activePlayers = guild.playerstats.filter(p => p.connected == true); + const channel = client.GetChannel(guild.activePlayersChannel); + let activePlayers = guild.playerstats.filter(p => p.connected == true); - let des = ``; - for (let i = 0; i < activePlayers.length; i++) { - des += `**- ${activePlayers[i].gamertag}**\n`; + let des = ``; + for (let i = 0; i < activePlayers.length; i++) { + des += `**- ${activePlayers[i].gamertag}**\n`; + } + const nodes = activePlayers.length === 0; + const PlayersEmbed = new EmbedBuilder() + .setColor(client.config.Colors.Default) + .setTitle(`Online List \` ${activePlayers.length} \` Player${activePlayers.length>1?'s':''} Online`) + .addFields( + { name: 'Server:', value: `\` ${hostname} \``, inline: false }, + { name: 'Map:', value: `\` ${map} \``, inline: true }, + { name: 'Status:', value: `\` ${statusEmoji} ${statusText} \``, inline: true }, + { name: 'Slots:', value: `\` ${slots} \``, inline: true } + ); + + const activePlayersEmbed = new EmbedBuilder() + .setColor(client.config.Colors.Default) + .setTimestamp() + .setTitle(`Players Online:`) + .setDescription(des || (nodes ? "No Players Online :(" : "")) + + return channel.send({ embeds: [PlayersEmbed, activePlayersEmbed] }).then(sentMessage => { + setTimeout(() => { + sentMessage.delete().catch(error => client.sendError(channel, `HandleActivePlayersList Error: \n${error}`)); + }, 360000); + }); } - const nodes = activePlayers.length === 0; - const PlayersEmbed = new EmbedBuilder() - .setColor(client.config.Colors.Default) - .setTitle(`Online List \` ${activePlayers.length} \` Player${activePlayers.length>1?'s':''} Online`) - .addFields( - { name: 'Server:', value: `\` ${hostname} \``, inline: false }, - { name: 'Map:', value: `\` ${map} \``, inline: true }, - { name: 'Status:', value: `\` ${statusEmoji} ${statusText} \``, inline: true }, - { name: 'Slots:', value: `\` ${slots} \``, inline: true } - ); - - const activePlayersEmbed = new EmbedBuilder() - .setColor(client.config.Colors.Default) - .setTimestamp() - .setTitle(`Players Online:`) - .setDescription(des || (nodes ? "No Players Online :(" : "")) - - return channel.send({ embeds: [PlayersEmbed, activePlayersEmbed] }).then(sentMessage => { - setTimeout(() => { - sentMessage.delete().catch(error => client.sendError(channel, `HandleActivePlayersList Error: \n${error}`)); - }, 360000); - }); } } \ No newline at end of file diff --git a/util/NitradoAPI.js b/util/NitradoAPI.js index 73f3342..f428479 100644 --- a/util/NitradoAPI.js +++ b/util/NitradoAPI.js @@ -9,45 +9,41 @@ const retryDelay = 5000; // 5 seconds // Private functions (only called locally) const HandlePlayerBan = async (client, gamertag, ban) => { - for (let retries = 0; retries <= maxRetries; retries++) { - try { - // get current bans - const res = await fetch(`https://api.nitrado.net/services/${client.config.Nitrado.ServerID}/gameservers`, { - headers: { - "Authorization": client.config.Nitrado.Auth - } - }).then(response => - response.json().then(data => data) - ).then(res => res); + const data = await module.exports.FetchServerSettings(client, 'HandlePlayerBan'); // Fetch server status - let bans = res.data.gameserver.settings.general.bans; - if (ban) bans += `\r\n${gamertag}`; - else if (!ban) bans = bans.replace(gamertag, ''); - else client.error("Incorrect Ban Option: HandlePlayerBan"); + if (data && data != 1) { + let bans = data.data.gameserver.settings.general.bans; + if (ban) bans += `\r\n${gamertag}`; + else if (!ban) bans = bans.replace(gamertag, ''); + else client.error("Incorrect Ban Option: HandlePlayerBan"); - const formData = new FormData(); - formData.append("category", "general"); - formData.append("key", "bans"); - formData.append("value", bans); - formData.pipe(concat(data => { - async function sendList() { - await fetch(`https://api.nitrado.net/services/${client.config.Nitrado.ServerID}/gameservers/settings`, { - method: "POST", - credentials: 'include', - headers: { - ...formData.getHeaders(), - "Authorization": client.config.Nitrado.Auth - }, - body: data, - }); - } - sendList(); - })); - return 0; - } catch (error) { - if (retries === maxRetries) throw new Error(`HandlePlayerBans: Failed to fetch data after ${maxRetries} retries`); + for (let retries = 0; retries <= maxRetries; retries++) { + try { + const formData = new FormData(); + formData.append("category", "general"); + formData.append("key", "bans"); + formData.append("value", bans); + formData.pipe(concat(data => { + async function sendList() { + await fetch(`https://api.nitrado.net/services/${client.config.Nitrado.ServerID}/gameservers/settings`, { + method: "POST", + credentials: 'include', + headers: { + ...formData.getHeaders(), + "Authorization": client.config.Nitrado.Auth + }, + body: data, + }); + } + sendList(); + })); + return 0; + } catch (error) { + client.error(`HandlePlayerBan: Error connecting to server (${client.config.Nitrado.ServerID}): ${error.message}`); + if (retries === maxRetries) throw new Error(`HandlePlayerBan: Error connecting to server (${client.config.Nitrado.ServerID}) after ${maxRetries} retries`); + } + await new Promise(resolve => setTimeout(resolve, retryDelay)); // Delay before retrying } - await new Promise(resolve => setTimeout(resolve, retryDelay)); // Delay before retrying } } @@ -76,7 +72,8 @@ module.exports = { await finished(Readable.fromWeb(body).pipe(stream)); return 0; } catch (error) { - if (retries === maxRetries) throw new Error(`DownloadNitradoFile: Failed to fetch data after ${maxRetries} retries`); + client.error(`DownloadNitradoFile: Error connecting to server (${client.config.Nitrado.ServerID}): ${error.message}`); + if (retries === maxRetries) throw new Error(`DownloadNitradoFile: Error connecting to server (${client.config.Nitrado.ServerID}) after ${maxRetries} retries`); } await new Promise(resolve => setTimeout(resolve, retryDelay)); // Delay before retrying } @@ -106,16 +103,23 @@ module.exports = { }, body: JSON.stringify(params) }); - return 0; + + if (!res.ok) { + const errorText = await res.text(); + client.error(`Failed to restart Nitrado server (${client.config.Nitrado.ServerID}): status: ${res.status}, message: ${errorText}: RestartServer`); + return 1; // Return error status on failed status code. + } else { + return 0; + } } catch (error) { - client.error(`Error during restart request: ${error.message}`); - if (retries === maxRetries) throw new Error(`RestartServer: Failed to fetch data after ${maxRetries} retries`); + client.error(`RestartServer: Error connecting to server (${client.config.Nitrado.ServerID}): ${error.message}`); + if (retries === maxRetries) throw new Error(`RestartServer: Error connecting to server (${client.config.Nitrado.ServerID}) after ${maxRetries} retries`); } await new Promise(resolve => setTimeout(resolve, retryDelay)); // Delay before retrying } }, - CheckServerStatus: async (client) => { + FetchServerSettings: async (client, fetcher) => { for (let retries = 0; retries <= maxRetries; retries++) { try { // get current status @@ -124,27 +128,35 @@ module.exports = { "Authorization": client.config.Nitrado.Auth } }); - + if (!res.ok) { const errorText = await res.text(); - client.error(`Failed to get Nitrado server stats (${client.config.Nitrado.ServerID}): status: ${res.status}, message: ${errorText}: CheckServerStatus`); + client.error(`Failed to get Nitrado server stats (${client.config.Nitrado.ServerID}): status: ${res.status}, message: ${errorText}: ${fetcher} via FetchServerSettings`); + if (retries === 2) return 1; // Return error status on the second failed status code. } else { const data = await res.json(); - if (data && data.data.gameserver.status === 'stopped') { - client.log(`Restart of Nitrado server ${client.config.Nitrado.ServerID} has been invoked by the bot, the periodic check showed status of "${data.data.gameserver.status}".`); - // Write optional "restart_message" to set in the Nitrado server logs and send a notice "message" to your server community. - restart_message = 'Server being restarted by periodic bot check.'; - message = 'The server was restarted by periodic bot check!'; - - module.exports.RestartServer(client, restart_message, message); - } + return data; } - return 0; } catch (error) { - client.error(`Failed to connect to Nitrado (${client.config.Nitrado.ServerID}): ${error.message}`); - if (retries === maxRetries) throw new Error(`CheckServerStatus: Failed to fetch data after ${maxRetries} retries`); + client.error(`${fetcher} via FetchServerSettings: Error connecting to server (${client.config.Nitrado.ServerID}): ${error.message}`); + if (retries === maxRetries) throw new Error(`${fetcher} via FetchServerSettings: Error connecting to server (${client.config.Nitrado.ServerID}) after ${maxRetries} retries`); } await new Promise(resolve => setTimeout(resolve, retryDelay)); // Delay before retrying } }, + + CheckServerStatus: async (client) => { + const data = await module.exports.FetchServerSettings(client, 'CheckServerStatus'); // Fetch server status + + if (data && data != 1) { + if (data && data.data.gameserver.status === 'stopped') { + client.log(`Restart of Nitrado server ${client.config.Nitrado.ServerID} has been invoked by the bot, the periodic check showed status of "${data.data.gameserver.status}".`); + // Write optional "restart_message" to set in the Nitrado server logs and send a notice "message" to your server community. + restart_message = 'Server being restarted by periodic bot check.'; + message = 'The server was restarted by periodic bot check!'; + + module.exports.RestartServer(client, restart_message, message); + } + } + }, }