ENHANCEMENTS:

- Cloud: server registration added for new /serverlist command (WIP)

CHANGES:
- Dropped Python 3.9 support

Author: karel26

core/utils/discord.py

@@ -104,14 +104,13 @@ class PlayerType(Enum):
     HISTORY = auto()
 
 
-async def wait_for_single_reaction(bot: DCSServerBot, interaction: discord.Interaction,
-                                   message: discord.Message) -> discord.Reaction:
+async def wait_for_single_reaction(interaction: discord.Interaction, message: discord.Message) -> discord.Reaction:
     def check_press(react: discord.Reaction, user: discord.Member):
         return (react.message.channel == interaction.channel) & (user == member) & (react.message.id == message.id)
 
     tasks = [
-        asyncio.create_task(bot.wait_for('reaction_add', check=check_press)),
-        asyncio.create_task(bot.wait_for('reaction_remove', check=check_press))
+        asyncio.create_task(interaction.client.wait_for('reaction_add', check=check_press)),
+        asyncio.create_task(interaction.client.wait_for('reaction_remove', check=check_press))
     ]
     try:
         member = interaction.user
@@ -126,10 +125,9 @@ def check_press(react: discord.Reaction, user: discord.Member):
             task.cancel()
 
 
-async def selection_list(bot: DCSServerBot, interaction: discord.Interaction, data: list, embed_formatter, num: int = 5,
+async def selection_list(interaction: discord.Interaction, data: list, embed_formatter, num: int = 5,
                          marker: int = -1, marker_emoji='🔄'):
     """
-    :param bot: An instance of DCSServerBot class.
     :param interaction: A discord.Interaction instance representing the interaction event.
     :param data: A list of data to display in the embeds.
     :param embed_formatter: A function that formats the data into an embed.
@@ -164,7 +162,7 @@ async def selection_list(bot: DCSServerBot, interaction: discord.Interaction, da
             await message.add_reaction('⏹️')
             if ((j + 1) * num) < len(data):
                 await message.add_reaction('▶️')
-            react = await wait_for_single_reaction(bot, interaction, message)
+            react = await wait_for_single_reaction(interaction, message)
             await message.delete()
             if react.emoji == '◀️':
                 j -= 1

locale/es/LC_MESSAGES/install.mo

@@ -98,6 +98,9 @@ msgstr "Buscando configuraciones de servidores de DCS existentes..."
 msgid "Please enter the path to your DCS World installation"
 msgstr "Por favor introduzca la ruta de su instalación de DCS"
 
+msgid "Do you want to continue without a DCS installation being set?"
+msgstr "¿Desea continuar sin configurar una instalación de DCS?"
+
 msgid "Directory not found. Please try again."
 msgstr "Directorio no encontrado. Por favor, inténtelo de nuevo."
 

locale/es/LC_MESSAGES/install.po

@@ -46,3 +46,4 @@ maintaining the solutions that are out in the wild.
 | /cloud status     |                  | Admin     | Status of the connection to the cloud service.       |
 | /cloud resync     | [@member / ucid] | DCS Admin | Resync all players (or this player) with the cloud.  |
 | /cloud statistics | [@member / ucid] | DCS       | Display player cloud statistics (overall, per guild) |
+| /serverlist       | name             | DCS       | Display the DCS server list.                         |

plugins/cloud/README.md

@@ -1,3 +1,5 @@
+from datetime import timedelta
+
 import aiohttp
 import asyncio
 import certifi
@@ -11,7 +13,7 @@
 
 from contextlib import suppress
 from core import Plugin, utils, TEventListener, PaginationReport, Group, DEFAULT_TAG, PluginConfigurationError, \
-    get_translation, ServiceRegistry
+    get_translation, ServiceRegistry, command
 from discord import app_commands, DiscordServerError
 from discord.ext import commands, tasks
 from psycopg.rows import dict_row
@@ -218,6 +220,39 @@ async def statistics(self, interaction: discord.Interaction,
         except aiohttp.ClientError:
             await interaction.followup.send(_('Cloud not connected!'), ephemeral=True)
 
+    @command(description=_('List registered DCS servers'))
+    @app_commands.guild_only()
+    @utils.app_has_role('DCS Admin') # TODO: change that to DCS
+    async def serverlist(self, interaction: discord.Interaction, search: Optional[str] = None):
+
+        def format_servers(servers: list[dict], marker, marker_emoji) -> discord.Embed:
+            embed = discord.Embed(title=_('DCS Servers'), color=discord.Color.blue())
+            for server in servers:
+                name = ('🔐 ' if server['password'] else '🔓 ')
+                name += f"{server['server_name']} [{server['num_players']}/{server['max_players']}]\n"
+                value = f"IP/Port:  {server['ipaddr']}:{server['port']}\n"
+                value += f"Map:      {server['theatre']}\n"
+                value += f"Time:     {timedelta(seconds=server['time_in_mission'])}\n"
+                if server['time_to_restart'] != -1:
+                    value += f"Restart:  {timedelta(seconds=server['time_to_restart'])}\n"
+                embed.add_field(name=name, value='```' + value + '```', inline=False)
+            return embed
+
+        # noinspection PyUnresolvedReferences
+        await interaction.response.defer()
+        try:
+            query = 'serverlist'
+            if search:
+                query += f'?wildcard={search}'
+            response = await self.get(query)
+            if not len(response):
+                await interaction.followup.send(_('No server found.'), ephemeral=True)
+                return
+            await utils.selection_list(interaction, response, format_servers)
+        except aiohttp.ClientError:
+            await interaction.followup.send(_('Cloud not connected!'), ephemeral=True)
+
+
     @tasks.loop(minutes=15.0)
     async def cloud_bans(self):
         try:
@@ -263,8 +298,8 @@ async def cloud_bans(self):
                 for user in users_to_ban - banned_users - {self.bot.owner_id}:
                     reason = next(x['reason'] for x in bans if x['discord_id'] == user.id)
                     await guild.ban(user, reason='DGSA: ' + reason)
-        except Exception as ex:
-            self.log.exception(ex)
+        except aiohttp.ClientError:
+            self.log.warning("Cloud service unavailable.")
 
     @cloud_bans.before_loop
     async def before_cloud_bans(self):

plugins/cloud/commands.py

@@ -1,12 +1,29 @@
 import aiohttp
 import asyncio
 
-from core import EventListener, Server, Player, Side, event
+from core import EventListener, Server, Player, Side, event, Status
+from datetime import datetime, timezone
+from discord.ext import tasks
 from psycopg.rows import dict_row
 
 
 class CloudListener(EventListener):
 
+    def __init__(self, plugin):
+        super().__init__(plugin)
+        if self.plugin.get_config().get('register', True):
+            self.update_registration.start()
+
+    async def shutdown(self) -> None:
+        if self.plugin.get_config().get('register', True):
+            self.update_registration.cancel()
+        await super().shutdown()
+
+    @event(name="registerDCSServer")
+    async def registerDCSServer(self, server: Server, data: dict) -> None:
+        if self.plugin.get_config().get('register', True) and data['channel'].startswith('sync'):
+            await self.cloud_register(server)
+
     async def update_cloud_data(self, server: Server, player: Player):
         if not server.current_mission:
             return
@@ -52,3 +69,47 @@ async def onPlayerChangeSlot(self, server: Server, data: dict) -> None:
             return
         # noinspection PyAsyncCall
         asyncio.create_task(self.update_cloud_data(server, player))
+
+    async def cloud_register(self, server: Server):
+        try:
+            # noinspection PyUnresolvedReferences
+            await self.plugin.post('register_server', {
+                "guild_id": self.node.guild_id,
+                "server_name": server.name,
+                "ipaddr": server.instance.dcs_host,
+                "port": server.instance.dcs_port,
+                "password": (server.settings['password'] != ""),
+                "theatre": server.current_mission.map,
+                "dcs_version": server.node.dcs_version,
+                "num_players": len(server.get_active_players()) + 1,
+                "max_players": int(server.settings.get('maxPlayers', 16)),
+                "time_in_mission": int(server.current_mission.mission_time if server.current_mission else 0),
+                "time_to_restart": (server.restart_time - datetime.now(tz=timezone.utc)).total_seconds() if server.restart_time else -1,
+            })
+            self.log.info(f"Server {server.name} registered with the cloud.")
+        except aiohttp.ClientError as ex:
+            self.log.error(f"Could not register server {server.name} with the cloud.", exc_info=ex)
+
+    @event(name="onSimulationStart")
+    async def onSimulationStart(self, server: Server, _: dict) -> None:
+        if self.plugin.get_config().get('register', True):
+            await self.cloud_register(server)
+
+    @event(name="onSimulationStop")
+    async def onSimulationStop(self, server: Server, _: dict) -> None:
+        if self.plugin.get_config().get('register', True):
+            try:
+                # noinspection PyUnresolvedReferences
+                await self.plugin.post('unregister_server', {
+                    "guild_id": self.node.guild_id,
+                    "server_name": server.name,
+                })
+                self.log.info(f"Server {server.name} unregistered from the cloud.")
+            except aiohttp.ClientError as ex:
+                self.log.error(f"Could not unregister server {server.name} from the cloud.", exc_info=ex)
+
+    @tasks.loop(minutes=5)
+    async def update_registration(self):
+        for server in self.bot.servers.values():
+            if server.status in [Status.RUNNING, Status.PAUSED]:
+                await self.cloud_register(server)

plugins/cloud/listener.py

@@ -1442,7 +1442,7 @@ async def linkcheck(self, interaction: discord.Interaction):
             if len(unmatched) == 0:
                 await interaction.followup.send(_('No unmatched member could be matched.'), ephemeral=True)
                 return
-        n = await utils.selection_list(self.bot, interaction, unmatched, self.format_unmatched)
+        n = await utils.selection_list(interaction, unmatched, self.format_unmatched)
         if n != -1:
             async with self.apool.connection() as conn:
                 async with conn.transaction():
@@ -1500,7 +1500,7 @@ async def mislinks(self, interaction: discord.Interaction):
                 if len(suspicious) == 0:
                     await interaction.followup.send(_('No mislinked players found.'), ephemeral=True)
                     return
-        n = await utils.selection_list(self.bot, interaction, suspicious, self.format_suspicious)
+        n = await utils.selection_list(interaction, suspicious, self.format_suspicious)
         if n != -1:
             ephemeral = utils.get_ephemeral(interaction)
             async with self.apool.connection() as conn:

plugins/mission/commands.py

@@ -212,11 +212,9 @@ async def run_node(name, config_dir=None, no_autoupdate=False) -> int:
         exit(-2)
 
     # Check versions
-    if int(platform.python_version_tuple()[0]) < 3 or int(platform.python_version_tuple()[1]) < 9:
-        log.error("You need Python 3.9 or higher to run DCSServerBot (3.11 recommended)!")
+    if int(platform.python_version_tuple()[0]) < 3 or int(platform.python_version_tuple()[1]) < 10:
+        log.error("You need Python 3.10 or higher to run DCSServerBot!")
         exit(-2)
-    elif int(platform.python_version_tuple()[1]) == 9:
-        log.warning("Python 3.9 is outdated, you should consider upgrading it to 3.10 or higher.")
 
     # Add certificates
     os.environ["SSL_CERT_FILE"] = certifi.where()

run.py

@@ -268,7 +268,7 @@ async def on_command_error(self, ctx: commands.Context, err: Exception):
             await ctx.send("An unknown exception occurred.")
 
     async def on_app_command_error(self, interaction: discord.Interaction, error: discord.app_commands.AppCommandError):
-        if isinstance(error, discord.app_commands.CommandNotFound) or isinstance(error, discord.app_commands.CommandInvokeError):
+        if isinstance(error, discord.app_commands.CommandNotFound):
             pass
         # noinspection PyUnresolvedReferences
         if not interaction.response.is_done():
@@ -279,11 +279,12 @@ async def on_app_command_error(self, interaction: discord.Interaction, error: di
         elif isinstance(error, discord.app_commands.CheckFailure):
             await interaction.followup.send(f"You don't have the permission to use {interaction.command.name}!",
                                             ephemeral=True)
-        elif isinstance(error, TimeoutError) or isinstance(error, asyncio.TimeoutError):
+        elif isinstance(error, (TimeoutError, asyncio.TimeoutError)):
             await interaction.followup.send('A timeout occurred. Is the DCS server running?', ephemeral=True)
         elif isinstance(error, discord.app_commands.TransformerError):
             await interaction.followup.send(error, ephemeral=True)
         elif isinstance(error, discord.app_commands.AppCommandError):
+            self.log.exception(error)
             await interaction.followup.send(str(error))
         else:
             self.log.exception(error)