nonebot-plugin-R6States 1.0.0__tar.gz → 1.1.0__tar.gz

{nonebot_plugin_r6states-1.0.0 → nonebot_plugin_r6states-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-R6States
-Version: 1.0.0
+Version: 1.1.0
 Summary: 查询指定玩家的各项数据
 Author-Email: Siornya <wxh200607@outlook.com>
 License: MIT
@@ -43,16 +43,10 @@ Description-Content-Type: text/markdown
 
 可以直接将 `nonebot_plugin_R6States` 文件夹放入插件目录中。
 
-### 基础指令
+### 数据查询
 
 ```text
-/R6 <player_id>
-```
-
-### 多人查询
-
-```text
-/R6 -g <id1> <id2> ... <idN>
+/R6 <player_ids...>
 ```
 
 ### 帮助信息

{nonebot_plugin_r6states-1.0.0 → nonebot_plugin_r6states-1.1.0}/README.md

@@ -30,16 +30,10 @@
 
 可以直接将 `nonebot_plugin_R6States` 文件夹放入插件目录中。
 
-### 基础指令
+### 数据查询
 
 ```text
-/R6 <player_id>
-```
-
-### 多人查询
-
-```text
-/R6 -g <id1> <id2> ... <idN>
+/R6 <player_ids...>
 ```
 
 ### 帮助信息

{nonebot_plugin_r6states-1.0.0 → nonebot_plugin_r6states-1.1.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-R6States"
-version = "1.0.0"
+version = "1.1.0"
 description = "查询指定玩家的各项数据"
 authors = [
     { name = "Siornya", email = "wxh200607@outlook.com" },

{nonebot_plugin_r6states-1.0.0 → nonebot_plugin_r6states-1.1.0}/src/nonebot_plugin_R6States/__init__.py

@@ -1,11 +1,13 @@
-from nonebot import on_command, logger
+import asyncio
+
+from nonebot import on_command, logger, get_driver
 from nonebot.adapters import Message
 from nonebot.params import CommandArg
 from nonebot.plugin import PluginMetadata, get_plugin_config
 from nonebot.adapters.onebot.v11 import MessageEvent, MessageSegment, GroupMessageEvent
 
 from .config import Config
-from .service import VALID_PLATFORMS, ServiceError, get_full_stats
+from .service import VALID_PLATFORMS, ServiceError, aclose, get_full_stats
 from .formatter import format_full_stats
 from .renderer import render_full_stats
 from .config_mannger import (
@@ -18,7 +20,7 @@ from .config_mannger import (
 __plugin_meta__ = PluginMetadata(
     name="彩六数据查询",
     description="查询指定玩家的数据",
-    usage="/r6 <id> [平台]　/r6key <key>　/r6help",
+    usage="/r6 <id...> [平台]　/r6key <key>　/r6help",
     homepage="https://github.com/Siornya/nonebot-plugin-R6States",
     type="application",
     config=Config,
@@ -27,28 +29,32 @@ __plugin_meta__ = PluginMetadata(
 
 plugin_config = get_plugin_config(Config)
 
+
+@get_driver().on_shutdown
+async def _shutdown():
+    await aclose()
+
+
 r6 = on_command("r6", aliases={"R6"}, priority=10, block=True)
 r6_key = on_command("r6key", aliases={"R6key", "R6DAPI", "r6dapi"}, priority=5, block=True)
 r6_help = on_command("r6help", aliases={"R6help"}, priority=5, block=True)
 
 HELP_TEXT = (
     "彩六数据查询\n"
-    "/r6 <id> [平台]   查询玩家数据（平台默认 uplay，可选 psn/xbl）\n"
+    "/r6 <id...> [平台]  查询玩家数据（最多5个，空格分隔；平台默认 uplay，可选 psn/xbl）\n"
     "/r6key <key>      设置本群/本人的 r6data API Key\n"
-    "/r6help           显示本帮助\n"
-    "Key 可在 https://r6data.com/ 免费获取；优先用你的个人 Key，没有则用群 Key"
+    "/r6help           显示帮助\n"
+    "聊群中API KEY优先用个人 Key，没有则用群 Key"
 )
 
 
 def _scope_id(event: MessageEvent) -> str:
-    """设置 key 的归属：群聊按群、私聊按人。"""
     if isinstance(event, GroupMessageEvent):
         return str(event.group_id)
     return str(event.user_id)
 
 
 def _lookup_scopes(event: MessageEvent) -> list[str]:
-    """查询时的 key 候选顺序：个人优先，个人没设则回退到群。"""
     if isinstance(event, GroupMessageEvent):
         return [str(event.user_id), str(event.group_id)]
     return [str(event.user_id)]
@@ -64,7 +70,7 @@ async def _(event: MessageEvent, args: Message = CommandArg()):
     key = args.extract_plain_text().strip()
     if not key:
         await r6_key.finish(
-            "请在命令后输入 API Key，例如：/r6key abcdef...\n"
+            "请在命令后输入 API Key，例如：/r6key <key>\n"
             "没有的话可在 https://r6data.com/ 免费获取"
         )
 
@@ -78,7 +84,7 @@ async def _(event: MessageEvent, args: Message = CommandArg()):
 async def _(event: MessageEvent, args: Message = CommandArg()):
     tokens = args.extract_plain_text().split()
     if not tokens:
-        await r6.finish("用法：/r6 <id> [平台]，详见 /r6help")
+        await r6.finish("用法：/r6 <id...> [平台]，详见 /r6help")
 
     # 末尾 token 若是平台名则作为平台，其余都当作玩家 id。
     platform = "uplay"
@@ -97,21 +103,29 @@ async def _(event: MessageEvent, args: Message = CommandArg()):
     if age is not None and age >= KEY_TTL_DAYS:
         await r6.send(f"⚠️ 当前 API Key 已设置 {age:.0f} 天，可能已过期，如查询失败请 /r6key 重设")
 
-    for player_id in tokens:
-        try:
-            data = await get_full_stats(
-                player_id, scopes, platform, season_year=plugin_config.current_season
-            )
-            if plugin_config.r6_output_image:
-                try:
-                    png = render_full_stats(player_id, data)
-                    await r6.send(MessageSegment.image(png))
-                    continue
-                except Exception as e:  # noqa: BLE001 - 渲染失败回退文本
-                    logger.warning(f"图片渲染失败，回退文本: {type(e).__name__}: {e}")
-            await r6.send(format_full_stats(player_id, data))
-        except ServiceError as e:
-            await r6.send(f"❌ {player_id}：{e.message}")
-        except Exception as e:  # noqa: BLE001
-            logger.error(f"查询 {player_id} 出错: {type(e).__name__}: {e}")
+    # 并发取数（单个失败不连累其余），再按原顺序逐个发送
+    results = await asyncio.gather(
+        *(
+            get_full_stats(pid, scopes, platform, season_year=plugin_config.current_season)
+            for pid in tokens
+        ),
+        return_exceptions=True,
+    )
+
+    for player_id, data in zip(tokens, results):
+        if isinstance(data, ServiceError):
+            logger.warning(f"查询 {player_id} 失败: {data.message}")
+            await r6.send(f"❌ {player_id}：{data.message}")
+            continue
+        if isinstance(data, BaseException):
+            logger.error(f"查询 {player_id} 出错: {type(data).__name__}: {data}")
             await r6.send(f"❌ {player_id}：查询失败")
+            continue
+        if plugin_config.r6_output_image:
+            try:
+                png = render_full_stats(player_id, data)
+                await r6.send(MessageSegment.image(png))
+                continue
+            except Exception as e:  # noqa: BLE001 - 渲染失败回退文本
+                logger.warning(f"图片渲染失败，回退文本: {type(e).__name__}: {e}")
+        await r6.send(format_full_stats(player_id, data))

{nonebot_plugin_r6states-1.0.0 → nonebot_plugin_r6states-1.1.0}/src/nonebot_plugin_R6States/cache.py

@@ -1,10 +1,3 @@
-"""轻量本地缓存：单 JSON 文件 + 每条目独立 TTL + 异步锁 + 原子写。
-
-设计动机（对比旧的 players.yaml）：
-- 旧实现按**整文件** mtime 判 TTL，一次写入会重置所有条目的有效期，过期还整包丢弃。
-- 这里每条目自带写入时间戳，**各自过期**；TTL 由调用方按 endpoint 指定。
-- 写入走 "临时文件 + os.replace" 原子替换，配异步锁，避免并发下半写/相互覆盖。
-"""
 from __future__ import annotations
 
 import os
@@ -29,7 +22,6 @@ class JSONCache:
                 data = json.load(f)
             return data if isinstance(data, dict) else {}
         except (json.JSONDecodeError, OSError):
-            # 缓存损坏不应影响主流程：当作空缓存重建。
             return {}
 
     def _atomic_write(self, data: dict[str, dict[str, Any]]) -> None:
@@ -46,18 +38,18 @@ class JSONCache:
                 pass
             raise
 
-    async def get(self, key: str, ttl: float) -> Optional[Any]:
-        """命中且未超过 ttl（秒）则返回缓存值，否则返回 None。"""
+    async def get(self, key: str) -> Optional[Any]:
         async with self._lock:
             entry = self._load().get(key)
-        if not entry:
-            return None
-        if time.time() - entry.get("ts", 0) > ttl:
+        if not entry or entry.get("exp", 0) < time.time():
             return None
         return entry.get("value")
 
-    async def set(self, key: str, value: Any) -> None:
+    async def set(self, key: str, value: Any, ttl: float) -> None:
+        """写入并带上过期时间；顺手剔除已过期条目，避免文件无限增长。"""
+        now = time.time()
         async with self._lock:
             data = self._load()
-            data[key] = {"ts": time.time(), "value": value}
+            data[key] = {"exp": now + ttl, "value": value}
+            data = {k: v for k, v in data.items() if v.get("exp", 0) > now}
             self._atomic_write(data)

nonebot_plugin_r6states-1.1.0/src/nonebot_plugin_R6States/config.py

@@ -0,0 +1,13 @@
+from __future__ import annotations
+
+from pydantic import BaseModel
+
+
+class Config(BaseModel):
+    # 当前赛季代码，查询默认按此赛季过滤。填 "all" 则不过滤、查生涯。
+    # 在 .env 里用 CURRENT_SEASON 覆盖
+    current_season: str = "Y11S2"
+
+    # 查询结果渲染成图片，失败时自动回退文本
+    # 在 .env 用 R6_OUTPUT_IMAGE 覆盖
+    r6_output_image: bool = True

{nonebot_plugin_r6states-1.0.0 → nonebot_plugin_r6states-1.1.0}/src/nonebot_plugin_R6States/config_mannger.py

@@ -1,9 +1,3 @@
-"""按群/按人管理 r6data api-key。
-
-落盘格式（带设置时间戳，用于过期提醒；key 官方有效期约 1 个月）::
-
-    {"apikeys": {"<id>": {"key": "...", "set_at": 1712345678.0}}}
-"""
 from __future__ import annotations
 
 import json
@@ -53,10 +47,6 @@ def get_apikey(target_id: str) -> Optional[str]:
 
 
 def resolve_apikey(scopes: list[str]) -> tuple[Optional[str], Optional[str]]:
-    """按候选顺序找第一个有 key 的归属，返回 (key, 命中的 scope)。
-
-    群聊传 [群号, 用户号]：群没设 key 时回退到个人 key。
-    """
     for scope in scopes:
         key = get_apikey(scope)
         if key:
@@ -65,7 +55,6 @@ def resolve_apikey(scopes: list[str]) -> tuple[Optional[str], Optional[str]]:
 
 
 def get_apikey_age_days(target_id: str) -> Optional[float]:
-    """key 已设置的天数；旧格式/未设置返回 None。"""
     entry = _entry(target_id)
     if not entry:
         return None

{nonebot_plugin_r6states-1.0.0 → nonebot_plugin_r6states-1.1.0}/src/nonebot_plugin_R6States/formatter.py

@@ -18,9 +18,21 @@ _BOARD_CN = {
     "event": "活动", "warmup": "热身",
 }
 
+#: 1000 起每档 100 分、每大段 5 小级；<1000 未定级，>=4500 冠军。
+_RANK_TIERS = ("紫铜", "青铜", "白银", "黄金", "铂金", "翡翠", "钻石")
+
+
+def rank_name(mmr: int) -> str:
+    if mmr < 1000:
+        return "未定级"
+    if mmr >= 4500:
+        return "冠军"
+    idx = (mmr - 1000) // 100
+    return f"{_RANK_TIERS[idx // 5]}{5 - idx % 5}"
+
 
 def _format_boards(profiles: list[dict[str, Any]]) -> list[str]:
-    """各 board 取最新赛季档案，输出概览行。"""
+    """各 board 取最新赛季档案，输出概览行；排位行补段位名。"""
     out: list[str] = []
     for fam in profiles:
         for board in fam.get("board_ids_full_profiles") or []:
@@ -33,9 +45,12 @@ def _format_boards(profiles: list[dict[str, Any]]) -> list[str]:
             kills, deaths = p.get("kills", 0), p.get("deaths", 0)
             wr = wins / (wins + losses) * 100 if (wins + losses) else 0
             kd = kills / deaths if deaths else float(kills)
-            name = _BOARD_CN.get(board.get("board_id", ""), board.get("board_id", "?"))
+            bid = board.get("board_id", "")
+            name = _BOARD_CN.get(bid, bid or "?")
+            rp = p.get("rank_points", 0)
+            rank_str = f"{rank_name(rp)} " if bid == "ranked" else ""
             out.append(
-                f"{name} RP{p.get('rank_points', 0)}(峰{p.get('max_rank_points', 0)}) "
+                f"{name} {rank_str}RP{rp}({p.get('max_rank_points', 0)}) "
                 f"胜负{wins}/{losses}({wr:.0f}%) KD{kd:.2f} 掉线{p.get('abandon', 0)}"
             )
     return out

{nonebot_plugin_r6states-1.0.0 → nonebot_plugin_r6states-1.1.0}/src/nonebot_plugin_R6States/renderer.py

@@ -1,10 +1,3 @@
-"""把 fullStats 渲染成图片（PNG 字节）。
-
-- 双字体：拉丁/数字用 Mona Sans，汉字用 Noto Sans CJK，按字符分段、基线对齐。
-- 2x 超采样：按 SCALE 倍分辨率绘制，避免客户端放大时发虚。
-- 干员区为对齐表格，数字右对齐；攻/防用不同颜色。
-内容提取复用 formatter 的 _format_boards（档案行）；干员直接读结构化字段以便排版。
-"""
 from __future__ import annotations
 
 from io import BytesIO
@@ -33,12 +26,12 @@ _DEF = (94, 160, 232)   # 防
 _SCALE = 2              # 超采样倍率
 _W = 760 * _SCALE
 _PAD = 36 * _SCALE
+_PER_SIDE = 4           # 攻/防各展示几个干员
 
 _font_cache: dict[tuple[str, int, Optional[int]], ImageFont.FreeTypeFont] = {}
 
 
 def _font(path: str, size: int, weight: Optional[int] = None) -> ImageFont.FreeTypeFont:
-    """按字号取字体；weight 给定时尝试调可变字重（失败则忽略）。"""
     key = (path, size * _SCALE, weight)
     if key in _font_cache:
         return _font_cache[key]
@@ -100,7 +93,7 @@ def _ascent(size: int) -> int:
     return _font(_NOTO, size).getmetrics()[0]
 
 
-def render_full_stats(player_id: str, data: dict[str, Any], top_n: int = 8) -> bytes:
+def render_full_stats(player_id: str, data: dict[str, Any]) -> bytes:
     info = data.get("data") or {}
     handle = (info.get("platformInfo") or {}).get("platformUserHandle") or player_id
     meta = info.get("metadata") or {}
@@ -149,18 +142,18 @@ def render_full_stats(player_id: str, data: dict[str, Any], top_n: int = 8) -> b
         section("干员 Top")
         by_rounds = lambda o: o.get("roundsPlayed", 0)  # noqa: E731
         atks = sorted((o for o in operators if o.get("side") == "Attacker"),
-                      key=by_rounds, reverse=True)[:4]
+                      key=by_rounds, reverse=True)[:_PER_SIDE]
         defs = sorted((o for o in operators if o.get("side") == "Defender"),
-                      key=by_rounds, reverse=True)[:4]
+                      key=by_rounds, reverse=True)[:_PER_SIDE]
 
         gap = 48 * _SCALE
         col_w = (_W - 2 * _PAD - gap) // 2
         lx, rx = p, p + col_w + gap
 
-        # 列头：攻 / 防
+        # 列头
         y += _ascent(19)
-        _draw(draw, lx, y, "攻", 19, _ATK, weight=700)
-        _draw(draw, rx, y, "防", 19, _DEF, weight=700)
+        _draw(draw, lx, y, "进攻方", 19, _ATK, weight=700)
+        _draw(draw, rx, y, "防守方", 19, _DEF, weight=700)
         y += _font(_NOTO, 19).getmetrics()[1] + 12 * _SCALE
 
         def _cell(cx: int, base: int, op: dict[str, Any]) -> None:

{nonebot_plugin_r6states-1.0.0 → nonebot_plugin_r6states-1.1.0}/src/nonebot_plugin_R6States/service.py

@@ -1,19 +1,22 @@
 """数据源（API 为主）+ 缓存层。
 
-对外只暴露 ``get_operator_stats``：先查本地缓存，未命中再打 r6data API，
+对外暴露 ``get_full_stats``：先查本地缓存，未命中再打 r6data 的 fullStats，
 成功后回写缓存。错误统一转成 ``ServiceError``，由指令层决定怎么回话。
+复用一个进程级共享的 httpx 客户端（连接池复用），指令层须在 on_shutdown 调 ``aclose``。
 """
 from __future__ import annotations
 
-from typing import Any
+from typing import Any, Optional
+
+import httpx
 
 from .cache import JSONCache
 from .storage import PLAYER_CACHE_FILE
 from .r6data import R6Client, R6APIError
 from .config_mannger import resolve_apikey
 
-#: 玩家快照属于会变的数据，缓存 30 分钟即可显著降低 API 用量。
-FULL_STATS_TTL = 30 * 60
+#: 玩家快照属于会变的数据，缓存 45 分钟即可显著降低 API 用量。
+FULL_STATS_TTL = 45 * 60
 
 VALID_PLATFORMS = ("uplay", "psn", "xbl")
 
@@ -22,6 +25,24 @@ APIKEY_HELP = "可在 https://r6data.com/ 免费获取 Key，再用 /r6key <key>
 
 _cache = JSONCache(PLAYER_CACHE_FILE)
 
+#: 进程级共享 httpx 客户端，注入给每个 R6Client，避免每次查询重建连接池/握手。
+_http: Optional[httpx.AsyncClient] = None
+
+
+def _client() -> httpx.AsyncClient:
+    global _http
+    if _http is None or _http.is_closed:
+        _http = httpx.AsyncClient(timeout=15.0)
+    return _http
+
+
+async def aclose() -> None:
+    """关闭共享 httpx 客户端（在 nonebot on_shutdown 调用）。"""
+    global _http
+    if _http is not None and not _http.is_closed:
+        await _http.aclose()
+    _http = None
+
 
 class ServiceError(Exception):
     def __init__(self, message: str, *, expired: bool = False) -> None:
@@ -45,15 +66,15 @@ async def get_full_stats(
         raise ServiceError(f"未设置 API Key。{APIKEY_HELP}")
 
     cache_key = f"fullStats:{platform}:{season_year or 'all'}:{modes or 'all'}:{player_id.lower()}"
-    cached = await _cache.get(cache_key, ttl=FULL_STATS_TTL)
+    cached = await _cache.get(cache_key)
     if cached is not None:
         return cached
 
     try:
-        async with R6Client(api_key=api_key) as r6:
-            data = await r6.players.get_full_stats(
-                player_id, platform, season_year=season_year, modes=modes
-            )
+        r6 = R6Client(api_key=api_key, client=_client())
+        data = await r6.players.get_full_stats(
+            player_id, platform, season_year=season_year, modes=modes
+        )
     except R6APIError as e:
         if e.status == 401:
             raise ServiceError(
@@ -64,5 +85,5 @@ async def get_full_stats(
     except Exception as e:  # noqa: BLE001 - 网络等异常统一兜底
         raise ServiceError(f"请求失败：{type(e).__name__}") from e
 
-    await _cache.set(cache_key, data)
+    await _cache.set(cache_key, data, FULL_STATS_TTL)
     return data

nonebot_plugin_r6states-1.0.0/src/nonebot_plugin_R6States/config.py

@@ -1,12 +0,0 @@
-from __future__ import annotations
-
-from pydantic import BaseModel
-
-
-class Config(BaseModel):
-    #: 当前赛季代码（如 "Y10S4"）。查询默认按此赛季过滤；填 "all" 则不过滤、查生涯。
-    #: 在 .env 里用 CURRENT_SEASON=Y10S4 覆盖；每赛季更新一次即可。
-    current_season: str = "Y11S2"
-
-    #: 查询结果是否渲染成图片（失败时自动回退文本）。.env 用 R6_OUTPUT_IMAGE=false 关闭。
-    r6_output_image: bool = True