nonebot-plugin-parser 2.1.0__tar.gz → 2.1.1__tar.gz

{nonebot_plugin_parser-2.1.0 → nonebot_plugin_parser-2.1.1}/PKG-INFO

@@ -1,30 +1,47 @@
 Metadata-Version: 2.3
 Name: nonebot-plugin-parser
-Version: 2.1.0
+Version: 2.1.1
 Summary: NoneBot2 链接分享解析 Alconna 版, 通用媒体卡片渲染(PIL 实现), 支持 B站/抖音/快手/微博/小红书/youtube/tiktok/twitter/acfun/nga
-Keywords: nonebot,nonebot2,video,bilibili,youtube,tiktok,twitter,kuaishou,acfun,weibo,xiaohongshu,nga,douyin
+Keywords: acfun,bilibili,douyin,kuaishou,nga,nonebot,nonebot2,tiktok,twitter,video,weibo,xiaohongshu,youtube
 Author: fllesser
 Author-email: fllesser <fllessive@gmail.com>
-Requires-Dist: msgspec>=0.19.0,<1.0.0
-Requires-Dist: httpx>=0.27.2,<1.0.0
-Requires-Dist: tqdm>=4.67.1,<5.0.0
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Framework :: AsyncIO
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Topic :: Communications :: Chat
+Classifier: Topic :: Internet :: WWW/HTTP
+Classifier: Topic :: Multimedia :: Video
 Requires-Dist: aiofiles>=25.1.0
-Requires-Dist: pillow>=11.0.0
-Requires-Dist: curl-cffi>=0.13.0,<1.0.0
-Requires-Dist: bilibili-api-python>=17.4.0,<18.0.0
 Requires-Dist: beautifulsoup4>=4.12.0,<5.0.0
-Requires-Dist: yt-dlp>=2025.10.14
-Requires-Dist: nonebot2>=2.4.3,<3.0.0
-Requires-Dist: nonebot-plugin-localstore>=0.7.4,<1.0.0
-Requires-Dist: nonebot-plugin-apscheduler>=0.5.0,<1.0.0
+Requires-Dist: bilibili-api-python>=17.4.0,<18.0.0
+Requires-Dist: curl-cffi>=0.13.0,<1.0.0
+Requires-Dist: httpx>=0.27.2,<1.0.0
+Requires-Dist: msgspec>=0.19.0,<1.0.0
 Requires-Dist: nonebot-plugin-alconna>=0.59.4
-Requires-Dist: nonebot-plugin-uninfo>=0.9.0
-Requires-Dist: nonebot-plugin-htmlkit>=0.1.0rc3 ; extra == 'htmlkit'
+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.0
+Requires-Dist: nonebot2>=2.4.3,<3.0.0
+Requires-Dist: pillow>=11.0.0
+Requires-Dist: pilmoji-for-parser
+Requires-Dist: tqdm>=4.67.1,<5.0.0
+Requires-Dist: nonebot-plugin-htmlkit>=0.1.0rc4 ; extra == 'all'
+Requires-Dist: yt-dlp>=2025.10.14 ; extra == 'all'
+Requires-Dist: nonebot-plugin-htmlkit>=0.1.0rc4 ; extra == 'htmlkit'
+Requires-Dist: yt-dlp>=2025.10.14 ; extra == 'ytdlp'
 Requires-Python: >=3.10
 Project-URL: IssueTracker, https://github.com/fllesser/nonebot-plugin-parser/issues
 Project-URL: Release, https://github.com/fllesser/nonebot-plugin-parser/releases
 Project-URL: Repository, https://github.com/fllesser/nonebot-plugin-parser
+Provides-Extra: all
 Provides-Extra: htmlkit
+Provides-Extra: ytdlp
 Description-Content-Type: text/markdown
 
 <div align="center">
@@ -80,7 +97,10 @@ Description-Content-Type: text/markdown
 ## 💿 安装
 > [!Warning]
 > **如果你已经在使用 nonebot-plugin-resolver[2]，请在安装此插件前卸载**
-    
+
+> [!Important]
+> 插件可选依赖 `htmlkit`, `ytdlp`, `all`，分别用于 htmlkit 渲染和 youtube / tiktok 解析，如果需要使用，请在安装时指定，如 `nb plugin install nonebot-plugin-parser[ytdlp]`
+
 <details open>
 <summary>使用 nb-cli 安装/更新</summary>
 在 nonebot2 项目的根目录下打开命令行, 输入以下指令即可安装

{nonebot_plugin_parser-2.1.0 → nonebot_plugin_parser-2.1.1}/README.md

@@ -51,7 +51,10 @@
 ## 💿 安装
 > [!Warning]
 > **如果你已经在使用 nonebot-plugin-resolver[2]，请在安装此插件前卸载**
-    
+
+> [!Important]
+> 插件可选依赖 `htmlkit`, `ytdlp`, `all`，分别用于 htmlkit 渲染和 youtube / tiktok 解析，如果需要使用，请在安装时指定，如 `nb plugin install nonebot-plugin-parser[ytdlp]`
+
 <details open>
 <summary>使用 nb-cli 安装/更新</summary>
 在 nonebot2 项目的根目录下打开命令行, 输入以下指令即可安装

{nonebot_plugin_parser-2.1.0 → nonebot_plugin_parser-2.1.1}/pyproject.toml

@@ -1,87 +1,112 @@
 [project]
 name = "nonebot-plugin-parser"
-version = "2.1.0"
+version = "2.1.1"
 description = "NoneBot2 链接分享解析 Alconna 版, 通用媒体卡片渲染(PIL 实现), 支持 B站/抖音/快手/微博/小红书/youtube/tiktok/twitter/acfun/nga"
-authors = [{ "name" = "fllesser", "email" = "fllessive@gmail.com" }]
 readme = "README.md"
 requires-python = ">=3.10"
+authors = [{ "name" = "fllesser", "email" = "fllessive@gmail.com" }]
 keywords = [
+  "acfun",
+  "bilibili",
+  "douyin",
+  "kuaishou",
+  "nga",
   "nonebot",
   "nonebot2",
-  "video",
-  "bilibili",
-  "youtube",
   "tiktok",
   "twitter",
-  "kuaishou",
-  "acfun",
+  "video",
   "weibo",
   "xiaohongshu",
-  "nga",
-  "douyin",
+  "youtube"
+]
+classifiers = [
+  "Development Status :: 5 - Production/Stable",
+  "Framework :: AsyncIO",
+  "License :: OSI Approved :: MIT License",
+  "Operating System :: OS Independent",
+  "Programming Language :: Python :: 3",
+  "Programming Language :: Python :: 3 :: Only",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "Topic :: Communications :: Chat",
+  "Topic :: Internet :: WWW/HTTP",
+  "Topic :: Multimedia :: Video",
 ]
 dependencies = [
-  "msgspec>=0.19.0,<1.0.0",
-  "httpx>=0.27.2,<1.0.0",
-  "tqdm>=4.67.1,<5.0.0",
   "aiofiles>=25.1.0",
-  "pillow>=11.0.0",
-
-  # 后续改为可选依赖
-  "curl_cffi>=0.13.0,<1.0.0",
-  "bilibili-api-python>=17.4.0,<18.0.0",
   "beautifulsoup4>=4.12.0,<5.0.0",
-  "yt-dlp>=2025.10.14",
-
-  "nonebot2>=2.4.3,<3.0.0",
-  "nonebot-plugin-localstore>=0.7.4,<1.0.0",
-  "nonebot-plugin-apscheduler>=0.5.0,<1.0.0",
+  "bilibili-api-python>=17.4.0,<18.0.0",
+  "curl_cffi>=0.13.0,<1.0.0",
+  "httpx>=0.27.2,<1.0.0",
+  "msgspec>=0.19.0,<1.0.0",
   "nonebot-plugin-alconna>=0.59.4",
-  "nonebot-plugin-uninfo>=0.9.0",
+  "nonebot-plugin-apscheduler>=0.5.0,<1.0.0",
+  "nonebot-plugin-localstore>=0.7.4,<1.0.0",
+  "nonebot-plugin-uninfo>=0.10.0",
+  "nonebot2>=2.4.3,<3.0.0",
+  "pillow>=11.0.0",
+  "pilmoji-for-parser",
+  "tqdm>=4.67.1,<5.0.0",
 ]
 
-[project.optional-dependencies]
-htmlkit = ["nonebot-plugin-htmlkit>=0.1.0rc3"]
-
 [project.urls]
-Repository = "https://github.com/fllesser/nonebot-plugin-parser"
 IssueTracker = "https://github.com/fllesser/nonebot-plugin-parser/issues"
 Release = "https://github.com/fllesser/nonebot-plugin-parser/releases"
+Repository = "https://github.com/fllesser/nonebot-plugin-parser"
+
+[project.optional-dependencies]
+all = ["nonebot-plugin-htmlkit>=0.1.0rc4", "yt-dlp>=2025.10.14"]
+htmlkit = ["nonebot-plugin-htmlkit>=0.1.0rc4"]
+ytdlp = ["yt-dlp>=2025.10.14"]
 
 [dependency-groups]
 dev = [
-  "nb-cli>=1.4.2",
   "nonebot2[fastapi]>=2.4.3,<3.0.0",
   "pre-commit>=4.3.0",
-  "ruff>=0.14.0,<1.0.0",
+  "ruff>=0.14.3,<1.0.0",
 ]
-
+extras = ["nonebot-plugin-htmlkit>=0.1.0rc4", "yt-dlp>=2025.10.14"]
+pydantic-v1 = ["pydantic<2.0.0"]  # renovate:ignore
+pydantic-v2 = ["pydantic>=2.0.0"]
+telegram = ["nonebot-adapter-telegram>=0.1.0b20"]
 test = [
-  "nonebot2[fastapi]>=2.4.3,<3.0.0",
   "nonebot-adapter-onebot>=2.4.6",
+  "nonebot2[fastapi]>=2.4.3,<3.0.0",
   "nonebug>=0.4.3,<1.0.0",
-  "pytest-xdist>=3.8.0,<4.0.0",
+  "poethepoet>=0.37.0",
   "pytest-asyncio>=1.2.0,<1.3.0",
   "pytest-cov>=7.0.0",
-  "poethepoet>=0.37.0",
+  "pytest-xdist>=3.8.0,<4.0.0",
   "respx>=0.22.0",
 ]
 
-telegram = ["nonebot-adapter-telegram>=0.1.0b20"]
-pydantic-v1 = ["pydantic<2.0.0"]                  # renovate:ignore
-pydantic-v2 = ["pydantic>=2.0.0"]
+[build-system]
+requires = ["uv_build>=0.9.0,<0.10.0"]
+build-backend = "uv_build"
+
+[tool.bumpversion]
+current_version = "2.1.1"
+commit = true
+message = "🔖 release: bump vesion from {current_version} to {new_version}"
+tag = true
 
-extras = ["nonebot-plugin-htmlkit>=0.1.0rc3"]
+[[tool.bumpversion.files]]
+filename = "uv.lock"
+search = "name = \"nonebot-plugin-parser\"\nversion = \"{current_version}\""
+replace = "name = \"nonebot-plugin-parser\"\nversion = \"{new_version}\""
 
-[tool.uv]
-required-version = ">=0.9.2"
-default-groups = ["test", "dev", "extras"]
-conflicts = [
-  [
-    { group = "pydantic-v1" },
-    { group = "pydantic-v2" },
-    { group = "telegram" },
-  ],
+[tool.coverage.report]
+show_missing = true  # 相当于 --cov-report=term-missing:cite[1]
+# omit = [ # 排除不需要统计的文件
+# ]
+exclude_lines = [
+  "raise NotImplementedError",
+  "if TYPE_CHECKING:",
+  "@overload",
+  "except",
+  "raise",
 ]
 
 [tool.nonebot]
@@ -91,20 +116,6 @@ adapters = [
 ]
 plugins = ["nonebot_plugin_parser"]
 
-
-[tool.pytest.ini_options]
-asyncio_mode = "auto"
-asyncio_default_fixture_loop_scope = "session"
-pythonpath = ["src"]
-addopts = [
-  "-v",                    # 详细输出
-  "-s",                    # 显示打印信息
-  "--tb=short",            # 简短的错误回溯
-  "-ra",                   # 显示所有测试结果摘要
-  "--strict-markers",      # 严格标记模式
-  "--import-mode=prepend", # 导入模式
-]
-
 [tool.poe.tasks]
 test_others = "pytest tests/others --cov=src --cov-report=xml:coverage1.xml --junitxml=junit1.xml -n auto"
 test_parsers = "pytest tests/parsers --cov=src --cov-report=xml:coverage2.xml --junitxml=junit2.xml -n auto"
@@ -112,19 +123,31 @@ test_render = "pytest tests/render --cov=src --cov-report=xml:coverage3.xml --ju
 bump = "bump-my-version bump"
 show-bump = "bump-my-version show-bump"
 
+[tool.pyright]
+pythonVersion = "3.10"
+pythonPlatform = "All"
+defineConstant = { PYDANTIC_V2 = true }
+executionEnvironments = [
+  { root = "./tests", extraPaths = [
+    "./src",
+  ] },
+  { root = "./src" },
+]
+typeCheckingMode = "standard"
+disableBytesTypePromotions = true
 
-[tool.coverage.report]
-show_missing = true # 相当于 --cov-report=term-missing:cite[1]
-# omit = [ # 排除不需要统计的文件
-
-# ]
-exclude_lines = [
-  "raise NotImplementedError",
-  "if TYPE_CHECKING:",
-  "@overload",
-  "except",
-  "raise",
+[tool.pytest.ini_options]
+addopts = [
+  "-v",  # 详细输出
+  "-s",  # 显示打印信息
+  "--tb=short",  # 简短的错误回溯
+  "-ra",  # 显示所有测试结果摘要
+  "--strict-markers",  # 严格标记模式
+  "--import-mode=prepend",  # 导入模式
 ]
+pythonpath = ["src"]
+asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "session"
 
 [tool.ruff]
 line-length = 120
@@ -135,33 +158,32 @@ line-ending = "lf"
 
 [tool.ruff.lint]
 select = [
-  "F",     # Pyflakes
-  "W",     # pycodestyle warnings
-  "E",     # pycodestyle errors
-  "I",     # isort
-  "UP",    # pyupgrade
-  "ASYNC", # flake8-async
-  "C4",    # flake8-comprehensions
-  "T10",   # flake8-debugger
-  "T20",   # flake8-print
-  "PYI",   # flake8-pyi
-  "PT",    # flake8-pytest-style
-  "Q",     # flake8-quotes
-  "TID",   # flake8-tidy-imports
-  "RUF",   # Ruff-specific rules
+  "F",  # Pyflakes
+  "W",  # pycodestyle warnings
+  "E",  # pycodestyle errors
+  "I",  # isort
+  "UP",  # pyupgrade
+  "ASYNC",  # flake8-async
+  "C4",  # flake8-comprehensions
+  "T10",  # flake8-debugger
+  "T20",  # flake8-print
+  "PYI",  # flake8-pyi
+  "PT",  # flake8-pytest-style
+  "Q",  # flake8-quotes
+  "TID",  # flake8-tidy-imports
+  "RUF",  # Ruff-specific rules
 ]
 ignore = [
-  "E402",   # module-import-not-at-top-of-file
+  "E402",  # module-import-not-at-top-of-file
   "UP037",  # quoted-annotation
-  "RUF001", # ambiguous-unicode-character-string
-  "RUF002", # ambiguous-unicode-character-docstring
-  "RUF003", # ambiguous-unicode-character-comment
-  "W191",   # indentation contains tabs
+  "RUF001",  # ambiguous-unicode-character-string
+  "RUF002",  # ambiguous-unicode-character-docstring
+  "RUF003",  # ambiguous-unicode-character-comment
+  "W191",  # indentation contains tabs
   # "I001",   # isort: imports are incorrectly sorted
-  "TID252", # 相对导入
+  "TID252",  # 相对导入
 ]
 
-
 [tool.ruff.lint.isort]
 force-sort-within-sections = true
 known-first-party = ["tests/*"]
@@ -174,33 +196,13 @@ mark-parentheses = false
 [tool.ruff.lint.pyupgrade]
 keep-runtime-typing = true
 
-
-[tool.pyright]
-pythonVersion = "3.10"
-pythonPlatform = "All"
-defineConstant = { PYDANTIC_V2 = true }
-executionEnvironments = [
-  { root = "./tests", extraPaths = [
-    "./src",
-  ] },
-  { root = "./src" },
+[tool.uv]
+required-version = ">=0.9.7"
+default-groups = ["test", "dev", "extras"]
+conflicts = [
+  [
+    { group = "pydantic-v1" },
+    { group = "pydantic-v2" },
+    { group = "telegram" },
+  ],
 ]
-typeCheckingMode = "standard"
-reportShadowedImports = false
-disableBytesTypePromotions = true
-
-[build-system]
-requires = ["uv_build>=0.9.0,<0.10.0"]
-build-backend = "uv_build"
-
-
-[tool.bumpversion]
-current_version = "2.1.0"
-commit = true
-message = "🔖 release: bump vesion from {current_version} to {new_version}"
-tag = true
-
-[[tool.bumpversion.files]]
-filename = "uv.lock"
-search = "name = \"nonebot-plugin-parser\"\nversion = \"{current_version}\""
-replace = "name = \"nonebot-plugin-parser\"\nversion = \"{new_version}\""

{nonebot_plugin_parser-2.1.0 → nonebot_plugin_parser-2.1.1}/src/nonebot_plugin_parser/config.py

@@ -1,11 +1,12 @@
 from enum import Enum
 from pathlib import Path
-from typing import Literal
 
 from bilibili_api.video import VideoCodecs
 from nonebot import get_driver, get_plugin_config, require
 from pydantic import BaseModel
 
+from .constants import PlatformEnum
+
 _nickname: str = next(iter(get_driver().config.nickname), "")
 """全局名称"""
 
@@ -17,11 +18,6 @@ _config_dir: Path = _store.get_plugin_config_dir()
 _data_dir: Path = _store.get_plugin_data_dir()
 
 
-PlatformNames = Literal[
-    "bilibili", "acfun", "douyin", "youtube", "kuaishou", "twitter", "tiktok", "weibo", "xiaohongshu", "nga"
-]
-
-
 class RenderType(str, Enum):
     default = "default"
     common = "common"
@@ -45,7 +41,7 @@ class Config(BaseModel):
     """视频/音频最大时长"""
     parser_append_url: bool = False
     """是否在解析结果中附加原始URL"""
-    parser_disabled_platforms: list[PlatformNames] = []
+    parser_disabled_platforms: list[PlatformEnum] = []
     """禁止的解析器"""
     parser_bili_video_codes: list[VideoCodecs] = [VideoCodecs.AVC, VideoCodecs.AV1, VideoCodecs.HEV]
     """B站视频编码"""
@@ -87,7 +83,7 @@ class Config(BaseModel):
         return self.parser_duration_maximum
 
     @property
-    def disabled_platforms(self) -> list[PlatformNames]:
+    def disabled_platforms(self) -> list[PlatformEnum]:
         """禁止的解析器"""
         return self.parser_disabled_platforms
 

{nonebot_plugin_parser-2.1.0 → nonebot_plugin_parser-2.1.1}/src/nonebot_plugin_parser/constants.py

@@ -1,3 +1,4 @@
+from enum import Enum
 from typing import Final
 
 from httpx import Timeout
@@ -20,3 +21,19 @@ ANDROID_HEADER: Final[dict[str, str]] = {
 COMMON_TIMEOUT: Final[Timeout] = Timeout(connect=15.0, read=20.0, write=10.0, pool=10.0)
 
 DOWNLOAD_TIMEOUT: Final[Timeout] = Timeout(connect=15.0, read=240.0, write=10.0, pool=10.0)
+
+
+class PlatformEnum(str, Enum):
+    ACFUN = "acfun"
+    BILIBILI = "bilibili"
+    DOUYIN = "douyin"
+    KUAISHOU = "kuaishou"
+    NGA = "nga"
+    TIKTOK = "tiktok"
+    TWITTER = "twitter"
+    WEIBO = "weibo"
+    XIAOHONGSHU = "xiaohongshu"
+    YOUTUBE = "youtube"
+
+    def __str__(self) -> str:
+        return self.value

{nonebot_plugin_parser-2.1.0 → nonebot_plugin_parser-2.1.1}/src/nonebot_plugin_parser/download/__init__.py

@@ -2,7 +2,7 @@ import asyncio
 from pathlib import Path
 
 import aiofiles
-import httpx
+from httpx import AsyncClient, HTTPError
 from nonebot import logger
 from tqdm.asyncio import tqdm
 
@@ -11,7 +11,6 @@ from ..constants import COMMON_HEADER, DOWNLOAD_TIMEOUT
 from ..exception import DownloadException, SizeLimitException, ZeroSizeException
 from ..utils import generate_file_name, merge_av, safe_unlink
 from .task import auto_task
-from .ytdlp import YtdlpDownloader
 
 
 class StreamDownloader:
@@ -20,10 +19,7 @@ class StreamDownloader:
     def __init__(self):
         self.headers: dict[str, str] = COMMON_HEADER.copy()
         self.cache_dir: Path = pconfig.cache_dir
-        self.client: httpx.AsyncClient = httpx.AsyncClient(
-            timeout=DOWNLOAD_TIMEOUT,
-            verify=False,
-        )
+        self.client: AsyncClient = AsyncClient(timeout=DOWNLOAD_TIMEOUT, verify=False)
 
     @auto_task
     async def streamd(
@@ -76,7 +72,7 @@ class StreamDownloader:
                             await file.write(chunk)
                             bar.update(len(chunk))
 
-        except httpx.HTTPError:
+        except HTTPError:
             await safe_unlink(file_path)
             logger.exception(f"下载失败 | url: {url}, file_path: {file_path}")
             raise DownloadException("媒体下载失败")
@@ -217,4 +213,12 @@ class StreamDownloader:
 
 
 DOWNLOADER: StreamDownloader = StreamDownloader()
-YTDLP_DOWNLOADER: YtdlpDownloader = YtdlpDownloader()
+
+try:
+    import yt_dlp as yt_dlp
+
+    from .ytdlp import YtdlpDownloader
+
+    YTDLP_DOWNLOADER = YtdlpDownloader()
+except ImportError:
+    YTDLP_DOWNLOADER = None

{nonebot_plugin_parser-2.1.0 → nonebot_plugin_parser-2.1.1}/src/nonebot_plugin_parser/download/task.py

@@ -3,8 +3,8 @@ from collections.abc import Callable, Coroutine
 from functools import wraps
 from typing import Any, ParamSpec, TypeVar
 
-P = ParamSpec("P")  # 保留参数类型
-T = TypeVar("T")  # 保留返回类型
+P = ParamSpec("P")
+T = TypeVar("T")
 
 
 def auto_task(func: Callable[P, Coroutine[Any, Any, T]]) -> Callable[P, Task[T]]:

{nonebot_plugin_parser-2.1.0 → nonebot_plugin_parser-2.1.1}/src/nonebot_plugin_parser/download/ytdlp.py

@@ -2,8 +2,7 @@ import asyncio
 from pathlib import Path
 from typing import Any
 
-import msgspec
-from msgspec import Struct
+from msgspec import Struct, convert
 import yt_dlp
 
 from ..config import pconfig
@@ -73,7 +72,7 @@ class YtdlpDownloader:
             if not info_dict:
                 raise ParseException("获取视频信息失败")
 
-        video_info = msgspec.convert(info_dict, VideoInfo)
+        video_info = convert(info_dict, VideoInfo)
         self._video_info_mapping[url] = video_info
         return video_info
 

{nonebot_plugin_parser-2.1.0 → nonebot_plugin_parser-2.1.1}/src/nonebot_plugin_parser/matchers/__init__.py

@@ -1,18 +1,16 @@
 """统一的解析器 matcher"""
 
-import re
 from typing import Literal
 
 from nonebot import get_driver, logger
 from nonebot.adapters import Event
 from nonebot_plugin_alconna import SupportAdapter
-from nonebot_plugin_alconna.uniseg import get_message_id, get_target, message_reaction
 
 from ..config import pconfig
 from ..parsers import BaseParser, ParseResult
 from ..renders import get_renderer
 from ..utils import LimitedSizeDict
-from .preprocess import Keyword, KwdRegexMatched, on_keyword_regex
+from .rule import Searched, SearchResult, on_keyword_regex
 
 
 def _get_enabled_parser_classes() -> list[type[BaseParser]]:
@@ -21,28 +19,24 @@ def _get_enabled_parser_classes() -> list[type[BaseParser]]:
     return [_cls for _cls in all_subclass if _cls.platform.name not in disabled_platforms]
 
 
-ENABLED_PARSER_CLASSES = _get_enabled_parser_classes()
-
-
-def _get_enabled_patterns() -> list[tuple[str, str]]:
-    """根据配置获取启用的平台正则表达式列表"""
-
-    return [pattern for _cls in ENABLED_PARSER_CLASSES for pattern in _cls.patterns]
-
-
 # 关键词 Parser 映射
 KEYWORD_PARSER_MAP: dict[str, BaseParser] = {}
 
 
 @get_driver().on_startup
-def build_keyword_parsers_map():
+def register_parser_matcher():
+    enabled_parser_classes = _get_enabled_parser_classes()
+
     enabled_platform_names = []
-    for _cls in ENABLED_PARSER_CLASSES:
+    for _cls in enabled_parser_classes:
         parser = _cls()
         enabled_platform_names.append(parser.platform.display_name)
         for keyword, _ in _cls.patterns:
             KEYWORD_PARSER_MAP[keyword] = parser
-    logger.info(f"启动的平台: {', '.join(sorted(enabled_platform_names))}")
+    logger.info(f"启用平台: {', '.join(sorted(enabled_platform_names))}")
+
+    parser_matcher = on_keyword_regex(*[pattern for _cls in enabled_parser_classes for pattern in _cls.patterns])
+    parser_matcher.append_handler(parser_handler)
 
 
 # 缓存结果
@@ -53,28 +47,24 @@ def clear_result_cache():
     _RESULT_CACHE.clear()
 
 
-parser_matcher = on_keyword_regex(*_get_enabled_patterns())
-
-
-@parser_matcher.handle()
-async def _(
+async def parser_handler(
     event: Event,
-    keyword: str = Keyword(),
-    matched: re.Match[str] = KwdRegexMatched(),
+    sr: SearchResult = Searched(),
 ):
     """统一的解析处理器"""
     # 响应用户处理中
     await _message_reaction(event, "resolving")
 
-    cache_key = matched.group(0)
     # 1. 获取缓存结果
+    cache_key = sr.searched.group(0)
     result = _RESULT_CACHE.get(cache_key)
+
     if result is None:
         # 2. 获取对应平台 parser
-        parser = KEYWORD_PARSER_MAP[keyword]
+        parser = KEYWORD_PARSER_MAP[sr.keyword]
 
         try:
-            result = await parser.parse(matched)
+            result = await parser.parse(sr.keyword, sr.searched)
         except Exception:
             # await UniMessage(str(e)).send()
             await _message_reaction(event, "fail")
@@ -99,17 +89,23 @@ async def _(
     await _message_reaction(event, "done")
 
 
-async def _message_reaction(event: Event, status: Literal["fail", "resolving", "done"]) -> None:
+from nonebot_plugin_alconna import uniseg
+
+
+async def _message_reaction(
+    event: Event,
+    status: Literal["fail", "resolving", "done"],
+) -> None:
     emoji_map = {
         "fail": ["10060", "❌"],
         "resolving": ["424", "👀"],
         "done": ["144", "🎉"],
     }
-    message_id = get_message_id(event)
-    target = get_target(event)
+    message_id = uniseg.get_message_id(event)
+    target = uniseg.get_target(event)
     if target.adapter == SupportAdapter.onebot11:
         emoji = emoji_map[status][0]
     else:
         emoji = emoji_map[status][1]
 
-    await message_reaction(emoji, message_id=message_id)
+    await uniseg.message_reaction(emoji, message_id=message_id)