logan/drb-server
1
0
Fork 0
Code Issues 16 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Linting
All checks were successful
release-tag / release-image (push) Successful in 1m52s
Details
Lint JavaScript/Node.js / lint-js (push) Successful in 11s
Details
DRB Tests / drb_mocha_tests (push) Successful in 29s
Details

Browse Source
This commit is contained in:
Logan Cusano
2024-08-11 15:57:46 -04:00
parent 5cd47378d6
commit 117cbea67f
37 changed files with 2273 additions and 1738 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
addons/example/index.js
View File

@@ -4,16 +4,19 @@ const log = new DebugBuilder("server", "server");
// Function called by the main application to initialize the addon // Function called by the main application to initialize the addon
export function initialize(nodeIo, config) { export function initialize(nodeIo, config) {
log.INFO(`Initializing ${config.name}`); log.INFO(`Initializing ${config.name}`);
// Call other functions within the addon module // Call other functions within the addon module
registerSocketEvents(nodeIo, config); registerSocketEvents(nodeIo, config);
// Call additional initialization functions if needed // Call additional initialization functions if needed
} }
// Function to register Socket.IO event handlers // Function to register Socket.IO event handlers
function registerSocketEvents(nodeIo, config) { function registerSocketEvents(nodeIo, config) {
nodeIo.on(config.options.eventName, (data) => { nodeIo.on(config.options.eventName, (data) => {
log.DEBUG(`Received event "${config.options.eventName}" from client:`, data); log.DEBUG(
}); `Received event "${config.options.eventName}" from client:`,
data,
);
});
} }

94
discordBot/addons/gptInteraction.mjs
View File

@@ -3,51 +3,55 @@ const log = new DebugBuilder("server", "discordBot.addons.gptInteraction");
import { gptHandler } from "../modules/gptHandler.mjs"; import { gptHandler } from "../modules/gptHandler.mjs";
export const gptInteraction = async (nodeIo, message) => { export const gptInteraction = async (nodeIo, message) => {
let conversation = []; let conversation = [];
let prevMessages = await message.channel.messages.fetch({ limit: 10 }); let prevMessages = await message.channel.messages.fetch({ limit: 10 });
prevMessages.reverse(); prevMessages.reverse();
prevMessages.forEach((msg) => { prevMessages.forEach((msg) => {
// Check if the message was sent within the last 24 hours // Check if the message was sent within the last 24 hours
if (new Date().getTime() - msg.createdTimestamp > (24 * 60 * 60 * 1000)) { if (new Date().getTime() - msg.createdTimestamp > 24 * 60 * 60 * 1000) {
return; return;
}
// Check if it's from a bot other than the server
if (msg.author.bot && msg.author.id !== nodeIo.serverClient.user.id) return;
const username = msg.author.username.replace(/\s+/g, '_').replace(/[^\w\s]/gi, '');
if (msg.author.id === nodeIo.serverClient.user.id) {
conversation.push({
role: 'assistant',
//name: msg.author.id,
content: msg.content,
});
return;
}
conversation.push({
role: 'user',
//name: msg.author.id,
content: msg.content.replace(`<@${nodeIo.serverClient.user.id}>`, ''),
});
});
const response = await gptHandler(conversation);
if (response) {
const responseMessage = response;
const chunkSize = 2500;
for (let i = 0; i < responseMessage.length; i += chunkSize) {
const chunk = responseMessage.substring(i, i + chunkSize);
log.DEBUG("Sending message chunk:", chunk);
await message.reply(chunk);
}
} else {
message.channel.send('Sorry, I encountered an error while processing your request.');
} }
}
// Check if it's from a bot other than the server
if (msg.author.bot && msg.author.id !== nodeIo.serverClient.user.id) return;
const username = msg.author.username
.replace(/\s+/g, "_")
.replace(/[^\w\s]/gi, "");
if (msg.author.id === nodeIo.serverClient.user.id) {
conversation.push({
role: "assistant",
//name: msg.author.id,
content: msg.content,
});
return;
}
conversation.push({
role: "user",
//name: msg.author.id,
content: msg.content.replace(`<@${nodeIo.serverClient.user.id}>`, ""),
});
});
const response = await gptHandler(conversation);
if (response) {
const responseMessage = response;
const chunkSize = 2500;
for (let i = 0; i < responseMessage.length; i += chunkSize) {
const chunk = responseMessage.substring(i, i + chunkSize);
log.DEBUG("Sending message chunk:", chunk);
await message.reply(chunk);
}
} else {
message.channel.send(
"Sorry, I encountered an error while processing your request.",
);
}
};

122
discordBot/addons/linkCop.mjs
View File

@@ -1,83 +1,93 @@
import { DebugBuilder } from "../../modules/debugger.mjs"; import { DebugBuilder } from "../../modules/debugger.mjs";
const log = new DebugBuilder("server", "discordBot.addons.linkCop"); const log = new DebugBuilder("server", "discordBot.addons.linkCop");
import { gptHandler } from "../modules/gptHandler.mjs"; import { gptHandler } from "../modules/gptHandler.mjs";
import dotenv from 'dotenv'; import dotenv from "dotenv";
dotenv.config(); dotenv.config();
const approvedLinksChannel = "767303243285790721"; const approvedLinksChannel = "767303243285790721";
const restrictedChannelIds = process.env.LINKCOP_RESTRICTED_CHANNEL_IDS.split(','); const restrictedChannelIds =
process.env.LINKCOP_RESTRICTED_CHANNEL_IDS.split(",");
const linkRegExp = /(?:http[s]?:\/\/)?(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b(?:[-a-zA-Z0-9()@:%_\+.~#?&\/=]*)/g const linkRegExp =
/(?:http[s]?:\/\/)?(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b(?:[-a-zA-Z0-9()@:%_\+.~#?&\/=]*)/g;
export const linkCop = async (nodeIo, message) => { export const linkCop = async (nodeIo, message) => {
if (message.channel.id == approvedLinksChannel || !restrictedChannelIds.includes(message.channel.id)) return false; if (
message.channel.id == approvedLinksChannel ||
!restrictedChannelIds.includes(message.channel.id)
)
return false;
const urls = String(message.content).matchAll(linkRegExp); const urls = String(message.content).matchAll(linkRegExp);
if (!urls || urls.length === 0) return false; if (!urls || urls.length === 0) return false;
log.DEBUG("Found URLs: ", urls); log.DEBUG("Found URLs: ", urls);
let conversation = []; let conversation = [];
let prevMessages = await message.channel.messages.fetch({ limit: 2 }); let prevMessages = await message.channel.messages.fetch({ limit: 2 });
prevMessages.reverse(); prevMessages.reverse();
prevMessages.forEach((msg) => { prevMessages.forEach((msg) => {
// Check if the message was sent within the last 5 minutes // Check if the message was sent within the last 5 minutes
if (new Date().getTime() - msg.createdTimestamp > (5 * 60 * 1000)) { if (new Date().getTime() - msg.createdTimestamp > 5 * 60 * 1000) {
return; return;
} }
// Check if it's from a bot other than the server // Check if it's from a bot other than the server
if (msg.author.bot && msg.author.id !== nodeIo.serverClient.user.id) return; if (msg.author.bot && msg.author.id !== nodeIo.serverClient.user.id) return;
const username = msg.author.username.replace(/\s+/g, '_').replace(/[^\w\s]/gi, ''); const username = msg.author.username
.replace(/\s+/g, "_")
.replace(/[^\w\s]/gi, "");
if (msg.author.id === nodeIo.serverClient.user.id) { if (msg.author.id === nodeIo.serverClient.user.id) {
conversation.push({ conversation.push({
role: 'assistant', role: "assistant",
//name: msg.author.id, //name: msg.author.id,
content: msg.content, content: msg.content,
}); });
return; return;
} }
conversation.push({
role: 'user',
//name: msg.author.id,
content: msg.content.replace(`<@${nodeIo.serverClient.user.id}>`, ''),
});
});
conversation.push({ conversation.push({
role: 'assistant', role: "user",
content: `There has been a link posted to a channel that links are not allowed in. The above messages are from the channel that links are not allowed including the message with the link. The message with the link is going to be deleted and moved to the '#links' channels. You are replying to the message with the link to let the user know.` //name: msg.author.id,
content: msg.content.replace(`<@${nodeIo.serverClient.user.id}>`, ""),
}); });
});
const response = await gptHandler(conversation); conversation.push({
role: "assistant",
content: `There has been a link posted to a channel that links are not allowed in. The above messages are from the channel that links are not allowed including the message with the link. The message with the link is going to be deleted and moved to the '#links' channels. You are replying to the message with the link to let the user know.`,
});
if (response) { const response = await gptHandler(conversation);
const responseMessage = response;
const chunkSize = 2000;
for (let i = 0; i < responseMessage.length; i += chunkSize) { if (response) {
const chunk = responseMessage.substring(i, i + chunkSize); const responseMessage = response;
const chunkSize = 2000;
log.DEBUG("Sending message chunk:", chunk); for (let i = 0; i < responseMessage.length; i += chunkSize) {
const chunk = responseMessage.substring(i, i + chunkSize);
await message.reply(chunk); log.DEBUG("Sending message chunk:", chunk);
}
const messageContent = { await message.reply(chunk);
'author': message.author,
'content': `<@${message.author.id}> - ${String(message.content)}`,
'channelId': message.channelId,
'links': urls
}
await message.delete();
log.DEBUG("Message content: ", messageContent);
message.client.channels.cache.get(approvedLinksChannel).send(messageContent);
} }
}
const messageContent = {
author: message.author,
content: `<@${message.author.id}> - ${String(message.content)}`,
channelId: message.channelId,
links: urls,
};
await message.delete();
log.DEBUG("Message content: ", messageContent);
message.client.channels.cache
.get(approvedLinksChannel)
.send(messageContent);
}
};

28
discordBot/commands/connections.mjs
View File

@@ -1,11 +1,11 @@
import { DebugBuilder } from "../../modules/debugger.mjs"; import { DebugBuilder } from "../../modules/debugger.mjs";
const log = new DebugBuilder("server", "discordBot.command.ping"); const log = new DebugBuilder("server", "discordBot.command.ping");
import { SlashCommandBuilder } from 'discord.js'; import { SlashCommandBuilder } from "discord.js";
// Exporting data property that contains the command structure for discord including any params // Exporting data property that contains the command structure for discord including any params
export const data = new SlashCommandBuilder() export const data = new SlashCommandBuilder()
.setName('connections') .setName("connections")
.setDescription('Check to see what bots are online.'); .setDescription("Check to see what bots are online.");
// Exporting other properties // Exporting other properties
export const example = "/connections"; // An example of how the command would be run in discord chat, this will be used for the help command export const example = "/connections"; // An example of how the command would be run in discord chat, this will be used for the help command
@@ -33,20 +33,20 @@ export async function autocomplete(nodeIo, interaction) {
*/ */
export const execute = async (nodeIo, interaction) => { export const execute = async (nodeIo, interaction) => {
try { try {
const sockets = await nodeIo.allSockets(); const sockets = await nodeIo.allSockets();
log.DEBUG("All open sockets: ",sockets); log.DEBUG("All open sockets: ", sockets);
let socketMessage = ""; let socketMessage = "";
// Create the message for discord with each socket on a new line // Create the message for discord with each socket on a new line
sockets.forEach(socket => { sockets.forEach((socket) => {
socketMessage += `\n${socket}` socketMessage += `\n${socket}`;
}); });
await interaction.reply(`**Online Sockets: '${socketMessage}'**`); await interaction.reply(`**Online Sockets: '${socketMessage}'**`);
//await interaction.reply('**Pong.**'); //await interaction.reply('**Pong.**');
//await interaction.channel.send('**Pong.**'); //await interaction.channel.send('**Pong.**');
} catch (err) { } catch (err) {
console.error(err); console.error(err);
// await interaction.reply(err.toString()); // await interaction.reply(err.toString());
} }
} };

86
discordBot/commands/join.mjs
View File

@@ -1,19 +1,28 @@
import { DebugBuilder } from "../../modules/debugger.mjs"; import { DebugBuilder } from "../../modules/debugger.mjs";
import { SlashCommandBuilder } from 'discord.js'; import { SlashCommandBuilder } from "discord.js";
import { joinNode, getAvailableNodes, promptNodeSelection, getUserVoiceChannel } from '../modules/wrappers.mjs'; import {
import { getAllSystems, getSystemByName } from '../../modules/mongo-wrappers/mongoSystemsWrappers.mjs'; joinNode,
getAvailableNodes,
promptNodeSelection,
getUserVoiceChannel,
} from "../modules/wrappers.mjs";
import {
getAllSystems,
getSystemByName,
} from "../../modules/mongo-wrappers/mongoSystemsWrappers.mjs";
const log = new DebugBuilder("server", "discordBot.command.join"); const log = new DebugBuilder("server", "discordBot.command.join");
// Exporting data property // Exporting data property
export const data = new SlashCommandBuilder() export const data = new SlashCommandBuilder()
.setName('join') .setName("join")
.setDescription('Listen to the selected radio system in your channel') .setDescription("Listen to the selected radio system in your channel")
.addStringOption(system => .addStringOption((system) =>
system.setName('system') system
.setDescription('The radio system you would like to listen to') .setName("system")
.setDescription("The radio system you would like to listen to")
.setRequired(true) .setRequired(true)
.setAutocomplete(true) .setAutocomplete(true),
); );
// Exporting other properties // Exporting other properties
@@ -28,16 +37,17 @@ export const deferInitialReply = true;
export async function autocomplete(nodeIo, interaction) { export async function autocomplete(nodeIo, interaction) {
const focusedValue = interaction.options.getFocused(); const focusedValue = interaction.options.getFocused();
const choices = await getAllSystems(); const choices = await getAllSystems();
const filtered = choices.filter(choice => choice.name.startsWith(focusedValue)); const filtered = choices.filter((choice) =>
choice.name.startsWith(focusedValue),
);
log.DEBUG(focusedValue, choices, filtered); log.DEBUG(focusedValue, choices, filtered);
try { try {
await interaction.respond( await interaction.respond(
filtered.map(choice => ({ name: choice.name, value: choice.name })) filtered.map((choice) => ({ name: choice.name, value: choice.name })),
); );
} } catch (e) {
catch (e) {
log.WARN("Autocomplete interaction failure", e); log.WARN("Autocomplete interaction failure", e);
} }
} }
@@ -54,40 +64,66 @@ export async function execute(nodeIo, interaction) {
if (!channelToJoin) return; if (!channelToJoin) return;
// Get the selected system // Get the selected system
const selectedSystemName = interaction.options.getString('system'); const selectedSystemName = interaction.options.getString("system");
const system = await getSystemByName(selectedSystemName); const system = await getSystemByName(selectedSystemName);
// Check if there was a system found by the given system name // Check if there was a system found by the given system name
if (!system) { if (!system) {
await interaction.editReply({ content: `System '${selectedSystemName}' not found.`, ephemeral: true }); await interaction.editReply({
content: `System '${selectedSystemName}' not found.`,
ephemeral: true,
});
return; return;
} }
// Get the available nodes for this system // Get the available nodes for this system
const availableNodes = await getAvailableNodes(nodeIo, interaction.guild.id, system); const availableNodes = await getAvailableNodes(
nodeIo,
interaction.guild.id,
system,
);
// Check if there are available nodes // Check if there are available nodes
if (availableNodes.length === 0) { if (availableNodes.length === 0) {
// If not, let the user know // If not, let the user know
await interaction.editReply(`<@${interaction.member.id}>, the selected system has no available nodes`); await interaction.editReply(
`<@${interaction.member.id}>, the selected system has no available nodes`,
);
return; return;
} }
// If there is one available node, request that node join // If there is one available node, request that node join
if (availableNodes.length === 1) { if (availableNodes.length === 1) {
await joinNode(nodeIo, interaction, availableNodes[0].id, system, channelToJoin); await joinNode(
nodeIo,
interaction,
availableNodes[0].id,
system,
channelToJoin,
);
} }
// If there are more than one available, prompt the user for their selected node // If there are more than one available, prompt the user for their selected node
else { else {
await promptNodeSelection(interaction, availableNodes, async selectedNode => { await promptNodeSelection(
await joinNode(nodeIo, interaction, selectedNode, system, channelToJoin); interaction,
}); availableNodes,
async (selectedNode) => {
await joinNode(
nodeIo,
interaction,
selectedNode,
system,
channelToJoin,
);
},
);
} }
} } catch (err) {
catch (err) {
log.ERROR(err); log.ERROR(err);
await interaction.editReply({ content: `An error occurred: ${err.message}`, ephemeral: true }); await interaction.editReply({
content: `An error occurred: ${err.message}`,
ephemeral: true,
});
} }
} }

47
discordBot/commands/leave.mjs
View File

@@ -1,19 +1,23 @@
import { DebugBuilder } from "../../modules/debugger.mjs"; import { DebugBuilder } from "../../modules/debugger.mjs";
import { SlashCommandBuilder } from 'discord.js'; import { SlashCommandBuilder } from "discord.js";
import { requestBotLeaveServer, getSocketIdByNuid } from '../../modules/socketServerWrappers.mjs'; import {
import { checkOnlineBotsInGuild } from '../modules/wrappers.mjs'; requestBotLeaveServer,
getSocketIdByNuid,
} from "../../modules/socketServerWrappers.mjs";
import { checkOnlineBotsInGuild } from "../modules/wrappers.mjs";
const log = new DebugBuilder("server", "discordBot.command.leave"); const log = new DebugBuilder("server", "discordBot.command.leave");
// Exporting data property // Exporting data property
export const data = new SlashCommandBuilder() export const data = new SlashCommandBuilder()
.setName('leave') .setName("leave")
.setDescription('Disconnect a bot from the server') .setDescription("Disconnect a bot from the server")
.addStringOption(system => .addStringOption((system) =>
system.setName('bot') system
.setDescription('The bot you would like to disconnect') .setName("bot")
.setDescription("The bot you would like to disconnect")
.setRequired(true) .setRequired(true)
.setAutocomplete(true) .setAutocomplete(true),
); );
// Exporting other properties // Exporting other properties
@@ -32,15 +36,14 @@ export async function autocomplete(nodeIo, interaction) {
log.DEBUG(choices); log.DEBUG(choices);
const filtered = choices const filtered = choices
.filter(choice => choice.name.startsWith(focusedValue)) .filter((choice) => choice.name.startsWith(focusedValue))
.map(choice => ({ name: choice.name, value: choice.nuid })); .map((choice) => ({ name: choice.name, value: choice.nuid }));
log.DEBUG(focusedValue, choices, filtered); log.DEBUG(focusedValue, choices, filtered);
try{ try {
await interaction.respond(filtered); await interaction.respond(filtered);
} } catch (e) {
catch (e) {
log.WARN("Autocomplete interaction failure", e); log.WARN("Autocomplete interaction failure", e);
} }
} }
@@ -52,19 +55,27 @@ export async function autocomplete(nodeIo, interaction) {
*/ */
export async function execute(nodeIo, interaction) { export async function execute(nodeIo, interaction) {
try { try {
const selectedNode = interaction.options.getString('bot'); const selectedNode = interaction.options.getString("bot");
const socket = await getSocketIdByNuid(nodeIo, selectedNode); const socket = await getSocketIdByNuid(nodeIo, selectedNode);
if (!socket) { if (!socket) {
await interaction.editReply({ content: `Bot '${selectedNode}' not found or not connected.`, ephemeral: true }); await interaction.editReply({
content: `Bot '${selectedNode}' not found or not connected.`,
ephemeral: true,
});
return; return;
} }
await requestBotLeaveServer(socket, interaction.guild.id); await requestBotLeaveServer(socket, interaction.guild.id);
await interaction.editReply(`Ok <@${interaction.member.id}>, the bot is leaving shortly.`); await interaction.editReply(
`Ok <@${interaction.member.id}>, the bot is leaving shortly.`,
);
} catch (err) { } catch (err) {
log.ERROR("Failed to disconnect bot:", err); log.ERROR("Failed to disconnect bot:", err);
await interaction.editReply({ content: `An error occurred: ${err.message}`, ephemeral: true }); await interaction.editReply({
content: `An error occurred: ${err.message}`,
ephemeral: true,
});
} }
} }

18
discordBot/commands/ping.mjs
View File

@@ -1,11 +1,11 @@
import { DebugBuilder } from "../../modules/debugger.mjs"; import { DebugBuilder } from "../../modules/debugger.mjs";
const log = new DebugBuilder("server", "discordBot.command.ping"); const log = new DebugBuilder("server", "discordBot.command.ping");
import { SlashCommandBuilder } from 'discord.js'; import { SlashCommandBuilder } from "discord.js";
// Exporting data property that contains the command structure for discord including any params // Exporting data property that contains the command structure for discord including any params
export const data = new SlashCommandBuilder() export const data = new SlashCommandBuilder()
.setName('ping') .setName("ping")
.setDescription('Replies with your input!'); .setDescription("Replies with your input!");
// Exporting other properties // Exporting other properties
export const example = "/ping"; // An example of how the command would be run in discord chat, this will be used for the help command export const example = "/ping"; // An example of how the command would be run in discord chat, this will be used for the help command
@@ -33,13 +33,13 @@ export async function autocomplete(nodeIo, interaction) {
*/ */
export const execute = async (nodeIo, interaction) => { export const execute = async (nodeIo, interaction) => {
try { try {
const sockets = await nodeIo.allSockets(); const sockets = await nodeIo.allSockets();
log.DEBUG("All open sockets: ",sockets); log.DEBUG("All open sockets: ", sockets);
//await interaction.reply(`**Online Sockets: '${sockets}'**`); //await interaction.reply(`**Online Sockets: '${sockets}'**`);
await interaction.reply('**Pong.**'); await interaction.reply("**Pong.**");
//await interaction.channel.send('**Pong.**'); //await interaction.channel.send('**Pong.**');
} catch (err) { } catch (err) {
console.error(err); console.error(err);
// await interaction.reply(err.toString()); // await interaction.reply(err.toString());
} }
} };

81
discordBot/commands/rssAdd.mjs
View File

@@ -1,28 +1,34 @@
import { SlashCommandBuilder } from "discord.js";
import { SlashCommandBuilder } from 'discord.js';
import { DebugBuilder } from "../../modules/debugger.mjs"; import { DebugBuilder } from "../../modules/debugger.mjs";
import { addSource } from '../../rss-manager/sourceManager.mjs' import { addSource } from "../../rss-manager/sourceManager.mjs";
const log = new DebugBuilder("server", "discordBot.command.rssAdd"); const log = new DebugBuilder("server", "discordBot.command.rssAdd");
// Exporting data property that contains the command structure for discord including any params // Exporting data property that contains the command structure for discord including any params
export const data = new SlashCommandBuilder() export const data = new SlashCommandBuilder()
.setName('rss-add') .setName("rss-add")
.setDescription('Add RSS Source') .setDescription("Add RSS Source")
.addStringOption(option => .addStringOption((option) =>
option.setName('title') option
.setDescription('The title of the RSS feed') .setName("title")
.setRequired(true)) .setDescription("The title of the RSS feed")
.addStringOption(option => .setRequired(true),
option.setName('link') )
.setDescription('The link to the RSS feed') .addStringOption((option) =>
.setRequired(true)) option
.addStringOption(option => .setName("link")
option.setName('category') .setDescription("The link to the RSS feed")
.setRequired(true),
)
.addStringOption((option) =>
option
.setName("category")
.setDescription('The category for the RSS feed *("ALL" by default")*') .setDescription('The category for the RSS feed *("ALL" by default")*')
.setRequired(false)) .setRequired(false),
);
// Exporting other properties // Exporting other properties
export const example = "/rss-add [title] [https://domain.com/feed.xml] [category]"; // An example of how the command would be run in discord chat, this will be used for the help command export const example =
"/rss-add [title] [https://domain.com/feed.xml] [category]"; // An example of how the command would be run in discord chat, this will be used for the help command
export const deferInitialReply = false; // If we the initial reply in discord should be deferred. This gives extra time to respond, however the method of replying is different. export const deferInitialReply = false; // If we the initial reply in discord should be deferred. This gives extra time to respond, however the method of replying is different.
/** /**
@@ -49,24 +55,37 @@ export async function autocomplete(nodeIo, interaction) {
*/ */
export const execute = async (nodeIo, interaction) => { export const execute = async (nodeIo, interaction) => {
try { try {
var title = interaction.options.getString('title'); var title = interaction.options.getString("title");
var link = interaction.options.getString('link'); var link = interaction.options.getString("link");
var category = interaction.options.getString('category'); var category = interaction.options.getString("category");
if (!category) category = "ALL"; if (!category) category = "ALL";
await interaction.reply(`Adding ${title} to the list of RSS sources, please wait...`); await interaction.reply(
`Adding ${title} to the list of RSS sources, please wait...`,
);
await addSource(title, link, category, interaction.guildId, interaction.channelId, (err, result) => { await addSource(
log.DEBUG("Result from adding entry", result); title,
link,
category,
interaction.guildId,
interaction.channelId,
(err, result) => {
log.DEBUG("Result from adding entry", result);
if (result) { if (result) {
interaction.editReply(`Successfully added ${title} to the list of RSS sources`); interaction.editReply(
} else { `Successfully added ${title} to the list of RSS sources`,
interaction.editReply(`${title} already exists in the list of RSS sources`); );
} } else {
}); interaction.editReply(
`${title} already exists in the list of RSS sources`,
);
}
},
);
} catch (err) { } catch (err) {
log.ERROR(err) log.ERROR(err);
await interaction.editReply(err.toString()); await interaction.editReply(err.toString());
} }
} };

48
discordBot/commands/rssRemove.mjs
View File

@@ -1,19 +1,23 @@
import { SlashCommandBuilder } from "discord.js";
import { SlashCommandBuilder } from 'discord.js';
import { DebugBuilder } from "../../modules/debugger.mjs"; import { DebugBuilder } from "../../modules/debugger.mjs";
import { removeSource } from '../../rss-manager/sourceManager.mjs' import { removeSource } from "../../rss-manager/sourceManager.mjs";
import { getAllFeeds, deleteFeedByTitle } from '../../modules/mongo-wrappers/mongoFeedsWrappers.mjs' import {
getAllFeeds,
deleteFeedByTitle,
} from "../../modules/mongo-wrappers/mongoFeedsWrappers.mjs";
const log = new DebugBuilder("server", "discordBot.command.rssRemove"); const log = new DebugBuilder("server", "discordBot.command.rssRemove");
// Exporting data property that contains the command structure for discord including any params // Exporting data property that contains the command structure for discord including any params
export const data = new SlashCommandBuilder() export const data = new SlashCommandBuilder()
.setName('rss-remove') .setName("rss-remove")
.setDescription('Add RSS Source') .setDescription("Add RSS Source")
.addStringOption(option => .addStringOption((option) =>
option.setName('title') option
.setDescription('The title of the RSS feed') .setName("title")
.setDescription("The title of the RSS feed")
.setRequired(true) .setRequired(true)
.setAutocomplete(true)) .setAutocomplete(true),
);
// Exporting other properties // Exporting other properties
export const example = "/rss-remove [title]"; // An example of how the command would be run in discord chat, this will be used for the help command export const example = "/rss-remove [title]"; // An example of how the command would be run in discord chat, this will be used for the help command
@@ -27,11 +31,15 @@ export const deferInitialReply = false; // If we the initial reply in discord sh
export async function autocomplete(nodeIo, interaction) { export async function autocomplete(nodeIo, interaction) {
const focusedValue = interaction.options.getFocused(); const focusedValue = interaction.options.getFocused();
const choices = await getAllFeeds() ?? []; const choices = (await getAllFeeds()) ?? [];
log.INFO("RSS Remove Choices:", choices); log.INFO("RSS Remove Choices:", choices);
const filtered = choices.filter(choice => choice.title.startsWith(focusedValue)); const filtered = choices.filter((choice) =>
choice.title.startsWith(focusedValue),
);
log.DEBUG(focusedValue, choices, filtered); log.DEBUG(focusedValue, choices, filtered);
await interaction.respond(filtered.map(choice => ({ name: choice.title, value: choice.title }))); await interaction.respond(
filtered.map((choice) => ({ name: choice.title, value: choice.title })),
);
} }
/** /**
@@ -41,8 +49,10 @@ export async function autocomplete(nodeIo, interaction) {
*/ */
export const execute = async (nodeIo, interaction) => { export const execute = async (nodeIo, interaction) => {
try { try {
var title = interaction.options.getString('title'); var title = interaction.options.getString("title");
await interaction.reply(`Removing ${title} from the list of RSS sources, please wait...`); await interaction.reply(
`Removing ${title} from the list of RSS sources, please wait...`,
);
const results = await deleteFeedByTitle(title); const results = await deleteFeedByTitle(title);
if (!results) { if (!results) {
@@ -50,9 +60,11 @@ export const execute = async (nodeIo, interaction) => {
await interaction.editReply(`Failed to remove source: '${title}'`); await interaction.editReply(`Failed to remove source: '${title}'`);
return; return;
} }
await interaction.editReply(`${title} was successfully removed from the RSS sources.`) await interaction.editReply(
`${title} was successfully removed from the RSS sources.`,
);
} catch (err) { } catch (err) {
log.ERROR(err) log.ERROR(err);
await interaction.editReply(err.toString()); await interaction.editReply(err.toString());
} }
} };

32
discordBot/commands/rssTrigger.mjs
View File

@@ -1,12 +1,12 @@
import { DebugBuilder } from "../../modules/debugger.mjs"; import { DebugBuilder } from "../../modules/debugger.mjs";
const log = new DebugBuilder("server", "discordBot.command.rssTrigger"); const log = new DebugBuilder("server", "discordBot.command.rssTrigger");
import { SlashCommandBuilder } from 'discord.js'; import { SlashCommandBuilder } from "discord.js";
import { updateFeeds } from '../../rss-manager/feedHandler.mjs' import { updateFeeds } from "../../rss-manager/feedHandler.mjs";
// Exporting data property that contains the command structure for discord including any params // Exporting data property that contains the command structure for discord including any params
export const data = new SlashCommandBuilder() export const data = new SlashCommandBuilder()
.setName('rss-trigger') .setName("rss-trigger")
.setDescription('Manually triggers an RSS feed update'); .setDescription("Manually triggers an RSS feed update");
// Exporting other properties // Exporting other properties
export const example = "/rss-trigger"; // An example of how the command would be run in discord chat, this will be used for the help command export const example = "/rss-trigger"; // An example of how the command would be run in discord chat, this will be used for the help command
@@ -33,15 +33,15 @@ export async function autocomplete(nodeIo, interaction) {
* @param {any} interaction The interaction object * @param {any} interaction The interaction object
*/ */
export const execute = async (nodeIo, interaction) => { export const execute = async (nodeIo, interaction) => {
try { try {
//const sockets = await nodeIo.allSockets(); //const sockets = await nodeIo.allSockets();
//await interaction.reply(`**Online Sockets: '${sockets}'**`); //await interaction.reply(`**Online Sockets: '${sockets}'**`);
await interaction.reply('Triggering RSS update'); await interaction.reply("Triggering RSS update");
await updateFeeds(interaction.client); await updateFeeds(interaction.client);
await interaction.editReply('RSS Update Completed'); await interaction.editReply("RSS Update Completed");
//await interaction.channel.send('**Pong.**'); //await interaction.channel.send('**Pong.**');
} catch (err) { } catch (err) {
console.error(err); console.error(err);
// await interaction.reply(err.toString()); // await interaction.reply(err.toString());
} }
} };

24
discordBot/commands/update.mjs
View File

@@ -1,12 +1,12 @@
import { DebugBuilder } from "../../modules/debugger.mjs"; import { DebugBuilder } from "../../modules/debugger.mjs";
const log = new DebugBuilder("server", "discordBot.command.update"); const log = new DebugBuilder("server", "discordBot.command.update");
import { SlashCommandBuilder } from 'discord.js'; import { SlashCommandBuilder } from "discord.js";
import { requestNodeUpdate } from '../../modules/socketServerWrappers.mjs'; import { requestNodeUpdate } from "../../modules/socketServerWrappers.mjs";
// Exporting data property that contains the command structure for discord including any params // Exporting data property that contains the command structure for discord including any params
export const data = new SlashCommandBuilder() export const data = new SlashCommandBuilder()
.setName('update') .setName("update")
.setDescription('Updates all nodes currently logged on'); .setDescription("Updates all nodes currently logged on");
// Exporting other properties // Exporting other properties
export const example = "/update"; // An example of how the command would be run in discord chat, this will be used for the help command export const example = "/update"; // An example of how the command would be run in discord chat, this will be used for the help command
@@ -19,19 +19,21 @@ export const deferInitialReply = false; // If we the initial reply in discord sh
*/ */
export const execute = async (nodeIo, interaction) => { export const execute = async (nodeIo, interaction) => {
try { try {
const openSockets = [...await nodeIo.allSockets()]; // TODO - Filter the returned nodes to only nodes that have the radio capability const openSockets = [...(await nodeIo.allSockets())]; // TODO - Filter the returned nodes to only nodes that have the radio capability
log.DEBUG("All open sockets: ", openSockets); log.DEBUG("All open sockets: ", openSockets);
// Check each open socket to see if the node has the requested system // Check each open socket to see if the node has the requested system
await Promise.all(openSockets.map(openSocket => { await Promise.all(
openSocket = nodeIo.sockets.sockets.get(openSocket); openSockets.map((openSocket) => {
requestNodeUpdate(openSocket); openSocket = nodeIo.sockets.sockets.get(openSocket);
})); requestNodeUpdate(openSocket);
}),
);
//await interaction.reply(`**Online Sockets: '${sockets}'**`); //await interaction.reply(`**Online Sockets: '${sockets}'**`);
await interaction.reply('All nodes have been requested to update'); await interaction.reply("All nodes have been requested to update");
//await interaction.channel.send('**Pong.**'); //await interaction.channel.send('**Pong.**');
} catch (err) { } catch (err) {
console.error(err); console.error(err);
// await interaction.reply(err.toString()); // await interaction.reply(err.toString());
} }
} };

151
discordBot/discordBot.mjs
View File

@@ -1,20 +1,22 @@
import { DebugBuilder } from "../modules/debugger.mjs"; import { DebugBuilder } from "../modules/debugger.mjs";
import { Client, GatewayIntentBits, Collection } from 'discord.js'; import { Client, GatewayIntentBits, Collection } from "discord.js";
import { registerActiveCommands, unregisterAllCommands } from './modules/registerCommands.mjs' import {
import { RSSController } from '../rss-manager/rssController.mjs' registerActiveCommands,
import { join, dirname } from 'path'; unregisterAllCommands,
import { readdirSync } from 'fs'; } from "./modules/registerCommands.mjs";
import { fileURLToPath } from 'url'; import { RSSController } from "../rss-manager/rssController.mjs";
import { join, dirname } from "path";
import { readdirSync } from "fs";
import { fileURLToPath } from "url";
import dotenv from 'dotenv'; import dotenv from "dotenv";
dotenv.config() dotenv.config();
const log = new DebugBuilder("server", "discordBot"); const log = new DebugBuilder("server", "discordBot");
const __filename = fileURLToPath(import.meta.url); const __filename = fileURLToPath(import.meta.url);
const __dirname = dirname(__filename); const __dirname = dirname(__filename);
/** /**
* Add the enabled commands to the bot to be used by users in discord * Add the enabled commands to the bot to be used by users in discord
* (commands that end in '.mjs' will be enabled, to disable just remove the extension or replace with '.mjs.disabled') * (commands that end in '.mjs' will be enabled, to disable just remove the extension or replace with '.mjs.disabled')
@@ -22,36 +24,41 @@ const __dirname = dirname(__filename);
* @param {any} _commandsPath="./commands" * @param {any} _commandsPath="./commands"
* @returns {any} * @returns {any}
*/ */
export const addEnabledCommands = async (serverClient, _commandsPath = "./commands") => { export const addEnabledCommands = async (
// Setup commands for the Discord bot serverClient,
serverClient.commands = new Collection(); _commandsPath = "./commands",
const commandsPath = join(__dirname, _commandsPath); ) => {
const commandFiles = readdirSync(commandsPath).filter(file => file.endsWith('.mjs')); // Setup commands for the Discord bot
serverClient.commands = new Collection();
const commandsPath = join(__dirname, _commandsPath);
const commandFiles = readdirSync(commandsPath).filter((file) =>
file.endsWith(".mjs"),
);
for (const file of commandFiles) { for (const file of commandFiles) {
const filePath = await join(commandsPath, file); const filePath = await join(commandsPath, file);
log.INFO(`Adding enabled command: ${filePath}`); log.INFO(`Adding enabled command: ${filePath}`);
await import(`file://${filePath}`).then(command => { await import(`file://${filePath}`).then((command) => {
if (command.data instanceof Promise) { if (command.data instanceof Promise) {
command.data.then(async (builder) => { command.data.then(async (builder) => {
command.data = builder; command.data = builder;
log.DEBUG("Importing command: ", command.data.name, command); log.DEBUG("Importing command: ", command.data.name, command);
// Set a new item in the Collection // Set a new item in the Collection
// With the key as the command name and the value as the exported module // With the key as the command name and the value as the exported module
serverClient.commands.set(command.data.name, command); serverClient.commands.set(command.data.name, command);
}); });
} else { } else {
log.DEBUG("Importing command: ", command.data.name, command); log.DEBUG("Importing command: ", command.data.name, command);
// Set a new item in the Collection // Set a new item in the Collection
// With the key as the command name and the value as the exported module // With the key as the command name and the value as the exported module
serverClient.commands.set(command.data.name, command); serverClient.commands.set(command.data.name, command);
} }
}) });
} }
// Register the commands currently in use by the bot // Register the commands currently in use by the bot
await registerActiveCommands(serverClient); await registerActiveCommands(serverClient);
} };
/** /**
* Add the enabled event listeners to the bot * Add the enabled event listeners to the bot
@@ -60,42 +67,60 @@ export const addEnabledCommands = async (serverClient, _commandsPath = "./comman
* @param {any} _eventsPath="./events" * @param {any} _eventsPath="./events"
* @returns {any} * @returns {any}
*/ */
export function addEnabledEventListeners(serverClient, _eventsPath = "./events") { export function addEnabledEventListeners(
const eventsPath = join(__dirname, _eventsPath); serverClient,
const eventFiles = readdirSync(eventsPath).filter(file => file.endsWith('.mjs')); _eventsPath = "./events",
) {
const eventsPath = join(__dirname, _eventsPath);
const eventFiles = readdirSync(eventsPath).filter((file) =>
file.endsWith(".mjs"),
);
for (const file of eventFiles) { for (const file of eventFiles) {
const filePath = join(eventsPath, file); const filePath = join(eventsPath, file);
log.INFO(`Adding enabled event listener: ${filePath}`); log.INFO(`Adding enabled event listener: ${filePath}`);
import(`file://${filePath}`).then(event => { import(`file://${filePath}`).then((event) => {
log.DEBUG("Adding event: ", event); log.DEBUG("Adding event: ", event);
if (event.once) { if (event.once) {
serverClient.once(event.name, (...args) => event.execute(serverClient.nodeIo, ...args)); serverClient.once(event.name, (...args) =>
} else { event.execute(serverClient.nodeIo, ...args),
serverClient.on(event.name, (...args) => event.execute(serverClient.nodeIo, ...args)); );
} } else {
}) serverClient.on(event.name, (...args) =>
} event.execute(serverClient.nodeIo, ...args),
);
}
});
}
} }
// The discord client // The discord client
export const serverClient = new Client({ intents: [GatewayIntentBits.Guilds, GatewayIntentBits.GuildVoiceStates, GatewayIntentBits.GuildMessages, GatewayIntentBits.MessageContent, GatewayIntentBits.GuildMembers, GatewayIntentBits.GuildPresences] }); export const serverClient = new Client({
intents: [
GatewayIntentBits.Guilds,
GatewayIntentBits.GuildVoiceStates,
GatewayIntentBits.GuildMessages,
GatewayIntentBits.MessageContent,
GatewayIntentBits.GuildMembers,
GatewayIntentBits.GuildPresences,
],
});
// Run when the bot is ready // Run when the bot is ready
serverClient.on('ready', async () => { serverClient.on("ready", async () => {
log.INFO(`Logged in as ${serverClient.user.tag}!`); log.INFO(`Logged in as ${serverClient.user.tag}!`);
// Add and register commands // Add and register commands
await addEnabledCommands(serverClient); await addEnabledCommands(serverClient);
// Config the discord bot with events // Config the discord bot with events
await addEnabledEventListeners(serverClient); await addEnabledEventListeners(serverClient);
// Start the RSS Controller // Start the RSS Controller
serverClient.RSSController = await new RSSController(serverClient); serverClient.RSSController = await new RSSController(serverClient);
serverClient.RSSController.start(); serverClient.RSSController.start();
log.INFO("RSS Controller:", serverClient.RSSController); log.INFO("RSS Controller:", serverClient.RSSController);
}); });
// Startup the discord bot // Startup the discord bot

17
discordBot/events/guildCreate.mjs
View File

@@ -1,16 +1,19 @@
import { DebugBuilder } from "../../modules/debugger.mjs"; import { DebugBuilder } from "../../modules/debugger.mjs";
const log = new DebugBuilder("server", "discordBot.events.guildCreate"); const log = new DebugBuilder("server", "discordBot.events.guildCreate");
import { Events } from 'discord.js'; import { Events } from "discord.js";
import { addEnabledCommands, addEnabledEventListeners } from "../discordBot.mjs"; import {
addEnabledCommands,
addEnabledEventListeners,
} from "../discordBot.mjs";
export const name = Events.GuildMemberAdd; export const name = Events.GuildMemberAdd;
export async function execute(nodeIo, guild) { export async function execute(nodeIo, guild) {
log.INFO("Bot has joined a new server", guild); log.INFO("Bot has joined a new server", guild);
log.DEBUG("Refreshing commands enabled"); log.DEBUG("Refreshing commands enabled");
await addEnabledCommands(nodeIo.serverClient); await addEnabledCommands(nodeIo.serverClient);
log.DEBUG("Refreshing events enabled"); log.DEBUG("Refreshing events enabled");
await addEnabledEventListeners(nodeIo.serverClient); await addEnabledEventListeners(nodeIo.serverClient);
} }

35
discordBot/events/guildMemberAdd.mjs
View File

@@ -1,8 +1,8 @@
import { DebugBuilder } from "../../modules/debugger.mjs"; import { DebugBuilder } from "../../modules/debugger.mjs";
const log = new DebugBuilder("server", "discordBot.events.guildMemberAdd"); const log = new DebugBuilder("server", "discordBot.events.guildMemberAdd");
import dotenv from 'dotenv'; import dotenv from "dotenv";
dotenv.config(); dotenv.config();
import { Events } from 'discord.js'; import { Events } from "discord.js";
import { gptHandler } from "../modules/gptHandler.mjs"; import { gptHandler } from "../modules/gptHandler.mjs";
const welcomeChannel = process.env.WELCOME_CHANNEL_ID; // TODO - Need to add a DB section for server configs so it's not static to one server const welcomeChannel = process.env.WELCOME_CHANNEL_ID; // TODO - Need to add a DB section for server configs so it's not static to one server
@@ -10,25 +10,24 @@ const welcomeChannel = process.env.WELCOME_CHANNEL_ID; // TODO - Need to add a D
export const name = Events.GuildMemberAdd; export const name = Events.GuildMemberAdd;
export async function execute(nodeIo, member) { export async function execute(nodeIo, member) {
log.INFO("New user joined the server", member); log.INFO("New user joined the server", member);
let conversation = []; let conversation = [];
conversation.push({ conversation.push({
role: 'assistant', role: "assistant",
content: `A new user has joined the server. Their name is '<@${member.id}>'. Please welcome them to the server and remind them about the rules.` content: `A new user has joined the server. Their name is '<@${member.id}>'. Please welcome them to the server and remind them about the rules.`,
}) });
const response = await gptHandler(conversation); const response = await gptHandler(conversation);
if (response) { if (response) {
const responseMessage = response.choices[0].message.content; const responseMessage = response.choices[0].message.content;
const chunkSize = 2500; const chunkSize = 2500;
for (let i = 0; i < responseMessage.length; i += chunkSize) { for (let i = 0; i < responseMessage.length; i += chunkSize) {
const chunk = responseMessage.substring(i, i + chunkSize); const chunk = responseMessage.substring(i, i + chunkSize);
log.DEBUG("Sending message chunk:", chunk); log.DEBUG("Sending message chunk:", chunk);
await nodeIo.serverClient.channels.cache.get(welcomeChannel).send(chunk); await nodeIo.serverClient.channels.cache.get(welcomeChannel).send(chunk);
}
} }
}
} }

6
discordBot/events/interactionCreate.mjs
View File

@@ -1,6 +1,6 @@
import { DebugBuilder } from "../../modules/debugger.mjs"; import { DebugBuilder } from "../../modules/debugger.mjs";
const log = new DebugBuilder("server", "discordBot.events.interactionCreate"); const log = new DebugBuilder("server", "discordBot.events.interactionCreate");
import { Events } from 'discord.js'; import { Events } from "discord.js";
export const name = Events.InteractionCreate; export const name = Events.InteractionCreate;
@@ -22,7 +22,9 @@ export async function execute(nodeIo, interaction) {
return; return;
} }
log.INFO(`${interaction.member.user} is running '${interaction.commandName}'`); log.INFO(
`${interaction.member.user} is running '${interaction.commandName}'`,
);
// Defer the initial reply if the command has the parameter set // Defer the initial reply if the command has the parameter set
if (command.deferInitialReply) { if (command.deferInitialReply) {

32
discordBot/events/messageCreate.mjs
View File

@@ -1,29 +1,29 @@
import { DebugBuilder } from "../../modules/debugger.mjs"; import { DebugBuilder } from "../../modules/debugger.mjs";
const log = new DebugBuilder("server", "discordBot.events.messageCreate"); const log = new DebugBuilder("server", "discordBot.events.messageCreate");
import dotenv from 'dotenv'; import dotenv from "dotenv";
dotenv.config(); dotenv.config();
import { Events } from 'discord.js'; import { Events } from "discord.js";
import { gptInteraction } from '../addons/gptInteraction.mjs'; import { gptInteraction } from "../addons/gptInteraction.mjs";
import { linkCop } from '../addons/linkCop.mjs'; import { linkCop } from "../addons/linkCop.mjs";
const IGNORED_CHANNELS = process.env.IGNORED_CHANNEL_IDS.split(','); const IGNORED_CHANNELS = process.env.IGNORED_CHANNEL_IDS.split(",");
export const name = Events.MessageCreate; export const name = Events.MessageCreate;
export async function execute(nodeIo, message) { export async function execute(nodeIo, message) {
// Ignore ignored channels // Ignore ignored channels
if (IGNORED_CHANNELS.includes(message.channel.id)) return; if (IGNORED_CHANNELS.includes(message.channel.id)) return;
// Ignore messages from a bot // Ignore messages from a bot
if (message.author.bot) return; if (message.author.bot) return;
log.INFO("Message create", message); log.INFO("Message create", message);
// Check if the message mentions the bot // Check if the message mentions the bot
if (message.mentions.users.has(nodeIo.serverClient.user.id)) { if (message.mentions.users.has(nodeIo.serverClient.user.id)) {
return await gptInteraction(nodeIo, message); return await gptInteraction(nodeIo, message);
} }
// Check if the message contains a link in a channel it shouldn't // Check if the message contains a link in a channel it shouldn't
if (await linkCop(nodeIo, message)) return; if (await linkCop(nodeIo, message)) return;
} }

181
discordBot/modules/gptHandler.mjs
View File

@@ -1,122 +1,117 @@
import { DebugBuilder } from "../../modules/debugger.mjs"; import { DebugBuilder } from "../../modules/debugger.mjs";
const log = new DebugBuilder("server", "discordBot.modules.gptHandler"); const log = new DebugBuilder("server", "discordBot.modules.gptHandler");
import dotenv from 'dotenv'; import dotenv from "dotenv";
dotenv.config(); dotenv.config();
import { OpenAI } from 'openai'; import { OpenAI } from "openai";
import { EventEmitter } from 'events'; import { EventEmitter } from "events";
const openai = new OpenAI(process.env.OPENAI_API_KEY); const openai = new OpenAI(process.env.OPENAI_API_KEY);
const assistant = await openai.beta.assistants.create({ const assistant = await openai.beta.assistants.create({
name: "Emmelia", name: "Emmelia",
instructions: process.env.DRB_SERVER_INITIAL_PROMPT, instructions: process.env.DRB_SERVER_INITIAL_PROMPT,
model: "gpt-4o", model: "gpt-4o",
}); });
class EventHandler extends EventEmitter { class EventHandler extends EventEmitter {
constructor(client) { constructor(client) {
super(); super();
this.client = client; this.client = client;
} }
async onEvent(event) { async onEvent(event) {
try { try {
console.log(event); console.log(event);
// Retrieve events that are denoted with 'requires_action' // Retrieve events that are denoted with 'requires_action'
// since these will have our tool_calls // since these will have our tool_calls
if (event.event === "thread.run.requires_action") { if (event.event === "thread.run.requires_action") {
await this.handleRequiresAction( await this.handleRequiresAction(
event.data, event.data,
event.data.id, event.data.id,
event.data.thread_id, event.data.thread_id,
); );
} }
} catch (error) { } catch (error) {
console.error("Error handling event:", error); console.error("Error handling event:", error);
}
} }
}
async handleRequiresAction(data, runId, threadId) { async handleRequiresAction(data, runId, threadId) {
try { try {
const toolOutputs = const toolOutputs =
data.required_action.submit_tool_outputs.tool_calls.map((toolCall) => { data.required_action.submit_tool_outputs.tool_calls.map((toolCall) => {
// Call the function // Call the function
switch (toolCall.function.name) { switch (toolCall.function.name) {
case "getCurrentTemperature": return { case "getCurrentTemperature":
tool_call_id: toolCall.id, return {
output: "57", tool_call_id: toolCall.id,
}; output: "57",
} };
}); }
// Submit all the tool outputs at the same time });
await this.submitToolOutputs(toolOutputs, runId, threadId); // Submit all the tool outputs at the same time
} catch (error) { await this.submitToolOutputs(toolOutputs, runId, threadId);
console.error("Error processing required action:", error); } catch (error) {
} console.error("Error processing required action:", error);
} }
}
async submitToolOutputs(toolOutputs, runId, threadId) { async submitToolOutputs(toolOutputs, runId, threadId) {
try { try {
// Use the submitToolOutputsStream helper // Use the submitToolOutputsStream helper
const stream = this.client.beta.threads.runs.submitToolOutputsStream( const stream = this.client.beta.threads.runs.submitToolOutputsStream(
threadId, threadId,
runId, runId,
{ tool_outputs: toolOutputs }, { tool_outputs: toolOutputs },
); );
for await (const event of stream) { for await (const event of stream) {
this.emit("event", event); this.emit("event", event);
} }
} catch (error) { } catch (error) {
console.error("Error submitting tool outputs:", error); console.error("Error submitting tool outputs:", error);
}
} }
}
} }
const eventHandler = new EventHandler(openai); const eventHandler = new EventHandler(openai);
eventHandler.on("event", eventHandler.onEvent.bind(eventHandler)); eventHandler.on("event", eventHandler.onEvent.bind(eventHandler));
export const gptHandler = async (additionalMessages) => { export const gptHandler = async (additionalMessages) => {
const thread = await openai.beta.threads.create(); const thread = await openai.beta.threads.create();
// Add the additional messages to the conversation // Add the additional messages to the conversation
for (const msgObj of additionalMessages) { for (const msgObj of additionalMessages) {
await openai.beta.threads.messages.create( await openai.beta.threads.messages.create(thread.id, msgObj);
thread.id, }
msgObj
); log.DEBUG("AI Conversation:", thread);
// Run the thread to get a response
try {
const stream = await openai.beta.threads.runs.stream(
thread.id,
{ assistant_id: assistant.id },
eventHandler,
);
for await (const event of stream) {
eventHandler.emit("event", event);
} }
log.DEBUG("AI Conversation:", thread); let response;
const messages = await openai.beta.threads.messages.list(thread.id);
response = messages.data[0].content[0].text.value;
// Run the thread to get a response log.DEBUG("AI Response:", response);
try {
const stream = await openai.beta.threads.runs.stream(
thread.id,
{ assistant_id: assistant.id },
eventHandler,
);
for await (const event of stream) { if (!response) {
eventHandler.emit("event", event); return false;
}
let response;
const messages = await openai.beta.threads.messages.list(
thread.id
);
response = messages.data[0].content[0].text.value;
log.DEBUG("AI Response:", response);
if (!response) {
return false;
}
return response;
} catch (error) {
console.error('Error generating response:', error);
return false;
} }
}
return response;
} catch (error) {
console.error("Error generating response:", error);
return false;
}
};

51
discordBot/modules/presenceManager.mjs Normal file
View File

@@ -0,0 +1,51 @@
import { getConfig } from "./configHandler.mjs";
class PresenceManager {
/**
* Creates an instance of PresenceManager.
* @param {import('discord.js').Client} client - The Discord client instance.
*/
constructor(client) {
this.client = client;
this.defaultStatus = "online";
this.defaultActivityType = "LISTENING";
this.defaultActivityName = "for your commands";
this.defaultUrl = null;
}
/**
* Set the bot's presence.
* @param {"online"|"idle"|"dnd"} status - The status of the bot (online, idle, dnd).
* @param {"PLAYING"|"STREAMING"|"LISTENING"|"WATCHING"|"COMPETING"} activityType - The type of activity.
* @param {string} activityName - The name of the activity.
* @param {string} [url=null] - The URL for STREAMING activity type (optional).
*/
setPresence(status, activityType, activityName, url = null) {
const activityOptions = {
type: activityType.toUpperCase(),
name: activityName,
};
if (activityType.toUpperCase() === "STREAMING" && url) {
activityOptions.url = url;
}
this.client.user.setPresence({
status: status,
activities: [activityOptions],
});
}
/**
* Reset the bot's presence to the default state.
*/
resetToDefault() {
const defaultPresence = getConfig("presence");
console.log("Default Presence:", defaultPresence);
// Update your bot's presence using this configuration
this.client.user.setPresence(defaultPresence);
}
}
export default PresenceManager;

137
discordBot/modules/registerCommands.mjs
View File

@@ -1,40 +1,51 @@
import { DebugBuilder } from "../../modules/debugger.mjs"; import { DebugBuilder } from "../../modules/debugger.mjs";
const log = new DebugBuilder("server", "discordBot.modules.registerCommands"); const log = new DebugBuilder("server", "discordBot.modules.registerCommands");
import { REST, Routes } from 'discord.js'; import { REST, Routes } from "discord.js";
import dotenv from 'dotenv'; import dotenv from "dotenv";
dotenv.config() dotenv.config();
const discordToken = process.env.DISCORD_TOKEN; const discordToken = process.env.DISCORD_TOKEN;
export const registerActiveCommands = async (serverClient) => { export const registerActiveCommands = async (serverClient) => {
const guildIDs = serverClient.guilds.cache; const guildIDs = serverClient.guilds.cache;
const clientId = serverClient.user.id; const clientId = serverClient.user.id;
const commands = await serverClient.commands.map(command => command = command.data.toJSON()); const commands = await serverClient.commands.map(
(command) => (command = command.data.toJSON()),
);
// Construct and prepare an instance of the REST module // Construct and prepare an instance of the REST module
const rest = new REST({ version: '10' }).setToken(discordToken); const rest = new REST({ version: "10" }).setToken(discordToken);
// and deploy your commands! // and deploy your commands!
guildIDs.forEach(guild => { guildIDs.forEach((guild) => {
log.INFO("Deploying commands for: ", guild.id); log.INFO("Deploying commands for: ", guild.id);
log.DEBUG("Commands", commands); log.DEBUG("Commands", commands);
(async () => { (async () => {
try { try {
log.DEBUG(`Started refreshing application (/) commands for guild ID: ${guild.id}.`); log.DEBUG(
// The put method is used to fully refresh all commands in the guild with the current set `Started refreshing application (/) commands for guild ID: ${guild.id}.`,
const data = await rest.put( );
Routes.applicationGuildCommands(clientId, guild.id), // The put method is used to fully refresh all commands in the guild with the current set
{ body: commands }, const data = await rest.put(
); Routes.applicationGuildCommands(clientId, guild.id),
{ body: commands },
);
log.DEBUG(`Successfully reloaded ${data.length} application (/) commands for guild ID: ${guild.id}.`); log.DEBUG(
} catch (error) { `Successfully reloaded ${data.length} application (/) commands for guild ID: ${guild.id}.`,
// And of course, make sure you catch and log any errors! );
log.ERROR("ERROR Deploying commands: ", error, "Body from error: ", commands); } catch (error) {
} // And of course, make sure you catch and log any errors!
})() log.ERROR(
}) "ERROR Deploying commands: ",
error,
"Body from error: ",
commands,
);
}
})();
});
}; };
/** /**
@@ -43,31 +54,39 @@ export const registerActiveCommands = async (serverClient) => {
* @param {any} serverClient The discord bot client * @param {any} serverClient The discord bot client
*/ */
export const unregisterAllCommands = async (serverClient) => { export const unregisterAllCommands = async (serverClient) => {
const guildIDs = serverClient.guilds.cache; const guildIDs = serverClient.guilds.cache;
const clientId = serverClient.user.id; const clientId = serverClient.user.id;
commands = []; commands = [];
const rest = new REST({ version: '10' }).setToken(discordToken); const rest = new REST({ version: "10" }).setToken(discordToken);
guildIDs.forEach(guild => { guildIDs.forEach((guild) => {
log.INFO("Removing commands for: ", clientId, guild.id); log.INFO("Removing commands for: ", clientId, guild.id);
(async () => { (async () => {
try { try {
log.DEBUG(`Started removal of ${commands.length} application (/) commands for guild ID: ${guild.id}.`); log.DEBUG(
// The put method is used to fully refresh all commands in the guild with the current set `Started removal of ${commands.length} application (/) commands for guild ID: ${guild.id}.`,
const data = await rest.put( );
Routes.applicationGuildCommands(clientId, guild.id), // The put method is used to fully refresh all commands in the guild with the current set
{ body: commands }, const data = await rest.put(
); Routes.applicationGuildCommands(clientId, guild.id),
{ body: commands },
);
log.DEBUG(`Successfully removed ${data.length} application (/) commands for guild ID: ${guild.id}.`); log.DEBUG(
} catch (error) { `Successfully removed ${data.length} application (/) commands for guild ID: ${guild.id}.`,
// And of course, make sure you catch and log any errors! );
log.ERROR("ERROR removing commands: ", error, "Body from error: ", commands); } catch (error) {
} // And of course, make sure you catch and log any errors!
})() log.ERROR(
}) "ERROR removing commands: ",
error,
} "Body from error: ",
commands,
);
}
})();
});
};
/** /**
* This named wrapper will remove all commands and then re-add the commands back, effectively refreshing them * This named wrapper will remove all commands and then re-add the commands back, effectively refreshing them
@@ -75,11 +94,13 @@ export const unregisterAllCommands = async (serverClient) => {
* @returns {any} * @returns {any}
*/ */
export const refreshActiveCommandsWrapper = async (serverClient) => { export const refreshActiveCommandsWrapper = async (serverClient) => {
// Remove all commands // Remove all commands
log.INFO("Removing/Unregistering all commands from all connected servers/guilds"); log.INFO(
await unregisterAllCommands(serverClient); "Removing/Unregistering all commands from all connected servers/guilds",
// Deploy the active commands );
log.INFO("Adding commands to all connected servers/guilds"); await unregisterAllCommands(serverClient);
await registerActiveCommands(serverClient); // Deploy the active commands
return; log.INFO("Adding commands to all connected servers/guilds");
} await registerActiveCommands(serverClient);
return;
};

41
discordBot/modules/rssWrappers.mjs
View File

@@ -1,22 +1,24 @@
// Import necessary modules // Import necessary modules
import { EmbedBuilder } from 'discord.js'; import { EmbedBuilder } from "discord.js";
import { DebugBuilder } from "../../modules/debugger.mjs"; import { DebugBuilder } from "../../modules/debugger.mjs";
import { parse } from "node-html-parser"; import { parse } from "node-html-parser";
import { config } from 'dotenv'; import { config } from "dotenv";
// Load environment variables // Load environment variables
config(); config();
const log = new DebugBuilder("server", "discordBot.modules.rssWrappers"); const log = new DebugBuilder("server", "discordBot.modules.rssWrappers");
const imageRegex = /(http(s?):)([/|.|\w|\s|-])*((\.(?:jpg|gif|png|webm))|(\/gallery\/(?:[/|.|\w|\s|-])*))/g; const imageRegex =
const youtubeVideoRegex = /((?:https?:)?\/\/)?((?:www|m)\.)?((?:youtube(-nocookie)?\.com|youtu.be))(\/(?:[\w\-]+\?v=|embed\/|v\/)?)([\w\-]+)/g; /(http(s?):)([/|.|\w|\s|-])*((\.(?:jpg|gif|png|webm))|(\/gallery\/(?:[/|.|\w|\s|-])*))/g;
const youtubeVideoRegex =
/((?:https?:)?\/\/)?((?:www|m)\.)?((?:youtube(-nocookie)?\.com|youtu.be))(\/(?:[\w\-]+\?v=|embed\/|v\/)?)([\w\-]+)/g;
export class DRBEmbedBuilder extends EmbedBuilder { export class DRBEmbedBuilder extends EmbedBuilder {
constructor() { constructor() {
super(); super();
this.setTimestamp(); this.setTimestamp();
this.setFooter({ text: 'Brought to you by Emmelia.' }); this.setFooter({ text: "Brought to you by Emmelia." });
} }
} }
@@ -27,8 +29,8 @@ export const sendPost = (post, source, channel) => {
const postLink = post.link; const postLink = post.link;
let postContent = `*This post has no content* [Direct Link](${post.link})`; let postContent = `*This post has no content* [Direct Link](${post.link})`;
if (post.content || post['content:encoded']) { if (post.content || post["content:encoded"]) {
const content = post['content:encoded'] ?? post.content; const content = post["content:encoded"] ?? post.content;
const parsedContent = parse(content); const parsedContent = parse(content);
let postText = parsedContent.text.trim(); let postText = parsedContent.text.trim();
@@ -43,15 +45,17 @@ export const sendPost = (post, source, channel) => {
const ytVideos = content.match(youtubeVideoRegex); const ytVideos = content.match(youtubeVideoRegex);
if (ytVideos) { if (ytVideos) {
ytVideos.slice(0, 4).forEach((ytVideo) => { ytVideos.slice(0, 4).forEach((ytVideo) => {
if (ytVideo.includes("embed")) ytVideo = ytVideo.replace("embed/", "watch?v="); if (ytVideo.includes("embed"))
ytVideo = ytVideo.replace("embed/", "watch?v=");
postContent += `\nEmbedded Video from Post: [YouTube](${ytVideo})`; postContent += `\nEmbedded Video from Post: [YouTube](${ytVideo})`;
}); });
} }
// Extract the first image link if available // Extract the first image link if available
const imageLinks = parsedContent.querySelectorAll("a") const imageLinks = parsedContent
.map(link => link.getAttribute("href")) .querySelectorAll("a")
.filter(href => href && href.match(imageRegex)); .map((link) => link.getAttribute("href"))
.filter((href) => href && href.match(imageRegex));
if (imageLinks.length > 0) { if (imageLinks.length > 0) {
post.image = imageLinks[0]; post.image = imageLinks[0];
@@ -67,11 +71,11 @@ export const sendPost = (post, source, channel) => {
try { try {
const rssMessage = new DRBEmbedBuilder() const rssMessage = new DRBEmbedBuilder()
.setColor(0x0099FF) .setColor(0x0099ff)
.setTitle(postTitle) .setTitle(postTitle)
.setURL(postLink) .setURL(postLink)
.addFields({ name: 'Source', value: postSourceLink, inline: true }) .addFields({ name: "Source", value: postSourceLink, inline: true })
.addFields({ name: 'Published', value: postPubDate, inline: true }); .addFields({ name: "Published", value: postPubDate, inline: true });
if (postImage) { if (postImage) {
log.DEBUG("Image from post:", postImage); log.DEBUG("Image from post:", postImage);
@@ -87,7 +91,14 @@ export const sendPost = (post, source, channel) => {
return channelResponse; return channelResponse;
} catch (err) { } catch (err) {
log.ERROR("Error sending message: ", postTitle, postId, postContent, postPubDate, err); log.ERROR(
"Error sending message: ",
postTitle,
postId,
postContent,
postPubDate,
err,
);
return err; return err;
} }
}; };

208
discordBot/modules/wrappers.mjs
View File

@@ -1,39 +1,49 @@
import { DebugBuilder } from "../../modules/debugger.mjs"; import { DebugBuilder } from "../../modules/debugger.mjs";
const log = new DebugBuilder("server", "discordBot.modules.wrappers"); const log = new DebugBuilder("server", "discordBot.modules.wrappers");
import { checkIfNodeIsConnectedToVC, getNodeDiscordID, getNodeDiscordUsername, checkIfNodeHasOpenDiscordClient, getNodeCurrentListeningSystem, requestNodeJoinSystem } from '../../modules/socketServerWrappers.mjs'; import {
import { getAllDiscordIDs } from '../../modules/mongo-wrappers/mongoDiscordIDWrappers.mjs' checkIfNodeIsConnectedToVC,
import { ActionRowBuilder, ButtonBuilder, ButtonStyle } from 'discord.js'; getNodeDiscordID,
getNodeDiscordUsername,
checkIfNodeHasOpenDiscordClient,
getNodeCurrentListeningSystem,
requestNodeJoinSystem,
} from "../../modules/socketServerWrappers.mjs";
import { getAllDiscordIDs } from "../../modules/mongo-wrappers/mongoDiscordIDWrappers.mjs";
import { ActionRowBuilder, ButtonBuilder, ButtonStyle } from "discord.js";
export const checkOnlineBotsInGuild = async (nodeIo, guildId) => { export const checkOnlineBotsInGuild = async (nodeIo, guildId) => {
let onlineBots = []; let onlineBots = [];
const openSockets = [...await nodeIo.allSockets()]; const openSockets = [...(await nodeIo.allSockets())];
await Promise.all(openSockets.map(async openSocket => { await Promise.all(
openSocket = await nodeIo.sockets.sockets.get(openSocket); openSockets.map(async (openSocket) => {
const connected = await checkIfNodeIsConnectedToVC(nodeIo, guildId, openSocket.node.nuid); openSocket = await nodeIo.sockets.sockets.get(openSocket);
log.INFO("Connected:", connected); const connected = await checkIfNodeIsConnectedToVC(
if (connected) { nodeIo,
const username = await getNodeDiscordUsername(openSocket, guildId); guildId,
const discordID = await getNodeDiscordID(openSocket); openSocket.node.nuid,
onlineBots.push({ );
name: username, log.INFO("Connected:", connected);
discord_id: discordID, if (connected) {
nuid: openSocket.node.nuid const username = await getNodeDiscordUsername(openSocket, guildId);
}); const discordID = await getNodeDiscordID(openSocket);
} onlineBots.push({
})); name: username,
discord_id: discordID,
nuid: openSocket.node.nuid,
});
}
}),
);
return onlineBots; return onlineBots;
} };
export const getAvailableTokensInGuild = async (nodeIo, guildId) => { export const getAvailableTokensInGuild = async (nodeIo, guildId) => {
try { try {
// Execute both asynchronous functions concurrently // Execute both asynchronous functions concurrently
const [discordIDs, onlineBots] = await Promise.all([ const [discordIDs, onlineBots] = await Promise.all([
getAllDiscordIDs(), // Fetch all Discord IDs getAllDiscordIDs(), // Fetch all Discord IDs
checkOnlineBotsInGuild(nodeIo, guildId) // Check online bots in the guild checkOnlineBotsInGuild(nodeIo, guildId), // Check online bots in the guild
]); ]);
// Use the results of both promises here // Use the results of both promises here
@@ -41,18 +51,23 @@ export const getAvailableTokensInGuild = async (nodeIo, guildId) => {
log.INFO("Online bots in the guild:", onlineBots); log.INFO("Online bots in the guild:", onlineBots);
// Filter any discordIDs that are not active // Filter any discordIDs that are not active
const availableDiscordIDs = discordIDs.filter(discordID => discordID.active == true).filter(discordID => !onlineBots.some(bot => Number(bot.discord_id) == discordID.discord_id)); const availableDiscordIDs = discordIDs
.filter((discordID) => discordID.active == true)
.filter(
(discordID) =>
!onlineBots.some(
(bot) => Number(bot.discord_id) == discordID.discord_id,
),
);
// Return the unavailable discordIDs // Return the unavailable discordIDs
return availableDiscordIDs; return availableDiscordIDs;
} catch (error) { } catch (error) {
console.error('Error getting available tokens in guild:', error); console.error("Error getting available tokens in guild:", error);
throw error; throw error;
} }
}; };
/** /**
* Get the nodes with given system that are available to be used within a given server * Get the nodes with given system that are available to be used within a given server
* @param {any} nodeIo The nodeIO object contained in the discord server object * @param {any} nodeIo The nodeIO object contained in the discord server object
@@ -62,39 +77,50 @@ export const getAvailableTokensInGuild = async (nodeIo, guildId) => {
*/ */
export const getAvailableNodes = async (nodeIo, guildId, system) => { export const getAvailableNodes = async (nodeIo, guildId, system) => {
// Get all open socket nodes // Get all open socket nodes
const openSockets = [...await nodeIo.allSockets()]; // TODO - Filter the returned nodes to only nodes that have the radio capability const openSockets = [...(await nodeIo.allSockets())]; // TODO - Filter the returned nodes to only nodes that have the radio capability
log.DEBUG("All open sockets: ", openSockets); log.DEBUG("All open sockets: ", openSockets);
var availableNodes = []; var availableNodes = [];
// Check each open socket to see if the node has the requested system // Check each open socket to see if the node has the requested system
await Promise.all(openSockets.map(async openSocket => { await Promise.all(
openSocket = await nodeIo.sockets.sockets.get(openSocket); openSockets.map(async (openSocket) => {
// Check if the node has an existing open client (meaning the radio is already being listened to) openSocket = await nodeIo.sockets.sockets.get(openSocket);
const hasOpenClient = await checkIfNodeHasOpenDiscordClient(openSocket); // Check if the node has an existing open client (meaning the radio is already being listened to)
if (hasOpenClient) { const hasOpenClient = await checkIfNodeHasOpenDiscordClient(openSocket);
let currentSystem = await getNodeCurrentListeningSystem(openSocket); if (hasOpenClient) {
if (currentSystem != system.name) { let currentSystem = await getNodeCurrentListeningSystem(openSocket);
log.INFO("Node is listening to a different system than requested", openSocket.node.name); if (currentSystem != system.name) {
return; log.INFO(
"Node is listening to a different system than requested",
openSocket.node.name,
);
return;
}
} }
}
// Check if the bot has an open voice connection in the requested server already // Check if the bot has an open voice connection in the requested server already
const connected = await checkIfNodeIsConnectedToVC(nodeIo, guildId, openSocket.node.nuid); const connected = await checkIfNodeIsConnectedToVC(
log.INFO("Connected:", connected); nodeIo,
if (!connected) { guildId,
// Check if this node has the requested system, if so add it to the availble array openSocket.node.nuid,
if (system.nodes.includes(openSocket.node.nuid)) { );
availableNodes.push(openSocket); log.INFO("Connected:", connected);
if (!connected) {
// Check if this node has the requested system, if so add it to the availble array
if (system.nodes.includes(openSocket.node.nuid)) {
availableNodes.push(openSocket);
}
} }
} }),
);
})); log.DEBUG(
"Availble nodes:",
log.DEBUG("Availble nodes:", availableNodes.map(socket => socket.node.name)); availableNodes.map((socket) => socket.node.name),
);
return availableNodes; return availableNodes;
} };
/** /**
* Gets the voice channel the user is currently in. * Gets the voice channel the user is currently in.
@@ -103,11 +129,14 @@ export const getAvailableNodes = async (nodeIo, guildId, system) => {
*/ */
export const getUserVoiceChannel = (interaction) => { export const getUserVoiceChannel = (interaction) => {
if (!interaction.member.voice.channel) { if (!interaction.member.voice.channel) {
interaction.editReply({ content: `<@${interaction.member.id}>, you need to enter a voice channel before using this command`, ephemeral: true }); interaction.editReply({
content: `<@${interaction.member.id}>, you need to enter a voice channel before using this command`,
ephemeral: true,
});
return null; return null;
} }
return interaction.member.voice.channel; return interaction.member.voice.channel;
} };
/** /**
* Joins a node to a specified system and voice channel. * Joins a node to a specified system and voice channel.
@@ -117,25 +146,55 @@ export const getUserVoiceChannel = (interaction) => {
* @param {any} system - The system object to join. * @param {any} system - The system object to join.
* @param {any} channel - The voice channel to join. * @param {any} channel - The voice channel to join.
*/ */
export const joinNode = async (nodeIo, interaction, nodeId, system, channel) => { export const joinNode = async (
nodeIo,
interaction,
nodeId,
system,
channel,
) => {
try { try {
const openSocket = await nodeIo.sockets.sockets.get(nodeId); const openSocket = await nodeIo.sockets.sockets.get(nodeId);
const discordTokens = await getAvailableTokensInGuild(nodeIo, interaction.guild.id); const discordTokens = await getAvailableTokensInGuild(
nodeIo,
interaction.guild.id,
);
if (discordTokens.length === 0) { if (discordTokens.length === 0) {
await interaction.editReply({ content: `<@${interaction.member.id}>, there are no free bots available.`, ephemeral: true }); await interaction.editReply({
content: `<@${interaction.member.id}>, there are no free bots available.`,
ephemeral: true,
});
return; return;
} }
log.INFO("Joining node:", nodeId, system.name, channel.id, openSocket.node.name, discordTokens[0].token); log.INFO(
await requestNodeJoinSystem(openSocket, system.name, channel.id, discordTokens[0].token); "Joining node:",
nodeId,
system.name,
channel.id,
openSocket.node.name,
discordTokens[0].token,
);
await requestNodeJoinSystem(
openSocket,
system.name,
channel.id,
discordTokens[0].token,
);
await interaction.editReply({ content: `<@${interaction.member.id}>, a bot will join your channel listening to '${system.name}' shortly.`, ephemeral: true }); await interaction.editReply({
content: `<@${interaction.member.id}>, a bot will join your channel listening to '${system.name}' shortly.`,
ephemeral: true,
});
} catch (err) { } catch (err) {
log.ERROR("Failed to join node:", err); log.ERROR("Failed to join node:", err);
await interaction.editReply({ content: `<@${interaction.member.id}>, an error occurred while joining the node: ${err.message}`, ephemeral: true }); await interaction.editReply({
content: `<@${interaction.member.id}>, an error occurred while joining the node: ${err.message}`,
ephemeral: true,
});
} }
} };
/** /**
* Prompts the user to select a node from available nodes. * Prompts the user to select a node from available nodes.
@@ -143,9 +202,16 @@ export const joinNode = async (nodeIo, interaction, nodeId, system, channel) =>
* @param {Array} availableNodes - The list of available nodes. * @param {Array} availableNodes - The list of available nodes.
* @param {Function} onNodeSelected - Callback function to handle the selected node. * @param {Function} onNodeSelected - Callback function to handle the selected node.
*/ */
export const promptNodeSelection = async (interaction, availableNodes, onNodeSelected) => { export const promptNodeSelection = async (
const nodeSelectionButtons = availableNodes.map(node => interaction,
new ButtonBuilder().setCustomId(node.id).setLabel(node.node.name).setStyle(ButtonStyle.Primary) availableNodes,
onNodeSelected,
) => {
const nodeSelectionButtons = availableNodes.map((node) =>
new ButtonBuilder()
.setCustomId(node.id)
.setLabel(node.node.name)
.setStyle(ButtonStyle.Primary),
); );
const actionRow = new ActionRowBuilder().addComponents(nodeSelectionButtons); const actionRow = new ActionRowBuilder().addComponents(nodeSelectionButtons);
@@ -153,15 +219,21 @@ export const promptNodeSelection = async (interaction, availableNodes, onNodeSel
const response = await interaction.editReply({ const response = await interaction.editReply({
content: `<@${interaction.member.id}>, please select the Node you would like to join with this system:`, content: `<@${interaction.member.id}>, please select the Node you would like to join with this system:`,
components: [actionRow], components: [actionRow],
ephemeral: true ephemeral: true,
}); });
const collectorFilter = i => i.user.id === interaction.user.id; const collectorFilter = (i) => i.user.id === interaction.user.id;
try { try {
const selectedNode = await response.awaitMessageComponent({ filter: collectorFilter, time: 60_000 }); const selectedNode = await response.awaitMessageComponent({
filter: collectorFilter,
time: 60_000,
});
await onNodeSelected(selectedNode.customId); await onNodeSelected(selectedNode.customId);
} catch (e) { } catch (e) {
log.ERROR("Node selection timeout:", e); log.ERROR("Node selection timeout:", e);
await interaction.editReply({ content: 'Confirmation not received within 1 minute, cancelling.', components: [] }); await interaction.editReply({
content: "Confirmation not received within 1 minute, cancelling.",
components: [],
});
} }
} };

32
eslint.config.mjs
View File

@@ -2,30 +2,28 @@ import path from "path";
import { fileURLToPath } from "url"; import { fileURLToPath } from "url";
import { FlatCompat } from "@eslint/eslintrc"; import { FlatCompat } from "@eslint/eslintrc";
import mjs from "@eslint/js"; import mjs from "@eslint/js";
import prettierConfig from 'eslint-config-prettier'; import prettierConfig from "eslint-config-prettier";
import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended'; import eslintPluginPrettierRecommended from "eslint-plugin-prettier/recommended";
const __filename = fileURLToPath(import.meta.url); const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename); const __dirname = path.dirname(__filename);
const compat = new FlatCompat({ const compat = new FlatCompat({
baseDirectory: __dirname, baseDirectory: __dirname,
recommendedConfig: mjs.configs.recommended recommendedConfig: mjs.configs.recommended,
}); });
export default [ export default [
...compat.extends().map( ...compat.extends().map((config) => ({
config => ({ ...config,
...config, files: ["**/*.mjs", "**/*.js", "**/*.cjs"],
files: ["**/*.mjs", "**/*.js", "**/*.cjs"], rules: {
rules: { ...config.rules,
...config.rules, // ...other your custom rules
// ...other your custom rules "no-console": "warn",
"no-console": "warn", "no-unused-vars": "warn",
"no-unused-vars": "warn", "unused-imports/no-unused-imports": "error",
"unused-imports/no-unused-imports": "error", },
} })),
})
),
prettierConfig, // Turns off all ESLint rules that have the potential to interfere with Prettier rules. prettierConfig, // Turns off all ESLint rules that have the potential to interfere with Prettier rules.
eslintPluginPrettierRecommended eslintPluginPrettierRecommended,
]; ];

60
modules/addonManager.mjs
View File

@@ -1,33 +1,45 @@
import { DebugBuilder } from "../modules/debugger.mjs"; import { DebugBuilder } from "../modules/debugger.mjs";
const log = new DebugBuilder("server", "addonManager"); const log = new DebugBuilder("server", "addonManager");
import { fileURLToPath } from 'url'; import { fileURLToPath } from "url";
import fs from 'fs'; import fs from "fs";
import path from 'path'; import path from "path";
// Function to load addons from the addons directory // Function to load addons from the addons directory
export const loadAddons = async (nodeIo) => { export const loadAddons = async (nodeIo) => {
const __filename = fileURLToPath(import.meta.url); const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename); const __dirname = path.dirname(__filename);
const addonsDir = path.join(__dirname, '../addons'); const addonsDir = path.join(__dirname, "../addons");
// Read the directory containing addon modules // Read the directory containing addon modules
const addonDirectories = await fs.readdirSync(addonsDir, { withFileTypes: true }); const addonDirectories = await fs.readdirSync(addonsDir, {
withFileTypes: true,
});
addonDirectories.forEach(addonDir => { addonDirectories.forEach((addonDir) => {
if (addonDir.isDirectory()) { if (addonDir.isDirectory()) {
const addonConfigPath = path.join(addonsDir, addonDir.name, 'config.json'); const addonConfigPath = path.join(
if (fs.existsSync(addonConfigPath)) { addonsDir,
const addonConfig = JSON.parse(fs.readFileSync(addonConfigPath, 'utf-8')); addonDir.name,
if (addonConfig.enabled) { "config.json",
const addonIndexPath = path.join(addonsDir, addonDir.name, 'index.js'); );
import(`file://${addonIndexPath}`).then(addonModule => { if (fs.existsSync(addonConfigPath)) {
log.DEBUG("Loading addon: ", addonModule); const addonConfig = JSON.parse(
addonModule.initialize(nodeIo, addonConfig); fs.readFileSync(addonConfigPath, "utf-8"),
log.DEBUG(`Addon ${addonConfig.name} loaded.`); );
}); if (addonConfig.enabled) {
} const addonIndexPath = path.join(
} addonsDir,
addonDir.name,
"index.js",
);
import(`file://${addonIndexPath}`).then((addonModule) => {
log.DEBUG("Loading addon: ", addonModule);
addonModule.initialize(nodeIo, addonConfig);
log.DEBUG(`Addon ${addonConfig.name} loaded.`);
});
} }
}); }
} }
});
};

95
modules/debugger.mjs
View File

@@ -1,10 +1,10 @@
// Import necessary modules // Import necessary modules
import debug from 'debug'; import debug from "debug";
import { config } from 'dotenv'; import { config } from "dotenv";
config(); config();
import { promises as fs } from 'fs'; import { promises as fs } from "fs";
import { join, dirname } from 'path'; import { join, dirname } from "path";
import { inspect } from 'util'; import { inspect } from "util";
/** /**
* Write a given message to the log file * Write a given message to the log file
@@ -12,24 +12,27 @@ import { inspect } from 'util';
* @param {string} appName The app name that created the log entry * @param {string} appName The app name that created the log entry
*/ */
const writeToLog = async (logMessage, appName) => { const writeToLog = async (logMessage, appName) => {
const logLocation = join(process.env.LOG_LOCATION ?? `./logs/${appName}.log`); const logLocation = join(process.env.LOG_LOCATION ?? `./logs/${appName}.log`);
// Ensure the log directory exists // Ensure the log directory exists
try { try {
await fs.mkdir(dirname(logLocation), { recursive: true }); await fs.mkdir(dirname(logLocation), { recursive: true });
} catch (err) { } catch (err) {
console.error(err); console.error(err);
} }
// Ensure the message is a string // Ensure the message is a string
logMessage = `${String(logMessage)}\n`; logMessage = `${String(logMessage)}\n`;
// Write to the file // Write to the file
try { try {
await fs.writeFile(logLocation, logMessage, { encoding: 'utf-8', flag: 'a+' }); await fs.writeFile(logLocation, logMessage, {
} catch (err) { encoding: "utf-8",
console.error(err); flag: "a+",
} });
} catch (err) {
console.error(err);
}
}; };
/** /**
@@ -39,33 +42,37 @@ const writeToLog = async (logMessage, appName) => {
* @param {string} fileName The name of the file calling the builder to be used in the 'fileName' portion of the namespace * @param {string} fileName The name of the file calling the builder to be used in the 'fileName' portion of the namespace
*/ */
export class DebugBuilder { export class DebugBuilder {
constructor(appName, fileName) { constructor(appName, fileName) {
const buildLogger = (level) => (...messageParts) => { const buildLogger =
const logger = debug(`${appName}:${fileName}:${level}`); (level) =>
logger(messageParts); (...messageParts) => {
const logger = debug(`${appName}:${fileName}:${level}`);
logger(messageParts);
const timeStamp = new Date().toLocaleString('en-US', { timeZone: 'America/New_York' }); const timeStamp = new Date().toLocaleString("en-US", {
const message = `${timeStamp} - ${appName}:${fileName}:${level}\t-\t${messageParts.map(part => inspect(part)).join(' ')}`; timeZone: "America/New_York",
});
const message = `${timeStamp} - ${appName}:${fileName}:${level}\t-\t${messageParts.map((part) => inspect(part)).join(" ")}`;
// Write to console // Write to console
console.log(message); console.log(message);
// Write to logfile // Write to logfile
writeToLog(message, appName); writeToLog(message, appName);
}; };
this.INFO = buildLogger('INFO'); this.INFO = buildLogger("INFO");
this.DEBUG = buildLogger('DEBUG'); this.DEBUG = buildLogger("DEBUG");
this.VERBOSE = buildLogger('VERBOSE'); this.VERBOSE = buildLogger("VERBOSE");
this.WARN = buildLogger('WARNING'); this.WARN = buildLogger("WARNING");
this.ERROR = (...messageParts) => { this.ERROR = (...messageParts) => {
buildLogger('ERROR')(...messageParts); buildLogger("ERROR")(...messageParts);
if (process.env.EXIT_ON_ERROR && process.env.EXIT_ON_ERROR > 0) { if (process.env.EXIT_ON_ERROR && process.env.EXIT_ON_ERROR > 0) {
writeToLog("!--- EXITING ---!", appName); writeToLog("!--- EXITING ---!", appName);
const exitDelay = parseInt(process.env.EXIT_ON_ERROR_DELAY, 10) || 0; const exitDelay = parseInt(process.env.EXIT_ON_ERROR_DELAY, 10) || 0;
setTimeout(() => process.exit(1), exitDelay); setTimeout(() => process.exit(1), exitDelay);
} }
}; };
} }
} }

44
modules/mongo-wrappers/mongoDiscordIDWrappers.mjs
View File

@@ -1,8 +1,12 @@
import { DebugBuilder } from "../../modules/debugger.mjs"; import { DebugBuilder } from "../../modules/debugger.mjs";
const log = new DebugBuilder("server", "mongoDiscordIDWrappers"); const log = new DebugBuilder("server", "mongoDiscordIDWrappers");
import { insertDocument, getDocuments, connectToDatabase } from "./mongoHandler.mjs"; import {
insertDocument,
getDocuments,
connectToDatabase,
} from "./mongoHandler.mjs";
const collectionName = 'discord-ids'; const collectionName = "discord-ids";
// Wrapper for inserting a Discord ID // Wrapper for inserting a Discord ID
export const createDiscordID = async (discordID) => { export const createDiscordID = async (discordID) => {
@@ -10,7 +14,7 @@ export const createDiscordID = async (discordID) => {
const insertedId = await insertDocument(collectionName, discordID); const insertedId = await insertDocument(collectionName, discordID);
return insertedId; return insertedId;
} catch (error) { } catch (error) {
log.ERROR('Error creating Discord ID:', error); log.ERROR("Error creating Discord ID:", error);
throw error; throw error;
} }
}; };
@@ -21,7 +25,7 @@ export const getAllDiscordIDs = async () => {
const discordIDs = await getDocuments(collectionName); const discordIDs = await getDocuments(collectionName);
return discordIDs; return discordIDs;
} catch (error) { } catch (error) {
log.ERROR('Error getting all Discord IDs:', error); log.ERROR("Error getting all Discord IDs:", error);
throw error; throw error;
} }
}; };
@@ -32,14 +36,11 @@ export const getDiscordID = async (identifier) => {
try { try {
const collection = db.db().collection(collectionName); const collection = db.db().collection(collectionName);
const discordID = await collection.findOne({ const discordID = await collection.findOne({
$or: [ $or: [{ name: identifier }, { discord_id: identifier }],
{ name: identifier },
{ discord_id: identifier }
]
}); });
return discordID; return discordID;
} catch (error) { } catch (error) {
log.ERROR('Error getting Discord ID:', error); log.ERROR("Error getting Discord ID:", error);
throw error; throw error;
} finally { } finally {
// Close the connection // Close the connection
@@ -52,16 +53,16 @@ export const updateDiscordID = async (identifier, updatedFields) => {
const db = await connectToDatabase(); const db = await connectToDatabase();
try { try {
const collection = db.db().collection(collectionName); const collection = db.db().collection(collectionName);
const result = await collection.updateOne({ const result = await collection.updateOne(
$or: [ {
{ name: identifier }, $or: [{ name: identifier }, { discord_id: identifier }],
{ discord_id: identifier } },
] { $set: updatedFields },
}, { $set: updatedFields }); );
log.INFO('Discord ID updated:', result.modifiedCount); log.INFO("Discord ID updated:", result.modifiedCount);
return result.modifiedCount; return result.modifiedCount;
} catch (error) { } catch (error) {
log.ERROR('Error updating Discord ID:', error); log.ERROR("Error updating Discord ID:", error);
throw error; throw error;
} finally { } finally {
// Close the connection // Close the connection
@@ -75,15 +76,12 @@ export const deleteDiscordID = async (identifier) => {
try { try {
const collection = db.db().collection(collectionName); const collection = db.db().collection(collectionName);
const result = await collection.deleteOne({ const result = await collection.deleteOne({
$or: [ $or: [{ name: identifier }, { discord_id: identifier }],
{ name: identifier },
{ discord_id: identifier }
]
}); });
log.INFO('Discord ID deleted:', result.deletedCount); log.INFO("Discord ID deleted:", result.deletedCount);
return result.deletedCount; return result.deletedCount;
} catch (error) { } catch (error) {
log.ERROR('Error deleting Discord ID:', error); log.ERROR("Error deleting Discord ID:", error);
throw error; throw error;
} finally { } finally {
// Close the connection // Close the connection

210
modules/mongo-wrappers/mongoFeedsWrappers.mjs
View File

@@ -1,112 +1,124 @@
import { DebugBuilder } from "../../modules/debugger.mjs"; import { DebugBuilder } from "../../modules/debugger.mjs";
const log = new DebugBuilder("server", "mongoFeedsWrappers"); const log = new DebugBuilder("server", "mongoFeedsWrappers");
import { import {
insertDocument, insertDocument,
getDocuments, getDocuments,
getDocumentByField, getDocumentByField,
updateDocumentByField, updateDocumentByField,
deleteDocumentByField, deleteDocumentByField,
} from "./mongoHandler.mjs"; } from "./mongoHandler.mjs";
const feedCollectionName = 'feeds'; const feedCollectionName = "feeds";
const postCollectionName = 'posts'; const postCollectionName = "posts";
// Wrapper for inserting a feed // Wrapper for inserting a feed
export const createFeed = async (feed) => { export const createFeed = async (feed) => {
try { try {
const insertedId = await insertDocument(feedCollectionName, feed); const insertedId = await insertDocument(feedCollectionName, feed);
return insertedId; return insertedId;
} catch (error) { } catch (error) {
log.ERROR('Error creating feed:', error); log.ERROR("Error creating feed:", error);
throw error; throw error;
} }
}; };
// Wrapper for retrieving all feeds // Wrapper for retrieving all feeds
export const getAllFeeds = async () => { export const getAllFeeds = async () => {
try { try {
const feeds = await getDocuments(feedCollectionName); const feeds = await getDocuments(feedCollectionName);
return feeds; return feeds;
} catch (error) { } catch (error) {
log.ERROR('Error getting all feeds:', error); log.ERROR("Error getting all feeds:", error);
throw error; throw error;
} }
}; };
// Wrapper for retrieving a feed by link // Wrapper for retrieving a feed by link
export const getFeedByLink = async (link) => { export const getFeedByLink = async (link) => {
try { try {
const feed = await getDocumentByField(feedCollectionName, 'link', link); const feed = await getDocumentByField(feedCollectionName, "link", link);
return feed; return feed;
} catch (error) { } catch (error) {
log.ERROR('Error getting feed by link:', error); log.ERROR("Error getting feed by link:", error);
throw error; throw error;
} }
}; };
// Wrapper for retrieving a feed by the title // Wrapper for retrieving a feed by the title
export const getFeedByTitle = async (title) => { export const getFeedByTitle = async (title) => {
try { try {
const feed = await getDocumentByField(feedCollectionName, 'title', title); const feed = await getDocumentByField(feedCollectionName, "title", title);
return feed; return feed;
} catch (error) { } catch (error) {
log.ERROR('Error getting feed by link:', error); log.ERROR("Error getting feed by link:", error);
throw error; throw error;
} }
}; };
// Wrapper for updating a feed by link // Wrapper for updating a feed by link
export const updateFeedByLink = async (link, updatedFields) => { export const updateFeedByLink = async (link, updatedFields) => {
try { try {
const modifiedCount = await updateDocumentByField(feedCollectionName, 'link', link, updatedFields); const modifiedCount = await updateDocumentByField(
return modifiedCount; feedCollectionName,
} catch (error) { "link",
log.ERROR('Error updating feed by link:', error); link,
throw error; updatedFields,
} );
}; return modifiedCount;
} catch (error) {
log.ERROR("Error updating feed by link:", error);
throw error;
}
};
// Wrapper for deleting a feed by link // Wrapper for deleting a feed by link
export const deleteFeedByLink = async (link) => { export const deleteFeedByLink = async (link) => {
try { try {
const deletedCount = await deleteDocumentByField(feedCollectionName, 'link', link); const deletedCount = await deleteDocumentByField(
return deletedCount; feedCollectionName,
} catch (error) { "link",
log.ERROR('Error deleting feed by link:', error); link,
throw error; );
} return deletedCount;
}; } catch (error) {
log.ERROR("Error deleting feed by link:", error);
throw error;
}
};
// Wrapper for deleting a feed by title // Wrapper for deleting a feed by title
export const deleteFeedByTitle = async (title) => { export const deleteFeedByTitle = async (title) => {
try { try {
const deletedCount = await deleteDocumentByField(feedCollectionName, 'title', title); const deletedCount = await deleteDocumentByField(
return deletedCount; feedCollectionName,
} catch (error) { "title",
log.ERROR('Error deleting feed by link:', error); title,
throw error; );
} return deletedCount;
}; } catch (error) {
log.ERROR("Error deleting feed by link:", error);
throw error;
}
};
// Wrapper for inserting a post // Wrapper for inserting a post
export const createPost = async (post) => { export const createPost = async (post) => {
try { try {
const insertedId = await insertDocument(postCollectionName, post); const insertedId = await insertDocument(postCollectionName, post);
return insertedId; return insertedId;
} catch (error) { } catch (error) {
log.ERROR('Error creating post:', error); log.ERROR("Error creating post:", error);
throw error; throw error;
} }
}; };
// Wrapper for retrieving a post by postId
export const getPostByPostId = async (postId) => {
try {
const post = await getDocumentByField(postCollectionName, 'postId', postId);
return post;
} catch (error) {
log.ERROR('Error getting post by postId:', error);
throw error;
}
};
// Wrapper for retrieving a post by postId
export const getPostByPostId = async (postId) => {
try {
const post = await getDocumentByField(postCollectionName, "postId", postId);
return post;
} catch (error) {
log.ERROR("Error getting post by postId:", error);
throw error;
}
};

50
modules/mongo-wrappers/mongoHandler.mjs
View File

@@ -1,10 +1,10 @@
// Import necessary modules // Import necessary modules
import { MongoClient } from 'mongodb'; import { MongoClient } from "mongodb";
import { DebugBuilder } from '../debugger.mjs'; import { DebugBuilder } from "../debugger.mjs";
const log = new DebugBuilder("server", 'mongoHandler'); const log = new DebugBuilder("server", "mongoHandler");
import dotenv from 'dotenv'; import dotenv from "dotenv";
dotenv.config() dotenv.config();
// MongoDB connection URI // MongoDB connection URI
const uri = process.env.MONGO_URL; const uri = process.env.MONGO_URL;
@@ -15,7 +15,7 @@ export const connectToDatabase = async () => {
const client = await MongoClient.connect(uri); const client = await MongoClient.connect(uri);
return client; return client;
} catch (error) { } catch (error) {
console.error('Error connecting to the database:', error); console.error("Error connecting to the database:", error);
throw error; throw error;
} }
}; };
@@ -27,10 +27,10 @@ export const insertDocument = async (collectionName, document) => {
try { try {
const collection = db.db().collection(collectionName); const collection = db.db().collection(collectionName);
const result = await collection.insertOne(document); const result = await collection.insertOne(document);
log.DEBUG('Document inserted:', result.insertedId); log.DEBUG("Document inserted:", result.insertedId);
return result.insertedId; return result.insertedId;
} catch (error) { } catch (error) {
console.error('Error inserting document:', error); console.error("Error inserting document:", error);
throw error; throw error;
} finally { } finally {
// Close the connection // Close the connection
@@ -45,10 +45,10 @@ export const getDocuments = async (collectionName) => {
try { try {
const collection = db.db().collection(collectionName); const collection = db.db().collection(collectionName);
const documents = await collection.find({}).toArray(); const documents = await collection.find({}).toArray();
log.DEBUG('Documents retrieved:', documents); log.DEBUG("Documents retrieved:", documents);
return documents; return documents;
} catch (error) { } catch (error) {
console.error('Error retrieving documents:', error); console.error("Error retrieving documents:", error);
throw error; throw error;
} finally { } finally {
// Close the connection // Close the connection
@@ -65,7 +65,7 @@ export const getDocumentByField = async (collectionName, field, value) => {
const document = await collection.findOne({ [field]: value }); const document = await collection.findOne({ [field]: value });
return document; return document;
} catch (error) { } catch (error) {
console.error('Error retrieving document:', error); console.error("Error retrieving document:", error);
throw error; throw error;
} finally { } finally {
await db.close(); await db.close();
@@ -73,16 +73,30 @@ export const getDocumentByField = async (collectionName, field, value) => {
}; };
// Function to update a document by a specific field // Function to update a document by a specific field
export const updateDocumentByField = async (collectionName, field, value, updatedFields) => { export const updateDocumentByField = async (
log.DEBUG("Update document by field:", collectionName, field, value, updatedFields); collectionName,
field,
value,
updatedFields,
) => {
log.DEBUG(
"Update document by field:",
collectionName,
field,
value,
updatedFields,
);
const db = await connectToDatabase(); const db = await connectToDatabase();
try { try {
const collection = db.db().collection(collectionName); const collection = db.db().collection(collectionName);
const result = await collection.updateOne({ [field]: value }, { $set: updatedFields }); const result = await collection.updateOne(
log.DEBUG('Document updated:', result.modifiedCount); { [field]: value },
{ $set: updatedFields },
);
log.DEBUG("Document updated:", result.modifiedCount);
return result.modifiedCount; return result.modifiedCount;
} catch (error) { } catch (error) {
console.error('Error updating document:', error); console.error("Error updating document:", error);
throw error; throw error;
} finally { } finally {
await db.close(); await db.close();
@@ -96,10 +110,10 @@ export const deleteDocumentByField = async (collectionName, field, value) => {
try { try {
const collection = db.db().collection(collectionName); const collection = db.db().collection(collectionName);
const result = await collection.deleteOne({ [field]: value }); const result = await collection.deleteOne({ [field]: value });
log.DEBUG('Document deleted:', result.deletedCount); log.DEBUG("Document deleted:", result.deletedCount);
return result.deletedCount; return result.deletedCount;
} catch (error) { } catch (error) {
console.error('Error deleting document:', error); console.error("Error deleting document:", error);
throw error; throw error;
} finally { } finally {
await db.close(); await db.close();

27
modules/mongo-wrappers/mongoNodesWrappers.mjs
View File

@@ -1,8 +1,12 @@
import { DebugBuilder } from "../../modules/debugger.mjs"; import { DebugBuilder } from "../../modules/debugger.mjs";
const log = new DebugBuilder("server", "mongoNodesWrappers"); const log = new DebugBuilder("server", "mongoNodesWrappers");
import { insertDocument, getDocuments, connectToDatabase } from "./mongoHandler.mjs"; import {
insertDocument,
getDocuments,
connectToDatabase,
} from "./mongoHandler.mjs";
const collectionName = 'nodes'; const collectionName = "nodes";
// Wrapper for inserting a node // Wrapper for inserting a node
export const createNode = async (node) => { export const createNode = async (node) => {
@@ -10,7 +14,7 @@ export const createNode = async (node) => {
const insertedId = await insertDocument(collectionName, node); const insertedId = await insertDocument(collectionName, node);
return insertedId; return insertedId;
} catch (error) { } catch (error) {
log.ERROR('Error creating node:', error); log.ERROR("Error creating node:", error);
throw error; throw error;
} }
}; };
@@ -21,7 +25,7 @@ export const getAllNodes = async () => {
const nodes = await getDocuments(collectionName); const nodes = await getDocuments(collectionName);
return nodes; return nodes;
} catch (error) { } catch (error) {
log.ERROR('Error getting all nodes:', error); log.ERROR("Error getting all nodes:", error);
throw error; throw error;
} }
}; };
@@ -34,7 +38,7 @@ export const getNodeByNuid = async (nuid) => {
const node = await collection.findOne({ nuid }); const node = await collection.findOne({ nuid });
return node; return node;
} catch (error) { } catch (error) {
log.ERROR('Error getting node by NUID:', error); log.ERROR("Error getting node by NUID:", error);
throw error; throw error;
} finally { } finally {
// Close the connection // Close the connection
@@ -47,11 +51,14 @@ export const updateNodeByNuid = async (nuid, updatedFields) => {
const db = await connectToDatabase(); const db = await connectToDatabase();
try { try {
const collection = db.db().collection(collectionName); const collection = db.db().collection(collectionName);
const result = await collection.updateOne({ nuid }, { $set: updatedFields }); const result = await collection.updateOne(
log.INFO('Node updated:', result.modifiedCount); { nuid },
{ $set: updatedFields },
);
log.INFO("Node updated:", result.modifiedCount);
return result.modifiedCount; return result.modifiedCount;
} catch (error) { } catch (error) {
log.ERROR('Error updating node by NUID:', error); log.ERROR("Error updating node by NUID:", error);
throw error; throw error;
} finally { } finally {
// Close the connection // Close the connection
@@ -65,10 +72,10 @@ export const deleteNodeByNuid = async (nuid) => {
try { try {
const collection = db.db().collection(collectionName); const collection = db.db().collection(collectionName);
const result = await collection.deleteOne({ nuid }); const result = await collection.deleteOne({ nuid });
log.INFO('Node deleted:', result.deletedCount); log.INFO("Node deleted:", result.deletedCount);
return result.deletedCount; return result.deletedCount;
} catch (error) { } catch (error) {
log.ERROR('Error deleting node by NUID:', error); log.ERROR("Error deleting node by NUID:", error);
throw error; throw error;
} finally { } finally {
// Close the connection // Close the connection

166
modules/mongo-wrappers/mongoSystemsWrappers.mjs
View File

@@ -1,113 +1,119 @@
import { DebugBuilder } from "../../modules/debugger.mjs"; import { DebugBuilder } from "../../modules/debugger.mjs";
const log = new DebugBuilder("server", "mongoSystemsWrappers"); const log = new DebugBuilder("server", "mongoSystemsWrappers");
import { insertDocument, getDocuments, connectToDatabase } from "./mongoHandler.mjs"; import {
insertDocument,
getDocuments,
connectToDatabase,
} from "./mongoHandler.mjs";
const collectionName = 'radio-systems'; const collectionName = "radio-systems";
// Local wrapper to remove any local files from radio systems // Local wrapper to remove any local files from radio systems
const removeLocalFilesFromsystem = async (system) => { const removeLocalFilesFromsystem = async (system) => {
if (system.trunkFile) delete system.trunkFile; if (system.trunkFile) delete system.trunkFile;
if (system.whitelistFile) delete system.whitelistFile; if (system.whitelistFile) delete system.whitelistFile;
} };
// Wrapper for inserting a system // Wrapper for inserting a system
export const createSystem = async (name, system, nuid) => { export const createSystem = async (name, system, nuid) => {
try { try {
// Remove any local files // Remove any local files
await removeLocalFilesFromsystem(system); await removeLocalFilesFromsystem(system);
// Add the NUID of the node that created this system // Add the NUID of the node that created this system
system.nodes = [nuid]; system.nodes = [nuid];
// Add the name of the system // Add the name of the system
system.name = name system.name = name;
const insertedId = await insertDocument(collectionName, system); const insertedId = await insertDocument(collectionName, system);
return insertedId; return insertedId;
} catch (error) { } catch (error) {
log.ERROR('Error creating system:', error); log.ERROR("Error creating system:", error);
throw error; throw error;
} }
}; };
// Wrapper for retrieving all systems // Wrapper for retrieving all systems
export const getAllSystems = async () => { export const getAllSystems = async () => {
try { try {
const systems = await getDocuments(collectionName); const systems = await getDocuments(collectionName);
return systems; return systems;
} catch (error) { } catch (error) {
log.ERROR('Error getting all systems:', error); log.ERROR("Error getting all systems:", error);
throw error; throw error;
} }
}; };
// Wrapper for retrieving a system by name // Wrapper for retrieving a system by name
export const getSystemByName = async (name) => { export const getSystemByName = async (name) => {
const db = await connectToDatabase(); const db = await connectToDatabase();
try { try {
const collection = db.db().collection(collectionName); const collection = db.db().collection(collectionName);
const system = await collection.findOne({ name }); const system = await collection.findOne({ name });
return system; return system;
} catch (error) { } catch (error) {
log.ERROR('Error getting system by name:', error); log.ERROR("Error getting system by name:", error);
throw error; throw error;
} finally { } finally {
// Close the connection // Close the connection
await db.close(); await db.close();
} }
}; };
// Wrapper to get all systems from a given node // Wrapper to get all systems from a given node
export const getSystemsByNuid = async (nuid) => { export const getSystemsByNuid = async (nuid) => {
const db = await connectToDatabase(); const db = await connectToDatabase();
try { try {
const collection = db.db().collection(collectionName); const collection = db.db().collection(collectionName);
// Query for documents where the 'nodes' array contains the given nodeID // Query for documents where the 'nodes' array contains the given nodeID
const query = { nodes: nuid }; const query = { nodes: nuid };
const systems = await collection.find(query).toArray(); const systems = await collection.find(query).toArray();
return systems; return systems;
} catch (error) { } catch (error) {
log.ERROR('Error finding entries:', error); log.ERROR("Error finding entries:", error);
throw error; throw error;
} finally { } finally {
// Close the connection // Close the connection
await db.close(); await db.close();
} }
}; };
// Wrapper for updating a system by name // Wrapper for updating a system by name
export const updateSystemByName = async (name, updatedSystem) => { export const updateSystemByName = async (name, updatedSystem) => {
// Remove any local files // Remove any local files
await removeLocalFilesFromsystem(updatedSystem); await removeLocalFilesFromsystem(updatedSystem);
const db = await connectToDatabase(); const db = await connectToDatabase();
try { try {
const collection = db.db().collection(collectionName); const collection = db.db().collection(collectionName);
const result = await collection.updateOne({ name }, { $set: updatedSystem }); const result = await collection.updateOne(
log.INFO('System updated:', result.modifiedCount); { name },
return result.modifiedCount; { $set: updatedSystem },
} catch (error) { );
log.ERROR('Error updating system by name:', error); log.INFO("System updated:", result.modifiedCount);
throw error; return result.modifiedCount;
} finally { } catch (error) {
// Close the connection log.ERROR("Error updating system by name:", error);
await db.close(); throw error;
} } finally {
// Close the connection
await db.close();
}
}; };
// Wrapper for deleting a system by name // Wrapper for deleting a system by name
export const deleteSystemByName = async (name) => { export const deleteSystemByName = async (name) => {
const db = await connectToDatabase(); const db = await connectToDatabase();
try { try {
const collection = db.db().collection(collectionName); const collection = db.db().collection(collectionName);
const result = await collection.deleteOne({ name }); const result = await collection.deleteOne({ name });
log.INFO('System deleted:', result.deletedCount); log.INFO("System deleted:", result.deletedCount);
return result.deletedCount; return result.deletedCount;
} catch (error) { } catch (error) {
log.ERROR('Error deleting system by name:', error); log.ERROR("Error deleting system by name:", error);
throw error; throw error;
} finally { } finally {
// Close the connection // Close the connection
await db.close(); await db.close();
} }
}; };

56
modules/socketServer.mjs
View File

@@ -1,41 +1,47 @@
import { DebugBuilder } from "../modules/debugger.mjs"; import { DebugBuilder } from "../modules/debugger.mjs";
const log = new DebugBuilder("server", "socketServer"); const log = new DebugBuilder("server", "socketServer");
import express from 'express'; import express from "express";
import { createServer } from 'node:http'; import { createServer } from "node:http";
import { Server } from 'socket.io'; import { Server } from "socket.io";
import morgan from 'morgan'; import morgan from "morgan";
import { nodeLoginWrapper, nodeUpdateWrapper, nodeDisconnectWrapper, nearbySystemsUpdateWraper } from "./socketServerWrappers.mjs"; import {
nodeLoginWrapper,
nodeUpdateWrapper,
nodeDisconnectWrapper,
nearbySystemsUpdateWraper,
} from "./socketServerWrappers.mjs";
export const app = express(); export const app = express();
export const server = createServer(app); export const server = createServer(app);
export const nodeIo = new Server(server); export const nodeIo = new Server(server);
app.use(morgan('tiny')); app.use(morgan("tiny"));
app.get('/', (req, res) => { app.get("/", (req, res) => {
res.send('<h1>Hello world</h1>'); res.send("<h1>Hello world</h1>");
}); });
nodeIo.on('connection', (socket) => { nodeIo.on("connection", (socket) => {
log.INFO('a user connected', socket.id); log.INFO("a user connected", socket.id);
socket.on('node-login', async (data) => { socket.on("node-login", async (data) => {
await nodeLoginWrapper(data, socket); await nodeLoginWrapper(data, socket);
await socket.emit('node-login-successful'); await socket.emit("node-login-successful");
}) });
socket.on('node-update', async (data) => { socket.on("node-update", async (data) => {
let tempPromises = []; let tempPromises = [];
tempPromises.push(nodeUpdateWrapper(data.node)); tempPromises.push(nodeUpdateWrapper(data.node));
tempPromises.push(nearbySystemsUpdateWraper(data.node.nuid, data.nearbySystems)); tempPromises.push(
nearbySystemsUpdateWraper(data.node.nuid, data.nearbySystems),
);
await Promise.all(tempPromises); await Promise.all(tempPromises);
await socket.emit('node-update-successful') await socket.emit("node-update-successful");
}) });
socket.on('disconnect', () => {
nodeDisconnectWrapper(socket.id);
});
socket.on("disconnect", () => {
nodeDisconnectWrapper(socket.id);
});
}); });

438
modules/socketServerWrappers.mjs
View File

@@ -1,7 +1,17 @@
import { DebugBuilder } from "../modules/debugger.mjs"; import { DebugBuilder } from "../modules/debugger.mjs";
const log = new DebugBuilder("server", "socketServerWrappers"); const log = new DebugBuilder("server", "socketServerWrappers");
import { createNode, getNodeByNuid, updateNodeByNuid } from "./mongo-wrappers/mongoNodesWrappers.mjs" import {
import { createSystem, getSystemByName, updateSystemByName, getSystemsByNuid, deleteSystemByName } from "./mongo-wrappers/mongoSystemsWrappers.mjs" createNode,
getNodeByNuid,
updateNodeByNuid,
} from "./mongo-wrappers/mongoNodesWrappers.mjs";
import {
createSystem,
getSystemByName,
updateSystemByName,
getSystemsByNuid,
deleteSystemByName,
} from "./mongo-wrappers/mongoSystemsWrappers.mjs";
/** /**
* Description * Description
@@ -11,11 +21,11 @@ import { createSystem, getSystemByName, updateSystemByName, getSystemsByNuid, de
* @returns {any} * @returns {any}
*/ */
const sendNodeCommand = async (socket, command, data) => { const sendNodeCommand = async (socket, command, data) => {
// TODO - Check to see if the command exists // TODO - Check to see if the command exists
// TODO - Check to see if the socket is alive? // TODO - Check to see if the socket is alive?
// TODO - Validate the given data // TODO - Validate the given data
socket.emit(command, data); socket.emit(command, data);
} };
/** /**
* Log the node into the network * Log the node into the network
@@ -24,25 +34,25 @@ const sendNodeCommand = async (socket, command, data) => {
* @returns {any} * @returns {any}
*/ */
export const nodeLoginWrapper = async (data, socket) => { export const nodeLoginWrapper = async (data, socket) => {
log.INFO(`Login requested from node: ${data.nuid}`, data); log.INFO(`Login requested from node: ${data.nuid}`, data);
// Check to see if node exists // Check to see if node exists
var node = await getNodeByNuid(data.nuid); var node = await getNodeByNuid(data.nuid);
if (!node) { if (!node) {
const insertedId = await createNode(data); const insertedId = await createNode(data);
log.DEBUG("Added new node to the database:", insertedId); log.DEBUG("Added new node to the database:", insertedId);
} else { } else {
// Check for updates // Check for updates
const updatedNode = await updateNodeByNuid(data.nuid, data) const updatedNode = await updateNodeByNuid(data.nuid, data);
log.DEBUG("Updated node:", updatedNode); log.DEBUG("Updated node:", updatedNode);
} }
node = await getNodeByNuid(data.nuid); node = await getNodeByNuid(data.nuid);
// Add the socket/node connection // Add the socket/node connection
socket.node = node; socket.node = node;
return; return;
} };
/** /**
* Disconnect the client from the server * Disconnect the client from the server
@@ -50,9 +60,9 @@ export const nodeLoginWrapper = async (data, socket) => {
* @returns {any} * @returns {any}
*/ */
export const nodeDisconnectWrapper = async (socketId) => { export const nodeDisconnectWrapper = async (socketId) => {
// TODO - Let any server know that a bot has disconnected if the bot was joined to vc? might not be worth cpu lol // TODO - Let any server know that a bot has disconnected if the bot was joined to vc? might not be worth cpu lol
return; return;
} };
/** /**
* Update node data in the database * Update node data in the database
@@ -60,10 +70,10 @@ export const nodeDisconnectWrapper = async (socketId) => {
* @returns {any} * @returns {any}
*/ */
export const nodeUpdateWrapper = async (nodeData) => { export const nodeUpdateWrapper = async (nodeData) => {
log.DEBUG("Data update sent by node: ", nodeData); log.DEBUG("Data update sent by node: ", nodeData);
const updateResults = await updateNodeByNuid(nodeData.nuid, nodeData); const updateResults = await updateNodeByNuid(nodeData.nuid, nodeData);
return; return;
} };
/** /**
* Wrapper to update the systems from the nearbySystems object passed from clients * Wrapper to update the systems from the nearbySystems object passed from clients
@@ -71,73 +81,88 @@ export const nodeUpdateWrapper = async (nodeData) => {
* @param {object} nearbySystems The nearby systems object passed from the node to be updated * @param {object} nearbySystems The nearby systems object passed from the node to be updated
*/ */
export const nearbySystemsUpdateWraper = async (nuid, nearbySystems) => { export const nearbySystemsUpdateWraper = async (nuid, nearbySystems) => {
log.DEBUG("System updates sent by node: ", nuid, nearbySystems); log.DEBUG("System updates sent by node: ", nuid, nearbySystems);
// Check to see if the node removed any systems // Check to see if the node removed any systems
const existingSystems = await getSystemsByNuid(nuid); const existingSystems = await getSystemsByNuid(nuid);
log.DEBUG("Existing systems:", existingSystems); log.DEBUG("Existing systems:", existingSystems);
if (existingSystems !== nearbySystems) { if (existingSystems !== nearbySystems) {
for (const existingSystem of existingSystems) { for (const existingSystem of existingSystems) {
if (existingSystem.name in nearbySystems) { if (existingSystem.name in nearbySystems) {
// Skip this system if it's in the given systems update // Skip this system if it's in the given systems update
continue; continue;
} }
log.DEBUG("System exists that was not given by node", existingSystem); log.DEBUG("System exists that was not given by node", existingSystem);
// Check if this node was the only node on this system // Check if this node was the only node on this system
if (existingSystem.nodes.filter(node => node !== nuid).length === 0) { if (existingSystem.nodes.filter((node) => node !== nuid).length === 0) {
// Remove the system if so // Remove the system if so
log.INFO("Given node was the only node on this system, removing the system..."); log.INFO(
await deleteSystemByName(existingSystem.name); "Given node was the only node on this system, removing the system...",
} else { );
// Remove the node from the array if there are other nodes with this system await deleteSystemByName(existingSystem.name);
log.INFO("Other nodes found on this system, removing the given NUID"); } else {
existingSystem.nodes = existingSystem.nodes.filter(node => node !== nuid); // Remove the node from the array if there are other nodes with this system
log.DEBUG(existingSystem); log.INFO("Other nodes found on this system, removing the given NUID");
await updateSystemByName(existingSystem.name, existingSystem); existingSystem.nodes = existingSystem.nodes.filter(
} (node) => node !== nuid,
} );
log.DEBUG(existingSystem);
await updateSystemByName(existingSystem.name, existingSystem);
}
} }
}
// Add and update the given systems // Add and update the given systems
for (const nearbySystem in nearbySystems) { for (const nearbySystem in nearbySystems) {
// Check if the system exists already on another node // Check if the system exists already on another node
const existingSystem = await getSystemByName(nearbySystem); const existingSystem = await getSystemByName(nearbySystem);
if (existingSystem) { if (existingSystem) {
// Verify the frequencies match (to make sure the name isn't just the same) // Verify the frequencies match (to make sure the name isn't just the same)
if (JSON.stringify(existingSystem.frequencies) === JSON.stringify(nearbySystems[nearbySystem].frequencies)) { if (
// The systems are the same JSON.stringify(existingSystem.frequencies) ===
JSON.stringify(nearbySystems[nearbySystem].frequencies)
) {
// The systems are the same
// Check if the current node is listed in the nodes, if not add it // Check if the current node is listed in the nodes, if not add it
if (!existingSystem.nodes.includes(nuid)) { if (!existingSystem.nodes.includes(nuid)) {
existingSystem.nodes.push(nuid); existingSystem.nodes.push(nuid);
// Update the system with the added node // Update the system with the added node
const updateResults = await updateSystemByName(nearbySystem, existingSystem); const updateResults = await updateSystemByName(
if (updateResults) log.INFO("System updated", nearbySystem); nearbySystem,
} existingSystem,
} else { );
// The systems are not the same if (updateResults) log.INFO("System updated", nearbySystem);
// TODO - Implement logic to handle if system names match, but they are for different frequencies or have additional freqs
// Check if the current node is listed in the nodes, if not add it
if (!existingSystem.nodes.includes(nuid)) {
existingSystem.nodes.push(nuid);
nearbySystems[nearbySystem].nodes = existingSystem.nodes;
}
// Update the system with the added node
const updateResults = await updateSystemByName(nearbySystem, nearbySystems[nearbySystem]);
if (updateResults) log.INFO("System updated", nearbySystem);
}
} }
else { } else {
// Create a new system // The systems are not the same
const newSystem = await createSystem(nearbySystem, nearbySystems[nearbySystem], nuid); // TODO - Implement logic to handle if system names match, but they are for different frequencies or have additional freqs
log.INFO("New system created", nearbySystem, newSystem);
// Check if the current node is listed in the nodes, if not add it
if (!existingSystem.nodes.includes(nuid)) {
existingSystem.nodes.push(nuid);
nearbySystems[nearbySystem].nodes = existingSystem.nodes;
} }
// Update the system with the added node
const updateResults = await updateSystemByName(
nearbySystem,
nearbySystems[nearbySystem],
);
if (updateResults) log.INFO("System updated", nearbySystem);
}
} else {
// Create a new system
const newSystem = await createSystem(
nearbySystem,
nearbySystems[nearbySystem],
nuid,
);
log.INFO("New system created", nearbySystem, newSystem);
} }
return; }
} return;
};
/** /**
* Get the open socket connection ID for a node from the NUID * Get the open socket connection ID for a node from the NUID
@@ -145,15 +170,14 @@ export const nearbySystemsUpdateWraper = async (nuid, nearbySystems) => {
* @returns {string|null} Will return the open socket ID or NULL * @returns {string|null} Will return the open socket ID or NULL
*/ */
export const getSocketIdByNuid = async (nodeIo, nuid) => { export const getSocketIdByNuid = async (nodeIo, nuid) => {
const openSockets = await nodeIo.allSockets(); const openSockets = await nodeIo.allSockets();
for (const openSocketId of openSockets) { for (const openSocketId of openSockets) {
log.DEBUG(openSockets) log.DEBUG(openSockets);
const openSocket = await nodeIo.sockets.sockets.get(openSocketId); const openSocket = await nodeIo.sockets.sockets.get(openSocketId);
if (openSocket.node.nuid == nuid) if (openSocket.node.nuid == nuid) return openSocket;
return openSocket; }
} return null;
return null; };
}
/** /**
* Get all nodes that are connected to a voice channel * Get all nodes that are connected to a voice channel
@@ -162,29 +186,34 @@ export const getSocketIdByNuid = async (nodeIo, nuid) => {
* @returns {Array} The sockets connected to VC in a given server * @returns {Array} The sockets connected to VC in a given server
*/ */
export const getAllSocketsConnectedToVC = async (nodeIo, guildId) => { export const getAllSocketsConnectedToVC = async (nodeIo, guildId) => {
// Get all open socket nodes // Get all open socket nodes
// TODO - require a server guild to filter the results, ie this would be able to check what server the VCs the nodes are connected are in // TODO - require a server guild to filter the results, ie this would be able to check what server the VCs the nodes are connected are in
const openSockets = [...await nodeIo.allSockets()]; // TODO - Filter the returned nodes to only nodes that have the radio capability const openSockets = [...(await nodeIo.allSockets())]; // TODO - Filter the returned nodes to only nodes that have the radio capability
// Check each open socket to see if the node has the requested system // Check each open socket to see if the node has the requested system
const socketsConnectedToVC = [] const socketsConnectedToVC = [];
await Promise.all(openSockets.map(async openSocket => { await Promise.all(
openSocket = await nodeIo.sockets.sockets.get(openSocket); openSockets.map(async (openSocket) => {
await new Promise((res) => { openSocket = await nodeIo.sockets.sockets.get(openSocket);
openSocket.emit('node-check-connected-status', guildId, (status) => { await new Promise((res) => {
if (status) { openSocket.emit("node-check-connected-status", guildId, (status) => {
log.INFO("Socket is connected to VC:", openSocket.node.name, status); if (status) {
socketsConnectedToVC.push(openSocket); log.INFO(
} else { "Socket is connected to VC:",
log.INFO("Socket is NOT connected to VC:", openSocket.node.name); openSocket.node.name,
} status,
res(); );
}) socketsConnectedToVC.push(openSocket);
} else {
log.INFO("Socket is NOT connected to VC:", openSocket.node.name);
}
res();
}); });
})); });
}),
return socketsConnectedToVC; );
}
return socketsConnectedToVC;
};
/** /**
* Check if the given node has an open discord client * Check if the given node has an open discord client
@@ -192,45 +221,65 @@ export const getAllSocketsConnectedToVC = async (nodeIo, guildId) => {
* @returns {boolean} If the given node has an open discord client or not * @returns {boolean} If the given node has an open discord client or not
*/ */
export const checkIfNodeHasOpenDiscordClient = async (openSocket) => { export const checkIfNodeHasOpenDiscordClient = async (openSocket) => {
// Check the open socket to see if the node has an open discord client // Check the open socket to see if the node has an open discord client
let hasOpenDiscordClient = false; let hasOpenDiscordClient = false;
await new Promise((res) => { await new Promise((res) => {
log.INFO("Checking if socket has an open connection:", openSocket.node.name) log.INFO(
openSocket.emit('node-check-discord-open-client', (status) => { "Checking if socket has an open connection:",
if (status) { openSocket.node.name,
log.INFO("Socket has an open discord client:", openSocket.node.name, status); );
hasOpenDiscordClient = true; openSocket.emit("node-check-discord-open-client", (status) => {
} else { if (status) {
log.INFO("Socket does NOT have an open discord client:", openSocket.node.name); log.INFO(
} "Socket has an open discord client:",
res(); openSocket.node.name,
}) status,
);
hasOpenDiscordClient = true;
} else {
log.INFO(
"Socket does NOT have an open discord client:",
openSocket.node.name,
);
}
res();
}); });
});
return hasOpenDiscordClient; return hasOpenDiscordClient;
} };
export const getNodeCurrentListeningSystem = async (openSocket) => { export const getNodeCurrentListeningSystem = async (openSocket) => {
const hasOpenClient = checkIfNodeHasOpenDiscordClient(openSocket); const hasOpenClient = checkIfNodeHasOpenDiscordClient(openSocket);
if (!hasOpenClient) return undefined; if (!hasOpenClient) return undefined;
// check what system the socket is listening to // check what system the socket is listening to
let currentSystem = undefined; let currentSystem = undefined;
await new Promise((res) => { await new Promise((res) => {
log.INFO("Checking system node is currently listening to:", openSocket.node.name) log.INFO(
openSocket.emit('node-check-current-system', (system) => { "Checking system node is currently listening to:",
if (system) { openSocket.node.name,
log.INFO("Socket is listening to system:", openSocket.node.name, system); );
currentSystem = system; openSocket.emit("node-check-current-system", (system) => {
} else { if (system) {
log.INFO("Socket is not currently listening to a system:", openSocket.node.name); log.INFO(
} "Socket is listening to system:",
res(); openSocket.node.name,
}) system,
);
currentSystem = system;
} else {
log.INFO(
"Socket is not currently listening to a system:",
openSocket.node.name,
);
}
res();
}); });
});
return currentSystem; return currentSystem;
} };
/** /**
* Wrapper to check if the given NUID is connected to a VC * Wrapper to check if the given NUID is connected to a VC
@@ -239,14 +288,17 @@ export const getNodeCurrentListeningSystem = async (openSocket) => {
* @returns {boolean} If the node is connected to VC in the given server * @returns {boolean} If the node is connected to VC in the given server
*/ */
export const checkIfNodeIsConnectedToVC = async (nodeIo, guildId, nuid) => { export const checkIfNodeIsConnectedToVC = async (nodeIo, guildId, nuid) => {
const socketsConnectedToVC = await getAllSocketsConnectedToVC(nodeIo, guildId); const socketsConnectedToVC = await getAllSocketsConnectedToVC(
for (const socket of socketsConnectedToVC) { nodeIo,
if (socket.node.nuid === nuid) { guildId,
return true; );
} for (const socket of socketsConnectedToVC) {
if (socket.node.nuid === nuid) {
return true;
} }
return false; }
} return false;
};
/** /**
* Get the discord username from a given socket * Get the discord username from a given socket
@@ -255,12 +307,12 @@ export const checkIfNodeIsConnectedToVC = async (nodeIo, guildId, nuid) => {
* @returns {string} The username of the bot in the requested server * @returns {string} The username of the bot in the requested server
*/ */
export const getNodeDiscordUsername = async (socket, guildId) => { export const getNodeDiscordUsername = async (socket, guildId) => {
return await new Promise((res) => { return await new Promise((res) => {
socket.emit('node-get-discord-username', guildId, (username) => { socket.emit("node-get-discord-username", guildId, (username) => {
res(username); res(username);
});
}); });
} });
};
/** /**
* Get the discord ID from a given socket * Get the discord ID from a given socket
@@ -268,12 +320,12 @@ export const getNodeDiscordUsername = async (socket, guildId) => {
* @returns {string} The ID of the bot * @returns {string} The ID of the bot
*/ */
export const getNodeDiscordID = async (socket) => { export const getNodeDiscordID = async (socket) => {
return await new Promise((res) => { return await new Promise((res) => {
socket.emit('node-get-discord-id', (discordID) => { socket.emit("node-get-discord-id", (discordID) => {
res(discordID); res(discordID);
});
}); });
} });
};
/** /**
* Request a given socket node to join a given voice channel * Request a given socket node to join a given voice channel
@@ -281,16 +333,21 @@ export const getNodeDiscordID = async (socket) => {
* @param {any} systemName The system preset name that we would like to listen to * @param {any} systemName The system preset name that we would like to listen to
* @param {string} discordChanelId The Discord channel ID to join the listening bot to * @param {string} discordChanelId The Discord channel ID to join the listening bot to
*/ */
export const requestNodeJoinSystem = async (socket, systemName, discordChanelId, discordToken = "MTE5NjAwNTM2ODYzNjExMjk3Nw.GuCMXg.24iNNofNNumq46FIj68zMe9RmQgugAgfrvelEA") => { export const requestNodeJoinSystem = async (
// Join the system socket,
const joinData = { systemName,
'clientID': discordToken, discordChanelId,
'channelID': discordChanelId, discordToken = "MTE5NjAwNTM2ODYzNjExMjk3Nw.GuCMXg.24iNNofNNumq46FIj68zMe9RmQgugAgfrvelEA",
'system': systemName ) => {
} // Join the system
// Send the command to the node const joinData = {
await sendNodeCommand(socket, "node-join", joinData); clientID: discordToken,
} channelID: discordChanelId,
system: systemName,
};
// Send the command to the node
await sendNodeCommand(socket, "node-join", joinData);
};
/** /**
* Request a given socket node to leave VC in a given server * Request a given socket node to leave VC in a given server
@@ -298,21 +355,20 @@ export const requestNodeJoinSystem = async (socket, systemName, discordChanelId,
* @param {string} guildId The guild ID to disconnect the socket node from * @param {string} guildId The guild ID to disconnect the socket node from
*/ */
export const requestBotLeaveServer = async (socket, guildId) => { export const requestBotLeaveServer = async (socket, guildId) => {
// Send the command to the node // Send the command to the node
await sendNodeCommand(socket, "node-leave", guildId); await sendNodeCommand(socket, "node-leave", guildId);
} };
/** /**
* Requset a given socket node to update themselves * Requset a given socket node to update themselves
* @param {any} socket The socket object of the node to request to update * @param {any} socket The socket object of the node to request to update
*/ */
export const requestNodeUpdate = async (socket) => { export const requestNodeUpdate = async (socket) => {
await sendNodeCommand(socket, 'node-update', (status) => { await sendNodeCommand(socket, "node-update", (status) => {
if (status) { if (status) {
log.INFO("Node is out of date, updating now", socket.node.name); log.INFO("Node is out of date, updating now", socket.node.name);
} else { } else {
log.INFO("Node is up to date", socket.node.name); log.INFO("Node is up to date", socket.node.name);
} }
}); });
} };

1
package.json
View File

@@ -5,6 +5,7 @@
"main": "server.js", "main": "server.js",
"scripts": { "scripts": {
"lint": "eslint .", "lint": "eslint .",
"lint:fix": "eslint --fix .",
"test": "mocha --timeout 5000", "test": "mocha --timeout 5000",
"start": "node server.js" "start": "node server.js"
}, },

96
rss-manager/feedHandler.mjs
View File

@@ -1,28 +1,36 @@
import { getAllFeeds, deleteFeedByLink, createPost, getPostByPostId } from '../modules/mongo-wrappers/mongoFeedsWrappers.mjs'; import {
import crypto from 'crypto'; getAllFeeds,
import { sendPost } from '../discordBot/modules/rssWrappers.mjs'; deleteFeedByLink,
createPost,
getPostByPostId,
} from "../modules/mongo-wrappers/mongoFeedsWrappers.mjs";
import crypto from "crypto";
import { sendPost } from "../discordBot/modules/rssWrappers.mjs";
import { DebugBuilder } from "../modules/debugger.mjs"; import { DebugBuilder } from "../modules/debugger.mjs";
import { removeSource } from './sourceManager.mjs' import { removeSource } from "./sourceManager.mjs";
import UserAgent from "user-agents"; import UserAgent from "user-agents";
import Parser from 'rss-parser'; import Parser from "rss-parser";
import dotenv from 'dotenv'; import dotenv from "dotenv";
dotenv.config() dotenv.config();
// Initialize the User-Agent string // Initialize the User-Agent string
process.env.USER_AGENT_STRING = new UserAgent({ platform: 'Win32' }).toString(); process.env.USER_AGENT_STRING = new UserAgent({ platform: "Win32" }).toString();
const parser = new Parser({ const parser = new Parser({
headers: { headers: {
'User-Agent': process.env.USER_AGENT_STRING, "User-Agent": process.env.USER_AGENT_STRING,
"Accept": "application/rss+xml,application/xhtml+xml,application/xml" Accept: "application/rss+xml,application/xhtml+xml,application/xml",
} },
}); });
const log = new DebugBuilder("server", "feedHandler"); const log = new DebugBuilder("server", "feedHandler");
export const returnHash = (...stringsIncluded) => { export const returnHash = (...stringsIncluded) => {
return crypto.createHash('sha1').update(stringsIncluded.join("-<<??//\\\\??>>-")).digest("base64"); return crypto
.createHash("sha1")
.update(stringsIncluded.join("-<<??//\\\\??>>-"))
.digest("base64");
}; };
/** /**
@@ -37,43 +45,55 @@ export const updateFeeds = async (client) => {
const records = await getAllFeeds(); const records = await getAllFeeds();
const sourcePromiseArray = records.map(async (source) => { const sourcePromiseArray = records.map(async (source) => {
log.DEBUG('Processing source:', source.title); log.DEBUG("Processing source:", source.title);
try { try {
const parsedFeed = await parser.parseURL(source.link); const parsedFeed = await parser.parseURL(source.link);
if (parsedFeed?.items) { if (parsedFeed?.items) {
await Promise.all(parsedFeed.items.reverse().map(async (post) => { await Promise.all(
log.DEBUG("Processing post:", post.title); parsedFeed.items.reverse().map(async (post) => {
log.DEBUG("Processing post:", post.title);
if (!post.title || !post.link) throw new Error("Missing title or link in the post"); if (!post.title || !post.link)
if (!post.content && !post['content:encoded']) log.WARN("No content for post:", post.title); throw new Error("Missing title or link in the post");
if (!post.content && !post["content:encoded"])
log.WARN("No content for post:", post.title);
post.postId = post.postId ?? post.guid ?? post.id ?? returnHash(post.title, post.link, post.pubDate ?? Date.now()); post.postId =
post.postId ??
post.guid ??
post.id ??
returnHash(post.title, post.link, post.pubDate ?? Date.now());
const existingRecord = await getPostByPostId(post.postId); const existingRecord = await getPostByPostId(post.postId);
if (!existingRecord) { if (!existingRecord) {
const channel = client.channels.cache.get(source.channel_id); const channel = client.channels.cache.get(source.channel_id);
const sendResults = await sendPost(post, source, channel); const sendResults = await sendPost(post, source, channel);
if (!sendResults) throw new Error("Failed to send post"); if (!sendResults) throw new Error("Failed to send post");
log.DEBUG("Saving post to database:", post.title, source.channel_id); log.DEBUG(
"Saving post to database:",
post.title,
source.channel_id,
);
const postToSave = { const postToSave = {
title: post.title, title: post.title,
link: post.link, link: post.link,
pubDate: post.pubDate, pubDate: post.pubDate,
author: post.author, author: post.author,
contentSnippet: post.contentSnippet, contentSnippet: post.contentSnippet,
id: post.id, id: post.id,
isoDate: post.isoDate, isoDate: post.isoDate,
postId: post.postId postId: post.postId,
}; };
await createPost(postToSave); await createPost(postToSave);
log.DEBUG("Post saved:", postToSave); log.DEBUG("Post saved:", postToSave);
} }
})); }),
);
} else { } else {
await deleteFeedByLink(source.link); await deleteFeedByLink(source.link);
} }

63
rss-manager/rssController.mjs
View File

@@ -2,7 +2,7 @@
import { DebugBuilder } from "../modules/debugger.mjs"; import { DebugBuilder } from "../modules/debugger.mjs";
import { updateFeeds } from "./feedHandler.mjs"; import { updateFeeds } from "./feedHandler.mjs";
import dotenv from 'dotenv'; import dotenv from "dotenv";
dotenv.config(); dotenv.config();
const log = new DebugBuilder("server", "rssController"); const log = new DebugBuilder("server", "rssController");
@@ -10,40 +10,39 @@ const log = new DebugBuilder("server", "rssController");
const refreshInterval = parseInt(process.env.RSS_REFRESH_INTERVAL) || 300000; const refreshInterval = parseInt(process.env.RSS_REFRESH_INTERVAL) || 300000;
export class RSSController { export class RSSController {
constructor(client) { constructor(client) {
this.client = client; this.client = client;
this.intervalId = null; this.intervalId = null;
}
async start() {
try {
log.INFO("Starting RSS Controller");
// Get initial feeds before starting the interval loop
await this.collectLatestPosts();
// Start the interval loop for updating feeds
this.intervalId = setInterval(async () => {
await this.collectLatestPosts();
}, refreshInterval);
} catch (error) {
log.ERROR(`Failed to start RSS Controller: ${error.message}`);
} }
}
async start() { async stop() {
try { if (this.intervalId) {
log.INFO("Starting RSS Controller"); clearInterval(this.intervalId);
// Get initial feeds before starting the interval loop log.INFO("RSS Controller stopped");
await this.collectLatestPosts();
// Start the interval loop for updating feeds
this.intervalId = setInterval(async () => {
await this.collectLatestPosts();
}, refreshInterval);
} catch (error) {
log.ERROR(`Failed to start RSS Controller: ${error.message}`);
}
} }
}
async stop() { async collectLatestPosts() {
if (this.intervalId) { try {
clearInterval(this.intervalId); log.INFO("Updating sources");
log.INFO("RSS Controller stopped"); await updateFeeds(this.client);
} } catch (error) {
} log.ERROR(`Error updating feeds: ${error.message}`);
async collectLatestPosts() {
try {
log.INFO("Updating sources");
await updateFeeds(this.client);
} catch (error) {
log.ERROR(`Error updating feeds: ${error.message}`);
}
} }
}
} }

135
rss-manager/sourceManager.mjs
View File

@@ -1,77 +1,92 @@
import { DebugBuilder } from "../modules/debugger.mjs"; import { DebugBuilder } from "../modules/debugger.mjs";
const log = new DebugBuilder("server", "sourceManager"); const log = new DebugBuilder("server", "sourceManager");
import { createFeed, getFeedByLink, deleteFeedByLink } from '../modules/mongo-wrappers/mongoFeedsWrappers.mjs'; import {
createFeed,
getFeedByLink,
deleteFeedByLink,
} from "../modules/mongo-wrappers/mongoFeedsWrappers.mjs";
class SourceManager { class SourceManager {
constructor(sourceFailureLimit) { constructor(sourceFailureLimit) {
this.sourceFailureLimit = sourceFailureLimit; this.sourceFailureLimit = sourceFailureLimit;
this.runningSourcesToRemove = {}; this.runningSourcesToRemove = {};
}
async removeSource(sourceURL) {
log.INFO(`Removing source: ${sourceURL}`);
const currentTime = Date.now();
const sourceData = this.runningSourcesToRemove[sourceURL];
if (!sourceData) {
this.runningSourcesToRemove[sourceURL] = {
count: 1,
timestamp: currentTime,
ignoredAttempts: 0,
};
return;
} }
async removeSource(sourceURL) { const elapsedTimeSinceLastAttempt = currentTime - sourceData.timestamp;
log.INFO(`Removing source: ${sourceURL}`); const waitTime = sourceData.count * 30000;
const currentTime = Date.now(); if (elapsedTimeSinceLastAttempt <= waitTime) {
const sourceData = this.runningSourcesToRemove[sourceURL]; sourceData.ignoredAttempts += 1;
return;
if (!sourceData) {
this.runningSourcesToRemove[sourceURL] = { count: 1, timestamp: currentTime, ignoredAttempts: 0 };
return;
}
const elapsedTimeSinceLastAttempt = currentTime - sourceData.timestamp;
const waitTime = sourceData.count * 30000;
if (elapsedTimeSinceLastAttempt <= waitTime) {
sourceData.ignoredAttempts += 1;
return;
}
if (sourceData.count < this.sourceFailureLimit) {
sourceData.count += 1;
sourceData.timestamp = currentTime;
return;
}
try {
const record = await getFeedByLink(sourceURL);
if (!record) {
log.ERROR(`Source not found in storage: ${sourceURL}`);
return;
}
const results = await deleteFeedByLink(sourceURL);
if (!results) {
log.WARN(`Failed to remove source: ${sourceURL}`);
return;
}
log.DEBUG(`Source removed after exceeding failure limit: ${sourceURL}`);
// Optionally, clean up the entry from runningSourcesToRemove
delete this.runningSourcesToRemove[sourceURL];
} catch (err) {
log.ERROR(`Error removing source from storage: ${sourceURL}`, err);
}
} }
async addSource(title, link, category, guildId, channelId, callback) { if (sourceData.count < this.sourceFailureLimit) {
try { sourceData.count += 1;
const feed = { title, link, category, guild_id: guildId, channel_id: channelId }; sourceData.timestamp = currentTime;
const record = await createFeed(feed); return;
log.DEBUG("Source added:", record);
if (callback) callback(null, record);
} catch (err) {
log.ERROR("Error adding source:", err);
if (callback) callback(err, null);
}
} }
try {
const record = await getFeedByLink(sourceURL);
if (!record) {
log.ERROR(`Source not found in storage: ${sourceURL}`);
return;
}
const results = await deleteFeedByLink(sourceURL);
if (!results) {
log.WARN(`Failed to remove source: ${sourceURL}`);
return;
}
log.DEBUG(`Source removed after exceeding failure limit: ${sourceURL}`);
// Optionally, clean up the entry from runningSourcesToRemove
delete this.runningSourcesToRemove[sourceURL];
} catch (err) {
log.ERROR(`Error removing source from storage: ${sourceURL}`, err);
}
}
async addSource(title, link, category, guildId, channelId, callback) {
try {
const feed = {
title,
link,
category,
guild_id: guildId,
channel_id: channelId,
};
const record = await createFeed(feed);
log.DEBUG("Source added:", record);
if (callback) callback(null, record);
} catch (err) {
log.ERROR("Error adding source:", err);
if (callback) callback(err, null);
}
}
} }
// Create a default instance of SourceManager // Create a default instance of SourceManager
const defaultSourceManager = new SourceManager(); const defaultSourceManager = new SourceManager();
// Export the class and default instance methods // Export the class and default instance methods
export { SourceManager }; export { SourceManager };
export const addSource = defaultSourceManager.addSource.bind(defaultSourceManager); export const addSource =
export const removeSource = defaultSourceManager.removeSource.bind(defaultSourceManager); defaultSourceManager.addSource.bind(defaultSourceManager);
export const removeSource =
defaultSourceManager.removeSource.bind(defaultSourceManager);

15
server.js
View File

@@ -1,15 +1,18 @@
import { DebugBuilder } from "./modules/debugger.mjs"; import { DebugBuilder } from "./modules/debugger.mjs";
const log = new DebugBuilder("server", "server"); const log = new DebugBuilder("server", "server");
import { nodeIo, app, server } from './modules/socketServer.mjs'; import { nodeIo, app, server } from "./modules/socketServer.mjs";
import { loadAddons } from './modules/addonManager.mjs'; import { loadAddons } from "./modules/addonManager.mjs";
import { serverClient, addEnabledEventListeners } from './discordBot/discordBot.mjs'; import {
serverClient,
addEnabledEventListeners,
} from "./discordBot/discordBot.mjs";
import dotenv from 'dotenv'; import dotenv from "dotenv";
dotenv.config() dotenv.config();
// Startup the node server // Startup the node server
server.listen(process.env.SERVER_PORT || 3000, () => { server.listen(process.env.SERVER_PORT || 3000, () => {
log.INFO(`server running at http://localhost:${process.env.SERVER_PORT}`); log.INFO(`server running at http://localhost:${process.env.SERVER_PORT}`);
}); });
// Add objects to the others // Add objects to the others

985
test/socketServerWrappers.test.js
View File

File diff suppressed because it is too large Load Diff