Last small fixes before release.

Author: karel26

core/data/impl/serverimpl.py

@@ -5,13 +5,12 @@
 import importlib
 import inspect
 import json
-import sqlite3
-
 import luadata
 import os
 import pkgutil
 import psutil
 import shutil
+import sqlite3
 import sys
 import tempfile
 import time
@@ -20,6 +19,7 @@
 if sys.platform == 'win32':
     import win32con
     import win32gui
+    import win32process
 
 from collections import OrderedDict
 from contextlib import suppress
@@ -157,6 +157,7 @@ class ServerImpl(Server):
     bot: DCSServerBot | None = field(compare=False, init=False)
     event_handler: MissionFileSystemEventHandler = field(compare=False, default=None)
     observer: ObserverType = field(compare=False, default=None)
+    process: psutil.Process | None = field(default=None, compare=False)
 
     @override
     def __post_init__(self):
@@ -493,7 +494,7 @@ async def send_to_dcs(self, message: dict) -> None:
 
     @override
     async def rename(self, new_name: str, update_settings: bool = False) -> None:
-        def update_config(old_name, new_name: str, update_settings: bool = False):
+        def update_config(old_name: str | None, new_name: str, update_settings: bool = False):
             # update servers.yaml
             filename = os.path.join(self.node.config_dir, 'servers.yaml')
             if os.path.exists(filename):
@@ -510,7 +511,7 @@ def update_config(old_name, new_name: str, update_settings: bool = False):
             if update_settings:
                 self.settings['name'] = new_name
 
-        async def update_database(old_name: str, new_name: str):
+        async def update_database(old_name: str | None, new_name: str):
             # rename the server in the database
             async with self.apool.connection() as conn:
                 await conn.execute("UPDATE servers SET server_name = %s WHERE server_name = %s",
@@ -547,7 +548,8 @@ async def update_cluster(new_name: str):
                 self.name = new_name
             except Exception:
                 # rollback config
-                update_config(new_name, old_name, update_settings)
+                if old_name:
+                    update_config(new_name, old_name, update_settings)
                 raise
         except Exception:
             self.log.exception(f"Error during renaming of server {old_name} to {new_name}: ", exc_info=True)
@@ -619,7 +621,7 @@ def do_startup(self):
                 instance=self.instance.name
             )
             if 'priority' in self.locals:
-                self.set_priority(self.locals.get('priority'))
+                self.set_priority(self.locals['priority'])
             self.log.info(f"  => DCS server starting up with PID {self.process.pid}")
         except Exception:
             self.log.error(f"  => Error while trying to launch DCS!", exc_info=True)
@@ -672,25 +674,63 @@ async def prepare_extensions(self):
                 except Exception:
                     self.log.error(f"  => Unknown error during {ext.name}.prepare() - skipped.", exc_info=True)
 
-    @staticmethod
-    def _window_enumeration_handler(hwnd, top_windows):
-        top_windows.append((hwnd, win32gui.GetWindowText(hwnd)))
-
     def _minimize(self):
-        top_windows = []
-        win32gui.EnumWindows(self._window_enumeration_handler, top_windows)
+        """
+        Minimize the main window of the process represented by
+        self.process (a psutil.Process instance).
+
+        If no window is found or the window disappears before the
+        message is sent, the call is silently ignored.
+        """
+        target_pid = self.process.pid
+
+        # ------------------------------------------------------------------
+        # 1. Gather all top‑level windows that belong to the target PID
+        # ------------------------------------------------------------------
+        candidate_windows = []
+
+        def enum_handler(hwnd, _):
+            # Skip invisible or child windows – we only care about
+            # top‑level windows that belong to the process.
+            if not win32gui.IsWindowVisible(hwnd):
+                return True
+
+            try:
+                _, win_pid = win32process.GetWindowThreadProcessId(hwnd)
+            except Exception:
+                # Some exotic windows can raise an exception when queried.
+                return True
+
+            if win_pid == target_pid:
+                title = win32gui.GetWindowText(hwnd)
+                candidate_windows.append((hwnd, title))
+
+            return True  # keep enumerating
 
-        # Fetch the window name of the process
-        window_name = self.instance.name
+        win32gui.EnumWindows(enum_handler, None)
 
-        for hwnd, title in top_windows:
-            if window_name.lower() in title.lower():
-                # non-blocking call
+        if not candidate_windows:
+            self.log.debug("No visible window found for PID %s", target_pid)
+            return
+
+        # ------------------------------------------------------------------
+        # 2. Pick the “main” window – usually the first one we found.
+        # ------------------------------------------------------------------
+        hwnd, title = candidate_windows[0]
+
+        # ------------------------------------------------------------------
+        # 3. Post the minimize command – only if the handle is still valid
+        # ------------------------------------------------------------------
+        try:
+            if win32gui.IsWindow(hwnd):
                 win32gui.PostMessage(hwnd,
                                      win32con.WM_SYSCOMMAND,
                                      win32con.SC_MINIMIZE,
                                      0)
-                break
+            else:
+                self.log.debug("Handle %s no longer refers to a window", hwnd)
+        except win32gui.error as exc:
+            return
 
     def set_priority(self, priority: str):
         if priority == 'below_normal':
@@ -987,7 +1027,12 @@ async def render_extensions(self) -> list[dict]:
 
     @override
     async def restart(self, modify_mission: bool | None = True, use_orig: bool | None = True) -> None:
-        await self.loadMission(self._get_current_mission_file(), modify_mission=modify_mission, use_orig=use_orig)
+        current_mission = self._get_current_mission_file()
+        if current_mission:
+            await self.loadMission(current_mission, modify_mission=modify_mission, use_orig=use_orig)
+        else:
+            await self.stop()
+            await self.start()
 
     @override
     async def getStartIndex(self) -> int:
@@ -1288,7 +1333,7 @@ async def enable_extension(self, name: str, config: dict | None = None) -> bool:
         if not ext:
             ext = self.load_extension(name, config)
             self.extensions[name] = ext
-        if await ext.enable():
+        if ext and await ext.enable():
             await self.config_extension(name, (config or {}) | {"enabled": True})
             return True
         return False

core/data/server.py

@@ -11,7 +11,6 @@
 from dataclasses import dataclass, field
 from datetime import datetime, timezone
 from pathlib import Path
-from psutil import Process
 from typing import TYPE_CHECKING, Any
 
 from .dataobject import DataObject
@@ -47,7 +46,6 @@ class Server(DataObject, ABC):
     _mission_id: int = field(default=None, compare=False)
     players: dict[str, Player] = field(default_factory=dict, compare=False)
     players_by_id: dict[int, Player] = field(default_factory=dict, compare=False)
-    process: Process | None = field(default=None, compare=False)
     _maintenance: bool = field(compare=False, default=False)
     restart_pending: bool = field(default=False, compare=False)
     on_mission_end: dict = field(default_factory=dict, compare=False)

extensions/srs/extension.py

@@ -320,8 +320,8 @@ def run_subprocess() -> psutil.Process:
                     self.process = await asyncio.to_thread(run_subprocess)
                     if not self.observer:
                         self.start_observer()
-            except psutil.NoSuchProcess:
-                self.log.error(f"Error during launch of {self.get_exe_path()}!")
+            except Exception as ex:
+                self.log.error(f"Error during launch of {self.get_exe_path()}: {ex}")
                 return False
         # Give SRS 10s to start
         for _ in range(0, 10):

plugins/mission/commands.py

@@ -21,6 +21,7 @@
 from discord.app_commands import Range, describe
 from discord.ext import commands, tasks
 from io import BytesIO
+from mgrs.core import MGRSError
 from openpyxl.utils import get_column_letter
 from pathlib import Path
 from psycopg.rows import dict_row
@@ -2334,23 +2335,30 @@ async def convert(self, interaction: discord.Interaction, mode: Literal['Lat/Lon
             if not lat or not lon:
                 await interaction.response.send_message("Latitude and longitude must be provided", ephemeral=True)
                 return
-            mgrs = utils.dd_to_mgrs(lat, lon)
-            await interaction.response.send_message(f"**MGRS**: {mgrs}")
+            try:
+                mgrs = utils.dd_to_mgrs(lat, lon)
+                await interaction.response.send_message(f"**MGRS**: {mgrs}")
+            except MGRSError as ex:
+                await interaction.response.send_message(str(ex), ephemeral=True)
+
         elif mode == 'MGRS => Lat/Lon':
             if not mgrs:
                 await interaction.response.send_message("MGRS must be provided", ephemeral=True)
                 return
-            mgrs = mgrs.replace(' ', '')
-            lat, lon = utils.mgrs_to_dd(mgrs)
-            d, m, s, f = utils.dd_to_dms(lat)
-            lat_dms = ('N' if d > 0 else 'S') + ' {:02d}°{:02d}\'{:02d}.{:02d}"'.format(
-                int(abs(d)), int(abs(m)), int(abs(s)), int(abs(f)))
-            d, m, s, f = utils.dd_to_dms(lon)
-            lon_dms = ('E' if d > 0 else 'W') + ' {:03d}°{:02d}\'{:02d}.{:02d}"'.format(
-                int(abs(d)), int(abs(m)), int(abs(s)), int(abs(f)))
-            await interaction.response.send_message(f"**DD**: {lat:.7f}, {lon:.7f}\n"
-                                                    f"**DMS**: {lat_dms}, {lon_dms}\n"
-                                                    f"**DDM**: {utils.dd_to_dmm(lat, lon)}")
+            try:
+                mgrs = mgrs.replace(' ', '')
+                lat, lon = utils.mgrs_to_dd(mgrs)
+                d, m, s, f = utils.dd_to_dms(lat)
+                lat_dms = ('N' if d > 0 else 'S') + ' {:02d}°{:02d}\'{:02d}.{:02d}"'.format(
+                    int(abs(d)), int(abs(m)), int(abs(s)), int(abs(f)))
+                d, m, s, f = utils.dd_to_dms(lon)
+                lon_dms = ('E' if d > 0 else 'W') + ' {:03d}°{:02d}\'{:02d}.{:02d}"'.format(
+                    int(abs(d)), int(abs(m)), int(abs(s)), int(abs(f)))
+                await interaction.response.send_message(f"**DD**: {lat:.7f}, {lon:.7f}\n"
+                                                        f"**DMS**: {lat_dms}, {lon_dms}\n"
+                                                        f"**DDM**: {utils.dd_to_dmm(lat, lon)}")
+            except MGRSError as ex:
+                await interaction.response.send_message(str(ex), ephemeral=True)
         else:
             await interaction.response.send_message("Invalid conversion mode", ephemeral=True)
 

requirements.in

@@ -98,7 +98,7 @@ pywin32==311 ; sys_platform == 'win32'
 pywinauto==0.6.9 ; sys_platform == 'win32'
 
 # Requests: Python HTTP library
-requests==2.33.1
+requests==2.34.1
 
 # Rich: Python library for rich text and beautiful formatting in the terminal
 rich==15.0.0

requirements.txt

@@ -39,7 +39,7 @@ geopandas==1.1.3
 gitdb==4.0.12
 gitpython==3.1.50
 h11==0.16.0
-idna==3.14
+idna==3.15
 jinja2==3.1.6
 jinxed==2.0.0
 jsonschema==4.26.0
@@ -82,7 +82,7 @@ pywin32==311 ; sys_platform == "win32"
 pywinauto==0.6.9 ; sys_platform == "win32"
 rapidfuzz==3.14.5
 referencing==0.37.0
-requests==2.33.1
+requests==2.34.1
 rich==15.0.0
 rpds-py==0.30.0
 ruamel-yaml==0.19.1

services/modmanager/service.py

@@ -85,47 +85,52 @@ async def install_packages(self):
             if 'packages' not in config:
                 continue
 
-            for package in config.get('packages', []):
-                folder = Folder(package['source'])
-                if package.get('version', 'latest') == 'latest':
-                    _version = await self.get_latest_version(package)
-                else:
-                    _version = package['version']
-                # check for valid versions
-                if _version is None:
-                    self.log.warning(f"{package['name']} without version in {folder.name}, skipped!")
-                    continue
-
-                installed = await self.get_installed_package(server, folder, package['name'])
-                if (not installed or installed != _version) and \
-                        server.status != Status.SHUTDOWN:
-                    self.log.warning(
-                        f"  - Server {server.name} needs to be shutdown to auto-install package {package['name']}")
-                    break
-                maintenance = server.maintenance
-                server.maintenance = True
-                try:
-                    if not installed:
-                        if not await self.install_package(server, folder, package['name'], _version,
-                                                          package.get('repo')):
-                            self.log.warning(f"- Package {package['name']}_v{_version} not found!")
-                    elif installed != _version:
-                        if version.parse(installed) > version.parse(_version):
-                            self.log.debug(f"- Installed package {package['name']}_v{installed} is newer than the "
-                                           f"configured version. Skipping.")
-                            continue
-                        if not await self.uninstall_package(server, folder, package['name'], installed):
-                            self.log.warning(f"- Package {package['name']}_v{installed} could not be uninstalled on "
-                                             f"server {server.name}!")
-                        elif not await self.install_package(server, folder, package['name'], _version,
-                                                            package.get('repo')):
-                            self.log.warning(f"- Package {package['name']}_v{_version} could not be installed on "
-                                             f"server {server.name}!")
-                        else:
-                            self.log.info(f"- Package {package['name']}_v{installed} updated to v{_version}.")
-                finally:
-                    if not maintenance:
-                        server.maintenance = False
+            try:
+                for package in config.get('packages', []):
+                    folder = Folder(package['source'])
+                    if package.get('version', 'latest') == 'latest':
+                        _version = await self.get_latest_version(package)
+                    else:
+                        _version = package['version']
+                    # check for valid versions
+                    if _version is None:
+                        self.log.warning(f"{package['name']} without version in {folder.name}, skipped!")
+                        continue
+
+                    installed = await self.get_installed_package(server, folder, package['name'])
+                    if (not installed or installed != _version) and \
+                            server.status != Status.SHUTDOWN:
+                        self.log.warning(
+                            f"  - Server {server.name} needs to be shutdown to auto-install package {package['name']}")
+                        break
+                    maintenance = server.maintenance
+                    server.maintenance = True
+                    try:
+                        if not installed:
+                            if not await self.install_package(server, folder, package['name'], _version,
+                                                              package.get('repo')):
+                                self.log.warning(f"- Package {package['name']}_v{_version} not found!")
+                        elif installed != _version:
+                            if version.parse(installed) > version.parse(_version):
+                                self.log.debug(f"- Installed package {package['name']}_v{installed} is newer than the "
+                                               f"configured version. Skipping.")
+                                continue
+                            if not await self.uninstall_package(server, folder, package['name'], installed):
+                                self.log.warning(f"- Package {package['name']}_v{installed} could not be uninstalled on "
+                                                 f"server {server.name}!")
+                            elif not await self.install_package(server, folder, package['name'], _version,
+                                                                package.get('repo')):
+                                self.log.warning(f"- Package {package['name']}_v{_version} could not be installed on "
+                                                 f"server {server.name}!")
+                            else:
+                                self.log.info(f"- Package {package['name']}_v{installed} updated to v{_version}.")
+                    except Exception as ex:
+                        self.log.error(f"Error while installing package {package['name']}_v{_version}: {ex}")
+                    finally:
+                        if not maintenance:
+                            server.maintenance = False
+            except Exception as ex:
+                self.log.error(f"Error while installing packages for server {server.name}: {ex}")
 
     @staticmethod
     def parse_filename(filename: str) -> tuple[str | None, str | None]: