BUGFIX:

- Core: Messages duplication on falsely detected split messages
- Coalitions: Typo in coalition detection
- Coalitions: /missionstats did not check coalition membership
- Coalition: /airbase info did not check coalition membership

Author: karel26

Scripts/net/DCSServerBot/DCSServerBot.lua

@@ -10,6 +10,7 @@ if base.dcsbot ~= nil then
 	return
 end
 
+local MAGIC_BYTE = string.char(1)
 local MAX_CHUNK   = 65000          -- safe UDP payload size
 local HEADER_SEP  = '|'            -- separator in the header
 local HEADER_FMT = '%s'..HEADER_SEP..'%d'..HEADER_SEP..'%d'..HEADER_SEP..'%d'..HEADER_SEP
@@ -57,7 +58,7 @@ dcsbot.sendBotTable = dcsbot.sendBotTable or function (tbl, channel)
         local payload   = msg:sub(start_idx, end_idx)
 
         local header = string.format(HEADER_FMT, msg_id, config.DCS_PORT, total_parts, part)
-        local packet = header .. payload
+        local packet = MAGIC_BYTE .. header .. payload
         socket.try(dcsbot.UDPSendSocket:sendto(packet, config.BOT_HOST, config.BOT_PORT))
     end
 end

Scripts/net/DCSServerBot/DCSServerBotUtils.lua

@@ -34,6 +34,7 @@ end
 -- this is the DCS server name
 server_name = nil
 
+local MAGIC_BYTE = string.char(1)
 local MAX_CHUNK   = 65000          -- safe UDP payload size
 local HEADER_SEP  = '|'            -- separator in the header
 local HEADER_FMT = '%s'..HEADER_SEP..'%d'..HEADER_SEP..'%d'..HEADER_SEP..'%d'..HEADER_SEP
@@ -61,7 +62,7 @@ function sendBotTable(tbl, channel)
         local payload   = msg:sub(start_idx, end_idx)
 
         local header = string.format(HEADER_FMT, msg_id, config.DCS_PORT, total_parts, part)
-        local packet = header .. payload
+        local packet = MAGIC_BYTE .. header .. payload
         socket.try(UDPSendSocket:sendto(packet, config.BOT_HOST, config.BOT_PORT))
     end
 end

core/utils/coalitions.py

@@ -25,7 +25,7 @@ def get_sides(bot: DCSServerBot, ctx: discord.Interaction | discord.Message, ser
     da_roles = [bot.get_role(x) for x in bot.roles['DCS Admin']]
     gm_roles = [bot.get_role(x) for x in bot.roles['GameMaster']]
     blue_role = bot.get_role(server.locals['coalitions']['blue_role'])
-    red_role = bot.get_role(server.locals['coalitions']['blue_role'])
+    red_role = bot.get_role(server.locals['coalitions']['red_role'])
     everyone = discord.utils.get(channel.guild.roles, name="@everyone")
 
     # check which coalition-specific data can be displayed in the questioned channel by that user

plugins/missionstats/listener.py

@@ -1,5 +1,4 @@
 import asyncio
-import psycopg_pool
 
 from core import EventListener, PersistentReport, Server, Coalition, Channel, event, Report, get_translation, \
     ThreadSafeDict
@@ -282,5 +281,6 @@ async def do_update(self):
                 if 'coalitions' in stats:
                     report = PersistentReport(self.bot, self.plugin_name, 'missionstats.json',
                                               embed_name='stats_embed', server=server)
-                    await report.render(stats=stats, mission_id=server.mission_id, title='Mission Statistics')
+                    await report.render(stats=stats, mission_id=server.mission_id, title='Mission Statistics',
+                                        sides=[Coalition.BLUE, Coalition.RED])
             self.update[server_name] = False

plugins/missionstats/reports.py

@@ -111,12 +111,12 @@ async def render(self, ucid: str, flt: StatisticsFilter) -> None:
 
 
 class MissionStats(report.EmbedElement):
-    async def render(self, stats: dict, sql: str, mission_id: int) -> None:
+    async def render(self, stats: dict, sql: str, mission_id: int, sides: list[Coalition]) -> None:
         self.add_field(name='▬▬▬▬▬▬▬▬▬▬▬ {} ▬▬▬▬▬▬▬▬▬▬▬'.format(_('Current Situation')),
                        value='_ _', inline=False)
         self.add_field(
             name='_ _', value=_('Airbases / FARPs\nPlanes\nHelicopters\nGround Units\nShips\nStructures'))
-        for coalition in [Coalition.BLUE, Coalition.RED]:
+        for coalition in sides:
             coalition_data = stats['coalitions'][coalition.name]
             value = '{}\n'.format(len(coalition_data['airbases']))
             for unit_type in [_('Airplanes'), _('Helicopters'), _('Ground Units'), _('Ships')]:
@@ -141,10 +141,12 @@ async def render(self, stats: dict, sql: str, mission_id: int) -> None:
                                 continue
                             elements[s][name] = value
                     self.add_field(name='_ _', value='\n'.join(elements[Side.BLUE].keys()) or '_ _')
-                    self.add_field(name=Side.BLUE.name.capitalize(),
-                                   value='\n'.join([str(x) for x in elements[Side.BLUE].values()]) or '_ _')
-                    self.add_field(name=Side.RED.name.capitalize(),
-                                   value='\n'.join([str(x) for x in elements[Side.RED].values()]) or '_ _')
+                    if Coalition.BLUE in sides:
+                        self.add_field(name=Side.BLUE.name.capitalize(),
+                                       value='\n'.join([str(x) for x in elements[Side.BLUE].values()]) or '_ _')
+                    if Coalition.RED in sides:
+                        self.add_field(name=Side.RED.name.capitalize(),
+                                       value='\n'.join([str(x) for x in elements[Side.RED].values()]) or '_ _')
 
 
 class ModuleStats1(report.EmbedElement):

services/servicebus/service.py

@@ -820,23 +820,25 @@ def datagram_received(derived, data: bytes, addr):
                     self.log.warning(f"Empty request received from {addr} - ignoring.")
                     return
 
-                # Check for the split header
-                parts = data.split(b"|", 4)
-                if len(parts) == 5:
-                    msg_id_b, port_b, total_b, seq_b, payload = parts
-                    try:
-                        msg_id = msg_id_b.decode("ascii")
-                        port = int(port_b)
-                        total = int(total_b)
-                        seq = int(seq_b)
-                    except Exception as e:
-                        self.log.debug("Invalid split header %s – treating as normal", parts)
-                        derived._handle_raw_payload(data)
-                    else:
-                        # 2️⃣  Store fragment and see if we are finished
-                        loop = asyncio.get_running_loop()
-                        loop.create_task(derived._process_fragment(msg_id, port, total, seq, payload))
-                        return  # early exit – we’ll process once all fragments are in
+                if data[0:1] == b'\x01':
+                    data = data[1:]
+
+                    # Check for the split header
+                    parts = data.split(b"|", 4)
+                    if len(parts) == 5:
+                        msg_id_b, port_b, total_b, seq_b, payload = parts
+                        try:
+                            msg_id = msg_id_b.decode("ascii")
+                            port = int(port_b)
+                            total = int(total_b)
+                            seq = int(seq_b)
+                        except Exception as e:
+                            self.log.debug("Malformed header after magic byte – dropping packet")
+                            return
+                        else:
+                            loop = asyncio.get_running_loop()
+                            loop.create_task(derived._process_fragment(msg_id, port, total, seq, payload))
+                            return  # early exit – we’ll process once all fragments are in
 
                 # Normal (unsplit) JSON packet
                 derived._handle_raw_payload(data)