chore(cli): increase timeout in local system (#533)

Author: zhravan

CHANGELOG.md

@@ -729,4 +729,3 @@
 * **vulnerability:** fixes CVE-2024-21538 (HIGH) and CVE-2025-30204 (HIGH) ([c25e0c7](https://github.com/raghavyuva/nixopus/commit/c25e0c7fa9ad742a25f95ae7e2a780a881cad573))
 
 
-

cli/app/commands/install/command.py

@@ -102,7 +102,7 @@ def main_install_callback(value: bool):
 def development(
     path: str = typer.Option(None, "--path", "-p", help="Installation directory (defaults to current directory)"),
     verbose: bool = typer.Option(False, "--verbose", "-v", help="Show more details while installing"),
-    timeout: int = typer.Option(300, "--timeout", "-t", help="How long to wait for each step (in seconds)"),
+    timeout: int = typer.Option(1800, "--timeout", "-t", help="How long to wait for each step (in seconds)"),
     force: bool = typer.Option(False, "--force", "-f", help="Replace files if they already exist"),
     dry_run: bool = typer.Option(False, "--dry-run", "-d", help="See what would happen, but don't make changes"),
     config_file: str = typer.Option(

cli/app/commands/install/development.py

@@ -76,7 +76,20 @@ def __init__(
             branch=branch,
         )
 
-        self.install_path = os.path.abspath(os.path.expanduser(install_path)) if install_path else os.getcwd()
+        # safe fallback incase cwd is not accessible
+        if install_path:
+            self.install_path = os.path.abspath(os.path.expanduser(install_path))
+        else:
+            try:
+                self.install_path = os.getcwd()
+            except (FileNotFoundError, OSError) as e:
+                # cwd is not accessible
+                # Fall back to user's home directory
+                self.install_path = os.path.expanduser("~/nixopus-dev")
+                os.makedirs(self.install_path, exist_ok=True)
+                if logger:
+                    logger.warning(f"Current directory is not accessible: {e}")
+                    logger.info(f"Using default installation path: {self.install_path}")
 
         # Check platform and WSL requirement for Windows
         self._check_platform_support()
@@ -182,7 +195,7 @@ def _get_config(self, key: str, user_config=None, defaults=None):
         if key == "api_env_file_path":
             return os.path.join(self.install_path, "api", ".env")
         if key == "view_env_file_path":
-            return os.path.join(self.install_path, "view", ".env.local")
+            return os.path.join(self.install_path, "view", ".env")
         if key == "ssh_key_path":
             return os.path.expanduser("~/.ssh/id_rsa_nixopus")
 
@@ -322,16 +335,28 @@ def _create_env_files(self):
         api_env_file = self._get_config("api_env_file_path")
         view_env_file = self._get_config("view_env_file_path")
 
+        if self.dry_run:
+            self.logger.info(f"[DRY RUN] Would create environment files:")
+            self.logger.info(f"  - API:  {api_env_file}")
+            self.logger.info(f"  - View: {view_env_file}")
+            return
+
         FileManager.create_directory(FileManager.get_directory_path(api_env_file), logger=self.logger)
         FileManager.create_directory(FileManager.get_directory_path(view_env_file), logger=self.logger)
 
+        # Get combined env file path
+        full_source_path = self._get_config("full_source_path")
+        combined_env_file = os.path.join(full_source_path, ".env")
+        FileManager.create_directory(FileManager.get_directory_path(combined_env_file), logger=self.logger)
+
         services = [
             ("api", "services.api.env", api_env_file),
             ("view", "services.view.env", view_env_file),
         ]
 
         env_manager = BaseEnvironmentManager(self.logger)
 
+        # Create individual service env files
         for service_name, service_key, env_file in services:
             env_values = self._config.get_service_env_values(service_key)
             updated_env_values = self._update_environment_variables(env_values)
@@ -343,6 +368,24 @@ def _create_env_files(self):
                 raise Exception(f"{env_file_permissions_failed} {service_name}: {file_perm_error}")
             self.logger.debug(created_env_file.format(service_name=service_name, env_file=env_file))
 
+        # Create combined env file with both API and view variables (for docker-compose)
+        api_env_values = self._config.get_service_env_values("services.api.env")
+        view_env_values = self._config.get_service_env_values("services.view.env")
+
+        combined_env_values = {}
+        combined_env_values.update(self._update_environment_variables(api_env_values))
+        combined_env_values.update(self._update_environment_variables(view_env_values))
+
+        success, error = env_manager.write_env_file(combined_env_file, combined_env_values)
+        if not success:
+            raise Exception(f"{env_file_creation_failed} combined: {error}")
+
+        file_perm_success, file_perm_error = FileManager.set_permissions(combined_env_file, 0o644)
+        if not file_perm_success:
+            raise Exception(f"{env_file_permissions_failed} combined: {file_perm_error}")
+
+        self.logger.debug(created_env_file.format(service_name="combined", env_file=combined_env_file))
+
     def _update_environment_variables(self, env_values: dict) -> dict:
         """Update environment variables with development-specific values"""
         updated_env = env_values.copy()
@@ -648,7 +691,7 @@ def _show_success_message(self):
             self.logger.info(" Configuration Files:")
             self.logger.info(f"  • Config Dir:  {os.path.join(self.install_path, 'nixopus-dev')}")
             self.logger.info(f"  • Backend:     {os.path.join(self.install_path, 'api', '.env')}")
-            self.logger.info(f"  • Frontend:    {os.path.join(self.install_path, 'view', '.env.local')}")
+            self.logger.info(f"  • Frontend:    {os.path.join(self.install_path, 'view', '.env')}")
             self.logger.info(f"  • Caddy:       {os.path.join(self.install_path, 'helpers', 'caddy.json')}")
             self.logger.info("  • SSH Key:     ~/.ssh/id_rsa_nixopus")
             self.logger.info("")

cli/app/commands/service/up.py

@@ -89,6 +89,15 @@ def up(self) -> UpResult:
     def execute(self) -> UpResult:
         self.logger.debug(f"Starting services: {self.config.name}")
 
+        # Handle dry-run mode
+        if self.config.dry_run:
+            self.logger.debug("[DRY RUN] Would start services")
+            return self._create_result(
+                success=True,
+                error=None,
+                docker_output="[DRY RUN] Services would be started"
+            )
+
         success, docker_output = self.docker_service.start_services(
             self.config.name, self.config.detach, self.config.env_file, self.config.compose_file
         )

cli/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nixopus"
-version = "0.1.17"
+version = "0.1.18"
 description = "A CLI for Nixopus"
 authors = ["Nixopus <[email protected]>"]
 readme = "README.md"