2026-01-19T2004Z

Author: Windows81

Source/launcher/subparsers/args_launch_mode/player.py

@@ -1,5 +1,6 @@
 # Standard library imports
 import argparse
+import itertools
 import logger
 
 # Local application imports
@@ -18,36 +19,36 @@ def _(
     subparser.add_argument(
         '--rcc_host', '--host', '-rh', '-h',
         type=str,
-        nargs='?',
-        default=None,
+        nargs='*',
+        default=[],
         help='Hostname or IP address to connect this program to the RCC server.',
     )
     subparser.add_argument(
         '--rcc_port', '--port', '-rp', '-p',
         type=int,
-        nargs='?',
-        default=None,
+        nargs='*',
+        default=[],
         help='Port number to connect this program to the RCC server.',
     )
     subparser.add_argument(
         '--web_host', '--webserver_host', '-wh',
         type=str,
-        nargs='?',
-        default=None,
+        nargs='*',
+        default=[],
         help='Hostname or IP address to connect this program to the web server.',
     )
     subparser.add_argument(
         '--web_port', '--webserver_port', '-wp',
         type=int,
-        nargs='?',
-        default=None,
+        nargs='*',
+        default=[],
         help='Port number to connect this program to the web server.',
     )
     subparser.add_argument(
         '--user_code', '-u',
         type=str,
-        nargs='?',
-        default=None,
+        nargs='*',
+        default=[],
         help='Determines the user code for the player which joins the server.\nUser codes derive a user name, user iden number, and other characteristics of any particular player.',
     )
     subparser.add_argument(
@@ -58,7 +59,7 @@ def _(
     subparser.add_argument(
         '--loud',
         action='store_true',
-        help='Makes the client\'s output file log very verbosely.',
+        help='Makes the client\'s output log file very verbose.',
     )
 
 
@@ -82,20 +83,6 @@ def _(
     args_ns: argparse.Namespace,
 ) -> list[logic.base_entry]:
 
-    web_host: str | None = args_ns.web_host
-    rcc_host: str | None = args_ns.rcc_host
-    if web_host is None:
-        web_host = rcc_host or 'localhost'
-    if rcc_host is None:
-        rcc_host = web_host or 'localhost'
-
-    web_port: int | None = args_ns.web_port
-    rcc_port: int | None = args_ns.rcc_port
-    if web_port is None:
-        web_port = rcc_port or 2005
-    if rcc_port is None:
-        rcc_port = web_port or 2005
-
     log_filter = gen_log_filter(
         parser, args_ns,
     )
@@ -106,7 +93,12 @@ def _(
             rcc_port=rcc_port,
             web_host=web_host,
             web_port=web_port,
-            user_code=args_ns.user_code,
+            user_code=user_code,
             logger=log_filter,
-        ),
+        )
+        for (
+            web_host, rcc_host, web_port, rcc_port, user_code,
+        ) in itertools.zip_longest(
+            args_ns.web_host, args_ns.rcc_host, args_ns.web_port, args_ns.rcc_port, args_ns.user_code,
+        )
     ]

Source/launcher/subparsers/args_launch_mode/server.py

@@ -1,12 +1,14 @@
 # Standard library imports
 import argparse
 import dataclasses
+import itertools
 
 # Local application imports
 import game_config as config
 import logger.flog_table
 import logger.bcolors
 import util.resource
+import util.const
 import logger
 
 from routines import player, rcc, web
@@ -27,41 +29,43 @@ def subparse(
         '--config',
         '-cp',
         type=str,
-        nargs='?',
-        default=util.resource.DEFAULT_CONFIG_PATH,
+        nargs='*',
+        default=[util.resource.DEFAULT_CONFIG_PATH],
         help='Game-specific options; defaults to ./GameConfig.toml.  Please review each option before starting a new server up.',
     )
     place_thing.add_argument(
         '--place_path',
         '--place',
         '-pl',
         type=str,
-        nargs='?',
-        default=None,
+        nargs='*',
+        default=[],
         help='Path to the place file to be loaded.  Argument `config_path` can\'t be passed in when using this option.',
     )
     ip_version = subparser.add_mutually_exclusive_group()
 
     ip_version.add_argument(
         '--ipv4-only',
         action='store_true',
-        help='Run server using IPv4 only.')
+        help='Run server using IPv4 only.',
+    )
     ip_version.add_argument(
         '--ipv6-only',
         action='store_true',
-        help='Run server using IPv6 only.')
+        help='Run server using IPv6 only.',
+    )
     subparser.add_argument(
         '--rcc_port', '--port', '-rp', '-p',
         type=int,
-        nargs='?',
-        default=None,
+        nargs='*',
+        default=[],
         help='Port number for the RCC server to run from.',
     )
     subparser.add_argument(
         '--web_port', '--webserver_port', '-wp',
         type=int,
-        nargs='?',
-        default=None,
+        nargs='*',
+        default=[],
         help='Port number for the web server to run from.',
     )
     subparser.add_argument(
@@ -150,73 +154,88 @@ def _(
     parser: argparse.ArgumentParser,
     args_ns: argparse.Namespace,
 ) -> list[logic.base_entry]:
-    if args_ns.place_path is not None:
-        game_config = config.generate_config(args_ns.place_path)
+    if len(args_ns.place_path) > 0:
+        game_configs = [
+            config.generate_config(v)
+            for v in args_ns.place_path
+        ]
     else:
-        game_config = config.get_cached_config(args_ns.config_path)
-
-    web_port: int | None = args_ns.web_port
-    rcc_port: int | None = args_ns.rcc_port
-    if web_port is None:
-        web_port = rcc_port or 2005
-    if rcc_port is None:
-        rcc_port = web_port or 2005
+        game_configs = [
+            config.get_cached_config(v)
+            for v in args_ns.config_path
+        ]
 
     has_ipv6: bool = not args_ns.ipv4_only
     has_ipv4: bool = not args_ns.ipv6_only
 
+    web_routine_args = set[logic.base_entry]()
+    rcc_routine_args = set[logic.base_entry]()
     log_filter = gen_log_filter(
         parser, args_ns,
     )
 
-    web_routine_args = []
-    if has_ipv6:
-        # IPv6 goes first since `localhost` also resolves first to [::1] on the client.
-        web_routine_args.append(web.obj_type(
-            web_port=web_port,
-            is_ssl=True,
-            is_ipv6=True,
-            server_mode=web.SERVER_MODE_TYPE.RCC,
-            logger=log_filter,
-            game_config=game_config,
-        ))
-    if has_ipv4:
-        web_routine_args.append(web.obj_type(
-            web_port=web_port,
-            is_ssl=True,
-            is_ipv6=False,
-            server_mode=web.SERVER_MODE_TYPE.RCC,
-            logger=log_filter,
-            game_config=game_config,
-        ))
-
-    routine_args = []
-    if not args_ns.skip_web:
-        routine_args.extend(web_routine_args)
-
-    if not args_ns.skip_rcc:
-        routine_args.append(
-            rcc.obj_type(
-                # TODO: add support for RCC to connect to hosts other than `localhost`.
-                web_host='localhost',
-                web_port=web_port,
-                rcc_port=rcc_port,
-                logger=log_filter,
-                game_config=game_config,
-            ),
-        )
-
-    if args_ns.run_client:
-        routine_args.extend([
-            player.obj_type(
-                rcc_host='127.0.0.1',
-                web_host='127.0.0.1',
-                rcc_port=rcc_port,
-                web_port=web_port,
-                user_code=args_ns.user_code,
-                logger=log_filter,
-                # Some CoreGUI elements don't render properly if we join too early.
-                launch_delay=3,
-            ),
-        ])
-    return routine_args
+    def gen_next_seq_port(ports: list[int | None]):
+        last_used = util.const.RFD_DEFAULT_PORT - 1
+        for p in ports:
+            if p is not None:
+                last_used = p
+            else:
+                last_used += 1
+            yield last_used
+
+    web_port_gen = gen_next_seq_port(args_ns.web_port)
+    rcc_port_gen = gen_next_seq_port(args_ns.rcc_port)
+
+    for (
+        web_port, rcc_port, game_config,
+    ) in itertools.zip_longest(
+        web_port_gen, rcc_port_gen, game_configs,
+    ):
+        if not args_ns.skip_web:
+            if has_ipv6:
+                # IPv6 goes first since `localhost` also resolves first to [::1] on the client.
+                web_routine_args.add(web.obj_type(
+                    web_port=web_port,
+                    is_ssl=True,
+                    is_ipv6=True,
+                    server_mode=web.SERVER_MODE_TYPE.RCC,
+                    logger=log_filter,
+                    game_config=game_config,
+                ))
+            if has_ipv4:
+                web_routine_args.add(web.obj_type(
+                    web_port=web_port,
+                    is_ssl=True,
+                    is_ipv6=False,
+                    server_mode=web.SERVER_MODE_TYPE.RCC,
+                    logger=log_filter,
+                    game_config=game_config,
+                ))
+
+        if not args_ns.skip_rcc:
+            rcc_routine_args.add(
+                rcc.obj_type(
+                    # TODO: add support for RCC to connect to hosts other than `localhost`.
+                    web_host='localhost',
+                    web_port=web_port,
+                    rcc_port=rcc_port,
+                    logger=log_filter,
+                    game_config=game_config,
+                ),
+            )
+
+        if args_ns.run_client:
+            rcc_routine_args.add([
+                player.obj_type(
+                    rcc_host='127.0.0.1',
+                    web_host='127.0.0.1',
+                    rcc_port=rcc_port,
+                    web_port=web_port,
+                    user_code=args_ns.user_code,
+                    logger=log_filter,
+                    # Some CoreGUI elements don't render properly if we join too early.
+                    launch_delay=3,
+                ),
+            ])
+
+    return [*web_routine_args, *rcc_routine_args]

Source/routines/_logic.py

@@ -20,6 +20,7 @@
 import game_config as game_config_module
 import util.resource
 import util.versions
+import util.const
 import logger
 from pretasks import (
     download,
@@ -60,6 +61,17 @@ def process(self) -> None:
         assert not self._completed
         self._completed = True
 
+    def __post_init__(self) -> None:
+        '''
+        https://stackoverflow.com/a/69944614/6879778
+        '''
+        for field in dataclasses.fields(self):
+            if isinstance(field.default, dataclasses._MISSING_TYPE):
+                continue
+            if getattr(self, field.name) is not None:
+                continue
+            setattr(self, field.name, field.default)
+
 
 @dataclasses.dataclass(kw_only=True, unsafe_hash=True)
 class popen_entry(base_entry):
@@ -178,7 +190,7 @@ class bin_entry(popen_entry, loggable_entry):
     auto_download: bool = False
     clear_temp_cache: bool = False
     web_host: str = 'localhost'
-    web_port: int
+    web_port: int = util.const.RFD_DEFAULT_PORT
 
     @staticmethod
     def get_none_ssl() -> ssl.SSLContext:
@@ -188,7 +200,14 @@ def get_none_ssl() -> ssl.SSLContext:
         return ctx
 
     @staticmethod
-    def resolve_host_port(host: str, port: int) -> tuple[str, int]:
+    def maybe_differenciate_web_and_rcc_stuff[T](web: T, rcc: T | None) -> tuple[T, T]:
+        has_rcc = rcc is not None
+        if has_rcc:
+            return (web, rcc)
+        return (web, web)
+
+    @staticmethod
+    def maybe_separate_host_and_port(host: str, port: int) -> tuple[str, int]:
         if not host.startswith('[') and re.search(r':.*:', host) is not None:
             host = '[%s]' % host
             return (host, port)
@@ -227,9 +246,10 @@ def get_app_base_url(self) -> str:
     DIRS_TO_ADD: ClassVar[list[str]]
 
     def __post_init__(self) -> None:
+        super().__post_init__()
         (
             self.web_host, self.web_port,
-        ) = self.resolve_host_port(
+        ) = self.maybe_separate_host_and_port(
             self.web_host, self.web_port,
         )