Archived
拆掉「同步调异步 / 异步桥同步」两类垫片的第二半(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 自用)。
163 lines
6.2 KiB
Python
163 lines
6.2 KiB
Python
# -*- coding: utf-8 -*-
|
||
"""播客端点。
|
||
|
||
端点(免费解析类,需登录,不扣次数):
|
||
- POST/GET /api/v1/podcast/parse ↔ Flask /podcast/parse
|
||
- POST/GET /api/v1/podcast/programs ↔ Flask /podcast/programs
|
||
- POST/GET /api/v1/podcast/search ↔ Flask /podcast/search
|
||
- POST/GET /api/v1/podcast/hot ↔ Flask /podcast/hot
|
||
|
||
说明:music_api.podcast 是原生异步模块(底层 core.http_client),此处直接 await;
|
||
解析与直链检查同属一次请求,不再需要线程卸载。
|
||
"""
|
||
from typing import Annotated
|
||
|
||
from fastapi import APIRouter, Depends, Request
|
||
|
||
from core import media
|
||
from music_api import APIException, podcast
|
||
from web import ratelimit
|
||
from web.deps import SiteUser, require_login
|
||
from web.request_utils import cookies as _cookies
|
||
from web.request_utils import extract_id as _extract_id
|
||
from web.request_utils import request_data as _request_data
|
||
from web.request_utils import safe_int as _safe_int
|
||
from web.response import error, success
|
||
from web.serializers import record_req_log as _record_log
|
||
|
||
router = APIRouter()
|
||
|
||
LoginUser = Annotated[SiteUser, Depends(require_login)]
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
@router.api_route('/podcast/parse', methods=['GET', 'POST'])
|
||
async def podcast_parse(_user: LoginUser, request: Request):
|
||
"""播客解析:电台 → 详情+单集列表;单集 → 详情+音频直链。"""
|
||
await ratelimit.guard(request, bucket='free', limit=30, window=60)
|
||
data = await _request_data(request)
|
||
raw = data.get('id') or data.get('url')
|
||
if not raw:
|
||
return error("参数 'id' 不能为空", 400)
|
||
page_size = max(1, min(_safe_int(data.get('page_size'), 30), 100))
|
||
quality = str(data.get('quality') or 'auto')
|
||
|
||
cookies = _cookies()
|
||
try:
|
||
result = await podcast.parse_podcast_ref(raw, cookies, page_size=page_size)
|
||
except APIException as e:
|
||
return error(str(e), 404)
|
||
except Exception:
|
||
return error('服务暂时不可用,请稍后再试', 500)
|
||
|
||
if result.get('kind') == 'program':
|
||
program = result['program']
|
||
song_id = program.get('main_song_id')
|
||
url_info = None
|
||
if song_id:
|
||
try:
|
||
url_info = await podcast.resolve_episode_url(song_id, cookies, quality)
|
||
except Exception:
|
||
url_info = None
|
||
if url_info:
|
||
program['audio'] = {
|
||
'url': url_info['url'],
|
||
'level': url_info['level'],
|
||
'level_name': media.quality_display_name(url_info['level']),
|
||
'type': url_info['type'],
|
||
'size': url_info['size'],
|
||
'size_formatted': media.format_file_size(url_info['size']),
|
||
'br': url_info['br'],
|
||
}
|
||
else:
|
||
program['audio'] = None
|
||
try:
|
||
_record_log('解析', ratelimit.client_ip(request), program.get('name') or str(raw))
|
||
except Exception:
|
||
pass
|
||
else:
|
||
try:
|
||
_record_log('解析', ratelimit.client_ip(request),
|
||
(result.get('radio') or {}).get('name') or str(raw))
|
||
except Exception:
|
||
pass
|
||
|
||
return success(result, '播客解析成功')
|
||
|
||
|
||
@router.api_route('/podcast/programs', methods=['GET', 'POST'])
|
||
async def podcast_programs(_user: LoginUser, request: Request):
|
||
"""播客单集列表(分页加载)。"""
|
||
await ratelimit.guard(request, bucket='free', limit=30, window=60)
|
||
data = await _request_data(request)
|
||
radio_id = data.get('radio_id') or data.get('id')
|
||
if not radio_id:
|
||
return error("参数 'radio_id' 不能为空", 400)
|
||
limit = max(1, min(_safe_int(data.get('limit'), 30), 100))
|
||
offset = max(0, _safe_int(data.get('offset'), 0))
|
||
asc = str(data.get('asc', 'true')).lower() in ('1', 'true', 'yes')
|
||
|
||
radio_id = _extract_id(str(radio_id))
|
||
if not str(radio_id).isdigit():
|
||
return error('无效的电台 ID')
|
||
try:
|
||
result = await podcast.get_radio_programs(radio_id, _cookies(),
|
||
limit=limit, offset=offset, asc=asc)
|
||
return success(result, '获取单集列表成功')
|
||
except APIException as e:
|
||
return error(str(e), 404)
|
||
except Exception:
|
||
return error('服务暂时不可用,请稍后再试', 500)
|
||
|
||
|
||
@router.api_route('/podcast/search', methods=['GET', 'POST'])
|
||
async def podcast_search(_user: LoginUser, request: Request):
|
||
"""播客搜索(电台 / 单集声音)。"""
|
||
await ratelimit.guard(request, bucket='free', limit=30, window=60)
|
||
data = await _request_data(request)
|
||
keyword = data.get('keyword') or data.get('q')
|
||
if not keyword:
|
||
return error("参数 'keyword' 不能为空", 400)
|
||
limit = max(1, min(_safe_int(data.get('limit'), 20), 50))
|
||
offset = max(0, _safe_int(data.get('offset'), 0))
|
||
search_type = data.get('type', 'all')
|
||
if search_type not in ('all', 'radio', 'voice'):
|
||
search_type = 'all'
|
||
try:
|
||
result = await podcast.search_podcast(keyword, _cookies(),
|
||
limit=limit, offset=offset, search_type=search_type)
|
||
return success(result, '播客搜索完成')
|
||
except APIException as e:
|
||
return error(str(e), 404)
|
||
except Exception:
|
||
return error('服务暂时不可用,请稍后再试', 500)
|
||
|
||
|
||
@router.api_route('/podcast/hot', methods=['GET', 'POST'])
|
||
async def podcast_hot(_user: LoginUser, request: Request):
|
||
"""热门播客 + 播客分类列表。"""
|
||
await ratelimit.guard(request, bucket='free', limit=30, window=60)
|
||
data = await _request_data(request)
|
||
limit = max(1, min(_safe_int(data.get('limit'), 30), 100))
|
||
offset = max(0, _safe_int(data.get('offset'), 0))
|
||
cate_id = data.get('cate_id') or None
|
||
try:
|
||
radios = await podcast.get_hot_radios(_cookies(), limit=limit, offset=offset, cate_id=cate_id)
|
||
except APIException as e:
|
||
return error(str(e), 404)
|
||
except Exception:
|
||
return error('服务暂时不可用,请稍后再试', 500)
|
||
try:
|
||
categories = await podcast.get_categories()
|
||
except APIException:
|
||
categories = []
|
||
# 满页视为可能还有更多
|
||
return success({'radios': radios, 'categories': categories,
|
||
'has_more': len(radios) >= limit}, '获取热门播客成功')
|