nonebot-plugin-parser 2.5.3__tar.gz → 2.6.1__tar.gz

{nonebot_plugin_parser-2.5.3 → nonebot_plugin_parser-2.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nonebot-plugin-parser
-Version: 2.5.3
+Version: 2.6.1
 Summary: NoneBot2 链接分享解析 Alconna 版, 现支持B站|抖音|快手|微博|小红书|YouTube|TikTok|Twitter|AcFun|NGA
 Keywords: acfun,bilibili,douyin,kuaishou,nga,nonebot,nonebot2,tiktok,twitter,video,weibo,xiaohongshu,youtube
 Author: fllesser
@@ -19,20 +19,20 @@ Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Communications :: Chat
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Multimedia :: Video
-Requires-Dist: nonebot2>=2.4.3,<3.0.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: pillow>=11.0.0
 Requires-Dist: aiofiles>=25.1.0
 Requires-Dist: httpx>=0.27.2,<1.0.0
 Requires-Dist: msgspec>=0.20.0,<1.0.0
+Requires-Dist: nonebot2>=2.4.3,<3.0.0
 Requires-Dist: apilmoji[rich]>=0.3.1,<1.0.0
 Requires-Dist: beautifulsoup4>=4.12.0,<5.0.0
 Requires-Dist: curl-cffi>=0.13.0,!=0.14.0,<1.0.0
 Requires-Dist: bilibili-api-python>=17.4.1,<18.0.0
+Requires-Dist: nonebot-plugin-uninfo>=0.10.1,<1.0.0
 Requires-Dist: nonebot-plugin-alconna>=0.60.4,<1.0.0
-Requires-Dist: nonebot-plugin-apscheduler>=0.5.0,<1.0.0
 Requires-Dist: nonebot-plugin-localstore>=0.7.4,<1.0.0
-Requires-Dist: nonebot-plugin-uninfo>=0.10.1,<1.0.0
+Requires-Dist: nonebot-plugin-apscheduler>=0.5.0,<1.0.0
 Requires-Dist: nonebot-plugin-htmlkit>=0.1.0rc4 ; extra == 'all'
 Requires-Dist: nonebot-plugin-htmlrender>=0.6.7 ; extra == 'all'
 Requires-Dist: yt-dlp[default]>=2026.3.13 ; extra == 'all'
@@ -71,7 +71,7 @@ Description-Content-Type: text/markdown
 
 </div>
 
-> [!IMPORTANT] 
+> [!IMPORTANT]
 > **收藏项目**，你将从 GitHub 上无延迟地接收所有发布通知～ ⭐️
 
 <img width="100%" src="https://starify.komoridevs.icu/api/starify?owner=fllesser&repo=nonebot-plugin-parser" alt="starify" />
@@ -81,14 +81,14 @@ Description-Content-Type: text/markdown
 | 平台    | 触发的消息形态                    | 视频 | 图集 | 音频 |
 | ------- | --------------------------------- | ---- | ---- | ---- |
 | B 站    | av 号/BV 号/链接/短链/卡片/小程序 | ✅​  | ✅​  | ✅​  |
-| 抖音    | 链接(分享链接，兼容电脑端链接)    | ✅​  | ✅​  | ❌️  |
-| 微博    | 链接(博文，视频，show, 文章)      | ✅​  | ✅​  | ❌️  |
-| 小红书  | 链接(含短链)/卡片                 | ✅​  | ✅​  | ❌️  |
-| 快手    | 链接(包含标准链接和短链)          | ✅​  | ✅​  | ❌️  |
-| acfun   | 链接                              | ✅​  | ❌️  | ❌️  |
-| youtube | 链接(含短链)                      | ✅​  | ❌️  | ✅​  |
-| tiktok  | 链接                              | ✅​  | ❌️  | ❌️  |
-| twitter | 链接                              | ✅​  | ✅​  | ❌️  |
+| 抖音    | 链接(分享链接，兼容电脑端链接)    | ✅​  | ✅​  | ❌️   |
+| 微博    | 链接(博文，视频，show, 文章)      | ✅​  | ✅​  | ❌️   |
+| 小红书  | 链接(含短链)/卡片                 | ✅​  | ✅​  | ❌️   |
+| 快手    | 链接(包含标准链接和短链)          | ✅​  | ✅​  | ❌️   |
+| acfun   | 链接                              | ✅​  | ❌️   | ❌️   |
+| youtube | 链接(含短链)                      | ✅​  | ❌️   | ✅​  |
+| tiktok  | 链接                              | ✅​  | ❌️   | ❌️   |
+| twitter | 链接                              | ✅​  | ✅​  | ❌️   |
 
 支持的链接，可参考 [测试链接](https://github.com/fllesser/nonebot-plugin-parser/blob/master/tests/others/test_urls.md)
 
@@ -108,7 +108,7 @@ Description-Content-Type: text/markdown
 
 ## 💿 安装
 
-> [!Warning] 
+> [!Warning]
 > **如果你已经在使用 nonebot-plugin-resolver[2]，请在安装此插件前卸载**
 
 <details>
@@ -304,6 +304,9 @@ parser_append_url=False
 # 例如: ./config/nonebot_plugin_parser/
 parser_custom_font="LXGWZhenKaiGB-Regular.ttf"
 
+# [可选] 用户名及标题字体粗细程度(仅 htmlrender)，如果使用 LXGW ZhenKai 字体建议设置为 500～600 之间
+parser_custom_font_weight: int = 700
+
 # [可选] 是否需要转发媒体内容(超过 4 项时始终使用合并转发)
 parser_need_forward_contents=True
 
@@ -390,18 +393,19 @@ class ExampleParser(BaseParser):
 
         # 4. 视频内容
         author = self.create_author(author_name, avatar_url)
-        video = self.create_video_content(video_url, cover_url, duration)
+        video = self.create_video(video_url, cover_url, duration)
 
         # 5. 图集内容
         image_urls = data.get("images")
-        images = self.create_image_contents(image_urls)
+        images = self.create_image(image_urls)
 
         # 6. 返回解析结果
         return self.result(
             title=title,
             text=description,
             author=author,
-            contents=[video, *images],
+            video=video,
+            contents=[*images],
             timestamp=timestamp,
             url=f"https://example.com/video/{video_id}",
         )
@@ -412,7 +416,7 @@ class ExampleParser(BaseParser):
 <details>
 <summary>辅助函数</summary>
 
-> 构建作者信息
+> 构建作者
 
 ```python
 author = self.create_author(
@@ -426,7 +430,7 @@ author = self.create_author(
 
 ```python
 # 方式1：传入 URL，自动下载
-video = self.create_video_content(
+video = self.create_video(
     url_or_task="https://example.com/video.mp4",
     cover_url="https://example.com/cover.jpg",  # 可选
     duration=120.5                               # 可选，单位：秒
@@ -435,7 +439,7 @@ video = self.create_video_content(
 # 方式2：传入已创建的下载任务
 from nonebot_plugin_parser.download import DOWNLOADER
 video_task = DOWNLOADER.download_video(url, ext_headers=self.headers)
-video = self.create_video_content(
+video = self.create_video(
     url_or_task=video_task,
     cover_url=cover_url,
     duration=duration
@@ -446,21 +450,12 @@ video = self.create_video_content(
 
 ```python
 # 并发下载图集内容
-images = self.create_image_contents([
+images = self.create_images([
     "https://example.com/img1.jpg",
     "https://example.com/img2.jpg",
 ])
 ```
 
-> 创建动图内容（GIF)，平台一般只提供视频（后续插件会做自动转为 gif 的处理)
-
-```python
-dynamics = self.create_dynamic_contents([
-    "https://example.com/dynamic1.mp4",
-    "https://example.com/dynamic2.mp4",
-])
-```
-
 > 重定向 url
 
 ```python
@@ -478,5 +473,5 @@ real_url = await self.get_redirect_url(
 
 ## 🎉 致谢
 
-[nonebot-plugin-resolver](https://github.com/zhiyu1998/nonebot-plugin-resolver)
-[parse-video-py](https://github.com/wujunwei928/parse-video-py)
+- [nonebot-plugin-resolver](https://github.com/zhiyu1998/nonebot-plugin-resolver) - 本项目最初基于此插件进行开发，在此表示感谢。尽管当前版本代码已完全重构，但仍感谢原项目提供的初始思路和参考。 
+- [parse-video-py](https://github.com/wujunwei928/parse-video-py) - 在抖音解析功能实现方面提供了技术参考和借鉴。

{nonebot_plugin_parser-2.5.3 → nonebot_plugin_parser-2.6.1}/README.md

@@ -17,7 +17,7 @@
 
 </div>
 
-> [!IMPORTANT] 
+> [!IMPORTANT]
 > **收藏项目**，你将从 GitHub 上无延迟地接收所有发布通知～ ⭐️
 
 <img width="100%" src="https://starify.komoridevs.icu/api/starify?owner=fllesser&repo=nonebot-plugin-parser" alt="starify" />
@@ -27,14 +27,14 @@
 | 平台    | 触发的消息形态                    | 视频 | 图集 | 音频 |
 | ------- | --------------------------------- | ---- | ---- | ---- |
 | B 站    | av 号/BV 号/链接/短链/卡片/小程序 | ✅​  | ✅​  | ✅​  |
-| 抖音    | 链接(分享链接，兼容电脑端链接)    | ✅​  | ✅​  | ❌️  |
-| 微博    | 链接(博文，视频，show, 文章)      | ✅​  | ✅​  | ❌️  |
-| 小红书  | 链接(含短链)/卡片                 | ✅​  | ✅​  | ❌️  |
-| 快手    | 链接(包含标准链接和短链)          | ✅​  | ✅​  | ❌️  |
-| acfun   | 链接                              | ✅​  | ❌️  | ❌️  |
-| youtube | 链接(含短链)                      | ✅​  | ❌️  | ✅​  |
-| tiktok  | 链接                              | ✅​  | ❌️  | ❌️  |
-| twitter | 链接                              | ✅​  | ✅​  | ❌️  |
+| 抖音    | 链接(分享链接，兼容电脑端链接)    | ✅​  | ✅​  | ❌️   |
+| 微博    | 链接(博文，视频，show, 文章)      | ✅​  | ✅​  | ❌️   |
+| 小红书  | 链接(含短链)/卡片                 | ✅​  | ✅​  | ❌️   |
+| 快手    | 链接(包含标准链接和短链)          | ✅​  | ✅​  | ❌️   |
+| acfun   | 链接                              | ✅​  | ❌️   | ❌️   |
+| youtube | 链接(含短链)                      | ✅​  | ❌️   | ✅​  |
+| tiktok  | 链接                              | ✅​  | ❌️   | ❌️   |
+| twitter | 链接                              | ✅​  | ✅​  | ❌️   |
 
 支持的链接，可参考 [测试链接](https://github.com/fllesser/nonebot-plugin-parser/blob/master/tests/others/test_urls.md)
 
@@ -54,7 +54,7 @@
 
 ## 💿 安装
 
-> [!Warning] 
+> [!Warning]
 > **如果你已经在使用 nonebot-plugin-resolver[2]，请在安装此插件前卸载**
 
 <details>
@@ -250,6 +250,9 @@ parser_append_url=False
 # 例如: ./config/nonebot_plugin_parser/
 parser_custom_font="LXGWZhenKaiGB-Regular.ttf"
 
+# [可选] 用户名及标题字体粗细程度(仅 htmlrender)，如果使用 LXGW ZhenKai 字体建议设置为 500～600 之间
+parser_custom_font_weight: int = 700
+
 # [可选] 是否需要转发媒体内容(超过 4 项时始终使用合并转发)
 parser_need_forward_contents=True
 
@@ -336,18 +339,19 @@ class ExampleParser(BaseParser):
 
         # 4. 视频内容
         author = self.create_author(author_name, avatar_url)
-        video = self.create_video_content(video_url, cover_url, duration)
+        video = self.create_video(video_url, cover_url, duration)
 
         # 5. 图集内容
         image_urls = data.get("images")
-        images = self.create_image_contents(image_urls)
+        images = self.create_image(image_urls)
 
         # 6. 返回解析结果
         return self.result(
             title=title,
             text=description,
             author=author,
-            contents=[video, *images],
+            video=video,
+            contents=[*images],
             timestamp=timestamp,
             url=f"https://example.com/video/{video_id}",
         )
@@ -358,7 +362,7 @@ class ExampleParser(BaseParser):
 <details>
 <summary>辅助函数</summary>
 
-> 构建作者信息
+> 构建作者
 
 ```python
 author = self.create_author(
@@ -372,7 +376,7 @@ author = self.create_author(
 
 ```python
 # 方式1：传入 URL，自动下载
-video = self.create_video_content(
+video = self.create_video(
     url_or_task="https://example.com/video.mp4",
     cover_url="https://example.com/cover.jpg",  # 可选
     duration=120.5                               # 可选，单位：秒
@@ -381,7 +385,7 @@ video = self.create_video_content(
 # 方式2：传入已创建的下载任务
 from nonebot_plugin_parser.download import DOWNLOADER
 video_task = DOWNLOADER.download_video(url, ext_headers=self.headers)
-video = self.create_video_content(
+video = self.create_video(
     url_or_task=video_task,
     cover_url=cover_url,
     duration=duration
@@ -392,21 +396,12 @@ video = self.create_video_content(
 
 ```python
 # 并发下载图集内容
-images = self.create_image_contents([
+images = self.create_images([
     "https://example.com/img1.jpg",
     "https://example.com/img2.jpg",
 ])
 ```
 
-> 创建动图内容（GIF)，平台一般只提供视频（后续插件会做自动转为 gif 的处理)
-
-```python
-dynamics = self.create_dynamic_contents([
-    "https://example.com/dynamic1.mp4",
-    "https://example.com/dynamic2.mp4",
-])
-```
-
 > 重定向 url
 
 ```python
@@ -424,5 +419,5 @@ real_url = await self.get_redirect_url(
 
 ## 🎉 致谢
 
-[nonebot-plugin-resolver](https://github.com/zhiyu1998/nonebot-plugin-resolver)
-[parse-video-py](https://github.com/wujunwei928/parse-video-py)
+- [nonebot-plugin-resolver](https://github.com/zhiyu1998/nonebot-plugin-resolver) - 本项目最初基于此插件进行开发，在此表示感谢。尽管当前版本代码已完全重构，但仍感谢原项目提供的初始思路和参考。 
+- [parse-video-py](https://github.com/wujunwei928/parse-video-py) - 在抖音解析功能实现方面提供了技术参考和借鉴。

{nonebot_plugin_parser-2.5.3 → nonebot_plugin_parser-2.6.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-parser"
-version = "2.5.3"
+version = "2.6.1"
 description = "NoneBot2 链接分享解析 Alconna 版, 现支持B站|抖音|快手|微博|小红书|YouTube|TikTok|Twitter|AcFun|NGA"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -39,20 +39,20 @@ classifiers = [
 ]
 
 dependencies = [
-  "nonebot2>=2.4.3,<3.0.0",
   "rich>=13.0.0",
   "pillow>=11.0.0",
   "aiofiles>=25.1.0",
   "httpx>=0.27.2,<1.0.0",
   "msgspec>=0.20.0,<1.0.0",
+  "nonebot2>=2.4.3,<3.0.0",
   "apilmoji[rich]>=0.3.1,<1.0.0",
   "beautifulsoup4>=4.12.0,<5.0.0",
   "curl_cffi>=0.13.0,<1.0.0,!=0.14.0",
   "bilibili-api-python>=17.4.1,<18.0.0",
+  "nonebot-plugin-uninfo>=0.10.1,<1.0.0",
   "nonebot-plugin-alconna>=0.60.4,<1.0.0",
-  "nonebot-plugin-apscheduler>=0.5.0,<1.0.0",
   "nonebot-plugin-localstore>=0.7.4,<1.0.0",
-  "nonebot-plugin-uninfo>=0.10.1,<1.0.0",
+  "nonebot-plugin-apscheduler>=0.5.0,<1.0.0",
 ]
 
 [project.urls]
@@ -118,7 +118,7 @@ nonebug = { git = "https://github.com/nonebot/nonebug", rev = "master" }
 [tool.bumpversion]
 tag = true
 commit = true
-current_version = "2.5.3"
+current_version = "2.6.1"
 message = "release: bump vesion from {current_version} to {new_version}"
 
 [[tool.bumpversion.files]]
@@ -150,7 +150,7 @@ test-render = "pytest tests/renders --cov=src --cov-report=xml --junitxml=junit.
 bump = "bump-my-version bump"
 show-bump = "bump-my-version show-bump"
 
-[tool.pyright]
+[tool.basedpyright]
 pythonVersion = "3.10"
 pythonPlatform = "All"
 defineConstant = { PYDANTIC_V2 = true }

{nonebot_plugin_parser-2.5.3 → nonebot_plugin_parser-2.6.1}/src/nonebot_plugin_parser/config.py

@@ -48,6 +48,8 @@ class Config(BaseModel):
     """Renderer 类型"""
     parser_custom_font: str | None = None
     """自定义字体"""
+    parser_custom_font_weight: int = 700
+    """字体粗细程度"""
     parser_need_forward_contents: bool = True
     """是否需要转发媒体内容"""
     parser_emoji_cdn: str = ELK_SH_CDN
@@ -160,6 +162,11 @@ class Config(BaseModel):
 
                 return font_path
 
+    @property
+    def custom_font_weight(self) -> int:
+        """字体粗细程度"""
+        return self.parser_custom_font_weight
+
     @property
     def need_forward_contents(self) -> bool:
         """是否需要转发媒体内容"""

{nonebot_plugin_parser-2.5.3 → nonebot_plugin_parser-2.6.1}/src/nonebot_plugin_parser/download/__init__.py

@@ -4,9 +4,10 @@ from functools import partial
 from contextlib import contextmanager
 from urllib.parse import urljoin
 
+import httpx
 import aiofiles
-from httpx import HTTPError, AsyncClient
-from nonebot import logger
+import curl_cffi
+from nonebot import logger, get_driver
 from rich.progress import (
     Progress,
     BarColumn,
@@ -15,22 +16,27 @@ from rich.progress import (
 )
 
 from .task import auto_task
-from ..utils import merge_av, safe_unlink, generate_file_name
+from ..utils import merge_av, safe_unlink, generate_file_name, is_module_available
 from ..config import pconfig
 from ..constants import COMMON_HEADER, DOWNLOAD_TIMEOUT
 from ..exception import IgnoreException, DownloadException
 
 
 class StreamDownloader:
-    """Downloader class for downloading files with stream"""
-
     def __init__(self):
         self.headers: dict[str, str] = COMMON_HEADER.copy()
         self.cache_dir: Path = pconfig.cache_dir
-        self.client: AsyncClient = AsyncClient(timeout=DOWNLOAD_TIMEOUT, verify=False)
+        self.client: httpx.AsyncClient = httpx.AsyncClient(timeout=DOWNLOAD_TIMEOUT, verify=False)
+
+    async def aclose(self):
+        await self.client.aclose()
 
+    @staticmethod
     @contextmanager
-    def rich_progress(self, desc: str, total: int | None = None):
+    def rich_progress(
+        desc: str,
+        total: int | None = None,
+    ):
         with Progress(
             TextColumn("[bold blue]{task.description}", justify="right"),
             BarColumn(bar_width=None),
@@ -41,53 +47,83 @@ class StreamDownloader:
             task_id = progress.add_task(description=desc, total=total)
             yield partial(progress.update, task_id)
 
-    async def _download_file(
+    @staticmethod
+    def _validate_content_length(
+        response: httpx.Response | curl_cffi.Response,
+    ) -> int:
+        """获取文件长度"""
+        content_length = response.headers.get("Content-Length")
+        content_length = int(content_length) if content_length else 0
+
+        if content_length == 0:
+            logger.warning(f"媒体 url: {response.url}, 大小为 0, 取消下载")
+            raise IgnoreException
+
+        if (file_size := content_length / 1024 / 1024) > pconfig.max_size:
+            logger.warning(f"媒体 url: {response.url} 大小 {file_size:.2f} MB, 超过 {pconfig.max_size} MB, 取消下载")
+            raise IgnoreException
+
+        return content_length
+
+    async def _download_file_with_httpx(
         self,
         url: str,
         *,
-        file_name: str | None = None,
-        ext_headers: dict[str, str] | None = None,
+        file_path: Path,
+        headers: dict[str, str],
         chunk_size: int = 64 * 1024,
     ) -> Path:
         """download file by url with stream"""
-        if not file_name:
-            file_name = generate_file_name(url)
-        file_path = self.cache_dir / file_name
-        # 如果文件存在，则直接返回
-        if file_path.exists():
-            return file_path
 
-        headers = {**self.headers, **(ext_headers or {})}
+        async with self.client.stream(
+            "GET",
+            url,
+            headers=headers,
+            follow_redirects=True,
+        ) as response:
+            response.raise_for_status()
+            content_length = self._validate_content_length(response)
+
+            with self.rich_progress(
+                f"httpx | {file_path.name}",
+                content_length,
+            ) as update_progress:
+                async with aiofiles.open(file_path, "wb") as file:
+                    async for chunk in response.aiter_bytes(chunk_size):
+                        await file.write(chunk)
+                        update_progress(advance=len(chunk))
 
-        try:
-            async with self.client.stream("GET", url, headers=headers, follow_redirects=True) as response:
-                response.raise_for_status()
-                content_length = response.headers.get("Content-Length")
-                content_length = int(content_length) if content_length else 0
-
-                if content_length == 0:
-                    logger.warning(f"媒体 url: {url}, 大小为 0, 取消下载")
-                    raise IgnoreException
-
-                if (file_size := content_length / 1024 / 1024) > pconfig.max_size:
-                    logger.warning(f"媒体 url: {url} 大小 {file_size:.2f} MB, 超过 {pconfig.max_size} MB, 取消下载")
-                    raise IgnoreException
-
-                with self.rich_progress(file_name, content_length) as update_progress:
-                    async with aiofiles.open(file_path, "wb") as file:
-                        async for chunk in response.aiter_bytes(chunk_size):
-                            await file.write(chunk)
-                            update_progress(advance=len(chunk))
-
-        except HTTPError:
-            await safe_unlink(file_path)
-            logger.exception(f"下载失败 | url: {url}, file_path: {file_path}")
-            raise DownloadException("媒体下载失败")
+        return file_path
+
+    async def _download_file_with_curl_cffi(
+        self,
+        url: str,
+        *,
+        file_path: Path,
+        headers: dict[str, str],
+    ) -> Path:
+        async with curl_cffi.AsyncSession(allow_redirects=True) as session:
+            response: curl_cffi.Response = await session.get(
+                url,
+                headers=headers,
+                timeout=DOWNLOAD_TIMEOUT,
+                stream=True,
+            )
+            response.raise_for_status()
+            content_length = self._validate_content_length(response)
+
+            with self.rich_progress(
+                f"curl_cffi | {file_path.name}",
+                content_length,
+            ) as update_progress:
+                async with aiofiles.open(file_path, "wb") as file:
+                    async for chunk in response.aiter_content(chunk_size=8192):
+                        await file.write(chunk)
+                        update_progress(advance=len(chunk))
 
         return file_path
 
-    @auto_task
-    async def download_file(
+    async def _download_file(
         self,
         url: str,
         *,
@@ -95,13 +131,28 @@ class StreamDownloader:
         ext_headers: dict[str, str] | None = None,
         chunk_size: int = 64 * 1024,
     ) -> Path:
-        """download file by url with stream"""
-        return await self._download_file(
-            url,
-            file_name=file_name,
-            ext_headers=ext_headers,
-            chunk_size=chunk_size,
-        )
+        """download file by url with fallback"""
+        if not file_name:
+            file_name = generate_file_name(url)
+        file_path = self.cache_dir / file_name
+        if file_path.exists():
+            return file_path
+
+        headers = {**self.headers, **(ext_headers or {})}
+
+        try:
+            path = await self._download_file_with_httpx(
+                url, file_path=file_path, headers=headers, chunk_size=chunk_size
+            )
+        except httpx.HTTPError:
+            logger.opt(exception=True).warning(f"下载失败(httpx) | url: {url}")
+            try:
+                path = await self._download_file_with_curl_cffi(url, file_path=file_path, headers=headers)
+            except curl_cffi.CurlError:
+                logger.opt(exception=True).warning(f"下载失败(curl_cffi) | url: {url}")
+                raise DownloadException("媒体下载失败")
+
+        return path
 
     @auto_task
     async def download_video(
@@ -199,7 +250,7 @@ class StreamDownloader:
                                 await f.write(chunk)
                                 total_size += len(chunk)
                                 update_progress(advance=len(chunk), total=total_size)
-        except HTTPError:
+        except httpx.HTTPError:
             await safe_unlink(video_path)
             logger.exception("m3u8 视频下载失败")
             raise DownloadException("m3u8 视频下载失败")
@@ -224,13 +275,18 @@ class StreamDownloader:
         return slices
 
 
-DOWNLOADER: StreamDownloader = StreamDownloader()
-
-try:
-    import yt_dlp as yt_dlp
+downloader: StreamDownloader = StreamDownloader()
+"""全局下载器实例，提供下载功能"""
+yt_dlp_downloader = None
+"""yt-dlp 下载器实例，提供下载视频功能，若 yt-dlp 未安装则为 None"""
 
+if is_module_available("yt_dlp"):
     from .ytdlp import YtdlpDownloader
 
-    YTDLP_DOWNLOADER = YtdlpDownloader()
-except ImportError:
-    YTDLP_DOWNLOADER = None
+    yt_dlp_downloader = YtdlpDownloader()
+
+
+@get_driver().on_shutdown
+async def close_download_client():
+    logger.debug("正在关闭下载器...")
+    await downloader.aclose()

nonebot_plugin_parser-2.6.1/src/nonebot_plugin_parser/download/task.py

@@ -0,0 +1,20 @@
+from typing import Any, TypeVar, ParamSpec
+from asyncio import Task, create_task
+from pathlib import Path
+from functools import wraps
+from collections.abc import Callable, Coroutine
+
+P = ParamSpec("P")
+T = TypeVar("T")
+
+
+def auto_task(func: Callable[P, Coroutine[Any, Any, Path]]) -> Callable[P, Task[Path]]:
+    """装饰器：自动将异步函数调用转换为 Task, 完整保留类型提示"""
+
+    @wraps(func)
+    def wrapper(*args: P.args, **kwargs: P.kwargs) -> Task[Path]:
+        coro = func(*args, **kwargs)
+        name = " | ".join(str(arg) for arg in args if isinstance(arg, str))
+        return create_task(coro, name=func.__name__ + " | " + name)
+
+    return wrapper