fix: allow custom ports on install setup optionally (#580)

zhravan · web-flow · commit 972c7ac4ea2a · 2025-11-21T21:10:06.000+05:30
diff --git a/cli/app/commands/install/base.py b/cli/app/commands/install/base.py
@@ -1,7 +1,16 @@
 import os
 import re
 
-from app.utils.config import Config
+from app.utils.config import (
+    API_PORT,
+    CADDY_ADMIN_PORT,
+    CADDY_HTTP_PORT,
+    CADDY_HTTPS_PORT,
+    Config,
+    PROXY_PORT,
+    SUPERTOKENS_API_PORT,
+    VIEW_PORT,
+)
 from app.utils.protocols import LoggerProtocol
 
 from .messages import configuration_key_has_no_default_value
@@ -20,6 +29,14 @@ def __init__(
         config_file: str = None,
         repo: str = None,
         branch: str = None,
+        api_port: int = None,
+        view_port: int = None,
+        db_port: int = None,
+        redis_port: int = None,
+        caddy_admin_port: int = None,
+        caddy_http_port: int = None,
+        caddy_https_port: int = None,
+        supertokens_port: int = None,
     ):
         self.logger = logger
         self.verbose = verbose
@@ -29,13 +46,71 @@ def __init__(
         self.config_file = config_file
         self.repo = repo
         self.branch = branch
+        self.api_port = api_port
+        self.view_port = view_port
+        self.db_port = db_port
+        self.redis_port = redis_port
+        self.caddy_admin_port = caddy_admin_port
+        self.caddy_http_port = caddy_http_port
+        self.caddy_https_port = caddy_https_port
+        self.supertokens_port = supertokens_port
         self._config = Config()
         self._config.load_user_config(self.config_file)
+        self._user_config = None
         self.progress = None
         self.main_task = None
     
     def _get_config(self, path: str):
         """Base config getter - override in subclasses for specific behavior"""
+        # Override port values if provided via command line
+        if path == API_PORT and self.api_port is not None:
+            return str(self.api_port)
+        if path == VIEW_PORT and self.view_port is not None:
+            return str(self.view_port)
+        if path == "services.db.env.DB_PORT" and self.db_port is not None:
+            return str(self.db_port)
+        if path == "services.redis.env.REDIS_PORT" and self.redis_port is not None:
+            return str(self.redis_port)
+        
+        # Handle PROXY_PORT (which is an alias for CADDY_ADMIN_PORT)
+        if path == PROXY_PORT:
+            if self.caddy_admin_port is not None:
+                return str(self.caddy_admin_port)
+            # Fall back to CADDY_ADMIN_PORT from config, default to 2019
+            try:
+                return str(self._config.get(CADDY_ADMIN_PORT))
+            except (KeyError, ValueError):
+                return "2019"
+        
+        if path == CADDY_ADMIN_PORT and self.caddy_admin_port is not None:
+            return str(self.caddy_admin_port)
+        if path == CADDY_HTTP_PORT and self.caddy_http_port is not None:
+            return str(self.caddy_http_port)
+        if path == CADDY_HTTPS_PORT and self.caddy_https_port is not None:
+            return str(self.caddy_https_port)
+        if path == SUPERTOKENS_API_PORT and self.supertokens_port is not None:
+            return str(self.supertokens_port)
+        
+        # Handle simple key lookups for port overrides
+        if path == "db_port" and self.db_port is not None:
+            return str(self.db_port)
+        if path == "redis_port" and self.redis_port is not None:
+            return str(self.redis_port)
+        if path == "proxy_port" and self.caddy_admin_port is not None:
+            return str(self.caddy_admin_port)
+        if path == "api_port" and self.api_port is not None:
+            return str(self.api_port)
+        if path == "view_port" and self.view_port is not None:
+            return str(self.view_port)
+        if path == "caddy_admin_port" and self.caddy_admin_port is not None:
+            return str(self.caddy_admin_port)
+        if path == "caddy_http_port" and self.caddy_http_port is not None:
+            return str(self.caddy_http_port)
+        if path == "caddy_https_port" and self.caddy_https_port is not None:
+            return str(self.caddy_https_port)
+        if path == "supertokens_api_port" and self.supertokens_port is not None:
+            return str(self.supertokens_port)
+        
         return self._config.get(path)
     
     def _validate_domains(self, api_domain: str = None, view_domain: str = None):
diff --git a/cli/app/commands/install/development.py b/cli/app/commands/install/development.py
@@ -82,15 +82,15 @@ def __init__(
             config_file=config_file,
             repo=repo,
             branch=branch,
+            api_port=api_port,
+            view_port=view_port,
+            db_port=db_port,
+            redis_port=redis_port,
+            caddy_admin_port=caddy_admin_port,
+            caddy_http_port=caddy_http_port,
+            caddy_https_port=caddy_https_port,
+            supertokens_port=supertokens_port,
         )
-        self.api_port = api_port
-        self.view_port = view_port
-        self.db_port = db_port
-        self.redis_port = redis_port
-        self.caddy_admin_port = caddy_admin_port
-        self.caddy_http_port = caddy_http_port
-        self.caddy_https_port = caddy_https_port
-        self.supertokens_port = supertokens_port
 
         # safe fallback incase cwd is not accessible
         if install_path:
diff --git a/cli/app/commands/install/run.py b/cli/app/commands/install/run.py
@@ -19,7 +19,10 @@
 from app.utils.config import (
     API_ENV_FILE,
     API_PORT,
+    CADDY_ADMIN_PORT,
     CADDY_CONFIG_VOLUME,
+    CADDY_HTTP_PORT,
+    CADDY_HTTPS_PORT,
     DEFAULT_BRANCH,
     DEFAULT_COMPOSE_FILE,
     DEFAULT_PATH,
@@ -140,13 +143,22 @@ def _get_config(self, path: str):
             return str(self.db_port)
         if path == "services.redis.env.REDIS_PORT" and self.redis_port is not None:
             return str(self.redis_port)
-        if path == PROXY_PORT and self.caddy_admin_port is not None:
-            return str(self.caddy_admin_port)
-        if path == "services.caddy.env.CADDY_ADMIN_PORT" and self.caddy_admin_port is not None:
+        
+        # Handle PROXY_PORT (which is an alias for CADDY_ADMIN_PORT)
+        if path == PROXY_PORT:
+            if self.caddy_admin_port is not None:
+                return str(self.caddy_admin_port)
+            # Fall back to CADDY_ADMIN_PORT from config, default to 2019
+            try:
+                return str(_config.get(CADDY_ADMIN_PORT))
+            except (KeyError, ValueError):
+                return "2019"
+        
+        if path == CADDY_ADMIN_PORT and self.caddy_admin_port is not None:
             return str(self.caddy_admin_port)
-        if path == "services.caddy.env.CADDY_HTTP_PORT" and self.caddy_http_port is not None:
+        if path == CADDY_HTTP_PORT and self.caddy_http_port is not None:
             return str(self.caddy_http_port)
-        if path == "services.caddy.env.CADDY_HTTPS_PORT" and self.caddy_https_port is not None:
+        if path == CADDY_HTTPS_PORT and self.caddy_https_port is not None:
             return str(self.caddy_https_port)
         if path == SUPERTOKENS_API_PORT and self.supertokens_port is not None:
             return str(self.supertokens_port)
@@ -465,6 +477,12 @@ def _start_services(self):
 
     def _load_proxy(self):
         proxy_port = self._get_config(PROXY_PORT)
+        # Ensure proxy_port is an integer
+        try:
+            proxy_port = int(proxy_port)
+        except (ValueError, TypeError):
+            proxy_port = 2019  # Default fallback
+        
         full_source_path = self._get_config("full_source_path")
         caddy_json_config = os.path.join(full_source_path, "helpers", "caddy.json")
         config = LoadConfig(
diff --git a/cli/app/commands/proxy/base.py b/cli/app/commands/proxy/base.py
@@ -179,7 +179,7 @@ def load_config(self, config_file: str, port: int = proxy_port) -> tuple[bool, s
             error_msg = invalid_json_error.format(error=str(e))
             self.logger.debug(error_msg)
             return False, error_msg
-        except requests.exceptions.ConnectionError:
+        except requests.exceptions.ConnectionError as e:
             error_msg = caddy_connection_failed.format(error=str(e))
             self.logger.debug(error_msg)
             return False, error_msg
diff --git a/cli/app/commands/proxy/load.py b/cli/app/commands/proxy/load.py
@@ -104,6 +104,10 @@ def execute(self) -> LoadResult:
         if not self.config.config_file:
             return self._create_result(False, "Configuration file is required")
 
+        # In dry-run mode, just return success without actually connecting to Caddy
+        if self.config.dry_run:
+            return self._create_result(True, None)
+
         success, message = self.caddy_service.load_config_file(self.config.config_file, self.config.proxy_port)
         return self._create_result(success, None if success else message)
 
diff --git a/cli/app/commands/proxy/status.py b/cli/app/commands/proxy/status.py
@@ -83,6 +83,10 @@ def status(self) -> StatusResult:
         return self.execute()
 
     def execute(self) -> StatusResult:
+        # In dry-run mode, just return success without actually connecting to Caddy
+        if self.config.dry_run:
+            return self._create_result(True, None)
+
         success, message = self.caddy_service.get_status(self.config.proxy_port)
         return self._create_result(success, None if success else message)
 
diff --git a/cli/app/commands/proxy/stop.py b/cli/app/commands/proxy/stop.py
@@ -90,6 +90,10 @@ def stop(self) -> StopResult:
         return self.execute()
 
     def execute(self) -> StopResult:
+        # In dry-run mode, just return success without actually connecting to Caddy
+        if self.config.dry_run:
+            return self._create_result(True, None)
+
         success, message = self.caddy_service.stop_caddy(self.config.proxy_port)
         return self._create_result(success, None if success else message)
 
diff --git a/cli/app/utils/config.py b/cli/app/utils/config.py
@@ -98,14 +98,22 @@ def unflatten_config(self, flattened_config: dict) -> dict:
 
 def expand_env_placeholders(value: str) -> str:
     # Expand environment placeholders in the form ${ENV_VAR:-default}
+    # Supports nested expansions like ${VAR1:-${VAR2:-default}}
     pattern = re.compile(r"\$\{([A-Za-z_][A-Za-z0-9_]*)(:-([^}]*))?}")
+    max_iterations = 10  # Prevent infinite loops
+    iteration = 0
 
     def replacer(match):
         var_name = match.group(1)
         default = match.group(3) if match.group(2) else ""
         return os.environ.get(var_name, default)
 
-    return pattern.sub(replacer, value)
+    # Keep expanding until no more placeholders are found or max iterations reached
+    while pattern.search(value) and iteration < max_iterations:
+        value = pattern.sub(replacer, value)
+        iteration += 1
+
+    return value
 
 
 VIEW_ENV_FILE = "services.view.env.VIEW_ENV_FILE"
@@ -130,5 +138,8 @@ def replacer(match):
 VIEW_PORT = "services.view.env.NEXT_PUBLIC_PORT"
 API_PORT = "services.api.env.PORT"
 CADDY_CONFIG_VOLUME = "services.caddy.env.CADDY_CONFIG_VOLUME"
+CADDY_ADMIN_PORT = "services.caddy.env.CADDY_ADMIN_PORT"
+CADDY_HTTP_PORT = "services.caddy.env.CADDY_HTTP_PORT"
+CADDY_HTTPS_PORT = "services.caddy.env.CADDY_HTTPS_PORT"
 DOCKER_PORT = "services.api.env.DOCKER_PORT"
 SUPERTOKENS_API_PORT = "services.api.env.SUPERTOKENS_API_PORT"
diff --git a/cli/pyproject.toml b/cli/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nixopus"
-version = "0.1.25"
+version = "0.1.26"
 description = "A CLI for Nixopus"
 authors = ["Nixopus <raghavyuva@gmail.com>"]
 readme = "README.md"
diff --git a/cli/tests/utils/test_config.py b/cli/tests/utils/test_config.py
@@ -360,6 +360,42 @@ def test_expand_env_placeholders_real_world_example(self):
         result = expand_env_placeholders("${API_PORT:-8443} and ${DB_NAME:-postgres}")
         self.assertEqual(result, "9000 and production_db")
 
+    def test_expand_env_placeholders_nested_single_level(self):
+        # Test nested expansion: ${VAR1:-${VAR2:-default}}
+        # Neither VAR1 nor VAR2 is set, should use final default
+        result = expand_env_placeholders("${VAR1:-${VAR2:-2019}}")
+        self.assertEqual(result, "2019")
+
+    def test_expand_env_placeholders_nested_first_var_set(self):
+        # First variable is set, should use it
+        os.environ["PROXY_PORT"] = "3000"
+        result = expand_env_placeholders("${PROXY_PORT:-${CADDY_ADMIN_PORT:-2019}}")
+        self.assertEqual(result, "3000")
+
+    def test_expand_env_placeholders_nested_second_var_set(self):
+        # First variable not set, second variable is set
+        os.environ["CADDY_ADMIN_PORT"] = "2020"
+        result = expand_env_placeholders("${PROXY_PORT:-${CADDY_ADMIN_PORT:-2019}}")
+        self.assertEqual(result, "2020")
+
+    def test_expand_env_placeholders_nested_both_vars_set(self):
+        # Both variables set, should use first one (higher priority)
+        os.environ["PROXY_PORT"] = "3000"
+        os.environ["CADDY_ADMIN_PORT"] = "2020"
+        result = expand_env_placeholders("${PROXY_PORT:-${CADDY_ADMIN_PORT:-2019}}")
+        self.assertEqual(result, "3000")
+
+    def test_expand_env_placeholders_nested_multiple_levels(self):
+        # Test triple nesting
+        result = expand_env_placeholders("${VAR1:-${VAR2:-${VAR3:-final}}}")
+        self.assertEqual(result, "final")
+
+    def test_expand_env_placeholders_nested_in_url(self):
+        # Test nested expansion in a URL context (real-world scenario)
+        os.environ["CADDY_ADMIN_PORT"] = "2020"
+        result = expand_env_placeholders("http://localhost:${PROXY_PORT:-${CADDY_ADMIN_PORT:-2019}}")
+        self.assertEqual(result, "http://localhost:2020")
+
 
 if __name__ == "__main__":
     unittest.main()
