clash-controller 0.2.3__tar.gz → 0.2.4__tar.gz

{clash_controller-0.2.3 → clash_controller-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clash_controller
-Version: 0.2.3
+Version: 0.2.4
 Summary: A Textual TUI for managing Clash proxy instances
 Author-email: Moha-Master <hongkongreporter@outlook.com>
 License-Expression: MIT

{clash_controller-0.2.3 → clash_controller-0.2.4}/clash_controller/__init__.py

@@ -2,4 +2,4 @@
 Clash Controller - A Textual TUI for managing Clash proxy instances.
 """
 
-__version__ = "0.2.3"
+__version__ = "0.2.4"

{clash_controller-0.2.3 → clash_controller-0.2.4}/clash_controller/api.py

@@ -320,6 +320,81 @@ class ClashAPI:
         """Update a rule provider."""
         return self._request('PUT', f'/providers/rules/{quote(name)}')
 
+    def update_all_providers(self):
+        """更新所有代理合集 (proxy-providers) 与规则合集 (rule-providers)。
+
+        由于部分内核（如 Clash 原版）可能不支持 rule-provider 或不完全支持 PUT 批量，
+        此处通过遍历获取到的 provider 列表进行逐一更新。
+        """
+        # 1. 获取所有 Proxy Provider
+        proxy_res, err = self.get_proxy_providers()
+        if err:
+            return None, err
+        if isinstance(proxy_res, dict) and proxy_res.get("status_code") in (401, 403):
+            return None, f"鉴权失败 (HTTP {proxy_res.get('status_code')})"
+
+        # 2. 获取所有 Rule Provider
+        rule_res, err = self.get_rule_providers()
+        if err:
+            return None, err
+        if isinstance(rule_res, dict) and rule_res.get("status_code") in (401, 403):
+            return None, f"鉴权失败 (HTTP {rule_res.get('status_code')})"
+
+        # 解析名称列表
+        proxy_names = []
+        if isinstance(proxy_res, dict):
+            providers = proxy_res.get("providers")
+            if isinstance(providers, dict):
+                proxy_names = list(providers.keys())
+
+        rule_names = []
+        if isinstance(rule_res, dict):
+            providers = rule_res.get("providers")
+            if isinstance(providers, dict):
+                rule_names = list(providers.keys())
+
+        total = len(proxy_names) + len(rule_names)
+        if total == 0:
+            return {"status": "success", "message": "未检测到任何 Proxy Provider 或 Rule Provider"}, None
+
+        errors = []
+        success_count = 0
+
+        # 3. 逐一更新
+        for name in proxy_names:
+            res, err = self.update_proxy_provider(name)
+            if err:
+                errors.append(f"代理合集[{name}]: {err}")
+            elif isinstance(res, dict) and res.get("status_code") not in (200, 204) and res.get("status") != "success":
+                msg = res.get("message") or res.get("body") or f"HTTP {res.get('status_code')}"
+                errors.append(f"代理合集[{name}]: {msg}")
+            else:
+                success_count += 1
+
+        for name in rule_names:
+            res, err = self.update_rule_provider(name)
+            if err:
+                errors.append(f"规则合集[{name}]: {err}")
+            elif isinstance(res, dict) and res.get("status_code") not in (200, 204) and res.get("status") != "success":
+                msg = res.get("message") or res.get("body") or f"HTTP {res.get('status_code')}"
+                errors.append(f"规则合集[{name}]: {msg}")
+            else:
+                success_count += 1
+
+        if not errors:
+            return {
+                "status": "success",
+                "message": f"共更新 {len(proxy_names)} 个代理合集、{len(rule_names)} 个规则合集",
+            }, None
+
+        if success_count == 0:
+            return None, f"全部 Provider 更新失败: {'; '.join(errors)}"
+
+        return {
+            "status": "warn",
+            "message": f"成功更新 {success_count}/{total} 个 Provider，失败：{'; '.join(errors)}",
+        }, None
+
     # === Rules ===
     def get_rules(self):
         """Get all rules."""
@@ -400,3 +475,57 @@ def interpret_api_result(action_desc: str, result, error) -> tuple[str, str]:
 
     return (f"{action_desc}失败：{error}", "err")
 
+
+def _brief(raw, limit: int = 120) -> str:
+    """把任意响应体压成一行短文本，供提示栏/通知展示。"""
+    if raw is None:
+        return "无内容"
+    text = " ".join(str(raw).split())
+    if not text:
+        return "无内容"
+    return text[:limit] + "…" if len(text) > limit else text
+
+
+def _transport_hint(error: str) -> str:
+    """把 requests 的传输层错误翻译成人话，认不出来就截断原文。"""
+    low = error.lower()
+    if "connection refused" in low or "connection aborted" in low:
+        return "拒绝连接，请确认 Clash 已启动且控制端口正确"
+    if "max retries exceeded" in low:
+        return "无法连接到端点，请确认 Clash 已启动且地址端口正确"
+    if "timed out" in low:
+        return "连接超时，端点可能未响应"
+    if "name resolution" in low or "failed to resolve" in low or "nodename" in low:
+        return "无法解析主机地址"
+    if "ssl" in low or "certificate" in low:
+        return "TLS 握手失败"
+    if "authorization" in low or "unauthorized" in low:
+        return "鉴权失败，请检查 API 密钥"
+    return _brief(error)
+
+
+def interpret_connect_result(result, error) -> tuple[bool, str]:
+    """解释连接预检查（GET /version）：返回 ``(能否使用, 版本号或失败原因)``。
+
+    只读探测不存在「写操作已发送但断连」的歧义，所以 ``SENT_BUT_DISCONNECTED``
+    在此按连不上处理（写操作仍由 ``interpret_api_result`` 保留原语义）。
+    Clash 对密钥错误返回 401 且带响应体，ClashAPI 会把它当正常结果返回，
+    因此这里必须校验状态码与版本字段，否则会把鉴权失败误判为连接成功。
+    """
+    if error == ClashAPI.SENT_BUT_DISCONNECTED:
+        return False, "未能读回响应，端点可能未启动或未开放控制接口"
+    if error:
+        return False, _transport_hint(str(error))
+    if not isinstance(result, dict):
+        return False, f"端点返回了无法识别的内容：{_brief(result)}"
+
+    status_code = result.get("status_code")
+    if isinstance(status_code, int) and not 200 <= status_code < 300:
+        if status_code in (401, 403):
+            return False, f"鉴权失败（HTTP {status_code}），请检查端点 API 密钥"
+        return False, f"HTTP {status_code}：{_brief(result.get('body') or result.get('message'))}"
+
+    version = result.get("version")
+    if not version:
+        return False, f"响应中没有版本信息，可能不是 Clash 控制接口：{_brief(result)}"
+    return True, str(version)

{clash_controller-0.2.3 → clash_controller-0.2.4}/clash_controller/screens/config.py

@@ -1,5 +1,6 @@
 """配置管理屏：配置提供方的增删改，以及拉取 / 比对 / 部署 / 重载流程。"""
 import asyncio
+import time
 
 from rich.text import Text
 from textual import on, work
@@ -11,7 +12,18 @@ from ..config import load_config_providers, save_config_providers
 from ..deploy import compute_sha256, evaluate_update, fetch_remote_config, read_current_config
 from ..ssh import apply_local_config_file, apply_remote_config_via_ssh
 from ..ui import PageScreen
-from ..widgets import ConfirmModal, FormField, FormModal, busy, fit_table_columns, load_rows, make_table, shorten
+from ..widgets import (
+    ConfirmModal,
+    ControlBusy,
+    FormField,
+    FormModal,
+    busy,
+    fit_table_columns,
+    hold_busy,
+    load_rows,
+    make_table,
+    shorten,
+)
 
 COLUMN_WEIGHTS = [2, 7]
 
@@ -30,6 +42,7 @@ class ConfigScreen(PageScreen):
         super().__init__()
         self._providers: list = []
         self._display: list = []
+        self._busy = ControlBusy(self)
 
     def compose_page(self):
         with Vertical(classes="panel"):
@@ -39,6 +52,7 @@ class ConfigScreen(PageScreen):
                 yield Button("编辑", id="edit")
                 yield Button("删除", id="delete", variant="error")
                 yield Button("重载配置", id="reload-api")
+                yield Button("更新Provider", id="update-providers")
                 yield Static("", classes="fill")
                 yield Static("单击行 = 部署该提供方", classes="fl-label")
         yield make_table("名称", "地址", id="cf-table")
@@ -240,10 +254,41 @@ class ConfigScreen(PageScreen):
 
     @work(exclusive=True)
     async def _reload_api(self) -> None:
-        self.app.status("正在重载配置…")
+        """就地忙碌态反馈（与设置页一致）：禁用按钮 + 文本换成点阵 spinner。"""
+        api = self.app.get_api()
+        button = self.query_one("#reload-api", Button)
+        started = time.monotonic()
+        self._busy.start(button)
         try:
-            result, error = await asyncio.to_thread(self.app.get_api().reload_configs)
+            result, error = await asyncio.to_thread(api.reload_configs)
+            await hold_busy(started)
         except Exception as e:  # noqa: BLE001
+            await hold_busy(started)
             self.app.notify_err(f"重载配置失败: {type(e).__name__}: {e}")
             return
+        finally:
+            self._busy.stop()
         self.app.report("重载配置", result, error)
+
+    @on(Button.Pressed, "#update-providers")
+    def _on_update_providers(self) -> None:
+        self._update_providers()
+
+    @work(exclusive=True)
+    async def _update_providers(self) -> None:
+        """就地忙碌态反馈：禁用按钮 + 文本换成点阵 spinner。"""
+        api = self.app.get_api()
+        button = self.query_one("#update-providers", Button)
+        started = time.monotonic()
+        self._busy.start(button)
+        try:
+            result, error = await asyncio.to_thread(api.update_all_providers)
+            await hold_busy(started)
+        except Exception as e:  # noqa: BLE001
+            await hold_busy(started)
+            self.app.notify_err(f"更新Provider失败: {type(e).__name__}: {e}")
+            return
+        finally:
+            self._busy.stop()
+        self.app.report("更新Provider", result, error)
+

{clash_controller-0.2.3 → clash_controller-0.2.4}/clash_controller/screens/overview.py

@@ -8,6 +8,7 @@ from datetime import datetime
 from rich.text import Text
 from textual import work
 from textual.containers import Horizontal, Vertical
+from textual.dom import NoScreen
 from textual.widgets import DataTable, Static
 
 from ..ui import PageScreen
@@ -16,6 +17,18 @@ from ..widgets import fit_table_columns, hold_busy, load_rows, make_table, short
 COLUMN_WEIGHTS = [4, 1.5, 1.5, 3, 3]
 
 
+def _attached(widget) -> bool:
+    """控件链是否仍连着屏幕。
+
+    页面退出时 worker 会被取消，而父链可能先于 `is_mounted` 复位被摘掉，
+    这时写 `table.loading` 会抛 NoScreen（覆盖层本来也随页面一起消失了）。
+    """
+    try:
+        return widget.screen is not None
+    except NoScreen:
+        return False
+
+
 class OverviewScreen(PageScreen):
     TITLE = "概览"
     HINT = "↑↓ / PgUp / PgDn 滚动连接表 · Ctrl+R 刷新 · Esc/Ctrl+C 返回"
@@ -185,8 +198,9 @@ class OverviewScreen(PageScreen):
                     if self.is_mounted:
                         await hold_busy(started)
                 finally:
-                    table.loading = False
-                if self.is_mounted:
+                    if _attached(table):
+                        table.loading = False
+                if _attached(table):
                     self.call_after_refresh(self._refit)  # 覆盖层撤下后区域宽可能变化，按最终宽度重排
                     table.focus()
 

{clash_controller-0.2.3 → clash_controller-0.2.4}/clash_controller/screens/profiles.py

@@ -1,5 +1,6 @@
 """端点档案屏（根屏）：居中 LOGO 版式，选择 / 连接 / 新增 / 编辑 / 删除（含 SSH 子表单）。"""
 import asyncio
+import time
 
 from rich.text import Text
 from textual import on, work
@@ -9,10 +10,11 @@ from textual.screen import Screen
 from textual.widgets import Button, OptionList, Static
 
 from .. import __version__
+from ..api import interpret_connect_result
 from ..config import load_profiles, save_profiles
 from ..deploy import default_endpoint_type
 from ..ui import LOGO_WIDTH, home_col_width, logo_text
-from ..widgets import ConfirmModal, FormField, FormModal, HintBar, MenuMarquee
+from ..widgets import ConfirmModal, FormField, FormModal, HintBar, MenuMarquee, busy, hold_busy
 
 try:  # textual 各版本 Option 导出位置不同
     from textual.widgets.option_list import Option
@@ -308,24 +310,46 @@ class ProfileListScreen(Screen):
         if error:
             self.app.notify_err(f"{profile.get('name', '?')}: {error}")
             return
+        name = str(profile.get("name", "?") or "?")
+        url = str(profile.get("url", "") or "")
         self.app.set_profile(profile)
-        self.app.add_log(f"Selected profile '{profile.get('name')}'.")
-        self.app.status(f"正在连接 {profile.get('url')} …")
-        try:
-            version_info, error = await asyncio.to_thread(self.app.get_api().get_version)
-        except Exception as e:  # noqa: BLE001
-            self.app.notify_err(f"连接失败: {type(e).__name__}: {e}")
+        self.app.add_log(f"Selected profile '{name}'.")
+        self.app.status(f"正在连接 {url} …")
+        started = time.monotonic()
+        version_info = None
+        api_error = None
+        conn_exc: Exception | None = None
+        async with busy(self.app, f"正在连接 {url} …", mode="bar"):
+            try:
+                version_info, api_error = await asyncio.to_thread(self.app.get_api().get_version)
+            except Exception as e:  # noqa: BLE001
+                conn_exc = e
+            # 本地 API 常在 1 帧内返回，补足最短可见时长，避免进度条「看不见」
+            await hold_busy(started)
+
+        if conn_exc is not None:
+            ok, detail = False, f"{type(conn_exc).__name__}: {conn_exc}"
+        else:
+            ok, detail = interpret_connect_result(version_info, api_error)
+
+        if not ok:
+            # 预检查不通过：留在端点选择界面，清掉档案，避免后续页面拿到坏客户端
+            message = f"无法连接端点 {name}（{url}）：{detail}"
+            self.app.add_log(message)
+            self.app.notify_err(message)
             self.app.clear_profile()
+            self.call_after_refresh(self._focus_list)
             return
-        if version_info:
-            version = version_info.get("version", "unknown")
-            self.app.add_log(f"Successfully connected to Clash (version: {version}).")
-            from .home import HomeScreen
 
-            self.app.push_screen(HomeScreen())
-        else:
-            self.app.notify_err(f"连接失败，请检查端点配置并确认 Clash 正在运行。错误：{error}")
-            self.app.clear_profile()
+        self.app.add_log(f"Successfully connected to Clash (version: {detail}).")
+        self.app.status(f"已连接 {name} · {detail}", "ok")
+        from .home import HomeScreen
+
+        self.app.push_screen(HomeScreen())
+
+    def _focus_list(self) -> None:
+        if self.is_mounted:
+            self.query_one("#pf-list", OptionList).focus()
 
     # ------------------------------------------------------------ 增删改
 

{clash_controller-0.2.3 → clash_controller-0.2.4}/clash_controller/screens/settings.py

@@ -34,6 +34,8 @@ class SettingsScreen(PageScreen):
         with Vertical(classes="panel"):
             with Horizontal(classes="filter-row"):
                 yield Static("核心操作", classes="fl-label")
+                yield Button("重载配置", id="reload-conf")
+                yield Button("更新Provider", id="update-providers")
                 yield Button("重载 GEO", id="reload-geo")
             with Horizontal(classes="filter-row gap-top"):
                 yield Static("重启升级", classes="fl-label")
@@ -100,6 +102,14 @@ class SettingsScreen(PageScreen):
             "set_mode", f"切换模式为 {labels.get(mode, mode)}", mode, control_id="st-mode"
         )
 
+    @on(Button.Pressed, "#reload-conf")
+    def _on_reload_conf(self) -> None:
+        self._call("reload_configs", "重载配置", control_id="reload-conf")
+
+    @on(Button.Pressed, "#update-providers")
+    def _on_update_providers(self) -> None:
+        self._call("update_all_providers", "更新Provider", control_id="update-providers")
+
     @on(Button.Pressed, "#reload-geo")
     def _on_reload_geo(self) -> None:
         self._call("reload_geo_databases", "重载 GEO 数据库", control_id="reload-geo")

{clash_controller-0.2.3 → clash_controller-0.2.4}/clash_controller/ui.py

@@ -12,6 +12,7 @@ from rich.text import Text
 from textual import on
 from textual.binding import Binding
 from textual.containers import Horizontal, Vertical, VerticalScroll
+from textual.css.query import NoMatches
 from textual.screen import Screen
 from textual.widgets import Button, Input, OptionList, Static, TextArea
 
@@ -176,14 +177,25 @@ class PageScreen(Screen):
     # ------------------------------------------------------------ 标题 / 副标题
 
     def set_subtitle(self, text: str) -> None:
+        """更新顶栏副标题。
+
+        判定不能用 ``is_mounted``：`on_mount` 里它仍是 `False`（Textual 派发完
+        Mount 事件之后才置位），首屏副标题会永远停在空串。改为按顶栏控件是否
+        已组合判断：未组合时仅保存文本，交由 compose 使用。
+        """
         self.subtitle = text
-        if self.is_mounted:
+        try:
             self.query_one("#tb-sub", Static).update(text)
+        except NoMatches:
+            pass
 
     def set_title(self, text: str) -> None:
+        """更新顶栏标题；判定口径同 set_subtitle。"""
         self.TITLE = text
-        if self.is_mounted:
+        try:
             self.query_one(".tb-title", Static).update(Text(text, style="bold"))
+        except NoMatches:
+            pass
 
     # ------------------------------------------------------------ 折叠菜单
 

{clash_controller-0.2.3 → clash_controller-0.2.4}/clash_controller.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clash_controller
-Version: 0.2.3
+Version: 0.2.4
 Summary: A Textual TUI for managing Clash proxy instances
 Author-email: Moha-Master <hongkongreporter@outlook.com>
 License-Expression: MIT

{clash_controller-0.2.3 → clash_controller-0.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "clash_controller"
-version = "0.2.3"
+version = "0.2.4"
 description = "A Textual TUI for managing Clash proxy instances"
 readme = "README.md"
 requires-python = ">=3.10"