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 个测试通过
54 lines
2.0 KiB
Python
54 lines
2.0 KiB
Python
"""依赖注入"""
|
||
from fastapi import Request
|
||
from app.services.proxy_service import ProxyService
|
||
from app.services.plugin_service import PluginService
|
||
from app.services.scheduler_service import SchedulerService
|
||
from app.services.validator_service import ValidatorService
|
||
from app.repositories.proxy_repo import ProxyRepository
|
||
from app.core.tasks.queue import ValidationQueue
|
||
from app.core.config import settings as app_settings
|
||
|
||
|
||
def get_proxy_service() -> ProxyService:
|
||
return ProxyService()
|
||
|
||
|
||
def get_plugin_service() -> PluginService:
|
||
return PluginService()
|
||
|
||
|
||
def get_scheduler_service(request: Request) -> SchedulerService:
|
||
return request.app.state.scheduler_service
|
||
|
||
|
||
def get_validation_queue(request: Request) -> ValidationQueue:
|
||
return request.app.state.validation_queue
|
||
|
||
|
||
def create_scheduler_service(db_settings: dict | None = None) -> SchedulerService:
|
||
"""在应用启动时创建 SchedulerService（非请求上下文）
|
||
|
||
db_settings 来自数据库持久化设置，用于覆盖 .env / 默认值。
|
||
"""
|
||
db_settings = db_settings or {}
|
||
validator = ValidatorService(
|
||
timeout=db_settings.get("validation_timeout", app_settings.validator_timeout),
|
||
connect_timeout=db_settings.get("connect_timeout", app_settings.validator_connect_timeout),
|
||
max_concurrency=db_settings.get("default_concurrency", app_settings.validator_max_concurrency),
|
||
)
|
||
proxy_repo = ProxyRepository()
|
||
queue = ValidationQueue(
|
||
validator=validator,
|
||
proxy_repo=proxy_repo,
|
||
worker_count=db_settings.get("default_concurrency", app_settings.validator_max_concurrency),
|
||
score_valid=app_settings.score_valid,
|
||
score_invalid=app_settings.score_invalid,
|
||
score_min=app_settings.score_min,
|
||
score_max=app_settings.score_max,
|
||
)
|
||
svc = SchedulerService(validation_queue=queue, proxy_repo=proxy_repo)
|
||
svc.interval_minutes = db_settings.get(
|
||
"validate_interval_minutes", 30
|
||
)
|
||
return svc
|