⚡️ 优化脚本执行逻辑 & 修复信号文件未删除

Author: Kaguya233qwq

src/nonebot_plugin_sky/tools/restart.py

@@ -144,3 +144,5 @@ async def trigger_signal(bot: Bot):
         await bot.send_private_msg(user_id=signal.user_id, message=signal.message)
     elif signal.action == Action.SEND_GROUP_MSG:
         await bot.send_group_msg(group_id=signal.group_id, message=signal.message)
+    # 触发后删除
+    SIGNAL_PATH.unlink()

src/sky_cli/cli.py

@@ -6,44 +6,82 @@
 import click
 
 POWERSHELL_SCRIPT_CONTENT = r"""
-# =======================================================
-# ==     NoneBot Guardian & Restarter for Windows      ==
-# ==     (Generated by nonebot-plugin-sky)             ==
-# =======================================================
+# ===================================================================
+# ==  Robust NoneBot Guardian & Restarter for Windows (v2.0)       ==
+# ==  - Auto-detects virtual environments.                         ==
+# ==  - Falls back to system-level commands.                       ==
+# ===================================================================
 
 $ScriptRoot = Split-Path -Parent $MyInvocation.MyCommand.Definition
 Set-Location -Path $ScriptRoot
 
-$VenvPythonPath = Join-Path $ScriptRoot ".venv\Scripts\python.exe"
+# 在当前目录下查找一个有效的 Python 虚拟环境
+# 如果找到，返回 python.exe 的完整路径,否则返回 $null。
+function Find-LocalPython {
+    $subdirectories = Get-ChildItem -Path $ScriptRoot -Directory
+    
+    foreach ($dir in $subdirectories) {
+        $potentialPath = Join-Path -Path $dir.FullName -ChildPath "Scripts\python.exe"
+        if (Test-Path -Path $potentialPath -PathType Leaf) {
+            return $potentialPath
+        }
+    }
+    
+    return $null
+}
+
+$CommandToRun = $null
+$CommandArgs = $null
+
+$localPythonPath = Find-LocalPython
+
+if ($localPythonPath) {
+    Write-Host "√ Automatically detected Python virtual environment at '$localPythonPath'" -ForegroundColor Green
+    $CommandToRun = $localPythonPath
+    $CommandArgs = "-m", "nb_cli", "run"
+}
 
-if (-not (Test-Path $VenvPythonPath)) {
-    Write-Host "Error: Python virtual environment not found at '$VenvPythonPath'" -ForegroundColor Red
+elseif (Get-Command "nb.exe" -ErrorAction SilentlyContinue) {
+    Write-Host "No local virtual environment found. Falling back to system-level 'nb.exe' command." -ForegroundColor Cyan
+    $CommandToRun = "nb.exe"
+    $CommandArgs = "run"
+}
+else {
+    Write-Host "× Error: Could not find a local virtual environment (e.g., '.\.venv\Scripts\python.exe') or a system-level 'nb.exe' command in your PATH." -ForegroundColor Red
+    Write-Host "Please ensure NoneBot is installed correctly either in a local venv or globally." -ForegroundColor Red
     Read-Host "Press Enter to exit"
     exit 1
 }
 
+# 进程守护循环
 while ($true) {
     Write-Host ""
-    Write-Host "($(Get-Date -Format 'HH:mm:ss')) Starting NoneBot process..."
-
-    $process = Start-Process -FilePath $VenvPythonPath -ArgumentList "-m", "nb_cli", "run" -NoNewWindow -Wait -PassThru
-    
-    $ExitCode = $process.ExitCode
+    Write-Host "($(Get-Date -Format 'HH:mm:ss')) Starting NoneBot process..." -ForegroundColor White
+
+    try {
+        $process = Start-Process -FilePath $CommandToRun -ArgumentList $CommandArgs -NoNewWindow -Wait -PassThru
+        $ExitCode = $process.ExitCode
+    } catch {
+        Write-Host "Failed to start process with command: '$CommandToRun'" -ForegroundColor Red
+        Write-Host $_.Exception.Message -ForegroundColor Red
+        $ExitCode = -1
+    }
 
-    # 当且仅当退出码为 0 时重启
-    if ($ExitCode -eq 0) {
+    if ($ExitCode -eq -1073741510) {
         Write-Host ""
-        Write-Host "($(Get-Date -Format 'HH:mm:ss')) Process exited with code 0. Assuming restart request. Rebooting in 5 seconds..." -ForegroundColor Yellow
-        Start-Sleep -Seconds 5
+        Write-Host "($(Get-Date -Format 'HH:mm:ss')) Process was interrupted by user (Ctrl+C). Not restarting." -ForegroundColor Green
+        break
     } else {
+        # 退出码为 0 或其他错误码都进行重启
         Write-Host ""
-        Write-Host "($(Get-Date -Format 'HH:mm:ss')) NoneBot process was interrupted (code $ExitCode). Not restarting." -ForegroundColor Green
-        break
+        Write-Host "($(Get-Date -Format 'HH:mm:ss')) Process exited with code ($ExitCode). Restarting in 5 seconds..." -ForegroundColor Yellow
+        Start-Sleep -Seconds 5
     }
 }
 
 Write-Host ""
-Read-Host "Script has finished. Press Enter to exit."
+Write-Host "Script has finished." -ForegroundColor Green
+Read-Host "Press Enter to exit."
 """
 
 BASH_SCRIPT_CONTENT = r"""
@@ -54,32 +92,56 @@
 # ==      (Generated by nonebot-plugin-sky)              ==
 # =======================================================
 
-cd "$(dirname "$0")"
+cd "$(dirname "$0")" || exit
+
+# 在当前目录下查找一个有效的 Python 虚拟环境
+# 如果找到，打印出 python 可执行文件的路径并返回 0；否则返回 1。
+find_local_python() {
+  for dir in */ .*/ ; do
+    if [ -d "$dir" ] && [ "$dir" != "./" ] && [ "$dir" != "../" ]; then
+      local potential_python="$dir/bin/python"
+      if [ -f "$potential_python" ]; then
+        echo "$potential_python"
+        return 0
+      fi
+    fi
+  done
+  return 1
+}
+
+RUN_CMD=""
 
-VENV_PYTHON="./.venv/bin/python"
+VENV_PYTHON=$(find_local_python)
 
-if [ ! -f "$VENV_PYTHON" ]; then
-    echo "Error: Python virtual environment not found at '$VENV_PYTHON'" >&2
+if [ $? -eq 0 ]; then
+    echo "✅ Automatically detected Python virtual environment at './${VENV_PYTHON#./}'"
+    RUN_CMD=("$VENV_PYTHON" -m nb_cli run)
+# 如果虚拟环境不存在，则检测全局的 'nb' 命令
+elif command -v nb >/dev/null 2>&1; then
+    echo "ℹ️  No local virtual environment found. Falling back to system-level 'nb' command."
+    RUN_CMD=(nb run)
+else
+    echo "❌ Error: Could not find a local virtual environment (e.g., ./.venv/bin/python) or a system-level 'nb' command in your PATH." >&2
+    echo "Please ensure NoneBot is installed correctly either in a local venv or globally." >&2
     exit 1
 fi
 
+# 进程守护循环
 while true; do
     echo ""
-    echo "[$(date +'%H:%M:%S')] Starting NoneBot process..."
+    echo "[$(date +'%Y-%m-%d %H:%M:%S')] Starting NoneBot process..."
     
-    "$VENV_PYTHON" -m nb_cli run
+    "${RUN_CMD[@]}"
     
     EXIT_CODE=$?
     
-    # 退出码为 130 (SIGINT) 时不重启
     if [ $EXIT_CODE -eq 130 ]; then
         echo ""
-        echo "[$(date +'%H:%M:%S')] Process was interrupted by user (SIGINT / Ctrl+C). Not restarting."
+        echo "[$(date +'%Y-%m-%d %H:%M:%S')] Process was interrupted by user (Ctrl+C). Not restarting."
         break
     else
-        # 退出码为 0 或其他错误码，都进行重启
         echo ""
-        echo "[$(date +'%H:%M:%S')] Process exited with code ($EXIT_CODE). Assuming restart request or crash. Rebooting in 5 seconds..."
+        echo "[$(date +'%Y-%m-%d %H:%M:%S')] Process exited with code ($EXIT_CODE). Restarting in 5 seconds..."
         sleep 5
     fi
 done