Archived
snowy-yang
445c16c329
为什么：_touch_device 在 services/tasks.py 与 web/routers/tasks.py 各有一份 逐字相同的实现，且两份都活着。同一份「更新设备心跳时间」的逻辑有两处副本， 改一处忘另一处就会出现行为分叉。 改法：删掉 web 层本地副本（16 行），改为调用 services.tasks._touch_device （两处调用点），并补 import asyncio 以包裹 to_thread。 说明：上一轮报告里提到的「6 组分叉实现」实测需逐组降级——success()/error() 分属不同层（一个是 tuple 返回、一个是 JSONResponse），iter_content 是两个垫片 的适配器，都**不该**合并；只有 _touch_device 是真·逐字重复，故只收敛这一组。
223 lines
8.7 KiB
Python
223 lines
8.7 KiB
Python
# -*- coding: utf-8 -*-
|
||
"""任务状态端点。
|
||
|
||
端点：
|
||
- POST/GET /api/v1/topen ↔ Flask /api/topen（请求统计，无鉴权）
|
||
- POST/GET /api/v1/queue ↔ Flask /api/queue（排队状态，无鉴权）
|
||
- POST/GET /api/v1/batch_progress ↔ Flask /api/batch_progress（需登录，仅本人任务）
|
||
- POST /api/v1/task/cancel ↔ Flask /api/task/cancel（需登录，仅本人任务）
|
||
- POST/GET /api/v1/task/heartbeat ↔ Flask /api/task/heartbeat（需登录）
|
||
- POST/GET /api/v1/task/list ↔ Flask /api/task/list（需登录）
|
||
|
||
这些端点读写 core.state 的共享任务表（与任务执行侧同一批对象），因此
|
||
看到的是同一份任务状态。
|
||
"""
|
||
import asyncio
|
||
import time
|
||
from typing import Annotated, Any
|
||
|
||
from fastapi import APIRouter, Depends, Request
|
||
|
||
from core.state import (
|
||
BATCH_DURATIONS,
|
||
BATCH_DURATIONS_LOCK,
|
||
DEVICE_LAST_SEEN,
|
||
DEVICE_LAST_SEEN_LOCK,
|
||
DOWNLOAD_TASKS,
|
||
DOWNLOAD_TASKS_LOCK,
|
||
REQUEST_STATS,
|
||
STATS_LOCK,
|
||
)
|
||
from services import tasks as services_tasks
|
||
from web import ratelimit
|
||
from web.deps import SiteUser, require_login
|
||
from web.request_utils import (
|
||
request_data as _request_data,
|
||
)
|
||
from web.response import error, success
|
||
|
||
router = APIRouter()
|
||
|
||
LoginUser = Annotated[SiteUser, Depends(require_login)]
|
||
|
||
|
||
|
||
def _owned_by(task: dict[str, Any], user: SiteUser) -> bool:
|
||
return int(task.get('user_id') or 0) == int(user.id)
|
||
|
||
|
||
def _semaphores():
|
||
"""批量打包/下载信号量（懒取，与 core.state 中的同一对象共享计数）。"""
|
||
from services._shared import BATCH_ZIP_SEM
|
||
from services.api_service import api_service
|
||
return BATCH_ZIP_SEM, api_service.downloader._download_semaphore
|
||
|
||
|
||
@router.api_route('/api/topen', methods=['GET', 'POST'])
|
||
async def topen(request: Request):
|
||
"""接口请求统计（实时）——锁内快照，避免 total 与明细不一致。"""
|
||
from services._shared import ENDPOINT_NAMES
|
||
with STATS_LOCK:
|
||
snapshot = {p: dict(v) for p, v in REQUEST_STATS.items()}
|
||
endpoints = []
|
||
total = sum(v['count'] for v in snapshot.values())
|
||
for path, info in snapshot.items():
|
||
endpoints.append({
|
||
'path': path,
|
||
'name': ENDPOINT_NAMES.get(path, path),
|
||
'count': info['count'],
|
||
'percent': round(info['count'] / total * 100, 1) if total else 0,
|
||
'last': info['last'],
|
||
})
|
||
endpoints.sort(key=lambda x: x['count'], reverse=True)
|
||
return success({
|
||
'total': total,
|
||
'endpoint_count': len(endpoints),
|
||
'max_count': endpoints[0]['count'] if endpoints else 0,
|
||
'endpoints': endpoints,
|
||
}, '获取请求统计成功')
|
||
|
||
|
||
@router.api_route('/api/queue', methods=['GET', 'POST'])
|
||
async def queue(request: Request):
|
||
"""实时排队状态（排队人数 + 预计等待时间）。"""
|
||
batch_sem, dl_sem = _semaphores()
|
||
avg_batch = None
|
||
with BATCH_DURATIONS_LOCK:
|
||
if BATCH_DURATIONS:
|
||
avg_batch = sum(BATCH_DURATIONS) / len(BATCH_DURATIONS)
|
||
return success({
|
||
'batch_capacity': batch_sem.capacity,
|
||
'batch_active': batch_sem.active,
|
||
'batch_waiting': batch_sem.waiting,
|
||
'download_capacity': dl_sem.capacity,
|
||
'download_active': dl_sem.active,
|
||
'download_waiting': dl_sem.waiting,
|
||
'avg_batch_seconds': round(avg_batch, 1) if avg_batch else None,
|
||
}, '获取排队状态成功')
|
||
|
||
|
||
@router.api_route('/api/batch_progress', methods=['GET', 'POST'])
|
||
async def batch_progress(user: LoginUser, request: Request):
|
||
"""下载任务进度（已处理 X/Y + 百分比 + 预计剩余时间）。"""
|
||
data = await _request_data(request)
|
||
task_id = str(data.get('task_id') or '').strip()
|
||
if not task_id:
|
||
return error('缺少 task_id 参数')
|
||
now = time.time()
|
||
with DOWNLOAD_TASKS_LOCK:
|
||
task = DOWNLOAD_TASKS.get(task_id)
|
||
if not task:
|
||
return error('任务不存在或已过期', 404)
|
||
if not _owned_by(task, user):
|
||
return error('无权查询该任务', 403)
|
||
|
||
total = task.get('total', 0)
|
||
done = task.get('done', 0)
|
||
live = task.get('live_percent')
|
||
if task.get('status') == 'running' and isinstance(live, (int, float)):
|
||
percent = round(min(99.0, max(0.0, float(live))), 1)
|
||
elif total:
|
||
percent = round(done / total * 100, 1)
|
||
else:
|
||
percent = 100.0 if task.get('status') in ('done',) else 0.0
|
||
elapsed = now - task.get('start', now)
|
||
eta = None
|
||
if task.get('status') == 'running' and done > 0 and elapsed > 0 and total:
|
||
rate = done / elapsed
|
||
if rate > 0:
|
||
eta = round((total - done) / rate, 1)
|
||
result = task.get('result') or {}
|
||
has_result = bool(result.get('zip_path') or result.get('file_path'))
|
||
return success({
|
||
'total': total,
|
||
'done': done,
|
||
'failed': task.get('failed', 0),
|
||
'percent': percent,
|
||
'status': task.get('status', 'running'),
|
||
'elapsed': round(elapsed, 1),
|
||
'eta': eta,
|
||
'msg': task.get('msg', ''),
|
||
'refunded': task.get('refunded', 0),
|
||
'has_result': has_result,
|
||
}, '获取任务进度成功')
|
||
|
||
|
||
@router.post('/api/task/cancel')
|
||
async def task_cancel(user: LoginUser, request: Request):
|
||
"""取消下载任务（仅任务本人的站点账号可取消）。"""
|
||
data = await _request_data(request)
|
||
task_id = str(data.get('task_id') or '').strip()
|
||
if not task_id:
|
||
return error('缺少 task_id 参数')
|
||
with DOWNLOAD_TASKS_LOCK:
|
||
task = DOWNLOAD_TASKS.get(task_id)
|
||
if not task:
|
||
return error('任务不存在或已过期', 404)
|
||
if not _owned_by(task, user):
|
||
return error('无权取消该任务', 403)
|
||
if task.get('status') in ('done', 'error', 'canceled'):
|
||
return error(f"任务已结束（{task.get('status')}）", 400)
|
||
task['status'] = 'canceled'
|
||
task['msg'] = '任务已取消'
|
||
task['completed_at'] = time.time()
|
||
task['cancel'].set()
|
||
return success({'task_id': task_id, 'status': 'canceled'}, '已请求取消')
|
||
|
||
|
||
@router.api_route('/api/task/heartbeat', methods=['GET', 'POST'])
|
||
async def task_heartbeat(user: LoginUser, request: Request):
|
||
"""设备心跳：保持任务活跃；暂停中的任务自动恢复（重新进入排队）。"""
|
||
await ratelimit.guard(request, bucket='hb', limit=60, window=60)
|
||
data = await _request_data(request)
|
||
device_id = str(data.get('device_id') or '').strip()[:64]
|
||
if not device_id:
|
||
return error('缺少 device_id 参数')
|
||
await asyncio.to_thread(services_tasks._touch_device, device_id)
|
||
resumed = 0
|
||
with DOWNLOAD_TASKS_LOCK:
|
||
for task in DOWNLOAD_TASKS.values():
|
||
if (task.get('device_id') == device_id
|
||
and int(task.get('user_id') or 0) == int(user.id)
|
||
and task.get('status') == 'paused'):
|
||
task['status'] = 'queued'
|
||
task['msg'] = '恢复中...'
|
||
task['pause'].clear()
|
||
resumed += 1
|
||
now = time.time()
|
||
with DEVICE_LAST_SEEN_LOCK:
|
||
stale = [d for d, ts in DEVICE_LAST_SEEN.items() if now - ts > 86400]
|
||
for d in stale:
|
||
DEVICE_LAST_SEEN.pop(d, None)
|
||
return success({'resumed': resumed, 'online': True}, '心跳成功')
|
||
|
||
|
||
@router.api_route('/api/task/list', methods=['GET', 'POST'])
|
||
async def task_list(user: LoginUser, request: Request):
|
||
"""本设备未结束的任务列表（重新打开网站时恢复任务悬浮窗）。"""
|
||
data = await _request_data(request)
|
||
device_id = str(data.get('device_id') or '').strip()[:64]
|
||
if not device_id:
|
||
return error('缺少 device_id 参数')
|
||
await asyncio.to_thread(services_tasks._touch_device, device_id)
|
||
my_tasks = []
|
||
with DOWNLOAD_TASKS_LOCK:
|
||
for tid, task in DOWNLOAD_TASKS.items():
|
||
params = task.get('params') or {}
|
||
if (task.get('device_id') == device_id
|
||
and int(task.get('user_id') or 0) == int(user.id)
|
||
and task.get('status') in ('queued', 'running', 'paused')):
|
||
my_tasks.append({
|
||
'task_id': tid,
|
||
'type': task.get('type', 'batch'),
|
||
'kind': ('podcast' if ('program_id' in params
|
||
or 'radio_name' in params
|
||
or params.get('radio_id'))
|
||
else 'music'),
|
||
'total': task.get('total', 0),
|
||
'done': task.get('done', 0),
|
||
'status': task.get('status', 'queued'),
|
||
'msg': task.get('msg', ''),
|
||
})
|
||
return success({'tasks': my_tasks}, '获取任务列表成功')
|