AskaEth/SenSu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: proxy API prefix, version from config, remove auth from framework/system endpoints

Browse Source 
- Proxy routes now use /SenSu/api/proxy (was missing prefix)
- Projects routes use dynamic prefix
- Version reads from config/framework/base_config.yaml
- Framework/System APIs no longer require auth (public info)
- Proxy init separated from route setup (avoids frozen router error)
- Version updated to v0.6.0
This commit is contained in:
qinglong
2026-06-11 14:37:28 +08:00
parent 6918ee6514
commit dd8a31e29a
8 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web_panel/manager.py
+2 -2
View File
@@ -62,8 +62,8 @@ class WebPanelManager:
plugins.setup_routes(app, self.base_path)
commands.setup_routes(app, self.base_path)
logs.setup_routes(app, self.base_path)
projects.setup_project_routes(app, self.sm)
proxy.setup_proxy_routes(app, self.sm)
projects.setup_project_routes(app, self.sm, self.base_path)
proxy.setup_proxy_routes(app, self.sm, self.base_path)
plugin_web.setup_plugin_web_routes(app, self.sm)
# 注册日志广播
services/web_panel/routes/projects.py
+2 -2
View File
@@ -8,7 +8,7 @@ def _get_engine(request):
return sm.get_service("project_engine")
return None
def setup_project_routes(app, service_manager):
def setup_project_routes(app, service_manager, prefix=''):
app["service_manager"] = service_manager
async def list_projects(request):
@@ -51,7 +51,7 @@ def setup_project_routes(app, service_manager):
async def project_page(request):
return web.FileResponse("static/web_panel/pages/projects.html")
app.router.add_get("/api/projects", list_projects)
app.router.add_get(f'{prefix}/api/projects', list_projects)
app.router.add_post("/api/projects/run", run_project)
app.router.add_get("/api/projects/{name}/logs", get_logs)
app.router.add_post("/api/projects/{name}/stop", stop_project)
services/web_panel/routes/proxy.py
+5 -5
View File
@@ -2,7 +2,7 @@ from aiohttp import web, ClientSession
import json, logging, asyncio
logger = logging.getLogger(__name__)
def setup_proxy_routes(app, service_manager):
def setup_proxy_routes(app, service_manager, prefix=''):
async def list_proxies(request):
ps = service_manager.get_service("proxy")
return web.json_response({"proxies": ps.list_proxies() if ps else []})
@@ -24,7 +24,7 @@ def setup_proxy_routes(app, service_manager):
ps.unregister_proxy(path)
return web.json_response({"ok": True})
app.router.add_get("/api/proxy", list_proxies)
app.router.add_post("/api/proxy", add_proxy)
app.router.add_delete("/api/proxy/{path}", remove_proxy)
logger.info("🔀 代理路由已注册")
app.router.add_get(f'{prefix}/api/proxy', list_proxies)
app.router.add_post(f'{prefix}/api/proxy', add_proxy)
app.router.add_delete(f'{prefix}/api/proxy/{{path}}', remove_proxy)
logger.info(f'🔀 代理路由已注册 ({prefix}/api/proxy)')
services/web_panel/routes/status.py
+15 -8
View File
@@ -1,25 +1,32 @@
import time
from aiohttp import web
from ..utils.auth import panel_auth
from ..utils.system_info import SystemInfoCollector
collector = SystemInfoCollector()
def setup_routes(app, prefix=''):
app.router.add_get(f'{prefix}/api/framework', panel_auth(get_framework))
app.router.add_get(f'{prefix}/api/system', panel_auth(get_system))
app.router.add_get(f'{prefix}/api/framework', get_framework)
app.router.add_get(f'{prefix}/api/system', get_system)
async def get_framework(req):
sm = req.app.get('service_manager')
if not sm: return web.json_response({"error": "Missing"}, 500)
ps = sm.get_service("plugin")
# 🟢 修复：使用 sm.start_time 属性
uptime = time.time() - getattr(sm, 'start_time', time.time())
# Read version from config file
ver = "v0.6.0"
try:
import yaml, os
config_path = os.path.join(os.path.dirname(__file__), "..", "..", "..", "config", "framework", "base_config.yaml")
with open(config_path) as f:
cfg = yaml.safe_load(f)
ver = cfg.get("framework", {}).get("version", ver)
except: pass
return web.json_response({
"version": "Alpha_0.2.0",
"uptime": int(uptime), # 取整秒
"version": ver,
"uptime": int(uptime),
"plugins": len(ps.plugins) if ps else 0
})