proxyctl 0.3.1__tar.gz → 0.3.2__tar.gz

{proxyctl-0.3.1 → proxyctl-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: proxyctl
-Version: 0.3.1
+Version: 0.3.2
 Summary: Proxy configuration lifecycle management for macOS and Linux
 Project-URL: Homepage, https://github.com/crhan/proxyctl
 Project-URL: Issues, https://github.com/crhan/proxyctl/issues

{proxyctl-0.3.1 → proxyctl-0.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "proxyctl"
-version = "0.3.1"
+version = "0.3.2"
 description = "Proxy configuration lifecycle management for macOS and Linux"
 readme = "README.md"
 requires-python = ">=3.10"

{proxyctl-0.3.1 → proxyctl-0.3.2}/src/proxyctl/__init__.py

@@ -1,3 +1,3 @@
 """proxyctl — Proxy configuration lifecycle management."""
 
-__version__ = "0.3.1"
+__version__ = "0.3.2"

{proxyctl-0.3.1 → proxyctl-0.3.2}/src/proxyctl/audit.py

@@ -439,7 +439,7 @@ def cmd_audit(audit_days: int, api_base: str, api_secret: str, do_apply: bool):
     if candidates and not do_apply:
         print(f"\n执行 {BOLD}proxyctl audit apply{NC} 自动写入双 config")
 
-    _audit_emit(as_json, _sys, _real_stdout, collector)
+    _audit_emit(as_json, as_plain, _sys, _real_stdout, collector)
 
 
 def _audit_emit(as_json: bool, as_plain: bool, _sys, _real_stdout,

{proxyctl-0.3.1 → proxyctl-0.3.2}/src/proxyctl/check.py

@@ -944,7 +944,7 @@ def cmd_check(engine, api: str, api_secret: str,
              "detail": "skipped_in_structured_modes"},
             {"stage": "connectivity",
              "ok": all(c.get("ok") for c in conn) if conn else False,
-             "detail": ";".join(f"{c.get('target')}={c.get('http_code') or 'X'}"
+             "detail": ";".join(f"{c.get('name')}={'ok' if c.get('ok') else 'X'}"
                                  for c in conn)},
             {"stage": "outbound_ip",
              "ok": bool(out_ip),

{proxyctl-0.3.1 → proxyctl-0.3.2}/src/proxyctl/cli.py

@@ -1230,6 +1230,7 @@ def cmd_dns_unlock(config: dict):
         print(f"{YELLOW}dns-unlock 仅支持 macOS{NC}")
         return
     dns_lock_label = config.get("dns_lock_label", DEFAULTS["dns_lock_label"])
+    dns_lock_plist = f"/Library/LaunchDaemons/{dns_lock_label}.plist"
 
     r = run(["launchctl", "bootout", f"system/{dns_lock_label}"], sudo=True, capture=True)
     if r.returncode == 0:
@@ -1723,7 +1724,7 @@ def _plan_mode(backend, target: str) -> list[dict]:
          "reversible": True,
          "side_effects": ["config-write"]},
         {"action": "subprocess",
-         "target": f"launchctl kickstart -k system/{backend.label}",
+         "target": f"launchctl kickstart -k {backend.label}",
          "summary": f"重启 launchd 服务以读取新 mode",
          "reversible": True, "requires_sudo": True,
          "side_effects": ["process"]},
@@ -1740,7 +1741,7 @@ def _plan_engine(backend, target: str) -> list[dict]:
         new_plist = f"/Library/LaunchDaemons/<{target}>.plist"
     return [
         {"action": "subprocess",
-         "target": f"launchctl bootout system/{backend.label}",
+         "target": f"launchctl bootout {backend.label}",
          "summary": f"停止当前引擎 {backend.name}",
          "reversible": True, "requires_sudo": True,
          "side_effects": ["process"]},

{proxyctl-0.3.1 → proxyctl-0.3.2}/src/proxyctl/trace.py

@@ -575,11 +575,12 @@ def cmd_trace(raw_input: str, api: str, secret: str, config: dict = None):
     }
 
     t.join()
-    lines, conn_ok = connectivity_result[0]
+    lines, remote_ip = connectivity_result[0]
     for line in lines:
         print(line)
     collector["stages"]["connectivity"] = {
-        "ok": bool(conn_ok),
+        "ok": bool(remote_ip),
+        "remote_ip": remote_ip,
         "lines": [_strip_ansi(line) for line in lines],
     }
 
@@ -588,8 +589,7 @@ def cmd_trace(raw_input: str, api: str, secret: str, config: dict = None):
     if as_json:
         _sys.stdout = _real_stdout
         from proxyctl._io import emit_json, envelope, OK
-        emit_json(envelope("trace", data=collector,
-                           ok=bool(conn_ok), code=OK))
+        emit_json(envelope("trace", data=collector, ok=True, code=OK))
         _sys.exit(0)