Port dev startup chain to master

astrbot/cli/banner.py

@@ -0,0 +1,28 @@
+"""ASCII logo and interactive mode utilities for CLI"""
+
+import sys
+
+logo_tmpl = r"""
+     ___           _______.___________..______      .______     ______   .___________.
+    /   \         /       |           ||   _  \     |   _  \   /  __  \  |           |
+   /  ^  \       |   (----`---|  |----`|  |_)  |    |  |_)  | |  |  |  | `---|  |----`
+  /  /_\  \       \   \       |  |     |      /     |   _  <  |  |  |  |     |  |
+ /  _____  \  .----)   |      |  |     |  |\  \----.|  |_)  | |  `--'  |     |  |
+/__/     \__\ |_______/       |__|     | _| `._____||______/   \______/      |__|
+"""
+
+
+def is_interactive() -> bool:
+    """Check if stdout is connected to a TTY (interactive terminal)"""
+    try:
+        return sys.stdout.isatty()
+    except Exception:
+        return False
+
+
+def print_logo() -> None:
+    """Print ASCII logo if in interactive mode"""
+    import click
+
+    if is_interactive():
+        click.echo(logo_tmpl)

astrbot/cli/commands/cmd_init.py

@@ -1,11 +1,16 @@
 import asyncio
+import json
 import os
+from collections.abc import Callable
 from pathlib import Path
 
 import click
 from filelock import FileLock, Timeout
 
-from ..utils import check_dashboard, get_astrbot_root
+from astrbot.cli.utils import DashboardManager
+from astrbot.core.config.default import DEFAULT_CONFIG
+from astrbot.core.utils.astrbot_path import astrbot_paths
+from astrbot.core.utils.env_template import expand_env_placeholders
 
 DASHBOARD_INITIAL_PASSWORD_ENV = "ASTRBOT_DASHBOARD_INITIAL_PASSWORD"
 
@@ -20,51 +25,299 @@ def _initialize_config_from_env(astrbot_root: Path) -> None:
     click.echo("Initialized data/cmd_config.json with dashboard initial password.")
 
 
-async def initialize_astrbot(astrbot_root: Path) -> None:
-    """Execute AstrBot initialization logic"""
+def _write_default_config(config_path: Path) -> dict:
+    config = json.loads(json.dumps(DEFAULT_CONFIG))
+    config_path.write_text(
+        json.dumps(config, ensure_ascii=False, indent=2),
+        encoding="utf-8-sig",
+    )
+    return config
+
+
+def _load_or_create_config(config_path: Path) -> dict:
+    if not config_path.exists():
+        return _write_default_config(config_path)
+    try:
+        return json.loads(config_path.read_text(encoding="utf-8-sig"))
+    except json.JSONDecodeError as e:
+        raise click.ClickException(f"Failed to parse config file: {e!s}") from e
+
+
+def _set_dashboard_username(config: dict, username: str) -> None:
+    username = username.strip()
+    if not username:
+        raise click.ClickException("Dashboard username cannot be empty")
+    dashboard_config = config.setdefault("dashboard", {})
+    if not isinstance(dashboard_config, dict):
+        raise click.ClickException("Config path conflict: dashboard is not a dict")
+    dashboard_config["username"] = username
+
+
+def _print_init_banner() -> None:
+    from astrbot.cli.banner import print_logo
+
+    click.echo("=" * 60)
+    click.echo("AstrBot 初始化向导")
+    click.echo("=" * 60)
+    print_logo()
+    click.echo()
+
+
+def _ensure_root_marker(astrbot_root: Path, *, yes: bool) -> None:
     dot_astrbot = astrbot_root / ".astrbot"
+    if dot_astrbot.exists():
+        return
+    if yes or click.confirm(
+        f"确定要将 AstrBot 安装到以下目录吗？\n  {astrbot_root}",
+        default=True,
+        abort=True,
+    ):
+        dot_astrbot.touch()
+        click.echo(f"[OK] 已创建: {dot_astrbot}")
 
-    if not dot_astrbot.exists():
-        if click.confirm(
-            f"Install AstrBot to this directory? {astrbot_root}",
-            default=True,
-            abort=True,
-        ):
-            dot_astrbot.touch()
-            click.echo(f"Created {dot_astrbot}")
 
+def _ensure_basic_directories(astrbot_root: Path) -> None:
     paths = {
         "data": astrbot_root / "data",
         "config": astrbot_root / "data" / "config",
         "plugins": astrbot_root / "data" / "plugins",
         "temp": astrbot_root / "data" / "temp",
+        "skills": astrbot_root / "data" / "skills",
     }
-
     for name, path in paths.items():
+        existed = path.exists()
         path.mkdir(parents=True, exist_ok=True)
-        click.echo(f"{'Created' if not path.exists() else 'Directory exists'}: {path}")
+        status = "Exists" if existed else "Created"
+        click.echo(f"  [{status}] {name.title()}: {path}")
+
+
+def _find_env_template() -> Path | None:
+    tmpl_candidates = [
+        Path("/opt/astrbot/config.template"),
+        getattr(astrbot_paths, "project_root", Path.cwd()) / "config.template",
+        Path.cwd() / "config.template",
+    ]
+    for tmpl in tmpl_candidates:
+        try:
+            if tmpl.exists():
+                return tmpl
+        except Exception:
+            continue
+    return None
+
+
+def _maybe_generate_env_file(astrbot_root: Path) -> None:
+    env_file = astrbot_root / ".env"
+    if env_file.exists():
+        return
+
+    tmpl = _find_env_template()
+    if tmpl is None:
+        click.echo("[提示] 未找到 config.template 文件，跳过 .env 生成")
+        return
+
+    try:
+        instance_name = astrbot_root.name or "astrbot"
+        port_val = os.environ.get("ASTRBOT_PORT") or os.environ.get("PORT") or "8000"
+        txt = expand_env_placeholders(
+            tmpl.read_text(encoding="utf-8"),
+            overrides={
+                "INSTANCE_NAME": instance_name,
+                "PORT": str(port_val),
+                "ASTRBOT_ROOT": str(astrbot_root),
+            },
+        )
+        header = (
+            "# Generated from config.template by astrbot init for instance: "
+            f"{instance_name}\n"
+            "# This file will be auto-loaded by 'astrbot run'\n\n"
+        )
+        env_file.write_text(header + txt, encoding="utf-8")
+        env_file.chmod(0o644)
+        click.echo(f"[OK] 环境变量文件已创建: {env_file}")
+    except Exception as e:
+        click.echo(f"[警告] 无法从模板生成 .env 文件: {e!s}")
+
+
+def _configure_admin_user(
+    config_path: Path,
+    config: dict,
+    admin_username: str | None,
+    admin_password: str | None,
+) -> str:
+    if admin_password is not None:
+        raise click.ClickException(
+            "--admin-password is no longer supported during init. Run 'astrbot conf admin' after initialization.",
+        )
 
+    effective_admin_username = (
+        admin_username.strip()
+        if admin_username
+        else str(DEFAULT_CONFIG["dashboard"]["username"])
+    )
+    if admin_username:
+        _set_dashboard_username(config, effective_admin_username)
+        config_path.write_text(
+            json.dumps(config, ensure_ascii=False, indent=2),
+            encoding="utf-8-sig",
+        )
+    click.echo(f"[OK] Dashboard admin 用户名已设置为: {effective_admin_username}")
+    return effective_admin_username
+
+
+def _print_admin_guidance() -> None:
+    click.echo()
+    click.echo("!" * 60)
+    click.echo("重要提示：")
+    click.echo("  1. Dashboard 密码尚未设置！首次登录前必须先设置密码")
+    click.echo("  2. 设置命令: astrbot conf admin")
+    click.echo("  3. 登录地址: http://localhost:6185 或 http://服务器IP:6185")
+    click.echo("!" * 60)
+    click.echo()
+
+
+def _print_backend_mode_guidance() -> None:
+    click.echo()
+    click.echo("[提示] 你选择了后端模式，可以使用以下方式管理 AstrBot：")
+    click.echo("  - 使用在线 Dashboard: 在浏览器中访问远程服务器的 WebUI")
+    click.echo("  - 使用 CLI 命令: astrbot conf / astrbot plug 等")
+    click.echo()
+    click.echo("!" * 60)
+    click.echo("安全提示：")
+    click.echo("  HTTPS 前端只能安全连接 localhost 的 HTTP 后端")
+    click.echo("  不支持远程 + HTTP 后端（不安全）")
+    click.echo("  如需远程访问，请使用 HTTPS 后端或通过反向代理")
+    click.echo("!" * 60)
+    click.echo()
+
+
+async def _maybe_install_dashboard(
+    astrbot_root: Path,
+    *,
+    yes: bool,
+    backend_only: bool,
+) -> None:
+    should_install_dashboard = not backend_only and (
+        yes
+        or click.confirm(
+            "是否需要集成式 WebUI？（个人电脑推荐，服务器推荐使用后端模式）",
+            default=True,
+        )
+    )
+    if should_install_dashboard:
+        await DashboardManager().ensure_installed(astrbot_root)
+        return
+    _print_backend_mode_guidance()
+
+
+def _resolve_init_root(root_arg: str | None) -> Path:
+    astrbot_root = Path(root_arg).expanduser() if root_arg else astrbot_paths.root
+    astrbot_root.mkdir(parents=True, exist_ok=True)
+    os.environ["ASTRBOT_ROOT"] = str(astrbot_root)
+    return astrbot_root
+
+
+def _with_root_lock(root: Path, fn: Callable[[], None]) -> None:
+    lock_file = root / "astrbot.lock"
+    lock = FileLock(lock_file, timeout=5)
+    try:
+        with lock.acquire():
+            fn()
+    except Timeout as err:
+        raise click.ClickException(
+            "Cannot acquire lock file. Please check if another instance is running",
+        ) from err
+
+
+def _print_final_instructions() -> None:
+    click.echo()
+    click.echo("=" * 60)
+    click.echo("初始化完成！")
+    click.echo("=" * 60)
+    click.echo()
+    click.echo("启动 AstrBot：")
+    click.echo("  完整模式（含 Dashboard）: astrbot run")
+    click.echo("  仅后端模式:           astrbot run --backend-only")
+    click.echo()
+    click.echo("首次使用前请先设置管理员密码：")
+    click.echo("  astrbot conf admin")
+    click.echo()
+
+
+async def initialize_astrbot(
+    astrbot_root: Path,
+    *,
+    yes: bool,
+    backend_only: bool,
+    admin_username: str | None,
+    admin_password: str | None,
+) -> None:
+    """Execute AstrBot initialization logic"""
+    _print_init_banner()
+    _ensure_root_marker(astrbot_root, yes=yes)
+    _ensure_basic_directories(astrbot_root)
     _initialize_config_from_env(astrbot_root)
 
-    await check_dashboard(astrbot_root / "data")
+    config_path = astrbot_root / "data" / "cmd_config.json"
+    config_existed = config_path.exists()
+    config = _load_or_create_config(config_path)
+    if not config_existed:
+        click.echo(f"[OK] 配置文件已创建: {config_path}")
+    _maybe_generate_env_file(astrbot_root)
+    _configure_admin_user(config_path, config, admin_username, admin_password)
+    _print_admin_guidance()
+    await _maybe_install_dashboard(astrbot_root, yes=yes, backend_only=backend_only)
 
 
 @click.command()
-def init() -> None:
+@click.option("--yes", "-y", is_flag=True, help="Skip confirmation prompts")
+@click.option("--backend-only", "-b", is_flag=True, help="Only initialize the backend")
+@click.option(
+    "-u",
+    "--admin-username",
+    type=str,
+    help="Set dashboard admin username during initialization",
+)
+@click.option(
+    "-p",
+    "--admin-password",
+    type=str,
+    help="Deprecated. Run `astrbot conf admin` after initialization.",
+)
+@click.option(
+    "--root",
+    help="ASTRBOT root directory to initialize (overrides ASTRBOT_ROOT env)",
+    type=str,
+)
+def init(
+    yes: bool,
+    backend_only: bool,
+    admin_username: str | None,
+    admin_password: str | None,
+    root: str | None = None,
+) -> None:
     """Initialize AstrBot"""
     click.echo("Initializing AstrBot...")
-    astrbot_root = get_astrbot_root()
-    lock_file = astrbot_root / "astrbot.lock"
-    lock = FileLock(lock_file, timeout=5)
+    if os.environ.get("ASTRBOT_SYSTEMD") == "1":
+        yes = True
 
-    try:
-        with lock.acquire():
-            asyncio.run(initialize_astrbot(astrbot_root))
-            click.echo("Done! You can now run 'astrbot run' to start AstrBot")
-    except Timeout:
-        raise click.ClickException(
-            "Cannot acquire lock file. Please check if another instance is running"
+    astrbot_root = _resolve_init_root(root)
+
+    def _run_init() -> None:
+        asyncio.run(
+            initialize_astrbot(
+                astrbot_root,
+                yes=yes,
+                backend_only=backend_only,
+                admin_username=admin_username,
+                admin_password=admin_password,
+            ),
         )
+        _print_final_instructions()
 
+    try:
+        _with_root_lock(astrbot_root, _run_init)
+    except click.ClickException:
+        raise
     except Exception as e:
-        raise click.ClickException(f"Initialization failed: {e!s}")
+        raise click.ClickException(f"Initialization failed: {e!s}") from e