Merge branch 'development'

Author: karel26

README.md

@@ -530,7 +530,7 @@ autorole:                                       # Automatically give roles to pe
   online: Online                                # Give people that are online on any of your servers the "Online" role.
 no_dcs_autoban: false                           # If true, people banned on your Discord will not be banned on your servers (default: false)
 message_ban: User has been banned on Discord.   # Default reason to show people that try to join your DCS servers when they are banned on Discord.
-message_autodelete: 300                         # Most of the Discord messages are private messages. If not, this is the timeout after which they vanish. Default is 300 (5 mins). 
+message_autodelete: 300                         # Optional: Most of the Discord messages are private messages. If not, this is the timeout after which they vanish. Default is 300 (5 mins). 
 channels:
   admin: 1122334455667788                       # Optional: Central admin channel (see below).
   audit: 88776655443322                         # Central audit channel to send audit events to (default: none)

Scripts/net/DCSServerBot/DCSServerBot.lua

@@ -10,6 +10,10 @@ if base.dcsbot ~= nil then
 	return
 end
 
+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
+
 -- load the configuration
 dofile(lfs.writedir() .. 'Scripts/net/DCSServerBot/DCSServerBotConfig.lua')
 local config = require('DCSServerBotConfig')
@@ -34,15 +38,34 @@ end
 
 dcsbot.sendBotTable = dcsbot.sendBotTable or function (tbl, channel)
 	tbl.server_name = cfg.name
-	tbl.channel = tostring(channel or "-1")
-	socket.try(dcsbot.UDPSendSocket:sendto(net.lua2json(tbl), config.BOT_HOST, config.BOT_PORT))
+    tbl.channel = tostring(channel or "-1")
+
+    local msg = net.lua2json(tbl)
+
+    if #msg <= MAX_CHUNK then
+        socket.try(dcsbot.UDPSendSocket:sendto(msg, config.BOT_HOST, config.BOT_PORT))
+        return
+    end
+
+    local msg_id      = tostring(math.floor(socket.gettime() * 1e6))
+    local total_parts = math.ceil(#msg / MAX_CHUNK)
+
+    for part = 1, total_parts do
+        local start_idx = (part-1) * MAX_CHUNK + 1
+        local end_idx   = math.min(start_idx + MAX_CHUNK - 1, #msg)
+        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
+        socket.try(dcsbot.UDPSendSocket:sendto(packet, config.BOT_HOST, config.BOT_PORT))
+    end
 end
 
-dcsbot.enableExtension = dcsbot.enableExtension or function (extension, config)
+dcsbot.enableExtension = dcsbot.enableExtension or function (extension, cfg)
     local msg = {
         command = 'enableExtension',
         extension = extension,
-        config = config
+        config = cfg
     }
 	dcsbot.sendBotTable(msg, "-1")
 end

Scripts/net/DCSServerBot/DCSServerBotUtils.lua

@@ -13,6 +13,7 @@ local tostring		= base.tostring
 local Sim			= base.Sim
 local type			= base.type
 local os            = base.os
+local math          = base.math
 
 local lfs			= require('lfs')
 local TableUtils 	= require('TableUtils')
@@ -28,13 +29,36 @@ UDPSendSocket = socket.udp()
 -- this is the DCS server name
 server_name = nil
 
+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
+
 function sendBotTable(tbl, channel)
-	if server_name == nil then
-		server_name = loadSettingsRaw().name
-	end
-	tbl.server_name = server_name
-	tbl.channel = tostring(channel or "-1")
-	socket.try(UDPSendSocket:sendto(net.lua2json(tbl), config.BOT_HOST, config.BOT_PORT))
+    if server_name == nil then
+        server_name = loadSettingsRaw().name
+    end
+    tbl.server_name = server_name
+    tbl.channel = tostring(channel or "-1")
+
+    local msg = net.lua2json(tbl)
+
+    if #msg <= MAX_CHUNK then
+        socket.try(UDPSendSocket:sendto(msg, config.BOT_HOST, config.BOT_PORT))
+        return
+    end
+
+    local msg_id      = tostring(math.floor(socket.gettime() * 1e6))
+    local total_parts = math.ceil(#msg / MAX_CHUNK)
+
+    for part = 1, total_parts do
+        local start_idx = (part-1) * MAX_CHUNK + 1
+        local end_idx   = math.min(start_idx + MAX_CHUNK - 1, #msg)
+        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
+        socket.try(UDPSendSocket:sendto(packet, config.BOT_HOST, config.BOT_PORT))
+    end
 end
 
 function loadSettingsRaw()
@@ -56,7 +80,7 @@ function mergeGuiSettings(new_settings)
 end
 
 function saveSettings(settings)
-    mergedSettings = mergeGuiSettings(settings)
+    local mergedSettings = mergeGuiSettings(settings)
     if mergedSettings.name ~= server_name then
         server_name = mergedSettings.name
     end
@@ -106,7 +130,7 @@ function getMulticrewAllParameters(PlayerId)
 
 			if (not tonumber(_player_slot)) then
 				-- If this is multiseat slot parse master slot and look for seat number
-				_t_start, _t_end = string.find(_player_slot, '_%d+')
+				local _t_start, _t_end = string.find(_player_slot, '_%d+')
 
 				if _t_start then
 					-- This is co-player
@@ -165,7 +189,7 @@ function isWithinInterval(last_event, interval)
 end
 
 function loadScript(scriptPath)
-    command = 'dofile(\\"' .. lfs.writedir():gsub('\\', '/') .. 'Scripts/net/DCSServerBot/' .. scriptPath .. '\\")'
+    local command = 'dofile(\\"' .. lfs.writedir():gsub('\\', '/') .. 'Scripts/net/DCSServerBot/' .. scriptPath .. '\\")'
     net.dostring_in('mission', 'a_do_script("' .. command .. '")')
 end
 
@@ -181,12 +205,12 @@ end
 function isDynamic(slotId)
     if not(string.find(slotId, 'red') or string.find(slotId, 'blue')) then
         -- Player took model
-        _master_slot = slotId
-        _sub_slot = 0
+        local _master_slot = slotId
+        local _sub_slot = 0
 
         if (not tonumber(slotId)) then
             -- If this is multiseat slot parse master slot and look for seat number
-            _t_start, _t_end = string.find(slotId, '_%d+')
+            local _t_start, _t_end = string.find(slotId, '_%d+')
 
             if _t_start then
                 -- This is co-player

migrate.py

@@ -407,9 +407,10 @@ def migrate_3(node: str):
                 'owner': int(cfg['BOT']['OWNER']),
                 'automatch': cfg['BOT'].getboolean('AUTOMATCH'),
                 'autoban': cfg['BOT'].getboolean('AUTOBAN'),
-                'message_ban': cfg['BOT']['MESSAGE_BAN'],
-                'message_autodelete': int(cfg['BOT']['MESSAGE_AUTODELETE'])
+                'message_ban': cfg['BOT']['MESSAGE_BAN']
             }
+            if int(cfg['BOT']['MESSAGE_AUTODELETE']) > 0:
+                bot['message_autodelete'] = int(cfg['BOT']['MESSAGE_AUTODELETE'])
             # take the first admin channel as the single one
             if single_admin:
                 for server_name, instance in utils.findDCSInstances():

plugins/admin/commands.py

@@ -918,7 +918,8 @@ async def _startup(server: Server):
                 await server.startup()
                 server.maintenance = False
             except (TimeoutError, asyncio.TimeoutError):
-                await interaction.followup.send(_("Timeout while starting server {}!").format(server.name))
+                await interaction.followup.send(_("Timeout while starting server {}!").format(server.name),
+                                                ephemeral=True)
 
         async def _node_online(node_name: str):
             next_startup = 0
@@ -929,7 +930,7 @@ async def _node_online(node_name: str):
                     next_startup += startup_delay
                 else:
                     server.maintenance = False
-            await interaction.followup.send(_("Node {} is now online.").format(node_name))
+            await interaction.followup.send(_("Node {} is now online.").format(node_name), ephemeral=ephemeral)
             await self.bot.audit(f"took node {node_name} online.", user=interaction.user)
 
         ephemeral = utils.get_ephemeral(interaction)

plugins/mission/commands.py

@@ -1065,23 +1065,24 @@ async def persistence(self, interaction: discord.Interaction,
     @airbase.command(name="info", description=_('Information about a specific airbase'))
     @utils.app_has_role('DCS')
     @app_commands.guild_only()
+    @app_commands.rename(_server='server')
     @app_commands.rename(idx=_('airbase'))
     @app_commands.describe(idx=_('Airbase for warehouse information'))
     @app_commands.autocomplete(idx=utils.airbase_autocomplete)
     async def airbase_info(self, interaction: discord.Interaction,
-                           server: app_commands.Transform[Server, utils.ServerTransformer(
+                           _server: app_commands.Transform[Server, utils.ServerTransformer(
                                status=[Status.RUNNING, Status.PAUSED])],
                            idx: int):
-        if server.status not in [Status.RUNNING, Status.PAUSED]:
+        if _server.status not in [Status.RUNNING, Status.PAUSED]:
             # noinspection PyUnresolvedReferences
             await interaction.response.send_message(_("Server {} is not running.").format(server.display_name),
                                                     ephemeral=True)
             return
 
         # noinspection PyUnresolvedReferences
-        await interaction.response.defer()
-        airbase = server.current_mission.airbases[idx]
-        data = await server.send_to_dcs_sync({
+        await interaction.response.defer(ephemeral=utils.get_ephemeral(interaction))
+        airbase = _server.current_mission.airbases[idx]
+        data = await _server.send_to_dcs_sync({
             "command": "getAirbase",
             "name": airbase['name']
         })
@@ -1093,10 +1094,10 @@ async def airbase_info(self, interaction: discord.Interaction,
         report = Report(self.bot, self.plugin_name, 'airbase.json')
         env = await report.render(coalition=colors[data['coalition']], airbase=airbase, data=data)
         if utils.check_roles(set(self.bot.roles['DCS Admin'] + self.bot.roles['GameMaster']), interaction.user):
-            view = AirbaseView(server, airbase, data)
+            view = AirbaseView(_server, airbase, data)
         else:
             view = discord.utils.MISSING
-        msg = await interaction.followup.send(embed=env.embed, view=view, ephemeral=utils.get_ephemeral(interaction))
+        msg = await interaction.followup.send(embed=env.embed, view=view)
         try:
             await view.wait()
         finally:
@@ -1108,29 +1109,30 @@ async def airbase_info(self, interaction: discord.Interaction,
     @airbase.command(description=_('Automatic Terminal Information Service (ATIS)'))
     @utils.app_has_role('DCS')
     @app_commands.guild_only()
+    @app_commands.rename(_server='server')
     @app_commands.rename(idx=_('airbase'))
     @app_commands.describe(idx=_('Airbase for ATIS information'))
     @app_commands.autocomplete(idx=utils.airbase_autocomplete)
     async def atis(self, interaction: discord.Interaction,
-                   server: app_commands.Transform[Server, utils.ServerTransformer(
+                   _server: app_commands.Transform[Server, utils.ServerTransformer(
                        status=[Status.RUNNING, Status.PAUSED])],
                    idx: int):
-        if server.status not in [Status.RUNNING, Status.PAUSED]:
+        if _server.status not in [Status.RUNNING, Status.PAUSED]:
             # noinspection PyUnresolvedReferences
             await interaction.response.send_message(_("Server {} is not running.").format(server.display_name),
                                                     ephemeral=True)
             return
         # noinspection PyUnresolvedReferences
         await interaction.response.defer()
-        airbase = server.current_mission.airbases[idx]
-        data = await server.send_to_dcs_sync({
+        airbase = _server.current_mission.airbases[idx]
+        data = await _server.send_to_dcs_sync({
             "command": "getWeatherInfo",
             "x": airbase['position']['x'],
             "y": airbase['position']['y'],
             "z": airbase['position']['z']
         })
         report = Report(self.bot, self.plugin_name, 'atis.json')
-        env = await report.render(airbase=airbase, data=data, server=server)
+        env = await report.render(airbase=airbase, data=data, server=_server)
         msg = await interaction.original_response()
         await msg.edit(embed=env.embed, delete_after=self.bot.locals.get('message_autodelete'))
 
@@ -1151,7 +1153,7 @@ async def capture(self, interaction: discord.Interaction,
             return
 
         # noinspection PyUnresolvedReferences
-        await interaction.response.defer()
+        await interaction.response.defer(ephemeral=utils.get_ephemeral(interaction))
         airbase = server.current_mission.airbases[idx]
         await server.send_to_dcs_sync({
             "command": "captureAirbase",
@@ -1160,7 +1162,7 @@ async def capture(self, interaction: discord.Interaction,
         })
         await interaction.followup.send(
             _("Airbase \"{}\": Coalition changed to **{}**.\n:warning: Auto-capturing is now **disabled**!").format(
-                airbase['name'], coalition.lower()), ephemeral=utils.get_ephemeral(interaction))
+                airbase['name'], coalition.lower()))
 
     @staticmethod
     async def manage_items(server: Server, airbase: dict, category: str, item: str | list[int],
@@ -1214,16 +1216,17 @@ async def manage_warehouse(server: Server, airbase: dict, value: int | None = No
     @airbase.command(description=_('Manage warehouses'))
     @utils.app_has_role('DCS')
     @app_commands.guild_only()
+    @app_commands.rename(_server='server')
     @app_commands.rename(idx=_('airbase'))
     @app_commands.describe(idx=_('Airbase for warehouse information'))
     @app_commands.autocomplete(idx=utils.airbase_autocomplete)
     @app_commands.autocomplete(category=wh_category_autocomplete)
     @app_commands.autocomplete(item=wh_item_autocomplete)
     async def warehouse(self, interaction: discord.Interaction,
-                        server: app_commands.Transform[Server, utils.ServerTransformer(
+                        _server: app_commands.Transform[Server, utils.ServerTransformer(
                             status=[Status.RUNNING, Status.PAUSED])],
                         idx: int, category: str | None = None, item: str | None = None, value: int | None = None):
-        if server.status not in [Status.RUNNING, Status.PAUSED]:
+        if _server.status not in [Status.RUNNING, Status.PAUSED]:
             # noinspection PyUnresolvedReferences
             await interaction.response.send_message(_("Server {} is not running.").format(server.display_name),
                                                     ephemeral=True)
@@ -1234,15 +1237,15 @@ async def warehouse(self, interaction: discord.Interaction,
             raise PermissionError(_("You cannot change warehouse items."))
 
         # noinspection PyUnresolvedReferences
-        await interaction.response.defer()
-        airbase = server.current_mission.airbases[idx]
+        await interaction.response.defer(ephemeral=True)
+        airbase = _server.current_mission.airbases[idx]
 
         embed = discord.Embed(title=_("Warehouse information for {}").format(airbase['name']),
                               color=discord.Color.blue())
 
         if category and item:
             _item = list(map(int, item.split('.'))) if isinstance(item, str) else item
-            data = await Mission.manage_items(server, airbase, category, _item, value)
+            data = await Mission.manage_items(_server, airbase, category, _item, value)
             if data['value'] == 1000000:
                 display = _("unlimited")
             elif category == 'liquids':
@@ -1251,11 +1254,11 @@ async def warehouse(self, interaction: discord.Interaction,
                 display = _("{} pcs").format(data['value'])
 
             item_name = next(
-                (x['name'] for x in server.resources.get(category) if str(x['wstype']) == item),
+                (x['name'] for x in _server.resources.get(category) if str(x['wstype']) == item),
                 'n/a'
             )
             embed.add_field(name=_("Inventory for {}").format(item_name), value="```" + display + "```")
-            await interaction.followup.send(embed=embed, ephemeral=utils.get_ephemeral(interaction))
+            await interaction.followup.send(embed=embed)
 
         else:
             if value is not None:
@@ -1266,11 +1269,11 @@ async def warehouse(self, interaction: discord.Interaction,
                     return
 
                 if category is not None:
-                    await Mission.manage_category(server, airbase, category, value)
+                    await Mission.manage_category(_server, airbase, category, value)
                 else:
-                    await Mission.manage_warehouse(server, airbase, value)
+                    await Mission.manage_warehouse(_server, airbase, value)
 
-            data = await server.send_to_dcs_sync({
+            data = await _server.send_to_dcs_sync({
                 "command": "getAirbase",
                 "name": airbase['name']
             })
@@ -2490,19 +2493,21 @@ async def upload_warehouse_data(channel: discord.TextChannel, server: Server, sh
         for airport in airports:
             await channel.send(_("Loading warehouse for airport {} ...").format(airport))
             for key, values in sheets.items():
-                await channel.send(_("Uploading {} information to your warehouse ...").format(SHEET_TITLES[key]))
+                await channel.send(_("> uploading {} information ...").format(SHEET_TITLES[key].lower()))
+                tasks = []
                 for k, v in values.items():
                     if key != 'liquids':
                         cmd = "setWarehouseItem"
                     else:
                         cmd = "setWarehouseLiquid"
-                    await server.send_to_dcs_sync({
+                    tasks.append(server.send_to_dcs_sync({
                         "command": cmd,
                         "name": airport,
                         "item": k,
                         "value": v
-                    }, timeout=60)
-            await channel.send(_("Warehouse updated."))
+                    }, timeout=60))
+                await asyncio.gather(*tasks)
+            await channel.send(_("Warehouse at {} updated.").format(airport))
 
     async def handle_warehouse_uploads(self, message: discord.Message):
         if not utils.check_roles(set(self.bot.roles['DCS Admin'] + self.bot.roles['GameMaster']), message.author):
@@ -2559,7 +2564,7 @@ async def handle_warehouse_uploads(self, message: discord.Message):
         if not await utils.yn_question(
                 ctx,
                 question=_("Do you want to load a new warehouse configuration?"),
-                message=_("This will replace the warehouse configuration for {}").format(','.join(airports))
+                message=_("This will replace the warehouse configuration for:\n{}").format(','.join(airports))
         ):
             await message.channel.send(_("Aborted."))
             return