feat: 添加抖音视频解析插件并优化代码结构
添加抖音视频解析插件,支持自动解析抖音分享链接并提取视频信息。优化现有代码结构,包括: - 重构单例模式实现 - 移除未使用的导入和文件 - 修复性能测试脚本中的异步调用 - 优化消息事件模型中的权限常量定义 - 改进编译脚本的错误处理 - 增强B站解析插件的稳定性 同时清理了多个废弃脚本和临时文件,提升代码可维护性。
This commit is contained in:
@@ -1,27 +0,0 @@
|
||||
└ <BrowserType name=chromium executable_path=/root/.cache/ms-playwright/chromium-1200/chrome-linux64/chrome>
|
||||
File "/usr/local/lib/python3.14/site-packages/playwright/_impl/_connection.py", line 69, in send
|
||||
return await self._connection.wrap_api_call(
|
||||
│ │ └ <function Connection.wrap_api_call at 0x7f1802831010>
|
||||
│ └ <playwright._impl._connection.Connection object at 0x7f18019d2d50>
|
||||
└ <playwright._impl._connection.Channel object at 0x7f1801b99950>
|
||||
File "/usr/local/lib/python3.14/site-packages/playwright/_impl/_connection.py", line 559, in wrap_api_call
|
||||
raise rewrite_error(error, f"{parsed_st['apiName']}: {error}") from None
|
||||
│ └ {'frames': [{'file': '/app/core/managers/browser_manager.py', 'line': 35, 'column': 0, 'function': 'BrowserManager.initialize...
|
||||
└ <function rewrite_error at 0x7f18029b1bc0>
|
||||
playwright._impl._errors.TargetClosedError: BrowserType.launch: Target page, context or browser has been closedBrowser logs:
|
||||
<launching> /root/.cache/ms-playwright/chromium_headless_shell-1200/chrome-headless-shell-linux64/chrome-headless-shell --disable-field-trial-config --disable-background-networking --disable-background-timer-throttling --disable-backgrounding-occluded-windows --disable-back-forward-cache --disable-breakpad --disable-client-side-phishing-detection --disable-component-extensions-with-background-pages --disable-component-update --no-default-browser-check --disable-default-apps --disable-dev-shm-usage --disable-extensions --disable-features=AcceptCHFrame,AvoidUnnecessaryBeforeUnloadCheckSync,DestroyProfileOnBrowserClose,DialMediaRouteProvider,GlobalMediaControls,HttpsUpgrades,LensOverlay,MediaRouter,PaintHolding,ThirdPartyStoragePartitioning,Translate,AutoDeElevate,RenderDocument,OptimizationHints --enable-features=CDPScreenshotNewSurface --allow-pre-commit-input --disable-hang-monitor --disable-ipc-flooding-protection --disable-popup-blocking --disable-prompt-on-repost --disable-renderer-backgrounding --force-color-profile=srgb --metrics-recording-only --no-first-run --password-store=basic --use-mock-keychain --no-service-autorun --export-tagged-pdf --disable-search-engine-choice-screen --unsafely-disable-devtools-self-xss-warnings --edge-skip-compat-layer-relaunch --enable-automation --disable-infobars --disable-search-engine-choice-screen --disable-sync --headless --hide-scrollbars --mute-audio --blink-settings=primaryHoverType=2,availableHoverTypes=2,primaryPointerType=4,availablePointerTypes=4 --no-sandbox --user-data-dir=/tmp/playwright_chromiumdev_profile-XViexK --remote-debugging-pipe --no-startup-window
|
||||
<launched> pid=336
|
||||
[pid=336][err] /root/.cache/ms-playwright/chromium_headless_shell-1200/chrome-headless-shell-linux64/chrome-headless-shell: error while loading shared libraries: libnspr4.so: cannot open shared object file: No such file or directory
|
||||
Call log:
|
||||
- <launching> /root/.cache/ms-playwright/chromium_headless_shell-1200/chrome-headless-shell-linux64/chrome-headless-shell --disable-field-trial-config --disable-background-networking --disable-background-timer-throttling --disable-backgrounding-occluded-windows --disable-back-forward-cache --disable-breakpad --disable-client-side-phishing-detection --disable-component-extensions-with-background-pages --disable-component-update --no-default-browser-check --disable-default-apps --disable-dev-shm-usage --disable-extensions --disable-features=AcceptCHFrame,AvoidUnnecessaryBeforeUnloadCheckSync,DestroyProfileOnBrowserClose,DialMediaRouteProvider,GlobalMediaControls,HttpsUpgrades,LensOverlay,MediaRouter,PaintHolding,ThirdPartyStoragePartitioning,Translate,AutoDeElevate,RenderDocument,OptimizationHints --enable-features=CDPScreenshotNewSurface --allow-pre-commit-input --disable-hang-monitor --disable-ipc-flooding-protection --disable-popup-blocking --disable-prompt-on-repost --disable-renderer-backgrounding --force-color-profile=srgb --metrics-recording-only --no-first-run --password-store=basic --use-mock-keychain --no-service-autorun --export-tagged-pdf --disable-search-engine-choice-screen --unsafely-disable-devtools-self-xss-warnings --edge-skip-compat-layer-relaunch --enable-automation --disable-infobars --disable-search-engine-choice-screen --disable-sync --headless --hide-scrollbars --mute-audio --blink-settings=primaryHoverType=2,availableHoverTypes=2,primaryPointerType=4,availablePointerTypes=4 --no-sandbox --user-data-dir=/tmp/playwright_chromiumdev_profile-XViexK --remote-debugging-pipe --no-startup-window
|
||||
- <launched> pid=336
|
||||
- [pid=336][err] /root/.cache/ms-playwright/chromium_headless_shell-1200/chrome-headless-shell-linux64/chrome-headless-shell: error while loading shared libraries: libnspr4.so: cannot open shared object file: No such file or directory
|
||||
- [pid=336] <gracefully close start>
|
||||
- [pid=336] <kill>
|
||||
- [pid=336] <will force kill>
|
||||
- [pid=336] exception while trying to kill process: Error: kill ESRCH
|
||||
- [pid=336] <process did exit: exitCode=127, signal=null>
|
||||
- [pid=336] starting temporary directories cleanup
|
||||
- [pid=336] finished temporary directories cleanup
|
||||
- [pid=336] <gracefully close end>
|
||||
2026-01-18 13:26:32.984 | ERROR | core.managers.browser_manager:init_pool:49 - 浏览器初始化失败,无法创建页面池2026-01-18 13:26:32.987 | INFO | __main__:main:151 - 已启动插件热重载监控: /app/plugins2026-01-18 13:26:32.987 | INFO | __main__:main:157 - [CodeExecutor] 初始化 Docker 客户端...2026-01-18 13:26:32.989 | ERROR | __main__:main:157 - 无法连接到 Docker 服务,请检查 Docker 是否正在运行: Error while fetching server API version: ('Connection aborted.', FileNotFoundError(2, 'No such file or directory'))2026-01-18 13:26:32.990 | WARNING | __main__:main:167 - [Main] 未启动代码执行 Worker,因为 Docker 客户端未初始化或连接失败。2026-01-18 13:26:32.990 | INFO | core.ws:connect:65 - 正在尝试连接至 NapCat: ws://127.0.0.1:30012026-01-18 13:26:32.998 | SUCCESS | core.ws:connect:71 - 连接成功!2026-01-18 13:26:33.000 | SUCCESS | core.ws:on_event:139 - Bot 实例初始化完成: self_id=28703925662026-01-18 13:26:33.000 | INFO | core.ws:on_event:145 - 代码执行器已成功注入 Bot 实例。2026-01-18 13:26:35.630 | INFO | core.ws:on_event:160 - [消息] group | 2221577113(DOGSOHA): [CQ:image,summ
|
||||
@@ -1,8 +1,9 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
跨平台 Python 模块编译脚本
|
||||
优化版跨平台 Python 模块编译脚本
|
||||
|
||||
将核心 Python 模块编译为机器码(.pyd 或 .so)以提升性能。
|
||||
此版本基于对项目结构的深入分析,包含了更多高频使用的模块。
|
||||
|
||||
支持的平台:
|
||||
- Windows: 生成 .pyd 文件
|
||||
@@ -22,6 +23,7 @@
|
||||
2. 需要安装 mypyc: pip install mypyc
|
||||
3. 编译后的文件是平台相关的,不能跨平台复制
|
||||
4. 建议在部署的目标环境上运行此脚本
|
||||
5. Mypyc 不支持动态特性,如 eval/exec/getattr/setattr 等
|
||||
"""
|
||||
import os
|
||||
import sys
|
||||
@@ -46,57 +48,53 @@ else:
|
||||
print(f"不支持的平台: {PLATFORM}")
|
||||
sys.exit(1)
|
||||
|
||||
# 要编译的模块列表
|
||||
# 注意:Mypyc 对动态特性支持有限,只选择计算密集或类型明确的模块
|
||||
# 根据项目分析,优化要编译的模块列表
|
||||
# 这些是项目中使用频率最高的模块,编译后能显著提升性能
|
||||
MODULES = [
|
||||
# 工具模块
|
||||
'core/utils/json_utils.py', # JSON 处理
|
||||
'core/utils/executor.py', # 代码执行引擎
|
||||
'core/utils/singleton.py', # 单例模式基类
|
||||
'core/utils/exceptions.py', # 自定义异常
|
||||
'core/utils/logger.py', # 日志模块
|
||||
# 工具模块 - 高频使用
|
||||
'core/utils/json_utils.py', # JSON 处理 - 高频使用
|
||||
'core/utils/executor.py', # 代码执行引擎 - 高频使用
|
||||
'core/utils/exceptions.py', # 自定义异常 - 基础组件
|
||||
'core/utils/performance.py', # 性能监控工具 - 重要组件
|
||||
'core/utils/logger.py', # 日志模块 - 高频使用
|
||||
'core/utils/singleton.py', # 单例模式 - 基础组件
|
||||
|
||||
# 核心管理模块
|
||||
'core/managers/command_manager.py', # 指令匹配和分发
|
||||
'core/managers/admin_manager.py', # 管理员管理
|
||||
'core/managers/permission_manager.py', # 权限管理
|
||||
'core/managers/plugin_manager.py', # 插件管理器
|
||||
'core/managers/redis_manager.py', # Redis 管理器
|
||||
'core/managers/image_manager.py', # 图片管理器
|
||||
# 核心管理模块 - 高频使用
|
||||
# 'core/managers/command_manager.py', # 指令匹配和分发 - 包含动态特性,不适合编译
|
||||
# 'core/managers/admin_manager.py', # 管理员管理 - 包含动态特性,不适合编译
|
||||
# 'core/managers/permission_manager.py', # 权限管理 - 包含动态特性,不适合编译
|
||||
# 'core/managers/plugin_manager.py', # 插件管理器 - 包含动态特性,不适合编译
|
||||
# 'core/managers/redis_manager.py', # Redis 管理器 - 包含动态特性,不适合编译
|
||||
# 'core/managers/image_manager.py', # 图片管理器 - 包含动态特性,不适合编译
|
||||
|
||||
# 核心基础模块
|
||||
'core/ws.py', # WebSocket 核心
|
||||
'core/bot.py', # Bot 核心抽象
|
||||
'core/config_loader.py', # 配置加载
|
||||
'core/config_models.py', # 配置模型
|
||||
'core/permission.py', # 权限枚举
|
||||
# 核心基础模块 - 高频使用
|
||||
'core/ws.py', # WebSocket 核心 - 核心通信,被10个文件引用
|
||||
# 'core/bot.py', # Bot 核心抽象 - 使用多重继承,不适合编译
|
||||
'core/config_loader.py', # 配置加载 - 启动必需,被7个文件引用
|
||||
# 'core/config_models.py', # 配置模型 - 包含复杂类型定义,不适合编译
|
||||
# 'core/permission.py', # 权限枚举 - 包含动态属性,不适合编译
|
||||
|
||||
# API 模块 - 注意:这些类会被 Bot 类多继承使用
|
||||
# 因此不适合编译,否则会导致 "multiple bases have instance lay-out conflict" 错误
|
||||
# 'core/api/base.py', # API 基础类
|
||||
# 'core/api/account.py', # 账号相关 API
|
||||
# 'core/api/friend.py', # 好友相关 API
|
||||
# 'core/api/group.py', # 群组相关 API
|
||||
# 'core/api/media.py', # 媒体相关 API
|
||||
# 'core/api/message.py', # 消息相关 API
|
||||
# 数据模型 - 高频使用
|
||||
'models/message.py', # 消息段模型 - 高频消息处理
|
||||
'models/sender.py', # 发送者模型 - 高频消息处理
|
||||
'models/objects.py', # API 响应数据模型 - 高频数据处理
|
||||
|
||||
# 数据模型(适合编译的高频使用数据类)
|
||||
'models/message.py', # 消息段模型
|
||||
'models/sender.py', # 发送者模型
|
||||
'models/objects.py', # API 响应数据模型
|
||||
# 事件处理相关 - 高频使用
|
||||
'core/handlers/event_handler.py', # 事件处理器 - 核心事件处理
|
||||
|
||||
# 事件处理相关
|
||||
'core/handlers/event_handler.py', # 事件处理器
|
||||
# 事件模型 - 高频使用,但包含dataclass,可能有编译问题,暂时排除
|
||||
# 'models/events/message.py', # 消息事件 - 最高频事件类型
|
||||
# 'models/events/notice.py', # 通知事件 - 高频事件类型
|
||||
# 'models/events/request.py', # 请求事件 - 高频事件类型
|
||||
# 'models/events/meta.py', # 元事件 - 高频事件类型
|
||||
|
||||
# 注意:以下文件不适合编译
|
||||
# - 主程序文件(main.py)
|
||||
# - 测试文件(tests/目录)
|
||||
# - 插件文件(plugins/目录)
|
||||
# - 编译脚本(compile_machine_code.py等)
|
||||
# - 临时文件(scratch_files/目录)
|
||||
# - 抽象基类(models/events/base.py)
|
||||
# - 事件工厂(models/events/factory.py)
|
||||
# - 编译(脚本compile_machine_code.py等)
|
||||
# - 包含复杂动态特性的文件
|
||||
# - API 基础类(由于多重继承问题)
|
||||
]
|
||||
|
||||
def list_compiled_modules():
|
||||
@@ -110,7 +108,7 @@ def list_compiled_modules():
|
||||
compiled_files.extend(glob.glob(f'**/*{ext}', recursive=True))
|
||||
|
||||
# 过滤掉虚拟环境中的文件
|
||||
compiled_files = [f for f in compiled_files if 'venv' not in f]
|
||||
compiled_files = [f for f in compiled_files if 'venv' not in f and '.venv' not in f]
|
||||
|
||||
if compiled_files:
|
||||
for f in sorted(compiled_files):
|
||||
@@ -131,7 +129,7 @@ def clean_compiled_files():
|
||||
compiled_files.extend(glob.glob(f'**/*{ext}', recursive=True))
|
||||
|
||||
# 过滤掉虚拟环境中的文件
|
||||
compiled_files = [f for f in compiled_files if 'venv' not in f]
|
||||
compiled_files = [f for f in compiled_files if 'venv' not in f and '.venv' not in f]
|
||||
|
||||
if compiled_files:
|
||||
for f in sorted(compiled_files):
|
||||
@@ -162,14 +160,22 @@ def compile_module(module_path):
|
||||
|
||||
try:
|
||||
# 直接调用 mypyc 命令行工具
|
||||
# 使用二进制模式捕获输出以避免编码问题
|
||||
result = subprocess.run(
|
||||
[sys.executable, '-m', 'mypyc', module_path],
|
||||
capture_output=True,
|
||||
text=True,
|
||||
check=True,
|
||||
encoding='utf-8' # 设置正确的编码
|
||||
check=True
|
||||
)
|
||||
|
||||
# 解码输出时处理可能的编码错误
|
||||
try:
|
||||
stdout_text = result.stdout.decode('utf-8', errors='replace')
|
||||
stderr_text = result.stderr.decode('utf-8', errors='replace')
|
||||
except AttributeError:
|
||||
# 如果已经是字符串(Python 3.7+),则直接使用
|
||||
stdout_text = result.stdout
|
||||
stderr_text = result.stderr
|
||||
|
||||
# 获取平台特定的模块名
|
||||
platform_module = get_platform_specific_module_name(module_path)
|
||||
mypyc_platform_module = platform_module.replace(EXTENSION, f'__mypyc{EXTENSION}')
|
||||
@@ -187,23 +193,32 @@ def compile_module(module_path):
|
||||
# 如果在 build 目录中,复制到正确位置
|
||||
os.makedirs(os.path.dirname(platform_module), exist_ok=True)
|
||||
shutil.copy2(build_module_path, platform_module)
|
||||
shutil.copy2(build_mypyc_path, mypyc_platform_module)
|
||||
if os.path.exists(build_mypyc_path):
|
||||
shutil.copy2(build_mypyc_path, mypyc_platform_module)
|
||||
print(f" ✓ 编译成功(已从 build 目录复制): {platform_module}")
|
||||
return True
|
||||
else:
|
||||
print(f" ✗ 编译失败:找不到编译产物")
|
||||
print(" ✗ 编译失败:找不到编译产物")
|
||||
if result.stdout:
|
||||
print(f" 编译输出:{result.stdout[:500]}...")
|
||||
print(f" 编译输出:{stdout_text[:500]}...")
|
||||
if result.stderr:
|
||||
print(f" 错误信息:{result.stderr[:500]}...")
|
||||
print(f" 错误信息:{stderr_text[:500]}...")
|
||||
return False
|
||||
|
||||
except subprocess.CalledProcessError as e:
|
||||
print(f" ✗ 编译失败,退出码: {e.returncode}")
|
||||
if e.stdout:
|
||||
print(f" 编译输出:{e.stdout[:500]}...")
|
||||
if e.stderr:
|
||||
print(f" 错误信息:{e.stderr[:500]}...")
|
||||
if hasattr(e, 'stdout') and e.stdout:
|
||||
try:
|
||||
stdout_text = e.stdout.decode('utf-8', errors='replace') if isinstance(e.stdout, bytes) else e.stdout
|
||||
print(f" 编译输出:{stdout_text[:500]}...")
|
||||
except Exception:
|
||||
print(f" 编译输出:{str(e.stdout)[:500]}...")
|
||||
if hasattr(e, 'stderr') and e.stderr:
|
||||
try:
|
||||
stderr_text = e.stderr.decode('utf-8', errors='replace') if isinstance(e.stderr, bytes) else e.stderr
|
||||
print(f" 错误信息:{stderr_text[:500]}...")
|
||||
except Exception:
|
||||
print(f" 错误信息:{str(e.stderr)[:500]}...")
|
||||
return False
|
||||
except Exception as e:
|
||||
print(f" ✗ 编译失败,意外错误: {e}")
|
||||
@@ -221,9 +236,20 @@ def should_skip_module(module_path):
|
||||
if 'from abc import ABC' in content or 'from abc import abstractmethod' in content:
|
||||
return True, "包含抽象基类,不适合编译"
|
||||
|
||||
# 检查是否包含动态特性
|
||||
if 'eval(' in content or 'exec(' in content or 'getattr(' in content or 'setattr(' in content:
|
||||
return True, "包含动态特性,不适合编译"
|
||||
# 检查是否包含危险的动态特性
|
||||
# 注意:我们允许基本的动态特性,如getattr,但对于eval、exec等危险操作仍然阻止
|
||||
if ('eval(' in content or 'exec(' in content or
|
||||
'compile(' in content):
|
||||
return True, "包含危险动态特性,不适合编译"
|
||||
|
||||
# 检查是否包含复杂的动态属性访问
|
||||
if ('__dict__' in content or '__class__' in content or
|
||||
'__module__' in content or '__bases__' in content):
|
||||
return True, "包含复杂动态特性,不适合编译"
|
||||
|
||||
# 检查是否包含复杂的动态属性访问
|
||||
if '.__dict__' in content or '.__class__' in content:
|
||||
return True, "包含复杂动态特性,不适合编译"
|
||||
|
||||
return False, ""
|
||||
except Exception as e:
|
||||
@@ -236,29 +262,41 @@ def compile_all_modules():
|
||||
|
||||
# 验证模块文件是否存在并检查是否适合编译
|
||||
valid_modules = []
|
||||
skipped_modules = []
|
||||
|
||||
for module_path in MODULES:
|
||||
if os.path.exists(module_path):
|
||||
should_skip, reason = should_skip_module(module_path)
|
||||
if should_skip:
|
||||
print(f"跳过: {module_path} ({reason})")
|
||||
skipped_modules.append((module_path, reason))
|
||||
else:
|
||||
valid_modules.append(module_path)
|
||||
else:
|
||||
print(f"警告: 模块 {module_path} 不存在,将被跳过")
|
||||
|
||||
print(f"\n有效模块: {len(valid_modules)}, 跳过模块: {len(skipped_modules)}")
|
||||
|
||||
if not valid_modules:
|
||||
print("错误: 没有有效的模块可编译")
|
||||
return False
|
||||
|
||||
# 编译模块
|
||||
success_count = 0
|
||||
failed_modules = []
|
||||
|
||||
for module_path in valid_modules:
|
||||
if compile_module(module_path):
|
||||
success_count += 1
|
||||
else:
|
||||
failed_modules.append(module_path)
|
||||
|
||||
print(f"\n" + "=" * 60)
|
||||
print("\n" + "=" * 60)
|
||||
print(f"编译完成: {success_count}/{len(valid_modules)} 个模块成功")
|
||||
|
||||
if failed_modules:
|
||||
print(f"失败模块: {failed_modules}")
|
||||
|
||||
if success_count == len(valid_modules):
|
||||
print("✓ 所有模块编译成功")
|
||||
return True
|
||||
@@ -269,13 +307,13 @@ def compile_all_modules():
|
||||
def main():
|
||||
"""主函数"""
|
||||
# 检查 Python 版本
|
||||
if not (sys.version_info.major == 3 and sys.version_info.minor == 14):
|
||||
print("警告: 推荐使用 Python 3.14 以获得最佳性能")
|
||||
if not (sys.version_info.major == 3 and sys.version_info.minor >= 8):
|
||||
print("警告: 推荐使用 Python 3.8+ 以获得最佳性能")
|
||||
print(f"当前版本: {sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}")
|
||||
print("继续编译可能导致兼容性问题")
|
||||
print()
|
||||
|
||||
parser = argparse.ArgumentParser(description='跨平台 Python 模块编译脚本')
|
||||
parser = argparse.ArgumentParser(description='优化版跨平台 Python 模块编译脚本')
|
||||
|
||||
group = parser.add_mutually_exclusive_group()
|
||||
group.add_argument('--compile', '-c', action='store_true', default=True,
|
||||
@@ -301,6 +339,7 @@ def main():
|
||||
else:
|
||||
compile_all_modules()
|
||||
print("\n使用 --list 选项查看已编译的模块")
|
||||
print("使用 --clean 选项清理编译文件")
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
@@ -66,7 +66,7 @@ def main():
|
||||
if compile_module(module):
|
||||
success_count += 1
|
||||
|
||||
print(f"\n--- Compilation Summary ---")
|
||||
print("\n--- Compilation Summary ---")
|
||||
print(f"Total modules: {len(modules)}")
|
||||
print(f"Successfully compiled: {success_count}")
|
||||
print(f"Failed: {len(modules) - success_count}")
|
||||
|
||||
Reference in New Issue
Block a user