插件配置持久化:
- plugin_settings 表新增 config_json 字段,支持存储每个插件的自定义配置
- BaseCrawlerPlugin 新增 default_config 属性和 update_config 方法
- PluginSettingsRepository 新增 get_config / set_config 方法
- PluginService 新增 get_plugin_config 和 update_plugin_config
- api/routes/plugins.py 新增 GET /{id}/config 和 POST /{id}/config 接口
- 前端 Plugins.vue 增加配置编辑对话框,支持动态渲染数字/布尔/字符串类型配置
- ip3366 插件示例化:增加 max_pages 配置项,验证配置生效后会动态更新爬取 URL
任务队列持久化:
- 新建 validation_tasks 表:id, ip, port, protocol, status, result, response_time_ms, created_at, updated_at
- 新建 ValidationTaskRepository,提供 insert_batch / acquire_pending / complete_task / reset_processing 等方法
- ValidationQueue 重构:
- submit() 时把任务写入数据库并唤醒 Worker
- Worker 通过 acquire_pending 原子取任务并验证
- 验证完成后更新任务状态并入库有效代理
- 启动时自动恢复之前中断的 processing 任务为 pending
- 支持 drain() 等待所有 pending 完成
- 调度器验证流程同样自动持久化到任务表
其他适配:
- 更新 api/deps.py 和 api/lifespan.py,移除对已删除 settings_service 的残留引用
- 更新前端 pluginService.js 和 api/index.js 增加配置相关 API
46 lines
1.5 KiB
Python
46 lines
1.5 KiB
Python
"""依赖注入"""
|
||
from fastapi import Request
|
||
from services.proxy_service import ProxyService
|
||
from services.plugin_service import PluginService
|
||
from services.scheduler_service import SchedulerService
|
||
from services.validator_service import ValidatorService
|
||
from repositories.proxy_repo import ProxyRepository
|
||
from core.tasks.queue import ValidationQueue
|
||
from 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() -> SchedulerService:
|
||
"""在应用启动时创建 SchedulerService(非请求上下文)"""
|
||
validator = ValidatorService(
|
||
timeout=app_settings.validator_timeout,
|
||
connect_timeout=app_settings.validator_connect_timeout,
|
||
max_concurrency=app_settings.validator_max_concurrency,
|
||
)
|
||
proxy_repo = ProxyRepository()
|
||
queue = ValidationQueue(
|
||
validator=validator,
|
||
proxy_repo=proxy_repo,
|
||
worker_count=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,
|
||
)
|
||
return SchedulerService(validation_queue=queue, proxy_repo=proxy_repo)
|