proxyctl 0.3.0__tar.gz → 0.3.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: proxyctl
-Version: 0.3.0
+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.0 → proxyctl-0.3.2}/pyproject.toml

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

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

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

{proxyctl-0.3.0 → 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.0 → 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.0 → 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:
@@ -1361,7 +1362,16 @@ def _read_log_lines(path: str, tail_n: int | None) -> list:
 
 # ── 帮助 ──────────────────────────────────────────────────────────────────────
 
-VERSION = "0.3.0"
+def _read_version() -> str:
+    """单一事实来源：pyproject.toml 的 [project] version。"""
+    try:
+        from importlib.metadata import version
+        return version("proxyctl")
+    except Exception:
+        return "unknown"
+
+
+VERSION = _read_version()
 
 
 # Help 输出按 group 分块的顺序（避免依赖 dict 插入顺序变化）
@@ -1714,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"]},
@@ -1731,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.0 → proxyctl-0.3.2}/src/proxyctl/core/plugin.py

@@ -148,6 +148,20 @@ class Plugin:
         return []
 
 
+# ── 内部工具 ─────────────────────────────────────────────────────────────────
+
+def _apply_color_policy(modname: str) -> None:
+    """插件模块加载后立刻调用：若当前是关色态，把模块自定义的 RED/GREEN/...
+    常量抹空。解决用户插件（如 sb_private.py）在 cli.main() 的 set_no_color
+    之后加载，导致硬编码 ANSI 字面量泄漏到管道输出的问题。"""
+    try:
+        from proxyctl import _io
+        _io.maybe_disable_module_colors(modname)
+    except Exception:
+        # 插件加载链路不应被色彩策略阻断
+        pass
+
+
 # ── Registry ─────────────────────────────────────────────────────────────────
 
 class PluginRegistry:
@@ -171,7 +185,9 @@ class PluginRegistry:
             if modname.startswith("_"):
                 continue
             try:
-                mod = importlib.import_module(f"proxyctl.builtin_plugins.{modname}")
+                full_name = f"proxyctl.builtin_plugins.{modname}"
+                mod = importlib.import_module(full_name)
+                _apply_color_policy(full_name)
                 self._discover_in_module(mod, config, source=f"builtin/{modname}")
             except Exception as e:
                 self.errors.append((f"builtin/{modname}", _fmt_err(e)))
@@ -192,6 +208,7 @@ class PluginRegistry:
                 mod = importlib.util.module_from_spec(spec)
                 sys.modules[mod_name] = mod
                 spec.loader.exec_module(mod)
+                _apply_color_policy(mod_name)
                 self._discover_in_module(mod, config, source=f"user/{fname}")
             except Exception as e:
                 self.errors.append((f"user/{fname}", _fmt_err(e)))

{proxyctl-0.3.0 → 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)