6.0.0 code refactor
This commit is contained in:
12 files changed
+524
-417
No files matched your search
+9
-409
@@ -5,10 +5,13 @@ const { REST } = require('@discordjs/rest');
|
||||
const Logger = require("../util/Logger");
|
||||
const mongoose = require('mongoose');
|
||||
|
||||
// custom util imports
|
||||
const { DownloadNitradoFile } = require('../util/NitradoAPI');
|
||||
const { HandlePlayerLogs, HandleActivePlayersList } = require('../util/LogsHandler');
|
||||
const { HandleKillfeed } = require('../util/KillfeedHandler');
|
||||
|
||||
const path = require("path");
|
||||
const fs = require('fs');
|
||||
const { Readable } = require('stream');
|
||||
const { finished } = require('stream/promises');
|
||||
const readline = require('readline');
|
||||
|
||||
const minute = 60000; // 1 minute in milliseconds
|
||||
@@ -103,409 +106,6 @@ class DayzArmbands extends Client {
|
||||
return n;
|
||||
}
|
||||
|
||||
async downloadFile(file, outputDir) {
|
||||
const res = await fetch(`https://api.nitrado.net/services/${this.config.Nitrado.ServerID}/gameservers/file_server/download?file=${file}`, {
|
||||
headers: {
|
||||
"Authorization": this.config.Nitrado.Auth
|
||||
}
|
||||
}).then(response =>
|
||||
response.json().then(data => data)
|
||||
).then(res => res);
|
||||
|
||||
const stream = fs.createWriteStream(outputDir);
|
||||
const { body } = await fetch(res.data.token.url);
|
||||
await finished(Readable.fromWeb(body).pipe(stream));
|
||||
}
|
||||
|
||||
async handleBanList(gamertag) {
|
||||
await this.downloadFile(`/games/${this.config.Nitrado.UserID}/noftp/dayzxb/ban.txt`, './logs/ban.txt').then(() => {
|
||||
fs.appendFile('./logs/ban.txt', gamertag, (err) => {
|
||||
if (err) throw err;
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
async handleKillfeed(guildId, stats, line) {
|
||||
|
||||
let guild = await this.GetGuild(guildId);
|
||||
const channel = this.channels.cache.get(guild.killfeedChannel);
|
||||
|
||||
let template = /(.*) \| Player \"(.*)\" \(DEAD\) \(id=(.*) pos=<(.*)>\)\[HP\: 0\] hit by Player \"(.*)\" \(id=(.*) pos=<(.*)>\) into (.*) for (.*) damage \((.*)\) with (.*) from (.*) meters /g;
|
||||
let data = [...line.matchAll(template)][0];
|
||||
if (!data) return stats;
|
||||
|
||||
let info = {
|
||||
time: data[1],
|
||||
victim: data[2],
|
||||
victimID: data[3],
|
||||
victimPOS: data[4],
|
||||
killer: data[5],
|
||||
killerID: data[6],
|
||||
killerPOS: data[7],
|
||||
bodyPart: data[8],
|
||||
damage: data[9],
|
||||
bullet: data[10],
|
||||
weapon: data[11],
|
||||
distance: data[12]
|
||||
};
|
||||
|
||||
if (!this.exists(info.victim) || !this.exists(info.victimID) || !this.exists(info.killer) || !this.exists(info.killerID)) return stats;
|
||||
|
||||
let killerStat = stats.find(stat => stat.playerID == info.killerID)
|
||||
let victimStat = stats.find(stat => stat.playerID == info.victimID)
|
||||
let killerStatIndex = stats.indexOf(killerStat);
|
||||
let victimStatIndex = stats.indexOf(victimStat);
|
||||
if (killerStat == undefined) killerStat = this.getDefaultPlayerStats(info.killer, info.killerID);
|
||||
if (victimStat == undefined) victimStat = this.getDefaultPlayerStats(info.victim, info.victimID);
|
||||
|
||||
killerStat.kills++;
|
||||
killerStat.killStreak++;
|
||||
killerStat.bestKillStreak = killerStat.killStreak > killerStat.bestKillStreak ? killerStat.killStreak : killerStat.bestKillStreak;
|
||||
killerStat.longestKill = parseFloat(info.distance) > killerStat.longestKill ? parseFloat(info.distance).toFixed(1) : killerStat.longestKill;
|
||||
victimStat.deaths++;
|
||||
victimStat.deathStreak++;
|
||||
victimStat.worstDeathStreak = victimStat.deathStreak > victimStat.worstDeathStreak ? victimStat.deathStreak : victimStat.bestKillStreak;
|
||||
killerStat.KDR = killerStat.kills / (killerStat.deaths == 0 ? 1 : killerStat.deaths); // prevent division by 0
|
||||
victimStat.KDR = victimStat.kills / (victimStat.deaths == 0 ? 1 : victimStat.deaths); // prevent division by 0
|
||||
victimStat.killStreak = 0;
|
||||
killerStat.deathStreak = 0;
|
||||
|
||||
let receivedBounty = null;
|
||||
if (victimStat.bounties.length > 0 && killerStat.discordID != "") {
|
||||
let totalBounty = 0;
|
||||
for (let i = 0; i < victimStat.bounties.length; i++) {
|
||||
totalBounty += victimStat.bounties[i].value;
|
||||
}
|
||||
|
||||
let banking = await this.dbo.collection("users").findOne({"user.userID": killerStat.discordID}).then(banking => banking);
|
||||
|
||||
if (!banking) {
|
||||
banking = {
|
||||
userID: killerStat.discordID,
|
||||
guilds: {
|
||||
[guildId]: {
|
||||
bankAccount: {
|
||||
balance: guild.startingBalance,
|
||||
cash: 0.00,
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Register inventory for user
|
||||
let newBank = new User();
|
||||
newBank.createUser(killerStat.discordID, guildId, guild.startingBalance, 0);
|
||||
newBank.save().catch(err => {
|
||||
if (err) return this.sendInternalError(interaction, err);
|
||||
});
|
||||
|
||||
} else banking = banking.user;
|
||||
|
||||
if (!this.exists(banking.guilds[guildId])) {
|
||||
const success = addUser(banking.guilds, guildId, killer.discordID, this, guild.startingBalance);
|
||||
if (!success) return this.sendError(guild.connectionLogsChannel, 'Failed to add bank');
|
||||
}
|
||||
|
||||
const newBalance = banking.guilds[guildId].bankAccount.balance + totalBounty;
|
||||
|
||||
await this.dbo.collection("users").updateOne({ "user.userID": killerStat.discordID }, {
|
||||
$set: {
|
||||
[`user.guilds.${guildId}.bankAccount.balance`]: newBalance,
|
||||
}
|
||||
}, function(err, res) {
|
||||
if (err) return this.sendError(guild.connectionLogsChannel, err);
|
||||
});
|
||||
|
||||
receivedBounty = new EmbedBuilder()
|
||||
.setColor(this.config.Colors.Default)
|
||||
.setDescription(`<@${killerStat.discordID}> received **$${totalBounty.toFixed(2)}** in bounty rewards.`);
|
||||
}
|
||||
|
||||
if (killerStatIndex == -1) stats.push(killerStat);
|
||||
else stats[killerStatIndex] = killerStat;
|
||||
if (victimStatIndex == -1) stats.push(victimStat);
|
||||
else stats[victimStatIndex] = victimStat;
|
||||
|
||||
let newDt = await this.getDateEST(info.time);
|
||||
let unixTime = Math.floor(newDt.getTime()/1000);
|
||||
|
||||
const killEvent = new EmbedBuilder()
|
||||
.setColor(this.config.Colors.Default)
|
||||
.setDescription(`**Kill Event** - <t:${unixTime}>\n**${info.killer}** killed **${info.victim}**\n> **__Kill Data__**\n> **Weapon:** \` ${info.weapon} \`\n> **Distance:** \` ${info.distance} \`\n> **Body Part:** \` ${info.bodyPart.split('(')[0]} \`\n> **Damage:** \` ${info.damage} \`\n **Killer\n${killerStat.KDR.toFixed(2)} K/D - ${killerStat.kills} Kills - Killstreak: ${killerStat.killStreak}\nVictim\n${victimStat.KDR.toFixed(2)} K/D - ${victimStat.deaths} Deaths - Deathstreak: ${victimStat.deathStreak}**`);
|
||||
|
||||
if (this.exists(channel)) await channel.send({ embeds: [killEvent] });
|
||||
if (this.exists(receivedBounty) && this.exists(channel)) await channel.send({ content: `<@${killerStat.discordID}>`, embeds: [receivedBounty] });
|
||||
|
||||
return stats;
|
||||
}
|
||||
|
||||
async handleAlarms(guildId, data) {
|
||||
let guild = await this.GetGuild(guildId);
|
||||
|
||||
if (!this.exists(guild.alarms)) {
|
||||
guild.alarms = [];
|
||||
await this.dbo.collection("guilds").updateOne({ 'server.serverID': guildId }, {
|
||||
$set: {
|
||||
'server.alarms': [],
|
||||
}
|
||||
}, function (err, res) {
|
||||
if (err) this.error(err);
|
||||
});
|
||||
}
|
||||
|
||||
for (let i = 0; i < guild.alarms.length; i++) {
|
||||
let alarm = guild.alarms[i];
|
||||
if (alarm.disabled) continue; // ignore if alarm is disabled due to emp
|
||||
if (alarm.ignoredPlayers.includes(data.playerID)) continue;
|
||||
|
||||
let diff = [Math.round(alarm.origin[0] - data.pos[0]), Math.round(alarm.origin[1] - data.pos[1])];
|
||||
let distance = Math.sqrt(Math.pow(diff[0], 2) + Math.pow(diff[1], 2)).toFixed(2)
|
||||
|
||||
if (distance < alarm.radius) {
|
||||
const channel = this.channels.cache.get(alarm.channel);
|
||||
|
||||
let newDt = await this.getDateEST(data.time);
|
||||
let unixTime = Math.floor(newDt.getTime()/1000);
|
||||
|
||||
// if (alarm.rules.includes['ban_on_entry']) {
|
||||
|
||||
|
||||
|
||||
// let alarmEmbed = new EmbedBuilder()
|
||||
// .setColor(this.config.Colors.Default)
|
||||
// .setDescription(`**Zone Ping - <t:${unixTime}>**\n**${data.player}** was located within **${distance} meters** of the Zone **${alarm.name}** __and has been banned.__`)
|
||||
// .addFields({ name: '**Location**', value: `**[${data.pos[0]}, ${data.pos[1]}](https://www.izurvive.com/chernarusplussatmap/#location=${data.pos[0]};${data.pos[1]})**`, inline: false })
|
||||
|
||||
// channel.send({ content: `<@&${alarm.role}>`, embeds: [alarmEmbed] });
|
||||
// } else {
|
||||
let alarmEmbed = new EmbedBuilder()
|
||||
.setColor(this.config.Colors.Default)
|
||||
.setDescription(`**Zone Ping - <t:${unixTime}>**\n**${data.player}** was located within **${distance} meters** of the Zone **${alarm.name}**`)
|
||||
.addFields({ name: '**Location**', value: `**[${data.pos[0]}, ${data.pos[1]}](https://www.izurvive.com/chernarusplussatmap/#location=${data.pos[0]};${data.pos[1]})**`, inline: false })
|
||||
|
||||
return await channel.send({ content: `<@&${alarm.role}>`, embeds: [alarmEmbed] });
|
||||
// }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async sendConnectionLogs(guildId, data) {
|
||||
|
||||
let guild = await this.GetGuild(guildId);
|
||||
if (!this.exists(guild.connectionLogsChannel)) return;
|
||||
const channel = this.channels.cache.get(guild.connectionLogsChannel);
|
||||
|
||||
let newDt = await this.getDateEST(data.time);
|
||||
let unixTime = Math.floor(newDt.getTime()/1000);
|
||||
|
||||
let connectionLog = new EmbedBuilder()
|
||||
.setColor(data.connected ? this.config.Colors.Green : this.config.Colors.Red)
|
||||
.setDescription(`**${data.connected ? 'Connect' : 'Disconnect'} Event - <t:${unixTime}>\n${data.player} ${data.connected ? 'Connected' : 'Disconnected'}**`);
|
||||
|
||||
if (!data.connected) {
|
||||
if (!(data.lastConnectionDate == null)) {
|
||||
let oldUnixTime = Math.floor(data.lastConnectionDate.getTime()/1000);
|
||||
let sessionTime = this.secondsToDhms(unixTime - oldUnixTime);
|
||||
connectionLog.addFields({ name: '**Session Time**', value: `**${sessionTime}**`, inline: false });
|
||||
} else connectionLog.addFields({ name: '**Session Time**', value: `**Unknown**`, inline: false });
|
||||
}
|
||||
|
||||
if (this.exists(channel)) await channel.send({ embeds: [connectionLog] });
|
||||
}
|
||||
|
||||
async detectCombatLog(guildId, data) {
|
||||
if (data.lastDamageDate == null) return;
|
||||
|
||||
let newDt = await this.getDateEST(data.time);
|
||||
|
||||
let diffMs = (newDt - data.lastDamageDate)
|
||||
let diffMins = Math.round(((diffMs % 86400000) % 3600000) / 60000); // minutes
|
||||
|
||||
if (diffMins > 5) return;
|
||||
|
||||
let guild = await this.GetGuild(guildId);
|
||||
if (!this.exists(guild.connectionLogsChannel)) return;
|
||||
const channel = this.channels.cache.get(guild.connectionLogsChannel);
|
||||
if (!channel) return;
|
||||
|
||||
let unixTime = Math.floor(newDt.getTime()/1000);
|
||||
|
||||
let combatLog = new EmbedBuilder()
|
||||
.setColor(this.config.Colors.Red)
|
||||
.setDescription(`**NOTICE:**\n**${data.player}** has combat logged at <t:${unixTime}> when fighting **${data.lastHitBy}**`);
|
||||
|
||||
if (client.exists(guild.adminRole)) channel.send({ content: `<@&${guild.adminRole}>` });
|
||||
|
||||
return channel.send({ embeds: [combatLog] });
|
||||
}
|
||||
|
||||
async handlePlayerLogs(guildId, stats, line) {
|
||||
|
||||
const connectTemplate = /(.*) \| Player \"(.*)\" is connected \(id=(.*)\)/g;
|
||||
const disconnectTemplate = /(.*) \| Player \"(.*)\"\(id=(.*)\) has been disconnected/g;
|
||||
const positionTemplate = /(.*) \| Player \"(.*)\" \(id=(.*) pos=<(.*)>\)/g;
|
||||
const damageTemplate = /(.*) \| Player \"(.*)\" \(id=(.*) pos=<(.*)>\)\[HP\: (.*)\] hit by Player \"(.*)\" \(id=(.*) pos=<(.*)>\) into (.*) for (.*) damage \((.*)\) with (.*) from (.*) meters /g;
|
||||
const deadTemplate = /(.*) \| Player \"(.*)\" \(DEAD\) \(id=(.*) pos=<(.*)>\)\[HP\: (.*)\] hit by Player \"(.*)\" \(id=(.*) pos=<(.*)>\) into (.*) for (.*) damage \((.*)\) with (.*) from (.*) meters /g;
|
||||
|
||||
if (line.includes(' connected')) {
|
||||
let data = [...line.matchAll(connectTemplate)][0];
|
||||
if (!data) return stats;
|
||||
|
||||
let info = {
|
||||
time: data[1],
|
||||
player: data[2],
|
||||
playerID: data[3],
|
||||
connected: true,
|
||||
};
|
||||
|
||||
if (!this.exists(info.player) || !this.exists(info.playerID)) return stats;
|
||||
|
||||
let playerStat = stats.find(stat => stat.playerID == info.playerID)
|
||||
let playerStatIndex = stats.indexOf(playerStat);
|
||||
if (playerStat == undefined) playerStat = this.getDefaultPlayerStats(info.player, info.playerID);
|
||||
|
||||
let newDt = await this.getDateEST(info.time);
|
||||
|
||||
playerStat.lastConnectionDate = newDt;
|
||||
playerStat.connected = true;
|
||||
|
||||
if (playerStatIndex == -1) stats.push(playerStat);
|
||||
else stats[playerStatIndex] = playerStat;
|
||||
|
||||
this.sendConnectionLogs(guildId, {
|
||||
time: info.time,
|
||||
player: info.player,
|
||||
connected: info.connected,
|
||||
lastConnectionDate: null,
|
||||
});
|
||||
}
|
||||
|
||||
if (line.includes(' disconnected')) {
|
||||
let data = [...line.matchAll(disconnectTemplate)][0];
|
||||
if (!data) return stats;
|
||||
|
||||
let info = {
|
||||
time: data[1],
|
||||
player: data[2],
|
||||
playerID: data[3],
|
||||
connected: false
|
||||
}
|
||||
|
||||
if (!this.exists(info.player) || !this.exists(info.playerID)) return stats;
|
||||
|
||||
let playerStat = stats.find(stat => stat.playerID == info.playerID)
|
||||
let playerStatIndex = stats.indexOf(playerStat);
|
||||
if (playerStat == undefined) playerStat = this.getDefaultPlayerStats(info.player, info.playerID);
|
||||
|
||||
playerStat.connected = false;
|
||||
|
||||
if (playerStatIndex == -1) stats.push(playerStat);
|
||||
else stats[playerStatIndex] = playerStat;
|
||||
|
||||
this.sendConnectionLogs(guildId, {
|
||||
time: info.time,
|
||||
player: info.player,
|
||||
connected: info.connected,
|
||||
lastConnectionDate: playerStat.lastConnectionDate,
|
||||
});
|
||||
|
||||
this.detectCombatLog(guildId, {
|
||||
time: info.time,
|
||||
player: info.player,
|
||||
lastDamageDate: playerStat.lastDamageDate,
|
||||
lastHitBy: playerStat.lastHitBy,
|
||||
});
|
||||
}
|
||||
|
||||
if (line.includes('pos=<')) {
|
||||
let data = [...line.matchAll(positionTemplate)][0];
|
||||
if (!data) return stats;
|
||||
|
||||
let info = {
|
||||
time: data[1],
|
||||
player: data[2],
|
||||
playerID: data[3],
|
||||
pos: data[4].split(', ').map(v => parseFloat(v))
|
||||
};
|
||||
|
||||
if (!this.exists(info.player) || !this.exists(info.playerID)) return stats;
|
||||
|
||||
let playerStat = stats.find(stat => stat.playerID == info.playerID)
|
||||
let playerStatIndex = stats.indexOf(playerStat);
|
||||
if (playerStat == undefined) playerStat = this.getDefaultPlayerStats(info.player, info.playerID);
|
||||
|
||||
playerStat.lastPos = playerStat.pos;
|
||||
playerStat.pos = info.pos;
|
||||
playerStat.lastTime = playerStat.time;
|
||||
playerStat.time = `${info.time} EST`;
|
||||
|
||||
this.handleAlarms(guildId, {
|
||||
time: info.time,
|
||||
player: info.player,
|
||||
playerID: info.playerID,
|
||||
pos: info.pos,
|
||||
});
|
||||
|
||||
if (playerStatIndex == -1) stats.push(playerStat);
|
||||
else stats[playerStatIndex] = playerStat;
|
||||
}
|
||||
|
||||
if (line.includes('hit by Player')) {
|
||||
let data = line.includes('(DEAD)') ? [...line.matchAll(deadTemplate)][0] : [...line.matchAll(damageTemplate)][0];
|
||||
if (!data) return stats;
|
||||
|
||||
let info = {
|
||||
time: data[1],
|
||||
player: data[2],
|
||||
playerID: data[3],
|
||||
attacker: data[5],
|
||||
attackerID: data[6]
|
||||
}
|
||||
|
||||
if (!this.exists(info.player) || !this.exists(info.playerID)) return stats;
|
||||
|
||||
let playerStat = stats.find(stat => stat.playerID == info.playerID)
|
||||
let playerStatIndex = stats.indexOf(playerStat);
|
||||
if (playerStat == undefined) playerStat = this.getDefaultPlayerStats(info.player, info.playerID);
|
||||
|
||||
let newDt = await this.getDateEST(info.time);
|
||||
|
||||
playerStat.lastDamageDate = newDt;
|
||||
playerStat.lastHitBy = info.attacker;
|
||||
|
||||
if (playerStatIndex == -1) stats.push(playerStat);
|
||||
else stats[playerStatIndex] = playerStat;
|
||||
}
|
||||
|
||||
return stats;
|
||||
}
|
||||
|
||||
async handleActivePlayersList(guildId) {
|
||||
this.activePlayersTick = 0; // reset hour tick
|
||||
|
||||
let guild = await this.GetGuild(guildId);
|
||||
if (!this.exists(guild.playerstats)) guild.playerstats = [];
|
||||
if (!this.exists(guild.activePlayersChannel)) return;
|
||||
|
||||
const channel = this.channels.cache.get(guild.activePlayersChannel);
|
||||
|
||||
let activePlayers = guild.playerstats.filter(p => p.connected);
|
||||
|
||||
if (activePlayers.length == 0) return;
|
||||
|
||||
let des = ``;
|
||||
for (let i = 0; i < activePlayers.length; i++) {
|
||||
des += `**- ${activePlayers[i].gamertag}**\n`;
|
||||
}
|
||||
|
||||
const activePlayersEmbed = new EmbedBuilder()
|
||||
.setColor(this.config.Colors.Default)
|
||||
.setTitle(`Online List - ${activePlayers.length} Player${activePlayers.length>1?'s':''} Online`)
|
||||
.setDescription(des);
|
||||
|
||||
return channel.send({ embeds: [activePlayersEmbed] });
|
||||
}
|
||||
|
||||
async readLogs(guildId) {
|
||||
const fileStream = fs.createReadStream('./logs/server-logs.ADM');
|
||||
|
||||
@@ -543,8 +143,8 @@ class DayzArmbands extends Client {
|
||||
}
|
||||
if (!inLog || !connected) s[j].connected = false;
|
||||
}
|
||||
if (lines[i].includes('connected') || lines[i].includes('pos=<') || lines[1].includes['hit by Player']) s = await this.handlePlayerLogs(guildId, s, lines[i]);
|
||||
if (!(i + 1 >= lines.length) && lines[i + 1].includes('killed by Player')) s = await this.handleKillfeed(guildId, s, lines[i]);
|
||||
if (lines[i].includes('connected') || lines[i].includes('pos=<') || lines[1].includes['hit by Player']) s = await HandlePlayerLogs(this, guildId, s, lines[i]);
|
||||
if (!(i + 1 >= lines.length) && lines[i + 1].includes('killed by Player')) s = await HandleKillfeed(this, guildId, s, lines[i]);
|
||||
}
|
||||
|
||||
await this.dbo.collection("guilds").updateOne({ "server.serverID": guildId }, {
|
||||
@@ -566,9 +166,9 @@ class DayzArmbands extends Client {
|
||||
if (this.config.Dev != 'PROD.') console.log('---- tick ----');
|
||||
this.activePlayersTick++;
|
||||
|
||||
await this.downloadFile(`/games/${this.config.Nitrado.UserID}/noftp/dayzxb/config/DayZServer_X1_x64.ADM`, './logs/server-logs.ADM').then(async () => {
|
||||
await DownloadNitradoFile(`/games/${this.config.Nitrado.UserID}/noftp/dayzxb/config/DayZServer_X1_x64.ADM`, './logs/server-logs.ADM').then(async () => {
|
||||
await this.readLogs(this.config.GuildID).then(async () => {
|
||||
if (this.activePlayersTick == 12) await this.handleActivePlayersList(this.config.GuildID);
|
||||
if (this.activePlayersTick == 12) await HandleActivePlayersList(this.config.GuildID);
|
||||
})
|
||||
});
|
||||
this.logsUpdateTimer(); // restart this function
|
||||
|
||||
Reference in new issue
Block a user