From ead10b56430160a5f0067d329608832369ede1ab Mon Sep 17 00:00:00 2001 From: Soulter <905617992@qq.com> Date: Thu, 5 Mar 2026 01:38:27 +0800 Subject: [PATCH] refactor: remove runtime_bootstrap module and related initialization --- main.py | 4 ---- runtime_bootstrap.py | 50 -------------------------------------------- 2 files changed, 54 deletions(-) delete mode 100644 runtime_bootstrap.py diff --git a/main.py b/main.py index 36c46fca3..1af6c181b 100644 --- a/main.py +++ b/main.py @@ -5,10 +5,6 @@ import os import sys from pathlib import Path -import runtime_bootstrap - -runtime_bootstrap.initialize_runtime_bootstrap() - from astrbot.core import LogBroker, LogManager, db_helper, logger # noqa: E402 from astrbot.core.config.default import VERSION # noqa: E402 from astrbot.core.initial_loader import InitialLoader # noqa: E402 diff --git a/runtime_bootstrap.py b/runtime_bootstrap.py deleted file mode 100644 index 1e9d109d6..000000000 --- a/runtime_bootstrap.py +++ /dev/null @@ -1,50 +0,0 @@ -import logging -import ssl -from typing import Any - -import aiohttp.connector as aiohttp_connector - -from astrbot.utils.http_ssl_common import build_ssl_context_with_certifi - -logger = logging.getLogger(__name__) - - -def _try_patch_aiohttp_ssl_context( - ssl_context: ssl.SSLContext, - log_obj: Any | None = None, -) -> bool: - log = log_obj or logger - attr_name = "_SSL_CONTEXT_VERIFIED" - - if not hasattr(aiohttp_connector, attr_name): - log.warning( - "aiohttp connector does not expose _SSL_CONTEXT_VERIFIED; skipped patch.", - ) - return False - - current_value = getattr(aiohttp_connector, attr_name, None) - if current_value is not None and not isinstance(current_value, ssl.SSLContext): - log.warning( - "aiohttp connector exposes _SSL_CONTEXT_VERIFIED with unexpected type; skipped patch.", - ) - return False - - setattr(aiohttp_connector, attr_name, ssl_context) - log.info("Configured aiohttp verified SSL context with system+certifi trust chain.") - return True - - -def configure_runtime_ca_bundle(log_obj: Any | None = None) -> bool: - log = log_obj or logger - - try: - log.info("Bootstrapping runtime CA bundle.") - ssl_context = build_ssl_context_with_certifi(log_obj=log) - return _try_patch_aiohttp_ssl_context(ssl_context, log_obj=log) - except Exception as exc: - log.error("Failed to configure runtime CA bundle for aiohttp: %r", exc) - return False - - -def initialize_runtime_bootstrap(log_obj: Any | None = None) -> bool: - return configure_runtime_ca_bundle(log_obj=log_obj)