ndev-stack 0.3.1__tar.gz → 0.3.3__tar.gz

{ndev_stack-0.3.1 → ndev_stack-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ndev-stack
-Version: 0.3.1
+Version: 0.3.3
 Summary: Cross-platform developer stack manager for PHP, FastCGI/PHP-FPM, MariaDB, Redis, PostgreSQL, MongoDB, Nginx, SSL, and Mailpit on Linux and Windows
 Author-email: Ankit Karan <ankit.karan99@gmail.com>
 Project-URL: Homepage, https://github.com/ankitkaran99/ndev

{ndev_stack-0.3.1 → ndev_stack-0.3.3}/ndev/__init__.py

@@ -1,7 +1,7 @@
 """
 ndev: Fast, cross-platform PHP developer environment for Windows and Linux.
 """
-__version__ = "0.3.1"
+__version__ = "0.3.3"
 
 from . import common as common
 from .common.logger import logger as logger

ndev_stack-0.3.3/ndev/linux/commands/grok.py

@@ -0,0 +1,97 @@
+import tempfile
+import subprocess
+import shutil
+import typer
+from pathlib import Path
+from rich.console import Console
+from ndev.common.logger import logger
+
+console = Console()
+
+def get_vhost_info() -> list[dict]:
+    nginx_dir = Path("/etc/nginx/sites-enabled")
+    vhosts = []
+    if not nginx_dir.exists():
+        return vhosts
+        
+    for file in nginx_dir.glob("*.conf"):
+        try:
+            content = file.read_text()
+            domain = None
+            for line in content.splitlines():
+                line = line.strip()
+                if line.startswith("server_name"):
+                    parts = line.split()
+                    for p in parts[1:]:
+                        p = p.rstrip(";").strip()
+                        if p and p != "_":
+                            domain = p
+                            break
+                    if domain:
+                        break
+            if domain:
+                has_ssl = "listen 443 ssl" in content or "listen [::]:443 ssl" in content
+                vhosts.append({"domain": domain, "ssl": has_ssl})
+        except Exception:
+            pass
+    return vhosts
+
+def grok_cmd():
+    """Proxy local Nginx vhosts over public internet using Ngrok."""
+    if not shutil.which("ngrok"):
+        logger.error("ngrok is not installed or not in PATH.")
+        raise typer.Exit(code=1)
+        
+    vhosts = get_vhost_info()
+    if not vhosts:
+        logger.error("No vhosts found in /etc/nginx/sites-enabled.")
+        raise typer.Exit(code=1)
+        
+    console.print("\n[bold]Available VHosts[/bold]")
+    console.print("----------------")
+    for i, v in enumerate(vhosts):
+        ssl_tag = " (HTTPS)" if v["ssl"] else ""
+        console.print(f" {i + 1}) {v['domain']}{ssl_tag}")
+        
+    console.print("")
+    choice = typer.prompt("Select vhost index", type=int)
+    if choice < 1 or choice > len(vhosts):
+        logger.error("Invalid selection.")
+        raise typer.Exit(code=1)
+        
+    selected = vhosts[choice - 1]
+    domain = selected["domain"]
+    is_ssl = selected["ssl"]
+    
+    policy_content = f'''on_http_request:
+  - actions:
+      - type: add-headers
+        config:
+          headers:
+            Host: "{domain}"
+
+on_http_response:
+  - expressions:
+      - 'res.status_code >= 300 && res.status_code < 400 && "location" in res.headers'
+      - 'res.headers["location"][0].contains("://{domain}")'
+    actions:
+      - type: add-headers
+        config:
+          headers:
+            Location: '${{res.headers["location"][0].replace("https://{domain}", conn.server_name.size() > 0 ? "https://" + conn.server_name : "").replace("http://{domain}", conn.server_name.size() > 0 ? "https://" + conn.server_name : "")}}'
+'''
+    
+    with tempfile.NamedTemporaryFile(mode="w", suffix=".yaml", delete=False) as tmp:
+        tmp.write(policy_content)
+        policy_file = tmp.name
+        
+    logger.info(f"Selected domain: {domain}{' (HTTPS)' if is_ssl else ''}")
+    logger.info("Starting ngrok...")
+    target = "https://localhost:443" if is_ssl else "80"
+    cmd = ["ngrok", "http", target, "--traffic-policy-file", policy_file]
+    if is_ssl:
+        cmd.append("--upstream-tls-verify=false")
+    try:
+        subprocess.run(cmd)
+    finally:
+        Path(policy_file).unlink(missing_ok=True)

{ndev_stack-0.3.1 → ndev_stack-0.3.3}/ndev/win/cli.py

@@ -1877,7 +1877,7 @@ def redis_cli(port: int):
 
 @main.command(name="grok")
 @click.option("--domain", default=None, help="Vhost domain to tunnel. Omit to select interactively.")
-@click.option("--ssl", is_flag=True, help="Tunnel HTTPS port 443")
+@click.option("--ssl/--no-ssl", default=None, help="Tunnel HTTPS port 443 (defaults to auto-detecting vhost SSL)")
 def grok(domain, ssl):
     """Tunnel a local virtual host to the public web via ngrok."""
     if not domain:
@@ -1897,12 +1897,19 @@ def grok(domain, ssl):
             raise click.ClickException("Invalid selection.")
 
     domain = re.sub(r"^https?://", "", domain.strip().lower()).rstrip("/")
-    console.print(f"Starting ngrok tunnel for [bold cyan]{domain}[/bold cyan]{' (HTTPS)' if ssl else ''} -- Ctrl+C to stop.")
-    proc = grok_core.start_tunnel(domain, ssl=ssl)
+    v_meta = vhost_core.get_vhost(domain)
+    is_ssl = ssl if ssl is not None else bool(v_meta and v_meta.get("ssl"))
+    console.print(f"Starting ngrok tunnel for [bold cyan]{domain}[/bold cyan]{' (HTTPS)' if is_ssl else ''} -- Ctrl+C to stop.")
+    proc, policy_file = grok_core.start_tunnel(domain, ssl=ssl)
     try:
         proc.wait()
     except KeyboardInterrupt:
         proc.terminate()
+    finally:
+        try:
+            policy_file.unlink(missing_ok=True)
+        except Exception:
+            pass
 
 
 @main.command(name="tunnel", hidden=True)

{ndev_stack-0.3.1 → ndev_stack-0.3.3}/ndev/win/core/fcgi.py

@@ -209,8 +209,12 @@ def nginx_upstream_name(version: str, domain: str | None = None) -> str:
 
 def render_upstream_block(version: str, domain: str | None = None) -> str:
     workers = status(version)
-    if not workers:
-        raise RuntimeError(f"PHP {version} pool is not running; start it first")
-    servers = "\n".join(f"    server 127.0.0.1:{w.port};" for w in workers)
+    if workers:
+        servers = "\n".join(f"    server 127.0.0.1:{w.port};" for w in workers)
+    else:
+        cfg = paths.load_config()
+        ports = ports_for(version, cfg["fcgi_workers_per_version"], cfg["fcgi_base_port"])
+        servers = "\n".join(f"    server 127.0.0.1:{p};" for p in ports)
     u_name = nginx_upstream_name(version, domain=domain)
     return f"upstream {u_name} {{\n{servers}\n}}\n"
+

ndev_stack-0.3.3/ndev/win/core/grok.py

@@ -0,0 +1,95 @@
+"""
+ngrok tunnel wrapper for ndev-win virtual hosts.
+"""
+from __future__ import annotations
+
+import shutil
+import subprocess
+import tempfile
+from pathlib import Path
+
+from . import paths, vhost
+
+HTTP_PORT = 80
+HTTPS_PORT = 443
+
+
+def list_vhosts() -> list[str]:
+    """Return list of domain names with configured Nginx virtual hosts."""
+    return [v["domain"] for v in vhost.list_vhosts()]
+
+
+def _ngrok_exe() -> str:
+    # 1. Check shim dir
+    shim_exe = paths.SHIM_DIR / "ngrok.exe"
+    if shim_exe.exists():
+        return str(shim_exe)
+
+    # 2. Check config
+    cfg = paths.load_config()
+    path = cfg.get("ngrok_path")
+    if path and Path(path).exists():
+        return str(path)
+
+    # 3. Check system PATH
+    which_path = shutil.which("ngrok") or shutil.which("ngrok.exe")
+    if which_path:
+        return which_path
+
+    raise FileNotFoundError("ngrok isn't installed -- run `ndev setup` first")
+
+
+def start_tunnel(domain: str, ssl: bool | None = None) -> tuple[subprocess.Popen, Path]:
+    """
+    Start `ngrok http` against Nginx.
+    Rewrites the request Host header to `domain` and rewrites any response
+    redirect Location headers from the local domain back to the ngrok public URL.
+    Returns (Popen, policy_file_path).
+    """
+    import re
+    clean_domain = re.sub(r"^https?://", "", domain.strip().lower()).rstrip("/")
+    vhost_meta = vhost.get_vhost(clean_domain)
+    known = list_vhosts()
+    if not vhost_meta and clean_domain not in known:
+        raise FileNotFoundError(
+            f"No vhost found for '{clean_domain}'. Known vhosts: {known or '(none)'}"
+        )
+
+    # Determine SSL mode: use explicit flag if provided, otherwise auto-detect from vhost config
+    is_ssl = ssl if ssl is not None else bool(vhost_meta and vhost_meta.get("ssl"))
+
+    target = f"https://localhost:{HTTPS_PORT}" if is_ssl else str(HTTP_PORT)
+
+    # Build traffic policy YAML to ensure:
+    # 1. Request Host header is rewritten to clean_domain so Nginx routes to the right vhost.
+    # 2. Response Location header rewriting prevents external devices from being redirected
+    #    to the unresolvable local domain (e.g. *.local).
+    policy_content = f'''on_http_request:
+  - actions:
+      - type: add-headers
+        config:
+          headers:
+            Host: "{clean_domain}"
+
+on_http_response:
+  - expressions:
+      - 'res.status_code >= 300 && res.status_code < 400 && "location" in res.headers'
+      - 'res.headers["location"][0].contains("://{clean_domain}")'
+    actions:
+      - type: add-headers
+        config:
+          headers:
+            Location: '${{res.headers["location"][0].replace("https://{clean_domain}", conn.server_name.size() > 0 ? "https://" + conn.server_name : "").replace("http://{clean_domain}", conn.server_name.size() > 0 ? "https://" + conn.server_name : "")}}'
+'''
+
+    with tempfile.NamedTemporaryFile(mode="w", suffix=".yaml", delete=False) as tmp:
+        tmp.write(policy_content)
+        policy_file = Path(tmp.name)
+
+    cmd = [_ngrok_exe(), "http", target, "--traffic-policy-file", str(policy_file)]
+    if is_ssl:
+        cmd.append("--upstream-tls-verify=false")
+
+    proc = subprocess.Popen(cmd)
+    return proc, policy_file
+

{ndev_stack-0.3.1 → ndev_stack-0.3.3}/ndev/win/core/setup.py

@@ -113,7 +113,7 @@ def install_nginx(version: str = DEFAULT_NGINX_VERSION) -> Path:
 
 
 def _include_vhosts_in_main_conf() -> None:
-    """Add `include ndev-vhosts/*.conf;` inside the http{} block in nginx.conf."""
+    """Ensure vhost includes, proxy mapping maps, and fastcgi_params are configured."""
     # Ensure default fallback vhost exists so Nginx never fails wildcard glob
     default_conf = paths.NGINX_CONF_D / "_default.conf"
     if not default_conf.exists():
@@ -127,27 +127,61 @@ def _include_vhosts_in_main_conf() -> None:
         )
 
     conf = paths.NGINX_DIR / "conf" / "nginx.conf"
-    if not conf.exists():
-        return
-    text = conf.read_text(encoding="utf-8", errors="ignore")
-    include_line = "    include ndev-vhosts/*.conf;\n"
-    if "ndev-vhosts" in text:
-        return
-
-    http_start = text.find("http {")
-    if http_start == -1:
-        return
-    brace_depth = 0
-    i = text.find("{", http_start)
-    for idx in range(i, len(text)):
-        if text[idx] == "{":
-            brace_depth += 1
-        elif text[idx] == "}":
-            brace_depth -= 1
-            if brace_depth == 0:
-                text = text[:idx] + include_line + text[idx:]
-                break
-    conf.write_text(text, encoding="utf-8")
+    if conf.exists():
+        text = conf.read_text(encoding="utf-8", errors="ignore")
+        changed = False
+
+        # Add forwarded header map directives if not already present
+        if "$fcgi_host" not in text:
+            map_block = (
+                "\n    # Map forwarded headers from reverse proxies (e.g. ngrok) to FastCGI params\n"
+                "    map $http_x_forwarded_host $fcgi_host {\n"
+                "        default $http_x_forwarded_host;\n"
+                '        ""      $host;\n'
+                "    }\n\n"
+                "    map $http_x_forwarded_proto $fcgi_scheme {\n"
+                "        default $http_x_forwarded_proto;\n"
+                '        ""      $scheme;\n'
+                "    }\n\n"
+                "    map $http_x_forwarded_proto $fcgi_https {\n"
+                '        default "on";\n'
+                '        ""      $https;\n'
+                "    }\n\n"
+            )
+            http_start = text.find("http {")
+            if http_start != -1:
+                brace_pos = text.find("{", http_start)
+                text = text[:brace_pos + 1] + map_block + text[brace_pos + 1:]
+                changed = True
+
+        if "ndev-vhosts" not in text:
+            include_line = "    include ndev-vhosts/*.conf;\n"
+            http_start = text.find("http {")
+            if http_start != -1:
+                brace_depth = 0
+                i = text.find("{", http_start)
+                for idx in range(i, len(text)):
+                    if text[idx] == "{":
+                        brace_depth += 1
+                    elif text[idx] == "}":
+                        brace_depth -= 1
+                        if brace_depth == 0:
+                            text = text[:idx] + include_line + text[idx:]
+                            changed = True
+                            break
+
+        if changed:
+            conf.write_text(text, encoding="utf-8")
+
+    # Update fastcgi_params to forward $fcgi_host and $fcgi_scheme
+    fcgi_params_path = paths.NGINX_DIR / "conf" / "fastcgi_params"
+    if fcgi_params_path.exists():
+        fcgi_text = fcgi_params_path.read_text(encoding="utf-8", errors="ignore")
+        if "HTTP_HOST" not in fcgi_text or "$fcgi_host" not in fcgi_text:
+            fcgi_text = fcgi_text.replace("fastcgi_param  REQUEST_SCHEME     $scheme;", "fastcgi_param  REQUEST_SCHEME     $fcgi_scheme;")
+            fcgi_text = fcgi_text.replace("fastcgi_param  HTTPS              $https if_not_empty;", "fastcgi_param  HTTPS              $fcgi_https if_not_empty;")
+            fcgi_text = fcgi_text.replace("fastcgi_param  SERVER_NAME        $server_name;", "fastcgi_param  SERVER_NAME        $fcgi_host;\nfastcgi_param  HTTP_HOST          $fcgi_host;")
+            fcgi_params_path.write_text(fcgi_text, encoding="utf-8")
 
 
 # ---- MariaDB ------------------------------------------------------------------

{ndev_stack-0.3.1 → ndev_stack-0.3.3}/ndev/win/core/vhost.py

@@ -286,3 +286,12 @@ def list_vhosts() -> list[dict]:
             "conf": str(p),
         })
     return vhosts
+
+
+def get_vhost(domain: str) -> dict | None:
+    """Get virtual host metadata for a specific domain name."""
+    clean_domain = re.sub(r"^https?://", "", domain.strip().lower()).rstrip("/")
+    for v in list_vhosts():
+        if v["domain"].lower() == clean_domain:
+            return v
+    return None

{ndev_stack-0.3.1 → ndev_stack-0.3.3}/ndev/win/templates/vhost.conf.tmpl

@@ -20,6 +20,8 @@ server {{
         include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
         fastcgi_param PATH_INFO $fastcgi_path_info;
+        fastcgi_param HTTP_X_FORWARDED_HOST $http_x_forwarded_host if_not_empty;
+        fastcgi_param HTTP_X_FORWARDED_PROTO $http_x_forwarded_proto if_not_empty;
         fastcgi_buffer_size 32k;
         fastcgi_buffers 16 16k;
         fastcgi_busy_buffers_size 64k;

{ndev_stack-0.3.1 → ndev_stack-0.3.3}/ndev/win/templates/vhost_ssl.conf.tmpl

@@ -30,6 +30,8 @@ server {{
         include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
         fastcgi_param PATH_INFO $fastcgi_path_info;
+        fastcgi_param HTTP_X_FORWARDED_HOST $http_x_forwarded_host if_not_empty;
+        fastcgi_param HTTP_X_FORWARDED_PROTO $http_x_forwarded_proto if_not_empty;
         fastcgi_buffer_size 32k;
         fastcgi_buffers 16 16k;
         fastcgi_busy_buffers_size 64k;

{ndev_stack-0.3.1 → ndev_stack-0.3.3}/ndev_stack.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ndev-stack
-Version: 0.3.1
+Version: 0.3.3
 Summary: Cross-platform developer stack manager for PHP, FastCGI/PHP-FPM, MariaDB, Redis, PostgreSQL, MongoDB, Nginx, SSL, and Mailpit on Linux and Windows
 Author-email: Ankit Karan <ankit.karan99@gmail.com>
 Project-URL: Homepage, https://github.com/ankitkaran99/ndev

{ndev_stack-0.3.1 → ndev_stack-0.3.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ndev-stack"
-version = "0.3.1"
+version = "0.3.3"
 description = "Cross-platform developer stack manager for PHP, FastCGI/PHP-FPM, MariaDB, Redis, PostgreSQL, MongoDB, Nginx, SSL, and Mailpit on Linux and Windows"
 readme = "README.md"
 requires-python = ">=3.10"

ndev_stack-0.3.1/ndev/linux/commands/grok.py

@@ -1,74 +0,0 @@
-import tempfile
-import subprocess
-import shutil
-import typer
-from pathlib import Path
-from rich.console import Console
-from ndev.common.logger import logger
-
-console = Console()
-
-def get_vhosts() -> list[str]:
-    nginx_dir = Path("/etc/nginx/sites-enabled")
-    domains = []
-    if not nginx_dir.exists():
-        return domains
-        
-    for file in nginx_dir.glob("*.conf"):
-        try:
-            content = file.read_text()
-            for line in content.splitlines():
-                line = line.strip()
-                if line.startswith("server_name"):
-                    parts = line.split()
-                    for p in parts[1:]:
-                        p = p.rstrip(";").strip()
-                        if p and p != "_":
-                            domains.append(p)
-                            break
-        except Exception:
-            pass
-    return domains
-
-def grok_cmd():
-    """Proxy local Nginx vhosts over public internet using Ngrok."""
-    if not shutil.which("ngrok"):
-        logger.error("ngrok is not installed or not in PATH.")
-        raise typer.Exit(code=1)
-        
-    domains = get_vhosts()
-    if not domains:
-        logger.error("No vhosts found in /etc/nginx/sites-enabled.")
-        raise typer.Exit(code=1)
-        
-    console.print("\n[bold]Available VHosts[/bold]")
-    console.print("----------------")
-    for i, d in enumerate(domains):
-        console.print(f" {i + 1}) {d}")
-        
-    console.print("")
-    choice = typer.prompt("Select vhost index", type=int)
-    if choice < 1 or choice > len(domains):
-        logger.error("Invalid selection.")
-        raise typer.Exit(code=1)
-        
-    domain = domains[choice - 1]
-    
-    policy_content = f"""on_http_request:
-  - actions:
-      - type: add-headers
-        config:
-          headers:
-            Host: {domain}
-"""
-    
-    with tempfile.NamedTemporaryFile(mode="w", suffix=".yaml", delete=False) as tmp:
-        tmp.write(policy_content)
-        policy_file = tmp.name
-        
-    logger.info(f"Selected domain: {domain}")
-    logger.info("Starting ngrok...")
-    try:
-        subprocess.run(["ngrok", "http", "80", "--traffic-policy-file", policy_file])
-    finally:
-        Path(policy_file).unlink(missing_ok=True)

ndev_stack-0.3.1/ndev/win/core/grok.py

@@ -1,54 +0,0 @@
-"""
-ngrok tunnel wrapper for ndev-win virtual hosts.
-"""
-from __future__ import annotations
-
-import shutil
-import subprocess
-from pathlib import Path
-
-from . import paths, vhost
-
-HTTP_PORT = 80
-HTTPS_PORT = 443
-
-
-def list_vhosts() -> list[str]:
-    """Return list of domain names with configured Nginx virtual hosts."""
-    return [v["domain"] for v in vhost.list_vhosts()]
-
-
-def _ngrok_exe() -> str:
-    # 1. Check shim dir
-    shim_exe = paths.SHIM_DIR / "ngrok.exe"
-    if shim_exe.exists():
-        return str(shim_exe)
-
-    # 2. Check config
-    cfg = paths.load_config()
-    path = cfg.get("ngrok_path")
-    if path and Path(path).exists():
-        return str(path)
-
-    # 3. Check system PATH
-    which_path = shutil.which("ngrok") or shutil.which("ngrok.exe")
-    if which_path:
-        return which_path
-
-    raise FileNotFoundError("ngrok isn't installed -- run `ndev setup` first")
-
-
-def start_tunnel(domain: str, ssl: bool = False) -> subprocess.Popen:
-    """
-    Start `ngrok http` against Nginx, rewriting Host header to `domain`.
-    """
-    import re
-    clean_domain = re.sub(r"^https?://", "", domain.strip().lower()).rstrip("/")
-    known = list_vhosts()
-    if clean_domain not in known:
-        raise FileNotFoundError(
-            f"No vhost found for '{clean_domain}'. Known vhosts: {known or '(none)'}"
-        )
-    target = f"https://localhost:{HTTPS_PORT}" if ssl else str(HTTP_PORT)
-    cmd = [_ngrok_exe(), "http", target, f"--host-header={clean_domain}"]
-    return subprocess.Popen(cmd)