Undefined-bot 3.2.1__tar.gz → 3.2.2__tar.gz

{undefined_bot-3.2.1 → undefined_bot-3.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Undefined-bot
-Version: 3.2.1
+Version: 3.2.2
 Summary: QQ bot platform with cognitive memory architecture and multi-agent Skills, via OneBot V11.
 Project-URL: Repository, https://github.com/69gg/Undefined
 Project-URL: Issues, https://github.com/69gg/Undefined/issues

{undefined_bot-3.2.1 → undefined_bot-3.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "Undefined-bot"
-version = "3.2.1"
+version = "3.2.2"
 description = "QQ bot platform with cognitive memory architecture and multi-agent Skills, via OneBot V11."
 readme = "README.md"
 authors = [

{undefined_bot-3.2.1 → undefined_bot-3.2.2}/src/Undefined/__init__.py

@@ -1,3 +1,3 @@
 """Undefined - A high-performance, highly scalable QQ group and private chat robot based on a self-developed architecture."""
 
-__version__ = "3.2.1"
+__version__ = "3.2.2"

{undefined_bot-3.2.1 → undefined_bot-3.2.2}/src/Undefined/api/app.py

@@ -364,8 +364,8 @@ async def _probe_ws_endpoint(url: str, timeout_seconds: float = 5.0) -> dict[str
         }
 
 
-def _build_openapi_spec(ctx: RuntimeAPIContext) -> dict[str, Any]:
-    cfg = ctx.config_getter()
+def _build_openapi_spec(ctx: RuntimeAPIContext, request: web.Request) -> dict[str, Any]:
+    server_url = f"{request.scheme}://{request.host}"
     return {
         "openapi": "3.0.3",
         "info": {
@@ -375,8 +375,8 @@ def _build_openapi_spec(ctx: RuntimeAPIContext) -> dict[str, Any]:
         },
         "servers": [
             {
-                "url": f"http://{cfg.api.host}:{cfg.api.port}",
-                "description": "Local runtime endpoint",
+                "url": server_url,
+                "description": "Runtime endpoint",
             }
         ],
         "components": {
@@ -483,20 +483,21 @@ class RuntimeAPIServer:
         self._host = host
         self._port = port
         self._runner: web.AppRunner | None = None
-        self._site: web.TCPSite | None = None
+        self._sites: list[web.TCPSite] = []
         self._background_tasks: set[asyncio.Task[Any]] = set()
 
     async def start(self) -> None:
+        from Undefined.config.models import resolve_bind_hosts
+
         app = self._create_app()
         self._runner = web.AppRunner(app)
         await self._runner.setup()
-        self._site = web.TCPSite(self._runner, host=self._host, port=self._port)
-        await self._site.start()
-        logger.info(
-            "[RuntimeAPI] 已启动: http://%s:%s",
-            self._host,
-            self._port,
-        )
+        for h in resolve_bind_hosts(self._host):
+            site = web.TCPSite(self._runner, host=h, port=self._port)
+            await site.start()
+            self._sites.append(site)
+        cfg = self._context.config_getter()
+        logger.info("[RuntimeAPI] 已启动: %s", cfg.api.display_url)
 
     async def stop(self) -> None:
         # 取消所有后台任务（如异步 tool invoke 回调）
@@ -597,11 +598,10 @@ class RuntimeAPIServer:
         )
 
     async def _openapi_handler(self, request: web.Request) -> Response:
-        _ = request
         cfg = self._ctx.config_getter()
         if not bool(getattr(cfg.api, "openapi_enabled", True)):
             return _json_error("OpenAPI disabled", status=404)
-        return web.json_response(_build_openapi_spec(self._ctx))
+        return web.json_response(_build_openapi_spec(self._ctx, request))
 
     async def _internal_probe_handler(self, request: web.Request) -> Response:
         _ = request

{undefined_bot-3.2.1 → undefined_bot-3.2.2}/src/Undefined/config/loader.py

@@ -390,6 +390,13 @@ class WebUISettings:
     using_default_password: bool
     config_exists: bool
 
+    @property
+    def display_url(self) -> str:
+        """用于日志和展示的格式化 URL。"""
+        from Undefined.config.models import format_netloc
+
+        return f"http://{format_netloc(self.url or '0.0.0.0', self.port)}"
+
 
 def load_webui_settings(config_path: Optional[Path] = None) -> WebUISettings:
     data = load_toml_data(config_path)

{undefined_bot-3.2.1 → undefined_bot-3.2.2}/src/Undefined/config/models.py

@@ -3,9 +3,28 @@
 from __future__ import annotations
 
 from dataclasses import dataclass, field
+from ipaddress import ip_address
 from typing import Any
 
 
+def format_netloc(host: str, port: int) -> str:
+    """格式化 host:port 为合法 netloc，IPv6 地址自动加方括号。"""
+    if ":" in host:
+        return f"[{host}]:{port}"
+    return f"{host}:{port}"
+
+
+def resolve_bind_hosts(host: str) -> list[str]:
+    """将监听地址展开为 aiohttp 绑定列表。
+
+    Python asyncio 对 IPv6 socket 设置 ``IPV6_V6ONLY=1``，
+    因此 ``::`` 只监听 IPv6。要实现双栈需同时绑定 IPv4 + IPv6。
+    """
+    if not host or host == "::":
+        return ["0.0.0.0", "::"]
+    return [host]
+
+
 @dataclass
 class ModelPoolEntry:
     """模型池中的单个模型条目（已合并缺省值后的完整配置）"""
@@ -247,3 +266,24 @@ class APIConfig:
     tool_invoke_denylist: list[str] = field(default_factory=list)
     tool_invoke_timeout: int = 120
     tool_invoke_callback_timeout: int = 10
+
+    @property
+    def loopback_url(self) -> str:
+        """同机代理用的回环 URL（通配地址映射到 127.0.0.1 / ::1）。"""
+        host = self.host
+        if not host:
+            host = "127.0.0.1"
+        else:
+            try:
+                addr = ip_address(host)
+            except ValueError:
+                pass  # 域名，原样
+            else:
+                if addr.is_unspecified:
+                    host = "127.0.0.1" if addr.version == 4 else "::1"
+        return f"http://{format_netloc(host, self.port)}"
+
+    @property
+    def display_url(self) -> str:
+        """用于日志和展示的格式化 URL（保留原始 host，仅处理 IPv6 方括号）。"""
+        return f"http://{format_netloc(self.host or '0.0.0.0', self.port)}"

{undefined_bot-3.2.1 → undefined_bot-3.2.2}/src/Undefined/webui/app.py

@@ -323,16 +323,18 @@ def run() -> None:
     host = settings.url
     port = settings.port
 
-    logger.info(f"Starting WebUI at http://{host}:{port}")
+    logger.info("Starting WebUI at %s", settings.display_url)
     if settings.using_default_password:
         logger.warning(
             "!!! USING DEFAULT PASSWORD !!! Please change 'webui.password' in config.toml"
         )
 
+    from Undefined.config.models import resolve_bind_hosts
+
     try:
         web.run_app(
             app,
-            host=host,
+            host=resolve_bind_hosts(host),
             port=port,
             print=None,
             shutdown_timeout=1.0,

{undefined_bot-3.2.1 → undefined_bot-3.2.2}/src/Undefined/webui/routes/_runtime.py

@@ -28,8 +28,7 @@ _ALLOWED_CHAT_IMAGE_EXTENSIONS = {
 
 
 def _runtime_base_url() -> str:
-    cfg = get_config(strict=False)
-    return f"http://{cfg.api.host}:{cfg.api.port}".rstrip("/")
+    return get_config(strict=False).api.loopback_url
 
 
 def _unauthorized() -> Response:

{undefined_bot-3.2.1 → undefined_bot-3.2.2}/src/Undefined/webui/routes/_system.py

@@ -8,7 +8,7 @@ from aiohttp.web_response import Response
 
 from Undefined import __version__
 from Undefined.config import get_config
-from ._shared import auth_capabilities, routes, check_auth, get_settings
+from ._shared import auth_capabilities, routes, check_auth
 from ..utils import load_bootstrap_probe_data
 
 try:
@@ -119,7 +119,7 @@ async def _runtime_health_status() -> tuple[bool, bool, str]:
     cfg = get_config(strict=False)
     if not bool(cfg.api.enabled):
         return False, False, "disabled"
-    url = f"http://{cfg.api.host}:{cfg.api.port}/health"
+    url = f"{cfg.api.loopback_url}/health"
     try:
         timeout = ClientTimeout(total=3.0)
         async with ClientSession(timeout=timeout) as session:
@@ -161,7 +161,7 @@ async def bootstrap_probe_handler(request: web.Request) -> Response:
         "runtime_reachable": runtime_reachable,
         "runtime_detail": runtime_detail,
         "auth_mode": "token" if request.headers.get("Authorization") else "cookie",
-        "management_url": f"http://{get_settings(request).url}:{get_settings(request).port}",
+        "management_url": f"{request.scheme}://{request.host}",
     }
     payload["advice"] = _bootstrap_advice(payload)
     return web.json_response(payload)