Merge branch 'co-work' of https://github.com/IrPgFKS0/dayz-reforger into co-work

Mutual changes

commands/admin.js

@@ -1,7 +1,7 @@
 const { EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle, StringSelectMenuBuilder } = require('discord.js');
 const CommandOptions = require('../util/CommandOptionTypes').CommandOptionTypes;
 const bitfieldCalculator = require('discord-bitfield-calculator');
-const { BanPlayer, UnbanPlayer, RestartServer, CheckServerStatus } = require('../util/NitradoAPI');
+const { BanPlayer, UnbanPlayer, RestartServer, CheckServerStatus, ToggleBaseDamage } = require('../util/NitradoAPI');
 const { Armbands } = require('../config/armbandsdb.js');
 
 module.exports = {
@@ -148,6 +148,18 @@ module.exports = {
     description: "Enable/Disable periodic server checks and restart if stopped.",
     value: "auto-restart",
     type: CommandOptions.SubCommand,
+  }, {
+    name: "disable-base-damage",
+    description: "Disable/Enable base damage",
+    value: "disable-base-damage",
+    type: CommandOptions.SubCommand,
+    options: [{
+      name: "preference",
+      description: "DisableBaseDamage Preference",
+      value: true,
+      type: CommandOptions.Boolean,
+      required: true,
+    }]
   }],
   SlashCommand: {
     /**
@@ -462,6 +474,13 @@ module.exports = {
         });
 
         return interaction.send({ embeds: [new EmbedBuilder().setColor(client.config.Colors.Yellow).setDescription(msg)], flags: (1 << 6) });
+      } else if (args[0].name == 'disable-base-damage') {
+        const preference = args[0].options[0].value;
+
+        const toggle = await ToggleBaseDamage(client, preference);
+        if (toggle == 1) return interaction.send({ embeds: [new EmbedBuilder().setColor(client.config.Colors.Red).setDescription('Failed to update ` disableBaseDamage `, try again later.')] });
+
+        return interaction.send({ embeds: [new EmbedBuilder().setColor(client.config.Colors.Green).setDescription(`Successfully updated \` disableBaseDamage \` to ${preference}.\nRestart the DayZ server to apply these changes.`)] });
       }
     }
   },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dayzr-bot",
-  "version": "9.9.8",
+  "version": "10.0.5",
   "description": "A General Purpose Discord Bot for DayZ Nitrado Servers.",
   "main": "index.js",
   "nodemonConfig": {

structures/DayzRBot.js

@@ -1,6 +1,5 @@
 const { RegisterGlobalCommands, RegisterGuildCommands } = require("../util/RegisterSlashCommands");
 const { Collection, Client, EmbedBuilder, Routes } = require('discord.js');
-const CommandOptions = require('../util/CommandOptionTypes').CommandOptionTypes;
 const MongoClient = require('mongodb').MongoClient;
 const { REST } = require('@discordjs/rest');
 const Logger = require("../util/Logger");
@@ -80,7 +79,7 @@ class DayzRBot extends Client {
 
           return await rest.post(Routes.interactionCallback(interaction.id, interaction.token), {
             body: {
-              type: CommandOptions.Integer,
+              type: 4,
               data: message,
             }
           });

util/AdminLogsHandler.js

@@ -28,14 +28,13 @@ module.exports = {
   DetectCombatLog: async (client, guildId, data) => {
     if (data.lastDamageDate == null) return;
 
-    let newDt = await client.getDateEST(data.time);
-
-    let diffSeconds = Math.round((newDt.getTime() - data.lastDamageDate.getTime()) / 1000);
+    const newDt = await client.getDateEST(data.time);
+    const diffSeconds = Math.round((newDt.getTime() - data.lastDamageDate.getTime()) / 1000);
 
     // If diff is greater than 5 minutes, not a combat log
     // or if death after last combat
+    if (diffSeconds > (data.combatLogTimer * 60)) return;
     if (data.lastDamageDate <= data.lastDeathDate) return;
-    if (diffSeconds > 5 * 60) return;
 
     let guild = await client.GetGuild(guildId);
     if (!client.exists(guild.connectionLogsChannel)) return;

util/KillfeedHandler.js

@@ -72,8 +72,8 @@ module.exports = {
     else if (killedBy == Templates.Explosion) info.causeOfDeath = data[5];
     else return stats; // Unknown template;
 
-    let newDt = await client.getDateEST(info.time);
-    let unixTime = Math.floor(newDt.getTime()/1000);
+    const newDt = await client.getDateEST(info.time);
+    const unixTime = Math.floor(newDt.getTime()/1000);
 
     const showCoords = client.exists(guild.showKillfeedCoords) ? guild.showKillfeedCoords : false; // default to false if no record of configuration.
 

util/LogsHandler.js

@@ -109,6 +109,7 @@ module.exports = {
           lastDamageDate: playerStat.lastDamageDate,
           lastHitBy: playerStat.lastHitBy,
           lastDeathDate: playerStat.lastDeathDate,
+          combatLogTimer: combatLogTimer,
         });
       }
     }
@@ -169,9 +170,7 @@ module.exports = {
       let playerStatIndex = stats.indexOf(playerStat);
       if (playerStat === undefined) playerStat = client.getDefaultPlayerStats(info.player, info.playerID);
 
-      const newDt = await client.getDateEST(info.time);
-
-      playerStat.lastDamageDate = newDt;
+      playerStat.lastDamageDate = await client.getDateEST(info.time);
       playerStat.lastHitBy = info.attacker;
 
       if (playerStatIndex === -1) stats.push(playerStat);

util/NitradoAPI.js

@@ -2,12 +2,54 @@ const { finished } = require('stream/promises');
 const concat = require('concat-stream');
 const { Readable } = require('stream');
 const FormData = require('form-data');
+const path = require("path");
 const fs = require('fs');
 const maxRetries = 5;
 const retryDelay = 5000; // 5 seconds
 
 // Private functions (only called locally)
 
+const UploadNitradoFile = async (client, remoteDir, remoteFilename, localFileDir) => {
+  for (let retries = 0; retries <= maxRetries; retries++) {
+    try {
+      const res = await fetch(`https://api.nitrado.net/services/${client.config.Nitrado.ServerID}/gameservers/file_server/upload?` + new URLSearchParams({
+        path: remoteDir,
+        file: remoteFilename
+      }), {
+        method: "POST",
+        headers: {
+          "Authorization": client.config.Nitrado.Auth
+        },
+      }).then(response => 
+        response.json().then(data => data)  
+      ).then(res => res);
+
+      let contents = fs.readFileSync(localFileDir, 'utf8');
+      
+      const uploadRes = await fetch(res.data.token.url, {
+        method: "POST",
+        headers: {
+          'Content-Type': 'application/binary',
+          token: res.data.token.token
+        },
+        body: contents,
+      });
+      if (!uploadRes.ok) {
+        const errorText = await uploadRes.text();
+        client.error(`Failed to upload file to Nitrado (${client.config.Nitrado.ServerID}): status: ${uploadRes.status}, message: ${errorText}: UploadNitradoFile`);
+        if (retries === 2) return 1; // Return error status on the second failed status code.
+      } else {
+        const data = await uploadRes.json();
+        return data;
+      }
+    } catch (error) {
+      client.error(`UploadNitradoFile: Error connecting to server (${client.config.Nitrado.ServerID}): ${error.message}`);
+      if (retries === maxRetries) throw new Error(`UploadNitradoFile: Error connecting to server (${client.config.Nitrado.ServerID}) after ${maxRetries} retries`);
+    }
+    await new Promise(resolve => setTimeout(resolve, retryDelay)); // Delay before retrying
+  }
+}
+
 const PostServerSettings = async (client, category, key, value) => {
   for (let retries = 0; retries <= maxRetries; retries++) {
     try {
@@ -176,35 +218,27 @@ module.exports = {
 
   ToggleBaseDamage: async (client, preference) => {
     const settings = await module.exports.FetchServerSettings(client, 'ToggleBaseDamage');  // Fetch server settings
+    if (settings == 1) return 1;
+   
+    const pref = preference ? 1 : 0;
+    const posted = await PostServerSettings(client, "config", "disableBaseDamage", pref);
+    if (posted == 1) return 1;
+   
+    const remoteDir = `/games/${client.config.Nitrado.UserID}/ftproot/dayzxb_missions/dayzOffline.chernarusplus`;
+    const remoteFilename = 'cfggameplay.json';
+
+    const jsonDir = `../logs/${remoteFilename}`;
+    await module.exports.DownloadNitradoFile(client, `${remoteDir}/${remoteFilename}`, jsonDir);
+   
+    let gameplay = JSON.parse(fs.readFileSync(jsonDir));
+    gameplay.GeneralData.disableBaseDamage = preference;
+
+    // write JSON to file
+    fs.writeFileSync(jsonDir, JSON.stringify(gameplay), null, 2);
+
+    const uploaded = await UploadNitradoFile(client, remoteDir, remoteFileName, jsonDir);
+    if (uploaded == 1) return 1;
    
-    if (settings && settings != 1) {
-      for (let retries = 0; retries <= maxRetries; retries++) {
-        try {
-          const formData = new FormData();
-          formData.append("category", "config");
-          formData.append("key", "disableBaseDamage");
-          formData.append("value", preference);
-          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
-      }
-    }
   }
 }