Merge pull request #15 from IrPgFKS0/co-work

Moved nitrado api back/cleaned up fetch errors

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": {

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');

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`, {
+    const data = await FetchServerSettings(client, 'HandleActivePlayersList');  // Fetch server status
-      headers: {
+
-        "Authorization": client.config.Nitrado.Auth
+    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 guild = await client.GetGuild(guildId);
+      if (!client.exists(guild.playerstats)) guild.playerstats = [];
+      if (!client.exists(guild.activePlayersChannel)) return;
 
-    let hostname = res.data.gameserver.settings.config.hostname;
+      const channel = client.GetChannel(guild.activePlayersChannel);
-    let map = res.data.gameserver.settings.config.mission.slice(12);  
+      let activePlayers = guild.playerstats.filter(p => p.connected == true);
-    let status = res.data.gameserver.status;
-    let slots = res.data.gameserver.slots;   
 
-    let statusEmoji;
+      let des = ``;
-    let statusText;
+      for (let i = 0; i < activePlayers.length; i++) {
-    if (status === "started") {
+        des += `**- ${activePlayers[i].gamertag}**\n`;
-      statusEmoji = "🟢";
+      }
-      statusText = "Active";
+      const nodes = activePlayers.length === 0;
-    } else if (status === "stopped") {
+      const PlayersEmbed = new EmbedBuilder()
-      statusEmoji = "🔴";
+        .setColor(client.config.Colors.Default)
-      statusText = "Stopped";
+        .setTitle(`Online List  \` ${activePlayers.length} \`  Player${activePlayers.length>1?'s':''} Online`)
-    } else if (status === "restarting") {
+        .addFields(
-      statusEmoji = "↻";
+          { name: 'Server:', value: `\` ${hostname} \``, inline: false },      
-      statusText = "Restarting";
+          { name: 'Map:', value: `\` ${map} \``, inline: true },
-    } else {
+          { name: 'Status:', value: `\` ${statusEmoji} ${statusText} \``, inline: true }, 
-      statusEmoji = "❓"; // Unknown status
+          { name: 'Slots:', value: `\` ${slots} \``, inline: true }
-      statusText = "Unknown Status";
+        );
+    
+      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);
+      });
     }
-    
-    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);
-
-    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);
-    });
   }
 }

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++) {
+  const data = await module.exports.FetchServerSettings(client, 'HandlePlayerBan');  // Fetch server status
-    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);
 
-      let bans = res.data.gameserver.settings.general.bans;
+  if (data && data != 1) {
-      if (ban) bans += `\r\n${gamertag}`;
+    let bans = data.data.gameserver.settings.general.bans;
-      else if (!ban) bans = bans.replace(gamertag, '');
+    if (ban) bans += `\r\n${gamertag}`;
-      else client.error("Incorrect Ban Option: HandlePlayerBan");
+    else if (!ban) bans = bans.replace(gamertag, '');
+    else client.error("Incorrect Ban Option: HandlePlayerBan");
 
-      const formData = new FormData();
+    for (let retries = 0; retries <= maxRetries; retries++) {
-      formData.append("category", "general");
+      try {
-      formData.append("key", "bans");
+        const formData = new FormData();
-      formData.append("value", bans);
+        formData.append("category", "general");
-      formData.pipe(concat(data => {
+        formData.append("key", "bans");
-        async function sendList() {
+        formData.append("value", bans);
-          await fetch(`https://api.nitrado.net/services/${client.config.Nitrado.ServerID}/gameservers/settings`, {
+        formData.pipe(concat(data => {
-            method: "POST",
+          async function sendList() {
-            credentials: 'include',
+            await fetch(`https://api.nitrado.net/services/${client.config.Nitrado.ServerID}/gameservers/settings`, {
-            headers: {
+              method: "POST",
-              ...formData.getHeaders(),
+              credentials: 'include',
-              "Authorization": client.config.Nitrado.Auth
+              headers: {
-            },
+                ...formData.getHeaders(),
-            body: data,
+                "Authorization": client.config.Nitrado.Auth
-          });
+              },
-        }
+              body: data,
-        sendList();
+            });
-      }));
+          }
-      return 0;
+          sendList();
-    } catch (error) {
+        }));
-      if (retries === maxRetries) throw new Error(`HandlePlayerBans: Failed to fetch data after ${maxRetries} retries`);
+        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}`);
+        client.error(`RestartServer: Error connecting to server (${client.config.Nitrado.ServerID}): ${error.message}`);
-        if (retries === maxRetries) throw new Error(`RestartServer: Failed to fetch data after ${maxRetries} retries`);
+        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
@@ -127,24 +131,32 @@ module.exports = {
 
         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') {
+          return data;
-            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 0;
       } catch (error) {
-        client.error(`Failed to connect to Nitrado (${client.config.Nitrado.ServerID}): ${error.message}`);
+        client.error(`${fetcher} via FetchServerSettings: Error connecting to server (${client.config.Nitrado.ServerID}): ${error.message}`);
-        if (retries === maxRetries) throw new Error(`CheckServerStatus: Failed to fetch data after ${maxRetries} retries`);
+        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);
+      }
+    }
+  },
 }