nonebot-plugin-bili-dynamic 0.2.2__tar.gz → 0.2.4__tar.gz

{nonebot_plugin_bili_dynamic-0.2.2 → nonebot_plugin_bili_dynamic-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-bili-dynamic
-Version: 0.2.2
+Version: 0.2.4
 Summary: B站动态/直播推送 NoneBot2 插件（基于 Colter23/mirai 插件移植）
 Author: Tony
 License: MIT
@@ -27,7 +27,7 @@ Requires-Dist: httpx>=0.27.0
 Requires-Dist: pillow>=10.0.0
 Requires-Dist: skia-python>=87.5
 Requires-Dist: qrcode[pil]>=7.4.2
-Requires-Dist: tortoise-orm[accel]>=0.21.0
+Requires-Dist: tortoise-orm[accel]<1.0,>=0.21.0
 Requires-Dist: aerich>=0.7.0
 Requires-Dist: pydantic>=2.0.0
 Requires-Dist: typing-extensions>=4.0.0

{nonebot_plugin_bili_dynamic-0.2.2 → nonebot_plugin_bili_dynamic-0.2.4}/nonebot_plugin_bili_dynamic/qrcode_login.py

@@ -13,6 +13,46 @@ from nonebot.adapters.onebot.v11 import Bot, MessageEvent, MessageSegment
 import httpx
 
 
+def _extract_login_cookies(set_cookie_headers: list, login_url: str) -> Dict:
+    """从扫码成功响应中提取登录 Cookie。
+
+    优先解析 Set-Cookie 响应头（B站官方下发凭证的通道），
+    部分情况下 data.url 的 query 里不再携带 SESSDATA，
+    因此 URL query 只作为兜底。
+    """
+    import http.cookies
+    from urllib.parse import urlparse, parse_qs
+
+    wanted = ("SESSDATA", "BILI_JCT", "DEDEUSERID")
+    cookies: Dict[str, str] = {}
+
+    # 1) Set-Cookie 响应头（可能有多个，逐个解析）
+    for header in set_cookie_headers or []:
+        try:
+            morsel = http.cookies.SimpleCookie()
+            morsel.load(header)
+            for key, m in morsel.items():
+                if key.upper() in wanted and m.value:
+                    cookies.setdefault(key, m.value)
+        except Exception as e:
+            logger.warning(f"[QRLogin] parse set-cookie failed: {e}")
+
+    # 2) 兜底：从 data.url 的 query 参数中提取
+    # 注意：parse_qs 已做过一次 URL 解码，不要再 unquote，
+    # 真实 SESSDATA 字面量里本就包含 %2C，二次解码会损坏值
+    if login_url:
+        try:
+            parsed = urlparse(login_url)
+            query_params = parse_qs(parsed.query)
+            for key, values in query_params.items():
+                if key.upper() in wanted and values:
+                    cookies.setdefault(key, values[0])
+        except Exception as e:
+            logger.error(f"[QRLogin] parse url failed: {e}")
+
+    return cookies
+
+
 class BiliQRCodeLogin:
     """B站扫码登录器"""
     
@@ -94,27 +134,23 @@ class BiliQRCodeLogin:
             poll_code = poll_data.get("code", 86083)
             
             if poll_code == 0:
-                # 登录成功！从 data.url 的 query 参数中提取 cookies
-                # 参考 Colter23 实现: url 中包含 "SESSDATA=xxx&bili_jct=xxx"
+                # 登录成功！凭证通过 Set-Cookie 响应头下发，
+                # data.url 的 query 参数只是兜底（部分情况下不再携带 SESSDATA）
                 login_url = poll_data.get("url", "")
-                cookies = {}
-                
-                if login_url:
-                    try:
-                        from urllib.parse import urlparse, parse_qs
-                        parsed = urlparse(login_url)
-                        query_params = parse_qs(parsed.query)
-                        
-                        for key, values in query_params.items():
-                            if key.upper() in ("SESSDATA", "BILI_JCT", "DEDEUSERID"):
-                                # URL decode 并取第一个值
-                                import urllib.parse
-                                cookies[key] = urllib.parse.unquote(values[0])
-                        
-                        logger.info(f"[QRLogin] extracted from url query: {list(cookies.keys())}")
-                    except Exception as e:
-                        logger.error(f"[QRLogin] parse url failed: {e}")
-                
+                cookies = _extract_login_cookies(
+                    resp.headers.get_list("set-cookie"),
+                    login_url,
+                )
+
+                if cookies:
+                    logger.info(f"[QRLogin] extracted cookies: {list(cookies.keys())}")
+                else:
+                    logger.error(
+                        f"[QRLogin] 登录成功但未提取到 Cookie, "
+                        f"set-cookie headers: {len(resp.headers.get_list('set-cookie'))} 条, "
+                        f"data.url: {login_url[:80]}"
+                    )
+
                 return 0, cookies
             
             return poll_code, None

{nonebot_plugin_bili_dynamic-0.2.2 → nonebot_plugin_bili_dynamic-0.2.4}/nonebot_plugin_bili_dynamic/renderer.py

@@ -375,7 +375,8 @@ async def _download_image(url: str) -> Optional[skia.Image]:
         client = await _client()
         resp = await client.get(url)
         if resp.status_code == 200 and resp.content:
-            img = skia.Image.MakeFromEncoded(resp.content)
+            # MakeWithCopy：MakeFromEncoded 零拷贝不持有数据，resp.content 释放后即成悬垂指针
+            img = skia.Image.MakeFromEncoded(skia.Data.MakeWithCopy(resp.content))
             if img:
                 try:
                     img = img.makeRasterImage() or img
@@ -549,7 +550,8 @@ def _make_pil_processed_image(
             pil = pil.convert("RGB")
         buf = io.BytesIO()
         pil.save(buf, format="PNG")
-        return skia.Image.MakeFromEncoded(buf.getvalue())
+        # MakeWithCopy：MakeFromEncoded 零拷贝不持有数据，防止临时 buffer 被 GC 后悬垂
+        return skia.Image.MakeFromEncoded(skia.Data.MakeWithCopy(buf.getvalue()))
     except Exception as e:
         logger.debug(f"[BiliDynamic] Pillow 图片预处理失败: {e}")
         return None
@@ -687,7 +689,8 @@ def _draw_fake_qr(canvas: skia.Canvas, link: str, color: int, x: float, y: float
         img = qr.make_image(fill_color="black", back_color="white").convert("RGB")
         buf = io.BytesIO()
         img.save(buf, format="PNG")
-        qimg = skia.Image.MakeFromEncoded(buf.getvalue())
+        # MakeWithCopy：MakeFromEncoded 零拷贝不持有数据，防止临时 buffer 被 GC 后悬垂
+        qimg = skia.Image.MakeFromEncoded(skia.Data.MakeWithCopy(buf.getvalue()))
         if qimg:
             _draw_image_rrect(canvas, qimg, skia.RRect.MakeRectXY(skia.Rect.MakeXYWH(x, y, size, size), 0, 0))
     except Exception:

{nonebot_plugin_bili_dynamic-0.2.2 → nonebot_plugin_bili_dynamic-0.2.4}/nonebot_plugin_bili_dynamic.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-bili-dynamic
-Version: 0.2.2
+Version: 0.2.4
 Summary: B站动态/直播推送 NoneBot2 插件（基于 Colter23/mirai 插件移植）
 Author: Tony
 License: MIT
@@ -27,7 +27,7 @@ Requires-Dist: httpx>=0.27.0
 Requires-Dist: pillow>=10.0.0
 Requires-Dist: skia-python>=87.5
 Requires-Dist: qrcode[pil]>=7.4.2
-Requires-Dist: tortoise-orm[accel]>=0.21.0
+Requires-Dist: tortoise-orm[accel]<1.0,>=0.21.0
 Requires-Dist: aerich>=0.7.0
 Requires-Dist: pydantic>=2.0.0
 Requires-Dist: typing-extensions>=4.0.0

{nonebot_plugin_bili_dynamic-0.2.2 → nonebot_plugin_bili_dynamic-0.2.4}/nonebot_plugin_bili_dynamic.egg-info/SOURCES.txt

@@ -19,4 +19,5 @@ nonebot_plugin_bili_dynamic.egg-info/dependency_links.txt
 nonebot_plugin_bili_dynamic.egg-info/entry_points.txt
 nonebot_plugin_bili_dynamic.egg-info/requires.txt
 nonebot_plugin_bili_dynamic.egg-info/top_level.txt
-tests/test_dynamic_expire.py
+tests/test_dynamic_expire.py
+tests/test_qrcode_login.py

{nonebot_plugin_bili_dynamic-0.2.2 → nonebot_plugin_bili_dynamic-0.2.4}/nonebot_plugin_bili_dynamic.egg-info/requires.txt

@@ -6,7 +6,7 @@ httpx>=0.27.0
 pillow>=10.0.0
 skia-python>=87.5
 qrcode[pil]>=7.4.2
-tortoise-orm[accel]>=0.21.0
+tortoise-orm[accel]<1.0,>=0.21.0
 aerich>=0.7.0
 pydantic>=2.0.0
 typing-extensions>=4.0.0

{nonebot_plugin_bili_dynamic-0.2.2 → nonebot_plugin_bili_dynamic-0.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-bili-dynamic"
-version = "0.2.2"
+version = "0.2.4"
 description = "B站动态/直播推送 NoneBot2 插件（基于 Colter23/mirai 插件移植）"
 readme = "README.md"
 license = {text = "MIT"}
@@ -29,7 +29,7 @@ dependencies = [
     "pillow>=10.0.0",
     "skia-python>=87.5",
     "qrcode[pil]>=7.4.2",
-    "tortoise-orm[accel]>=0.21.0",
+    "tortoise-orm[accel]>=0.21.0,<1.0",
     "aerich>=0.7.0",
     "pydantic>=2.0.0",
     "typing-extensions>=4.0.0",

nonebot_plugin_bili_dynamic-0.2.4/tests/test_qrcode_login.py

@@ -0,0 +1,46 @@
+"""扫码登录 Cookie 提取测试"""
+import nonebot
+import pytest
+
+
+@pytest.fixture(scope="module", autouse=True)
+def init_nonebot():
+    nonebot.init()
+
+
+def test_extract_from_set_cookie_only():
+    """data.url query 不含凭证时，能从 Set-Cookie 头提取（真实失败场景）"""
+    from nonebot_plugin_bili_dynamic.qrcode_login import _extract_login_cookies
+
+    headers = [
+        "SESSDATA=abc123%2C456*7; Domain=.bilibili.com; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Path=/",
+        "bili_jct=token789; Domain=.bilibili.com; Path=/",
+        "DedeUserID=123456; Domain=.bilibili.com; Path=/",
+        "sid=othersid; Domain=.bilibili.com; Path=/",
+    ]
+    cookies = _extract_login_cookies(headers, "https://www.bilibili.com/")
+    assert cookies["SESSDATA"] == "abc123%2C456*7"
+    assert cookies["bili_jct"] == "token789"
+    assert cookies["DedeUserID"] == "123456"
+    assert "sid" not in cookies
+
+
+def test_extract_from_url_query_fallback():
+    """旧格式：凭证在 data.url 的 query 里"""
+    from nonebot_plugin_bili_dynamic.qrcode_login import _extract_login_cookies
+
+    url = (
+        "https://passport.biligame.com/x/passport-login/web/crossDomain"
+        "?DedeUserID=123456&DedeUserID__ckMd5=deadbeef&Expires=15551000"
+        "&SESSDATA=abc123%252C456&bili_jct=token789&gourl=https%3A%2F%2Fwww.bilibili.com"
+    )
+    cookies = _extract_login_cookies([], url)
+    assert cookies["DedeUserID"] == "123456"
+    assert cookies["SESSDATA"] == "abc123%2C456"
+    assert cookies["bili_jct"] == "token789"
+
+
+def test_extract_empty_when_nothing():
+    from nonebot_plugin_bili_dynamic.qrcode_login import _extract_login_cookies
+
+    assert _extract_login_cookies([], "") == {}