🔖 1.0.0.a17

* ✨ RequestError 新增 status_code 参数

* ✨ 新增支持故障转移的请求方法

* ✨ 支持茶服多个api地址的故障转移

nonebot_plugin_tetris_stats/config/migrations/09d4bb60160d_rename_field.py

@@ -0,0 +1,51 @@
+"""Rename field
+
+迁移 ID: 09d4bb60160d
+父迁移: b9d65badc713
+创建时间: 2024-04-23 23:42:04.541672
+
+"""
+
+from __future__ import annotations
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+from alembic import op
+
+revision: str = '09d4bb60160d'
+down_revision: str | Sequence[str] | None = 'b9d65badc713'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('nonebot_plugin_tetris_stats_iorank', schema=None) as batch_op:
+        batch_op.alter_column('create_time', new_column_name='update_time', existing_type=sa.DateTime())
+        batch_op.drop_index('ix_nonebot_plugin_tetris_stats_iorank_create_time')
+    op.create_index(
+        batch_op.f('ix_nonebot_plugin_tetris_stats_iorank_update_time'),
+        'nonebot_plugin_tetris_stats_iorank',
+        ['update_time'],
+        unique=False,
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('nonebot_plugin_tetris_stats_iorank', schema=None) as batch_op:
+        batch_op.alter_column('update_time', new_column_name='create_time')
+        batch_op.drop_index(batch_op.f('ix_nonebot_plugin_tetris_stats_iorank_update_time'))
+    op.create_index(
+        'ix_nonebot_plugin_tetris_stats_iorank_create_time',
+        'nonebot_plugin_tetris_stats_iorank',
+        ['create_time'],
+        unique=False,
+    )
+    # ### end Alembic commands ###

nonebot_plugin_tetris_stats/config/migrations/0d50142b780f_add_field.py

@@ -0,0 +1,43 @@
+"""add field
+
+迁移 ID: 0d50142b780f
+父迁移: 09d4bb60160d
+创建时间: 2024-04-24 14:55:08.064098
+
+"""
+
+from __future__ import annotations
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+from alembic import op
+
+revision: str = '0d50142b780f'
+down_revision: str | Sequence[str] | None = '09d4bb60160d'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('nonebot_plugin_tetris_stats_iorank', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('file_hash', sa.String(length=128), nullable=True))
+        batch_op.create_index(
+            batch_op.f('ix_nonebot_plugin_tetris_stats_iorank_file_hash'), ['file_hash'], unique=False
+        )
+
+    # ### end Alembic commands ###
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('nonebot_plugin_tetris_stats_iorank', schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f('ix_nonebot_plugin_tetris_stats_iorank_file_hash'))
+        batch_op.drop_column('file_hash')
+
+    # ### end Alembic commands ###

nonebot_plugin_tetris_stats/config/migrations/6c3206f90cc3_add_field.py

@@ -0,0 +1,65 @@
+"""Add redundant platform field
+
+迁移 ID: 6c3206f90cc3
+父迁移: 9f6582279ce2
+创建时间: 2023-11-26 20:15:56.033892
+
+"""
+from __future__ import annotations
+
+from collections.abc import Sequence
+
+from alembic import op
+from sqlalchemy.ext.automap import automap_base
+from sqlalchemy.orm import Session
+from ujson import dumps, loads
+
+revision: str = '6c3206f90cc3'
+down_revision: str | Sequence[str] | None = '9f6582279ce2'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+
+    Base = automap_base()  # noqa: N806
+    connection = op.get_bind()
+    Base.prepare(autoload_with=connection)
+
+    HistoricalData = Base.classes.nonebot_plugin_tetris_stats_historicaldata  # noqa: N806
+
+    with Session(connection) as session:
+        for row in session.query(HistoricalData):
+            platform = row.game_platform
+            game_user = loads(row.game_user)
+            processed_data = loads(row.processed_data)
+            game_user['platform'] = platform
+            processed_data['platform'] = platform
+            row.game_user = dumps(game_user)
+            row.processed_data = dumps(processed_data)
+            session.add(row)
+        session.commit()
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return
+
+    Base = automap_base()  # noqa: N806
+    connection = op.get_bind()
+    Base.prepare(autoload_with=connection)
+
+    HistoricalData = Base.classes.nonebot_plugin_tetris_stats_historicaldata  # noqa: N806
+
+    with Session(connection) as session:
+        for row in session.query(HistoricalData):
+            game_user = loads(row.game_user)
+            processed_data = loads(row.processed_data)
+            game_user.pop('platform', None)
+            processed_data.pop('platform', None)
+            row.game_user = dumps(game_user)
+            row.processed_data = dumps(processed_data)
+            session.add(row)
+        session.commit()

nonebot_plugin_tetris_stats/config/migrations/9f6582279ce2_recreate_historical_data.py

@@ -45,8 +45,8 @@ def upgrade(name: str = '') -> None:
         sa.Column('game_platform', sa.String(length=32), nullable=False),
         sa.Column('command_type', sa.String(length=16), nullable=False),
         sa.Column('command_args', sa.JSON(), nullable=False),
-        sa.Column('game_user', PydanticType(), nullable=False),
-        sa.Column('processed_data', PydanticType(), nullable=False),
+        sa.Column('game_user', PydanticType(list), nullable=False),
+        sa.Column('processed_data', PydanticType(list), nullable=False),
         sa.Column('finish_time', sa.DateTime(), nullable=False),
         sa.PrimaryKeyConstraint('id', name=op.f('pk_nonebot_plugin_tetris_stats_historicaldata')),
     )

nonebot_plugin_tetris_stats/config/migrations/b9d65badc713_del_old_tos_bind_data.py

@@ -0,0 +1,38 @@
+"""Del old TOS bind data
+
+迁移 ID: b9d65badc713
+父迁移: 6c3206f90cc3
+创建时间: 2023-12-30 00:27:40.991704
+
+"""
+from __future__ import annotations
+
+from collections.abc import Sequence
+
+from alembic import op
+from sqlalchemy.ext.automap import automap_base
+from sqlalchemy.orm import Session
+
+revision: str = 'b9d65badc713'
+down_revision: str | Sequence[str] | None = '6c3206f90cc3'
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade(name: str = '') -> None:
+    if name:
+        return
+
+    Base = automap_base()  # noqa: N806
+    connection = op.get_bind()
+    Base.prepare(autoload_with=connection)
+
+    Bind = Base.classes.nonebot_plugin_tetris_stats_bind  # noqa: N806
+    with Session(connection) as session:
+        session.query(Bind).filter(Bind.game_platform == 'TOS').delete()
+        session.commit()
+
+
+def downgrade(name: str = '') -> None:
+    if name:
+        return

nonebot_plugin_tetris_stats/db/models.py

@@ -1,9 +1,11 @@
+from collections.abc import Callable, Sequence
 from datetime import datetime
 from typing import Any
 
 from nonebot.adapters import Message
+from nonebot.compat import type_validate_json
 from nonebot_plugin_orm import Model
-from pydantic import BaseModel
+from pydantic import BaseModel, ValidationError
 from sqlalchemy import JSON, DateTime, Dialect, PickleType, String, TypeDecorator
 from sqlalchemy.orm import Mapped, MappedAsDataclass, mapped_column
 
@@ -14,16 +16,24 @@ from ..utils.typing import CommandType, GameType
 class PydanticType(TypeDecorator):
     impl = JSON
 
+    def __init__(self, get_model: Callable[[], Sequence[type[BaseModel]]], *args: Any, **kwargs: Any):  # noqa: ANN401
+        self.get_model = get_model
+        super().__init__(*args, **kwargs)
+
     def process_bind_param(self, value: Any | None, dialect: Dialect) -> str:  # noqa: ANN401
         # 将 Pydantic 模型实例转换为 JSON
-        if isinstance(value, BaseModel):
-            return value.json()
+        if isinstance(value, tuple(self.get_model())):
+            return value.json()  # type: ignore[union-attr]
         raise TypeError
 
     def process_result_value(self, value: Any | None, dialect: Dialect) -> BaseModel:  # noqa: ANN401
         # 将 JSON 转换回 Pydantic 模型实例
         if isinstance(value, str | bytes):
-            return BaseModel.parse_raw(value)
+            for i in self.get_model():
+                try:
+                    return type_validate_json(i, value)
+                except ValidationError:  # noqa: PERF203
+                    ...
         raise TypeError
 
 
@@ -46,6 +56,8 @@ class HistoricalData(MappedAsDataclass, Model):
     game_platform: Mapped[GameType] = mapped_column(String(32), index=True, init=False)
     command_type: Mapped[CommandType] = mapped_column(String(16), index=True, init=False)
     command_args: Mapped[list[str]] = mapped_column(JSON, init=False)
-    game_user: Mapped[BaseUser] = mapped_column(PydanticType, init=False)
-    processed_data: Mapped[BaseProcessedData] = mapped_column(PydanticType, init=False)
+    game_user: Mapped[BaseUser] = mapped_column(PydanticType(get_model=BaseUser.__subclasses__), init=False)
+    processed_data: Mapped[BaseProcessedData] = mapped_column(
+        PydanticType(get_model=BaseProcessedData.__subclasses__), init=False
+    )
     finish_time: Mapped[datetime] = mapped_column(DateTime, init=False)

nonebot_plugin_tetris_stats/game_data_processor/__init__.py

@@ -1,5 +1,5 @@
 from abc import ABC, abstractmethod
-from datetime import UTC, datetime
+from datetime import datetime, timezone
 from typing import Any
 
 from nonebot.matcher import Matcher
@@ -12,6 +12,8 @@ from .schemas import BaseProcessedData as ProcessedData
 from .schemas import BaseRawResponse as RawResponse
 from .schemas import BaseUser as User
 
+UTC = timezone.utc
+
 
 class Processor(ABC):
     event_id: int

nonebot_plugin_tetris_stats/game_data_processor/io_data_processor/__init__.py

@@ -1,4 +1,4 @@
-from datetime import UTC, datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from zoneinfo import ZoneInfo
 
 from arclet.alconna import Alconna, AllParam, Arg, ArgFlag, Args, CommandMeta, Option
@@ -9,7 +9,7 @@ from nonebot_plugin_orm import get_session
 from sqlalchemy import func, select
 
 from ...db import query_bind_info
-from ...utils.exception import NeedCatchError
+from ...utils.exception import HandleNotFinishedError, NeedCatchError
 from ...utils.metrics import get_metrics
 from ...utils.platform import get_platform
 from ...utils.typing import Me
@@ -20,6 +20,8 @@ from .model import IORank
 from .processor import Processor, User, identify_user_info
 from .typing import Rank
 
+UTC = timezone.utc
+
 alc = on_alconna(
     Alconna(
         'io',
@@ -93,7 +95,8 @@ async def _(bot: Bot, event: Event, matcher: Matcher, account: User):
     try:
         await matcher.finish(await proc.handle_bind(platform=get_platform(bot), account=event.get_user_id()))
     except NeedCatchError as e:
-        await matcher.finish(str(e))
+        await matcher.send(str(e))
+        raise HandleNotFinishedError from e
 
 
 @alc.assign('query')
@@ -116,7 +119,8 @@ async def _(bot: Bot, event: Event, matcher: Matcher, target: At | Me):
     try:
         await matcher.finish(message + await proc.handle_query())
     except NeedCatchError as e:
-        await matcher.finish(str(e))
+        await matcher.send(str(e))
+        raise HandleNotFinishedError from e
 
 
 @alc.assign('query')
@@ -129,7 +133,8 @@ async def _(event: Event, matcher: Matcher, account: User):
     try:
         await matcher.finish(await proc.handle_query())
     except NeedCatchError as e:
-        await matcher.finish(str(e))
+        await matcher.send(str(e))
+        raise HandleNotFinishedError from e
 
 
 @alc.assign('rank')
@@ -146,19 +151,19 @@ async def _(matcher: Matcher, rank: Rank):
                 .where(IORank.rank == rank)
                 .order_by(
                     func.abs(
-                        func.julianday(IORank.create_time)
-                        - func.julianday(latest_data.create_time - timedelta(hours=24))
+                        func.julianday(IORank.update_time)
+                        - func.julianday(latest_data.update_time - timedelta(hours=24))
                     )
                 )
                 .limit(1)
             )
         ).one()
     message = ''
-    if (datetime.now(UTC) - latest_data.create_time.replace(tzinfo=UTC)) > timedelta(hours=7):
+    if (datetime.now(UTC) - latest_data.update_time.replace(tzinfo=UTC)) > timedelta(hours=7):
         message += 'Warning: 数据超过7小时未更新, 请联系Bot主人查看后台\n'
     message += f'{rank.upper()} 段 分数线 {latest_data.tr_line:.2f} TR, {latest_data.player_count} 名玩家\n'
     if compare_data.id != latest_data.id:
-        message += f'对比 {(latest_data.create_time-compare_data.create_time).total_seconds()/3600:.2f} 小时前趋势: {f"↑{difference:.2f}" if (difference:=latest_data.tr_line-compare_data.tr_line) > 0 else f"↓{-difference:.2f}" if difference < 0 else "→"}'
+        message += f'对比 {(latest_data.update_time-compare_data.update_time).total_seconds()/3600:.2f} 小时前趋势: {f"↑{difference:.2f}" if (difference:=latest_data.tr_line-compare_data.tr_line) > 0 else f"↓{-difference:.2f}" if difference < 0 else "→"}'
     else:
         message += '暂无对比数据'
     avg = get_metrics(pps=latest_data.avg_pps, apm=latest_data.avg_apm, vs=latest_data.avg_vs)
@@ -183,7 +188,7 @@ async def _(matcher: Matcher, rank: Rank):
         f'APM: {latest_data.high_apm[1]} By: {latest_data.high_apm[0]["name"].upper()}\n'
         f'ADPM: {max_vs.adpm} ( {max_vs.vs}vs ) By: {latest_data.high_vs[0]["name"].upper()}\n'
         '\n'
-        f'数据更新时间: {latest_data.create_time.replace(tzinfo=UTC).astimezone(ZoneInfo("Asia/Shanghai")).strftime("%Y-%m-%d %H:%M:%S")}'
+        f'数据更新时间: {latest_data.update_time.replace(tzinfo=UTC).astimezone(ZoneInfo("Asia/Shanghai")).strftime("%Y-%m-%d %H:%M:%S")}'
     )
     await matcher.finish(message)
 

nonebot_plugin_tetris_stats/game_data_processor/io_data_processor/cache.py

@@ -1,12 +1,14 @@
-from datetime import UTC, datetime
+from datetime import datetime, timezone
 
 from aiocache import Cache as ACache  # type: ignore[import-untyped]
+from nonebot.compat import type_validate_json
 from nonebot.log import logger
-from pydantic import parse_raw_as
 
 from ...utils.request import Request
 from .schemas.base import FailedModel, SuccessModel
 
+UTC = timezone.utc
+
 
 class Cache:
     cache = ACache(ACache.MEMORY)
@@ -16,7 +18,7 @@ class Cache:
         cached_data = await cls.cache.get(url)
         if cached_data is None:
             response_data = await Request.request(url)
-            parsed_data: SuccessModel | FailedModel = parse_raw_as(SuccessModel | FailedModel, response_data)  # type: ignore[arg-type]
+            parsed_data: SuccessModel | FailedModel = type_validate_json(SuccessModel | FailedModel, response_data)  # type: ignore[arg-type]
             if isinstance(parsed_data, SuccessModel):
                 await cls.cache.add(
                     url,

nonebot_plugin_tetris_stats/game_data_processor/io_data_processor/constant.py

@@ -1,7 +1,8 @@
-from ...utils.typing import GameType
+from typing import Literal
+
 from .typing import Rank
 
-GAME_TYPE: GameType = 'IO'
+GAME_TYPE: Literal['IO'] = 'IO'
 BASE_URL = 'https://ch.tetr.io/api/'
 RANK_PERCENTILE: dict[Rank, float] = {
     'x': 1,

nonebot_plugin_tetris_stats/game_data_processor/io_data_processor/model.py

@@ -1,4 +1,4 @@
-from datetime import UTC, datetime
+from datetime import datetime, timezone
 
 from nonebot_plugin_orm import Model
 from sqlalchemy import JSON, DateTime, String
@@ -6,6 +6,8 @@ from sqlalchemy.orm import Mapped, MappedAsDataclass, mapped_column
 
 from .typing import Rank
 
+UTC = timezone.utc
+
 
 class IORank(MappedAsDataclass, Model):
     id: Mapped[int] = mapped_column(init=False, primary_key=True)
@@ -21,9 +23,8 @@ class IORank(MappedAsDataclass, Model):
     high_pps: Mapped[tuple[dict[str, str], float]] = mapped_column(JSON)
     high_apm: Mapped[tuple[dict[str, str], float]] = mapped_column(JSON)
     high_vs: Mapped[tuple[dict[str, str], float]] = mapped_column(JSON)
-    create_time: Mapped[datetime] = mapped_column(
+    update_time: Mapped[datetime] = mapped_column(
         DateTime,
-        default=lambda: datetime.now(tz=UTC),
         index=True,
-        init=False,
     )
+    file_hash: Mapped[str | None] = mapped_column(String(128), index=True)

nonebot_plugin_tetris_stats/game_data_processor/io_data_processor/processor.py

@@ -1,21 +1,26 @@
 from collections import defaultdict
 from collections.abc import Callable
-from datetime import UTC, datetime, timedelta
+from datetime import datetime, timedelta, timezone
+from hashlib import sha512
 from math import floor
 from re import match
 from statistics import mean
+from typing import Literal
 
+from aiofiles import open
 from nonebot import get_driver
+from nonebot.compat import type_validate_json
+from nonebot.utils import run_sync
 from nonebot_plugin_apscheduler import scheduler  # type: ignore[import-untyped]
+from nonebot_plugin_localstore import get_data_file  # type: ignore[import-untyped]
 from nonebot_plugin_orm import get_session
-from pydantic import parse_raw_as
 from sqlalchemy import select
+from zstandard import ZstdCompressor
 
 from ...db import create_or_update_bind
 from ...utils.exception import MessageFormatError, RequestError, WhatTheFuckError
 from ...utils.request import splice_url
 from ...utils.retry import retry
-from ...utils.typing import GameType
 from .. import Processor as ProcessorMeta
 from .cache import Cache
 from .constant import BASE_URL, GAME_TYPE, RANK_PERCENTILE
@@ -33,6 +38,8 @@ from .schemas.user_records import SoloRecord, UserRecords
 from .schemas.user_records import SuccessModel as RecordsSuccess
 from .typing import Rank
 
+UTC = timezone.utc
+
 driver = get_driver()
 
 
@@ -55,7 +62,7 @@ class Processor(ProcessorMeta):
         self.processed_data = ProcessedData()
 
     @property
-    def game_platform(self) -> GameType:
+    def game_platform(self) -> Literal['IO']:
         return GAME_TYPE
 
     async def handle_bind(self, platform: str, account: str) -> str:
@@ -94,7 +101,7 @@ class Processor(ProcessorMeta):
             self.raw_response.user_info = await Cache.get(
                 splice_url([BASE_URL, 'users/', f'{self.user.ID or self.user.name}'])
             )
-            user_info: UserInfo = parse_raw_as(UserInfo, self.raw_response.user_info)  # type: ignore[arg-type]
+            user_info: UserInfo = type_validate_json(UserInfo, self.raw_response.user_info)  # type: ignore[arg-type]
             if isinstance(user_info, InfoFailed):
                 raise RequestError(f'用户信息请求错误:\n{user_info.error}')
             self.processed_data.user_info = user_info
@@ -106,7 +113,7 @@ class Processor(ProcessorMeta):
             self.raw_response.user_records = await Cache.get(
                 splice_url([BASE_URL, 'users/', f'{self.user.ID or self.user.name}/', 'records'])
             )
-            user_records: UserRecords = parse_raw_as(UserRecords, self.raw_response.user_records)  # type: ignore[arg-type]
+            user_records: UserRecords = type_validate_json(UserRecords, self.raw_response.user_records)  # type: ignore[arg-type]
             if isinstance(user_records, RecordsFailed):
                 raise RequestError(f'用户Solo数据请求错误:\n{user_records.error}')
             self.processed_data.user_records = user_records
@@ -156,7 +163,10 @@ class Processor(ProcessorMeta):
 @scheduler.scheduled_job('cron', hour='0,6,12,18', minute=0)
 @retry(exception_type=RequestError, delay=timedelta(minutes=15))
 async def get_io_rank_data() -> None:
-    league_all: LeagueAll = parse_raw_as(LeagueAll, await Cache.get(splice_url([BASE_URL, 'users/lists/league/all'])))  # type: ignore[arg-type]
+    league_all: LeagueAll = type_validate_json(
+        LeagueAll,  # type: ignore[arg-type]
+        (data := await Cache.get(splice_url([BASE_URL, 'users/lists/league/all']))),
+    )
     if isinstance(league_all, LeagueAllFailed):
         raise RequestError(f'排行榜数据请求错误:\n{league_all.error}')
 
@@ -183,6 +193,10 @@ async def get_io_rank_data() -> None:
         user = sort(users, field)
         return User(ID=user.id, name=user.username).dict(), field(user)
 
+    data_hash: str | None = await run_sync((await run_sync(sha512)(data)).hexdigest)()
+    async with open(get_data_file('nonebot_plugin_tetris_stats', f'{data_hash}.json.zst'), mode='wb') as file:
+        await file.write(await run_sync(ZstdCompressor(level=12, threads=-1).compress)(data))
+
     users = [i for i in league_all.data.users if isinstance(i, LeagueAllUser)]
     rank_to_users: defaultdict[Rank, list[LeagueAllUser]] = defaultdict(list)
     for i in users:
@@ -206,6 +220,8 @@ async def get_io_rank_data() -> None:
                 high_pps=(build_extremes_data(rank_users, pps, _max)),
                 high_apm=(build_extremes_data(rank_users, apm, _max)),
                 high_vs=(build_extremes_data(rank_users, vs, _max)),
+                update_time=league_all.cache.cached_at,
+                file_hash=data_hash,
             )
         )
     async with get_session() as session:
@@ -216,6 +232,6 @@ async def get_io_rank_data() -> None:
 @driver.on_startup
 async def _() -> None:
     async with get_session() as session:
-        latest_time = await session.scalar(select(IORank.create_time).order_by(IORank.id.desc()).limit(1))
+        latest_time = await session.scalar(select(IORank.update_time).order_by(IORank.id.desc()).limit(1))
     if latest_time is None or datetime.now(tz=UTC) - latest_time.replace(tzinfo=UTC) > timedelta(hours=6):
         await get_io_rank_data()

nonebot_plugin_tetris_stats/game_data_processor/io_data_processor/schemas/league_all.py

@@ -28,20 +28,20 @@ class SuccessModel(BaseSuccessModel):
             league: League
             supporter: bool
             verified: bool
-            country: str | None
+            country: str | None = None
 
         class InvalidUser(BaseModel):
             class League(BaseModel):
                 gamesplayed: int
                 gameswon: int
                 rating: float
-                glicko: float | None
-                rd: float | None
+                glicko: float | None = None
+                rd: float | None = None
                 rank: Rank
                 bestrank: Rank
-                apm: float | None
-                pps: float | None
-                vs: float | None
+                apm: float | None = None
+                pps: float | None = None
+                vs: float | None = None
                 decaying: bool
 
             id: str = Field(..., alias='_id')

nonebot_plugin_tetris_stats/game_data_processor/io_data_processor/schemas/response.py

@@ -1,14 +1,21 @@
+from typing import Literal
+
 from ... import ProcessedData as ProcessedDataMeta
 from ... import RawResponse as RawResponseMeta
+from ..constant import GAME_TYPE
 from .user_info import SuccessModel as InfoSuccess
 from .user_records import SuccessModel as RecordsSuccess
 
 
 class RawResponse(RawResponseMeta):
+    platform: Literal['IO'] = GAME_TYPE
+
     user_info: bytes | None = None
     user_records: bytes | None = None
 
 
 class ProcessedData(ProcessedDataMeta):
+    platform: Literal['IO'] = GAME_TYPE
+
     user_info: InfoSuccess | None = None
     user_records: RecordsSuccess | None = None

nonebot_plugin_tetris_stats/game_data_processor/io_data_processor/schemas/user.py

@@ -1,7 +1,12 @@
+from typing import Literal
+
 from ...schemas import BaseUser
+from ..constant import GAME_TYPE
 
 
 class User(BaseUser):
+    platform: Literal['IO'] = GAME_TYPE
+
     ID: str | None = None
     name: str | None = None
 

nonebot_plugin_tetris_stats/game_data_processor/io_data_processor/schemas/user_info.py

@@ -14,7 +14,7 @@ class SuccessModel(BaseSuccessModel):
             class Badge(BaseModel):
                 id: str
                 label: str
-                ts: datetime | None
+                ts: datetime | None = None
 
             class NeverPlayedLeague(BaseModel):
                 gamesplayed: Literal[0]
@@ -60,8 +60,8 @@ class SuccessModel(BaseSuccessModel):
                 bestrank: Rank
                 standing: int
                 standing_local: int
-                next_rank: Rank | None
-                prev_rank: Rank | None
+                next_rank: Rank | None = None
+                prev_rank: Rank | None = None
                 next_at: int
                 prev_at: int
                 percentile: float
@@ -70,7 +70,7 @@ class SuccessModel(BaseSuccessModel):
                 rd: float
                 apm: float
                 pps: float
-                vs: float | None
+                vs: float | None = None
                 decaying: bool
 
             class Connections(BaseModel):
@@ -78,41 +78,41 @@ class SuccessModel(BaseSuccessModel):
                     id: str
                     username: str
 
-                discord: Discord | None
+                discord: Discord | None = None
 
             class Distinguishment(BaseModel):
-                type: str  # noqa: A003
+                type: str
 
             id: str = Field(..., alias='_id')
             username: str
             role: Literal['anon', 'user', 'bot', 'halfmod', 'mod', 'admin', 'sysop', 'banned']
-            ts: datetime | None
-            botmaster: str | None
+            ts: datetime | None = None
+            botmaster: str | None = None
             badges: list[Badge]
             xp: float
             gamesplayed: int
             gameswon: int
             gametime: float
-            country: str | None
-            badstanding: bool | None
-            supporter: bool | None  # osk说是必有, 但实际上不是 fk osk
+            country: str | None = None
+            badstanding: bool | None = None
+            supporter: bool | None = None  # osk说是必有, 但实际上不是 fk osk
             supporter_tier: int
             verified: bool
             league: NeverPlayedLeague | NeverRatedLeague | RatedLeague
-            avatar_revision: int | None
+            avatar_revision: int | None = None
             """This user's avatar ID. Get their avatar at
 
             https://tetr.io/user-content/avatars/{ USERID }.jpg?rv={ AVATAR_REVISION }"""
-            banner_revision: int | None
+            banner_revision: int | None = None
             """This user's banner ID. Get their banner at
 
             https://tetr.io/user-content/banners/{ USERID }.jpg?rv={ BANNER_REVISION }
 
             Ignore this field if the user is not a supporter."""
-            bio: str | None
+            bio: str | None = None
             connections: Connections
-            friend_count: int | None
-            distinguishment: Distinguishment | None
+            friend_count: int | None = None
+            distinguishment: Distinguishment | None = None
 
         user: User
 

nonebot_plugin_tetris_stats/game_data_processor/io_data_processor/schemas/user_records.py

@@ -12,14 +12,14 @@ class EndContext(BaseModel):
         zero: bool
         locked: bool
         prev: int
-        frameoffset: int
+        frameoffset: int | None = None
 
     class Clears(BaseModel):
         singles: int
         doubles: int
         triples: int
         quads: int
-        pentas: int | None
+        pentas: int | None = None
         realtspins: int
         minitspins: int
         minitspinsingles: int
@@ -33,7 +33,7 @@ class EndContext(BaseModel):
     class Garbage(BaseModel):
         sent: int
         received: int
-        attack: int | None
+        attack: int | None = None
         cleared: int
 
     class Finesse(BaseModel):
@@ -46,18 +46,18 @@ class EndContext(BaseModel):
     level_lines: int
     level_lines_needed: int
     inputs: int
-    holds: int | None
+    holds: int | None = None
     time: Time
     score: int
-    zenlevel: int
-    zenprogress: int
+    zenlevel: int | None = None
+    zenprogress: int | None = None
     level: int
     combo: int
-    currentcombopower: int | None  # WTF
+    currentcombopower: int | None = None  # WTF
     topcombo: int
     btb: int
     topbtb: int
-    currentbtbchainpower: int | None  # WTF * 2
+    currentbtbchainpower: int | None = None  # WTF * 2
     tspins: int
     piecesplaced: int
     clears: Clears
@@ -79,7 +79,7 @@ class BaseModeRecord(BaseModel):
         replayid: str
         user: User
         ts: datetime
-        ismulti: bool | None
+        ismulti: bool | None = None
         endcontext: EndContext
 
     class MultiRecord(BaseModel):
@@ -92,21 +92,19 @@ class BaseModeRecord(BaseModel):
         replayid: str
         user: User
         ts: datetime
-        ismulti: bool | None
+        ismulti: bool | None = None
         endcontext: list[EndContext]
 
-    record: SoloRecord | MultiRecord | None
-    rank: int | None
+    record: SoloRecord | MultiRecord | None = None
+    rank: int | None = None
 
 
 class SuccessModel(BaseSuccessModel):
     class Data(BaseModel):
         class Records(BaseModel):
-            class Sprint(BaseModeRecord):
-                ...
+            class Sprint(BaseModeRecord): ...
 
-            class Blitz(BaseModeRecord):
-                ...
+            class Blitz(BaseModeRecord): ...
 
             sprint: Sprint = Field(..., alias='40l')
             blitz: Blitz

nonebot_plugin_tetris_stats/game_data_processor/schemas.py

@@ -2,8 +2,14 @@ from abc import ABC, abstractmethod
 
 from pydantic import BaseModel
 
+from ..utils.typing import GameType
 
-class BaseUser(ABC, BaseModel):
+
+class Base(BaseModel):
+    platform: GameType
+
+
+class BaseUser(ABC, Base):
     """游戏用户"""
 
     def __eq__(self, __value: object) -> bool:
@@ -17,9 +23,9 @@ class BaseUser(ABC, BaseModel):
         raise NotImplementedError
 
 
-class BaseRawResponse(BaseModel):
+class BaseRawResponse(Base):
     """原始请求数据"""
 
 
-class BaseProcessedData(BaseModel):
+class BaseProcessedData(Base):
     """处理/验证后的数据"""

nonebot_plugin_tetris_stats/game_data_processor/top_data_processor/__init__.py

@@ -5,7 +5,7 @@ from nonebot_plugin_alconna import At, on_alconna
 from nonebot_plugin_orm import get_session
 
 from ...db import query_bind_info
-from ...utils.exception import NeedCatchError
+from ...utils.exception import HandleNotFinishedError, NeedCatchError
 from ...utils.platform import get_platform
 from ...utils.typing import Me
 from .. import add_default_handlers
@@ -76,7 +76,8 @@ async def _(bot: Bot, event: Event, matcher: Matcher, account: User):
     try:
         await matcher.finish(await proc.handle_bind(platform=get_platform(bot), account=event.get_user_id()))
     except NeedCatchError as e:
-        await matcher.finish(str(e))
+        await matcher.send(str(e))
+        raise HandleNotFinishedError from e
 
 
 @alc.assign('query')
@@ -99,7 +100,8 @@ async def _(bot: Bot, event: Event, matcher: Matcher, target: At | Me):
     try:
         await matcher.finish(message + await proc.handle_query())
     except NeedCatchError as e:
-        await matcher.finish(str(e))
+        await matcher.send(str(e))
+        raise HandleNotFinishedError from e
 
 
 @alc.assign('query')
@@ -112,7 +114,8 @@ async def _(event: Event, matcher: Matcher, account: User):
     try:
         await matcher.finish(await proc.handle_query())
     except NeedCatchError as e:
-        await matcher.finish(str(e))
+        await matcher.send(str(e))
+        raise HandleNotFinishedError from e
 
 
 add_default_handlers(alc)

nonebot_plugin_tetris_stats/game_data_processor/top_data_processor/constant.py

@@ -1,4 +1,4 @@
-from ...utils.typing import GameType
+from typing import Literal
 
-GAME_TYPE: GameType = 'TOP'
+GAME_TYPE: Literal['TOP'] = 'TOP'
 BASE_URL = 'http://tetrisonline.pl/top/'

nonebot_plugin_tetris_stats/game_data_processor/top_data_processor/processor.py

@@ -2,7 +2,7 @@ from contextlib import suppress
 from dataclasses import dataclass
 from io import StringIO
 from re import match
-from typing import NoReturn
+from typing import Literal
 from urllib.parse import urlencode
 
 from lxml import etree
@@ -12,7 +12,6 @@ from pandas import read_html
 from ...db import create_or_update_bind
 from ...utils.exception import MessageFormatError, RequestError
 from ...utils.request import Request, splice_url
-from ...utils.typing import GameType
 from .. import Processor as ProcessorMeta
 from ..schemas import BaseUser
 from .constant import BASE_URL, GAME_TYPE
@@ -20,6 +19,8 @@ from .schemas.response import ProcessedData, RawResponse
 
 
 class User(BaseUser):
+    platform: Literal['TOP'] = GAME_TYPE
+
     name: str
 
     @property
@@ -56,7 +57,7 @@ class Processor(ProcessorMeta):
         self.processed_data = ProcessedData()
 
     @property
-    def game_platform(self) -> GameType:
+    def game_platform(self) -> Literal['TOP']:
         return GAME_TYPE
 
     async def handle_bind(self, platform: str, account: str) -> str:
@@ -86,10 +87,9 @@ class Processor(ProcessorMeta):
             self.processed_data.user_profile = self.raw_response.user_profile.decode()
         return self.processed_data.user_profile
 
-    async def check_user(self) -> None | NoReturn:
+    async def check_user(self) -> None:
         if 'user not found!' in await self.get_user_profile():
             raise RequestError('用户不存在!')
-        return None
 
     async def get_user_name(self) -> str:
         """获取用户名"""

nonebot_plugin_tetris_stats/game_data_processor/top_data_processor/schemas/response.py

@@ -1,9 +1,16 @@
+from typing import Literal
+
 from ...schemas import BaseProcessedData, BaseRawResponse
+from ..constant import GAME_TYPE
 
 
 class RawResponse(BaseRawResponse):
+    platform: Literal['TOP'] = GAME_TYPE
+
     user_profile: bytes | None = None
 
 
 class ProcessedData(BaseProcessedData):
+    platform: Literal['TOP'] = GAME_TYPE
+
     user_profile: str | None = None

nonebot_plugin_tetris_stats/game_data_processor/tos_data_processor/__init__.py

@@ -1,3 +1,5 @@
+from typing import NoReturn
+
 from arclet.alconna import Alconna, AllParam, Arg, ArgFlag, Args, CommandMeta, Option
 from nonebot.adapters import Bot, Event
 from nonebot.matcher import Matcher
@@ -5,7 +7,7 @@ from nonebot_plugin_alconna import At, on_alconna
 from nonebot_plugin_orm import get_session
 
 from ...db import query_bind_info
-from ...utils.exception import NeedCatchError
+from ...utils.exception import HandleNotFinishedError, NeedCatchError, RequestError
 from ...utils.platform import get_platform
 from ...utils.typing import Me
 from .. import add_default_handlers
@@ -66,27 +68,63 @@ alc = on_alconna(
     aliases={'tos', 'TOS'},
 )
 
-try:
-    from nonebot.adapters.onebot.v11 import GROUP, MessageEvent
-    from nonebot.adapters.onebot.v11 import Bot as OB11Bot
 
-    @alc.assign('bind')
-    async def _(event: MessageEvent, matcher: Matcher):
-        await matcher.finish('QQ 平台无需绑定')
+async def finish_special_query(matcher: Matcher, proc: Processor) -> NoReturn:
+    try:
+        await matcher.finish(await proc.handle_query())
+    except NeedCatchError as e:
+        if isinstance(e, RequestError) and '未找到此用户' in e.message:
+            matcher.skip()
+        await matcher.send(str(e))
+        raise HandleNotFinishedError from e
+
+
+try:
+    from nonebot.adapters.onebot.v11 import GROUP as OB11GROUP
+    from nonebot.adapters.onebot.v11 import Bot as OB11Bot
+    from nonebot.adapters.onebot.v11 import MessageEvent as OB11MessageEvent
 
     @alc.assign('query')
-    async def _(bot: OB11Bot, event: MessageEvent, matcher: Matcher, target: At | Me):
-        if event.is_tome() and await GROUP(bot, event):
+    async def _(bot: OB11Bot, event: OB11MessageEvent, matcher: Matcher, target: At | Me):
+        if event.is_tome() and await OB11GROUP(bot, event):
             await matcher.finish('不能查询bot的信息')
         proc = Processor(
             event_id=id(event),
-            user=User(teaid=target.target if isinstance(target, At) else event.get_user_id()),
+            user=User(teaid=f'onebot-{target.target}' if isinstance(target, At) else f'onebot-{event.get_user_id()}'),
             command_args=[],
         )
-        try:
-            await matcher.finish(await proc.handle_query())
-        except NeedCatchError as e:
-            await matcher.finish(str(e))
+        await finish_special_query(matcher, proc)
+
+except ImportError:
+    pass
+
+try:
+    from nonebot.adapters.kaiheila.event import MessageEvent as KookMessageEvent
+
+    @alc.assign('query')
+    async def _(event: KookMessageEvent, matcher: Matcher, target: At | Me):
+        proc = Processor(
+            event_id=id(event),
+            user=User(teaid=f'kook-{target.target}' if isinstance(target, At) else f'kook-{event.get_user_id()}'),
+            command_args=[],
+        )
+        await finish_special_query(matcher, proc)
+
+except ImportError:
+    pass
+
+try:
+    from nonebot.adapters.discord import MessageEvent as DiscordMessageEvent
+
+    @alc.assign('query')
+    async def _(event: DiscordMessageEvent, matcher: Matcher, target: At | Me):
+        proc = Processor(
+            event_id=id(event),
+            user=User(teaid=f'discord-{target.target}' if isinstance(target, At) else f'discord-{event.get_user_id()}'),
+            command_args=[],
+        )
+        await finish_special_query(matcher, proc)
+
 except ImportError:
     pass
 
@@ -101,7 +139,8 @@ async def _(bot: Bot, event: Event, matcher: Matcher, account: User):
     try:
         await matcher.finish(await proc.handle_bind(platform=get_platform(bot), account=event.get_user_id()))
     except NeedCatchError as e:
-        await matcher.finish(str(e))
+        await matcher.send(str(e))
+        raise HandleNotFinishedError from e
 
 
 @alc.assign('query')
@@ -118,13 +157,14 @@ async def _(bot: Bot, event: Event, matcher: Matcher, target: At | Me):
     message = '* 由于无法验证绑定信息, 不能保证查询到的用户为本人\n'
     proc = Processor(
         event_id=id(event),
-        user=User(name=bind.game_account),
+        user=User(teaid=bind.game_account),
         command_args=[],
     )
     try:
         await matcher.finish(message + await proc.handle_query())
     except NeedCatchError as e:
-        await matcher.finish(str(e))
+        await matcher.send(str(e))
+        raise HandleNotFinishedError from e
 
 
 @alc.assign('query')
@@ -137,7 +177,8 @@ async def _(event: Event, matcher: Matcher, account: User):
     try:
         await matcher.finish(await proc.handle_query())
     except NeedCatchError as e:
-        await matcher.finish(str(e))
+        await matcher.send(str(e))
+        raise HandleNotFinishedError from e
 
 
 add_default_handlers(alc)

nonebot_plugin_tetris_stats/game_data_processor/tos_data_processor/constant.py

@@ -1,4 +1,10 @@
-from ...utils.typing import GameType
+from typing import Literal
 
-GAME_TYPE: GameType = 'TOS'
-BASE_URL = 'https://teatube.cn:8888/'
+GAME_TYPE: Literal['TOS'] = 'TOS'
+BASE_URL = {
+    'https://teatube.cn:8888/',
+    'http://cafuuchino1.studio26f.org:19970',
+    'http://cafuuchino2.studio26f.org:19970',
+    'http://cafuuchino3.studio26f.org:19970',
+    'http://cafuuchino4.studio26f.org:19970',
+}

nonebot_plugin_tetris_stats/game_data_processor/tos_data_processor/processor.py

@@ -1,14 +1,15 @@
 from dataclasses import dataclass
 from re import match
+from typing import Literal
 from urllib.parse import urlencode
 
+from httpx import TimeoutException
+from nonebot.compat import type_validate_json
 from nonebot_plugin_orm import get_session
-from pydantic import parse_raw_as
 
 from ...db import create_or_update_bind
 from ...utils.exception import MessageFormatError, RequestError
 from ...utils.request import Request, splice_url
-from ...utils.typing import GameType
 from .. import Processor as ProcessorMeta
 from ..schemas import BaseUser
 from .constant import BASE_URL, GAME_TYPE
@@ -19,6 +20,8 @@ from .schemas.user_profile import UserProfile
 
 
 class User(BaseUser):
+    platform: Literal['TOS'] = GAME_TYPE
+
     teaid: str | None = None
     name: str | None = None
 
@@ -51,7 +54,7 @@ def identify_user_info(info: str) -> User | MessageFormatError:
         and 2 <= len(info) <= 18  # noqa: PLR2004
     ):
         return User(name=info)
-    if info.isdigit():
+    if info.startswith(('onebot-', 'qqguild-', 'kook-', 'discord-')) and info.split('-', maxsplit=1)[1].isdigit():
         return User(teaid=info)
     return MessageFormatError('用户名/QQ号不合法')
 
@@ -67,22 +70,20 @@ class Processor(ProcessorMeta):
         self.processed_data = ProcessedData(user_profile={})
 
     @property
-    def game_platform(self) -> GameType:
+    def game_platform(self) -> Literal['TOS']:
         return GAME_TYPE
 
     async def handle_bind(self, platform: str, account: str) -> str:
         """处理绑定消息"""
         self.command_type = 'bind'
         await self.get_user()
-        if self.user.name is None:
-            raise  # FIXME: 不知道怎么才能把这类型给变过来了
         async with get_session() as session:
             return await create_or_update_bind(
                 session=session,
                 chat_platform=platform,
                 chat_account=account,
                 game_platform=GAME_TYPE,
-                game_account=self.user.name,
+                game_account=self.user.unique_identifier,
             )
 
     async def handle_query(self) -> str:
@@ -104,23 +105,31 @@ class Processor(ProcessorMeta):
         """获取用户信息"""
         if self.processed_data.user_info is None:
             if self.user.teaid is not None:
-                url = splice_url(
-                    [
-                        BASE_URL,
-                        'getTeaIdInfo',
-                        f'?{urlencode({"teaId":self.user.teaid})}',
-                    ]
-                )
+                url = [
+                    splice_url(
+                        [
+                            i,
+                            'getTeaIdInfo',
+                            f'?{urlencode({"teaId":self.user.teaid})}',
+                        ]
+                    )
+                    for i in BASE_URL
+                ]
             else:
-                url = splice_url(
-                    [
-                        BASE_URL,
-                        'getUsernameInfo',
-                        f'?{urlencode({"username":self.user.name})}',
-                    ]
-                )
-            self.raw_response.user_info = await Request.request(url)
-            user_info: UserInfo = parse_raw_as(UserInfo, self.raw_response.user_info)  # type: ignore[arg-type]
+                url = [
+                    splice_url(
+                        [
+                            i,
+                            'getUsernameInfo',
+                            f'?{urlencode({"username":self.user.name})}',
+                        ]
+                    )
+                    for i in BASE_URL
+                ]
+            self.raw_response.user_info = await Request.failover_request(
+                url, failover_code=[502], failover_exc=(TimeoutException,)
+            )
+            user_info: UserInfo = type_validate_json(UserInfo, self.raw_response.user_info)  # type: ignore[arg-type]
             if not isinstance(user_info, InfoSuccess):
                 raise RequestError(f'用户信息请求错误:\n{user_info.error}')
             self.processed_data.user_info = user_info
@@ -132,16 +141,23 @@ class Processor(ProcessorMeta):
             other_parameter = {}
         params = urlencode(dict(sorted(other_parameter.items())))
         if self.processed_data.user_profile.get(params) is None:
-            self.raw_response.user_profile[params] = await Request.request(
-                splice_url(
-                    [
-                        BASE_URL,
-                        'getProfile',
-                        f'?{urlencode({"id":self.user.teaid or self.user.name,**other_parameter})}',
-                    ]
-                )
+            self.raw_response.user_profile[params] = await Request.failover_request(
+                [
+                    splice_url(
+                        [
+                            i,
+                            'getProfile',
+                            f'?{urlencode({"id":self.user.teaid or self.user.name,**other_parameter})}',
+                        ]
+                    )
+                    for i in BASE_URL
+                ],
+                failover_code=[502],
+                failover_exc=(TimeoutException,),
+            )
+            self.processed_data.user_profile[params] = type_validate_json(
+                UserProfile, self.raw_response.user_profile[params]
             )
-            self.processed_data.user_profile[params] = UserProfile.parse_raw(self.raw_response.user_profile[params])
         return self.processed_data.user_profile[params]
 
     async def get_game_data(self) -> GameData | None:
@@ -202,11 +218,7 @@ class Processor(ProcessorMeta):
             message += f"\nL'PM: {game_data.lpm} ( {game_data.pps} pps )"
             message += f'\nAPM: {game_data.apm} ( x{game_data.apl} )'
             message += f'\nADPM: {game_data.adpm} ( x{game_data.adpl} ) ( {game_data.vs}vs )'
-        message += (
-            f'\n40L: {float(user_info.pb_sprint)/1000:.2f}s'
-            if user_info.pb_sprint != 2147483647  # noqa: PLR2004
-            else ''
-        )
-        message += f'\nMarathon: {user_info.pb_marathon}' if user_info.pb_marathon != 0 else ''
-        message += f'\nChallenge: {user_info.pb_challenge}' if user_info.pb_challenge != 0 else ''
+        message += f'\n40L: {float(user_info.pb_sprint)/1000:.2f}s' if user_info.pb_sprint != '2147483647' else ''
+        message += f'\nMarathon: {user_info.pb_marathon}' if user_info.pb_marathon != '0' else ''
+        message += f'\nChallenge: {user_info.pb_challenge}' if user_info.pb_challenge != '0' else ''
         return message

nonebot_plugin_tetris_stats/game_data_processor/tos_data_processor/schemas/response.py

@@ -1,13 +1,20 @@
+from typing import Literal
+
 from ...schemas import BaseProcessedData, BaseRawResponse
+from ..constant import GAME_TYPE
 from .user_info import SuccessModel as InfoSuccess
 from .user_profile import UserProfile
 
 
 class RawResponse(BaseRawResponse):
+    platform: Literal['TOS'] = GAME_TYPE
+
     user_profile: dict[str, bytes]
     user_info: bytes | None = None
 
 
 class ProcessedData(BaseProcessedData):
+    platform: Literal['TOS'] = GAME_TYPE
+
     user_profile: dict[str, UserProfile]
     user_info: InfoSuccess | None = None

nonebot_plugin_tetris_stats/utils/exception.py

@@ -15,21 +15,25 @@ class NeedCatchError(TetrisStatsError):
     """需要被捕获的异常基类"""
 
 
-class DoNotCatchError(TetrisStatsError):
-    """不应该被捕获的异常基类"""
-
-
 class RequestError(NeedCatchError):
     """请求错误"""
 
+    def __init__(self, message: str = '', *, status_code: int | None = None):
+        super().__init__(message)
+        self.status_code = status_code
+
 
 class MessageFormatError(NeedCatchError):
     """用户发送的消息格式不正确"""
 
 
-class DatabaseVersionError(DoNotCatchError):
-    """数据库版本错误"""
+class DoNotCatchError(TetrisStatsError):
+    """不应该被捕获的异常基类"""
 
 
 class WhatTheFuckError(DoNotCatchError):
     """用于表示不应该出现的情况 ("""
+
+
+class HandleNotFinishedError(DoNotCatchError):
+    """任务没有正常完成处理的错误"""

nonebot_plugin_tetris_stats/utils/metrics.py

@@ -144,7 +144,7 @@ class TetrisMetricsProWithLPMADPM(TetrisMetricsBasicWithLPM, TetrisMetricsBaseWi
 
 
 @overload
-def get_metrics(  # noqa: PLR0913
+def get_metrics(
     *,
     pps: Number,
     lpm: None = None,
@@ -157,7 +157,7 @@ def get_metrics(  # noqa: PLR0913
 
 
 @overload
-def get_metrics(  # noqa: PLR0913
+def get_metrics(
     *,
     pps: None = None,
     lpm: Number,
@@ -170,7 +170,7 @@ def get_metrics(  # noqa: PLR0913
 
 
 @overload
-def get_metrics(  # noqa: PLR0913
+def get_metrics(
     *,
     pps: None = None,
     lpm: None = None,
@@ -183,7 +183,7 @@ def get_metrics(  # noqa: PLR0913
 
 
 @overload
-def get_metrics(  # noqa: PLR0913
+def get_metrics(
     *,
     pps: None = None,
     lpm: None = None,
@@ -196,7 +196,7 @@ def get_metrics(  # noqa: PLR0913
 
 
 @overload
-def get_metrics(  # noqa: PLR0913
+def get_metrics(
     *,
     pps: Number,
     lpm: None = None,
@@ -209,7 +209,7 @@ def get_metrics(  # noqa: PLR0913
 
 
 @overload
-def get_metrics(  # noqa: PLR0913
+def get_metrics(
     *,
     pps: None = None,
     lpm: Number,
@@ -222,7 +222,7 @@ def get_metrics(  # noqa: PLR0913
 
 
 @overload
-def get_metrics(  # noqa: PLR0913
+def get_metrics(
     *,
     pps: Number,
     lpm: None = None,
@@ -235,7 +235,7 @@ def get_metrics(  # noqa: PLR0913
 
 
 @overload
-def get_metrics(  # noqa: PLR0913
+def get_metrics(
     *,
     pps: Number,
     lpm: None = None,
@@ -248,7 +248,7 @@ def get_metrics(  # noqa: PLR0913
 
 
 @overload
-def get_metrics(  # noqa: PLR0913
+def get_metrics(
     *,
     pps: None = None,
     lpm: Number,
@@ -261,7 +261,7 @@ def get_metrics(  # noqa: PLR0913
 
 
 @overload
-def get_metrics(  # noqa: PLR0913
+def get_metrics(
     *,
     pps: None = None,
     lpm: Number,

nonebot_plugin_tetris_stats/utils/recorder.py

@@ -1,4 +1,4 @@
-from datetime import UTC, datetime
+from datetime import datetime, timezone
 from typing import ClassVar
 
 from nonebot import get_driver, get_plugin
@@ -9,6 +9,8 @@ from nonebot_plugin_orm import get_session
 
 from ..db.models import HistoricalData
 
+UTC = timezone.utc
+
 driver = get_driver()
 
 

nonebot_plugin_tetris_stats/utils/request.py

@@ -1,8 +1,10 @@
+from collections.abc import Sequence
+from http import HTTPStatus
 from urllib.parse import urljoin, urlparse
 
 from aiofiles import open
 from httpx import AsyncClient, HTTPError
-from nonebot import get_driver
+from nonebot import get_driver, get_plugin_config
 from nonebot.log import logger
 from playwright.async_api import Response
 from ujson import JSONDecodeError, dumps, loads
@@ -12,7 +14,7 @@ from .browser import BrowserManager
 from .exception import RequestError
 
 driver = get_driver()
-config = Config.parse_obj(driver.config)
+config = get_plugin_config(Config)
 
 
 @driver.on_startup
@@ -38,7 +40,7 @@ def splice_url(url_list: list[str]) -> str:
 class Request:
     """网络请求相关类"""
 
-    _CACHE_FILE = CACHE_PATH.joinpath('cloudflare_cache.json')
+    _CACHE_FILE = CACHE_PATH / 'cloudflare_cache.json'
     _headers: dict | None = None
     _cookies: dict | None = None
 
@@ -46,36 +48,31 @@ class Request:
     async def _anti_cloudflare(cls, url: str) -> bytes:
         """用firefox硬穿五秒盾"""
         browser = await BrowserManager.get_browser()
-        context = await browser.new_context()
-        page = await context.new_page()
-        response = await page.goto(url)
-        attempts = 0
-        while attempts < 60:  # noqa: PLR2004
-            attempts += 1
-            text = await page.locator('body').text_content()
-            if text is None:
-                await page.wait_for_timeout(1000)
-                continue
-            if await page.title() == 'Please Wait... | Cloudflare':
-                logger.warning('疑似触发了 Cloudflare 的验证码')
-                break
-            try:
-                loads(text)
-            except JSONDecodeError:
-                await page.wait_for_timeout(1000)
-            else:
-                if not isinstance(response, Response):
-                    raise RequestError('api请求失败')
-                cls._headers = await response.request.all_headers()
+        async with await browser.new_context() as context, await context.new_page() as page:
+            response = await page.goto(url)
+            attempts = 0
+            while attempts < 60:  # noqa: PLR2004
+                attempts += 1
+                text = await page.locator('body').text_content()
+                if text is None:
+                    await page.wait_for_timeout(1000)
+                    continue
+                if await page.title() == 'Please Wait... | Cloudflare':
+                    logger.warning('疑似触发了 Cloudflare 的验证码')
+                    break
                 try:
-                    cls._cookies = {i['name']: i['value'] for i in await context.cookies()}
-                except KeyError:
-                    cls._cookies = None
-                await page.close()
-                await context.close()
-                return await response.body()
-        await page.close()
-        await context.close()
+                    loads(text)
+                except JSONDecodeError:
+                    await page.wait_for_timeout(1000)
+                else:
+                    if not isinstance(response, Response):
+                        raise RequestError('api请求失败')
+                    cls._headers = await response.request.all_headers()
+                    try:
+                        cls._cookies = {i['name']: i['value'] for i in await context.cookies()}
+                    except KeyError:
+                        cls._cookies = None
+                    return await response.body()
         raise RequestError('绕过五秒盾失败')
 
     @classmethod
@@ -118,12 +115,47 @@ class Request:
         try:
             async with AsyncClient(cookies=cls._cookies, timeout=config.tetris_req_timeout) as session:
                 response = await session.get(url, headers=cls._headers)
+                if response.status_code != HTTPStatus.OK:
+                    raise RequestError(
+                        f'请求错误 code: {response.status_code} {HTTPStatus(response.status_code).phrase}\n{response.text}',
+                        status_code=response.status_code,
+                    )
                 if is_json:
                     loads(response.content)
                 return response.content
         except HTTPError as e:
-            raise RequestError(f'请求错误\n{e!r}') from e
+            raise RequestError(f'请求错误 \n{e!r}') from e
         except JSONDecodeError:
             if urlparse(url).netloc.lower().endswith('tetr.io'):
                 return await cls._anti_cloudflare(url)
             raise
+
+    @classmethod
+    async def failover_request(
+        cls,
+        urls: Sequence[str],
+        *,
+        failover_code: Sequence[int],
+        failover_exc: tuple[type[BaseException], ...],
+        is_json: bool = True,
+    ) -> bytes:
+        error_list: list[RequestError] = []
+        for i in urls:
+            logger.debug(f'尝试请求 {i}')
+            try:
+                return await cls.request(i, is_json=is_json)
+            except RequestError as e:
+                if e.status_code in failover_code:  # 如果状态码在 failover_code 中, 则继续尝试下一个URL
+                    error_list.append(e)
+                    continue
+                # 如果状态码不在故障转移列表中, 则查找异常栈, 如果异常栈内有 failover_exc 内的异常类型, 则继续尝试下一个URL
+                tb = e.__traceback__
+                while tb is not None:
+                    if isinstance(tb.tb_frame.f_locals.get('exc_value'), failover_exc):
+                        error_list.append(e)
+                        break
+                    tb = tb.tb_next
+                else:
+                    raise
+                continue
+        raise RequestError(f'所有地址皆不可用\n{error_list!r}')

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = 'nonebot-plugin-tetris-stats'
-version = '1.0.0.a9'
+version = '1.0.0.a17'
 description = '一款基于 NoneBot2 的用于查询 Tetris 相关游戏数据的插件'
 authors = ['scdhh <wallfjjd@gmail.com>']
 readme = 'README.md'
@@ -10,34 +10,37 @@ license = 'AGPL-3.0'
 
 [tool.poetry.dependencies]
 python = '^3.10'
-nonebot2 = '^2.0.0-beta.3'
-lxml = '^4.9.1'
+nonebot2 = '^2.2.0'
+lxml = '^5.1.0'
 pandas = '>=1.4.3,<3.0.0'
-playwright = '^1.24.1'
-ujson = '^5.4.0'
+playwright = '^1.41.2'
+ujson = '^5.9.0'
 aiofiles = "^23.2.1"
-nonebot-plugin-orm = ">=0.1.1,<0.7.0"
-nonebot-plugin-localstore = "^0.5.1"
-httpx = "^0.25.0"
-nonebot-plugin-alconna = ">=0.30,<0.34"
-nonebot-plugin-apscheduler = "^0.3.0"
+nonebot-plugin-orm = ">=0.1.1,<0.8.0"
+nonebot-plugin-localstore = "^0.6.0"
+httpx = "^0.27.0"
+nonebot-plugin-alconna = ">=0.40"
+nonebot-plugin-apscheduler = "^0.4.0"
 aiocache = "^0.12.2"
+zstandard = "^0.22.0"
 
 [tool.poetry.group.dev.dependencies]
-mypy = '>=0.991,<1.8'
-types-ujson = '^5.7.0'
+mypy = '>=1.9'
+types-ujson = '^5.9.0'
 pandas-stubs = '>=1.5.2,<3.0.0'
-ruff = '>=0.0.239,<0.1.7'
-types-aiofiles = "^23.2.0.0"
-nonebot2 = { extras = ["fastapi"], version = "^2.1.1" }
-types-lxml = "^2023.3.28"
-nonebot-plugin-orm = { extras = ["default"], version = ">=0.3,<0.7" }
-nonebot-adapter-onebot = "^2.3.1"
-nonebot-adapter-satori = "^0.8.0"
+ruff = '>=0.3.0'
+types-aiofiles = "^23.2.0.20240106"
+nonebot2 = { extras = ["fastapi"], version = "^2.2.0" }
+types-lxml = "^2024.2.9"
+nonebot-plugin-orm = { extras = ["default"], version = ">=0.3,<0.8" }
+nonebot-adapter-onebot = "^2.4.1"
+nonebot-adapter-satori = "^0.11.3"
+nonebot-adapter-kaiheila = "^0.3.4"
+nonebot-adapter-discord = "^0.1.3"
 
 [tool.poetry.group.debug.dependencies]
 objprint = '^0.2.2'
-viztracer = "^0.16.0"
+viztracer = "^0.16.2"
 
 [build-system]
 requires = ['poetry-core>=1.0.0']