proxyctl 0.5.5__tar.gz → 0.5.7__tar.gz

{proxyctl-0.5.5 → proxyctl-0.5.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: proxyctl
-Version: 0.5.5
+Version: 0.5.7
 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.5 → proxyctl-0.5.7}/man/proxyctl.1

@@ -131,11 +131,32 @@ Linux systemctl --user）。
 4 阶段健康检查：basic / groups / connectivity / outbound-ip。
 \fB--plain\fR 输出 TSV（stage / ok / detail）。
 .TP
-\fBproxyctl connections\fR [\fB--app\fR \fINAME\fR ...] [\fB--all\fR] [\fB--json\fR]
+\fBproxyctl connections\fR [\fB--host\fR \fITEXT\fR ...] [\fB--chain\fR \fITEXT\fR ...] [\fB--route\fR \fIKIND\fR ...] [\fB--preset\fR \fINAME\fR ...] [\fB--agent\fR \fINAME\fR ...] [\fB--query\fR \fITEXT\fR ...] [\fB--app\fR \fINAME\fR ...] [\fB--all\fR] [\fB--json\fR]
 把本机 App/进程的 TCP 连接与 \fIproxy_port\fR、mihomo \fB/connections\fR
-API 的 \fIsourcePort\fR 连接详情关联。默认过滤 Codex / Claude / ChatGPT；
-\fB--all\fR 查看所有进程。只读；非 mihomo 后端或本地 API 不可用时降级输出
-unmatched。
+API 的 \fIsourcePort\fR 连接详情关联。默认不做 AI 工具过滤，输出全部可关联
+目的站点；\fB--host\fR 按 host/rulePayload/IP 过滤，\fB--chain\fR /
+\fB--line\fR 按 Mihomo 链路节点过滤，\fB--route\fR 按 route_kind 过滤
+（proxy/direct/reject/unknown，也接受 代理/直连/拒绝/未知），\fB--preset\fR
+使用预设（如 ai/openai/anthropic/coding），\fB--agent\fR 按工具过滤（如
+codex/claude/chatgpt/openclaw），\fB--query\fR / \fB--filter\fR 做全文过滤。
+\fB--app\fR 保留兼容，用于进程/App 过滤；\fB--all\fR 为兼容 no-op。
+macOS 上还会用 \fBnetstat -anv\fR 反查被
+Network/System Extension 接管后的 socket owner，并在 JSON 中输出
+\fBproxy_owner_connections\fR 与 \fBproxy_owner_groups\fR。后者按
+rulePayload / host / IP 聚合目的地，输出 app_contexts / candidate_contexts，
+并标出 mixed_chains / mixed_route_kind。
+只读；非 mihomo 后端或本地 API 不可用时降级输出 unmatched。
+.TP
+\fBproxyctl traffic\fR [snapshot|sample|watch|report] [\fB--by\fR \fIline,app\fR] [\fB--interval\fR \fISEC\fR] [\fB--count\fR \fIN\fR] [\fB--since\fR \fI1h\fR] [\fB--store\fR \fIDIR\fR] [\fB--host\fR \fITEXT\fR ...] [\fB--chain\fR \fITEXT\fR ...] [\fB--route\fR \fIKIND\fR ...] [\fB--preset\fR \fINAME\fR ...] [\fB--agent\fR \fINAME\fR ...] [\fB--json\fR]
+按当前活跃 Mihomo \fB/connections\fR 的 upload/download 统计流量快照。
+默认 \fB--by line\fR 按首个链路节点统计线路；也可用
+\fB--by line,app\fR 进一步按软件归因。软件归因分可信度：
+可见进程为 process/socket-owner，被 Network/System Extension 遮蔽时按目的域名
+给出 inferred 候选。\fBsample\fR 记录一次连接计数器增量，
+\fBwatch\fR 按间隔重复记录，\fBreport\fR 读取已记录增量并按
+\fB--since\fR 汇总。人类输出模式下 \fBwatch\fR 每次采样都会实时打印一行进度；
+\fB--json\fR 保持最终单个 envelope。首次看到的连接只建立基线，不回填此前已经
+产生的字节；未运行 sample/watch 的时间段无法补算。
 .TP
 \fBproxyctl trace\fR \fIDOMAIN\fR [\fB--json\fR]
 4 阶段域名链路诊断：DNS 解析 / 规则匹配预测 / 连通性 / 实际连接。

{proxyctl-0.5.5 → proxyctl-0.5.7}/pyproject.toml

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

{proxyctl-0.5.5 → proxyctl-0.5.7}/src/proxyctl/_io.py

@@ -72,7 +72,7 @@ _COLOR_NAMES = ("RED", "GREEN", "YELLOW", "CYAN", "BOLD", "DIM", "NC")
 _COLOR_MODULES_KNOWN = (
     "proxyctl.cli", "proxyctl.status", "proxyctl.check",
     "proxyctl.trace", "proxyctl.audit", "proxyctl.explain",
-    "proxyctl.connections",
+    "proxyctl.connections", "proxyctl.connections_human", "proxyctl.traffic",
 )
 
 
@@ -399,7 +399,7 @@ def lock_paths(lock_dir: str | None = None) -> dict[str, str]:
     home = os.path.expanduser("~")
     base = lock_dir or os.path.join(home, ".config", "proxyctl")
     # 已知锁名（与 cli._exec_with_lock 一致）
-    names = ["system", "config", "daemon"]
+    names = ["system", "config", "daemon", "traffic"]
     return {n: os.path.join(base, f".lock.{n}") for n in names}
 
 

{proxyctl-0.5.5 → proxyctl-0.5.7}/src/proxyctl/builtin_plugins/connectivity_basic.py

@@ -3,8 +3,9 @@
 提供一组跨所有用户都通用的连通性测试点：
 - 海外（走代理）：google / github
 - 国内（直连）：baidu
+- AI 线路：anthropic（走 claude 规则组）
 
-本机特例（discord/anthropic/telegram、企业内网等）请走用户插件。
+本机特例（discord/telegram、企业内网等）请走用户插件。
 
 代理组：默认提供 "proxy"（绝大多数 mihomo/sing-box 配置都有这个组）。
 其他组（claude / residential-* 等）由用户插件提供。
@@ -24,12 +25,18 @@ class ConnectivityBasic(Plugin):
             CheckTarget(name="google", url="https://www.google.com", mode="proxy"),
             CheckTarget(name="github", url="https://github.com",     mode="proxy"),
             CheckTarget(name="baidu",  url="https://www.baidu.com",  mode="direct"),
+            CheckTarget(name="anthropic",
+                        url="https://api.anthropic.com",
+                        mode="proxy",
+                        expected_proxy="claude"),
         ]
 
     def check_outbound_probes(self, ctx: dict) -> list[OutboundProbe]:
-        # 只提供 proxy 出口探测——direct 探测严重依赖本地网络环境
-        # （国内用户用 myip.ipip.net 这种国内服务才稳，海外用户用 ipify 更好），
-        # 因此 direct 探测由用户插件提供。
         return [
             OutboundProbe(name="proxy", mode="proxy", url="https://api.ipify.org"),
+            OutboundProbe(name="claude", mode="proxy", url="https://ipinfo.io/ip"),
+            OutboundProbe(name="direct",
+                          mode="direct",
+                          url="https://myip.ipip.net",
+                          extract_re=r"\d+\.\d+\.\d+\.\d+"),
         ]

{proxyctl-0.5.5 → proxyctl-0.5.7}/src/proxyctl/check.py

@@ -76,6 +76,43 @@ def _test_url(url: str, desc: str, mode: str = "proxy", timeout: int = 8,
         return False, f"  {YELLOW}?{NC} {desc:<18s} {url:<44s} {YELLOW}{code}{NC}"
 
 
+def _api_connections(api_base: str, api_secret: str) -> list[dict]:
+    r = subprocess.run(
+        ["curl", "-s", "--noproxy", "*",
+         "-H", f"Authorization: Bearer {api_secret}",
+         f"{api_base.rstrip('/')}/connections"],
+        capture_output=True, text=True, timeout=2
+    )
+    try:
+        data = json.loads(r.stdout or "{}")
+    except Exception:
+        return []
+    conns = data.get("connections")
+    return conns if isinstance(conns, list) else []
+
+
+def _target_uses_expected_proxy(api_base: str, api_secret: str, url: str,
+                                expected_proxy: str) -> tuple[bool, str]:
+    host = urllib.parse.urlparse(url).hostname or ""
+    if not host or not expected_proxy:
+        return True, ""
+
+    for _ in range(3):
+        for conn in _api_connections(api_base, api_secret):
+            meta = conn.get("metadata") or {}
+            conn_host = meta.get("host") or ""
+            if conn_host != host and not conn_host.endswith("." + host):
+                continue
+            chains = conn.get("chains") or []
+            actual = chains[-1] if chains else ""
+            chain_str = " → ".join(reversed(chains)) if chains else "?"
+            if actual.lower() == expected_proxy.lower():
+                return True, f" via {chain_str}"
+            return False, f" expected {expected_proxy}, got {actual or '?'}"
+        time.sleep(0.2)
+    return False, f" expected {expected_proxy}, no active connection found"
+
+
 def _test_dns(desc: str, server: str, domain: str) -> tuple:
     """通用 DNS 可达性测试：dig @server domain（用于 CheckTarget mode='dns'）。
 
@@ -102,6 +139,73 @@ def _test_tcp(host: str, port: int, desc: str) -> tuple:
         return False, f"  {RED}✗{NC} {desc:<18s} {addr:<44s} {RED}unreachable{NC}"
 
 
+def _rule_target_groups_from_config(config_path: str) -> list[str]:
+    """Return proxy groups that are used as mihomo rule targets.
+
+    `check` is a maintenance view: if a top-level rule can route traffic into a
+    group, that group should be visible even when it is not a child of `proxy`.
+    """
+    if not config_path or not os.path.isfile(config_path):
+        return []
+
+    try:
+        import yaml
+        with open(config_path, encoding="utf-8") as f:
+            data = yaml.safe_load(f) or {}
+    except Exception:
+        return []
+
+    if not isinstance(data, dict):
+        return []
+
+    group_names: set[str] = set()
+    for group in data.get("proxy-groups") or []:
+        if isinstance(group, dict) and isinstance(group.get("name"), str):
+            group_names.add(group["name"])
+
+    if not group_names:
+        return []
+
+    # Mihomo rule strings use comma-separated fields; the policy is normally
+    # the last field, except trailing options such as `no-resolve`.
+    option_tokens = {"no-resolve", "src", "dst", "in", "out"}
+    targets: list[str] = []
+    seen: set[str] = set()
+
+    def add_target(name: str) -> None:
+        if name in group_names and name not in seen:
+            seen.add(name)
+            targets.append(name)
+
+    for rule in data.get("rules") or []:
+        if isinstance(rule, str):
+            parts = [p.strip() for p in rule.split(",") if p.strip()]
+            for token in reversed(parts[1:]):
+                if token.lower() in option_tokens:
+                    continue
+                add_target(token)
+                break
+        elif isinstance(rule, dict):
+            for key in ("policy", "target", "proxy", "outbound"):
+                value = rule.get(key)
+                if isinstance(value, str):
+                    add_target(value)
+                    break
+
+    return targets
+
+
+def _merge_check_groups(base: list[str] | None, rule_targets: list[str]) -> list[str]:
+    """Merge plugin groups and config-derived rule target groups preserving order."""
+    merged: list[str] = []
+    seen: set[str] = set()
+    for name in list(base or []) + list(rule_targets or []):
+        if name and name not in seen:
+            seen.add(name)
+            merged.append(name)
+    return merged
+
+
 def _proxy_groups_section(api_base: str, api_secret: str,
                            groups: list[str] | None = None,
                            collect_into: list | None = None) -> bool:
@@ -909,6 +1013,10 @@ def cmd_check(engine, api: str, api_secret: str,
     groups = []
     if registry is not None:
         groups = registry.collect("check_groups")
+    groups = _merge_check_groups(
+        groups,
+        _rule_target_groups_from_config(getattr(engine, "config_file", "")),
+    )
     groups_data: list = []
     _proxy_groups_section(api, api_secret, groups=groups,
                           collect_into=groups_data if as_json else None)
@@ -975,6 +1083,15 @@ def cmd_check(engine, api: str, api_secret: str,
                 ok, line = _test_url(target.url, target.name,
                                      target.mode, target.timeout,
                                      proxy_port=proxy_port)
+                expected = getattr(target, "expected_proxy", "")
+                if ok and expected:
+                    route_ok, route_msg = _target_uses_expected_proxy(
+                        api, api_secret, target.url, expected)
+                    ok = route_ok
+                    if route_ok:
+                        line += f"  {GREEN}{route_msg}{NC}"
+                    else:
+                        line += f"  {RED}{route_msg}{NC}"
         except Exception as e:
             ok, line = False, f"  {RED}✗{NC} {target.name}  error: {e}"
         results[idx] = (line, ok)

{proxyctl-0.5.5 → proxyctl-0.5.7}/src/proxyctl/cli.py

@@ -2,8 +2,8 @@
 
 支持 Mihomo 后端（首发）/ Sing-box 后端（预留）
 
-用法：proxyctl [start|stop|restart|status|log|check|fix|recover|
-               mode|audit|trace|bench|dns-lock|dns-unlock]
+用法：proxyctl [start|stop|restart|status|log|check|connections|traffic|
+               fix|recover|mode|audit|trace|bench|dns-lock|dns-unlock]
 """
 
 import functools
@@ -1680,6 +1680,8 @@ def cmd_version_print() -> None:
                 "doctor_since_filter":             True,   # 0.5.0: --since <version> 屏蔽未来规则
                 "suggestions_ignore_file":         True,   # 0.5.0: ~/.config/proxyctl/suggestions.ignore
                 "proxy_group_dead_check":          True,   # 0.5.0: proxy_group.mostly_dead 规则
+                "traffic_snapshot":                True,   # 0.5.6+: active /connections traffic grouping
+                "traffic_history":                 True,   # 0.5.6+: sample/watch/report recorded deltas
             },
         }
         _io.emit_json(_io.envelope("version", data=data))
@@ -2749,6 +2751,10 @@ def _h_connections(ctx):
     from proxyctl.connections import cmd_connections
     cmd_connections(ctx["args"], ctx["backend"], ctx["config"])
 
+def _h_traffic(ctx):
+    from proxyctl.traffic import cmd_traffic
+    cmd_traffic(ctx["args"], ctx["backend"], ctx["config"])
+
 def _h_bench(ctx):
     from proxyctl.check import cmd_bench
     bench_groups = ctx["args"] or None
@@ -2916,6 +2922,7 @@ DISPATCH: dict = {
     "log":             _h_log,
     "check":           _h_check,
     "connections":     _h_connections,
+    "traffic":         _h_traffic,
     "bench":           _h_bench,
     "fix":             _h_fix,
     "recover":         _h_recover,