This repository has been archived on 2026-10-02. You can view files and clone it. You cannot open issues or pull requests or push a commit.
Files
NeteaseUrl/tests/test_download_sync.py
T
snowy-yang 69a50c2c31 refactor: worker 子系统全面异步化,拆掉同步转异步的桥接层
拆掉「同步调异步 / 异步桥同步」两类垫片的第二半(HTTP 线 B2 见前序提交)。
worker 侧此前是「起线程跑同步函数、函数体内部再用 asyncio.to_thread 把活塞给
另一条循环」——线程与协程互等,取消/暂停只能靠轮询。本轮把 worker 自身变成
协程,由 _start_task 直接挂到应用事件循环上,桥接层随之失去存在理由。

改动(按子系统):
- music_downloader:downloader / _aria2 / _concurrency / cover / _http /
  __main__ 全链路协程化。per-file 锁改 asyncio.Lock;计数闸改
  「active 计数 + await asyncio.sleep(0.5)」的可取消等待(原阻塞式 with 会让
  已取消任务仍要等全局名额腾出,卡死并拖后腿退款);aria2p 的同步 RPC 仍经
  to_thread,轮询改 asyncio.sleep;新增 core.http_client.iter_chunks,把**流式
  读取期**的 aiohttp.ClientError 收敛成 UpstreamNetworkError(请求建立阶段早已
  有这条路径,读取阶段此前没有,断流会绕过调用方的 UpstreamError 分类)。
  删除 get_http_session / _SESSION_LOCAL。
  models._RetryFromScratch 不再继承 requests.RequestException 而继承 Exception:
  它是「续传起点失效、残片已清、从头重下」,既不是确定性失败
  (DownloadException),也不是残片已保留的网络失败(UpstreamError),必须独立
  成类且在 except 链中先于二者捕获。
- music_api:podcast.py 全部函数协程化(直链解析内部改
  await NeteaseAPI.get_song_url);compat.py 删除——16 个死掉的同步门面早已
  清空,文件只剩空壳。
- services:_taskcore / _zipcore / batch / downloads / podcast / tasks 协程化。
  threading.Thread → loop.create_task(任务句柄字段 worker_thread →
  worker_task),ThreadPoolExecutor → asyncio.gather + asyncio.Semaphore,
  终态函数与结算回调全部改 await;监控线程里「worker 已死」判定改 task.done()。
  删除 services/streaming.py(同步流垫片,唯一消费者已迁到
  core.http_client.open)。zipfile 实例仍非线程安全,故「下载」并行、
  「入包」严格串行。
- web:路由层 130+ 处 to_thread 拆除——被包住的目标自己已是协程,再包一层只是
  把协程丢进线程里跑一圈。tasks_registry.start_task 直接 create_task。
  web/app.py 关闭段去掉 async_bridge.shutdown()(不再有第二条约循环)。
  web/routers/download.py 的播客端点补上 3 处漏掉的 await
  (extract_podcast_ref / get_radio_detail)——漏掉时不报错、只静默返回协程对象,
  靠 pyright 抓出来后修正。

留在 to_thread 上的都是**正当的阻塞卸载**:同步 SQLite 落库与账本结算、
mutagen 全量重写标签、zipfile 整段拷贝、shutil.rmtree、aria2p 的同步 RPC、
PBKDF2 的 10 万次迭代。ruff 对残留的本地元数据操作(exists/stat/os.replace/
往 .part 顺序写分块)按「微秒级、卸载的调度开销大于操作本身」放行,pyproject
逐条注明理由。

取消/暂停仍由 threading.Event 承载:置位方是请求线程/监控线程,读取方是 worker
协程,只有「置位」与「轮询读取」两种操作,既不需要跨循环唤醒也不会卡住事件
循环——比 asyncio.Event 更省心(ASYNC110 同理按此豁免)。

测试:10 个文件的替身边界同步迁移——网络替身从 core.sync_http 的
get_http_session 换成 downloader/服务模块的 _http.open + **真实** iter_chunks
(顺带钉住读取期异常收敛);`_run` 改为在独立线程里 asyncio.run(worker(...));
aria2 的假时钟从 time.sleep 换成 _POLL_INTERVAL=0;monitor 的线程句柄替身换成
done() 可控的轻量替身(asyncio.Task 的构造需要运行中的事件循环,而监控循环跑在
常驻线程里);podcast / 封面 / 结算包装等替身一律改 async。

门禁:ruff 全过 / pyright 0-0 / pytest 383 项全绿(0 失败)。

下一步 B2:auth_system 12 个模块改 aiosqlite 背板、web 层剩余 to_thread 收尾;
B3:删 core/sync_http.py、core/async_bridge.py、core/http_errors.py(现仅
sync_http 自用)。
2026-09-28 19:36:56 +08:00

148 lines
5.2 KiB
Python

# -*- coding: utf-8 -*-
"""/download 端点 json 同步模式的契约测试(沙箱,不触真实上游)。
test_download_billing.py 覆盖参数校验与退费口径;本文件钉住 format=json
的同步下载分支——它此前零覆盖,却是 40 行内嵌「取信息 → 下载 → 组响应 →
结算」的完整事务:
- 任一步失败:退回预扣(无 open 账本行)+ 专属文案
- 成功:settle(1, 'delivered'),余额恰好 -1
替身边界:monkeypatch ``services.api_service.api_service.downloader``
(路由内延迟导入取的就是这个实例属性),MusicInfo/DownloadResult 用
真实 dataclass 构造。
"""
import pytest
from fastapi.testclient import TestClient
import auth_system as auth
import core.db as db
from music_downloader.models import MusicInfo
SECRET = 'download-sync-test-secret'
PW = 'Passw0rd12'
def _info() -> MusicInfo:
return MusicInfo(id=347230, name='晴天', artists='周杰伦', album='叶惠美',
pic_url='', duration=269, track_number=1,
download_url='', file_type='mp3', file_size=1024,
quality='lossless')
def _dl(success: bool = True, msg: str = ''):
from music_downloader.models import DownloadResult
return DownloadResult(success=success, file_path='/tmp/x.mp3',
error_message=msg)
@pytest.fixture()
def env(tmp_path, monkeypatch):
db_path = tmp_path / 'site.db'
monkeypatch.setattr(auth.db, 'DATA_DIR', tmp_path)
monkeypatch.setattr(auth.db, 'DB_PATH', db_path)
monkeypatch.setattr(auth.db, 'BACKUP_DIR', tmp_path / 'backups')
monkeypatch.setattr(auth.db, 'SECRET_KEY_PATH', tmp_path / 'secret.key')
monkeypatch.setattr(db, 'DATA_DIR', tmp_path)
monkeypatch.setattr(db, 'DB_PATH', db_path)
auth.init_db()
monkeypatch.setattr('web.deps.secret_key', lambda: SECRET)
auth.create_user('payer', PW, email='p@example.com', credits=3)
state: dict = {'info_exc': None, 'dl_result': _dl(), 'dl_exc': None}
class _FakeDownloader:
async def get_music_info(self, music_id, quality, cookies):
if state['info_exc'] is not None:
raise state['info_exc']
return state['info']
async def download_music_file(self, music_id, quality, **kw):
if state['dl_exc'] is not None:
raise state['dl_exc']
return state['dl_result']
state['info'] = _info()
from services.api_service import api_service
monkeypatch.setattr(api_service, 'downloader', _FakeDownloader())
from web.app import create_app
client = TestClient(create_app())
r = client.post('/auth/login', json={'username': 'payer', 'password': PW})
raw = r.headers.get('set-cookie', '')
cookie = ''
for part in raw.split(';'):
if part.strip().startswith('session='):
cookie = part.strip()[len('session='):]
break
state['headers'] = {'Cookie': f'session={cookie}'}
state['client'] = client
return state
def _balance(username: str = 'payer') -> int:
u = auth.get_user_by_name(username)
assert u is not None, f'用户 {username} 不存在'
return int(u['duration_seconds'] or 0)
def _open_rows() -> list[dict]:
conn = auth.get_conn()
rows = conn.execute(
"SELECT task_id, status FROM billing_ledger WHERE status='open'").fetchall()
conn.close()
return [dict(r) for r in rows]
def _post(env, **payload):
return env['client'].post('/download', json={'id': '347230', 'format': 'json',
**payload}, headers=env['headers'])
def test_json_success_settles_one_credit(env):
r = _post(env)
assert r.status_code == 200
body = r.json()
assert body is not None and body['success'] is True
assert body['data']['name'] == '晴天'
assert body['data']['artist'] == '周杰伦'
assert body['data']['filename'] == '周杰伦 - 晴天.mp3' # 默认 filename_format=artist_song
assert body['data']['duration'] == 269 * 1000
assert _balance() == 2 # 预扣 1,交付结算
assert _open_rows() == []
def test_json_info_failure_refunds(env):
env['info_exc'] = RuntimeError('song gone')
r = _post(env)
assert r.status_code == 404
assert r.json()['message'] == '获取失败:歌曲不存在或暂无版权'
assert _balance() == 3
assert _open_rows() == []
def test_json_download_failure_refunds(env):
env['dl_result'] = _dl(success=False, msg='size mismatch')
r = _post(env)
assert r.status_code == 500
assert r.json()['message'] == '下载失败,请稍后重试或更换音质'
assert _balance() == 3
assert _open_rows() == []
def test_json_download_exception_refunds(env):
env['dl_exc'] = RuntimeError('disk full')
r = _post(env)
assert r.status_code == 500
assert r.json()['message'] == '服务暂时不可用,请稍后再试'
assert _balance() == 3
assert _open_rows() == []
def test_empty_id_refunds_with_specific_message(env):
r = env['client'].post('/download', json={'id': '', 'format': 'json'},
headers=env['headers'])
assert r.json()['message'] == "参数 'music_id' 不能为空"
assert _balance() == 3
assert _open_rows() == []