proxy2vpn 0.2.0__tar.gz → 0.3.1__tar.gz

{proxy2vpn-0.2.0/src/proxy2vpn.egg-info → proxy2vpn-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: proxy2vpn
-Version: 0.2.0
+Version: 0.3.1
 Summary: Proxy2VPN Python utilities
 Author-email: Serhii Khalymon <serhii.khalymon@pm.me>
 License-Expression: MIT
@@ -25,7 +25,7 @@ Python command-line interface for managing multiple VPN containers with Docker.
 ## Features
 - Manage VPN credentials as reusable profiles
 - Create and control VPN services
-- Bulk start/stop operations
+- Multi-service control with `--all` flags
 - Query and validate provider server locations
 - Apply predefined presets for common setups
 
@@ -61,7 +61,7 @@ proxy2vpn --help
 ## Quick Start
 1. Initialize the compose file:
    ```bash
-   proxy2vpn init
+   proxy2vpn system init
    ```
 
 2. Create a profile file with your VPN credentials:
@@ -87,13 +87,15 @@ proxy2vpn --help
 5. View status and test connectivity:
    ```bash
    proxy2vpn vpn list
-   proxy2vpn test vpn1
+   proxy2vpn vpn test vpn1
    ```
 
 ## Command overview
 
-### Initialization
-- `proxy2vpn init [--force]`
+### System operations
+- `proxy2vpn system init [--force]`
+- `proxy2vpn system validate`
+- `proxy2vpn system diagnose [--lines N] [--all] [--verbose] [--json]`
 
 ### Profiles
 - `proxy2vpn profile create NAME ENV_FILE`
@@ -102,18 +104,13 @@ proxy2vpn --help
 
 ### VPN services
 - `proxy2vpn vpn create NAME PROFILE [--port PORT] [--provider PROVIDER] [--location LOCATION]`
-- `proxy2vpn vpn list`
-- `proxy2vpn vpn start NAME`
-- `proxy2vpn vpn stop NAME`
-- `proxy2vpn vpn restart NAME`
+- `proxy2vpn vpn list [--diagnose] [--ips-only]`
+- `proxy2vpn vpn start [NAME | --all]`
+- `proxy2vpn vpn stop [NAME | --all]`
+- `proxy2vpn vpn restart [NAME | --all]`
 - `proxy2vpn vpn logs NAME [--lines N] [--follow]`
-- `proxy2vpn vpn delete NAME`
-
-### Bulk operations
-- `proxy2vpn bulk up`
-- `proxy2vpn bulk down`
-- `proxy2vpn bulk status`
-- `proxy2vpn bulk ips`
+- `proxy2vpn vpn delete [NAME | --all]`
+- `proxy2vpn vpn test NAME`
 
 ### Server database
 - `proxy2vpn servers update`
@@ -126,9 +123,6 @@ proxy2vpn --help
 - `proxy2vpn preset list`
 - `proxy2vpn preset apply PRESET SERVICE [--port PORT]`
 
-### Testing
-- `proxy2vpn test SERVICE` – verify that a proxy container is reachable
-
 ## Development
 
 ### Setup

{proxy2vpn-0.2.0 → proxy2vpn-0.3.1}/README.md

@@ -5,7 +5,7 @@ Python command-line interface for managing multiple VPN containers with Docker.
 ## Features
 - Manage VPN credentials as reusable profiles
 - Create and control VPN services
-- Bulk start/stop operations
+- Multi-service control with `--all` flags
 - Query and validate provider server locations
 - Apply predefined presets for common setups
 
@@ -41,7 +41,7 @@ proxy2vpn --help
 ## Quick Start
 1. Initialize the compose file:
    ```bash
-   proxy2vpn init
+   proxy2vpn system init
    ```
 
 2. Create a profile file with your VPN credentials:
@@ -67,13 +67,15 @@ proxy2vpn --help
 5. View status and test connectivity:
    ```bash
    proxy2vpn vpn list
-   proxy2vpn test vpn1
+   proxy2vpn vpn test vpn1
    ```
 
 ## Command overview
 
-### Initialization
-- `proxy2vpn init [--force]`
+### System operations
+- `proxy2vpn system init [--force]`
+- `proxy2vpn system validate`
+- `proxy2vpn system diagnose [--lines N] [--all] [--verbose] [--json]`
 
 ### Profiles
 - `proxy2vpn profile create NAME ENV_FILE`
@@ -82,18 +84,13 @@ proxy2vpn --help
 
 ### VPN services
 - `proxy2vpn vpn create NAME PROFILE [--port PORT] [--provider PROVIDER] [--location LOCATION]`
-- `proxy2vpn vpn list`
-- `proxy2vpn vpn start NAME`
-- `proxy2vpn vpn stop NAME`
-- `proxy2vpn vpn restart NAME`
+- `proxy2vpn vpn list [--diagnose] [--ips-only]`
+- `proxy2vpn vpn start [NAME | --all]`
+- `proxy2vpn vpn stop [NAME | --all]`
+- `proxy2vpn vpn restart [NAME | --all]`
 - `proxy2vpn vpn logs NAME [--lines N] [--follow]`
-- `proxy2vpn vpn delete NAME`
-
-### Bulk operations
-- `proxy2vpn bulk up`
-- `proxy2vpn bulk down`
-- `proxy2vpn bulk status`
-- `proxy2vpn bulk ips`
+- `proxy2vpn vpn delete [NAME | --all]`
+- `proxy2vpn vpn test NAME`
 
 ### Server database
 - `proxy2vpn servers update`
@@ -106,9 +103,6 @@ proxy2vpn --help
 - `proxy2vpn preset list`
 - `proxy2vpn preset apply PRESET SERVICE [--port PORT]`
 
-### Testing
-- `proxy2vpn test SERVICE` – verify that a proxy container is reachable
-
 ## Development
 
 ### Setup

{proxy2vpn-0.2.0 → proxy2vpn-0.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "proxy2vpn"
-version = "0.2.0"
+version = "0.3.1"
 description = "Proxy2VPN Python utilities"
 authors = [{ name = "Serhii Khalymon", email = "serhii.khalymon@pm.me" }]
 readme = "README.md"

{proxy2vpn-0.2.0 → proxy2vpn-0.3.1}/src/proxy2vpn/cli.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from pathlib import Path
+import json
 
 import typer
 from .typer_ext import HelpfulTyper
@@ -19,35 +20,54 @@ app = HelpfulTyper(help="proxy2vpn command line interface")
 profile_app = HelpfulTyper(help="Manage VPN profiles")
 vpn_app = HelpfulTyper(help="Manage VPN services")
 server_app = HelpfulTyper(help="Manage cached server lists")
+system_app = HelpfulTyper(help="System level operations")
 bulk_app = HelpfulTyper(help="Bulk container operations")
 preset_app = HelpfulTyper(help="Manage presets")
 
 app.add_typer(profile_app, name="profile")
 app.add_typer(vpn_app, name="vpn")
 app.add_typer(server_app, name="servers")
-app.add_typer(bulk_app, name="bulk")
+app.add_typer(system_app, name="system")
 app.add_typer(preset_app, name="preset")
+app.add_typer(bulk_app, name="bulk", hidden=True)
 
 
-@app.callback()
+@app.callback(invoke_without_command=True)
 def main(
     ctx: typer.Context,
     compose_file: Path = typer.Option(
         config.COMPOSE_FILE, "--compose-file", "-f", help="Path to compose file"
     ),
+    version: bool = typer.Option(
+        False,
+        "--version",
+        "-V",
+        help="Show version and exit",
+        is_eager=True,
+    ),
 ):
     """Store global options in context."""
+    if version:
+        from . import __version__
+
+        typer.echo(__version__)
+        raise typer.Exit()
+
     ctx.obj = ctx.obj or {}
     ctx.obj["compose_file"] = compose_file
 
+    if ctx.invoked_subcommand is None:
+        typer.echo(ctx.get_help())
+        raise typer.Exit()
+
 
 # ---------------------------------------------------------------------------
-# Initialization command
+# System commands
 # ---------------------------------------------------------------------------
 
 
-@app.command("init")
-def init_command(
+@system_app.command("init")
+def system_init(
     ctx: typer.Context,
     force: bool = typer.Option(
         False, "--force", "-f", help="Overwrite existing compose file if it exists"
@@ -147,44 +167,96 @@ def vpn_create(
 
 
 @vpn_app.command("list")
-def vpn_list(ctx: typer.Context):
+def vpn_list(
+    ctx: typer.Context,
+    diagnose: bool = typer.Option(
+        False, "--diagnose", help="Include diagnostic health scores"
+    ),
+    ips_only: bool = typer.Option(
+        False, "--ips-only", help="Show only container IP addresses"
+    ),
+):
     """List VPN services with their status and IP addresses."""
 
     compose_file: Path = ctx.obj.get("compose_file", config.COMPOSE_FILE)
     manager = ComposeManager(compose_file)
-    from .docker_ops import get_vpn_containers, get_container_ip
+    from .docker_ops import (
+        get_vpn_containers,
+        get_container_ip,
+        analyze_container_logs,
+    )
+    from .diagnostics import DiagnosticAnalyzer
+
+    if ips_only:
+        containers = get_vpn_containers(all=False)
+        for container in containers:
+            ip = get_container_ip(container)
+            typer.echo(f"{container.name}: {ip}")
+        return
 
     services = manager.list_services()
     containers = {c.name: c for c in get_vpn_containers(all=True)}
+    analyzer = DiagnosticAnalyzer() if diagnose else None
 
-    typer.echo(f"{'NAME':<15} {'PORT':<8} {'PROFILE':<12} {'STATUS':<10} {'IP':<15}")
-    typer.echo("-" * 65)
+    header = f"{'NAME':<15} {'PORT':<8} {'PROFILE':<12} {'STATUS':<10} {'IP':<15}"
+    if diagnose:
+        header += f" {'HEALTH':<7}"
+    typer.echo(header)
+    typer.echo("-" * len(header))
     for svc in services:
         container = containers.get(svc.name)
         if container:
             status = container.status
             ip = get_container_ip(container) if status == "running" else "N/A"
+            health = "N/A"
+            if diagnose:
+                results = analyze_container_logs(container.name, analyzer=analyzer)
+                health = str(analyzer.health_score(results))
         else:
             status = "not created"
             ip = "N/A"
-        typer.echo(
-            f"{svc.name:<15} {svc.port:<8} {svc.profile:<12} {status:<10} {ip:<15}"
-        )
+            health = "N/A"
+        line = f"{svc.name:<15} {svc.port:<8} {svc.profile:<12} {status:<10} {ip:<15}"
+        if diagnose:
+            line += f" {health:<7}"
+        typer.echo(line)
 
 
 @vpn_app.command("start")
-def vpn_start(ctx: typer.Context, name: str):
-    """Start the container for a VPN service."""
+def vpn_start(
+    ctx: typer.Context,
+    name: str | None = typer.Argument(None),
+    all: bool = typer.Option(False, "--all", help="Start all VPN services"),
+):
+    """Start one or all VPN containers."""
 
     compose_file: Path = ctx.obj.get("compose_file", config.COMPOSE_FILE)
     manager = ComposeManager(compose_file)
+    if all and name is not None:
+        typer.echo("Cannot specify NAME when using --all", err=True)
+        raise typer.Exit(1)
+    if all:
+        from .docker_ops import start_all_vpn_containers
+
+        results = start_all_vpn_containers()
+        for svc_name, started in results:
+            if started:
+                typer.echo(f"\u2713 Started {svc_name}")
+            else:
+                typer.echo(f"\u2192 {svc_name} already running")
+        return
+
+    if name is None:
+        typer.echo("Specify a service NAME or use --all", err=True)
+        raise typer.Exit(1)
     try:
         manager.get_service(name)
     except KeyError:
         typer.echo(f"Service '{name}' not found.", err=True)
         raise typer.Exit(1)
 
-    from .docker_ops import start_container
+    from .docker_ops import start_container, analyze_container_logs
+    from .diagnostics import DiagnosticAnalyzer
 
     try:
         start_container(name)
@@ -194,22 +266,47 @@ def vpn_start(ctx: typer.Context, name: str):
         raise typer.Exit(1)
     except APIError as exc:
         typer.echo(f"Failed to start '{name}': {exc.explanation}", err=True)
+        analyzer = DiagnosticAnalyzer()
+        results = analyze_container_logs(name, analyzer=analyzer)
+        if results:
+            typer.echo("Diagnostic hints:", err=True)
+            for res in results:
+                typer.echo(f" - {res.message}: {res.recommendation}", err=True)
         raise typer.Exit(1)
 
 
 @vpn_app.command("stop")
-def vpn_stop(ctx: typer.Context, name: str):
-    """Stop the container for a VPN service."""
+def vpn_stop(
+    ctx: typer.Context,
+    name: str | None = typer.Argument(None),
+    all: bool = typer.Option(False, "--all", help="Stop all VPN services"),
+):
+    """Stop one or all VPN containers."""
 
     compose_file: Path = ctx.obj.get("compose_file", config.COMPOSE_FILE)
     manager = ComposeManager(compose_file)
+    if all and name is not None:
+        typer.echo("Cannot specify NAME when using --all", err=True)
+        raise typer.Exit(1)
+    if all:
+        from .docker_ops import stop_all_vpn_containers
+
+        results = stop_all_vpn_containers()
+        for svc_name in results:
+            typer.echo(f"\u2713 Stopped {svc_name}")
+        return
+
+    if name is None:
+        typer.echo("Specify a service NAME or use --all", err=True)
+        raise typer.Exit(1)
     try:
         manager.get_service(name)
     except KeyError:
         typer.echo(f"Service '{name}' not found.", err=True)
         raise typer.Exit(1)
 
-    from .docker_ops import stop_container
+    from .docker_ops import stop_container, analyze_container_logs
+    from .diagnostics import DiagnosticAnalyzer
 
     try:
         stop_container(name)
@@ -219,22 +316,55 @@ def vpn_stop(ctx: typer.Context, name: str):
         raise typer.Exit(1)
     except APIError as exc:
         typer.echo(f"Failed to stop '{name}': {exc.explanation}", err=True)
+        analyzer = DiagnosticAnalyzer()
+        results = analyze_container_logs(name, analyzer=analyzer)
+        if results:
+            typer.echo("Diagnostic hints:", err=True)
+            for res in results:
+                typer.echo(f" - {res.message}: {res.recommendation}", err=True)
         raise typer.Exit(1)
 
 
 @vpn_app.command("restart")
-def vpn_restart(ctx: typer.Context, name: str):
-    """Restart a VPN container."""
+def vpn_restart(
+    ctx: typer.Context,
+    name: str | None = typer.Argument(None),
+    all: bool = typer.Option(False, "--all", help="Restart all VPN services"),
+):
+    """Restart one or all VPN containers."""
 
     compose_file: Path = ctx.obj.get("compose_file", config.COMPOSE_FILE)
     manager = ComposeManager(compose_file)
+    if all and name is not None:
+        typer.echo("Cannot specify NAME when using --all", err=True)
+        raise typer.Exit(1)
+    if all:
+        from .docker_ops import get_vpn_containers, restart_container
+
+        containers = get_vpn_containers(all=True)
+        for container in containers:
+            try:
+                restart_container(container.name)
+                typer.echo(f"\u2713 Restarted {container.name}")
+            except NotFound:
+                typer.echo(f"Container '{container.name}' does not exist.", err=True)
+            except APIError as exc:
+                typer.echo(
+                    f"Failed to restart '{container.name}': {exc.explanation}", err=True
+                )
+        return
+
+    if name is None:
+        typer.echo("Specify a service NAME or use --all", err=True)
+        raise typer.Exit(1)
     try:
         manager.get_service(name)
     except KeyError:
         typer.echo(f"Service '{name}' not found.", err=True)
         raise typer.Exit(1)
 
-    from .docker_ops import restart_container
+    from .docker_ops import restart_container, analyze_container_logs
+    from .diagnostics import DiagnosticAnalyzer
 
     try:
         restart_container(name)
@@ -244,6 +374,12 @@ def vpn_restart(ctx: typer.Context, name: str):
         raise typer.Exit(1)
     except APIError as exc:
         typer.echo(f"Failed to restart '{name}': {exc.explanation}", err=True)
+        analyzer = DiagnosticAnalyzer()
+        results = analyze_container_logs(name, analyzer=analyzer)
+        if results:
+            typer.echo("Diagnostic hints:", err=True)
+            for res in results:
+                typer.echo(f" - {res.message}: {res.recommendation}", err=True)
         raise typer.Exit(1)
 
 
@@ -277,13 +413,39 @@ def vpn_logs(
 @vpn_app.command("delete")
 def vpn_delete(
     ctx: typer.Context,
-    name: str,
+    name: str | None = typer.Argument(None),
+    all: bool = typer.Option(False, "--all", help="Delete all VPN services"),
     force: bool = typer.Option(False, "--force", "-f", help="Do not prompt"),
 ):
-    """Delete a VPN service and remove its container."""
+    """Delete one or all VPN services and remove their containers."""
 
     compose_file: Path = ctx.obj.get("compose_file", config.COMPOSE_FILE)
     manager = ComposeManager(compose_file)
+    from .docker_ops import remove_container, stop_container
+
+    if all and name is not None:
+        typer.echo("Cannot specify NAME when using --all", err=True)
+        raise typer.Exit(1)
+    if all:
+        services = manager.list_services()
+        if not force and not typer.confirm("Delete all services?"):
+            raise typer.Exit()
+        for svc in services:
+            try:
+                stop_container(svc.name)
+            except NotFound:
+                pass
+            try:
+                remove_container(svc.name)
+            except NotFound:
+                pass
+            manager.remove_service(svc.name)
+            typer.echo(f"Service '{svc.name}' deleted.")
+        return
+
+    if name is None:
+        typer.echo("Specify a service NAME or use --all", err=True)
+        raise typer.Exit(1)
     try:
         manager.get_service(name)
     except KeyError:
@@ -293,8 +455,6 @@ def vpn_delete(
     if not force and not typer.confirm(f"Delete service '{name}'?"):
         raise typer.Exit()
 
-    from .docker_ops import remove_container, stop_container
-
     try:
         stop_container(name)
     except NotFound:
@@ -308,6 +468,27 @@ def vpn_delete(
     typer.echo(f"Service '{name}' deleted.")
 
 
+@vpn_app.command("test")
+def vpn_test(ctx: typer.Context, name: str):
+    """Test that a VPN service proxy is working."""
+
+    compose_file: Path = ctx.obj.get("compose_file", config.COMPOSE_FILE)
+    manager = ComposeManager(compose_file)
+    try:
+        manager.get_service(name)
+    except KeyError:
+        typer.echo(f"Service '{name}' not found.", err=True)
+        raise typer.Exit(1)
+
+    from .docker_ops import test_vpn_connection
+
+    if test_vpn_connection(name):
+        typer.echo("VPN connection is active.")
+    else:
+        typer.echo("VPN connection failed.", err=True)
+        raise typer.Exit(1)
+
+
 # ---------------------------------------------------------------------------
 # Bulk container commands
 # ---------------------------------------------------------------------------
@@ -317,6 +498,7 @@ def vpn_delete(
 def bulk_up():
     """Start all VPN containers."""
 
+    typer.echo("Deprecated: use 'vpn start --all' instead.", err=True)
     from .docker_ops import start_all_vpn_containers
 
     results = start_all_vpn_containers()
@@ -331,6 +513,7 @@ def bulk_up():
 def bulk_down():
     """Stop all running VPN containers."""
 
+    typer.echo("Deprecated: use 'vpn stop --all' instead.", err=True)
     from .docker_ops import stop_all_vpn_containers
 
     results = stop_all_vpn_containers()
@@ -339,30 +522,19 @@ def bulk_down():
 
 
 @bulk_app.command("status")
-def bulk_status():
+def bulk_status(ctx: typer.Context):
     """Show status and IP address for VPN containers."""
 
-    from .docker_ops import get_vpn_containers, get_container_ip
-
-    containers = get_vpn_containers(all=True)
-    typer.echo(f"{'NAME':<15} {'STATUS':<10} {'PORT':<8} {'IP':<15}")
-    typer.echo("-" * 50)
-    for container in containers:
-        port = container.labels.get("vpn.port", "N/A")
-        ip = get_container_ip(container) if container.status == "running" else "N/A"
-        typer.echo(f"{container.name:<15} {container.status:<10} {port:<8} {ip:<15}")
+    typer.echo("Deprecated: use 'vpn list' instead.", err=True)
+    vpn_list(ctx)
 
 
 @bulk_app.command("ips")
-def bulk_ips():
+def bulk_ips(ctx: typer.Context):
     """Show IP addresses of running VPN containers."""
 
-    from .docker_ops import get_vpn_containers, get_container_ip
-
-    containers = get_vpn_containers(all=False)
-    for container in containers:
-        ip = get_container_ip(container)
-        typer.echo(f"{container.name}: {ip}")
+    typer.echo("Deprecated: use 'vpn list --ips-only' instead.", err=True)
+    vpn_list(ctx, ips_only=True)
 
 
 # ---------------------------------------------------------------------------
@@ -454,8 +626,8 @@ def preset_apply(
     typer.echo(f"Service '{service}' created from preset '{preset}' on port {port}.")
 
 
-@app.command("validate")
-def validate(compose_file: Path = typer.Option(config.COMPOSE_FILE)):
+@system_app.command("validate")
+def system_validate(compose_file: Path = typer.Option(config.COMPOSE_FILE)):
     """Validate that the compose file is well formed."""
 
     errors = validate_compose(compose_file)
@@ -466,17 +638,60 @@ def validate(compose_file: Path = typer.Option(config.COMPOSE_FILE)):
     typer.echo("compose file is valid.")
 
 
-@app.command("test")
-def test(service: str):
-    """Test that a VPN service proxy is working."""
+@system_app.command("diagnose")
+def system_diagnose(
+    lines: int = typer.Option(
+        100, "--lines", "-n", help="Number of log lines to analyze"
+    ),
+    all_containers: bool = typer.Option(
+        False, "--all", help="Check all containers, not only problematic ones"
+    ),
+    verbose: bool = typer.Option(False, "--verbose", "-v", help="Verbose output"),
+    json_output: bool = typer.Option(False, "--json", help="Output JSON"),
+):
+    """Diagnose VPN containers and report health."""
 
-    from .docker_ops import test_vpn_connection
+    from .docker_ops import (
+        get_problematic_containers,
+        get_vpn_containers,
+        get_container_diagnostics,
+        analyze_container_logs,
+    )
+    from .diagnostics import DiagnosticAnalyzer
 
-    if test_vpn_connection(service):
-        typer.echo("VPN connection is active.")
+    analyzer = DiagnosticAnalyzer()
+    containers = (
+        get_vpn_containers(all=True)
+        if all_containers
+        else get_problematic_containers(all=True)
+    )
+
+    summary: list[dict[str, object]] = []
+    for container in containers:
+        diag = get_container_diagnostics(container)
+        results = analyze_container_logs(container.name, lines=lines, analyzer=analyzer)
+        score = analyzer.health_score(results)
+        entry = {
+            "container": container.name,
+            "status": diag["status"],
+            "health": score,
+            "issues": [r.message for r in results],
+            "recommendations": [r.recommendation for r in results],
+        }
+        summary.append(entry)
+
+    if json_output:
+        typer.echo(json.dumps(summary, indent=2))
     else:
-        typer.echo("VPN connection failed.", err=True)
-        raise typer.Exit(1)
+        if not summary:
+            typer.echo("No containers to diagnose.")
+        for entry in summary:
+            typer.echo(
+                f"{entry['container']}: status={entry['status']} health={entry['health']}"
+            )
+            if verbose or entry["issues"]:
+                for issue, rec in zip(entry["issues"], entry["recommendations"]):
+                    typer.echo(f"  - {issue}: {rec}")
 
 
 if __name__ == "__main__":

proxy2vpn-0.3.1/src/proxy2vpn/diagnostics.py

@@ -0,0 +1,100 @@
+"""Diagnostic analysis for proxy2vpn containers."""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+import re
+from typing import Iterable, List
+
+
+@dataclass
+class DiagnosticResult:
+    """Result of analyzing a log line."""
+
+    pattern: str
+    severity: str
+    message: str
+    recommendation: str
+
+
+class DiagnosticAnalyzer:
+    """Analyze container logs for common error patterns."""
+
+    def __init__(self) -> None:
+        self.patterns: list[tuple[re.Pattern[str], str, str, str]] = [
+            (
+                re.compile(r"authentication (failed|failure)", re.I),
+                "critical",
+                "Authentication failure",
+                "Check credentials and provider configuration.",
+            ),
+            (
+                re.compile(r"certificate|ssl", re.I),
+                "critical",
+                "Certificate or SSL issue",
+                "Verify certificates and TLS settings.",
+            ),
+            (
+                re.compile(
+                    r"(connection (refused|timed out|unreachable))|(network is unreachable)",
+                    re.I,
+                ),
+                "critical",
+                "Network connectivity issue",
+                "Ensure network access and proxy settings.",
+            ),
+            (
+                re.compile(r"rate limit", re.I),
+                "warning",
+                "Rate limiting detected",
+                "Reduce request rate or check provider limits.",
+            ),
+            (
+                re.compile(r"(dns (resolution|lookup) failed)|no such host", re.I),
+                "critical",
+                "DNS resolution failure",
+                "Check DNS configuration or server availability.",
+            ),
+            (
+                re.compile(r"openvpn", re.I),
+                "info",
+                "OpenVPN error",
+                "Review OpenVPN configuration for issues.",
+            ),
+            (
+                re.compile(r"wireguard", re.I),
+                "info",
+                "WireGuard error",
+                "Review WireGuard configuration for issues.",
+            ),
+        ]
+
+    def analyze(self, log_lines: Iterable[str]) -> List[DiagnosticResult]:
+        """Return diagnostic results for matching log lines."""
+
+        results: List[DiagnosticResult] = []
+        for line in log_lines:
+            for pattern, severity, message, recommendation in self.patterns:
+                if pattern.search(line):
+                    results.append(
+                        DiagnosticResult(
+                            pattern=pattern.pattern,
+                            severity=severity,
+                            message=message,
+                            recommendation=recommendation,
+                        )
+                    )
+        return results
+
+    def health_score(self, results: Iterable[DiagnosticResult]) -> int:
+        """Return a simple health score based on diagnostic results."""
+
+        score = 100
+        for res in results:
+            if res.severity == "critical":
+                score -= 40
+            elif res.severity == "warning":
+                score -= 20
+            else:
+                score -= 10
+        return max(score, 0)

{proxy2vpn-0.2.0 → proxy2vpn-0.3.1}/src/proxy2vpn/docker_ops.py

@@ -4,6 +4,8 @@ from __future__ import annotations
 
 from typing import Iterable, Iterator
 
+from .diagnostics import DiagnosticAnalyzer, DiagnosticResult
+
 import docker
 import requests
 from docker.models.containers import Container
@@ -89,6 +91,49 @@ def get_vpn_containers(all: bool = False) -> list[Container]:
     return client.containers.list(all=all, filters={"label": "vpn.type=vpn"})
 
 
+def get_problematic_containers(all: bool = False) -> list[Container]:
+    """Return containers that are not running properly."""
+
+    containers = get_vpn_containers(all=all)
+    problematic: list[Container] = []
+    for container in containers:
+        container.reload()
+        state = container.attrs.get("State", {})
+        if (
+            container.status != "running"
+            or state.get("ExitCode", 0) != 0
+            or state.get("RestartCount", 0) > 0
+        ):
+            problematic.append(container)
+    return problematic
+
+
+def get_container_diagnostics(container: Container) -> dict:
+    """Return diagnostic information for a container."""
+
+    container.reload()
+    state = container.attrs.get("State", {})
+    return {
+        "name": container.name,
+        "status": container.status,
+        "exit_code": state.get("ExitCode"),
+        "restart_count": state.get("RestartCount", 0),
+        "started_at": state.get("StartedAt"),
+        "finished_at": state.get("FinishedAt"),
+    }
+
+
+def analyze_container_logs(
+    name: str, lines: int = 100, analyzer: DiagnosticAnalyzer | None = None
+) -> list[DiagnosticResult]:
+    """Analyze container logs and return diagnostic results."""
+
+    if analyzer is None:
+        analyzer = DiagnosticAnalyzer()
+    logs = list(container_logs(name, lines=lines, follow=False))
+    return analyzer.analyze(logs)
+
+
 def start_all_vpn_containers() -> list[tuple[str, bool]]:
     """Start all VPN containers.
 

{proxy2vpn-0.2.0 → proxy2vpn-0.3.1}/src/proxy2vpn/typer_ext.py

@@ -50,7 +50,7 @@ class HelpfulTyper(typer.Typer):
             self._show_no_such_command_help(exc)
         else:
             # For other errors, format them nicely
-            error_msg = exc.message.strip()
+            error_msg = (getattr(exc, "message", "") or str(exc)).strip()
 
             # Handle missing argument errors
             if "Missing argument" in error_msg:
@@ -329,11 +329,11 @@ class HelpfulTyper(typer.Typer):
                 f"{command_path} list-providers",
                 f"{command_path} list-countries nordvpn",
             ]
-        elif "bulk" in command_path:
+        elif "system" in command_path:
             examples = [
-                f"{command_path} up",
-                f"{command_path} down",
-                f"{command_path} status",
+                f"{command_path} init",
+                f"{command_path} validate",
+                f"{command_path} diagnose",
             ]
         elif "preset" in command_path:
             examples = [
@@ -355,7 +355,7 @@ class HelpfulTyper(typer.Typer):
             "vpn": f"{base_url}#vpn-management",
             "profile": f"{base_url}#profile-management",
             "servers": f"{base_url}#server-lists",
-            "bulk": f"{base_url}#bulk-operations",
+            "system": f"{base_url}#system-operations",
             "preset": f"{base_url}#presets",
         }
 

{proxy2vpn-0.2.0 → proxy2vpn-0.3.1/src/proxy2vpn.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: proxy2vpn
-Version: 0.2.0
+Version: 0.3.1
 Summary: Proxy2VPN Python utilities
 Author-email: Serhii Khalymon <serhii.khalymon@pm.me>
 License-Expression: MIT
@@ -25,7 +25,7 @@ Python command-line interface for managing multiple VPN containers with Docker.
 ## Features
 - Manage VPN credentials as reusable profiles
 - Create and control VPN services
-- Bulk start/stop operations
+- Multi-service control with `--all` flags
 - Query and validate provider server locations
 - Apply predefined presets for common setups
 
@@ -61,7 +61,7 @@ proxy2vpn --help
 ## Quick Start
 1. Initialize the compose file:
    ```bash
-   proxy2vpn init
+   proxy2vpn system init
    ```
 
 2. Create a profile file with your VPN credentials:
@@ -87,13 +87,15 @@ proxy2vpn --help
 5. View status and test connectivity:
    ```bash
    proxy2vpn vpn list
-   proxy2vpn test vpn1
+   proxy2vpn vpn test vpn1
    ```
 
 ## Command overview
 
-### Initialization
-- `proxy2vpn init [--force]`
+### System operations
+- `proxy2vpn system init [--force]`
+- `proxy2vpn system validate`
+- `proxy2vpn system diagnose [--lines N] [--all] [--verbose] [--json]`
 
 ### Profiles
 - `proxy2vpn profile create NAME ENV_FILE`
@@ -102,18 +104,13 @@ proxy2vpn --help
 
 ### VPN services
 - `proxy2vpn vpn create NAME PROFILE [--port PORT] [--provider PROVIDER] [--location LOCATION]`
-- `proxy2vpn vpn list`
-- `proxy2vpn vpn start NAME`
-- `proxy2vpn vpn stop NAME`
-- `proxy2vpn vpn restart NAME`
+- `proxy2vpn vpn list [--diagnose] [--ips-only]`
+- `proxy2vpn vpn start [NAME | --all]`
+- `proxy2vpn vpn stop [NAME | --all]`
+- `proxy2vpn vpn restart [NAME | --all]`
 - `proxy2vpn vpn logs NAME [--lines N] [--follow]`
-- `proxy2vpn vpn delete NAME`
-
-### Bulk operations
-- `proxy2vpn bulk up`
-- `proxy2vpn bulk down`
-- `proxy2vpn bulk status`
-- `proxy2vpn bulk ips`
+- `proxy2vpn vpn delete [NAME | --all]`
+- `proxy2vpn vpn test NAME`
 
 ### Server database
 - `proxy2vpn servers update`
@@ -126,9 +123,6 @@ proxy2vpn --help
 - `proxy2vpn preset list`
 - `proxy2vpn preset apply PRESET SERVICE [--port PORT]`
 
-### Testing
-- `proxy2vpn test SERVICE` – verify that a proxy container is reachable
-
 ## Development
 
 ### Setup

{proxy2vpn-0.2.0 → proxy2vpn-0.3.1}/src/proxy2vpn.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ src/proxy2vpn/compose_manager.py
 src/proxy2vpn/compose_utils.py
 src/proxy2vpn/compose_validator.py
 src/proxy2vpn/config.py
+src/proxy2vpn/diagnostics.py
 src/proxy2vpn/docker_ops.py
 src/proxy2vpn/models.py
 src/proxy2vpn/preset_manager.py
@@ -19,6 +20,7 @@ src/proxy2vpn.egg-info/dependency_links.txt
 src/proxy2vpn.egg-info/entry_points.txt
 src/proxy2vpn.egg-info/requires.txt
 src/proxy2vpn.egg-info/top_level.txt
+tests/test_cli_empty_commands.py
 tests/test_cli_entrypoint.py
 tests/test_compose_manager.py
 tests/test_compose_utils.py
@@ -26,4 +28,5 @@ tests/test_compose_validator.py
 tests/test_docker_ops.py
 tests/test_init_command.py
 tests/test_preset_manager.py
-tests/test_server_manager.py
+tests/test_server_manager.py
+tests/test_version_option.py

proxy2vpn-0.3.1/tests/test_cli_empty_commands.py

@@ -0,0 +1,29 @@
+import os
+import pathlib
+import subprocess
+import sys
+
+repo_root = pathlib.Path(__file__).resolve().parents[1]
+
+
+def _run_cli(*args: str) -> subprocess.CompletedProcess[str]:
+    env = os.environ.copy()
+    env["PYTHONPATH"] = str(repo_root / "src")
+    return subprocess.run(
+        [sys.executable, "-m", "proxy2vpn", *args],
+        capture_output=True,
+        text=True,
+        env=env,
+    )
+
+
+def test_root_command_shows_help():
+    result = _run_cli()
+    assert result.returncode == 0
+    assert "proxy2vpn command line interface" in result.stdout
+
+
+def test_missing_arguments_show_error():
+    result = _run_cli("profile", "create")
+    assert result.returncode == 2
+    assert "Missing parameter" in result.stderr

{proxy2vpn-0.2.0 → proxy2vpn-0.3.1}/tests/test_init_command.py

@@ -20,7 +20,7 @@ def _run_proxy2vpn(args, cwd):
 
 
 def test_init_creates_compose(tmp_path):
-    result = _run_proxy2vpn(["init"], tmp_path)
+    result = _run_proxy2vpn(["system", "init"], tmp_path)
     assert result.returncode == 0
     compose = tmp_path / "compose.yml"
     assert compose.exists()
@@ -34,8 +34,8 @@ def test_init_requires_force(tmp_path):
     compose = tmp_path / "compose.yml"
     compose.write_text("services: {}\n")
 
-    result = _run_proxy2vpn(["init"], tmp_path)
+    result = _run_proxy2vpn(["system", "init"], tmp_path)
     assert result.returncode != 0
 
-    result = _run_proxy2vpn(["init", "--force"], tmp_path)
+    result = _run_proxy2vpn(["system", "init", "--force"], tmp_path)
     assert result.returncode == 0

proxy2vpn-0.3.1/tests/test_version_option.py

@@ -0,0 +1,31 @@
+import os
+import pathlib
+import subprocess
+import sys
+
+repo_root = pathlib.Path(__file__).resolve().parents[1]
+sys.path.insert(0, str(repo_root / "src"))
+import proxy2vpn  # noqa
+
+
+def _run_cli(*args: str) -> subprocess.CompletedProcess[str]:
+    env = os.environ.copy()
+    env["PYTHONPATH"] = str(repo_root / "src")
+    return subprocess.run(
+        [sys.executable, "-m", "proxy2vpn", *args],
+        capture_output=True,
+        text=True,
+        env=env,
+    )
+
+
+def test_version_flag_long():
+    result = _run_cli("--version")
+    assert result.returncode == 0
+    assert result.stdout.strip() == proxy2vpn.__version__
+
+
+def test_version_flag_short():
+    result = _run_cli("-V")
+    assert result.returncode == 0
+    assert result.stdout.strip() == proxy2vpn.__version__