📝 更新文档pdf

nonebot_bison/admin_page/api.py

@@ -1,5 +1,3 @@
-from typing import cast
-
 import nonebot
 from fastapi import status
 from fastapi.routing import APIRouter
@@ -14,18 +12,14 @@ from ..apis import check_sub_target
 from .jwt import load_jwt, pack_jwt
 from ..types import Target as T_Target
 from ..utils.get_bot import get_groups
+from ..platform import platform_manager
 from .token_manager import token_manager
 from ..config.db_config import SubscribeDupException
-from ..platform import site_manager, platform_manager
-from ..utils.site import CookieClientManager, is_cookie_client_manager
 from ..config import NoSuchUserException, NoSuchTargetException, NoSuchSubscribeException, config
 from .types import (
-    Cookie,
     TokenResp,
     GlobalConf,
-    SiteConfig,
     StatusResp,
-    CookieTarget,
     SubscribeResp,
     PlatformConfig,
     AddSubscribeReq,
@@ -60,20 +54,16 @@ async def check_is_superuser(token_obj: dict = Depends(get_jwt_obj)):
 
 @router.get("/global_conf")
 async def get_global_conf() -> GlobalConf:
-    platform_res = {}
+    res = {}
     for platform_name, platform in platform_manager.items():
-        platform_res[platform_name] = PlatformConfig(
+        res[platform_name] = PlatformConfig(
             platformName=platform_name,
             categories=platform.categories,
             enabledTag=platform.enable_tag,
-            site_name=platform.site.name,
             name=platform.name,
             hasTarget=getattr(platform, "has_target"),
         )
-    site_res = {}
+    return GlobalConf(platformConf=res)
-    for site_name, site in site_manager.items():
-        site_res[site_name] = SiteConfig(name=site_name, enable_cookie=is_cookie_client_manager(site.client_mgr))
-    return GlobalConf(platformConf=platform_res, siteConf=site_res)
 
 
 async def get_admin_groups(qq: int):
@@ -207,64 +197,3 @@ async def update_weigth_config(platformName: str, target: str, weight_config: We
     except NoSuchTargetException:
         raise HTTPException(status.HTTP_400_BAD_REQUEST, "no such subscribe")
     return StatusResp(ok=True, msg="")
-
-
-@router.get("/cookie", dependencies=[Depends(check_is_superuser)])
-async def get_cookie(site_name: str = None, target: str = None) -> list[Cookie]:
-    cookies_in_db = await config.get_cookie(site_name, is_anonymous=False)
-    client_mgr = cast(CookieClientManager, site_manager[site_name].client_mgr)
-    friendly_names = [await client_mgr.get_cookie_friendly_name(x) for x in cookies_in_db]
-    return [
-        Cookie(
-            id=cookies_in_db[i].id,
-            friendly_name=friendly_names[i],
-            site_name=cookies_in_db[i].site_name,
-            last_usage=cookies_in_db[i].last_usage,
-            status=cookies_in_db[i].status,
-            cd_milliseconds=cookies_in_db[i].cd_milliseconds,
-            is_universal=cookies_in_db[i].is_universal,
-            is_anonymous=cookies_in_db[i].is_anonymous,
-            tags=cookies_in_db[i].tags,
-        )
-        for i in range(len(cookies_in_db))
-    ]
-
-
-@router.post("/cookie", dependencies=[Depends(check_is_superuser)])
-async def add_cookie(site_name: str, content: str) -> StatusResp:
-    client_mgr = cast(CookieClientManager, site_manager[site_name].client_mgr)
-    await client_mgr.add_user_cookie(content)
-    return StatusResp(ok=True, msg="")
-
-
-@router.delete("/cookie/{cookie_id}", dependencies=[Depends(check_is_superuser)])
-async def delete_cookie_by_id(cookie_id: int) -> StatusResp:
-    await config.delete_cookie_by_id(cookie_id)
-    return StatusResp(ok=True, msg="")
-
-
-@router.get("/cookie_target", dependencies=[Depends(check_is_superuser)])
-async def get_cookie_target(
-    site_name: str | None = None, target: str | None = None, cookie_id: int | None = None
-) -> list[CookieTarget]:
-    cookie_targets = await config.get_cookie_target()
-    # TODO: filter in SQL
-    return [
-        x
-        for x in cookie_targets
-        if (site_name is None or x.cookie.site_name == site_name)
-        and (target is None or x.target.target == target)
-        and (cookie_id is None or x.cookie.id == cookie_id)
-    ]
-
-
-@router.post("/cookie_target", dependencies=[Depends(check_is_superuser)])
-async def add_cookie_target(platform_name: str, target: str, cookie_id: int) -> StatusResp:
-    await config.add_cookie_target(target, platform_name, cookie_id)
-    return StatusResp(ok=True, msg="")
-
-
-@router.delete("/cookie_target", dependencies=[Depends(check_is_superuser)])
-async def del_cookie_target(platform_name: str, target: str, cookie_id: int) -> StatusResp:
-    await config.delete_cookie_target(target, platform_name, cookie_id)
-    return StatusResp(ok=True, msg="")

nonebot_bison/admin_page/types.py

@@ -6,22 +6,14 @@ class PlatformConfig(BaseModel):
     categories: dict[int, str]
     enabledTag: bool
     platformName: str
-    site_name: str
     hasTarget: bool
 
 
-class SiteConfig(BaseModel):
-    name: str
-    enable_cookie: bool
-
-
 AllPlatformConf = dict[str, PlatformConfig]
-AllSiteConf = dict[str, SiteConfig]
 
 
 class GlobalConf(BaseModel):
     platformConf: AllPlatformConf
-    siteConf: AllSiteConf
 
 
 class TokenResp(BaseModel):
@@ -58,32 +50,3 @@ class AddSubscribeReq(BaseModel):
 class StatusResp(BaseModel):
     ok: bool
     msg: str
-
-
-from typing import Any
-from datetime import datetime
-
-from pydantic import BaseModel
-
-
-class Target(BaseModel):
-    platform_name: str
-    target_name: str
-    target: str
-
-
-class Cookie(BaseModel):
-    id: int
-    site_name: str
-    friendly_name: str
-    last_usage: datetime
-    status: str
-    cd_milliseconds: int
-    is_universal: bool
-    is_anonymous: bool
-    tags: dict[str, Any]
-
-
-class CookieTarget(BaseModel):
-    target: Target
-    cookie_id: int

nonebot_bison/config/db_config.py

@@ -12,8 +12,8 @@ from nonebot_plugin_datastore import create_session
 
 from ..types import Tag
 from ..types import Target as T_Target
-from .utils import NoSuchTargetException, DuplicateCookieTargetException
+from .utils import NoSuchTargetException
-from .db_model import User, Cookie, Target, Subscribe, CookieTarget, ScheduleTimeWeight
+from .db_model import User, Target, Subscribe, ScheduleTimeWeight
 from ..types import Category, UserSubInfo, WeightConfig, TimeWeightConfig, PlatformWeightConfigResp
 
 
@@ -259,108 +259,5 @@ class DBConfig:
             )
         return res
 
-    async def get_cookie(
-        self,
-        site_name: str | None = None,
-        target: T_Target | None = None,
-        is_universal: bool | None = None,
-        is_anonymous: bool | None = None,
-    ) -> Sequence[Cookie]:
-        """获取满足传入条件的所有 cookie"""
-        async with create_session() as sess:
-            query = select(Cookie).distinct()
-            if is_universal is not None:
-                query = query.where(Cookie.is_universal == is_universal)
-            if is_anonymous is not None:
-                query = query.where(Cookie.is_anonymous == is_anonymous)
-            if site_name:
-                query = query.where(Cookie.site_name == site_name)
-            query = query.outerjoin(CookieTarget).options(selectinload(Cookie.targets))
-            res = (await sess.scalars(query)).all()
-            if target:
-                # 如果指定了 target，过滤掉不满足要求的cookie
-                query = select(CookieTarget.cookie_id).join(Target).where(Target.target == target)
-                ids = set((await sess.scalars(query)).all())
-                # 如果指定了 target 且未指定 is_universal，则添加返回 universal cookie
-                res = [cookie for cookie in res if cookie.id in ids or cookie.is_universal]
-            return res
-
-    async def add_cookie(self, cookie: Cookie) -> int:
-        async with create_session() as sess:
-            sess.add(cookie)
-            await sess.commit()
-            await sess.refresh(cookie)
-            return cookie.id
-
-    async def update_cookie(self, cookie: Cookie):
-        async with create_session() as sess:
-            cookie_in_db: Cookie | None = await sess.scalar(select(Cookie).where(Cookie.id == cookie.id))
-            if not cookie_in_db:
-                raise ValueError(f"cookie {cookie.id} not found")
-            cookie_in_db.content = cookie.content
-            cookie_in_db.last_usage = cookie.last_usage
-            cookie_in_db.status = cookie.status
-            cookie_in_db.tags = cookie.tags
-            await sess.commit()
-
-    async def delete_cookie_by_id(self, cookie_id: int):
-        async with create_session() as sess:
-            cookie = await sess.scalar(
-                select(Cookie)
-                .where(Cookie.id == cookie_id)
-                .outerjoin(CookieTarget)
-                .options(selectinload(Cookie.targets))
-            )
-            if len(cookie.targets) > 0:
-                raise Exception(f"cookie {cookie.id} in use")
-            await sess.execute(delete(Cookie).where(Cookie.id == cookie_id))
-            await sess.commit()
-
-    async def add_cookie_target(self, target: T_Target, platform_name: str, cookie_id: int):
-        """通过 cookie_id 可以唯一确定一个 Cookie，通过 target 和 platform_name 可以唯一确定一个 Target"""
-        async with create_session() as sess:
-            target_obj = await sess.scalar(
-                select(Target).where(Target.platform_name == platform_name, Target.target == target)
-            )
-            # check if relation exists
-            cookie_target = await sess.scalar(
-                select(CookieTarget).where(CookieTarget.target == target_obj, CookieTarget.cookie_id == cookie_id)
-            )
-            if cookie_target:
-                raise DuplicateCookieTargetException()
-            cookie_obj = await sess.scalar(select(Cookie).where(Cookie.id == cookie_id))
-            cookie_target = CookieTarget(target=target_obj, cookie=cookie_obj)
-            sess.add(cookie_target)
-            await sess.commit()
-
-    async def delete_cookie_target(self, target: T_Target, platform_name: str, cookie_id: int):
-        async with create_session() as sess:
-            target_obj = await sess.scalar(
-                select(Target).where(Target.platform_name == platform_name, Target.target == target)
-            )
-            cookie_obj = await sess.scalar(select(Cookie).where(Cookie.id == cookie_id))
-            await sess.execute(
-                delete(CookieTarget).where(CookieTarget.target == target_obj, CookieTarget.cookie == cookie_obj)
-            )
-            await sess.commit()
-
-    async def delete_cookie_target_by_id(self, cookie_target_id: int):
-        async with create_session() as sess:
-            await sess.execute(delete(CookieTarget).where(CookieTarget.id == cookie_target_id))
-            await sess.commit()
-
-    async def get_cookie_target(self) -> list[CookieTarget]:
-        async with create_session() as sess:
-            query = (
-                select(CookieTarget)
-                .outerjoin(Target)
-                .options(selectinload(CookieTarget.target))
-                .outerjoin(Cookie)
-                .options(selectinload(CookieTarget.cookie))
-            )
-            res = list((await sess.scalars(query)).all())
-            res.sort(key=lambda x: (x.target.platform_name, x.cookie_id, x.target_id))
-            return res
-
 
 config = DBConfig()

nonebot_bison/config/db_model.py

@@ -1,5 +1,4 @@
 import datetime
-from typing import Any
 from pathlib import Path
 
 from nonebot_plugin_saa import PlatformTarget
@@ -7,7 +6,7 @@ from sqlalchemy.dialects.postgresql import JSONB
 from nonebot.compat import PYDANTIC_V2, ConfigDict
 from nonebot_plugin_datastore import get_plugin_data
 from sqlalchemy.orm import Mapped, relationship, mapped_column
-from sqlalchemy import JSON, String, DateTime, ForeignKey, UniqueConstraint
+from sqlalchemy import JSON, String, ForeignKey, UniqueConstraint
 
 from ..types import Tag, Category
 
@@ -37,7 +36,6 @@ class Target(Model):
 
     subscribes: Mapped[list["Subscribe"]] = relationship(back_populates="target")
     time_weight: Mapped[list["ScheduleTimeWeight"]] = relationship(back_populates="target")
-    cookies: Mapped[list["CookieTarget"]] = relationship(back_populates="target")
 
 
 class ScheduleTimeWeight(Model):
@@ -68,40 +66,3 @@ class Subscribe(Model):
 
     target: Mapped[Target] = relationship(back_populates="subscribes")
     user: Mapped[User] = relationship(back_populates="subscribes")
-
-
-class Cookie(Model):
-    id: Mapped[int] = mapped_column(primary_key=True)
-    site_name: Mapped[str] = mapped_column(String(100))
-    content: Mapped[str] = mapped_column(String(1024))
-    # 最后使用的时刻
-    last_usage: Mapped[datetime.datetime] = mapped_column(DateTime, default=datetime.datetime(1970, 1, 1))
-    # Cookie 当前的状态
-    status: Mapped[str] = mapped_column(String(20), default="")
-    # 使用一次之后，需要的冷却时间
-    cd_milliseconds: Mapped[int] = mapped_column(default=0)
-    # 是否是通用 Cookie（对所有Target都有效）
-    is_universal: Mapped[bool] = mapped_column(default=False)
-    # 是否是匿名 Cookie
-    is_anonymous: Mapped[bool] = mapped_column(default=False)
-    # 标签，扩展用
-    tags: Mapped[dict[str, Any]] = mapped_column(JSON().with_variant(JSONB, "postgresql"), default={})
-
-    targets: Mapped[list["CookieTarget"]] = relationship(back_populates="cookie")
-
-    @property
-    def cd(self) -> datetime.timedelta:
-        return datetime.timedelta(milliseconds=self.cd_milliseconds)
-
-    @cd.setter
-    def cd(self, value: datetime.timedelta):
-        self.cd_milliseconds = int(value.total_seconds() * 1000)
-
-
-class CookieTarget(Model):
-    id: Mapped[int] = mapped_column(primary_key=True)
-    target_id: Mapped[int] = mapped_column(ForeignKey("nonebot_bison_target.id", ondelete="CASCADE"))
-    cookie_id: Mapped[int] = mapped_column(ForeignKey("nonebot_bison_cookie.id", ondelete="CASCADE"))
-
-    target: Mapped[Target] = relationship(back_populates="cookies")
-    cookie: Mapped[Cookie] = relationship(back_populates="targets")

nonebot_bison/config/migrations/ef796b74b0fe_add_cookie.py

@@ -1,62 +0,0 @@
-"""empty message
-
-Revision ID: ef796b74b0fe
-Revises: f9baef347cc8
-Create Date: 2024-09-13 00:34:08.601438
-
-"""
-
-import sqlalchemy as sa
-from alembic import op
-from sqlalchemy import Text
-from sqlalchemy.dialects import postgresql
-
-# revision identifiers, used by Alembic.
-revision = "ef796b74b0fe"
-down_revision = "f9baef347cc8"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table(
-        "nonebot_bison_cookie",
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("site_name", sa.String(length=100), nullable=False),
-        sa.Column("content", sa.String(length=1024), nullable=False),
-        sa.Column("last_usage", sa.DateTime(), nullable=False),
-        sa.Column("status", sa.String(length=20), nullable=False),
-        sa.Column("cd_milliseconds", sa.Integer(), nullable=False),
-        sa.Column("is_universal", sa.Boolean(), nullable=False),
-        sa.Column("is_anonymous", sa.Boolean(), nullable=False),
-        sa.Column("tags", sa.JSON().with_variant(postgresql.JSONB(astext_type=Text()), "postgresql"), nullable=False),
-        sa.PrimaryKeyConstraint("id", name=op.f("pk_nonebot_bison_cookie")),
-    )
-    op.create_table(
-        "nonebot_bison_cookietarget",
-        sa.Column("id", sa.Integer(), nullable=False),
-        sa.Column("target_id", sa.Integer(), nullable=False),
-        sa.Column("cookie_id", sa.Integer(), nullable=False),
-        sa.ForeignKeyConstraint(
-            ["cookie_id"],
-            ["nonebot_bison_cookie.id"],
-            name=op.f("fk_nonebot_bison_cookietarget_cookie_id_nonebot_bison_cookie"),
-            ondelete="CASCADE",
-        ),
-        sa.ForeignKeyConstraint(
-            ["target_id"],
-            ["nonebot_bison_target.id"],
-            name=op.f("fk_nonebot_bison_cookietarget_target_id_nonebot_bison_target"),
-            ondelete="CASCADE",
-        ),
-        sa.PrimaryKeyConstraint("id", name=op.f("pk_nonebot_bison_cookietarget")),
-    )
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_table("nonebot_bison_cookietarget")
-    op.drop_table("nonebot_bison_cookie")
-    # ### end Alembic commands ###

nonebot_bison/config/subs_io/nbesf_model/v3.py

@@ -1,106 +0,0 @@
-"""nbesf is Nonebot Bison Enchangable Subscribes File! ver.2"""
-
-from typing import Any
-from functools import partial
-
-from nonebot.log import logger
-from pydantic import BaseModel
-from nonebot_plugin_saa.registries import AllSupportedPlatformTarget
-from nonebot.compat import PYDANTIC_V2, ConfigDict, model_dump, type_validate_json, type_validate_python
-
-from ..utils import NBESFParseErr
-from ....types import Tag, Category
-from .base import NBESFBase, SubReceipt
-from ...db_config import SubscribeDupException, config
-
-# ===== nbesf 定义格式 ====== #
-NBESF_VERSION = 3
-
-
-class Target(BaseModel):
-    """Bsion快递包发货信息"""
-
-    target_name: str
-    target: str
-    platform_name: str
-    default_schedule_weight: int
-
-    if PYDANTIC_V2:
-        model_config = ConfigDict(from_attributes=True)
-    else:
-
-        class Config:
-            orm_mode = True
-
-
-class SubPayload(BaseModel):
-    """Bison快递包里的单件货物"""
-
-    categories: list[Category]
-    tags: list[Tag]
-    target: Target
-
-    if PYDANTIC_V2:
-        model_config = ConfigDict(from_attributes=True)
-    else:
-
-        class Config:
-            orm_mode = True
-
-
-class SubPack(BaseModel):
-    """Bison给指定用户派送的快递包"""
-
-    # user_target: Bison快递包收货信息
-    user_target: AllSupportedPlatformTarget
-    subs: list[SubPayload]
-
-
-class SubGroup(NBESFBase):
-    """
-    Bison的全部订单(按用户分组)
-
-    结构参见`nbesf_model`下的对应版本
-    """
-
-    version: int = NBESF_VERSION
-    groups: list[SubPack] = []
-
-
-# ======================= #
-
-
-async def subs_receipt_gen(nbesf_data: SubGroup):
-    for item in nbesf_data.groups:
-        sub_receipt = partial(SubReceipt, user=item.user_target)
-
-        for sub in item.subs:
-            receipt = sub_receipt(
-                target=sub.target.target,
-                target_name=sub.target.target_name,
-                platform_name=sub.target.platform_name,
-                cats=sub.categories,
-                tags=sub.tags,
-            )
-            try:
-                await config.add_subscribe(receipt.user, **model_dump(receipt, exclude={"user"}))
-            except SubscribeDupException:
-                logger.warning(f"！添加订阅条目 {repr(receipt)} 失败: 相同的订阅已存在")
-            except Exception as e:
-                logger.error(f"！添加订阅条目 {repr(receipt)} 失败: {repr(e)}")
-            else:
-                logger.success(f"添加订阅条目 {repr(receipt)} 成功！")
-
-
-def nbesf_parser(raw_data: Any) -> SubGroup:
-    try:
-        if isinstance(raw_data, str):
-            nbesf_data = type_validate_json(SubGroup, raw_data)
-        else:
-            nbesf_data = type_validate_python(SubGroup, raw_data)
-
-    except Exception as e:
-        logger.error("数据解析失败，该数据格式可能不满足NBESF格式标准！")
-        raise NBESFParseErr("数据解析失败") from e
-    else:
-        return nbesf_data

nonebot_bison/config/utils.py

@@ -8,7 +8,3 @@ class NoSuchSubscribeException(Exception):
 
 class NoSuchTargetException(Exception):
     pass
-
-
-class DuplicateCookieTargetException(Exception):
-    pass

nonebot_bison/platform/__init__.py

@@ -3,7 +3,6 @@ from pkgutil import iter_modules
 from collections import defaultdict
 from importlib import import_module
 
-from ..utils import Site
 from ..plugin_config import plugin_config
 from .platform import Platform, make_no_target_group
 
@@ -36,10 +35,3 @@ def _get_unavailable_platforms() -> dict[str, str]:
 
 # platform => reason for not available
 unavailable_paltforms: dict[str, str] = _get_unavailable_platforms()
-
-
-site_manager: dict[str, type[Site]] = {}
-for site in Site.registry:
-    if not hasattr(site, "name"):
-        continue
-    site_manager[site.name] = site

nonebot_bison/platform/platform.py

@@ -16,7 +16,7 @@ from nonebot_plugin_saa import PlatformTarget
 from ..post import Post
 from ..utils import Site, ProcessContext
 from ..plugin_config import plugin_config
-from ..types import Tag, Target, RawPost, SubUnit, Category, RegistryMeta
+from ..types import Tag, Target, RawPost, SubUnit, Category
 
 
 class CategoryNotSupport(Exception):
@@ -29,6 +29,21 @@ class CategoryNotRecognize(Exception):
     """raise in get_category, when you don't know the category of post"""
 
 
+class RegistryMeta(type):
+    def __new__(cls, name, bases, namespace, **kwargs):
+        return super().__new__(cls, name, bases, namespace)
+
+    def __init__(cls, name, bases, namespace, **kwargs):
+        if kwargs.get("base"):
+            # this is the base class
+            cls.registry = []
+        elif not kwargs.get("abstract"):
+            # this is the subclass
+            cls.registry.append(cls)
+
+        super().__init__(name, bases, namespace, **kwargs)
+
+
 P = ParamSpec("P")
 R = TypeVar("R")
 

nonebot_bison/platform/rss.py

@@ -10,14 +10,12 @@ from ..post import Post
 from .platform import NewMessage
 from ..types import Target, RawPost
 from ..utils import Site, text_similarity
-from ..utils.site import create_cookie_client_manager
 
 
 class RssSite(Site):
     name = "rss"
     schedule_type = "interval"
     schedule_setting = {"seconds": 30}
-    client_mgr = create_cookie_client_manager("rss")
 
 
 class RssPost(Post):
@@ -65,7 +63,7 @@ class Rss(NewMessage):
         return post.id
 
     async def get_sub_list(self, target: Target) -> list[RawPost]:
-        client = await self.ctx.get_client(target)
+        client = await self.ctx.get_client()
         res = await client.get(target, timeout=10.0)
         feed = feedparser.parse(res)
         entries = feed.entries

nonebot_bison/platform/weibo.py

@@ -13,7 +13,6 @@ from bs4 import BeautifulSoup as bs
 from ..post import Post
 from .platform import NewMessage
 from ..utils import Site, http_client
-from ..utils.site import create_cookie_client_manager
 from ..types import Tag, Target, RawPost, ApiError, Category
 
 _HEADER = {
@@ -40,7 +39,6 @@ class WeiboSite(Site):
     name = "weibo.com"
     schedule_type = "interval"
     schedule_setting = {"seconds": 3}
-    client_mgr = create_cookie_client_manager(name)
 
 
 class Weibo(NewMessage):
@@ -80,11 +78,9 @@ class Weibo(NewMessage):
             raise cls.ParseTargetException(prompt="正确格式:\n1. 用户数字UID\n2. https://weibo.com/u/xxxx")
 
     async def get_sub_list(self, target: Target) -> list[RawPost]:
-        client = await self.ctx.get_client(target)
+        client = await self.ctx.get_client()
-        header = {"Referer": f"https://m.weibo.cn/u/{target}", "MWeibo-Pwa": "1", "X-Requested-With": "XMLHttpRequest"}
-        # 获取 cookie 见 https://docs.rsshub.app/zh/deploy/config#%E5%BE%AE%E5%8D%9A
         params = {"containerid": "107603" + target}
-        res = await client.get("https://m.weibo.cn/api/container/getIndex?", headers=header, params=params, timeout=4.0)
+        res = await client.get("https://m.weibo.cn/api/container/getIndex?", params=params, timeout=4.0)
         res_data = json.loads(res.text)
         if not res_data["ok"] and res_data["msg"] != "这里还没有内容":
             raise ApiError(res.request.url)

nonebot_bison/scheduler/manager.py

@@ -1,5 +1,3 @@
-from typing import cast
-
 from nonebot.log import logger
 
 from ..utils import Site
@@ -9,7 +7,6 @@ from ..config.db_model import Target
 from ..types import Target as T_Target
 from ..platform import platform_manager
 from ..plugin_config import plugin_config
-from ..utils.site import CookieClientManager, is_cookie_client_manager
 
 scheduler_dict: dict[type[Site], Scheduler] = {}
 
@@ -33,9 +30,6 @@ async def init_scheduler():
         else:
             _schedule_class_platform_dict[site].append(platform_name)
     for site, target_list in _schedule_class_dict.items():
-        if is_cookie_client_manager(site.client_mgr):
-            client_mgr = cast(CookieClientManager, site.client_mgr)
-            await client_mgr.refresh_anonymous_cookie()
         if not plugin_config.bison_use_browser and site.require_browser:
             logger.warning(f"{site.name} requires browser, it will not schedule.")
             continue

nonebot_bison/scheduler/scheduler.py

@@ -12,7 +12,6 @@ from ..send import send_msgs
 from ..types import Target, SubUnit
 from ..platform import platform_manager
 from ..utils import Site, ProcessContext
-from ..utils.site import SkipRequestException
 
 
 @dataclass
@@ -108,8 +107,6 @@ class Scheduler:
                     schedulable.platform_name, schedulable.target
                 )
                 to_send = await platform_obj.do_fetch_new_post(SubUnit(schedulable.target, send_userinfo_list))
-        except SkipRequestException as err:
-            logger.debug(f"skip request: {err}")
         except Exception as err:
             records = context.gen_req_records()
             for record in records:

nonebot_bison/sub_manager/__init__.py

@@ -14,10 +14,6 @@ from nonebot.adapters.onebot.v11.event import PrivateMessageEvent
 from .add_sub import do_add_sub
 from .del_sub import do_del_sub
 from .query_sub import do_query_sub
-from .add_cookie import do_add_cookie
-from .del_cookie import do_del_cookie
-from .add_cookie_target import do_add_cookie_target
-from .del_cookie_target import do_del_cookie_target
 from .utils import common_platform, admin_permission, gen_handle_cancel, configurable_to_me, set_target_user_info
 
 add_sub_matcher = on_command(
@@ -30,10 +26,12 @@ add_sub_matcher = on_command(
 add_sub_matcher.handle()(set_target_user_info)
 do_add_sub(add_sub_matcher)
 
+
 query_sub_matcher = on_command("查询订阅", rule=configurable_to_me, priority=5, block=True)
 query_sub_matcher.handle()(set_target_user_info)
 do_query_sub(query_sub_matcher)
 
+
 del_sub_matcher = on_command(
     "删除订阅",
     rule=configurable_to_me,
@@ -44,46 +42,6 @@ del_sub_matcher = on_command(
 del_sub_matcher.handle()(set_target_user_info)
 do_del_sub(del_sub_matcher)
 
-add_cookie_matcher = on_command(
-    "添加cookie",
-    aliases={"添加Cookie"},
-    rule=to_me(),
-    permission=SUPERUSER,
-    priority=5,
-    block=True,
-)
-do_add_cookie(add_cookie_matcher)
-
-add_cookie_target_matcher = on_command(
-    "关联cookie",
-    aliases={"关联Cookie"},
-    rule=to_me(),
-    permission=SUPERUSER,
-    priority=5,
-    block=True,
-)
-do_add_cookie_target(add_cookie_target_matcher)
-
-del_cookie_target_matcher = on_command(
-    "取消关联cookie",
-    aliases={"取消关联Cookie"},
-    rule=to_me(),
-    permission=SUPERUSER,
-    priority=5,
-    block=True,
-)
-do_del_cookie_target(del_cookie_target_matcher)
-
-del_cookie_matcher = on_command(
-    "删除cookie",
-    aliases={"删除Cookie"},
-    rule=to_me(),
-    permission=SUPERUSER,
-    priority=5,
-    block=True,
-)
-do_del_cookie(del_cookie_matcher)
-
 group_manage_matcher = on_command("群管理", rule=to_me(), permission=SUPERUSER, priority=4, block=True)
 
 group_handle_cancel = gen_handle_cancel(group_manage_matcher, "已取消")
@@ -167,8 +125,4 @@ __all__ = [
     "del_sub_matcher",
     "group_manage_matcher",
     "no_permission_matcher",
-    "add_cookie_matcher",
-    "add_cookie_target_matcher",
-    "del_cookie_target_matcher",
-    "del_cookie_matcher",
 ]

nonebot_bison/sub_manager/add_cookie.py

@@ -1,69 +0,0 @@
-from typing import cast
-
-from nonebot.typing import T_State
-from nonebot.matcher import Matcher
-from nonebot.params import Arg, ArgPlainText
-from nonebot.adapters import Message, MessageTemplate
-
-from ..platform import platform_manager
-from .utils import common_platform, gen_handle_cancel
-from ..utils.site import CookieClientManager, is_cookie_client_manager
-
-
-def do_add_cookie(add_cookie: type[Matcher]):
-    handle_cancel = gen_handle_cancel(add_cookie, "已中止添加cookie")
-
-    @add_cookie.handle()
-    async def init_promote(state: T_State):
-        state["_prompt"] = (
-            "请输入想要添加 Cookie 的平台，目前支持，请输入冒号左边的名称：\n"
-            + "".join(
-                [
-                    f"{platform_name}: {platform_manager[platform_name].name}\n"
-                    for platform_name in common_platform
-                    if is_cookie_client_manager(platform_manager[platform_name].site.client_mgr)
-                ]
-            )
-            + "要查看全部平台请输入：“全部”\n中止添加cookie过程请输入：“取消”"
-        )
-
-    @add_cookie.got("platform", MessageTemplate("{_prompt}"), [handle_cancel])
-    async def parse_platform(state: T_State, platform: str = ArgPlainText()) -> None:
-        if platform == "全部":
-            message = "全部平台\n" + "\n".join(
-                [
-                    f"{platform_name}: {platform.name}"
-                    for platform_name, platform in platform_manager.items()
-                    if is_cookie_client_manager(platform_manager[platform_name].site.client_mgr)
-                ]
-            )
-            await add_cookie.reject(message)
-        elif platform == "取消":
-            await add_cookie.finish("已中止添加cookie")
-        elif platform in platform_manager:
-            state["platform"] = platform
-            state["site"] = platform_manager[platform].site
-        else:
-            await add_cookie.reject("平台输入错误")
-
-    @add_cookie.handle()
-    async def prepare_get_id(state: T_State):
-        state["_prompt"] = "请输入 Cookie"
-
-    @add_cookie.got("cookie", MessageTemplate("{_prompt}"), [handle_cancel])
-    async def got_cookie(state: T_State, cookie: Message = Arg()):
-        client_mgr: type[CookieClientManager] = cast(
-            type[CookieClientManager], platform_manager[state["platform"]].site.client_mgr
-        )
-        cookie_text = cookie.extract_plain_text()
-        if not await client_mgr.validate_cookie(cookie_text):
-            await add_cookie.reject(state["site"].cookie_format_prompt)
-        state["cookie"] = cookie_text
-
-    @add_cookie.handle()
-    async def add_cookie_process(state: T_State):
-        client_mgr = cast(CookieClientManager, platform_manager[state["platform"]].site.client_mgr)
-        await client_mgr.add_user_cookie(state["cookie"])
-        await add_cookie.finish(
-            f"已添加 Cookie: {state['cookie']} 到平台 {state['platform']}" + "\n请使用“关联cookie”为 Cookie 关联订阅"
-        )

nonebot_bison/sub_manager/add_cookie_target.py

@@ -1,75 +0,0 @@
-from typing import cast
-
-from nonebot.typing import T_State
-from nonebot.matcher import Matcher
-from nonebot.params import ArgPlainText
-from nonebot_plugin_saa import MessageFactory
-from nonebot.internal.adapter import MessageTemplate
-
-from ..config import config
-from ..utils import parse_text
-from ..platform import platform_manager
-from ..utils.site import CookieClientManager
-from .utils import gen_handle_cancel, generate_sub_list_text
-
-
-def do_add_cookie_target(add_cookie_target_matcher: type[Matcher]):
-    handle_cancel = gen_handle_cancel(add_cookie_target_matcher, "已中止关联 cookie")
-
-    @add_cookie_target_matcher.handle()
-    async def init_promote(state: T_State):
-        res = await generate_sub_list_text(
-            add_cookie_target_matcher, state, is_index=True, is_show_cookie=True, is_hide_no_cookie_platfrom=True
-        )
-        res += "请输入要关联 cookie 的订阅的序号\n输入'取消'中止"
-        await MessageFactory(await parse_text(res)).send()
-
-    @add_cookie_target_matcher.got("target_idx", parameterless=[handle_cancel])
-    async def got_target_idx(state: T_State, target_idx: str = ArgPlainText()):
-        try:
-            target_idx = int(target_idx)
-            state["target"] = state["sub_table"][target_idx]
-            state["site"] = platform_manager[state["target"]["platform_name"]].site
-        except Exception:
-            await add_cookie_target_matcher.reject("序号错误")
-
-    @add_cookie_target_matcher.handle()
-    async def init_promote_cookie(state: T_State):
-
-        # 获取 site 的所有用户 cookie，再排除掉已经关联的 cookie，剩下的就是可以关联的 cookie
-        cookies = await config.get_cookie(site_name=state["site"].name, is_anonymous=False)
-        associated_cookies = await config.get_cookie(
-            target=state["target"]["target"],
-            site_name=state["site"].name,
-            is_anonymous=False,
-        )
-        associated_cookie_ids = {cookie.id for cookie in associated_cookies}
-        cookies = [cookie for cookie in cookies if cookie.id not in associated_cookie_ids]
-        if not cookies:
-            await add_cookie_target_matcher.finish(
-                "当前平台暂无可关联的 Cookie，请使用“添加cookie”命令添加或检查已关联的 Cookie"
-            )
-        state["cookies"] = cookies
-
-        client_mgr = cast(CookieClientManager, state["site"].client_mgr)
-        state["_prompt"] = "请选择一个 Cookie，已关联的 Cookie 不会显示\n" + "\n".join(
-            [f"{idx}. {await client_mgr.get_cookie_friendly_name(cookie)}" for idx, cookie in enumerate(cookies, 1)]
-        )
-
-    @add_cookie_target_matcher.got("cookie_idx", MessageTemplate("{_prompt}"), [handle_cancel])
-    async def got_cookie_idx(state: T_State, cookie_idx: str = ArgPlainText()):
-        try:
-            cookie_idx = int(cookie_idx)
-            state["cookie"] = state["cookies"][cookie_idx - 1]
-        except Exception:
-            await add_cookie_target_matcher.reject("序号错误")
-
-    @add_cookie_target_matcher.handle()
-    async def add_cookie_target_process(state: T_State):
-        await config.add_cookie_target(state["target"]["target"], state["target"]["platform_name"], state["cookie"].id)
-        cookie = state["cookie"]
-        client_mgr = cast(CookieClientManager, state["site"].client_mgr)
-        await add_cookie_target_matcher.finish(
-            f"已关联 Cookie: {await client_mgr.get_cookie_friendly_name(cookie)} "
-            f"到订阅 {state['site'].name} {state['target']['target']}"
-        )

nonebot_bison/sub_manager/del_cookie.py

@@ -1,48 +0,0 @@
-from nonebot.typing import T_State
-from nonebot.matcher import Matcher
-from nonebot.params import EventPlainText
-from nonebot_plugin_saa import MessageFactory
-
-from ..config import config
-from ..utils import parse_text
-from ..platform import site_manager
-from .utils import gen_handle_cancel
-
-
-def do_del_cookie(del_cookie: type[Matcher]):
-    handle_cancel = gen_handle_cancel(del_cookie, "删除中止")
-
-    @del_cookie.handle()
-    async def send_list(state: T_State):
-        cookies = await config.get_cookie(is_anonymous=False)
-        if not cookies:
-            await del_cookie.finish("暂无已添加的 Cookie\n请使用“添加cookie”命令添加")
-        res = "已添加的 Cookie 为：\n"
-        state["cookie_table"] = {}
-        for index, cookie in enumerate(cookies, 1):
-            state["cookie_table"][index] = cookie
-            client_mgr = site_manager[cookie.site_name].client_mgr
-            friendly_name = await client_mgr.get_cookie_friendly_name(cookie)
-            res += f"{index} {cookie.site_name} {friendly_name} {len(cookie.targets)}个关联\n"
-            if res[-1] != "\n":
-                res += "\n"
-        res += "请输入要删除的 Cookie 的序号\n输入'取消'中止"
-        await MessageFactory(await parse_text(res)).send()
-
-    @del_cookie.receive(parameterless=[handle_cancel])
-    async def do_del(
-        state: T_State,
-        index_str: str = EventPlainText(),
-    ):
-        try:
-            index = int(index_str)
-            cookie = state["cookie_table"][index]
-            if cookie.targets:
-                await del_cookie.reject("只能删除未关联的 Cookie，请使用“取消关联cookie”命令取消关联")
-            await config.delete_cookie_by_id(cookie.id)
-        except KeyError:
-            await del_cookie.reject("序号错误")
-        except Exception:
-            await del_cookie.reject("删除错误")
-        else:
-            await del_cookie.finish("删除成功")

nonebot_bison/sub_manager/del_cookie_target.py

@@ -1,51 +0,0 @@
-from typing import cast
-
-from nonebot.typing import T_State
-from nonebot.matcher import Matcher
-from nonebot.params import EventPlainText
-from nonebot_plugin_saa import MessageFactory
-
-from ..config import config
-from ..utils import parse_text
-from .utils import gen_handle_cancel
-from ..platform import platform_manager
-from ..utils.site import CookieClientManager
-
-
-def do_del_cookie_target(del_cookie_target: type[Matcher]):
-    handle_cancel = gen_handle_cancel(del_cookie_target, "取消关联中止")
-
-    @del_cookie_target.handle()
-    async def send_list(state: T_State):
-        cookie_targets = await config.get_cookie_target()
-        if not cookie_targets:
-            await del_cookie_target.finish("暂无已关联 Cookie\n请使用“添加cookie”命令添加关联")
-        res = "已关联的 Cookie 为：\n"
-        state["cookie_target_table"] = {}
-        for index, cookie_target in enumerate(cookie_targets, 1):
-            client_mgr = cast(CookieClientManager, platform_manager[cookie_target.target.platform_name].site.client_mgr)
-            friendly_name = await client_mgr.get_cookie_friendly_name(cookie_target.cookie)
-            state["cookie_target_table"][index] = {
-                "platform_name": cookie_target.target.platform_name,
-                "target": cookie_target.target,
-                "friendly_name": friendly_name,
-                "cookie_target": cookie_target,
-            }
-            res += f"{index} {cookie_target.target.platform_name} {cookie_target.target.target_name} {friendly_name}\n"
-            if res[-1] != "\n":
-                res += "\n"
-        res += "请输入要删除的关联的序号\n输入'取消'中止"
-        await MessageFactory(await parse_text(res)).send()
-
-    @del_cookie_target.receive(parameterless=[handle_cancel])
-    async def do_del(
-        state: T_State,
-        index_str: str = EventPlainText(),
-    ):
-        try:
-            index = int(index_str)
-            await config.delete_cookie_target_by_id(state["cookie_target_table"][index]["cookie_target"].id)
-        except Exception:
-            await del_cookie_target.reject("删除错误")
-        else:
-            await del_cookie_target.finish("删除成功")

nonebot_bison/sub_manager/utils.py

@@ -1,21 +1,16 @@
 import contextlib
-from itertools import groupby
+from typing import Annotated
-from operator import attrgetter
-from typing import Annotated, cast
 
 from nonebot.rule import Rule
 from nonebot.adapters import Event
 from nonebot.typing import T_State
 from nonebot.matcher import Matcher
 from nonebot.permission import SUPERUSER
+from nonebot_plugin_saa import extract_target
 from nonebot.params import Depends, EventToMe, EventPlainText
-from nonebot_plugin_saa import PlatformTarget, extract_target
 
-from ..config import config
+from ..platform import platform_manager
-from ..types import Category
 from ..plugin_config import plugin_config
-from ..platform import site_manager, platform_manager
-from ..utils.site import CookieClientManager, is_cookie_client_manager
 
 
 def _configurable_to_me(to_me: bool = EventToMe()):
@@ -65,59 +60,3 @@ def admin_permission():
         permission = permission | GROUP_ADMIN | GROUP_OWNER
 
     return permission
-
-
-async def generate_sub_list_text(
-    matcher: type[Matcher],
-    state: T_State,
-    user_info: PlatformTarget = None,
-    is_index=False,
-    is_show_cookie=False,
-    is_hide_no_cookie_platfrom=False,
-):
-    """根据配置参数，生产订阅列表文本，同时将订阅信息存入state["sub_table"]"""
-    if user_info:
-        sub_list = await config.list_subscribe(user_info)
-    else:
-        sub_list = await config.list_subs_with_all_info()
-        sub_list = [
-            next(group)
-            for key, group in groupby(sorted(sub_list, key=attrgetter("target_id")), key=attrgetter("target_id"))
-        ]
-    if is_hide_no_cookie_platfrom:
-        sub_list = [
-            sub
-            for sub in sub_list
-            if is_cookie_client_manager(platform_manager.get(sub.target.platform_name).site.client_mgr)
-        ]
-    if not sub_list:
-        await matcher.finish("暂无已订阅账号\n请使用“添加订阅”命令添加订阅")
-    res = "订阅的帐号为：\n"
-    state["sub_table"] = {}
-    for index, sub in enumerate(sub_list, 1):
-        state["sub_table"][index] = {
-            "platform_name": sub.target.platform_name,
-            "target": sub.target.target,
-        }
-        res += f"{index} " if is_index else ""
-        res += f"{sub.target.platform_name} {sub.target.target_name} {sub.target.target}\n"
-        if platform := platform_manager.get(sub.target.platform_name):
-            if platform.categories:
-                res += " [{}]".format(", ".join(platform.categories[Category(x)] for x in sub.categories)) + "\n"
-            if platform.enable_tag:
-                if sub.tags:
-                    res += " {}".format(", ".join(sub.tags)) + "\n"
-            if is_show_cookie:
-                target_cookies = await config.get_cookie(
-                    target=sub.target.target, site_name=platform.site.name, is_anonymous=False
-                )
-                if target_cookies:
-                    res += "  关联的 Cookie：\n"
-                    for cookie in target_cookies:
-                        client_mgr = cast(CookieClientManager, site_manager[platform.site.name].client_mgr)
-                        res += f"  \t{await client_mgr.get_cookie_friendly_name(cookie)}\n"
-
-        else:
-            res += f" （平台 {sub.target.platform_name} 已失效，请删除此订阅）"
-
-    return res

nonebot_bison/types.py

@@ -58,18 +58,3 @@ class ApiError(Exception):
 class SubUnit(NamedTuple):
     sub_target: Target
     user_sub_infos: list[UserSubInfo]
-
-
-class RegistryMeta(type):
-    def __new__(cls, name, bases, namespace, **kwargs):
-        return super().__new__(cls, name, bases, namespace)
-
-    def __init__(cls, name, bases, namespace, **kwargs):
-        if kwargs.get("base"):
-            # this is the base class
-            cls.registry = []
-        elif not kwargs.get("abstract"):
-            # this is the subclass
-            cls.registry.append(cls)
-
-        super().__init__(name, bases, namespace, **kwargs)

nonebot_bison/utils/__init__.py

@@ -1,25 +1,25 @@
-import difflib
 import re
 import sys
+import difflib
 
 import nonebot
+from nonebot.plugin import require
 from bs4 import BeautifulSoup as bs
 from nonebot.log import logger, default_format
-from nonebot.plugin import require
 from nonebot_plugin_saa import Text, Image, MessageSegmentFactory
 
-from .context import ProcessContext as ProcessContext
+from .site import Site as Site
+from ..plugin_config import plugin_config
+from .image import pic_merge as pic_merge
 from .http import http_client as http_client
 from .image import capture_html as capture_html
-from .image import is_pics_mergable as is_pics_mergable
-from .image import pic_merge as pic_merge
-from .image import pic_url_to_image as pic_url_to_image
-from .image import text_to_image as text_to_image
 from .site import ClientManager as ClientManager
-from .site import DefaultClientManager as DefaultClientManager
+from .image import text_to_image as text_to_image
-from .site import Site as Site
 from .site import anonymous_site as anonymous_site
-from ..plugin_config import plugin_config
+from .context import ProcessContext as ProcessContext
+from .image import is_pics_mergable as is_pics_mergable
+from .image import pic_url_to_image as pic_url_to_image
+from .site import DefaultClientManager as DefaultClientManager
 
 
 class Singleton(type):

nonebot_bison/utils/context.py

@@ -22,9 +22,8 @@ class ProcessContext:
         async def _log_to_ctx(r: Response):
             self._log_response(r)
 
-        existing_hooks = client.event_hooks["response"]
         hooks = {
-            "response": [*existing_hooks, _log_to_ctx],
+            "response": [_log_to_ctx],
         }
         client.event_hooks = hooks
 

nonebot_bison/utils/site.py

@@ -1,17 +1,10 @@
-import json
 from typing import Literal
-from json import JSONDecodeError
 from abc import ABC, abstractmethod
-from datetime import datetime, timedelta
 
-import httpx
 from httpx import AsyncClient
-from nonebot.log import logger
 
-from ..config import config
+from ..types import Target
 from .http import http_client
-from ..config.db_model import Cookie
-from ..types import Target, RegistryMeta
 
 
 class ClientManager(ABC):
@@ -42,121 +35,12 @@ class DefaultClientManager(ClientManager):
         pass
 
 
-class CookieClientManager(ClientManager):
+class Site:
-    _site_name: str
-    _default_cd: int = timedelta(seconds=10)
-
-    @classmethod
-    async def refresh_anonymous_cookie(cls):
-        """移除已有的匿名cookie，添加一个新的匿名cookie"""
-        anonymous_cookies = await config.get_cookie(cls._site_name, is_anonymous=True)
-        anonymous_cookie = Cookie(site_name=cls._site_name, content="{}", is_universal=True, is_anonymous=True)
-        for cookie in anonymous_cookies:
-            if not cookie.is_anonymous:
-                continue
-            await config.delete_cookie_by_id(cookie.id)
-            anonymous_cookie.id = cookie.id  # 保持原有的id
-        anonymous_cookie.last_usage = datetime.now()  # 使得第一次请求优先使用用户 cookie
-        await config.add_cookie(anonymous_cookie)
-
-    @classmethod
-    async def add_user_cookie(cls, content: str):
-        """添加用户 cookie"""
-        cookie = Cookie(site_name=cls._site_name, content=content)
-        cookie.cd = cls._default_cd
-        await config.add_cookie(cookie)
-
-    @classmethod
-    async def validate_cookie(cls, content: str) -> bool:
-        """验证 cookie 内容是否有效，添加 cookie 时用，可根据平台的具体情况进行重写"""
-        try:
-            data = json.loads(content)
-            if not isinstance(data, dict):
-                return False
-        except JSONDecodeError:
-            return False
-        return True
-
-    @classmethod
-    async def get_cookie_friendly_name(cls, cookie: Cookie) -> str:
-        """获取 cookie 的友好名字，用于展示"""
-        from . import text_fletten
-
-        return text_fletten(f"{cookie.site_name} [{cookie.content[:10]}]")
-
-    def _generate_hook(self, cookie: Cookie) -> callable:
-        """hook 函数生成器，用于回写请求状态到数据库"""
-
-        async def _response_hook(resp: httpx.Response):
-            if resp.status_code == 200:
-                logger.trace(f"请求成功: {cookie.id} {resp.request.url}")
-                cookie.status = "success"
-            else:
-                logger.warning(f"请求失败:{cookie.id} {resp.request.url}, 状态码: {resp.status_code}")
-                cookie.status = "failed"
-            cookie.last_usage = datetime.now()
-            await config.update_cookie(cookie)
-
-        return _response_hook
-
-    async def _choose_cookie(self, target: Target | None) -> Cookie:
-        """选择 cookie 的具体算法"""
-        cookies = await config.get_cookie(self._site_name, target)
-        cookies = (cookie for cookie in cookies if cookie.last_usage + cookie.cd < datetime.now())
-        cookie = min(cookies, key=lambda x: x.last_usage)
-        return cookie
-
-    async def get_client(self, target: Target | None) -> AsyncClient:
-        """获取 client，根据 target 选择 cookie"""
-        client = http_client()
-        cookie = await self._choose_cookie(target)
-        if cookie.is_universal:
-            logger.trace(f"平台 {self._site_name} 未获取到用户cookie, 使用匿名cookie")
-        else:
-            logger.trace(f"平台 {self._site_name} 获取到用户cookie: {cookie.id}")
-
-        return await self._assemble_client(client, cookie)
-
-    async def _assemble_client(self, client, cookie) -> AsyncClient:
-        """组装 client，可以自定义 cookie 对象的 content 装配到 client 中的方式"""
-        cookies = httpx.Cookies()
-        if cookie:
-            cookies.update(json.loads(cookie.content))
-        client.cookies = cookies
-        client.event_hooks = {"response": [self._generate_hook(cookie)]}
-        return client
-
-    async def get_client_for_static(self) -> AsyncClient:
-        return http_client()
-
-    async def get_query_name_client(self) -> AsyncClient:
-        return http_client()
-
-    async def refresh_client(self):
-        pass
-
-
-def is_cookie_client_manager(manger: type[ClientManager]) -> bool:
-    return issubclass(manger, CookieClientManager)
-
-
-def create_cookie_client_manager(site_name: str) -> type[CookieClientManager]:
-    """创建一个平台特化的 CookieClientManger"""
-    return type(
-        "CookieClientManager",
-        (CookieClientManager,),
-        {"_site_name": site_name},
-    )
-
-
-class Site(metaclass=RegistryMeta, base=True):
     schedule_type: Literal["date", "interval", "cron"]
     schedule_setting: dict
     name: str
     client_mgr: type[ClientManager] = DefaultClientManager
     require_browser: bool = False
-    registry: list[type["Site"]]
-    cookie_format_prompt = "无效的 Cookie，请检查后重新输入，详情见<待添加的文档>"
 
     def __str__(self):
         return f"[{self.name}]-{self.name}-{self.schedule_setting}"
@@ -172,7 +56,3 @@ def anonymous_site(schedule_type: Literal["date", "interval", "cron"], schedule_
             "client_mgr": DefaultClientManager,
         },
     )
-
-
-class SkipRequestException(Exception):
-    pass

tests/config/test_cookie.py

@@ -1,123 +0,0 @@
-import json
-from typing import cast
-from datetime import datetime
-
-import pytest
-from nonebug import App
-
-
-async def test_cookie(app: App, init_scheduler):
-    from nonebot_plugin_saa import TargetQQGroup
-
-    from nonebot_bison.platform import site_manager
-    from nonebot_bison.config.db_config import config
-    from nonebot_bison.types import Target as T_Target
-    from nonebot_bison.utils.site import CookieClientManager
-    from nonebot_bison.config.utils import DuplicateCookieTargetException
-
-    target = T_Target("weibo_id")
-    platform_name = "weibo"
-    await config.add_subscribe(
-        TargetQQGroup(group_id=123),
-        target=target,
-        target_name="weibo_name",
-        platform_name=platform_name,
-        cats=[],
-        tags=[],
-    )
-    site = site_manager["weibo.com"]
-    client_mgr = cast(CookieClientManager, site.client_mgr)
-
-    # 刷新匿名cookie
-    await client_mgr.refresh_anonymous_cookie()
-
-    cookies = await config.get_cookie(site_name=site.name)
-    assert len(cookies) == 1
-
-    # 添加用户cookie
-    await client_mgr.add_user_cookie(json.dumps({"test_cookie": "1"}))
-    await client_mgr.add_user_cookie(json.dumps({"test_cookie": "2"}))
-
-    cookies = await config.get_cookie(site_name=site.name)
-    assert len(cookies) == 3
-
-    cookies = await config.get_cookie(site_name=site.name, is_anonymous=False)
-    assert len(cookies) == 2
-
-    # 单个target，多个cookie
-    await config.add_cookie_target(target, platform_name, cookies[0].id)
-    await config.add_cookie_target(target, platform_name, cookies[1].id)
-
-    cookies = await config.get_cookie(site_name=site.name, target=target)
-    assert len(cookies) == 3
-
-    cookies = await config.get_cookie(site_name=site.name, target=target, is_anonymous=False)
-    assert len(cookies) == 2
-
-    cookies = await config.get_cookie(site_name=site.name, target=target, is_universal=False)
-    assert len(cookies) == 2
-
-    # 测试不同的target
-    target2 = T_Target("weibo_id2")
-    await config.add_subscribe(
-        TargetQQGroup(group_id=123),
-        target=target2,
-        target_name="weibo_name2",
-        platform_name=platform_name,
-        cats=[],
-        tags=[],
-    )
-    await client_mgr.add_user_cookie(json.dumps({"test_cookie": "3"}))
-    cookies = await config.get_cookie(site_name=site.name, is_anonymous=False)
-
-    # 多个target，多个cookie
-    await config.add_cookie_target(target2, platform_name, cookies[0].id)
-    await config.add_cookie_target(target2, platform_name, cookies[2].id)
-
-    cookies = await config.get_cookie(site_name=site.name, target=target2)
-    assert len(cookies) == 3
-
-    # 重复关联 target
-    with pytest.raises(DuplicateCookieTargetException) as e:
-        await config.add_cookie_target(target2, platform_name, cookies[2].id)
-    assert isinstance(e.value, DuplicateCookieTargetException)
-
-    cookies = await config.get_cookie(site_name=site.name, target=target2, is_anonymous=False)
-    assert len(cookies) == 2
-
-    # 有关联的cookie不能删除
-    with pytest.raises(Exception, match="cookie") as e:
-        await config.delete_cookie_by_id(cookies[1].id)
-    cookies = await config.get_cookie(site_name=site.name, target=target2, is_anonymous=False)
-    assert len(cookies) == 2
-
-    await config.delete_cookie_target(target2, platform_name, cookies[1].id)
-    await config.delete_cookie_by_id(cookies[1].id)
-    cookies = await config.get_cookie(site_name=site.name, target=target2, is_anonymous=False)
-    assert len(cookies) == 1
-
-    cookie = cookies[0]
-    cookie_id = cookie.id
-    cookie.last_usage = datetime(2024, 9, 13)
-    cookie.status = "test"
-    await config.update_cookie(cookie)
-    cookies = await config.get_cookie(site_name=site.name, target=target2, is_anonymous=False)
-    assert len(cookies) == 1
-    assert cookies[0].id == cookie_id
-    assert cookies[0].last_usage == datetime(2024, 9, 13)
-    assert cookies[0].status == "test"
-
-    # 不存在的 cookie_id
-    cookie.id = 114514
-    with pytest.raises(ValueError, match="cookie") as e:
-        await config.update_cookie(cookie)
-
-    # 获取所有关联对象
-    cookie_targets = await config.get_cookie_target()
-    assert len(cookie_targets) == 3
-
-    # 删除关联对象
-    await config.delete_cookie_target_by_id(cookie_targets[0].id)
-
-    cookie_targets = await config.get_cookie_target()
-    assert len(cookie_targets) == 2

tests/sub_manager/test_add_cookie.py

@@ -1,212 +0,0 @@
-import json
-
-from nonebug.app import App
-from pytest_mock import MockerFixture
-
-from ..utils import BotReply, fake_superuser, fake_admin_user, fake_private_message_event
-
-
-async def test_add_cookie_rule(app: App, mocker: MockerFixture):
-    from nonebot.adapters.onebot.v11.bot import Bot
-    from nonebot.adapters.onebot.v11.message import Message
-
-    from nonebot_bison.plugin_config import plugin_config
-    from nonebot_bison.sub_manager import add_cookie_matcher
-
-    mocker.patch.object(plugin_config, "bison_to_me", True)
-
-    async with app.test_matcher(add_cookie_matcher) as ctx:
-        bot = ctx.create_bot(base=Bot)
-        event = fake_private_message_event(message=Message("添加cookie"), sender=fake_superuser)
-        ctx.receive_event(bot, event)
-        ctx.should_pass_rule()
-        ctx.should_pass_permission()
-
-    async with app.test_matcher(add_cookie_matcher) as ctx:
-        bot = ctx.create_bot(base=Bot)
-        event = fake_private_message_event(message=Message("添加cookie"), sender=fake_admin_user)
-        ctx.receive_event(bot, event)
-        ctx.should_not_pass_rule()
-        ctx.should_pass_permission()
-
-
-async def test_add_cookie_target_no_cookie(app: App, mocker: MockerFixture):
-    from nonebot.adapters.onebot.v11.bot import Bot
-    from nonebot.adapters.onebot.v11.message import Message
-
-    from nonebot_bison.sub_manager import add_cookie_target_matcher
-
-    async with app.test_matcher(add_cookie_target_matcher) as ctx:
-        bot = ctx.create_bot(base=Bot)
-        from nonebug_saa import should_send_saa
-        from nonebot_plugin_saa import TargetQQGroup, MessageFactory
-
-        from nonebot_bison.config import config
-        from nonebot_bison.types import Target as T_Target
-
-        target = T_Target("weibo_id")
-        platform_name = "weibo"
-        await config.add_subscribe(
-            TargetQQGroup(group_id=123),
-            target=target,
-            target_name="weibo_name",
-            platform_name=platform_name,
-            cats=[],
-            tags=[],
-        )
-
-        event_1 = fake_private_message_event(
-            message=Message("关联cookie"), sender=fake_superuser, to_me=True, user_id=fake_superuser.user_id
-        )
-        ctx.receive_event(bot, event_1)
-        ctx.should_pass_rule()
-        should_send_saa(
-            ctx,
-            MessageFactory(
-                "订阅的帐号为：\n1 weibo weibo_name weibo_id\n []\n请输入要关联 cookie 的订阅的序号\n输入'取消'中止"
-            ),
-            bot,
-            event=event_1,
-        )
-        event_2 = fake_private_message_event(
-            message=Message("1"), sender=fake_superuser, to_me=True, user_id=fake_superuser.user_id
-        )
-        ctx.receive_event(bot, event_2)
-        ctx.should_pass_rule()
-        ctx.should_call_send(
-            event_2,
-            "当前平台暂无可关联的 Cookie，请使用“添加cookie”命令添加或检查已关联的 Cookie",
-            True,
-        )
-
-
-async def test_add_cookie(app: App, mocker: MockerFixture):
-    from nonebot.adapters.onebot.v11.bot import Bot
-    from nonebot.adapters.onebot.v11.message import Message
-
-    from nonebot_bison.platform import platform_manager
-    from nonebot_bison.sub_manager import common_platform, add_cookie_matcher, add_cookie_target_matcher
-
-    async with app.test_matcher(add_cookie_matcher) as ctx:
-        bot = ctx.create_bot(base=Bot)
-        event_1 = fake_private_message_event(
-            message=Message("添加Cookie"), sender=fake_superuser, to_me=True, user_id=fake_superuser.user_id
-        )
-        ctx.receive_event(bot, event_1)
-        ctx.should_pass_rule()
-        ctx.should_call_send(
-            event_1,
-            BotReply.add_reply_on_add_cookie(platform_manager, common_platform),
-            True,
-        )
-        event_2 = fake_private_message_event(
-            message=Message("全部"), sender=fake_superuser, to_me=True, user_id=fake_superuser.user_id
-        )
-        ctx.receive_event(bot, event_2)
-        ctx.should_pass_rule()
-        ctx.should_rejected()
-        ctx.should_call_send(
-            event_2,
-            BotReply.add_reply_on_add_cookie_input_allplatform(platform_manager),
-            True,
-        )
-        event_3 = fake_private_message_event(
-            message=Message("weibo"), sender=fake_superuser, to_me=True, user_id=fake_superuser.user_id
-        )
-        ctx.receive_event(bot, event_3)
-        ctx.should_pass_rule()
-        ctx.should_call_send(event_3, BotReply.add_reply_on_input_cookie)
-        event_4_err = fake_private_message_event(
-            message=Message("test"), sender=fake_superuser, to_me=True, user_id=fake_superuser.user_id
-        )
-        ctx.receive_event(bot, event_4_err)
-        ctx.should_call_send(event_4_err, "无效的 Cookie，请检查后重新输入，详情见<待添加的文档>", True)
-        ctx.should_rejected()
-        event_4_ok = fake_private_message_event(
-            message=Message(json.dumps({"cookie": "test"})),
-            sender=fake_superuser,
-            to_me=True,
-            user_id=fake_superuser.user_id,
-        )
-        ctx.receive_event(bot, event_4_ok)
-        ctx.should_pass_rule()
-        ctx.should_call_send(
-            event_4_ok, '已添加 Cookie: {"cookie": "test"} 到平台 weibo\n请使用“关联cookie”为 Cookie 关联订阅', True
-        )
-
-    async with app.test_matcher(add_cookie_target_matcher) as ctx:
-        from nonebug_saa import should_send_saa
-        from nonebot_plugin_saa import TargetQQGroup, MessageFactory
-
-        from nonebot_bison.config import config
-        from nonebot_bison.types import Target as T_Target
-
-        target = T_Target("weibo_id")
-        platform_name = "weibo"
-        await config.add_subscribe(
-            TargetQQGroup(group_id=123),
-            target=target,
-            target_name="weibo_name",
-            platform_name=platform_name,
-            cats=[],
-            tags=[],
-        )
-        bot = ctx.create_bot(base=Bot)
-        event_1 = fake_private_message_event(
-            message=Message("关联cookie"), sender=fake_superuser, to_me=True, user_id=fake_superuser.user_id
-        )
-        ctx.receive_event(bot, event_1)
-        ctx.should_pass_rule()
-        should_send_saa(
-            ctx,
-            MessageFactory(
-                "订阅的帐号为：\n1 weibo weibo_name weibo_id\n []\n请输入要关联 cookie 的订阅的序号\n输入'取消'中止"
-            ),
-            bot,
-            event=event_1,
-        )
-        event_2_err = fake_private_message_event(
-            message=Message("2"), sender=fake_superuser, to_me=True, user_id=fake_superuser.user_id
-        )
-        ctx.receive_event(bot, event_2_err)
-        ctx.should_call_send(event_2_err, "序号错误", True)
-        ctx.should_rejected()
-        event_2_ok = fake_private_message_event(
-            message=Message("1"), sender=fake_superuser, to_me=True, user_id=fake_superuser.user_id
-        )
-        ctx.receive_event(bot, event_2_ok)
-        ctx.should_pass_rule()
-        ctx.should_call_send(event_2_ok, '请选择一个 Cookie，已关联的 Cookie 不会显示\n1. weibo.com [{"cookie":]', True)
-        event_3_err = fake_private_message_event(
-            message=Message("2"), sender=fake_superuser, to_me=True, user_id=fake_superuser.user_id
-        )
-        ctx.receive_event(bot, event_3_err)
-        ctx.should_call_send(event_3_err, "序号错误", True)
-        ctx.should_rejected()
-        event_3_ok = fake_private_message_event(
-            message=Message("1"), sender=fake_superuser, to_me=True, user_id=fake_superuser.user_id
-        )
-        ctx.receive_event(bot, event_3_ok)
-        ctx.should_pass_rule()
-        ctx.should_call_send(event_3_ok, '已关联 Cookie: weibo.com [{"cookie":] 到订阅 weibo.com weibo_id', True)
-
-
-async def test_add_cookie_target_no_target(app: App, mocker: MockerFixture):
-
-    from nonebot.adapters.onebot.v11.bot import Bot
-    from nonebot.adapters.onebot.v11.message import Message
-
-    from nonebot_bison.sub_manager import add_cookie_target_matcher
-
-    async with app.test_matcher(add_cookie_target_matcher) as ctx:
-        bot = ctx.create_bot(base=Bot)
-        event_1 = fake_private_message_event(
-            message=Message("关联cookie"), sender=fake_superuser, to_me=True, user_id=fake_superuser.user_id
-        )
-        ctx.receive_event(bot, event_1)
-        ctx.should_pass_rule()
-        ctx.should_call_send(
-            event_1,
-            "暂无已订阅账号\n请使用“添加订阅”命令添加订阅",
-            True,
-        )

tests/sub_manager/test_delete_cookie.py

@@ -1,133 +0,0 @@
-import json
-
-from nonebug.app import App
-
-from ..utils import fake_superuser, fake_private_message_event
-
-
-async def test_del_cookie_err(app: App):
-    from nonebug_saa import should_send_saa
-    from nonebot.adapters.onebot.v11.bot import Bot
-    from nonebot.adapters.onebot.v11.message import Message
-    from nonebot_plugin_saa import TargetQQGroup, MessageFactory
-
-    from nonebot_bison.config import config
-    from nonebot_bison.config.db_model import Cookie
-    from nonebot_bison.types import Target as T_Target
-    from nonebot_bison.sub_manager import del_cookie_matcher
-
-    async with app.test_matcher(del_cookie_matcher) as ctx:
-        bot = ctx.create_bot(base=Bot)
-        event = fake_private_message_event(
-            message=Message("删除cookie"), sender=fake_superuser, to_me=True, user_id=fake_superuser.user_id
-        )
-        ctx.receive_event(bot, event)
-        ctx.should_pass_rule()
-        ctx.should_pass_permission()
-        ctx.should_call_send(event, "暂无已添加的 Cookie\n请使用“添加cookie”命令添加", True)
-
-    async with app.test_matcher(del_cookie_matcher) as ctx:
-        bot = ctx.create_bot(base=Bot)
-        target = T_Target("weibo_id")
-        platform_name = "weibo"
-        await config.add_subscribe(
-            TargetQQGroup(group_id=123),
-            target=target,
-            target_name="weibo_name",
-            platform_name=platform_name,
-            cats=[],
-            tags=[],
-        )
-        await config.add_cookie(Cookie(content=json.dumps({"cookie": "test"}), site_name="weibo.com"))
-        cookies = await config.get_cookie(is_anonymous=False)
-        await config.add_cookie_target(target, platform_name, cookies[0].id)
-
-        event_1 = fake_private_message_event(
-            message=Message("删除cookie"), sender=fake_superuser, to_me=True, user_id=fake_superuser.user_id
-        )
-        ctx.receive_event(bot, event_1)
-        ctx.should_pass_rule()
-        ctx.should_pass_permission()
-        should_send_saa(
-            ctx,
-            MessageFactory(
-                '已添加的 Cookie 为：\n1 weibo.com weibo.com [{"cookie":] '
-                "1个关联\n请输入要删除的 Cookie 的序号\n输入'取消'中止"
-            ),
-            bot,
-            event=event_1,
-        )
-        event_2_err = fake_private_message_event(
-            message=Message("2"), sender=fake_superuser, to_me=True, user_id=fake_superuser.user_id
-        )
-        ctx.receive_event(bot, event_2_err)
-        ctx.should_call_send(event_2_err, "序号错误", True)
-        ctx.should_rejected()
-
-        event_2 = fake_private_message_event(
-            message=Message("1"), sender=fake_superuser, to_me=True, user_id=fake_superuser.user_id
-        )
-        ctx.receive_event(bot, event_2)
-        ctx.should_pass_rule()
-        ctx.should_call_send(event_2, "只能删除未关联的 Cookie，请使用“取消关联cookie”命令取消关联", True)
-        ctx.should_call_send(event_2, "删除错误", True)
-        ctx.should_rejected()
-
-
-async def test_del_cookie(app: App):
-    from nonebug_saa import should_send_saa
-    from nonebot.adapters.onebot.v11.bot import Bot
-    from nonebot.adapters.onebot.v11.message import Message
-    from nonebot_plugin_saa import TargetQQGroup, MessageFactory
-
-    from nonebot_bison.config import config
-    from nonebot_bison.config.db_model import Cookie
-    from nonebot_bison.types import Target as T_Target
-    from nonebot_bison.sub_manager import del_cookie_matcher
-
-    async with app.test_matcher(del_cookie_matcher) as ctx:
-        bot = ctx.create_bot(base=Bot)
-        event = fake_private_message_event(
-            message=Message("删除cookie"), sender=fake_superuser, to_me=True, user_id=fake_superuser.user_id
-        )
-        ctx.receive_event(bot, event)
-        ctx.should_pass_rule()
-        ctx.should_pass_permission()
-        ctx.should_call_send(event, "暂无已添加的 Cookie\n请使用“添加cookie”命令添加", True)
-
-    async with app.test_matcher(del_cookie_matcher) as ctx:
-        bot = ctx.create_bot(base=Bot)
-        target = T_Target("weibo_id")
-        platform_name = "weibo"
-        await config.add_subscribe(
-            TargetQQGroup(group_id=123),
-            target=target,
-            target_name="weibo_name",
-            platform_name=platform_name,
-            cats=[],
-            tags=[],
-        )
-        await config.add_cookie(Cookie(content=json.dumps({"cookie": "test"}), site_name="weibo.com"))
-
-        event_1 = fake_private_message_event(
-            message=Message("删除cookie"), sender=fake_superuser, to_me=True, user_id=fake_superuser.user_id
-        )
-        ctx.receive_event(bot, event_1)
-        ctx.should_pass_rule()
-        ctx.should_pass_permission()
-        should_send_saa(
-            ctx,
-            MessageFactory(
-                '已添加的 Cookie 为：\n1 weibo.com weibo.com [{"cookie":]'
-                " 0个关联\n请输入要删除的 Cookie 的序号\n输入'取消'中止"
-            ),
-            bot,
-            event=event_1,
-        )
-        event_2 = fake_private_message_event(
-            message=Message("1"), sender=fake_superuser, to_me=True, user_id=fake_superuser.user_id
-        )
-        ctx.receive_event(bot, event_2)
-        ctx.should_pass_rule()
-        ctx.should_pass_permission()
-        ctx.should_call_send(event_2, "删除成功", True)

tests/utils.py

@@ -89,7 +89,6 @@ add_reply_on_id_input_search = (
 
 
 class BotReply:
-
     @staticmethod
     def add_reply_on_platform(platform_manager, common_platform):
         return (
@@ -160,33 +159,3 @@ class BotReply:
     add_reply_on_tags_need_more_info = "订阅标签直接输入标签内容\n屏蔽标签请在标签名称前添加~号\n详见https://nonebot-bison.netlify.app/usage/#%E5%B9%B3%E5%8F%B0%E8%AE%A2%E9%98%85%E6%A0%87%E7%AD%BE-tag"
     add_reply_abort = "已中止订阅"
     no_permission = "您没有权限进行此操作，请联系 Bot 管理员"
-
-    @staticmethod
-    def add_reply_on_add_cookie(platform_manager, common_platform):
-        from nonebot_bison.utils.site import is_cookie_client_manager
-
-        return (
-            "请输入想要添加 Cookie 的平台，目前支持，请输入冒号左边的名称：\n"
-            + "".join(
-                [
-                    f"{platform_name}: {platform_manager[platform_name].name}\n"
-                    for platform_name in common_platform
-                    if is_cookie_client_manager(platform_manager[platform_name].site.client_mgr)
-                ]
-            )
-            + "要查看全部平台请输入：“全部”\n中止添加cookie过程请输入：“取消”"
-        )
-
-    @staticmethod
-    def add_reply_on_add_cookie_input_allplatform(platform_manager):
-        from nonebot_bison.utils.site import is_cookie_client_manager
-
-        return "全部平台\n" + "\n".join(
-            [
-                f"{platform_name}: {platform.name}"
-                for platform_name, platform in platform_manager.items()
-                if is_cookie_client_manager(platform.site.client_mgr)
-            ]
-        )
-
-    add_reply_on_input_cookie = "请输入 Cookie"

结项报告.md

@@ -0,0 +1,230 @@
+<br><br><br>
+
+<center><p style="font-size:56px"><b>结项报告</b></p></center>
+
+<br>
+
+<center>项目名称：<u>bison 爬虫的 Cookie 管理与调度系统</u></center>
+
+<center>项目主导师：<u><a href="mailto:felinae225@qq.com ">felinae98</a></u></center>
+
+<center>报告人：<u>杜家楷</u></center>
+
+<center>日期：<u>2024.09.30</u></center>
+
+<center>邮箱：<u>suyiiyii@gmail.com</u></center>
+
+[toc]
+
+# 项目背景
+
+Bison 是一个支持从各个站点和社交平台获取信息，并推送到 QQ 的 NoneBot 插件。但是随着从各个网站获取信息难得的提升，Bison 需要支持携带 Cookie 进行请求。
+
+本项目旨在为 Bison 添加 Cookie 功能的支持。完成一个通用的 Cookie 组件，为各个平台的信息采集提供支持并保证扩展能力，需要同时支持实名 Cookie 和匿名 Cookie 的调度；同时要实现完善的 UI 供管理员进行管理。
+
+# 方案描述：
+
+继承原有的 ClientManager，创建 CookieClientManger，在获取 client 时，会根据 Target 信息自动选择合适的 Cookie。
+
+## cookie 存储
+
+因为 Cookie 和订阅的 Target 之间是多对多关系，所以创建两张表，一张 Cookie 表用于存储 Cookie 的内容和状态等信息，另一张是 CookieTarget 表，用于存储 Cookie 和 target 直接的关系。
+
+```mermaid
+classDiagram
+    class Cookie {
+        int id
+        str site_name
+        str content
+        str cookie_name
+        datetime last_usage
+        str status
+        int cd_milliseconds
+        bool is_universal
+        bool is_anonymous
+        dict[str, Any] tags
+    }
+    class CookieTarget {
+        int id
+        int target_id
+        int cookie_id
+    }
+```
+
+## 获取 Cookie
+
+```python
+async def get_client(self, target: Target | None) -> AsyncClient: ...
+
+async def get_client_for_static(self) -> AsyncClient: ...
+
+async def get_query_name_client(self) -> AsyncClient: ...
+
+async def refresh_client(self): ...
+```
+
+现有的 ClientManager 有以上方法，Platform 模块抓取时，用的是 get_client 方法，获取到 AsyncClient，再使用获取到的 AsyncClient 进行请求。所以，只需要重写 get_client 方法，根据传入的 Target 信息返回带有 Cookie 的 client，即可实现携带 Cookie 请求。
+
+## 调度 Cookie
+
+首先，cookie 分为实名 Cookie 和匿名 Cookie。实名 Cookie 为用户上传的 cookie，匿名 Cookie 为程序可以自动生成的 cookie。
+
+同时，项目内还存在没有 target 概念的 Platform，还需要兼容这种情况。
+
+为了调度 Cookie，添加了`status` 、`last_usage`、 `cd`、 `is_anonymous` 等字段，具体定义和含义见下：
+
+```python
+    # 最后使用的时刻
+    last_usage: Mapped[datetime.datetime] = mapped_column(DateTime, default=datetime.datetime(1970, 1, 1))
+    # Cookie 当前的状态
+    status: Mapped[str] = mapped_column(String(20), default="")
+    # 使用一次之后，需要的冷却时间
+    cd_milliseconds: Mapped[int] = mapped_column(default=0)
+    # 是否是通用 Cookie（对所有 Target 都有效）
+    is_universal: Mapped[bool] = mapped_column(default=False)
+    # 是否是匿名 Cookie
+    is_anonymous: Mapped[bool] = mapped_column(default=False)
+    # 标签，扩展用
+    tags: Mapped[dict[str, Any]] = mapped_column(JSON().with_variant(JSONB, "postgresql"), default={})
+```
+
+其中：
+
+- **is_universal**：用于标记 Cookie 是否为通用 Cookie，即对所有 Target 都有效。可以理解为是一种特殊的 target，添加 Cookie 和获取 Cookie 时通过传入参数进行设置。
+
+- **is_anonymous**：用于标记 Cookie 是否为匿名 Cookie，目前的定义是：可以由程序自动生成的，适用于所有 target 的 Cookie。目前的逻辑是 bison 启动时，删除原有的匿名 cookie，再生成一个新的匿名 cookie。
+
+- **无 Target 平台的 Cookie 处理方式**
+
+  对于不存在 Target 的平台，如小刻食堂，可以重写 init_cookie 方法，为用户 Cookie 设置 is_universal 属性。这样，在获取 Client 时，由于传入的 Target 为空，就只会选择 is_universal 的 cookie。实现了无 Target 平台的用户 Cookie 调度。
+
+## 选择 cookie
+
+### 一种基于优先队列的 Cookie 选择算法
+
+只是简单的选择。
+
+设定：
+
+- Cookie 的「空闲时间」定义为从上次被选择到现在，经过的时间
+- 每一个 Cookie 有一个独立的 CD，每次使用之后必须间隔一定时间后才能够再次使用
+- 匿名 Cookie 作为保底，设置比实名 Cookie 短的 CD
+
+实现思路
+
+- 在每次 Cookie 被选择时，记录此时的时间
+- 每次选择时，选择空闲时间最长的 Cookie，并检查是否过了 CD，如果还在冷却，则选择下一个 Cookie，否则选择该 Cookie
+- 如果没有可用的 Cookie，则跳过本次选择
+
+# 时间规划：
+
+## 调研和熟悉阶段（07 月 01 日 - 08 月 01 日）
+
+- [x] 调研主流平台 Cookie 使用情况
+- [x] 详细阅读代码，跟踪调试，熟悉项目细节
+- [x] 整理开发方案，提交社区讨论
+
+## 开发阶段（08 月 01 日 - 09 月 01 日）
+
+- [x] 和社区共同讨论，确定开发方案
+- [x] 编写核心功能模块
+- [x] 添加相关组件的单元测试
+
+## 整理和收尾阶段（09 月 01 日 - 09 月 30 日）
+
+- [x] 和社区一起验收核心功能模块
+- [x] 完善相关文档
+- [x] 思考可以改进或者补充的地方
+
+# 效果展示
+
+## 使用对话添加 Cookie
+
+<img src="assets/image-20240928161112657.png" alt="image-20240928161112657" style="zoom:50%;" />
+
+## 使用对话关联 Cookie 到 Target
+
+<img src="assets/image-20240928161504145.png" alt="image-20240928161504145" style="zoom:50%;" />
+
+在此之后，Bison 会携带用户上传的 Cookie 进行请求，可以抓取到受限制的内容，比如说仅粉丝可见的消息
+
+<img src="assets/image-20240928171940890.png" alt="image-20240928171940890" style="zoom:50%;" />
+
+## 删除 Cookie
+
+<img src="assets/image-20240928172609762.png" alt="image-20240928172609762" style="zoom:50%;" />
+
+## Web UI
+
+在 Bison 原有 Web UI 的基础上，添加了管理 Cookie 的功能。
+
+<img src="assets/image-20240929160056550.png" alt="image-20240929160056550" style="zoom:50%;" />
+
+# 项目难点
+
+我认为项目的难点主要在 Cookie 的调度上。
+
+## 调度基础
+
+因为项目支持多个用户同时使用，每个用户都支持订阅不同的平台，项目对订阅的管理方式并不是简单的租户之间隔离，而是共用一套调度器。例如，如果用户A和用户B同时订阅了一个Target ，此Target并不会重复采集，而是采集之后同时发送给用户A和用户B。因此，在引入Cookie之后，如果只有一个用户上传了Cookie，那么使用该Cookie采集到的信息，是否要转发给另一个用户？
+
+经过和社区讨论，答案是：要转发。在此基础上我的解决方案是，全局仍然共用调度器，采取原有的调度逻辑。但是实际请求前，获取AsyncClient时，会根据请求的Target选择合适的Cookie。
+
+同时，一个实名Cookie可以访问多个受限的资源（例如一个账号可以关注多个微博用户），一个受限的资源也可以通过多个实名Cookie去访问。因此需要合理的对Cookie进行建模。
+
+我抽象了Cookie和CookieTarget两种对象，前者存储Cookie数据，后者存储Cookie和Target的关系，来处理Cookie和Target之间的多对多关系。
+
+## 实名Cookie和匿名Cookie
+
+实名Cookie指的是用户上传的Cookie，匿名Cookie指的是程序能够自己生成的Cookie。Bison 原来只有匿名Cookie，当匿名Cookie失效之后，会尝试重新生成Cookie，基本无额外成本。而如果使用实名Cookie，频繁请求可能会使Cookie关联的用户有安全风险，因此需要指定合理的请求策略。
+
+我将实名Cookie和匿名Cookie进行统一管理，使用同样的调度逻辑进行处理，但是匿名Cookie将会有与实名Cookie不同的参数。让两者在同一个框架下实现了统一调度。
+
+## 无目标概念的平台
+
+Bison还支持采集公告、博客类的，没有「目标」概念的站点（有目标概念的站点有微博，B站等）。对于此类平台，添加Cookie之后，无需关联到Target，也可以说只有该平台一个Target。
+
+对此，我给Cookie添加了`is_universal`属性，用来表示该Cookie是否适用于平台的所有Target，调度时默认在选择范围内。也为匿名Cookie的实现提供支持。
+
+## Cookie 调度
+
+为了实现在安全范围内尽可能快速采集的要求，我设计了默认的调度策略。
+
+- 选择所有匹配的Cookie（包括有关联的和`is_universal`的）
+- 在匹配的Cookie集合中，选择满足`last_usage + cd < now()`且`last_usage`值最小的Cookie
+
+这样做，可以以一种简单的方式实现对实名Cookie的选择，同时提供匿名Cookie为备用方案。
+
+同时，在编写Cookie模块时，我把调度Cookie中的各个阶段都使用函数抽象出来，如选择Cookie、组装Client、状态回写等，便于适配平台的个性化需求。
+
+# 项目总结
+
+- 已完成工作：
+
+  - 完成 CookieClientManger
+  - 创建存储 Cookie 的数据表，支持 CookieClientManger 选择 Cookie。
+  - 为管理员管理 Cookie 创建对话交互
+  - 在原有的 WebUI 上添加管理 Cookie 功能
+  - 导入导出功能支持 Cookie
+
+- 测试用例：
+
+  按照项目开发规范编写单元测试，覆盖率不下降，不低于 85%。
+
+- 后续工作安排：
+
+  目前，项目的功能已经开发完毕，已提交 PR。但由于个人和社区的时间分配问题，PR 的 review 工作还在进行中，所以接下来的时间将会和社区成员一起修改 PR，达到社区的要求后合并。
+
+# 心得体会
+
+起初，我是在学校里师兄的推荐下，了解到开源之夏活动。我自己很早就了解到开源，也想要参与开源，但是一直没有好的途径，非常感谢活动的组织方提供了这样一个机会让我接触开源，参与开源。
+
+我们的项目主要编程语言是 Python，在以往，我只会用 Python 写一些自用的脚本，最多就是一下简单的 REST API 后端，都是大家口中的「玩具」。而参与此次项目，才让我了解到一个真正有产品，有用户的开源项目是怎么运行的。Release、Issue、PR&Review，还有大家在一起讨论交流，这都是我做自己的项目体验不到的。
+
+同时，参与此次项目也极大的提高了我的代码能力，`装饰器`，`元类`，`类型参数`等高级用法，都是我之前没有接触过或接触过但仅限于使用的。还有单元测试，单元测试我一直想做，但是总是遇到些解决不了的问题就放弃了，项目中大量的单元测试，我可以照着已有的去写我自己的，在这个过程中我学到了很多。还有，项目惜字如金的码风，也极大的提高了我阅读缺少注释的代码的能力。
+
+这在里，要感谢社区的成员们，愿意回答我这个新人的各种问题，给我的代码和报告提建议，群友直接还有时不时的互动，给我家的感觉。
+
+还要特别感谢我的导师（felinae98），像一个家长一样，~~及时的~~详尽的 review 我的代码，通过引导让我自己意识到我的方案存在什么问题，并提供改进方案。对于我和社区提出的一些自己觉得很合理的方案，详细的给我们分析项目的情况和引入之后导致的复杂度，以及引入的必要性。我在后来更加深刻的理解项目之后才意识到，当时提出的方案是一个过度设计，也更加认可导师的观点。
+
+非常高兴能够参与开源之夏活动。未来，我将继续热衷于开源事业，积极参与其中。