refactor: 拆分 4 个巨石模块为包,清理过时注释并删除作废文档

为什么:单文件 1100~1900 行的巨石模块让「改一处要通读全文」;同时注释里残留
大量已删台账的编号,以及「Flask/FastAPI 双栈迁移期」这类已失实的架构描述,
会误导后来者按不复存在的架构去改代码。

拆分(对外导入路径不变,行为零变更):
- music_downloader.py  -> music_downloader/(models/downloader/cover/_http/_log/_concurrency)
- auth_system.py       -> auth_system/(db/security/users/credits/ledger/mail/cards/backup...)
- music_api.py         -> music_api/(api/client/crypto/qr/cookies/compat/constants/errors)
- services/runtime.py  -> services/(api_service/_shared/_taskcore/downloads/batch/podcast/
  streaming/tasks);services/runtime.py 保留为兼容门面

兼容性做法:各包用 __init__.py 以 __all__ 原样再导出全部符号,既有调用点
(auth_system.xxx / services.xxx / from music_api import Y)零改动;路径常量改为经包属性
动态读取(auth_system.DB_PATH),否则测试的 monkeypatch 会静默失效并写到生产库。

修复 9 处代码损伤(上一轮注释清理把 `()` 当「空括号残留」删掉所致;用「与拆分前逐字
等价」校验逐一定位,静态检查只会报出其中 4 处):
- core/config.py  ).strip() or '*'
- core/state.py   threading.Lock() x2
- qr_login.py     datetime.now() / .strip()
- music_downloader/downloader.py  .lower()
- services/podcast.py  set() / time.time() x2

清理与删除:
- 删除 部署文档.md / 功能介绍.md / README_私有包警告.txt
- 清理指向已删台账与文档的过时编号注释;把「迁移期 / 两栈 / 双框架 / 已迁移」等
  失实描述改写为现状描述(保留 `<-> Flask /path` 映射表等仍有价值的契约来源说明)
- _mkpkg.py:公开包剔除清单去掉已不存在的文档名;私有包警告改为自包含
- pyproject.toml:补 pythonpath = ["."],使裸跑 pytest 不再 import core 失败

验证:ruff 全通过;pyright 0 errors / 0 warnings(102 文件);pytest 144 passed;
真实 uvicorn 冒烟 6 条路由符合预期且生产 data/ 指纹未变;忽略注释的逐字等价性校验通过。
This commit is contained in:
snowy-yang committed 2026-09-26 12:37:48 +08:00
1 parent 838d635bc5
commit 6288a98ecc
89 files changed
+5806 -5112

No files matched your search

+96
View File
@@ -0,0 +1,96 @@
# -*- coding: utf-8 -*-
"""登录 IP 归属地探测与异地自动封禁。
(自 auth_system.py 拆出,行为与原实现一致。)
"""
import json
import sqlite3
import time
from .db import (
_x,
)
from .logs import (
add_log,
)
from .users import (
ban_user,
)
_PROVINCE_CACHE: dict[str, str] = {}
def _is_private_ip(ip: str) -> bool:
"""内网/回环地址判断(172.16-31.* 才是私网,不能把整个 172.* 误判)"""
try:
import ipaddress
addr = ipaddress.ip_address(ip)
return addr.is_private or addr.is_loopback or addr.is_link_local
except ValueError:
return False
def query_ip_province(ip: str) -> str:
"""查询 IP 归属省份(内网/失败返回空串),带进程内缓存
改用官方路径 /json/{query} 与 zh-CN 语言参数"""
ip = (ip or '').split(',')[0].strip()
if not ip or ip in ('-', '127.0.0.1', '0.0.0.0') or _is_private_ip(ip):
return ''
if ip in _PROVINCE_CACHE:
return _PROVINCE_CACHE[ip]
province = ''
try:
import urllib.parse as _ul
from core import sync_http as _rq
r = _rq.get('http://ip-api.com/json/' + _ul.quote(ip),
params={'lang': 'zh-CN', 'fields': 'status,regionName'},
timeout=5)
d = r.json()
if d.get('status') == 'success':
province = str(d.get('regionName') or '')
except Exception:
province = ''
# 简单容量上限,防止公网长期运行下无界增长
if len(_PROVINCE_CACHE) > 5000:
_PROVINCE_CACHE.clear()
# 查询失败(超时/限流/垃圾 JSON)的空省份不写缓存——旧口径一次
# ip-api 抖动窗口内登录的 IP 被永久标记"无省份",省份防倒卖静默失效
if province:
_PROVINCE_CACHE[ip] = province
return province
PROVINCE_WINDOW = 24 * 3600 # 省份变化检测窗口:24 小时
PROVINCE_BAN_LIMIT = 3 # 窗口内出现 >=3 个不同省份即封禁
def record_login_location(user: sqlite3.Row, ip: str) -> tuple:
"""记录本次登录省份并检测异常:24h 内出现 >=3 个不同省份自动封禁。
返回 (是否被封禁, 说明)"""
if user['role'] == 'admin':
return False, ''
province = query_ip_province(ip)
if not province:
return False, ''
now = int(time.time())
try:
history = json.loads(user['recent_provinces'] if 'recent_provinces' in user.keys() and user['recent_provinces'] else '[]')
except Exception:
history = []
history = [h for h in history if isinstance(h, dict) and now - int(h.get('t', 0)) <= PROVINCE_WINDOW]
history.append({'p': province, 't': now})
provinces = []
for h in history:
if h.get('p') and h['p'] not in provinces:
provinces.append(h['p'])
_x('UPDATE users SET recent_provinces = ? WHERE id = ?',
(json.dumps(history, ensure_ascii=False), user['id']))
if len(provinces) >= PROVINCE_BAN_LIMIT:
reason = f'24小时内检测到 {len(provinces)} 个不同省份登录({"/".join(provinces[-3:])}),疑似账号倒卖,已自动封禁'
ban_user(user['id'], reason)
add_log('fail', user['username'], ip, '自动封禁', reason)
return True, reason
return False, province