From 55c8a9ee7fa733f98c2facbb26ae408b3381992c Mon Sep 17 00:00:00 2001 From: SowinskiBraeden Date: Thu, 4 Apr 2024 20:11:48 -0700 Subject: [PATCH] refactor/support multiple discord guilds with 1 nitrado server each + better handling for NitradoAPI --- .env.example | 18 +- commands/admin.js | 24 ++ commands/alarm.js | 8 + commands/bounty.js | 8 + commands/compare-rating.js | 9 + commands/debug.js | 13 +- commands/event.js | 8 + commands/gamertag-link.js | 8 + commands/gamertag-unlink.js | 8 + commands/leaderboard.js | 9 + commands/location.js | 28 +- commands/lookup.js | 8 + commands/player-list.js | 9 + commands/player-stats.js | 9 + commands/purchase-emp.js | 9 + commands/purchase-uav.js | 9 + commands/reset.js | 1 + commands/server.js | 192 +++++++-- commands/weapon-stats.js | 9 + config/config.js | 12 +- database/destinations.js | 152 ++++++- database/guild.js | 4 + database/player.js | 23 +- events/interactionCreate.js | 6 +- package-lock.json | 773 ++++-------------------------------- package.json | 6 +- src/DayzRBot.js | 271 ++++++++----- util/AdminLogsHandler.js | 19 +- util/AlarmsHandler.js | 39 +- util/Cryptic.js | 19 + util/KillfeedHandler.js | 30 +- util/LogsHandler.js | 25 +- util/NitradoAPI.js | 150 ++++--- 33 files changed, 888 insertions(+), 1028 deletions(-) create mode 100644 util/Cryptic.js diff --git a/.env.example b/.env.example index f7cc002..c453307 100644 --- a/.env.example +++ b/.env.example @@ -1,8 +1,16 @@ +# Discord Bot Token token='Your Discord Bot token' + +# MongoDB Information mongoURI='Your mongodb URI' dbo='Your mongodb database' -SERVER_ID='Your Nitrado server ID' -USER_ID='Your Nitrado user ID' -AUTH_KEY='Your Nitrado Auth Token' -GuildID='Your Discord Guild ID' -Dev=PROD. # or DEV. \ No newline at end of file + +# Encryption +key='Secret Encryption Key', +iv='Secret Initialization Vector', + +# Other Bot Configuration +Dev=PROD. # or DEV. + +# Note: "PROD." downloads Nitrado logs every 5 minutes, "DEV." checks every 15 seconds. +# Any other value for Dev will not allow the bot to run. diff --git a/commands/admin.js b/commands/admin.js index 141e6ac..b20150d 100644 --- a/commands/admin.js +++ b/commands/admin.js @@ -134,6 +134,14 @@ module.exports = { if (args[0].name == 'gamertag-link') { + if (!client.exists(GuildDB.Nitrado) || !client.exists(GuildDB.Nitrado.ServerID) || !client.exists(GuildDB.Nitrado.UserID) || !client.exists(GuildDB.Nitrado.Auth)) { + const warnNitradoNotInitialized = new EmbedBuilder() + .setColor(client.config.Colors.Yellow) + .setDescription("**WARNING:** The DayZ Nitrado Server has not been configured for this guild yet. This command or feature is currently unavailable."); + + return interaction.send({ embeds: [warnNitradoNotInitialized], flags: (1 << 6) }); + } + let playerStat = await client.dbo.collection("players").findOne({"gamertag": args[0].options[1].value}); if (!client.exists(playerStat)) return interaction.send({ embeds: [new EmbedBuilder().setColor(client.config.Colors.Yellow).setDescription(`**Not Found** This gamertag \` ${args[0].options[1].value} \` cannot be found, the gamertag may be incorrect or this player has not logged onto the server before for at least \` 5 minutes \`.`)] }); @@ -180,6 +188,14 @@ module.exports = { } else if (args[0].name == 'gamertag-unlink') { + if (!client.exists(GuildDB.Nitrado) || !client.exists(GuildDB.Nitrado.ServerID) || !client.exists(GuildDB.Nitrado.UserID) || !client.exists(GuildDB.Nitrado.Auth)) { + const warnNitradoNotInitialized = new EmbedBuilder() + .setColor(client.config.Colors.Yellow) + .setDescription("**WARNING:** The DayZ Nitrado Server has not been configured for this guild yet. This command or feature is currently unavailable."); + + return interaction.send({ embeds: [warnNitradoNotInitialized], flags: (1 << 6) }); + } + let playerStat = await client.dbo.collection("players").findOne({"discordID": args[0].options[0].value}); if (!client.exists(playerStat)) return interaction.send({ embeds: [new EmbedBuilder().setColor(client.config.Colors.Yellow).setDescription(`**Not Found** <@${args[0].options[0].value}> has no gamertag linked.`)] }); @@ -265,6 +281,14 @@ module.exports = { } else if (args[0].name == 'bounty-clear') { + if (!client.exists(GuildDB.Nitrado) || !client.exists(GuildDB.Nitrado.ServerID) || !client.exists(GuildDB.Nitrado.UserID) || !client.exists(GuildDB.Nitrado.Auth)) { + const warnNitradoNotInitialized = new EmbedBuilder() + .setColor(client.config.Colors.Yellow) + .setDescription("**WARNING:** The DayZ Nitrado Server has not been configured for this guild yet. This command or feature is currently unavailable."); + + return interaction.send({ embeds: [warnNitradoNotInitialized], flags: (1 << 6) }); + } + let playerStat = await client.dbo.collection("players").findOne({"gamertag": args[0].options[0].value}); if (!client.exists(playerStat)) return interaction.send({ embeds: [new EmbedBuilder().setColor(client.config.Colors.Yellow).setDescription('**Not Found** This player cannot be found, the gamertag may be incorrect or this player has not logged onto the server before for at least ` 5 minutes `.')] }); diff --git a/commands/alarm.js b/commands/alarm.js index 8a01c1a..9d94ee2 100644 --- a/commands/alarm.js +++ b/commands/alarm.js @@ -214,6 +214,14 @@ module.exports = { if (GuildDB.hasBotAdmin && interaction.member.roles.filter(e => GuildDB.botAdminRoles.indexOf(e) !== -1).length > 0) canUseCommand = true; if (!canUseCommand) return interaction.send({ content: 'You don\'t have the permissions to use this command.' }); + if (!client.exists(GuildDB.Nitrado) || !client.exists(GuildDB.Nitrado.ServerID) || !client.exists(GuildDB.Nitrado.UserID) || !client.exists(GuildDB.Nitrado.Auth)) { + const warnNitradoNotInitialized = new EmbedBuilder() + .setColor(client.config.Colors.Yellow) + .setDescription("**WARNING:** The DayZ Nitrado Server has not been configured for this guild yet. This command or feature is currently unavailable."); + + return interaction.send({ embeds: [warnNitradoNotInitialized], flags: (1 << 6) }); + } + if (args[0].name == 'create') { if (args[0].options[3].value.includes('-') || args[0].options[3].value.includes(' ')) return interaction.send({ embeds: [new EmbedBuilder().setColor(client.config.Colors.Red).setDescription('**Invalid Name:** Alarm Names cannot include hyphens or spaces.')] }) diff --git a/commands/bounty.js b/commands/bounty.js index 552a966..3e237d8 100644 --- a/commands/bounty.js +++ b/commands/bounty.js @@ -59,6 +59,14 @@ module.exports = { */ run: async (client, interaction, args, { GuildDB }) => { + if (!client.exists(GuildDB.Nitrado) || !client.exists(GuildDB.Nitrado.ServerID) || !client.exists(GuildDB.Nitrado.UserID) || !client.exists(GuildDB.Nitrado.Auth)) { + const warnNitradoNotInitialized = new EmbedBuilder() + .setColor(client.config.Colors.Yellow) + .setDescription("**WARNING:** The DayZ Nitrado Server has not been configured for this guild yet. This command or feature is currently unavailable."); + + return interaction.send({ embeds: [warnNitradoNotInitialized], flags: (1 << 6) }); + } + let banking; if (args[0].name == 'set' || args[0].name == 'pay') { banking = await client.dbo.collection("users").findOne({"user.userID": interaction.member.user.id}).then(banking => banking); diff --git a/commands/compare-rating.js b/commands/compare-rating.js index 22cfb0f..6096f47 100644 --- a/commands/compare-rating.js +++ b/commands/compare-rating.js @@ -33,6 +33,15 @@ module.exports = { * @param {*} param3 */ run: async (client, interaction, args, { GuildDB }) => { + + if (!client.exists(GuildDB.Nitrado) || !client.exists(GuildDB.Nitrado.ServerID) || !client.exists(GuildDB.Nitrado.UserID) || !client.exists(GuildDB.Nitrado.Auth)) { + const warnNitradoNotInitialized = new EmbedBuilder() + .setColor(client.config.Colors.Yellow) + .setDescription("**WARNING:** The DayZ Nitrado Server has not been configured for this guild yet. This command or feature is currently unavailable."); + + return interaction.send({ embeds: [warnNitradoNotInitialized], flags: (1 << 6) }); + } + let discord = args[0] && args[0].name == 'discord' ? args[0].value : undefined; let gamertag = args[0] && args[0].name == 'gamertag' ? args[0].value : undefined; diff --git a/commands/debug.js b/commands/debug.js index 58c53d5..9d7c8a5 100644 --- a/commands/debug.js +++ b/commands/debug.js @@ -11,12 +11,7 @@ module.exports = { channel: ["VIEW_CHANNEL", "SEND_MESSAGES", "EMBED_LINKS"], member: [], }, - options: [{ - name: 'sync-logs', - description: 'download the Nitrado logs and run checks now', - value: 'sync-logs', - type: CommandOptions.SubCommand, - }], + options: [], SlashCommand: { /** * @@ -28,11 +23,7 @@ module.exports = { run: async (client, interaction, args, { GuildDB }) => { if (!client.config.Admins.includes(interaction.member.user.id)) return interaction.send({ content: 'Only developers can access this command.', flags: (1 << 6) }) - if (args[0].name == 'sync-logs') { - if (client.processingLogs) return interaction.send({ content: 'The Nitrado logs are already being processed at the moment...', flags: (1 << 6) }); - interaction.send({ content: 'Downloading and processing Nitrado logs now...', flags: (1 << 6) }); - return client.logsUpdateTimer(client); - } + return interaction.send({ content: `Hello ${interaction.member.user.id}, you are my creator!!` }) }, }, Interactions: {} diff --git a/commands/event.js b/commands/event.js index ca946f6..0ef13d7 100644 --- a/commands/event.js +++ b/commands/event.js @@ -72,6 +72,14 @@ module.exports = { */ run: async (client, interaction, args, { GuildDB }) => { + if (!client.exists(GuildDB.Nitrado) || !client.exists(GuildDB.Nitrado.ServerID) || !client.exists(GuildDB.Nitrado.UserID) || !client.exists(GuildDB.Nitrado.Auth)) { + const warnNitradoNotInitialized = new EmbedBuilder() + .setColor(client.config.Colors.Yellow) + .setDescription("**WARNING:** The DayZ Nitrado Server has not been configured for this guild yet. This command or feature is currently unavailable."); + + return interaction.send({ embeds: [warnNitradoNotInitialized], flags: (1 << 6) }); + } + const permissions = bitfieldCalculator.permissions(interaction.member.permissions); let canUseCommand = false; diff --git a/commands/gamertag-link.js b/commands/gamertag-link.js index fc497ff..a078952 100644 --- a/commands/gamertag-link.js +++ b/commands/gamertag-link.js @@ -29,6 +29,14 @@ module.exports = { */ run: async (client, interaction, args, { GuildDB }) => { + if (!client.exists(GuildDB.Nitrado) || !client.exists(GuildDB.Nitrado.ServerID) || !client.exists(GuildDB.Nitrado.UserID) || !client.exists(GuildDB.Nitrado.Auth)) { + const warnNitradoNotInitialized = new EmbedBuilder() + .setColor(client.config.Colors.Yellow) + .setDescription("**WARNING:** The DayZ Nitrado Server has not been configured for this guild yet. This command or feature is currently unavailable."); + + return interaction.send({ embeds: [warnNitradoNotInitialized], flags: (1 << 6) }); + } + let playerStat = await client.dbo.collection("players").findOne({"gamertag": args[0].value}); if (!client.exists(playerStat)) return interaction.send({ embeds: [new EmbedBuilder().setColor(client.config.Colors.Yellow).setDescription(`**Not Found** This gamertag \` ${args[0].value} \` cannot be found, the gamertag may be incorrect or this player has not logged onto the server before for at least \` 5 minutes \`.`)] }); diff --git a/commands/gamertag-unlink.js b/commands/gamertag-unlink.js index f9067a0..b52b6f8 100644 --- a/commands/gamertag-unlink.js +++ b/commands/gamertag-unlink.js @@ -21,6 +21,14 @@ module.exports = { */ run: async (client, interaction, args, { GuildDB }) => { + if (!client.exists(GuildDB.Nitrado) || !client.exists(GuildDB.Nitrado.ServerID) || !client.exists(GuildDB.Nitrado.UserID) || !client.exists(GuildDB.Nitrado.Auth)) { + const warnNitradoNotInitialized = new EmbedBuilder() + .setColor(client.config.Colors.Yellow) + .setDescription("**WARNING:** The DayZ Nitrado Server has not been configured for this guild yet. This command or feature is currently unavailable."); + + return interaction.send({ embeds: [warnNitradoNotInitialized], flags: (1 << 6) }); + } + let playerStat = await client.dbo.collection("players").findOne({"discordID": interaction.member.user.id}); if (!client.exists(playerStat)) return interaction.send({ embeds: [new EmbedBuilder().setColor(client.config.Colors.Yellow).setDescription(`**No Gamertag Linked** It Appears your don't have a gamertag linked to your account.`)] }); diff --git a/commands/leaderboard.js b/commands/leaderboard.js index 479bf87..2931301 100644 --- a/commands/leaderboard.js +++ b/commands/leaderboard.js @@ -52,6 +52,15 @@ module.exports = { * @param {*} param3 */ run: async (client, interaction, args, { GuildDB }) => { + + if (!client.exists(GuildDB.Nitrado) || !client.exists(GuildDB.Nitrado.ServerID) || !client.exists(GuildDB.Nitrado.UserID) || !client.exists(GuildDB.Nitrado.Auth)) { + const warnNitradoNotInitialized = new EmbedBuilder() + .setColor(client.config.Colors.Yellow) + .setDescription("**WARNING:** The DayZ Nitrado Server has not been configured for this guild yet. This command or feature is currently unavailable."); + + return interaction.send({ embeds: [warnNitradoNotInitialized], flags: (1 << 6) }); + } + const category = args[0].value; const limit = args[1].value; diff --git a/commands/location.js b/commands/location.js index 2d79058..fb3bd01 100644 --- a/commands/location.js +++ b/commands/location.js @@ -1,6 +1,5 @@ const { EmbedBuilder } = require('discord.js'); -const { destinations } = require('../database/destinations'); -const { calculateVector } = require('../util/Vector'); +const { nearest } = require('../database/destinations'); module.exports = { name: "location", @@ -21,27 +20,22 @@ module.exports = { * @param {*} param3 */ run: async (client, interaction, args, { GuildDB }) => { + + if (!client.exists(GuildDB.Nitrado) || !client.exists(GuildDB.Nitrado.ServerID) || !client.exists(GuildDB.Nitrado.UserID) || !client.exists(GuildDB.Nitrado.Auth)) { + const warnNitradoNotInitialized = new EmbedBuilder() + .setColor(client.config.Colors.Yellow) + .setDescription("**WARNING:** The DayZ Nitrado Server has not been configured for this guild yet. This command or feature is currently unavailable."); + + return interaction.send({ embeds: [warnNitradoNotInitialized], flags: (1 << 6) }); + } + let playerStat = await client.dbo.collection("players").findOne({"discordID": interaction.member.user.id}); if (!client.exists(playerStat)) return interaction.send({ embeds: [new EmbedBuilder().setColor(client.config.Colors.Yellow).setDescription(`**Not Found** You haven't linked your gamertag and are unable to use this command.`)], flags: (1 << 6) }); let newDt = await client.getDateEST(playerStat.time); let unixTime = Math.floor(newDt.getTime()/1000); - - let tempDest; - let lastDist = 1000000; - let destination_dir; - if (showCoords) { // Only calculate if showing coords, very tiny minor optimization... probably amounts to nothing. - for (let i = 0; i < destinations.length; i++) { - let { distance, theta, dir } = calculateVector(info.victimPOS, destinations[i].coord); - if (distance < lastDist) { - tempDest = destinations[i].name; - lastDist = distance; - destination_dir = dir; - } - } - } - const destination = lastDist > 500 ? `${destination_dir} of ${tempDest}` : `Near ${tempDest}`; + const destination = nearest(playerStat.pos, GuildDB.Nitrado.Mission); let lastLocation = new EmbedBuilder() .setColor(client.config.Colors.Default) diff --git a/commands/lookup.js b/commands/lookup.js index 7368552..427570c 100644 --- a/commands/lookup.js +++ b/commands/lookup.js @@ -46,6 +46,14 @@ module.exports = { */ run: async (client, interaction, args, { GuildDB }) => { + if (!client.exists(GuildDB.Nitrado) || !client.exists(GuildDB.Nitrado.ServerID) || !client.exists(GuildDB.Nitrado.UserID) || !client.exists(GuildDB.Nitrado.Auth)) { + const warnNitradoNotInitialized = new EmbedBuilder() + .setColor(client.config.Colors.Yellow) + .setDescription("**WARNING:** The DayZ Nitrado Server has not been configured for this guild yet. This command or feature is currently unavailable."); + + return interaction.send({ embeds: [warnNitradoNotInitialized], flags: (1 << 6) }); + } + if (args[0].name == 'discord') { let playerStat = await client.dbo.collection("players").findOne({"gamertag": args[0].options[0].value}); diff --git a/commands/player-list.js b/commands/player-list.js index 8c5ec3b..0cf8b70 100644 --- a/commands/player-list.js +++ b/commands/player-list.js @@ -21,6 +21,14 @@ module.exports = { */ run: async (client, interaction, args, { GuildDB }, start) => { + if (!client.exists(GuildDB.Nitrado) || !client.exists(GuildDB.Nitrado.ServerID) || !client.exists(GuildDB.Nitrado.UserID) || !client.exists(GuildDB.Nitrado.Auth)) { + const warnNitradoNotInitialized = new EmbedBuilder() + .setColor(client.config.Colors.Yellow) + .setDescription("**WARNING:** The DayZ Nitrado Server has not been configured for this guild yet. This command or feature is currently unavailable."); + + return interaction.send({ embeds: [warnNitradoNotInitialized], flags: (1 << 6) }); + } + let activePlayers = await client.dbo.collection("players").find({"connected": true}); let des = activePlayers.length > 0 ? `` : `**No Players Online**`; @@ -28,6 +36,7 @@ module.exports = { des += `**- ${activePlayers[i].gamertag}**\n`; } + // TODO: handle activePlayers.length being undefined const activePlayersEmbed = new EmbedBuilder() .setColor(client.config.Colors.Default) .setTitle(`Online List - ${activePlayers.length} Player${(activePlayers.length>1||activePlayers.length==0)?'s':''} Online`) diff --git a/commands/player-stats.js b/commands/player-stats.js index 040f479..9d67edb 100644 --- a/commands/player-stats.js +++ b/commands/player-stats.js @@ -56,6 +56,15 @@ module.exports = { * @param {*} param3 */ run: async (client, interaction, args, { GuildDB }, start) => { + + if (!client.exists(GuildDB.Nitrado) || !client.exists(GuildDB.Nitrado.ServerID) || !client.exists(GuildDB.Nitrado.UserID) || !client.exists(GuildDB.Nitrado.Auth)) { + const warnNitradoNotInitialized = new EmbedBuilder() + .setColor(client.config.Colors.Yellow) + .setDescription("**WARNING:** The DayZ Nitrado Server has not been configured for this guild yet. This command or feature is currently unavailable."); + + return interaction.send({ embeds: [warnNitradoNotInitialized], flags: (1 << 6) }); + } + let category = args[0].value; let discord = args[1] && args[1].name == 'discord' ? args[1].value : undefined; let gamertag = args[1] && args[1].name == 'gamertag' ? args[1].value : undefined; diff --git a/commands/purchase-emp.js b/commands/purchase-emp.js index c2c920d..389d9d3 100644 --- a/commands/purchase-emp.js +++ b/commands/purchase-emp.js @@ -32,6 +32,15 @@ module.exports = { * @param {*} param3 */ run: async (client, interaction, args, { GuildDB }) => { + + if (!client.exists(GuildDB.Nitrado) || !client.exists(GuildDB.Nitrado.ServerID) || !client.exists(GuildDB.Nitrado.UserID) || !client.exists(GuildDB.Nitrado.Auth)) { + const warnNitradoNotInitialized = new EmbedBuilder() + .setColor(client.config.Colors.Yellow) + .setDescription("**WARNING:** The DayZ Nitrado Server has not been configured for this guild yet. This command or feature is currently unavailable."); + + return interaction.send({ embeds: [warnNitradoNotInitialized], flags: (1 << 6) }); + } + if (client.exists(GuildDB.purchaseEMP) && !GuildDB.purchaseEMP) return interaction.send({ embeds: [new EmbedBuilder().setColor(client.config.Colors.Yellow).setDescription('**Notice:** The admins have disabled this feature')] }); const duration = args[0].value; diff --git a/commands/purchase-uav.js b/commands/purchase-uav.js index afc7c37..cc52779 100644 --- a/commands/purchase-uav.js +++ b/commands/purchase-uav.js @@ -39,6 +39,15 @@ module.exports = { * @param {*} param3 */ run: async (client, interaction, args, { GuildDB }) => { + + if (!client.exists(GuildDB.Nitrado) || !client.exists(GuildDB.Nitrado.ServerID) || !client.exists(GuildDB.Nitrado.UserID) || !client.exists(GuildDB.Nitrado.Auth)) { + const warnNitradoNotInitialized = new EmbedBuilder() + .setColor(client.config.Colors.Yellow) + .setDescription("**WARNING:** The DayZ Nitrado Server has not been configured for this guild yet. This command or feature is currently unavailable."); + + return interaction.send({ embeds: [warnNitradoNotInitialized], flags: (1 << 6) }); + } + if (client.exists(GuildDB.purchaseUAV) && !GuildDB.purchaseUAV) return interaction.send({ embeds: [new EmbedBuilder().setColor(client.config.Colors.Yellow).setDescription('**Notice:** The admins have disabled this feature')] }); let banking = await client.dbo.collection("users").findOne({"user.userID": interaction.member.user.id}).then(banking => banking); diff --git a/commands/reset.js b/commands/reset.js index 57b68ae..05fcf2f 100644 --- a/commands/reset.js +++ b/commands/reset.js @@ -3,6 +3,7 @@ const CommandOptions = require('../util/CommandOptionTypes').CommandOptionTypes; const { addUser } = require('../database/user'); const bitfieldCalculator = require('discord-bitfield-calculator'); +// TODO: Reset User Banking, Reset User Game Stats, Reset All Users Banking, Reset All User Game stats module.exports = { name: "reset", debug: false, diff --git a/commands/server.js b/commands/server.js index 6dd65c9..8cc82e3 100644 --- a/commands/server.js +++ b/commands/server.js @@ -1,8 +1,10 @@ -const { EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle, StringSelectMenuBuilder } = require('discord.js'); +const { EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle, ModalBuilder, TextInputBuilder, TextInputStyle } = require('discord.js'); const CommandOptions = require('../util/CommandOptionTypes').CommandOptionTypes; const bitfieldCalculator = require('discord-bitfield-calculator'); const { BanPlayer, UnbanPlayer, RestartServer, CheckServerStatus, DisableBaseDamage, DisableContainerDamage } = require('../util/NitradoAPI'); +const { encrypt, decrypt } = require('../util/Cryptic'); +// TODO: deactivate nitrado server from guild module.exports = { name: "server", debug: false, @@ -13,8 +15,13 @@ module.exports = { channel: ["VIEW_CHANNEL", "SEND_MESSAGES", "EMBED_LINKS"], member: [], }, - options: [ - { + options: [{ + name: "initialize", + description: "Connect your Nitrado server to the bot", + value: "initialize", + type: CommandOptions.SubCommand, + }, + { name: "ban-player", description: "Ban a player from the DayZ server", value: "ban-player", @@ -91,16 +98,88 @@ module.exports = { if (GuildDB.hasBotAdmin && interaction.member.roles.filter(e => GuildDB.botAdminRoles.indexOf(e) !== -1).length > 0) canUseCommand = true; if (!canUseCommand) return interaction.send({ content: 'You don\'t have the permissions to use this command.' }); + const NitradoCred = client.exists(GuildDB.Nitrado) ? { + ServerID: GuildDB.Nitrado.ServerID, + UserID: GuildDB.Nitrado.UserID, + Auth: decrypt( + GuildDB.Nitrado.Auth, + client.config.EncryptionMethod, + client.key, + client.encryptionIV + ) + } : { + ServerID: null, + UserID: null, + Auth: null + } + + if (args[0].name == 'initialize') { + + if (client.exists(GuildDB.Nitrado)) { + const prompt = new EmbedBuilder() + .setTitle(`Nitrado Server Information Already Configured!`) + .setDescription('**Notice:** This will overwrite your previously configured Nitrado Server Information') + .setColor(client.config.Colors.Yellow) + + const opt = new ActionRowBuilder() + .addComponents( + new ButtonBuilder() + .setCustomId(`OverwriteNitrado-yes-${interaction.member.user.id}`) + .setLabel("Yes") + .setStyle(ButtonStyle.Danger), + new ButtonBuilder() + .setCustomId(`OverwriteNitrado-no-${interaction.member.user.id}`) + .setLabel("No") + .setStyle(ButtonStyle.Success) + ) + + return interaction.send({ embeds: [prompt], components: [opt], flags: (1 << 6) }); + } + + const NitradoCredentials = new ModalBuilder() + .setTitle('Connect your Nitrado Server') + .setCustomId(`NitradoCredentials-${interaction.member.user.id}`); + + const ServerID = new ActionRowBuilder().addComponents(new TextInputBuilder() + .setCustomId('ServerIDInput') + .setLabel('Your Nitrado Server ID') + .setStyle(TextInputStyle.Short) + .setRequired(true) + ); + + const UserID = new ActionRowBuilder().addComponents(new TextInputBuilder() + .setCustomId('UserIDInput') + .setLabel('Your Nitrado User ID') + .setStyle(TextInputStyle.Short) + .setRequired(true) + ); + + const Auth = new ActionRowBuilder().addComponents(new TextInputBuilder() + .setCustomId('AuthInput') + .setLabel('Your Nitrado Authentication Token') + .setPlaceholder("This will be encrypted to protect your server!") + .setStyle(TextInputStyle.Short) + .setRequired(true) + ); + + NitradoCredentials.addComponents(ServerID, UserID, Auth); + + return interaction.showModal(NitradoCredentials); + + } + + if (!client.exists(GuildDB.Nitrado) || !client.exists(GuildDB.Nitrado.ServerID)) return interaction.send({ embeds: [new EmbedBuilder().setColor(client.config.Colors.Red).setDescription(`**Notice:**\nThis Discord guild has not been configured with a Nitrado DayZ server. To configure your guild, use `)] }); + if (args[0].name == 'ban-player') { - let data = await BanPlayer(client, args[0].options[0].value); + let data = await BanPlayer(NitradoCred, client, args[0].options[0].value); if (data == 1) { let failed = new EmbedBuilder() .setColor(client.config.Colors.Red) - .setDescription(`Failed to ban **${args[0].options[0].value}**. Check internal logs for an error.`); + .setDescription(`Failed to ban **${args[0].options[0].value}**. This can result from a variety of reasons:\nNitrado servers may be experiencing issues\nThe DayZ.R Bot may be experiencing issues\nYour Nitrado credentials were entered incorrectly`); - return interaciton.send({ embeds: [failed] }); + return interaction.send({ embeds: [failed], flags: (1 << 6) }); } let banned = new EmbedBuilder() @@ -111,12 +190,12 @@ module.exports = { } else if (args[0].name == 'unban-player') { - let data = UnbanPlayer(client, args[0].options[0].value); + let data = UnbanPlayer(NitradoCred, client, args[0].options[0].value); if (data == 1) { let failed = new EmbedBuilder() .setColor(client.config.Colors.Red) - .setDescription(`Failed to ban **${args[0].options[0].value}**. Check internal logs for an error.`); + .setDescription(`Failed to unban **${args[0].options[0].value}**. This can result from a variety of reasons:\nNitrado servers may be experiencing issues\nThe DayZ.R Bot may be experiencing issues\nYour Nitrado credentials were entered incorrectly`); return interaction.send({ embeds: [failed] }); } @@ -132,29 +211,26 @@ module.exports = { restart_message = 'Server being restarted by an admin.'; message = 'The server was restarted by an admin!'; - RestartServer(client, restart_message, message); + RestartServer(NitradoCred, client, restart_message, message); return interaction.send({ embeds: [new EmbedBuilder().setColor(client.config.Colors.Yellow).setDescription('The server will restart shortly.')], flags: (1 << 6) }); } else if (args[0].name == "auto-restart") { - msg = 'Auto server restart periodic check enabled.'; - pref = 0; - + let msg = 'Auto server restart periodic check enabled.'; + let pref = 0; + // Enable/Disable a 10min periodic server status check. - if (!client.arIntervalId) { - client.arIntervalId = setInterval(CheckServerStatus, client.arInterval, client); - client.log('Enabled and starting periodic Nitrado server status check.'); + if (!client.arIntervalIds.has(GuildDB.serverID)) { + client.arIntervalIds.set(GuildDB.serverID, setInterval(CheckServerStatus, client.arInterval, NitradoCred, client)); pref = 1; } else { msg = 'Auto server restart periodic check disabled.' - clearInterval(client.arIntervalId); - client.arIntervalId = 0; - client.log('Disabled periodic Nitrado server status check.'); + clearInterval(client.arIntervalIds.get(GuildDB.serverID)); } // Update DB preference client.dbo.collection("guilds").updateOne({ "server.serverID": GuildDB.serverID }, { $set: { - "server.autoRestart": pref + "server.autoRestart": pref, } }, function (err, res) { if (err) return client.sendInternalError(interaction, err); @@ -166,23 +242,91 @@ module.exports = { const preference = args[0].options[0].value; await interaction.deferReply({ flags: (1 << 6) }); - const disableBaseDamageFailed = await DisableBaseDamage(client, preference); + const disableBaseDamageFailed = await DisableBaseDamage(NitradoCred, client, preference); - if (disableBaseDamageFailed) return interaction.editReply({ embeds: [new EmbedBuilder().setColor(client.config.Colors.Red).setDescription('Failed to set **disableBaseDamage**, try again later.')], flags: (1 << 6) }); + if (disableBaseDamageFailed) return interaction.editReply({ embeds: [new EmbedBuilder().setColor(client.config.Colors.Red).setDescription('Failed to set **disableBaseDamage**. This can result from a variety of reasons:\nNitrado servers may be experiencing issues\nThe DayZ.R Bot may be experiencing issues\nYour Nitrado credentials were entered incorrectly')], flags: (1 << 6) }); return interaction.editReply({ embeds: [new EmbedBuilder().setColor(client.config.Colors.Green).setDescription(`Successfully set **disableBaseDamage** to ${preference}.\nRestart the DayZ server to apply these changes.`)], flags: (1 << 6) }); } else if (args[0].name == 'disable-container-damage') { const preference = args[0].options[0].value; await interaction.deferReply({ flags: (1 << 6) }); - const disableContainerDamageFailed = await DisableContainerDamage(client, preference); + const disableContainerDamageFailed = await DisableContainerDamage(NitradoCred, client, preference); - if (disableContainerDamageFailed) return interaction.editReply({ embeds: [new EmbedBuilder().setColor(client.config.Colors.Red).setDescription('Failed to set **disableContainerDamage**, try again later.')], flags: (1 << 6) }); + if (disableContainerDamageFailed) return interaction.editReply({ embeds: [new EmbedBuilder().setColor(client.config.Colors.Red).setDescription('Failed to set **disableContainerDamage**. This can result from a variety of reasons:\nNitrado servers may be experiencing issues\nThe DayZ.R Bot may be experiencing issues\nYour Nitrado credentials were entered incorrectly')], flags: (1 << 6) }); return interaction.editReply({ embeds: [new EmbedBuilder().setColor(client.config.Colors.Green).setDescription(`Successfully set **disableContainerDamage** to ${preference}.\nRestart the DayZ server to apply these changes.`)], flags: (1 << 6) }); } } }, - Interactions: {} + Interactions: { + + NitradoCredentials: { + run: async(client, interaction, GuildDB) => { + if (!interaction.customId.endsWith(interaction.member.user.id)) + return interaction.reply({ content: 'This interaction is not for you', flags: (1 << 6) }); + + const Nitrado = { + ServerID: interaction.fields.fields.get('ServerIDInput').value, + UserID: interaction.fields.fields.get('UserIDInput').value, + Auth: encrypt( + interaction.fields.fields.get('AuthInput').value, + client.config.EncryptionMethod, + client.key, + client.encryptionIV + ), // Encrypt the Authentication Token + }; + + await client.dbo.collection('guilds').updateOne({ "server.serverID": GuildDB.serverID }, { $set: { "Nitrado": Nitrado } }, (err, res) => { + if (err) client.sendInternalError(interaction, err); + }); + + client.initNewNitradoServer(GuildDB.serverID, Nitrado); + + return interaction.reply({ content: 'Successfully configured your Nitrado Server Information', flags: (1 << 6) }); + } + }, + + OverwriteNitrado: { + run: async(client, interaction, GuildDB) => { + if (!interaction.customId.endsWith(interaction.member.user.id)) + return interaction.reply({ content: 'This interaction is not for you', flags: (1 << 6) }); + + if (interaction.customId.split('-')[1] == 'yes') { + const NitradoCredentials = new ModalBuilder() + .setTitle('Connect your Nitrado Server') + .setCustomId(`NitradoCredentials-${interaction.member.user.id}`); + + const ServerID = new ActionRowBuilder().addComponents(new TextInputBuilder() + .setCustomId('ServerIDInput') + .setLabel('Your Nitrado Server ID') + .setStyle(TextInputStyle.Short) + .setRequired(true) + ); + + const UserID = new ActionRowBuilder().addComponents(new TextInputBuilder() + .setCustomId('UserIDInput') + .setLabel('Your Nitrado User ID') + .setStyle(TextInputStyle.Short) + .setRequired(true) + ); + + const Auth = new ActionRowBuilder().addComponents(new TextInputBuilder() + .setCustomId('AuthInput') + .setLabel('Your Nitrado Authentication Token') + .setStyle(TextInputStyle.Short) + .setRequired(true) + ); + + NitradoCredentials.addComponents(ServerID, UserID, Auth); + + return interaction.update(NitradoCredentials); + } else { + return interaction.reply({ content: 'Cancelled Overwriting Nitrado Server Information' }); + } + } + } + + } } diff --git a/commands/weapon-stats.js b/commands/weapon-stats.js index f83e3b6..90bfc06 100644 --- a/commands/weapon-stats.js +++ b/commands/weapon-stats.js @@ -53,6 +53,15 @@ module.exports = { * @param {*} param3 */ run: async (client, interaction, args, { GuildDB }) => { + + if (!client.exists(GuildDB.Nitrado) || !client.exists(GuildDB.Nitrado.ServerID) || !client.exists(GuildDB.Nitrado.UserID) || !client.exists(GuildDB.Nitrado.Auth)) { + const warnNitradoNotInitialized = new EmbedBuilder() + .setColor(client.config.Colors.Yellow) + .setDescription("**WARNING:** The DayZ Nitrado Server has not been configured for this guild yet. This command or feature is currently unavailable."); + + return interaction.send({ embeds: [warnNitradoNotInitialized], flags: (1 << 6) }); + } + let discord = args[1] && args[1].name == 'discord' ? args[1].value : undefined; let gamertag = args[1] && args[1].name == 'gamertag' ? args[1].value : undefined; let self = !discord && !gamertag; // searching for self if both discord and gamertag are undefined diff --git a/config/config.js b/config/config.js index 4d2c0fc..9505356 100644 --- a/config/config.js +++ b/config/config.js @@ -21,16 +21,12 @@ module.exports = { Dev: process.env.Dev || "DEV.", Version: package.version, // (major).(minor).(patch) Admins: ["362791661274660874", "329371697570381824"], // Admins of the bot - ServerID: "1050215624053374976", - GuildID: process.env.GuildID || "", - SupportServer: "https://discord.gg/KVFJCvvFtK", // Support Server Link + SupportServer: "https://discord.gg/KVFJCvvFtK", // Support Server Link Token: process.env.token || "", //Discord Bot Token + SecretKey: process.env.key || "01234567891", + SecretIv: process.env.iv || "9876543210", + EncryptionMethod: process.env.encryptionMethod || "aes-256-cbc", Scopes: ["identify", "guilds", "applications.commands"], //Discord OAuth2 Scopes - Nitrado: { - ServerID: process.env.SERVER_ID, - UserID: process.env.USER_ID, - Auth: process.env.AUTH_KEY - }, IconURL: "", Colors: { Default: "#8a7c72", diff --git a/database/destinations.js b/database/destinations.js index 1697e24..cd5fea9 100644 --- a/database/destinations.js +++ b/database/destinations.js @@ -1,5 +1,26 @@ +const { calculateVector } = require('../util/Vector'); + module.exports = { - destinations: [ + // Calculates the nearest location to a given coordinate + nearest: (pos, mission) => { + let tempDest; + let lastDist = 1000000; + let destination_dir; + for (let i = 0; i < destinations[mission].length; i++) { + let { distance, theta, dir } = calculateVector(data.pos, destinations[mission][i].coord); + if (distance < lastDist) { + tempDest = destinations[mission][i].name; + lastDist = distance; + destination_dir = dir; + } + } + return lastDist > 500 ? `${destination_dir} of ${tempDest}` : `Near ${tempDest}`; + } +} + +// A curated list of destinations across DayZ Chernarus and Livonia +const destinations = { + Chernarus: [ { name: 'Sinystok', coord: [1481.47, 11933.38], @@ -310,5 +331,134 @@ module.exports = { name: 'Ski Resort Peak', coord: [250.80, 11867.28], }, + ], + Livonia: [ + { + name: 'Lukow', + coord: [3575.00 / 11925.00], + }, { + name: 'Brena', + coord: [6518.75 / 11228.13], + }, { + name: 'Kolembrody', + coord: [8406.25 / 11968.75], + }, { + name: 'Grabin', + coord: [10756.25 / 11062.50], + }, { + name: 'Sitnik', + coord: [11440.63 / 9543.75], + }, { + name: 'Tarnow', + coord: [9275.00 / 10921.88], + }, { + name: 'Sobatka', + coord: [6250.00 / 10193.75], + }, { + name: 'Gliniska', + coord: [5012.50 / 9881.25], + }, { + name: 'Gliniska Airfield', + coord: [3968.75 / 10278.13] + }, { + name: 'Kopa', + coord: [5545.31 / 8748.44], + }, { + name: 'Olszanka', + coord: [4856.25 / 7571.88], + }, { + name: 'Radacz', + coord: [4006.25 / 7972.66], + }, { + name: 'Topolin', + coord: [1665.62 / 7378.13], + }, { + name: 'Bielawa', + coord: [1525.00 / 9700.00], + }, { + name: 'Adamow', + coord: [3081.25 / 6793.75], + }, { + name: 'Muratyn', + coord: [4587.50 / 6387.50], + }, { + name: 'Lipina', + coord: [5943.75 / 6787.50], + }, { + name: 'Nidek', + coord: [6118.75 / 8056.25], + }, { + name: 'Zapadlisko', + coord: [8093.75 / 8710.94], + }, { + name: 'Krsnik Military', + coord: [7841.02 / 10075.39], + }, { + name: 'Zalesie', + coord: [878.12 / 5512.50], + }, { + name: 'Borek Military', + coord: [9807.81 / 8500.00], + }, { + name: 'Polkrabiec', + coord: [11878.13 / 6571.09], + }, { + name: 'Lembork', + coord: [8825.00 / 6628.13], + }, { + name: 'Karlin', + coord: [10064.39 / 6924.93], + }, { + name: 'Radunin', + coord: [7301.89 / 6418.68], + }, { + name: 'Roztoka', + coord: [7650.00 / 5246.88], + }, { + name: 'Sarnowek', + coord: [3287.50 / 5009.38], + }, { + name: 'Huta', + coord: [5154.69 / 5520.31], + }, { + name: 'Drewniki', + coord: [5834.38 / 5084.38], + }, { + name: 'Nadbor', + coord: [6056.25 / 4103.13], + }, { + name: 'Nadbor Military', + coord: [5625.00 / 3787.50], + }, { + name: 'Max', + coord: [6448.44 / 4732.81], + }, { + name: 'Wrzeszcz', + coord: [9042.19 / 4385.94], + }, { + name: 'Gieraltow', + coord: [11243.75 / 4332.81], + }, { + name: 'Konopki', + coord: [11460.16 / 2889.84], + }, { + name: 'Swarog Military', + coord: [5017.19 / 2146.88], + }, { + name: 'Hedrykow', + coord: [4487.50 / 4825.00], + }, { + name: 'Polana', + coord: [3296.87 / 2043.75], + }, { + name: 'Dambog', + coord: [597.27 / 1138.67], + }, { + name: 'Dolnik', + coord: [11410.94 / 578.12], + }, { + name: 'Widok', + coord: [10234.38 / 2165.63], + }, ] } \ No newline at end of file diff --git a/database/guild.js b/database/guild.js index 35ee3a3..6c01a3f 100644 --- a/database/guild.js +++ b/database/guild.js @@ -7,6 +7,7 @@ module.exports = { if (!guild) { guild = {} guild.server = module.exports.getDefaultSettings(GuildId); + guild.Nitrado = undefined; if (client.databaseConnected) { client.dbo.collection("guilds").insertOne(guild, (err, res) => { if (err) throw err; @@ -16,6 +17,8 @@ module.exports = { return { serverID: GuildId, + Nitrado: guild.Nitrado, + lastLog: guild.server.lastLog, serverName: guild.server.serverName, autoRestart: guild.server.autoRestart, showKillfeedCoords: guild.server.showKillfeedCoords, @@ -58,6 +61,7 @@ module.exports = { getDefaultSettings(GuildId) { return { serverID: GuildId, + lastLog: null, serverName: "our server!", autoRestart: 0, showKillfeedCoords: 0, diff --git a/database/player.js b/database/player.js index 2bdb453..578316a 100644 --- a/database/player.js +++ b/database/player.js @@ -24,17 +24,20 @@ const createWeaponsObject = (value) => { module.exports = { UpdatePlayer: async (client, player, interaction=null) => { - return await client.dbo.collection("players").updateOne( - { "playerID": player.playerID }, - { $set: player }, - { upsert: true }, // Create player stat document if it does not exist - (err, _) => { - if (err) { - if (interaction == null) return client.error(err); - else return client.sendInternalError(interaction, err); + /* Wrapping this function in a promise solves some bugs */ + return new Promise(resolve => { + client.dbo.collection("players").updateOne( + { "playerID": player.playerID }, + { $set: player }, + { upsert: true }, // Create player stat document if it does not exist + (err, _) => { + if (err) { + if (interaction == null) return client.error(err); + else return client.sendInternalError(interaction, err); + } else resolve(); } - } - ); + ); + }); }, getDefaultPlayer(gt, pID, NSID) { diff --git a/events/interactionCreate.js b/events/interactionCreate.js index b5f7f1a..621aa14 100644 --- a/events/interactionCreate.js +++ b/events/interactionCreate.js @@ -1,9 +1,11 @@ +const { InteractionType } = require('discord.js'); const { GetGuild } = require('../database/guild'); + module.exports = async (client, interaction) => { - if (interaction.isCommand()) return; + if (interaction.type == InteractionType.ApplicationCommand) return; /* - This file handles all menu and button interactions + This file routes any menu, modal & button interactions from any command */ diff --git a/package-lock.json b/package-lock.json index b81e9e4..cbabe56 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,26 +1,24 @@ { "name": "dayzr-bot", - "version": "12.2.0", + "version": "12.7.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "dayzr-bot", - "version": "12.2.0", + "version": "12.7.1", "license": "MIT", "dependencies": { "@discordjs/rest": "^1.1.0", "colors": "^1.4.0", "concat-stream": "^2.0.0", + "crypto": "^1.0.1", "discord-bitfield-calculator": "^1.0.0", "discord.js": "^14.8.0", "dotenv": "^16.0.3", "form-data": "^4.0.0", "mongodb": "^4.12.1", "winston": "^3.8.1" - }, - "devDependencies": { - "nodemon": "^2.0.20" } }, "node_modules/@aws-crypto/crc32": { @@ -715,6 +713,23 @@ "node": ">=16.9.0" } }, + "node_modules/@fastify/busboy": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.1.1.tgz", + "integrity": "sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==", + "engines": { + "node": ">=14" + } + }, + "node_modules/@mongodb-js/saslprep": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.5.tgz", + "integrity": "sha512-XLNOMH66KhJzUJNwT/qlMnS4WsNDWD5ASdyaSH3EtK+F4r/CFGa3jT4GNi4mfOitGvWXtdLgQJkQjxSVrio+jA==", + "optional": true, + "dependencies": { + "sparse-bitfield": "^3.0.3" + } + }, "node_modules/@sapphire/async-queue": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.5.0.tgz", @@ -1292,25 +1307,6 @@ "@types/node": "*" } }, - "node_modules/abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true - }, - "node_modules/anymatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", - "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", - "dev": true, - "dependencies": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - }, - "engines": { - "node": ">= 8" - } - }, "node_modules/async": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz", @@ -1321,12 +1317,6 @@ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true - }, "node_modules/base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", @@ -1346,47 +1336,16 @@ } ] }, - "node_modules/binary-extensions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", - "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/bowser": { "version": "2.11.0", "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.11.0.tgz", "integrity": "sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==", "optional": true }, - "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, - "dependencies": { - "fill-range": "^7.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/bson": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/bson/-/bson-4.7.0.tgz", - "integrity": "sha512-VrlEE4vuiO1WTpfof4VmaVolCVYkYTgB9iWgYNOrVlnifpME/06fhFRmONgBhClD5pFC1t9ZWqFUQEQAzY43bA==", + "version": "4.7.2", + "resolved": "https://registry.npmjs.org/bson/-/bson-4.7.2.tgz", + "integrity": "sha512-Ry9wCtIZ5kGqkJoi6aD8KjxFZEx78guTQDnpXWiNthsxzrxAK/i8E6pCHAIZTbaEFWcOCvbecMukfK7XUvyLpQ==", "dependencies": { "buffer": "^5.6.0" }, @@ -1422,44 +1381,6 @@ "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" }, - "node_modules/busboy": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz", - "integrity": "sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==", - "dependencies": { - "streamsearch": "^1.1.0" - }, - "engines": { - "node": ">=10.16.0" - } - }, - "node_modules/chokidar": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", - "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ], - "dependencies": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" - }, - "engines": { - "node": ">= 8.10.0" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" - } - }, "node_modules/color": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz", @@ -1519,12 +1440,6 @@ "node": ">= 0.8" } }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true - }, "node_modules/concat-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz", @@ -1539,6 +1454,12 @@ "typedarray": "^0.0.6" } }, + "node_modules/crypto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/crypto/-/crypto-1.0.1.tgz", + "integrity": "sha512-VxBKmeNcqQdiUQUW2Tzq0t377b54N2bMtXO/qiLa+6eRRmmC4qT3D4OnTGoT/U6O9aklQ/jTwbOtRMTTY8G0Ig==", + "deprecated": "This package is no longer supported. It's now a built-in Node module. If you've depended on crypto, you should switch to the one that's built-in." + }, "node_modules/delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -1641,18 +1562,6 @@ "url": "https://github.com/sindresorhus/file-type?sponsor=1" } }, - "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "dependencies": { - "to-regex-range": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/fn.name": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz", @@ -1671,27 +1580,6 @@ "node": ">= 6" } }, - "node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true, - "engines": { - "node": ">=4" - } - }, "node_modules/ieee754": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", @@ -1711,69 +1599,21 @@ } ] }, - "node_modules/ignore-by-default": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", - "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==", - "dev": true - }, "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "node_modules/ip": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz", - "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz", + "integrity": "sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==" }, "node_modules/is-arrayish": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==" }, - "node_modules/is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "dependencies": { - "binary-extensions": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, - "engines": { - "node": ">=0.12.0" - } - }, "node_modules/is-stream": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", @@ -1837,25 +1677,13 @@ "node": ">= 0.6" } }, - "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, "node_modules/mongodb": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-4.12.1.tgz", - "integrity": "sha512-koT87tecZmxPKtxRQD8hCKfn+ockEL2xBiUvx3isQGI6mFmagWt4f4AyCE9J4sKepnLhMacoCTQQA6SLAI2L6w==", + "version": "4.17.2", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-4.17.2.tgz", + "integrity": "sha512-mLV7SEiov2LHleRJPMPrK2PMyhXFZt2UQLC4VD4pnth3jMjYKHhtqfwwkkvS/NXuo/Fp3vbhaNcXrIDaLRb9Tg==", "dependencies": { - "bson": "^4.7.0", - "mongodb-connection-string-url": "^2.5.4", + "bson": "^4.7.2", + "mongodb-connection-string-url": "^2.6.0", "socks": "^2.7.1" }, "engines": { @@ -1863,7 +1691,7 @@ }, "optionalDependencies": { "@aws-sdk/credential-providers": "^3.186.0", - "saslprep": "^1.0.3" + "@mongodb-js/saslprep": "^1.1.0" } }, "node_modules/mongodb-connection-string-url": { @@ -1880,67 +1708,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, - "node_modules/nodemon": { - "version": "2.0.22", - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.22.tgz", - "integrity": "sha512-B8YqaKMmyuCO7BowF1Z1/mkPqLk6cs/l63Ojtd6otKjMx47Dq1utxfRxcavH1I7VSaL8n5BUaoutadnsX3AAVQ==", - "dev": true, - "dependencies": { - "chokidar": "^3.5.2", - "debug": "^3.2.7", - "ignore-by-default": "^1.0.1", - "minimatch": "^3.1.2", - "pstree.remy": "^1.1.8", - "semver": "^5.7.1", - "simple-update-notifier": "^1.0.7", - "supports-color": "^5.5.0", - "touch": "^3.1.0", - "undefsafe": "^2.0.5" - }, - "bin": { - "nodemon": "bin/nodemon.js" - }, - "engines": { - "node": ">=8.10.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/nodemon" - } - }, - "node_modules/nodemon/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/nopt": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", - "integrity": "sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==", - "dev": true, - "dependencies": { - "abbrev": "1" - }, - "bin": { - "nopt": "bin/nopt.js" - }, - "engines": { - "node": "*" - } - }, - "node_modules/normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/one-time": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz", @@ -1961,24 +1728,6 @@ "url": "https://github.com/sponsors/Borewit" } }, - "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true, - "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/pstree.remy": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", - "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==", - "dev": true - }, "node_modules/punycode": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", @@ -2015,18 +1764,6 @@ "url": "https://github.com/sponsors/Borewit" } }, - "node_modules/readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "dev": true, - "dependencies": { - "picomatch": "^2.2.1" - }, - "engines": { - "node": ">=8.10.0" - } - }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -2054,27 +1791,6 @@ "node": ">=10" } }, - "node_modules/saslprep": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/saslprep/-/saslprep-1.0.3.tgz", - "integrity": "sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag==", - "optional": true, - "dependencies": { - "sparse-bitfield": "^3.0.3" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", - "dev": true, - "bin": { - "semver": "bin/semver" - } - }, "node_modules/simple-swizzle": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", @@ -2083,27 +1799,6 @@ "is-arrayish": "^0.3.1" } }, - "node_modules/simple-update-notifier": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz", - "integrity": "sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==", - "dev": true, - "dependencies": { - "semver": "~7.0.0" - }, - "engines": { - "node": ">=8.10.0" - } - }, - "node_modules/simple-update-notifier/node_modules/semver": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz", - "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/smart-buffer": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", @@ -2143,14 +1838,6 @@ "node": "*" } }, - "node_modules/streamsearch": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", - "integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==", - "engines": { - "node": ">=10.0.0" - } - }, "node_modules/string_decoder": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", @@ -2181,35 +1868,11 @@ "url": "https://github.com/sponsors/Borewit" } }, - "node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/text-hex": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==" }, - "node_modules/to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "dependencies": { - "is-number": "^7.0.0" - }, - "engines": { - "node": ">=8.0" - } - }, "node_modules/token-types": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/token-types/-/token-types-5.0.1.tgz", @@ -2226,18 +1889,6 @@ "url": "https://github.com/sponsors/Borewit" } }, - "node_modules/touch": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz", - "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==", - "dev": true, - "dependencies": { - "nopt": "~1.0.10" - }, - "bin": { - "nodetouch": "bin/nodetouch.js" - } - }, "node_modules/tr46": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz", @@ -2269,21 +1920,15 @@ "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==" }, - "node_modules/undefsafe": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", - "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==", - "dev": true - }, "node_modules/undici": { - "version": "5.21.0", - "resolved": "https://registry.npmjs.org/undici/-/undici-5.21.0.tgz", - "integrity": "sha512-HOjK8l6a57b2ZGXOcUsI5NLfoTrfmbOl90ixJDl0AEFG4wgHNDQxtZy15/ZQp7HhjkpaGlp/eneMgtsu1dIlUA==", + "version": "5.28.3", + "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.3.tgz", + "integrity": "sha512-3ItfzbrhDlINjaP0duwnNsKpDQk3acHI3gVJ1z4fmwMK31k5G9OVIAMLSIaP6w4FaGkaAkN6zaQO9LUvZ1t7VA==", "dependencies": { - "busboy": "^1.6.0" + "@fastify/busboy": "^2.0.0" }, "engines": { - "node": ">=12.18" + "node": ">=14.0" } }, "node_modules/util-deprecate": { @@ -2987,6 +2632,20 @@ "resolved": "https://registry.npmjs.org/@discordjs/util/-/util-0.2.0.tgz", "integrity": "sha512-/8qNbebFzLWKOOg+UV+RB8itp4SmU5jw0tBUD3ifElW6rYNOj1Ku5JaSW7lLl/WgjjxF01l/1uQPCzkwr110vg==" }, + "@fastify/busboy": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.1.1.tgz", + "integrity": "sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==" + }, + "@mongodb-js/saslprep": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.1.5.tgz", + "integrity": "sha512-XLNOMH66KhJzUJNwT/qlMnS4WsNDWD5ASdyaSH3EtK+F4r/CFGa3jT4GNi4mfOitGvWXtdLgQJkQjxSVrio+jA==", + "optional": true, + "requires": { + "sparse-bitfield": "^3.0.3" + } + }, "@sapphire/async-queue": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.5.0.tgz", @@ -3453,22 +3112,6 @@ "@types/node": "*" } }, - "abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true - }, - "anymatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", - "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", - "dev": true, - "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - } - }, "async": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz", @@ -3479,52 +3122,21 @@ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, - "balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true - }, "base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" }, - "binary-extensions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", - "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", - "dev": true - }, "bowser": { "version": "2.11.0", "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.11.0.tgz", "integrity": "sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==", "optional": true }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, - "requires": { - "fill-range": "^7.0.1" - } - }, "bson": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/bson/-/bson-4.7.0.tgz", - "integrity": "sha512-VrlEE4vuiO1WTpfof4VmaVolCVYkYTgB9iWgYNOrVlnifpME/06fhFRmONgBhClD5pFC1t9ZWqFUQEQAzY43bA==", + "version": "4.7.2", + "resolved": "https://registry.npmjs.org/bson/-/bson-4.7.2.tgz", + "integrity": "sha512-Ry9wCtIZ5kGqkJoi6aD8KjxFZEx78guTQDnpXWiNthsxzrxAK/i8E6pCHAIZTbaEFWcOCvbecMukfK7XUvyLpQ==", "requires": { "buffer": "^5.6.0" } @@ -3543,30 +3155,6 @@ "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" }, - "busboy": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz", - "integrity": "sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==", - "requires": { - "streamsearch": "^1.1.0" - } - }, - "chokidar": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", - "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", - "dev": true, - "requires": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "fsevents": "~2.3.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" - } - }, "color": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz", @@ -3620,12 +3208,6 @@ "delayed-stream": "~1.0.0" } }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true - }, "concat-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz", @@ -3637,6 +3219,11 @@ "typedarray": "^0.0.6" } }, + "crypto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/crypto/-/crypto-1.0.1.tgz", + "integrity": "sha512-VxBKmeNcqQdiUQUW2Tzq0t377b54N2bMtXO/qiLa+6eRRmmC4qT3D4OnTGoT/U6O9aklQ/jTwbOtRMTTY8G0Ig==" + }, "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -3711,15 +3298,6 @@ "token-types": "^5.0.1" } }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "requires": { - "to-regex-range": "^5.0.1" - } - }, "fn.name": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz", @@ -3735,77 +3313,26 @@ "mime-types": "^2.1.12" } }, - "glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "requires": { - "is-glob": "^4.0.1" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true - }, "ieee754": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" }, - "ignore-by-default": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", - "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==", - "dev": true - }, "inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "ip": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz", - "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz", + "integrity": "sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==" }, "is-arrayish": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==" }, - "is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "requires": { - "binary-extensions": "^2.0.0" - } - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true - }, - "is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "requires": { - "is-extglob": "^2.1.1" - } - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true - }, "is-stream": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", @@ -3857,24 +3384,15 @@ "mime-db": "1.52.0" } }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, "mongodb": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-4.12.1.tgz", - "integrity": "sha512-koT87tecZmxPKtxRQD8hCKfn+ockEL2xBiUvx3isQGI6mFmagWt4f4AyCE9J4sKepnLhMacoCTQQA6SLAI2L6w==", + "version": "4.17.2", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-4.17.2.tgz", + "integrity": "sha512-mLV7SEiov2LHleRJPMPrK2PMyhXFZt2UQLC4VD4pnth3jMjYKHhtqfwwkkvS/NXuo/Fp3vbhaNcXrIDaLRb9Tg==", "requires": { "@aws-sdk/credential-providers": "^3.186.0", - "bson": "^4.7.0", - "mongodb-connection-string-url": "^2.5.4", - "saslprep": "^1.0.3", + "@mongodb-js/saslprep": "^1.1.0", + "bson": "^4.7.2", + "mongodb-connection-string-url": "^2.6.0", "socks": "^2.7.1" } }, @@ -3892,50 +3410,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, - "nodemon": { - "version": "2.0.22", - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.22.tgz", - "integrity": "sha512-B8YqaKMmyuCO7BowF1Z1/mkPqLk6cs/l63Ojtd6otKjMx47Dq1utxfRxcavH1I7VSaL8n5BUaoutadnsX3AAVQ==", - "dev": true, - "requires": { - "chokidar": "^3.5.2", - "debug": "^3.2.7", - "ignore-by-default": "^1.0.1", - "minimatch": "^3.1.2", - "pstree.remy": "^1.1.8", - "semver": "^5.7.1", - "simple-update-notifier": "^1.0.7", - "supports-color": "^5.5.0", - "touch": "^3.1.0", - "undefsafe": "^2.0.5" - }, - "dependencies": { - "debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - } - } - }, - "nopt": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", - "integrity": "sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==", - "dev": true, - "requires": { - "abbrev": "1" - } - }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true - }, "one-time": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz", @@ -3949,18 +3423,6 @@ "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-5.0.0.tgz", "integrity": "sha512-YtCKvLUOvwtMGmrniQPdO7MwPjgkFBtFIrmfSbYmYuq3tKDV/mcfAhBth1+C3ru7uXIZasc/pHnb+YDYNkkj4A==" }, - "picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true - }, - "pstree.remy": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz", - "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==", - "dev": true - }, "punycode": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", @@ -3984,15 +3446,6 @@ "readable-stream": "^3.6.0" } }, - "readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "dev": true, - "requires": { - "picomatch": "^2.2.1" - } - }, "safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -4003,21 +3456,6 @@ "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.3.1.tgz", "integrity": "sha512-kYBSfT+troD9cDA85VDnHZ1rpHC50O0g1e6WlGHVCz/g+JS+9WKLj+XwFYyR8UbrZN8ll9HUpDAAddY58MGisg==" }, - "saslprep": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/saslprep/-/saslprep-1.0.3.tgz", - "integrity": "sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag==", - "optional": true, - "requires": { - "sparse-bitfield": "^3.0.3" - } - }, - "semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", - "dev": true - }, "simple-swizzle": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", @@ -4026,23 +3464,6 @@ "is-arrayish": "^0.3.1" } }, - "simple-update-notifier": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz", - "integrity": "sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==", - "dev": true, - "requires": { - "semver": "~7.0.0" - }, - "dependencies": { - "semver": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz", - "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==", - "dev": true - } - } - }, "smart-buffer": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", @@ -4071,11 +3492,6 @@ "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", "integrity": "sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==" }, - "streamsearch": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", - "integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==" - }, "string_decoder": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", @@ -4099,29 +3515,11 @@ "peek-readable": "^5.0.0" } }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - }, "text-hex": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==" }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "requires": { - "is-number": "^7.0.0" - } - }, "token-types": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/token-types/-/token-types-5.0.1.tgz", @@ -4131,15 +3529,6 @@ "ieee754": "^1.2.1" } }, - "touch": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz", - "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==", - "dev": true, - "requires": { - "nopt": "~1.0.10" - } - }, "tr46": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz", @@ -4168,18 +3557,12 @@ "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==" }, - "undefsafe": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", - "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==", - "dev": true - }, "undici": { - "version": "5.21.0", - "resolved": "https://registry.npmjs.org/undici/-/undici-5.21.0.tgz", - "integrity": "sha512-HOjK8l6a57b2ZGXOcUsI5NLfoTrfmbOl90ixJDl0AEFG4wgHNDQxtZy15/ZQp7HhjkpaGlp/eneMgtsu1dIlUA==", + "version": "5.28.3", + "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.3.tgz", + "integrity": "sha512-3ItfzbrhDlINjaP0duwnNsKpDQk3acHI3gVJ1z4fmwMK31k5G9OVIAMLSIaP6w4FaGkaAkN6zaQO9LUvZ1t7VA==", "requires": { - "busboy": "^1.6.0" + "@fastify/busboy": "^2.0.0" } }, "util-deprecate": { diff --git a/package.json b/package.json index a6c79b7..0b6f79c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dayzr-bot", - "version": "12.7.1", + "version": "13.0.0", "description": "A General Purpose Discord Bot for DayZ Nitrado Servers.", "main": "index.js", "nodemonConfig": { @@ -20,14 +20,12 @@ "@discordjs/rest": "^1.1.0", "colors": "^1.4.0", "concat-stream": "^2.0.0", + "crypto": "^1.0.1", "discord-bitfield-calculator": "^1.0.0", "discord.js": "^14.8.0", "dotenv": "^16.0.3", "form-data": "^4.0.0", "mongodb": "^4.12.1", "winston": "^3.8.1" - }, - "devDependencies": { - "nodemon": "^2.0.20" } } diff --git a/src/DayzRBot.js b/src/DayzRBot.js index d7250d7..0dbf08e 100644 --- a/src/DayzRBot.js +++ b/src/DayzRBot.js @@ -1,14 +1,16 @@ const { RegisterGlobalCommands, RegisterGuildCommands } = require("../util/RegisterSlashCommands"); -const { Collection, Client, EmbedBuilder, Routes } = require('discord.js'); +const { Collection, Client, EmbedBuilder, Routes, InteractionResponseType, InteractionType, GatewayDispatchEvents } = require('discord.js'); const MongoClient = require('mongodb').MongoClient; const { REST } = require('@discordjs/rest'); const Logger = require("../util/Logger"); +const crypto = require('crypto'); // custom util imports const { DownloadNitradoFile, CheckServerStatus, FetchServerSettings, PostServerSettings } = require('../util/NitradoAPI'); const { HandlePlayerLogs, HandleActivePlayersList } = require('../util/LogsHandler'); const { HandleKillfeed, UpdateLastDeathDate } = require('../util/KillfeedHandler'); const { HandleExpiredUAVs, HandleEvents, PlaceFireplaceInAlarm } = require('../util/AlarmsHandler'); +const { decrypt } = require('../util/Cryptic'); // Data structures imports const { getDefaultPlayer, UpdatePlayer } = require('../database/player'); @@ -21,6 +23,12 @@ const readline = require('readline'); const minute = 60000; // 1 minute in milliseconds const arInterval = 600000; // Set auto-restart interval 10 minutes (600,000ms) +const Missions = { + "dayzOffline.chernarusplus": "Chernarus", + "dayzOffline.enoch": "Livonia", +}; + +// TODO: probably just rewrite this thing in a non garbage language class DayzRBot extends Client { constructor(options, config) { @@ -32,30 +40,53 @@ class DayzRBot extends Client { this.logger = new Logger(path.join(__dirname, "..", "logs/Logs.log")); this.timer = this.config.Dev == 'PROD.' ? minute * 5 : minute / 4; - if (this.config.Token === "" || this.config.GuildID === "") { + if ( + this.config.Token === "" || + this.config.SecretKey === "" || + this.config.SecretIv === "" + ) { throw new TypeError( "The config.js is not filled out. Please make sure nothing is blank, otherwise the bot will not work properly." ); } + if (!["DEV.", "PROD."].includes(this.config.Dev)) { + throw new TypeError( + "The Dev version in the config.js does not match the allowed cases of 'DEV.' or 'PROD.'" + ); + } + + // Generate secret hash with crypto to use for encryption + this.key = crypto + .createHash('sha512') + .update(this.config.SecretKey) + .digest('hex') + .substring(0, 32); + + this.encryptionIV = crypto + .createHash('sha512') + .update(this.config.SecretIv) + .digest('hex') + .substring(0, 16); + this.db; this.dbo; this.databaseConnected = false; this.arInterval = arInterval; - this.arIntervalId; // Interval for auto-restart functions + this.arIntervalIds = new Map(); this.playerSessions = new Map(); - this.alarmPingQueue = {}; - this.processingLogs = false; - this.autoRestartInit(); + this.logHistory = new Map(); + this.alarmPingQueue = new Map(); + this.initialize(); this.LoadCommandsAndInteractionHandlers(); this.LoadEvents(); this.Ready = false; this.activePlayersTick = 11; - this.ws.on("INTERACTION_CREATE", async (interaction) => { + this.ws.on(GatewayDispatchEvents.InteractionCreate, async (interaction) => { const start = new Date().getTime(); - if (interaction.type != 3) { + if (interaction.type == InteractionType.ApplicationCommand) { let GuildDB = await GetGuild(this, interaction.guild_id); for (const [factionID, data] of Object.entries(GuildDB.factionArmbands)) { @@ -66,7 +97,7 @@ class DayzRBot extends Client { $pull: { 'server.usedArmbands': data.armband }, $unset: { [`server.factionArmbands.${factionID}`]: "" }, }; - await this.dbo.collection("guilds").updateOne({ 'server.serverID': GuildDB.serverID }, query, (err, res) => { + this.dbo.collection("guilds").updateOne({ 'server.serverID': GuildDB.serverID }, query, (err, res) => { if (err) return this.sendInternalError(interaction, err); }); } @@ -75,32 +106,28 @@ class DayzRBot extends Client { const command = interaction.data.name.toLowerCase(); const args = interaction.data.options; - this.log(`Interaction - ${command}`); - - this.rest = new REST({ version: '10' }).setToken(this.config.Token); + this.log(`Interaction [${interaction.guild_id}] - ${command}`); + const rest = new REST({ version: '10' }).setToken(this.config.Token); + // Easy to send response so ;) interaction.guild = await this.guilds.fetch(interaction.guild_id); - interaction.send = async (message) => { - return await this.rest.post(Routes.interactionCallback(interaction.id, interaction.token), { + const handleCallback = async (interactionType, message) => { + return await rest.post(Routes.interactionCallback(interaction.id, interaction.token), { body: { - type: 4, + type: interactionType, data: message, } }); - }; - - interaction.deferReply = async (message) => { - return await this.rest.post(Routes.interactionCallback(interaction.id, interaction.token), { - body: { - type: 5, - data: message, - } - }); - }; + } + // Nicely name our custom callback functions and pass correct type because discord is picky with numbers... + interaction.send = async (message) => handleCallback(InteractionResponseType.ChannelMessageWithSource, message); + interaction.deferReply = async (message) => handleCallback(InteractionResponseType.DeferredChannelMessageWithSource, message); + interaction.showModal = async (message) => handleCallback(InteractionResponseType.Modal, message); + interaction.editReply = async (message) => { - return await this.rest.patch(Routes.webhookMessage(this.application.id, interaction.token), { + return await rest.patch(Routes.webhookMessage(this.application.id, interaction.token), { body: message, }); }; @@ -135,17 +162,7 @@ class DayzRBot extends Client { } async readLogs(guild) { - const fileStream = fs.createReadStream('./logs/server-logs.ADM'); - - let logHistoryDir = path.join(__dirname, '..', 'logs', 'history-logs.ADM.json'); - let history; - try { - history = JSON.parse(fs.readFileSync(logHistoryDir)); - } catch (err) { - history = { - lastLog: null - }; - } + const fileStream = fs.createReadStream(`./logs/${guild.Nitrado.ServerID}-logs.ADM`); const rl = readline.createInterface({ input: fileStream, @@ -154,13 +171,14 @@ class DayzRBot extends Client { let lines = []; for await (const line of rl) { lines.push(line); } - let logIndex = lines.indexOf(history.lastLog); + let logIndex = lines.indexOf(this.logHistory.get(guild.Nitrado.ServerID)); - if (this.playerSessions.size === 0) { - let players = await this.dbo.collection('players').find({"connected": true}).toArray(); - players.map(p => p.connected = false); // assume all players not connected on init only. + if (this.playerSessions.get(guild.Nitrado.ServerID).size === 0) { + let players = await this.dbo.collection('players').find({"nitradoServerID": guild.Nitrado.ServerID}) // Get all players of this server + .toArray().then(all => all.filter(p => p.connected).map(p => p.connected = false)); // assume all players who were previously connected are not connected on init only. + for (let i = 0; i < players.length; i++) { - UpdatePlayer(this, players[i]) + await UpdatePlayer(this, players[i]) } } @@ -171,38 +189,44 @@ class DayzRBot extends Client { if ((i - 1) >= 0 && lines[i] == lines[i - 1]) continue; // continue if this line is a duplicate of the last line // Handle general logs - if (lines[i].includes('connected') || lines[i].includes('pos=<')) await HandlePlayerLogs(this, guild, lines[i], guild.combatLogTimer); - if (lines[i].includes('killed by Zmb') || lines[i].includes('>) died.')) await UpdateLastDeathDate(this, lines[i]); // Updates users last death date for non PVP deaths. + if (lines[i].includes('connected') || lines[i].includes('pos=<')) await HandlePlayerLogs(guild.Nitrado.ServerID, this, guild, lines[i], guild.combatLogTimer); + if (lines[i].includes('killed by Zmb') || lines[i].includes('>) died.')) await UpdateLastDeathDate(guild.Nitrado.ServerID, this, lines[i]); // Updates users last death date for non PVP deaths. if (lines[i].includes(') placed Fireplace')) await PlaceFireplaceInAlarm(this, guild, lines[i]); // Handle killfeed logs - if (lines[i].includes('killed by with') || lines[i].includes('killed by LandMineTrap')) await HandleKillfeed(this, guild, lines[i]); // Handles explosive deaths - if (!(i + 1 >= lines.length) && lines[i + 1].includes('killed by') && lines[i].includes('TransportHit')) await HandleKillfeed(this, guild, lines[i]); // Handles vehicle deaths - if (!(i + 1 >= lines.length) && lines[i + 1].includes('killed by Player') && lines[i].includes('hit by Player')) await HandleKillfeed(this, guild, lines[i]); // Handles regular deaths - if (lines[i].includes('killed by Player') && !lines[i - 1].includes('hit by Player')) await HandleKillfeed(this, guild, lines[i]); // Handles deaths missing hit by log + if ( + (lines[i].includes('killed by with') || lines[i].includes('killed by LandMineTrap')) || // Handle explosive deaths + (!(i + 1 >= lines.length) && lines[i + 1].includes('killed by') && lines[i].includes('TransportHit')) || // Handle vehicle deaths + (!(i + 1 >= lines.length) && lines[i + 1].includes('killed by Player') && lines[i].includes('hit by Player')) || // Handle PVP deaths + (lines[i].includes('killed by Player') && !lines[i - 1].includes('hit by Player')) // Handle deaths missing hit by log + ) await HandleKillfeed(guild.Nitrado.ServerID, this, guild, lines[i]); } // Handle alarm pings const maxEmbed = 10; - for (const [channel_id, data] of Object.entries(this.alarmPingQueue)) { - const channel = this.GetChannel(channel_id); - if (!channel) continue; - for (const [role, embeds] of Object.entries(data)) { - let embedArrays = []; - while (embeds.length > 0) - embedArrays.push(embeds.splice(0, maxEmbed)) - for (let i = 0; i < embedArrays.length; i++) { - if (role == '-no-role-ping-') channel.send({ embeds: embedArrays[i] }); - else channel.send({ content: `<@&${role}>`, embeds: embedArrays[i] }); - } - } - } + this.alarmPingQueue.forEach(queue => { + queue.forEach((data, channel_id) => { + const channel = this.GetChannel(channel_id); + if (!channel) return; + data.forEach((embeds, role) => { + let embedArrays = []; + while (embeds.length > 0); + embedArrays.push(embeds.splice(0, maxEmbed)); - this.alarmPingQueue = {}; + for (let i = 0; i < embedArrays.length; i++) { + if (role == '-no-role-ping-') channel.send({ embeds: embedArrays[i] }); + else channel.send({ content: `<@&${role}>`, embeds: embedArrays[i] }); + } + }); + }); + }); + + this.alarmPingQueue.set(guild.serverID, new Map()); // Clear alarm queue for this guild const playerTemplate = /(.*) \| Player \"(.*)\" \(id=(.*) pos=<(.*)>\)/g; - let previouslyConnected = await this.dbo.collection('players').find({"connected": true}).toArray(); // All players with connection log captured above and no disconnect log + let previouslyConnected = await this.dbo.collection('players').find({"nitradoServerID": guild.Nitrado.ServerID}) + .toArray().then(players => players.filter(p => p.connected)); // All players with connection log captured above and no disconnect log let lastDetectedTime; for (let i = lines.length - 1; i > 0; i--) { @@ -225,14 +249,14 @@ class DayzRBot extends Client { lastDetectedTime = await this.getDateEST(info.time); let playerStat = await this.dbo.collection("players").findOne({"playerID": info.playerID}); - if (!this.exists(playerStat)) playerStat = getDefaultPlayer(info.player, info.playerID, this.config.Nitrado.ServerID); + if (!this.exists(playerStat)) playerStat = getDefaultPlayer(info.player, info.playerID, guild.Nitrado.ServerID); if (!previouslyConnected.includes(playerStat) && this.exists(playerStat.lastDisconnectionDate) && playerStat.lastDisconnectionDate !== null && playerStat.lastDisconnectionDate.getTime() > lastDetectedTime.getTime()) continue; // Skip this player if the lastDisconnectionDate time is later than the player log entry. // Track adjusted sessions this instance has handled (e.g. no bot crashes or restarts). - if (this.playerSessions.has(info.playerID)) { + if (this.playerSessions.get(guild.Nitrado.ServerID).has(info.playerID)) { // Player is already in a session, update the session's end time. - const session = this.playerSessions.get(info.playerID); + const session = this.playerSessions.get(guild.Nitrado.ServerID).get(info.playerID); session.endTime = lastDetectedTime; // Update end time. } else { // Player is not in a session, create a new session. @@ -240,7 +264,7 @@ class DayzRBot extends Client { startTime: lastDetectedTime, endTime: null, // Initialize end time as null. }; - this.playerSessions.set(info.playerID, newSession); + this.playerSessions.get(guild.Nitrado.ServerID).set(info.playerID, newSession); // Check if the player has been marked as connected before, but only if a session doesn't exist // in the map, indicating the connection was discovered in the logs during this session. @@ -256,46 +280,59 @@ class DayzRBot extends Client { } } - history.lastLog = lines[lines.length - 1]; - - // write JSON string to a file - fs.writeFileSync(logHistoryDir, JSON.stringify(history)); + const lastLine = lines[lines.length - 1] + this.logHistory.set(guild.Nitrado.ServerID, lastLine); + this.dbo.collection("guilds").updateOne({ "server.serverID": guild.serverID }, {$set: { "server.lastLog": lastLine }}, (err, res) => { + if (err) this.error(`Failed to save last log to guild config [${guild.serverID}] for nitrado server [${guild.Nitrado.ServerID}]`); + }); } async logsUpdateTimer(c) { - if (c.processingLogs) return; // Process is already running, wait till next scheduled time. - c.processingLogs = true; - let t = new Date(); - // c.log(`...Logs Tick - ${t.getHours()}:${t.getMinutes()}:${t.getSeconds()}...`); c.activePlayersTick++; - const settings = await FetchServerSettings(c, "logsUpdateTimer").then(res => res.data.gameserver); + c.guilds.cache.forEach(async (guild) => { + let GuildDB = await GetGuild(c, guild.id); + + /* + Note to self: + return statements do not prematurely exit out of a forEach loop like it does in a for loop. + */ - if (settings == 1) { - c.error('...Failed to Fetch Server Settings to download Nitrado Logs...'); - return; - } + if (!c.exists(GuildDB.Nitrado)) return; // Continue if no nitrado credentials - const filename = settings.game_specific.log_files.sort((a, b) => a.length - b.length)[0]; - const path = `${settings.game_specific.path.slice(0, -1)}${filename.split(settings.game)[1]}`; + const NitradoCred = { + ServerID: GuildDB.Nitrado.ServerID, + UserID: GuildDB.Nitrado.UserID, + Auth: decrypt( + GuildDB.Nitrado.Auth, + c.config.EncryptionMethod, + c.key, + c.encryptionIV + ) + }; - // Ensure Player List is logged for next update - const playerListEnabled = parseInt(settings.settings.config.adminLogPlayerList) - if (!playerListEnabled) PostServerSettings(this, "config", "adminLogPlayerList", '1') + const response = await FetchServerSettings(NitradoCred, c, "logsUpdateTimer").then(res => res); + if (response == 1) return; + const settings = response.data.gameserver; - let guild = await GetGuild(c, c.config.GuildID); + GuildDB.Nitrado.Mission = Missions[settings.settings.config.mission]; - await DownloadNitradoFile(c, path, './logs/server-logs.ADM').then(async (status) => { - if (status == 1) return c.error('...Failed to Download logs...'); - // c.log('...Downloaded logs...'); - await c.readLogs(guild).then(async () => { - // c.log('...Analyzed logs...'); - HandleExpiredUAVs(c, guild); - HandleEvents(c, guild) - if (c.activePlayersTick == 12) await HandleActivePlayersList(c, guild); - }) + const filename = settings.game_specific.log_files.sort((a, b) => a.length - b.length)[0]; + const path = `${settings.game_specific.path.slice(0, -1)}${filename.split(settings.game)[1]}`; + + // Ensure Player List is logged for next update + const playerListEnabled = parseInt(settings.settings.config.adminLogPlayerList) + if (!playerListEnabled) PostServerSettings(NitradoCred, c, "config", "adminLogPlayerList", '1') + + await DownloadNitradoFile(NitradoCred, c, path, `./logs/${NitradoCred.ServerID}-logs.ADM`).then(async (status) => { + if (status == 1) return c.error(`Failed to Download Nitrado Log Files - [${NitradoCred.ServerID}]`); + await c.readLogs(GuildDB).then(async () => { + HandleExpiredUAVs(c, GuildDB); + HandleEvents(c, GuildDB) + if (c.activePlayersTick == 12) await HandleActivePlayersList(NitradoCred, c, GuildDB); + }) + }); }); - c.processingLogs = false; } async connectMongo(mongoURI, dbo) { @@ -338,19 +375,35 @@ class DayzRBot extends Client { if (failed) process.exit(-1); } - async autoRestartInit() { + async initialize() { // Wait for MongoDB to connect await this.connectMongo(this.config.mongoURI, this.config.dbo); - - let is_enabled = undefined; - if (this.databaseConnected) is_enabled = await this.dbo.collection("guilds").findOne({ "server.autoRestart": 1 }).then(is_enabled => is_enabled); - - if (is_enabled) { - this.log('Starting periodic Nitrado server status check.'); - this.arIntervalId = setInterval(CheckServerStatus, this.arInterval, this); + + let guilds = await this.dbo.collection("guilds").find({}).toArray(); + + /* + Initialize auto restart for enabled servers + Initialize last logs + Initialize Player Sessions + */ + for (let i = 0; i < guilds.length; i++) { + if (!this.exists(guilds[i].Nitrado)) continue; + if (guilds[i].server.autoRestart) this.arIntervalIds.set(guilds[i].server.serverID, setInterval(CheckServerStatus, this.arInterval, guilds[i].nitrado, this)) + this.logHistory.set(guilds[i].Nitrado.ServerID, guilds[i].server.lastLog); // Using Nitrado Server ID over guild ID in case of future support for multiple nitrado servers in a single guild + this.playerSessions.set(guilds[i].Nitrado.ServerID, new Map()); // Same reason here as named above. + this.log(`[${guilds[i].server.serverID}] Initialized existing Nitrado`); } } + async initNewNitradoServer(guildId, Nitrado) { + let guild = await GetGuild(this, guildId) + + if (guild.autoRestart) this.arIntervalIds.set(guildId, setInterval(CheckServerStatus, this.arInterval, Nitrado, this)) + this.logHistory.set(Nitrado.ServerID, guild.lastLog); + this.playerSessions.set(Nitrado.ServerID, new Map()); + this.log(`[${guild.serverID}] Initialized new Nitrado`); + } + exists(n) { return typeof(n) == 'number' ? !isNaN(n) : null != n && undefined != n && "" != n } secondsToDhms(seconds) { @@ -434,7 +487,15 @@ class DayzRBot extends Client { // Calls register for guild and global commands RegisterSlashCommands() { RegisterGlobalCommands(this); - this.guilds.cache.forEach((guild) => RegisterGuildCommands(this, guild.id)); + let p = Promise.resolve() + this.guilds.cache.forEach((guild) => { + p = p.then(() => { + RegisterGuildCommands(this, guild.id); + return new Promise((resolve) => { + setTimeout(resolve, 500); + }) + }) + }); } build() { diff --git a/util/AdminLogsHandler.js b/util/AdminLogsHandler.js index 81acdb9..35f7e6b 100644 --- a/util/AdminLogsHandler.js +++ b/util/AdminLogsHandler.js @@ -1,6 +1,5 @@ const { EmbedBuilder } = require('discord.js'); -const { destinations } = require('../database/destinations'); -const { calculateVector } = require('./Vector'); +const { nearest } = require('../database/destinations'); module.exports = { @@ -16,7 +15,7 @@ module.exports = { .setDescription(`**${data.connected ? 'Connect' : 'Disconnect'} Event - \n${data.player} ${data.connected ? 'Connected' : 'Disconnected'}**`); if (!data.connected) { - if (!(data.lastConnectionDate == null)) { + if (data.lastConnectionDate != null) { let oldUnixTime = Math.floor(data.lastConnectionDate.getTime() / 1000); let sessionTime = client.secondsToDhms(unixTime - oldUnixTime); connectionLog.addFields({ name: '**Session Time**', value: `**${sessionTime}**`, inline: false }); @@ -47,19 +46,7 @@ module.exports = { if (!channel) return; let unixTime = Math.floor(newDt.getTime() / 1000); - - let tempDest; - let lastDist = 1000000; - let destination_dir; - for (let i = 0; i < destinations.length; i++) { - let { distance, theta, dir } = calculateVector(data.pos, destinations[i].coord); - if (distance < lastDist) { - tempDest = destinations[i].name; - lastDist = distance; - destination_dir = dir; - } - } - const destination = lastDist > 500 ? `${destination_dir} of ${tempDest}` : `Near ${tempDest}`; + const destination = nearest(data.pos, guild.Nitrado.Mission); let combatLog = new EmbedBuilder() .setColor(client.config.Colors.Red) diff --git a/util/AlarmsHandler.js b/util/AlarmsHandler.js index 7b8266f..5ca8911 100644 --- a/util/AlarmsHandler.js +++ b/util/AlarmsHandler.js @@ -1,7 +1,6 @@ const { BanPlayer, UnbanPlayer } = require('./NitradoAPI'); const { EmbedBuilder } = require('discord.js'); -const { calculateVector } = require('./Vector'); -const { destinations } = require('../database/destinations'); +const { nearest } = require('../database/destinations'); const { GetGuild } = require('../database/guild'); // Private functions (only called locally) @@ -26,18 +25,7 @@ const HandlePlayerTrackEvent = async (client, guild, e) => { let newDt = await client.getDateEST(player.time); let unixTime = Math.floor(newDt.getTime()/1000); - let tempDest; - let lastDist = 1000000; - let destination_dir; - for (let i = 0; i < destinations.length; i++) { - let { distance, theta, dir } = calculateVector(player.pos, destinations[i].coord); - if (distance < lastDist) { - tempDest = destinations[i].name; - lastDist = distance; - destination_dir = dir; - } - } - const destination = lastDist > 500 ? `${destination_dir} of ${tempDest}` : `Near ${tempDest}`; + const destination = nearest(player.pos, guild.Nitrado.Mission); const trackEvent = new EmbedBuilder() .setColor(client.config.Colors.Default) @@ -76,12 +64,12 @@ module.exports = { let newDt = await client.getDateEST(data.time); let unixTime = Math.floor(newDt.getTime()/1000); - if (!client.alarmPingQueue[alarm.channel]) client.alarmPingQueue[alarm.channel] = {}; - let route = alarm.mute ? '-no-role-ping-' : alarm.role; - if (!client.alarmPingQueue[alarm.channel][route]) client.alarmPingQueue[alarm.channel][route] = []; + if (!client.alarmPingQueue.get(guild.serverID).has(alarm.channel)) client.alarmPingQueue.get(guild.serverID).set(alarm.channel, new Map()); + let route = alarm.mute ? null : alarm.role; + if (!client.alarmPingQueue.get(guild.serverID).get(alarm.channel).has(route)) client.alarmPingQueue.get(guild.serverID).get(alarm.channel).set(route, []); if (alarm.rules.includes['ban_on_entry']) { - client.alarmPingQueue[alarm.channel][route].push( + client.alarmPingQueue.get(guild.serverID).get(alarm.channel).get(route).push( new EmbedBuilder() .setColor(client.config.Colors.Default) .setDescription(`**Zone Ping - **\n**${data.player}** was located within **${distance} meters** of the Zone **${alarm.name}** __and has been banned.__`) @@ -92,7 +80,7 @@ module.exports = { return; } - client.alarmPingQueue[alarm.channel][route].push( + client.alarmPingQueue.get(guild.serverID).get(alarm.channel).get(route).push( new EmbedBuilder() .setColor(client.config.Colors.Default) .setDescription(`**Zone Ping - **\n**${data.player}** was located within **${distance} meters** of the Zone **${alarm.name}**`) @@ -113,18 +101,7 @@ module.exports = { let newDt = await client.getDateEST(data.time); let unixTime = Math.floor(newDt.getTime()/1000); - let tempDest; - let lastDist = 1000000; - let destination_dir; - for (let i = 0; i < destinations.length; i++) { - let { distance, theta, dir } = calculateVector(data.pos, destinations[i].coord); - if (distance < lastDist) { - tempDest = destinations[i].name; - lastDist = distance; - destination_dir = dir; - } - } - const destination = lastDist > 500 ? `${destination_dir} of ${tempDest}` : `Near ${tempDest}`; + const destination = nearest(data.pos, guild.Nitrado.Mission); let uavEmbed = new EmbedBuilder() .setColor(client.config.Colors.Default) diff --git a/util/Cryptic.js b/util/Cryptic.js new file mode 100644 index 0000000..0f32e46 --- /dev/null +++ b/util/Cryptic.js @@ -0,0 +1,19 @@ +const crypto = require('crypto'); + +module.exports = { + encrypt: (data, EncryptionMethod, Key, EncryptionIV) => { + const cipher = crypto.createCipheriv(EncryptionMethod, Key, EncryptionIV) + return Buffer.from( + cipher.update(data, 'utf8', 'hex') + cipher.final('hex') + ).toString('base64') // Encrypts data and converts to hex and base64 + }, + + decrypt: (data, EncryptionMethod, Key, EncryptionIV) => { + const buff = Buffer.from(data, 'base64') + const decipher = crypto.createDecipheriv(EncryptionMethod, Key, EncryptionIV) + return ( + decipher.update(buff.toString('utf8'), 'hex', 'utf8') + + decipher.final('utf8') + ) // Decrypts data and converts to utf8 + } +} \ No newline at end of file diff --git a/util/KillfeedHandler.js b/util/KillfeedHandler.js index cae694f..0250e1d 100644 --- a/util/KillfeedHandler.js +++ b/util/KillfeedHandler.js @@ -1,8 +1,7 @@ const { EmbedBuilder } = require('discord.js'); const { createUser, addUser } = require('../database/user'); const { KillInAlarm } = require('./AlarmsHandler'); -const { destinations } = require('../database/destinations'); -const { calculateVector } = require('./Vector'); +const { nearest } = require('../database/destinations'); const { getDefaultPlayer, UpdatePlayer } = require('../database/player'); const { calculateNewCombatRating } = require('./CombatRatingHandler'); const { weapons, weaponClassOf } = require('../database/weapons'); @@ -54,7 +53,7 @@ const Vehicles = { module.exports = { // Update last death date for non PVP deaths - UpdateLastDeathDate: async (client, line) => { + UpdateLastDeathDate: async (NitradoServerID, client, line) => { let killedByZmb = /(.*) \| Player \"(.*)\" \(DEAD\) \(id=(.*) pos=<(.*)>\) killed by (.*)/g; let diedTemplate = /(.*) \| Player \"(.*)\" \(DEAD\) \(id=(.*) pos=<(.*)>\) died\. Stats> Water: (.*) Energy: (.*) Bleed sources: (.*)/g; @@ -71,7 +70,7 @@ module.exports = { const newDt = await client.getDateEST(info.time); let victimStat = await client.dbo.collection("players").findOne({"playerID": info.playerID}); - if (!client.exists(victimStat)) victimStat = getDefaultPlayer(info.player, info.playerID, client.config.Nitrado.ServerID); + if (!client.exists(victimStat)) victimStat = getDefaultPlayer(info.player, info.playerID, NitradoServerID); victimStat.lastDeathDate = newDt; @@ -79,7 +78,7 @@ module.exports = { return }, - HandleKillfeed: async (client, guild, line) => { + HandleKillfeed: async (NitradoServerID, client, guild, line) => { const channel = client.GetChannel(guild.killfeedChannel); @@ -127,26 +126,13 @@ module.exports = { const showCoords = client.exists(guild.showKillfeedCoords) ? guild.showKillfeedCoords : false; // default to false if no record of configuration. const showWeapon = client.exists(guild.showKillfeedWeapon) ? guild.showKillfeedWeapon : false; // default to false if no record of configuration. - let tempDest; - let lastDist = 1000000; - let destination_dir; - if (showCoords) { // Only calculate if showing coords, very tiny minor optimization... probably amounts to nothing. - for (let i = 0; i < destinations.length; i++) { - let { distance, theta, dir } = calculateVector(info.victimPOS, destinations[i].coord); - if (distance < lastDist) { - tempDest = destinations[i].name; - lastDist = distance; - destination_dir = dir; - } - } - } - const destination = lastDist > 500 ? `${destination_dir} of ${tempDest}` : `Near ${tempDest}`; + const destination = nearest(info.victimPOS, guild.Nitrado.Mission); if ([Templates.LandMine, Templates.Explosion, Templates.Vehicle].includes(killedBy)) if (killedBy == Templates.LandMine || killedBy == Templates.Explosion || killedBy == Templates.Vehicle) { let victimStat = await client.dbo.collection("players").findOne({"playerID": info.victimID}); - if (!client.exists(victimStat)) victimStat = getDefaultPlayer(info.victim, info.victimID, client.config.Nitrado.ServerID); + if (!client.exists(victimStat)) victimStat = getDefaultPlayer(info.victim, info.victimID, NitradoServerID); victimStat.lastDeathDate = newDt; const cod = killedBy == Templates.LandMine ? `Land Mine Trap` : @@ -169,8 +155,8 @@ module.exports = { let victimStat = await client.dbo.collection("players").findOne({"playerID": info.victimID}); let killerStat = await client.dbo.collection("players").findOne({"playerID": info.killerID}); - if (!client.exists(victimStat)) victimStat = getDefaultPlayer(info.victim, info.victimID, client.config.Nitrado.ServerID); - if (!client.exists(killerStat)) killerStat = getDefaultPlayer(info.killer, info.killerID, client.config.Nitrado.ServerID); + if (!client.exists(victimStat)) victimStat = getDefaultPlayer(info.victim, info.victimID, NitradoServerID); + if (!client.exists(killerStat)) killerStat = getDefaultPlayer(info.killer, info.killerID, NitradoServerID); let weapon = info.weapon.includes("Engraved") ? info.weapon.split("Engraved ")[1] : info.weapon.includes("Sawed-off") ? info.weapon.split("Sawed-off ")[1] : diff --git a/util/LogsHandler.js b/util/LogsHandler.js index 9156e95..f8ebe56 100644 --- a/util/LogsHandler.js +++ b/util/LogsHandler.js @@ -5,11 +5,12 @@ const { getDefaultPlayer } = require('../database/player'); const { FetchServerSettings } = require('../util/NitradoAPI'); const { UpdatePlayer, insertPVPstats, createWeaponStats } = require('../database/player') +// TODO: Remove lastSendMessage let lastSendMessage; module.exports = { - HandlePlayerLogs: async (client, GuildDB, line, combatLogTimer = 5) => { + HandlePlayerLogs: async (NitradoServerID, client, GuildDB, line, combatLogTimer = 5) => { const connectTemplate = /(.*) \| Player \"(.*)\" is connected \(id=(.*)\)/g; const disconnectTemplate = /(.*) \| Player \"(.*)\"\(id=(.*)\) has been disconnected/g; @@ -30,7 +31,7 @@ module.exports = { if (!client.exists(info.player) || !client.exists(info.playerID)) return; let playerStat = await client.dbo.collection("players").findOne({"playerID": info.playerID}); - if (!client.exists(playerStat)) playerStat = getDefaultPlayer(info.player, info.playerID, client.config.Nitrado.ServerID); + if (!client.exists(playerStat)) playerStat = getDefaultPlayer(info.player, info.playerID, NitradoServerID); const newDt = await client.getDateEST(info.time); playerStat.lastConnectionDate = newDt; @@ -39,9 +40,9 @@ module.exports = { playerStat.connections++; // Track adjusted sessions this instance has handled (e.g. no bot crashes or restarts). - if (client.playerSessions.has(info.playerID)) { + if (client.playerSessions.get(NitradoServerID).has(info.playerID)) { // Player is already in a session, update the session's end time. - const session = client.playerSessions.get(info.playerID); + const session = client.playerSessions.get(NitradoServerID).get(info.playerID); session.endTime = newDt; // Update end time. } else { // Player is not in a session, create a new session. @@ -49,7 +50,7 @@ module.exports = { startTime: newDt, endTime: null, // Initialize end time as null. }; - client.playerSessions.set(info.playerID, newSession); + client.playerSessions.get(NitradoServerID).set(info.playerID, newSession); } await SendConnectionLogs(client, GuildDB, { @@ -75,8 +76,8 @@ module.exports = { if (!client.exists(info.player) || !client.exists(info.playerID)) return; let playerStat = await client.dbo.collection("players").findOne({"playerID": info.playerID}); - if (!client.exists(playerStat)) playerStat = getDefaultPlayer(info.player, info.playerID, client.config.Nitrado.ServerID); - + if (!client.exists(playerStat)) playerStat = getDefaultPlayer(info.player, info.playerID, NitradoServerID); + let oldUnixTime; let sessionTimeSeconds; const newDt = await client.getDateEST(info.time); @@ -129,7 +130,7 @@ module.exports = { if (!client.exists(info.player) || !client.exists(info.playerID)) return; let playerStat = await client.dbo.collection("players").findOne({"playerID": info.playerID}); - if (!client.exists(playerStat)) playerStat = getDefaultPlayer(info.player, info.playerID, client.config.Nitrado.ServerID); + if (!client.exists(playerStat)) playerStat = getDefaultPlayer(info.player, info.playerID, NitradoServerID); if (!client.exists(playerStat.lastConnectionDate)) playerStat.lastConnectionDate = await client.getDateEST(info.time); playerStat.lastPos = playerStat.pos; @@ -169,8 +170,8 @@ module.exports = { let playerStat = await client.dbo.collection("players").findOne({"playerID": info.playerID}); let attackerStat = await client.dbo.collection("players").findOne({"playerID": info.attackerID}); - if (!client.exists(playerStat)) playerStat = getDefaultPlayer(info.player, info.playerID, client.config.Nitrado.ServerID); - if (!client.exists(attackerStat)) attackerStat = getDefaultPlayer(info.attacker, info.attackerID, client.config.Nitrado.ServerID); + if (!client.exists(playerStat)) playerStat = getDefaultPlayer(info.player, info.playerID, NitradoServerID); + if (!client.exists(attackerStat)) attackerStat = getDefaultPlayer(info.attacker, info.attackerID, NitradoServerID); playerStat.lastDamageDate = await client.getDateEST(info.time); playerStat.lastHitBy = info.attacker; @@ -202,10 +203,10 @@ module.exports = { return; }, - HandleActivePlayersList: async (client, guild) => { + HandleActivePlayersList: async (nitrado_cred, client, guild) => { client.activePlayersTick = 0; // reset hour tick - const data = await FetchServerSettings(client, 'HandleActivePlayersList'); // Fetch server status + const data = await FetchServerSettings(nitrado_cred, client, 'HandleActivePlayersList'); // Fetch server status if (data && data !== 1) { let hostname = data.data.gameserver.settings.config.hostname; diff --git a/util/NitradoAPI.js b/util/NitradoAPI.js index 5f2c50d..cc658c6 100644 --- a/util/NitradoAPI.js +++ b/util/NitradoAPI.js @@ -8,20 +8,18 @@ const retryDelay = 5000; // 5 seconds // Private functions (only called locally) -const UploadNitradoFile = async (client, remoteDir, remoteFilename, localFileDir) => { +const UploadNitradoFile = async (nitrado_cred, 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({ + const res = await fetch(`https://api.nitrado.net/services/${nitrado_cred.ServerID}/gameservers/file_server/upload?` + new URLSearchParams({ path: remoteDir, file: remoteFilename }), { method: "POST", headers: { - "Authorization": client.config.Nitrado.Auth + "Authorization": nitrado_cred.Auth }, - }).then(response => - response.json().then(data => data) - ).then(res => res); + }).then(response => response.json()); let contents = fs.readFileSync(localFileDir, 'utf8'); @@ -34,22 +32,24 @@ const UploadNitradoFile = async (client, remoteDir, remoteFilename, localFileDir 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`); + client.error(`Failed to upload file to Nitrado (${nitrado_cred.ServerID}): status: ${uploadRes.status}, message: ${res.statusText}: UploadNitradoFile`); if (retries === 2) return 1; // Return error status on the second failed status code. } else { return uploadRes; } } 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`); + client.error(`UploadNitradoFile: Error connecting to server (${nitrado_cred.ServerID}): ${error.message}`); + if (retries === maxRetries) { + client.error(`UploadNitradoFile: Error connecting to server (${nitrado_cred.ServerID}) after ${maxRetries} retries`); + return 1; + } } await new Promise(resolve => setTimeout(resolve, retryDelay)); // Delay before retrying } } -const HandlePlayerBan = async (client, gamertag, ban) => { - const data = await module.exports.FetchServerSettings(client, 'HandlePlayerBan'); // Fetch server status +const HandlePlayerBan = async (nitrado_cred, client, gamertag, ban) => { + const data = await module.exports.FetchServerSettings(nitrado_cred, client, 'HandlePlayerBan'); // Fetch server status if (data && data != 1) { let bans = data.data.gameserver.settings.general.bans; @@ -59,26 +59,31 @@ const HandlePlayerBan = async (client, gamertag, ban) => { let category = 'general'; let key = 'bans'; - return await module.exports.PostServerSettings(client, category, key, bans); // returns 1 (failed) or 0 (not failed) + return await module.exports.PostServerSettings(nitrado_cred, client, category, key, bans); // returns 1 (failed) or 0 (not failed) } } -const GetRemoteDir = async (client, dir="") => { +const GetRemoteDir = async (nitrado_cred, client, dir="") => { const dirParam = client.exists(dir) ? `?dir=${dir}` : ""; for (let retries = 0; retries <= maxRetries; retries++) { try { - const res = await fetch(`https://api.nitrado.net/services/${client.config.Nitrado.ServerID}/gameservers/file_server/list${dirParam}`, { + const res = await fetch(`https://api.nitrado.net/services/${nitrado_cred.ServerID}/gameservers/file_server/list${dirParam}`, { headers: { - "Authorization": client.config.Nitrado.Auth + "Authorization": nitrado_cred.Auth } }).then(response => response.json().then(data => data) ).then(res => res); + + if (res.status === "error") return 1; return res.data.entries; } catch (error) { - client.error(`GetRemoteDir: Error connecting to server (${client.config.Nitrado.ServerID}): ${error.message}`); - if (retries == maxRetries) throw new Error(`GetRemoteDir: Error connecting to server (${client.config.Nitrado.ServerID}) after ${maxRetries} retries`) + client.error(`GetRemoteDir: Error connecting to server (${nitrado_cred.ServerID}): ${error}`); + if (retries == maxRetries) { + client.error(`GetRemoteDir: Error connecting to server (${nitrado_cred.ServerID}) after ${maxRetries} retries`); + return 1; + } } await new Promise(resolve => setTimeout(resolve, retryDelay)); // Delay before retrying } @@ -88,12 +93,12 @@ const GetRemoteDir = async (client, dir="") => { module.exports = { - DownloadNitradoFile: async(client, filename, outputDir) => { + DownloadNitradoFile: async(nitrado_cred, client, filename, outputDir) => { for (let retries = 0; retries <= maxRetries; retries++) { try { - const res = await fetch(`https://api.nitrado.net/services/${client.config.Nitrado.ServerID}/gameservers/file_server/download?file=${filename}`, { + const res = await fetch(`https://api.nitrado.net/services/${nitrado_cred.ServerID}/gameservers/file_server/download?file=${filename}`, { headers: { - "Authorization": client.config.Nitrado.Auth + "Authorization": nitrado_cred.Auth } }).then(response => response.json().then(data => data) @@ -101,16 +106,18 @@ module.exports = { const stream = fs.createWriteStream(outputDir); if (!res.data || !res.data.token) { - const errorText = await res.text(); - client.error(`Error downloading File "${filename}": message: ${errorText}: DownloadNitradoFile`); + client.error(`Error downloading File "${filename}": message: ${res.message}: DownloadNitradoFile`); return 1; } const { body } = await fetch(res.data.token.url); await finished(Readable.fromWeb(body).pipe(stream)); return 0; } catch (error) { - 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`); + client.error(`DownloadNitradoFile: Error connecting to server (${nitrado_cred.ServerID}): ${error.message}`); + if (retries === maxRetries) { + client.error(`DownloadNitradoFile: Error connecting to server (${nitrado_cred.ServerID}) after ${maxRetries} retries`); + return 1; + } } await new Promise(resolve => setTimeout(resolve, retryDelay)); // Delay before retrying } @@ -122,67 +129,70 @@ module.exports = { rather than write two whole different functions for each. */ - BanPlayer: async (client, gamertag) => await HandlePlayerBan(client, gamertag, true), - UnbanPlayer: async (client, gamertag) => await HandlePlayerBan(client, gamertag, false), + BanPlayer: async (nitrado_cred, client, gamertag) => await HandlePlayerBan(nitrado_cred, client, gamertag, true), + UnbanPlayer: async (nitrado_cred, client, gamertag) => await HandlePlayerBan(nitrado_cred, client, gamertag, false), - RestartServer: async (client, restart_message, message) => { + RestartServer: async (nitrado_cred, client, restart_message, message) => { const params = { restart_message: restart_message, message: message }; - // client.log('Restarting server...'); for (let retries = 0; retries < maxRetries; retries++) { try { - const res = await fetch(`https://api.nitrado.net/services/${client.config.Nitrado.ServerID}/gameservers/restart`, { + const res = await fetch(`https://api.nitrado.net/services/${nitrado_cred.ServerID}/gameservers/restart`, { method: "POST", headers: { - "Authorization": client.config.Nitrado.Auth, + "Authorization": nitrado_cred.Auth, }, 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`); + client.error(`Failed to restart Nitrado server (${nitrado_cred.ServerID}): status: ${res.status}, message: ${res.statusText}: RestartServer`); return 1; // Return error status on failed status code. } else { return 0; } } catch (error) { - 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`); + client.error(`RestartServer: Error connecting to server (${nitrado_cred.ServerID}): ${error.message}`); + if (retries === maxRetries) { + client.error(`RestartServer: Error connecting to server (${nitrado_cred.ServerID}) after ${maxRetries} retries`); + return 1; + } } await new Promise(resolve => setTimeout(resolve, retryDelay)); // Delay before retrying } }, - FetchServerSettings: async (client, fetcher) => { + FetchServerSettings: async (nitrado_cred, client, fetcher) => { for (let retries = 0; retries <= maxRetries; retries++) { try { // get current status - const res = await fetch(`https://api.nitrado.net/services/${client.config.Nitrado.ServerID}/gameservers`, { + const res = await fetch(`https://api.nitrado.net/services/${nitrado_cred.ServerID}/gameservers`, { headers: { - "Authorization": client.config.Nitrado.Auth + "Authorization": nitrado_cred.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}: ${fetcher} via FetchServerSettings`); + client.error(`Failed to get Nitrado server stats (${nitrado_cred.ServerID}): status: ${res.status}, message: ${res.statusText}: ${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`); + client.error(`${fetcher} via FetchServerSettings: Error connecting to server (${nitrado_cred.ServerID}): ${error.message}`); + if (retries === maxRetries) { + client.error(`${fetcher} via FetchServerSettings: Error connecting to server (${nitrado_cred.ServerID}) after ${maxRetries} retries`); + return 1; + } } await new Promise(resolve => setTimeout(resolve, retryDelay)); // Delay before retrying } }, - PostServerSettings: async (client, category, key, value) => { + PostServerSettings: async (nitrado_cred, client, category, key, value) => { for (let retries = 0; retries <= maxRetries; retries++) { try { const formData = new FormData(); @@ -191,18 +201,17 @@ module.exports = { formData.append("value", value); formData.pipe(concat(data => { async function postData() { - const res = await fetch(`https://api.nitrado.net/services/${client.config.Nitrado.ServerID}/gameservers/settings`, { + const res = await fetch(`https://api.nitrado.net/services/${nitrado_cred.ServerID}/gameservers/settings`, { method: "POST", credentials: 'include', headers: { ...formData.getHeaders(), - "Authorization": client.config.Nitrado.Auth + "Authorization": nitrado_cred.Auth }, body: data, }); if (!res.ok) { - const errorText = await res.text(); - client.error(`Failed to get post Nitrado server settings (${client.config.Nitrado.ServerID}): status: ${res.status}, message: ${errorText}: PostServerSettings`); + client.error(`Failed to get post Nitrado server settings (${nitrado_cred.ServerID}): status: ${res.status}, message: ${res.statusText}: PostServerSettings`); if (retries === 2) return 1; // Return error status on the second failed status code. } else { const data = await res.json(); @@ -213,39 +222,46 @@ module.exports = { })); return 0; } catch (error) { - client.error(`PostServerSettings: Error connecting to server (${client.config.Nitrado.ServerID}): ${error.message}`); - if (retries === maxRetries) throw new Error(`PostServerSettings: Error connecting to server (${client.config.Nitrado.ServerID}) after ${maxRetries} retries`); + client.error(`PostServerSettings: Error connecting to server (${nitrado_cred.ServerID}): ${error.message}`); + if (retries === maxRetries) { + client.error(`PostServerSettings: Error connecting to server (${nitrado_cred.ServerID}) after ${maxRetries} retries`); + return 1; + } } await new Promise(resolve => setTimeout(resolve, retryDelay)); // Delay before retrying } }, - CheckServerStatus: async (client) => { - const data = await module.exports.FetchServerSettings(client, 'CheckServerStatus'); // Fetch server status + CheckServerStatus: async (nitrado_cred, client) => { + const data = await module.exports.FetchServerSettings(nitrado_cred, 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}".`); + client.log(`Restart of Nitrado server ${nitrado_cred.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); + module.exports.RestartServer(nitrado_cred, client, restart_message, message); } } }, - DisableBaseDamage: async (client, preference) => { + DisableBaseDamage: async (nitrado_cred, client, preference) => { const pref = preference ? '1' : '0'; - const posted = await module.exports.PostServerSettings(client, "config", "disableBaseDamage", pref); + const posted = await module.exports.PostServerSettings(nitrado_cred, client, "config", "disableBaseDamage", pref); if (posted == 1) return 1; - const basePath = await GetRemoteDir(client).then(dirs => dirs.filter(dir => dir.type == 'dir')[0].path) - const missionPath = await GetRemoteDir(client, basePath).then(dirs => dirs[0].path) + const remoteDirs = await GetRemoteDir(nitrado_cred, client); + if (remoteDirs == 1) return 1; + const basePath = remoteDirs.filter(dir => dir.type == 'dir')[0].path + const remoteDirsFromBase = await GetRemoteDir(nitrado_cred, client, basePath); + if (remoteDirsFromBase == 1) return 1; + const missionPath = remoteDirsFromBase[0].path; const cfggameplayPath = `${missionPath}/cfggameplay.json`; const jsonDir = `./logs/cfggameplay.json`; - await module.exports.DownloadNitradoFile(client, cfggameplayPath, jsonDir); + await module.exports.DownloadNitradoFile(nitrado_cred, client, cfggameplayPath, jsonDir); let gameplay = JSON.parse(fs.readFileSync(jsonDir)); gameplay.GeneralData.disableBaseDamage = preference; @@ -253,23 +269,27 @@ module.exports = { // write JSON to file fs.writeFileSync(jsonDir, JSON.stringify(gameplay, null, 2)); - const uploaded = await UploadNitradoFile(client, missionPath, 'cfggameplay.json', jsonDir); + const uploaded = await UploadNitradoFile(nitrado_cred, client, missionPath, 'cfggameplay.json', jsonDir); if (uploaded == 1) return 1; return 0; }, - DisableContainerDamage: async (client, preference) => { + DisableContainerDamage: async (nitrado_cred, client, preference) => { const pref = preference ? '1' : '0'; - const posted = await module.exports.PostServerSettings(client, "config", "disableContainerDamage", pref); + const posted = await module.exports.PostServerSettings(nitrado_cred, client, "config", "disableContainerDamage", pref); if (posted == 1) return 1; - const basePath = await GetRemoteDir(client).then(dirs => dirs.filter(dir => dir.type == 'dir')[0].path) - const missionPath = await GetRemoteDir(client, basePath).then(dirs => dirs[0].path) + const remoteDirs = await GetRemoteDir(nitrado_cred, client); + if (remoteDirs == 1) return 1; + const basePath = remoteDirs.filter(dir => dir.type == 'dir')[0].path + const remoteDirsFromBase = await GetRemoteDir(nitrado_cred, client, basePath); + if (remoteDirsFromBase == 1) return 1; + const missionPath = remoteDirsFromBase[0].path; const cfggameplayPath = `${missionPath}/cfggameplay.json`; const jsonDir = `./logs/cfggameplay.json`; - await module.exports.DownloadNitradoFile(client, cfggameplayPath, jsonDir); + await module.exports.DownloadNitradoFile(nitrado_cred, client, cfggameplayPath, jsonDir); let gameplay = JSON.parse(fs.readFileSync(jsonDir)); gameplay.GeneralData.disableContainerDamage = preference; @@ -277,7 +297,7 @@ module.exports = { // write JSON to file fs.writeFileSync(jsonDir, JSON.stringify(gameplay, null, 2)); - const uploaded = await UploadNitradoFile(client, missionPath, 'cfggameplay.json', jsonDir); + const uploaded = await UploadNitradoFile(nitrado_cred, client, missionPath, 'cfggameplay.json', jsonDir); if (uploaded == 1) return 1; return 0;