ENHANCEMENTS:

- You can specify that bot commands work with specific DCS versions only now.

CHANGES:
- Changed the way extensions are started to avoid race conditions like with SRS.
- SRS: wait on extension startup until the SRS server is up and accepting commands.

Author: karel26

core/extension.py

@@ -58,12 +58,13 @@ async def beforeMissionLoad(self, filename: str) -> tuple[str, bool]:
         return filename, False
 
     async def startup(self) -> bool:
-        # avoid race conditions
-        if await asyncio.to_thread(self.is_running):
-            return True
         self.running = True
-        self.log.info(f"  => {self.name} launched for \"{self.server.name}\".")
-        return True
+        if self.is_running():
+            self.log.info(f"  => {self.name} launched for \"{self.server.name}\".")
+            return True
+        else:
+            self.log.warning(f"  => {self.name} NOT launched for \"{self.server.name}\".")
+            return False
 
     def shutdown(self) -> bool:
         # avoid race conditions

core/plugin.py

@@ -18,7 +18,7 @@
 from discord.app_commands.commands import CommandCallback, GroupT, P, T
 from discord.ext import commands, tasks
 from discord.utils import MISSING, _shorten
-from packaging import version
+from packaging.version import parse
 from pathlib import Path
 from typing import Type, Optional, TYPE_CHECKING, Union, Any, Dict, Callable, List
 
@@ -352,7 +352,7 @@ async def _init_db(self) -> bool:
                         # old variant, to be migrated
                         if installed.startswith('v'):
                             installed = installed[1:]
-                        while version.parse(installed) < version.parse(self.plugin_version):
+                        while parse(installed) < parse(self.plugin_version):
                             updates_file = f'./plugins/{self.plugin_name}/db/update_v{installed}.sql'
                             if os.path.exists(updates_file):
                                 with open(updates_file, mode='r') as updates_sql:

core/utils/discord.py

@@ -17,6 +17,7 @@
 from discord.ui import Button, View, Select, Item, Modal, TextInput
 from enum import Enum, auto
 from fuzzywuzzy import fuzz
+from packaging.version import parse, Version
 from psycopg.rows import dict_row
 from typing import Optional, cast, Union, TYPE_CHECKING, Iterable, Any, Callable
 
@@ -43,6 +44,7 @@
     "app_has_not_role",
     "app_has_roles",
     "app_has_not_roles",
+    "app_has_dcs_version",
     "cmd_has_roles",
     "get_role_ids",
     "format_embed",
@@ -553,6 +555,16 @@ def predicate(interaction: Interaction) -> bool:
     return app_commands.check(predicate)
 
 
+def app_has_dcs_version(version: str):
+    def predicate(interaction: Interaction) -> bool:
+        if parse(interaction.client.node.dcs_version) < Version(version):
+            raise app_commands.AppCommandError(
+                _("You need at least DCS version {} to use this command!").format(version))
+        return True
+
+    return app_commands.check(predicate)
+
+
 def format_embed(data: dict, **kwargs) -> discord.Embed:
     """
     :param data: A dictionary containing the data for formatting the embed.

extensions/lardoon/extension.py

@@ -64,7 +64,6 @@ def _get_tacview_dir(self) -> str:
     async def startup(self) -> bool:
         global process, servers, tacview_dirs, lock
 
-        await super().startup()
         if 'Tacview' not in self.server.options['plugins']:
             self.log.warning('Lardoon needs Tacview to be enabled in your server!')
             return False
@@ -100,7 +99,7 @@ def run_subprocess():
         if tacview_dir not in tacview_dirs:
             tacview_dirs[tacview_dir] = set()
         tacview_dirs[tacview_dir].add(self.server.name)
-        return self.is_running()
+        return await super().startup()
 
     def terminate(self) -> bool:
         global process

extensions/lotatc/extension.py

@@ -192,14 +192,13 @@ def is_installed(self) -> bool:
         return True
 
     async def startup(self) -> bool:
-        await super().startup()
         path = os.path.join(self.home, 'stats.json')
         if os.path.exists(path):
             self.process_stats_file(path)
         self.observer = Observer()
         self.observer.schedule(self, path=self.home)
         self.observer.start()
-        return True
+        return await super().startup()
 
     def stop_observer(self):
         if self.observer:

extensions/olympus/extension.py

@@ -215,7 +215,6 @@ async def prepare(self) -> bool:
             return False
 
     async def startup(self) -> bool:
-        await super().startup()
 
         def log_output(proc: subprocess.Popen):
             for line in iter(proc.stdout.readline, b''):
@@ -255,9 +254,11 @@ def run_subprocess():
         # Give the Olympus server 10s to start
         for _ in range(0, 10):
             if self.is_running():
-                return True
+                break
             await asyncio.sleep(1)
-        return False
+        else:
+            return False
+        return await super().startup()
 
     def is_running(self) -> bool:
         return self.process is not None and self.process.is_running()

extensions/ovgme/extension.py

@@ -14,14 +14,13 @@ def __init__(self, server: Server, config: dict):
         self.modules: dict[str, list[str]] = {}
 
     async def startup(self) -> bool:
-        await super().startup()
         filename = await self.server.get_current_mission_file()
         try:
             mission = await asyncio.to_thread(MizFile, filename)
             self.modules[self.server.name] = mission.requiredModules
         except UnsupportedMizFileException:
             self.log.warning(f"Can't read requiredModules from Mission {filename}, unsupported format.")
-        return True
+        return await super().startup()
 
     def shutdown(self) -> bool:
         self.modules.pop(self.server.name, None)

extensions/sneaker/extension.py

@@ -99,7 +99,6 @@ def _run_subprocess(self, config: str):
     async def startup(self) -> bool:
         global process, servers, lock
 
-        await super().startup()
         if 'Tacview' not in self.server.options['plugins']:
             self.log.warning('Sneaker needs Tacview to be enabled in your server!')
             return False
@@ -117,7 +116,7 @@ async def startup(self) -> bool:
                     process = psutil.Process(p.pid)
                     atexit.register(self.terminate)
             servers.add(self.server.name)
-            return True
+            return await super().startup()
         except Exception as ex:
             self.log.error(f"Error during launch of {self.config['cmd']}: {str(ex)}")
             return False

extensions/srs/extension.py

@@ -213,21 +213,21 @@ async def prepare(self) -> bool:
         return await super().prepare()
 
     async def startup(self) -> bool:
-        await super().startup()
         if self.config.get('autostart', True):
             self.log.debug(f"Launching SRS server with: \"{self.get_exe_path()}\" -cfg=\"{self.config['config']}\"")
-            if sys.platform == 'win32' and self.config.get('minimized', True):
-                import win32process
-                import win32con
-
-                info = subprocess.STARTUPINFO()
-                info.dwFlags |= win32process.STARTF_USESHOWWINDOW
-                info.wShowWindow = win32con.SW_SHOWMINNOACTIVE
-            else:
-                info = None
-            out = subprocess.DEVNULL if not self.config.get('debug', False) else None
 
             def run_subprocess():
+                if sys.platform == 'win32' and self.config.get('minimized', True):
+                    import win32process
+                    import win32con
+
+                    info = subprocess.STARTUPINFO()
+                    info.dwFlags |= win32process.STARTF_USESHOWWINDOW
+                    info.wShowWindow = win32con.SW_SHOWMINNOACTIVE
+                else:
+                    info = None
+                out = subprocess.DEVNULL if not self.config.get('debug', False) else None
+
                 return subprocess.Popen([
                     self.get_exe_path(),
                     f"-cfg={os.path.expandvars(self.config['config'])}"
@@ -241,7 +241,14 @@ def run_subprocess():
             except psutil.NoSuchProcess:
                 self.log.error(f"Error during launch of {self.get_exe_path()}!")
                 return False
-        return await asyncio.to_thread(self.is_running)
+        # Give SRS 10s to start
+        for _ in range(0, 10):
+            if self.is_running():
+                break
+            await asyncio.sleep(1)
+        else:
+            return False
+        return await super().startup()
 
     def shutdown(self) -> bool:
         if self.config.get('autostart', True) and not self.config.get('no_shutdown', False):
@@ -336,6 +343,8 @@ def is_running(self) -> bool:
         if not self.process:
             self.process = utils.find_process('SR-Server.exe', self.server.instance.name)
             running = self.process is not None and self.process.is_running()
+            if not running:
+                self.log.debug("SRS: is NOT running (process)")
         else:
             try:
                 server_ip = self.locals['Server Settings'].get('SERVER_IP', '127.0.0.1')
@@ -347,6 +356,8 @@ def is_running(self) -> bool:
                                  f"It does not contain a valid IP-address!")
                 server_ip = '127.0.0.1'
             running = utils.is_open(server_ip, self.locals['Server Settings'].get('SERVER_PORT', 5002))
+            if not running:
+                self.log.debug("SRS: is NOT running (port)")
         # start the observer, if we were started to a running SRS server
         if running and not self.observer:
             self.start_observer()

plugins/slotblocking/README.md

@@ -44,6 +44,9 @@ DEFAULT:            # Default section - true for all your servers.
     threshold: 0.1            # 10% threshold until slots are blocked
     activation_threshold: 10  # do not balance, if the number of players is below this threshold
     message: You need to take a slot of the opposite coalition to keep the balance!
+  messages:
+    credits_taken: '{deposit} credits taken for using a reserved module.'  # Possible variables: deposit, old_points, new_points
+    payback: 'You have been given {deposit} credits back.' # Possible variables: deposit, old_points, new_points
 DCS.release_server:
   restricted:             # in this example we restrict by credit points
   - group_name: Rookie    # this tag has to be in the group name of the respective units (best is to prepend it)