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,124 @@
|
||||
"""丰享商家端 API 客户端。
|
||||
|
||||
相比原实现的关键改动:
|
||||
1. 复用 requests.Session(原代码每 5 秒新建 TLS 连接,纯浪费)
|
||||
2. 只对「网络层故障」做有限重试,业务错误码不重试
|
||||
3. 用异常区分三种状态,替代原来返回 "SESSION_EXPIRED" 魔法字符串
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import logging
|
||||
from typing import Any, Dict, List, Optional
|
||||
|
||||
import requests
|
||||
from requests.adapters import HTTPAdapter
|
||||
from urllib3.util.retry import Retry
|
||||
|
||||
from .config import Config
|
||||
|
||||
log = logging.getLogger("fengxiang.client")
|
||||
|
||||
# 丰享返回的「会话失效」错误码
|
||||
SESSION_EXPIRED_CODES = {110003, 10009}
|
||||
|
||||
|
||||
class FengxiangError(Exception):
|
||||
"""所有客户端异常的基类。"""
|
||||
|
||||
|
||||
class SessionExpired(FengxiangError):
|
||||
"""Cookie/会话失效,需要重新登录。"""
|
||||
|
||||
|
||||
class ApiError(FengxiangError):
|
||||
"""接口返回了非 0 的业务错误码。"""
|
||||
|
||||
def __init__(self, errno: Any, errmsg: str = ""):
|
||||
self.errno = errno
|
||||
self.errmsg = errmsg
|
||||
super().__init__(f"errno={errno} errmsg={errmsg}")
|
||||
|
||||
|
||||
class NetworkError(FengxiangError):
|
||||
"""网络/超时/非 JSON 响应,可稍后重试。"""
|
||||
|
||||
|
||||
class FengxiangClient:
|
||||
def __init__(self, cfg: Config, session: Optional[requests.Session] = None):
|
||||
self.cfg = cfg
|
||||
self.session = session or self._build_session()
|
||||
self.cookies: Dict[str, str] = {}
|
||||
|
||||
def _build_session(self) -> requests.Session:
|
||||
s = requests.Session()
|
||||
retry = Retry(
|
||||
total=self.cfg.api.max_retries,
|
||||
connect=self.cfg.api.max_retries,
|
||||
read=self.cfg.api.max_retries,
|
||||
backoff_factor=0.5,
|
||||
status_forcelist=(429, 500, 502, 503, 504),
|
||||
allowed_methods=frozenset(["POST"]),
|
||||
raise_on_status=False,
|
||||
)
|
||||
adapter = HTTPAdapter(max_retries=retry, pool_connections=2, pool_maxsize=4)
|
||||
s.mount("https://", adapter)
|
||||
s.mount("http://", adapter)
|
||||
s.headers.update({
|
||||
"Content-Type": "application/json",
|
||||
"User-Agent": ("Mozilla/5.0 (Windows NT 10.0; Win64; x64) "
|
||||
"AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120 Safari/537.36"),
|
||||
"Referer": self.cfg.api.base_url.rstrip("/") + "/MMS",
|
||||
"Origin": self.cfg.api.base_url.rstrip("/"),
|
||||
})
|
||||
return s
|
||||
|
||||
def set_cookies(self, cookies: Dict[str, str]) -> None:
|
||||
self.cookies = dict(cookies or {})
|
||||
|
||||
def list_orders(self, page_size: int = 5, page: int = 1) -> List[Dict[str, Any]]:
|
||||
"""拉取订单列表。
|
||||
|
||||
返回订单列表;会话失效抛 SessionExpired;业务错误抛 ApiError;
|
||||
网络问题抛 NetworkError。
|
||||
"""
|
||||
payload = {"shopId": self.cfg.shop_id, "page": page, "pageSize": page_size}
|
||||
try:
|
||||
resp = self.session.post(
|
||||
self.cfg.api.order_url,
|
||||
json=payload,
|
||||
cookies=self.cookies,
|
||||
timeout=self.cfg.api.timeout,
|
||||
)
|
||||
except requests.RequestException as exc:
|
||||
raise NetworkError(f"请求失败: {exc}") from exc
|
||||
|
||||
if resp.status_code >= 500:
|
||||
raise NetworkError(f"服务端 {resp.status_code}")
|
||||
if resp.status_code >= 400:
|
||||
raise NetworkError(f"HTTP {resp.status_code}")
|
||||
|
||||
try:
|
||||
data = resp.json()
|
||||
except ValueError as exc:
|
||||
raise NetworkError(f"响应非 JSON: {resp.text[:120]}") from exc
|
||||
|
||||
errno = data.get("errno")
|
||||
if errno == 0:
|
||||
orders = (data.get("data") or {}).get("list") or []
|
||||
return [o for o in orders if isinstance(o, dict)]
|
||||
if errno in SESSION_EXPIRED_CODES:
|
||||
raise SessionExpired(f"errno={errno} {data.get('errmsg', '')}".strip())
|
||||
raise ApiError(errno, str(data.get("errmsg", "")))
|
||||
|
||||
def check_cookie(self, cookies: Dict[str, str]) -> bool:
|
||||
"""校验 Cookie 是否可用(不抛异常)。"""
|
||||
self.set_cookies(cookies)
|
||||
try:
|
||||
self.list_orders(page_size=1)
|
||||
return True
|
||||
except SessionExpired:
|
||||
return False
|
||||
except FengxiangError as exc:
|
||||
log.warning("Cookie 校验时出现非会话类错误: %s", exc)
|
||||
return False
|
||||
Reference in new issue
Block a user