エイカク
d35771f97d
* fix: patch pip distlib finder for frozen electron runtime * fix: use certifi CA bundle for runtime SSL requests * fix: configure certifi CA before core imports * fix: improve mac font fallback for dashboard text * fix: harden frozen pip patch and unify TLS connector * refactor: centralize dashboard CJK font fallback stacks * perf: reuse TLS context and avoid repeated frozen pip patch * refactor: bootstrap TLS setup before core imports * fix: use async confirm dialog for provider deletions * fix: replace native confirm dialogs in dashboard - Add shared confirm helper in dashboard/src/utils/confirmDialog.ts for async dialog usage with safe fallback. - Migrate provider, chat, config, session, platform, persona, MCP, backup, and knowledge-base delete/close confirmations to use the shared helper. - Remove scattered inline confirm handling to keep behavior consistent and avoid native blocking dialog focus/caret issues in Electron. * fix: capture runtime bootstrap logs after logger init - Add bootstrap record buffer in runtime_bootstrap for early TLS patch logs before logger is ready. - Flush buffered bootstrap logs to astrbot logger at process startup in main.py. - Include concrete exception details for TLS bootstrap failures to improve diagnosis. * fix: harden runtime bootstrap and unify confirm handling - Simplify bootstrap log buffering and add a public initialize hook for non-main startup paths. - Guard aiohttp TLS patching with feature/type checks and keep graceful fallback when internals are unavailable. - Standardize dashboard confirmation flow via shared confirm helpers across composition and options API components. * refactor: simplify runtime tls bootstrap and tighten confirm typing * refactor: align ssl helper namespace and confirm usage
34 lines
882 B
Python
34 lines
882 B
Python
import logging
|
|
import ssl
|
|
import threading
|
|
|
|
import aiohttp
|
|
|
|
from astrbot.utils.http_ssl_common import (
|
|
build_ssl_context_with_certifi as _build_ssl_context,
|
|
)
|
|
|
|
logger = logging.getLogger("astrbot")
|
|
|
|
_SHARED_TLS_CONTEXT: ssl.SSLContext | None = None
|
|
_SHARED_TLS_CONTEXT_LOCK = threading.Lock()
|
|
|
|
|
|
def build_ssl_context_with_certifi() -> ssl.SSLContext:
|
|
"""Build an SSL context from system trust store and add certifi CAs."""
|
|
global _SHARED_TLS_CONTEXT
|
|
|
|
if _SHARED_TLS_CONTEXT is not None:
|
|
return _SHARED_TLS_CONTEXT
|
|
|
|
with _SHARED_TLS_CONTEXT_LOCK:
|
|
if _SHARED_TLS_CONTEXT is not None:
|
|
return _SHARED_TLS_CONTEXT
|
|
|
|
_SHARED_TLS_CONTEXT = _build_ssl_context(log_obj=logger)
|
|
return _SHARED_TLS_CONTEXT
|
|
|
|
|
|
def build_tls_connector() -> aiohttp.TCPConnector:
|
|
return aiohttp.TCPConnector(ssl=build_ssl_context_with_certifi())
|