proxyctl 0.1.2__tar.gz → 0.1.4__tar.gz

{proxyctl-0.1.2 → proxyctl-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: proxyctl
-Version: 0.1.2
+Version: 0.1.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.1.2 → proxyctl-0.1.4}/pyproject.toml

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

{proxyctl-0.1.2 → proxyctl-0.1.4}/src/proxyctl/check.py

@@ -36,10 +36,11 @@ def _port_listening(port: int) -> bool:
         return False
 
 
-def _test_url(url: str, desc: str, mode: str = "proxy", timeout: int = 8) -> tuple:
+def _test_url(url: str, desc: str, mode: str = "proxy", timeout: int = 8,
+              proxy_port: int = 7890) -> tuple:
     """
     测试 URL 可达性。
-    mode=proxy: 走 socks5h://127.0.0.1:7890
+    mode=proxy: 走 socks5h://127.0.0.1:{proxy_port}（需配置 mixed-port 或 socks-port）
     mode=direct: 绕过所有代理 (--noproxy '*')
     返回 (ok: bool, line: str)，调用方负责 print。
     """
@@ -49,7 +50,7 @@ def _test_url(url: str, desc: str, mode: str = "proxy", timeout: int = 8) -> tup
     cmd = ["curl", "-s", "-o", "/dev/null", "-w", "%{http_code}",
            "--max-time", str(timeout)]
     if mode == "proxy":
-        cmd += ["--proxy", "socks5h://127.0.0.1:7890"]
+        cmd += ["--proxy", f"socks5h://127.0.0.1:{proxy_port}"]
     else:
         cmd += ["--noproxy", "*"]
     cmd.append(url)
@@ -281,7 +282,8 @@ def _proxy_groups_section(api_base: str, api_secret: str,
     return True
 
 
-def _ipgeo(ip: str, cache_file: str, api_secret: str) -> str:
+def _ipgeo(ip: str, cache_file: str, api_secret: str,
+            proxy_port: int = 7890) -> str:
     """查询 IP 归属地，带文件缓存。返回 'city,country|org' 格式。"""
     if not ip:
         return ""
@@ -293,7 +295,8 @@ def _ipgeo(ip: str, cache_file: str, api_secret: str) -> str:
            if k not in ("http_proxy", "https_proxy", "all_proxy",
                         "HTTP_PROXY", "HTTPS_PROXY", "ALL_PROXY")}
     r = subprocess.run(
-        ["curl", "-s", "--max-time", "6", "--proxy", "socks5h://127.0.0.1:7890",
+        ["curl", "-s", "--max-time", "6",
+         "--proxy", f"socks5h://127.0.0.1:{proxy_port}",
          f"https://ipinfo.io/{ip}/json"],
         capture_output=True, text=True, env=env, timeout=10
     )
@@ -428,11 +431,11 @@ def cmd_bench(api: str, api_secret: str, groups: list = None,
     _proxy_groups_section(api, api_secret, groups=list(group_members.keys()))
 
 
-def _fetch_probe(probe, env_clean: dict) -> str:
+def _fetch_probe(probe, env_clean: dict, proxy_port: int = 7890) -> str:
     """根据 OutboundProbe 配置发起一次 IP 查询，返回提取后的 IP。"""
     cmd = ["curl", "-s", "--max-time", str(probe.timeout)]
     if probe.mode == "proxy":
-        cmd += ["--proxy", "socks5h://127.0.0.1:7890"]
+        cmd += ["--proxy", f"socks5h://127.0.0.1:{proxy_port}"]
     else:
         cmd += ["--noproxy", "*"]
     cmd.append(probe.url)
@@ -478,9 +481,13 @@ def cmd_check(engine, api: str, api_secret: str,
         probes = registry.collect("check_outbound_probes", ctx={})
     probe_ips: dict[str, str] = {p.name: "" for p in probes}
 
+    # 临时常量：probes 在端口解析之前启动，所以这里用 config 直接拿
+    _probe_proxy_port = int(config.get("proxy_port", 7890))
+
     def _make_fetcher(probe):
         def _run():
-            probe_ips[probe.name] = _fetch_probe(probe, env_clean)
+            probe_ips[probe.name] = _fetch_probe(probe, env_clean,
+                                                  proxy_port=_probe_proxy_port)
         return _run
 
     ip_threads = [threading.Thread(target=_make_fetcher(p)) for p in probes]
@@ -521,10 +528,13 @@ def cmd_check(engine, api: str, api_secret: str,
         print(f"  {RED}✗{NC} daemon not running — 执行 proxyctl start")
         return
 
-    # 端口检测（proxy 模式不检查 53）
+    # 端口检测（proxy 模式不检查 53）— 端口来自 config + api_base
+    from urllib.parse import urlparse
+    proxy_port = int(config.get("proxy_port", 7890))
+    api_port = urlparse(api).port or 9090
     dns_hijack = mode in ("tun", "mixed")
-    check_ports = [(53, "dns"), (7890, "proxy"), (9090, "api")] if dns_hijack \
-                  else [(7890, "proxy"), (9090, "api")]
+    check_ports = [(53, "dns"), (proxy_port, "proxy"), (api_port, "api")] if dns_hijack \
+                  else [(proxy_port, "proxy"), (api_port, "api")]
     ok_ports, fail_ports = [], []
     for port, desc in check_ports:
         if _port_listening(port):
@@ -710,7 +720,8 @@ def cmd_check(engine, api: str, api_secret: str,
                 ok, line = _test_tcp(parts[0], int(parts[1]), target.name)
             else:
                 ok, line = _test_url(target.url, target.name,
-                                     target.mode, target.timeout)
+                                     target.mode, target.timeout,
+                                     proxy_port=proxy_port)
         except Exception as e:
             ok, line = False, f"  {RED}✗{NC} {target.name}  error: {e}"
         results[idx] = (line, ok)
@@ -737,7 +748,7 @@ def cmd_check(engine, api: str, api_secret: str,
         print(f"  {YELLOW}—{NC} 无出口探测项")
     for probe in probes:
         ip = probe_ips.get(probe.name, "")
-        geo = _ipgeo(ip, cache_file, api_secret)
+        geo = _ipgeo(ip, cache_file, api_secret, proxy_port=proxy_port)
         print(f"  {probe.name:<7s}{_fmt_ip(ip, geo)}")
 
     # 分流校验：当同时有 proxy 出口和 direct 出口时比较

{proxyctl-0.1.2 → proxyctl-0.1.4}/src/proxyctl/cli.py

@@ -43,6 +43,8 @@ DEFAULTS = {
     "api_secret": "",     # 必填：Clash API Bearer token
     "config_dir": os.path.join(HOME, ".config"),
     "dns_lock_label": "com.proxyctl.dns-lock",
+    # 引擎对外暴露的 HTTP/SOCKS mixed-port（应与 mihomo config 的 port/mixed-port 一致）
+    "proxy_port": 7890,
 }
 
 SCRIPTS_DIR = os.path.dirname(os.path.realpath(__file__))
@@ -514,13 +516,38 @@ def _wait_ready(backend: Backend):
     """
     if IS_MACOS:
         wait_port(53, timeout=10)
-    wait_port(7890, timeout=10)
+    wait_port(int(backend.config.get("proxy_port", DEFAULTS["proxy_port"])),
+              timeout=10)
     time.sleep(3)
 
 
+# ── 路由钩子调度 ──────────────────────────────────────────────────────────────
+
+def _apply_route_hooks(registry, ctx: dict, action: str) -> None:
+    """调度所有插件的 RouteHook。action ∈ {'activate', 'deactivate'}。
+
+    单个 hook 失败只打 warning，不中断主流程——路由注入是辅助优化，
+    不能让某个插件挂了拖死 start/stop。
+    """
+    if registry is None:
+        return
+    hooks = registry.collect("route_hooks")
+    for h in hooks:
+        fn = getattr(h, action, None)
+        if fn is None:
+            continue
+        try:
+            fn(ctx)
+        except Exception as e:
+            sys.stderr.write(
+                f"[route_hook warning] {h.name}.{action} failed: "
+                f"{type(e).__name__}: {e}\n"
+            )
+
+
 # ── 命令：start ───────────────────────────────────────────────────────────────
 
-def cmd_start(backend: Backend, config: dict):
+def cmd_start(backend: Backend, config: dict, registry=None):
     r = service_start(backend, config)
     if r.returncode != 0:
         print(f"{RED}✗{NC} {backend.name} 启动失败")
@@ -538,10 +565,18 @@ def cmd_start(backend: Backend, config: dict):
             proxy_activate()
             print("系统代理 → 127.0.0.1:7890 (已激活)")
 
+    _apply_route_hooks(registry,
+                       {"engine": backend.name, "config": config, "phase": "start"},
+                       "activate")
+
 
 # ── 命令：stop ────────────────────────────────────────────────────────────────
 
-def cmd_stop(backend: Backend, config: dict):
+def cmd_stop(backend: Backend, config: dict, registry=None):
+    _apply_route_hooks(registry,
+                       {"engine": backend.name, "config": config, "phase": "stop"},
+                       "deactivate")
+
     if IS_MACOS:
         dns_lock_stop(config)
         dns_deactivate(config)
@@ -554,7 +589,7 @@ def cmd_stop(backend: Backend, config: dict):
 
 # ── 命令：restart ─────────────────────────────────────────────────────────────
 
-def cmd_restart(backend: Backend, config: dict, *, clean: bool = False):
+def cmd_restart(backend: Backend, config: dict, *, clean: bool = False, registry=None):
     if clean and os.path.isfile(backend.cache_file):
         os.remove(backend.cache_file)
     # 人工介入后清掉 watchdog 的失败状态，避免误判为"还在触顶窗口内"
@@ -578,10 +613,14 @@ def cmd_restart(backend: Backend, config: dict, *, clean: bool = False):
         else:
             proxy_deactivate()
 
+    _apply_route_hooks(registry,
+                       {"engine": backend.name, "config": config, "phase": "restart"},
+                       "activate")
+
 
 # ── 命令：fix ─────────────────────────────────────────────────────────────────
 
-def cmd_fix(backend: Backend, config: dict):
+def cmd_fix(backend: Backend, config: dict, registry=None):
     """修复引擎状态：运行中则重注入 DNS/代理，已停止则还原系统配置。"""
     api_base = config.get("api_base", DEFAULTS["api_base"])
     api_secret = config.get("api_secret", "")
@@ -602,6 +641,11 @@ def cmd_fix(backend: Backend, config: dict):
             if get_mode(backend) == "proxy":
                 proxy_activate()
                 print(f"  {GREEN}✓{NC} 系统代理 → 127.0.0.1:7890")
+
+            _apply_route_hooks(registry,
+                               {"engine": backend.name, "config": config,
+                                "phase": "fix"},
+                               "activate")
         else:
             print(f"{BOLD}[引擎运行中] 尝试热重载配置{NC}")
 
@@ -1159,7 +1203,7 @@ def cmd_env(config: dict, unset: bool = False):
             print(f"unset {var};")
         return
 
-    port = 7890  # mixed-port
+    port = int(config.get("proxy_port", DEFAULTS["proxy_port"]))  # mixed-port
     proxy_http = f"http://127.0.0.1:{port}"
     proxy_socks = f"socks5://127.0.0.1:{port}"
     no_proxy = "localhost,127.0.0.1,::1,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16"
@@ -1176,7 +1220,7 @@ def cmd_env(config: dict, unset: bool = False):
 
 # ── 帮助 ──────────────────────────────────────────────────────────────────────
 
-VERSION = "0.1.2"
+VERSION = "0.1.4"
 
 def cmd_help(verbose: bool = False):
     """打印帮助信息
@@ -1280,13 +1324,13 @@ def main():
     cmd = sys.argv[1] if len(sys.argv) > 1 else "status"
 
     if cmd == "start":
-        cmd_start(backend, config)
+        cmd_start(backend, config, registry=registry)
     elif cmd == "stop":
-        cmd_stop(backend, config)
+        cmd_stop(backend, config, registry=registry)
     elif cmd == "restart":
-        cmd_restart(backend, config)
+        cmd_restart(backend, config, registry=registry)
     elif cmd == "restart-clean":
-        cmd_restart(backend, config, clean=True)
+        cmd_restart(backend, config, clean=True, registry=registry)
     elif cmd == "status":
         from proxyctl.status import cmd_status
         mode_str = get_mode(backend)
@@ -1303,7 +1347,7 @@ def main():
         default_groups = registry.collect("check_groups") if registry else None
         cmd_bench(api_base, api_secret, bench_groups, default_groups=default_groups)
     elif cmd == "fix":
-        cmd_fix(backend, config)
+        cmd_fix(backend, config, registry=registry)
     elif cmd == "recover":
         cmd_recover(backend, config)
     elif cmd == "dns-lock":

{proxyctl-0.1.2 → proxyctl-0.1.4}/src/proxyctl/status.py

@@ -94,10 +94,17 @@ def _gather_engine(engine) -> dict:
     return {"pid": pid, "runs": runs, "daemon_up": daemon_up, "etime": etime}
 
 
-def _gather_ports(claude_proxy_label: str) -> dict:
-    """采集端口监听状态。"""
-    ports = [(p, desc, _port_listening(p))
-             for p, desc in [(7890, "proxy"), (9090, "api")]]
+def _gather_ports(claude_proxy_label: str,
+                   port_list: list[tuple[int, str]] | None = None) -> dict:
+    """采集端口监听状态。
+
+    Args:
+        port_list: [(port, desc), ...]，由调用方根据 config/api_base 解析后传入。
+                   None 时回退到 [(7890,"proxy"), (9090,"api")] 以兼容旧调用。
+    """
+    if port_list is None:
+        port_list = [(7890, "proxy"), (9090, "api")]
+    ports = [(p, desc, _port_listening(p)) for p, desc in port_list]
     cp_running = False
     cp_pid = ""
     cp_port = False
@@ -475,10 +482,20 @@ def cmd_status(engine, api: str, api_secret: str,
     dns_lock_label = config.get("dns_lock_label", "com.proxyctl.dns-lock")
     claude_proxy_label = config.get("claude_proxy_label", "com.proxyctl.claude-proxy")
 
+    # 端口列表：proxy 取 config.proxy_port，api 从 api_base URL 解析
+    proxy_port = int(config.get("proxy_port", 7890))
+    api_port = 9090
+    try:
+        from urllib.parse import urlparse
+        api_port = urlparse(api).port or 9090
+    except Exception:
+        pass
+    port_list = [(proxy_port, "proxy"), (api_port, "api")]
+
     # 全部 section 并发采集，拿到一个打印一个
     with ThreadPoolExecutor(max_workers=8) as pool:
         f_engine  = pool.submit(_gather_engine, engine)
-        f_ports   = pool.submit(_gather_ports, claude_proxy_label)
+        f_ports   = pool.submit(_gather_ports, claude_proxy_label, port_list)
         f_tun     = pool.submit(_gather_tun, engine, True)
         f_proxy   = pool.submit(_gather_proxy_settings)
         f_dns     = pool.submit(_gather_dns, dns_lock_label)