Merge branch 'development'

Author: karel26

COALITIONS.md

@@ -51,10 +51,12 @@ My Fancy Server:
   # [...]
   channels:
     status: 1122334455667788
-    chat: 8765432187654321      # general chat channel
+    chat: 8765432187654321          # general chat channel
     admin: 8877665544332211
-    blue: 1188227733664455      # chat channel for coalition blue
-    red: 8811772266335544       # chat channel for coalition red
+    blue: 1188227733664455          # chat channel for coalition blue
+    blue_events: 987651234987651234 # Optional: to separate in-game event from chat messages (default: take blue instead).
+    red: 8811772266335544           # chat channel for coalition red
+    red_events: 123459876123459876  # Optional: same as blue_events for red.
   # [...]
   coalitions:
     lock_time: 1 day            # time in which you are not allowed to move to the opposite coalition after leaving one coalition

README.md

@@ -430,6 +430,7 @@ My Fancy Server:                # Your server name, as displayed in the server l
   channels:
     status: 1122334455667788    # The Discord channel to display the server status embed and players embed into. Right-click on your channel and select "Copy Channel ID". You can disable it with -1
     chat: 8877665544332211      # The Discord channel for the in-game chat replication. You can disable it with setting it to -1.
+    events: 1928374619283746    # Optional: if you want to split game events from chat messages, you can enable an optional events channel.
     admin: 1188227733664455     # The channel where you can fire admin commands to this server. You can decide if you want to have a central admin channel or server specific ones. See bot.yaml for more.
     voice: 1827364518273645     # The voice channel, where people need to connect to (if force_voice is true). 
   chat_log:

core/commandline.py

@@ -21,7 +21,6 @@
         parser.add_argument('-s', '--secret', action='store_true', help='Reveal all stored passwords')
     elif program == 'update.py':
         parser.add_argument('-n', '--node', help='Node name', default=platform.node())
-        parser.add_argument('-d', '--delete', action='store_true', help='remove obsolete local files')
         parser.add_argument('-r', '--no-restart', action='store_true', default=False,
                             help="don't start DCSServerBot after the update")
     elif program == 'install.py':

core/data/impl/nodeimpl.py

@@ -386,6 +386,7 @@ async def _upgrade_pending_non_git(self) -> bool:
         try:
             async with aiohttp.ClientSession() as session:
                 async with session.get(REPO_URL) as response:
+                    response.raise_for_status()
                     result = await response.json()
                     current_version = re.sub('^v', '', __version__)
                     latest_version = re.sub('^v', '', result[0]["tag_name"])
@@ -661,6 +662,7 @@ def has_timeout(row: dict, timeout: int):
                                 FROM cluster c LEFT OUTER JOIN nodes n
                                 ON c.guild_id = n.guild_id AND c.master = n.node
                                 WHERE c.guild_id = %s
+                                AND n.last_seen > (NOW() AT TIME ZONE 'UTC' - interval '1 minute')
                             """, (self.guild_id, ))
                             cluster = await cursor.fetchone()
                             # No master there? we take it!

plugins/mission/listener.py

@@ -823,12 +823,14 @@ async def onMissionEvent(self, server: Server, data: dict) -> None:
                         "menu": menu
                     })
         elif data['eventName'] == 'S_EVENT_PLAYER_LEAVE_UNIT':
-            group_id = data.get('initiator', {}).get('group', {}).get('id_')
-            if group_id is not None:
-                await server.send_to_dcs({
-                    "command": "deleteMenu",
-                    "groupID": group_id
-                })
+            initiator = data.get('initiator', {})
+            if initiator:
+                group_id = initiator.get('group', {}).get('id_')
+                if group_id is not None:
+                    await server.send_to_dcs({
+                        "command": "deleteMenu",
+                        "groupID": group_id
+                    })
 
     @chat_command(name='pause', help='pause the mission', roles=['DCS Admin', 'GameMaster'])
     async def pause(self, server: Server, player: Player, params: list[str]):

update.py

@@ -1,6 +1,8 @@
 import io
 import os
 import re
+from pathlib import Path
+
 import requests
 import shutil
 import subprocess
@@ -15,7 +17,7 @@
 from version import __version__
 
 
-def do_update_git(delete: Optional[bool]) -> int:
+def do_update_git() -> int:
     import git
 
     try:
@@ -42,7 +44,7 @@ def do_update_git(delete: Optional[bool]) -> int:
                             print('     Please run update.cmd manually.')
                             return -1
                 except git.exc.InvalidGitRepositoryError:
-                    return do_update_github(delete)
+                    return do_update_github()
                 except git.exc.GitCommandError:
                     print('  => Autoupdate failed!')
                     print('     Please revert back the changes in these files:')
@@ -53,25 +55,56 @@ def do_update_git(delete: Optional[bool]) -> int:
                 print('- No update found for DCSServerBot.')
                 return 0
     except git.exc.InvalidGitRepositoryError:
-        return do_update_github(delete)
+        return do_update_github()
 
 
-def cleanup_local_files(to_delete_set: Iterable):
+def cleanup_local_files(to_delete_set: Iterable, extracted_folder: str):
     # Exclude directories from deletion
-#    exclude_dirs = {'__pycache__', '.git', 'config', 'reports', 'sounds', 'services', 'extensions', 'plugins', 'logs'}
-    exclude_dirs = {'__pycache__', '.git', 'config', 'reports', 'sounds', 'services', 'plugins', 'logs'}
-    to_delete_set = {f for f in to_delete_set if not any(excluded_dir in f for excluded_dir in exclude_dirs)}
+    root_exclude_dirs = {'__pycache__', '.git', 'config', 'reports', 'logs'}
+    plugins_dir = Path('plugins')
+    services_dir = Path('services')
+
+    to_delete_set = {f for f in to_delete_set if not any(excluded_dir in f for excluded_dir in root_exclude_dirs)}
 
     # Delete each old file that is not in the updated directory.
     for relative_path in to_delete_set:
         full_path = os.path.join(os.getcwd(), relative_path)
+        # Skip special handling for plugins and services if outside their context
+        if plugins_dir in Path(relative_path).parents:
+            # Delete only subdirectories inside `plugins` that exist in the zip
+            sub_path = relative_path.replace(f"{plugins_dir}/", "")  # Subpath inside plugins directory
+            if not os.path.isdir(os.path.join(extracted_folder, plugins_dir, sub_path)):
+                print(f"  => Deleting {full_path} (from plugins directory)")
+                if os.path.isfile(full_path):
+                    os.remove(full_path)
+                elif os.path.isdir(full_path):
+                    shutil.rmtree(full_path)
+            continue
+        elif services_dir in Path(relative_path).parents:
+            # Delete only subdirectories inside `services` that exist in zip
+            sub_path = relative_path.replace(f"{services_dir}/", "")  # Subpath inside services directory
+            if not os.path.isdir(os.path.join(extracted_folder, services_dir, sub_path)):
+                print(f"  => Deleting {full_path} (from services directory)")
+                if os.path.isfile(full_path):
+                    os.remove(full_path)
+                elif os.path.isdir(full_path):
+                    shutil.rmtree(full_path)
+            continue
+
+        # Delete rest normally
         if os.path.isfile(full_path):
             print(f"  => Deleting {full_path}")
             os.remove(full_path)
+        elif os.path.isdir(full_path):
+            print(f"  => Removing directory {full_path}")
+            shutil.rmtree(full_path)
 
 
-def do_update_github(delete: Optional[bool] = False) -> int:
+def do_update_github() -> int:
     response = requests.get(f"https://api.github.com/repos/Special-K-s-Flightsim-Bots/DCSServerBot/releases")
+    if response.status_code != 200:
+        print(f'  => Autoupdate failed: {response.reason} ({response.status_code})')
+        return -2
     current_version = re.sub('^v', '', __version__)
     latest_version = re.sub('^v', '', response.json()[0]["tag_name"])
 
@@ -91,12 +124,11 @@ def do_update_github(delete: Optional[bool] = False) -> int:
 
                     extracted_folder = os.path.join(temp_dir, os.listdir(temp_dir)[0])  # there is one folder
 
-                    if delete:
-                        # check for necessary file deletions
-                        old_files_set = set(utils.list_all_files(os.getcwd()))
-                        new_files_set = set(utils.list_all_files(extracted_folder))
-                        to_delete_set = old_files_set - new_files_set
-                        cleanup_local_files(to_delete_set)
+                    # check for necessary file deletions
+                    old_files_set = set(utils.list_all_files(os.getcwd()))
+                    new_files_set = set(utils.list_all_files(extracted_folder))
+                    to_delete_set = old_files_set - new_files_set
+                    cleanup_local_files(to_delete_set, extracted_folder)
 
                     for root, dirs, files in os.walk(extracted_folder):
                         for file in files:
@@ -124,9 +156,9 @@ def do_update_github(delete: Optional[bool] = False) -> int:
     # get the command line args from core
     args = COMMAND_LINE_ARGS
     try:
-        rc = do_update_git(args.delete)
+        rc = do_update_git()
     except ImportError:
-        rc = do_update_github(args.delete)
+        rc = do_update_github()
     if args.no_restart:
         exit(-2)
     else: