Add first draft of using rustplus-ts to connect to servers

Author: alexemanuelol

index.ts

@@ -27,7 +27,7 @@ import { LocaleManager, Languages, isValidLanguage } from './src/managers/Locale
 import { CredentialsManager } from './src/managers/credentialsManager';
 import { GuildInstanceManager } from './src/managers/guildInstanceManager';
 import { DiscordManager } from './src/managers/discordManager';
-//import { RustPlusMananger } from './src/managers/rustPlusManager';
+import { RustPlusManager } from './src/managers/rustPlusManager';
 import { FcmListenerManager } from './src/managers/fcmListenerManager';
 
 dotenv.config();
@@ -97,10 +97,10 @@ export const guildInstanceManager = new GuildInstanceManager(
     path.join(__dirname, 'src', 'templates')
 );
 
+export const rustPlusManager = new RustPlusManager();
 export const discordManager = new DiscordManager();
 discordManager.build();
 
-//export const rustPlusManager = new RustPlusMananger();
 export const fcmListenerManager = new FcmListenerManager(discordManager);
 
 process.on('unhandledRejection', error => {

src/discordEvents/guildDelete.ts

@@ -20,9 +20,16 @@
 
 import * as discordjs from 'discord.js';
 
-import { guildInstanceManager as gim, log, credentialsManager as cm, fcmListenerManager as flm } from '../../index';
+import {
+    guildInstanceManager as gim,
+    log,
+    credentialsManager as cm,
+    fcmListenerManager as flm,
+    rustPlusManager as rpm
+} from '../../index';
 import { DiscordManager } from '../managers/discordManager';
 import { Credentials } from '../managers/credentialsManager';
+import { GuildInstance } from '../managers/guildInstanceManager';
 
 export const name = 'guildDelete';
 export const once = false;
@@ -50,7 +57,10 @@ export async function execute(dm: DiscordManager, guild: discordjs.Guild) {
         cm.updateCredentials(steamId);
     }
 
-    // TODO! turn off and remove rustplus instance from manager for guild
+    const gInstance = gim.getGuildInstance(guild.id) as GuildInstance;
+    for (const serverId of Object.keys(gInstance.serverInfoMap)) {
+        rpm.removeInstance(guild.id, serverId);
+    }
 
     /* Delete guild instance file last. */
     gim.deleteGuildInstance(guild.id);

src/discordEvents/ready.ts

@@ -20,10 +20,18 @@
 
 import * as path from 'path';
 
-import { guildInstanceManager as gim, config, log, credentialsManager as cm, fcmListenerManager as flm } from '../../index';
+import {
+    guildInstanceManager as gim,
+    config,
+    log,
+    credentialsManager as cm,
+    fcmListenerManager as flm,
+    rustPlusManager as rpm
+} from '../../index';
 import { DiscordManager } from '../managers/discordManager';
 import { Credentials } from '../managers/credentialsManager';
 import * as types from '../utils/types';
+import { GuildInstance } from '../managers/guildInstanceManager';
 
 export const name = 'ready';
 export const once = true;
@@ -100,11 +108,19 @@ export async function execute(dm: DiscordManager) {
     for (const guild of dm.client.guilds.cache.values()) {
         await dm.registerGuildSlashCommands(guild);
         await dm.setupGuild(guild);
-    }
-
 
-    // TODO!
-    // Setup rustplus instances based on guild settings
-    // global variable uptimeBot set new time.
+        const gInstance = gim.getGuildInstance(guild.id) as GuildInstance;
+        for (const [serverId, content] of Object.entries(gInstance.serverInfoMap)) {
+            if (content.active) {
+                if (rpm.addInstance(guild.id, serverId, content.mainSteamId)) {
+                    const rustPlusInstance = rpm.getInstance(guild.id, serverId);
+                    if (rustPlusInstance) {
+                        await rustPlusInstance.startup();
+                    }
+                }
+            }
+        }
+    }
 
+    // TODO! global variable uptimeBot set new time.
 }

src/discordUtils/discordButtons.ts

@@ -20,6 +20,7 @@
 
 import * as discordjs from 'discord.js';
 
+import { ConnectionStatus } from '../managers/rustPlusManager';
 import * as types from '../utils/types';
 import * as constants from '../utils/constants';
 import { guildInstanceManager as gim, localeManager as lm } from '../../index';
@@ -153,23 +154,33 @@ export function getHelpButtons(): discordjs.ActionRowBuilder<discordjs.ButtonBui
  * Guild based buttons
  */
 
-export function getServerButtons(guildId: types.GuildId, serverId: types.ServerId, connection: ButtonConnectionTypes):
+export function getServerButtons(guildId: types.GuildId, serverId: types.ServerId,
+    connectionStatus: ConnectionStatus):
     discordjs.ActionRowBuilder<discordjs.ButtonBuilder>[] {
     const gInstance = gim.getGuildInstance(guildId) as GuildInstance;
     const serverInfo = gInstance.serverInfoMap[serverId] as ServerInfo;
     const language = gInstance.generalSettings.language;
     const identifier = JSON.stringify({ 'serverId': serverId });
 
     const connectionMap = {
-        [ButtonConnectionTypes.Connected]: ['ServerDisconnect', 'buttonDisconnect', discordjs.ButtonStyle.Danger],
-        [ButtonConnectionTypes.Disconnected]: ['ServerConnect', 'buttonConnect', discordjs.ButtonStyle.Primary],
-        [ButtonConnectionTypes.Reconnecting]: ['ServerReconnecting', 'buttonReconnecting', discordjs.ButtonStyle.Danger]
+        [ConnectionStatus.Disconnected]: ['ServerConnect', 'buttonConnect', discordjs.ButtonStyle.Primary],
+        [ConnectionStatus.Connecting]: ['ServerConnecting', 'buttonConnecting', discordjs.ButtonStyle.Primary],
+        [ConnectionStatus.Connected]: ['ServerDisconnect', 'buttonDisconnect', discordjs.ButtonStyle.Danger],
+        [ConnectionStatus.Reconnecting]: ['ServerReconnecting', 'buttonReconnecting', discordjs.ButtonStyle.Danger]
     }
 
     const connectionButton = getButton({
-        customId: `${connectionMap[connection][0] as string}${identifier}`,
-        label: lm.getIntl(language, connectionMap[connection][1] as string),
-        style: connectionMap[connection][2] as discordjs.ButtonStyle.Danger | discordjs.ButtonStyle.Primary,
+        customId: `${connectionMap[connectionStatus][0] as string}${identifier}`,
+        label: lm.getIntl(language, connectionMap[connectionStatus][1] as string),
+        style: connectionMap[connectionStatus][2] as discordjs.ButtonStyle.Danger | discordjs.ButtonStyle.Primary,
+        type: discordjs.ComponentType.Button
+    });
+
+    const isServerView = gInstance.serverToView === serverId;
+    const viewButton = getButton({
+        customId: `ServerView${identifier}`,
+        label: lm.getIntl(language, 'buttonView'),
+        style: isServerView ? discordjs.ButtonStyle.Success : discordjs.ButtonStyle.Danger,
         type: discordjs.ComponentType.Button
     });
 
@@ -196,7 +207,7 @@ export function getServerButtons(guildId: types.GuildId, serverId: types.ServerI
 
     return [
         new discordjs.ActionRowBuilder<discordjs.ButtonBuilder>().addComponents(
-            connectionButton, editButton, websiteButton, deleteButton
+            connectionButton, viewButton, editButton, websiteButton, deleteButton
         )
     ];
 }

src/discordUtils/discordMessages.ts

@@ -22,6 +22,7 @@ import * as discordjs from 'discord.js';
 import * as path from 'path';
 
 import { log, guildInstanceManager as gim, credentialsManager as cm, localeManager as lm } from '../../index';
+import { ConnectionStatus } from '../managers/rustPlusManager';
 import * as constants from '../utils/constants';
 import * as discordButtons from './discordButtons';
 import * as discordEmbeds from './discordEmbeds';
@@ -154,7 +155,7 @@ export async function sendCredentialsListMessage(dm: DiscordManager, interaction
  */
 
 export async function sendServerMessage(dm: DiscordManager, guildId: types.GuildId, serverId: types.ServerId,
-    interaction: discordjs.Interaction | null = null) {
+    connectionStatus: ConnectionStatus, interaction: discordjs.Interaction | null = null) {
     const funcName = `[sendServerMessage]`;
     const logParam = { guildId: guildId, serverId: serverId };
     const gInstance = gim.getGuildInstance(guildId);
@@ -170,18 +171,16 @@ export async function sendServerMessage(dm: DiscordManager, guildId: types.Guild
         return;
     }
 
-    // TODO! Figure out what connection should be, based on rustplusManager and GuildInstance activeServerId
-    const connection = discordButtons.ButtonConnectionTypes.Disconnected;
-
     const content = {
         embeds: [discordEmbeds.getServerEmbed(guildId, serverId)],
-        components: discordButtons.getServerButtons(guildId, serverId, connection)
+        components: discordButtons.getServerButtons(guildId, serverId, connectionStatus)
     };
 
     const message = await dm.sendUpdateMessage(guildId, content, gInstance.guildChannelIds.servers, serverInfo.
         messageId, interaction);
 
-    if (interaction === null && message instanceof discordjs.Message) {
+    if (interaction === null && message instanceof discordjs.Message &&
+        gInstance.serverInfoMap[serverId].messageId !== message.id) {
         gInstance.serverInfoMap[serverId].messageId = message.id;
         gim.updateGuildInstance(guildId);
     }
@@ -229,7 +228,8 @@ export async function sendSmartSwitchMessage(dm: DiscordManager, guildId: types.
     const message = await dm.sendUpdateMessage(guildId, content, gInstance.guildChannelIds.smartSwitches,
         smartSwitch.messageId, interaction);
 
-    if (interaction === null && message instanceof discordjs.Message) {
+    if (interaction === null && message instanceof discordjs.Message &&
+        smartSwitch.messageId !== message.id) {
         smartSwitch.messageId = message.id;
         gim.updateGuildInstance(guildId);
     }
@@ -275,7 +275,8 @@ export async function sendSmartAlarmMessage(dm: DiscordManager, guildId: types.G
     const message = await dm.sendUpdateMessage(guildId, content, gInstance.guildChannelIds.smartAlarms,
         smartAlarm.messageId, interaction);
 
-    if (interaction === null && message instanceof discordjs.Message) {
+    if (interaction === null && message instanceof discordjs.Message &&
+        smartAlarm.messageId !== message.id) {
         smartAlarm.messageId = message.id;
         gim.updateGuildInstance(guildId);
     }
@@ -318,7 +319,8 @@ export async function sendStorageMonitorMessage(dm: DiscordManager, guildId: typ
     const message = await dm.sendUpdateMessage(guildId, content, gInstance.guildChannelIds.storageMonitors,
         storageMonitor.messageId, interaction);
 
-    if (interaction === null && message instanceof discordjs.Message) {
+    if (interaction === null && message instanceof discordjs.Message &&
+        storageMonitor.messageId !== message.id) {
         storageMonitor.messageId = message.id;
         gim.updateGuildInstance(guildId);
     }