proxyctl 0.5.3__tar.gz → 0.5.4__tar.gz

{proxyctl-0.5.3 → proxyctl-0.5.4}/PKG-INFO

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

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

{proxyctl-0.5.3 → proxyctl-0.5.4}/src/proxyctl/cli.py

@@ -2010,32 +2010,39 @@ def _plan_engine(backend, target: str) -> list[dict]:
 
 
 def _plan_fix(backend, config) -> list[dict]:
-    """fix 的 plan。
+    """fix 的 plan（v0.5.4：按平台分支）。
+
+    Linux：cmd_fix 仅走 Clash API 热重载，不改系统 DNS（systemd-resolved
+    上的 127.0.0.53 stub 不该被 networksetup 替换）。plan 同步只出 http_put。
+    macOS：保留 DNS 重写 + 缓存清理 + 热重载三步。
 
     networksetup / scutil 迭代型操作不可逐条 argv 化（每个网络服务调一次），
-    标 action=system_op + 描述性 target。http_put 是单次精确请求，target
-    为完整 URL。cmd_fix 实际还会调插件 route_hooks + 第二次 curl 清 fakeip，
-    contract test 不做 subprocess 子集校验（plugin 可注入），只校验
-    placeholder 已消除（< / > 字符不出现）。
+    标 action=system_op + 描述性 target。contract test 不做 subprocess 子集
+    校验（plugin 可注入），只校验 placeholder 已消除。
     """
     api_base = config.get('api_base', 'http://127.0.0.1:9090')
-    return [
-        {"action": "system_op",
-         "target": "networksetup -setdnsservers (per service) 127.0.0.1",
-         "summary": "重置系统 DNS 指向 127.0.0.1（对抗 DHCP 续租）",
-         "reversible": True, "requires_sudo": True,
-         "side_effects": ["system"]},
-        {"action": "system_op",
-         "target": "scutil DNS reset + dscacheutil -flushcache",
-         "summary": "清 macOS DNS 缓存（含 fakeip 表）",
-         "reversible": True, "requires_sudo": True,
-         "side_effects": ["cache"]},
-        {"action": "http_put",
-         "target": f"{api_base}/configs?force=true",
-         "summary": "向 Clash API 发热重载请求（不重启进程）",
-         "reversible": True,
-         "side_effects": ["network-io"]},
-    ]
+    plan = []
+    if IS_MACOS:
+        plan.extend([
+            {"action": "system_op",
+             "target": "networksetup -setdnsservers (per service) 127.0.0.1",
+             "summary": "重置系统 DNS 指向 127.0.0.1（对抗 DHCP 续租）",
+             "reversible": True, "requires_sudo": True,
+             "side_effects": ["system"]},
+            {"action": "system_op",
+             "target": "scutil DNS reset + dscacheutil -flushcache",
+             "summary": "清 macOS DNS 缓存（含 fakeip 表）",
+             "reversible": True, "requires_sudo": True,
+             "side_effects": ["cache"]},
+        ])
+    plan.append({
+        "action": "http_put",
+        "target": f"{api_base}/configs?force=true",
+        "summary": "向 Clash API 发热重载请求（不重启进程）",
+        "reversible": True,
+        "side_effects": ["network-io"],
+    })
+    return plan
 
 
 def _plan_audit_apply(days: int, backend, config: dict) -> list[dict]:

{proxyctl-0.5.3 → proxyctl-0.5.4}/src/proxyctl/explain.py

@@ -1544,6 +1544,12 @@ def cmd_doctor(args: list, backend, config) -> None:
     port = config.get("proxy_port", 7890)
     api_base = config.get("api_base", "http://127.0.0.1:9090")
 
+    # mode 先取（dns_ok 判定 + 显示均依赖；v0.5.4 起）
+    try:
+        mode_str = get_mode(backend)
+    except Exception:
+        mode_str = "unknown"
+
     if suggest_only:
         # Fast path：跳过所有 5 项 score 探测（最慢可累计 5-10s）
         engine_up = None
@@ -1560,7 +1566,7 @@ def cmd_doctor(args: list, backend, config) -> None:
     else:
         engine_up = bool(service_running(backend))
         port_listen = _tcp_open("127.0.0.1", port)
-        dns_ok = _dns_points_to_loopback()
+        dns_ok = _dns_check_ok(mode_str)
         system_proxy_ok = _system_proxy_points_to_loopback(port)
         connectivity_ok = (_quick_connectivity(api_base, port)
                            if engine_up else False)
@@ -1575,10 +1581,6 @@ def cmd_doctor(args: list, backend, config) -> None:
         hint = _doctor_hint(flags_for_human)
 
     # informational extra（不计分）
-    try:
-        mode_str = get_mode(backend)
-    except Exception:
-        mode_str = "unknown"
     try:
         held = _io.held_lock_names()
     except Exception:
@@ -1643,7 +1645,9 @@ def cmd_doctor(args: list, backend, config) -> None:
               f"{DIM}engine={backend.name}{ev_tag} mode={mode_str} port={port}{NC}")
         print(f"  {icon(engine_up)}  engine_up        ({backend.name} 服务运行中)")
         print(f"  {icon(port_listen)}  port_listen      (127.0.0.1:{port})")
-        print(f"  {icon(dns_ok)}  dns_ok           (系统 DNS 含 127.0.0.1)")
+        dns_desc = ("proxy 模式无需 DNS 劫持" if mode_str == "proxy"
+                    else "系统 DNS 含 127.0.0.1")
+        print(f"  {icon(dns_ok)}  dns_ok           ({dns_desc})")
         print(f"  {icon(system_proxy_ok)}  system_proxy_ok  (macOS HTTP/HTTPS proxy)")
         print(f"  {icon(connectivity_ok)}  connectivity_ok  (https://www.google.com via proxy)")
         if held:
@@ -1765,6 +1769,21 @@ def _dns_points_to_loopback() -> bool:
         return False
 
 
+def _dns_check_ok(mode: str) -> bool:
+    """doctor dns_ok 判定（v0.5.4：mode-aware）。
+
+    proxy 模式无需系统 DNS 指向 127.0.0.1——流量走 HTTP/SOCKS 代理，
+    mihomo 不在 :53 监听，系统 DNS 用 systemd-resolved / DHCP 默认即可。
+    旧逻辑在 Ubuntu（DNS=127.0.0.53 stub）+ proxy 模式下永远判 ✗
+    并建议 `proxyctl fix`——但 fix 的 DNS 改写只对 macOS TUN 模式有意义。
+
+    tun / mixed / 未知模式：保留旧的"系统 DNS 含 127.0.0.1"判定。
+    """
+    if mode == "proxy":
+        return True
+    return _dns_points_to_loopback()
+
+
 def _system_proxy_points_to_loopback(port: int) -> bool:
     """macOS：networksetup -getwebproxy 是否指向 127.0.0.1:port。Linux：跳过判 True。"""
     if sys.platform != "darwin":