fix/bring back missing functions in NitradoAPI.js

This commit is contained in:
SowinskiBraeden committed 2023-09-03 20:54:09 -07:00
1 parent 26bf295765
commit b94312229a
2 files changed
+57 -14

No files matched your search

+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "dayzr-bot", "name": "dayzr-bot",
"version": "9.5.2", "version": "9.5.3",
"description": "A General Purpose Discord Bot for DayZ Nitrado Servers.", "description": "A General Purpose Discord Bot for DayZ Nitrado Servers.",
"main": "index.js", "main": "index.js",
"nodemonConfig": { "nodemonConfig": {
+56 -13
View File
@@ -8,28 +8,43 @@ const retryDelay = 5000; // 5 seconds
// Private functions (only called locally) // Private functions (only called locally)
const DownloadNitradoFile = async(client, filename, outputDir) => { const HandlePlayerBan = async (client, gamertag, ban) => {
for (let retries = 0; retries <= maxRetries; retries++) { for (let retries = 0; retries <= maxRetries; retries++) {
try { try {
const res = await fetch(`https://api.nitrado.net/services/${client.config.Nitrado.ServerID}/gameservers/file_server/download?file=${filename}`, { // get current bans
const res = await fetch(`https://api.nitrado.net/services/${client.config.Nitrado.ServerID}/gameservers`, {
headers: { headers: {
"Authorization": client.config.Nitrado.Auth "Authorization": client.config.Nitrado.Auth
} }
}).then(response => }).then(response =>
response.json().then(data => data) response.json().then(data => data)
).then(res => res); ).then(res => res);
const stream = fs.createWriteStream(outputDir); let bans = res.data.gameserver.settings.general.bans;
if (!res.data || !res.data.token) { if (ban) bans += `\r\n${gamertag}`;
client.error(`Error downloading File "${filename}":`); else if (!ban) bans = bans.replace(gamertag, '');
client.error(res); else client.error("Incorrect Ban Option: HandlePlayerBan");
return -1;
} const formData = new FormData();
const { body } = await fetch(res.data.token.url); formData.append("category", "general");
await finished(Readable.fromWeb(body).pipe(stream)); formData.append("key", "bans");
return 0; formData.append("value", bans);
formData.pipe(concat(data => {
async function sendList() {
await fetch(`https://api.nitrado.net/services/${client.config.Nitrado.ServerID}/gameservers/settings`, {
method: "POST",
credentials: 'include',
headers: {
...formData.getHeaders(),
"Authorization": client.config.Nitrado.Auth
},
body: data,
});
}
sendList();
}));
} catch (error) { } catch (error) {
if (retries === maxRetries) throw new Error(`DownloadNitradoFile: Failed to fetch data after ${maxRetries} retries`); if (retries === maxRetries) throw new Error(`HandlePlayerBans: Failed to fetch data after ${maxRetries} retries`);
} }
await new Promise(resolve => setTimeout(resolve, retryDelay)); // Delay before retrying await new Promise(resolve => setTimeout(resolve, retryDelay)); // Delay before retrying
} }
@@ -38,6 +53,34 @@ const DownloadNitradoFile = async(client, filename, outputDir) => {
// Public functions (called externally) // Public functions (called externally)
module.exports = { module.exports = {
DownloadNitradoFile: async(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}`, {
headers: {
"Authorization": client.config.Nitrado.Auth
}
}).then(response =>
response.json().then(data => data)
).then(res => res);
const stream = fs.createWriteStream(outputDir);
if (!res.data || !res.data.token) {
client.error(`Error downloading File "${filename}":`);
client.error(res);
return -1;
}
const { body } = await fetch(res.data.token.url);
await finished(Readable.fromWeb(body).pipe(stream));
return 0;
} catch (error) {
if (retries === maxRetries) throw new Error(`DownloadNitradoFile: Failed to fetch data after ${maxRetries} retries`);
}
await new Promise(resolve => setTimeout(resolve, retryDelay)); // Delay before retrying
}
},
/* /*
Export explicit function names; i.e BanPlayer() & UnbanPlayer() Export explicit function names; i.e BanPlayer() & UnbanPlayer()
that call to the private parent function HandlePlayerBan() that call to the private parent function HandlePlayerBan()