proxyctl 0.5.5__tar.gz → 0.5.6__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {proxyctl-0.5.5 → proxyctl-0.5.6}/PKG-INFO +1 -1
- {proxyctl-0.5.5 → proxyctl-0.5.6}/man/proxyctl.1 +25 -4
- {proxyctl-0.5.5 → proxyctl-0.5.6}/pyproject.toml +1 -1
- {proxyctl-0.5.5 → proxyctl-0.5.6}/src/proxyctl/_io.py +2 -2
- {proxyctl-0.5.5 → proxyctl-0.5.6}/src/proxyctl/cli.py +9 -2
- proxyctl-0.5.6/src/proxyctl/connections.py +908 -0
- proxyctl-0.5.6/src/proxyctl/connections_filters.py +317 -0
- proxyctl-0.5.6/src/proxyctl/connections_human.py +239 -0
- {proxyctl-0.5.5 → proxyctl-0.5.6}/src/proxyctl/explain.py +51 -8
- proxyctl-0.5.6/src/proxyctl/traffic.py +984 -0
- proxyctl-0.5.6/src/proxyctl/traffic_store.py +257 -0
- proxyctl-0.5.5/src/proxyctl/connections.py +0 -466
- {proxyctl-0.5.5 → proxyctl-0.5.6}/.gitignore +0 -0
- {proxyctl-0.5.5 → proxyctl-0.5.6}/LICENSE +0 -0
- {proxyctl-0.5.5 → proxyctl-0.5.6}/README.md +0 -0
- {proxyctl-0.5.5 → proxyctl-0.5.6}/src/proxyctl/__init__.py +0 -0
- {proxyctl-0.5.5 → proxyctl-0.5.6}/src/proxyctl/audit.py +0 -0
- {proxyctl-0.5.5 → proxyctl-0.5.6}/src/proxyctl/autostart.py +0 -0
- {proxyctl-0.5.5 → proxyctl-0.5.6}/src/proxyctl/builtin_plugins/__init__.py +0 -0
- {proxyctl-0.5.5 → proxyctl-0.5.6}/src/proxyctl/builtin_plugins/connectivity_basic.py +0 -0
- {proxyctl-0.5.5 → proxyctl-0.5.6}/src/proxyctl/builtin_plugins/corp_network.py +0 -0
- {proxyctl-0.5.5 → proxyctl-0.5.6}/src/proxyctl/check.py +0 -0
- {proxyctl-0.5.5 → proxyctl-0.5.6}/src/proxyctl/completion.py +0 -0
- {proxyctl-0.5.5 → proxyctl-0.5.6}/src/proxyctl/core/__init__.py +0 -0
- {proxyctl-0.5.5 → proxyctl-0.5.6}/src/proxyctl/core/plugin.py +0 -0
- {proxyctl-0.5.5 → proxyctl-0.5.6}/src/proxyctl/engine/__init__.py +0 -0
- {proxyctl-0.5.5 → proxyctl-0.5.6}/src/proxyctl/engine/base.py +0 -0
- {proxyctl-0.5.5 → proxyctl-0.5.6}/src/proxyctl/engine/mihomo.py +0 -0
- {proxyctl-0.5.5 → proxyctl-0.5.6}/src/proxyctl/engine/singbox.py +0 -0
- {proxyctl-0.5.5 → proxyctl-0.5.6}/src/proxyctl/status.py +0 -0
- {proxyctl-0.5.5 → proxyctl-0.5.6}/src/proxyctl/subscription.py +0 -0
- {proxyctl-0.5.5 → proxyctl-0.5.6}/src/proxyctl/suggest.py +0 -0
- {proxyctl-0.5.5 → proxyctl-0.5.6}/src/proxyctl/suggest_rules.py +0 -0
- {proxyctl-0.5.5 → proxyctl-0.5.6}/src/proxyctl/trace.py +0 -0
|
@@ -131,11 +131,32 @@ Linux systemctl --user)。
|
|
|
131
131
|
4 阶段健康检查:basic / groups / connectivity / outbound-ip。
|
|
132
132
|
\fB--plain\fR 输出 TSV(stage / ok / detail)。
|
|
133
133
|
.TP
|
|
134
|
-
\fBproxyctl connections\fR [\fB--app\fR \fINAME\fR ...] [\fB--all\fR] [\fB--json\fR]
|
|
134
|
+
\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]
|
|
135
135
|
把本机 App/进程的 TCP 连接与 \fIproxy_port\fR、mihomo \fB/connections\fR
|
|
136
|
-
API 的 \fIsourcePort\fR
|
|
137
|
-
|
|
138
|
-
|
|
136
|
+
API 的 \fIsourcePort\fR 连接详情关联。默认不做 AI 工具过滤,输出全部可关联
|
|
137
|
+
目的站点;\fB--host\fR 按 host/rulePayload/IP 过滤,\fB--chain\fR /
|
|
138
|
+
\fB--line\fR 按 Mihomo 链路节点过滤,\fB--route\fR 按 route_kind 过滤
|
|
139
|
+
(proxy/direct/reject/unknown,也接受 代理/直连/拒绝/未知),\fB--preset\fR
|
|
140
|
+
使用预设(如 ai/openai/anthropic/coding),\fB--agent\fR 按工具过滤(如
|
|
141
|
+
codex/claude/chatgpt/openclaw),\fB--query\fR / \fB--filter\fR 做全文过滤。
|
|
142
|
+
\fB--app\fR 保留兼容,用于进程/App 过滤;\fB--all\fR 为兼容 no-op。
|
|
143
|
+
macOS 上还会用 \fBnetstat -anv\fR 反查被
|
|
144
|
+
Network/System Extension 接管后的 socket owner,并在 JSON 中输出
|
|
145
|
+
\fBproxy_owner_connections\fR 与 \fBproxy_owner_groups\fR。后者按
|
|
146
|
+
rulePayload / host / IP 聚合目的地,输出 app_contexts / candidate_contexts,
|
|
147
|
+
并标出 mixed_chains / mixed_route_kind。
|
|
148
|
+
只读;非 mihomo 后端或本地 API 不可用时降级输出 unmatched。
|
|
149
|
+
.TP
|
|
150
|
+
\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]
|
|
151
|
+
按当前活跃 Mihomo \fB/connections\fR 的 upload/download 统计流量快照。
|
|
152
|
+
默认 \fB--by line\fR 按首个链路节点统计线路;也可用
|
|
153
|
+
\fB--by line,app\fR 进一步按软件归因。软件归因分可信度:
|
|
154
|
+
可见进程为 process/socket-owner,被 Network/System Extension 遮蔽时按目的域名
|
|
155
|
+
给出 inferred 候选。\fBsample\fR 记录一次连接计数器增量,
|
|
156
|
+
\fBwatch\fR 按间隔重复记录,\fBreport\fR 读取已记录增量并按
|
|
157
|
+
\fB--since\fR 汇总。人类输出模式下 \fBwatch\fR 每次采样都会实时打印一行进度;
|
|
158
|
+
\fB--json\fR 保持最终单个 envelope。首次看到的连接只建立基线,不回填此前已经
|
|
159
|
+
产生的字节;未运行 sample/watch 的时间段无法补算。
|
|
139
160
|
.TP
|
|
140
161
|
\fBproxyctl trace\fR \fIDOMAIN\fR [\fB--json\fR]
|
|
141
162
|
4 阶段域名链路诊断:DNS 解析 / 规则匹配预测 / 连通性 / 实际连接。
|
|
@@ -72,7 +72,7 @@ _COLOR_NAMES = ("RED", "GREEN", "YELLOW", "CYAN", "BOLD", "DIM", "NC")
|
|
|
72
72
|
_COLOR_MODULES_KNOWN = (
|
|
73
73
|
"proxyctl.cli", "proxyctl.status", "proxyctl.check",
|
|
74
74
|
"proxyctl.trace", "proxyctl.audit", "proxyctl.explain",
|
|
75
|
-
"proxyctl.connections",
|
|
75
|
+
"proxyctl.connections", "proxyctl.connections_human", "proxyctl.traffic",
|
|
76
76
|
)
|
|
77
77
|
|
|
78
78
|
|
|
@@ -399,7 +399,7 @@ def lock_paths(lock_dir: str | None = None) -> dict[str, str]:
|
|
|
399
399
|
home = os.path.expanduser("~")
|
|
400
400
|
base = lock_dir or os.path.join(home, ".config", "proxyctl")
|
|
401
401
|
# 已知锁名(与 cli._exec_with_lock 一致)
|
|
402
|
-
names = ["system", "config", "daemon"]
|
|
402
|
+
names = ["system", "config", "daemon", "traffic"]
|
|
403
403
|
return {n: os.path.join(base, f".lock.{n}") for n in names}
|
|
404
404
|
|
|
405
405
|
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
|
|
3
3
|
支持 Mihomo 后端(首发)/ Sing-box 后端(预留)
|
|
4
4
|
|
|
5
|
-
用法:proxyctl [start|stop|restart|status|log|check|
|
|
6
|
-
mode|audit|trace|bench|dns-lock|dns-unlock]
|
|
5
|
+
用法:proxyctl [start|stop|restart|status|log|check|connections|traffic|
|
|
6
|
+
fix|recover|mode|audit|trace|bench|dns-lock|dns-unlock]
|
|
7
7
|
"""
|
|
8
8
|
|
|
9
9
|
import functools
|
|
@@ -1680,6 +1680,8 @@ def cmd_version_print() -> None:
|
|
|
1680
1680
|
"doctor_since_filter": True, # 0.5.0: --since <version> 屏蔽未来规则
|
|
1681
1681
|
"suggestions_ignore_file": True, # 0.5.0: ~/.config/proxyctl/suggestions.ignore
|
|
1682
1682
|
"proxy_group_dead_check": True, # 0.5.0: proxy_group.mostly_dead 规则
|
|
1683
|
+
"traffic_snapshot": True, # 0.5.6+: active /connections traffic grouping
|
|
1684
|
+
"traffic_history": True, # 0.5.6+: sample/watch/report recorded deltas
|
|
1683
1685
|
},
|
|
1684
1686
|
}
|
|
1685
1687
|
_io.emit_json(_io.envelope("version", data=data))
|
|
@@ -2749,6 +2751,10 @@ def _h_connections(ctx):
|
|
|
2749
2751
|
from proxyctl.connections import cmd_connections
|
|
2750
2752
|
cmd_connections(ctx["args"], ctx["backend"], ctx["config"])
|
|
2751
2753
|
|
|
2754
|
+
def _h_traffic(ctx):
|
|
2755
|
+
from proxyctl.traffic import cmd_traffic
|
|
2756
|
+
cmd_traffic(ctx["args"], ctx["backend"], ctx["config"])
|
|
2757
|
+
|
|
2752
2758
|
def _h_bench(ctx):
|
|
2753
2759
|
from proxyctl.check import cmd_bench
|
|
2754
2760
|
bench_groups = ctx["args"] or None
|
|
@@ -2916,6 +2922,7 @@ DISPATCH: dict = {
|
|
|
2916
2922
|
"log": _h_log,
|
|
2917
2923
|
"check": _h_check,
|
|
2918
2924
|
"connections": _h_connections,
|
|
2925
|
+
"traffic": _h_traffic,
|
|
2919
2926
|
"bench": _h_bench,
|
|
2920
2927
|
"fix": _h_fix,
|
|
2921
2928
|
"recover": _h_recover,
|