From a5d164cf43fbfa073b2ff5773a9dee6ae43cad79 Mon Sep 17 00:00:00 2001 From: "cto-new[bot]" <140088366+cto-new[bot]@users.noreply.github.com> Date: Mon, 24 Nov 2025 12:55:15 +0000 Subject: [PATCH 1/2] feat(warp): add WARP status checks and system health API --- WARP_STATUS_CHECK.md | 166 +++++++++++++++++++++++++++++++ app/api/admin/manage.py | 202 ++++++++++++++++++++++++++++++++++++++ main.py | 43 +++++++- readme.md | 33 +++++++ tests/test_warp_api.py | 83 ++++++++++++++++ tests/test_warp_docker.sh | 59 +++++++++++ tests/test_warp_status.py | 92 +++++++++++++++++ 7 files changed, 673 insertions(+), 5 deletions(-) create mode 100644 WARP_STATUS_CHECK.md create mode 100644 tests/test_warp_api.py create mode 100755 tests/test_warp_docker.sh create mode 100755 tests/test_warp_status.py diff --git a/WARP_STATUS_CHECK.md b/WARP_STATUS_CHECK.md new file mode 100644 index 000000000..34478cea9 --- /dev/null +++ b/WARP_STATUS_CHECK.md @@ -0,0 +1,166 @@ +# WARP连接状态检查功能 + +本文档说明了如何检查Docker环境内的WARP连接状态。 + +## 功能概述 + +我们为Grok2API项目添加了完整的WARP连接状态检查功能，包括： + +1. **基础健康检查端点** - 简单的WARP连接状态 +2. **详细系统状态API** - 完整的系统状态信息 +3. **容器内直接检查** - 命令行工具 + +## 使用方法 + +### 1. 健康检查端点 + +**端点**: `GET /health` + +**示例**: +```bash +curl http://localhost:8000/health +``` + +**响应示例**: +```json +{ + "status": "healthy", + "service": "Grok2API", + "version": "1.0.3", + "warp_connected": true +} +``` + +### 2. 详细系统状态API + +**端点**: `GET /api/system/status`（需要管理员认证） + +**步骤**: +1. 登录管理后台获取token: +```bash +curl -X POST http://localhost:8000/api/login \ + -H "Content-Type: application/json" \ + -d '{"username": "admin", "password": "admin"}' +``` + +2. 使用token获取系统状态: +```bash +curl -H "Authorization: Bearer " \ + http://localhost:8000/api/system/status +``` + +**响应示例**: +```json +{ + "success": true, + "data": { + "overall_status": "正常", + "healthy": true, + "storage_mode": "FILE", + "warp": { + "installed": true, + "connected": true, + "status": "已连接", + "details": "Status update: Connected", + "error": null + }, + "dbus": { + "running": true, + "status": "运行中", + "socket_exists": true + }, + "network": { + "connected": true, + "status": "连通", + "error": null + }, + "timestamp": "2024-11-24T12:52:05.155000" + } +} +``` + +### 3. 容器内直接检查 + +```bash +# 进入容器 +docker exec -it bash + +# 检查WARP状态 +warp-cli status + +# 检查D-Bus服务 +ls -la /run/dbus/system_bus_socket + +# 检查warp-svc进程 +ps aux | grep warp-svc +``` + +## 状态说明 + +### WARP状态 +- **已连接**: WARP正常工作，流量通过WARP代理 +- **连接中**: WARP正在尝试连接 +- **未连接**: WARP已安装但未连接 +- **未安装**: WARP客户端未安装 +- **错误**: 检查过程中出现错误 + +### D-Bus状态 +- **运行中**: D-Bus服务正常运行 +- **未运行**: D-Bus服务未启动 + +### 网络连通性 +- **连通**: 可以访问外部网络（测试1.1.1.1） +- **不通**: 无法访问外部网络 + +## 故障排除 + +### WARP未连接 +1. 检查容器是否有足够权限： + ```bash + docker run --cap-add=NET_ADMIN --cap-add=SYS_ADMIN ... + ``` + +2. 检查系统参数： + ```bash + --sysctl net.ipv6.conf.all.disable_ipv6=0 + --sysctl net.ipv4.ip_forward=1 + ``` + +3. 手动连接： + ```bash + docker exec warp-cli connect + ``` + +### D-Bus服务异常 +1. 重启D-Bus： + ```bash + docker exec dbus-daemon --system --nofork --nopidfile --address=unix:path=/run/dbus/system_bus_socket & + ``` + +### 网络不通 +1. 检查容器网络配置 +2. 验证DNS设置 +3. 检查防火墙规则 + +## 测试脚本 + +项目提供了测试脚本来验证功能： + +1. **本地测试**: + ```bash + python test_warp_status.py + ``` + +2. **API测试**: + ```bash + python test_warp_api.py + ``` + +3. **Docker测试**: + ```bash + ./test_warp_docker.sh + ``` + +## 集成说明 + +这些功能已集成到现有的管理后台中，可以通过Web界面查看系统状态，也可以通过API进行程序化检查。所有检查都是非阻塞的，不会影响正常的API服务。 \ No newline at end of file diff --git a/app/api/admin/manage.py b/app/api/admin/manage.py index cb0fe8181..cb58662a8 100644 --- a/app/api/admin/manage.py +++ b/app/api/admin/manage.py @@ -1,6 +1,8 @@ """管理接口 - Token管理和系统配置""" import secrets +import asyncio +import subprocess from typing import Dict, Any, List, Optional from datetime import datetime, timedelta from pathlib import Path @@ -193,6 +195,132 @@ def _format_size(size_bytes: int) -> str: return f"{size_mb:.1f} MB" +async def _check_warp_status() -> Dict[str, Any]: + """检查WARP连接状态""" + try: + # 检查warp-cli命令是否存在 + check_cmd = ["which", "warp-cli"] + result = await asyncio.create_subprocess_exec( + *check_cmd, + stdout=asyncio.subprocess.PIPE, + stderr=asyncio.subprocess.PIPE + ) + stdout, stderr = await result.communicate() + + if result.returncode != 0: + return { + "installed": False, + "connected": False, + "status": "未安装", + "error": "warp-cli命令未找到" + } + + # 获取WARP状态 + status_cmd = ["warp-cli", "status"] + result = await asyncio.create_subprocess_exec( + *status_cmd, + stdout=asyncio.subprocess.PIPE, + stderr=asyncio.subprocess.PIPE + ) + stdout, stderr = await result.communicate() + + status_output = stdout.decode('utf-8').strip() + error_output = stderr.decode('utf-8').strip() + + if result.returncode != 0: + return { + "installed": True, + "connected": False, + "status": "错误", + "error": error_output or "获取状态失败" + } + + # 解析状态输出 + is_connected = "Connected" in status_output + is_connecting = "Connecting" in status_output + is_disconnected = "Disconnected" in status_output + + status = "已连接" if is_connected else ("连接中" if is_connecting else "未连接") + + return { + "installed": True, + "connected": is_connected, + "status": status, + "details": status_output, + "error": None + } + + except Exception as e: + logger.error(f"[Admin] 检查WARP状态异常: {e}") + return { + "installed": False, + "connected": False, + "status": "检查失败", + "error": str(e) + } + + +async def _check_dbus_status() -> Dict[str, Any]: + """检查D-Bus服务状态""" + try: + # 检查D-Bus socket是否存在 + dbus_socket = Path("/run/dbus/system_bus_socket") + if dbus_socket.exists(): + return { + "running": True, + "status": "运行中", + "socket_exists": True + } + else: + return { + "running": False, + "status": "未运行", + "socket_exists": False + } + except Exception as e: + logger.error(f"[Admin] 检查D-Bus状态异常: {e}") + return { + "running": False, + "status": "检查失败", + "error": str(e) + } + + +async def _check_network_connectivity() -> Dict[str, Any]: + """检查网络连通性""" + try: + # 使用curl检查连接到Cloudflare + test_cmd = ["curl", "-s", "--connect-timeout", "5", "--max-time", "10", "https://1.1.1.1"] + result = await asyncio.create_subprocess_exec( + *test_cmd, + stdout=asyncio.subprocess.PIPE, + stderr=asyncio.subprocess.PIPE + ) + stdout, stderr = await result.communicate() + + if result.returncode == 0: + return { + "connected": True, + "status": "连通", + "error": None + } + else: + error_msg = stderr.decode('utf-8').strip() if stderr else "连接超时" + return { + "connected": False, + "status": "不通", + "error": error_msg + } + + except Exception as e: + logger.error(f"[Admin] 检查网络连通性异常: {e}") + return { + "connected": False, + "status": "检查失败", + "error": str(e) + } + + # === 页面路由 === @router.get("/login", response_class=HTMLResponse) @@ -620,3 +748,77 @@ async def test_token(request: TestTokenRequest, _: bool = Depends(verify_admin_s except Exception as e: logger.error(f"[Admin] Token测试异常: {e}") raise HTTPException(status_code=500, detail={"error": f"测试失败: {e}", "code": "TEST_TOKEN_ERROR"}) + + +@router.get("/api/system/status") +async def get_system_status(_: bool = Depends(verify_admin_session)) -> Dict[str, Any]: + """获取系统状态信息""" + try: + logger.debug("[Admin] 开始获取系统状态") + + # 并行检查各项状态 + warp_status, dbus_status, network_status = await asyncio.gather( + _check_warp_status(), + _check_dbus_status(), + _check_network_connectivity(), + return_exceptions=True + ) + + # 处理异常结果 + if isinstance(warp_status, Exception): + logger.error(f"[Admin] WARP状态检查异常: {warp_status}") + warp_status = { + "installed": False, + "connected": False, + "status": "检查失败", + "error": str(warp_status) + } + + if isinstance(dbus_status, Exception): + logger.error(f"[Admin] D-Bus状态检查异常: {dbus_status}") + dbus_status = { + "running": False, + "status": "检查失败", + "error": str(dbus_status) + } + + if isinstance(network_status, Exception): + logger.error(f"[Admin] 网络连通性检查异常: {network_status}") + network_status = { + "connected": False, + "status": "检查失败", + "error": str(network_status) + } + + # 计算整体系统状态 + system_healthy = ( + warp_status.get("installed", False) and + warp_status.get("connected", False) and + dbus_status.get("running", False) and + network_status.get("connected", False) + ) + + overall_status = "正常" if system_healthy else "异常" + + # 获取存储模式 + import os + storage_mode = os.getenv("STORAGE_MODE", "file").upper() + + logger.debug(f"[Admin] 系统状态获取完成 - WARP: {warp_status.get('status')}, D-Bus: {dbus_status.get('status')}, 网络: {network_status.get('status')}") + + return { + "success": True, + "data": { + "overall_status": overall_status, + "healthy": system_healthy, + "storage_mode": storage_mode, + "warp": warp_status, + "dbus": dbus_status, + "network": network_status, + "timestamp": datetime.now().isoformat() + } + } + + except Exception as e: + logger.error(f"[Admin] 获取系统状态异常: {e}") + raise HTTPException(status_code=500, detail={"error": f"获取失败: {e}", "code": "SYSTEM_STATUS_ERROR"}) diff --git a/main.py b/main.py index 2b9c46309..18048b397 100644 --- a/main.py +++ b/main.py @@ -99,11 +99,44 @@ async def root(): @app.get("/health") async def health_check(): """健康检查接口""" - return { - "status": "healthy", - "service": "Grok2API", - "version": "1.0.3" - } + try: + # 简单检查WARP状态（非阻塞） + import asyncio + import subprocess + + async def quick_warp_check(): + try: + proc = await asyncio.create_subprocess_exec( + "warp-cli", "status", + stdout=asyncio.subprocess.PIPE, + stderr=asyncio.subprocess.PIPE + ) + stdout, stderr = await proc.communicate() + if proc.returncode == 0: + status_output = stdout.decode('utf-8').strip() + return "Connected" in status_output + return False + except: + return False + + # 在事件循环中运行检查 + loop = asyncio.get_event_loop() + warp_connected = await quick_warp_check() + + return { + "status": "healthy", + "service": "Grok2API", + "version": "1.0.3", + "warp_connected": warp_connected + } + except: + # 如果检查失败，返回基本状态 + return { + "status": "healthy", + "service": "Grok2API", + "version": "1.0.3", + "warp_connected": None + } # 挂载MCP服务器 app.mount("", mcp_app) diff --git a/readme.md b/readme.md index 187204807..d816e47c7 100644 --- a/readme.md +++ b/readme.md @@ -339,6 +339,39 @@ Docker 镜像已内置自动安装和启动 **Cloudflare WARP** 网络代理功 | `net.ipv6.conf.all.disable_ipv6=0` | 启用 IPv6 支持（WARP 使用） | | `net.ipv4.ip_forward=1` | 启用 IPv4 转发 | +**WARP 状态检查：** + +系统提供多种方式检查 WARP 连接状态： + +1. **健康检查端点**：`GET /health` + ```bash + curl http://localhost:8000/health + # 返回示例：{"status": "healthy", "service": "Grok2API", "version": "1.0.3", "warp_connected": true} + ``` + +2. **管理后台系统状态**：`GET /api/system/status`（需要管理员登录） + ```bash + # 先登录获取token，然后： + curl -H "Authorization: Bearer " http://localhost:8000/api/system/status + ``` + 返回详细的系统状态信息，包括： + - WARP 安装和连接状态 + - D-Bus 服务状态 + - 网络连通性测试 + - 整体系统健康状态 + +3. **容器内直接检查**： + ```bash + # 进入容器 + docker exec -it bash + + # 检查WARP状态 + warp-cli status + + # 检查D-Bus服务 + ls -la /run/dbus/system_bus_socket + ``` + **禁用 WARP（可选）：** 如不需要 WARP 代理，可使用自己的 Docker 镜像或修改启动脚本。 diff --git a/tests/test_warp_api.py b/tests/test_warp_api.py new file mode 100644 index 000000000..564374942 --- /dev/null +++ b/tests/test_warp_api.py @@ -0,0 +1,83 @@ +#!/usr/bin/env python3 +""" +测试WARP状态检查API端点 +""" + +import asyncio +import aiohttp +import json + + +async def test_health_endpoint(): + """测试健康检查端点""" + print("=== 测试健康检查端点 ===") + + try: + async with aiohttp.ClientSession() as session: + async with session.get('http://localhost:8001/health', timeout=aiohttp.ClientTimeout(total=10)) as response: + if response.status == 200: + data = await response.json() + print(f"健康检查响应: {json.dumps(data, indent=2, ensure_ascii=False)}") + + if 'warp_connected' in data: + warp_status = data['warp_connected'] + if warp_status is True: + print("✓ WARP已连接") + elif warp_status is False: + print("✗ WARP未连接") + else: + print("? WARP状态未知") + else: + print("! 响应中缺少warp_connected字段") + else: + print(f"✗ 请求失败，状态码: {response.status}") + + except aiohttp.ClientConnectorError: + print("✗ 无法连接到服务器，请确保应用正在运行") + except asyncio.TimeoutError: + print("✗ 请求超时") + except Exception as e: + print(f"✗ 测试异常: {e}") + + +async def test_system_status_endpoint(): + """测试系统状态端点（需要认证）""" + print("\n=== 测试系统状态端点 ===") + print("注意：此端点需要管理员认证，这里只测试未认证的情况") + + try: + async with aiohttp.ClientSession() as session: + async with session.get('http://localhost:8001/api/system/status', timeout=aiohttp.ClientTimeout(total=10)) as response: + if response.status == 401: + print("✓ 端点存在且需要认证（符合预期）") + elif response.status == 200: + data = await response.json() + print(f"意外成功响应: {json.dumps(data, indent=2, ensure_ascii=False)}") + else: + print(f"响应状态码: {response.status}") + + except aiohttp.ClientConnectorError: + print("✗ 无法连接到服务器，请确保应用正在运行") + except asyncio.TimeoutError: + print("✗ 请求超时") + except Exception as e: + print(f"✗ 测试异常: {e}") + + +async def main(): + """主测试函数""" + print("开始测试WARP状态检查API端点...\n") + + await test_health_endpoint() + await test_system_status_endpoint() + + print("\n测试完成！") + print("\n要测试完整的系统状态功能，请：") + print("1. 启动应用: python -m uvicorn main:app --host 0.0.0.0 --port 8001") + print("2. 访问管理后台: http://localhost:8001/login") + print("3. 使用 admin/admin 登录") + print("4. 调用 /api/system/status API") + + +if __name__ == "__main__": + asyncio.run(main()) \ No newline at end of file diff --git a/tests/test_warp_docker.sh b/tests/test_warp_docker.sh new file mode 100755 index 000000000..6919f3b16 --- /dev/null +++ b/tests/test_warp_docker.sh @@ -0,0 +1,59 @@ +#!/bin/bash +# Docker环境下的WARP状态检查测试 + +set -e + +# 颜色输出 +RED='\033[0;31m' +GREEN='\033[0;32m' +YELLOW='\033[1;33m' +NC='\033[0m' # No Color + +echo -e "${YELLOW}=== Docker环境WARP状态检查测试 ===${NC}" + +# 构建镜像 +echo -e "${YELLOW}[1/4] 构建Docker镜像...${NC}" +docker build -t grok2api-warp-test . + +# 运行容器 +echo -e "${YELLOW}[2/4] 启动容器...${NC}" +CONTAINER_ID=$(docker run -d --rm \ + --cap-add=NET_ADMIN \ + --cap-add=SYS_ADMIN \ + --sysctl net.ipv6.conf.all.disable_ipv6=0 \ + --sysctl net.ipv4.ip_forward=1 \ + -p 8000:8000 \ + grok2api-warp-test) + +echo -e "${GREEN}容器ID: $CONTAINER_ID${NC}" + +# 等待容器启动 +echo -e "${YELLOW}[3/4] 等待服务启动...${NC}" +sleep 10 + +# 检查容器内WARP状态 +echo -e "${YELLOW}[4/4] 检查WARP状态...${NC}" + +echo -e "\n${GREEN}=== WARP安装检查 ===${NC}" +docker exec $CONTAINER_ID which warp-cli || echo -e "${RED}warp-cli未找到${NC}" + +echo -e "\n${GREEN}=== WARP服务状态 ===${NC}" +docker exec $CONTAINER_ID warp-cli status || echo -e "${RED}无法获取WARP状态${NC}" + +echo -e "\n${GREEN}=== D-Bus服务状态 ===${NC}" +docker exec $CONTAINER_ID ls -la /run/dbus/system_bus_socket || echo -e "${RED}D-Bus socket不存在${NC}" + +echo -e "\n${GREEN}=== 健康检查API ===${NC}" +curl -s http://localhost:8000/health | python3 -m json.tool || echo -e "${RED}健康检查失败${NC}" + +echo -e "\n${GREEN}=== 系统状态API（需要先登录） ===${NC}" +echo "要测试系统状态API，请：" +echo "1. 访问 http://localhost:8000/login" +echo "2. 使用 admin/admin 登录" +echo "3. 调用 /api/system/status API" + +# 清理 +echo -e "\n${YELLOW}清理容器...${NC}" +docker stop $CONTAINER_ID + +echo -e "${GREEN}测试完成！${NC}" \ No newline at end of file diff --git a/tests/test_warp_status.py b/tests/test_warp_status.py new file mode 100755 index 000000000..b366147c7 --- /dev/null +++ b/tests/test_warp_status.py @@ -0,0 +1,92 @@ +#!/usr/bin/env python3 +""" +测试WARP状态检查功能 +""" + +import asyncio +import sys +import os + +# 添加项目根目录到Python路径 +sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) + +from app.api.admin.manage import _check_warp_status, _check_dbus_status, _check_network_connectivity + + +async def test_warp_status(): + """测试WARP状态检查""" + print("=== 测试WARP状态检查 ===") + + try: + warp_status = await _check_warp_status() + print(f"WARP状态: {warp_status}") + + if warp_status.get("installed"): + print(f"✓ WARP已安装") + if warp_status.get("connected"): + print(f"✓ WARP已连接") + else: + print(f"✗ WARP未连接: {warp_status.get('status')}") + else: + print(f"✗ WARP未安装") + + if warp_status.get("error"): + print(f"错误信息: {warp_status.get('error')}") + + except Exception as e: + print(f"测试异常: {e}") + + +async def test_dbus_status(): + """测试D-Bus状态检查""" + print("\n=== 测试D-Bus状态检查 ===") + + try: + dbus_status = await _check_dbus_status() + print(f"D-Bus状态: {dbus_status}") + + if dbus_status.get("running"): + print(f"✓ D-Bus服务运行中") + else: + print(f"✗ D-Bus服务未运行: {dbus_status.get('status')}") + + if dbus_status.get("error"): + print(f"错误信息: {dbus_status.get('error')}") + + except Exception as e: + print(f"测试异常: {e}") + + +async def test_network_connectivity(): + """测试网络连通性检查""" + print("\n=== 测试网络连通性检查 ===") + + try: + network_status = await _check_network_connectivity() + print(f"网络状态: {network_status}") + + if network_status.get("connected"): + print(f"✓ 网络连通正常") + else: + print(f"✗ 网络连通异常: {network_status.get('status')}") + + if network_status.get("error"): + print(f"错误信息: {network_status.get('error')}") + + except Exception as e: + print(f"测试异常: {e}") + + +async def main(): + """主测试函数""" + print("开始测试WARP连接状态检查功能...\n") + + await test_warp_status() + await test_dbus_status() + await test_network_connectivity() + + print("\n测试完成！") + + +if __name__ == "__main__": + asyncio.run(main()) \ No newline at end of file From 5209f80c1f63ef47314051b141e54c3c3de1473c Mon Sep 17 00:00:00 2001 From: "cto-new[bot]" <140088366+cto-new[bot]@users.noreply.github.com> Date: Mon, 24 Nov 2025 13:05:47 +0000 Subject: [PATCH 2/2] feat(warp): add WARP health/status checks, tests, docs --- WARP_REGISTRATION_MISSING_FIX.md | 188 +++++++++++++++++++++++++++++ WARP_STATUS_CHECK.md | 144 +++++++++++++++++++--- app/api/admin/manage.py | 138 ++++++++++++++++++++-- readme.md | 9 ++ scripts/warp_quickfix.sh | 147 +++++++++++++++++++++++ scripts/warp_troubleshoot.sh | 197 +++++++++++++++++++++++++++++++ tests/test_warp_docker.sh | 3 + 7 files changed, 801 insertions(+), 25 deletions(-) create mode 100644 WARP_REGISTRATION_MISSING_FIX.md create mode 100755 scripts/warp_quickfix.sh create mode 100755 scripts/warp_troubleshoot.sh diff --git a/WARP_REGISTRATION_MISSING_FIX.md b/WARP_REGISTRATION_MISSING_FIX.md new file mode 100644 index 000000000..21aee8e69 --- /dev/null +++ b/WARP_REGISTRATION_MISSING_FIX.md @@ -0,0 +1,188 @@ +# WARP "Registration Missing due to: Daemon Startup" 错误解决方案 + +## 问题描述 + +当运行 `warp-cli status` 时出现以下错误： +``` +Status update: Unable +Reason: Registration Missing due to: Daemon Startup +``` + +## 根本原因 + +这个错误通常表示WARP守护进程（warp-svc）没有正常启动或无法与D-Bus服务通信。 + +## 解决方案 + +### 方案1：使用快速修复脚本（推荐） + +```bash +# 在容器内运行 +./scripts/warp_quickfix.sh +``` + +这个脚本会自动： +1. 清理旧的进程和socket文件 +2. 重新启动D-Bus服务 +3. 启动WARP守护进程 +4. 尝试连接WARP + +### 方案2：手动修复步骤 + +#### 步骤1：清理旧进程 +```bash +# 终止可能存在的WARP和D-Bus进程 +pkill -f warp-svc +pkill -f dbus-daemon + +# 删除旧的socket文件 +rm -f /run/dbus/system_bus_socket +``` + +#### 步骤2：启动D-Bus服务 +```bash +# 创建D-Bus运行目录 +mkdir -p /run/dbus + +# 启动D-Bus守护进程 +dbus-daemon --system --nofork --nopidfile --address=unix:path=/run/dbus/system_bus_socket & + +# 等待服务启动 +sleep 2 +``` + +#### 步骤3：验证D-Bus服务 +```bash +# 检查socket文件是否存在 +ls -la /run/dbus/system_bus_socket + +# 检查进程是否运行 +ps aux | grep dbus-daemon +``` + +#### 步骤4：启动WARP守护进程 +```bash +# 启动warp-svc守护进程 +warp-svc & + +# 等待服务启动 +sleep 3 +``` + +#### 步骤5：连接WARP +```bash +# 尝试连接 +warp-cli connect + +# 检查状态 +warp-cli status +``` + +### 方案3：使用详细故障排除 + +```bash +# 运行详细的故障排除脚本 +./scripts/warp_troubleshoot.sh +``` + +该脚本会： +- 检查所有相关服务的状态 +- 提供详细的诊断信息 +- 给出针对性的修复建议 +- 提供自动修复选项 + +## 预防措施 + +### 1. 确保正确的Docker权限 + +在运行Docker容器时，确保包含必要的权限： + +```bash +docker run --cap-add=NET_ADMIN \ + --cap-add=SYS_ADMIN \ + --sysctl net.ipv6.conf.all.disable_ipv6=0 \ + --sysctl net.ipv4.ip_forward=1 \ + your-image +``` + +### 2. 使用官方的启动脚本 + +项目提供的 `docker-entrypoint.sh` 已经包含了正确的启动顺序： +1. 启动D-Bus服务 +2. 启动WARP守护进程 +3. 连接WARP +4. 启动应用程序 + +### 3. 检查系统兼容性 + +确保系统满足以下要求： +- 支持TUN/TAP设备 +- 具有必要的系统权限 +- 内核版本兼容 + +## 验证修复 + +修复后，可以通过以下方式验证： + +### 1. 命令行检查 +```bash +# 检查WARP状态 +warp-cli status + +# 预期输出应包含 "Connected" +``` + +### 2. API检查 +```bash +# 健康检查端点 +curl http://localhost:8000/health + +# 预期输出应包含 "warp_connected": true +``` + +### 3. 系统状态API +```bash +# 需要先登录获取token +curl -H "Authorization: Bearer " \ + http://localhost:8000/api/system/status + +# 检查warp.connected字段 +``` + +## 常见变体错误 + +### "Registration Missing" (无Daemon Startup) +通常表示WARP守护进程完全未运行。 + +### "Unable to connect to WARP service" +表示warp-cli无法与warp-svc通信。 + +### "Permission denied" +通常是权限问题，需要NET_ADMIN和SYS_ADMIN权限。 + +## 获取帮助 + +如果问题仍然存在： + +1. **查看日志**： + ```bash + journalctl -u warp-svc -f + ``` + +2. **运行诊断脚本**： + ```bash + ./scripts/warp_troubleshoot.sh + ``` + +3. **检查系统状态**： + ```bash + # 通过API检查 + curl http://localhost:8000/api/system/status + ``` + +4. **重启容器**： + 有时简单的容器重启可以解决临时性问题。 + +## 总结 + +"Registration Missing due to: Daemon Startup" 错误通常是WARP服务启动顺序或权限问题。使用提供的快速修复脚本可以自动解决大多数情况，而手动修复步骤可以帮助理解问题的根本原因。 \ No newline at end of file diff --git a/WARP_STATUS_CHECK.md b/WARP_STATUS_CHECK.md index 34478cea9..9dc3c8cae 100644 --- a/WARP_STATUS_CHECK.md +++ b/WARP_STATUS_CHECK.md @@ -114,33 +114,147 @@ ps aux | grep warp-svc ## 故障排除 -### WARP未连接 -1. 检查容器是否有足够权限： +### 自动故障排除 + +我们提供了两个自动化脚本来帮助解决WARP连接问题： + +#### 1. 详细故障排除脚本 + +```bash +# 在容器内或本地运行 +./scripts/warp_troubleshoot.sh +``` + +该脚本会全面检查： +- 运行环境（Docker/本地） +- 系统权限（TUN设备访问） +- WARP安装和版本 +- D-Bus服务状态 +- WARP守护进程状态 +- 网络连通性 + +并提供针对性的修复建议和自动修复选项。 + +#### 2. 快速修复脚本 + +```bash +# 快速修复常见WARP连接问题 +./scripts/warp_quickfix.sh +``` + +该脚本会自动执行以下修复步骤： +1. 清理旧的WARP和D-Bus进程 +2. 删除旧的socket文件 +3. 重新创建必要目录 +4. 启动D-Bus服务 +5. 启动WARP守护进程 +6. 尝试连接WARP + +适用于大多数常见的WARP连接问题。 + +### 常见问题解决 + +#### WARP未连接 +1. **检查容器权限**： ```bash - docker run --cap-add=NET_ADMIN --cap-add=SYS_ADMIN ... + docker run --cap-add=NET_ADMIN --cap-add=SYS_ADMIN \ + --sysctl net.ipv6.conf.all.disable_ipv6=0 \ + --sysctl net.ipv4.ip_forward=1 \ + your-image ``` -2. 检查系统参数： +2. **启动D-Bus服务**： ```bash - --sysctl net.ipv6.conf.all.disable_ipv6=0 - --sysctl net.ipv4.ip_forward=1 + mkdir -p /run/dbus + dbus-daemon --system --nofork --nopidfile --address=unix:path=/run/dbus/system_bus_socket & ``` -3. 手动连接： +3. **启动WARP守护进程**： ```bash - docker exec warp-cli connect + warp-svc & + sleep 2 ``` -### D-Bus服务异常 -1. 重启D-Bus： +4. **连接WARP**： + ```bash + warp-cli connect + ``` + +#### "Registration Missing due to: Daemon Startup" 错误 + +这个错误通常表示WARP守护进程启动失败： + +1. **重启守护进程**： ```bash - docker exec dbus-daemon --system --nofork --nopidfile --address=unix:path=/run/dbus/system_bus_socket & + pkill warp-svc + warp-svc & + sleep 3 + warp-cli connect ``` -### 网络不通 -1. 检查容器网络配置 -2. 验证DNS设置 -3. 检查防火墙规则 +2. **检查D-Bus服务**： + ```bash + ls -la /run/dbus/system_bus_socket + ``` + +3. **在Docker容器中运行**： + 确保使用正确的权限和系统参数。 + +#### D-Bus服务异常 + +1. **手动启动D-Bus**： + ```bash + mkdir -p /run/dbus + dbus-daemon --system --nofork --nopidfile --address=unix:path=/run/dbus/system_bus_socket & + ``` + +2. **检查socket权限**： + ```bash + ls -la /run/dbus/ + ``` + +3. **清理旧的socket文件**： + ```bash + rm -f /run/dbus/system_bus_socket + # 重新启动D-Bus服务 + ``` + +#### 网络连通性问题 + +1. **测试基础连接**： + ```bash + curl -I https://1.1.1.1 + ``` + +2. **检查DNS解析**： + ```bash + nslookup 1.1.1.1 + ``` + +3. **查看容器网络**： + ```bash + ip addr show + route -n + ``` + +### 本地开发环境 + +如果在本地开发环境中，WARP功能可能受限： +- 建议使用Docker容器进行开发和测试 +- 或者手动安装WARP客户端（需要root权限） + +### 日志查看 + +```bash +# 查看WARP服务日志 +journalctl -u warp-svc -f + +# 查看系统日志 +dmesg | grep -i warp + +# 查看D-Bus日志 +journalctl -u dbus -f +``` ## 测试脚本 diff --git a/app/api/admin/manage.py b/app/api/admin/manage.py index cb58662a8..a80dfb523 100644 --- a/app/api/admin/manage.py +++ b/app/api/admin/manage.py @@ -212,7 +212,37 @@ async def _check_warp_status() -> Dict[str, Any]: "installed": False, "connected": False, "status": "未安装", - "error": "warp-cli命令未找到" + "error": "warp-cli命令未找到", + "suggestions": [ + "在Docker容器中运行应用以使用WARP功能", + "或者手动安装Cloudflare WARP客户端" + ] + } + + # 检查warp-svc进程是否运行 + ps_cmd = ["ps", "aux"] + result = await asyncio.create_subprocess_exec( + *ps_cmd, + stdout=asyncio.subprocess.PIPE, + stderr=asyncio.subprocess.PIPE + ) + stdout, stderr = await result.communicate() + ps_output = stdout.decode('utf-8') + + warp_svc_running = "warp-svc" in ps_output + + if not warp_svc_running: + return { + "installed": True, + "connected": False, + "status": "守护进程未运行", + "error": "warp-svc守护进程未启动", + "details": "WARP已安装但守护进程未运行", + "suggestions": [ + "启动warp-svc守护进程: warp-svc &", + "检查D-Bus服务是否正常运行", + "在Docker容器中运行以确保正确的权限配置" + ] } # 获取WARP状态 @@ -228,11 +258,35 @@ async def _check_warp_status() -> Dict[str, Any]: error_output = stderr.decode('utf-8').strip() if result.returncode != 0: + # 分析具体错误 + if "Registration Missing" in error_output: + error_detail = "WARP注册缺失，通常是因为守护进程启动问题" + suggestions = [ + "重启warp-svc守护进程", + "检查D-Bus服务状态: ls -la /run/dbus/system_bus_socket", + "在具有适当权限的Docker容器中运行" + ] + elif "Daemon Startup" in error_output: + error_detail = "WARP守护进程启动失败" + suggestions = [ + "确保容器有NET_ADMIN和SYS_ADMIN权限", + "检查系统内核版本兼容性", + "重启容器或重新安装WARP" + ] + else: + error_detail = error_output or "获取状态失败" + suggestions = [ + "检查WARP服务状态", + "查看系统日志获取详细错误信息" + ] + return { "installed": True, "connected": False, "status": "错误", - "error": error_output or "获取状态失败" + "error": error_detail, + "details": error_output, + "suggestions": suggestions } # 解析状态输出 @@ -240,14 +294,22 @@ async def _check_warp_status() -> Dict[str, Any]: is_connecting = "Connecting" in status_output is_disconnected = "Disconnected" in status_output - status = "已连接" if is_connected else ("连接中" if is_connecting else "未连接") + if is_connected: + status = "已连接" + elif is_connecting: + status = "连接中" + elif is_disconnected: + status = "未连接" + else: + status = "未知状态" return { "installed": True, "connected": is_connected, "status": status, "details": status_output, - "error": None + "error": None, + "warp_svc_running": warp_svc_running } except Exception as e: @@ -256,7 +318,11 @@ async def _check_warp_status() -> Dict[str, Any]: "installed": False, "connected": False, "status": "检查失败", - "error": str(e) + "error": f"检查异常: {str(e)}", + "suggestions": [ + "检查系统权限配置", + "确保在支持的环境中运行" + ] } @@ -265,24 +331,76 @@ async def _check_dbus_status() -> Dict[str, Any]: try: # 检查D-Bus socket是否存在 dbus_socket = Path("/run/dbus/system_bus_socket") - if dbus_socket.exists(): + socket_exists = dbus_socket.exists() + + # 检查D-Bus进程是否运行 + ps_cmd = ["ps", "aux"] + result = await asyncio.create_subprocess_exec( + *ps_cmd, + stdout=asyncio.subprocess.PIPE, + stderr=asyncio.subprocess.PIPE + ) + stdout, stderr = await result.communicate() + ps_output = stdout.decode('utf-8') + + dbus_daemon_running = "dbus-daemon" in ps_output + + if socket_exists and dbus_daemon_running: return { "running": True, "status": "运行中", - "socket_exists": True + "socket_exists": True, + "daemon_running": True } - else: + elif not socket_exists and not dbus_daemon_running: return { "running": False, "status": "未运行", - "socket_exists": False + "socket_exists": False, + "daemon_running": False, + "suggestions": [ + "启动D-Bus服务: dbus-daemon --system --nofork --nopidfile --address=unix:path=/run/dbus/system_bus_socket &", + "确保在Docker容器中运行以获得完整的WARP支持", + "检查系统是否安装了dbus包" + ] } + elif not socket_exists and dbus_daemon_running: + return { + "running": False, + "status": "socket缺失", + "socket_exists": False, + "daemon_running": True, + "error": "D-Bus守护进程运行但socket文件不存在", + "suggestions": [ + "创建/run/dbus目录: mkdir -p /run/dbus", + "重启D-Bus守护进程", + "检查文件系统权限" + ] + } + else: # socket_exists but not dbus_daemon_running + return { + "running": False, + "status": "守护进程异常", + "socket_exists": True, + "daemon_running": False, + "error": "D-Bus socket存在但守护进程未运行", + "suggestions": [ + "检查socket文件是否有效", + "重启D-Bus守护进程", + "清理旧的socket文件后重启服务" + ] + } + except Exception as e: logger.error(f"[Admin] 检查D-Bus状态异常: {e}") return { "running": False, "status": "检查失败", - "error": str(e) + "error": str(e), + "suggestions": [ + "检查系统权限", + "确保在支持的环境中运行" + ] } diff --git a/readme.md b/readme.md index d816e47c7..8bfa71b20 100644 --- a/readme.md +++ b/readme.md @@ -372,6 +372,15 @@ Docker 镜像已内置自动安装和启动 **Cloudflare WARP** 网络代理功 ls -la /run/dbus/system_bus_socket ``` +4. **故障排除脚本**： + ```bash + # 详细故障排除和诊断 + ./scripts/warp_troubleshoot.sh + + # 快速修复常见问题 + ./scripts/warp_quickfix.sh + ``` + **禁用 WARP（可选）：** 如不需要 WARP 代理，可使用自己的 Docker 镜像或修改启动脚本。 diff --git a/scripts/warp_quickfix.sh b/scripts/warp_quickfix.sh new file mode 100755 index 000000000..e0995cdf3 --- /dev/null +++ b/scripts/warp_quickfix.sh @@ -0,0 +1,147 @@ +#!/bin/bash +# WARP快速修复脚本 + +set -e + +# 颜色输出 +RED='\033[0;31m' +GREEN='\033[0;32m' +YELLOW='\033[1;33m' +BLUE='\033[0;34m' +NC='\033[0m' # No Color + +echo -e "${BLUE}=== WARP快速修复脚本 ===${NC}\n" + +# 函数：执行命令并显示结果 +execute_cmd() { + local cmd="$1" + local desc="$2" + + echo -e "${YELLOW}执行: $desc${NC}" + echo -e "${BLUE}命令: $cmd${NC}" + + if eval "$cmd"; then + echo -e "${GREEN}✓ 成功${NC}\n" + else + echo -e "${RED}✗ 失败${NC}\n" + return 1 + fi +} + +# 函数：检查命令是否存在 +command_exists() { + command -v "$1" >/dev/null 2>&1 +} + +# 检查是否在Docker容器中 +if [ ! -f /.dockerenv ]; then + echo -e "${YELLOW}警告: 当前不在Docker容器中运行${NC}" + echo -e "${YELLOW}某些功能可能无法正常工作${NC}\n" +fi + +# 1. 清理旧的WARP进程 +echo -e "${YELLOW}[1/6] 清理旧的WARP进程${NC}" +if pgrep -f "warp-svc" > /dev/null; then + execute_cmd "pkill -f warp-svc" "终止warp-svc进程" +else + echo -e "${GREEN}✓ 没有运行中的warp-svc进程${NC}\n" +fi + +# 2. 清理旧的D-Bus进程和socket +echo -e "${YELLOW}[2/6] 清理旧的D-Bus进程和socket${NC}" +if pgrep -f "dbus-daemon" > /dev/null; then + execute_cmd "pkill -f dbus-daemon" "终止dbus-daemon进程" +else + echo -e "${GREEN}✓ 没有运行中的dbus-daemon进程${NC}\n" +fi + +if [ -S /run/dbus/system_bus_socket ]; then + execute_cmd "rm -f /run/dbus/system_bus_socket" "删除旧的D-Bus socket文件" +else + echo -e "${GREEN}✓ 没有旧的D-Bus socket文件${NC}\n" +fi + +# 3. 创建必要的目录 +echo -e "${YELLOW}[3/6] 创建必要的目录${NC}" +execute_cmd "mkdir -p /run/dbus" "创建D-Bus运行目录" + +# 4. 启动D-Bus服务 +echo -e "${YELLOW}[4/6] 启动D-Bus服务${NC}" +execute_cmd "dbus-daemon --system --nofork --nopidfile --address=unix:path=/run/dbus/system_bus_socket &" "启动D-Bus守护进程" + +# 等待D-Bus启动 +echo -e "${BLUE}等待D-Bus服务启动...${NC}" +sleep 2 + +# 验证D-Bus是否启动成功 +if [ -S /run/dbus/system_bus_socket ]; then + echo -e "${GREEN}✓ D-Bus服务启动成功${NC}\n" +else + echo -e "${RED}✗ D-Bus服务启动失败${NC}\n" + exit 1 +fi + +# 5. 启动WARP守护进程（如果已安装） +echo -e "${YELLOW}[5/6] 启动WARP守护进程${NC}" +if command_exists warp-cli; then + execute_cmd "warp-svc &" "启动WARP守护进程" + + # 等待WARP服务启动 + echo -e "${BLUE}等待WARP服务启动...${NC}" + sleep 3 + + # 验证WARP是否启动成功 + if pgrep -f "warp-svc" > /dev/null; then + echo -e "${GREEN}✓ WARP守护进程启动成功${NC}\n" + else + echo -e "${RED}✗ WARP守护进程启动失败${NC}\n" + exit 1 + fi +else + echo -e "${YELLOW}⚠ warp-cli未安装，跳过WARP启动${NC}\n" +fi + +# 6. 连接WARP（如果已安装） +echo -e "${YELLOW}[6/6] 连接WARP${NC}" +if command_exists warp-cli; then + echo -e "${BLUE}尝试连接WARP...${NC}" + if warp-cli connect 2>/dev/null; then + echo -e "${GREEN}✓ WARP连接成功${NC}\n" + + # 显示连接状态 + echo -e "${BLUE}WARP连接状态:${NC}" + warp-cli status + else + echo -e "${YELLOW}⚠ WARP连接失败，但服务已启动${NC}" + echo -e "${YELLOW}可以稍后手动尝试: warp-cli connect${NC}\n" + fi +else + echo -e "${YELLOW}⚠ warp-cli未安装，跳过WARP连接${NC}\n" +fi + +# 最终状态检查 +echo -e "${BLUE}=== 最终状态检查 ===${NC}\n" + +echo -e "${YELLOW}D-Bus状态:${NC}" +if [ -S /run/dbus/system_bus_socket ] && pgrep -f "dbus-daemon" > /dev/null; then + echo -e "${GREEN}✓ D-Bus服务正常运行${NC}" +else + echo -e "${RED}✗ D-Bus服务异常${NC}" +fi + +echo -e "${YELLOW}WARP状态:${NC}" +if command_exists warp-cli; then + if pgrep -f "warp-svc" > /dev/null; then + echo -e "${GREEN}✓ WARP守护进程运行中${NC}" + echo -e "${BLUE}连接状态:${NC}" + warp-cli status 2>/dev/null || echo -e "${RED}无法获取状态${NC}" + else + echo -e "${RED}✗ WARP守护进程未运行${NC}" + fi +else + echo -e "${YELLOW}⚠ WARP未安装${NC}" +fi + +echo -e "\n${GREEN}快速修复完成！${NC}" +echo -e "${BLUE}如果问题仍然存在，请运行详细的故障排除脚本:${NC}" +echo -e "${BLUE}./scripts/warp_troubleshoot.sh${NC}" \ No newline at end of file diff --git a/scripts/warp_troubleshoot.sh b/scripts/warp_troubleshoot.sh new file mode 100755 index 000000000..32ad78a62 --- /dev/null +++ b/scripts/warp_troubleshoot.sh @@ -0,0 +1,197 @@ +#!/bin/bash +# WARP连接故障排除脚本 + +set -e + +# 颜色输出 +RED='\033[0;31m' +GREEN='\033[0;32m' +YELLOW='\033[1;33m' +BLUE='\033[0;34m' +NC='\033[0m' # No Color + +echo -e "${BLUE}=== WARP连接故障排除脚本 ===${NC}\n" + +# 检查运行环境 +echo -e "${YELLOW}[1] 检查运行环境${NC}" +if [ -f /.dockerenv ]; then + echo -e "${GREEN}✓ 运行在Docker容器中${NC}" + IN_DOCKER=true +else + echo -e "${YELLOW}⚠ 未运行在Docker容器中（WARP功能有限）${NC}" + IN_DOCKER=false +fi + +# 检查权限 +echo -e "\n${YELLOW}[2] 检查系统权限${NC}" +if [ -r /dev/net/tun ] 2>/dev/null; then + echo -e "${GREEN}✓ TUN设备可访问${NC}" +else + echo -e "${RED}✗ TUN设备不可访问${NC}" +fi + +# 检查WARP安装 +echo -e "\n${YELLOW}[3] 检查WARP安装${NC}" +if command -v warp-cli &> /dev/null; then + echo -e "${GREEN}✓ warp-cli已安装${NC}" + WARP_INSTALLED=true + + # 检查WARP版本 + WARP_VERSION=$(warp-cli --version 2>/dev/null || echo "未知版本") + echo -e "${BLUE} 版本: $WARP_VERSION${NC}" +else + echo -e "${RED}✗ warp-cli未安装${NC}" + WARP_INSTALLED=false +fi + +# 检查D-Bus服务 +echo -e "\n${YELLOW}[4] 检查D-Bus服务${NC}" +if [ -S /run/dbus/system_bus_socket ]; then + echo -e "${GREEN}✓ D-Bus socket存在${NC}" + DBUS_SOCKET=true +else + echo -e "${RED}✗ D-Bus socket不存在${NC}" + DBUS_SOCKET=false +fi + +if pgrep -f "dbus-daemon" > /dev/null; then + echo -e "${GREEN}✓ D-Bus守护进程运行中${NC}" + DBUS_RUNNING=true +else + echo -e "${RED}✗ D-Bus守护进程未运行${NC}" + DBUS_RUNNING=false +fi + +# 检查WARP守护进程 +echo -e "\n${YELLOW}[5] 检查WARP守护进程${NC}" +if pgrep -f "warp-svc" > /dev/null; then + echo -e "${GREEN}✓ warp-svc守护进程运行中${NC}" + WARP_SVC_RUNNING=true +else + echo -e "${RED}✗ warp-svc守护进程未运行${NC}" + WARP_SVC_RUNNING=false +fi + +# 获取WARP状态 +echo -e "\n${YELLOW}[6] WARP状态检查${NC}" +if [ "$WARP_INSTALLED" = true ]; then + echo -e "${BLUE}执行: warp-cli status${NC}" + if WARP_STATUS=$(warp-cli status 2>&1); then + echo -e "${GREEN}$WARP_STATUS${NC}" + + if echo "$WARP_STATUS" | grep -q "Connected"; then + WARP_CONNECTED=true + elif echo "$WARP_STATUS" | grep -q "Connecting"; then + WARP_CONNECTING=true + else + WARP_CONNECTED=false + fi + else + echo -e "${RED}获取WARP状态失败${NC}" + echo -e "${RED}$WARP_STATUS${NC}" + WARP_CONNECTED=false + fi +else + echo -e "${YELLOW}跳过WARP状态检查（未安装）${NC}" +fi + +# 网络连通性测试 +echo -e "\n${YELLOW}[7] 网络连通性测试${NC}" +echo -e "${BLUE}测试连接到Cloudflare DNS...${NC}" +if timeout 5 curl -s https://1.1.1.1 > /dev/null; then + echo -e "${GREEN}✓ 网络连通正常${NC}" + NETWORK_OK=true +else + echo -e "${RED}✗ 网络连通异常${NC}" + NETWORK_OK=false +fi + +# 故障诊断和建议 +echo -e "\n${BLUE}=== 故障诊断和建议 ===${NC}" + +if [ "$WARP_INSTALLED" = false ]; then + echo -e "\n${YELLOW}问题: WARP未安装${NC}" + echo -e "${GREEN}解决方案:${NC}" + echo "1. 在Docker容器中运行应用（推荐）" + echo "2. 手动安装WARP:" + echo " curl https://pkg.cloudflareclient.com/pubkey.gpg | gpg --yes --dearmor --output /usr/share/keyrings/cloudflare-warp-archive-keyring.gpg" + echo " echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/cloudflare-warp-archive-keyring.gpg] https://pkg.cloudflareclient.com/ $(lsb_release -cs) main' | tee /etc/apt/sources.list.d/cloudflare-client.list" + echo " apt-get update && apt-get install -y cloudflare-warp" +elif [ "$WARP_SVC_RUNNING" = false ]; then + echo -e "\n${YELLOW}问题: WARP守护进程未运行${NC}" + echo -e "${GREEN}解决方案:${NC}" + echo "1. 启动D-Bus服务（如果未运行）:" + echo " mkdir -p /run/dbus" + echo " dbus-daemon --system --nofork --nopidfile --address=unix:path=/run/dbus/system_bus_socket &" + echo "2. 启动WARP守护进程:" + echo " warp-svc &" + echo "3. 等待几秒钟后检查状态" +elif [ "$DBUS_RUNNING" = false ] || [ "$DBUS_SOCKET" = false ]; then + echo -e "\n${YELLOW}问题: D-Bus服务异常${NC}" + echo -e "${GREEN}解决方案:${NC}" + echo "1. 创建D-Bus运行目录:" + echo " mkdir -p /run/dbus" + echo "2. 启动D-Bus守护进程:" + echo " dbus-daemon --system --nofork --nopidfile --address=unix:path=/run/dbus/system_bus_socket &" + echo "3. 重启WARP服务" +elif [ "$WARP_CONNECTED" = false ] && [ "$WARP_INSTALLED" = true ]; then + echo -e "\n${YELLOW}问题: WARP未连接${NC}" + echo -e "${GREEN}解决方案:${NC}" + echo "1. 尝试连接WARP:" + echo " warp-cli connect" + echo "2. 如果连接失败，尝试重启服务:" + echo " pkill warp-svc" + echo " warp-svc &" + echo " sleep 2" + echo " warp-cli connect" +fi + +if [ "$IN_DOCKER" = false ]; then + echo -e "\n${YELLOW}注意: 当前不在Docker容器中运行${NC}" + echo -e "${GREEN}建议:${NC}" + echo "1. 使用Docker运行以获得完整的WARP支持" + echo "2. 确保Docker容器有适当的权限:" + echo " docker run --cap-add=NET_ADMIN --cap-add=SYS_ADMIN \\" + echo " --sysctl net.ipv6.conf.all.disable_ipv6=0 \\" + echo " --sysctl net.ipv4.ip_forward=1 ..." +fi + +# 自动修复选项 +echo -e "\n${BLUE}=== 自动修复选项 ===${NC}" +if [ "$WARP_INSTALLED" = true ] && [ "$DBUS_RUNNING" = false ]; then + echo -e "${YELLOW}是否尝试自动启动D-Bus服务? (y/N)${NC}" + read -r response + if [[ "$response" =~ ^[Yy]$ ]]; then + echo -e "${BLUE}启动D-Bus服务...${NC}" + mkdir -p /run/dbus + dbus-daemon --system --nofork --nopidfile --address=unix:path=/run/dbus/system_bus_socket & + sleep 2 + echo -e "${GREEN}D-Bus服务已启动${NC}" + fi +fi + +if [ "$WARP_INSTALLED" = true ] && [ "$WARP_SVC_RUNNING" = false ]; then + echo -e "${YELLOW}是否尝试自动启动WARP守护进程? (y/N)${NC}" + read -r response + if [[ "$response" =~ ^[Yy]$ ]]; then + echo -e "${BLUE}启动WARP守护进程...${NC}" + warp-svc & + sleep 3 + echo -e "${GREEN}WARP守护进程已启动${NC}" + + echo -e "${YELLOW}是否尝试连接WARP? (y/N)${NC}" + read -r connect_response + if [[ "$connect_response" =~ ^[Yy]$ ]]; then + echo -e "${BLUE}连接WARP...${NC}" + if warp-cli connect; then + echo -e "${GREEN}WARP连接成功${NC}" + warp-cli status + else + echo -e "${RED}WARP连接失败${NC}" + fi + fi + fi +fi + +echo -e "\n${GREEN}故障排除完成！${NC}" +echo -e "${BLUE}如需进一步帮助，请查看日志: journalctl -u warp-svc -f${NC}" \ No newline at end of file diff --git a/tests/test_warp_docker.sh b/tests/test_warp_docker.sh index 6919f3b16..03d732e47 100755 --- a/tests/test_warp_docker.sh +++ b/tests/test_warp_docker.sh @@ -34,6 +34,9 @@ sleep 10 # 检查容器内WARP状态 echo -e "${YELLOW}[4/4] 检查WARP状态...${NC}" +echo -e "\n${GREEN}=== 运行故障排除脚本 ===${NC}" +docker exec $CONTAINER_ID /app/scripts/warp_troubleshoot.sh || echo -e "${RED}故障排除脚本执行失败${NC}" + echo -e "\n${GREEN}=== WARP安装检查 ===${NC}" docker exec $CONTAINER_ID which warp-cli || echo -e "${RED}warp-cli未找到${NC}"