Add serverPolling

Author: alexemanuelol

index.ts

@@ -61,7 +61,7 @@ export const config = {
         debug: getBooleanEnv('RPP_DEBUG', false),
         language: isValidLanguage(getStringEnv('RPP_LANGUAGE', 'en')) ?
             getStringEnv('RPP_LANGUAGE', 'en') as Languages : Languages.ENGLISH,
-        pollingIntervalMs: getNumberEnv('RPP_POLLING_INTERVAL_MS', 10_000),
+        serverPollingHandlerIntervalMs: getNumberEnv('RPP_SERVER_POLLING_HANDLER_INTERVAL_MS', 10_000),
         showCallStackOnError: getBooleanEnv('RPP_SHOW_CALL_STACK_ON_ERROR', false),
         reconnectIntervalMs: getNumberEnv('RPP_RECONNECT_INTERVAL_MS', 15_000)
     },

src/discordEvents/ready.ts

@@ -112,7 +112,7 @@ export async function execute(dm: DiscordManager) {
         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)) {
+                if (rpm.addInstance(guild.id, serverId, content.mainRequesterSteamId)) {
                     const rpInstance = rpm.getInstance(guild.id, serverId);
                     if (rpInstance) {
                         await rpInstance.startup();

src/discordUtils/discordButtons.ts

@@ -156,7 +156,7 @@ export function getHelpButtons(): discordjs.ActionRowBuilder<discordjs.ButtonBui
 
 export function getServerButtons(guildId: types.GuildId, serverId: types.ServerId,
     connectionStatus: ConnectionStatus):
-    discordjs.ActionRowBuilder<discordjs.ButtonBuilder>[] {
+    discordjs.ActionRowBuilder<discordjs.ButtonBuilder> {
     const gInstance = gim.getGuildInstance(guildId) as GuildInstance;
     const serverInfo = gInstance.serverInfoMap[serverId] as ServerInfo;
     const language = gInstance.generalSettings.language;
@@ -205,11 +205,9 @@ export function getServerButtons(guildId: types.GuildId, serverId: types.ServerI
         type: discordjs.ComponentType.Button
     });
 
-    return [
-        new discordjs.ActionRowBuilder<discordjs.ButtonBuilder>().addComponents(
-            connectionButton, viewButton, editButton, websiteButton, deleteButton
-        )
-    ];
+    return new discordjs.ActionRowBuilder<discordjs.ButtonBuilder>().addComponents(
+        connectionButton, viewButton, editButton, websiteButton, deleteButton
+    );
 }
 
 export function getSmartSwitchButtons(guildId: types.GuildId, serverId: types.ServerId, entityId: types.EntityId,

src/discordUtils/discordMessages.ts

@@ -158,7 +158,9 @@ export async function sendServerMessage(dm: DiscordManager, guildId: types.Guild
 
     const content = {
         embeds: [discordEmbeds.getServerEmbed(guildId, serverId)],
-        components: discordButtons.getServerButtons(guildId, serverId, connectionStatus)
+        components: [
+            await discordSelectMenus.getMainRequesterSteamIdSelectMenu(dm, guildId, serverId),
+            discordButtons.getServerButtons(guildId, serverId, connectionStatus)]
     };
 
     const message = await dm.sendUpdateMessage(guildId, content, gInstance.guildChannelIds.servers, serverInfo.

src/discordUtils/discordSelectMenus.ts

@@ -20,12 +20,14 @@
 
 import * as discordjs from 'discord.js';
 
-import { guildInstanceManager as gim, localeManager as lm } from '../../index';
+import { guildInstanceManager as gim, localeManager as lm, credentialsManager as cm } from '../../index';
 import {
     GuildInstance, ServerInfo, SmartSwitch, SmartSwitchAutoSetting, VoiceGenders
 } from '../managers/guildInstanceManager';
 import * as types from '../utils/types';
 import { Languages, LanguageDiscordEmoji } from '../managers/LocaleManager';
+import { Credentials } from '../managers/credentialsManager';
+import { DiscordManager } from '../managers/discordManager';
 
 export const StringSelectMenuLimits = {
     CustomId: 100,
@@ -203,6 +205,50 @@ export function getSmartSwitchSelectMenu(guildId: types.GuildId, serverId: types
     );
 }
 
+export async function getMainRequesterSteamIdSelectMenu(dm: DiscordManager, guildId: types.GuildId,
+    serverId: types.ServerId): Promise<discordjs.ActionRowBuilder<discordjs.StringSelectMenuBuilder>> {
+    const gInstance = gim.getGuildInstance(guildId) as GuildInstance;
+    const language = gInstance.generalSettings.language;
+    const server = gInstance.serverInfoMap[serverId] as ServerInfo;
+    const identifier = JSON.stringify({ 'serverId': serverId });
+    const serverPairingDataMap = gInstance.pairingDataMap[serverId];
+
+    const options: discordjs.SelectMenuComponentOptionData[] = [];
+    for (const [steamId, pairingData] of Object.entries(serverPairingDataMap)) {
+        const credentials = cm.getCredentials(steamId) as Credentials;
+        const member = await dm.getMember(guildId, credentials.discordUserId);
+        const userName = member ? member.user.username : lm.getIntl(language, 'unknown');
+        options.push({
+            label: steamId,
+            description: lm.getIntl(language, 'mainRequesterSteamIdOptionDesc', { user: userName }),
+            value: steamId,
+            emoji: pairingData.valid ? '✅' : '❌'
+        });
+    }
+
+    const credentials = cm.getCredentials(server.mainRequesterSteamId);
+    let name = server.mainRequesterSteamId;
+    if (credentials) {
+        const member = await dm.getMember(guildId, credentials.discordUserId);
+        const userName = member ? ` (${member.user.username})` : '';
+        name += userName;
+    }
+
+    const mainRequesterValid = Object.hasOwn(serverPairingDataMap, server.mainRequesterSteamId) &&
+        serverPairingDataMap[server.mainRequesterSteamId].valid;
+    const placeholder = `${mainRequesterValid ? '✅' : '❌'} ${name}`;
+
+    return new discordjs.ActionRowBuilder<discordjs.StringSelectMenuBuilder>().addComponents(
+        getStringSelectMenu({
+            customId: `MainRequesterSteamId${identifier}`,
+            disabled: Object.keys(serverPairingDataMap).length === 0 ? true : false,
+            placeholder: placeholder,
+            options: options,
+            type: discordjs.ComponentType.StringSelect
+        })
+    );
+}
+
 
 /**
  * Settings based selectMenus

src/handlers/buttonHandler.ts

@@ -425,7 +425,7 @@ async function serverConnectButtonHandler(dm: DiscordManager, interaction: disco
     server.active = true;
     gim.updateGuildInstance(guildId);
 
-    if (rpm.addInstance(guildId, serverId, server.mainSteamId)) {
+    if (rpm.addInstance(guildId, serverId, server.mainRequesterSteamId)) {
         const rpInstance = rpm.getInstance(guildId, serverId);
         if (rpInstance) {
             await rpInstance.startup();

src/handlers/selectMenuHandler.ts

@@ -20,12 +20,13 @@
 
 import * as discordjs from 'discord.js';
 
-import { guildInstanceManager as gim, localeManager as lm } from '../../index';
+import { guildInstanceManager as gim, localeManager as lm, rustPlusManager as rpm } from '../../index';
 import { DiscordManager } from "../managers/discordManager";
 import * as types from '../utils/types';
-import { GuildInstance, VoiceGenders } from '../managers/guildInstanceManager';
+import { GuildInstance, ServerInfo, VoiceGenders } from '../managers/guildInstanceManager';
 import { Languages } from '../managers/LocaleManager';
 import * as discordMessages from '../discordUtils/discordMessages';
+import { ConnectionStatus } from '../managers/rustPlusManager';
 
 export async function selectMenuHandler(dm: DiscordManager, interaction: discordjs.AnySelectMenuInteraction):
     Promise<boolean> {
@@ -40,6 +41,10 @@ export async function selectMenuHandler(dm: DiscordManager, interaction: discord
         return await inGameChatCommandResponseDelaySelectMenuHandler(dm,
             interaction as discordjs.StringSelectMenuInteraction);
     }
+    else if (interaction.customId.startsWith('MainRequesterSteamId')) {
+        return await mainRequesterSteamIdSelectMenuHandler(dm,
+            interaction as discordjs.StringSelectMenuInteraction);
+    }
 
     return false;
 }
@@ -132,5 +137,28 @@ async function inGameChatCommandResponseDelaySelectMenuHandler(dm: DiscordManage
 
     await discordMessages.sendSettingInGameChatCommandResponseDelayMessage(dm, guildId, true, false, interaction);
 
+    return true;
+}
+
+async function mainRequesterSteamIdSelectMenuHandler(dm: DiscordManager,
+    interaction: discordjs.StringSelectMenuInteraction): Promise<boolean> {
+    const identifier = JSON.parse(interaction.customId.replace('MainRequesterSteamId', ''));
+    const serverId = identifier.serverId as types.ServerId;
+    const guildId = interaction.guildId as types.GuildId;
+    const gInstance = gim.getGuildInstance(guildId) as GuildInstance;
+    const server = gInstance.serverInfoMap[serverId] as ServerInfo;
+    const steamId = interaction.values[0] as types.SteamId;
+
+    server.mainRequesterSteamId = steamId;
+    gim.updateGuildInstance(guildId);
+
+    let connectionStatus = ConnectionStatus.Disconnected;
+    const rpInstance = rpm.getInstance(guildId, serverId);
+    if (rpInstance) {
+        connectionStatus = rpInstance.connectionStatus;
+    }
+
+    await discordMessages.sendServerMessage(dm, guildId, serverId, connectionStatus, interaction);
+
     return true;
 }

src/languages/en.json

@@ -22,7 +22,6 @@
     "autoSettingOffLabel": "OFF",
     "buttonActiveServer": "ACTIVE SERVER",
     "buttonAfk": "AFK",
-    "buttonView": "VIEW",
     "buttonCommandPrefix": "COMMAND PREFIX",
     "buttonConnect": "CONNECT",
     "buttonConnecting": "CONNECTING",
@@ -40,6 +39,7 @@
     "buttonReconnecting": "RECONNECTING",
     "buttonRecycle": "RECYCLE",
     "buttonTrademark": "TRADEMARK",
+    "buttonView": "VIEW",
     "buttonVoice": "VOICE",
     "buttonWebsite": "WEBSITE",
     "commandPrefix": "Command Prefix",
@@ -123,6 +123,7 @@
     "lastTrigger": "Last Trigger",
     "linkCap": "LINK",
     "linkToThePlugin": "Link to the Plugin",
+    "mainRequesterSteamIdOptionDesc": "Set main requester to {user}.",
     "male": "Male",
     "message": "Message",
     "newsCap": "NEWS",

src/managers/fcmListenerManager.ts

@@ -224,6 +224,12 @@ export class FcmListenerManager {
         const androidId = credentials.gcm.androidId;
         const securityToken = credentials.gcm.securityToken;
         this.listeners[steamId] = new PushReceiverClient(androidId, securityToken, []);
+        // TODO! Something is messed up here. I tested with two steam accounts with credentials on the same discord
+        // guild. For some reason the two fcm instances wont work together properly. When I pair in-game with account
+        // 1, the above steamId is the one for account 2, but the data below is correct and from account 1. For the
+        // love of god I cant figure out how to solve it. When I print each fcm listener (this.listeners) I can see
+        // that each listener have the correct androidId and securityToken for the given steamId. This needs to be
+        // solved before v2 release.
         this.listeners[steamId].on('ON_DATA_RECEIVED', (data: unknown) => {
             const funcName = `[FcmListenerManager: ON_DATA_RECEIVED: ${steamId}]`;
             if (!isValidFcmNotificaton(data)) {
@@ -449,7 +455,7 @@ async function pairingServer(flm: FcmListenerManager, steamId: types.SteamId, bo
             port: body.port,
             messageId: (message) ? message.id : null,
             pairedDate: Math.floor(Date.now() / 1000),
-            mainSteamId: serverInfo ? serverInfo.mainSteamId : body.playerId,
+            mainRequesterSteamId: serverInfo ? serverInfo.mainRequesterSteamId : body.playerId,
             active: serverInfo ? serverInfo.active : false,
             connect: null,
             noteMap: serverInfo ? serverInfo.noteMap : {},
@@ -649,7 +655,7 @@ async function alarmAlarm(flm: FcmListenerManager, steamId: types.SteamId, title
         }
 
         const rpInstance = rpm.getInstance(guildId, serverId);
-        if (!rpInstance && !serverInfo.active && steamId === serverInfo.mainSteamId &&
+        if (!rpInstance && !serverInfo.active && steamId === serverInfo.mainRequesterSteamId &&
             gInstance.generalSettings.fcmAlarmNotify) {
             await discordMessages.sendFcmAlarmTriggerMessage(flm.dm, guildId, serverId, title, message);
         }
@@ -679,7 +685,7 @@ async function alarmPlugin(flm: FcmListenerManager, steamId: types.SteamId, titl
             continue;
         }
 
-        if (gInstance.generalSettings.fcmAlarmPluginNotify && steamId === serverInfo.mainSteamId) {
+        if (gInstance.generalSettings.fcmAlarmPluginNotify && steamId === serverInfo.mainRequesterSteamId) {
             if ((gInstance.generalSettings.fcmAlarmPluginNotifyActiveServer && serverInfo.active) ||
                 !gInstance.generalSettings.fcmAlarmPluginNotifyActiveServer) {
                 discordMessages.sendFcmAlarmPluginTriggerMessage(flm.dm, guildId, serverId, title, message);
@@ -734,7 +740,7 @@ async function teamLogin(flm: FcmListenerManager, steamId: types.SteamId, body:
         }
 
         const rpInstance = rpm.getInstance(guildId, serverId);
-        if (!rpInstance && !serverInfo.active && steamId === serverInfo.mainSteamId) {
+        if (!rpInstance && !serverInfo.active && steamId === serverInfo.mainRequesterSteamId) {
             await discordMessages.sendFcmTeamLoginMessage(flm.dm, guildId, serverId, body);
             log.info(`${funcName} ${body.targetName} just connected to ${body.name}.`);
         }

src/managers/guildInstanceManager.ts

@@ -274,7 +274,7 @@ export interface ServerInfo {
     /* Rest */
     messageId: types.MessageId | null;
     pairedDate: types.Timestamp;
-    mainSteamId: types.SteamId;
+    mainRequesterSteamId: types.SteamId;
     active: boolean;
     connect: string | null;
     noteMap: NoteMap;
@@ -1397,7 +1397,7 @@ export function isValidServerInfo(object: unknown): object is ServerInfo {
         'port',
         'messageId',
         'pairedDate',
-        'mainSteamId',
+        'mainRequesterSteamId',
         'active',
         'connect',
         'noteMap',
@@ -1418,7 +1418,7 @@ export function isValidServerInfo(object: unknown): object is ServerInfo {
     errors.push(vu.validateType('port', obj.port, 'string'));
     errors.push(vu.validateType('messageId', obj.messageId, 'string', null));
     errors.push(vu.validateType('pairedDate', obj.pairedDate, 'number'));
-    errors.push(vu.validateType('mainSteamId', obj.mainSteamId, 'string'));
+    errors.push(vu.validateType('mainRequesterSteamId', obj.mainRequesterSteamId, 'string'));
     errors.push(vu.validateType('active', obj.active, 'boolean'));
     errors.push(vu.validateType('connect', obj.connect, 'string', null));
     errors.push(vu.validateObjectOfTypes('noteMap', obj.noteMap, 'string'));