refactor: 重构为可部署到服务器的模块化结构(v5.0.0)
- 拆包 fengxiang/:config/client/store/notify/monitor/admin/tts,统一入口 order_monitor.py - 服务器形态:Docker 常驻,Cookie 由本机登录后 POST 上传并热加载,不再依赖桌面弹窗 - 修复:首次启动重推历史订单、speak() 阻塞主循环、夜间 sleep 10h 不可中断 - 修复:test_push.py 残留 miservice 依赖(小爱已移除)、run_monitor.bat 写死盘符 - 配置化:webhook/shopId 移出源码(环境变量 > config.yaml > 默认值) - 可观测:滚动文件日志 + /healthz + Docker HEALTHCHECK + 告警冷却 - 飞书通道保留配置位,默认关闭(原 token 已失效 code=19001) - 新增 22 项单元测试(不联网)
This commit is contained in:
1 parent
ab6a2bb7ea
commit
4ee30399bf
30 files changed
+2410
-825
No files matched your search
@@ -0,0 +1,152 @@
|
||||
"""内置管理接口(HTTP)。
|
||||
|
||||
存在的唯一目的是解决「服务器没有桌面,丰享登录必须人工过验证码」这个矛盾:
|
||||
本机登录后把 Cookie POST 过来,容器内立刻热生效,不用重启、不用 SSH 拷文件。
|
||||
|
||||
接口:
|
||||
GET /healthz 健康检查(Docker HEALTHCHECK 用,免鉴权,只返回运行指标)
|
||||
GET /api/status 运行状态(同上,别名)
|
||||
POST /api/cookies 更新 Cookie(需鉴权)
|
||||
POST /api/test-push 发一条测试消息(需鉴权)
|
||||
|
||||
鉴权:请求头 X-Auth-Token 或 Authorization: Bearer <token>,也支持 ?token=。
|
||||
安全默认:未配置 token 时只接受来自 127.0.0.1 的写请求。
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
import logging
|
||||
import threading
|
||||
from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
|
||||
from typing import Any, Dict
|
||||
from urllib.parse import parse_qs, urlparse
|
||||
|
||||
from .config import Config
|
||||
|
||||
log = logging.getLogger("fengxiang.admin")
|
||||
|
||||
MAX_BODY = 64 * 1024
|
||||
|
||||
|
||||
class _Handler(BaseHTTPRequestHandler):
|
||||
server_version = "fengxiang-admin/1.0"
|
||||
monitor = None # 由 AdminServer 注入
|
||||
cfg = None
|
||||
|
||||
# -------- 工具方法 --------
|
||||
def log_message(self, fmt: str, *args: Any) -> None:
|
||||
log.debug("%s - %s", self.address_string(), fmt % args)
|
||||
|
||||
def _json(self, code: int, payload: Dict[str, Any]) -> None:
|
||||
body = json.dumps(payload, ensure_ascii=False).encode("utf-8")
|
||||
self.send_response(code)
|
||||
self.send_header("Content-Type", "application/json; charset=utf-8")
|
||||
self.send_header("Content-Length", str(len(body)))
|
||||
self.end_headers()
|
||||
self.wfile.write(body)
|
||||
|
||||
def _auth_ok(self, query: Dict[str, list]) -> bool:
|
||||
token = self.cfg.admin.token
|
||||
if not token:
|
||||
# 未配置 token:仅允许本机回环写入
|
||||
return self.client_address[0] in ("127.0.0.1", "::1")
|
||||
supplied = (
|
||||
self.headers.get("X-Auth-Token")
|
||||
or (self.headers.get("Authorization") or "").replace("Bearer ", "").strip()
|
||||
or (query.get("token") or [""])[0]
|
||||
)
|
||||
return supplied == token
|
||||
|
||||
def _read_json(self) -> Dict[str, Any]:
|
||||
length = int(self.headers.get("Content-Length") or 0)
|
||||
if length <= 0 or length > MAX_BODY:
|
||||
raise ValueError("请求体为空或过大")
|
||||
raw = self.rfile.read(length)
|
||||
data = json.loads(raw.decode("utf-8"))
|
||||
if not isinstance(data, dict):
|
||||
raise ValueError("请求体必须是 JSON 对象")
|
||||
return data
|
||||
|
||||
# -------- 路由 --------
|
||||
def do_GET(self) -> None: # noqa: N802
|
||||
path = urlparse(self.path).path
|
||||
if path in ("/healthz", "/api/status", "/api/health"):
|
||||
self._json(200, self.monitor.status())
|
||||
return
|
||||
if path == "/":
|
||||
self._json(200, {
|
||||
"service": "fengxiang-monitor admin",
|
||||
"endpoints": ["GET /healthz", "GET /api/status",
|
||||
"POST /api/cookies", "POST /api/test-push"],
|
||||
})
|
||||
return
|
||||
self._json(404, {"error": "not found"})
|
||||
|
||||
def do_POST(self) -> None: # noqa: N802
|
||||
parsed = urlparse(self.path)
|
||||
path = parsed.path
|
||||
query = parse_qs(parsed.query)
|
||||
|
||||
if not self._auth_ok(query):
|
||||
self._json(401, {"error": "unauthorized"})
|
||||
return
|
||||
|
||||
if path == "/api/cookies":
|
||||
try:
|
||||
payload = self._read_json()
|
||||
except (ValueError, json.JSONDecodeError) as exc:
|
||||
self._json(400, {"error": f"参数错误: {exc}"})
|
||||
return
|
||||
cookies = payload.get("cookies", payload)
|
||||
if not isinstance(cookies, dict) or not cookies:
|
||||
self._json(400, {"error": "cookies 必须是非空对象"})
|
||||
return
|
||||
try:
|
||||
ok = self.monitor.update_cookies({str(k): str(v) for k, v in cookies.items()})
|
||||
except Exception as exc: # noqa: BLE001
|
||||
log.exception("写入 Cookie 失败")
|
||||
self._json(500, {"error": str(exc)})
|
||||
return
|
||||
if ok:
|
||||
self._json(200, {"ok": True, "count": len(cookies), "status": self.monitor.status()})
|
||||
else:
|
||||
self._json(422, {"ok": False, "error": "Cookie 校验未通过,可能已失效"})
|
||||
return
|
||||
|
||||
if path == "/api/test-push":
|
||||
try:
|
||||
payload = self._read_json()
|
||||
except (ValueError, json.JSONDecodeError):
|
||||
payload = {}
|
||||
text = payload.get("text") or "【丰享监控】测试消息,请忽略。"
|
||||
result = self.monitor.dispatcher.notify(text)
|
||||
self._json(200, {"result": result})
|
||||
return
|
||||
|
||||
self._json(404, {"error": "not found"})
|
||||
|
||||
|
||||
class AdminServer:
|
||||
def __init__(self, cfg: Config, monitor) -> None:
|
||||
self.cfg = cfg
|
||||
self.monitor = monitor
|
||||
handler = type("BoundHandler", (_Handler,), {"monitor": monitor, "cfg": cfg})
|
||||
self.httpd = ThreadingHTTPServer((cfg.admin.host, cfg.admin.port), handler)
|
||||
self.httpd.daemon_threads = True
|
||||
self._thread = threading.Thread(target=self.httpd.serve_forever,
|
||||
name="admin-http", daemon=True)
|
||||
|
||||
def start(self) -> None:
|
||||
self._thread.start()
|
||||
log.info("管理接口已启动 http://%s:%d (健康检查 /healthz)",
|
||||
self.cfg.admin.host, self.cfg.admin.port)
|
||||
if not self.cfg.admin.token:
|
||||
log.warning("未设置 admin.token,写接口仅允许本机回环访问")
|
||||
|
||||
def stop(self) -> None:
|
||||
try:
|
||||
self.httpd.shutdown()
|
||||
self.httpd.server_close()
|
||||
except Exception: # noqa: BLE001
|
||||
pass
|
||||
Reference in new issue
Block a user