psiphon 2.0.0__tar.gz → 2.0.2__tar.gz

{psiphon-2.0.0 → psiphon-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: psiphon
-Version: 2.0.0
+Version: 2.0.2
 Summary: Foreground native Psiphon packet tunnel and explicit local proxy for Linux
 Author: KpihX
 Author-email: KpihX <kapoivha@gmail.com>
@@ -69,6 +69,11 @@ the worker refuses before mutations. Cancellation starts no supervisor or route
 For agent-operated privilege, launch connect only in an armed tmux pane in the
 agent's current window. No sudo or privileged operation runs in offline checks.
 
+Logs live in `$XDG_STATE_HOME/psiphon/psiphon.log` (default
+`~/.local/state/psiphon/`). Before a new connection, a 2 MiB log rotates through
+four numbered prior logs (`.1` to `.4`), bounding retained log storage to about
+10 MiB. The oldest retained log is discarded on the next rotation.
+
 **Escalation trust:** sudo approves this local Python interpreter and installed
 package, including an editable checkout if that is what you installed. They may
 be user-writable. `-I` avoids ambient PYTHONPATH/user-site, but does not make that

{psiphon-2.0.0 → psiphon-2.0.2}/README.md

@@ -52,6 +52,11 @@ the worker refuses before mutations. Cancellation starts no supervisor or route
 For agent-operated privilege, launch connect only in an armed tmux pane in the
 agent's current window. No sudo or privileged operation runs in offline checks.
 
+Logs live in `$XDG_STATE_HOME/psiphon/psiphon.log` (default
+`~/.local/state/psiphon/`). Before a new connection, a 2 MiB log rotates through
+four numbered prior logs (`.1` to `.4`), bounding retained log storage to about
+10 MiB. The oldest retained log is discarded on the next rotation.
+
 **Escalation trust:** sudo approves this local Python interpreter and installed
 package, including an editable checkout if that is what you installed. They may
 be user-writable. `-I` avoids ambient PYTHONPATH/user-site, but does not make that

{psiphon-2.0.0 → psiphon-2.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "psiphon"
-version = "2.0.0"
+version = "2.0.2"
 description = "Foreground native Psiphon packet tunnel and explicit local proxy for Linux"
 readme = "README.md"
 license = "BUSL-1.1"

{psiphon-2.0.0 → psiphon-2.0.2}/src/psiphon/config.py

@@ -50,6 +50,8 @@ RUNTIME_DIR = _runtime / f"psiphon-{os.getuid()}"
 ACTIVE_CONFIG = CONFIG_DIR / "psiphon.config"
 PID_FILE = RUNTIME_DIR / "psiphon.pid"
 LOG_FILE = STATE_DIR / "psiphon.log"
+LOG_MAX_BYTES = 2 * 1024 * 1024
+LOG_BACKUPS = 4
 SESSION_FILE = RUNTIME_DIR / "session.json"
 DATA_DIR = CACHE_DIR / "core"  # signed server-list cache and tunnel-core datastore
 

{psiphon-2.0.0 → psiphon-2.0.2}/src/psiphon/main.py

@@ -17,6 +17,7 @@ from typing import Annotated, Any
 import requests
 import typer
 from rich.console import Console
+from rich.table import Table
 
 from psiphon import config, engine, network, routing
 from psiphon.supervisor import RollbackError, Supervisor
@@ -112,6 +113,23 @@ def notice_state(offset: int = 0) -> dict[str, Any]:
     return state
 
 
+def rotate_log() -> None:
+    """Keep a bounded local history before opening a new connection log."""
+    if (
+        not config.LOG_FILE.exists()
+        or config.LOG_FILE.stat().st_size < config.LOG_MAX_BYTES
+    ):
+        return
+    oldest = config.LOG_FILE.with_name(f"{config.LOG_FILE.name}.{config.LOG_BACKUPS}")
+    if oldest.exists():
+        oldest.unlink()
+    for number in range(config.LOG_BACKUPS - 1, 0, -1):
+        source = config.LOG_FILE.with_name(f"{config.LOG_FILE.name}.{number}")
+        if source.exists():
+            source.replace(source.with_name(f"{config.LOG_FILE.name}.{number + 1}"))
+    config.LOG_FILE.replace(config.LOG_FILE.with_name(f"{config.LOG_FILE.name}.1"))
+
+
 def process_identity(pid: int) -> dict[str, str]:
     proc = Path(f"/proc/{pid}")
     stat = (proc / "stat").read_text().rsplit(") ", 1)[1].split()
@@ -169,7 +187,8 @@ def connected(region: str, proxy: bool, interface: str | None, wait_s: float):
         elif interface:
             uplink = interface
         engine.write_config(region, proxy)
-        # Create a private log before the worker opens it; never truncate history.
+        # Create a private log before the worker opens it; preserve bounded history.
+        rotate_log()
         fd = os.open(
             config.LOG_FILE,
             os.O_APPEND | os.O_CREAT | os.O_WRONLY | os.O_NOFOLLOW,
@@ -341,12 +360,7 @@ def status(
         "-p",
         help="Measure explicit local proxy instead of active OS route",
     ),
-    geo: bool = typer.Option(
-        False,
-        "--geo",
-        "-g",
-        help="Query third-party GeoIP (not physical-location proof)",
-    ),
+    geo: bool = typer.Option(False, "--geo", "-g", help="Query third-party GeoIP"),
     download: bool = typer.Option(False, "--download", "-d"),
     upload: bool = typer.Option(False, "--upload", "-u"),
     speed: bool = typer.Option(
@@ -355,17 +369,61 @@ def status(
     seconds: float = typer.Option(
         config.BENCH_DEFAULT_S, "--seconds", "-n", min=1, max=60
     ),
+    output_format: str = typer.Option("table", "--format", "-f", help="table or json"),
 ) -> None:
     """Inspect the current route and HTTPS egress, even without Psiphon running."""
+    if output_format not in ("table", "json"):
+        raise typer.BadParameter("format must be table or json")
     route = routing.active_route()
-    console.print("Active OS route: " + json.dumps(route), markup=False)
     transport = proxy_url(proxy)
     address = network.public_ip(transport)
-    console.print(
-        f"{'Explicit proxy' if proxy else 'Active route'} HTTPS IP: {address}"
-    )
+    location = {}
     if geo:
-        console.print(network.geo(address, transport))
+        try:
+            location = network.geo(address, transport)
+        except (ConnectionError, requests.RequestException):
+            location = {}
+    state = {}
+    if config.SESSION_FILE.exists():
+        try:
+            state = json.loads(config.SESSION_FILE.read_text())
+        except (OSError, ValueError):
+            state = {"state": "unreadable"}
+    payload: dict[str, Any] = {
+        "mode": "explicit-proxy" if proxy else "active-route",
+        "interface": route.get("dev", ""),
+        "local_ipv4": route.get("prefsrc", route.get("src", "")),
+        "gateway": route.get("gateway", ""),
+        "public_ipv4": address,
+        "location": location,
+        "session": state,
+    }
+    if output_format == "json":
+        console.print_json(json.dumps(payload))
+    else:
+        table = Table(title="Current IPv4 Network Status", show_header=False)
+        table.add_column("Property", style="cyan")
+        table.add_column("Value")
+        table.add_row("Mode", payload["mode"])
+        table.add_row("Active interface", payload["interface"] or "not reported")
+        table.add_row("Local IPv4", payload["local_ipv4"] or "not reported")
+        table.add_row("Gateway", payload["gateway"] or "point-to-point or not reported")
+        table.add_row("Public IPv4", address)
+        country = " ".join(
+            str(value)
+            for value in (location.get("country", ""), location.get("country_code", ""))
+            if value
+        )
+        table.add_row(
+            "Location (indicative)",
+            ", ".join(
+                value for value in (country, str(location.get("city", ""))) if value
+            )
+            or ("unavailable" if geo else "not requested; use -g"),
+        )
+        table.add_row("Requested region", str(state.get("region", "not connected")))
+        table.add_row("Tunnel mode", str(state.get("mode", "not connected")))
+        console.print(table)
     for enabled, name, measure in (
         (download or speed, "download", network.download),
         (upload or speed, "upload", network.upload),
@@ -373,7 +431,7 @@ def status(
         if enabled:
             result = measure(seconds, transport)
             console.print(
-                f"{name}: {result.mbps:.3f} Mbps; {result.bytes_received} bytes / {result.elapsed_s:.3f}s"
+                f"[green]{name.title()}:[/green] {result.mbps:.2f} Mbps · {result.bytes_received / 1_000_000:.1f} MB in {result.elapsed_s:.1f}s"
             )