在上游 MediaCrawler 之上新增一层: - 监控层 api/monitor/ —— 多博主/多笔记的定时采集、指标快照差分、报表、 企业微信通知。每轮采集写入独立目录,差分才成立。 - WebUI 登录鉴权 api/auth.py —— PBKDF2 口令 + 服务端会话,/api 全接口防护。 WebSocket 单独加依赖:BaseHTTPMiddleware 对 ws 作用域直接放行,覆盖不到。 - 全局平台切换 + 能力矩阵 —— 如实区分「爬虫模块支持」与「监控层已接线」, 未接通的平台直接拒绝建任务,而不是静默跑空。 - 监控库改用 MySQL 5.7(可回退 SQLite 供测试):逐表强制 utf8mb4 (服务端与库默认都是 latin1),启动校验所连 schema 以防写错库, 连接池 recycle + pre_ping 应对 MySQL 的 8 小时空闲断连。 修复上游缺陷: - xhs/core.py: 主页抓取失败会跳掉整个博主,导致一条作品都抓不到, 而那份资料只喂给一个空函数。改为尽力而为,失败不中断。 - xhs/login.py: cookie 登录只注入 web_session,冷启动签名会失败。 新增 INJECT_ALL_COOKIES 开关(默认关闭,原有行为不变)。 - requirements.txt: 补上 websockets。它在上游 pyproject.toml 里有声明、 这里漏了,导致 uvicorn 没有 WebSocket 能力,实时日志流从未工作。 改动过的上游文件清单及合并方式见 UPSTREAM.md。 测试:492 passed(另有 1 个既有的 Windows/gbk 上游测试失败,与本改动无关)
82 lines
3.4 KiB
Python
82 lines
3.4 KiB
Python
# -*- coding: utf-8 -*-
|
|
# Copyright (c) 2025 [email protected]
|
|
#
|
|
# This file is part of MediaCrawler project.
|
|
# Repository: https://github.com/NanmiCoder/MediaCrawler/blob/main/api/schemas/monitor.py
|
|
# GitHub: https://github.com/NanmiCoder
|
|
# Licensed under NON-COMMERCIAL LEARNING LICENSE 1.1
|
|
#
|
|
# 声明:本代码仅供学习和研究目的使用。使用者应遵守以下原则:
|
|
# 1. 不得用于任何商业用途。
|
|
# 2. 使用时应遵守目标平台的使用条款和robots.txt规则。
|
|
# 3. 不得进行大规模爬取或对平台造成运营干扰。
|
|
# 4. 应合理控制请求频率,避免给目标平台带来不必要的负担。
|
|
# 5. 不得用于任何非法或不当的用途。
|
|
#
|
|
# 详细许可条款请参阅项目根目录下的LICENSE文件。
|
|
# 使用本代码即表示您同意遵守上述原则和LICENSE中的所有条款。
|
|
|
|
"""Request models for the monitoring API."""
|
|
|
|
from typing import List, Literal, Optional
|
|
|
|
from pydantic import BaseModel, Field
|
|
|
|
# A floor on the interval is a correctness guard, not a nicety: every run
|
|
# launches a browser and hits XHS with several requests, so a short interval
|
|
# across many creators is the pattern that triggers rate limiting.
|
|
MIN_INTERVAL_MINUTES = 30
|
|
MAX_INTERVAL_MINUTES = 7 * 24 * 60
|
|
|
|
|
|
class MonitorTaskCreate(BaseModel):
|
|
name: str = Field(min_length=1, max_length=200)
|
|
platform: str = "xhs"
|
|
# One subprocess handles exactly one crawler type, so a task is either
|
|
# creator-driven or note-driven.
|
|
mode: Literal["creator", "note"]
|
|
# None means "use the value configured on the Settings page", which is what
|
|
# makes those defaults meaningful. Bounds still apply when a value is given.
|
|
interval_minutes: Optional[int] = Field(
|
|
default=None, ge=MIN_INTERVAL_MINUTES, le=MAX_INTERVAL_MINUTES
|
|
)
|
|
max_notes_count: Optional[int] = Field(default=None, ge=1, le=500)
|
|
enable_comments: bool = True
|
|
# Raising this widens the comment window, which is the only lever available
|
|
# for noticing new comments -- the API has no time-sort.
|
|
max_comments_count: Optional[int] = Field(default=None, ge=1, le=500)
|
|
run_timeout_seconds: int = Field(default=3600, ge=60, le=86400)
|
|
enabled: bool = True
|
|
# Push a WeCom summary for runs that failed or found new works. Opt-in per
|
|
# task so a single webhook does not get flooded.
|
|
notify_enabled: bool = False
|
|
# Raw pasted values: full URLs or bare ids, in either form.
|
|
targets: List[str] = Field(min_length=1)
|
|
|
|
|
|
class MonitorTaskUpdate(BaseModel):
|
|
name: Optional[str] = Field(default=None, min_length=1, max_length=200)
|
|
enabled: Optional[bool] = None
|
|
interval_minutes: Optional[int] = Field(
|
|
default=None, ge=MIN_INTERVAL_MINUTES, le=MAX_INTERVAL_MINUTES
|
|
)
|
|
max_notes_count: Optional[int] = Field(default=None, ge=1, le=500)
|
|
enable_comments: Optional[bool] = None
|
|
max_comments_count: Optional[int] = Field(default=None, ge=1, le=500)
|
|
run_timeout_seconds: Optional[int] = Field(default=None, ge=60, le=86400)
|
|
notify_enabled: Optional[bool] = None
|
|
# When present, replaces the whole target list.
|
|
targets: Optional[List[str]] = None
|
|
|
|
|
|
class CookiePayload(BaseModel):
|
|
cookie: str = Field(min_length=1)
|
|
|
|
|
|
class WebhookPayload(BaseModel):
|
|
url: str = Field(default="", description="企业微信机器人 Webhook 地址,留空表示停用")
|
|
|
|
|
|
class WebhookTestPayload(BaseModel):
|
|
url: Optional[str] = Field(default=None, description="不传则使用已保存的地址")
|