ENHANCEMENTS:

- Ports have a tag if they are UDP or TCP (or both) now
- /doc command shows tcp/udp notation in server documentation
- /doc new node sheet added to server documentation

CHANGES
- Some code cleanups

BUGFIX:
- Rare hangup if a DCS server starts non-responsive

Author: karel26

extensions/cloud/extension.py

@@ -92,7 +92,7 @@ async def cloud_register(self):
             payload = {
                 "guild_id": self.node.guild_id,
                 "server_name": self.server.name,
-                "port": self.server.instance.dcs_port.port,
+                "port": int(self.server.instance.dcs_port),
                 "password": (self.server.settings.get('password', '') != ''),
                 "theatre": self.server.current_mission.map,
                 "dcs_version": self.node.dcs_version,

services/servicebus/service.py

@@ -194,8 +194,8 @@ async def send_init(self, server: Server):
                 "options": server.options,
                 "channels": server.locals.get('channels', {}),
                 "node": self.node.name,
-                "dcs_port": server.instance.dcs_port.port,
-                "webgui_port": server.instance.webgui_port.port,
+                "dcs_port": int(server.instance.dcs_port),
+                "webgui_port": int(server.instance.webgui_port),
                 "maintenance": server.maintenance
             }
         }, timeout=timeout)
@@ -220,7 +220,7 @@ async def register_local_servers(self):
                     if server.maintenance:
                         self.log.warning(f'  => Maintenance mode enabled for Server {server.name}')
 
-                    if utils.is_open(server.instance.dcs_host, server.instance.webgui_port.port):
+                    if utils.is_open(server.instance.dcs_host, int(server.instance.webgui_port)):
                         calls[server.name] = asyncio.create_task(
                             server.send_to_dcs_sync({"command": "registerDCSServer"}, timeout)
                         )