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

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,19 +165,13 @@ 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
-      }
-    }).then(response => 
-      response.json().then(data => data)
-    ).then(res => res);
 
-  
+    if (data && data != 1) {
-    let hostname = res.data.gameserver.settings.config.hostname;
+      let hostname = data.data.gameserver.settings.config.hostname;
-    let map = res.data.gameserver.settings.config.mission.slice(12);  
+      let map = data.data.gameserver.settings.config.mission.slice(12);  
-    let status = res.data.gameserver.status;
+      let status = data.data.gameserver.status;
-    let slots = res.data.gameserver.slots;   
+      let slots = data.data.gameserver.slots;   
       
       let statusEmoji;
       let statusText;
@@ -227,3 +224,4 @@ module.exports = {
       });
     }
   }
+}

util/NitradoAPI.js

@@ -9,22 +9,16 @@ 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) {
+    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");
 
+    for (let retries = 0; retries <= maxRetries; retries++) {
+      try {
         const formData = new FormData();
         formData.append("category", "general");
         formData.append("key", "bans");
@@ -45,11 +39,13 @@ const HandlePlayerBan = async (client, gamertag, ban) => {
         }));
         return 0;
       } catch (error) {
-      if (retries === maxRetries) throw new Error(`HandlePlayerBans: Failed to fetch data after ${maxRetries} retries`);
+        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
     }
   }
+}
 
 // Public functions (called externally)
 
@@ -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)
         });
+
+        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,9 +131,24 @@ 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();
+          return data;
+        }
+      } catch (error) {
+        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.
@@ -139,12 +158,5 @@ module.exports = {
         module.exports.RestartServer(client, restart_message, message);
       }
     }
-        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`);
-      }
-      await new Promise(resolve => setTimeout(resolve, retryDelay)); // Delay before retrying
-    }
   },
 }