4ef7931941
修复问题： - 添加缺失的 httpx 依赖到 requirements.txt - 修复前端批量删除参数格式与后端不匹配（数组->对象数组） - 移除 app/api/main.py 中重复创建 app 的冗余代码 - 修复 Plugins.vue v-model 直接修改 store 状态的 Vue 警告 - 修复 README 端口/启动命令文档与实际配置不一致 - 修正 pytest.ini 过时配置 (asyncio_default_fixture_loop_scope) - 修复 WebUI index.html 语言设置为 zh-CN - 修复 .gitignore 错误忽略 tests/ 目录 后端优化： - 修复调度器默认间隔从 5 秒改为 30 分钟，避免无节制验证 - 修复 validate_all_now 在调度器停止时无法执行的 bug - 设置保存后热更新运行中调度器的验证间隔 - 将 update_score 优化为原子单事务 SQL，消除并发竞态 - 导出功能改为真正的流式分批读取（iter_batches），降低大导出内存占用 - ProxyResponse Schema 补齐 response_time_ms 字段 - 日志级别改为从配置动态读取，不再硬编码 INFO - 清理 validator_service 中的冗余 try/finally 代码 插件健壮性： - 修复 ip3366/ip89/kuaidaili/proxylist_download/speedx/yundaili/proxyscrape 的端口范围检查和 IPv6 地址解析问题（改用 rsplit + 1-65535 校验） - 修复 PluginService.list_plugins 并发竞争条件 - 修复 run_all_plugins 去重逻辑与数据库 UNIQUE 约束保持一致 - 修复 proxyscrape 异常时错误跳过 fallback 的 bug 测试： - 新增 7 个插件解析单元测试 - 新增 update_score 自动删除和 iter_batches 流式读取测试 - 全部 74 个测试通过
107 lines
3.6 KiB
Python
107 lines
3.6 KiB
Python
"""代理业务服务"""
|
|
import csv
|
|
import json
|
|
import io
|
|
from datetime import datetime
|
|
from typing import List, Optional, Tuple, AsyncIterator
|
|
from app.core.db import get_db
|
|
from app.repositories.proxy_repo import ProxyRepository
|
|
from app.models.domain import Proxy
|
|
from app.core.log import logger
|
|
|
|
|
|
class ProxyService:
|
|
def __init__(self, proxy_repo: ProxyRepository = ProxyRepository()):
|
|
self.proxy_repo = proxy_repo
|
|
|
|
async def get_stats(self) -> dict:
|
|
async with get_db() as db:
|
|
stats = await self.proxy_repo.get_stats(db)
|
|
stats["today_new"] = await self.proxy_repo.get_today_new_count(db)
|
|
return stats
|
|
|
|
async def list_proxies(
|
|
self,
|
|
page: int = 1,
|
|
page_size: int = 20,
|
|
protocol: Optional[str] = None,
|
|
min_score: int = 0,
|
|
max_score: Optional[int] = None,
|
|
sort_by: str = "last_check",
|
|
sort_order: str = "DESC",
|
|
) -> Tuple[List[Proxy], int]:
|
|
async with get_db() as db:
|
|
return await self.proxy_repo.list_paginated(
|
|
db, page, page_size, protocol, min_score, max_score, sort_by, sort_order
|
|
)
|
|
|
|
async def get_random_proxy(self) -> Optional[Proxy]:
|
|
async with get_db() as db:
|
|
return await self.proxy_repo.get_random(db)
|
|
|
|
async def delete_proxy(self, ip: str, port: int) -> None:
|
|
async with get_db() as db:
|
|
await self.proxy_repo.delete(db, ip, port)
|
|
|
|
async def batch_delete(self, proxies: List[Tuple[str, int]]) -> int:
|
|
async with get_db() as db:
|
|
return await self.proxy_repo.batch_delete(db, proxies)
|
|
|
|
async def clean_invalid(self) -> int:
|
|
async with get_db() as db:
|
|
return await self.proxy_repo.clean_invalid(db)
|
|
|
|
async def clean_expired(self, days: int) -> int:
|
|
async with get_db() as db:
|
|
return await self.proxy_repo.clean_expired(db, days)
|
|
|
|
async def export_proxies(
|
|
self,
|
|
fmt: str,
|
|
protocol: Optional[str] = None,
|
|
limit: int = 10000,
|
|
) -> AsyncIterator[str]:
|
|
if fmt == "csv":
|
|
yield "\ufeffIP,Port,Protocol,Score,Last Check\n"
|
|
elif fmt == "txt":
|
|
pass
|
|
elif fmt == "json":
|
|
yield "["
|
|
first = True
|
|
|
|
exported = 0
|
|
async with get_db() as db:
|
|
async for batch in self.proxy_repo.iter_batches(db, protocol=protocol, batch_size=1000):
|
|
for p in batch:
|
|
if exported >= limit:
|
|
break
|
|
if fmt == "csv":
|
|
yield f"{p.ip},{p.port},{p.protocol},{p.score},{self._fmt_time(p.last_check)}\n"
|
|
elif fmt == "txt":
|
|
yield f"{p.ip}:{p.port}\n"
|
|
elif fmt == "json":
|
|
item = {
|
|
"ip": p.ip,
|
|
"port": p.port,
|
|
"protocol": p.protocol,
|
|
"score": p.score,
|
|
"last_check": self._fmt_time(p.last_check),
|
|
}
|
|
prefix = "" if first else ","
|
|
yield prefix + json.dumps(item, ensure_ascii=False)
|
|
first = False
|
|
exported += 1
|
|
if exported >= limit:
|
|
break
|
|
|
|
if fmt == "json":
|
|
yield "]"
|
|
|
|
@staticmethod
|
|
def _fmt_time(dt: Optional[datetime]) -> str:
|
|
if not dt:
|
|
return ""
|
|
if isinstance(dt, str):
|
|
return dt
|
|
return dt.isoformat()
|