@ryantest/openclaw-qqbot 1.6.7-beta.8 → 1.6.7-beta.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryantest/openclaw-qqbot",
-  "version": "1.6.7-beta.8",
+  "version": "1.6.7-beta.9",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/scripts/upgrade-via-npm.sh

@@ -18,15 +18,53 @@
 
 set -eo pipefail
 
-# 异常退出时清理临时文件（防止泄露或残留）
+# 异常退出时清理临时文件并回滚（防止泄露或残留）
+INSTALL_COMPLETED=false  # 标记 install 是否已完成（用于区分正常退出和异常退出）
 cleanup_on_exit() {
+    local exit_code=$?
+
+    # 异常退出时同步临时配置中的 install 记录回真实配置
     if [ -n "$TEMP_CONFIG_FILE" ] && [ -f "$TEMP_CONFIG_FILE" ]; then
+        # 尝试同步 install 记录（即使异常退出也要保留）
+        node -e "
+          try {
+            const fs = require('fs');
+            const tmp = JSON.parse(fs.readFileSync('$TEMP_CONFIG_FILE', 'utf8'));
+            const real = JSON.parse(fs.readFileSync('$CONFIG_FILE', 'utf8'));
+            if (tmp.plugins && tmp.plugins.installs) {
+              if (!real.plugins) real.plugins = {};
+              real.plugins.installs = { ...(real.plugins.installs || {}), ...tmp.plugins.installs };
+            }
+            if (tmp.plugins && tmp.plugins.entries) {
+              if (!real.plugins) real.plugins = {};
+              real.plugins.entries = { ...(real.plugins.entries || {}), ...tmp.plugins.entries };
+            }
+            fs.writeFileSync('$CONFIG_FILE', JSON.stringify(real, null, 4) + '\n');
+          } catch {}
+        " 2>/dev/null || true
         rm -f "$TEMP_CONFIG_FILE" 2>/dev/null || true
     fi
-    # 异常退出时清理本次备份目录（正常流程中备份已被删除或回滚，这里是兜底）
-    if [ -n "$BACKUP_DIR" ] && [ -d "$BACKUP_DIR" ]; then
+
+    # 异常退出且 install 未完成时，回滚备份目录（而非删除）
+    if [ "$INSTALL_COMPLETED" != "true" ] && [ -n "$BACKUP_DIR" ] && [ -d "$BACKUP_DIR" ]; then
+        if [ ! -d "$EXTENSIONS_DIR/$PLUGIN_ID" ] || [ ! -f "$EXTENSIONS_DIR/$PLUGIN_ID/package.json" ]; then
+            # 插件目录不存在或不完整，回滚
+            rm -rf "$EXTENSIONS_DIR/$PLUGIN_ID" 2>/dev/null || true
+            mv "$BACKUP_DIR/$PLUGIN_ID" "$EXTENSIONS_DIR/$PLUGIN_ID" 2>/dev/null || \
+            mv "$BACKUP_DIR"/* "$EXTENSIONS_DIR/$PLUGIN_ID" 2>/dev/null || true
+            echo "  ↩️  [cleanup] 异常退出，已回滚到旧版本"
+        else
+            # 插件目录完整，清理备份
+            rm -rf "$BACKUP_DIR" 2>/dev/null || true
+        fi
+    elif [ "$INSTALL_COMPLETED" = "true" ] && [ -n "$BACKUP_DIR" ] && [ -d "$BACKUP_DIR" ]; then
+        # 正常完成，清理备份
         rm -rf "$BACKUP_DIR" 2>/dev/null || true
     fi
+
+    # 清理 openclaw install 可能残留的暂存目录（extensions 和 /tmp 中都可能存在）
+    find "${EXTENSIONS_DIR:-/dev/null}" -maxdepth 1 -name ".openclaw-install-stage-*" -exec rm -rf {} + 2>/dev/null || true
+    find "${TMPDIR:-/tmp}" -maxdepth 1 -name ".openclaw-install-stage-*" -exec rm -rf {} + 2>/dev/null || true
 }
 trap cleanup_on_exit EXIT
 
@@ -232,22 +270,32 @@ fi
 # plugins install/update 可能把 install 记录写入了临时配置，需要同步回真实配置
 restore_qqbot_channel() {
     if [ -n "$TEMP_CONFIG_FILE" ] && [ -f "$TEMP_CONFIG_FILE" ]; then
-        # 将临时配置中 plugins.installs 的变更同步回真实配置
+        # 将临时配置中 plugins.installs 和 plugins.entries 的变更同步回真实配置
         node -e "
           try {
             const fs = require('fs');
             const tmp = JSON.parse(fs.readFileSync('$TEMP_CONFIG_FILE', 'utf8'));
             const real = JSON.parse(fs.readFileSync('$CONFIG_FILE', 'utf8'));
+            let changed = false;
             if (tmp.plugins && tmp.plugins.installs) {
               if (!real.plugins) real.plugins = {};
               real.plugins.installs = { ...(real.plugins.installs || {}), ...tmp.plugins.installs };
+              changed = true;
+            }
+            // 同步 plugins.entries（openclaw plugins install 会写入 entries）
+            if (tmp.plugins && tmp.plugins.entries) {
+              if (!real.plugins) real.plugins = {};
+              real.plugins.entries = { ...(real.plugins.entries || {}), ...tmp.plugins.entries };
+              changed = true;
+            }
+            if (changed) {
               fs.writeFileSync('$CONFIG_FILE', JSON.stringify(real, null, 4) + '\n');
             }
           } catch {}
         " 2>/dev/null || true
         rm -f "$TEMP_CONFIG_FILE"
         unset OPENCLAW_CONFIG_PATH
-        echo "  [兼容] 已同步 install 记录并清理临时配置副本"
+        echo "  [兼容] 已同步 install/entries 记录并清理临时配置副本"
     fi
 }
 
@@ -336,21 +384,57 @@ if [ "$UPGRADE_OK" != "true" ]; then
     echo "  执行 install: $INSTALL_SRC"
 
     if $CMD plugins install "$INSTALL_SRC" --pin 2>&1; then
-        UPGRADE_OK=true
-        echo "  ✅ install 成功"
-        # install 成功，清理备份
-        if [ -n "$BACKUP_DIR" ] && [ -d "$BACKUP_DIR" ]; then
-            rm -rf "$BACKUP_DIR"
-            echo "  已清理旧版备份"
+        # install 返回 0，但需要验证插件目录是否真的存在且完整
+        if [ -d "$EXTENSIONS_DIR/$PLUGIN_ID" ] && [ -f "$EXTENSIONS_DIR/$PLUGIN_ID/package.json" ]; then
+            UPGRADE_OK=true
+            INSTALL_COMPLETED=true
+            echo "  ✅ install 成功"
+            # install 成功，清理备份
+            if [ -n "$BACKUP_DIR" ] && [ -d "$BACKUP_DIR" ]; then
+                rm -rf "$BACKUP_DIR"
+                echo "  已清理旧版备份"
+            fi
+            # 清理 openclaw CLI install 可能留下的额外 backup 目录（extensions 内遗留 + 新路径）
+            find "$EXTENSIONS_DIR" -maxdepth 1 -name ".openclaw-qqbot-backup-*" -exec rm -rf {} + 2>/dev/null || true
+            find "${EXTENSIONS_DIR:-/dev/null}" -maxdepth 1 -name ".openclaw-install-stage-*" -exec rm -rf {} + 2>/dev/null || true
+            find "${TMPDIR:-/tmp}" -maxdepth 1 -name ".openclaw-install-stage-*" -exec rm -rf {} + 2>/dev/null || true
+            find "${TMPDIR:-/tmp}" -maxdepth 1 -name ".qqbot-upgrade-backup-*" -exec rm -rf {} + 2>/dev/null || true
+        else
+            echo "  ❌ install 命令返回成功但插件目录不完整"
+            echo "  [诊断] 目录存在: $([ -d "$EXTENSIONS_DIR/$PLUGIN_ID" ] && echo '是' || echo '否')"
+            echo "  [诊断] package.json 存在: $([ -f "$EXTENSIONS_DIR/$PLUGIN_ID/package.json" ] && echo '是' || echo '否')"
+            # 清理可能残留的暂存目录（extensions 和 /tmp 中都可能存在）
+            find "${EXTENSIONS_DIR:-/dev/null}" -maxdepth 1 -name ".openclaw-install-stage-*" -exec rm -rf {} + 2>/dev/null || true
+            find "${TMPDIR:-/tmp}" -maxdepth 1 -name ".openclaw-install-stage-*" -exec rm -rf {} + 2>/dev/null || true
+            # 回滚
+            if [ -n "$BACKUP_DIR" ] && [ -d "$BACKUP_DIR" ]; then
+                rm -rf "$EXTENSIONS_DIR/$PLUGIN_ID" 2>/dev/null || true
+                # 备份目录内可能是 PLUGIN_ID 子目录或直接是内容
+                if [ -d "$BACKUP_DIR/$PLUGIN_ID" ]; then
+                    mv "$BACKUP_DIR/$PLUGIN_ID" "$EXTENSIONS_DIR/$PLUGIN_ID"
+                else
+                    mv "$BACKUP_DIR" "$EXTENSIONS_DIR/$PLUGIN_ID"
+                fi
+                echo "  ↩️  已回滚到旧版本"
+            fi
+            restore_qqbot_channel
+            echo "QQBOT_NEW_VERSION=unknown"
+            echo "QQBOT_REPORT=❌ QQBot 安装异常（目录不完整，已回滚），请重试或手动安装"
+            exit 1
         fi
-        # 清理 openclaw CLI install 可能留下的额外 backup 目录（extensions 内遗留 + 新路径）
-        find "$EXTENSIONS_DIR" -maxdepth 1 -name ".openclaw-qqbot-backup-*" -exec rm -rf {} + 2>/dev/null || true
-        find "${TMPDIR:-/tmp}" -maxdepth 1 -name ".qqbot-upgrade-backup-*" -exec rm -rf {} + 2>/dev/null || true
     else
         echo "  ❌ install 失败"
+        # 清理可能残留的暂存目录（extensions 和 /tmp 中都可能存在）
+        find "${EXTENSIONS_DIR:-/dev/null}" -maxdepth 1 -name ".openclaw-install-stage-*" -exec rm -rf {} + 2>/dev/null || true
+        find "${TMPDIR:-/tmp}" -maxdepth 1 -name ".openclaw-install-stage-*" -exec rm -rf {} + 2>/dev/null || true
         # 回滚：恢复旧目录
         if [ -n "$BACKUP_DIR" ] && [ -d "$BACKUP_DIR" ]; then
-            mv "$BACKUP_DIR" "$EXTENSIONS_DIR/$PLUGIN_ID"
+            rm -rf "$EXTENSIONS_DIR/$PLUGIN_ID" 2>/dev/null || true
+            if [ -d "$BACKUP_DIR/$PLUGIN_ID" ]; then
+                mv "$BACKUP_DIR/$PLUGIN_ID" "$EXTENSIONS_DIR/$PLUGIN_ID"
+            else
+                mv "$BACKUP_DIR" "$EXTENSIONS_DIR/$PLUGIN_ID"
+            fi
             echo "  ↩️  已回滚到旧版本"
         fi
         restore_qqbot_channel

package/scripts/upgrade-via-source.sh

@@ -262,8 +262,9 @@ if lsof -i :18789 -sTCP:LISTEN >/dev/null 2>&1; then
     sleep 1
 fi
 
-# 清理之前可能残留的 staging 目录
+# 清理之前可能残留的 staging 目录（extensions 和 /tmp 中都可能存在）
 find "$HOME/.openclaw/extensions/" -maxdepth 1 -name ".openclaw-install-stage-*" -exec rm -rf {} + 2>/dev/null || true
+find "${TMPDIR:-/tmp}" -maxdepth 1 -name ".openclaw-install-stage-*" -exec rm -rf {} + 2>/dev/null || true
 
 # ── 清空并重新构建 dist/ ──
 # openclaw plugins install . 只做文件复制，不执行 npm lifecycle scripts。
@@ -398,6 +399,7 @@ else
         echo ""
         echo "  尝试自动修复: 清理残留并重试安装..."
         find "$HOME/.openclaw/extensions/" -maxdepth 1 -name ".openclaw-install-stage-*" -exec rm -rf {} + 2>/dev/null || true
+        find "${TMPDIR:-/tmp}" -maxdepth 1 -name ".openclaw-install-stage-*" -exec rm -rf {} + 2>/dev/null || true
         if openclaw plugins install . 2>&1 | tee -a "$INSTALL_LOG"; then
             for _candidate_name in openclaw-qqbot qqbot openclaw-qq; do
                 if [ -d "$HOME/.openclaw/extensions/$_candidate_name" ]; then

package/src/slash-commands.ts

@@ -893,7 +893,7 @@ function fireHotUpgrade(targetVersion?: string, pkg?: string, useLocal?: boolean
       }
 
       const shContent = `#!/bin/bash
-set -e
+# 注意：不使用 set -e，因为 gateway start 失败时仍需恢复 channels.qqbot
 CLI="${cliInvoke}"
 CONFIG="${configPath}"
 BACKUP="${qqbotChannelBackup}"
@@ -903,13 +903,22 @@ $CLI gateway stop 2>/dev/null || true
 sleep 2
 
 if [ -f "$BACKUP" ]; then
-  echo "[qqbot-upgrade] Temporarily removing channels.qqbot for config validation bypass..."
+  echo "[qqbot-upgrade] Temporarily removing channels.qqbot and plugins.entries for config validation bypass..."
   node -e "
     const fs = require('fs');
     const cfg = JSON.parse(fs.readFileSync(process.argv[1], 'utf8'));
+    let changed = false;
     if (cfg.channels && cfg.channels.qqbot) {
       delete cfg.channels.qqbot;
       if (Object.keys(cfg.channels).length === 0) delete cfg.channels;
+      changed = true;
+    }
+    if (cfg.plugins && cfg.plugins.entries && cfg.plugins.entries['openclaw-qqbot']) {
+      delete cfg.plugins.entries['openclaw-qqbot'];
+      if (Object.keys(cfg.plugins.entries).length === 0) delete cfg.plugins.entries;
+      changed = true;
+    }
+    if (changed) {
       fs.writeFileSync(process.argv[1], JSON.stringify(cfg, null, 4) + '\\n');
     }
   " "$CONFIG" 2>/dev/null
@@ -917,25 +926,44 @@ if [ -f "$BACKUP" ]; then
 fi
 
 echo "[qqbot-upgrade] Starting gateway..."
-$CLI gateway start
+START_OK=false
+if $CLI gateway start 2>/dev/null; then
+  START_OK=true
+  echo "[qqbot-upgrade] Gateway started successfully"
+else
+  echo "[qqbot-upgrade] WARNING: gateway start failed, will still restore config"
+fi
 
-echo "[qqbot-upgrade] Waiting for plugin to load (5s)..."
-sleep 5
+echo "[qqbot-upgrade] Waiting for plugin to load (8s)..."
+sleep 8
 
 if [ -f "$BACKUP" ]; then
-  echo "[qqbot-upgrade] Restoring channels.qqbot..."
+  echo "[qqbot-upgrade] Restoring channels.qqbot and plugins.entries..."
   node -e "
     const fs = require('fs');
     const cfg = JSON.parse(fs.readFileSync(process.argv[1], 'utf8'));
     const qqbot = JSON.parse(fs.readFileSync(process.argv[2], 'utf8'));
     if (!cfg.channels) cfg.channels = {};
     cfg.channels.qqbot = qqbot;
+    // 恢复 plugins.entries
+    if (!cfg.plugins) cfg.plugins = {};
+    if (!cfg.plugins.entries) cfg.plugins.entries = {};
+    if (!cfg.plugins.entries['openclaw-qqbot']) {
+      cfg.plugins.entries['openclaw-qqbot'] = { enabled: true };
+    }
     fs.writeFileSync(process.argv[1], JSON.stringify(cfg, null, 4) + '\\n');
   " "$CONFIG" "$BACKUP" 2>/dev/null
   rm -f "$BACKUP"
   echo "[qqbot-upgrade] channels.qqbot restored"
 fi
 
+# 如果 start 失败，尝试再次启动（此时 channels.qqbot 已恢复，插件可能已注册）
+if [ "$START_OK" != "true" ]; then
+  echo "[qqbot-upgrade] Retrying gateway start..."
+  sleep 2
+  $CLI gateway start 2>/dev/null || echo "[qqbot-upgrade] WARNING: retry also failed"
+fi
+
 # 清理自身
 rm -f "$0"
 echo "[qqbot-upgrade] Done."