BUGFIX:

- Tacview: configuration could end up with empty ports (reworked the whole config part)

Author: karel26

README.md

@@ -136,12 +136,25 @@ DCSServerBot supports some of them already and can add a bit of quality of life.
 ## Installation
 
 ### Prerequisites
-You need to have [Python](https://www.python.org/downloads/) 3.9 or higher and [PostgreSQL](https://www.postgresql.org/download/) installed. Please make sure that you tick 
-"Add python.exe to PATH" during your Python installation.<br>
+You need the following software to run DCSServerBot:
+
+#### a) Python
+You need to have [Python](https://www.python.org/downloads/) 3.9 or higher and installed. Please make sure that you tick "Add python.exe to PATH" 
+during your Python installation.<br>
 > [!NOTE]
 > Keep in mind, that Python 3.13 is still very new and can have bugs. I would recommend using the latest Python 3.12 for 
 > now.
 
+#### b) PostgreSQL
+DCSServerBot needs a database to store information in. I decided to use [PostgreSQL](https://www.postgresql.org/download/), as it has a great performance
+and stability and allows secure remote access, which is needed for [Multi-Node](./MULTINODE.md) installations.
+> [!NOTE]
+> If you install PostgreSQL on Linux, please make sure that you install the postgresXX-contrib package also.
+
+> [!IMPORTANT]
+> If using PostgreSQL remotely over unsecured networks, it is recommended to have SSL enabled.
+
+#### c) Git (optional)
 If you want to use instant autoupdate from the master branch, you have to install [Git for Windows](https://git-scm.com/download/win) and make sure 
 the ```git```-command is in your PATH.
 
@@ -176,6 +189,7 @@ The bot needs a unique Token per installation. This one can be obtained at http:
 If you do not want to use Discord, or if you maybe are not allowed to do so due to limitations of your Country, etc.
 you can now install DCSServerBot without the need to use Discord. Just select the respective option during the 
 installation, and you will install a variant that works without.
+
 > [!NOTE]
 > Please keep in mind that DCSServerBot was originally made for Discord and that there are some functionalities that
 > can only work, if you use it, like static graphs, greenieboards, and others.<br>
@@ -189,15 +203,7 @@ it somewhere on your PC that is running the DCS server(s) and give it write perm
 > [!CAUTION]
 > Make sure that the bots installation directory can only be seen by yourself and is not exposed to anybody 
 > outside via www etc. as it contains sensitive data. Do NEVER expose any of the DCSServerBot ports to the
-> outside world.
-
-### Database
-DCSServerBot uses PostgreSQL to store all information that needs to be persistent. This consists of, but is not limited
-to: players, mission information, statistics. DCSServerBot needs a fast database to do this. Install the latest 
-available PostgreSQL version from the above-mentioned website.<br>
-
-> [!IMPORTANT]
-> If using PostgreSQL remotely over unsecured networks, it is recommended to have SSL enabled.
+> outside world also.
 
 ### DCSServerBot Installation (Discord)
 Run the provided `install.cmd` script or just `run.cmd`.<br>

core/data/impl/serverimpl.py

@@ -478,7 +478,7 @@ def _load_extension(self, name: str) -> Optional[Extension]:
     async def init_extensions(self) -> list[str]:
         async with self.lock:
             extensions = DEFAULT_EXTENSIONS | self.locals.get('extensions', {})
-            for extension in extensions:
+            for extension in extensions.keys():
                 try:
                     ext: Extension = self.extensions.get(extension)
                     if not ext:

core/utils/discord.py

@@ -1249,19 +1249,19 @@ async def get_command(bot: DCSServerBot, *, name: str,
 
 
 class ConfigModal(Modal):
-    def __init__(self, title: str, config: dict, default: Optional[dict] = None, ephemeral: Optional[bool] = False):
+    def __init__(self, title: str, config: dict, old_values: Optional[dict] = None, ephemeral: Optional[bool] = False):
         super().__init__(title=title)
         self.ephemeral = ephemeral
         self.value = None
         self.config = config
-        if not default:
-            default = {}
+        if not old_values:
+            old_values = {}
         for k, v in self.config.items():
             self.add_item(TextInput(custom_id=k,
                                     label=v.get('label'),
                                     style=discord.TextStyle(v.get('style', 1)),
                                     placeholder=v.get('placeholder'),
-                                    default=str(default.get(k)) if default.get(k) is not None else "",
+                                    default=str(old_values.get(k)) if old_values.get(k) is not None else v.get('default', ''),
                                     required=v.get('required', False),
                                     min_length=v.get('min_length'),
                                     max_length=v.get('max_length')))
@@ -1270,6 +1270,8 @@ def __init__(self, title: str, config: dict, default: Optional[dict] = None, eph
     def unmap(value: str, t: str = None) -> Any:
         if not t or t == str:
             return value
+        elif not value:
+            return None
         elif t == int:
             return int(value)
         elif t == float:
@@ -1286,7 +1288,7 @@ async def on_submit(self, interaction: discord.Interaction) -> None:
         # noinspection PyUnresolvedReferences
         await interaction.response.defer(ephemeral=self.ephemeral)
         self.value = {
-            v.custom_id: self.unmap(v.value, self.config[v.custom_id].get('type')) if v.value else v.default
+            v.custom_id: self.unmap(v.value, self.config[v.custom_id].get('type'))
             for v in self.children
         }
         self.stop()

extensions/lotatc/extension.py

@@ -41,7 +41,8 @@ class LotAtc(Extension, FileSystemEventHandler):
             "type": int,
             "label": _("LotAtc Port"),
             "placeholder": _("Unique port number for LotAtc"),
-            "required": True
+            "required": True,
+            "default": 10310
         }
     }
 

extensions/realweather/README.md

@@ -3,6 +3,9 @@ If you want to use real-time weather in your missions, you can do that by using
 Download the release zip and unzip it to a directory of your choice on your system running your DCS servers and the 
 DCSServerBot. 
 
+> [!IMPORTANT]
+> DCSServerBot only supports DCS Real Weather Updater versions from 1.9.0 upwards.
+
 ## Configuration
 The configuration for RealWeather goes into your nodes.yaml. There are 2 versions available at the moment, v1.x.x and 
 v2.x.x. Both differ in their configuration, which is why I added 2 examples in here:
@@ -52,6 +55,8 @@ MyNode:
               visibility-minimum: 300
               visibility-maximum: 2000
 ```
+> [!NOTE]
+> You can find a list of supported parameters in the config.json provided by DCS-real-weather.
 
 ### Version 2.x
 ```yaml
@@ -114,19 +119,20 @@ MyNode:
               enable: true
               system-time: true
               offset: '0h5m'
+            date:
+              enable: true
+              system-date: true
+              offset: "0"
 ```
-You can find a list of supported parameters in the config.json (v1.x) or config.toml (v2.x) provided by DCS-real-weather.
-
-
-> [!IMPORTANT]
-> DCSServerBot only supports DCS Real Weather Updater versions from 1.9.0 upwards.
+> [!NOTE]
+> You can find a list of supported parameters in the config.toml provided by DCS-real-weather.
 
 > [!TIP]
 > If you want to set a custom ICAO code (URMM in this case) per mission, you can name your mission like so:<br>
 > `MyFancyMission_ICAO_URMM_whatsoever.miz`
 
 > [!NOTE]
-> You can use any parameter that Real Weather describes in their discord. I only write a toml from whatever
+> You can use any parameter that Real Weather describes in their discord. I only write a json/toml from whatever
 > you put in the extension configuration to pass that through to Real Weather. That said, it is ALWAYS a good
 > idea to look at what they added or changed, as I can not keep up with every 3rd party app I support with the
 > bot.

extensions/srs/extension.py

@@ -44,19 +44,22 @@ class SRS(Extension, FileSystemEventHandler):
             "type": int,
             "label": _("SRS Port"),
             "placeholder": _("Unique port number for SRS"),
-            "required": True
+            "required": True,
+            "default": 5002
         },
         "blue_password": {
             "type": str,
             "label": _("Blue Password"),
             "placeholder": _("Password for blue GCI, . for none"),
-            "required": True
+            "required": True,
+            "default": "blue"
           },
         "red_password": {
             "type": str,
             "label": _("Red Password"),
             "placeholder": _("Password for red GCI, . for none"),
-            "required": True
+            "required": True,
+            "default": "red"
         }
     }
 

extensions/tacview/extension.py

@@ -34,28 +34,33 @@ class Tacview(Extension):
             "type": int,
             "label": _("Tacview Port"),
             "placeholder": _("Unique port number for Tacview"),
-            "required": True
+            "required": True,
+            "default": 42674
         },
         "tacviewRealTimeTelemetryPassword": {
             "type": str,
             "label": _("Tacview Password"),
             "placeholder": _("Password for Tacview, . for none"),
+            "default": ""
         },
         "tacviewRemoteControlPort": {
             "type": int,
             "label": _("Remote Control Port"),
-            "placeholder": _("Unique port number for remote control")
+            "placeholder": _("Unique port number for remote control"),
+            "default": 42675
         },
         "tacviewRemoteControlPassword": {
             "type": str,
             "label": _("Remote Control Password"),
             "placeholder": _("Password for remote control, . for none"),
+            "default": ""
         },
         "tacviewPlaybackDelay": {
             "type": int,
             "label": _("Playback Delay"),
             "placeholder": _("Playback delay time"),
-            "required": True
+            "required": True,
+            "default": 0
         }
     }
 

plugins/lotatc/commands.py

@@ -111,7 +111,7 @@ async def _configure(self, interaction: discord.Interaction,
         config = server.instance.locals.get('extensions', {}).get('LotAtc', {})
         modal = utils.ConfigModal(title=_("LotAtc Configuration"),
                                   config=LotAtcExt.CONFIG_DICT,
-                                  default=config)
+                                  old_values=config)
         # noinspection PyUnresolvedReferences
         await interaction.response.send_modal(modal)
         if await modal.wait():

plugins/srs/commands.py

@@ -86,7 +86,7 @@ async def _configure(self, interaction: discord.Interaction,
         config = server.instance.locals.get('extensions', {}).get('SRS', {})
         modal = utils.ConfigModal(title=_("SRS Configuration"),
                                   config=SRSExt.CONFIG_DICT,
-                                  default=config)
+                                  old_values=config)
         # noinspection PyUnresolvedReferences
         await interaction.response.send_modal(modal)
         if await modal.wait():

plugins/tacview/commands.py

@@ -18,16 +18,10 @@ async def _configure(self, interaction: discord.Interaction, *,
                          server: Server,
                          enabled: bool = None,
                          autoupdate: bool = None) -> Optional[dict]:
-        config = server.instance.locals.get('extensions', {}).get('Tacview', {
-            "tacviewRealTimeTelemetryPort": "42674",
-            "tacviewRealTimeTelemetryPassword": "",
-            "tacviewRemoteControlEnabled": "42675",
-            "tacviewRemoteControlPassword": "",
-            "tacviewPlaybackDelay": "0"
-        })
+        config = server.instance.locals.get('extensions', {}).get('Tacview', {})
         modal = utils.ConfigModal(title=_("Tacview Configuration"),
                                   config=TacviewExt.CONFIG_DICT,
-                                  default=config)
+                                  old_values=config)
         # noinspection PyUnresolvedReferences
         await interaction.response.send_modal(modal)
         if await modal.wait():
@@ -38,16 +32,24 @@ async def _configure(self, interaction: discord.Interaction, *,
         tacviewRemoteControlPassword = modal.value.get('tacviewRemoteControlPassword')
         if tacviewRemoteControlPassword == '.':
             tacviewRemoteControlPassword = ""
-        return {
+        ret = {
             "enabled": enabled or config.get('enabled', True),
             "autoupdate": autoupdate or config.get('autoupdate', False),
             "tacviewRealTimeTelemetryPort": modal.value.get('tacviewRealTimeTelemetryPort'),
             "tacviewRealTimeTelemetryPassword": tacviewRealTimeTelemetryPassword,
-            "tacviewRemoteControlEnabled": True if modal.value.get('tacviewRemoteControlPort') else False,
-            "tacviewRemoteControlPort": modal.value.get('tacviewRemoteControlPort'),
-            "tacviewRemoteControlPassword": tacviewRemoteControlPassword,
             "tacviewPlaybackDelay": int(modal.value.get('tacviewPlaybackDelay')),
         }
+        if modal.value.get('tacviewRemoteControlPort'):
+            ret |= {
+                "tacviewRemoteControlEnabled": True,
+                "tacviewRemoteControlPort": modal.value.get('tacviewRemoteControlPort'),
+                "tacviewRemoteControlPassword": tacviewRemoteControlPassword
+            }
+        else:
+            ret |= {
+                "tacviewRemoteControlEnabled": False
+            }
+        return ret
 
     @tacview.command(description=_('Configure Tacview'))
     @app_commands.guild_only()